From 00dc4f8f3291825971095da0e8fc7e76fcfde87b Mon Sep 17 00:00:00 2001
From: Brian Clifton <brian@clifton.me>
Date: Tue, 2 Feb 2021 17:08:45 -0700
Subject: [PATCH] Merge pull request #7790 from brave/88.0.4324.146

Updated patches from Chromium 88.0.4324.96 to Chromium 88.0.4324.146.
---
 patches/chrome-VERSION.patch                         |  4 ++--
 ...um-chrome-browser-ChromeTabbedActivity.java.patch | 12 ++++++------
 ...um-chrome-browser-ui-RootUiCoordinator.java.patch |  4 ++--
 patches/chrome-browser-BUILD.gn.patch                |  2 +-
 .../chrome-browser-ui-tabs-tab_strip_model.h.patch   |  2 +-
 patches/chrome-installer-mac-signing-model.py.patch  |  4 ++--
 .../chrome-installer-mac-signing-pipeline.py.patch   |  4 ++--
 patches/chrome-test-BUILD.gn.patch                   |  2 +-
 ...omponents-os_crypt-keychain_password_mac.mm.patch |  2 +-
 ...browser-renderer_host-navigation_request.cc.patch |  4 ++--
 patches/google_apis-google_api_keys.cc.patch         |  4 ++--
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
index 59cd12373b71..4c6fbcaa8095 100644
--- a/patches/chrome-VERSION.patch
+++ b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index a2037909b21fdd237e604d4fe44fe4009c95f867..7eaf0c671bd0c5c43c947ecec7caf01b444e566a 100644
+index 1facb380c04a365306104f6ccc1ab4a38bbd8902..84391cc0c53f9dcbae3cb3afd5053c32aa02c8a7 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=88
 -MINOR=0
 -BUILD=4324
--PATCH=96
+-PATCH=146
 +MINOR=1
 +BUILD=19
 +PATCH=89
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
index 3950b25d89e8..eb581f1691e6 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-index 3bf1d5382bccefc88c42ec47730a606974e17e8f..9559894ceae64141ab11c4c10a5744196a4ca28a 100644
+index 32cd5d13e98d0e1e72b3606cb61820aea0eaa362..af4f1fd61e792a8cbc85e507db872517c8099dbc 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -186,7 +186,7 @@ import java.util.Locale;
+@@ -187,7 +187,7 @@ import java.util.Locale;
   * This is the main activity for ChromeMobile when not running in document mode.  All the tabs
   * are accessible via a chrome specific tab switching UI.
   */
@@ -11,7 +11,7 @@ index 3bf1d5382bccefc88c42ec47730a606974e17e8f..9559894ceae64141ab11c4c10a574419
          implements ChromeAccessibilityUtil.Observer {
      private static final String TAG = "ChromeTabbedActivity";
  
-@@ -1477,7 +1477,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1478,7 +1478,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
  
      @Override
      protected RootUiCoordinator createRootUiCoordinator() {
@@ -20,7 +20,7 @@ index 3bf1d5382bccefc88c42ec47730a606974e17e8f..9559894ceae64141ab11c4c10a574419
                  mIntentMetadataOneshotSupplier, getShareDelegateSupplier(),
                  getActivityTabProvider(), mEphemeralTabCoordinatorSupplier,
                  mTabModelProfileSupplier, mBookmarkBridgeSupplier,
-@@ -1645,7 +1645,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1646,7 +1646,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
  
      @Override
      public AppMenuPropertiesDelegate createAppMenuPropertiesDelegate() {
@@ -29,7 +29,7 @@ index 3bf1d5382bccefc88c42ec47730a606974e17e8f..9559894ceae64141ab11c4c10a574419
                  getMultiWindowModeStateDispatcher(), getTabModelSelector(), getToolbarManager(),
                  getWindow().getDecorView(), this, mOverviewModeBehaviorSupplier,
                  mBookmarkBridgeSupplier, getModalDialogManager());
-@@ -1675,10 +1675,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1676,10 +1676,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
                  }
              };
          }
@@ -42,7 +42,7 @@ index 3bf1d5382bccefc88c42ec47730a606974e17e8f..9559894ceae64141ab11c4c10a574419
                          tabDelegateFactorySupplier, true, overviewNTPCreator,
                          AsyncTabParamsManagerSingleton.getInstance()));
      }
-@@ -2079,7 +2079,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2095,7 +2095,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          }
      }
  
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ui-RootUiCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ui-RootUiCoordinator.java.patch
index 4e5e9fe46932..c22305091743 100644
--- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ui-RootUiCoordinator.java.patch
+++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ui-RootUiCoordinator.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-index 8192354c80011a233a89e23f1d57e46101e4e96e..8d64bdada66b01408767d35c4eb4786c573fe8d4 100644
+index 8668edb074785dc8d10bc9a60aeec5d8c0341306..90f31cd0b7ee8f9a9711e7197133f95c3aec4e4c 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-@@ -612,7 +612,7 @@ public class RootUiCoordinator
+@@ -610,7 +610,7 @@ public class RootUiCoordinator
                              mActivity.getModalDialogManager(), voiceSearchDelegate);
              mButtonDataProviders = Arrays.asList(
                      mIdentityDiscController, shareButtonController, voiceToolbarButtonController);
diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch
index 54cda0b0a07a..22769469915c 100644
--- 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 2ce41b55b4052bf79ffffa270bf3e7830edec9e8..b5c4f565b05541c780dc6c97d4ed55a6d987808c 100644
+index 2ae270b5a60f5ec40fd54a29505c2a262a12d3e6..b4e90d31e045b849a196bd662700b2c22231c3ea 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
 @@ -2432,6 +2432,7 @@ static_library("browser") {
diff --git a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch
index 65ef110bf205..b4204f70879d 100644
--- a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch
+++ b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h
-index 70e8a233c4b80d7f6c16e2a7828b90a6c6145528..c213bb8030896d8d7cb80d0ba63694d2fb7628c9 100644
+index 6a03d63486a63d08dc6790b1179326a111f1c1cd..98b13e4ab537df7685f96520d7b9de855f3b610a 100644
 --- a/chrome/browser/ui/tabs/tab_strip_model.h
 +++ b/chrome/browser/ui/tabs/tab_strip_model.h
 @@ -579,6 +579,7 @@ class TabStripModel : public TabGroupController {
diff --git a/patches/chrome-installer-mac-signing-model.py.patch b/patches/chrome-installer-mac-signing-model.py.patch
index 5ed75d551a24..e10858b87f86 100644
--- a/patches/chrome-installer-mac-signing-model.py.patch
+++ b/patches/chrome-installer-mac-signing-model.py.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/installer/mac/signing/model.py b/chrome/installer/mac/signing/model.py
-index 490df480e9ef6988f7bdeffe57436ab76eb1de21..3a28d911f9af61f48a806c7987ccf8ce5b38819a 100644
+index a5d3c40ca91d0d779e38baf278d51b9b38df09e0..99846c7b7f7ddb8a3d0b7fb68595c3cf8374f97f 100644
 --- a/chrome/installer/mac/signing/model.py
 +++ b/chrome/installer/mac/signing/model.py
-@@ -335,7 +335,7 @@ class Paths(object):
+@@ -342,7 +342,7 @@ class Paths(object):
          Returns:
              Path to the packaging directory.
          """
diff --git a/patches/chrome-installer-mac-signing-pipeline.py.patch b/patches/chrome-installer-mac-signing-pipeline.py.patch
index 28efab69d985..4dbda9cc7448 100644
--- a/patches/chrome-installer-mac-signing-pipeline.py.patch
+++ b/patches/chrome-installer-mac-signing-pipeline.py.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/installer/mac/signing/pipeline.py b/chrome/installer/mac/signing/pipeline.py
-index c5a005ab6122a83f5e45e7c0c5e1825851db2255..04a93775a990d9b7b26ca6922e15b42fc63b8466 100644
+index 1aa7a576329e6785d21505f94a943f2f636deec8..252915059abf94572ad8526fecff08f09ba5416e 100644
 --- a/chrome/installer/mac/signing/pipeline.py
 +++ b/chrome/installer/mac/signing/pipeline.py
-@@ -628,5 +628,8 @@ def sign_all(orig_paths,
+@@ -665,5 +665,8 @@ def sign_all(orig_paths,
                          uuids_to_package_path.keys(), config):
                      package_path = uuids_to_package_path[result]
                      notarize.staple(package_path)
diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch
index 91a184e56f53..5163feeebf5b 100644
--- 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 4579f62b5796a5d6ce1ffa50cf3082c13f906fe0..f294bc5d26685ebbead1217bf07ad1ee4c392002 100644
+index 0096bead803507ffb0856548bae26431daf24d9d..d064fdfc39745dbb8aa2ac6e45d9f38778b4884c 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
 @@ -868,6 +868,7 @@ if (!is_android) {
diff --git a/patches/components-os_crypt-keychain_password_mac.mm.patch b/patches/components-os_crypt-keychain_password_mac.mm.patch
index 4d3954fbf06d..9b4921f800ae 100644
--- a/patches/components-os_crypt-keychain_password_mac.mm.patch
+++ b/patches/components-os_crypt-keychain_password_mac.mm.patch
@@ -1,5 +1,5 @@
 diff --git a/components/os_crypt/keychain_password_mac.mm b/components/os_crypt/keychain_password_mac.mm
-index 3b8543488d0bb0ae7c0996db70f9527bc5e34cd8..ff8ecf90e685823c27657cc75b59bdb8a1ea4146 100644
+index 6654c46eb0af784a3a2ff64569d5d1931b9fae30..9640ca797a416a4bd73c1e774b6fb6c8e6e320b5 100644
 --- a/components/os_crypt/keychain_password_mac.mm
 +++ b/components/os_crypt/keychain_password_mac.mm
 @@ -7,6 +7,7 @@
diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch
index 165f00fd1398..f97e484c0420 100644
--- 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 c97f3d40a599822f37be0bc92f5f77ef50439b4a..7fc7f27d2265146cc0fff0ffe9a48220a3763547 100644
+index b469e327a1dc6c3183d7487a54e7fd8cce0035e5..5d9d879b9df707612cf5b5d6363206caaba41f36 100644
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
 @@ -1887,6 +1887,7 @@ void NavigationRequest::OnRequestRedirected(
@@ -10,7 +10,7 @@ index c97f3d40a599822f37be0bc92f5f77ef50439b4a..7fc7f27d2265146cc0fff0ffe9a48220
    common_params_->referrer = Referrer::SanitizeForRequest(
        common_params_->url, *common_params_->referrer);
  
-@@ -2864,6 +2865,7 @@ void NavigationRequest::OnStartChecksComplete(
+@@ -2870,6 +2871,7 @@ void NavigationRequest::OnStartChecksComplete(
    headers.MergeFrom(TakeModifiedRequestHeaders());
    begin_params_->headers = headers.ToString();
  
diff --git a/patches/google_apis-google_api_keys.cc.patch b/patches/google_apis-google_api_keys.cc.patch
index cf1984dbbe0f..cbdc0df306ca 100644
--- a/patches/google_apis-google_api_keys.cc.patch
+++ b/patches/google_apis-google_api_keys.cc.patch
@@ -1,9 +1,9 @@
 diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc
-index 917edc5590d8a29737f40c88d194e374de633344..9b7a7b829e789106cab4b043bf0f547d0bbca2f2 100644
+index 41ee2db055d3126ed798b127288bfc05d90caf4a..d221f4e160bad9b75565affa4915eb6e45dd0a3d 100644
 --- a/google_apis/google_api_keys.cc
 +++ b/google_apis/google_api_keys.cc
 @@ -220,6 +220,7 @@ class APIKeyCache {
- #if defined(OS_IOS)
+ #if defined(OS_IOS) || defined(OS_FUCHSIA)
    void set_api_key(const std::string& api_key) { api_key_ = api_key; }
  #endif
 +  void set_api_key_for_testing(const std::string& api_key) { api_key_ = api_key; }