Upgrade patches from Chromium 97.0.4692.36 to Chromium 97.0.4692.45

brave · Dec 10, 2021 · f2c0aac · f2c0aac
1 parent 7170470
commit f2c0aac
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 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 71f615d1e25f7b08f0367657c199f1320325f0e6..897088226a0ac2a6de5284f5d4c5622e61735010 100644
+index 109d41868f0ac3301d9bd538af4b6507b342e9e4..0f4f065713339337234b63e4b181da7224a49c2d 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=97
 -MINOR=0
 -BUILD=4692
--PATCH=36
+-PATCH=45
 +MINOR=1
 +BUILD=35
 +PATCH=25
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 1f2223b770bb2b8a09aaf7c783baa3b3ab7f97d5..ad3f609e106055ae15be323d6a975772260c309c 100644
+index d5d60702f82ec4f7677f9ef01297d5499edbe5af..95065afc853306a58826d1ad133387a36b6aeb07 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
 @@ -253,6 +253,7 @@ android_resources("chrome_app_java_resources") {
@@ -10,47 +10,47 @@ index 1f2223b770bb2b8a09aaf7c783baa3b3ab7f97d5..ad3f609e106055ae15be323d6a975772
  }
 
  if (enable_vr) {
-@@ -622,6 +623,7 @@ android_library("chrome_java") {
+@@ -623,6 +624,7 @@ android_library("chrome_java") {
    ]
 
    deps += feed_deps
 +  deps += brave_chrome_java_deps
 
    srcjar_deps = [
      ":autofill_verification_status_generated_enum",
-@@ -654,6 +656,7 @@ android_library("chrome_java") {
+@@ -655,6 +657,7 @@ android_library("chrome_java") {
      "//components/offline_pages/core:offline_page_model_enums_java",
      "//net:effective_connection_type_java",
    ]
 +  srcjar_deps += brave_chrome_java_srcjar_deps
 
    # From java_sources.gni.
    sources = chrome_java_sources + [ app_hooks_impl ]
-@@ -772,6 +775,7 @@ java_group("chrome_all_java") {
+@@ -773,6 +776,7 @@ java_group("chrome_all_java") {
        "//chrome/android/features/tab_ui:module_desc_java",
      ]
    }
 +  deps += brave_chrome_all_java_deps
  }
 
  # This is a list of all base module jni headers. New features should add their
-@@ -817,6 +821,7 @@ group("jni_headers") {
+@@ -818,6 +822,7 @@ group("jni_headers") {
      "//components/ukm/android:jni_headers",
      "//components/webauthn/android:jni_headers",
    ]
 +  public_deps += ["//brave/build/android:jni_headers"]
  }
 
  action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
-@@ -2170,6 +2175,7 @@ if (current_toolchain == default_toolchain) {
+@@ -2171,6 +2176,7 @@ if (current_toolchain == default_toolchain) {
          ":${_variant}_locale_pak_assets",
          ":${_variant}_paks",
        ]
 +      deps += [ "//brave:brave_pak_assets" ]
        if (_is_monochrome) {
          deps += [ "//android_webview:locale_pak_assets" ]
          if (webview_includes_weblayer && !_is_bundle_module) {
-@@ -2569,6 +2575,7 @@ android_library("base_module_java") {
+@@ -2570,6 +2576,7 @@ android_library("base_module_java") {
      "//components/payments/content/android:service_java",
      "//third_party/androidx:androidx_browser_browser_java",
    ]

diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index d189c06a28cf69e7eba7d3b30bab13a4e670e421..fd0b4e66db350fe6c9d6cdc530717392aba88a17 100644
+index 1dbd99cace756e42c9db75b1729e794b13fe22d8..86a8553c5ca2be15ddc5ddbf37522898e811b1d5 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
 @@ -2548,6 +2548,7 @@ static_library("browser") {

diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index bdc5d54f047f9f113453008b8c03e10b60f33479..b113ce3fc60e5b9fb73f49b62b7baae2b4a9c945 100644
+index c9d0dcd8f2839e1451194b3e483e0fa03be9ce81..8f958c6b449b62ca2cd6f0c39417c9aec53f8019 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -7747,6 +7747,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7750,6 +7750,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 fb35e6bfe2da69f6162163e7a018ab8ccf8f00f0..cd2d211ec13405ef868fc610094869bdf6393c8b 100644
+index 90b6b2321831f7b6f42826d161a2b4467bebeef4..754264fa68dbc15de9e070662e0b518542d260eb 100644
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -367,6 +367,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -368,6 +368,7 @@ const base::Feature* const 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 3a5aa8aa5f82aea0bb23cf8dc7e71446437b727b..363283b5ee0f6b9164a823e648613bad06b28ef5 100644
+index 31ba319a276304cfec26ee4b52dfbbc5ae733448..d857bbb5eca17588185aed364e7b7a4f513491c2 100644
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
 @@ -2506,6 +2506,7 @@ void NavigationRequest::OnRequestRedirected(