Update patches from Chromium 123.0.6312.22 to Chromium 124.0.6328.0.

patches/base-BUILD.gn.patch

@@ -1,24 +1,24 @@
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-index a989a351a87650d33342cc8eea9d719bcad31fb6..6a266d17d905c8ac0e14a586c76eafffdf8a2814 100644
+index 7317f2b2023772023e49928f1a808bc60b7ceca4..ce98630e625ed8f5757993d6bb232ca4e7d5e429 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -4550,6 +4550,7 @@ if (is_android) {
+@@ -4553,6 +4553,7 @@ if (is_android) {
        "android/java/src/org/chromium/base/task/ThreadPoolTaskExecutor.java",
        "android/java/src/org/chromium/base/task/UiThreadTaskExecutor.java",
      ]
 +    sources += brave_java_base_sources
 
      if (use_clang_profiling) {
        sources += [
-@@ -4588,6 +4589,7 @@ if (is_android) {
+@@ -4591,6 +4592,7 @@ if (is_android) {
        "android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java",
        "android/java/src/org/chromium/base/shared_preferences/StrictPreferenceKeyChecker.java",
      ]
 +    sources += brave_base_shared_preferences_java_sources
    }
 
    android_library("base_cached_flags_java") {
-@@ -4614,6 +4616,7 @@ if (is_android) {
+@@ -4617,6 +4619,7 @@ if (is_android) {
        "android/java/src/org/chromium/base/cached_flags/ValuesOverridden.java",
        "android/java/src/org/chromium/base/cached_flags/ValuesReturned.java",
      ]

patches/base-threading-thread_restrictions.h.patch

@@ -1,8 +1,8 @@
 diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
-index 0c6f557a44b83a3a40e5dbde8a436272788680bc..2754bbb7037001db3f5bbae10f5c52c8a2399056 100644
+index e9b8366361706dcd5977fe9cdba221026770a3c5..912d0f43e4aff3a81701dd47904d2ed9a44e2663 100644
 --- a/base/threading/thread_restrictions.h
 +++ b/base/threading/thread_restrictions.h
-@@ -727,6 +727,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBaseSyncPrimitives {
+@@ -728,6 +728,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBaseSyncPrimitives {
    ScopedAllowBaseSyncPrimitives& operator=(
        const ScopedAllowBaseSyncPrimitives&) = delete;
 

patches/build-config-BUILDCONFIG.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
-index 894e82b45b8bc675faf94623829606c117671e93..841ee31e933ad02321c151c2784608a91b198663 100644
+index 2694fe998328eeccc86587cc332187062f334065..530087faf46c23164f6ecbf4de25d7b91b7b628c 100644
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
 @@ -329,6 +329,7 @@ is_posix = !is_win && !is_fuchsia

patches/build-config-android-internal_rules.gni.patch

@@ -1,5 +1,5 @@
 diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
-index b1bf874b29ed21dab8263c1e170076974f34c5a6..0862f5a3476cdfc489b090eb50b0edb81a042c76 100644
+index 5f27a3f9a85377d6777d1213348c2747c0f642fa..a29272fe26846252eb250c7ed90acff9bedd671a 100644
 --- a/build/config/android/internal_rules.gni
 +++ b/build/config/android/internal_rules.gni
 @@ -4069,6 +4069,7 @@ if (enable_java_templates) {

patches/build-config-android-rules.gni.patch

@@ -1,5 +1,5 @@
 diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
-index 693c79cca13978fdef4fdbec142aac207f9815ff..cb3e262a918e042694d7a04175741ca90e103355 100644
+index 018c1b2a78abff2d1fe07b727be615e5f22b0526..22236b8c62b07933d25f4f7e962325bb817739bf 100644
 --- a/build/config/android/rules.gni
 +++ b/build/config/android/rules.gni
 @@ -213,6 +213,7 @@ if (enable_java_templates && is_android) {

patches/build-config-compiler-BUILD.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 3c7b4d82d0b4675597b4d67b5ed40f62e229512f..56092de9e91df34cf6406d0fd8f1c1c51742f1b0 100644
+index 1b3c1bd47894971d7f41f29115bae7cbb69dae97..277495fb4298ea2115d42ab280dec17d63f09ff7 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
 @@ -591,7 +591,6 @@ config("compiler") {

patches/chrome-android-BUILD.gn.patch

@@ -1,72 +1,72 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index d3e324f0f6fbbc17088b321edae228e0debce440..86a3fba12e8a723e9a5edd05b6cc34d9126148c1 100644
+index 09f1c67340616f7c686365195e982a8261ca68a7..9ef05261e40cd6550b3b984277baedc0adc41570 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -164,6 +164,7 @@ if (current_toolchain == default_toolchain) {
+@@ -190,6 +190,7 @@ if (current_toolchain == default_toolchain) {
        "java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png",
        "java/res_chromium_base/values/channel_constants.xml",
      ]
 +    sources += brave_base_module_resources
    }
 
    android_resources("chrome_app_java_resources") {
-@@ -241,6 +242,7 @@ if (current_toolchain == default_toolchain) {
+@@ -268,6 +269,7 @@ if (current_toolchain == default_toolchain) {
      } else {
        deps += [ "//components/plus_addresses/android:java_resources" ]
      }
 +    deps += brave_chrome_app_java_resources_deps sources += brave_java_resources resource_overlay = true
    }
 
    android_library("app_hooks_java") {
-@@ -675,6 +677,7 @@ if (current_toolchain == default_toolchain) {
+@@ -709,6 +711,7 @@ if (current_toolchain == default_toolchain) {
      ]
 
      deps += feed_deps
 +    deps += brave_chrome_java_deps
 
      srcjar_deps = [
        ":chrome_android_java_enums_srcjar",
-@@ -693,6 +696,7 @@ if (current_toolchain == default_toolchain) {
+@@ -727,6 +730,7 @@ if (current_toolchain == default_toolchain) {
        "//components/supervised_user/core/browser:supervised_user_utils_enum_javagen",
        "//net:effective_connection_type_java",
      ]
 +    srcjar_deps += brave_chrome_java_srcjar_deps
 
      # From java_sources.gni.
      sources = chrome_java_sources + [ app_hooks_impl ]
-@@ -835,6 +839,7 @@ if (current_toolchain == default_toolchain) {
+@@ -873,6 +877,7 @@ if (current_toolchain == default_toolchain) {
        "//components/messages/android/internal:java",
        "//components/segmentation_platform/internal:internal_java",
      ]
 +    deps += brave_chrome_all_java_deps
    }
 
    action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
-@@ -2151,6 +2156,7 @@ if (current_toolchain == default_toolchain) {
+@@ -2192,6 +2197,7 @@ if (current_toolchain == default_toolchain) {
        "java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png",
        "java/res_chromium_base/values/channel_constants.xml",
      ]
 +    sources += brave_base_module_resources
 
      # Dep needed to ensure override works properly.
      deps = [ ":chrome_base_module_resources" ]
-@@ -2363,6 +2369,7 @@ if (current_toolchain == default_toolchain) {
+@@ -2404,6 +2410,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" ]
        }
-@@ -2626,6 +2633,7 @@ if (current_toolchain == default_toolchain) {
+@@ -2667,6 +2674,7 @@ if (current_toolchain == default_toolchain) {
        "//components/payments/content/android:service_java",
        "//third_party/androidx:androidx_browser_browser_java",
      ]
 +    sources += brave_java_base_module_sources deps += brave_java_base_module_deps
 
      # More deps for DFMs.
      if (dfmify_dev_ui) {
-@@ -3736,6 +3744,7 @@ generate_jni("chrome_jni_headers") {
+@@ -3751,6 +3759,7 @@ generate_jni("chrome_jni_headers") {
      "java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java",
      "java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java",
    ]

patches/chrome-android-chrome_java_sources.gni.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
-index 9bcace05170803781fb1f9b04b5427f8a5d125ce..a359ed839e5b35af2d6c646468ca3880ff7af7e3 100644
+index fa6fa6c4d8b6aaf61c135661b5e8b3f2ce9dbc93..bc3266a36db9e468978bfe30929fbb23d7288acd 100644
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -1233,3 +1233,4 @@ chrome_java_sources = [
+@@ -1235,3 +1235,4 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUSBActivity.java",
    "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java",
  ]

patches/chrome-android-chrome_public_apk_tmpl.gni.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
-index df3d58c8bade42ce87ff75a3ded8ce014fe6d6a9..8b40bff381fe06b4f4e31ac40b5cb5c678ac0883 100644
+index dcaf4832a26fe604181ced6531283938c3cadf40..6fb8e20fe4ec8fa16a5f2f3cc27333288eccef63 100644
 --- a/chrome/android/chrome_public_apk_tmpl.gni
 +++ b/chrome/android/chrome_public_apk_tmpl.gni
 @@ -317,6 +317,7 @@ template("chrome_common_apk_or_module_tmpl") {
@@ -18,7 +18,7 @@ index df3d58c8bade42ce87ff75a3ded8ce014fe6d6a9..8b40bff381fe06b4f4e31ac40b5cb5c6
        if (_is_monochrome) {
          proguard_configs +=
              [ "//android_webview/nonembedded/java/proguard.flags" ]
-@@ -729,6 +731,7 @@ template("chrome_common_apk_or_module_tmpl") {
+@@ -728,6 +730,7 @@ template("chrome_common_apk_or_module_tmpl") {
                                   "version_code",
                                   "version_name",
                                 ])

patches/chrome-android-features-tab_ui-BUILD.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn
-index bb27efb8f31b4dc225c1e22898cbfa7394e3a986..e5e8042f382928d4a10acf544ea5bb2aa949ea3c 100644
+index 4f279ba9ee3a2f4a9a3b917ed984a283a0995b85..2ad3caf264fad8a5da08867075ccdeea127aafea 100644
 --- a/chrome/android/features/tab_ui/BUILD.gn
 +++ b/chrome/android/features/tab_ui/BUILD.gn
 @@ -99,6 +99,7 @@ android_resources("java_resources") {

patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
-index b0e54227e04907f04be5b1beaf271fb70e4d40f4..911bc478609228c28bddfcffb8846b7785ecdfe6 100644
+index 3cad8d266abf42a10e6de1fc42b6d10e202f899f..dd48ad0aea49e1e8ea5f5cef3f87cc7fa78ae41d 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
-@@ -96,7 +96,7 @@ public class NotificationPlatformBridge {
+@@ -97,7 +97,7 @@ public class NotificationPlatformBridge {
      // TODO(crbug.com/1521424): Fine tune this duration, and possibly turn it off for A11Y users.
      private static final long PROVISIONAL_UNSUBSCRIBE_DURATION_MS = 10 * 1000;
 
@@ -11,7 +11,7 @@ index b0e54227e04907f04be5b1beaf271fb70e4d40f4..911bc478609228c28bddfcffb8846b77
 
      private static NotificationManagerProxy sNotificationManagerOverride;
 
-@@ -119,7 +119,7 @@ public class NotificationPlatformBridge {
+@@ -120,7 +120,7 @@ public class NotificationPlatformBridge {
      private TrustedWebActivityClient mTwaClient;
 
      /** Encapsulates attributes that identify a notification and where it originates from. */
@@ -20,7 +20,7 @@ index b0e54227e04907f04be5b1beaf271fb70e4d40f4..911bc478609228c28bddfcffb8846b77
          public final String notificationId;
          public final @NotificationType int notificationType;
          public final String origin;
-@@ -185,7 +185,7 @@ public class NotificationPlatformBridge {
+@@ -186,7 +186,7 @@ public class NotificationPlatformBridge {
          sNotificationManagerOverride = notificationManager;
      }
 
@@ -29,7 +29,7 @@ index b0e54227e04907f04be5b1beaf271fb70e4d40f4..911bc478609228c28bddfcffb8846b77
          mNativeNotificationPlatformBridge = nativeNotificationPlatformBridge;
          Context context = ContextUtils.getApplicationContext();
          if (sNotificationManagerOverride != null) {
-@@ -793,7 +793,7 @@ public class NotificationPlatformBridge {
+@@ -814,7 +814,7 @@ public class NotificationPlatformBridge {
                  .storeNotificationResourcesIfSuspended(notification);
      }
 

patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-index 6d36f86cc96e8c1c6f2bee8b103664ff35b59779..6bc15955db5f3809620e04dff38e3a506724ce62 100644
+index 50d05fbe2556a43c79146685231104c2e897253f..7c489f7f876939328ad3dc88a341be214a3be3c5 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -54,7 +54,7 @@ import org.chromium.ui.text.NoUnderlineClickableSpan;
+@@ -56,7 +56,7 @@ import org.chromium.ui.text.NoUnderlineClickableSpan;
  import org.chromium.ui.text.SpanApplier;
 
  /** Fragment to keep track of the all the privacy related preferences. */
@@ -11,15 +11,15 @@ index 6d36f86cc96e8c1c6f2bee8b103664ff35b59779..6bc15955db5f3809620e04dff38e3a50
          implements Preference.OnPreferenceChangeListener {
      private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
      private static final String PREF_PRELOAD_PAGES = "preload_pages";
-@@ -367,6 +367,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -381,6 +381,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      @Override
      public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
          menu.clear();
 +        super.onCreateOptionsMenu(menu, inflater);
          MenuItem help =
                  menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help);
          help.setIcon(
-@@ -381,6 +382,6 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -395,6 +396,6 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                      .show(getActivity(), getString(R.string.help_context_privacy), null);
              return true;
          }

patches/chrome-browser-BUILD.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index e9c28ab05bd012216864a0de1afcfcad421adb7a..e243c97b1fbed54bd60e1e106ffe93a712cea239 100644
+index 109cfdc1a341f4f576513853b1447327e96e32d6..abcbab8d7f92abb056c464679414f2b374dd7532 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
 @@ -2690,6 +2690,7 @@ static_library("browser") {

patches/chrome-browser-about_flags.cc.patch

@@ -1,16 +1,16 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index 78d050ff0573230afb679fea6c1add799f6dcce4..13d9a21e768211f6b6255a16d6ac7ad8a865f483 100644
+index 00e4c44f92a7d8f9aa6f76076d58abe3847d56ac..16d09483ff75bfaa652a9479627d78caa55bea6f 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -3733,6 +3733,7 @@ const FeatureEntry::Choice kAccountBookmarksAndReadingListBehindOptInChoices[] =
+@@ -3742,6 +3742,7 @@ const FeatureEntry::FeatureVariation
  //
  // When adding a new choice, add it to the end of the list.
  const FeatureEntry kFeatureEntries[] = {
 +    BRAVE_ABOUT_FLAGS_FEATURE_ENTRIES
  // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
  // //tools/flags/generate_unexpire_flags.py.
  #include "build/chromeos_buildflags.h"
-@@ -11206,6 +11207,7 @@ void GetStorage(Profile* profile, GetStorageCallback callback) {
+@@ -11200,6 +11201,7 @@ void GetStorage(Profile* profile, GetStorageCallback callback) {
 
  bool ShouldSkipConditionalFeatureEntry(const flags_ui::FlagsStorage* storage,
                                         const FeatureEntry& entry) {

patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chrome/browser/android/browsing_data/browsing_data_bridge.cc
-index ee7ccfec6299983a8592a6e05eeb0c65b96e6a3d..416a92f2644b3862c9af60c4cc73199c69776bb4 100644
+index d738954e50f971ba7bd22c8147c9d31fb75a8788..5a956713b9efb641b0b46342c4c7c1ac2e487f80 100644
 --- a/chrome/browser/android/browsing_data/browsing_data_bridge.cc
 +++ b/chrome/browser/android/browsing_data/browsing_data_bridge.cc
-@@ -121,6 +121,7 @@ static void JNI_BrowsingDataBridge_ClearBrowsingData(
+@@ -120,6 +120,7 @@ static void JNI_BrowsingDataBridge_ClearBrowsingData(
          remove_mask |= chrome_browsing_data_remover::DATA_TYPE_CONTENT_SETTINGS;
          break;
        case browsing_data::BrowsingDataType::DOWNLOADS:

patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-index 7749b546f8ec9648c02c5b47839f033f53fb7921..8db1a76dee020d1589194c557daf8f30909b9f51 100644
+index 49d264780ffe2eed7610f7b0bd4b580d0941980f..693bbc78de19eb02569035cf3784834b7eb7858c 100644
 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 @@ -1513,6 +1513,7 @@ const char* ChromeBrowsingDataRemoverDelegate::GetHistogramSuffix(

patches/chrome-browser-extensions-BUILD.gn.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
-index 2f5e88a288e6e8fa623a75ccdfaef54914d21e96..08554d0131c9b7e649465f50102ba5b6c015f6fb 100644
+index a8116f27589f93f8bc4d2cf4836c6f9354e73f8a..20e04183ec14c91517852c2729e89d3dc9fde0eb 100644
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
-@@ -1422,6 +1422,7 @@ static_library("extensions") {
+@@ -1423,6 +1423,7 @@ static_library("extensions") {
    } else {
      sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
    }

patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
-index 74c0b1db664c25ab4bacf5d5e4d71f96ed5da460..9db7b2d2666c2d01b3028f964dec5b85af69d688 100644
+index 5ce8e6fee8418134d964a3d3815b33b3c2157751..cd343e16ec23d64e53931045e9fdf9b1ceabf9c2 100644
 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
 +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
-@@ -658,6 +658,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper(
+@@ -657,6 +657,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper(
    info->incognito_access.is_enabled = util::CanBeIncognitoEnabled(&extension);
    info->incognito_access.is_active =
        util::IsIncognitoEnabled(extension.id(), browser_context_);

patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc
-index 44d011b985cd892100ab7f0a5e6ff4db253a0910..441726f81b3608264f996f6b4f0b1cdd4c932fb1 100644
+index bad6ac790ae1f8f0e1d2dfa4bd4ac2412fe43a6a..08464dc380a447ca136348708cfa6c002324f80f 100644
 --- a/chrome/browser/external_protocol/external_protocol_handler.cc
 +++ b/chrome/browser/external_protocol/external_protocol_handler.cc
-@@ -349,7 +349,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState(
+@@ -362,7 +362,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState(
    if (scheme == "mailto") {
      base::UmaHistogramEnumeration(kBlockStateMetric,
                                    BlockStateMetric::kAllowedDefaultMail);

patches/chrome-browser-importer-external_process_importer_host.h.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/importer/external_process_importer_host.h b/chrome/browser/importer/external_process_importer_host.h
-index a55ef6ae01873eff0d83d7ea82bfd506ca31566b..c22ff75ec50a6a030b175385b309b12dc7ae9c0c 100644
+index 7a543722cef41a13529638b59cfa09ffd25731c6..4577f6d13351b469f458d0a43187e73ea2870c71 100644
 --- a/chrome/browser/importer/external_process_importer_host.h
 +++ b/chrome/browser/importer/external_process_importer_host.h
-@@ -75,6 +75,7 @@ class ExternalProcessImporterHost
+@@ -80,6 +80,7 @@ class ExternalProcessImporterHost
    void NotifyImportItemEnded(importer::ImportItem item);
    void NotifyImportEnded();