Merge pull request #10418 from brave/94.0.4606.81_1.31.x_124-1.30.x

Upgrade patches from Chromium 94.0.4606.71 to Chromium 94.0.4606.81 (1.30.x).
brave · Oct 8, 2021 · db3def7 · db3def7
2 parents b05aa27 + 7323ab1
commit db3def7
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 32 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 6de619ddbd5353393892d4e4688481b451cff819..3cff1a924404ad82a9cab449c284694117fa4b6e 100644
+index c655f0a68928a93aee3d5b79aa67db130cd943e3..85b6ec4053e32008d9bcaf2332169a8405c0dcb1 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=94
 -MINOR=0
 -BUILD=4606
--PATCH=71
+-PATCH=81
 +MINOR=1
 +BUILD=30
 +PATCH=88
diff --git a/...-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/...-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
-index 2f256b5c415d929755b2572f68ca5c6a6802f014..50133e4346799f7cc240440ff3be696fe5344443 100644
+index b6fd4598ddb07d22ad9b91922f5166022c7cec61..3140d262be5b07e43237925b7005d36e225de326 100644
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
 @@ -408,6 +408,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC

diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 0fcf061bf93b4b11603ef944cf8dd4d456cf5f45..4e3251cdf1c6b9a830230a4538cc3b2838740314 100644
+index 1004666505dc8c127bb2405571eba9ab60277e3f..69f5c2bf3b49d21cdb6b73e31e76dce8c848fc18 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
 @@ -1307,6 +1307,7 @@ if (!is_android && !is_fuchsia) {

diff --git a/patches/components-sync-driver-BUILD.gn.patch b/patches/components-sync-driver-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/components/sync/driver/BUILD.gn b/components/sync/driver/BUILD.gn
-index b2828a0321267bba655d7872c04df3b8d07ead87..b64672032bf99b9aeded76c12ff9b3dc355a1048 100644
+index b2828a0321267bba655d7872c04df3b8d07ead87..424610060c147892294d35623d4345e2d19d63fe 100644
 --- a/components/sync/driver/BUILD.gn
 +++ b/components/sync/driver/BUILD.gn
 @@ -110,6 +110,7 @@ static_library("driver") {

diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch
@@ -1,16 +1,16 @@
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
-index 8d0575e107ad397a43031f99780938948e389609..f566653aa55b49ccd20487127241a82457591813 100644
+index bd052c19a233f4633d59492b236de78bcaaf6317..daa1797109b17476b4cd66d19aaf145198a71199 100644
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -2405,6 +2405,7 @@ void NavigationRequest::OnRequestRedirected(
+@@ -2410,6 +2410,7 @@ void NavigationRequest::OnRequestRedirected(
    common_params_->url = redirect_info.new_url;
    common_params_->method = redirect_info.new_method;
    common_params_->referrer->url = GURL(redirect_info.new_referrer);
 +  BRAVE_ONREQUESTREDIRECTED_MAYBEHIDEREFERRER
    common_params_->referrer = Referrer::SanitizeForRequest(
        common_params_->url, *common_params_->referrer);
 
-@@ -3636,6 +3637,7 @@ void NavigationRequest::OnStartChecksComplete(
+@@ -3640,6 +3641,7 @@ void NavigationRequest::OnStartChecksComplete(
    headers.MergeFrom(TakeModifiedRequestHeaders());
    begin_params_->headers = headers.ToString();
 

diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index c2b1d0d10b5222342761dc03cc3c734fd610814a..26f405508f71f392150e63336fdd3d69272b31e3 100644
+index c28f517cc5623887009f894a8792156980d11138..2e405e3c45cb131e8e6d6f77372c0f92e963c3cc 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -944,6 +944,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) {
+@@ -955,6 +955,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) {
  }
 
  void RenderThreadImpl::RegisterSchemes() {

diff --git a/patches/v8/src-wasm-module-compiler.cc.patch b/patches/v8/src-wasm-module-compiler.cc.patch