From 99ecdcc8390f93c23c8a3b51b844086334634c61 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Wed, 6 Apr 2022 17:10:44 -0400
Subject: [PATCH] Updated patches from Chromium 101.0.4951.15 to Chromium
 101.0.4951.26.

---
 patches/base-BUILD.gn.patch                                 | 4 ++--
 patches/chrome-android-java-AndroidManifest.xml.patch       | 6 +++---
 patches/chrome-browser-BUILD.gn.patch                       | 4 ++--
 patches/chrome-browser-about_flags.cc.patch                 | 4 ++--
 .../chrome-browser-chrome_content_browser_client.h.patch    | 4 ++--
 ...hrome-browser-flags-android-chrome_feature_list.cc.patch | 4 ++--
 patches/chrome-browser-resources-settings-BUILD.gn.patch    | 6 +++---
 patches/chrome-browser-ui-BUILD.gn.patch                    | 6 +++---
 patches/chrome-browser-ui-chrome_pages.cc.patch             | 2 +-
 patches/chrome-test-BUILD.gn.patch                          | 4 ++--
 ...settings-browser-page_specific_content_settings.cc.patch | 6 +++---
 patches/components-page_info-page_info.cc.patch             | 2 +-
 .../content-public-browser-content_browser_client.h.patch   | 4 ++--
 patches/net-cookies-canonical_cookie.cc.patch               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch
index e8946908e2d..34782befc78 100644
--- a/patches/base-BUILD.gn.patch
+++ b/patches/base-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-index 29f74fb8bedaad04d3dad645c4414c40a0ff65c2..2fe473cf7e90aef669fb41f9ca7232bd450e99a2 100644
+index 6e93d84600ea6f7d37631c6a004a82933d5fa440..39ecdc15cd5193f824f1ba8d1854d79256af4d38 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -4255,6 +4255,7 @@ if (is_android) {
+@@ -4253,6 +4253,7 @@ if (is_android) {
        "android/java/src/org/chromium/base/task/TaskTraits.java",
        "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
      ]
diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch
index 377f7be8e2c..f57322c8a6d 100644
--- a/patches/chrome-android-java-AndroidManifest.xml.patch
+++ b/patches/chrome-android-java-AndroidManifest.xml.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
-index 87bb188811cd6e004d931ea1478301be7495beaa..bd2790cd3a7473ba3b959a6a6aca91eaaead4edc 100644
+index e3309fd939849f07a11a6ea427fe56a7be88dbc3..61ff6e4420d3d128798b40b6a254a5fc081137b8 100644
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
 @@ -59,18 +59,26 @@ by a child template that "extends" this file.
@@ -71,7 +71,7 @@ index 87bb188811cd6e004d931ea1478301be7495beaa..bd2790cd3a7473ba3b959a6a6aca91ea
              <meta-data android:name="android.app.searchable"
                  android:resource="@xml/searchable" />
          </activity-alias>
-@@ -1222,6 +1236,7 @@ by a child template that "extends" this file.
+@@ -1233,6 +1247,7 @@ by a child template that "extends" this file.
              android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
          </activity>
  
@@ -79,7 +79,7 @@ index 87bb188811cd6e004d931ea1478301be7495beaa..bd2790cd3a7473ba3b959a6a6aca91ea
          {% block extra_application_definitions %}
          {% endblock %}
        {% endmacro %}
-@@ -1300,6 +1315,7 @@ by a child template that "extends" this file.
+@@ -1311,6 +1326,7 @@ by a child template that "extends" this file.
        <!-- ARCore APK integration -->
        <!-- This tag indicates that this application optionally uses ARCore. -->
        <meta-data android:name="com.google.ar.core" android:value="optional" />
diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch
index c4d5ebc661c..7c5a202561d 100644
--- a/patches/chrome-browser-BUILD.gn.patch
+++ b/patches/chrome-browser-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 9f43f67ddb16b1bd0b9435b4741a73d5a37df4bb..764ba1f5a1d2fdb1968816c6ec1c233bdb697ecd 100644
+index 3e75521cfba3854cc6a317b933745ba1a9e3f7b2..4c3e1a680b8a915531a4ef07e9ece189eaa27056 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2572,6 +2572,7 @@ static_library("browser") {
+@@ -2575,6 +2575,7 @@ static_library("browser") {
        "performance_monitor/metric_evaluator_helper_posix.h",
      ]
    }
diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch
index 4349e40aecb..6354fad3f1a 100644
--- 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 0b2a0ccb532a85e9aa7cedd141c3b546a35b8b8d..7ee4bffd17ca10a0f9c1101b7b9022c574cfa8b9 100644
+index ad19de513c785ed3cdc9f9c74b1dd8bc21bdc349..e3406532fa028d17f1d7e8e170b678090fd48c73 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -2976,6 +2976,7 @@ constexpr FeatureEntry::FeatureVariation kLensStandaloneVariations[] = {
+@@ -2968,6 +2968,7 @@ constexpr FeatureEntry::FeatureVariation kLensStandaloneVariations[] = {
  //
  // When adding a new choice, add it to the end of the list.
  const FeatureEntry kFeatureEntries[] = {
diff --git a/patches/chrome-browser-chrome_content_browser_client.h.patch b/patches/chrome-browser-chrome_content_browser_client.h.patch
index 0d8e3ccaad2..928528cf9a0 100644
--- a/patches/chrome-browser-chrome_content_browser_client.h.patch
+++ b/patches/chrome-browser-chrome_content_browser_client.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
-index 4aa99834bd6c70494c9b086591e016ed1276c431..5b7a3b5fa6d959a7a0fa0340939ed65abd1e92d9 100644
+index e87e967efce09de9377f337f4b91f020a3a8ccde..13df993177e99f5889868ca256289190e278592d 100644
 --- a/chrome/browser/chrome_content_browser_client.h
 +++ b/chrome/browser/chrome_content_browser_client.h
-@@ -805,6 +805,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
+@@ -809,6 +809,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
    }
  
   private:
diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
index dde9deecf56..e3b9bee4730 100644
--- 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 c4f893f11c6ce261a7ecce250ba3edeae2c17cb2..5b5781aad6467ecce4c2fddf2bd42d8fb0671db8 100644
+index 4ede5ccfd1d906fe44c5a2e701094a80afd10bc1..9eccf954a2ab8724bd362fd22c65b08ba70f40f9 100644
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -381,6 +381,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -382,6 +382,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
  };
  
  const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {
diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch
index 26c4b720746..c0826fd6ec2 100644
--- a/patches/chrome-browser-resources-settings-BUILD.gn.patch
+++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
-index c7fb0edd5202914565c858af07049acecb14b24f..4971f0aaa4855d2d60c4a3a7a63f0333942a8129 100644
+index ee0e4fc2a52177af5e573871527a5dd1af02232b..3579c440065362917cc75e79c1fa44de9da9181d 100644
 --- a/chrome/browser/resources/settings/BUILD.gn
 +++ b/chrome/browser/resources/settings/BUILD.gn
-@@ -118,6 +118,7 @@ generate_grd("build_grd") {
+@@ -120,6 +120,7 @@ generate_grd("build_grd") {
      deps = [ ":build_ts" ]
      manifest_files = [ "$target_gen_dir/tsconfig.manifest" ]
    }
@@ -10,7 +10,7 @@ index c7fb0edd5202914565c858af07049acecb14b24f..4971f0aaa4855d2d60c4a3a7a63f0333
  }
  
  preprocess_if_expr("preprocess") {
-@@ -276,4 +277,6 @@ ts_library("build_ts") {
+@@ -278,4 +279,6 @@ ts_library("build_ts") {
      ":preprocess",
      ":preprocess_generated",
    ]
diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch
index 50a63bdd3a9..13378d1c176 100644
--- a/patches/chrome-browser-ui-BUILD.gn.patch
+++ b/patches/chrome-browser-ui-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
-index 8b45cdafec81dd51d3c8416f091c5e87449bba57..58f12d915b03f5acb5fc57e953a3d6e490402115 100644
+index 3078935563b84e06fc60a84bd2bb2028609f759b..223e3bc269f29ab4294480b56555641c49bed180 100644
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -650,6 +650,7 @@ static_library("ui") {
+@@ -651,6 +651,7 @@ static_library("ui") {
      "//ui/webui/resources/cr_components/most_visited:mojom",
      "//v8:v8_version",
    ]
@@ -10,7 +10,7 @@ index 8b45cdafec81dd51d3c8416f091c5e87449bba57..58f12d915b03f5acb5fc57e953a3d6e4
  
    # TODO(crbug/925153): Remove this circular dependency.
    allow_circular_includes_from = [
-@@ -3799,10 +3800,13 @@ static_library("ui") {
+@@ -3800,10 +3801,13 @@ static_library("ui") {
        ]
        deps += [ "//google_update" ]
      } else {
diff --git a/patches/chrome-browser-ui-chrome_pages.cc.patch b/patches/chrome-browser-ui-chrome_pages.cc.patch
index b0dfeef757a..c67f5b06a78 100644
--- a/patches/chrome-browser-ui-chrome_pages.cc.patch
+++ b/patches/chrome-browser-ui-chrome_pages.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
-index caaa6b8b661097d4399545c880ae193b3cd8121e..1659f8f1354481598ee805b968cf0e2683fc5bde 100644
+index 6cc8b8d4cf8321ad51eb0dfef549f3cdf328e0a7..9487f166076f86bae41a04396d8f2102dbde8857 100644
 --- a/chrome/browser/ui/chrome_pages.cc
 +++ b/chrome/browser/ui/chrome_pages.cc
 @@ -318,7 +318,7 @@ void ShowSlow(Browser* browser) {
diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch
index 778583d6ef5..026a48418bb 100644
--- a/patches/chrome-test-BUILD.gn.patch
+++ b/patches/chrome-test-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 3883b62bf65713a10304eda2fc3fe0bb3260f4ab..1430cdf3e5cb5ee99aa38e352f18a35504a8e061 100644
+index 58e1d25e93b7694df8a7c247d63b3215dc143f86..15d2657de0d1ddf1e2ae42d096c30d1a02fedfe8 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -303,6 +303,7 @@ static_library("test_support") {
+@@ -305,6 +305,7 @@ static_library("test_support") {
      "//ui/gl",
    ]
  
diff --git a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch
index 48b6226effd..d5530c3075e 100644
--- a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch
+++ b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/content_settings/browser/page_specific_content_settings.cc b/components/content_settings/browser/page_specific_content_settings.cc
-index 6802b524defd8686ed76a0bc5ffaad77fd84400f..4fa8922c5df3e1fb3a6a9e8126b238736e8058da 100644
+index e5258283ea56f091dce4d53a843fd44aca8e34ad..42ab86a2fecf8cf2106d056bf5451646fccdc2ce 100644
 --- a/components/content_settings/browser/page_specific_content_settings.cc
 +++ b/components/content_settings/browser/page_specific_content_settings.cc
-@@ -411,6 +411,7 @@ bool PageSpecificContentSettings::IsContentBlocked(
+@@ -423,6 +423,7 @@ bool PageSpecificContentSettings::IsContentBlocked(
        content_type == ContentSettingsType::ADS ||
        content_type == ContentSettingsType::SOUND ||
        content_type == ContentSettingsType::CLIPBOARD_READ_WRITE ||
@@ -10,7 +10,7 @@ index 6802b524defd8686ed76a0bc5ffaad77fd84400f..4fa8922c5df3e1fb3a6a9e8126b23873
        content_type == ContentSettingsType::SENSORS ||
        content_type == ContentSettingsType::GEOLOCATION) {
      const auto& it = content_settings_status_.find(content_type);
-@@ -434,6 +435,7 @@ bool PageSpecificContentSettings::IsContentAllowed(
+@@ -446,6 +447,7 @@ bool PageSpecificContentSettings::IsContentAllowed(
        content_type != ContentSettingsType::PPAPI_BROKER &&
        content_type != ContentSettingsType::MIDI_SYSEX &&
        content_type != ContentSettingsType::CLIPBOARD_READ_WRITE &&
diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch
index d236f39b7e3..53111d80d0d 100644
--- a/patches/components-page_info-page_info.cc.patch
+++ b/patches/components-page_info-page_info.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
-index 02fe3bd9aaaa84a57aa4f9a3cac840d0ebe54b0b..62fea1fd2ecf4bc001d8e047a4508250949afe59 100644
+index 9d867b80283ce17d73097845479af79c29bbc32b..6cca34a4a432d7bb35ff44c7da2792f27a5233c8 100644
 --- a/components/page_info/page_info.cc
 +++ b/components/page_info/page_info.cc
 @@ -995,6 +995,7 @@ void PageInfo::PresentSitePermissions() {
diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch
index 6b833ff1dad..2a5ce7c3d6a 100644
--- a/patches/content-public-browser-content_browser_client.h.patch
+++ b/patches/content-public-browser-content_browser_client.h.patch
@@ -1,8 +1,8 @@
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 5c757ff4b622d93426b58cbc3afce54f540de482..9dd32b75be9978a51b8ad0d0a7b157ce3d3fd215 100644
+index de15701d1e8f31ad0d65424187f664146553bef7..e35b746b29985a62267efaf4c9cef5eab96c3c40 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -1975,6 +1975,7 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1976,6 +1976,7 @@ class CONTENT_EXPORT ContentBrowserClient {
    virtual ui::AXMode GetAXModeForBrowserContext(
        BrowserContext* browser_context);
  
diff --git a/patches/net-cookies-canonical_cookie.cc.patch b/patches/net-cookies-canonical_cookie.cc.patch
index 2bf0d6fcd18..ca6e2cd74f5 100644
--- a/patches/net-cookies-canonical_cookie.cc.patch
+++ b/patches/net-cookies-canonical_cookie.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc
-index 5a44d467808859a3f836a20747039193572d8348..d6ccae3b544956c70f74ed5ebca5735b5e9e3d80 100644
+index 0621c193e7d9f7821c1b86398e32c8da4f6d3b97..9626fbc07aecf56365992b767a0275bdc88c6f1d 100644
 --- a/net/cookies/canonical_cookie.cc
 +++ b/net/cookies/canonical_cookie.cc
-@@ -557,6 +557,7 @@ std::unique_ptr<CanonicalCookie> CanonicalCookie::Create(
+@@ -569,6 +569,7 @@ std::unique_ptr<CanonicalCookie> CanonicalCookie::Create(
    // Get the port, this will get a default value if a port isn't provided.
    int source_port = url.EffectiveIntPort();