Merge pull request #4184 from brave/79.0.3945.74

Upgrade from Chromium 79.0.3945.70 to Chromium 79.0.3945.74
brave · Dec 10, 2019 · 0126ac3 · 0126ac3
1 parent fab2075
commit 0126ac3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index 3cbcec3b99f70599f35eac6d5404b2b397ed175b..8c842648453f451be5d26d6769ead14def282655 100644
+index 66f2dc44203589209cad291151e0d8dd784bcf57..77c21636c91febbeaf759a025ff9ab8d738bccb7 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=79
 -MINOR=0
 -BUILD=3945
--PATCH=70
+-PATCH=74
 +MINOR=1
 +BUILD=3
 +PATCH=60
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-util-FeatureUtilities.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-util-FeatureUtilities.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
-index 6afd8a49935f8541b94cbc69c6ce459bfbccbf84..b2608ce57b4ac1e2fd437830150d3a57ae7978c0 100644
+index 1471794e1fc56768c1e0f14d169f2a539ffdef48..73e70053b280f9fa6cc2d30b0d56d73435f25525 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
-@@ -368,7 +368,7 @@ public class FeatureUtilities {
+@@ -378,7 +378,7 @@ public class FeatureUtilities {
       */
      public static boolean isBottomToolbarEnabled() {
          // TODO(crbug.com/944228): TabGroupsAndroid and ChromeDuet are incompatible for now.
@@ -11,7 +11,7 @@ index 6afd8a49935f8541b94cbc69c6ce459bfbccbf84..b2608ce57b4ac1e2fd437830150d3a57
                  && !DeviceFormFactor.isNonMultiDisplayContextOnTablet(
                          ContextUtils.getApplicationContext())
                  && !isTabGroupsAndroidEnabled();
-@@ -413,7 +413,7 @@ public class FeatureUtilities {
+@@ -423,7 +423,7 @@ public class FeatureUtilities {
       *         enabled).
       */
      public static boolean isNightModeAvailable() {

diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index 1518449679e8c4a457a58042b5a0f6a70f385db9..15631077869506e67b36a4d25408917cd9cb92d8 100644
+index 0ab55be2f96853137cec8928621360e9f639b467..34e01378c8e413af12399bc3ca30188bddd91778 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
 @@ -282,14 +282,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {

diff --git a/patches/chrome-browser-android-chrome_feature_list.cc.patch b/patches/chrome-browser-android-chrome_feature_list.cc.patch
@@ -1,16 +1,16 @@
 diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
-index 60e38840f24815aa51a9f11d23cc5715afe62eed..1a6d45266f8307555f473a6902763ea455dbf1a4 100644
+index e41455bfe3ad7b75ef41403a5bd4c9579c64e3d1..e5558f535eb649a6f0c3cd33d109e68f947a76aa 100644
 --- a/chrome/browser/android/chrome_feature_list.cc
 +++ b/chrome/browser/android/chrome_feature_list.cc
-@@ -229,6 +229,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
+@@ -230,6 +230,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
  };
 
  const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {
 +  BRAVE_FIND_FEATURE_EXPOSED_TO_JAVA
    for (size_t i = 0; i < base::size(kFeaturesExposedToJava); ++i) {
      if (kFeaturesExposedToJava[i]->name == feature_name)
        return kFeaturesExposedToJava[i];
-@@ -245,7 +246,7 @@ const base::Feature kAdjustWebApkInstallationSpace = {
+@@ -246,7 +247,7 @@ const base::Feature kAdjustWebApkInstallationSpace = {
      "AdjustWebApkInstallationSpace", base::FEATURE_DISABLED_BY_DEFAULT};
 
  const base::Feature kAndroidNightMode{"AndroidNightMode",