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 · 0671231 · 0671231
1 parent ee5fd1f
commit 0671231
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 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..d5348916f2e68d48bc2fe9b9c9a1506539e1fad7 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=79
 -MINOR=0
 -BUILD=3945
--PATCH=70
+-PATCH=74
 +MINOR=1
 +BUILD=1
 +PATCH=19
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..64843c257b6f0541525c82860282b4a57c9bb144 100644
+index 1471794e1fc56768c1e0f14d169f2a539ffdef48..b066f328f572627de5540e7fbf332bd4dd2b3a44 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
-@@ -367,11 +367,13 @@ public class FeatureUtilities {
+@@ -377,11 +377,13 @@ public class FeatureUtilities {
       * @return Whether or not the bottom toolbar is enabled.
       */
      public static boolean isBottomToolbarEnabled() {

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,8 +1,8 @@
 diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
-index 60e38840f24815aa51a9f11d23cc5715afe62eed..93c5110e0b33c6ad15699c4a49fb524ffb7f864c 100644
+index e41455bfe3ad7b75ef41403a5bd4c9579c64e3d1..a3bd74daf333e9636e356b54fc7b0853372d98c7 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) {