1 files changed, 553 insertions, 647 deletions

diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch b/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
index b1200f9..d71a532 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
@@ -1,17 +1,8 @@
 # Additional changes to Inox's fix-building-without-safebrowsing.patch
 
---- a/chrome/browser/BUILD.gn
-+++ b/chrome/browser/BUILD.gn
-@@ -615,8 +615,6 @@ static_library("browser") {
-     "internal_auth.h",
-     "interstitials/chrome_settings_page_helper.cc",
-     "interstitials/chrome_settings_page_helper.h",
--    "interstitials/enterprise_util.cc",
--    "interstitials/enterprise_util.h",
-     "invalidation/profile_invalidation_provider_factory.cc",
-     "invalidation/profile_invalidation_provider_factory.h",
-     "language/language_model_manager_factory.cc",
-@@ -1960,7 +1958,6 @@ static_library("browser") {
+--- chrome/browser/BUILD.gn.orig
++++ chrome/browser/BUILD.gn
+@@ -1953,7 +1953,6 @@ static_library("browser") {
      "//chrome/browser/net:probe_message_proto",
      "//chrome/browser/new_tab_page/modules/drive:mojo_bindings",
      "//chrome/browser/new_tab_page/modules/photos:mojo_bindings",
@@ -19,18 +10,17 @@
      "//chrome/browser/new_tab_page/modules/task_module:mojo_bindings",
      "//chrome/browser/notifications",
      "//chrome/browser/notifications/scheduler:factory",
-@@ -3774,10 +3771,6 @@ static_library("browser") {
+@@ -3726,9 +3725,6 @@ static_library("browser") {
        "download/offline_item_model_manager_factory.h",
        "enterprise/connectors/analysis/analysis_service_settings.cc",
        "enterprise/connectors/analysis/analysis_service_settings.h",
 -      "enterprise/connectors/analysis/content_analysis_delegate.cc",
 -      "enterprise/connectors/analysis/content_analysis_delegate.h",
--      "enterprise/connectors/analysis/content_analysis_delegate_base.cc",
 -      "enterprise/connectors/analysis/content_analysis_delegate_base.h",
        "enterprise/connectors/analysis/content_analysis_dialog.cc",
        "enterprise/connectors/analysis/content_analysis_dialog.h",
        "enterprise/connectors/analysis/content_analysis_downloads_delegate.cc",
-@@ -4024,10 +4017,6 @@ static_library("browser") {
+@@ -3978,10 +3974,6 @@ static_library("browser") {
        "new_tab_page/modules/photos/photos_service.h",
        "new_tab_page/modules/photos/photos_service_factory.cc",
        "new_tab_page/modules/photos/photos_service_factory.h",
@@ -41,7 +31,7 @@
        "new_tab_page/modules/task_module/task_module_handler.cc",
        "new_tab_page/modules/task_module/task_module_handler.h",
        "new_tab_page/modules/task_module/task_module_service.cc",
-@@ -7380,9 +7369,14 @@ static_library("browser") {
+@@ -7012,9 +7004,14 @@ static_library("browser") {
        "//components/safe_browsing/content/browser:safe_browsing_blocking_page",
        "//components/safe_browsing/content/browser/download:download_stats",
        "//components/safe_browsing/content/common:file_type_policies",
@@ -57,8 +47,8 @@
  
    if (!is_fuchsia) {
      sources += [
---- a/chrome/browser/accuracy_tips/accuracy_service_factory.cc
-+++ b/chrome/browser/accuracy_tips/accuracy_service_factory.cc
+--- chrome/browser/accuracy_tips/accuracy_service_factory.cc.orig
++++ chrome/browser/accuracy_tips/accuracy_service_factory.cc
 @@ -48,10 +48,7 @@ KeyedService* AccuracyServiceFactory::Bu
      content::BrowserContext* browser_context) const {
    DCHECK(base::FeatureList::IsEnabled(safe_browsing::kAccuracyTipsFeature));
@@ -71,9 +61,9 @@
    auto* history_service = HistoryServiceFactory::GetForProfile(
        profile, ServiceAccessType::IMPLICIT_ACCESS);
    auto delegate = std::make_unique<AccuracyServiceDelegate>(profile);
---- a/chrome/browser/chrome_content_browser_client.cc
-+++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -4298,11 +4298,13 @@ ChromeContentBrowserClient::CreateThrott
+--- chrome/browser/chrome_content_browser_client.cc.orig
++++ chrome/browser/chrome_content_browser_client.cc
+@@ -4229,11 +4229,13 @@ ChromeContentBrowserClient::CreateThrott
                     &throttles);
  #endif
  
@@ -87,7 +77,7 @@
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
-@@ -5699,26 +5701,7 @@ ChromeContentBrowserClient::GetSafeBrows
+@@ -5632,26 +5634,7 @@ ChromeContentBrowserClient::GetSafeBrows
      const std::vector<std::string>& allowlist_domains) {
    DCHECK_CURRENTLY_ON(BrowserThread::IO);
  
@@ -115,7 +105,7 @@
  }
  
  safe_browsing::RealTimeUrlLookupServiceBase*
-@@ -5739,11 +5722,6 @@ ChromeContentBrowserClient::GetUrlLookup
+@@ -5672,11 +5655,6 @@ ChromeContentBrowserClient::GetUrlLookup
          GetForProfile(profile);
    }
  #endif
@@ -127,9 +117,9 @@
    return nullptr;
  }
  
---- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
-+++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
-@@ -143,34 +143,6 @@ void MaybeCreateSafeBrowsingForRenderer(
+--- chrome/browser/chrome_content_browser_client_receiver_bindings.cc.orig
++++ chrome/browser/chrome_content_browser_client_receiver_bindings.cc
+@@ -139,45 +139,6 @@ void MaybeCreateSafeBrowsingForRenderer(
          const std::vector<std::string>& allowlist_domains)>
          get_checker_delegate,
      mojo::PendingReceiver<safe_browsing::mojom::SafeBrowsing> receiver) {
@@ -147,6 +137,17 @@
 -  std::vector<std::string> allowlist_domains =
 -      safe_browsing::GetURLAllowlistByPolicy(pref_service);
 -
+-  // Log the size of the domains to make sure copying them is
+-  // not too expensive.
+-  if (allowlist_domains.size() > 0) {
+-    int total_size = 0;
+-    for (const auto& domains : allowlist_domains) {
+-      total_size += domains.size();
+-    }
+-    base::UmaHistogramCounts10000(
+-        "SafeBrowsing.Policy.AllowlistDomainsTotalSize", total_size);
+-  }
+-
 -  bool safe_browsing_enabled =
 -      safe_browsing::IsSafeBrowsingEnabled(*pref_service);
 -  content::GetIOThreadTaskRunner({})->PostTask(
@@ -164,9 +165,9 @@
  }
  
  // BadgeManager is not used for Android.
---- a/chrome/browser/component_updater/chrome_client_side_phishing_component_installer.cc
-+++ b/chrome/browser/component_updater/chrome_client_side_phishing_component_installer.cc
-@@ -29,20 +29,6 @@ namespace {
+--- chrome/browser/component_updater/client_side_phishing_component_installer.cc.orig
++++ chrome/browser/component_updater/client_side_phishing_component_installer.cc
+@@ -36,20 +36,6 @@ const char kClientSidePhishingManifestNa
  
  void LoadFromDisk(const base::FilePath& pb_path,
                    const base::FilePath& visual_tflite_model_path) {
@@ -186,9 +187,9 @@
 -      ->PopulateFromDynamicUpdate(binary_pb, std::move(visual_tflite_model));
  }
  
- void PopulateModelFromFiles(const base::FilePath& install_dir) {
-@@ -56,9 +42,6 @@ void PopulateModelFromFiles(const base::
- update_client::InstallerAttributes GetInstallerAttributes() {
+ base::FilePath GetInstalledProtoPath(const base::FilePath& base) {
+@@ -123,9 +109,6 @@ update_client::InstallerAttributes
+ ClientSidePhishingComponentInstallerPolicy::GetInstallerAttributes() const {
    update_client::InstallerAttributes attributes;
  
 -  // Pass the tag parameter to the installer as the "tag" attribute; it will
@@ -197,19 +198,9 @@
    return attributes;
  }
  
---- a/chrome/browser/devtools/devtools_window.cc
-+++ b/chrome/browser/devtools/devtools_window.cc
-@@ -70,6 +70,7 @@
- #include "content/public/common/content_client.h"
- #include "content/public/common/url_constants.h"
- #include "net/base/escape.h"
-+#include "net/cert/x509_certificate.h"
- #include "third_party/blink/public/common/input/web_gesture_event.h"
- #include "third_party/blink/public/common/input/web_input_event.h"
- #include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
---- a/chrome/browser/download/chrome_download_manager_delegate.cc
-+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -130,7 +130,6 @@ using content::DownloadManager;
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig
++++ chrome/browser/download/chrome_download_manager_delegate.cc
+@@ -135,7 +135,6 @@ using content::DownloadManager;
  using download::DownloadItem;
  using download::DownloadPathReservationTracker;
  using download::PathValidationResult;
@@ -217,7 +208,7 @@
  using safe_browsing::DownloadProtectionService;
  using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
  
-@@ -1519,8 +1518,6 @@ void ChromeDownloadManagerDelegate::OnDo
+@@ -1517,8 +1516,6 @@ void ChromeDownloadManagerDelegate::OnDo
      if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
        DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
  #endif
@@ -226,7 +217,7 @@
    }
    if (ShouldBlockFile(target_info->danger_type, item)) {
      MaybeReportDangerousDownloadBlocked(
-@@ -1655,7 +1652,6 @@ void ChromeDownloadManagerDelegate::Mayb
+@@ -1670,7 +1667,6 @@ void ChromeDownloadManagerDelegate::Mayb
      service->MaybeSendDangerousDownloadOpenedReport(download,
                                                      show_download_in_folder);
    }
@@ -234,7 +225,7 @@
    if (!download->GetAutoOpened()) {
      download::DownloadContent download_content =
          download::DownloadContentFromMimeType(download->GetMimeType(), false);
-@@ -1663,6 +1659,7 @@ void ChromeDownloadManagerDelegate::Mayb
+@@ -1678,6 +1674,7 @@ void ChromeDownloadManagerDelegate::Mayb
          download->GetDangerType(), download_content, base::Time::Now(),
          download->GetEndTime(), show_download_in_folder);
    }
@@ -242,27 +233,48 @@
  }
  
  void ChromeDownloadManagerDelegate::CheckDownloadAllowed(
-@@ -1732,8 +1729,7 @@ void ChromeDownloadManagerDelegate::Chec
-   DCHECK(download_item);
-   DCHECK(download_item->IsSavePackageDownload());
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC)
-+#if 0
-   absl::optional<enterprise_connectors::AnalysisSettings> settings =
-       safe_browsing::DeepScanningRequest::ShouldUploadBinary(download_item);
- 
---- a/chrome/browser/download/download_stats.cc
-+++ b/chrome/browser/download/download_stats.cc
-@@ -9,6 +9,7 @@
+@@ -1754,30 +1751,6 @@ void ChromeDownloadManagerDelegate::Chec
+     std::move(callback).Run(true);
+     return;
+   }
+-
+-  absl::optional<enterprise_connectors::AnalysisSettings> settings =
+-      safe_browsing::DeepScanningRequest::ShouldUploadBinary(download_item);
+-
+-  if (settings.has_value()) {
+-    DownloadProtectionService* service = GetDownloadProtectionService();
+-    // Save package never need malware scans, so exempt them from scanning if
+-    // there are no other tags.
+-    settings->tags.erase("malware");
+-    if (!settings->tags.empty() && service) {
+-      download_item->SetUserData(
+-          enterprise_connectors::SavePackageScanningData::kKey,
+-          std::make_unique<enterprise_connectors::SavePackageScanningData>(
+-              std::move(callback)));
+-
+-      service->UploadSavePackageForDeepScanning(
+-          download_item, std::move(save_package_files),
+-          base::BindRepeating(
+-              &ChromeDownloadManagerDelegate::CheckSavePackageScanningDone,
+-              weak_ptr_factory_.GetWeakPtr(), download_item->GetId()),
+-          std::move(settings.value()));
+-      return;
+-    }
+-  }
+ #endif
+   std::move(callback).Run(true);
+ }
+--- chrome/browser/download/download_stats.cc.orig
++++ chrome/browser/download/download_stats.cc
+@@ -8,6 +8,7 @@
+ #include "base/metrics/user_metrics.h"
  #include "base/notreached.h"
- #include "build/build_config.h"
  #include "components/profile_metrics/browser_profile_type.h"
 +#include "components/safe_browsing/buildflags.h"
  #include "components/safe_browsing/content/browser/download/download_stats.h"
  
  void RecordDownloadCount(ChromeDownloadCountTypes type) {
-@@ -28,8 +29,10 @@ void RecordDangerousDownloadWarningShown
+@@ -27,8 +28,10 @@ void RecordDangerousDownloadWarningShown
      bool has_user_gesture) {
    base::UmaHistogramEnumeration("Download.ShowedDownloadWarning", danger_type,
                                  download::DOWNLOAD_DANGER_TYPE_MAX);
@@ -273,24 +285,23 @@
  }
  
  void RecordOpenedDangerousConfirmDialog(
---- a/chrome/browser/download/download_target_determiner.cc
-+++ b/chrome/browser/download/download_target_determiner.cc
-@@ -877,12 +877,14 @@ void DownloadTargetDeterminer::CheckVisi
+--- chrome/browser/download/download_target_determiner.cc.orig
++++ chrome/browser/download/download_target_determiner.cc
+@@ -872,11 +872,13 @@ void DownloadTargetDeterminer::CheckVisi
      bool visited_referrer_before) {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
    DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_);
 +#if BUILDFLAG(FULL_SAFE_BROWSING)
    safe_browsing::RecordDownloadFileTypeAttributes(
        safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel(
-           virtual_path_.BaseName(), download_->GetURL(),
-           GetProfile()->GetPrefs()),
+           virtual_path_.BaseName()),
        download_->HasUserGesture(), visited_referrer_before,
        GetLastDownloadBypassTimestamp());
 +#endif // BUILDFLAG(FULL_SAFE_BROWSING)
    danger_level_ = GetDangerLevel(
        visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER);
    if (danger_level_ != DownloadFileType::NOT_DANGEROUS &&
-@@ -1122,6 +1124,7 @@ DownloadFileType::DangerLevel DownloadTa
+@@ -1111,6 +1113,7 @@ DownloadFileType::DangerLevel DownloadTa
  
  absl::optional<base::Time>
  DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const {
@@ -298,7 +309,7 @@
    safe_browsing::SafeBrowsingMetricsCollector* metrics_collector =
        safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
            GetProfile());
-@@ -1130,6 +1133,9 @@ DownloadTargetDeterminer::GetLastDownloa
+@@ -1119,6 +1122,9 @@ DownloadTargetDeterminer::GetLastDownloa
                                   safe_browsing::SafeBrowsingMetricsCollector::
                                       EventType::DANGEROUS_DOWNLOAD_BYPASS)
                             : absl::nullopt;
@@ -308,19 +319,19 @@
  }
  
  void DownloadTargetDeterminer::OnDownloadDestroyed(
---- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
-+++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
-@@ -33,7 +33,6 @@
+--- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc.orig
++++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
+@@ -32,7 +32,6 @@
  #include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service_factory.h"
  #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h"
  #include "chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.h"
 -#include "chrome/browser/safe_browsing/download_protection/check_client_download_request.h"
  #include "chrome/grit/generated_resources.h"
  #include "components/enterprise/common/proto/connectors.pb.h"
- #include "components/policy/core/common/chrome_schema.h"
---- a/chrome/browser/enterprise/connectors/connectors_service.cc
-+++ b/chrome/browser/enterprise/connectors/connectors_service.cc
-@@ -461,19 +461,6 @@ absl::optional<std::string> ConnectorsSe
+ #include "components/policy/core/browser/url_util.h"
+--- chrome/browser/enterprise/connectors/connectors_service.cc.orig
++++ chrome/browser/enterprise/connectors/connectors_service.cc
+@@ -475,19 +475,6 @@ absl::optional<std::string> ConnectorsSe
    return absl::nullopt;
  }
  
@@ -340,9 +351,9 @@
  ConnectorsManager* ConnectorsService::ConnectorsManagerForTesting() {
    return connectors_manager_.get();
  }
---- a/chrome/browser/enterprise/connectors/connectors_service.h
-+++ b/chrome/browser/enterprise/connectors/connectors_service.h
-@@ -80,12 +80,6 @@ class ConnectorsService : public KeyedSe
+--- chrome/browser/enterprise/connectors/connectors_service.h.orig
++++ chrome/browser/enterprise/connectors/connectors_service.h
+@@ -78,12 +78,6 @@ class ConnectorsService : public KeyedSe
    // is no token to use.
    absl::optional<std::string> GetDMTokenForRealTimeUrlCheck() const;
  
@@ -355,18 +366,18 @@
    // Returns the CBCM domain or profile domain that enables connector policies.
    // If both set Connector policies, the CBCM domain is returned as it has
    // precedence.
---- a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc
-+++ b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc
-@@ -41,9 +41,6 @@ void CommonSignalsDecorator::Decorate(Si
+--- chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc.orig
++++ chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc
+@@ -38,9 +38,6 @@ void CommonSignalsDecorator::Decorate(Si
    // Get signals from policy values.
    signals.set_built_in_dns_client_enabled(
        enterprise_signals::utils::GetBuiltInDnsClientEnabled(local_state_));
 -  signals.set_safe_browsing_protection_level(static_cast<int32_t>(
 -      enterprise_signals::utils::GetSafeBrowsingProtectionLevel(
 -          profile_prefs_)));
- 
-   absl::optional<bool> third_party_blocking_enabled =
-       enterprise_signals::utils::GetThirdPartyBlockingEnabled(local_state_);
+   signals.set_remote_desktop_available(
+       enterprise_signals::utils::GetChromeRemoteDesktopAppBlocked(
+           policy_blocklist_service_));
 @@ -58,15 +55,6 @@ void CommonSignalsDecorator::Decorate(Si
      signals.set_chrome_cleanup_enabled(chrome_cleanup_enabled.value());
    }
@@ -380,32 +391,12 @@
 -        static_cast<int32_t>(password_protection_warning_trigger.value()));
 -  }
 -
-   if (cached_device_model_ && cached_device_manufacturer_) {
-     UpdateFromCache(signals);
-     LogSignalsCollectionLatency(kLatencyHistogramWithCacheVariant, start_time);
---- a/chrome/browser/enterprise/connectors/reporting/reporting_service_settings.cc
-+++ b/chrome/browser/enterprise/connectors/reporting/reporting_service_settings.cc
-@@ -63,17 +63,6 @@ ReportingServiceSettings::ReportingServi
-       else
-         DVLOG(1) << "Enabled event name list contains a non string value!";
-     }
--  } else {
--    // When the list of enabled event names is not set, we assume all events are
--    // enabled. This is to support the feature of selecting the "All always on"
--    // option in the policy UI, which means to always enable all events, even
--    // when new events may be added in the future. And this is also to support
--    // existing customer policies that were created before we introduced the
--    // concept of enabling/disabling events.
--    for (auto* event_name :
--         extensions::SafeBrowsingPrivateEventRouter::kAllEvents) {
--      enabled_event_names_.insert(event_name);
--    }
-   }
+   std::move(done_closure).Run();
+ }
  
-   const base::Value* enabled_opt_in_events_value =
---- a/chrome/browser/enterprise/signals/context_info_fetcher.cc
-+++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc
-@@ -204,7 +204,6 @@ void ContextInfoFetcher::Fetch(ContextIn
+--- chrome/browser/enterprise/signals/context_info_fetcher.cc.orig
++++ chrome/browser/enterprise/signals/context_info_fetcher.cc
+@@ -169,7 +169,6 @@ void ContextInfoFetcher::Fetch(ContextIn
        GetAnalysisConnectorProviders(enterprise_connectors::FILE_DOWNLOADED);
    info.on_bulk_data_entry_providers =
        GetAnalysisConnectorProviders(enterprise_connectors::BULK_DATA_ENTRY);
@@ -413,7 +404,7 @@
    info.on_security_event_providers = GetOnSecurityEventProviders();
    info.browser_version = version_info::GetVersionNumber();
    info.site_isolation_enabled =
-@@ -262,11 +261,6 @@ std::vector<std::string> ContextInfoFetc
+@@ -227,11 +226,6 @@ std::vector<std::string> ContextInfoFetc
    return connectors_service_->GetAnalysisServiceProviderNames(connector);
  }
  
@@ -425,8 +416,8 @@
  std::vector<std::string> ContextInfoFetcher::GetOnSecurityEventProviders() {
    return connectors_service_->GetReportingServiceProviderNames(
        enterprise_connectors::ReportingConnector::SECURITY_EVENT);
---- a/chrome/browser/enterprise/signals/context_info_fetcher.h
-+++ b/chrome/browser/enterprise/signals/context_info_fetcher.h
+--- chrome/browser/enterprise/signals/context_info_fetcher.h.orig
++++ chrome/browser/enterprise/signals/context_info_fetcher.h
 @@ -6,6 +6,7 @@
  #define CHROME_BROWSER_ENTERPRISE_SIGNALS_CONTEXT_INFO_FETCHER_H_
  
@@ -435,7 +426,7 @@
  #include <vector>
  
  #include "base/callback_forward.h"
-@@ -38,7 +39,6 @@ struct ContextInfo {
+@@ -37,7 +38,6 @@ struct ContextInfo {
    std::vector<std::string> on_file_downloaded_providers;
    std::vector<std::string> on_bulk_data_entry_providers;
    std::vector<std::string> on_security_event_providers;
@@ -443,7 +434,7 @@
    std::string browser_version;
    safe_browsing::SafeBrowsingState safe_browsing_protection_level;
    bool site_isolation_enabled;
-@@ -89,7 +89,6 @@ class ContextInfoFetcher {
+@@ -88,7 +88,6 @@ class ContextInfoFetcher {
    std::vector<std::string> GetAnalysisConnectorProviders(
        enterprise_connectors::AnalysisConnector connector);
  
@@ -451,8 +442,8 @@
  
    std::vector<std::string> GetOnSecurityEventProviders();
  
---- 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
 @@ -33,24 +33,6 @@ bool IsURLBlocked(const GURL& url, Polic
  
  }  // namespace
@@ -477,7 +468,7 @@
 -
  absl::optional<bool> GetThirdPartyBlockingEnabled(PrefService* local_state) {
    DCHECK(local_state);
- #if BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
+ #if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
 @@ -65,15 +47,6 @@ bool GetBuiltInDnsClientEnabled(PrefServ
    return local_state->GetBoolean(prefs::kBuiltInDnsClientEnabled);
  }
@@ -493,9 +484,9 @@
 -
  absl::optional<bool> GetChromeCleanupEnabled(PrefService* local_state) {
    DCHECK(local_state);
- #if BUILDFLAG(IS_WIN)
---- a/chrome/browser/enterprise/signals/signals_utils.h
-+++ b/chrome/browser/enterprise/signals/signals_utils.h
+ #if defined(OS_WIN)
+--- chrome/browser/enterprise/signals/signals_utils.h.orig
++++ chrome/browser/enterprise/signals/signals_utils.h
 @@ -21,12 +21,6 @@ bool GetBuiltInDnsClientEnabled(PrefServ
  
  absl::optional<bool> GetChromeCleanupEnabled(PrefService* local_state);
@@ -509,20 +500,9 @@
  bool GetChromeRemoteDesktopAppBlocked(PolicyBlocklistService* service);
  
  }  // namespace utils
---- a/chrome/browser/extensions/BUILD.gn
-+++ b/chrome/browser/extensions/BUILD.gn
-@@ -300,10 +300,6 @@ static_library("extensions") {
-     "api/runtime/chrome_runtime_api_delegate.h",
-     "api/safe_browsing_private/safe_browsing_private_api.cc",
-     "api/safe_browsing_private/safe_browsing_private_api.h",
--    "api/safe_browsing_private/safe_browsing_private_event_router.cc",
--    "api/safe_browsing_private/safe_browsing_private_event_router.h",
--    "api/safe_browsing_private/safe_browsing_private_event_router_factory.cc",
--    "api/safe_browsing_private/safe_browsing_private_event_router_factory.h",
-     "api/safe_browsing_private/safe_browsing_util.cc",
-     "api/safe_browsing_private/safe_browsing_util.h",
-     "api/scripting/scripting_api.cc",
-@@ -638,8 +634,6 @@ static_library("extensions") {
+--- chrome/browser/extensions/BUILD.gn.orig
++++ chrome/browser/extensions/BUILD.gn
+@@ -650,8 +650,6 @@ static_library("extensions") {
      "menu_manager_factory.h",
      "navigation_observer.cc",
      "navigation_observer.h",
@@ -531,8 +511,8 @@
      "pack_extension_job.cc",
      "pack_extension_job.h",
      "pending_extension_info.cc",
---- 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
 @@ -72,17 +72,8 @@ api::enterprise_reporting_private::Conte
            : nullptr;
    info.os_firewall = ToInfoSettingValue(signals.os_firewall);
@@ -551,75 +531,183 @@
    info.browser_version = std::move(signals.browser_version);
    info.built_in_dns_client_enabled = signals.built_in_dns_client_enabled;
  
---- a/chrome/browser/extensions/browser_context_keyed_service_factories.cc
-+++ b/chrome/browser/extensions/browser_context_keyed_service_factories.cc
-@@ -125,7 +125,6 @@ void EnsureBrowserContextKeyedServiceFac
- #endif
-   extensions::PreferenceAPI::GetFactoryInstance();
-   extensions::ProcessesAPI::GetFactoryInstance();
--  extensions::SafeBrowsingPrivateEventRouterFactory::GetInstance();
-   extensions::SessionsAPI::GetFactoryInstance();
- #if BUILDFLAG(IS_CHROMEOS)
-   extensions::SessionStateChangedEventDispatcher::GetFactoryInstance();
---- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
-+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
-@@ -612,51 +612,22 @@ void ChromeExtensionsBrowserClient::Noti
-     content::BrowserContext* context,
-     const ExtensionId& extension_id,
-     const std::string& code) const {
--  auto* telemetry_service =
--      safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile(
--          Profile::FromBrowserContext(context));
--  if (!telemetry_service || !telemetry_service->enabled() ||
--      !base::FeatureList::IsEnabled(
--          safe_browsing::kExtensionTelemetryTabsExecuteScriptSignal)) {
--    return;
--  }
--
--  auto signal = std::make_unique<safe_browsing::TabsExecuteScriptSignal>(
--      extension_id, code);
--  telemetry_service->AddSignal(std::move(signal));
+--- 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
+@@ -326,6 +326,7 @@ void SafeBrowsingPrivateEventRouter::OnD
+     event_router_->BroadcastEvent(std::move(extension_event));
+   }
+ 
++#if defined(FULL_SAFE_BROWSING)
+   absl::optional<enterprise_connectors::ReportingSettings> settings =
+       GetReportingSettings();
+   if (!settings.has_value() ||
+@@ -356,6 +357,7 @@ void SafeBrowsingPrivateEventRouter::OnD
+ 
+   ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()),
+                       std::move(event));
++#endif // FULL_SAFE_BROWSING
  }
  
- bool ChromeExtensionsBrowserClient::IsExtensionTelemetryServiceEnabled(
-     content::BrowserContext* context) const {
--  auto* telemetry_service =
--      safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile(
--          Profile::FromBrowserContext(context));
--  return telemetry_service && telemetry_service->enabled();
-+  return false;
+ void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialShown(
+@@ -383,6 +385,7 @@ void SafeBrowsingPrivateEventRouter::OnS
+     event_router_->BroadcastEvent(std::move(extension_event));
+   }
+ 
++#if defined(FULL_SAFE_BROWSING)
+   absl::optional<enterprise_connectors::ReportingSettings> settings =
+       GetReportingSettings();
+   if (!settings.has_value() ||
+@@ -406,6 +409,7 @@ void SafeBrowsingPrivateEventRouter::OnS
+ 
+   ReportRealtimeEvent(kKeyInterstitialEvent, std::move(settings.value()),
+                       std::move(event));
++#endif // FULL_SAFE_BROWSING
+ }
+ 
+ void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialProceeded(
+@@ -433,6 +437,7 @@ void SafeBrowsingPrivateEventRouter::OnS
+     event_router_->BroadcastEvent(std::move(extension_event));
+   }
+ 
++#if defined(FULL_SAFE_BROWSING)
+   absl::optional<enterprise_connectors::ReportingSettings> settings =
+       GetReportingSettings();
+   if (!settings.has_value() ||
+@@ -452,6 +457,7 @@ void SafeBrowsingPrivateEventRouter::OnS
+ 
+   ReportRealtimeEvent(kKeyInterstitialEvent, std::move(settings.value()),
+                       std::move(event));
++#endif // FULL_SAFE_BROWSING
  }
  
- bool ChromeExtensionsBrowserClient::
-     IsExtensionTelemetryRemoteHostContactedSignalEnabled() const {
--  return base::FeatureList::IsEnabled(
--      safe_browsing::kExtensionTelemetryReportContactedHosts);
-+  return false;
+ void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorResult(
+@@ -465,6 +471,7 @@ void SafeBrowsingPrivateEventRouter::OnA
+     const enterprise_connectors::ContentAnalysisResponse::Result& result,
+     const int64_t content_size,
+     safe_browsing::EventResult event_result) {
++#if defined(FULL_SAFE_BROWSING)
+   if (result.tag() == "malware") {
+     DCHECK_EQ(1, result.triggered_rules().size());
+     OnDangerousDeepScanningResult(
+@@ -476,6 +483,7 @@ void SafeBrowsingPrivateEventRouter::OnA
+     OnSensitiveDataEvent(url, file_name, download_digest_sha256, mime_type,
+                          trigger, scan_id, result, content_size, event_result);
+   }
++#endif // FULL_SAFE_BROWSING
  }
  
- void ChromeExtensionsBrowserClient::NotifyExtensionRemoteHostContacted(
-     content::BrowserContext* context,
-     const ExtensionId& extension_id,
-     const GURL& url) const {
--  if (!url.SchemeIsHTTPOrHTTPS()) {
--    return;
--  }
--  auto* telemetry_service =
--      safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile(
--          Profile::FromBrowserContext(context));
--  if (!telemetry_service || !telemetry_service->enabled()) {
--    return;
--  }
--  auto remote_host_signal =
--      std::make_unique<safe_browsing::RemoteHostContactedSignal>(extension_id,
--                                                                 url);
--  telemetry_service->AddSignal(std::move(remote_host_signal));
+ void SafeBrowsingPrivateEventRouter::OnDangerousDeepScanningResult(
+@@ -491,6 +499,7 @@ void SafeBrowsingPrivateEventRouter::OnD
+     const std::string& malware_category,
+     const std::string& evidence_locker_filepath,
+     const std::string& scan_id) {
++#if defined(FULL_SAFE_BROWSING)
+   absl::optional<enterprise_connectors::ReportingSettings> settings =
+       GetReportingSettings();
+   if (!settings.has_value() ||
+@@ -528,6 +537,7 @@ void SafeBrowsingPrivateEventRouter::OnD
+ 
+   ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()),
+                       std::move(event));
++#endif // FULL_SAFE_BROWSING
+ }
+ 
+ void SafeBrowsingPrivateEventRouter::OnSensitiveDataEvent(
+@@ -540,6 +550,7 @@ void SafeBrowsingPrivateEventRouter::OnS
+     const enterprise_connectors::ContentAnalysisResponse::Result& result,
+     const int64_t content_size,
+     safe_browsing::EventResult event_result) {
++#if defined(FULL_SAFE_BROWSING)
+   absl::optional<enterprise_connectors::ReportingSettings> settings =
+       GetReportingSettings();
+   if (!settings.has_value() ||
+@@ -572,6 +583,7 @@ void SafeBrowsingPrivateEventRouter::OnS
+ 
+   ReportRealtimeEvent(kKeySensitiveDataEvent, std::move(settings.value()),
+                       std::move(event));
++#endif // FULL_SAFE_BROWSING
  }
  
- // static
---- a/chrome/browser/extensions/extension_service.cc
-+++ b/chrome/browser/extensions/extension_service.cc
-@@ -53,7 +53,6 @@
+ void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorWarningBypassed(
+@@ -584,6 +596,7 @@ void SafeBrowsingPrivateEventRouter::OnA
+     safe_browsing::DeepScanAccessPoint access_point,
+     const enterprise_connectors::ContentAnalysisResponse::Result& result,
+     const int64_t content_size) {
++#if defined(FULL_SAFE_BROWSING)
+   absl::optional<enterprise_connectors::ReportingSettings> settings =
+       GetReportingSettings();
+   if (!settings.has_value() ||
+@@ -616,6 +629,7 @@ void SafeBrowsingPrivateEventRouter::OnA
+ 
+   ReportRealtimeEvent(kKeySensitiveDataEvent, std::move(settings.value()),
+                       std::move(event));
++#endif // FULL_SAFE_BROWSING
+ }
+ 
+ void SafeBrowsingPrivateEventRouter::OnUnscannedFileEvent(
+@@ -628,6 +642,7 @@ void SafeBrowsingPrivateEventRouter::OnU
+     const std::string& reason,
+     const int64_t content_size,
+     safe_browsing::EventResult event_result) {
++#if defined(FULL_SAFE_BROWSING)
+   absl::optional<enterprise_connectors::ReportingSettings> settings =
+       GetReportingSettings();
+   if (!settings.has_value() ||
+@@ -654,6 +669,7 @@ void SafeBrowsingPrivateEventRouter::OnU
+ 
+   ReportRealtimeEvent(kKeyUnscannedFileEvent, std::move(settings.value()),
+                       std::move(event));
++#endif // FULL_SAFE_BROWSING
+ }
+ 
+ void SafeBrowsingPrivateEventRouter::OnDangerousDownloadEvent(
+@@ -679,6 +695,7 @@ void SafeBrowsingPrivateEventRouter::OnD
+     const std::string& scan_id,
+     const int64_t content_size,
+     safe_browsing::EventResult event_result) {
++#if defined(FULL_SAFE_BROWSING)
+   absl::optional<enterprise_connectors::ReportingSettings> settings =
+       GetReportingSettings();
+   if (!settings.has_value() ||
+@@ -709,6 +726,7 @@ void SafeBrowsingPrivateEventRouter::OnD
+ 
+   ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()),
+                       std::move(event));
++#endif
+ }
+ 
+ void SafeBrowsingPrivateEventRouter::OnDangerousDownloadWarningBypassed(
+@@ -732,6 +750,7 @@ void SafeBrowsingPrivateEventRouter::OnD
+     const std::string& mime_type,
+     const std::string& scan_id,
+     const int64_t content_size) {
++#if defined(FULL_SAFE_BROWSING)
+   absl::optional<enterprise_connectors::ReportingSettings> settings =
+       GetReportingSettings();
+   if (!settings.has_value() ||
+@@ -762,6 +781,7 @@ void SafeBrowsingPrivateEventRouter::OnD
+ 
+   ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()),
+                       std::move(event));
++#endif // FULL_SAFE_BROWSING
+ }
+ 
+ void SafeBrowsingPrivateEventRouter::OnLoginEvent(
+@@ -1087,7 +1107,11 @@ void SafeBrowsingPrivateEventRouter::Rep
+ }
+ 
+ std::string SafeBrowsingPrivateEventRouter::GetProfileUserName() const {
++#if defined(FULL_SAFE_BROWSING)
+   return safe_browsing::GetProfileEmail(identity_manager_);
++#else
++  return "";
++#endif
+ }
+ 
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+--- chrome/browser/extensions/extension_service.cc.orig
++++ chrome/browser/extensions/extension_service.cc
+@@ -52,7 +52,6 @@
  #include "chrome/browser/extensions/forced_extensions/install_stage_tracker.h"
  #include "chrome/browser/extensions/install_verifier.h"
  #include "chrome/browser/extensions/installed_loader.h"
@@ -627,15 +715,7 @@
  #include "chrome/browser/extensions/pending_extension_manager.h"
  #include "chrome/browser/extensions/permissions_updater.h"
  #include "chrome/browser/extensions/shared_module_service.h"
-@@ -207,7 +206,6 @@ void ExtensionService::BlocklistExtensio
-   blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
-       extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE,
-       extension_prefs_);
--  OnBlocklistStateAdded(extension_id);
- }
- 
- bool ExtensionService::OnExternalExtensionUpdateUrlFound(
-@@ -370,7 +368,6 @@ ExtensionService::ExtensionService(Profi
+@@ -370,7 +369,6 @@ ExtensionService::ExtensionService(Profi
        safe_browsing_verdict_handler_(extension_prefs,
                                       ExtensionRegistry::Get(profile),
                                       this),
@@ -643,7 +723,7 @@
        registry_(ExtensionRegistry::Get(profile)),
        pending_extension_manager_(profile),
        install_directory_(install_directory),
-@@ -870,100 +867,6 @@ bool ExtensionService::IsExtensionEnable
+@@ -852,47 +850,6 @@ bool ExtensionService::IsExtensionEnable
    return extension_registrar_.IsExtensionEnabled(extension_id);
  }
  
@@ -651,14 +731,56 @@
 -    const std::string& extension_id,
 -    const base::Value& attributes) {
 -  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+-  HandleMalwareOmahaAttribute(extension_id, attributes);
 -  omaha_attributes_handler_.PerformActionBasedOnOmahaAttributes(extension_id,
 -                                                                attributes);
 -  allowlist_.PerformActionBasedOnOmahaAttributes(extension_id, attributes);
+-}
+-
+-void ExtensionService::HandleMalwareOmahaAttribute(
+-    const std::string& extension_id,
+-    const base::Value& attributes) {
+-  bool has_malware_value =
+-      OmahaAttributesHandler::HasOmahaBlocklistStateInAttributes(
+-          attributes, BitMapBlocklistState::BLOCKLISTED_MALWARE);
+-  if (!has_malware_value) {
+-    OmahaAttributesHandler::ReportNoUpdateCheckKeys();
+-    // Omaha attributes may have previously have the "_malware" key.
+-    MaybeEnableRemotelyDisabledExtension(extension_id);
+-    return;
+-  }
+-
+-  if (extension_prefs_->HasDisableReason(
+-          extension_id, disable_reason::DISABLE_REMOTELY_FOR_MALWARE)) {
+-    // The extension is already disabled. No work needs to be done.
+-    return;
+-  }
+-
+-  OmahaAttributesHandler::ReportExtensionDisabledRemotely(
+-      extension_registrar_.IsExtensionEnabled(extension_id),
+-      ExtensionUpdateCheckDataKey::kMalware);
+-
+-  // Add the extension to the blocklisted extensions set.
+-  UpdateBlocklistedExtensions({extension_id},
+-                              registry_->blocklisted_extensions().GetIDs());
+-  extension_prefs_->AddDisableReason(
+-      extension_id, disable_reason::DISABLE_REMOTELY_FOR_MALWARE);
 -  // Show an error for the newly blocklisted extension.
 -  error_controller_->ShowErrorIfNeeded();
 -}
+ 
+ void ExtensionService::MaybeEnableRemotelyDisabledExtension(
+     const std::string& extension_id) {
+@@ -909,56 +866,6 @@ void ExtensionService::MaybeEnableRemote
+   unchanged.erase(extension_id);
+   // Remove the extension from the blocklist.
+   UpdateBlocklistedExtensions({}, unchanged);
+-  OmahaAttributesHandler::ReportReenableExtension(
+-      ExtensionUpdateCheckDataKey::kMalware);
+-}
 -
--void ExtensionService::OnGreylistStateRemoved(const std::string& extension_id) {
+-void ExtensionService::ClearGreylistedAcknowledgedStateAndMaybeReenable(
+-    const std::string& extension_id) {
 -  bool is_on_sb_list = (blocklist_prefs::GetSafeBrowsingExtensionBlocklistState(
 -                            extension_id, extension_prefs_) !=
 -                        BitMapBlocklistState::NOT_BLOCKLISTED);
@@ -675,8 +797,9 @@
 -                                    disable_reason::DISABLE_GREYLIST);
 -}
 -
--void ExtensionService::OnGreylistStateAdded(const std::string& extension_id,
--                                            BitMapBlocklistState new_state) {
+-void ExtensionService::MaybeDisableGreylistedExtension(
+-    const std::string& extension_id,
+-    BitMapBlocklistState new_state) {
 -#if DCHECK_IS_ON()
 -  bool has_new_state_on_sb_list =
 -      (blocklist_prefs::GetSafeBrowsingExtensionBlocklistState(
@@ -702,51 +825,12 @@
 -  blocklist_prefs::UpdateCurrentGreylistStatesAsAcknowledged(extension_id,
 -                                                             extension_prefs_);
 -  DisableExtension(extension_id, disable_reason::DISABLE_GREYLIST);
--}
--
--void ExtensionService::OnBlocklistStateRemoved(
--    const std::string& extension_id) {
--  if (blocklist_prefs::IsExtensionBlocklisted(extension_id, extension_prefs_)) {
--    return;
--  }
--
--  // Clear acknowledged state.
--  blocklist_prefs::RemoveAcknowledgedBlocklistState(
--      extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE,
--      extension_prefs_);
--
--  scoped_refptr<const Extension> extension =
--      registry_->blocklisted_extensions().GetByID(extension_id);
--  DCHECK(extension);
--  registry_->RemoveBlocklisted(extension_id);
--  AddExtension(extension.get());
--}
--
--void ExtensionService::OnBlocklistStateAdded(const std::string& extension_id) {
--  DCHECK(
--      blocklist_prefs::IsExtensionBlocklisted(extension_id, extension_prefs_));
--  // The extension was already acknowledged by the user, it should already be in
--  // the unloaded state.
--  if (blocklist_prefs::HasAcknowledgedBlocklistState(
--          extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE,
--          extension_prefs_)) {
--    DCHECK(base::Contains(registry_->blocklisted_extensions().GetIDs(),
--                          extension_id));
--    return;
--  }
--
--  scoped_refptr<const Extension> extension =
--      registry_->GetInstalledExtension(extension_id);
--  registry_->AddBlocklisted(extension);
--  UnloadExtension(extension_id, UnloadedExtensionReason::BLOCKLIST);
--}
--
+ }
+ 
  void ExtensionService::RemoveDisableReasonAndMaybeEnable(
-     const std::string& extension_id,
-     disable_reason::DisableReason reason_to_remove) {
---- a/chrome/browser/extensions/extension_service.h
-+++ b/chrome/browser/extensions/extension_service.h
-@@ -26,7 +26,6 @@
+--- chrome/browser/extensions/extension_service.h.orig
++++ chrome/browser/extensions/extension_service.h
+@@ -25,7 +25,6 @@
  #include "chrome/browser/extensions/forced_extensions/force_installed_metrics.h"
  #include "chrome/browser/extensions/forced_extensions/force_installed_tracker.h"
  #include "chrome/browser/extensions/install_gate.h"
@@ -754,7 +838,7 @@
  #include "chrome/browser/extensions/pending_extension_manager.h"
  #include "chrome/browser/extensions/safe_browsing_verdict_handler.h"
  #include "chrome/browser/profiles/profile_manager.h"
-@@ -276,40 +275,11 @@ class ExtensionService : public Extensio
+@@ -269,28 +268,11 @@ class ExtensionService : public Extensio
    // nothing.
    void EnableExtension(const std::string& extension_id);
  
@@ -762,26 +846,14 @@
 -  // whether to remove greylist disabled reason. Called when a greylisted
 -  // state is removed from the Safe Browsing blocklist or Omaha blocklist. Also
 -  // clears all acknowledged states if the greylist disabled reason is removed.
--  void OnGreylistStateRemoved(const std::string& extension_id);
+-  void ClearGreylistedAcknowledgedStateAndMaybeReenable(
+-      const std::string& extension_id);
 -
 -  // Takes acknowledged blocklist states into account and decides whether to
 -  // disable the greylisted extension. Called when a new greylisted state is
 -  // added to the Safe Browsing blocklist or Omaha blocklist.
--  void OnGreylistStateAdded(const std::string& extension_id,
--                            BitMapBlocklistState new_state);
--
--  // Takes Safe Browsing and Omaha malware blocklist states into account and
--  // decides whether to remove the extension from the blocklist and reload it.
--  // Called when a blocklisted extension is removed from the Safe Browsing
--  // malware blocklist or Omaha malware blocklist. Also clears the acknowledged
--  // state if the extension is reloaded.
--  void OnBlocklistStateRemoved(const std::string& extension_id);
--
--  // Takes acknowledged malware blocklist state into account and decides whether
--  // to add the extension to the blocklist and unload it. Called when the
--  // extension is added to the Safe Browsing malware blocklist or the Omaha
--  // malware blocklist.
--  void OnBlocklistStateAdded(const std::string& extension_id);
+-  void MaybeDisableGreylistedExtension(const std::string& extension_id,
+-                                       BitMapBlocklistState new_state);
 -
    // Removes the disable reason and enable the extension if there are no disable
    // reasons left and is not blocked for another reason.
@@ -795,17 +867,29 @@
    // Disables the extension. If the extension is already disabled, just adds
    // the |disable_reasons| (a bitmask of disable_reason::DisableReason - there
    // can be multiple DisableReasons e.g. when an extension comes in disabled
-@@ -649,8 +619,6 @@ class ExtensionService : public Extensio
+@@ -562,11 +544,6 @@ class ExtensionService : public Extensio
+   // Helper method to determine if an extension can be blocked.
+   bool CanBlockExtension(const Extension* extension) const;
+ 
+-  // Handles the malware Omaha attribute for remotely disabled extensions.
+-  // TODO(crbug.com/1193695): Move this function to OmahaAttributesHandler.
+-  void HandleMalwareOmahaAttribute(const std::string& extension_id,
+-                                   const base::Value& attributes);
+-
+   // Enables an extension that was only previously disabled remotely.
+   void MaybeEnableRemotelyDisabledExtension(const std::string& extension_id);
+ 
+@@ -639,8 +616,6 @@ class ExtensionService : public Extensio
  
    SafeBrowsingVerdictHandler safe_browsing_verdict_handler_;
  
 -  OmahaAttributesHandler omaha_attributes_handler_;
 -
    // Sets of enabled/disabled/terminated/blocklisted extensions. Not owned.
-   raw_ptr<ExtensionRegistry> registry_ = nullptr;
+   ExtensionRegistry* registry_ = nullptr;
  
---- a/chrome/browser/extensions/extension_system_impl.cc
-+++ b/chrome/browser/extensions/extension_system_impl.cc
+--- chrome/browser/extensions/extension_system_impl.cc.orig
++++ chrome/browser/extensions/extension_system_impl.cc
 @@ -465,8 +465,6 @@ void ExtensionSystemImpl::InstallUpdate(
  void ExtensionSystemImpl::PerformActionBasedOnOmahaAttributes(
      const std::string& extension_id,
@@ -815,42 +899,28 @@
  }
  
  bool ExtensionSystemImpl::FinishDelayedInstallationIfReady(
---- a/chrome/browser/extensions/safe_browsing_verdict_handler.cc
-+++ b/chrome/browser/extensions/safe_browsing_verdict_handler.cc
-@@ -119,7 +119,6 @@ void SafeBrowsingVerdictHandler::UpdateB
-     blocklist_.Remove(id);
-     blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
-         id, BitMapBlocklistState::NOT_BLOCKLISTED, extension_prefs_);
--    extension_service_->OnBlocklistStateRemoved(id);
-     UMA_HISTOGRAM_ENUMERATION("ExtensionBlacklist.UnblacklistInstalled",
-                               extension->location());
-   }
-@@ -133,7 +132,6 @@ void SafeBrowsingVerdictHandler::UpdateB
-     blocklist_.Insert(extension);
-     blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
-         id, BitMapBlocklistState::BLOCKLISTED_MALWARE, extension_prefs_);
--    extension_service_->OnBlocklistStateAdded(id);
-     UMA_HISTOGRAM_ENUMERATION("ExtensionBlacklist.BlacklistInstalled",
-                               extension->location());
-   }
-@@ -157,7 +155,6 @@ void SafeBrowsingVerdictHandler::UpdateG
+--- chrome/browser/extensions/safe_browsing_verdict_handler.cc.orig
++++ chrome/browser/extensions/safe_browsing_verdict_handler.cc
+@@ -101,8 +101,6 @@ void SafeBrowsingVerdictHandler::UpdateG
      blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
          extension->id(), BitMapBlocklistState::NOT_BLOCKLISTED,
          extension_prefs_);
--    extension_service_->OnGreylistStateRemoved(extension->id());
+-    extension_service_->ClearGreylistedAcknowledgedStateAndMaybeReenable(
+-        extension->id());
      UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Enabled",
                                extension->location());
    }
-@@ -177,7 +174,6 @@ void SafeBrowsingVerdictHandler::UpdateG
+@@ -125,8 +123,6 @@ void SafeBrowsingVerdictHandler::UpdateG
          blocklist_prefs::BlocklistStateToBitMapBlocklistState(greylist_state);
      blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
          extension->id(), bitmap_greylist_state, extension_prefs_);
--    extension_service_->OnGreylistStateAdded(id, bitmap_greylist_state);
+-    extension_service_->MaybeDisableGreylistedExtension(id,
+-                                                        bitmap_greylist_state);
      UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Disabled",
                                extension->location());
    }
---- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
-+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
+--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig
++++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
 @@ -35,8 +35,6 @@
  #include "chrome/browser/file_system_access/file_system_access_permission_request_manager.h"
  #include "chrome/browser/installable/installable_utils.h"
@@ -860,7 +930,7 @@
  #include "chrome/browser/ui/file_system_access_dialogs.h"
  #include "chrome/common/chrome_paths.h"
  #include "components/content_settings/core/browser/host_content_settings_map.h"
-@@ -305,83 +303,6 @@ BindResultCallbackToCurrentSequence(
+@@ -299,83 +297,6 @@ BindResultCallbackToCurrentSequence(
        base::SequencedTaskRunnerHandle::Get(), std::move(callback));
  }
  
@@ -944,7 +1014,7 @@
  std::string GenerateLastPickedDirectoryKey(const std::string& id) {
    return id.empty() ? kDefaultLastPickedDirectoryKey
                      : base::StrCat({kCustomLastPickedDirectoryKey, "-", id});
-@@ -1137,28 +1058,6 @@ void ChromeFileSystemAccessPermissionCon
+@@ -1106,28 +1027,6 @@ void ChromeFileSystemAccessPermissionCon
                       std::move(callback)));
  }
  
@@ -973,9 +1043,9 @@
  void ChromeFileSystemAccessPermissionContext::
      DidConfirmSensitiveDirectoryAccess(
          const url::Origin& origin,
---- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
-+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
-@@ -86,10 +86,6 @@ class ChromeFileSystemAccessPermissionCo
+--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.h.orig
++++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
+@@ -85,10 +85,6 @@ class ChromeFileSystemAccessPermissionCo
        HandleType handle_type,
        content::GlobalRenderFrameHostId frame_id,
        base::OnceCallback<void(SensitiveDirectoryResult)> callback) override;
@@ -986,9 +1056,9 @@
    bool CanObtainReadPermission(const url::Origin& origin) override;
    bool CanObtainWritePermission(const url::Origin& origin) override;
  
---- a/chrome/browser/media/webrtc/display_media_access_handler.cc
-+++ b/chrome/browser/media/webrtc/display_media_access_handler.cc
-@@ -23,6 +23,7 @@
+--- chrome/browser/media/webrtc/display_media_access_handler.cc.orig
++++ chrome/browser/media/webrtc/display_media_access_handler.cc
+@@ -25,6 +25,7 @@
  #include "chrome/browser/safe_browsing/user_interaction_observer.h"
  #include "chrome/common/pref_names.h"
  #include "components/prefs/pref_service.h"
@@ -996,7 +1066,7 @@
  #include "components/url_formatter/elide_url.h"
  #include "content/public/browser/browser_thread.h"
  #include "content/public/browser/desktop_capture.h"
-@@ -106,6 +107,7 @@ void DisplayMediaAccessHandler::HandleRe
+@@ -111,6 +112,7 @@ void DisplayMediaAccessHandler::HandleRe
      return;
    }
  
@@ -1004,41 +1074,25 @@
    // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
    // warnings until user interaction. If the current page has a delayed warning,
    // it'll have a user interaction observer attached. Show the warning
-@@ -121,6 +123,7 @@ void DisplayMediaAccessHandler::HandleRe
+@@ -125,6 +127,7 @@ void DisplayMediaAccessHandler::HandleRe
      observer->OnDesktopCaptureRequest();
      return;
    }
 +  #endif // BUILDFLAG(FULL_SAFE_BROWSING)
  
- #if BUILDFLAG(IS_MAC)
+ #if defined(OS_MAC)
    // Do not allow picker UI to be shown on a page that isn't in the foreground
---- a/chrome/browser/notifications/notification_display_service_impl.cc
-+++ b/chrome/browser/notifications/notification_display_service_impl.cc
-@@ -88,13 +88,6 @@ NotificationDisplayServiceImpl::Notifica
-             profile_));
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
--    AddNotificationHandler(
--        NotificationHandler::Type::TAILORED_SECURITY,
--        std::make_unique<safe_browsing::TailoredSecurityNotificationHandler>());
--#endif
--
- #if BUILDFLAG(ENABLE_EXTENSIONS)
-     AddNotificationHandler(
-         NotificationHandler::Type::EXTENSION,
---- a/chrome/browser/password_manager/chrome_password_manager_client.cc
-+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig
++++ chrome/browser/password_manager/chrome_password_manager_client.cc
 @@ -33,7 +33,6 @@
- #include "chrome/browser/password_manager/password_scripts_fetcher_factory.h"
+ #include "chrome/browser/password_manager/password_reuse_manager_factory.h"
  #include "chrome/browser/password_manager/password_store_factory.h"
  #include "chrome/browser/profiles/profile.h"
 -#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
  #include "chrome/browser/safe_browsing/user_interaction_observer.h"
  #include "chrome/browser/signin/identity_manager_factory.h"
  #include "chrome/browser/sync/sync_service_factory.h"
-@@ -114,11 +113,11 @@
+@@ -110,11 +109,11 @@
  #if BUILDFLAG(FULL_SAFE_BROWSING)
  #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h"
  #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h"
@@ -1049,9 +1103,9 @@
  #include "ui/events/keycodes/keyboard_codes.h"
 -#endif
  
- #if BUILDFLAG(IS_ANDROID)
+ #if defined(OS_ANDROID)
  #include "chrome/browser/android/tab_android.h"
-@@ -850,6 +849,7 @@ autofill::LanguageCode ChromePasswordMan
+@@ -826,6 +825,7 @@ autofill::LanguageCode ChromePasswordMan
    return autofill::LanguageCode();
  }
  
@@ -1059,59 +1113,45 @@
  safe_browsing::PasswordProtectionService*
  ChromePasswordManagerClient::GetPasswordProtectionService() const {
    return safe_browsing::ChromePasswordProtectionService::
-@@ -885,13 +885,9 @@ void ChromePasswordManagerClient::CheckP
-       web_contents(), web_contents()->GetLastCommittedURL(), username,
-       password_type, matching_reused_credentials, password_field_exists);
- }
-+#endif // BUILDFLAG(FULL_SAFE_BROWSING)
- 
- void ChromePasswordManagerClient::LogPasswordReuseDetectedEvent() {
+@@ -836,13 +836,6 @@ ChromePasswordManagerClient::GetPassword
+ void ChromePasswordManagerClient::CheckSafeBrowsingReputation(
+     const GURL& form_action,
+     const GURL& frame_url) {
 -  safe_browsing::PasswordProtectionService* pps =
 -      GetPasswordProtectionService();
 -  if (pps) {
--    pps->MaybeLogPasswordReuseDetectedEvent(web_contents());
+-    pps->MaybeStartPasswordFieldOnFocusRequest(
+-        web_contents(), web_contents()->GetLastCommittedURL(), form_action,
+-        frame_url, pps->GetAccountInfo().hosted_domain);
 -  }
  }
+ #endif  // defined(ON_FOCUS_PING_ENABLED)
  
- #if !BUILDFLAG(IS_ANDROID)
-@@ -900,36 +896,10 @@ void ChromePasswordManagerClient::MaybeR
-     bool is_federated,
-     const url::Origin& federated_origin,
-     const std::u16string& login_user_name) const {
--  if (!base::FeatureList::IsEnabled(policy::features::kLoginEventReporting))
--    return;
--
--  extensions::SafeBrowsingPrivateEventRouter* router =
--      extensions::SafeBrowsingPrivateEventRouterFactory::GetForProfile(
--          profile_);
--  if (!router)
+@@ -852,22 +845,10 @@ void ChromePasswordManagerClient::CheckP
+     const std::vector<password_manager::MatchingReusedCredential>&
+         matching_reused_credentials,
+     bool password_field_exists) {
+-  safe_browsing::PasswordProtectionService* pps =
+-      GetPasswordProtectionService();
+-  if (!pps)
 -    return;
 -
--  // The router is responsible for checking if the reporting of this event type
--  // is enabled by the admin.
--  router->OnLoginEvent(url, is_federated, federated_origin, login_user_name);
+-  pps->MaybeStartProtectedPasswordEntryRequest(
+-      web_contents(), web_contents()->GetLastCommittedURL(), username,
+-      password_type, matching_reused_credentials, password_field_exists);
  }
++#endif // BUILDFLAG(FULL_SAFE_BROWSING)
  
- void ChromePasswordManagerClient::MaybeReportEnterprisePasswordBreachEvent(
-     const std::vector<std::pair<GURL, std::u16string>>& identities) const {
--  if (!base::FeatureList::IsEnabled(
--          policy::features::kPasswordBreachEventReporting)) {
--    return;
+ void ChromePasswordManagerClient::LogPasswordReuseDetectedEvent() {
+-  safe_browsing::PasswordProtectionService* pps =
+-      GetPasswordProtectionService();
+-  if (pps) {
+-    pps->MaybeLogPasswordReuseDetectedEvent(web_contents());
 -  }
--
--  extensions::SafeBrowsingPrivateEventRouter* router =
--      extensions::SafeBrowsingPrivateEventRouterFactory::GetForProfile(
--          profile_);
--  if (!router)
--    return;
--
--  // The router is responsible for checking if the reporting of this event type
--  // is enabled by the admin.
--  router->OnPasswordBreach(kPasswordBreachEntryTrigger, identities);
  }
- #endif
  
-@@ -1398,9 +1368,11 @@ void ChromePasswordManagerClient::OnPast
+ #if !defined(OS_ANDROID)
+@@ -1365,9 +1346,11 @@ void ChromePasswordManagerClient::OnPast
    }
  
    was_on_paste_called_ = true;
@@ -1120,11 +1160,11 @@
 +#endif // defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
  }
 -#endif
-+#endif //  !BUILDFLAG(IS_ANDROID)
++#endif //  !defined(OS_ANDROID)
  
  void ChromePasswordManagerClient::RenderFrameCreated(
      content::RenderFrameHost* render_frame_host) {
-@@ -1435,7 +1407,9 @@ void ChromePasswordManagerClient::OnInpu
+@@ -1402,7 +1385,9 @@ void ChromePasswordManagerClient::OnInpu
    if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
      OnPaste();
    } else {
@@ -1132,9 +1172,9 @@
      password_reuse_detection_manager_.OnKeyPressedCommitted(key_event.text);
 +#endif  // defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
    }
- #endif  // BUILDFLAG(IS_ANDROID)
+ #endif  // defined(OS_ANDROID)
  }
-@@ -1474,6 +1448,7 @@ bool ChromePasswordManagerClient::IsPass
+@@ -1441,6 +1426,7 @@ bool ChromePasswordManagerClient::IsPass
      is_enabled = false;
    }
  
@@ -1142,7 +1182,7 @@
    // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
    // warnings until user interaction. If the current page has a delayed warning,
    // it'll have a user interaction observer attached. Disable password
-@@ -1484,6 +1459,7 @@ bool ChromePasswordManagerClient::IsPass
+@@ -1451,6 +1437,7 @@ bool ChromePasswordManagerClient::IsPass
      observer->OnPasswordSaveOrAutofillDenied();
      is_enabled = false;
    }
@@ -1150,9 +1190,9 @@
  
    if (log_manager_->IsLoggingActive()) {
      password_manager::BrowserSavePasswordProgressLogger logger(
---- a/chrome/browser/password_manager/chrome_password_manager_client.h
-+++ b/chrome/browser/password_manager/chrome_password_manager_client.h
-@@ -216,13 +216,14 @@ class ChromePasswordManagerClient
+--- chrome/browser/password_manager/chrome_password_manager_client.h.orig
++++ chrome/browser/password_manager/chrome_password_manager_client.h
+@@ -207,13 +207,14 @@ class ChromePasswordManagerClient
    void AnnotateNavigationEntry(bool has_password_field) override;
    autofill::LanguageCode GetPageLanguage() const override;
  
@@ -1168,7 +1208,7 @@
  
    void CheckProtectedPasswordEntry(
        password_manager::metrics_util::PasswordType reused_password_type,
-@@ -230,6 +231,7 @@ class ChromePasswordManagerClient
+@@ -221,6 +222,7 @@ class ChromePasswordManagerClient
        const std::vector<password_manager::MatchingReusedCredential>&
            matching_reused_credentials,
        bool password_field_exists) override;
@@ -1176,8 +1216,8 @@
  
    void LogPasswordReuseDetectedEvent() override;
  
---- 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
 @@ -136,6 +136,7 @@ void AbusiveOriginPermissionRevocationRe
    DCHECK(profile_);
    DCHECK(callback_);
@@ -1194,9 +1234,9 @@
  }
  
  void AbusiveOriginPermissionRevocationRequest::OnSafeBrowsingVerdictReceived(
---- a/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
-+++ b/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
-@@ -16,7 +16,6 @@
+--- chrome/browser/permissions/contextual_notification_permission_ui_selector.cc.orig
++++ chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
+@@ -17,7 +17,6 @@
  #include "chrome/browser/browser_process.h"
  #include "chrome/browser/permissions/quiet_notification_permission_ui_config.h"
  #include "chrome/browser/permissions/quiet_notification_permission_ui_state.h"
@@ -1204,7 +1244,7 @@
  #include "chrome/common/chrome_features.h"
  #include "components/permissions/permission_request.h"
  #include "components/permissions/request_type.h"
-@@ -150,9 +149,6 @@ void ContextualNotificationPermissionUiS
+@@ -151,9 +150,6 @@ void ContextualNotificationPermissionUiS
  }
  
  void ContextualNotificationPermissionUiSelector::Cancel() {
@@ -1214,7 +1254,7 @@
  }
  
  bool ContextualNotificationPermissionUiSelector::IsPermissionRequestSupported(
-@@ -178,24 +174,14 @@ void ContextualNotificationPermissionUiS
+@@ -179,24 +175,14 @@ void ContextualNotificationPermissionUiS
    absl::optional<Decision> decision =
        GetDecisionBasedOnSiteReputation(reputation);
  
@@ -1244,92 +1284,23 @@
  }
  
  void ContextualNotificationPermissionUiSelector::OnSafeBrowsingVerdictReceived(
---- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
-+++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
-@@ -322,47 +322,5 @@ bool PredictionBasedPermissionUiSelector
- 
- PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse(
+--- chrome/browser/permissions/prediction_based_permission_ui_selector.cc.orig
++++ chrome/browser/permissions/prediction_based_permission_ui_selector.cc
+@@ -212,10 +212,8 @@ bool PredictionBasedPermissionUiSelector
      permissions::RequestType request_type) {
--  if (!safe_browsing::IsSafeBrowsingEnabled(*(profile_->GetPrefs()))) {
-     return PredictionSource::USE_NONE;
--  }
--
--  bool is_server_side_prediction_enabled = false;
--  bool is_ondevice_prediction_enabled = false;
--
--  bool is_tflite_available = false;
--#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
--  is_tflite_available = true;
--#endif  // BUILDFLAG(BUILD_WITH_TFLITE_LIB)
--
--  // Notification supports both flavours of the quiet prompt
--  if (request_type == permissions::RequestType::kNotifications &&
--      (base::FeatureList::IsEnabled(features::kQuietNotificationPrompts) ||
--       base::FeatureList::IsEnabled(
--           permissions::features::kPermissionQuietChip))) {
--    is_server_side_prediction_enabled =
--        base::FeatureList::IsEnabled(features::kPermissionPredictions);
--
--    is_ondevice_prediction_enabled =
--        is_tflite_available &&
--        base::FeatureList::IsEnabled(
--            permissions::features::kPermissionOnDeviceNotificationPredictions);
--  }
--
--  // Geolocation supports only the quiet chip ui
--  if (request_type == permissions::RequestType::kGeolocation &&
--      base::FeatureList::IsEnabled(
--          permissions::features::kPermissionQuietChip)) {
--    is_server_side_prediction_enabled = base::FeatureList::IsEnabled(
--        features::kPermissionGeolocationPredictions);
--  }
--
--  if (is_server_side_prediction_enabled && is_ondevice_prediction_enabled) {
--    return PredictionSource::USE_ANY;
--  } else if (is_server_side_prediction_enabled) {
--    return PredictionSource::USE_SERVER_SIDE;
--  } else if (is_ondevice_prediction_enabled) {
--    return PredictionSource::USE_ONDEVICE;
--  } else {
--    return PredictionSource::USE_NONE;
+   // We need to also check `kQuietNotificationPrompts` here since there is no
+   // generic safeguard anywhere else in the stack.
+-  if (!base::FeatureList::IsEnabled(features::kQuietNotificationPrompts) ||
+-      !safe_browsing::IsSafeBrowsingEnabled(*(profile_->GetPrefs()))) {
++  if (!base::FeatureList::IsEnabled(features::kQuietNotificationPrompts))
+     return false;
 -  }
- }
---- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
-+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -92,6 +92,7 @@
- #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"
-@@ -1732,8 +1733,6 @@ std::unique_ptr<ConfigurationPolicyHandl
-   handlers->AddHandler(
-       std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
-           chrome_schema));
--  handlers->AddHandler(
--      std::make_unique<safe_browsing::SafeBrowsingPolicyHandler>());
-   handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>());
-   handlers->AddHandler(
-       std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
-@@ -1790,13 +1789,6 @@ std::unique_ptr<ConfigurationPolicyHandl
-           prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
-           prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema));
- 
--  handlers->AddHandler(std::make_unique<SimpleSchemaValidatingPolicyHandler>(
--      key::kExemptDomainFileTypePairsFromFileTypeDownloadWarnings,
--      safe_browsing::file_type::prefs::
--          kExemptDomainFileTypePairsFromFileTypeDownloadWarnings,
--      chrome_schema, SCHEMA_ALLOW_UNKNOWN,
--      SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED,
--      SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED));
-   handlers->AddHandler(
-       std::make_unique<ManagedAccountRestrictionsPolicyHandler>(chrome_schema));
- 
---- a/chrome/browser/prefs/browser_prefs.cc
-+++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -248,7 +248,6 @@
+   double hold_back_chance = 0.0;
+   bool is_permissions_predictions_enabled = false;
+   switch (request_type) {
+--- chrome/browser/prefs/browser_prefs.cc.orig
++++ chrome/browser/prefs/browser_prefs.cc
+@@ -243,7 +243,6 @@
  #include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h"
  #include "chrome/browser/new_tab_page/modules/drive/drive_service.h"
  #include "chrome/browser/new_tab_page/modules/photos/photos_service.h"
@@ -1337,7 +1308,7 @@
  #include "chrome/browser/new_tab_page/modules/task_module/task_module_service.h"
  #include "chrome/browser/new_tab_page/promos/promo_service.h"
  #include "chrome/browser/search/background/ntp_custom_background_service.h"
-@@ -1386,7 +1385,6 @@ void RegisterProfilePrefs(user_prefs::Pr
+@@ -1277,7 +1276,6 @@ void RegisterProfilePrefs(user_prefs::Pr
    NewTabPageHandler::RegisterProfilePrefs(registry);
    NewTabPageUI::RegisterProfilePrefs(registry);
    NewTabUI::RegisterProfilePrefs(registry);
@@ -1345,18 +1316,8 @@
    ntp_tiles::CustomLinksManagerImpl::RegisterProfilePrefs(registry);
    PhotosService::RegisterProfilePrefs(registry);
    PinnedTabCodec::RegisterProfilePrefs(registry);
---- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -536,7 +536,6 @@ void ChromeBrowserMainExtraPartsProfiles
-     SystemExtensionsProviderFactory::GetInstance();
- #endif
-   TabRestoreServiceFactory::GetInstance();
--  safe_browsing::TailoredSecurityServiceFactory::GetInstance();
-   TemplateURLFetcherFactory::GetInstance();
-   TemplateURLServiceFactory::GetInstance();
- #if !BUILDFLAG(IS_ANDROID)
---- a/chrome/browser/reputation/reputation_service.cc
-+++ b/chrome/browser/reputation/reputation_service.cc
+--- chrome/browser/reputation/reputation_service.cc.orig
++++ chrome/browser/reputation/reputation_service.cc
 @@ -120,9 +120,7 @@ void ReputationService::GetReputationSta
                                              ReputationCheckCallback callback) {
    DCHECK(url.SchemeIsHTTPOrHTTPS());
@@ -1368,18 +1329,8 @@
  
    LookalikeUrlService* service = LookalikeUrlService::Get(profile_);
    if (service->EngagedSitesNeedUpdating()) {
---- a/chrome/browser/resources/settings/privacy_page/privacy_guide/privacy_guide_page.ts
-+++ b/chrome/browser/resources/settings/privacy_page/privacy_guide/privacy_guide_page.ts
-@@ -17,7 +17,6 @@ import './privacy_guide_completion_fragm
- import './privacy_guide_cookies_fragment.js';
- import './privacy_guide_history_sync_fragment.js';
- import './privacy_guide_msbb_fragment.js';
--import './privacy_guide_safe_browsing_fragment.js';
- import './privacy_guide_welcome_fragment.js';
- import './step_indicator.js';
- 
---- 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
 @@ -17,15 +17,6 @@ SafeBrowsingMetricsProvider::~SafeBrowsi
  
  void SafeBrowsingMetricsProvider::ProvideCurrentSessionData(
@@ -1396,8 +1347,8 @@
  }
  
  }  // namespace safe_browsing
---- a/chrome/browser/safe_browsing/url_lookup_service_factory.cc
-+++ b/chrome/browser/safe_browsing/url_lookup_service_factory.cc
+--- chrome/browser/safe_browsing/url_lookup_service_factory.cc.orig
++++ chrome/browser/safe_browsing/url_lookup_service_factory.cc
 @@ -59,28 +59,7 @@ RealTimeUrlLookupServiceFactory::RealTim
  
  KeyedService* RealTimeUrlLookupServiceFactory::BuildServiceInstanceFor(
@@ -1428,9 +1379,9 @@
  }
  
  }  // namespace safe_browsing
---- a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
-+++ b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
-@@ -143,15 +143,6 @@ CreateSettingsPageHelper() {
+--- chrome/browser/ssl/chrome_security_blocking_page_factory.cc.orig
++++ chrome/browser/ssl/chrome_security_blocking_page_factory.cc
+@@ -142,15 +142,6 @@ CreateSettingsPageHelper() {
        CreateChromeSettingsPageHelper();
  }
  
@@ -1446,9 +1397,9 @@
  }  // namespace
  
  std::unique_ptr<SSLBlockingPage>
-@@ -175,10 +166,6 @@ ChromeSecurityBlockingPageFactory::Creat
-           Profile::FromBrowserContext(web_contents->GetBrowserContext()));
-   state->DidDisplayErrorPage(cert_error);
+@@ -192,10 +183,6 @@ ChromeSecurityBlockingPageFactory::Creat
+     }
+   }
  
 -  LogSafeBrowsingSecuritySensitiveAction(
 -      safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
@@ -1457,7 +1408,18 @@
    auto controller_client = std::make_unique<SSLErrorControllerClient>(
        web_contents, ssl_info, cert_error, request_url,
        std::move(metrics_helper), CreateSettingsPageHelper());
-@@ -248,10 +235,6 @@ ChromeSecurityBlockingPageFactory::Creat
+@@ -264,10 +251,6 @@ ChromeSecurityBlockingPageFactory::Creat
+     const GURL& request_url,
+     std::unique_ptr<SSLCertReporter> ssl_cert_reporter,
+     const net::SSLInfo& ssl_info) {
+-  LogSafeBrowsingSecuritySensitiveAction(
+-      safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
+-          Profile::FromBrowserContext(web_contents->GetBrowserContext())));
+-
+   auto page = std::make_unique<LegacyTLSBlockingPage>(
+       web_contents, cert_error, request_url, std::move(ssl_cert_reporter),
+       /*can_show_enhanced_protection_message=*/true, ssl_info,
+@@ -289,10 +272,6 @@ ChromeSecurityBlockingPageFactory::Creat
      std::unique_ptr<SSLCertReporter> ssl_cert_reporter,
      const net::SSLInfo& ssl_info,
      const std::string& mitm_software_name) {
@@ -1468,7 +1430,7 @@
    auto page = std::make_unique<MITMSoftwareBlockingPage>(
        web_contents, cert_error, request_url, std::move(ssl_cert_reporter),
        /*can_show_enhanced_protection_message=*/true, ssl_info,
-@@ -273,10 +256,6 @@ ChromeSecurityBlockingPageFactory::Creat
+@@ -314,10 +293,6 @@ ChromeSecurityBlockingPageFactory::Creat
      const GURL& request_url,
      std::unique_ptr<SSLCertReporter> ssl_cert_reporter,
      const net::SSLInfo& ssl_info) {
@@ -1479,8 +1441,8 @@
    auto page = std::make_unique<BlockedInterceptionBlockingPage>(
        web_contents, cert_error, request_url, std::move(ssl_cert_reporter),
        /*can_show_enhanced_protection_message=*/true, ssl_info,
---- a/chrome/browser/ssl/sct_reporting_service_factory.cc
-+++ b/chrome/browser/ssl/sct_reporting_service_factory.cc
+--- chrome/browser/ssl/sct_reporting_service_factory.cc.orig
++++ chrome/browser/ssl/sct_reporting_service_factory.cc
 @@ -32,15 +32,7 @@ SCTReportingServiceFactory::~SCTReportin
  
  KeyedService* SCTReportingServiceFactory::BuildServiceInstanceFor(
@@ -1498,19 +1460,8 @@
  }
  
  content::BrowserContext* SCTReportingServiceFactory::GetBrowserContextToUse(
---- a/chrome/browser/ssl/ssl_error_controller_client.cc
-+++ b/chrome/browser/ssl/ssl_error_controller_client.cc
-@@ -91,8 +91,6 @@ void SSLErrorControllerClient::GoBack()
- }
- 
- void SSLErrorControllerClient::Proceed() {
--  MaybeTriggerSecurityInterstitialProceededEvent(web_contents_, request_url_,
--                                                 "SSL_ERROR", cert_error_);
- #if BUILDFLAG(ENABLE_EXTENSIONS)
-   // Hosted Apps should not be allowed to run if there is a problem with their
-   // certificate. So, when users click proceed on an interstitial, move the tab
---- a/chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc
-+++ b/chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc
+--- chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc.orig
++++ chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc
 @@ -6,7 +6,6 @@
  
  #include "chrome/browser/browser_process.h"
@@ -1531,9 +1482,9 @@
  }
  
  }  // namespace
---- a/chrome/browser/ui/BUILD.gn
-+++ b/chrome/browser/ui/BUILD.gn
-@@ -546,7 +546,6 @@ static_library("ui") {
+--- chrome/browser/ui/BUILD.gn.orig
++++ chrome/browser/ui/BUILD.gn
+@@ -533,7 +533,6 @@ static_library("ui") {
      "//components/renderer_context_menu",
      "//components/resources",
      "//components/safe_browsing/content/browser",
@@ -1541,17 +1492,8 @@
      "//components/safe_browsing/content/browser/password_protection",
      "//components/safe_browsing/content/browser/web_ui",
      "//components/safe_browsing/core/browser/db:database_manager",
-@@ -4667,8 +4666,6 @@ static_library("ui") {
-       "views/safe_browsing/password_reuse_modal_warning_dialog.h",
-       "views/safe_browsing/prompt_for_scanning_modal_dialog.cc",
-       "views/safe_browsing/prompt_for_scanning_modal_dialog.h",
--      "views/safe_browsing/tailored_security_unconsented_modal.cc",
--      "views/safe_browsing/tailored_security_unconsented_modal.h",
-       "views/send_tab_to_self/send_tab_to_self_bubble_device_button.cc",
-       "views/send_tab_to_self/send_tab_to_self_bubble_device_button.h",
-       "views/send_tab_to_self/send_tab_to_self_bubble_view_impl.cc",
---- a/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc
-+++ b/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc
+--- chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc.orig
++++ chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.cc
 @@ -16,6 +16,7 @@
  #include "components/javascript_dialogs/tab_modal_dialog_manager.h"
  #include "components/javascript_dialogs/tab_modal_dialog_view.h"
@@ -1576,12 +1518,12 @@
  }
  
  void JavaScriptTabModalDialogManagerDelegateDesktop::DidCloseDialog() {
---- a/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc
-+++ b/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc
-@@ -10,7 +10,10 @@
- #include "base/strings/utf_string_conversions.h"
- #include "base/task/task_runner_util.h"
+--- chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc.orig
++++ chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc
+@@ -11,7 +11,10 @@
+ #include "base/task/post_task.h"
  #include "base/task/thread_pool.h"
+ #include "base/task_runner_util.h"
 +#include "components/safe_browsing/buildflags.h"
 +#if BUILDFLAG(FULL_SAFE_BROWSING)
  #include "chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h"
@@ -1589,7 +1531,7 @@
  #include "chrome/browser/profiles/profile.h"
  #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h"
  #include "content/public/browser/web_contents.h"
-@@ -21,6 +24,7 @@
+@@ -22,6 +25,7 @@
  
  namespace {
  
@@ -1597,7 +1539,7 @@
  void CompletionCallback(
      content::WebContentsViewDelegate::DropCompletionCallback callback,
      const enterprise_connectors::ContentAnalysisDelegate::Data& data,
-@@ -62,6 +66,7 @@ enterprise_connectors::ContentAnalysisDe
+@@ -63,6 +67,7 @@ enterprise_connectors::ContentAnalysisDe
    }
    return data;
  }
@@ -1605,7 +1547,7 @@
  
  // Helper class to handle WebContents being destroyed while files are opened in
  // the threadpool. This class deletes itself either when it's no longer needed
-@@ -75,6 +80,7 @@ class HandleDropScanData : public conten
+@@ -76,6 +81,7 @@ class HandleDropScanData : public conten
        : content::WebContentsObserver(web_contents),
          callback_(std::move(callback)) {}
  
@@ -1613,7 +1555,7 @@
    void ScanData(
        enterprise_connectors::ContentAnalysisDelegate::Data analysis_data) {
      DCHECK(web_contents());
-@@ -86,6 +92,7 @@ class HandleDropScanData : public conten
+@@ -87,6 +93,7 @@ class HandleDropScanData : public conten
  
      delete this;
    }
@@ -1621,7 +1563,7 @@
  
    void WebContentsDestroyed() override { delete this; }
  
-@@ -105,13 +112,16 @@ void HandleOnPerformDrop(
+@@ -106,13 +113,16 @@ void HandleOnPerformDrop(
      content::WebContents* web_contents,
      const content::DropData& drop_data,
      content::WebContentsViewDelegate::DropCompletionCallback callback) {
@@ -1638,7 +1580,7 @@
    if (!enterprise_connectors::ContentAnalysisDelegate::IsEnabled(
            profile, web_contents->GetLastCommittedURL(), &data, connector)) {
      std::move(callback).Run(
-@@ -151,4 +161,8 @@ void HandleOnPerformDrop(
+@@ -154,4 +164,8 @@ void HandleOnPerformDrop(
      std::move(callback).Run(
          content::WebContentsViewDelegate::DropCompletionResult::kContinue);
    }
@@ -1647,8 +1589,8 @@
 +      content::WebContentsViewDelegate::DropCompletionResult::kContinue);
 +#endif // BUILDFLAG(FULL_SAFE_BROWSING)
  }
---- a/chrome/browser/ui/views/download/download_item_view.cc
-+++ b/chrome/browser/ui/views/download/download_item_view.cc
+--- chrome/browser/ui/views/download/download_item_view.cc.orig
++++ chrome/browser/ui/views/download/download_item_view.cc
 @@ -837,9 +837,7 @@ void DownloadItemView::UpdateLabels() {
    deep_scanning_label_->SetVisible(mode_ ==
                                     download::DownloadItemMode::kDeepScanning);
@@ -1676,7 +1618,7 @@
    open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) ||
                             prompt_to_scan || allow_open_during_deep_scan);
  
-@@ -1421,7 +1423,9 @@ void DownloadItemView::ShowContextMenuIm
+@@ -1427,7 +1429,9 @@ void DownloadItemView::ShowContextMenuIm
  }
  
  void DownloadItemView::OpenDownloadDuringAsyncScanning() {
@@ -1686,9 +1628,9 @@
    model_->SetOpenWhenComplete(true);
  }
  
---- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
-+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
-@@ -367,7 +367,6 @@ void DownloadsDOMHandler::OpenDuringScan
+--- chrome/browser/ui/webui/downloads/downloads_dom_handler.cc.orig
++++ chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
+@@ -366,7 +366,6 @@ void DownloadsDOMHandler::OpenDuringScan
    if (download) {
      DownloadItemModel model(download);
      model.SetOpenWhenComplete(true);
@@ -1696,9 +1638,9 @@
    }
  }
  
---- a/chrome/browser/ui/webui/management/management_ui_handler.cc
-+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
-@@ -843,12 +843,6 @@ base::Value ManagementUIHandler::GetThre
+--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig
++++ chrome/browser/ui/webui/management/management_ui_handler.cc
+@@ -805,12 +805,6 @@ base::Value ManagementUIHandler::GetThre
                                    &info);
    }
  
@@ -1711,9 +1653,9 @@
    const std::string enterprise_manager =
        connectors_service->GetManagementDomain();
  
---- a/chrome/browser/webshare/share_service_impl.cc
-+++ b/chrome/browser/webshare/share_service_impl.cc
-@@ -17,7 +17,9 @@
+--- chrome/browser/webshare/share_service_impl.cc.orig
++++ chrome/browser/webshare/share_service_impl.cc
+@@ -14,7 +14,9 @@
  #include "chrome/browser/browser_process.h"
  #include "chrome/browser/safe_browsing/safe_browsing_service.h"
  #include "chrome/common/chrome_features.h"
@@ -1723,10 +1665,10 @@
  #include "components/safe_browsing/core/browser/db/database_manager.h"
  #include "content/public/browser/web_contents.h"
  #include "mojo/public/cpp/bindings/self_owned_receiver.h"
-@@ -198,11 +200,13 @@ void ShareServiceImpl::Share(const std::
- 
+@@ -182,11 +184,13 @@ void ShareServiceImpl::Share(const std::
      // Check if at least one file is marked by the download protection service
      // to send a ping to check this file type.
+     const base::FilePath path = base::FilePath::FromUTF8Unsafe(file->name);
 +#if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
      if (!should_check_url &&
          safe_browsing::FileTypePolicies::GetInstance()->IsCheckedBinaryFile(
@@ -1737,7 +1679,7 @@
  
      // In the case where the original blob handle was to a native file (of
      // unknown size), the serialized data does not contain an accurate file
-@@ -212,6 +216,7 @@ void ShareServiceImpl::Share(const std::
+@@ -196,6 +200,7 @@ void ShareServiceImpl::Share(const std::
    }
  
    DCHECK(!safe_browsing_request_);
@@ -1745,7 +1687,7 @@
    if (should_check_url && g_browser_process->safe_browsing_service()) {
      safe_browsing_request_.emplace(
          g_browser_process->safe_browsing_service()->database_manager(),
-@@ -221,6 +226,7 @@ void ShareServiceImpl::Share(const std::
+@@ -205,6 +210,7 @@ void ShareServiceImpl::Share(const std::
                         std::move(files), std::move(callback)));
      return;
    }
@@ -1753,9 +1695,9 @@
  
    OnSafeBrowsingResultReceived(title, text, share_url, std::move(files),
                                 std::move(callback),
---- a/chrome/test/BUILD.gn
-+++ b/chrome/test/BUILD.gn
-@@ -1314,7 +1314,6 @@ if (!is_android) {
+--- chrome/test/BUILD.gn.orig
++++ chrome/test/BUILD.gn
+@@ -1196,7 +1196,6 @@ if (!is_android && !is_fuchsia) {
        "//components/resources",
        "//components/safe_browsing:buildflags",
        "//components/safe_browsing/content/browser",
@@ -1763,7 +1705,7 @@
        "//components/safe_browsing/content/browser:safe_browsing_service",
        "//components/safe_browsing/content/browser/password_protection",
        "//components/safe_browsing/content/browser/password_protection:test_support",
-@@ -5819,7 +5818,6 @@ test("unit_tests") {
+@@ -5349,7 +5348,6 @@ test("unit_tests") {
      "//components/resources",
      "//components/safe_browsing:buildflags",
      "//components/safe_browsing/content/browser",
@@ -1771,20 +1713,20 @@
      "//components/safe_browsing/content/browser/password_protection",
      "//components/safe_browsing/content/browser/password_protection:mock_password_protection",
      "//components/safe_browsing/content/browser/web_ui",
---- a/components/password_manager/content/browser/content_password_manager_driver.cc
-+++ b/components/password_manager/content/browser/content_password_manager_driver.cc
-@@ -415,7 +415,7 @@ void ContentPasswordManagerDriver::Check
-   if (!password_manager::bad_message::CheckFrameNotPrerendering(
-           render_frame_host_))
-     return;
+--- components/password_manager/content/browser/content_password_manager_driver.cc.orig
++++ components/password_manager/content/browser/content_password_manager_driver.cc
+@@ -407,7 +407,7 @@ void ContentPasswordManagerDriver::Check
+   if (client_->GetMetricsRecorder()) {
+     client_->GetMetricsRecorder()->RecordUserFocusedPasswordField();
+   }
 -#if defined(ON_FOCUS_PING_ENABLED)
 +#if defined(ON_FOCUS_PING_ENABLED) && BUILDFLAG(FULL_SAFE_BROWSING)
    client_->CheckSafeBrowsingReputation(form_action, frame_url);
  #endif
  }
---- a/components/password_manager/core/browser/password_manager_client.h
-+++ b/components/password_manager/core/browser/password_manager_client.h
-@@ -374,11 +374,14 @@ class PasswordManagerClient {
+--- components/password_manager/core/browser/password_manager_client.h.orig
++++ components/password_manager/core/browser/password_manager_client.h
+@@ -339,11 +339,14 @@ class PasswordManagerClient {
    // Returns the current best guess as to the page's display language.
    virtual autofill::LanguageCode GetPageLanguage() const;
  
@@ -1800,7 +1742,7 @@
    // Checks the safe browsing reputation of the webpage when the
    // user focuses on a username/password field. This is used for reporting
    // only, and won't trigger a warning.
-@@ -386,6 +389,7 @@ class PasswordManagerClient {
+@@ -351,6 +354,7 @@ class PasswordManagerClient {
                                             const GURL& frame_url) = 0;
  #endif
  
@@ -1808,7 +1750,7 @@
    // Checks the safe browsing reputation of the webpage where password reuse
    // happens. This is called by the PasswordReuseDetectionManager when a
    // protected password is typed on the wrong domain. This may trigger a
-@@ -398,6 +402,7 @@ class PasswordManagerClient {
+@@ -363,6 +367,7 @@ class PasswordManagerClient {
        const std::string& username,
        const std::vector<MatchingReusedCredential>& matching_reused_credentials,
        bool password_field_exists) = 0;
@@ -1816,8 +1758,8 @@
  
    // Records a Chrome Sync event that GAIA password reuse was detected.
    virtual void LogPasswordReuseDetectedEvent() = 0;
---- a/components/password_manager/core/browser/password_reuse_detection_manager.cc
-+++ b/components/password_manager/core/browser/password_reuse_detection_manager.cc
+--- components/password_manager/core/browser/password_reuse_detection_manager.cc.orig
++++ components/password_manager/core/browser/password_reuse_detection_manager.cc
 @@ -161,9 +161,11 @@ void PasswordReuseDetectionManager::OnRe
                               ? reused_protected_password_hash->username
                               : "";
@@ -1830,8 +1772,19 @@
  }
  
  void PasswordReuseDetectionManager::SetClockForTesting(base::Clock* clock) {
---- a/components/safe_browsing/content/common/proto/BUILD.gn
-+++ b/components/safe_browsing/content/common/proto/BUILD.gn
+--- components/safe_browsing/content/browser/BUILD.gn.orig
++++ components/safe_browsing/content/browser/BUILD.gn
+@@ -82,8 +82,6 @@ source_set("browser") {
+     "threat_details_cache.h",
+     "threat_details_history.cc",
+     "threat_details_history.h",
+-    "user_population.cc",
+-    "user_population.h",
+     "web_api_handshake_checker.cc",
+     "web_api_handshake_checker.h",
+   ]
+--- components/safe_browsing/content/common/proto/BUILD.gn.orig
++++ components/safe_browsing/content/common/proto/BUILD.gn
 @@ -5,8 +5,12 @@
  import("//components/safe_browsing/buildflags.gni")
  import("//third_party/protobuf/proto_library.gni")
@@ -1847,8 +1800,8 @@
    }
 -}
 +# }
---- a/components/safe_browsing/content/common/safe_browsing.mojom
-+++ b/components/safe_browsing/content/common/safe_browsing.mojom
+--- components/safe_browsing/content/common/safe_browsing.mojom.orig
++++ components/safe_browsing/content/common/safe_browsing.mojom
 @@ -120,7 +120,6 @@ enum PhishingDetectorResult {
    INVALID_SCORE = 4,
  };
@@ -1857,39 +1810,9 @@
  // Interface for setting the CSD model and to start phishing classification.
  interface PhishingDetector {
    // A classification model for client-side phishing detection.
---- a/components/safe_browsing/core/browser/BUILD.gn
-+++ b/components/safe_browsing/core/browser/BUILD.gn
-@@ -11,8 +11,6 @@ source_set("browser") {
-     "safe_browsing_url_checker_impl.cc",
-     "safe_browsing_url_checker_impl.h",
-     "url_checker_delegate.h",
--    "user_population.cc",
--    "user_population.h",
-   ]
- 
-   public_deps = [ "//google_apis:google_apis" ]
---- a/components/safe_browsing/core/browser/verdict_cache_manager.cc
-+++ b/components/safe_browsing/core/browser/verdict_cache_manager.cc
-@@ -402,16 +402,6 @@ VerdictCacheManager::VerdictCacheManager
-   // pref_service can be null in tests.
-   if (pref_service) {
-     pref_change_registrar_.Init(pref_service);
--    pref_change_registrar_.Add(
--        prefs::kSafeBrowsingEnhanced,
--        base::BindRepeating(&VerdictCacheManager::CleanUpAllPageLoadTokens,
--                            weak_factory_.GetWeakPtr(),
--                            ClearReason::kSafeBrowsingStateChanged));
--    pref_change_registrar_.Add(
--        prefs::kSafeBrowsingEnabled,
--        base::BindRepeating(&VerdictCacheManager::CleanUpAllPageLoadTokens,
--                            weak_factory_.GetWeakPtr(),
--                            ClearReason::kSafeBrowsingStateChanged));
-   }
-   // sync_observer_ can be null in some embedders that don't support sync.
-   if (sync_observer_) {
---- a/content/browser/file_system_access/safe_move_helper.cc
-+++ b/content/browser/file_system_access/safe_move_helper.cc
-@@ -154,14 +154,8 @@ void SafeMoveHelper::Start(SafeMoveHelpe
+--- content/browser/file_system_access/safe_move_helper.cc.orig
++++ content/browser/file_system_access/safe_move_helper.cc
+@@ -150,14 +150,8 @@ void SafeMoveHelper::Start(SafeMoveHelpe
      return;
    }
  
@@ -1904,7 +1827,7 @@
  }
  
  void SafeMoveHelper::ComputeHashForSourceFile(HashCallback callback) {
-@@ -181,44 +175,6 @@ void SafeMoveHelper::ComputeHashForSourc
+@@ -177,38 +171,6 @@ void SafeMoveHelper::ComputeHashForSourc
                       std::move(wrapped_callback), source_url()));
  }
  
@@ -1927,18 +1850,12 @@
 -    return;
 -  }
 -
--  content::GlobalRenderFrameHostId outermost_main_frame_id;
--  auto* rfh = content::RenderFrameHost::FromID(context_.frame_id);
--  if (rfh)
--    outermost_main_frame_id = rfh->GetOutermostMainFrame()->GetGlobalId();
--
 -  auto item = std::make_unique<FileSystemAccessWriteItem>();
 -  item->target_file_path = dest_url().path();
 -  item->full_path = source_url().path();
 -  item->sha256_hash = hash;
 -  item->size = size;
 -  item->frame_url = context_.url;
--  item->outermost_main_frame_id = outermost_main_frame_id;
 -  item->has_user_gesture = has_transient_user_activation_;
 -  manager_->permission_context()->PerformAfterWriteChecks(
 -      std::move(item), context_.frame_id,
@@ -1949,8 +1866,8 @@
  void SafeMoveHelper::DidAfterWriteCheck(
      FileSystemAccessPermissionContext::AfterWriteCheckResult result) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
---- a/content/browser/file_system_access/safe_move_helper.h
-+++ b/content/browser/file_system_access/safe_move_helper.h
+--- content/browser/file_system_access/safe_move_helper.h.orig
++++ content/browser/file_system_access/safe_move_helper.h
 @@ -52,9 +52,6 @@ class CONTENT_EXPORT SafeMoveHelper {
   private:
    SEQUENCE_CHECKER(sequence_checker_);
@@ -1961,8 +1878,8 @@
    void DidAfterWriteCheck(
        FileSystemAccessPermissionContext::AfterWriteCheckResult result);
    void DidFileSkipQuarantine(base::File::Error result);
---- a/content/public/browser/file_system_access_permission_context.h
-+++ b/content/public/browser/file_system_access_permission_context.h
+--- content/public/browser/file_system_access_permission_context.h.orig
++++ content/public/browser/file_system_access_permission_context.h
 @@ -107,12 +107,6 @@ class FileSystemAccessPermissionContext
        base::OnceCallback<void(SensitiveDirectoryResult)> callback) = 0;
  
@@ -1976,9 +1893,9 @@
  
    // Returns whether the give |origin| already allows read permission, or it is
    // possible to request one. This is used to block file dialogs from being
---- a/extensions/browser/updater/update_service.cc
-+++ b/extensions/browser/updater/update_service.cc
-@@ -122,13 +122,6 @@ void UpdateService::OnEvent(Events event
+--- extensions/browser/updater/update_service.cc.orig
++++ extensions/browser/updater/update_service.cc
+@@ -111,13 +111,6 @@ void UpdateService::OnEvent(Events event
        break;
    }
  
@@ -1992,20 +1909,9 @@
  }
  
  UpdateService::UpdateService(
---- a/printing/buildflags/buildflags.gni
-+++ b/printing/buildflags/buildflags.gni
-@@ -37,7 +37,7 @@ declare_args() {
-   # Enable snapshotting a page when printing for its content to be analyzed for
-   # sensitive content by enterprise users.
-   enable_print_content_analysis =
--      is_chromeos_ash || is_chromeos_lacros || is_win || is_linux || is_mac
-+      false
- }
- 
- declare_args() {
---- a/weblayer/BUILD.gn
-+++ b/weblayer/BUILD.gn
-@@ -462,7 +462,6 @@ source_set("weblayer_lib_base") {
+--- weblayer/BUILD.gn.orig
++++ weblayer/BUILD.gn
+@@ -463,7 +463,6 @@ source_set("weblayer_lib_base") {
      "//components/prefs",
      "//components/profile_metrics",
      "//components/safe_browsing/content/browser",