Merge pull request #8583 from brave/90.0.4430.85-1.24.x

Upgrade patches from Chromium 90.0.4430.72 to Chromium 90.0.4430.85 (1.24.x).
brave · Apr 22, 2021 · a30fc2f · a30fc2f
2 parents e7d08f2 + b8f7cfa
commit a30fc2f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 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 56b9731f103cb8e4d27d92604ea85ae7f169bccc..58848d0b3cf6b5ff97456128a85d9739f7fe1eac 100644
+index f1fa6a9b4c396a4d18b2f0bbeaa20abd69d1b91e..172bed8ffc5c97b5e36a35ea6cad970b180d03cc 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=90
 -MINOR=0
 -BUILD=4430
--PATCH=72
+-PATCH=85
 +MINOR=1
 +BUILD=24
 +PATCH=72
diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index 38c40cd243dcdd7440f8884f2081e0b01bb56da0..21fd63d3c264f37799b8136955e788c7e30f589d 100644
+index 38c40cd243dcdd7440f8884f2081e0b01bb56da0..8f6f00c3527091f3a8cea2bde61b95789e96aec8 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
 @@ -236,6 +236,7 @@ android_resources("chrome_app_java_resources") {

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 01dea31dd36b5c6a5322516d0d1ae5e927d2b1ef..cdc60f23e344f476cf25ff17101a0ed97bfecac7 100644
+index 66a4b6926835c2c521c66eb2a6d92bd0d08de454..c4a6ecd42c5be847b21b7e1d7554d6d832cb24e5 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
 @@ -307,14 +307,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
@@ -21,7 +21,7 @@ index 01dea31dd36b5c6a5322516d0d1ae5e927d2b1ef..cdc60f23e344f476cf25ff17101a0ed9
 
  const FeatureEntry::Choice kPassiveListenersChoices[] = {
      {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-@@ -7276,6 +7276,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7281,6 +7281,7 @@ const FeatureEntry kFeatureEntries[] = {
      // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag
      // Histograms" in tools/metrics/histograms/README.md (run the
      // AboutFlagsHistogramTest unit test to verify this process).