Merge pull request #8652 from brave/90.0.4430.93-1.23.x

Upgrade patches from Chromium 90.0.4430.85 to Chromium 90.0.4430.93 (1.23.x).
brave · Apr 28, 2021 · 960268d · 960268d
2 parents c3ec4de + 783dfb5
commit 960268d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 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 f1fa6a9b4c396a4d18b2f0bbeaa20abd69d1b91e..172bed8ffc5c97b5e36a35ea6cad970b180d03cc 100644
+index b4c1ed25b7c57d3a4445fcab71f4e1b4d8eb5683..6dfb1b68b5f275d91489ff30a3dd042e0d63fdd6 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=90
 -MINOR=0
 -BUILD=4430
--PATCH=85
+-PATCH=93
 +MINOR=1
 +BUILD=23
 +PATCH=74
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 66a4b6926835c2c521c66eb2a6d92bd0d08de454..c4a6ecd42c5be847b21b7e1d7554d6d832cb24e5 100644
+index 1281ce53672f412451440eb29194acd1ed695ed4..0a3d50b6d6618691f6142e58f01bbc99d9df33c8 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 66a4b6926835c2c521c66eb2a6d92bd0d08de454..c4a6ecd42c5be847b21b7e1d7554d6d8
 
  const FeatureEntry::Choice kPassiveListenersChoices[] = {
      {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-@@ -7281,6 +7281,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7285,6 +7285,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).

diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
-index 0f8f7f4c975d398298a94c90c2a364a37f3d7fa7..94610fef241ad1dad4f66a2f2ee9d77ca1d0444b 100644
+index 28672e8af478efed095039ea2522abf5bc75db94..8b38632a236fb0edf62624a164917ee68f7b0edc 100644
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -316,6 +316,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
+@@ -317,6 +317,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
  };
 
  const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {

diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
-index dae1c91d2d720f09b9a0840d829d4cc8600232ba..0f19c1307b05eb1fb4aab124c992c2f6474598a7 100644
+index ec741e3bdb5041c525d30e6c3b16ab9a0a4a607a..41b4d8f1ed8a54fae3f3b658122e5ff41d2a8a14 100644
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
 @@ -2041,6 +2041,7 @@ void NavigationRequest::OnRequestRedirected(
@@ -10,7 +10,7 @@ index dae1c91d2d720f09b9a0840d829d4cc8600232ba..0f19c1307b05eb1fb4aab124c992c2f6
    common_params_->referrer = Referrer::SanitizeForRequest(
        common_params_->url, *common_params_->referrer);
 
-@@ -3079,6 +3080,7 @@ void NavigationRequest::OnStartChecksComplete(
+@@ -3095,6 +3096,7 @@ void NavigationRequest::OnStartChecksComplete(
    headers.MergeFrom(TakeModifiedRequestHeaders());
    begin_params_->headers = headers.ToString();