Revert "update ugc to 102.0.5005.61-3"

This reverts commit 2be1931967e4073a55d7ac3e3ecdff7c825a63f4.

1 files changed, 1044 insertions, 1199 deletions

diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/www/chromium-uc/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
index d6d7e41..0527dde 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
@@ -2,17 +2,17 @@
 # TODO: This patch should probably be split up and merged into
 # disable-signin.patch and fix-building-without-safebrowsing.patch
 
---- a/android_webview/browser/aw_browser_context.cc
-+++ b/android_webview/browser/aw_browser_context.cc
-@@ -48,7 +48,6 @@
+--- android_webview/browser/aw_browser_context.cc.orig
++++ android_webview/browser/aw_browser_context.cc
+@@ -49,7 +49,6 @@
  #include "components/prefs/pref_service_factory.h"
  #include "components/prefs/segregated_pref_store.h"
  #include "components/profile_metrics/browser_profile_type.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
  #include "components/url_formatter/url_fixer.h"
  #include "components/user_prefs/user_prefs.h"
- #include "components/variations/variations_client.h"
-@@ -519,8 +518,6 @@ void AwBrowserContext::RebuildTable(
+ #include "components/visitedlink/browser/visitedlink_writer.h"
+@@ -470,8 +469,6 @@ void AwBrowserContext::RebuildTable(
  }
  
  void AwBrowserContext::SetExtendedReportingAllowed(bool allowed) {
@@ -21,9 +21,9 @@
  }
  
  // TODO(amalova): Make sure NetworkContextParams is configured correctly when
---- a/chrome/app/settings_strings.grdp
-+++ b/chrome/app/settings_strings.grdp
-@@ -1842,69 +1842,9 @@
+--- chrome/app/settings_strings.grdp.orig
++++ chrome/app/settings_strings.grdp
+@@ -1591,78 +1591,9 @@
    <message name="IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_DESC_COOKIES_PAGE" desc="On the cookies page, the secondary text next to the checkbox that enables prediction of network actions.">
      Preloads pages that Chrome thinks you might visit. To do this, Chrome may use cookies, if you allow cookies, and may encrypt and send pages through Google to hide your identity from sites.
    </message>
@@ -33,6 +33,9 @@
 -  <message name="IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION_DESC" desc="Checkbox label: should Chrome protect user and user's device from dangerous sites">
 -    Sends URLs of some pages you visit to Google, when your security is at risk
 -  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING" desc="The section title of the extended safe browsing checkbox to help improve safe browsing">
+-    Help improve Chrome security
+-  </message>
 -  <message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC" desc="Description for extended safe browsing">
 -    Sends URLs of some pages you visit, limited system information, and some page content to Google, to help discover new threats and protect everyone on the web.
 -  </message>
@@ -51,6 +54,9 @@
 -  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_ONE" desc="First bullet point under the safe browsing enhanced protection mode">
 -    Predicts and warns you about dangerous events before they happen
 -  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_TWO" desc="Second bullet point under the safe browsing enhanced protection mode">
+-    Keeps you safe on Chrome and may be used to improve your security in other Google apps when you are signed in
+-  </message>
 -  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_THREE" desc="Third bullet point under the safe browsing enhanced protection mode">
 -    Improves security for you and everyone on the web
 -  </message>
@@ -64,7 +70,7 @@
 -    Standard protection
 -  </message>
 -  <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_DESC" desc="Description for safe browsing standard protection mode">
--    Standard protection against websites, downloads, and extensions that are known to be dangerous
+-    Standard protection against websites, downloads, and extensions that are known to be dangerous.
 -  </message>
 -  <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_EXPAND_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the detailed description of safe browsing standard protection. Only visible by screen reader software.">
 -    Show standard protection details
@@ -72,6 +78,9 @@
 -  <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_ONE" desc="First bullet point under the safe browsing standard protection mode">
 -    Detects and warns you about dangerous events when they happen
 -  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_TWO" desc="First bullet point under the safe browsing standard protection mode">
+-    Checks URLs with a list of unsafe sites stored in Chrome. If a site tries to steal your password, or when you download a harmful file, Chrome may also send URLs, including bits of page content, to Safe Browsing.
+-  </message>
 -  <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_HELP_IMPROVE" desc="The name of the toggle to enable reporting to help improve safe browsing">
 -    Help improve security on the web for everyone
 -  </message>
@@ -93,9 +102,9 @@
    <message name="IDS_SETTINGS_ENABLE_DO_NOT_TRACK" desc="The label of the checkbox to enable/disable sending the 'Do Not track' header">
      Send a "Do Not Track" request with your browsing traffic
    </message>
---- a/chrome/browser/android/signin/signin_manager_android.cc
-+++ b/chrome/browser/android/signin/signin_manager_android.cc
-@@ -15,7 +15,6 @@
+--- chrome/browser/android/signin/signin_manager_android.cc.orig
++++ chrome/browser/android/signin/signin_manager_android.cc
+@@ -14,7 +14,6 @@
  #include "chrome/android/chrome_jni_headers/SigninManagerImpl_jni.h"
  #include "chrome/common/pref_names.h"
  #include "components/prefs/pref_service.h"
@@ -103,7 +112,7 @@
  #include "google_apis/gaia/gaia_auth_util.h"
  
  #include "base/android/callback_android.h"
-@@ -31,7 +30,6 @@
+@@ -30,7 +29,6 @@
  #include "components/policy/core/browser/browser_policy_connector.h"
  #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
  #include "components/prefs/pref_service.h"
@@ -111,7 +120,7 @@
  #include "components/signin/public/identity_manager/accounts_cookie_mutator.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
  #include "content/public/browser/browser_context.h"
-@@ -96,8 +94,6 @@ class ProfileDataRemover : public conten
+@@ -95,8 +93,6 @@ class ProfileDataRemover : public conten
        // All the Profile data has been wiped. Clear the last signed in username
        // as well, so that the next signin doesn't trigger the account
        // change dialog.
@@ -120,7 +129,7 @@
      }
  
      origin_runner_->PostTask(FROM_HERE, std::move(callback_));
-@@ -133,11 +129,6 @@ SigninManagerAndroid::SigninManagerAndro
+@@ -132,11 +128,6 @@ SigninManagerAndroid::SigninManagerAndro
    DCHECK(user_cloud_policy_manager_);
    DCHECK(user_policy_signin_service_);
  
@@ -132,7 +141,7 @@
    force_browser_signin_.Init(prefs::kForceBrowserSignin,
                               g_browser_process->local_state());
  
-@@ -161,7 +152,7 @@ void SigninManagerAndroid::Shutdown() {
+@@ -160,7 +151,7 @@ void SigninManagerAndroid::Shutdown() {
  }
  
  bool SigninManagerAndroid::IsSigninAllowed() const {
@@ -141,11 +150,11 @@
  }
  
  jboolean SigninManagerAndroid::IsSigninAllowedByPolicy(JNIEnv* env) const {
---- a/chrome/browser/android/signin/signin_manager_android.h
-+++ b/chrome/browser/android/signin/signin_manager_android.h
+--- chrome/browser/android/signin/signin_manager_android.h.orig
++++ chrome/browser/android/signin/signin_manager_android.h
 @@ -117,9 +117,6 @@ class SigninManagerAndroid : public Keye
  
-   const raw_ptr<Profile> profile_ = nullptr;
+   Profile* const profile_ = nullptr;
  
 -  // Handler for prefs::kSigninAllowed set in user's profile.
 -  BooleanPrefMember signin_allowed_;
@@ -153,8 +162,8 @@
    // Handler for prefs::kForceBrowserSignin. This preference is set in Local
    // State, not in user prefs.
    BooleanPrefMember force_browser_signin_;
---- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc
-+++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc
+--- chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc.orig
++++ chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc
 @@ -18,7 +18,6 @@
  #include "chrome/browser/profiles/profile_manager.h"
  #include "chrome/common/pref_names.h"
@@ -172,19 +181,19 @@
      return;
    }
  
---- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
-+++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
+--- chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc.orig
++++ chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
 @@ -37,7 +37,6 @@
- #include "chromeos/dbus/dbus_thread_manager.h"
+ #include "components/arc/session/arc_session.h"
  #include "components/crx_file/id_util.h"
  #include "components/prefs/pref_service.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
  #include "content/public/test/browser_task_environment.h"
  #include "extensions/common/extension.h"
  #include "extensions/common/extension_builder.h"
---- a/chrome/browser/ash/login/signin/device_id_browsertest.cc
-+++ b/chrome/browser/ash/login/signin/device_id_browsertest.cc
-@@ -25,7 +25,6 @@
+--- chrome/browser/ash/login/signin/device_id_browsertest.cc.orig
++++ chrome/browser/ash/login/signin/device_id_browsertest.cc
+@@ -24,7 +24,6 @@
  #include "chrome/common/chrome_switches.h"
  #include "chrome/test/base/in_process_browser_test.h"
  #include "components/prefs/pref_service.h"
@@ -192,7 +201,7 @@
  #include "components/user_manager/known_user.h"
  #include "components/user_manager/user_manager.h"
  #include "content/public/test/browser_test.h"
-@@ -256,15 +255,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE
+@@ -249,15 +248,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE
    SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword,
                 kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId);
  
@@ -207,8 +216,8 @@
 -
    // Can't use SetKnownUserDeviceId here, because it forbids changing a device
    // ID.
-   user_manager::KnownUser known_user(g_browser_process->local_state());
-@@ -290,13 +280,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE
+   user_manager::known_user::SetStringPref(
+@@ -282,13 +272,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE
    SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword,
                 kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId);
  
@@ -221,10 +230,10 @@
 -
    // Can't use SetKnownUserDeviceId here, because it forbids changing a device
    // ID.
-   user_manager::KnownUser known_user(g_browser_process->local_state());
---- a/chrome/browser/chrome_content_browser_client.cc
-+++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -236,7 +236,6 @@
+   user_manager::known_user::SetStringPref(
+--- chrome/browser/chrome_content_browser_client.cc.orig
++++ chrome/browser/chrome_content_browser_client.cc
+@@ -225,7 +225,6 @@
  #include "components/safe_browsing/core/browser/realtime/url_lookup_service.h"
  #include "components/safe_browsing/core/browser/url_checker_delegate.h"
  #include "components/safe_browsing/core/common/features.h"
@@ -232,19 +241,9 @@
  #include "components/security_interstitials/content/insecure_form_navigation_throttle.h"
  #include "components/security_interstitials/content/origin_policy_ui.h"
  #include "components/security_interstitials/content/ssl_cert_reporter.h"
---- a/chrome/browser/download/bubble/download_bubble_prefs.cc
-+++ b/chrome/browser/download/bubble/download_bubble_prefs.cc
-@@ -11,7 +11,6 @@
- #include "chrome/common/pref_names.h"
- #include "components/prefs/pref_service.h"
- #include "components/safe_browsing/core/common/features.h"
--#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
- 
- namespace download {
- 
---- a/chrome/browser/download/download_browsertest.cc
-+++ b/chrome/browser/download/download_browsertest.cc
-@@ -101,7 +101,6 @@
+--- chrome/browser/download/download_browsertest.cc.orig
++++ chrome/browser/download/download_browsertest.cc
+@@ -103,7 +103,6 @@
  #include "components/safe_browsing/content/browser/safe_browsing_service_interface.h"
  #include "components/safe_browsing/content/common/proto/download_file_types.pb.h"
  #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -252,9 +251,9 @@
  #include "components/security_state/core/features.h"
  #include "components/security_state/core/security_state.h"
  #include "components/services/quarantine/test_support.h"
---- a/chrome/browser/download/download_item_model.cc
-+++ b/chrome/browser/download/download_item_model.cc
-@@ -830,6 +830,7 @@ void DownloadItemModel::ExecuteCommand(D
+--- chrome/browser/download/download_item_model.cc.orig
++++ chrome/browser/download/download_item_model.cc
+@@ -783,6 +783,7 @@ void DownloadItemModel::ExecuteCommand(D
        DownloadUIModel::ExecuteCommand(download_commands, command);
        break;
      case DownloadCommands::DEEP_SCAN:
@@ -262,7 +261,7 @@
        safe_browsing::SafeBrowsingService* sb_service =
            g_browser_process->safe_browsing_service();
        if (!sb_service)
-@@ -855,6 +856,7 @@ void DownloadItemModel::ExecuteCommand(D
+@@ -808,6 +809,7 @@ void DownloadItemModel::ExecuteCommand(D
            safe_browsing::DeepScanningRequest::DeepScanTrigger::
                TRIGGER_APP_PROMPT,
            safe_browsing::DownloadCheckResult::UNKNOWN, std::move(settings));
@@ -270,8 +269,8 @@
        break;
    }
  }
---- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
-+++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
+--- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc.orig
++++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
 @@ -38,7 +38,6 @@
  #include "components/policy/core/common/chrome_schema.h"
  #include "components/prefs/pref_service.h"
@@ -280,33 +279,35 @@
  #include "components/url_matcher/url_matcher.h"
  #include "content/public/browser/web_contents.h"
  #include "crypto/secure_hash.h"
---- a/chrome/browser/enterprise/connectors/connectors_manager.cc
-+++ b/chrome/browser/enterprise/connectors/connectors_manager.cc
-@@ -6,12 +6,12 @@
+--- chrome/browser/enterprise/connectors/connectors_manager.cc.orig
++++ chrome/browser/enterprise/connectors/connectors_manager.cc
+@@ -6,6 +6,7 @@
  
  #include <memory>
  
 +#include "base/bind.h"
  #include "base/feature_list.h"
+ #include "base/no_destructor.h"
  #include "base/values.h"
- #include "chrome/browser/browser_process.h"
+@@ -13,7 +14,6 @@
  #include "chrome/browser/enterprise/connectors/connectors_prefs.h"
+ #include "components/policy/core/browser/url_util.h"
  #include "components/prefs/pref_service.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
  #include "components/url_matcher/url_matcher.h"
  #include "url/gurl.h"
  
---- a/chrome/browser/enterprise/connectors/connectors_service.cc
-+++ b/chrome/browser/enterprise/connectors/connectors_service.cc
-@@ -38,7 +38,6 @@
+--- chrome/browser/enterprise/connectors/connectors_service.cc.orig
++++ chrome/browser/enterprise/connectors/connectors_service.cc
+@@ -36,7 +36,6 @@
  #include "components/policy/core/common/cloud/machine_level_user_cloud_policy_store.h"
  #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
  #include "components/policy/core/common/policy_types.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
- #include "components/signin/public/base/consent_level.h"
+ #include "components/signin/public/identity_manager/consent_level.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
  #include "components/user_prefs/user_prefs.h"
-@@ -391,8 +390,7 @@ std::string ConnectorsService::GetManage
+@@ -406,8 +405,7 @@ std::string ConnectorsService::GetManage
  
    absl::optional<policy::PolicyScope> scope = absl::nullopt;
    for (const char* scope_pref :
@@ -315,8 +316,8 @@
 +       {ConnectorScopePref(AnalysisConnector::FILE_ATTACHED),
          ConnectorScopePref(AnalysisConnector::FILE_DOWNLOADED),
          ConnectorScopePref(AnalysisConnector::BULK_DATA_ENTRY),
-         ConnectorScopePref(AnalysisConnector::PRINT),
-@@ -444,20 +442,6 @@ std::string ConnectorsService::GetManage
+         ConnectorScopePref(ReportingConnector::SECURITY_EVENT)}) {
+@@ -458,20 +456,6 @@ std::string ConnectorsService::GetManage
  
  absl::optional<std::string> ConnectorsService::GetDMTokenForRealTimeUrlCheck()
      const {
@@ -337,9 +338,9 @@
    return absl::nullopt;
  }
  
---- a/chrome/browser/enterprise/connectors/connectors_service.h
-+++ b/chrome/browser/enterprise/connectors/connectors_service.h
-@@ -15,7 +15,6 @@
+--- chrome/browser/enterprise/connectors/connectors_service.h.orig
++++ chrome/browser/enterprise/connectors/connectors_service.h
+@@ -13,7 +13,6 @@
  #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
  #include "components/keyed_service/core/keyed_service.h"
  #include "components/policy/core/common/policy_types.h"
@@ -347,9 +348,9 @@
  #include "content/public/browser/browser_context.h"
  
  namespace base {
---- a/chrome/browser/enterprise/signals/context_info_fetcher.cc
-+++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc
-@@ -218,11 +218,6 @@ void ContextInfoFetcher::Fetch(ContextIn
+--- chrome/browser/enterprise/signals/context_info_fetcher.cc.orig
++++ chrome/browser/enterprise/signals/context_info_fetcher.cc
+@@ -183,11 +183,6 @@ void ContextInfoFetcher::Fetch(ContextIn
    info.third_party_blocking_enabled =
        utils::GetThirdPartyBlockingEnabled(g_browser_process->local_state());
  
@@ -359,19 +360,19 @@
 -  info.password_protection_warning_trigger =
 -      utils::GetPasswordProtectionWarningTrigger(profile->GetPrefs());
  
- #if BUILDFLAG(IS_WIN)
+ #if defined(OS_WIN)
    base::ThreadPool::CreateCOMSTATaskRunner({base::MayBlock()})
---- a/chrome/browser/enterprise/signals/context_info_fetcher.h
-+++ b/chrome/browser/enterprise/signals/context_info_fetcher.h
-@@ -13,7 +13,6 @@
- #include "base/memory/raw_ptr.h"
+--- chrome/browser/enterprise/signals/context_info_fetcher.h.orig
++++ chrome/browser/enterprise/signals/context_info_fetcher.h
+@@ -12,7 +12,6 @@
+ #include "base/callback_forward.h"
  #include "build/build_config.h"
  #include "chrome/browser/enterprise/signals/signals_common.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
  
  namespace content {
  class BrowserContext;
-@@ -40,11 +39,8 @@ struct ContextInfo {
+@@ -39,11 +38,8 @@ struct ContextInfo {
    std::vector<std::string> on_bulk_data_entry_providers;
    std::vector<std::string> on_security_event_providers;
    std::string browser_version;
@@ -383,18 +384,18 @@
    absl::optional<bool> chrome_cleanup_enabled;
    bool chrome_remote_desktop_app_blocked;
    absl::optional<bool> third_party_blocking_enabled;
---- a/chrome/browser/enterprise/signals/signals_utils.cc
-+++ b/chrome/browser/enterprise/signals/signals_utils.cc
+--- chrome/browser/enterprise/signals/signals_utils.cc.orig
++++ chrome/browser/enterprise/signals/signals_utils.cc
 @@ -10,7 +10,6 @@
  #include "components/policy/content/policy_blocklist_service.h"
  #include "components/policy/core/browser/url_blocklist_manager.h"
  #include "components/prefs/pref_service.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
  
- #if BUILDFLAG(IS_WIN)
+ #if defined(OS_WIN)
  #include "components/component_updater/pref_names.h"
---- a/chrome/browser/enterprise/signals/signals_utils.h
-+++ b/chrome/browser/enterprise/signals/signals_utils.h
+--- chrome/browser/enterprise/signals/signals_utils.h.orig
++++ chrome/browser/enterprise/signals/signals_utils.h
 @@ -5,8 +5,6 @@
  #ifndef CHROME_BROWSER_ENTERPRISE_SIGNALS_SIGNALS_UTILS_H_
  #define CHROME_BROWSER_ENTERPRISE_SIGNALS_SIGNALS_UTILS_H_
@@ -404,8 +405,8 @@
  #include "third_party/abseil-cpp/absl/types/optional.h"
  
  class PolicyBlocklistService;
---- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
-+++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
+--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig
++++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
 @@ -77,45 +77,10 @@ api::enterprise_reporting_private::Conte
    info.browser_version = std::move(signals.browser_version);
    info.built_in_dns_client_enabled = signals.built_in_dns_client_enabled;
@@ -456,9 +457,9 @@
  
    return info;
  }
---- a/chrome/browser/extensions/api/identity/identity_apitest.cc
-+++ b/chrome/browser/extensions/api/identity/identity_apitest.cc
-@@ -57,7 +57,6 @@
+--- chrome/browser/extensions/api/identity/identity_apitest.cc.orig
++++ chrome/browser/extensions/api/identity/identity_apitest.cc
+@@ -56,7 +56,6 @@
  #include "components/prefs/pref_service.h"
  #include "components/signin/core/browser/account_reconcilor.h"
  #include "components/signin/public/base/list_accounts_test_utils.h"
@@ -466,9 +467,9 @@
  #include "components/signin/public/base/signin_switches.h"
  #include "components/signin/public/identity_manager/accounts_mutator.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
---- a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
-+++ b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
-@@ -29,7 +29,6 @@
+--- chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc.orig
++++ chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
+@@ -30,7 +30,6 @@
  #include "chrome/common/channel_info.h"
  #include "chrome/common/extensions/api/identity.h"
  #include "components/prefs/pref_service.h"
@@ -476,7 +477,7 @@
  #include "components/signin/public/base/signin_switches.h"
  #include "components/signin/public/identity_manager/access_token_info.h"
  #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
-@@ -63,7 +62,7 @@ const char* const kExtensionsIdentityAPI
+@@ -64,7 +63,7 @@ const char* const kExtensionsIdentityAPI
      "extensions_identity_api";
  
  bool IsBrowserSigninAllowed(Profile* profile) {
@@ -485,8 +486,8 @@
  }
  
  std::string GetOAuth2MintTokenFlowVersion() {
---- a/chrome/browser/extensions/api/preference/preference_api.cc
-+++ b/chrome/browser/extensions/api/preference/preference_api.cc
+--- chrome/browser/extensions/api/preference/preference_api.cc.orig
++++ chrome/browser/extensions/api/preference/preference_api.cc
 @@ -35,7 +35,6 @@
  #include "components/prefs/pref_service.h"
  #include "components/privacy_sandbox/privacy_sandbox_prefs.h"
@@ -494,8 +495,8 @@
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
  #include "components/spellcheck/browser/pref_names.h"
  #include "components/translate/core/browser/translate_pref_names.h"
- #include "extensions/browser/api/content_settings/content_settings_service.h"
-@@ -110,11 +109,6 @@ const PrefMappingEntry kPrefMapping[] =
+ #include "extensions/browser/extension_pref_value_map.h"
+@@ -109,11 +108,6 @@ const PrefMappingEntry kPrefMapping[] =
       APIPermissionID::kPrivacy},
      {"doNotTrackEnabled", prefs::kEnableDoNotTrack, APIPermissionID::kPrivacy,
       APIPermissionID::kPrivacy},
@@ -507,7 +508,7 @@
      {"searchSuggestEnabled", prefs::kSearchSuggestEnabled,
       APIPermissionID::kPrivacy, APIPermissionID::kPrivacy},
      {"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService,
-@@ -845,18 +839,6 @@ ExtensionFunction::ResponseAction SetPre
+@@ -844,18 +838,6 @@ ExtensionFunction::ResponseAction SetPre
          base::Value(browser_pref_value->GetBool()));
    }
  
@@ -526,7 +527,7 @@
    preference_api->SetExtensionControlledPref(
        extension_id(), browser_pref, scope,
        base::Value::FromUniquePtrValue(std::move(browser_pref_value)));
-@@ -909,18 +891,6 @@ ExtensionFunction::ResponseAction ClearP
+@@ -908,18 +890,6 @@ ExtensionFunction::ResponseAction ClearP
    PreferenceAPI::Get(browser_context())
        ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope);
  
@@ -545,9 +546,9 @@
    return RespondNow(NoArguments());
  }
  
---- a/chrome/browser/extensions/api/preference/preference_apitest.cc
-+++ b/chrome/browser/extensions/api/preference/preference_apitest.cc
-@@ -31,7 +31,6 @@
+--- chrome/browser/extensions/api/preference/preference_apitest.cc.orig
++++ chrome/browser/extensions/api/preference/preference_apitest.cc
+@@ -28,7 +28,6 @@
  #include "components/keep_alive_registry/scoped_keep_alive.h"
  #include "components/password_manager/core/common/password_manager_pref_names.h"
  #include "components/prefs/pref_service.h"
@@ -555,43 +556,43 @@
  #include "components/translate/core/browser/translate_pref_names.h"
  #include "content/public/browser/notification_service.h"
  #include "content/public/test/browser_test.h"
-@@ -86,7 +85,6 @@ class ExtensionPreferenceApiTest
-               prefs->GetInteger(prefetch::prefs::kNetworkPredictionOptions));
+@@ -73,7 +72,6 @@ class ExtensionPreferenceApiTest : publi
+               prefs->GetInteger(prefs::kNetworkPredictionOptions));
      EXPECT_TRUE(
          prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService));
 -    EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
      EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
    }
  
-@@ -112,7 +110,6 @@ class ExtensionPreferenceApiTest
-               prefs->GetInteger(prefetch::prefs::kNetworkPredictionOptions));
+@@ -99,7 +97,6 @@ class ExtensionPreferenceApiTest : publi
+               prefs->GetInteger(prefs::kNetworkPredictionOptions));
      EXPECT_FALSE(
          prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService));
 -    EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
      EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
    }
  
-@@ -185,7 +182,6 @@ IN_PROC_BROWSER_TEST_P(ExtensionPreferen
-       prefetch::prefs::kNetworkPredictionOptions,
-       static_cast<int>(prefetch::NetworkPredictionOptions::kDisabled));
+@@ -163,7 +160,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionPreferen
+   prefs->SetInteger(prefs::kNetworkPredictionOptions,
+                     chrome_browser_net::NETWORK_PREDICTION_NEVER);
    prefs->SetBoolean(password_manager::prefs::kCredentialsEnableService, false);
 -  prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false);
    prefs->SetBoolean(prefs::kSearchSuggestEnabled, false);
    prefs->SetString(prefs::kWebRTCIPHandlingPolicy,
                     blink::kWebRTCIPHandlingDefaultPublicInterfaceOnly);
---- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
-+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
-@@ -39,7 +39,6 @@
+--- chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc.orig
++++ chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
+@@ -36,7 +36,6 @@
  #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
  #include "components/prefs/pref_service.h"
  #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
- #include "components/url_matcher/url_matcher.h"
- #include "components/url_matcher/url_util.h"
---- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
-+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
-@@ -36,7 +36,6 @@
+ #include "content/public/browser/browser_context.h"
+ #include "extensions/browser/event_router.h"
+--- chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc.orig
++++ chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
+@@ -35,7 +35,6 @@
  #include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
  #include "components/policy/core/common/cloud/realtime_reporting_job_configuration.h"
  #include "components/safe_browsing/core/common/features.h"
@@ -599,8 +600,8 @@
  #include "components/signin/public/identity_manager/identity_test_environment.h"
  #include "content/public/test/browser_task_environment.h"
  #include "extensions/browser/test_event_router.h"
---- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
-+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig
++++ chrome/browser/extensions/api/settings_private/prefs_util.cc
 @@ -43,7 +43,6 @@
  #include "components/prefs/pref_service.h"
  #include "components/privacy_sandbox/privacy_sandbox_prefs.h"
@@ -609,7 +610,7 @@
  #include "components/search_engines/default_search_manager.h"
  #include "components/spellcheck/browser/pref_names.h"
  #include "components/translate/core/browser/translate_pref_names.h"
-@@ -295,16 +294,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -283,16 +282,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
        settings_api::PrefType::PREF_TYPE_BOOLEAN;
  
    // Security page
@@ -626,9 +627,9 @@
    (*s_allowlist)[::prefs::kHttpsOnlyModeEnabled] =
        settings_api::PrefType::PREF_TYPE_BOOLEAN;
  
---- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
-+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
-@@ -649,9 +649,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore
+--- chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc.orig
++++ chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
+@@ -647,9 +647,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore
  IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest,
                         GetReferrerChainForNonSafeBrowsingUser) {
    PrefService* pref_service = browser()->profile()->GetPrefs();
@@ -638,9 +639,9 @@
  
    GURL page_url = GetTestServerURLWithReferrers("empty_referrer_chain.html");
    ASSERT_TRUE(OpenTestURL(page_url));
---- a/chrome/browser/extensions/extension_allowlist.cc
-+++ b/chrome/browser/extensions/extension_allowlist.cc
-@@ -10,7 +10,6 @@
+--- chrome/browser/extensions/extension_allowlist.cc.orig
++++ chrome/browser/extensions/extension_allowlist.cc
+@@ -9,7 +9,6 @@
  #include "chrome/browser/profiles/profile.h"
  #include "chrome/browser/safe_browsing/safe_browsing_metrics_collector_factory.h"
  #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h"
@@ -648,7 +649,7 @@
  #include "extensions/browser/allowlist_state.h"
  #include "extensions/browser/extension_registry.h"
  #include "extensions/browser/extension_system.h"
-@@ -69,10 +68,6 @@ ExtensionAllowlist::ExtensionAllowlist(P
+@@ -68,10 +67,6 @@ ExtensionAllowlist::ExtensionAllowlist(P
    // Register to Enhanced Safe Browsing setting changes for allowlist
    // enforcements.
    pref_change_registrar_.Init(profile_->GetPrefs());
@@ -659,7 +660,7 @@
  }
  
  ExtensionAllowlist::~ExtensionAllowlist() = default;
-@@ -241,15 +236,8 @@ void ExtensionAllowlist::OnExtensionInst
+@@ -240,15 +235,8 @@ void ExtensionAllowlist::OnExtensionInst
  }
  
  void ExtensionAllowlist::SetAllowlistEnforcementFields() {
@@ -675,7 +676,7 @@
  }
  
  // `ApplyEnforcement` can be called when an extension becomes not allowlisted or
-@@ -399,15 +387,6 @@ void ExtensionAllowlist::NotifyExtension
+@@ -398,15 +386,6 @@ void ExtensionAllowlist::NotifyExtension
  }
  
  void ExtensionAllowlist::ReportExtensionReEnabledEvent() {
@@ -691,17 +692,9 @@
  }
  
  }  // namespace extensions
---- a/chrome/browser/extensions/installed_loader.cc
-+++ b/chrome/browser/extensions/installed_loader.cc
-@@ -28,7 +28,6 @@
- #include "chrome/common/extensions/chrome_manifest_url_handlers.h"
- #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h"
- #include "chrome/common/webui_url_constants.h"
--#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/notification_service.h"
- #include "content/public/common/url_constants.h"
-@@ -798,12 +797,6 @@ void InstalledLoader::RecordExtensionsMe
+--- chrome/browser/extensions/installed_loader.cc.orig
++++ chrome/browser/extensions/installed_loader.cc
+@@ -797,12 +797,6 @@ void InstalledLoader::RecordExtensionsMe
                                enabled_not_allowlisted_count);
    base::UmaHistogramCounts100("Extensions.NotAllowlistedDisabled",
                                disabled_not_allowlisted_count);
@@ -714,9 +707,9 @@
  }
  
  int InstalledLoader::GetCreationFlags(const ExtensionInfo* info) {
---- a/chrome/browser/net/profile_network_context_service.cc
-+++ b/chrome/browser/net/profile_network_context_service.cc
-@@ -46,7 +46,6 @@
+--- chrome/browser/net/profile_network_context_service.cc.orig
++++ chrome/browser/net/profile_network_context_service.cc
+@@ -43,7 +43,6 @@
  #include "components/pref_registry/pref_registry_syncable.h"
  #include "components/prefs/pref_registry_simple.h"
  #include "components/prefs/pref_service.h"
@@ -724,24 +717,22 @@
  #include "content/public/browser/browser_context.h"
  #include "content/public/browser/browser_thread.h"
  #include "content/public/browser/network_service_instance.h"
-@@ -806,15 +805,8 @@ void ProfileNetworkContextService::Confi
+@@ -741,13 +740,6 @@ void ProfileNetworkContextService::Confi
    network_context_params->enable_certificate_reporting = true;
    network_context_params->enable_expect_ct_reporting = true;
  
--  SCTReportingService* sct_reporting_service =
--      SCTReportingServiceFactory::GetForBrowserContext(profile_);
--  if (sct_reporting_service) {
--    network_context_params->sct_auditing_mode =
--        sct_reporting_service->GetReportingMode();
--  } else {
-     network_context_params->sct_auditing_mode =
-         network::mojom::SCTAuditingMode::kDisabled;
+-  // Initialize the network context to do SCT auditing only if the current
+-  // profile is opted in to Safe Browsing Extended Reporting.
+-  if (!profile_->IsOffTheRecord() &&
+-      safe_browsing::IsExtendedReportingEnabled(*profile_->GetPrefs())) {
+-    network_context_params->enable_sct_auditing = true;
 -  }
- 
+-
    network_context_params->ct_policy = GetCTPolicy();
  
---- a/chrome/browser/net/trial_comparison_cert_verifier_browsertest.cc
-+++ b/chrome/browser/net/trial_comparison_cert_verifier_browsertest.cc
+ #if BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED)
+--- chrome/browser/net/trial_comparison_cert_verifier_browsertest.cc.orig
++++ chrome/browser/net/trial_comparison_cert_verifier_browsertest.cc
 @@ -11,7 +11,6 @@
  #include "chrome/test/base/in_process_browser_test.h"
  #include "chrome/test/base/ui_test_utils.h"
@@ -750,9 +741,9 @@
  #include "content/public/test/browser_test.h"
  #include "net/base/features.h"
  #include "net/cert/trial_comparison_cert_verifier.h"
---- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
-+++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
-@@ -18,7 +18,6 @@
+--- chrome/browser/net/trial_comparison_cert_verifier_controller.cc.orig
++++ chrome/browser/net/trial_comparison_cert_verifier_controller.cc
+@@ -19,7 +19,6 @@
  #include "chrome/browser/safe_browsing/certificate_reporting_service.h"
  #include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h"
  #include "chrome/common/channel_info.h"
@@ -760,7 +751,7 @@
  #include "components/security_interstitials/content/certificate_error_report.h"
  #include "content/public/browser/browser_task_traits.h"
  #include "content/public/browser/browser_thread.h"
-@@ -41,12 +40,6 @@ TrialComparisonCertVerifierController::T
+@@ -42,12 +41,6 @@ TrialComparisonCertVerifierController::T
      // enabled.
      return;
    }
@@ -773,7 +764,7 @@
  }
  
  TrialComparisonCertVerifierController::
-@@ -100,9 +93,7 @@ bool TrialComparisonCertVerifierControll
+@@ -101,9 +94,7 @@ bool TrialComparisonCertVerifierControll
    if (!MaybeAllowedForProfile(profile_))
      return false;
  
@@ -784,8 +775,8 @@
  }
  
  void TrialComparisonCertVerifierController::SendTrialReport(
---- a/chrome/browser/net/trial_comparison_cert_verifier_controller.h
-+++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.h
+--- chrome/browser/net/trial_comparison_cert_verifier_controller.h.orig
++++ chrome/browser/net/trial_comparison_cert_verifier_controller.h
 @@ -14,7 +14,6 @@
  #include "base/memory/ref_counted.h"
  #include "base/memory/weak_ptr.h"
@@ -797,13 +788,13 @@
 @@ -77,7 +76,6 @@ class TrialComparisonCertVerifierControl
    void RefreshState();
  
-   raw_ptr<Profile> profile_;
+   Profile* profile_;
 -  PrefChangeRegistrar pref_change_registrar_;
  
    mojo::ReceiverSet<
        cert_verifier::mojom::TrialComparisonCertVerifierReportClient>
---- a/chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc
-+++ b/chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc
+--- chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc.orig
++++ chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc
 @@ -20,7 +20,6 @@
  #include "chrome/test/base/testing_browser_process.h"
  #include "chrome/test/base/testing_profile.h"
@@ -812,17 +803,17 @@
  #include "components/security_interstitials/content/cert_logger.pb.h"
  #include "components/sync_preferences/testing_pref_service_syncable.h"
  #include "content/public/browser/browser_task_traits.h"
---- a/chrome/browser/password_manager/generated_password_leak_detection_pref.cc
-+++ b/chrome/browser/password_manager/generated_password_leak_detection_pref.cc
-@@ -14,7 +14,6 @@
- #include "components/password_manager/core/common/password_manager_features.h"
+--- chrome/browser/password_manager/generated_password_leak_detection_pref.cc.orig
++++ chrome/browser/password_manager/generated_password_leak_detection_pref.cc
+@@ -13,7 +13,6 @@
+ #include "chrome/common/extensions/api/settings_private.h"
  #include "components/password_manager/core/common/password_manager_pref_names.h"
  #include "components/prefs/pref_service.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
  
  namespace {
-@@ -37,8 +36,7 @@ bool IsUserAllowedToUseLeakDetection(Pro
+@@ -43,8 +42,7 @@ bool IsUserSignedInAndSyncing(Profile* p
  // Returns whether the effective value of the Safe Browsing preferences for
  // |profile| is standard protection.
  bool IsSafeBrowsingStandard(Profile* profile) {
@@ -832,7 +823,7 @@
  }
  
  }  // namespace
-@@ -57,16 +55,6 @@ GeneratedPasswordLeakDetectionPref::Gene
+@@ -63,16 +61,6 @@ GeneratedPasswordLeakDetectionPref::Gene
        base::BindRepeating(
            &GeneratedPasswordLeakDetectionPref::OnSourcePreferencesChanged,
            base::Unretained(this)));
@@ -849,8 +840,8 @@
  
    if (auto* identity_manager = IdentityManagerFactory::GetForProfile(profile))
      identity_manager_observer_.Observe(identity_manager);
---- a/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
-+++ b/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
+--- chrome/browser/permissions/abusive_origin_permission_revocation_request.cc.orig
++++ chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
 @@ -17,7 +17,6 @@
  #include "components/permissions/permissions_client.h"
  #include "components/prefs/pref_service.h"
@@ -859,18 +850,18 @@
  
  namespace {
  constexpr char kExcludedKey[] = "exempted";
---- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
-+++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
-@@ -26,7 +26,6 @@
+--- chrome/browser/permissions/prediction_based_permission_ui_selector.cc.orig
++++ chrome/browser/permissions/prediction_based_permission_ui_selector.cc
+@@ -23,7 +23,6 @@
  #include "components/permissions/prediction_service/prediction_service.h"
  #include "components/permissions/prediction_service/prediction_service_messages.pb.h"
  #include "components/prefs/pref_service.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
  
- #if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
- #include "chrome/browser/permissions/prediction_model_handler_factory.h"
---- a/chrome/browser/policy/browser_signin_policy_handler.cc
-+++ b/chrome/browser/policy/browser_signin_policy_handler.cc
+ namespace {
+ 
+--- chrome/browser/policy/browser_signin_policy_handler.cc.orig
++++ chrome/browser/policy/browser_signin_policy_handler.cc
 @@ -15,7 +15,6 @@
  #include "components/policy/core/common/policy_map.h"
  #include "components/policy/policy_constants.h"
@@ -879,13 +870,13 @@
  
  namespace policy {
  BrowserSigninPolicyHandler::BrowserSigninPolicyHandler(Schema chrome_schema)
-@@ -49,28 +48,18 @@ void BrowserSigninPolicyHandler::ApplyPo
+@@ -48,28 +47,18 @@ void BrowserSigninPolicyHandler::ApplyPo
  #endif
-       [[fallthrough]];
+       FALLTHROUGH;
      case BrowserSigninMode::kEnabled:
-+#if !BUILDFLAG(IS_ANDROID)
++#if !defined(OS_ANDROID)
        prefs->SetValue(
--#if BUILDFLAG(IS_ANDROID)
+-#if defined(OS_ANDROID)
 -          // The new kSigninAllowedOnNextStartup pref is only used on Desktop.
 -          // Keep the old kSigninAllowed pref for Android until the policy is
 -          // fully deprecated in M71 and can be removed.
@@ -897,9 +888,9 @@
 +#endif
        break;
      case BrowserSigninMode::kDisabled:
-+#if !BUILDFLAG(IS_ANDROID)
++#if !defined(OS_ANDROID)
        prefs->SetValue(
--#if BUILDFLAG(IS_ANDROID)
+-#if defined(OS_ANDROID)
 -          // The new kSigninAllowedOnNextStartup pref is only used on Desktop.
 -          // Keep the old kSigninAllowed pref for Android until the policy is
 -          // fully deprecated in M71 and can be removed.
@@ -912,12 +903,12 @@
        break;
    }
  }
---- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
-+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -94,12 +94,9 @@
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig
++++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
+@@ -83,12 +83,9 @@
+ #include "components/policy/core/common/schema.h"
+ #include "components/policy/policy_constants.h"
  #include "components/proxy_config/proxy_policy_handler.h"
- #include "components/safe_browsing/buildflags.h"
- #include "components/safe_browsing/content/common/file_type_policies_prefs.h"
 -#include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
  #include "components/search_engines/default_search_policy_handler.h"
@@ -927,76 +918,39 @@
  #include "components/spellcheck/spellcheck_buildflags.h"
  #include "components/sync/base/pref_names.h"
  #include "components/sync/driver/sync_policy_handler.h"
-@@ -207,9 +204,6 @@ const PolicyToPreferenceMapEntry kSimple
-   { key::kDefaultPopupsSetting,
-     prefs::kManagedDefaultPopupsSetting,
-     base::Value::Type::INTEGER },
--  { key::kDisableSafeBrowsingProceedAnyway,
--    prefs::kSafeBrowsingProceedAnywayDisabled,
--    base::Value::Type::BOOLEAN },
-   { key::kEditBookmarksEnabled,
-     bookmarks::prefs::kEditBookmarksEnabled,
+@@ -209,15 +206,6 @@ const PolicyToPreferenceMapEntry kSimple
+   { key::kQuicAllowed,
+     prefs::kQuicAllowed,
      base::Value::Type::BOOLEAN },
-@@ -230,9 +224,6 @@ const PolicyToPreferenceMapEntry kSimple
-     prefs::kPrintingEnabled,
-     base::Value::Type::BOOLEAN },
- #endif // BUILDFLAG(ENABLE_PRINTING)
 -  { key::kSafeBrowsingEnabled,
 -    prefs::kSafeBrowsingEnabled,
 -    base::Value::Type::BOOLEAN },
-   { key::kSavingBrowserHistoryDisabled,
-     prefs::kSavingBrowserHistoryDisabled,
-     base::Value::Type::BOOLEAN },
-@@ -291,9 +282,6 @@ const PolicyToPreferenceMapEntry kSimple
-   { key::kAdsSettingForIntrusiveAdsSites,
-     prefs::kManagedDefaultAdsSetting,
-     base::Value::Type::INTEGER },
--  { key::kAdvancedProtectionAllowed,
--    prefs::kAdvancedProtectionAllowed,
+-  { key::kSafeBrowsingForTrustedSourcesEnabled,
+-    prefs::kSafeBrowsingForTrustedSourcesEnabled,
+-    base::Value::Type::BOOLEAN },
+-  { key::kSafeBrowsingExtendedReportingEnabled,
+-    prefs::kSafeBrowsingScoutReportingEnabled,
 -    base::Value::Type::BOOLEAN },
-   { key::kAllowCrossOriginAuthPrompt,
-     prefs::kAllowCrossOriginAuthPrompt,
+   { key::kUrlKeyedAnonymizedDataCollectionEnabled,
+     unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled,
      base::Value::Type::BOOLEAN },
-@@ -482,15 +470,6 @@ const PolicyToPreferenceMapEntry kSimple
-   { key::kPasswordDismissCompromisedAlertEnabled,
-     password_manager::prefs::kPasswordDismissCompromisedAlertEnabled,
+@@ -353,15 +341,6 @@ const PolicyToPreferenceMapEntry kSimple
+   { key::kGloballyScopeHTTPAuthCacheEnabled,
+     prefs::kGloballyScopeHTTPAuthCacheEnabled,
      base::Value::Type::BOOLEAN },
--  { key::kPasswordProtectionChangePasswordURL,
--    prefs::kPasswordProtectionChangePasswordURL,
--    base::Value::Type::STRING },
--  { key::kPasswordProtectionLoginURLs,
--    prefs::kPasswordProtectionLoginURLs,
--    base::Value::Type::LIST },
 -  { key::kPasswordProtectionWarningTrigger,
 -    prefs::kPasswordProtectionWarningTrigger,
 -    base::Value::Type::INTEGER },
-   { key::kPolicyRefreshRate,
-     policy_prefs::kUserPolicyRefreshRate,
-     base::Value::Type::INTEGER },
-@@ -526,9 +505,6 @@ const PolicyToPreferenceMapEntry kSimple
-   { key::kRestoreOnStartupURLs,
-     prefs::kURLsToRestoreOnStartup,
-     base::Value::Type::LIST },
--  { key::kSafeBrowsingAllowlistDomains,
--    prefs::kSafeBrowsingAllowlistDomains,
+-  { key::kPasswordProtectionLoginURLs,
+-    prefs::kPasswordProtectionLoginURLs,
 -    base::Value::Type::LIST },
+-  { key::kPasswordProtectionChangePasswordURL,
+-    prefs::kPasswordProtectionChangePasswordURL,
+-    base::Value::Type::STRING },
    { key::kSafeSitesFilterBehavior,
      policy_prefs::kSafeSitesFilterBehavior,
      base::Value::Type::INTEGER },
-@@ -653,12 +629,6 @@ const PolicyToPreferenceMapEntry kSimple
-   { key::kAdditionalDnsQueryTypesEnabled,
-     prefs::kAdditionalDnsQueryTypesEnabled,
-     base::Value::Type::BOOLEAN },
--  { key::kSafeBrowsingForTrustedSourcesEnabled,
--    prefs::kSafeBrowsingForTrustedSourcesEnabled,
--    base::Value::Type::BOOLEAN },
--  { key::kSafeBrowsingExtendedReportingEnabled,
--    prefs::kSafeBrowsingScoutReportingEnabled,
--    base::Value::Type::BOOLEAN },
-   { key::kForceGoogleSafeSearch,
-     prefs::kForceGoogleSafeSearch,
-     base::Value::Type::BOOLEAN },
-@@ -816,9 +786,6 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -470,18 +449,12 @@ const PolicyToPreferenceMapEntry kSimple
    { key::kMaxConnectionsPerProxy,
      prefs::kMaxConnectionsPerProxy,
      base::Value::Type::INTEGER },
@@ -1006,10 +960,48 @@
    { key::kDefaultWebBluetoothGuardSetting,
      prefs::kManagedDefaultWebBluetoothGuardSetting,
      base::Value::Type::INTEGER },
-@@ -1782,12 +1749,6 @@ std::unique_ptr<ConfigurationPolicyHandl
-           SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
-           SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED));
- 
+   { key::kDefaultMediaStreamSetting,
+     prefs::kManagedDefaultMediaStreamSetting,
+     base::Value::Type::INTEGER },
+-  { key::kDisableSafeBrowsingProceedAnyway,
+-    prefs::kSafeBrowsingProceedAnywayDisabled,
+-    base::Value::Type::BOOLEAN },
+   { key::kCECPQ2Enabled,
+     prefs::kCECPQ2Enabled,
+     base::Value::Type::BOOLEAN },
+@@ -684,9 +657,6 @@ const PolicyToPreferenceMapEntry kSimple
+   { key::kIntranetRedirectBehavior,
+     omnibox::kIntranetRedirectBehavior,
+     base::Value::Type::INTEGER },
+-  { key::kAdvancedProtectionAllowed,
+-    prefs::kAdvancedProtectionAllowed,
+-    base::Value::Type::BOOLEAN },
+   { key::kAccessibilityImageLabelsEnabled,
+     prefs::kAccessibilityImageLabelsEnabled,
+     base::Value::Type::BOOLEAN },
+@@ -1642,8 +1612,6 @@ std::unique_ptr<ConfigurationPolicyHandl
+   handlers->AddHandler(std::make_unique<JavascriptPolicyHandler>());
+   handlers->AddHandler(std::make_unique<NetworkPredictionPolicyHandler>());
+   handlers->AddHandler(std::make_unique<RestoreOnStartupPolicyHandler>());
+-  handlers->AddHandler(
+-      std::make_unique<safe_browsing::SafeBrowsingPolicyHandler>());
+   handlers->AddHandler(std::make_unique<SimpleDeprecatingPolicyHandler>(
+       std::make_unique<SimplePolicyHandler>(key::kAuthServerWhitelist,
+                                             prefs::kAuthServerAllowlist,
+@@ -1667,9 +1635,6 @@ std::unique_ptr<ConfigurationPolicyHandl
+           key::kWindowOcclusionEnabled,
+           policy::policy_prefs::kNativeWindowOcclusionEnabled,
+           base::Value::Type::BOOLEAN)));
+-  handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
+-      key::kSafeBrowsingAllowlistDomains, prefs::kSafeBrowsingAllowlistDomains,
+-      base::Value::Type::LIST));
+   handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>());
+   handlers->AddHandler(std::make_unique<BrowsingHistoryPolicyHandler>());
+ 
+@@ -1762,12 +1727,6 @@ std::unique_ptr<ConfigurationPolicyHandl
+           key::kOnSecurityEventEnterpriseConnector,
+           enterprise_connectors::kOnSecurityEventPref,
+           enterprise_connectors::kOnSecurityEventScopePref, chrome_schema));
 -  handlers->AddHandler(
 -      std::make_unique<
 -          enterprise_connectors::EnterpriseConnectorsPolicyHandler>(
@@ -1017,56 +1009,55 @@
 -          prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
 -          prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema));
  
-   handlers->AddHandler(
-       std::make_unique<ManagedAccountRestrictionsPolicyHandler>(chrome_schema));
-@@ -1959,17 +1920,6 @@ std::unique_ptr<ConfigurationPolicyHandl
+   handlers->AddHandler(std::make_unique<BrowsingDataLifetimePolicyHandler>(
+       key::kClearBrowsingDataOnExitList,
+@@ -1806,17 +1765,6 @@ std::unique_ptr<ConfigurationPolicyHandl
    signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
        key::kForceBrowserSignin, prefs::kForceBrowserSignin,
        base::Value::Type::BOOLEAN));
 -  signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
 -      key::kSigninAllowed,
--#if BUILDFLAG(IS_ANDROID)
+-#if defined(OS_ANDROID)
 -      // The new kSigninAllowedOnNextStartup pref is only used on Desktop.
 -      // Keep the old kSigninAllowed pref for Android until the policy is
 -      // fully deprecated in M71 and can be removed.
 -      prefs::kSigninAllowed,
--#else   // BUILDFLAG(IS_ANDROID)
+-#else   // defined(OS_ANDROID)
 -      prefs::kSigninAllowedOnNextStartup,
--#endif  // BUILDFLAG(IS_ANDROID)
+-#endif  // defined(OS_ANDROID)
 -      base::Value::Type::BOOLEAN));
    handlers->AddHandler(std::make_unique<LegacyPoliciesDeprecatingPolicyHandler>(
        std::move(signin_legacy_policies),
        std::make_unique<BrowserSigninPolicyHandler>(chrome_schema)));
---- a/chrome/browser/prefs/browser_prefs.cc
-+++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -134,7 +134,6 @@
+--- chrome/browser/prefs/browser_prefs.cc.orig
++++ chrome/browser/prefs/browser_prefs.cc
+@@ -139,7 +139,6 @@
+ #include "components/prefs/pref_service.h"
  #include "components/privacy_sandbox/privacy_sandbox_prefs.h"
  #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
- #include "components/safe_browsing/content/common/file_type_policies_prefs.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
  #include "components/search_engines/template_url_prepopulate_data.h"
  #include "components/security_interstitials/content/insecure_form_blocking_page.h"
  #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
-@@ -1014,7 +1013,6 @@ void RegisterLocalState(PrefRegistrySimp
+@@ -921,7 +920,6 @@ void RegisterLocalState(PrefRegistrySimp
    ProfileNetworkContextService::RegisterLocalStatePrefs(registry);
    profiles::RegisterPrefs(registry);
    RegisterScreenshotPrefs(registry);
 -  safe_browsing::RegisterLocalStatePrefs(registry);
    secure_origin_allowlist::RegisterPrefs(registry);
- #if !BUILDFLAG(IS_ANDROID)
+ #if !defined(OS_ANDROID)
    SerialPolicyAllowedPorts::RegisterPrefs(registry);
-@@ -1275,8 +1273,6 @@ void RegisterProfilePrefs(user_prefs::Pr
+@@ -1171,7 +1169,6 @@ void RegisterProfilePrefs(user_prefs::Pr
    PushMessagingAppIdentifier::RegisterProfilePrefs(registry);
    QuietNotificationPermissionUiState::RegisterProfilePrefs(registry);
    RegisterBrowserUserPrefs(registry);
--  safe_browsing::file_type::RegisterProfilePrefs(registry);
 -  safe_browsing::RegisterProfilePrefs(registry);
    SearchPrefetchService::RegisterProfilePrefs(registry);
    blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs(
        registry);
---- a/chrome/browser/prefs/chrome_command_line_pref_store.cc
-+++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc
-@@ -25,7 +25,6 @@
+--- chrome/browser/prefs/chrome_command_line_pref_store.cc.orig
++++ chrome/browser/prefs/chrome_command_line_pref_store.cc
+@@ -31,7 +31,6 @@
  #include "components/language/core/browser/pref_names.h"
  #include "components/proxy_config/proxy_config_dictionary.h"
  #include "components/proxy_config/proxy_config_pref_names.h"
@@ -1074,18 +1065,18 @@
  #include "components/safe_browsing/core/common/safebrowsing_switches.h"
  #include "components/sync/base/pref_names.h"
  #include "content/public/common/content_switches.h"
-@@ -75,8 +74,6 @@ const CommandLinePrefStore::BooleanSwitc
+@@ -78,8 +77,6 @@ const CommandLinePrefStore::BooleanSwitc
          {switches::kAllowCrossOriginAuthPrompt,
           prefs::kAllowCrossOriginAuthPrompt, true},
          {switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true},
 -        {safe_browsing::switches::kSbEnableEnhancedProtection,
 -         prefs::kSafeBrowsingEnhanced, true},
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-         {ash::switches::kEnableTouchpadThreeFingerClick,
+         {chromeos::switches::kEnableTouchpadThreeFingerClick,
           prefs::kEnableTouchpadThreeFingerClick, true},
---- a/chrome/browser/prefs/chrome_pref_service_factory.cc
-+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
-@@ -49,10 +49,8 @@
+--- chrome/browser/prefs/chrome_pref_service_factory.cc.orig
++++ chrome/browser/prefs/chrome_pref_service_factory.cc
+@@ -48,10 +48,8 @@
  #include "components/prefs/pref_service.h"
  #include "components/prefs/pref_store.h"
  #include "components/prefs/pref_value_store.h"
@@ -1096,7 +1087,7 @@
  #include "components/sync/base/model_type.h"
  #include "components/sync/base/pref_names.h"
  #include "components/sync_preferences/pref_model_associator.h"
-@@ -122,8 +120,6 @@ const prefs::TrackedPreferenceMetadata k
+@@ -121,8 +119,6 @@ const prefs::TrackedPreferenceMetadata k
      {5, extensions::pref_names::kExtensions, EnforcementLevel::NO_ENFORCEMENT,
       PrefTrackingStrategy::SPLIT, ValueType::IMPERSONAL},
  #endif
@@ -1104,17 +1095,17 @@
 -     PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL},
      {7, prefs::kSearchProviderOverrides, EnforcementLevel::ENFORCE_ON_LOAD,
       PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
- #if !BUILDFLAG(IS_ANDROID)
-@@ -147,8 +143,6 @@ const prefs::TrackedPreferenceMetadata k
+ #if !defined(OS_ANDROID)
+@@ -146,8 +142,6 @@ const prefs::TrackedPreferenceMetadata k
       PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
      // kSyncRemainingRollbackTries is deprecated and will be removed a few
      // releases after M50.
 -    {18, prefs::kSafeBrowsingIncidentsSent, EnforcementLevel::ENFORCE_ON_LOAD,
 -     PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
- #if BUILDFLAG(IS_WIN)
+ #if defined(OS_WIN)
      {19, prefs::kSwReporterPromptVersion, EnforcementLevel::ENFORCE_ON_LOAD,
       PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
-@@ -157,10 +151,6 @@ const prefs::TrackedPreferenceMetadata k
+@@ -156,10 +150,6 @@ const prefs::TrackedPreferenceMetadata k
      {22, prefs::kSwReporterPromptSeed, EnforcementLevel::ENFORCE_ON_LOAD,
       PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
  #endif
@@ -1122,11 +1113,11 @@
 -     PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL},
 -    {24, prefs::kGoogleServicesLastAccountId, EnforcementLevel::ENFORCE_ON_LOAD,
 -     PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL},
- #if BUILDFLAG(IS_WIN)
+ #if defined(OS_WIN)
      {25, prefs::kSettingsResetPromptPromptWave,
       EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC,
---- a/chrome/browser/prefs/pref_functional_browsertest.cc
-+++ b/chrome/browser/prefs/pref_functional_browsertest.cc
+--- chrome/browser/prefs/pref_functional_browsertest.cc.orig
++++ chrome/browser/prefs/pref_functional_browsertest.cc
 @@ -24,7 +24,6 @@
  #include "components/content_settings/core/common/content_settings_types.h"
  #include "components/content_settings/core/common/pref_names.h"
@@ -1136,8 +1127,8 @@
  #include "content/public/browser/web_contents.h"
  #include "content/public/test/browser_test.h"
 @@ -220,9 +219,6 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTe
-   prefetch::SetPreloadPagesState(prefs,
-                                  prefetch::PreloadPagesState::kNoPreloading);
+   prefs->SetInteger(prefs::kNetworkPredictionOptions,
+                     chrome_browser_net::NETWORK_PREDICTION_NEVER);
  
 -  EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
 -  prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false);
@@ -1147,25 +1138,25 @@
  
 @@ -236,7 +232,6 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTe
  
-   EXPECT_EQ(prefetch::PreloadPagesState::kNoPreloading,
-             prefetch::GetPreloadPagesState(*prefs));
+   EXPECT_EQ(chrome_browser_net::NETWORK_PREDICTION_NEVER,
+             prefs->GetInteger(prefs::kNetworkPredictionOptions));
 -  EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
    EXPECT_FALSE(
        prefs->GetBoolean(embedder_support::kAlternateErrorPagesEnabled));
    EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
---- a/chrome/browser/profiles/gaia_info_update_service.cc
-+++ b/chrome/browser/profiles/gaia_info_update_service.cc
-@@ -20,7 +20,6 @@
+--- chrome/browser/profiles/gaia_info_update_service.cc.orig
++++ chrome/browser/profiles/gaia_info_update_service.cc
+@@ -19,7 +19,6 @@
+ #include "chrome/common/pref_names.h"
  #include "components/prefs/pref_service.h"
  #include "components/signin/public/base/avatar_icon_util.h"
- #include "components/signin/public/base/consent_level.h"
 -#include "components/signin/public/base/signin_pref_names.h"
  #include "components/signin/public/identity_manager/account_info.h"
  #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
- #include "content/public/browser/notification_details.h"
---- a/chrome/browser/profiles/gaia_info_update_service_unittest.cc
-+++ b/chrome/browser/profiles/gaia_info_update_service_unittest.cc
-@@ -28,7 +28,6 @@
+ #include "components/signin/public/identity_manager/consent_level.h"
+--- chrome/browser/profiles/gaia_info_update_service_unittest.cc.orig
++++ chrome/browser/profiles/gaia_info_update_service_unittest.cc
+@@ -27,7 +27,6 @@
  #include "chrome/test/base/testing_profile_manager.h"
  #include "components/prefs/pref_service.h"
  #include "components/profile_metrics/state.h"
@@ -1173,9 +1164,9 @@
  #include "components/signin/public/identity_manager/account_info.h"
  #include "components/sync_preferences/pref_service_syncable.h"
  #include "content/public/test/browser_task_environment.h"
---- a/chrome/browser/profiles/profile_attributes_entry.cc
-+++ b/chrome/browser/profiles/profile_attributes_entry.cc
-@@ -26,7 +26,6 @@
+--- chrome/browser/profiles/profile_attributes_entry.cc.orig
++++ chrome/browser/profiles/profile_attributes_entry.cc
+@@ -29,7 +29,6 @@
  #include "components/prefs/pref_service.h"
  #include "components/prefs/scoped_user_pref_update.h"
  #include "components/profile_metrics/state.h"
@@ -1183,7 +1174,7 @@
  #include "components/signin/public/identity_manager/account_info.h"
  #include "third_party/abseil-cpp/absl/types/optional.h"
  #include "ui/base/resource/resource_bundle.h"
-@@ -486,7 +485,7 @@ bool ProfileAttributesEntry::IsUsingDefa
+@@ -490,7 +489,7 @@ bool ProfileAttributesEntry::IsUsingDefa
  }
  
  bool ProfileAttributesEntry::IsSignedInWithCredentialProvider() const {
@@ -1192,7 +1183,7 @@
  }
  
  size_t ProfileAttributesEntry::GetAvatarIconIndex() const {
-@@ -666,9 +665,6 @@ void ProfileAttributesEntry::SetLastDown
+@@ -672,9 +671,6 @@ void ProfileAttributesEntry::SetLastDown
  }
  
  void ProfileAttributesEntry::SetSignedInWithCredentialProvider(bool value) {
@@ -1202,9 +1193,9 @@
  }
  
  void ProfileAttributesEntry::LockForceSigninProfile(bool is_lock) {
---- a/chrome/browser/profiles/profile_attributes_storage.cc
-+++ b/chrome/browser/profiles/profile_attributes_storage.cc
-@@ -38,7 +38,6 @@
+--- chrome/browser/profiles/profile_attributes_storage.cc.orig
++++ chrome/browser/profiles/profile_attributes_storage.cc
+@@ -36,7 +36,6 @@
  #include "components/prefs/scoped_user_pref_update.h"
  #include "components/profile_metrics/state.h"
  #include "components/signin/public/base/persistent_repeating_timer.h"
@@ -1212,7 +1203,7 @@
  #include "content/public/browser/browser_task_traits.h"
  #include "content/public/browser/browser_thread.h"
  #include "third_party/icu/source/i18n/unicode/coll.h"
-@@ -376,8 +375,6 @@ void ProfileAttributesStorage::AddProfil
+@@ -374,8 +373,6 @@ void ProfileAttributesStorage::AddProfil
    if (params.account_id.HasAccountIdKey())
      info.SetStringKey(ProfileAttributesEntry::kAccountIdKey,
                        params.account_id.GetAccountIdKey());
@@ -1221,9 +1212,9 @@
    attributes->SetKey(key, std::move(info));
  
    ProfileAttributesEntry* entry = InitEntryWithKey(key, params.is_omitted);
---- a/chrome/browser/profiles/profile_impl.cc
-+++ b/chrome/browser/profiles/profile_impl.cc
-@@ -149,7 +149,6 @@
+--- chrome/browser/profiles/profile_impl.cc.orig
++++ chrome/browser/profiles/profile_impl.cc
+@@ -150,7 +150,6 @@
  #include "components/prefs/scoped_user_pref_update.h"
  #include "components/profile_metrics/browser_profile_type.h"
  #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
@@ -1231,17 +1222,17 @@
  #include "components/signin/public/identity_manager/identity_manager.h"
  #include "components/site_isolation/site_isolation_policy.h"
  #include "components/spellcheck/spellcheck_buildflags.h"
---- a/chrome/browser/profiles/profile_manager.cc
-+++ b/chrome/browser/profiles/profile_manager.cc
-@@ -93,7 +93,6 @@
- #include "components/signin/public/base/consent_level.h"
+--- chrome/browser/profiles/profile_manager.cc.orig
++++ chrome/browser/profiles/profile_manager.cc
+@@ -94,7 +94,6 @@
+ #include "components/search_engines/default_search_manager.h"
  #include "components/signin/public/base/signin_buildflags.h"
  #include "components/signin/public/base/signin_metrics.h"
 -#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/consent_level.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
  #include "components/signin/public/identity_manager/primary_account_mutator.h"
- #include "components/sync/base/stop_source.h"
-@@ -2228,8 +2227,7 @@ void ProfileManager::AddProfileToStorage
+@@ -2105,8 +2104,7 @@ void ProfileManager::AddProfileToStorage
        entry->SetAuthInfo(account_info.gaia, username,
                           is_consented_primary_account);
  
@@ -1249,9 +1240,9 @@
 -          prefs::kSignedInWithCredentialProvider));
 +      entry->SetSignedInWithCredentialProvider(false);
  
- #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
+ #if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
        // Sign out if force-sign-in policy is enabled and profile is not signed
-@@ -2284,14 +2282,13 @@ void ProfileManager::AddProfileToStorage
+@@ -2161,14 +2159,13 @@ void ProfileManager::AddProfileToStorage
  
    init_params.is_ephemeral = IsEphemeral(profile);
    init_params.is_signed_in_with_credential_provider =
@@ -1267,9 +1258,9 @@
    prefs->SetBoolean(bookmarks::prefs::kEditBookmarksEnabled, false);
    prefs->SetBoolean(bookmarks::prefs::kShowBookmarkBar, false);
    prefs->ClearPref(DefaultSearchManager::kDefaultSearchProviderDataPrefName);
---- a/chrome/browser/profiles/profile_window.cc
-+++ b/chrome/browser/profiles/profile_window.cc
-@@ -41,7 +41,6 @@
+--- chrome/browser/profiles/profile_window.cc.orig
++++ chrome/browser/profiles/profile_window.cc
+@@ -40,7 +40,6 @@
  #include "chrome/common/url_constants.h"
  #include "components/flags_ui/pref_service_flags_storage.h"
  #include "components/prefs/pref_service.h"
@@ -1277,8 +1268,8 @@
  #include "components/signin/public/identity_manager/account_info.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
  #include "content/public/browser/browser_thread.h"
---- a/chrome/browser/profiles/profiles_state.cc
-+++ b/chrome/browser/profiles/profiles_state.cc
+--- chrome/browser/profiles/profiles_state.cc.orig
++++ chrome/browser/profiles/profiles_state.cc
 @@ -42,7 +42,6 @@
  #include <algorithm>
  #include "chrome/browser/profiles/gaia_info_update_service.h"
@@ -1287,24 +1278,24 @@
  #endif
  
  #if BUILDFLAG(IS_CHROMEOS_LACROS)
---- a/chrome/browser/resources/settings/privacy_page/disable_safebrowsing_dialog.html
-+++ b/chrome/browser/resources/settings/privacy_page/disable_safebrowsing_dialog.html
+--- chrome/browser/resources/settings/privacy_page/disable_safebrowsing_dialog.html.orig
++++ chrome/browser/resources/settings/privacy_page/disable_safebrowsing_dialog.html
 @@ -1,12 +1,9 @@
      <cr-dialog id="dialog" close-text="$i18n{close}">
 -      <div slot="title">$i18n{safeBrowsingDisableDialog}</div>
 -      <div slot="body">$i18n{safeBrowsingDisableDialogDesc}</div>
        <div slot="button-container">
-         <cr-button id="cancel" class="cancel-button" on-click="onDialogCancel_">
+         <cr-button class="cancel-button" on-click="onDialogCancel_">
            $i18n{cancel}
          </cr-button>
-         <cr-button id="confirm" class="action-button" on-click="onDialogConfirm_">
+         <cr-button class="action-button" on-click="onDialogConfirm_">
 -          $i18n{safeBrowsingDisableDialogConfirm}
          </cr-button>
        </div>
      </cr-dialog>
---- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
-+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-@@ -565,7 +565,7 @@
+--- chrome/browser/resources/settings/privacy_page/privacy_page.html.orig
++++ chrome/browser/resources/settings/privacy_page/privacy_page.html
+@@ -535,7 +535,7 @@
            </category-setting-exceptions>
          </settings-subpage>
        </template>
@@ -1313,9 +1304,9 @@
            no-search>
          <template is="dom-if" route-path="/content/ads" no-search>
            <settings-subpage page-title="$i18n{siteSettingsAds}"
---- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
-+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
-@@ -102,7 +102,7 @@ export class SettingsPrivacyPageElement
+--- chrome/browser/resources/settings/privacy_page/privacy_page.ts.orig
++++ chrome/browser/resources/settings/privacy_page/privacy_page.ts
+@@ -90,7 +90,7 @@ export class SettingsPrivacyPageElement
        enableSafeBrowsingSubresourceFilter_: {
          type: Boolean,
          value() {
@@ -1324,8 +1315,8 @@
          }
        },
  
---- a/chrome/browser/resources/settings/privacy_page/security_page.html
-+++ b/chrome/browser/resources/settings/privacy_page/security_page.html
+--- chrome/browser/resources/settings/privacy_page/security_page.html.orig
++++ chrome/browser/resources/settings/privacy_page/security_page.html
 @@ -53,105 +53,6 @@
        <img id="banner" alt=""
            src="chrome://settings/images/safe_browsing_banner.svg">
@@ -1432,7 +1423,7 @@
      <div class="cr-row first">
        <h2>$i18n{advancedPageTitle}</h2>
      </div>
-@@ -213,8 +114,3 @@
+@@ -202,8 +103,3 @@
          on-click="onAdvancedProtectionProgramLinkClick_"
          external>
      </cr-link-row>
@@ -1441,27 +1432,25 @@
 -          on-close="onDisableSafebrowsingDialogClose_">
 -      </settings-disable-safebrowsing-dialog>
 -    </template>
---- a/chrome/browser/resources/settings/privacy_page/security_page.ts
-+++ b/chrome/browser/resources/settings/privacy_page/security_page.ts
-@@ -200,17 +200,6 @@ export class SettingsSecurityPageElement
+--- chrome/browser/resources/settings/privacy_page/security_page.ts.orig
++++ chrome/browser/resources/settings/privacy_page/security_page.ts
+@@ -182,15 +182,6 @@ export class SettingsSecurityPageElement
  
-   override ready() {
+   ready() {
      super.ready();
 -
--    CrSettingsPrefs.initialized.then(() => {
--      // Expand initial pref value manually because automatic
--      // expanding is disabled.
--      const prefValue = this.getPref('generated.safe_browsing').value;
--      if (prefValue === SafeBrowsingSetting.ENHANCED) {
--        this.$.safeBrowsingEnhanced.expanded = true;
--      } else if (prefValue === SafeBrowsingSetting.STANDARD) {
--        this.$.safeBrowsingStandard.expanded = true;
--      }
--    });
+-    // Expand initial pref value manually because automatic
+-    // expanding is disabled.
+-    const prefValue = this.getPref('generated.safe_browsing').value;
+-    if (prefValue === SafeBrowsingSetting.ENHANCED) {
+-      this.$.safeBrowsingEnhanced.expanded = true;
+-    } else if (prefValue === SafeBrowsingSetting.STANDARD) {
+-      this.$.safeBrowsingStandard.expanded = true;
+-    }
    }
  
    /**
-@@ -259,8 +248,7 @@ export class SettingsSecurityPageElement
+@@ -239,8 +230,7 @@ export class SettingsSecurityPageElement
    }
  
    private getDisabledExtendedSafeBrowsing_(): boolean {
@@ -1471,9 +1460,9 @@
    }
  
    private getPasswordsLeakToggleSubLabel_(): string {
---- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
-+++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
-@@ -48,7 +48,7 @@ function getCategoryItemMap(): Map<Conte
+--- chrome/browser/resources/settings/site_settings_page/site_settings_page.ts.orig
++++ chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
+@@ -47,7 +47,7 @@ function getCategoryItemMap(): Map<Conte
        enabledLabel: 'siteSettingsAdsAllowed',
        disabledLabel: 'siteSettingsAdsBlocked',
        shouldShow: () =>
@@ -1482,8 +1471,8 @@
      },
      {
        route: routes.SITE_SETTINGS_AR,
---- a/chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc
-+++ b/chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc
+--- chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc.orig
++++ chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc
 @@ -19,7 +19,6 @@
  #include "components/prefs/testing_pref_service.h"
  #include "components/safe_browsing/content/browser/triggers/ad_redirect_trigger.h"
@@ -1492,16 +1481,16 @@
  #include "content/public/browser/render_frame_host.h"
  #include "content/public/browser/web_contents.h"
  #include "content/public/test/browser_test.h"
---- a/chrome/browser/safe_browsing/advanced_protection_status_manager.cc
-+++ b/chrome/browser/safe_browsing/advanced_protection_status_manager.cc
+--- chrome/browser/safe_browsing/advanced_protection_status_manager.cc.orig
++++ chrome/browser/safe_browsing/advanced_protection_status_manager.cc
 @@ -13,7 +13,6 @@
  #include "chrome/browser/signin/identity_manager_factory.h"
  #include "components/prefs/pref_service.h"
  #include "components/safe_browsing/core/common/features.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
- #include "components/signin/public/base/consent_level.h"
  #include "components/signin/public/identity_manager/account_info.h"
  #include "components/signin/public/identity_manager/accounts_mutator.h"
+ #include "components/signin/public/identity_manager/consent_level.h"
 @@ -63,9 +62,7 @@ void AdvancedProtectionStatusManager::Ma
  
    is_under_advanced_protection_ = core_info.is_under_advanced_protection;
@@ -1535,8 +1524,8 @@
  }
  
  bool AdvancedProtectionStatusManager::IsUnconsentedPrimaryAccount(
---- a/chrome/browser/safe_browsing/advanced_protection_status_manager_unittest.cc
-+++ b/chrome/browser/safe_browsing/advanced_protection_status_manager_unittest.cc
+--- chrome/browser/safe_browsing/advanced_protection_status_manager_unittest.cc.orig
++++ chrome/browser/safe_browsing/advanced_protection_status_manager_unittest.cc
 @@ -10,7 +10,6 @@
  #include "base/test/task_environment.h"
  #include "build/chromeos_buildflags.h"
@@ -1545,18 +1534,18 @@
  #include "components/signin/public/identity_manager/account_info.h"
  #include "components/signin/public/identity_manager/accounts_mutator.h"
  #include "components/signin/public/identity_manager/identity_test_environment.h"
---- a/chrome/browser/safe_browsing/android/services_delegate_android.h
-+++ b/chrome/browser/safe_browsing/android/services_delegate_android.h
-@@ -6,7 +6,6 @@
- #define CHROME_BROWSER_SAFE_BROWSING_ANDROID_SERVICES_DELEGATE_ANDROID_H_
+--- chrome/browser/safe_browsing/android/services_delegate_android.h.orig
++++ chrome/browser/safe_browsing/android/services_delegate_android.h
+@@ -7,7 +7,6 @@
  
+ #include "base/macros.h"
  #include "chrome/browser/safe_browsing/services_delegate.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
  
  namespace safe_browsing {
  
---- a/chrome/browser/safe_browsing/certificate_reporting_service.cc
-+++ b/chrome/browser/safe_browsing/certificate_reporting_service.cc
+--- chrome/browser/safe_browsing/certificate_reporting_service.cc.orig
++++ chrome/browser/safe_browsing/certificate_reporting_service.cc
 @@ -14,7 +14,6 @@
  #include "chrome/browser/profiles/profile.h"
  #include "chrome/browser/safe_browsing/safe_browsing_service.h"
@@ -1565,9 +1554,9 @@
  #include "components/security_interstitials/content/certificate_error_report.h"
  #include "content/public/browser/browser_thread.h"
  #include "services/network/public/cpp/shared_url_loader_factory.h"
---- a/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc
-+++ b/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc
-@@ -25,7 +25,6 @@
+--- chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc.orig
++++ chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc
+@@ -27,7 +27,6 @@
  #include "chrome/test/base/in_process_browser_test.h"
  #include "chrome/test/base/ui_test_utils.h"
  #include "components/prefs/pref_service.h"
@@ -1575,8 +1564,8 @@
  #include "components/security_interstitials/content/cert_report_helper.h"
  #include "components/security_interstitials/content/certificate_error_report.h"
  #include "components/variations/variations_params_manager.h"
---- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.cc
-+++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.cc
+--- chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.cc.orig
++++ chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.cc
 @@ -43,7 +43,6 @@
  #include "components/component_updater/component_updater_service.h"
  #include "components/component_updater/pref_names.h"
@@ -1585,9 +1574,9 @@
  #include "content/public/browser/browser_task_traits.h"
  #include "content/public/browser/browser_thread.h"
  #include "net/http/http_status_code.h"
---- a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc
-+++ b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc
-@@ -43,7 +43,6 @@
+--- chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc.orig
++++ chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc
+@@ -44,7 +44,6 @@
  #include "components/policy/core/common/mock_configuration_policy_provider.h"
  #include "components/policy/policy_constants.h"
  #include "components/prefs/pref_service.h"
@@ -1595,8 +1584,8 @@
  #include "content/public/test/browser_test.h"
  #include "testing/gmock/include/gmock/gmock.h"
  #include "testing/gtest/include/gtest/gtest.h"
---- a/chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.cc
-+++ b/chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.cc
+--- chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.cc.orig
++++ chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.cc
 @@ -12,7 +12,6 @@
  #include "chrome/browser/profiles/profile.h"
  #include "chrome/browser/profiles/profile_manager.h"
@@ -1605,9 +1594,9 @@
  #include "components/version_info/version_info.h"
  
  namespace safe_browsing {
---- a/chrome/browser/safe_browsing/chrome_password_protection_service.cc
-+++ b/chrome/browser/safe_browsing/chrome_password_protection_service.cc
-@@ -65,7 +65,6 @@
+--- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig
++++ chrome/browser/safe_browsing/chrome_password_protection_service.cc
+@@ -63,7 +63,6 @@
  #include "components/safe_browsing/core/browser/verdict_cache_manager.h"
  #include "components/safe_browsing/core/common/features.h"
  #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -1615,7 +1604,7 @@
  #include "components/safe_browsing/core/common/safebrowsing_constants.h"
  #include "components/safe_browsing/core/common/utils.h"
  #include "components/security_interstitials/content/unsafe_resource_util.h"
-@@ -1212,14 +1211,6 @@ bool ChromePasswordProtectionService::Ha
+@@ -1220,14 +1219,6 @@ bool ChromePasswordProtectionService::Ha
  }
  
  void ChromePasswordProtectionService::OnWarningTriggerChanged() {
@@ -1630,7 +1619,7 @@
    // Clears captured enterprise password hashes or GSuite sync password hashes.
    password_manager::PasswordReuseManager* reuse_manager =
        GetPasswordReuseManager();
-@@ -1378,7 +1369,7 @@ PrefService* ChromePasswordProtectionSer
+@@ -1385,7 +1376,7 @@ PrefService* ChromePasswordProtectionSer
  }
  
  bool ChromePasswordProtectionService::IsSafeBrowsingEnabled() {
@@ -1639,7 +1628,7 @@
  }
  
  bool ChromePasswordProtectionService::IsExtendedReporting() {
-@@ -1398,44 +1389,7 @@ bool ChromePasswordProtectionService::Is
+@@ -1405,44 +1396,7 @@ bool ChromePasswordProtectionService::Is
  bool ChromePasswordProtectionService::IsPingingEnabled(
      LoginReputationClientRequest::TriggerType trigger_type,
      ReusedPasswordAccountType password_type) {
@@ -1667,7 +1656,7 @@
 -// Only saved password and GAIA password reuse warnings are shown to users on
 -// Android, so other types of password reuse events should be gated by Safe
 -// Browsing extended reporting.
--#if BUILDFLAG(IS_ANDROID)
+-#if defined(OS_ANDROID)
 -    if (password_type.account_type() ==
 -            ReusedPasswordAccountType::SAVED_PASSWORD ||
 -        IsSyncingGMAILPasswordWithSignedInProtectionEnabled(password_type)) {
@@ -1685,8 +1674,8 @@
  }
  
  RequestOutcome ChromePasswordProtectionService::GetPingNotSentReason(
-@@ -1664,22 +1618,6 @@ MaybeCreateCommitDeferringCondition(
-              : nullptr;
+@@ -1661,22 +1615,6 @@ MaybeCreateNavigationThrottle(content::N
+                  : nullptr;
  }
  
 -PasswordProtectionTrigger
@@ -1708,9 +1697,9 @@
  bool ChromePasswordProtectionService::IsURLAllowlistedForPasswordEntry(
      const GURL& url) const {
    if (!profile_)
---- a/chrome/browser/safe_browsing/chrome_password_protection_service.h
-+++ b/chrome/browser/safe_browsing/chrome_password_protection_service.h
-@@ -215,13 +215,6 @@ class ChromePasswordProtectionService :
+--- chrome/browser/safe_browsing/chrome_password_protection_service.h.orig
++++ chrome/browser/safe_browsing/chrome_password_protection_service.h
+@@ -211,13 +211,6 @@ class ChromePasswordProtectionService :
    bool UserClickedThroughSBInterstitial(
        PasswordProtectionRequest* request) override;
  
@@ -1724,9 +1713,9 @@
    // If |url| matches Safe Browsing allowlist domains, password protection
    // change password URL, or password protection login URLs in the enterprise
    // policy.
---- a/chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc
-+++ b/chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc
-@@ -39,7 +39,6 @@
+--- chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc.orig
++++ chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc
+@@ -38,7 +38,6 @@
  #include "components/safe_browsing/content/browser/password_protection/password_protection_test_util.h"
  #include "components/safe_browsing/core/browser/password_protection/metrics_util.h"
  #include "components/safe_browsing/core/common/features.h"
@@ -1734,9 +1723,9 @@
  #include "components/security_state/core/security_state.h"
  #include "components/signin/public/identity_manager/account_info.h"
  #include "components/signin/public/identity_manager/identity_test_environment.h"
---- a/chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc
-+++ b/chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc
-@@ -29,9 +29,7 @@
+--- chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc.orig
++++ chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc
+@@ -28,9 +28,7 @@
  #include "components/prefs/pref_service.h"
  #include "components/prefs/scoped_user_pref_update.h"
  #include "components/safe_browsing/content/browser/password_protection/password_protection_request_content.h"
@@ -1746,9 +1735,9 @@
  #include "components/signin/public/identity_manager/identity_manager.h"
  #include "components/signin/public/identity_manager/identity_test_utils.h"
  #include "components/sync/driver/sync_service.h"
---- a/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
-+++ b/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
-@@ -36,7 +36,6 @@
+--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig
++++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
+@@ -34,7 +34,6 @@
  #include "components/prefs/pref_service.h"
  #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
  #include "components/safe_browsing/core/common/features.h"
@@ -1756,9 +1745,9 @@
  
  #include "content/public/browser/browser_task_traits.h"
  #include "content/public/browser/browser_thread.h"
---- a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
-+++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
-@@ -37,7 +37,6 @@
+--- chrome/browser/safe_browsing/download_protection/check_client_download_request.cc.orig
++++ chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
+@@ -38,7 +38,6 @@
  #include "components/safe_browsing/content/common/file_type_policies.h"
  #include "components/safe_browsing/core/common/features.h"
  #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -1766,8 +1755,8 @@
  #include "components/safe_browsing/core/common/utils.h"
  #include "components/url_matcher/url_matcher.h"
  #include "content/public/browser/browser_context.h"
---- a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc
-+++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc
+--- chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc.orig
++++ chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc
 @@ -24,7 +24,6 @@
  #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
  #include "components/safe_browsing/content/common/file_type_policies.h"
@@ -1776,9 +1765,9 @@
  #include "components/safe_browsing/core/common/utils.h"
  #include "content/public/browser/browser_context.h"
  #include "content/public/browser/browser_task_traits.h"
---- a/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc
-+++ b/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc
-@@ -95,7 +95,6 @@
+--- chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc.orig
++++ chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc
+@@ -93,7 +93,6 @@
  #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
  #include "components/safe_browsing/core/common/features.h"
  #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -1786,8 +1775,8 @@
  #include "components/safe_browsing/core/common/safebrowsing_switches.h"
  #include "components/signin/public/identity_manager/identity_test_environment.h"
  #include "content/public/browser/browser_task_traits.h"
---- a/chrome/browser/safe_browsing/generated_safe_browsing_pref.cc
-+++ b/chrome/browser/safe_browsing/generated_safe_browsing_pref.cc
+--- chrome/browser/safe_browsing/generated_safe_browsing_pref.cc.orig
++++ chrome/browser/safe_browsing/generated_safe_browsing_pref.cc
 @@ -7,7 +7,6 @@
  #include "chrome/browser/profiles/profile.h"
  #include "chrome/common/extensions/api/settings_private.h"
@@ -1818,7 +1807,7 @@
  }
  
  extensions::settings_private::SetPrefResult GeneratedSafeBrowsingPref::SetPref(
-@@ -48,37 +32,14 @@ extensions::settings_private::SetPrefRes
+@@ -48,31 +32,14 @@ extensions::settings_private::SetPrefRes
      return extensions::settings_private::SetPrefResult::PREF_TYPE_MISMATCH;
  
    // If SBER is forcefully disabled, Enhanced cannot be selected by the user.
@@ -1849,16 +1838,10 @@
 -  profile_->GetPrefs()->SetBoolean(prefs::kSafeBrowsingEnhanced,
 -                                   selection == SafeBrowsingSetting::ENHANCED);
 -
--  // Set ESB not set in sync with Account ESB through TailoredSecurity.
--  if (selection == SafeBrowsingSetting::ENHANCED) {
--    profile_->GetPrefs()->SetBoolean(
--        prefs::kEnhancedProtectionEnabledViaTailoredSecurity, false);
--  }
--
    return extensions::settings_private::SetPrefResult::SUCCESS;
  }
  
-@@ -89,10 +50,8 @@ GeneratedSafeBrowsingPref::GetPrefObject
+@@ -83,10 +50,8 @@ GeneratedSafeBrowsingPref::GetPrefObject
    pref_object->key = kGeneratedSafeBrowsingPref;
    pref_object->type = extensions::api::settings_private::PREF_TYPE_NUMBER;
  
@@ -1871,7 +1854,7 @@
  
    if (safe_browsing_enhanced_enabled && safe_browsing_enabled) {
      pref_object->value = std::make_unique<base::Value>(
-@@ -122,29 +81,18 @@ void GeneratedSafeBrowsingPref::ApplySaf
+@@ -116,29 +81,18 @@ void GeneratedSafeBrowsingPref::ApplySaf
    // three different preferences. It is possible that these may be in
    // temporarily conflicting managed states. The enabled preference is always
    // taken as the canonical source of management.
@@ -1907,7 +1890,7 @@
  
    if (!enabled_enforced && !enabled_recommended && !reporting_enforced) {
      // No relevant policies are applied.
-@@ -154,8 +102,6 @@ void GeneratedSafeBrowsingPref::ApplySaf
+@@ -148,8 +102,6 @@ void GeneratedSafeBrowsingPref::ApplySaf
    if (enabled_enforced) {
      // Preference is fully controlled.
      pref_object->enforcement = settings_api::Enforcement::ENFORCEMENT_ENFORCED;
@@ -1916,7 +1899,7 @@
      return;
    }
  
-@@ -180,8 +126,6 @@ void GeneratedSafeBrowsingPref::ApplySaf
+@@ -174,8 +126,6 @@ void GeneratedSafeBrowsingPref::ApplySaf
      // Reporting has been forcefully disabled by policy. Enhanced protection is
      // thus also implicitly disabled by the same policy.
      pref_object->enforcement = settings_api::Enforcement::ENFORCEMENT_ENFORCED;
@@ -1925,9 +1908,9 @@
  
      pref_object->user_selectable_values =
          std::make_unique<std::vector<std::unique_ptr<base::Value>>>();
---- a/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc
-+++ b/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc
-@@ -23,7 +23,6 @@
+--- chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc.orig
++++ chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc
+@@ -22,7 +22,6 @@
  #include "chrome/test/base/testing_profile.h"
  #include "chrome/test/base/testing_profile_manager.h"
  #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -1935,9 +1918,9 @@
  #include "components/sync_preferences/testing_pref_service_syncable.h"
  #include "content/public/test/browser_task_environment.h"
  #include "content/public/test/test_utils.h"
---- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
-+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
-@@ -40,7 +40,6 @@
+--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig
++++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
+@@ -42,7 +42,6 @@
  #include "components/prefs/pref_service.h"
  #include "components/safe_browsing/core/common/features.h"
  #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -1945,8 +1928,8 @@
  #include "content/public/browser/browser_thread.h"
  #include "content/public/browser/download_item_utils.h"
  #include "services/network/public/cpp/shared_url_loader_factory.h"
---- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
-+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
+--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc.orig
++++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
 @@ -36,7 +36,6 @@
  #include "chrome/test/base/testing_profile.h"
  #include "chrome/test/base/testing_profile_manager.h"
@@ -1955,8 +1938,8 @@
  #include "components/sync_preferences/testing_pref_service_syncable.h"
  #include "content/public/test/browser_task_environment.h"
  #include "extensions/browser/quota_service.h"
---- a/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc
-+++ b/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc
+--- chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc.orig
++++ chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc
 @@ -43,7 +43,6 @@
  #include "components/history/core/browser/history_database_params.h"
  #include "components/history/core/browser/history_service.h"
@@ -1965,8 +1948,8 @@
  #include "components/sync_preferences/testing_pref_service_syncable.h"
  #include "content/public/test/browser_task_environment.h"
  #include "content/public/test/test_utils.h"
---- a/chrome/browser/safe_browsing/incident_reporting/state_store.cc
-+++ b/chrome/browser/safe_browsing/incident_reporting/state_store.cc
+--- chrome/browser/safe_browsing/incident_reporting/state_store.cc.orig
++++ chrome/browser/safe_browsing/incident_reporting/state_store.cc
 @@ -14,7 +14,6 @@
  #include "chrome/browser/safe_browsing/incident_reporting/incident.h"
  #include "chrome/browser/safe_browsing/incident_reporting/platform_state_store.h"
@@ -1975,8 +1958,8 @@
  
  namespace safe_browsing {
  
---- a/chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc
-+++ b/chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc
+--- chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc.orig
++++ chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc
 @@ -21,7 +21,6 @@
  #include "chrome/test/base/testing_profile.h"
  #include "chrome/test/base/testing_profile_manager.h"
@@ -1985,8 +1968,8 @@
  #include "components/sync_preferences/pref_service_syncable.h"
  #include "components/sync_preferences/pref_service_syncable_factory.h"
  #include "content/public/test/browser_task_environment.h"
---- a/chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc
-+++ b/chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc
+--- chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc.orig
++++ chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc
 @@ -7,7 +7,6 @@
  #include "base/metrics/histogram_functions.h"
  #include "chrome/browser/profiles/profile.h"
@@ -1995,9 +1978,9 @@
  
  namespace safe_browsing {
  
---- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
-+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
-@@ -79,7 +79,6 @@
+--- chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc.orig
++++ chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
+@@ -74,7 +74,6 @@
  #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h"
  #include "components/safe_browsing/core/browser/verdict_cache_manager.h"
  #include "components/safe_browsing/core/common/features.h"
@@ -2005,9 +1988,9 @@
  #include "components/safe_browsing/core/common/web_ui_constants.h"
  #include "components/security_interstitials/content/security_interstitial_controller_client.h"
  #include "components/security_interstitials/content/security_interstitial_tab_helper.h"
---- a/chrome/browser/safe_browsing/safe_browsing_service.cc
-+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
-@@ -121,7 +121,6 @@ base::FilePath SafeBrowsingService::GetB
+--- chrome/browser/safe_browsing/safe_browsing_service.cc.orig
++++ chrome/browser/safe_browsing/safe_browsing_service.cc
+@@ -103,7 +103,6 @@ base::FilePath SafeBrowsingService::GetB
  
  SafeBrowsingService::SafeBrowsingService()
      : services_delegate_(ServicesDelegate::Create(this)),
@@ -2015,7 +1998,7 @@
        shutdown_(false),
        enabled_(false),
        enabled_by_prefs_(false) {}
-@@ -249,8 +248,6 @@ TriggerManager* SafeBrowsingService::tri
+@@ -257,8 +256,6 @@ TriggerManager* SafeBrowsingService::tri
  
  PasswordProtectionService* SafeBrowsingService::GetPasswordProtectionService(
      Profile* profile) const {
@@ -2024,7 +2007,7 @@
    return nullptr;
  }
  
-@@ -342,9 +339,6 @@ void SafeBrowsingService::OnProfileAdded
+@@ -387,9 +384,6 @@ void SafeBrowsingService::OnProfileAdded
    std::unique_ptr<PrefChangeRegistrar> registrar =
        std::make_unique<PrefChangeRegistrar>();
    registrar->Init(pref_service);
@@ -2034,7 +2017,7 @@
    // ClientSideDetectionService will need to be refresh the models
    // renderers have if extended-reporting changes.
    registrar->Add(prefs::kSafeBrowsingScoutReportingEnabled,
-@@ -373,14 +367,6 @@ void SafeBrowsingService::OnProfileAdded
+@@ -418,14 +412,6 @@ void SafeBrowsingService::OnProfileAdded
                            NoCachedPopulationReason::kChangeMbbPref));
    user_population_prefs_[pref_service] = std::move(registrar);
  
@@ -2049,7 +2032,7 @@
    // Extended Reporting metrics are handled together elsewhere.
    RecordExtendedReportingMetrics(*pref_service);
  
-@@ -423,18 +409,6 @@ void SafeBrowsingService::RefreshState()
+@@ -465,18 +451,6 @@ void SafeBrowsingService::RefreshState()
  
    // Check if any profile requires the service to be active.
    enabled_by_prefs_ = false;
@@ -2068,9 +2051,9 @@
  
    if (enabled_by_prefs_)
      Start();
---- a/chrome/browser/safe_browsing/safe_browsing_service.h
-+++ b/chrome/browser/safe_browsing/safe_browsing_service.h
-@@ -27,7 +27,6 @@
+--- chrome/browser/safe_browsing/safe_browsing_service.h.orig
++++ chrome/browser/safe_browsing/safe_browsing_service.h
+@@ -28,7 +28,6 @@
  #include "components/safe_browsing/buildflags.h"
  #include "components/safe_browsing/content/browser/safe_browsing_service_interface.h"
  #include "components/safe_browsing/core/browser/db/util.h"
@@ -2078,7 +2061,7 @@
  #include "content/public/browser/browser_context.h"
  #include "content/public/browser/browser_thread.h"
  #include "services/network/public/mojom/network_context.mojom-forward.h"
-@@ -94,15 +93,6 @@ class SafeBrowsingService : public SafeB
+@@ -97,15 +96,6 @@ class SafeBrowsingService : public SafeB
    // Called on the main thread to let us know that the io_thread is going away.
    void ShutDown();
  
@@ -2094,9 +2077,9 @@
    // Get current enabled status. Must be called on IO thread.
    bool enabled() const {
      DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-@@ -267,10 +257,6 @@ class SafeBrowsingService : public SafeB
- 
-   std::unique_ptr<ProxyConfigMonitor> proxy_config_monitor_;
+@@ -287,10 +277,6 @@ class SafeBrowsingService : public SafeB
+   // Provides phishing and malware statistics. Accessed on UI thread.
+   std::unique_ptr<PingManager> ping_manager_;
  
 -  // Whether SafeBrowsing Extended Reporting is enabled by the current set of
 -  // profiles. Updated on the UI thread.
@@ -2105,9 +2088,9 @@
    // Whether the service has been shutdown.
    bool shutdown_;
  
---- a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc
-+++ b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc
-@@ -28,7 +28,6 @@
+--- chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc.orig
++++ chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc
+@@ -27,7 +27,6 @@
  #include "components/safe_browsing/core/browser/db/database_manager.h"
  #include "components/safe_browsing/core/browser/ping_manager.h"
  #include "components/safe_browsing/core/common/features.h"
@@ -2115,7 +2098,7 @@
  #include "content/public/browser/browser_task_traits.h"
  #include "content/public/browser/browser_thread.h"
  #include "content/public/browser/download_item_utils.h"
-@@ -141,11 +140,9 @@ bool AndroidTelemetryService::CanSendPin
+@@ -142,11 +141,9 @@ bool AndroidTelemetryService::CanSendPin
      return false;
    }
  
@@ -2130,9 +2113,9 @@
  
    if (profile_->IsOffTheRecord()) {
      RecordApkDownloadTelemetryOutcome(
---- a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc
-+++ b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc
-@@ -19,7 +19,6 @@
+--- chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc.orig
++++ chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc
+@@ -18,7 +18,6 @@
  #include "components/download/public/common/mock_download_item.h"
  #include "components/prefs/pref_service.h"
  #include "components/safe_browsing/core/common/features.h"
@@ -2140,8 +2123,8 @@
  #include "content/public/browser/browser_task_traits.h"
  #include "content/public/browser/browser_thread.h"
  #include "content/public/browser/download_item_utils.h"
---- a/chrome/browser/safe_browsing/url_checker_delegate_impl.cc
-+++ b/chrome/browser/safe_browsing/url_checker_delegate_impl.cc
+--- chrome/browser/safe_browsing/url_checker_delegate_impl.cc.orig
++++ chrome/browser/safe_browsing/url_checker_delegate_impl.cc
 @@ -21,7 +21,6 @@
  #include "components/safe_browsing/core/browser/db/database_manager.h"
  #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
@@ -2150,9 +2133,9 @@
  #include "components/security_interstitials/content/unsafe_resource_util.h"
  #include "content/public/browser/browser_task_traits.h"
  #include "content/public/browser/browser_thread.h"
---- a/chrome/browser/signin/account_consistency_mode_manager.cc
-+++ b/chrome/browser/signin/account_consistency_mode_manager.cc
-@@ -20,7 +20,6 @@
+--- chrome/browser/signin/account_consistency_mode_manager.cc.orig
++++ chrome/browser/signin/account_consistency_mode_manager.cc
+@@ -19,7 +19,6 @@
  #include "components/pref_registry/pref_registry_syncable.h"
  #include "components/prefs/pref_service.h"
  #include "components/signin/public/base/signin_buildflags.h"
@@ -2160,7 +2143,7 @@
  #include "google_apis/google_api_keys.h"
  
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -97,7 +96,6 @@ AccountConsistencyModeManager::AccountCo
+@@ -98,7 +97,6 @@ AccountConsistencyModeManager::AccountCo
    // pref.
    bool signin_allowed = IsDiceSignInAllowed() &&
                          prefs->GetBoolean(prefs::kSigninAllowedOnNextStartup);
@@ -2168,8 +2151,8 @@
  
    UMA_HISTOGRAM_BOOLEAN("Signin.SigninAllowed", signin_allowed);
  #endif
-@@ -192,16 +190,7 @@ AccountConsistencyModeManager::ComputeAc
-   return AccountConsistencyMethod::kMirror;
+@@ -196,16 +194,7 @@ AccountConsistencyModeManager::ComputeAc
+     // AccountManager is not available, when DICE has been disabled on Lacros.
  #endif
  
 -#if BUILDFLAG(ENABLE_DICE_SUPPORT)
@@ -2185,9 +2168,9 @@
 -  NOTREACHED();
    return AccountConsistencyMethod::kDisabled;
  }
---- a/chrome/browser/signin/account_consistency_mode_manager_unittest.cc
-+++ b/chrome/browser/signin/account_consistency_mode_manager_unittest.cc
-@@ -19,7 +19,6 @@
+--- chrome/browser/signin/account_consistency_mode_manager_unittest.cc.orig
++++ chrome/browser/signin/account_consistency_mode_manager_unittest.cc
+@@ -20,7 +20,6 @@
  #include "components/prefs/testing_pref_store.h"
  #include "components/signin/public/base/account_consistency_method.h"
  #include "components/signin/public/base/signin_buildflags.h"
@@ -2195,33 +2178,33 @@
  #include "components/sync_preferences/testing_pref_service_syncable.h"
  #include "content/public/test/browser_task_environment.h"
  #include "testing/gtest/include/gtest/gtest.h"
---- a/chrome/browser/signin/chrome_device_id_helper.cc
-+++ b/chrome/browser/signin/chrome_device_id_helper.cc
-@@ -17,7 +17,6 @@
+--- chrome/browser/signin/chrome_device_id_helper.cc.orig
++++ chrome/browser/signin/chrome_device_id_helper.cc
+@@ -16,7 +16,6 @@
+ #include "base/logging.h"
  #include "chrome/browser/ash/profiles/profile_helper.h"
- #include "chrome/browser/browser_process.h"
  #include "components/prefs/pref_service.h"
 -#include "components/signin/public/base/signin_pref_names.h"
  #include "components/signin/public/base/signin_switches.h"
  #include "components/user_manager/known_user.h"
  #include "components/user_manager/user_manager.h"
-@@ -70,21 +69,11 @@ void MigrateSigninScopedDeviceId(Profile
-   user_manager::KnownUser known_user(g_browser_process->local_state());
+@@ -67,21 +66,11 @@ void MigrateSigninScopedDeviceId(Profile
+     return;
    const AccountId account_id = user->GetAccountId();
-   if (known_user.GetDeviceId(account_id).empty()) {
+   if (user_manager::known_user::GetDeviceId(account_id).empty()) {
 -    const std::string legacy_device_id = profile->GetPrefs()->GetString(
 -        prefs::kGoogleServicesSigninScopedDeviceId);
 -    if (!legacy_device_id.empty()) {
 -      // Need to move device ID from the old location to the new one, if it has
 -      // not been done yet.
--      known_user.SetDeviceId(account_id, legacy_device_id);
+-      user_manager::known_user::SetDeviceId(account_id, legacy_device_id);
 -    } else {
--      known_user.SetDeviceId(
+-      user_manager::known_user::SetDeviceId(
 -          account_id, GenerateSigninScopedDeviceId(
 -                          user_manager::UserManager::Get()
 -                              ->IsUserNonCryptohomeDataEphemeral(account_id)));
 -    }
-+    known_user.SetDeviceId(
++    user_manager::known_user::SetDeviceId(
 +        account_id, GenerateSigninScopedDeviceId(
 +                        user_manager::UserManager::Get()
 +                            ->IsUserNonCryptohomeDataEphemeral(account_id)));
@@ -2231,8 +2214,8 @@
  }
  
  #endif
---- a/chrome/browser/signin/chrome_signin_client.cc
-+++ b/chrome/browser/signin/chrome_signin_client.cc
+--- chrome/browser/signin/chrome_signin_client.cc.orig
++++ chrome/browser/signin/chrome_signin_client.cc
 @@ -38,7 +38,6 @@
  #include "components/prefs/pref_service.h"
  #include "components/signin/core/browser/cookie_settings_util.h"
@@ -2241,8 +2224,8 @@
  #include "components/signin/public/identity_manager/access_token_info.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
  #include "components/signin/public/identity_manager/scope_set.h"
---- a/chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc
-+++ b/chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc
+--- chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc.orig
++++ chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc
 @@ -21,7 +21,6 @@
  #include "components/network_session_configurator/common/network_switches.h"
  #include "components/prefs/pref_service.h"
@@ -2251,9 +2234,9 @@
  #include "components/signin/public/identity_manager/identity_test_utils.h"
  #include "components/user_manager/user.h"
  #include "components/user_manager/user_manager.h"
---- a/chrome/browser/signin/dice_browsertest.cc
-+++ b/chrome/browser/signin/dice_browsertest.cc
-@@ -60,7 +60,6 @@
+--- chrome/browser/signin/dice_browsertest.cc.orig
++++ chrome/browser/signin/dice_browsertest.cc
+@@ -59,7 +59,6 @@
  #include "components/signin/public/base/account_consistency_method.h"
  #include "components/signin/public/base/signin_client.h"
  #include "components/signin/public/base/signin_metrics.h"
@@ -2261,8 +2244,8 @@
  #include "components/signin/public/identity_manager/identity_manager.h"
  #include "components/signin/public/identity_manager/identity_test_utils.h"
  #include "components/signin/public/identity_manager/primary_account_mutator.h"
---- a/chrome/browser/signin/header_modification_delegate_impl.cc
-+++ b/chrome/browser/signin/header_modification_delegate_impl.cc
+--- chrome/browser/signin/header_modification_delegate_impl.cc.orig
++++ chrome/browser/signin/header_modification_delegate_impl.cc
 @@ -15,7 +15,6 @@
  #include "chrome/browser/sync/sync_service_factory.h"
  #include "chrome/common/pref_names.h"
@@ -2280,9 +2263,9 @@
  #endif
        cookie_settings_.get());
  }
---- a/chrome/browser/signin/mirror_browsertest.cc
-+++ b/chrome/browser/signin/mirror_browsertest.cc
-@@ -30,7 +30,6 @@
+--- chrome/browser/signin/mirror_browsertest.cc.orig
++++ chrome/browser/signin/mirror_browsertest.cc
+@@ -31,7 +31,6 @@
  #include "components/prefs/pref_service.h"
  #include "components/signin/core/browser/dice_header_helper.h"
  #include "components/signin/core/browser/signin_header_helper.h"
@@ -2290,97 +2273,29 @@
  #include "content/public/common/content_client.h"
  #include "content/public/test/browser_test.h"
  #include "google_apis/gaia/gaia_urls.h"
---- a/chrome/browser/signin/primary_account_policy_manager.cc
-+++ b/chrome/browser/signin/primary_account_policy_manager.cc
-@@ -14,7 +14,6 @@
- #include "chrome/grit/generated_resources.h"
- #include "components/prefs/pref_service.h"
- #include "components/signin/public/base/signin_metrics.h"
--#include "components/signin/public/base/signin_pref_names.h"
- #include "components/signin/public/identity_manager/account_info.h"
- #include "components/signin/public/identity_manager/identity_manager.h"
- #include "components/signin/public/identity_manager/identity_utils.h"
-@@ -178,23 +177,11 @@ void PrimaryAccountPolicyManager::Initia
-   EnsurePrimaryAccountAllowedForProfile(
-       profile_, signin_metrics::SIGNIN_NOT_ALLOWED_ON_PROFILE_INIT);
+--- chrome/browser/signin/signin_manager.cc.orig
++++ chrome/browser/signin/signin_manager.cc
+@@ -5,7 +5,6 @@
+ #include "chrome/browser/signin/signin_manager.h"
  
--  signin_allowed_.Init(
--      prefs::kSigninAllowed, profile_->GetPrefs(),
--      base::BindRepeating(
--          &PrimaryAccountPolicyManager::OnSigninAllowedPrefChanged,
--          weak_pointer_factory_.GetWeakPtr()));
--
-   local_state_pref_registrar_.Init(g_browser_process->local_state());
--  local_state_pref_registrar_.Add(
--      prefs::kGoogleServicesUsernamePattern,
--      base::BindRepeating(
--          &PrimaryAccountPolicyManager::OnGoogleServicesUsernamePatternChanged,
--          weak_pointer_factory_.GetWeakPtr()));
- }
- 
- void PrimaryAccountPolicyManager::Shutdown() {
-   local_state_pref_registrar_.RemoveAll();
--  signin_allowed_.Destroy();
- }
- 
- void PrimaryAccountPolicyManager::OnGoogleServicesUsernamePatternChanged() {
-@@ -219,11 +206,6 @@ void PrimaryAccountPolicyManager::Ensure
- 
-   CoreAccountInfo primary_account =
-       identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync);
--  if (profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed) &&
--      signin::IsUsernameAllowedByPatternFromPrefs(
--          g_browser_process->local_state(), primary_account.email)) {
--    return;
--  }
- 
- #if BUILDFLAG(IS_CHROMEOS_LACROS)
-   // Disabling signin in chrome and 'RestrictSigninToPattern' policy
---- a/chrome/browser/signin/primary_account_policy_manager.h
-+++ b/chrome/browser/signin/primary_account_policy_manager.h
-@@ -61,9 +61,6 @@ class PrimaryAccountPolicyManager : publ
- 
-   raw_ptr<Profile> profile_;
- 
--  // Helper object to listen for changes to the signin allowed preference.
--  BooleanPrefMember signin_allowed_;
--
-   // Helper object to listen for changes to signin preferences stored in non-
-   // profile-specific local prefs (like kGoogleServicesUsernamePattern).
-   PrefChangeRegistrar local_state_pref_registrar_;
---- a/chrome/browser/signin/primary_account_policy_manager_unittest.cc
-+++ b/chrome/browser/signin/primary_account_policy_manager_unittest.cc
-@@ -14,7 +14,6 @@
- #include "chrome/test/base/testing_browser_process.h"
- #include "chrome/test/base/testing_profile.h"
- #include "chrome/test/base/testing_profile_manager.h"
--#include "components/signin/public/base/signin_pref_names.h"
- #include "components/signin/public/identity_manager/identity_test_environment.h"
- #include "content/public/test/browser_task_environment.h"
- #include "testing/gtest/include/gtest/gtest.h"
---- a/chrome/browser/signin/signin_manager.cc
-+++ b/chrome/browser/signin/signin_manager.cc
-@@ -6,7 +6,6 @@
- 
- #include "base/bind.h"
  #include "components/prefs/pref_service.h"
 -#include "components/signin/public/base/signin_pref_names.h"
  #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
  #include "components/signin/public/identity_manager/primary_account_mutator.h"
-@@ -21,11 +20,6 @@ SigninManager::SigninManager(PrefService
-                              signin::IdentityManager* identity_manager,
-                              SigninClient* client)
+@@ -13,11 +12,6 @@
+ SigninManager::SigninManager(PrefService* prefs,
+                              signin::IdentityManager* identity_manager)
      : prefs_(prefs), identity_manager_(identity_manager) {
 -  signin_allowed_.Init(
 -      prefs::kSigninAllowed, prefs_,
 -      base::BindRepeating(&SigninManager::OnSigninAllowedPrefChanged,
 -                          base::Unretained(this)));
 -
- #if BUILDFLAG(IS_CHROMEOS_LACROS)
-   is_main_profile_ = client->GetInitialPrimaryAccount().has_value();
- #endif
-@@ -128,16 +122,6 @@ CoreAccountInfo SigninManager::ComputeUn
+   UpdateUnconsentedPrimaryAccount();
+   identity_manager_->AddObserver(this);
+ }
+@@ -63,16 +57,6 @@ SigninManager::ComputeUnconsentedPrimary
          signin::ConsentLevel::kSync);
    }
  
@@ -2392,13 +2307,13 @@
 -  // It was considered simpler to keep the logic to update the unconsented
 -  // primary account in a single place.
 -  if (!signin_allowed_.GetValue())
--    return CoreAccountInfo();
+-    return absl::nullopt;
 -
    signin::AccountsInCookieJarInfo cookie_info =
        identity_manager_->GetAccountsInCookieJar();
  
---- a/chrome/browser/signin/signin_promo_util.cc
-+++ b/chrome/browser/signin/signin_promo_util.cc
+--- chrome/browser/signin/signin_promo_util.cc.orig
++++ chrome/browser/signin/signin_promo_util.cc
 @@ -8,7 +8,6 @@
  #include "chrome/browser/profiles/profile.h"
  #include "chrome/browser/signin/identity_manager_factory.h"
@@ -2416,18 +2331,37 @@
      return false;
  
    // Display the signin promo if the user is not signed in.
---- a/chrome/browser/signin/signin_ui_util.cc
-+++ b/chrome/browser/signin/signin_ui_util.cc
-@@ -39,7 +39,6 @@
+--- chrome/browser/signin/signin_ui_util.cc.orig
++++ chrome/browser/signin/signin_ui_util.cc
+@@ -34,7 +34,6 @@
+ #include "components/feature_engagement/public/tracker.h"
  #include "components/prefs/pref_service.h"
- #include "components/signin/public/base/consent_level.h"
  #include "components/signin/public/base/signin_metrics.h"
 -#include "components/signin/public/base/signin_pref_names.h"
  #include "components/signin/public/identity_manager/account_info.h"
  #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
+ #include "components/signin/public/identity_manager/consent_level.h"
+--- chrome/browser/signin/signin_util.cc.orig
++++ chrome/browser/signin/signin_util.cc
+@@ -30,7 +30,6 @@
+ #include "components/google/core/common/google_util.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
---- a/chrome/browser/signin/signin_util_win.cc
-+++ b/chrome/browser/signin/signin_util_win.cc
+ #include "components/signin/public/identity_manager/identity_utils.h"
+ #include "components/signin/public/identity_manager/primary_account_mutator.h"
+@@ -232,7 +231,7 @@ void EnsurePrimaryAccountAllowedForProfi
+ 
+   CoreAccountInfo primary_account =
+       identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync);
+-  if (profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed) &&
++  if (false &&
+       signin::IsUsernameAllowedByPatternFromPrefs(
+           g_browser_process->local_state(), primary_account.email)) {
+     return;
+--- chrome/browser/signin/signin_util_win.cc.orig
++++ chrome/browser/signin/signin_util_win.cc
 @@ -34,7 +34,6 @@
  #include "components/prefs/pref_service.h"
  #include "components/signin/core/browser/about_signin_internals.h"
@@ -2436,8 +2370,8 @@
  #include "components/signin/public/identity_manager/accounts_mutator.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
  
-@@ -134,9 +133,6 @@ void ImportCredentialsFromProvider(Profi
-                                   account_id, nullptr, profile));
+@@ -136,9 +135,6 @@ void ImportCredentialsFromProvider(Profi
+                                        account_id, nullptr));
      }
    }
 -
@@ -2446,7 +2380,7 @@
  }
  
  // Extracts the |cred_provider_gaia_id| and |cred_provider_email| for the user
-@@ -311,20 +307,7 @@ bool ReauthWithCredentialProviderIfPossi
+@@ -313,20 +309,7 @@ bool ReauthWithCredentialProviderIfPossi
    //  - The profile is marked as having been signed in with a system credential.
    //  - The profile is already signed in.
    //  - The profile is in an auth error state.
@@ -2467,8 +2401,8 @@
  }
  
  }  // namespace signin_util
---- a/chrome/browser/signin/signin_util_win_browsertest.cc
-+++ b/chrome/browser/signin/signin_util_win_browsertest.cc
+--- chrome/browser/signin/signin_util_win_browsertest.cc.orig
++++ chrome/browser/signin/signin_util_win_browsertest.cc
 @@ -31,7 +31,6 @@
  #include "chrome/test/base/in_process_browser_test.h"
  #include "chrome/test/base/testing_browser_process.h"
@@ -2477,9 +2411,9 @@
  #include "components/signin/public/identity_manager/identity_manager.h"
  #include "components/signin/public/identity_manager/identity_test_utils.h"
  #include "components/signin/public/identity_manager/primary_account_mutator.h"
---- a/chrome/browser/ssl/certificate_reporting_test_utils.cc
-+++ b/chrome/browser/ssl/certificate_reporting_test_utils.cc
-@@ -14,7 +14,6 @@
+--- chrome/browser/ssl/certificate_reporting_test_utils.cc.orig
++++ chrome/browser/ssl/certificate_reporting_test_utils.cc
+@@ -15,7 +15,6 @@
  #include "build/build_config.h"
  #include "chrome/browser/profiles/profile.h"
  #include "components/prefs/pref_service.h"
@@ -2487,38 +2421,29 @@
  #include "components/security_interstitials/content/cert_report_helper.h"
  #include "components/security_interstitials/content/certificate_error_report.h"
  #include "components/variations/variations_associated_data.h"
---- a/chrome/browser/ssl/sct_reporting_service.cc
-+++ b/chrome/browser/ssl/sct_reporting_service.cc
-@@ -12,7 +12,6 @@
+--- chrome/browser/ssl/sct_reporting_service.cc.orig
++++ chrome/browser/ssl/sct_reporting_service.cc
+@@ -9,7 +9,6 @@
+ #include "chrome/browser/net/system_network_context_manager.h"
+ #include "chrome/browser/safe_browsing/safe_browsing_service.h"
  #include "chrome/common/chrome_features.h"
- #include "chrome/common/pref_names.h"
- #include "components/prefs/pref_service.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
  #include "content/public/browser/network_service_instance.h"
  #include "content/public/browser/storage_partition.h"
- #include "google_apis/google_api_keys.h"
-@@ -199,18 +198,6 @@ void SetSCTAuditingEnabledForStoragePart
- }  // namespace
- 
- network::mojom::SCTAuditingMode SCTReportingService::GetReportingMode() {
--  if (profile_->IsOffTheRecord() ||
--      !base::FeatureList::IsEnabled(features::kSCTAuditing)) {
--    return network::mojom::SCTAuditingMode::kDisabled;
--  }
--  if (safe_browsing::IsSafeBrowsingEnabled(pref_service_)) {
--    if (safe_browsing::IsExtendedReportingEnabled(pref_service_)) {
--      return network::mojom::SCTAuditingMode::kEnhancedSafeBrowsingReporting;
--    }
--    if (base::FeatureList::IsEnabled(features::kSCTAuditingHashdance)) {
--      return network::mojom::SCTAuditingMode::kHashdance;
--    }
--  }
-   return network::mojom::SCTAuditingMode::kDisabled;
+ #include "net/traffic_annotation/network_traffic_annotation.h"
+@@ -119,8 +118,5 @@ void SCTReportingService::SetReportingEn
  }
  
---- a/chrome/browser/ssl/ssl_browsertest.cc
-+++ b/chrome/browser/ssl/ssl_browsertest.cc
-@@ -93,7 +93,6 @@
+ void SCTReportingService::OnPreferenceChanged() {
+-  const bool enabled = safe_browsing_service_ &&
+-                       safe_browsing_service_->enabled_by_prefs() &&
+-                       safe_browsing::IsExtendedReportingEnabled(pref_service_);
+-  SetReportingEnabled(enabled);
++  SetReportingEnabled(false);
+ }
+--- chrome/browser/ssl/ssl_browsertest.cc.orig
++++ chrome/browser/ssl/ssl_browsertest.cc
+@@ -94,7 +94,6 @@
  #include "components/policy/policy_constants.h"
  #include "components/prefs/testing_pref_service.h"
  #include "components/safe_browsing/core/common/features.h"
@@ -2526,9 +2451,9 @@
  #include "components/security_interstitials/content/bad_clock_blocking_page.h"
  #include "components/security_interstitials/content/captive_portal_blocking_page.h"
  #include "components/security_interstitials/content/cert_report_helper.h"
---- a/chrome/browser/ssl/ssl_error_controller_client.cc
-+++ b/chrome/browser/ssl/ssl_error_controller_client.cc
-@@ -22,7 +22,6 @@
+--- chrome/browser/ssl/ssl_error_controller_client.cc.orig
++++ chrome/browser/ssl/ssl_error_controller_client.cc
+@@ -23,7 +23,6 @@
  #include "chrome/browser/ssl/stateful_ssl_host_state_delegate_factory.h"
  #include "chrome/common/pref_names.h"
  #include "chrome/common/url_constants.h"
@@ -2536,17 +2461,17 @@
  #include "components/security_interstitials/content/content_metrics_helper.h"
  #include "components/security_interstitials/content/settings_page_helper.h"
  #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
---- a/chrome/browser/supervised_user/supervised_user_pref_store.cc
-+++ b/chrome/browser/supervised_user/supervised_user_pref_store.cc
-@@ -25,7 +25,6 @@
+--- chrome/browser/supervised_user/supervised_user_pref_store.cc.orig
++++ chrome/browser/supervised_user/supervised_user_pref_store.cc
+@@ -23,7 +23,6 @@
  #include "chrome/common/pref_names.h"
  #include "components/feed/core/shared_prefs/pref_names.h"
  #include "components/prefs/pref_value_map.h"
 -#include "components/signin/public/base/signin_pref_names.h"
- #include "components/signin/public/base/signin_switches.h"
  #include "extensions/buildflags/buildflags.h"
  
-@@ -58,10 +57,6 @@ SupervisedUserSettingsPrefMappingEntry k
+ namespace {
+@@ -55,10 +54,6 @@ SupervisedUserSettingsPrefMappingEntry k
          prefs::kSupervisedUserSafeSites,
      },
      {
@@ -2557,7 +2482,7 @@
          supervised_users::kUserName,
          prefs::kProfileName,
      },
-@@ -127,7 +122,6 @@ void SupervisedUserPrefStore::OnNewSetti
+@@ -124,7 +119,6 @@ void SupervisedUserPrefStore::OnNewSetti
      prefs_->SetInteger(prefs::kForceYouTubeRestrict,
                         safe_search_util::YOUTUBE_RESTRICT_MODERATE);
      prefs_->SetBoolean(prefs::kHideWebStoreIcon, false);
@@ -2565,8 +2490,8 @@
      prefs_->SetBoolean(feed::prefs::kEnableSnippets, false);
  
      // Copy supervised user settings to prefs.
---- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
-+++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
+--- chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc.orig
++++ chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
 @@ -37,7 +37,6 @@
  #include "components/autofill/core/common/autofill_features.h"
  #include "components/autofill/core/common/autofill_payments_features.h"
@@ -2575,8 +2500,8 @@
  #include "components/signin/public/identity_manager/identity_manager.h"
  #include "components/strings/grit/components_strings.h"
  #include "components/sync/driver/sync_service.h"
---- a/chrome/browser/ui/browser_command_controller.cc
-+++ b/chrome/browser/ui/browser_command_controller.cc
+--- chrome/browser/ui/browser_command_controller.cc.orig
++++ chrome/browser/ui/browser_command_controller.cc
 @@ -57,7 +57,6 @@
  #include "components/prefs/pref_service.h"
  #include "components/sessions/core/tab_restore_service.h"
@@ -2585,7 +2510,7 @@
  #include "content/public/browser/native_web_keyboard_event.h"
  #include "content/public/browser/navigation_controller.h"
  #include "content/public/browser/navigation_entry.h"
-@@ -214,10 +213,6 @@ BrowserCommandController::BrowserCommand
+@@ -184,10 +183,6 @@ BrowserCommandController::BrowserCommand
            &BrowserCommandController::UpdateCommandsForFullscreenMode,
            base::Unretained(this)));
  #endif
@@ -2596,7 +2521,7 @@
  
    InitCommandState();
  
-@@ -1611,7 +1606,7 @@ void BrowserCommandController::UpdateSho
+@@ -1526,7 +1521,7 @@ void BrowserCommandController::UpdateSho
      return;
  
    command_updater_.UpdateCommandEnabled(
@@ -2604,10 +2529,10 @@
 +      IDC_SHOW_SIGNIN, false);
  }
  
- void BrowserCommandController::UpdateReloadStopState(bool is_loading,
---- a/chrome/browser/ui/browser_command_controller.h
-+++ b/chrome/browser/ui/browser_command_controller.h
-@@ -212,7 +212,6 @@ class BrowserCommandController : public
+ // static
+--- chrome/browser/ui/browser_command_controller.h.orig
++++ chrome/browser/ui/browser_command_controller.h
+@@ -211,7 +211,6 @@ class BrowserCommandController : public
  
    PrefChangeRegistrar profile_pref_registrar_;
    PrefChangeRegistrar local_pref_registrar_;
@@ -2615,8 +2540,8 @@
  
    // In locked fullscreen mode disallow enabling/disabling commands.
    bool is_locked_fullscreen_ = false;
---- a/chrome/browser/ui/browser_command_controller_unittest.cc
-+++ b/chrome/browser/ui/browser_command_controller_unittest.cc
+--- chrome/browser/ui/browser_command_controller_unittest.cc.orig
++++ chrome/browser/ui/browser_command_controller_unittest.cc
 @@ -27,7 +27,6 @@
  #include "chrome/test/base/test_browser_window.h"
  #include "chrome/test/base/testing_browser_process.h"
@@ -2625,17 +2550,17 @@
  #include "content/public/browser/native_web_keyboard_event.h"
  #include "ui/events/keycodes/dom/dom_code.h"
  #include "ui/events/keycodes/keyboard_codes.h"
---- a/chrome/browser/ui/chrome_pages.cc
-+++ b/chrome/browser/ui/chrome_pages.cc
-@@ -64,7 +64,6 @@
- #if !BUILDFLAG(IS_ANDROID)
- #include "base/metrics/histogram_functions.h"
+--- chrome/browser/ui/chrome_pages.cc.orig
++++ chrome/browser/ui/chrome_pages.cc
+@@ -61,7 +61,6 @@
+ 
+ #if !defined(OS_ANDROID)
  #include "chrome/browser/signin/identity_manager_factory.h"
 -#include "components/signin/public/base/signin_pref_names.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
  #endif
  
-@@ -524,13 +523,7 @@ void ShowBrowserSignin(Browser* browser,
+@@ -484,13 +483,7 @@ void ShowBrowserSignin(Browser* browser,
  
  void ShowBrowserSigninOrSettings(Browser* browser,
                                   signin_metrics::AccessPoint access_point) {
@@ -2650,18 +2575,18 @@
  }
  #endif
  
---- a/chrome/browser/ui/hats/trust_safety_sentiment_service.cc
-+++ b/chrome/browser/ui/hats/trust_safety_sentiment_service.cc
-@@ -22,8 +22,6 @@
+--- chrome/browser/ui/hats/trust_safety_sentiment_service.cc.orig
++++ chrome/browser/ui/hats/trust_safety_sentiment_service.cc
+@@ -19,8 +19,6 @@
+ #include "components/content_settings/core/common/pref_names.h"
  #include "components/password_manager/core/common/password_manager_pref_names.h"
  #include "components/prefs/pref_service.h"
- #include "components/privacy_sandbox/privacy_sandbox_prefs.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
 -#include "components/signin/public/base/signin_pref_names.h"
  #include "components/unified_consent/pref_names.h"
- #include "components/version_info/channel.h"
  
-@@ -128,9 +126,6 @@ bool HasNonDefaultPrivacySetting(Profile
+ namespace {
+@@ -81,9 +79,6 @@ bool HasNonDefaultPrivacySetting(Profile
    auto* prefs = profile->GetPrefs();
  
    std::vector<std::string> prefs_to_check = {
@@ -2671,7 +2596,7 @@
        prefs::kEnableDoNotTrack,
        password_manager::prefs::kPasswordLeakDetectionEnabled,
        prefs::kCookieControlsMode,
-@@ -148,13 +143,9 @@ bool HasNonDefaultPrivacySetting(Profile
+@@ -101,13 +96,9 @@ bool HasNonDefaultPrivacySetting(Profile
    // Users consenting to sync automatically enable UKM collection
    auto* ukm_pref = prefs->FindPreference(
        unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled);
@@ -2686,9 +2611,9 @@
  
    // Check the default value for each user facing content setting. Note that
    // this will not include content setting exceptions set via permission
---- a/chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc
-+++ b/chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc
-@@ -19,7 +19,6 @@
+--- chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc.orig
++++ chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc
+@@ -20,7 +20,6 @@
  #include "components/password_manager/core/browser/password_manager_metrics_util.h"
  #include "components/safe_browsing/content/browser/password_protection/password_protection_test_util.h"
  #include "components/safe_browsing/core/browser/password_protection/metrics_util.h"
@@ -2696,36 +2621,36 @@
  #include "components/signin/public/identity_manager/account_info.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
  #include "components/signin/public/identity_manager/identity_test_utils.h"
---- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
-+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
+--- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig
++++ chrome/browser/ui/views/profiles/profile_menu_view.cc
 @@ -53,7 +53,6 @@
+ #include "chrome/grit/generated_resources.h"
  #include "chrome/grit/theme_resources.h"
  #include "components/signin/core/browser/signin_error_controller.h"
- #include "components/signin/public/base/consent_level.h"
 -#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/consent_level.h"
  #include "components/signin/public/identity_manager/primary_account_mutator.h"
  #include "components/strings/grit/components_strings.h"
- #include "components/vector_icons/vector_icons.h"
-@@ -508,7 +507,6 @@ void ProfileMenuView::BuildAutofillButto
+@@ -501,7 +500,6 @@ void ProfileMenuView::BuildAutofillButto
  
  void ProfileMenuView::BuildSyncInfo() {
    Profile* profile = browser()->profile();
 -  if (!profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed))
      return;
  
-   if (!SyncServiceFactory::IsSyncAllowed(profile)) {
---- a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
-+++ b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
-@@ -60,7 +60,6 @@
- #include "components/google/core/common/google_util.h"
+   signin::IdentityManager* identity_manager =
+--- chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc.orig
++++ chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
+@@ -55,7 +55,6 @@
+ #include "components/feature_engagement/public/tracker.h"
+ #include "components/feature_engagement/test/test_tracker.h"
  #include "components/prefs/pref_service.h"
- #include "components/signin/public/base/consent_level.h"
 -#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/consent_level.h"
  #include "components/signin/public/identity_manager/identity_test_utils.h"
  #include "components/sync/driver/sync_service.h"
- #include "components/sync/driver/sync_user_settings.h"
---- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
-+++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
+--- chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc.orig
++++ chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
 @@ -122,7 +122,6 @@ PasswordReuseModalWarningDialog::Passwor
      OnWarningDone done_callback)
      : content::WebContentsObserver(web_contents),
@@ -2767,19 +2692,19 @@
    LogModalWarningDialogLifetime(modal_construction_start_time_);
  }
  
---- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h
-+++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h
-@@ -62,7 +62,6 @@ class PasswordReuseModalWarningDialog
+--- chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h.orig
++++ chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h
+@@ -60,7 +60,6 @@ class PasswordReuseModalWarningDialog
  
   private:
    OnWarningDone done_callback_;
--  raw_ptr<ChromePasswordProtectionService> service_;
+-  ChromePasswordProtectionService* service_;
    const GURL url_;
    const ReusedPasswordAccountType password_type_;
  
---- a/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc
-+++ b/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc
-@@ -46,7 +46,6 @@
+--- chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc.orig
++++ chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc
+@@ -44,7 +44,6 @@
  #include "components/keyed_service/content/browser_context_dependency_manager.h"
  #include "components/prefs/pref_service.h"
  #include "components/prefs/scoped_user_pref_update.h"
@@ -2787,9 +2712,9 @@
  #include "components/signin/public/identity_manager/identity_test_utils.h"
  #include "content/public/browser/render_frame_host.h"
  #include "content/public/browser/render_process_host.h"
---- a/chrome/browser/ui/webui/browser_command/browser_command_handler.cc
-+++ b/chrome/browser/ui/webui/browser_command/browser_command_handler.cc
-@@ -17,7 +17,6 @@
+--- chrome/browser/ui/webui/browser_command/browser_command_handler.cc.orig
++++ chrome/browser/ui/webui/browser_command/browser_command_handler.cc
+@@ -16,7 +16,6 @@
  #include "chrome/common/webui_url_constants.h"
  #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
  #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
@@ -2798,8 +2723,8 @@
  #include "ui/base/window_open_disposition.h"
  
 @@ -61,13 +60,6 @@ void BrowserCommandHandler::CanExecuteCo
-     case Command::kOpenSafetyCheck:
-       can_execute = !chrome::enterprise_util::IsBrowserManaged(profile_);
+       can_execute =
+           !chrome::enterprise_util::HasBrowserPoliciesApplied(profile_);
        break;
 -    case Command::kOpenSafeBrowsingEnhancedProtectionSettings: {
 -      bool managed = safe_browsing::SafeBrowsingPolicyHandler::
@@ -2811,8 +2736,8 @@
      case Command::kOpenFeedbackForm:
        can_execute = true;
        break;
---- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
-+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
+--- chrome/browser/ui/webui/downloads/downloads_dom_handler.cc.orig
++++ chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
 @@ -37,7 +37,6 @@
  #include "chrome/common/url_constants.h"
  #include "components/download/public/common/download_item.h"
@@ -2821,28 +2746,9 @@
  #include "content/public/browser/browser_thread.h"
  #include "content/public/browser/download_manager.h"
  #include "content/public/browser/render_process_host.h"
---- a/chrome/browser/ui/webui/history/history_ui.cc
-+++ b/chrome/browser/ui/webui/history/history_ui.cc
-@@ -41,7 +41,6 @@
- #include "components/history_clusters/core/history_clusters_prefs.h"
- #include "components/history_clusters/core/history_clusters_service.h"
- #include "components/prefs/pref_service.h"
--#include "components/signin/public/base/signin_pref_names.h"
- #include "components/signin/public/identity_manager/identity_manager.h"
- #include "components/strings/grit/components_strings.h"
- #include "content/public/browser/web_ui.h"
-@@ -124,8 +123,6 @@ content::WebUIDataSource* CreateHistoryU
-   source->AddBoolean("allowDeletingHistory", allow_deleting_history);
- 
-   source->AddBoolean("isGuestSession", profile->IsGuestSession());
--  source->AddBoolean("isSignInAllowed",
--                     prefs->GetBoolean(prefs::kSigninAllowed));
- 
-   source->AddBoolean(kIsUserSignedInKey, IsUserSignedIn(profile));
- 
---- a/chrome/browser/ui/webui/management/management_ui_handler.cc
-+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
-@@ -30,7 +30,6 @@
+--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig
++++ chrome/browser/ui/webui/management/management_ui_handler.cc
+@@ -29,7 +29,6 @@
  #include "chrome/browser/profiles/profile.h"
  #include "chrome/browser/ui/managed_ui.h"
  #include "chrome/common/pref_names.h"
@@ -2850,8 +2756,8 @@
  #include "components/strings/grit/components_strings.h"
  #include "content/public/browser/storage_partition.h"
  #include "content/public/browser/web_contents.h"
---- a/chrome/browser/ui/webui/profile_info_watcher.cc
-+++ b/chrome/browser/ui/webui/profile_info_watcher.cc
+--- chrome/browser/ui/webui/profile_info_watcher.cc.orig
++++ chrome/browser/ui/webui/profile_info_watcher.cc
 @@ -12,7 +12,6 @@
  #include "chrome/browser/signin/identity_manager_factory.h"
  #include "chrome/common/pref_names.h"
@@ -2872,8 +2778,8 @@
  }
  
  ProfileInfoWatcher::~ProfileInfoWatcher() {
---- a/chrome/browser/ui/webui/profile_info_watcher.h
-+++ b/chrome/browser/ui/webui/profile_info_watcher.h
+--- chrome/browser/ui/webui/profile_info_watcher.h.orig
++++ chrome/browser/ui/webui/profile_info_watcher.h
 @@ -49,7 +49,6 @@ class ProfileInfoWatcher : public Profil
    // Called when the authenticated username changes.
    base::RepeatingClosure callback_;
@@ -2882,9 +2788,9 @@
  };
  
  #endif  // CHROME_BROWSER_UI_WEBUI_PROFILE_INFO_WATCHER_H_
---- a/chrome/browser/ui/webui/reset_password/reset_password_ui.cc
-+++ b/chrome/browser/ui/webui/reset_password/reset_password_ui.cc
-@@ -20,7 +20,6 @@
+--- chrome/browser/ui/webui/reset_password/reset_password_ui.cc.orig
++++ chrome/browser/ui/webui/reset_password/reset_password_ui.cc
+@@ -17,7 +17,6 @@
  #include "components/safe_browsing/content/browser/password_protection/password_protection_service.h"
  #include "components/safe_browsing/core/browser/password_protection/metrics_util.h"
  #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -2892,17 +2798,17 @@
  #include "components/strings/grit/components_strings.h"
  #include "components/url_formatter/url_formatter.h"
  #include "components/user_prefs/user_prefs.h"
---- a/chrome/browser/ui/webui/settings/people_handler.cc
-+++ b/chrome/browser/ui/webui/settings/people_handler.cc
-@@ -42,7 +42,6 @@
+--- chrome/browser/ui/webui/settings/people_handler.cc.orig
++++ chrome/browser/ui/webui/settings/people_handler.cc
+@@ -41,7 +41,6 @@
+ #include "components/prefs/pref_service.h"
  #include "components/signin/core/browser/signin_error_controller.h"
- #include "components/signin/public/base/consent_level.h"
  #include "components/signin/public/base/signin_metrics.h"
 -#include "components/signin/public/base/signin_pref_names.h"
  #include "components/signin/public/identity_manager/accounts_mutator.h"
+ #include "components/signin/public/identity_manager/consent_level.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
- #include "components/signin/public/identity_manager/primary_account_mutator.h"
-@@ -301,10 +300,6 @@ void PeopleHandler::RegisterMessages() {
+@@ -290,10 +289,6 @@ void PeopleHandler::RegisterMessages() {
  void PeopleHandler::OnJavascriptAllowed() {
    PrefService* prefs = profile_->GetPrefs();
    profile_pref_registrar_.Init(prefs);
@@ -2913,8 +2819,8 @@
  
    signin::IdentityManager* identity_manager(
        IdentityManagerFactory::GetInstance()->GetForProfile(profile_));
---- a/chrome/browser/ui/webui/settings/safety_check_handler.cc
-+++ b/chrome/browser/ui/webui/settings/safety_check_handler.cc
+--- chrome/browser/ui/webui/settings/safety_check_handler.cc.orig
++++ chrome/browser/ui/webui/settings/safety_check_handler.cc
 @@ -28,7 +28,6 @@
  #include "chrome/grit/chromium_strings.h"
  #include "chrome/grit/generated_resources.h"
@@ -2923,20 +2829,22 @@
  #include "components/strings/grit/components_strings.h"
  #include "components/version_info/version_info.h"
  #include "content/public/browser/browser_context.h"
---- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -66,7 +66,6 @@
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig
++++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+@@ -67,7 +67,6 @@
+ #include "components/password_manager/core/browser/manage_passwords_referrer.h"
  #include "components/password_manager/core/common/password_manager_features.h"
  #include "components/prefs/pref_service.h"
- #include "components/privacy_sandbox/privacy_sandbox_features.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
  #include "components/signin/public/base/signin_buildflags.h"
  #include "components/strings/grit/components_chromium_strings.h"
  #include "components/strings/grit/components_strings.h"
-@@ -1473,44 +1472,6 @@ void AddPrivacyStrings(content::WebUIDat
+@@ -1391,46 +1390,6 @@ void AddPrivacyStrings(content::WebUIDat
      {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
      {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
      {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT},
+-    {"safeBrowsingEnableExtendedReporting",
+-     IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING},
 -    {"safeBrowsingEnableExtendedReportingDesc",
 -     IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC},
 -    {"safeBrowsingEnhanced", IDS_SETTINGS_SAFEBROWSING_ENHANCED},
@@ -2978,7 +2886,7 @@
      {"safeBrowsingSectionLabel", IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL},
      {"syncAndGoogleServicesPrivacyDescription",
       IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT},
-@@ -2811,11 +2772,6 @@ void AddSiteSettingsStrings(content::Web
+@@ -2626,11 +2585,6 @@ void AddSiteSettingsStrings(content::Web
    html_source->AddLocalizedStrings(kSensorsLocalizedStrings);
  
    html_source->AddBoolean(
@@ -2990,19 +2898,19 @@
        "enableBlockAutoplayContentSetting",
        base::FeatureList::IsEnabled(media::kAutoplayDisableSettings));
  
---- a/chrome/browser/ui/webui/settings/settings_ui.cc
-+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
-@@ -71,7 +71,6 @@
+--- chrome/browser/ui/webui/settings/settings_ui.cc.orig
++++ chrome/browser/ui/webui/settings/settings_ui.cc
+@@ -72,7 +72,6 @@
  #include "components/pref_registry/pref_registry_syncable.h"
  #include "components/prefs/pref_service.h"
  #include "components/safe_browsing/core/common/features.h"
 -#include "components/signin/public/base/signin_pref_names.h"
- #include "components/signin/public/base/signin_switches.h"
  #include "content/public/browser/url_data_source.h"
  #include "content/public/browser/web_contents.h"
-@@ -258,9 +257,7 @@ SettingsUI::SettingsUI(content::WebUI* w
-         std::make_unique<IncompatibleApplicationsHandler>());
- #endif  // BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
+ #include "content/public/browser/web_ui.h"
+@@ -274,9 +273,7 @@ SettingsUI::SettingsUI(content::WebUI* w
+           ? "enable-branding-update"
+           : "");
  
 -  html_source->AddBoolean("signinAllowed", !profile->IsGuestSession() &&
 -                                               profile->GetPrefs()->GetBoolean(
@@ -3011,8 +2919,38 @@
  
    html_source->AddBoolean("showImportPasswords",
                            base::FeatureList::IsEnabled(
---- a/chrome/browser/ui/webui/signin/inline_login_handler.cc
-+++ b/chrome/browser/ui/webui/signin/inline_login_handler.cc
+--- chrome/browser/ui/webui/signin/dice_turn_sync_on_helper.cc.orig
++++ chrome/browser/ui/webui/signin/dice_turn_sync_on_helper.cc
+@@ -46,7 +46,6 @@
+ #include "components/policy/core/common/management/management_service.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/accounts_mutator.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/signin/public/identity_manager/primary_account_mutator.h"
+@@ -248,8 +247,7 @@ DiceTurnSyncOnHelper::DiceTurnSyncOnHelp
+   // last authenticated account of the current profile, then Chrome will show a
+   // confirmation dialog before starting sync.
+   // TODO(skym): Warn for high risk upgrade scenario (https://crbug.com/572754).
+-  std::string last_email =
+-      profile_->GetPrefs()->GetString(prefs::kGoogleServicesLastUsername);
++  std::string last_email;
+   delegate_->ShowMergeSyncDataConfirmation(
+       last_email, account_info_.email,
+       base::BindOnce(&DiceTurnSyncOnHelper::OnMergeAccountConfirmation,
+--- chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_unittest.cc.orig
++++ chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_unittest.cc
+@@ -38,7 +38,6 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/public/base/account_consistency_method.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/signin/public/identity_manager/identity_test_environment.h"
+ #include "components/signin/public/identity_manager/primary_account_mutator.h"
+--- chrome/browser/ui/webui/signin/inline_login_handler.cc.orig
++++ chrome/browser/ui/webui/signin/inline_login_handler.cc
 @@ -27,7 +27,6 @@
  #include "chrome/common/pref_names.h"
  #include "components/metrics/metrics_pref_names.h"
@@ -3021,7 +2959,7 @@
  #include "content/public/browser/storage_partition.h"
  #include "content/public/browser/web_contents.h"
  #include "content/public/browser/web_ui.h"
-@@ -138,8 +137,6 @@ void InlineLoginHandler::ContinueHandleI
+@@ -127,8 +126,6 @@ void InlineLoginHandler::ContinueHandleI
    std::string default_email;
    if (reason == signin_metrics::Reason::kSigninPrimaryAccount ||
        reason == signin_metrics::Reason::kForcedSigninPrimaryAccount) {
@@ -3030,9 +2968,9 @@
    } else {
      if (!net::GetValueForKeyInQuery(current_url, "email", &default_email))
        default_email.clear();
---- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
-+++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
-@@ -67,7 +67,6 @@
+--- chrome/browser/ui/webui/signin/inline_login_handler_impl.cc.orig
++++ chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
+@@ -70,7 +70,6 @@
  #include "components/prefs/pref_service.h"
  #include "components/signin/core/browser/about_signin_internals.h"
  #include "components/signin/public/base/signin_metrics.h"
@@ -3040,9 +2978,9 @@
  #include "components/signin/public/identity_manager/account_info.h"
  #include "components/signin/public/identity_manager/accounts_cookie_mutator.h"
  #include "components/signin/public/identity_manager/accounts_mutator.h"
---- a/chrome/browser/ui/webui/signin/signin_error_ui.cc
-+++ b/chrome/browser/ui/webui/signin/signin_error_ui.cc
-@@ -27,7 +27,6 @@
+--- chrome/browser/ui/webui/signin/signin_error_ui.cc.orig
++++ chrome/browser/ui/webui/signin/signin_error_ui.cc
+@@ -23,7 +23,6 @@
  #include "chrome/grit/generated_resources.h"
  #include "chrome/grit/signin_resources.h"
  #include "components/prefs/pref_service.h"
@@ -3050,7 +2988,7 @@
  #include "components/strings/grit/components_strings.h"
  #include "content/public/browser/web_ui.h"
  #include "content/public/browser/web_ui_data_source.h"
-@@ -119,9 +118,7 @@ void SigninErrorUI::Initialize(Browser*
+@@ -115,9 +114,7 @@ void SigninErrorUI::Initialize(Browser*
    if (is_profile_blocked) {
      source->AddLocalizedString("profileBlockedMessage",
                                 IDS_OLD_PROFILES_DISABLED_MESSAGE);
@@ -3061,8 +2999,8 @@
      if (allowed_domain.empty()) {
        source->AddLocalizedString(
            "profileBlockedAddPersonSuggestion",
---- a/chrome/browser/ui/webui/signin/signin_utils_desktop.cc
-+++ b/chrome/browser/ui/webui/signin/signin_utils_desktop.cc
+--- chrome/browser/ui/webui/signin/signin_utils_desktop.cc.orig
++++ chrome/browser/ui/webui/signin/signin_utils_desktop.cc
 @@ -18,7 +18,6 @@
  #include "chrome/grit/chromium_strings.h"
  #include "chrome/grit/generated_resources.h"
@@ -3090,38 +3028,8 @@
        return SigninUIError::ProfileWasUsedByAnotherAccount(email, last_email);
      }
    }
---- a/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc
-+++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc
-@@ -47,7 +47,6 @@
- #include "components/policy/core/common/management/management_service.h"
- #include "components/prefs/pref_service.h"
- #include "components/signin/public/base/signin_metrics.h"
--#include "components/signin/public/base/signin_pref_names.h"
- #include "components/signin/public/identity_manager/accounts_mutator.h"
- #include "components/signin/public/identity_manager/identity_manager.h"
- #include "components/signin/public/identity_manager/primary_account_mutator.h"
-@@ -226,8 +225,7 @@ TurnSyncOnHelper::TurnSyncOnHelper(
-   // last authenticated account of the current profile, then Chrome will show a
-   // confirmation dialog before starting sync.
-   // TODO(skym): Warn for high risk upgrade scenario (https://crbug.com/572754).
--  std::string last_email =
--      profile_->GetPrefs()->GetString(prefs::kGoogleServicesLastUsername);
-+  std::string last_email;
-   delegate_->ShowMergeSyncDataConfirmation(
-       last_email, account_info_.email,
-       base::BindOnce(&TurnSyncOnHelper::OnMergeAccountConfirmation,
---- a/chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc
-+++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc
-@@ -46,7 +46,6 @@
- #include "components/signin/public/base/account_consistency_method.h"
- #include "components/signin/public/base/consent_level.h"
- #include "components/signin/public/base/signin_metrics.h"
--#include "components/signin/public/base/signin_pref_names.h"
- #include "components/signin/public/base/signin_switches.h"
- #include "components/signin/public/identity_manager/identity_manager.h"
- #include "components/signin/public/identity_manager/identity_test_environment.h"
---- a/chrome/browser/ui/webui/welcome/welcome_ui.cc
-+++ b/chrome/browser/ui/webui/welcome/welcome_ui.cc
+--- chrome/browser/ui/webui/welcome/welcome_ui.cc.orig
++++ chrome/browser/ui/webui/welcome/welcome_ui.cc
 @@ -24,7 +24,6 @@
  #include "chrome/grit/welcome_resources.h"
  #include "chrome/grit/welcome_resources_map.h"
@@ -3139,8 +3047,8 @@
    html_source->SetRequestFilter(
        base::BindRepeating(&ShouldHandleRequestCallback,
                            weak_ptr_factory_.GetWeakPtr()),
---- a/chrome/browser/unified_consent/unified_consent_service_factory.cc
-+++ b/chrome/browser/unified_consent/unified_consent_service_factory.cc
+--- chrome/browser/unified_consent/unified_consent_service_factory.cc.orig
++++ chrome/browser/unified_consent/unified_consent_service_factory.cc
 @@ -13,7 +13,6 @@
  #include "components/embedder_support/pref_names.h"
  #include "components/keyed_service/content/browser_context_dependency_manager.h"
@@ -3155,10 +3063,10 @@
      prefs::kSearchSuggestEnabled, embedder_support::kAlternateErrorPagesEnabled,
 -        prefs::kSafeBrowsingEnabled, prefs::kSafeBrowsingScoutReportingEnabled,
          spellcheck::prefs::kSpellCheckUseSpellingService,
- #if BUILDFLAG(IS_ANDROID)
+ #if defined(OS_ANDROID)
          prefs::kContextualSearchEnabled
---- a/chrome/common/extensions/api/privacy.json
-+++ b/chrome/common/extensions/api/privacy.json
+--- chrome/common/extensions/api/privacy.json.orig
++++ chrome/common/extensions/api/privacy.json
 @@ -63,16 +63,6 @@
              "value": ["passwordSavingEnabled", {"type":"boolean"}],
              "description": "If enabled, the password manager will ask if you want to save passwords. This preference's value is a boolean, defaulting to <code>true</code>."
@@ -3176,9 +3084,9 @@
            "searchSuggestEnabled": {
              "$ref": "types.ChromeSetting",
              "value": ["searchSuggestEnabled", {"type":"boolean"}],
---- a/components/password_manager/core/browser/leak_detection_delegate.cc
-+++ b/components/password_manager/core/browser/leak_detection_delegate.cc
-@@ -23,7 +23,6 @@
+--- components/password_manager/core/browser/leak_detection_delegate.cc.orig
++++ components/password_manager/core/browser/leak_detection_delegate.cc
+@@ -22,7 +22,6 @@
  #include "components/password_manager/core/common/password_manager_features.h"
  #include "components/password_manager/core/common/password_manager_pref_names.h"
  #include "components/prefs/pref_service.h"
@@ -3186,7 +3094,7 @@
  #include "services/network/public/cpp/shared_url_loader_factory.h"
  
  namespace password_manager {
-@@ -176,28 +175,7 @@ void LeakDetectionDelegate::OnError(Leak
+@@ -169,28 +168,7 @@ void LeakDetectionDelegate::OnError(Leak
  
  bool CanStartLeakCheck(const PrefService& prefs,
                         const PasswordManagerClient* client) {
@@ -3216,18 +3124,18 @@
  }
  
  }  // namespace password_manager
---- a/components/password_manager/core/browser/password_bubble_experiment.cc
-+++ b/components/password_manager/core/browser/password_bubble_experiment.cc
+--- components/password_manager/core/browser/password_bubble_experiment.cc.orig
++++ components/password_manager/core/browser/password_bubble_experiment.cc
 @@ -18,7 +18,6 @@
  #include "components/prefs/pref_registry_simple.h"
  #include "components/prefs/pref_service.h"
  #include "components/signin/public/base/signin_buildflags.h"
 -#include "components/signin/public/base/signin_pref_names.h"
- #include "components/sync/base/user_selectable_type.h"
  #include "components/sync/driver/sync_service.h"
  #include "components/sync/driver/sync_user_settings.h"
---- a/components/password_manager/core/browser/password_reuse_detector.cc
-+++ b/components/password_manager/core/browser/password_reuse_detector.cc
+ 
+--- components/password_manager/core/browser/password_reuse_detector.cc.orig
++++ components/password_manager/core/browser/password_reuse_detector.cc
 @@ -15,7 +15,6 @@
  #include "components/password_manager/core/browser/password_reuse_detector_consumer.h"
  #include "components/password_manager/core/browser/password_store_consumer.h"
@@ -3236,7 +3144,7 @@
  #include "google_apis/gaia/gaia_auth_util.h"
  #include "google_apis/gaia/gaia_urls.h"
  #include "url/origin.h"
-@@ -216,9 +215,7 @@ PasswordReuseDetector::CheckNonGaiaEnter
+@@ -205,9 +204,7 @@ PasswordReuseDetector::CheckNonGaiaEnter
    // Skips password reuse check if |domain| matches enterprise login URL or
    // enterprise change password URL.
    GURL page_url(domain);
@@ -3247,8 +3155,8 @@
      return absl::nullopt;
    }
  
---- a/components/password_manager/core/browser/password_reuse_manager_impl.cc
-+++ b/components/password_manager/core/browser/password_reuse_manager_impl.cc
+--- components/password_manager/core/browser/password_reuse_manager_impl.cc.orig
++++ components/password_manager/core/browser/password_reuse_manager_impl.cc
 @@ -9,7 +9,6 @@
  #include "components/password_manager/core/browser/password_store_signin_notifier.h"
  #include "components/password_manager/core/common/password_manager_features.h"
@@ -3257,7 +3165,7 @@
  
  namespace password_manager {
  
-@@ -320,20 +319,6 @@ void PasswordReuseManagerImpl::ScheduleP
+@@ -318,20 +317,6 @@ void PasswordReuseManagerImpl::ScheduleP
  
  void PasswordReuseManagerImpl::ScheduleEnterprisePasswordURLUpdate() {
    DCHECK(main_task_runner_->RunsTasksInCurrentSequence());
@@ -3278,9 +3186,9 @@
  }
  
  void PasswordReuseManagerImpl::OnGetPasswordStoreResults(
---- a/components/password_manager/core/browser/password_store.cc
-+++ b/components/password_manager/core/browser/password_store.cc
-@@ -40,7 +40,6 @@
+--- components/password_manager/core/browser/password_store.cc.orig
++++ components/password_manager/core/browser/password_store.cc
+@@ -39,7 +39,6 @@
  #include "components/password_manager/core/common/password_manager_features.h"
  #include "components/password_manager/core/common/password_manager_pref_names.h"
  #include "components/prefs/pref_service.h"
@@ -3288,8 +3196,8 @@
  #include "components/sync/model/proxy_model_type_controller_delegate.h"
  
  namespace password_manager {
---- a/components/password_manager/core/browser/password_sync_util.cc
-+++ b/components/password_manager/core/browser/password_sync_util.cc
+--- components/password_manager/core/browser/password_sync_util.cc.orig
++++ components/password_manager/core/browser/password_sync_util.cc
 @@ -8,7 +8,6 @@
  #include "build/build_config.h"
  #include "components/password_manager/core/browser/password_form.h"
@@ -3310,9 +3218,9 @@
    return false;
  }
  
---- a/components/password_manager/core/browser/sync_credentials_filter_unittest.cc
-+++ b/components/password_manager/core/browser/sync_credentials_filter_unittest.cc
-@@ -30,7 +30,6 @@
+--- components/password_manager/core/browser/sync_credentials_filter_unittest.cc.orig
++++ components/password_manager/core/browser/sync_credentials_filter_unittest.cc
+@@ -29,7 +29,6 @@
  #include "components/password_manager/core/common/password_manager_features.h"
  #include "components/prefs/pref_registry_simple.h"
  #include "components/prefs/testing_pref_service.h"
@@ -3320,18 +3228,8 @@
  #include "testing/gtest/include/gtest/gtest.h"
  
  namespace password_manager {
---- a/components/reputation/core/safety_tips_config.cc
-+++ b/components/reputation/core/safety_tips_config.cc
-@@ -5,6 +5,7 @@
- #include "components/reputation/core/safety_tips_config.h"
- 
- #include "base/no_destructor.h"
-+#include "base/notreached.h"
- #include "base/ranges/algorithm.h"
- #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
- #include "third_party/re2/src/re2/re2.h"
---- a/components/safe_browsing/content/browser/base_blocking_page.cc
-+++ b/components/safe_browsing/content/browser/base_blocking_page.cc
+--- components/safe_browsing/content/browser/base_blocking_page.cc.orig
++++ components/safe_browsing/content/browser/base_blocking_page.cc
 @@ -13,7 +13,6 @@
  #include "base/time/time.h"
  #include "components/safe_browsing/content/browser/safe_browsing_controller_client.h"
@@ -3340,9 +3238,9 @@
  #include "components/security_interstitials/content/security_interstitial_controller_client.h"
  #include "components/security_interstitials/content/settings_page_helper.h"
  #include "components/security_interstitials/content/unsafe_resource_util.h"
---- a/components/safe_browsing/content/browser/client_side_detection_service.cc
-+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
-@@ -27,7 +27,6 @@
+--- components/safe_browsing/content/browser/client_side_detection_service.cc.orig
++++ components/safe_browsing/content/browser/client_side_detection_service.cc
+@@ -28,7 +28,6 @@
  #include "components/safe_browsing/core/common/features.h"
  #include "components/safe_browsing/core/common/proto/client_model.pb.h"
  #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -3350,8 +3248,8 @@
  #include "components/safe_browsing/core/common/safebrowsing_constants.h"
  #include "components/safe_browsing/core/common/utils.h"
  #include "content/public/browser/browser_task_traits.h"
---- a/components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.cc
-+++ b/components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.cc
+--- components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.cc.orig
++++ components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.cc
 @@ -20,7 +20,6 @@
  #include "components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager_util.h"
  #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
@@ -3359,8 +3257,8 @@
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
  #include "components/safe_browsing/core/common/utils.h"
  #include "components/sessions/content/session_tab_helper.h"
- #include "content/public/browser/browser_context.h"
-@@ -339,7 +338,7 @@ GURL SafeBrowsingNavigationObserverManag
+ #include "content/public/browser/navigation_details.h"
+@@ -306,7 +305,7 @@ GURL SafeBrowsingNavigationObserverManag
  bool SafeBrowsingNavigationObserverManager::IsEnabledAndReady(
      PrefService* prefs,
      bool has_safe_browsing_service) {
@@ -3369,8 +3267,8 @@
  }
  
  // static
---- a/components/safe_browsing/content/browser/triggers/suspicious_site_trigger_unittest.cc
-+++ b/components/safe_browsing/content/browser/triggers/suspicious_site_trigger_unittest.cc
+--- components/safe_browsing/content/browser/triggers/suspicious_site_trigger_unittest.cc.orig
++++ components/safe_browsing/content/browser/triggers/suspicious_site_trigger_unittest.cc
 @@ -11,7 +11,6 @@
  #include "build/build_config.h"
  #include "components/prefs/testing_pref_service.h"
@@ -3379,9 +3277,9 @@
  #include "content/public/test/browser_task_environment.h"
  #include "content/public/test/navigation_simulator.h"
  #include "content/public/test/test_renderer_host.h"
---- a/components/safe_browsing/content/browser/triggers/trigger_manager.cc
-+++ b/components/safe_browsing/content/browser/triggers/trigger_manager.cc
-@@ -13,7 +13,6 @@
+--- components/safe_browsing/content/browser/triggers/trigger_manager.cc.orig
++++ components/safe_browsing/content/browser/triggers/trigger_manager.cc
+@@ -12,7 +12,6 @@
  #include "components/safe_browsing/content/browser/base_ui_manager.h"
  #include "components/safe_browsing/content/browser/threat_details.h"
  #include "components/safe_browsing/core/common/features.h"
@@ -3389,7 +3287,7 @@
  #include "components/security_interstitials/core/unsafe_resource.h"
  #include "content/public/browser/browser_context.h"
  #include "content/public/browser/browser_thread.h"
-@@ -86,16 +85,16 @@ SBErrorOptions TriggerManager::GetSBErro
+@@ -85,16 +84,16 @@ SBErrorOptions TriggerManager::GetSBErro
      const PrefService& pref_service,
      content::WebContents* web_contents) {
    return SBErrorOptions(/*is_main_frame_load_blocked=*/false,
@@ -3412,14 +3310,14 @@
                          /*help_center_article_link=*/std::string());
  }
  
---- a/components/safe_browsing/content/browser/triggers/trigger_throttler.cc
-+++ b/components/safe_browsing/content/browser/triggers/trigger_throttler.cc
+--- components/safe_browsing/content/browser/triggers/trigger_throttler.cc.orig
++++ components/safe_browsing/content/browser/triggers/trigger_throttler.cc
 @@ -197,28 +197,6 @@ void TriggerThrottler::LoadTriggerEvents
    trigger_events_.clear();
    if (!local_state_prefs_)
      return;
 -
--  const base::Value* event_dict = local_state_prefs_->GetDictionary(
+-  const base::DictionaryValue* event_dict = local_state_prefs_->GetDictionary(
 -      prefs::kSafeBrowsingTriggerEventTimestamps);
 -  for (auto trigger_pair : event_dict->DictItems()) {
 -    // Check that the first item in the pair is convertible to a trigger type
@@ -3434,7 +3332,7 @@
 -      continue;
 -
 -    const TriggerType trigger_type = static_cast<TriggerType>(trigger_type_int);
--    for (const auto& timestamp : trigger_pair.second.GetListDeprecated()) {
+-    for (const auto& timestamp : trigger_pair.second.GetList()) {
 -      if (timestamp.is_double())
 -        trigger_events_[trigger_type].push_back(
 -            base::Time::FromDoubleT(timestamp.GetDouble()));
@@ -3453,8 +3351,8 @@
  }
  
  size_t TriggerThrottler::GetDailyQuotaForTrigger(
---- a/components/safe_browsing/content/browser/triggers/trigger_throttler_unittest.cc
-+++ b/components/safe_browsing/content/browser/triggers/trigger_throttler_unittest.cc
+--- components/safe_browsing/content/browser/triggers/trigger_throttler_unittest.cc.orig
++++ components/safe_browsing/content/browser/triggers/trigger_throttler_unittest.cc
 @@ -9,7 +9,6 @@
  #include "base/test/simple_test_clock.h"
  #include "components/prefs/testing_pref_service.h"
@@ -3463,9 +3361,9 @@
  #include "testing/gmock/include/gmock/gmock.h"
  #include "testing/gtest/include/gtest/gtest.h"
  
---- a/components/safe_browsing/content/browser/ui_manager.cc
-+++ b/components/safe_browsing/content/browser/ui_manager.cc
-@@ -17,7 +17,6 @@
+--- components/safe_browsing/content/browser/ui_manager.cc.orig
++++ components/safe_browsing/content/browser/ui_manager.cc
+@@ -18,7 +18,6 @@
  #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
  #include "components/safe_browsing/core/browser/ping_manager.h"
  #include "components/safe_browsing/core/common/features.h"
@@ -3473,9 +3371,9 @@
  #include "components/security_interstitials/content/security_interstitial_tab_helper.h"
  #include "components/security_interstitials/content/unsafe_resource_util.h"
  #include "components/security_interstitials/core/unsafe_resource.h"
---- a/components/safe_browsing/content/browser/ui_manager_unittest.cc
-+++ b/components/safe_browsing/content/browser/ui_manager_unittest.cc
-@@ -15,7 +15,6 @@
+--- components/safe_browsing/content/browser/ui_manager_unittest.cc.orig
++++ components/safe_browsing/content/browser/ui_manager_unittest.cc
+@@ -14,7 +14,6 @@
  #include "components/safe_browsing/content/browser/safe_browsing_controller_client.h"
  #include "components/safe_browsing/content/browser/ui_manager.h"
  #include "components/safe_browsing/core/browser/db/util.h"
@@ -3483,38 +3381,38 @@
  #include "components/security_interstitials/content/security_interstitial_controller_client.h"
  #include "components/security_interstitials/content/settings_page_helper.h"
  #include "components/security_interstitials/content/unsafe_resource_util.h"
---- a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc
-+++ b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc
+--- components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc.orig
++++ components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc
 @@ -32,7 +32,6 @@
  #include "components/safe_browsing/core/browser/referrer_chain_provider.h"
  #include "components/safe_browsing/core/common/features.h"
  #include "components/safe_browsing/core/common/proto/csd.pb.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
- #include "content/public/browser/global_routing_id.h"
  #include "services/network/public/mojom/cookie_manager.mojom.h"
  #if BUILDFLAG(FULL_SAFE_BROWSING)
-@@ -2050,18 +2049,13 @@ void SafeBrowsingUIHandler::GetPrefs(con
+ #include "components/enterprise/common/proto/connectors.pb.h"
+@@ -2035,18 +2034,13 @@ void SafeBrowsingUIHandler::GetPrefs(con
    AllowJavascript();
-   DCHECK(!args.empty());
-   std::string callback_id = args[0].GetString();
+   DCHECK(!args->GetList().empty());
+   std::string callback_id = args->GetList()[0].GetString();
 -  ResolveJavascriptCallback(base::Value(callback_id),
 -                            safe_browsing::GetSafeBrowsingPreferencesList(
 -                                user_prefs::UserPrefs::Get(browser_context_)));
 +  ResolveJavascriptCallback(base::Value(callback_id), base::ListValue());
  }
  
- void SafeBrowsingUIHandler::GetPolicies(const base::Value::List& args) {
+ void SafeBrowsingUIHandler::GetPolicies(const base::ListValue* args) {
    AllowJavascript();
-   DCHECK(!args.empty());
-   std::string callback_id = args[0].GetString();
+   DCHECK(!args->GetList().empty());
+   std::string callback_id = args->GetList()[0].GetString();
 -  ResolveJavascriptCallback(base::Value(callback_id),
 -                            safe_browsing::GetSafeBrowsingPoliciesList(
 -                                user_prefs::UserPrefs::Get(browser_context_)));
  }
  
- void SafeBrowsingUIHandler::GetCookie(const base::Value::List& args) {
---- a/components/safe_browsing/core/browser/db/hit_report.h
-+++ b/components/safe_browsing/core/browser/db/hit_report.h
+ void SafeBrowsingUIHandler::GetCookie(const base::ListValue* args) {
+--- components/safe_browsing/core/browser/db/hit_report.h.orig
++++ components/safe_browsing/core/browser/db/hit_report.h
 @@ -8,7 +8,6 @@
  #define COMPONENTS_SAFE_BROWSING_CORE_BROWSER_DB_HIT_REPORT_H_
  
@@ -3531,8 +3429,8 @@
    bool is_enhanced_protection = false;
    bool is_metrics_reporting_active;
  
---- a/components/safe_browsing/core/browser/db/util.h
-+++ b/components/safe_browsing/core/browser/db/util.h
+--- components/safe_browsing/core/browser/db/util.h.orig
++++ components/safe_browsing/core/browser/db/util.h
 @@ -18,7 +18,6 @@
  #include "base/strings/string_piece.h"
  #include "base/trace_event/traced_value.h"
@@ -3541,9 +3439,9 @@
  
  namespace safe_browsing {
  
---- a/components/safe_browsing/core/browser/db/v4_local_database_manager.cc
-+++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.cc
-@@ -334,10 +334,9 @@ const V4LocalDatabaseManager*
+--- components/safe_browsing/core/browser/db/v4_local_database_manager.cc.orig
++++ components/safe_browsing/core/browser/db/v4_local_database_manager.cc
+@@ -337,10 +337,9 @@ const V4LocalDatabaseManager*
  scoped_refptr<V4LocalDatabaseManager> V4LocalDatabaseManager::Create(
      const base::FilePath& base_path,
      scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
@@ -3556,7 +3454,7 @@
        std::move(io_task_runner), nullptr));
  }
  
-@@ -360,14 +359,12 @@ void V4LocalDatabaseManager::CollectData
+@@ -363,14 +362,12 @@ void V4LocalDatabaseManager::CollectData
  
  V4LocalDatabaseManager::V4LocalDatabaseManager(
      const base::FilePath& base_path,
@@ -3571,7 +3469,7 @@
        list_infos_(GetListInfos()),
        task_runner_(task_runner_for_tests
                         ? task_runner_for_tests
-@@ -1123,8 +1120,7 @@ void V4LocalDatabaseManager::SetupUpdate
+@@ -1137,8 +1134,7 @@ void V4LocalDatabaseManager::SetupUpdate
                            weak_factory_.GetWeakPtr());
  
    v4_update_protocol_manager_ = V4UpdateProtocolManager::Create(
@@ -3581,9 +3479,9 @@
  }
  
  void V4LocalDatabaseManager::UpdateRequestCompleted(
---- a/components/safe_browsing/core/browser/db/v4_local_database_manager.h
-+++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.h
-@@ -39,8 +39,7 @@ class V4LocalDatabaseManager : public Sa
+--- components/safe_browsing/core/browser/db/v4_local_database_manager.h.orig
++++ components/safe_browsing/core/browser/db/v4_local_database_manager.h
+@@ -37,8 +37,7 @@ class V4LocalDatabaseManager : public Sa
    static scoped_refptr<V4LocalDatabaseManager> Create(
        const base::FilePath& base_path,
        scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
@@ -3593,7 +3491,7 @@
  
    V4LocalDatabaseManager(const V4LocalDatabaseManager&) = delete;
    V4LocalDatabaseManager& operator=(const V4LocalDatabaseManager&) = delete;
-@@ -109,7 +108,6 @@ class V4LocalDatabaseManager : public Sa
+@@ -108,7 +107,6 @@ class V4LocalDatabaseManager : public Sa
    // Must be initialized by calling StartOnIOThread() before using.
    V4LocalDatabaseManager(
        const base::FilePath& base_path,
@@ -3601,7 +3499,7 @@
        scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
        scoped_refptr<base::SequencedTaskRunner> io_task_runner,
        scoped_refptr<base::SequencedTaskRunner> task_runner_for_tests);
-@@ -369,10 +367,6 @@ class V4LocalDatabaseManager : public Sa
+@@ -367,10 +365,6 @@ class V4LocalDatabaseManager : public Sa
    // ready to process next update.
    DatabaseUpdatedCallback db_updated_callback_;
  
@@ -3612,9 +3510,9 @@
    // The client_state of each list currently being synced. This is updated each
    // time a database update completes, and used to send list client_state
    // information in the full hash request.
---- a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
-+++ b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
-@@ -89,7 +89,6 @@ void SetSbV4UrlPrefixForTesting(const ch
+--- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig
++++ components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
+@@ -88,7 +88,6 @@ void SetSbV4UrlPrefixForTesting(const ch
  
  std::string GetReportUrl(const V4ProtocolConfig& config,
                           const std::string& method,
@@ -3622,7 +3520,7 @@
                           const bool is_enhanced_protection) {
    std::string url = base::StringPrintf(
        "%s/%s?client=%s&appver=%s&pver=4.0", kSbReportsURLPrefix, method.c_str(),
-@@ -99,8 +98,6 @@ std::string GetReportUrl(const V4Protoco
+@@ -98,8 +97,6 @@ std::string GetReportUrl(const V4Protoco
      base::StringAppendF(&url, "&key=%s",
                          net::EscapeQueryParamValue(api_key, true).c_str());
    }
@@ -3631,8 +3529,8 @@
    if (is_enhanced_protection)
      url.append(base::StringPrintf("&enh=%d", is_enhanced_protection));
    return url;
---- a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.h
-+++ b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.h
+--- components/safe_browsing/core/browser/db/v4_protocol_manager_util.h.orig
++++ components/safe_browsing/core/browser/db/v4_protocol_manager_util.h
 @@ -18,10 +18,11 @@
  #include <vector>
  
@@ -3654,8 +3552,8 @@
      const bool is_enhanced_protection = false);
  
  // Different types of threats that SafeBrowsing protects against. This is the
---- a/components/safe_browsing/core/browser/db/v4_update_protocol_manager.cc
-+++ b/components/safe_browsing/core/browser/db/v4_update_protocol_manager.cc
+--- components/safe_browsing/core/browser/db/v4_update_protocol_manager.cc.orig
++++ components/safe_browsing/core/browser/db/v4_update_protocol_manager.cc
 @@ -78,19 +78,8 @@ static const int kV4TimerStartIntervalSe
  // Maximum time, in seconds, to wait for a response to an update request.
  static const int kV4TimerUpdateWaitSecMax = 15 * 60;  // 15 minutes
@@ -3742,9 +3640,9 @@
    V4ProtocolManagerUtil::SetClientInfoFromConfig(request.mutable_client(),
                                                   config_);
  
---- a/components/safe_browsing/core/browser/db/v4_update_protocol_manager.h
-+++ b/components/safe_browsing/core/browser/db/v4_update_protocol_manager.h
-@@ -23,7 +23,6 @@
+--- components/safe_browsing/core/browser/db/v4_update_protocol_manager.h.orig
++++ components/safe_browsing/core/browser/db/v4_update_protocol_manager.h
+@@ -24,7 +24,6 @@
  #include "components/safe_browsing/core/browser/db/util.h"
  #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
  #include "components/safe_browsing/core/common/proto/webui.pb.h"
@@ -3752,7 +3650,7 @@
  #include "third_party/abseil-cpp/absl/types/optional.h"
  
  class GURL;
-@@ -44,9 +43,6 @@ class V4UpdateProtocolManagerFactory;
+@@ -45,9 +44,6 @@ class V4UpdateProtocolManagerFactory;
  using V4UpdateCallback =
      base::RepeatingCallback<void(std::unique_ptr<ParsedServerResponse>)>;
  
@@ -3762,7 +3660,7 @@
  class V4UpdateProtocolManager {
   public:
    V4UpdateProtocolManager(const V4UpdateProtocolManager&) = delete;
-@@ -64,8 +60,7 @@ class V4UpdateProtocolManager {
+@@ -65,8 +61,7 @@ class V4UpdateProtocolManager {
    static std::unique_ptr<V4UpdateProtocolManager> Create(
        scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
        const V4ProtocolConfig& config,
@@ -3772,7 +3670,7 @@
  
    void OnURLLoaderComplete(std::unique_ptr<std::string> response_body);
  
-@@ -87,8 +82,7 @@ class V4UpdateProtocolManager {
+@@ -88,8 +83,7 @@ class V4UpdateProtocolManager {
    V4UpdateProtocolManager(
        scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
        const V4ProtocolConfig& config,
@@ -3782,7 +3680,7 @@
  
   private:
    FRIEND_TEST_ALL_PREFIXES(V4UpdateProtocolManagerTest,
-@@ -206,8 +200,6 @@ class V4UpdateProtocolManager {
+@@ -207,8 +201,6 @@ class V4UpdateProtocolManager {
    // complete.
    base::OneShotTimer timeout_timer_;
  
@@ -3791,7 +3689,7 @@
    SEQUENCE_CHECKER(sequence_checker_);
  };
  
-@@ -225,8 +217,7 @@ class V4UpdateProtocolManagerFactory {
+@@ -226,8 +218,7 @@ class V4UpdateProtocolManagerFactory {
    virtual std::unique_ptr<V4UpdateProtocolManager> CreateProtocolManager(
        scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
        const V4ProtocolConfig& config,
@@ -3801,8 +3699,8 @@
  };
  
  }  // namespace safe_browsing
---- a/components/safe_browsing/core/browser/password_protection/password_protection_service_base.h
-+++ b/components/safe_browsing/core/browser/password_protection/password_protection_service_base.h
+--- components/safe_browsing/core/browser/password_protection/password_protection_service_base.h.orig
++++ components/safe_browsing/core/browser/password_protection/password_protection_service_base.h
 @@ -28,7 +28,6 @@
  #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h"
  #include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h"
@@ -3811,7 +3709,7 @@
  #include "components/sessions/core/session_id.h"
  #include "components/signin/public/identity_manager/account_info.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
-@@ -150,10 +149,6 @@ class PasswordProtectionServiceBase : pu
+@@ -149,10 +148,6 @@ class PasswordProtectionServiceBase : pu
    // Returns if the warning UI is enabled.
    bool IsWarningEnabled(ReusedPasswordAccountType password_type);
  
@@ -3822,9 +3720,9 @@
    // If |url| matches Safe Browsing allowlist domains, password protection
    // change password URL, or password protection login URLs in the enterprise
    // policy.
---- a/components/safe_browsing/core/browser/ping_manager.cc
-+++ b/components/safe_browsing/core/browser/ping_manager.cc
-@@ -190,7 +190,7 @@ GURL PingManager::SafeBrowsingHitUrl(
+--- components/safe_browsing/core/browser/ping_manager.cc.orig
++++ components/safe_browsing/core/browser/ping_manager.cc
+@@ -141,7 +141,7 @@ GURL PingManager::SafeBrowsingHitUrl(
           hit_report.threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING ||
           hit_report.threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE);
    std::string url =
@@ -3833,8 +3731,8 @@
                     hit_report.is_enhanced_protection);
    std::string threat_list = "none";
    switch (hit_report.threat_type) {
---- a/components/safe_browsing/core/browser/realtime/policy_engine.cc
-+++ b/components/safe_browsing/core/browser/realtime/policy_engine.cc
+--- components/safe_browsing/core/browser/realtime/policy_engine.cc.orig
++++ components/safe_browsing/core/browser/realtime/policy_engine.cc
 @@ -8,7 +8,6 @@
  #include "base/metrics/histogram_macros.h"
  #include "build/build_config.h"
@@ -3843,7 +3741,7 @@
  #include "components/safe_browsing/core/common/utils.h"
  #include "components/unified_consent/pref_names.h"
  #include "components/user_prefs/user_prefs.h"
-@@ -36,7 +35,7 @@ bool RealTimePolicyEngine::IsUserMbbOpte
+@@ -35,7 +34,7 @@ bool RealTimePolicyEngine::IsUserMbbOpte
  
  // static
  bool RealTimePolicyEngine::IsUserEpOptedIn(PrefService* pref_service) {
@@ -3852,7 +3750,7 @@
  }
  
  // static
-@@ -82,9 +81,7 @@ bool RealTimePolicyEngine::CanPerformEnt
+@@ -81,9 +80,7 @@ bool RealTimePolicyEngine::CanPerformEnt
      return false;
    }
  
@@ -3863,8 +3761,8 @@
  }
  
  // static
---- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc
-+++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc
+--- components/safe_browsing/core/browser/realtime/url_lookup_service.cc.orig
++++ components/safe_browsing/core/browser/realtime/url_lookup_service.cc
 @@ -19,7 +19,6 @@
  #include "components/safe_browsing/core/browser/referrer_chain_provider.h"
  #include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h"
@@ -3873,7 +3771,7 @@
  #include "components/unified_consent/pref_names.h"
  #include "net/base/ip_address.h"
  #include "net/base/load_flags.h"
-@@ -62,10 +61,6 @@ RealTimeUrlLookupService::RealTimeUrlLoo
+@@ -61,10 +60,6 @@ RealTimeUrlLookupService::RealTimeUrlLoo
        variations_(variations_service) {
    pref_change_registrar_.Init(pref_service_);
    pref_change_registrar_.Add(
@@ -3884,7 +3782,7 @@
        unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled,
        base::BindRepeating(&RealTimeUrlLookupService::OnPrefChanged,
                            base::Unretained(this)));
-@@ -139,7 +134,7 @@ bool RealTimeUrlLookupService::CanSendPa
+@@ -144,7 +139,7 @@ bool RealTimeUrlLookupService::CanSendPa
  }
  
  bool RealTimeUrlLookupService::CanCheckSubresourceURL() const {
@@ -3893,35 +3791,22 @@
  }
  
  bool RealTimeUrlLookupService::CanCheckSafeBrowsingDb() const {
-@@ -149,11 +144,7 @@ bool RealTimeUrlLookupService::CanCheckS
- }
- 
- bool RealTimeUrlLookupService::CanSendRTSampleRequest() const {
--  return IsExtendedReportingEnabled(*pref_service_) &&
--         base::FeatureList::IsEnabled(
--             safe_browsing::kSendSampledPingsForProtegoAllowlistDomains) &&
--         (bypass_protego_probability_for_tests_ ||
--          base::RandDouble() <= kProbabilityForSendingSampledRequests);
-+  return false;
- }
- 
- void RealTimeUrlLookupService::Shutdown() {
---- a/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
-+++ b/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
-@@ -17,7 +17,6 @@
+--- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig
++++ components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
+@@ -16,7 +16,6 @@
+ #include "components/prefs/pref_service.h"
  #include "components/safe_browsing/core/browser/referrer_chain_provider.h"
  #include "components/safe_browsing/core/browser/verdict_cache_manager.h"
- #include "components/safe_browsing/core/common/features.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
  #include "components/safe_browsing/core/common/safebrowsing_constants.h"
  #include "components/safe_browsing/core/common/utils.h"
  #include "net/base/ip_address.h"
---- a/components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc
-+++ b/components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc
-@@ -12,13 +12,11 @@
+--- components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc.orig
++++ components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc
+@@ -11,13 +11,11 @@
+ #include "base/time/time.h"
  #include "components/prefs/pref_service.h"
  #include "components/prefs/scoped_user_pref_update.h"
- #include "components/safe_browsing/core/browser/db/hit_report.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
  
  namespace {
@@ -3932,7 +3817,7 @@
  
  const int kMetricsLoggingIntervalDay = 1;
  
-@@ -59,11 +57,6 @@ SafeBrowsingMetricsCollector::SafeBrowsi
+@@ -54,11 +52,6 @@ SafeBrowsingMetricsCollector::SafeBrowsi
      PrefService* pref_service)
      : pref_service_(pref_service) {
    pref_change_registrar_.Init(pref_service_);
@@ -3944,7 +3829,7 @@
  }
  
  void SafeBrowsingMetricsCollector::Shutdown() {
-@@ -71,16 +64,6 @@ void SafeBrowsingMetricsCollector::Shutd
+@@ -66,16 +59,6 @@ void SafeBrowsingMetricsCollector::Shutd
  }
  
  void SafeBrowsingMetricsCollector::StartLogging() {
@@ -3961,7 +3846,7 @@
  }
  
  void SafeBrowsingMetricsCollector::LogMetricsAndScheduleNextLogging() {
-@@ -88,9 +71,6 @@ void SafeBrowsingMetricsCollector::LogMe
+@@ -83,9 +66,6 @@ void SafeBrowsingMetricsCollector::LogMe
    LogDailyEventMetrics();
    RemoveOldEventsFromPref();
  
@@ -3971,7 +3856,7 @@
    ScheduleNextLoggingAfterInterval(base::Days(kMetricsLoggingIntervalDay));
  }
  
-@@ -103,87 +83,16 @@ void SafeBrowsingMetricsCollector::Sched
+@@ -98,181 +78,40 @@ void SafeBrowsingMetricsCollector::Sched
  }
  
  void SafeBrowsingMetricsCollector::LogDailyOptInMetrics() {
@@ -4029,7 +3914,7 @@
  void SafeBrowsingMetricsCollector::RemoveOldEventsFromPref() {
 -  DictionaryPrefUpdate update(pref_service_,
 -                              prefs::kSafeBrowsingEventTimestamps);
--  base::Value* mutable_state_dict = update.Get();
+-  base::DictionaryValue* mutable_state_dict = update.Get();
 -  bool is_pref_valid = mutable_state_dict->is_dict();
 -  base::UmaHistogramBoolean("SafeBrowsing.MetricsCollector.IsPrefValid",
 -                            is_pref_valid);
@@ -4058,30 +3943,47 @@
 -  AddSafeBrowsingEventAndUserStateToPref(GetUserState(), event_type);
  }
  
- void SafeBrowsingMetricsCollector::AddBypassEventToPref(
-@@ -220,15 +129,7 @@ absl::optional<base::Time>
- SafeBrowsingMetricsCollector::GetLatestEventTimestamp(
-     EventTypeFilter event_type_filter) {
-   // Events are not logged when Safe Browsing is disabled.
+ absl::optional<base::Time>
+ SafeBrowsingMetricsCollector::GetLatestEventTimestamp(EventType event_type) {
+-  // Events are not logged when Safe Browsing is disabled.
 -  SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_);
 -  if (sb_state == SafeBrowsingState::NO_SAFE_BROWSING) {
      return absl::nullopt;
 -  }
 -
 -  const absl::optional<Event> event =
--      GetLatestEventFromEventTypeFilter(GetUserState(), event_type_filter);
+-      GetLatestEventFromEventType(GetUserState(), event_type);
 -  return event ? absl::optional<base::Time>(event.value().timestamp)
 -               : absl::nullopt;
  }
  
  absl::optional<base::Time>
-@@ -240,55 +141,14 @@ SafeBrowsingMetricsCollector::GetLatestS
+ SafeBrowsingMetricsCollector::GetLatestSecuritySensitiveEventTimestamp() {
+-  std::vector<absl::optional<base::Time>> security_sensitive_event_times{
+-      GetLatestEventTimestamp(SECURITY_SENSITIVE_SAFE_BROWSING_INTERSTITIAL),
+-      GetLatestEventTimestamp(SECURITY_SENSITIVE_SSL_INTERSTITIAL),
+-      GetLatestEventTimestamp(SECURITY_SENSITIVE_PASSWORD_PROTECTION),
+-      GetLatestEventTimestamp(SECURITY_SENSITIVE_DOWNLOAD)};
+   absl::optional<base::Time> latest_event_time = absl::nullopt;
+-  for (absl::optional<base::Time> security_sensitive_event_time :
+-       security_sensitive_event_times) {
+-    if (!security_sensitive_event_time) {
+-      continue;
+-    }
+-    if (!latest_event_time ||
+-        (latest_event_time.value() < security_sensitive_event_time.value())) {
+-      latest_event_time = security_sensitive_event_time;
+-    }
+-  }
+   return latest_event_time;
+ }
+ 
  void SafeBrowsingMetricsCollector::AddSafeBrowsingEventAndUserStateToPref(
      UserState user_state,
      EventType event_type) {
 -  DictionaryPrefUpdate update(pref_service_,
 -                              prefs::kSafeBrowsingEventTimestamps);
--  base::Value* mutable_state_dict = update.Get();
+-  base::DictionaryValue* mutable_state_dict = update.Get();
 -
 -  base::Value* event_dict =
 -      mutable_state_dict->FindDictKey(UserStateToPrefKey(user_state));
@@ -4099,8 +4001,8 @@
 -  }
 -
 -  // Remove the oldest timestamp if the length of the timestamps hits the limit.
--  while (timestamps->GetListDeprecated().size() >= kTimestampsMaxLength) {
--    timestamps->EraseListIter(timestamps->GetListDeprecated().begin());
+-  while (timestamps->GetList().size() >= kTimestampsMaxLength) {
+-    timestamps->EraseListIter(timestamps->GetList().begin());
 -  }
 -
 -  timestamps->Append(TimeToPrefValue(base::Time::Now()));
@@ -4115,7 +4017,12 @@
 -  if (!pref_service_->GetBoolean(prefs::kSafeBrowsingEnhanced)) {
 -    AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection,
 -                                           EventType::USER_STATE_DISABLED);
--    LogEnhancedProtectionDisabledMetrics();
+-    int disabled_times_last_week = GetEventCountSince(
+-        UserState::kEnhancedProtection, EventType::USER_STATE_DISABLED,
+-        base::Time::Now() - base::Days(7));
+-    if (disabled_times_last_week <= kEsbDisabledMetricsQuota) {
+-      LogEnhancedProtectionDisabledMetrics();
+-    }
 -  } else {
 -    AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection,
 -                                           EventType::USER_STATE_ENABLED);
@@ -4124,7 +4031,7 @@
  
  const base::Value* SafeBrowsingMetricsCollector::GetSafeBrowsingEventDictionary(
      UserState user_state) {
--  const base::Value* state_dict =
+-  const base::DictionaryValue* state_dict =
 -      pref_service_->GetDictionary(prefs::kSafeBrowsingEventTimestamps);
 -
 -  return state_dict->FindDictKey(UserStateToPrefKey(user_state));
@@ -4132,7 +4039,7 @@
  }
  
  absl::optional<SafeBrowsingMetricsCollector::Event>
-@@ -449,20 +309,7 @@ int SafeBrowsingMetricsCollector::GetEve
+@@ -370,20 +209,7 @@ int SafeBrowsingMetricsCollector::GetEve
  }
  
  UserState SafeBrowsingMetricsCollector::GetUserState() {
@@ -4154,8 +4061,8 @@
  }
  
  bool SafeBrowsingMetricsCollector::IsBypassEventType(const EventType& type) {
---- a/components/safe_browsing/core/common/BUILD.gn
-+++ b/components/safe_browsing/core/common/BUILD.gn
+--- components/safe_browsing/core/common/BUILD.gn.orig
++++ components/safe_browsing/core/common/BUILD.gn
 @@ -6,20 +6,8 @@ import("//build/config/features.gni")
  import("//components/safe_browsing/buildflags.gni")
  import("//mojo/public/tools/bindings/mojom.gni")
@@ -4179,8 +4086,8 @@
  }
  
  source_set("safe_browsing_policy_handler") {
---- a/components/safe_browsing/core/common/safe_browsing_policy_handler.cc
-+++ b/components/safe_browsing/core/common/safe_browsing_policy_handler.cc
+--- components/safe_browsing/core/common/safe_browsing_policy_handler.cc.orig
++++ components/safe_browsing/core/common/safe_browsing_policy_handler.cc
 @@ -11,7 +11,6 @@
  #include "components/policy/policy_constants.h"
  #include "components/prefs/pref_service.h"
@@ -4189,7 +4096,7 @@
  #include "components/strings/grit/components_strings.h"
  #include "third_party/abseil-cpp/absl/types/optional.h"
  
-@@ -180,34 +179,14 @@ void SafeBrowsingPolicyHandler::ApplyPol
+@@ -172,34 +171,14 @@ void SafeBrowsingPolicyHandler::ApplyPol
  
    if (!value.has_value())
      return;
@@ -4226,7 +4133,7 @@
  
    if (safe_browsing_enhanced)
      return ProtectionLevel::kEnhancedProtection;
-@@ -221,10 +200,8 @@ SafeBrowsingPolicyHandler::GetSafeBrowsi
+@@ -213,10 +192,8 @@ SafeBrowsingPolicyHandler::GetSafeBrowsi
  // static
  bool SafeBrowsingPolicyHandler::IsSafeBrowsingProtectionLevelSetByPolicy(
      const PrefService* pref_service) {
@@ -4239,8 +4146,8 @@
    DCHECK_EQ(is_safe_browsing_enabled_managed,
              is_safe_browsing_enhanced_managed);
    return is_safe_browsing_enabled_managed && is_safe_browsing_enhanced_managed;
---- a/components/safe_browsing/core/common/safe_browsing_prefs_unittest.cc
-+++ b/components/safe_browsing/core/common/safe_browsing_prefs_unittest.cc
+--- components/safe_browsing/core/common/safe_browsing_prefs_unittest.cc.orig
++++ components/safe_browsing/core/common/safe_browsing_prefs_unittest.cc
 @@ -12,7 +12,6 @@
  #include "components/prefs/pref_registry_simple.h"
  #include "components/prefs/testing_pref_service.h"
@@ -4249,8 +4156,8 @@
  #include "testing/gtest/include/gtest/gtest.h"
  #include "url/gurl.h"
  
---- a/components/safety_check/safety_check.cc
-+++ b/components/safety_check/safety_check.cc
+--- components/safety_check/safety_check.cc.orig
++++ components/safety_check/safety_check.cc
 @@ -4,26 +4,9 @@
  
  #include "components/safety_check/safety_check.h"
@@ -4278,8 +4185,8 @@
    return SafeBrowsingStatus::kDisabled;
  }
  
---- a/components/security_interstitials/content/bad_clock_blocking_page.cc
-+++ b/components/security_interstitials/content/bad_clock_blocking_page.cc
+--- components/security_interstitials/content/bad_clock_blocking_page.cc.orig
++++ components/security_interstitials/content/bad_clock_blocking_page.cc
 @@ -7,7 +7,6 @@
  #include <utility>
  
@@ -4288,8 +4195,8 @@
  #include "components/security_interstitials/content/cert_report_helper.h"
  #include "components/security_interstitials/content/security_interstitial_controller_client.h"
  #include "components/security_interstitials/content/security_interstitial_page.h"
---- a/components/security_interstitials/content/captive_portal_blocking_page.cc
-+++ b/components/security_interstitials/content/captive_portal_blocking_page.cc
+--- components/security_interstitials/content/captive_portal_blocking_page.cc.orig
++++ components/security_interstitials/content/captive_portal_blocking_page.cc
 @@ -15,7 +15,6 @@
  #include "build/build_config.h"
  #include "components/captive_portal/core/captive_portal_detector.h"
@@ -4298,8 +4205,8 @@
  #include "components/security_interstitials/content/cert_report_helper.h"
  #include "components/security_interstitials/content/security_interstitial_controller_client.h"
  #include "components/security_interstitials/content/ssl_cert_reporter.h"
---- a/components/security_interstitials/content/cert_report_helper.cc
-+++ b/components/security_interstitials/content/cert_report_helper.cc
+--- components/security_interstitials/content/cert_report_helper.cc.orig
++++ components/security_interstitials/content/cert_report_helper.cc
 @@ -14,7 +14,6 @@
  #include "build/branding_buildflags.h"
  #include "build/build_config.h"
@@ -4396,8 +4303,8 @@
  }
  
  bool CertReportHelper::ShouldReportCertificateError() {
---- a/components/security_interstitials/content/mitm_software_blocking_page.cc
-+++ b/components/security_interstitials/content/mitm_software_blocking_page.cc
+--- components/security_interstitials/content/mitm_software_blocking_page.cc.orig
++++ components/security_interstitials/content/mitm_software_blocking_page.cc
 @@ -6,7 +6,6 @@
  
  #include <utility>
@@ -4406,8 +4313,8 @@
  #include "components/security_interstitials/content/cert_report_helper.h"
  #include "components/security_interstitials/content/security_interstitial_controller_client.h"
  #include "components/security_interstitials/content/security_interstitial_page.h"
---- a/components/security_interstitials/content/security_interstitial_controller_client.cc
-+++ b/components/security_interstitials/content/security_interstitial_controller_client.cc
+--- components/security_interstitials/content/security_interstitial_controller_client.cc.orig
++++ components/security_interstitials/content/security_interstitial_controller_client.cc
 @@ -7,7 +7,6 @@
  #include <utility>
  
@@ -4415,8 +4322,8 @@
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
  #include "components/security_interstitials/content/settings_page_helper.h"
  #include "components/security_interstitials/core/metrics_helper.h"
- #include "content/public/browser/navigation_entry.h"
-@@ -99,11 +98,6 @@ SecurityInterstitialControllerClient::Ge
+ #include "content/public/browser/web_contents.h"
+@@ -98,11 +97,6 @@ SecurityInterstitialControllerClient::Ge
    return prefs_;
  }
  
@@ -4428,19 +4335,19 @@
  bool SecurityInterstitialControllerClient::CanLaunchDateAndTimeSettings() {
    NOTREACHED();
    return false;
---- a/components/security_interstitials/content/security_interstitial_controller_client.h
-+++ b/components/security_interstitials/content/security_interstitial_controller_client.h
+--- components/security_interstitials/content/security_interstitial_controller_client.h.orig
++++ components/security_interstitials/content/security_interstitial_controller_client.h
 @@ -54,8 +54,6 @@ class SecurityInterstitialControllerClie
    bool CanGoBackBeforeNavigation() override;
  
   protected:
 -  // security_interstitials::ControllerClient overrides.
 -  const std::string GetExtendedReportingPrefName() const override;
-   raw_ptr<content::WebContents> web_contents_;
+   content::WebContents* web_contents_;
  
   private:
---- a/components/security_interstitials/content/security_interstitial_page.cc
-+++ b/components/security_interstitials/content/security_interstitial_page.cc
+--- components/security_interstitials/content/security_interstitial_page.cc.orig
++++ components/security_interstitials/content/security_interstitial_page.cc
 @@ -11,7 +11,6 @@
  #include "base/values.h"
  #include "components/grit/components_resources.h"
@@ -4481,8 +4388,8 @@
  }
  
  std::u16string SecurityInterstitialPage::GetFormattedHostName() const {
---- a/components/security_interstitials/content/ssl_blocking_page.cc
-+++ b/components/security_interstitials/content/ssl_blocking_page.cc
+--- components/security_interstitials/content/ssl_blocking_page.cc.orig
++++ components/security_interstitials/content/ssl_blocking_page.cc
 @@ -12,7 +12,6 @@
  #include "base/metrics/histogram_macros.h"
  #include "base/strings/string_number_conversions.h"
@@ -4491,8 +4398,8 @@
  #include "components/security_interstitials/content/cert_report_helper.h"
  #include "components/security_interstitials/content/security_interstitial_controller_client.h"
  #include "components/security_interstitials/content/security_interstitial_page.h"
---- a/components/security_interstitials/core/controller_client.cc
-+++ b/components/security_interstitials/core/controller_client.cc
+--- components/security_interstitials/core/controller_client.cc.orig
++++ components/security_interstitials/core/controller_client.cc
 @@ -36,7 +36,6 @@ MetricsHelper* ControllerClient::metrics
  
  void ControllerClient::SetReportingPreference(bool report) {
@@ -4501,9 +4408,9 @@
    metrics_helper_->RecordUserInteraction(
        report ? MetricsHelper::SET_EXTENDED_REPORTING_ENABLED
               : MetricsHelper::SET_EXTENDED_REPORTING_DISABLED);
---- a/components/security_interstitials/core/controller_client.h
-+++ b/components/security_interstitials/core/controller_client.h
-@@ -121,9 +121,6 @@ class ControllerClient {
+--- components/security_interstitials/core/controller_client.h.orig
++++ components/security_interstitials/core/controller_client.h
+@@ -122,9 +122,6 @@ class ControllerClient {
  
    void SetBaseHelpCenterUrlForTesting(const GURL& test_url);
  
@@ -4513,8 +4420,8 @@
   private:
    std::unique_ptr<MetricsHelper> metrics_helper_;
    // Link to the help center.
---- a/components/signin/core/browser/account_investigator.cc
-+++ b/components/signin/core/browser/account_investigator.cc
+--- components/signin/core/browser/account_investigator.cc.orig
++++ components/signin/core/browser/account_investigator.cc
 @@ -13,7 +13,6 @@
  #include "components/prefs/pref_registry_simple.h"
  #include "components/prefs/pref_service.h"
@@ -4589,9 +4496,9 @@
    base::TimeDelta stable_age;
    if (!last_changed.is_null())
      stable_age = std::max(now - last_changed, base::TimeDelta());
---- a/components/signin/core/browser/account_investigator_unittest.cc
-+++ b/components/signin/core/browser/account_investigator_unittest.cc
-@@ -13,7 +13,6 @@
+--- components/signin/core/browser/account_investigator_unittest.cc.orig
++++ components/signin/core/browser/account_investigator_unittest.cc
+@@ -12,7 +12,6 @@
  #include "build/build_config.h"
  #include "components/prefs/pref_registry_simple.h"
  #include "components/signin/public/base/signin_metrics.h"
@@ -4599,8 +4506,8 @@
  #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
  #include "components/signin/public/identity_manager/identity_test_environment.h"
  #include "components/sync_preferences/testing_pref_service_syncable.h"
---- a/components/signin/core/browser/account_reconcilor_unittest.cc
-+++ b/components/signin/core/browser/account_reconcilor_unittest.cc
+--- components/signin/core/browser/account_reconcilor_unittest.cc.orig
++++ components/signin/core/browser/account_reconcilor_unittest.cc
 @@ -29,7 +29,6 @@
  #include "components/signin/public/base/list_accounts_test_utils.h"
  #include "components/signin/public/base/signin_buildflags.h"
@@ -4609,8 +4516,8 @@
  #include "components/signin/public/base/test_signin_client.h"
  #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
  #include "components/signin/public/identity_manager/identity_test_environment.h"
---- a/components/signin/core/browser/dice_account_reconcilor_delegate.cc
-+++ b/components/signin/core/browser/dice_account_reconcilor_delegate.cc
+--- components/signin/core/browser/dice_account_reconcilor_delegate.cc.orig
++++ components/signin/core/browser/dice_account_reconcilor_delegate.cc
 @@ -12,7 +12,6 @@
  #include "base/ranges/algorithm.h"
  #include "components/prefs/pref_service.h"
@@ -4619,8 +4526,8 @@
  
  namespace signin {
  
---- a/components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc
-+++ b/components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc
+--- components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc.orig
++++ components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc
 @@ -8,7 +8,6 @@
  
  #include "components/prefs/pref_registry_simple.h"
@@ -4629,8 +4536,8 @@
  #include "components/signin/public/base/test_signin_client.h"
  #include "components/sync_preferences/testing_pref_service_syncable.h"
  #include "google_apis/gaia/gaia_auth_util.h"
---- a/components/signin/core/browser/signin_investigator.cc
-+++ b/components/signin/core/browser/signin_investigator.cc
+--- components/signin/core/browser/signin_investigator.cc.orig
++++ components/signin/core/browser/signin_investigator.cc
 @@ -7,7 +7,6 @@
  #include "base/check.h"
  #include "base/metrics/histogram_macros.h"
@@ -4667,8 +4574,8 @@
      scenario = InvestigatedScenario::kFirstSignIn;
    } else if (AreAccountsEqualWithFallback()) {
      scenario = InvestigatedScenario::kSameAccount;
---- a/components/signin/core/browser/signin_investigator_unittest.cc
-+++ b/components/signin/core/browser/signin_investigator_unittest.cc
+--- components/signin/core/browser/signin_investigator_unittest.cc.orig
++++ components/signin/core/browser/signin_investigator_unittest.cc
 @@ -9,7 +9,6 @@
  #include "components/prefs/pref_registry_simple.h"
  #include "components/signin/core/browser/signin_investigator.h"
@@ -4677,9 +4584,9 @@
  #include "components/signin/public/identity_manager/identity_test_environment.h"
  #include "components/sync_preferences/testing_pref_service_syncable.h"
  #include "testing/gtest/include/gtest/gtest.h"
---- a/components/signin/internal/identity_manager/account_tracker_service.cc
-+++ b/components/signin/internal/identity_manager/account_tracker_service.cc
-@@ -31,7 +31,6 @@
+--- components/signin/internal/identity_manager/account_tracker_service.cc.orig
++++ components/signin/internal/identity_manager/account_tracker_service.cc
+@@ -29,7 +29,6 @@
  #include "components/prefs/scoped_user_pref_update.h"
  #include "components/signin/internal/identity_manager/account_capabilities_constants.h"
  #include "components/signin/internal/identity_manager/account_info_util.h"
@@ -4687,7 +4594,7 @@
  #include "components/signin/public/base/signin_switches.h"
  #include "components/signin/public/identity_manager/account_capabilities.h"
  #include "components/signin/public/identity_manager/tribool.h"
-@@ -178,9 +177,6 @@ AccountTrackerService::~AccountTrackerSe
+@@ -152,9 +151,6 @@ AccountTrackerService::~AccountTrackerSe
  
  // static
  void AccountTrackerService::RegisterPrefs(PrefRegistrySimple* registry) {
@@ -4697,7 +4604,7 @@
  }
  
  void AccountTrackerService::Initialize(PrefService* pref_service,
-@@ -481,14 +477,12 @@ AccountTrackerService::ComputeNewMigrati
+@@ -455,14 +451,12 @@ AccountTrackerService::ComputeNewMigrati
  
  void AccountTrackerService::SetMigrationState(AccountIdMigrationState state) {
    DCHECK(state != MIGRATION_DONE || AreAllAccountsMigrated());
@@ -4713,7 +4620,7 @@
  }
  
  base::FilePath AccountTrackerService::GetImagePathFor(
-@@ -545,27 +539,6 @@ void AccountTrackerService::OnAccountIma
+@@ -519,24 +513,7 @@ void AccountTrackerService::OnAccountIma
      const CoreAccountId& account_id,
      const std::string& image_url_with_size,
      bool success) {
@@ -4722,15 +4629,12 @@
 -
 -  base::DictionaryValue* dict = nullptr;
 -  ListPrefUpdate update(pref_service_, prefs::kAccountInfo);
--  for (size_t i = 0; i < update->GetListDeprecated().size();
--       ++i, dict = nullptr) {
--    base::Value& dict_value = update->GetListDeprecated()[i];
--    if (dict_value.is_dict()) {
--      dict = static_cast<base::DictionaryValue*>(&dict_value);
--      const std::string* account_key = dict->FindStringKey(kAccountKeyPath);
--      if (account_key && *account_key == account_id.ToString()) {
+-  for (size_t i = 0; i < update->GetList().size(); ++i, dict = nullptr) {
+-    if (update->GetDictionary(i, &dict)) {
+-      std::string value;
+-      if (dict->GetString(kAccountKeyPath, &value) &&
+-          value == account_id.ToString())
 -        break;
--      }
 -    }
 -  }
 -
@@ -4738,177 +4642,67 @@
 -    return;
 -  }
 -  dict->SetString(kLastDownloadedImageURLWithSizePath, image_url_with_size);
++  return;
  }
  
  void AccountTrackerService::RemoveAccountImageFromDisk(
-@@ -577,181 +550,16 @@ void AccountTrackerService::RemoveAccoun
+@@ -548,11 +525,10 @@ void AccountTrackerService::RemoveAccoun
  }
  
  void AccountTrackerService::LoadFromPrefs() {
--  const base::Value* list = pref_service_->GetList(prefs::kAccountInfo);
--  std::set<CoreAccountId> to_remove;
--  for (size_t i = 0; i < list->GetListDeprecated().size(); ++i) {
--    const base::Value& dict_value = list->GetListDeprecated()[i];
--    if (dict_value.is_dict()) {
--      const base::DictionaryValue& dict =
--          base::Value::AsDictionaryValue(dict_value);
--      if (const std::string* account_key =
--              dict.FindStringKey(kAccountKeyPath)) {
--        // Ignore incorrectly persisted non-canonical account ids.
--        if (account_key->find('@') != std::string::npos &&
--            *account_key != gaia::CanonicalizeEmail(*account_key)) {
--          to_remove.insert(CoreAccountId::FromString(*account_key));
--          continue;
--        }
--
--        CoreAccountId account_id = CoreAccountId::FromString(*account_key);
--        StartTrackingAccount(account_id);
--        AccountInfo& account_info = accounts_[account_id];
--
--        GetString(dict, kAccountGaiaPath, account_info.gaia);
--        GetString(dict, kAccountEmailPath, account_info.email);
--        GetString(dict, kAccountHostedDomainPath, account_info.hosted_domain);
--        GetString(dict, kAccountFullNamePath, account_info.full_name);
--        GetString(dict, kAccountGivenNamePath, account_info.given_name);
--        GetString(dict, kAccountLocalePath, account_info.locale);
--        GetString(dict, kAccountPictureURLPath, account_info.picture_url);
--        GetString(dict, kLastDownloadedImageURLWithSizePath,
--                  account_info.last_downloaded_image_url_with_size);
--
--        if (absl::optional<bool> is_child_status =
--                dict.FindBoolKey(kDeprecatedChildStatusPath)) {
--          account_info.is_child_account = is_child_status.value()
--                                              ? signin::Tribool::kTrue
--                                              : signin::Tribool::kFalse;
+-  const base::ListValue* list = pref_service_->GetList(prefs::kAccountInfo);
+   std::set<CoreAccountId> to_remove;
+-  for (size_t i = 0; i < list->GetList().size(); ++i) {
++  for (size_t i = 0; false; ++i) {
+     const base::DictionaryValue* dict = nullptr;
+-    if (list->GetDictionary(i, &dict)) {
++    if (false) {
+       std::string value;
+       if (dict->GetString(kAccountKeyPath, &value)) {
+         // Ignore incorrectly persisted non-canonical account ids.
+@@ -588,14 +564,6 @@ void AccountTrackerService::LoadFromPref
+           account_info.is_child_account = is_child_status.value()
+                                               ? signin::Tribool::kTrue
+                                               : signin::Tribool::kFalse;
 -          // Migrate to kAccountChildAttributePath.
 -          ListPrefUpdate update(pref_service_, prefs::kAccountInfo);
--          base::Value* update_dict = &update->GetListDeprecated()[i];
--          DCHECK(update_dict->is_dict());
--          update_dict->SetIntPath(
--              kAccountChildAttributePath,
--              static_cast<int>(account_info.is_child_account));
+-          base::DictionaryValue* update_dict = nullptr;
+-          update->GetDictionary(i, &update_dict);
+-          DCHECK(update_dict);
+-          SetAccountCapabilityPath(update_dict, kAccountChildAttributePath,
+-                                   account_info.is_child_account);
 -          update_dict->RemoveKey(kDeprecatedChildStatusPath);
--        } else {
--          account_info.is_child_account =
--              ParseTribool(dict.FindIntPath(kAccountChildAttributePath));
--        }
--
--        absl::optional<bool> is_under_advanced_protection =
--            dict.FindBoolKey(kAdvancedProtectionAccountStatusPath);
--        if (is_under_advanced_protection.has_value()) {
--          account_info.is_under_advanced_protection =
--              is_under_advanced_protection.value();
--        }
--
--        if (absl::optional<int> can_offer_extended_chrome_sync_promos =
--                dict.FindIntPath(
--                    kDeprecatedCanOfferExtendedChromeSyncPromosPrefPath)) {
--          // Migrate to Capability names based pref paths.
--          ListPrefUpdate update(pref_service_, prefs::kAccountInfo);
--          base::Value* update_dict = &update->GetListDeprecated()[i];
--          DCHECK(update_dict->is_dict());
--          SetAccountCapabilityState(
--              update_dict, kCanOfferExtendedChromeSyncPromosCapabilityName,
--              ParseTribool(can_offer_extended_chrome_sync_promos));
--          update_dict->RemovePath(
--              kDeprecatedCanOfferExtendedChromeSyncPromosPrefPath);
--        }
--
--        for (const std::string& name :
--             AccountCapabilities::GetSupportedAccountCapabilityNames()) {
--          switch (FindAccountCapabilityState(dict, name)) {
--            case signin::Tribool::kUnknown:
--              account_info.capabilities.capabilities_map_.erase(name);
--              break;
--            case signin::Tribool::kTrue:
--              account_info.capabilities.capabilities_map_[name] = true;
--              break;
--            case signin::Tribool::kFalse:
--              account_info.capabilities.capabilities_map_[name] = false;
--              break;
--          }
--        }
--
--        if (!account_info.gaia.empty())
--          NotifyAccountUpdated(account_info);
--      }
--    }
--  }
--
--  // Remove any obsolete prefs.
--  for (auto account_id : to_remove) {
--    AccountInfo account_info;
--    account_info.account_id = account_id;
--    RemoveFromPrefs(account_info);
--    RemoveAccountImageFromDisk(account_id);
--  }
--
--  if (GetMigrationState() != MIGRATION_DONE) {
--    const AccountIdMigrationState new_state = ComputeNewMigrationState();
--    SetMigrationState(new_state);
--
--    if (new_state == MIGRATION_IN_PROGRESS) {
--      MigrateToGaiaId();
--    }
--  }
--
--  DCHECK(GetMigrationState() != MIGRATION_DONE || AreAllAccountsMigrated());
--  UMA_HISTOGRAM_ENUMERATION("Signin.AccountTracker.GaiaIdMigrationState",
--                            GetMigrationState(), NUM_MIGRATION_STATES);
--
--  UMA_HISTOGRAM_COUNTS_100("Signin.AccountTracker.CountOfLoadedAccounts",
--                           accounts_.size());
+         } else {
+           account_info.is_child_account =
+               FindAccountCapabilityPath(*dict, kAccountChildAttributePath);
+@@ -654,13 +622,11 @@ void AccountTrackerService::LoadFromPref
  }
  
  void AccountTrackerService::SaveToPrefs(const AccountInfo& account_info) {
 -  if (!pref_service_)
 -    return;
--
--  base::DictionaryValue* dict = nullptr;
++  return;
+ 
+   base::DictionaryValue* dict = nullptr;
 -  ListPrefUpdate update(pref_service_, prefs::kAccountInfo);
--  for (size_t i = 0; i < update->GetListDeprecated().size();
--       ++i, dict = nullptr) {
--    base::Value& dict_value = update->GetListDeprecated()[i];
--    if (dict_value.is_dict()) {
--      dict = static_cast<base::DictionaryValue*>(&dict_value);
--      const std::string* account_key = dict->FindStringKey(kAccountKeyPath);
--      if (account_key && *account_key == account_info.account_id.ToString()) {
--        break;
--      }
--    }
--  }
--
--  if (!dict) {
--    update->Append(base::Value(base::Value::Type::DICTIONARY));
--    base::Value& dict_value = update->GetListDeprecated().back();
--    DCHECK(dict_value.is_dict());
--    dict = static_cast<base::DictionaryValue*>(&dict_value);
--    dict->SetString(kAccountKeyPath, account_info.account_id.ToString());
--  }
--
--  dict->SetString(kAccountEmailPath, account_info.email);
--  dict->SetString(kAccountGaiaPath, account_info.gaia);
--  dict->SetString(kAccountHostedDomainPath, account_info.hosted_domain);
--  dict->SetString(kAccountFullNamePath, account_info.full_name);
--  dict->SetString(kAccountGivenNamePath, account_info.given_name);
--  dict->SetString(kAccountLocalePath, account_info.locale);
--  dict->SetString(kAccountPictureURLPath, account_info.picture_url);
--  dict->SetIntPath(kAccountChildAttributePath,
--                   static_cast<int>(account_info.is_child_account));
--  dict->SetBoolean(kAdvancedProtectionAccountStatusPath,
--                   account_info.is_under_advanced_protection);
--  // |kLastDownloadedImageURLWithSizePath| should only be set after the GAIA
--  // picture is successufly saved to disk. Otherwise, there is no guarantee that
--  // |kLastDownloadedImageURLWithSizePath| matches the picture on disk.
--  for (const std::string& name :
--       AccountCapabilities::GetSupportedAccountCapabilityNames()) {
--    signin::Tribool capability_state =
--        account_info.capabilities.GetCapabilityByName(name);
--    SetAccountCapabilityState(dict, name, capability_state);
--  }
- }
+-  for (size_t i = 0; i < update->GetList().size(); ++i, dict = nullptr) {
+-    if (update->GetDictionary(i, &dict)) {
++  if (false) {
++    while (false) {
+       std::string value;
+       if (dict->GetString(kAccountKeyPath, &value) &&
+           value == account_info.account_id.ToString())
+@@ -670,9 +636,6 @@ void AccountTrackerService::SaveToPrefs(
+ 
+   if (!dict) {
+     dict = new base::DictionaryValue();
+-    update->Append(base::WrapUnique(dict));
+-    // |dict| is invalidated at this point, so it needs to be reset.
+-    update->GetDictionary(update->GetList().size() - 1, &dict);
+     dict->SetString(kAccountKeyPath, account_info.account_id.ToString());
+   }
  
- void AccountTrackerService::RemoveFromPrefs(const AccountInfo& account_info) {
+@@ -699,14 +662,7 @@ void AccountTrackerService::RemoveFromPr
    if (!pref_service_)
      return;
  
@@ -4923,9 +4717,9 @@
  }
  
  CoreAccountId AccountTrackerService::PickAccountIdForAccount(
---- a/components/signin/internal/identity_manager/account_tracker_service.h
-+++ b/components/signin/internal/identity_manager/account_tracker_service.h
-@@ -235,6 +235,8 @@ class AccountTrackerService {
+--- components/signin/internal/identity_manager/account_tracker_service.h.orig
++++ components/signin/internal/identity_manager/account_tracker_service.h
+@@ -236,6 +236,8 @@ class AccountTrackerService {
    AccountInfoCallback on_account_updated_callback_;
    AccountInfoCallback on_account_removed_callback_;
  
@@ -4934,18 +4728,18 @@
    // Task runner used for file operations on avatar images.
    scoped_refptr<base::SequencedTaskRunner> image_storage_task_runner_;
  
---- a/components/signin/internal/identity_manager/account_tracker_service_unittest.cc
-+++ b/components/signin/internal/identity_manager/account_tracker_service_unittest.cc
-@@ -28,7 +28,6 @@
- #include "components/signin/internal/identity_manager/fake_account_capabilities_fetcher_factory.h"
+--- components/signin/internal/identity_manager/account_tracker_service_unittest.cc.orig
++++ components/signin/internal/identity_manager/account_tracker_service_unittest.cc
+@@ -26,7 +26,6 @@
+ #include "components/signin/internal/identity_manager/account_tracker_service.h"
  #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service.h"
  #include "components/signin/public/base/avatar_icon_util.h"
 -#include "components/signin/public/base/signin_pref_names.h"
  #include "components/signin/public/base/signin_switches.h"
  #include "components/signin/public/base/test_signin_client.h"
  #include "components/signin/public/identity_manager/account_capabilities.h"
---- a/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc
-+++ b/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc
+--- components/signin/internal/identity_manager/gaia_cookie_manager_service.cc.orig
++++ components/signin/internal/identity_manager/gaia_cookie_manager_service.cc
 @@ -29,7 +29,6 @@
  #include "components/signin/internal/identity_manager/ubertoken_fetcher_impl.h"
  #include "components/signin/public/base/signin_buildflags.h"
@@ -4954,7 +4748,7 @@
  #include "components/signin/public/identity_manager/set_accounts_in_cookie_result.h"
  #include "google_apis/gaia/gaia_constants.h"
  #include "google_apis/gaia/gaia_urls.h"
-@@ -451,9 +450,7 @@ GaiaCookieManagerService::GaiaCookieMana
+@@ -456,9 +455,7 @@ GaiaCookieManagerService::GaiaCookieMana
        listAccountsUnexpectedServerResponseRetried_(false),
        external_cc_result_fetched_(false),
        list_accounts_stale_(true) {
@@ -4965,7 +4759,7 @@
  
    if (!gaia_cookie_last_list_accounts_data.empty()) {
      if (!gaia::ParseListAccountsData(gaia_cookie_last_list_accounts_data,
-@@ -477,8 +474,6 @@ GaiaCookieManagerService::~GaiaCookieMan
+@@ -482,8 +479,6 @@ GaiaCookieManagerService::~GaiaCookieMan
  
  // static
  void GaiaCookieManagerService::RegisterPrefs(PrefRegistrySimple* registry) {
@@ -4974,7 +4768,7 @@
  }
  
  void GaiaCookieManagerService::InitCookieListener() {
-@@ -896,16 +891,12 @@ void GaiaCookieManagerService::OnListAcc
+@@ -906,16 +901,12 @@ void GaiaCookieManagerService::OnListAcc
                                     &signed_out_accounts_)) {
      listed_accounts_.clear();
      signed_out_accounts_.clear();
@@ -4991,9 +4785,9 @@
    RecordListAccountsFailure(GoogleServiceAuthError::NONE);
  
    InitializeListedAccountsIds();
---- a/components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc
-+++ b/components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc
-@@ -24,7 +24,6 @@
+--- components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc.orig
++++ components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc
+@@ -25,7 +25,6 @@
  #include "components/prefs/testing_pref_service.h"
  #include "components/signin/internal/identity_manager/account_tracker_service.h"
  #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service.h"
@@ -5001,8 +4795,8 @@
  #include "components/signin/public/base/test_signin_client.h"
  #include "google_apis/gaia/gaia_constants.h"
  #include "google_apis/gaia/gaia_urls.h"
---- a/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc
-+++ b/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc
+--- components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc.orig
++++ components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc
 @@ -17,7 +17,6 @@
  #include "components/prefs/pref_service.h"
  #include "components/signin/public/base/signin_client.h"
@@ -5057,8 +4851,8 @@
 -    client_->GetPrefs()->SetBoolean(prefs::kTokenServiceDiceCompatible, true);
    }
  }
---- a/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc
-+++ b/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc
+--- components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc.orig
++++ components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc
 @@ -25,7 +25,6 @@
  #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
  #include "components/signin/public/base/account_consistency_method.h"
@@ -5067,8 +4861,8 @@
  #include "components/signin/public/base/test_signin_client.h"
  #include "components/signin/public/identity_manager/account_info.h"
  #include "components/signin/public/webdata/token_web_data.h"
---- a/components/signin/internal/identity_manager/primary_account_manager.cc
-+++ b/components/signin/internal/identity_manager/primary_account_manager.cc
+--- components/signin/internal/identity_manager/primary_account_manager.cc.orig
++++ components/signin/internal/identity_manager/primary_account_manager.cc
 @@ -22,7 +22,6 @@
  #include "components/signin/public/base/account_consistency_method.h"
  #include "components/signin/public/base/signin_client.h"
@@ -5077,7 +4871,7 @@
  #include "components/signin/public/base/signin_switches.h"
  
  using signin::PrimaryAccountChangeEvent;
-@@ -44,22 +43,10 @@ PrimaryAccountManager::~PrimaryAccountMa
+@@ -47,22 +46,10 @@ PrimaryAccountManager::~PrimaryAccountMa
  
  // static
  void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
@@ -5100,7 +4894,7 @@
  }
  
  void PrimaryAccountManager::Initialize(PrefService* local_state) {
-@@ -67,25 +54,7 @@ void PrimaryAccountManager::Initialize(P
+@@ -70,25 +57,7 @@ void PrimaryAccountManager::Initialize(P
    DCHECK(!IsInitialized());
    initialized_ = true;
  
@@ -5127,7 +4921,7 @@
  
    if (!pref_account_id.empty()) {
      if (account_tracker_service_->GetMigrationState() ==
-@@ -95,14 +64,11 @@ void PrimaryAccountManager::Initialize(P
+@@ -98,14 +67,11 @@ void PrimaryAccountManager::Initialize(P
        // |account_info.gaia| could be empty if |account_id| is already gaia id.
        if (!account_info.gaia.empty()) {
          pref_account_id = account_info.gaia;
@@ -5143,7 +4937,7 @@
    CoreAccountId account_id = CoreAccountId::FromString(pref_account_id);
    CoreAccountInfo account_info =
        account_tracker_service_->GetAccountInfo(account_id);
-@@ -176,8 +142,7 @@ void PrimaryAccountManager::SetSyncPrima
+@@ -166,8 +132,7 @@ void PrimaryAccountManager::SetSyncPrima
  
  #if DCHECK_IS_ON()
    {
@@ -5153,7 +4947,7 @@
      bool consented_to_sync =
          client_->GetPrefs()->GetBoolean(prefs::kGoogleServicesConsentedToSync);
  
-@@ -193,10 +158,6 @@ void PrimaryAccountManager::SetSyncPrima
+@@ -183,10 +148,6 @@ void PrimaryAccountManager::SetSyncPrima
    // Go ahead and update the last signed in account info here as well. Once a
    // user is signed in the corresponding preferences should match. Doing it here
    // as opposed to on signin allows us to catch the upgrade scenario.
@@ -5164,7 +4958,7 @@
  
    // Commit primary sync account info immediately so that it does not get lost
    // if Chrome crashes before the next commit interval.
-@@ -210,20 +171,11 @@ void PrimaryAccountManager::SetPrimaryAc
+@@ -200,20 +161,11 @@ void PrimaryAccountManager::SetPrimaryAc
  
    PrefService* prefs = client_->GetPrefs();
    const std::string& account_id = primary_account_info_.account_id.ToString();
@@ -5186,27 +4980,27 @@
    if (primary_account_info().account_id.empty()) {
      DCHECK(!consented_pref);
      return false;
---- a/components/signin/internal/identity_manager/primary_account_manager_unittest.cc
-+++ b/components/signin/internal/identity_manager/primary_account_manager_unittest.cc
-@@ -25,7 +25,6 @@
- #include "components/signin/internal/identity_manager/fake_account_capabilities_fetcher_factory.h"
+--- components/signin/internal/identity_manager/primary_account_manager_unittest.cc.orig
++++ components/signin/internal/identity_manager/primary_account_manager_unittest.cc
+@@ -24,7 +24,6 @@
  #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service_delegate.h"
+ #include "components/signin/internal/identity_manager/primary_account_policy_manager.h"
  #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
 -#include "components/signin/public/base/signin_pref_names.h"
  #include "components/signin/public/base/signin_switches.h"
  #include "components/signin/public/base/test_signin_client.h"
  #include "components/sync_preferences/testing_pref_service_syncable.h"
---- a/components/signin/internal/identity_manager/primary_account_mutator_impl.cc
-+++ b/components/signin/internal/identity_manager/primary_account_mutator_impl.cc
-@@ -15,7 +15,6 @@
+--- components/signin/internal/identity_manager/primary_account_mutator_impl.cc.orig
++++ components/signin/internal/identity_manager/primary_account_mutator_impl.cc
+@@ -14,7 +14,6 @@
  #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
  #include "components/signin/public/base/signin_buildflags.h"
  #include "components/signin/public/base/signin_metrics.h"
 -#include "components/signin/public/base/signin_pref_names.h"
- #include "components/signin/public/base/signin_switches.h"
  #include "google_apis/gaia/core_account_id.h"
  
-@@ -60,7 +59,7 @@ PrimaryAccountMutatorImpl::SetPrimaryAcc
+ namespace signin {
+@@ -58,7 +57,7 @@ PrimaryAccountMutatorImpl::SetPrimaryAcc
    DCHECK(!account_info.gaia.empty());
  
  #if !BUILDFLAG(IS_CHROMEOS_ASH)
@@ -5215,8 +5009,59 @@
  #if BUILDFLAG(IS_CHROMEOS_LACROS)
    // Check that `prefs::kSigninAllowed` has not been set to false in a context
    // where Lacros wants to set a Primary Account. Lacros doesn't offer account
---- a/components/signin/internal/identity_manager/profile_oauth2_token_service.cc
-+++ b/components/signin/internal/identity_manager/profile_oauth2_token_service.cc
+--- components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc.orig
++++ components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc
+@@ -10,7 +10,6 @@
+ #include "components/signin/internal/identity_manager/primary_account_manager.h"
+ #include "components/signin/public/base/signin_client.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/account_info.h"
+ #include "components/signin/public/identity_manager/identity_utils.h"
+ 
+@@ -28,18 +27,7 @@ void PrimaryAccountPolicyManagerImpl::In
+   // local_state can be null during unit tests.
+   if (local_state) {
+     local_state_pref_registrar_.Init(local_state);
+-    local_state_pref_registrar_.Add(
+-        prefs::kGoogleServicesUsernamePattern,
+-        base::BindRepeating(&PrimaryAccountPolicyManagerImpl::
+-                                OnGoogleServicesUsernamePatternChanged,
+-                            weak_pointer_factory_.GetWeakPtr(),
+-                            primary_account_manager));
+   }
+-  signin_allowed_.Init(
+-      prefs::kSigninAllowed, client_->GetPrefs(),
+-      base::BindRepeating(
+-          &PrimaryAccountPolicyManagerImpl::OnSigninAllowedPrefChanged,
+-          base::Unretained(this), primary_account_manager));
+ 
+   CoreAccountInfo account_info = primary_account_manager->GetPrimaryAccountInfo(
+       signin::ConsentLevel::kSync);
+--- components/signin/internal/identity_manager/primary_account_policy_manager_impl.h.orig
++++ components/signin/internal/identity_manager/primary_account_policy_manager_impl.h
+@@ -56,9 +56,6 @@ class PrimaryAccountPolicyManagerImpl :
+   // profile-specific local prefs (like kGoogleServicesUsernamePattern).
+   PrefChangeRegistrar local_state_pref_registrar_;
+ 
+-  // Helper object to listen for changes to the signin allowed preference.
+-  BooleanPrefMember signin_allowed_;
+-
+   base::WeakPtrFactory<PrimaryAccountPolicyManagerImpl> weak_pointer_factory_{
+       this};
+ };
+--- components/signin/internal/identity_manager/primary_account_policy_manager_impl_unittest.cc.orig
++++ components/signin/internal/identity_manager/primary_account_policy_manager_impl_unittest.cc
+@@ -15,7 +15,6 @@
+ #include "components/signin/internal/identity_manager/primary_account_policy_manager_impl.h"
+ #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
+ #include "components/signin/public/base/account_consistency_method.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/base/test_signin_client.h"
+ #include "components/sync_preferences/testing_pref_service_syncable.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+--- components/signin/internal/identity_manager/profile_oauth2_token_service.cc.orig
++++ components/signin/internal/identity_manager/profile_oauth2_token_service.cc
 @@ -12,7 +12,6 @@
  #include "components/prefs/pref_registry_simple.h"
  #include "components/signin/internal/identity_manager/profile_oauth2_token_service_delegate.h"
@@ -5234,9 +5079,9 @@
  }
  
  ProfileOAuth2TokenServiceDelegate* ProfileOAuth2TokenService::GetDelegate() {
---- a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc
-+++ b/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc
-@@ -24,7 +24,6 @@
+--- components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc.orig
++++ components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc
+@@ -25,7 +25,6 @@
  #include "components/account_manager_core/mock_account_manager_facade.h"
  #include "components/signin/internal/identity_manager/account_tracker_service.h"
  #include "components/signin/internal/identity_manager/profile_oauth2_token_service_observer.h"
@@ -5244,8 +5089,8 @@
  #include "components/signin/public/base/test_signin_client.h"
  #include "components/signin/public/identity_manager/account_info.h"
  #include "components/sync_preferences/testing_pref_service_syncable.h"
---- a/components/signin/public/base/BUILD.gn
-+++ b/components/signin/public/base/BUILD.gn
+--- components/signin/public/base/BUILD.gn.orig
++++ components/signin/public/base/BUILD.gn
 @@ -34,8 +34,6 @@ static_library("base") {
      "signin_client.h",
      "signin_metrics.cc",
@@ -5255,8 +5100,8 @@
      "signin_switches.cc",
      "signin_switches.h",
    ]
---- a/components/signin/public/base/device_id_helper.cc
-+++ b/components/signin/public/base/device_id_helper.cc
+--- components/signin/public/base/device_id_helper.cc.orig
++++ components/signin/public/base/device_id_helper.cc
 @@ -9,7 +9,6 @@
  #include "base/guid.h"
  #include "build/chromeos_buildflags.h"
@@ -5301,8 +5146,8 @@
  }
  
  #endif
---- a/components/signin/public/base/device_id_helper_unittest.cc
-+++ b/components/signin/public/base/device_id_helper_unittest.cc
+--- components/signin/public/base/device_id_helper_unittest.cc.orig
++++ components/signin/public/base/device_id_helper_unittest.cc
 @@ -8,7 +8,6 @@
  
  #include "build/build_config.h"
@@ -5352,8 +5197,8 @@
  }
  
  #endif
---- a/components/signin/public/identity_manager/identity_utils.cc
-+++ b/components/signin/public/identity_manager/identity_utils.cc
+--- components/signin/public/identity_manager/identity_utils.cc.orig
++++ components/signin/public/identity_manager/identity_utils.cc
 @@ -11,7 +11,6 @@
  #include "base/strings/string_util.h"
  #include "base/strings/utf_string_conversions.h"
@@ -5372,8 +5217,8 @@
  }
  
  }  // namespace signin
---- a/components/signin/public/identity_manager/identity_utils_unittest.cc
-+++ b/components/signin/public/identity_manager/identity_utils_unittest.cc
+--- components/signin/public/identity_manager/identity_utils_unittest.cc.orig
++++ components/signin/public/identity_manager/identity_utils_unittest.cc
 @@ -7,7 +7,6 @@
  #include "components/prefs/pref_registry_simple.h"
  #include "components/prefs/pref_service.h"
@@ -5382,19 +5227,19 @@
  #include "testing/gtest/include/gtest/gtest.h"
  
  namespace {
---- a/components/signin/public/identity_manager/primary_account_mutator_unittest.cc
-+++ b/components/signin/public/identity_manager/primary_account_mutator_unittest.cc
-@@ -16,7 +16,6 @@
- #include "components/signin/public/base/consent_level.h"
+--- components/signin/public/identity_manager/primary_account_mutator_unittest.cc.orig
++++ components/signin/public/identity_manager/primary_account_mutator_unittest.cc
+@@ -15,7 +15,6 @@
+ #include "build/chromeos_buildflags.h"
  #include "components/signin/public/base/signin_buildflags.h"
  #include "components/signin/public/base/signin_metrics.h"
 -#include "components/signin/public/base/signin_pref_names.h"
- #include "components/signin/public/base/signin_switches.h"
+ #include "components/signin/public/identity_manager/consent_level.h"
  #include "components/signin/public/identity_manager/identity_test_environment.h"
  #include "components/signin/public/identity_manager/identity_test_utils.h"
---- a/tools/metrics/histograms/enums.xml
-+++ b/tools/metrics/histograms/enums.xml
-@@ -90465,7 +90465,6 @@ Full version information for the fingerp
+--- tools/metrics/histograms/enums.xml.orig
++++ tools/metrics/histograms/enums.xml
+@@ -83754,7 +83754,6 @@ Full version information for the fingerp
    <int value="3" label="kRestoreOnStartup"/>
    <int value="4" label="kURLsToRestoreOnStartup"/>
    <int value="5" label="extensions::pref_names::kExtensions"/>
@@ -5402,7 +5247,7 @@
    <int value="7" label="kSearchProviderOverrides"/>
    <int value="8" label="kDefaultSearchProviderSearchURL (Obsolete 12/2016)"/>
    <int value="9" label="kDefaultSearchProviderKeyword (Obsolete 12/2016)"/>
-@@ -90480,10 +90479,7 @@ Full version information for the fingerp
+@@ -83769,10 +83768,7 @@ Full version information for the fingerp
    <int value="18" label="kSafeBrowsingIncidentsSent"/>
    <int value="19" label="kSwReporterPromptVersion"/>
    <int value="20" label="kSwReporterPromptReason"/>