39 files changed, 12872 insertions, 0 deletions

diff --git a/www/chromium-uc/patches/core/bromite/disable-fetching-field-trials.patch b/www/chromium-uc/patches/core/bromite/disable-fetching-field-trials.patch
new file mode 100644
index 0000000..ebb9aec
--- /dev/null
+++ b/www/chromium-uc/patches/core/bromite/disable-fetching-field-trials.patch
@@ -0,0 +1,88 @@
+# NOTE: Modified to remove usage of compiler #if macros
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 8 Jul 2018 18:16:34 +0200
+Subject: Disable fetching of all field trials
+
+---
+ .../browser/flags/ChromeFeatureList.java      | 19 ++++---------------
+ .../variations/service/variations_service.cc  | 12 +-----------
+ 2 files changed, 5 insertions(+), 26 deletions(-)
+
+--- chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java.orig
++++ chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+@@ -105,11 +105,7 @@ public abstract class ChromeFeatureList
+      *   the specified parameter does not exist.
+      */
+     public static String getFieldTrialParamByFeature(String featureName, String paramName) {
+-        String testValue = FeatureList.getTestValueForFieldTrialParam(featureName, paramName);
+-        if (testValue != null) return testValue;
+-        if (FeatureList.hasTestFeatures()) return "";
+-        assert FeatureList.isInitialized();
+-        return ChromeFeatureListJni.get().getFieldTrialParamByFeature(featureName, paramName);
++        return "";
+     }
+ 
+     /**
+@@ -126,12 +122,7 @@ public abstract class ChromeFeatureList
+      */
+     public static int getFieldTrialParamByFeatureAsInt(
+             String featureName, String paramName, int defaultValue) {
+-        String testValue = FeatureList.getTestValueForFieldTrialParam(featureName, paramName);
+-        if (testValue != null) return Integer.valueOf(testValue);
+-        if (FeatureList.hasTestFeatures()) return defaultValue;
+-        assert FeatureList.isInitialized();
+-        return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsInt(
+-                featureName, paramName, defaultValue);
++        return defaultValue;
+     }
+ 
+     /**
+@@ -148,12 +139,7 @@ public abstract class ChromeFeatureList
+      */
+     public static double getFieldTrialParamByFeatureAsDouble(
+             String featureName, String paramName, double defaultValue) {
+-        String testValue = FeatureList.getTestValueForFieldTrialParam(featureName, paramName);
+-        if (testValue != null) return Double.valueOf(testValue);
+-        if (FeatureList.hasTestFeatures()) return defaultValue;
+-        assert FeatureList.isInitialized();
+-        return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsDouble(
+-                featureName, paramName, defaultValue);
++        return defaultValue;
+     }
+ 
+     /**
+@@ -184,12 +170,7 @@ public abstract class ChromeFeatureList
+      */
+     public static boolean getFieldTrialParamByFeatureAsBoolean(
+             String featureName, String paramName, boolean defaultValue) {
+-        String testValue = FeatureList.getTestValueForFieldTrialParam(featureName, paramName);
+-        if (testValue != null) return Boolean.valueOf(testValue);
+-        if (FeatureList.hasTestFeatures()) return defaultValue;
+-        assert FeatureList.isInitialized();
+-        return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsBoolean(
+-                featureName, paramName, defaultValue);
++        return defaultValue;
+     }
+ 
+     /* Alphabetical: */
+--- components/variations/service/variations_service.cc.orig
++++ components/variations/service/variations_service.cc
+@@ -238,17 +238,7 @@ bool GetInstanceManipulations(const net:
+ // Variations seed fetching is only enabled in official Chrome builds, if a URL
+ // is specified on the command line, and for testing.
+ bool IsFetchingEnabled() {
+-#if !BUILDFLAG(GOOGLE_CHROME_BRANDING)
+-  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+-          switches::kVariationsServerURL) &&
+-      !g_should_fetch_for_testing) {
+-    DVLOG(1)
+-        << "Not performing repeated fetching in unofficial build without --"
+-        << switches::kVariationsServerURL << " specified.";
+-    return false;
+-  }
+-#endif
+-  return true;
++  return false;
+ }
+ 
+ std::unique_ptr<SeedResponse> MaybeImportFirstRunSeed(
diff --git a/www/chromium-uc/patches/core/debian/disable/unrar.patch b/www/chromium-uc/patches/core/debian/disable/unrar.patch
new file mode 100644
index 0000000..a87c2a8
--- /dev/null
+++ b/www/chromium-uc/patches/core/debian/disable/unrar.patch
@@ -0,0 +1,85 @@
+description: disable support for safe browsing inspection of rar files
+author: Michael Gilbert <mgilbert@debian.org>
+bug: http://bugs.debian.org/914487
+
+--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig
++++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc
+@@ -95,7 +95,7 @@ void FileAnalyzer::Start(const base::Fil
+   if (inspection_type == DownloadFileType::ZIP) {
+     StartExtractZipFeatures();
+   } else if (inspection_type == DownloadFileType::RAR) {
+-    StartExtractRarFeatures();
++    LOG(WARNING) << "Safebrowser inspection of rar files is disabled in this build";
+ #if defined(OS_MAC)
+   } else if (inspection_type == DownloadFileType::DMG) {
+     StartExtractDmgFeatures();
+--- chrome/common/safe_browsing/BUILD.gn.orig
++++ chrome/common/safe_browsing/BUILD.gn
+@@ -58,39 +58,6 @@ if (safe_browsing_mode == 1) {
+     public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
+   }
+ 
+-  source_set("rar_analyzer") {
+-    sources = [
+-      "rar_analyzer.cc",
+-      "rar_analyzer.h",
+-    ]
+-
+-    deps = [
+-      ":archive_analyzer_results",
+-      ":download_type_util",
+-      "//base",
+-      "//base:i18n",
+-      "//components/safe_browsing/content/common:file_type_policies",
+-      "//components/safe_browsing/core/common",
+-      "//third_party/unrar:unrar",
+-    ]
+-
+-    defines = [
+-      "_FILE_OFFSET_BITS=64",
+-      "LARGEFILE_SOURCE",
+-      "RAR_SMP",
+-      "SILENT",
+-
+-      # The following is set to disable certain macro definitions in the unrar
+-      # source code.
+-      "CHROMIUM_UNRAR",
+-
+-      # Disables exceptions in unrar, replaces them with process termination.
+-      "UNRAR_NO_EXCEPTIONS",
+-    ]
+-
+-    public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
+-  }
+-
+   if (is_linux || is_win) {
+     source_set("document_analyzer") {
+       sources = [
+@@ -189,7 +156,6 @@ source_set("safe_browsing") {
+       ":archive_analyzer_results",
+       ":binary_feature_extractor",
+       ":download_type_util",
+-      ":rar_analyzer",
+       "//components/safe_browsing/core/common",
+     ]
+ 
+--- chrome/services/file_util/safe_archive_analyzer.cc.orig
++++ chrome/services/file_util/safe_archive_analyzer.cc
+@@ -7,7 +7,6 @@
+ #include "base/macros.h"
+ #include "build/build_config.h"
+ #include "chrome/common/safe_browsing/archive_analyzer_results.h"
+-#include "chrome/common/safe_browsing/rar_analyzer.h"
+ #include "chrome/common/safe_browsing/zip_analyzer.h"
+ 
+ #if defined(OS_MAC)
+@@ -47,8 +46,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile
+                                          AnalyzeRarFileCallback callback) {
+   DCHECK(rar_file.IsValid());
+ 
++  LOG(FATAL) << "AnalyzeRarFile is disabled in this build";
+   safe_browsing::ArchiveAnalyzerResults results;
+-  safe_browsing::rar_analyzer::AnalyzeRarFile(
+-      std::move(rar_file), std::move(temporary_file), &results);
+   std::move(callback).Run(results);
+ }
diff --git a/www/chromium-uc/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch b/www/chromium-uc/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch
new file mode 100644
index 0000000..18fc72a
--- /dev/null
+++ b/www/chromium-uc/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch
@@ -0,0 +1,1195 @@
+--- chrome/browser/BUILD.gn.orig
++++ chrome/browser/BUILD.gn
+@@ -2195,7 +2195,6 @@ static_library("browser") {
+     "//components/reputation/core:proto",
+     "//components/resources",
+     "//components/safe_browsing/content/browser",
+-    "//components/safe_browsing/content/browser:client_side_detection",
+     "//components/safe_browsing/content/browser:safe_browsing_service",
+     "//components/safe_browsing/content/browser/password_protection",
+     "//components/safe_browsing/content/browser/web_ui",
+@@ -3706,8 +3705,6 @@ static_library("browser") {
+       "download/download_commands.h",
+       "download/download_crx_util.cc",
+       "download/download_crx_util.h",
+-      "download/download_danger_prompt.cc",
+-      "download/download_danger_prompt.h",
+       "download/download_dir_policy_handler.cc",
+       "download/download_dir_policy_handler.h",
+       "download/download_dir_util.cc",
+--- chrome/browser/browser_process.h.orig
++++ chrome/browser/browser_process.h
+@@ -55,10 +55,6 @@ class NetworkQualityTracker;
+ class SharedURLLoaderFactory;
+ }
+ 
+-namespace safe_browsing {
+-class SafeBrowsingService;
+-}
+-
+ namespace subresource_filter {
+ class RulesetService;
+ }
+@@ -218,9 +214,6 @@ class BrowserProcess {
+   // on this platform (or this is a unit test).
+   virtual StatusTray* status_tray() = 0;
+ 
+-  // Returns the SafeBrowsing service.
+-  virtual safe_browsing::SafeBrowsingService* safe_browsing_service() = 0;
+-
+   // Returns the service providing versioned storage for rules used by the Safe
+   // Browsing subresource filter.
+   virtual subresource_filter::RulesetService*
+--- chrome/browser/browser_process_impl.cc.orig
++++ chrome/browser/browser_process_impl.cc
+@@ -70,7 +70,6 @@
+ #include "chrome/browser/printing/print_preview_dialog_controller.h"
+ #include "chrome/browser/profiles/profile_manager.h"
+ #include "chrome/browser/resource_coordinator/resource_coordinator_parts.h"
+-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
+ #include "chrome/browser/shell_integration.h"
+ #include "chrome/browser/site_isolation/prefs_observer.h"
+ #include "chrome/browser/ssl/secure_origin_prefs_observer.h"
+@@ -395,8 +394,6 @@ void BrowserProcessImpl::StartTearDown()
+ 
+   metrics_services_manager_.reset();
+   intranet_redirect_detector_.reset();
+-  if (safe_browsing_service_.get())
+-    safe_browsing_service()->ShutDown();
+   network_time_tracker_.reset();
+ #if BUILDFLAG(ENABLE_PLUGINS)
+   plugins_resource_service_.reset();
+@@ -1030,14 +1027,6 @@ StatusTray* BrowserProcessImpl::status_t
+   return status_tray_.get();
+ }
+ 
+-safe_browsing::SafeBrowsingService*
+-BrowserProcessImpl::safe_browsing_service() {
+-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+-  if (!created_safe_browsing_service_)
+-    CreateSafeBrowsingService();
+-  return safe_browsing_service_.get();
+-}
+-
+ subresource_filter::RulesetService*
+ BrowserProcessImpl::subresource_filter_ruleset_service() {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+@@ -1300,26 +1289,6 @@ void BrowserProcessImpl::CreateBackgroun
+ #endif
+ }
+ 
+-void BrowserProcessImpl::CreateSafeBrowsingService() {
+-  DCHECK(!safe_browsing_service_);
+-  // Set this flag to true so that we don't retry indefinitely to
+-  // create the service class if there was an error.
+-  created_safe_browsing_service_ = true;
+-
+-  // The factory can be overridden in tests.
+-  if (!safe_browsing::SafeBrowsingServiceInterface::HasFactory()) {
+-    safe_browsing::SafeBrowsingServiceInterface::RegisterFactory(
+-        safe_browsing::GetSafeBrowsingServiceFactory());
+-  }
+-
+-  // TODO(crbug/925153): Port consumers of the |safe_browsing_service_| to use
+-  // the interface in components/safe_browsing, and remove this cast.
+-  safe_browsing_service_ = static_cast<safe_browsing::SafeBrowsingService*>(
+-      safe_browsing::SafeBrowsingServiceInterface::CreateSafeBrowsingService());
+-  if (safe_browsing_service_)
+-    safe_browsing_service_->Initialize();
+-}
+-
+ void BrowserProcessImpl::CreateSubresourceFilterRulesetService() {
+   DCHECK(!subresource_filter_ruleset_service_);
+   created_subresource_filter_ruleset_service_ = true;
+--- chrome/browser/browser_process_impl.h.orig
++++ chrome/browser/browser_process_impl.h
+@@ -190,7 +190,6 @@ class BrowserProcessImpl : public Browse
+       std::unique_ptr<BackgroundModeManager> manager) override;
+ #endif
+   StatusTray* status_tray() override;
+-  safe_browsing::SafeBrowsingService* safe_browsing_service() override;
+   subresource_filter::RulesetService* subresource_filter_ruleset_service()
+       override;
+   federated_learning::FlocSortingLshClustersService*
+@@ -344,9 +343,6 @@ class BrowserProcessImpl : public Browse
+   std::unique_ptr<BackgroundModeManager> background_mode_manager_;
+ #endif
+ 
+-  bool created_safe_browsing_service_ = false;
+-  scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_service_;
+-
+   bool created_subresource_filter_ruleset_service_ = false;
+   std::unique_ptr<subresource_filter::RulesetService>
+       subresource_filter_ruleset_service_;
+--- chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc.orig
++++ chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+@@ -70,7 +70,6 @@
+ #include "chrome/browser/profiles/profile.h"
+ #include "chrome/browser/profiles/profile_keep_alive_types.h"
+ #include "chrome/browser/profiles/scoped_profile_keep_alive.h"
+-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
+ #include "chrome/browser/search_engines/template_url_service_factory.h"
+ #include "chrome/browser/share/share_history.h"
+ #include "chrome/browser/share/share_ranking.h"
+@@ -643,10 +642,6 @@ void ChromeBrowsingDataRemoverDelegate::
+     base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
+ 
+     network::mojom::NetworkContext* safe_browsing_context = nullptr;
+-    safe_browsing::SafeBrowsingService* sb_service =
+-        g_browser_process->safe_browsing_service();
+-    if (sb_service)
+-      safe_browsing_context = sb_service->GetNetworkContext(profile_);
+ 
+     browsing_data::RemoveEmbedderCookieData(
+         delete_begin, delete_end, filter_builder, host_content_settings_map_,
+--- chrome/browser/chrome_content_browser_client.cc.orig
++++ chrome/browser/chrome_content_browser_client.cc
+@@ -921,34 +921,6 @@ void SetApplicationLocaleOnIOThread(cons
+   GetIOThreadApplicationLocale() = locale;
+ }
+ 
+-// An implementation of the SSLCertReporter interface used by
+-// SSLErrorHandler. Uses CertificateReportingService to send reports. The
+-// service handles queueing and re-sending of failed reports. Each certificate
+-// error creates a new instance of this class.
+-class CertificateReportingServiceCertReporter : public SSLCertReporter {
+- public:
+-  explicit CertificateReportingServiceCertReporter(
+-      content::WebContents* web_contents)
+-      : service_(CertificateReportingServiceFactory::GetForBrowserContext(
+-            web_contents->GetBrowserContext())) {}
+-
+-  CertificateReportingServiceCertReporter(
+-      const CertificateReportingServiceCertReporter&) = delete;
+-  CertificateReportingServiceCertReporter& operator=(
+-      const CertificateReportingServiceCertReporter&) = delete;
+-
+-  ~CertificateReportingServiceCertReporter() override {}
+-
+-  // SSLCertReporter implementation
+-  void ReportInvalidCertificateChain(
+-      const std::string& serialized_report) override {
+-    service_->Send(serialized_report);
+-  }
+-
+- private:
+-  CertificateReportingService* service_;
+-};
+-
+ #if BUILDFLAG(ENABLE_EXTENSIONS)
+ 
+ AppLoadedInTabSource ClassifyAppLoadedInTabSource(
+@@ -1423,7 +1395,6 @@ void ChromeContentBrowserClient::PostAft
+   InitNetworkContextsParentDirectory();
+ 
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+-  safe_browsing_service_ = g_browser_process->safe_browsing_service();
+ }
+ 
+ bool ChromeContentBrowserClient::IsBrowserStartupComplete() {
+@@ -4229,7 +4200,7 @@ ChromeContentBrowserClient::CreateThrott
+   content::WebContents* web_contents = handle->GetWebContents();
+   throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
+       handle,
+-      std::make_unique<CertificateReportingServiceCertReporter>(web_contents),
++      nullptr,
+       base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
+       base::BindOnce(
+           &ShouldIgnoreSslInterstitialBecauseNavigationDefaultedToHttps)));
+@@ -4258,15 +4229,6 @@ ChromeContentBrowserClient::CreateThrott
+                    &throttles);
+ #endif
+ 
+-  // g_browser_process->safe_browsing_service() may be null in unittests.
+-  safe_browsing::SafeBrowsingUIManager* ui_manager =
+-      g_browser_process->safe_browsing_service()
+-          ? g_browser_process->safe_browsing_service()->ui_manager().get()
+-          : nullptr;
+-  throttles.push_back(
+-      std::make_unique<safe_browsing::SafeBrowsingNavigationThrottle>(
+-          handle, ui_manager));
+-
+   if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) {
+     throttles.push_back(
+         std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
+--- chrome/browser/component_updater/file_type_policies_component_installer.cc.orig
++++ chrome/browser/component_updater/file_type_policies_component_installer.cc
+@@ -40,20 +40,6 @@ const uint8_t kFileTypePoliciesPublicKey
+ const char kFileTypePoliciesManifestName[] = "File Type Policies";
+ 
+ void LoadFileTypesFromDisk(const base::FilePath& pb_path) {
+-  if (pb_path.empty())
+-    return;
+-
+-  VLOG(1) << "Reading Download File Types from file: " << pb_path.value();
+-  std::string binary_pb;
+-  if (!base::ReadFileToString(pb_path, &binary_pb)) {
+-    // The file won't exist on new installations, so this is not always an
+-    // error.
+-    VLOG(1) << "Failed reading from " << pb_path.value();
+-    return;
+-  }
+-
+-  safe_browsing::FileTypePolicies::GetInstance()->PopulateFromDynamicUpdate(
+-      binary_pb);
+ }
+ 
+ }  // namespace
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig
++++ chrome/browser/download/chrome_download_manager_delegate.cc
+@@ -436,13 +436,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
+ 
+ void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
+   download_manager_ = dm;
+-
+-  safe_browsing::SafeBrowsingService* sb_service =
+-      g_browser_process->safe_browsing_service();
+-  if (sb_service && !profile_->IsOffTheRecord()) {
+-    // Include this download manager in the set monitored by safe browsing.
+-    sb_service->AddDownloadManager(dm);
+-  }
+ }
+ 
+ #if defined(OS_ANDROID)
+@@ -791,16 +784,6 @@ void ChromeDownloadManagerDelegate::Choo
+ 
+ void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
+     base::FilePath* filename) {
+-  safe_browsing::FileTypePolicies* file_type_policies =
+-      safe_browsing::FileTypePolicies::GetInstance();
+-
+-  if (file_type_policies->GetFileDangerLevel(*filename) ==
+-      safe_browsing::DownloadFileType::NOT_DANGEROUS)
+-    return;
+-
+-  base::FilePath default_filename = base::FilePath::FromUTF8Unsafe(
+-      l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME));
+-  *filename = filename->AddExtension(default_filename.BaseName().value());
+ }
+ 
+ void ChromeDownloadManagerDelegate::SanitizeDownloadParameters(
+--- chrome/browser/download/download_item_model.cc.orig
++++ chrome/browser/download/download_item_model.cc
+@@ -86,7 +86,7 @@ class DownloadItemModelData : public bas
+ 
+   // Danger level of the file determined based on the file type and whether
+   // there was a user action associated with the download.
+-  DownloadFileType::DangerLevel danger_level_;
++  safe_browsing::DownloadFileType::DangerLevel danger_level_;
+ 
+   // Whether the download is currently being revived.
+   bool is_being_revived_;
+@@ -123,7 +123,7 @@ DownloadItemModelData::DownloadItemModel
+     : should_show_in_shelf_(true),
+       was_ui_notified_(false),
+       should_prefer_opening_in_browser_(false),
+-      danger_level_(DownloadFileType::NOT_DANGEROUS),
++      danger_level_(safe_browsing::DownloadFileType::NOT_DANGEROUS),
+       is_being_revived_(false) {}
+ 
+ }  // namespace
+@@ -381,13 +381,13 @@ void DownloadItemModel::SetShouldPreferO
+   data->should_prefer_opening_in_browser_ = preference;
+ }
+ 
+-DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const {
++safe_browsing::DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const {
+   const DownloadItemModelData* data = DownloadItemModelData::Get(download_);
+-  return data ? data->danger_level_ : DownloadFileType::NOT_DANGEROUS;
++  return data ? data->danger_level_ : safe_browsing::DownloadFileType::NOT_DANGEROUS;
+ }
+ 
+ void DownloadItemModel::SetDangerLevel(
+-    DownloadFileType::DangerLevel danger_level) {
++    safe_browsing::DownloadFileType::DangerLevel danger_level) {
+   DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
+   data->danger_level_ = danger_level;
+ }
+@@ -599,9 +599,6 @@ bool DownloadItemModel::IsCommandEnabled
+       // filename. Don't base an "Always open" decision based on it. Also
+       // exclude extensions.
+       return download_->CanOpenDownload() &&
+-             safe_browsing::FileTypePolicies::GetInstance()
+-                 ->IsAllowedToOpenAutomatically(
+-                     download_->GetTargetFilePath()) &&
+              !download_crx_util::IsExtensionDownload(*download_);
+     case DownloadCommands::PAUSE:
+       return !download_->IsSavePackageDownload() &&
+--- chrome/browser/download/download_prefs.cc.orig
++++ chrome/browser/download/download_prefs.cc
+@@ -260,14 +260,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
+         base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) +
+         extension);
+ 
+-    // Note that the list of file types that are not allowed to open
+-    // automatically can change in the future. When the list is tightened, it is
+-    // expected that some entries in the users' auto open list will get dropped
+-    // permanently as a result.
+-    if (FileTypePolicies::GetInstance()->IsAllowedToOpenAutomatically(
+-            filename_with_extension)) {
+-      auto_open_by_user_.insert(extension);
+-    }
++    auto_open_by_user_.insert(extension);
+   }
+ }
+ 
+@@ -475,10 +468,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
+ bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension(
+     const base::FilePath& file_name) {
+   base::FilePath::StringType extension = file_name.Extension();
+-  if (!FileTypePolicies::GetInstance()->IsAllowedToOpenAutomatically(
+-          file_name)) {
+-    return false;
+-  }
+ 
+   DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
+   extension.erase(0, 1);
+--- chrome/browser/download/download_target_determiner.cc.orig
++++ chrome/browser/download/download_target_determiner.cc
+@@ -297,13 +297,6 @@ base::FilePath DownloadTargetDeterminer:
+       download_->GetURL(), download_->GetContentDisposition(), referrer_charset,
+       suggested_filename, sniffed_mime_type, default_filename);
+ 
+-  // We don't replace the file extension if sfafe browsing consider the file
+-  // extension to be unsafe. Just let safe browsing scan the generated file.
+-  if (safe_browsing::FileTypePolicies::GetInstance()->IsCheckedBinaryFile(
+-          generated_filename)) {
+-    return generated_filename;
+-  }
+-
+   // If no mime type or explicitly specified a name, don't replace file
+   // extension.
+   if (sniffed_mime_type.empty() || !suggested_filename.empty())
+@@ -1113,29 +1106,7 @@ DownloadFileType::DangerLevel DownloadTa
+       download_->HasUserGesture())
+     return DownloadFileType::NOT_DANGEROUS;
+ 
+-  DownloadFileType::DangerLevel danger_level =
+-      safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel(
+-          virtual_path_.BaseName());
+-
+-  // A danger level of ALLOW_ON_USER_GESTURE is used to label potentially
+-  // dangerous file types that have a high frequency of legitimate use. We would
+-  // like to avoid prompting for the legitimate cases as much as possible. To
+-  // that end, we consider a download to be legitimate if one of the following
+-  // is true, and avoid prompting:
+-  //
+-  // * The user navigated to the download URL via the omnibox (either by typing
+-  //   the URL, pasting it, or using search).
+-  //
+-  // * The navigation that initiated the download has a user gesture associated
+-  //   with it AND the user the user is familiar with the referring origin. A
+-  //   user is considered familiar with a referring origin if a visit for a page
+-  //   from the same origin was recorded on the previous day or earlier.
+-  if (danger_level == DownloadFileType::ALLOW_ON_USER_GESTURE &&
+-      ((download_->GetTransitionType() &
+-        ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0 ||
+-       (download_->HasUserGesture() && visits == VISITED_REFERRER)))
+-    return DownloadFileType::NOT_DANGEROUS;
+-  return danger_level;
++  return DownloadFileType::NOT_DANGEROUS;
+ }
+ 
+ absl::optional<base::Time>
+--- chrome/browser/extensions/api/downloads/downloads_api.cc.orig
++++ chrome/browser/extensions/api/downloads/downloads_api.cc
+@@ -36,7 +36,6 @@
+ #include "chrome/browser/browser_process.h"
+ #include "chrome/browser/download/download_core_service.h"
+ #include "chrome/browser/download/download_core_service_factory.h"
+-#include "chrome/browser/download/download_danger_prompt.h"
+ #include "chrome/browser/download/download_file_icon_extractor.h"
+ #include "chrome/browser/download/download_open_prompt.h"
+ #include "chrome/browser/download/download_prefs.h"
+@@ -1274,9 +1273,6 @@ DownloadsAcceptDangerFunction::Downloads
+ 
+ DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
+ 
+-DownloadsAcceptDangerFunction::OnPromptCreatedCallback*
+-    DownloadsAcceptDangerFunction::on_prompt_created_ = NULL;
+-
+ ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
+   std::unique_ptr<downloads::AcceptDanger::Params> params(
+       downloads::AcceptDanger::Params::Create(args()));
+@@ -1314,42 +1310,7 @@ void DownloadsAcceptDangerFunction::Prom
+     return;
+   }
+   RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
+-  // DownloadDangerPrompt displays a modal dialog using native widgets that the
+-  // user must either accept or cancel. It cannot be scripted.
+-  DownloadDangerPrompt* prompt = DownloadDangerPrompt::Create(
+-      download_item, web_contents, true,
+-      base::BindOnce(&DownloadsAcceptDangerFunction::DangerPromptCallback, this,
+-                     download_id));
+-  // DownloadDangerPrompt deletes itself
+-  if (on_prompt_created_ && !on_prompt_created_->is_null())
+-    std::move(*on_prompt_created_).Run(prompt);
+-  // Function finishes in DangerPromptCallback().
+-}
+-
+-void DownloadsAcceptDangerFunction::DangerPromptCallback(
+-    int download_id,
+-    DownloadDangerPrompt::Action action) {
+-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+-  DownloadItem* download_item = GetDownload(
+-      browser_context(), include_incognito_information(), download_id);
+-  std::string error;
+-  if (InvalidId(download_item, &error) ||
+-      Fault(download_item->GetState() != DownloadItem::IN_PROGRESS,
+-            download_extension_errors::kNotInProgress, &error)) {
+-    Respond(Error(std::move(error)));
+-    return;
+-  }
+-  switch (action) {
+-    case DownloadDangerPrompt::ACCEPT:
+-      download_item->ValidateDangerousDownload();
+-      break;
+-    case DownloadDangerPrompt::CANCEL:
+-      download_item->Remove();
+-      break;
+-    case DownloadDangerPrompt::DISMISS:
+-      break;
+-  }
+-  Respond(NoArguments());
++  download_item->ValidateDangerousDownload();
+ }
+ 
+ DownloadsShowFunction::DownloadsShowFunction() {}
+--- chrome/browser/extensions/api/downloads/downloads_api.h.orig
++++ chrome/browser/extensions/api/downloads/downloads_api.h
+@@ -13,7 +13,6 @@
+ #include "base/macros.h"
+ #include "base/scoped_observation.h"
+ #include "base/time/time.h"
+-#include "chrome/browser/download/download_danger_prompt.h"
+ #include "chrome/common/extensions/api/downloads.h"
+ #include "components/download/content/public/all_download_item_notifier.h"
+ #include "components/download/public/common/download_path_reservation_tracker.h"
+@@ -199,13 +198,6 @@ class DownloadsRemoveFileFunction : publ
+ 
+ class DownloadsAcceptDangerFunction : public ExtensionFunction {
+  public:
+-  using OnPromptCreatedCallback =
+-      base::OnceCallback<void(DownloadDangerPrompt*)>;
+-  static void OnPromptCreatedForTesting(
+-      OnPromptCreatedCallback* callback) {
+-    on_prompt_created_ = callback;
+-  }
+-
+   DECLARE_EXTENSION_FUNCTION("downloads.acceptDanger", DOWNLOADS_ACCEPTDANGER)
+   DownloadsAcceptDangerFunction();
+ 
+@@ -217,13 +209,10 @@ class DownloadsAcceptDangerFunction : pu
+ 
+  protected:
+   ~DownloadsAcceptDangerFunction() override;
+-  void DangerPromptCallback(int download_id,
+-                            DownloadDangerPrompt::Action action);
+ 
+  private:
+   void PromptOrWait(int download_id, int retries);
+ 
+-  static OnPromptCreatedCallback* on_prompt_created_;
+ };
+ 
+ class DownloadsShowFunction : public ExtensionFunction {
+--- chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc.orig
++++ chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc
+@@ -54,38 +54,7 @@ SafeBrowsingPrivateGetReferrerChainFunct
+         base::StringPrintf("Could not find tab with id %d.", params->tab_id)));
+   }
+ 
+-  Profile* profile = Profile::FromBrowserContext(browser_context());
+-  if (!SafeBrowsingNavigationObserverManager::IsEnabledAndReady(
+-          profile->GetPrefs(), g_browser_process->safe_browsing_service()))
+-    return RespondNow(NoArguments());
+-
+-  SafeBrowsingNavigationObserverManager* navigation_observer_manager =
+-      safe_browsing::SafeBrowsingNavigationObserverManagerFactory::
+-          GetForBrowserContext(profile);
+-
+-  safe_browsing::ReferrerChain referrer_chain;
+-  SafeBrowsingNavigationObserverManager::AttributionResult result =
+-      navigation_observer_manager->IdentifyReferrerChainByWebContents(
+-          contents, kReferrerUserGestureLimit, &referrer_chain);
+-
+-  // If the referrer chain is incomplete we'll append the most recent
+-  // navigations to referrer chain for diagnostic purposes. This only happens if
+-  // the user is not in incognito mode and has opted into extended reporting or
+-  // Scout reporting. Otherwise, |CountOfRecentNavigationsToAppend| returns 0.
+-  int recent_navigations_to_collect =
+-      SafeBrowsingNavigationObserverManager::CountOfRecentNavigationsToAppend(
+-          profile, profile->GetPrefs(), result);
+-  if (recent_navigations_to_collect > 0) {
+-    navigation_observer_manager->AppendRecentNavigations(
+-        recent_navigations_to_collect, &referrer_chain);
+-  }
+-
+   std::vector<api::safe_browsing_private::ReferrerChainEntry> referrer_entries;
+-  referrer_entries.reserve(referrer_chain.size());
+-  for (const auto& entry : referrer_chain) {
+-    referrer_entries.emplace_back(
+-        safe_browsing_util::ReferrerToReferrerChainEntry(entry));
+-  }
+   return RespondNow(ArgumentList(
+       api::safe_browsing_private::GetReferrerChain::Results::Create(
+           referrer_entries)));
+--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig
++++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+@@ -683,18 +683,6 @@ void WebstorePrivateBeginInstallWithMani
+ 
+ void WebstorePrivateBeginInstallWithManifest3Function::
+     ReportFrictionAcceptedEvent() {
+-  if (!profile_) {
+-    return;
+-  }
+-  auto* metrics_collector =
+-      safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
+-          profile_);
+-  // `metrics_collector` can be null in incognito.
+-  if (metrics_collector) {
+-    metrics_collector->AddSafeBrowsingEventToPref(
+-        safe_browsing::SafeBrowsingMetricsCollector::EventType::
+-            EXTENSION_ALLOWLIST_INSTALL_BYPASS);
+-  }
+ }
+ 
+ void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
+@@ -1159,52 +1147,9 @@ WebstorePrivateGetReferrerChainFunction:
+ 
+ ExtensionFunction::ResponseAction
+ WebstorePrivateGetReferrerChainFunction::Run() {
+-  Profile* profile = Profile::FromBrowserContext(browser_context());
+-  if (!SafeBrowsingNavigationObserverManager::IsEnabledAndReady(
+-          profile->GetPrefs(), g_browser_process->safe_browsing_service()))
+-    return RespondNow(ArgumentList(
+-        api::webstore_private::GetReferrerChain::Results::Create("")));
+-
+-  content::WebContents* web_contents = GetSenderWebContents();
+-  if (!web_contents) {
+-    return RespondNow(ErrorWithArguments(
+-        api::webstore_private::GetReferrerChain::Results::Create(""),
+-        kWebstoreUserCancelledError));
+-  }
+-
+-  SafeBrowsingNavigationObserverManager* navigation_observer_manager =
+-      safe_browsing::SafeBrowsingNavigationObserverManagerFactory::
+-          GetForBrowserContext(profile);
+-
+-  safe_browsing::ReferrerChain referrer_chain;
+-  SafeBrowsingNavigationObserverManager::AttributionResult result =
+-      navigation_observer_manager->IdentifyReferrerChainByWebContents(
+-          web_contents, kExtensionReferrerUserGestureLimit, &referrer_chain);
+-
+-  // If the referrer chain is incomplete we'll append the most recent
+-  // navigations to referrer chain for diagnostic purposes. This only happens if
+-  // the user is not in incognito mode and has opted into extended reporting or
+-  // Scout reporting. Otherwise, |CountOfRecentNavigationsToAppend| returns 0.
+-  int recent_navigations_to_collect =
+-      SafeBrowsingNavigationObserverManager::CountOfRecentNavigationsToAppend(
+-          profile, profile->GetPrefs(), result);
+-  if (recent_navigations_to_collect > 0) {
+-    navigation_observer_manager->AppendRecentNavigations(
+-        recent_navigations_to_collect, &referrer_chain);
+-  }
+-
+-  safe_browsing::ExtensionWebStoreInstallRequest request;
+-  request.mutable_referrer_chain()->Swap(&referrer_chain);
+-  request.mutable_referrer_chain_options()->set_recent_navigations_to_collect(
+-      recent_navigations_to_collect);
+-
+-  std::string serialized_referrer_proto = request.SerializeAsString();
+-  // Base64 encode the proto to avoid issues with base::Value rejecting strings
+-  // which are not valid UTF8.
+-  base::Base64Encode(serialized_referrer_proto, &serialized_referrer_proto);
+   return RespondNow(
+       ArgumentList(api::webstore_private::GetReferrerChain::Results::Create(
+-          serialized_referrer_proto)));
++          "")));
+ }
+ 
+ WebstorePrivateGetExtensionStatusFunction::
+--- chrome/browser/extensions/blocklist_state_fetcher.cc.orig
++++ chrome/browser/extensions/blocklist_state_fetcher.cc
+@@ -34,33 +34,8 @@ BlocklistStateFetcher::~BlocklistStateFe
+ void BlocklistStateFetcher::Request(const std::string& id,
+                                     RequestCallback callback) {
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+-  if (!safe_browsing_config_) {
+-    if (g_browser_process && g_browser_process->safe_browsing_service()) {
+-      SetSafeBrowsingConfig(
+-          g_browser_process->safe_browsing_service()->GetV4ProtocolConfig());
+-    } else {
+-      base::ThreadTaskRunnerHandle::Get()->PostTask(
+-          FROM_HERE, base::BindOnce(std::move(callback), BLOCKLISTED_UNKNOWN));
+-      return;
+-    }
+-  }
+-
+-  bool request_already_sent = base::Contains(callbacks_, id);
+-  callbacks_.insert(std::make_pair(id, std::move(callback)));
+-  if (request_already_sent)
+-    return;
+-
+-  if (g_browser_process && g_browser_process->safe_browsing_service()) {
+-    if (base::FeatureList::IsEnabled(
+-            safe_browsing::kSafeBrowsingRemoveCookies)) {
+-      url_loader_factory_ = g_browser_process->shared_url_loader_factory();
+-    } else {
+-      url_loader_factory_ =
+-          g_browser_process->safe_browsing_service()->GetURLLoaderFactory();
+-    }
+-  }
+-
+-  SendRequest(id);
++  base::ThreadTaskRunnerHandle::Get()->PostTask(
++      FROM_HERE, base::BindOnce(std::move(callback), BLOCKLISTED_UNKNOWN));
+ }
+ 
+ void BlocklistStateFetcher::SendRequest(const std::string& id) {
+@@ -71,8 +46,7 @@ void BlocklistStateFetcher::SendRequest(
+   std::string request_str;
+   request.SerializeToString(&request_str);
+ 
+-  GURL request_url = GURL(safe_browsing::GetReportUrl(
+-      *safe_browsing_config_, "clientreport/crx-list-info"));
++  GURL request_url = GURL();
+   net::NetworkTrafficAnnotationTag traffic_annotation =
+       net::DefineNetworkTrafficAnnotation("extension_blacklist", R"(
+         semantics {
+@@ -122,12 +96,6 @@ void BlocklistStateFetcher::SendRequest(
+                      base::Unretained(this), fetcher));
+ }
+ 
+-void BlocklistStateFetcher::SetSafeBrowsingConfig(
+-    const safe_browsing::V4ProtocolConfig& config) {
+-  safe_browsing_config_ =
+-      std::make_unique<safe_browsing::V4ProtocolConfig>(config);
+-}
+-
+ void BlocklistStateFetcher::OnURLLoaderComplete(
+     network::SimpleURLLoader* url_loader,
+     std::unique_ptr<std::string> response_body) {
+--- chrome/browser/extensions/blocklist_state_fetcher.h.orig
++++ chrome/browser/extensions/blocklist_state_fetcher.h
+@@ -37,8 +37,6 @@ class BlocklistStateFetcher {
+ 
+   virtual void Request(const std::string& id, RequestCallback callback);
+ 
+-  void SetSafeBrowsingConfig(const safe_browsing::V4ProtocolConfig& config);
+-
+  protected:
+   void OnURLLoaderComplete(network::SimpleURLLoader* url_loader,
+                            std::unique_ptr<std::string> response_body);
+@@ -57,7 +55,6 @@ class BlocklistStateFetcher {
+ 
+   void SendRequest(const std::string& id);
+ 
+-  std::unique_ptr<safe_browsing::V4ProtocolConfig> safe_browsing_config_;
+   scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
+ 
+   // SimpleURLLoader -> (owned loader, extension id).
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig
++++ chrome/browser/metrics/chrome_metrics_service_client.cc
+@@ -828,9 +828,6 @@ void ChromeMetricsServiceClient::Registe
+   metrics_service_->RegisterMetricsProvider(
+       std::make_unique<HttpsEngagementMetricsProvider>());
+ 
+-  metrics_service_->RegisterMetricsProvider(
+-      std::make_unique<CertificateReportingMetricsProvider>());
+-
+ #if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
+   metrics_service_->RegisterMetricsProvider(
+       std::make_unique<UpgradeMetricsProvider>());
+--- chrome/browser/net/trial_comparison_cert_verifier_controller.cc.orig
++++ chrome/browser/net/trial_comparison_cert_verifier_controller.cc
+@@ -138,9 +138,6 @@ void TrialComparisonCertVerifierControll
+   std::string serialized_report;
+   if (!report.Serialize(&serialized_report))
+     return;
+-
+-  CertificateReportingServiceFactory::GetForBrowserContext(profile_)->Send(
+-      serialized_report);
+ }
+ 
+ // static
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig
++++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+@@ -297,7 +297,6 @@ void ChromeBrowserMainExtraPartsProfiles
+ #if BUILDFLAG(IS_CHROMEOS_LACROS)
+   CertDbInitializerFactory::GetInstance();
+ #endif
+-  CertificateReportingServiceFactory::GetInstance();
+ #if !defined(OS_ANDROID)
+   ChromeBrowsingDataLifetimeManagerFactory::GetInstance();
+ #endif
+--- chrome/browser/profiles/profile_impl.cc.orig
++++ chrome/browser/profiles/profile_impl.cc
+@@ -93,7 +93,6 @@
+ #include "chrome/browser/profiles/profile_metrics.h"
+ #include "chrome/browser/push_messaging/push_messaging_service_factory.h"
+ #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
+-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
+ #include "chrome/browser/sessions/exit_type_service.h"
+ #include "chrome/browser/sharing/sharing_service_factory.h"
+ #include "chrome/browser/signin/identity_manager_factory.h"
+@@ -627,17 +626,6 @@ void ProfileImpl::LoadPrefsForNormalStar
+ 
+   mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
+       pref_validation_delegate;
+-  scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_service(
+-      g_browser_process->safe_browsing_service());
+-  if (safe_browsing_service.get()) {
+-    auto pref_validation_delegate_impl =
+-        safe_browsing_service->CreatePreferenceValidationDelegate(this);
+-    if (pref_validation_delegate_impl) {
+-      mojo::MakeSelfOwnedReceiver(
+-          std::move(pref_validation_delegate_impl),
+-          pref_validation_delegate.InitWithNewPipeAndPassReceiver());
+-    }
+-  }
+ 
+   prefs_ =
+       CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false),
+--- chrome/browser/profiles/profiles_state.cc.orig
++++ chrome/browser/profiles/profiles_state.cc
+@@ -259,9 +259,6 @@ void RemoveBrowsingDataForProfile(const
+   // The BrowsingDataRemover relies on many objects that aren't created in unit
+   // tests. Previously this code would depend on content::ResourceDispatcherHost
+   // but that's gone, so do a similar hack for now.
+-  if (!g_browser_process->safe_browsing_service())
+-    return;
+-
+   Profile* profile =
+       g_browser_process->profile_manager()->GetProfileByPath(profile_path);
+   if (!profile)
+--- chrome/browser/safe_browsing/BUILD.gn.orig
++++ chrome/browser/safe_browsing/BUILD.gn
+@@ -5,6 +5,7 @@ import("//components/safe_browsing/build
+ import("//extensions/buildflags/buildflags.gni")
+ 
+ static_library("safe_browsing") {
++  if (false) {
+   sources = [
+     "chrome_controller_client.cc",
+     "chrome_controller_client.h",
+@@ -88,6 +89,7 @@ static_library("safe_browsing") {
+       "//extensions/browser",
+     ]
+   }
++  }
+ 
+   if (safe_browsing_mode != 0) {
+     # "Safe Browsing Basic" files used for safe browsing in full mode
+@@ -411,6 +413,7 @@ static_library("advanced_protection") {
+ }
+ 
+ source_set("metrics_collector") {
++  if (false) {
+   sources = [
+     "safe_browsing_metrics_collector_factory.cc",
+     "safe_browsing_metrics_collector_factory.h",
+@@ -428,6 +431,7 @@ source_set("metrics_collector") {
+     "//components/safe_browsing/core/common:safe_browsing_prefs",
+     "//content/public/browser",
+   ]
++  }
+ }
+ 
+ source_set("test_support") {
+--- chrome/browser/ssl/security_state_tab_helper.cc.orig
++++ chrome/browser/ssl/security_state_tab_helper.cc
+@@ -217,89 +217,6 @@ bool SecurityStateTabHelper::UsedPolicyI
+ 
+ security_state::MaliciousContentStatus
+ SecurityStateTabHelper::GetMaliciousContentStatus() const {
+-  content::NavigationEntry* entry =
+-      web_contents()->GetController().GetVisibleEntry();
+-  if (!entry)
+-    return security_state::MALICIOUS_CONTENT_STATUS_NONE;
+-  safe_browsing::SafeBrowsingService* sb_service =
+-      g_browser_process->safe_browsing_service();
+-  if (!sb_service)
+-    return security_state::MALICIOUS_CONTENT_STATUS_NONE;
+-  scoped_refptr<SafeBrowsingUIManager> sb_ui_manager = sb_service->ui_manager();
+-  safe_browsing::SBThreatType threat_type;
+-  if (sb_ui_manager->IsUrlAllowlistedOrPendingForWebContents(
+-          entry->GetURL(), false, entry, web_contents(), false, &threat_type)) {
+-    switch (threat_type) {
+-      case safe_browsing::SB_THREAT_TYPE_UNUSED:
+-      case safe_browsing::SB_THREAT_TYPE_SAFE:
+-      case safe_browsing::SB_THREAT_TYPE_URL_PHISHING:
+-      case safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING:
+-        return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
+-      case safe_browsing::SB_THREAT_TYPE_URL_MALWARE:
+-      case safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE:
+-        return security_state::MALICIOUS_CONTENT_STATUS_MALWARE;
+-      case safe_browsing::SB_THREAT_TYPE_URL_UNWANTED:
+-        return security_state::MALICIOUS_CONTENT_STATUS_UNWANTED_SOFTWARE;
+-      case safe_browsing::SB_THREAT_TYPE_SAVED_PASSWORD_REUSE:
+-#if BUILDFLAG(FULL_SAFE_BROWSING)
+-        return security_state::MALICIOUS_CONTENT_STATUS_SAVED_PASSWORD_REUSE;
+-#endif
+-      case safe_browsing::SB_THREAT_TYPE_SIGNED_IN_SYNC_PASSWORD_REUSE:
+-#if BUILDFLAG(FULL_SAFE_BROWSING)
+-        if (safe_browsing::ChromePasswordProtectionService::
+-                ShouldShowPasswordReusePageInfoBubble(
+-                    web_contents(), PasswordType::PRIMARY_ACCOUNT_PASSWORD)) {
+-          return security_state::
+-              MALICIOUS_CONTENT_STATUS_SIGNED_IN_SYNC_PASSWORD_REUSE;
+-        }
+-#endif
+-        FALLTHROUGH;
+-      case safe_browsing::SB_THREAT_TYPE_SIGNED_IN_NON_SYNC_PASSWORD_REUSE:
+-#if BUILDFLAG(FULL_SAFE_BROWSING)
+-        if (safe_browsing::ChromePasswordProtectionService::
+-                ShouldShowPasswordReusePageInfoBubble(
+-                    web_contents(), PasswordType::OTHER_GAIA_PASSWORD)) {
+-          return security_state::
+-              MALICIOUS_CONTENT_STATUS_SIGNED_IN_NON_SYNC_PASSWORD_REUSE;
+-        }
+-#endif
+-        FALLTHROUGH;
+-      case safe_browsing::SB_THREAT_TYPE_ENTERPRISE_PASSWORD_REUSE:
+-#if BUILDFLAG(FULL_SAFE_BROWSING)
+-        if (safe_browsing::ChromePasswordProtectionService::
+-                ShouldShowPasswordReusePageInfoBubble(
+-                    web_contents(), PasswordType::ENTERPRISE_PASSWORD)) {
+-          return security_state::
+-              MALICIOUS_CONTENT_STATUS_ENTERPRISE_PASSWORD_REUSE;
+-        }
+-#endif
+-        // If user has already changed password or FULL_SAFE_BROWSING isn't
+-        // enabled, returns the regular social engineering content status.
+-        return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
+-      case safe_browsing::SB_THREAT_TYPE_BILLING:
+-        return security_state::MALICIOUS_CONTENT_STATUS_BILLING;
+-      case safe_browsing::
+-          DEPRECATED_SB_THREAT_TYPE_URL_PASSWORD_PROTECTION_PHISHING:
+-      case safe_browsing::SB_THREAT_TYPE_URL_BINARY_MALWARE:
+-      case safe_browsing::SB_THREAT_TYPE_EXTENSION:
+-      case safe_browsing::SB_THREAT_TYPE_BLOCKLISTED_RESOURCE:
+-      case safe_browsing::SB_THREAT_TYPE_API_ABUSE:
+-      case safe_browsing::SB_THREAT_TYPE_SUBRESOURCE_FILTER:
+-      case safe_browsing::SB_THREAT_TYPE_CSD_ALLOWLIST:
+-      case safe_browsing::SB_THREAT_TYPE_AD_SAMPLE:
+-      case safe_browsing::SB_THREAT_TYPE_BLOCKED_AD_POPUP:
+-      case safe_browsing::SB_THREAT_TYPE_BLOCKED_AD_REDIRECT:
+-      case safe_browsing::SB_THREAT_TYPE_SUSPICIOUS_SITE:
+-      case safe_browsing::SB_THREAT_TYPE_APK_DOWNLOAD:
+-      case safe_browsing::SB_THREAT_TYPE_HIGH_CONFIDENCE_ALLOWLIST:
+-      case safe_browsing::SB_THREAT_TYPE_ACCURACY_TIPS:
+-        // These threat types are not currently associated with
+-        // interstitials, and thus resources with these threat types are
+-        // not ever whitelisted or pending whitelisting.
+-        NOTREACHED();
+-        break;
+-    }
+-  }
+   return security_state::MALICIOUS_CONTENT_STATUS_NONE;
+ }
+ 
+--- chrome/browser/ui/BUILD.gn.orig
++++ chrome/browser/ui/BUILD.gn
+@@ -3946,7 +3946,6 @@ static_library("ui") {
+       "views/device_chooser_content_view.h",
+       "views/devtools_process_observer.cc",
+       "views/devtools_process_observer.h",
+-      "views/download/download_danger_prompt_views.cc",
+       "views/download/download_in_progress_dialog_view.cc",
+       "views/download/download_in_progress_dialog_view.h",
+       "views/download/download_item_view.cc",
+--- chrome/browser/ui/tab_helpers.cc.orig
++++ chrome/browser/ui/tab_helpers.cc
+@@ -330,16 +330,6 @@ void TabHelpers::AttachTabHelpers(WebCon
+   //     See https://crbug.com/910288.
+   resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
+       web_contents);
+-  safe_browsing::SafeBrowsingNavigationObserver::MaybeCreateForWebContents(
+-      web_contents, HostContentSettingsMapFactory::GetForProfile(profile),
+-      safe_browsing::SafeBrowsingNavigationObserverManagerFactory::
+-          GetForBrowserContext(profile),
+-      profile->GetPrefs(), g_browser_process->safe_browsing_service());
+-  safe_browsing::SafeBrowsingTabObserver::CreateForWebContents(
+-      web_contents,
+-      std::make_unique<safe_browsing::ChromeSafeBrowsingTabObserverDelegate>());
+-  safe_browsing::TriggerCreator::MaybeCreateTriggersForWebContents(
+-      profile, web_contents);
+   ReputationWebContentsObserver::CreateForWebContents(web_contents);
+   SearchEngineTabHelper::CreateForWebContents(web_contents);
+   SecurityStateTabHelper::CreateForWebContents(web_contents);
+--- chrome/browser/ui/webui/downloads/downloads_dom_handler.cc.orig
++++ chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
+@@ -23,7 +23,6 @@
+ #include "base/threading/thread.h"
+ #include "base/values.h"
+ #include "chrome/browser/browser_process.h"
+-#include "chrome/browser/download/download_danger_prompt.h"
+ #include "chrome/browser/download/download_history.h"
+ #include "chrome/browser/download/download_item_model.h"
+ #include "chrome/browser/download/download_prefs.h"
+@@ -171,9 +170,6 @@ void DownloadsDOMHandler::SaveDangerousR
+   }
+ 
+   CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS);
+-  download::DownloadItem* file = GetDownloadByStringId(id);
+-  if (file)
+-    ShowDangerPrompt(file);
+ }
+ 
+ void DownloadsDOMHandler::AcceptIncognitoWarning(const std::string& id) {
+@@ -325,12 +321,6 @@ void DownloadsDOMHandler::RemoveDownload
+   IdSet ids;
+ 
+   for (auto* download : to_remove) {
+-    if (download->IsDangerous() || download->IsMixedContent()) {
+-      // Don't allow users to revive dangerous downloads; just nuke 'em.
+-      download->Remove();
+-      continue;
+-    }
+-
+     DownloadItemModel item_model(download);
+     if (!item_model.ShouldShowInShelf() ||
+         download->GetState() == download::DownloadItem::IN_PROGRESS) {
+@@ -404,44 +394,6 @@ void DownloadsDOMHandler::FinalizeRemova
+   }
+ }
+ 
+-void DownloadsDOMHandler::ShowDangerPrompt(
+-    download::DownloadItem* dangerous_item) {
+-  DownloadDangerPrompt* danger_prompt = DownloadDangerPrompt::Create(
+-      dangerous_item, GetWebUIWebContents(), false,
+-      base::BindOnce(&DownloadsDOMHandler::DangerPromptDone,
+-                     weak_ptr_factory_.GetWeakPtr(), dangerous_item->GetId()));
+-  // danger_prompt will delete itself.
+-  DCHECK(danger_prompt);
+-}
+-
+-void DownloadsDOMHandler::DangerPromptDone(
+-    int download_id,
+-    DownloadDangerPrompt::Action action) {
+-  if (action != DownloadDangerPrompt::ACCEPT)
+-    return;
+-  download::DownloadItem* item = NULL;
+-  if (GetMainNotifierManager())
+-    item = GetMainNotifierManager()->GetDownload(download_id);
+-  if (!item && GetOriginalNotifierManager())
+-    item = GetOriginalNotifierManager()->GetDownload(download_id);
+-  if (!item || item->IsDone())
+-    return;
+-  CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS);
+-
+-  // If a download is mixed content, validate that first. Is most cases, mixed
+-  // content warnings will occur first, but in the worst case scenario, we show
+-  // a dangerous warning twice. That's better than showing a mixed content
+-  // warning, then dismissing the dangerous download warning. Since mixed
+-  // content downloads triggering the UI are temporary and rare to begin with,
+-  // this should very rarely occur.
+-  if (item->IsMixedContent()) {
+-    item->ValidateMixedContentDownload();
+-    return;
+-  }
+-
+-  item->ValidateDangerousDownload();
+-}
+-
+ bool DownloadsDOMHandler::IsDeletingHistoryAllowed() {
+   content::DownloadManager* manager = GetMainNotifierManager();
+   return manager &&
+--- chrome/browser/ui/webui/downloads/downloads_dom_handler.h.orig
++++ chrome/browser/ui/webui/downloads/downloads_dom_handler.h
+@@ -12,7 +12,6 @@
+ 
+ #include "base/macros.h"
+ #include "base/memory/weak_ptr.h"
+-#include "chrome/browser/download/download_danger_prompt.h"
+ #include "chrome/browser/ui/webui/downloads/downloads.mojom-forward.h"
+ #include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h"
+ #include "content/public/browser/web_contents_observer.h"
+@@ -94,18 +93,6 @@ class DownloadsDOMHandler : public conte
+   // null-checking |original_notifier_|.
+   content::DownloadManager* GetOriginalNotifierManager() const;
+ 
+-  // Displays a native prompt asking the user for confirmation after accepting
+-  // the dangerous download specified by |dangerous|. The function returns
+-  // immediately, and will invoke DangerPromptAccepted() asynchronously if the
+-  // user accepts the dangerous download. The native prompt will observe
+-  // |dangerous| until either the dialog is dismissed or |dangerous| is no
+-  // longer an in-progress dangerous download.
+-  virtual void ShowDangerPrompt(download::DownloadItem* dangerous);
+-
+-  // Conveys danger acceptance from the DownloadDangerPrompt to the
+-  // DownloadItem.
+-  void DangerPromptDone(int download_id, DownloadDangerPrompt::Action action);
+-
+   // Returns true if the records of any downloaded items are allowed (and able)
+   // to be deleted.
+   bool IsDeletingHistoryAllowed();
+--- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig
++++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+@@ -281,116 +281,6 @@ CreateHttpsOnlyModePage(content::WebCont
+                                                       request_url));
+ }
+ 
+-std::unique_ptr<safe_browsing::SafeBrowsingBlockingPage>
+-CreateSafeBrowsingBlockingPage(content::WebContents* web_contents) {
+-  safe_browsing::SBThreatType threat_type =
+-      safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
+-  GURL request_url("http://example.com");
+-  std::string url_param;
+-  if (net::GetValueForKeyInQuery(web_contents->GetURL(), "url", &url_param)) {
+-    if (GURL(url_param).is_valid()) {
+-      request_url = GURL(url_param);
+-    }
+-  }
+-  GURL main_frame_url(request_url);
+-  // TODO(mattm): add flag to change main_frame_url or add dedicated flag to
+-  // test subresource interstitials.
+-  std::string type_param;
+-  if (net::GetValueForKeyInQuery(web_contents->GetURL(), "type", &type_param)) {
+-    if (type_param == "malware") {
+-      threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
+-    } else if (type_param == "phishing") {
+-      threat_type = safe_browsing::SB_THREAT_TYPE_URL_PHISHING;
+-    } else if (type_param == "unwanted") {
+-      threat_type = safe_browsing::SB_THREAT_TYPE_URL_UNWANTED;
+-    } else if (type_param == "clientside_malware") {
+-      threat_type = safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE;
+-    } else if (type_param == "clientside_phishing") {
+-      threat_type = safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING;
+-    } else if (type_param == "billing") {
+-      threat_type = safe_browsing::SB_THREAT_TYPE_BILLING;
+-    }
+-  }
+-  const content::GlobalRenderFrameHostId primary_main_frame_id =
+-      web_contents->GetMainFrame()->GetGlobalId();
+-  safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource;
+-  resource.url = request_url;
+-  resource.is_subresource = request_url != main_frame_url;
+-  resource.is_subframe = false;
+-  resource.threat_type = threat_type;
+-  resource.render_process_id = primary_main_frame_id.child_id;
+-  resource.render_frame_id = primary_main_frame_id.frame_routing_id;
+-  resource.threat_source = g_browser_process->safe_browsing_service()
+-                               ->database_manager()
+-                               ->GetThreatSource();
+-
+-  // Normally safebrowsing interstitial types which block the main page load
+-  // (SB_THREAT_TYPE_URL_MALWARE, SB_THREAT_TYPE_URL_PHISHING, and
+-  // SB_THREAT_TYPE_URL_UNWANTED on main-frame loads) would expect there to be a
+-  // pending navigation when the SafeBrowsingBlockingPage is created. This demo
+-  // creates a SafeBrowsingBlockingPage but does not actually show a real
+-  // interstitial. Instead it extracts the html and displays it manually, so the
+-  // parts which depend on the NavigationEntry are not hit.
+-  auto* ui_manager =
+-      g_browser_process->safe_browsing_service()->ui_manager().get();
+-  return base::WrapUnique<safe_browsing::SafeBrowsingBlockingPage>(
+-      ui_manager->blocking_page_factory()->CreateSafeBrowsingPage(
+-          ui_manager, web_contents, main_frame_url, {resource}, true));
+-}
+-
+-std::unique_ptr<TestSafeBrowsingBlockingPageQuiet>
+-CreateSafeBrowsingQuietBlockingPage(content::WebContents* web_contents) {
+-  safe_browsing::SBThreatType threat_type =
+-      safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
+-  GURL request_url("http://example.com");
+-  std::string url_param;
+-  if (net::GetValueForKeyInQuery(web_contents->GetURL(), "url", &url_param)) {
+-    if (GURL(url_param).is_valid())
+-      request_url = GURL(url_param);
+-  }
+-  GURL main_frame_url(request_url);
+-  std::string type_param;
+-  bool is_giant_webview = false;
+-  if (net::GetValueForKeyInQuery(web_contents->GetURL(), "type", &type_param)) {
+-    if (type_param == "malware") {
+-      threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
+-    } else if (type_param == "phishing") {
+-      threat_type = safe_browsing::SB_THREAT_TYPE_URL_PHISHING;
+-    } else if (type_param == "unwanted") {
+-      threat_type = safe_browsing::SB_THREAT_TYPE_URL_UNWANTED;
+-    } else if (type_param == "billing") {
+-      threat_type = safe_browsing::SB_THREAT_TYPE_BILLING;
+-    } else if (type_param == "giant") {
+-      threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
+-      is_giant_webview = true;
+-    }
+-  }
+-  const content::GlobalRenderFrameHostId primary_main_frame_id =
+-      web_contents->GetMainFrame()->GetGlobalId();
+-  safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource;
+-  resource.url = request_url;
+-  resource.is_subresource = request_url != main_frame_url;
+-  resource.is_subframe = false;
+-  resource.threat_type = threat_type;
+-  resource.render_process_id = primary_main_frame_id.child_id;
+-  resource.render_frame_id = primary_main_frame_id.frame_routing_id;
+-  resource.threat_source = g_browser_process->safe_browsing_service()
+-                               ->database_manager()
+-                               ->GetThreatSource();
+-
+-  // Normally safebrowsing interstitial types which block the main page load
+-  // (SB_THREAT_TYPE_URL_MALWARE, SB_THREAT_TYPE_URL_PHISHING, and
+-  // SB_THREAT_TYPE_URL_UNWANTED on main-frame loads) would expect there to be a
+-  // pending navigation when the SafeBrowsingBlockingPage is created. This demo
+-  // creates a SafeBrowsingBlockingPage but does not actually show a real
+-  // interstitial. Instead it extracts the html and displays it manually, so the
+-  // parts which depend on the NavigationEntry are not hit.
+-  return base::WrapUnique<TestSafeBrowsingBlockingPageQuiet>(
+-      TestSafeBrowsingBlockingPageQuiet::CreateBlockingPage(
+-          g_browser_process->safe_browsing_service()->ui_manager().get(),
+-          web_contents, main_frame_url, resource, is_giant_webview));
+-}
+-
+ #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
+ std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
+     content::WebContents* web_contents) {
+@@ -507,8 +397,6 @@ void InterstitialHTMLSource::StartDataRe
+     interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
+   } else if (path_without_query == "/legacy-tls") {
+     interstitial_delegate = CreateLegacyTLSBlockingPage(web_contents);
+-  } else if (path_without_query == "/safebrowsing") {
+-    interstitial_delegate = CreateSafeBrowsingBlockingPage(web_contents);
+   } else if (path_without_query == "/clock") {
+     interstitial_delegate = CreateBadClockBlockingPage(web_contents);
+   } else if (path_without_query == "/lookalike") {
+@@ -525,16 +413,12 @@ void InterstitialHTMLSource::StartDataRe
+     interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
+   }
+ 
+-  if (path_without_query == "/quietsafebrowsing") {
+-    std::unique_ptr<TestSafeBrowsingBlockingPageQuiet> blocking_page =
+-        CreateSafeBrowsingQuietBlockingPage(web_contents);
+-    html = blocking_page->GetHTML();
+-    interstitial_delegate = std::move(blocking_page);
+ #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+-  } else if (path_without_query == "/supervised_user") {
++  if (path_without_query == "/supervised_user") {
+     html = GetSupervisedUserInterstitialHTML(path);
++  } else
+ #endif
+-  } else if (interstitial_delegate.get()) {
++  if (interstitial_delegate.get()) {
+     html = interstitial_delegate.get()->GetHTMLContents();
+   } else {
+     html = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
+--- chrome/renderer/chrome_content_renderer_client.cc.orig
++++ chrome/renderer/chrome_content_renderer_client.cc
+@@ -97,7 +97,6 @@
+ #include "components/page_load_metrics/renderer/metrics_render_frame_observer.h"
+ #include "components/paint_preview/buildflags/buildflags.h"
+ #include "components/safe_browsing/buildflags.h"
+-#include "components/safe_browsing/content/renderer/threat_dom_details.h"
+ #include "components/spellcheck/spellcheck_buildflags.h"
+ #include "components/subresource_filter/content/renderer/subresource_filter_agent.h"
+ #include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h"
+--- components/security_interstitials/content/cert_report_helper.cc.orig
++++ components/security_interstitials/content/cert_report_helper.cc
+@@ -177,7 +177,6 @@ void CertReportHelper::FinishCertCollect
+     return;
+   }
+ 
+-  ssl_cert_reporter_->ReportInvalidCertificateChain(serialized_report);
+ }
+ 
+ bool CertReportHelper::ShouldShowCertificateReporterCheckbox() {
diff --git a/www/chromium-uc/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch b/www/chromium-uc/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch
new file mode 100644
index 0000000..b3f1614
--- /dev/null
+++ b/www/chromium-uc/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch
@@ -0,0 +1,99 @@
+--- components/autofill/core/browser/autofill_download_manager.cc.orig
++++ components/autofill/core/browser/autofill_download_manager.cc
+@@ -824,96 +824,6 @@ std::tuple<GURL, std::string> AutofillDo
+ }
+ 
+ bool AutofillDownloadManager::StartRequest(FormRequestData request_data) {
+-  scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory =
+-      driver_->GetURLLoaderFactory();
+-  DCHECK(url_loader_factory);
+-
+-  // Get the URL and method to use for this request.
+-  std::string method;
+-  GURL request_url;
+-  std::tie(request_url, method) = GetRequestURLAndMethod(request_data);
+-
+-  // Track the URL length for GET queries because the URL length can be in the
+-  // thousands when rich metadata is enabled.
+-  if (request_data.request_type == AutofillDownloadManager::REQUEST_QUERY &&
+-      method == "GET") {
+-    UMA_HISTOGRAM_COUNTS_100000("Autofill.Query.GetUrlLength",
+-                                request_url.spec().length());
+-  }
+-
+-  auto resource_request = std::make_unique<network::ResourceRequest>();
+-  resource_request->url = request_url;
+-  resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
+-  resource_request->method = method;
+-
+-  // On iOS we have a single, shared URLLoaderFactory provided by BrowserState.
+-  // As it is shared, it is not trusted and we cannot assign trusted_params
+-  // to the network request.
+-#if !defined(OS_IOS)
+-  // Do not call IsolationInfo() for REQUEST_UPLOADs because Password Manager
+-  // uploads when RenderFrameHostImpl::DidCommitNavigation() is called, in which
+-  // case IsolationInfo() may crash because there is no committing
+-  // NavigationRequest. This is safe because no information about the response
+-  // is passed to the renderer, or is otherwise visible to a page.
+-  // crbug/1176635#c22
+-  if (request_data.request_type != AutofillDownloadManager::REQUEST_UPLOAD) {
+-    resource_request->trusted_params =
+-        network::ResourceRequest::TrustedParams();
+-    resource_request->trusted_params->isolation_info = driver_->IsolationInfo();
+-  }
+-#endif
+-
+-  // Add Chrome experiment state to the request headers.
+-  variations::AppendVariationsHeaderUnknownSignedIn(
+-      request_url,
+-      driver_->IsIncognito() ? variations::InIncognito::kYes
+-                             : variations::InIncognito::kNo,
+-      resource_request.get());
+-
+-  // Set headers specific to the API.
+-  // Encode response serialized proto in base64 for safety.
+-  resource_request->headers.SetHeader(kGoogEncodeResponseIfExecutable,
+-                                      "base64");
+-
+-  // Put API key in request's header if a key exists, and the endpoint is
+-  // trusted by Google.
+-  if (!api_key_.empty() && request_url.SchemeIs(url::kHttpsScheme) &&
+-      google_util::IsGoogleAssociatedDomainUrl(request_url)) {
+-    resource_request->headers.SetHeader(kGoogApiKey, api_key_);
+-  }
+-
+-  auto simple_loader = network::SimpleURLLoader::Create(
+-      std::move(resource_request),
+-      GetNetworkTrafficAnnotation(request_data.request_type));
+-
+-  // This allows reading the error message within the API response when status
+-  // is not 200 (e.g., 400). Otherwise, URL loader will not give any content in
+-  // the response when there is a failure, which makes debugging hard.
+-  simple_loader->SetAllowHttpErrorResults(true);
+-
+-  if (method == "POST") {
+-    const std::string content_type = "application/x-protobuf";
+-    std::string payload;
+-    if (!GetAPIBodyPayload(request_data.payload, request_data.request_type,
+-                           &payload)) {
+-      return false;
+-    }
+-
+-    // Attach payload data and add data format header.
+-    simple_loader->AttachStringForUpload(payload, content_type);
+-  }
+-
+-  // Transfer ownership of the loader into url_loaders_. Temporarily hang
+-  // onto the raw pointer to use it as a key and to kick off the request;
+-  // transferring ownership (std::move) invalidates the |simple_loader|
+-  // variable.
+-  auto* raw_simple_loader = simple_loader.get();
+-  url_loaders_.push_back(std::move(simple_loader));
+-  raw_simple_loader->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
+-      url_loader_factory.get(),
+-      base::BindOnce(&AutofillDownloadManager::OnSimpleLoaderComplete,
+-                     base::Unretained(this), std::move(--url_loaders_.end()),
+-                     std::move(request_data), AutofillTickClock::NowTicks()));
+   return true;
+ }
+ 
diff --git a/www/chromium-uc/patches/core/inox-patchset/0005-disable-default-extensions.patch b/www/chromium-uc/patches/core/inox-patchset/0005-disable-default-extensions.patch
new file mode 100644
index 0000000..894d468
--- /dev/null
+++ b/www/chromium-uc/patches/core/inox-patchset/0005-disable-default-extensions.patch
@@ -0,0 +1,100 @@
+--- chrome/browser/extensions/component_extensions_allowlist/allowlist.cc.orig
++++ chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
+@@ -28,7 +28,6 @@ namespace extensions {
+ 
+ bool IsComponentExtensionAllowlisted(const std::string& extension_id) {
+   const char* const kAllowed[] = {
+-    extension_misc::kInAppPaymentsSupportAppId,
+     extension_misc::kPdfExtensionId,
+ #if defined(OS_CHROMEOS)
+     extension_misc::kAssessmentAssistantExtensionId,
+--- chrome/browser/extensions/component_loader.cc.orig
++++ chrome/browser/extensions/component_loader.cc
+@@ -354,11 +354,6 @@ void ComponentLoader::AddWebStoreApp() {
+   if (!IsNormalSession())
+     return;
+ #endif
+-
+-  AddWithNameAndDescription(
+-      IDR_WEBSTORE_MANIFEST, base::FilePath(FILE_PATH_LITERAL("web_store")),
+-      l10n_util::GetStringUTF8(IDS_WEBSTORE_NAME_STORE),
+-      l10n_util::GetStringUTF8(IDS_WEBSTORE_APP_DESCRIPTION));
+ }
+ 
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -495,18 +490,6 @@ void ComponentLoader::AddDefaultComponen
+     AddHangoutServicesExtension();
+ #endif  // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
+ 
+-    bool install_feedback = enable_background_extensions_during_testing;
+-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+-    install_feedback = true;
+-#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
+-    if (install_feedback) {
+-      AddWithNameAndDescription(
+-          IDR_FEEDBACK_MANIFEST, base::FilePath(FILE_PATH_LITERAL("feedback")),
+-          l10n_util::GetStringUTF8(IDS_FEEDBACK_REPORT_APP_TITLE),
+-          // Description string
+-          l10n_util::GetStringUTF8(IDS_FEEDBACK_REPORT_PAGE_TITLE));
+-    }
+-
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+     if (command_line->HasSwitch(switches::kLoadGuestModeTestExtension)) {
+       base::FilePath path = base::FilePath(command_line->GetSwitchValueASCII(
+--- chrome/browser/extensions/external_component_loader.cc.orig
++++ chrome/browser/extensions/external_component_loader.cc
+@@ -30,9 +30,6 @@ ExternalComponentLoader::~ExternalCompon
+ 
+ void ExternalComponentLoader::StartLoading() {
+   auto prefs = std::make_unique<base::DictionaryValue>();
+-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+-  AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId, prefs.get());
+-#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
+ 
+ #if defined(OS_CHROMEOS)
+   {
+--- chrome/browser/extensions/webstore_installer.cc.orig
++++ chrome/browser/extensions/webstore_installer.cc
+@@ -555,20 +555,6 @@ void WebstoreInstaller::DownloadNextPend
+ void WebstoreInstaller::DownloadCrx(
+     const std::string& extension_id,
+     InstallSource source) {
+-  download_url_ = GetWebstoreInstallURL(extension_id, source);
+-  MaybeAppendAuthUserParameter(approval_->authuser, &download_url_);
+-
+-  base::FilePath user_data_dir;
+-  base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+-  base::FilePath download_path = user_data_dir.Append(kWebstoreDownloadFolder);
+-
+-  base::FilePath download_directory(g_download_directory_for_tests ?
+-      *g_download_directory_for_tests : download_path);
+-
+-  base::PostTaskAndReplyWithResult(
+-      GetExtensionFileTaskRunner().get(), FROM_HERE,
+-      base::BindOnce(&GetDownloadFilePath, download_directory, extension_id),
+-      base::BindOnce(&WebstoreInstaller::StartDownload, this, extension_id));
+ }
+ 
+ // http://crbug.com/165634
+@@ -712,21 +698,6 @@ void WebstoreInstaller::UpdateDownloadPr
+ void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) {
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+   DCHECK(!crx_installer_.get());
+-
+-  ExtensionService* service = ExtensionSystem::Get(profile_)->
+-      extension_service();
+-  CHECK(service);
+-
+-  const Approval* approval = GetAssociatedApproval(download);
+-  DCHECK(approval);
+-
+-  crx_installer_ = download_crx_util::CreateCrxInstaller(profile_, download);
+-
+-  crx_installer_->set_expected_id(approval->extension_id);
+-  crx_installer_->set_is_gallery_install(true);
+-  crx_installer_->set_allow_silent_install(true);
+-
+-  crx_installer_->InstallCrx(download.GetFullPath());
+ }
+ 
+ void WebstoreInstaller::ReportFailure(const std::string& error,
diff --git a/www/chromium-uc/patches/core/inox-patchset/0007-disable-web-resource-service.patch b/www/chromium-uc/patches/core/inox-patchset/0007-disable-web-resource-service.patch
new file mode 100644
index 0000000..ad9e012
--- /dev/null
+++ b/www/chromium-uc/patches/core/inox-patchset/0007-disable-web-resource-service.patch
@@ -0,0 +1,48 @@
+--- components/web_resource/web_resource_service.cc.orig
++++ components/web_resource/web_resource_service.cc
+@@ -120,44 +120,7 @@ bool WebResourceService::GetFetchSchedul
+ // Initializes the fetching of data from the resource server.  Data
+ // load calls OnSimpleLoaderComplete.
+ void WebResourceService::StartFetch() {
+-  // Set to false so that next fetch can be scheduled after this fetch or
+-  // if we receive notification that resource is allowed.
+-  fetch_scheduled_ = false;
+-  // Check whether fetching is allowed.
+-  if (!resource_request_allowed_notifier_->ResourceRequestsAllowed())
+-    return;
+-
+-  // First, put our next cache load on the MessageLoop.
+-  ScheduleFetch(cache_update_delay_ms_);
+-
+-  // Set cache update time in preferences.
+-  prefs_->SetString(last_update_time_pref_name_,
+-                    base::NumberToString(base::Time::Now().ToDoubleT()));
+-
+-  // If we are still fetching data, exit.
+-  if (in_fetch_)
+-    return;
+-  in_fetch_ = true;
+-
+-  GURL web_resource_server =
+-      application_locale_.empty()
+-          ? web_resource_server_
+-          : google_util::AppendGoogleLocaleParam(web_resource_server_,
+-                                                 application_locale_);
+-
+-  DVLOG(1) << "WebResourceService StartFetch " << web_resource_server;
+-  auto resource_request = std::make_unique<network::ResourceRequest>();
+-  resource_request->url = web_resource_server;
+-  // Do not let url fetcher affect existing state in system context
+-  // (by setting cookies, for example).
+-  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
+-  resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
+-  simple_url_loader_ = network::SimpleURLLoader::Create(
+-      std::move(resource_request), traffic_annotation_);
+-  simple_url_loader_->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
+-      url_loader_factory_.get(),
+-      base::BindOnce(&WebResourceService::OnSimpleLoaderComplete,
+-                     base::Unretained(this)));
++  in_fetch_ = false;
+ }
+ 
+ void WebResourceService::EndFetch() {
diff --git a/www/chromium-uc/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch b/www/chromium-uc/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch
new file mode 100644
index 0000000..9f78ade
--- /dev/null
+++ b/www/chromium-uc/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch
@@ -0,0 +1,16 @@
+--- net/dns/host_resolver_manager.cc.orig
++++ net/dns/host_resolver_manager.cc
+@@ -139,10 +139,10 @@ const unsigned kMinimumTTLSeconds = kCac
+ // cached.
+ const int kIPv6ProbePeriodMs = 1000;
+ 
+-// Google DNS address used for IPv6 probes.
+-const uint8_t kIPv6ProbeAddress[] = {0x20, 0x01, 0x48, 0x60, 0x48, 0x60,
++// RIPE NCC k.root-servers.net. 2001:7fd::1 (anycasted), used for IPv6 probes.
++const uint8_t kIPv6ProbeAddress[] = {0x20, 0x01, 0x07, 0xfd, 0x00, 0x00,
+                                      0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-                                     0x00, 0x00, 0x88, 0x88};
++                                     0x00, 0x00, 0x00, 0x01};
+ 
+ enum DnsResolveStatus {
+   RESOLVE_STATUS_DNS_SUCCESS = 0,
diff --git a/www/chromium-uc/patches/core/inox-patchset/0015-disable-update-pings.patch b/www/chromium-uc/patches/core/inox-patchset/0015-disable-update-pings.patch
new file mode 100644
index 0000000..cc7f344
--- /dev/null
+++ b/www/chromium-uc/patches/core/inox-patchset/0015-disable-update-pings.patch
@@ -0,0 +1,11 @@
+--- chrome/updater/configurator.cc.orig
++++ chrome/updater/configurator.cc
+@@ -82,7 +82,7 @@ int Configurator::UpdateDelay() const {
+ }
+ 
+ std::vector<GURL> Configurator::UpdateUrl() const {
+-  return external_constants_->UpdateURL();
++  return std::vector<GURL>;
+ }
+ 
+ std::vector<GURL> Configurator::PingUrl() const {
diff --git a/www/chromium-uc/patches/core/inox-patchset/0017-disable-new-avatar-menu.patch b/www/chromium-uc/patches/core/inox-patchset/0017-disable-new-avatar-menu.patch
new file mode 100644
index 0000000..269fb0c
--- /dev/null
+++ b/www/chromium-uc/patches/core/inox-patchset/0017-disable-new-avatar-menu.patch
@@ -0,0 +1,11 @@
+--- components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc.orig
++++ components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc
+@@ -86,7 +86,7 @@ void PrimaryAccountPolicyManagerImpl::On
+ }
+ 
+ bool PrimaryAccountPolicyManagerImpl::IsSigninAllowed() const {
+-  return signin_allowed_.GetValue();
++  return false;
+ }
+ 
+ void PrimaryAccountPolicyManagerImpl::OnSigninAllowedPrefChanged(
diff --git a/www/chromium-uc/patches/core/inox-patchset/0021-disable-rlz.patch b/www/chromium-uc/patches/core/inox-patchset/0021-disable-rlz.patch
new file mode 100644
index 0000000..4b96b3e
--- /dev/null
+++ b/www/chromium-uc/patches/core/inox-patchset/0021-disable-rlz.patch
@@ -0,0 +1,29 @@
+# Disable rlz
+
+--- BUILD.gn.orig
++++ BUILD.gn
+@@ -485,14 +485,6 @@ group("gn_all") {
+     deps += [ "//chromeos:chromeos_unittests" ]
+   }
+ 
+-  if (is_chromeos_ash || is_mac || is_win) {
+-    deps += [
+-      "//rlz:rlz_id",
+-      "//rlz:rlz_lib",
+-      "//rlz:rlz_unittests",
+-    ]
+-  }
+-
+   if (is_linux || is_chromeos) {
+     # The following are definitely linux-only.
+     deps += [
+--- rlz/buildflags/buildflags.gni.orig
++++ rlz/buildflags/buildflags.gni
+@@ -7,6 +7,6 @@ import("//build/config/chromeos/ui_mode.
+ 
+ # Whether we are using the rlz library or not.  Platforms like Android send
+ # rlz codes for searches but do not use the library.
+-enable_rlz_support = is_win || is_apple || is_chromeos_ash
++enable_rlz_support = false
+ 
+ enable_rlz = is_chrome_branded && enable_rlz_support
diff --git a/www/chromium-uc/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch b/www/chromium-uc/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
new file mode 100644
index 0000000..198b00e
--- /dev/null
+++ b/www/chromium-uc/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
@@ -0,0 +1,858 @@
+From 06f6141610cb2aa562c94dbb9f1f4355e4b34c5d Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Mon, 30 Sep 2019 09:37:51 +0200
+Subject: [PATCH 75/76] all: add trk: prefixes to possibly evil connections
+
+Prefix URLs to Google services with trk: so that whenever something
+tries to load them, the developer will be informed via printf and
+dialog (extra info bar between URLbar and content window) about this.
+
+If you see such dialog, we know that (a) either the URL needs to be
+whitelisted, or (b) the feature that triggered it needs to be disabled
+by default.
+---
+ build/mac/tweak_info_plist.py                 |  2 +-
+ .../customization/customization_document.cc   |  2 +-
+ .../file_manager/private_api_drive.cc         |  2 +-
+ .../file_manager/private_api_misc.cc          |  2 +-
+ .../remote_commands/crd_host_delegate.cc      |  6 +++---
+ .../cryptotoken_private_api.cc                |  4 ++--
+ chrome/browser/extensions/install_signer.cc   |  2 +-
+ .../media/webrtc/webrtc_event_log_uploader.cc |  2 +-
+ .../media/webrtc/webrtc_log_uploader.cc       |  2 +-
+ .../nacl_host/nacl_infobar_delegate.cc        |  2 +-
+ .../profiles/profile_avatar_downloader.cc     |  2 +-
+ .../default_apps/external_extensions.json     |  6 +++---
+ .../client_side_detection_service.cc          |  2 +-
+ .../download_protection/download_feedback.cc  |  2 +-
+ .../spellcheck_hunspell_dictionary.cc         |  2 +-
+ .../supervised_user_service.cc                |  2 +-
+ .../browser/tracing/crash_service_uploader.cc |  2 +-
+ .../ui/views/outdated_upgrade_bubble_view.cc  |  2 +-
+ .../ui/webui/ntp/ntp_resource_cache.cc        |  8 ++++----
+ .../components/recovery_component.cc          |  2 +-
+ .../crash/crashpad_crash_reporter.cc          |  2 +-
+ .../extensions/chrome_extensions_client.cc    |  4 ++--
+ .../setup/google_chrome_behaviors.cc          |  2 +-
+ .../browser/service/cast_service_simple.cc    |  2 +-
+ chromecast/crash/linux/minidump_uploader.cc   |  2 +-
+ .../simple_geolocation_provider.cc            |  2 +-
+ .../common/cloud_devices_urls.cc              |  8 ++++----
+ components/drive/service/drive_api_service.cc |  4 ++--
+ components/feedback/feedback_uploader.cc      |  2 +-
+ components/gcm_driver/gcm_account_tracker.cc  |  4 ++--
+ components/google/core/common/google_util.cc  |  2 +-
+ .../core/browser/web_history_service.cc       |  6 +++---
+ components/metrics/url_constants.cc           |  2 +-
+ .../core/browser/password_store.cc            |  8 ++++----
+ .../safe_search_url_checker_client.cc         |  2 +-
+ .../safe_search_api/stub_url_checker.cc       |  2 +-
+ .../core/browser/translate_url_fetcher.cc     |  1 +
+ .../translate/core/common/translate_util.cc   |  2 +-
+ .../variations/variations_url_constants.cc    |  2 +-
+ .../speech/speech_recognition_engine.cc       |  2 +-
+ .../browser/webauth/authenticator_common.cc   |  4 ++--
+ .../shell/browser/shell_browser_main_parts.cc |  2 +-
+ google_apis/gaia/gaia_constants.cc            | 20 +++++++++----------
+ google_apis/gaia/gaia_urls.cc                 |  1 +
+ google_apis/gcm/engine/gservices_settings.cc  |  6 +++---
+ .../notifier/base/gaia_token_pre_xmpp_auth.cc |  2 +-
+ remoting/base/breakpad_mac.mm                 |  2 +-
+ remoting/protocol/jingle_messages.cc          |  2 +-
+ rlz/lib/lib_values.cc                         |  2 +-
+ third_party/libjingle_xmpp/xmpp/constants.cc  |  6 +++---
+ .../chromevox/background/prefs.js             |  4 ++--
+ .../chromevoxclassic/host/chrome/host.js      |  4 ++--
+ ui/views/examples/webview_example.cc          |  2 +-
+ 54 files changed, 89 insertions(+), 87 deletions(-)
+
+--- build/apple/tweak_info_plist.py.orig
++++ build/apple/tweak_info_plist.py
+@@ -195,7 +195,7 @@ def _AddKeystoneKeys(plist, bundle_ident
+   also requires the |bundle_identifier| argument (com.example.product)."""
+   plist['KSVersion'] = plist['CFBundleShortVersionString']
+   plist['KSProductID'] = bundle_identifier
+-  plist['KSUpdateURL'] = 'https://tools.google.com/service/update2'
++  plist['KSUpdateURL'] = 'trk:132:https://tools.google.com/service/update2'
+ 
+   _RemoveKeys(plist, 'KSChannelID')
+   if base_tag != '':
+--- chrome/browser/ash/customization/customization_document.cc.orig
++++ chrome/browser/ash/customization/customization_document.cc
+@@ -175,7 +175,7 @@ std::string ReadFileInBackground(const b
+ 
+ // Template URL where to fetch OEM services customization manifest from.
+ const char ServicesCustomizationDocument::kManifestUrl[] =
+-    "https://ssl.gstatic.com/chrome/chromeos-customization/%s.json";
++    "trk:151:https://ssl.gstatic.com/chrome/chromeos-customization/%s.json";
+ 
+ // A custom extensions::ExternalLoader that the ServicesCustomizationDocument
+ // creates and uses to publish OEM default apps to the extensions system.
+--- chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc.orig
++++ chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+@@ -87,7 +87,7 @@ namespace {
+ 
+ using api::file_manager_private::ProfileInfo;
+ 
+-const char kCWSScope[] = "https://www.googleapis.com/auth/chromewebstore";
++const char kCWSScope[] = "trk:209:https://www.googleapis.com/auth/chromewebstore";
+ 
+ // Thresholds for mountCrostini() API.
+ constexpr base::TimeDelta kMountCrostiniSlowOperationThreshold =
+--- chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc.orig
++++ chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
+@@ -52,8 +52,8 @@ namespace {
+ 
+ const char kGoogleDotCom[] = "google.com";
+ constexpr const char* kGoogleGstaticAppIds[] = {
+-    "https://www.gstatic.com/securitykey/origins.json",
+-    "https://www.gstatic.com/securitykey/a/google.com/origins.json"};
++    "trk:273:https://www.gstatic.com/securitykey/origins.json",
++    "trk:274:https://www.gstatic.com/securitykey/a/google.com/origins.json"};
+ 
+ // ContainsAppIdByHash returns true iff the SHA-256 hash of one of the
+ // elements of |list| equals |hash|.
+--- chrome/browser/extensions/install_signer.cc.orig
++++ chrome/browser/extensions/install_signer.cc
+@@ -67,7 +67,7 @@ const int kSignatureFormatVersion = 2;
+ const size_t kSaltBytes = 32;
+ 
+ const char kBackendUrl[] =
+-    "https://www.googleapis.com/chromewebstore/v1.1/items/verify";
++    "trk:222:https://www.googleapis.com/chromewebstore/v1.1/items/verify";
+ 
+ const char kPublicKeyPEM[] =                                            \
+     "-----BEGIN PUBLIC KEY-----"                                        \
+--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig
++++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
+@@ -125,7 +125,7 @@ void OnURLLoadUploadProgress(uint64_t cu
+ }  // namespace
+ 
+ const char WebRtcEventLogUploaderImpl::kUploadURL[] =
+-    "https://clients2.google.com/cr/report";
++    "trk:300:https://clients2.google.com/cr/report";
+ 
+ WebRtcEventLogUploaderImpl::Factory::Factory(
+     scoped_refptr<base::SequencedTaskRunner> task_runner)
+--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig
++++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
+@@ -485,7 +485,7 @@ void WebRtcLogUploader::UploadCompressed
+             "Not implemented, it would be good to do so."
+         })");
+ 
+-  constexpr char kUploadURL[] = "https://clients2.google.com/cr/report";
++  constexpr char kUploadURL[] = "trk:301:https://clients2.google.com/cr/report";
+   auto resource_request = std::make_unique<network::ResourceRequest>();
+   resource_request->url = !upload_url_for_testing_.is_empty()
+                               ? upload_url_for_testing_
+--- chrome/browser/nacl_host/nacl_infobar_delegate.cc.orig
++++ chrome/browser/nacl_host/nacl_infobar_delegate.cc
+@@ -33,7 +33,7 @@ std::u16string NaClInfoBarDelegate::GetL
+ }
+ 
+ GURL NaClInfoBarDelegate::GetLinkURL() const {
+-  return GURL("https://support.google.com/chrome/?p=ib_nacl");
++  return GURL("trk:143:https://support.google.com/chrome/?p=ib_nacl");
+ }
+ 
+ std::u16string NaClInfoBarDelegate::GetMessageText() const {
+--- chrome/browser/profiles/profile_avatar_downloader.cc.orig
++++ chrome/browser/profiles/profile_avatar_downloader.cc
+@@ -20,7 +20,7 @@
+ 
+ namespace {
+ const char kHighResAvatarDownloadUrlPrefix[] =
+-    "https://www.gstatic.com/chrome/profile_avatars/";
++    "trk:271:https://www.gstatic.com/chrome/profile_avatars/";
+ }
+ 
+ ProfileAvatarDownloader::ProfileAvatarDownloader(size_t icon_index,
+--- chrome/browser/resources/default_apps/external_extensions.json.orig
++++ chrome/browser/resources/default_apps/external_extensions.json
+@@ -23,17 +23,17 @@
+   },
+   // Google Sheets
+   "aapocclcgogkmnckokdopfmhonfmgoek" : {
+-    "external_update_url": "https://clients2.google.com/service/update2/crx",
++    "external_update_url": "trk:03:https://clients2.google.com/service/update2/crx",
+     "web_app_migration_flag": "MigrateDefaultChromeAppToWebAppsGSuite"
+   },
+   // Google Slides
+   "felcaaldnbdncclmgdcncolpebgiejap" : {
+-    "external_update_url": "https://clients2.google.com/service/update2/crx",
++    "external_update_url": "trk:04:https://clients2.google.com/service/update2/crx",
+     "web_app_migration_flag": "MigrateDefaultChromeAppToWebAppsGSuite"
+   },
+   // Drive extension
+   "ghbmnnjooekpmoecnnnilnnbdlolhkhi" : {
+-    "external_update_url": "https://clients2.google.com/service/update2/crx"
++    "external_update_url": "trk:04:https://clients2.google.com/service/update2/crx"
+   }
+ }
+ 
+--- chrome/browser/safe_browsing/download_protection/download_feedback.cc.orig
++++ chrome/browser/safe_browsing/download_protection/download_feedback.cc
+@@ -202,7 +202,7 @@ const int64_t DownloadFeedback::kMaxUplo
+ 
+ // static
+ const char DownloadFeedback::kSbFeedbackURL[] =
+-    "https://safebrowsing.google.com/safebrowsing/uploads/chrome";
++    "trk:164:https://safebrowsing.google.com/safebrowsing/uploads/chrome";
+ 
+ // static
+ DownloadFeedbackFactory* DownloadFeedback::factory_ = nullptr;
+--- chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc.orig
++++ chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+@@ -279,7 +279,7 @@ GURL SpellcheckHunspellDictionary::GetDi
+   DCHECK(!bdict_file.empty());
+ 
+   static const char kDownloadServerUrl[] =
+-      "https://redirector.gvt1.com/edgedl/chrome/dict/";
++      "trk:173:https://redirector.gvt1.com/edgedl/chrome/dict/";
+ 
+   return GURL(std::string(kDownloadServerUrl) +
+               base::ToLowerASCII(bdict_file));
+--- chrome/browser/supervised_user/supervised_user_service.cc.orig
++++ chrome/browser/supervised_user/supervised_user_service.cc
+@@ -87,7 +87,7 @@ namespace {
+ 
+ // The URL from which to download a host denylist if no local one exists yet.
+ const char kDenylistURL[] =
+-    "https://www.gstatic.com/chrome/supervised_user/denylist-20141001-1k.bin";
++    "trk:272:https://www.gstatic.com/chrome/supervised_user/denylist-20141001-1k.bin";
+ // The filename under which we'll store the denylist (in the user data dir). The
+ // old file will be used as a backup in case the new file has not been loaded
+ // yet.
+--- chrome/browser/ui/views/outdated_upgrade_bubble_view.cc.orig
++++ chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
+@@ -54,7 +54,7 @@ const char* kUpdateBrowserRedirectUrl =
+ #else
+     // The URL to be used to re-install Chrome when auto-update failed for
+     // too long.
+-    "https://www.google.com/chrome";
++    "trk:242:https://www.google.com/chrome";
+ #endif
+ 
+ bool g_upgrade_bubble_is_showing = false;
+--- chrome/browser/ui/webui/ntp/ntp_resource_cache.cc.orig
++++ chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+@@ -67,17 +67,17 @@ namespace {
+ // The URL for the the Learn More page shown on incognito new tab.
+ const char kLearnMoreIncognitoUrl[] =
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+-    "https://support.google.com/chromebook/?p=incognito";
++    "trk:246:https://support.google.com/chromebook/?p=incognito";
+ #else
+-    "https://support.google.com/chrome/?p=incognito";
++    "trk:247:https://support.google.com/chrome/?p=incognito";
+ #endif
+ 
+ // The URL for the Learn More page shown on guest session new tab.
+ const char kLearnMoreGuestSessionUrl[] =
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+-    "https://support.google.com/chromebook/?p=chromebook_guest";
++    "trk:248:https://support.google.com/chromebook/?p=chromebook_guest";
+ #else
+-    "https://support.google.com/chrome/?p=ui_guest";
++    "trk:261:https://support.google.com/chrome/?p=ui_guest";
+ #endif
+ 
+ std::string ReplaceTemplateExpressions(
+--- chrome/chrome_cleaner/components/recovery_component.cc.orig
++++ chrome/chrome_cleaner/components/recovery_component.cc
+@@ -37,7 +37,7 @@ namespace chrome_cleaner {
+ namespace {
+ 
+ const char kComponentDownloadUrl[] =
+-    "https://clients2.google.com/service/update2/crx?response=redirect&os=win"
++    "trk:108:https://clients2.google.com/service/update2/crx?response=redirect&os=win"
+     "&installsource=swreporter&x=id%3Dnpdjjkjlcidkjlamlmmdelcjbcpdjocm"
+     "%26v%3D0.0.0.0%26uc&acceptformat=crx3";
+ 
+--- chrome/chrome_cleaner/crash/crashpad_crash_reporter.cc.orig
++++ chrome/chrome_cleaner/crash/crashpad_crash_reporter.cc
+@@ -28,7 +28,7 @@
+ namespace {
+ 
+ // The URL where crash reports are uploaded.
+-const char kReportUploadURL[] = "https://clients2.google.com/cr/report";
++const char kReportUploadURL[] = "trk:302:https://clients2.google.com/cr/report";
+ 
+ // Whether the current process is connected to a crash handler process.
+ bool g_is_connected_to_crash_handler = false;
+--- chrome/common/extensions/chrome_extensions_client.cc.orig
++++ chrome/common/extensions/chrome_extensions_client.cc
+@@ -45,9 +45,9 @@ namespace {
+ 
+ // TODO(battre): Delete the HTTP URL once the blocklist is downloaded via HTTPS.
+ const char kExtensionBlocklistUrlPrefix[] =
+-    "http://www.gstatic.com/chrome/extensions/blocklist";
++    "trk:269:http://www.gstatic.com/chrome/extensions/blocklist";
+ const char kExtensionBlocklistHttpsUrlPrefix[] =
+-    "https://www.gstatic.com/chrome/extensions/blocklist";
++    "trk:270:https://www.gstatic.com/chrome/extensions/blocklist";
+ 
+ const char kThumbsWhiteListedExtension[] = "khopmbdjffemhegeeobelklnbglcdgfh";
+ 
+--- chrome/installer/setup/google_chrome_behaviors.cc.orig
++++ chrome/installer/setup/google_chrome_behaviors.cc
+@@ -37,7 +37,7 @@ namespace installer {
+ namespace {
+ 
+ constexpr base::WStringPiece kUninstallSurveyUrl(
+-    L"https://support.google.com/chrome?p=chrome_uninstall_survey");
++    L"trk:253:https://support.google.com/chrome?p=chrome_uninstall_survey");
+ 
+ bool NavigateToUrlWithEdge(const std::wstring& url) {
+   std::wstring protocol_url = L"microsoft-edge:" + url;
+--- chromecast/browser/service/cast_service_simple.cc.orig
++++ chromecast/browser/service/cast_service_simple.cc
+@@ -27,7 +27,7 @@ GURL GetStartupURL() {
+   const base::CommandLine::StringVector& args = command_line->GetArgs();
+ 
+   if (args.empty())
+-    return GURL("http://www.google.com/");
++    return GURL("trk:255:http://www.google.com/");
+ 
+   GURL url(args[0]);
+   if (url.is_valid() && url.has_scheme())
+--- chromecast/crash/linux/minidump_uploader.cc.orig
++++ chromecast/crash/linux/minidump_uploader.cc
+@@ -41,7 +41,7 @@ namespace {
+ 
+ const char kProductName[] = "Eureka";
+ 
+-const char kCrashServerProduction[] = "https://clients2.google.com/cr/report";
++const char kCrashServerProduction[] = "trk:305:https://clients2.google.com/cr/report";
+ 
+ const char kVirtualChannel[] = "virtual-channel";
+ 
+--- chromeos/geolocation/simple_geolocation_provider.cc.orig
++++ chromeos/geolocation/simple_geolocation_provider.cc
+@@ -20,7 +20,7 @@ namespace chromeos {
+ namespace {
+ 
+ const char kDefaultGeolocationProviderUrl[] =
+-    "https://www.googleapis.com/geolocation/v1/geolocate?";
++    "trk:215:https://www.googleapis.com/geolocation/v1/geolocate?";
+ 
+ }  // namespace
+ 
+--- components/cloud_devices/common/cloud_devices_urls.cc.orig
++++ components/cloud_devices/common/cloud_devices_urls.cc
+@@ -13,14 +13,14 @@
+ namespace cloud_devices {
+ 
+ const char kCloudPrintAuthScope[] =
+-    "https://www.googleapis.com/auth/cloudprint";
++    "trk:197:https://www.googleapis.com/auth/cloudprint";
+ 
+ namespace {
+ 
+ // Url must not be matched by "urls" section of
+ // cloud_print_app/manifest.json. If it's matched, print driver dialog will
+ // open sign-in page in separate window.
+-const char kCloudPrintURL[] = "https://www.google.com/cloudprint";
++const char kCloudPrintURL[] = "trk:201:https://www.google.com/cloudprint";
+ 
+ }
+ 
+--- components/drive/service/drive_api_service.cc.orig
++++ components/drive/service/drive_api_service.cc
+@@ -75,9 +75,9 @@ namespace drive {
+ namespace {
+ 
+ // OAuth2 scopes for Drive API.
+-const char kDriveScope[] = "https://www.googleapis.com/auth/drive";
++const char kDriveScope[] = "trk:217:https://www.googleapis.com/auth/drive";
+ const char kDriveAppsReadonlyScope[] =
+-    "https://www.googleapis.com/auth/drive.apps.readonly";
++    "trk:218:https://www.googleapis.com/auth/drive.apps.readonly";
+ const char kDriveAppsScope[] = "https://www.googleapis.com/auth/drive.apps";
+ 
+ // Mime type to create a directory.
+--- components/feedback/feedback_uploader.cc.orig
++++ components/feedback/feedback_uploader.cc
+@@ -27,7 +27,7 @@ constexpr base::FilePath::CharType kFeed
+     FILE_PATH_LITERAL("Feedback Reports");
+ 
+ constexpr char kFeedbackPostUrl[] =
+-    "https://www.google.com/tools/feedback/chrome/__submit";
++    "trk:232:https://www.google.com/tools/feedback/chrome/__submit";
+ 
+ constexpr char kProtoBufMimeType[] = "application/x-protobuf";
+ 
+--- components/google/core/common/google_util.cc.orig
++++ components/google/core/common/google_util.cc
+@@ -143,7 +143,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
+ 
+ // Global functions -----------------------------------------------------------
+ 
+-const char kGoogleHomepageURL[] = "https://www.google.com/";
++const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/";
+ 
+ bool HasGoogleSearchQueryParam(base::StringPiece str) {
+   url::Component query(0, static_cast<int>(str.length())), key, value;
+--- components/history/core/browser/web_history_service.cc.orig
++++ components/history/core/browser/web_history_service.cc
+@@ -42,13 +42,13 @@ namespace history {
+ namespace {
+ 
+ const char kHistoryOAuthScope[] =
+-    "https://www.googleapis.com/auth/chromesync";
++    "trk:138:https://www.googleapis.com/auth/chromesync";
+ 
+ const char kHistoryQueryHistoryUrl[] =
+-    "https://history.google.com/history/api/lookup?client=chrome";
++    "trk:139:https://history.google.com/history/api/lookup?client=chrome";
+ 
+ const char kHistoryDeleteHistoryUrl[] =
+-    "https://history.google.com/history/api/delete?client=chrome";
++    "trk:140:https://history.google.com/history/api/delete?client=chrome";
+ 
+ const char kHistoryAudioHistoryUrl[] =
+     "https://history.google.com/history/api/lookup?client=audio";
+--- components/metrics/url_constants.cc.orig
++++ components/metrics/url_constants.cc
+@@ -7,7 +7,7 @@
+ namespace metrics {
+ 
+ const char kNewMetricsServerUrl[] =
+-    "https://clientservices.googleapis.com/uma/v2";
++    "trk:265:https://clientservices.googleapis.com/uma/v2";
+ 
+ const char kNewMetricsServerUrlInsecure[] =
+     "http://clientservices.googleapis.com/uma/v2";
+--- components/safe_browsing/content/browser/client_side_detection_service.cc.orig
++++ components/safe_browsing/content/browser/client_side_detection_service.cc
+@@ -62,7 +62,7 @@ const int ClientSideDetectionService::kN
+ const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30;
+ 
+ const char ClientSideDetectionService::kClientReportPhishingUrl[] =
+-    "https://sb-ssl.google.com/safebrowsing/clientreport/phishing";
++    "trk:148:https://sb-ssl.google.com/safebrowsing/clientreport/phishing";
+ 
+ struct ClientSideDetectionService::ClientPhishingReportInfo {
+   std::unique_ptr<network::SimpleURLLoader> loader;
+--- components/safe_search_api/safe_search/safe_search_url_checker_client.cc.orig
++++ components/safe_search_api/safe_search/safe_search_url_checker_client.cc
+@@ -28,7 +28,7 @@ namespace safe_search_api {
+ namespace {
+ 
+ const char kSafeSearchApiUrl[] =
+-    "https://safesearch.googleapis.com/v1:classify";
++    "trk:238:https://safesearch.googleapis.com/v1:classify";
+ const char kDataContentType[] = "application/x-www-form-urlencoded";
+ const char kDataFormat[] = "key=%s&urls=%s";
+ 
+--- components/safe_search_api/stub_url_checker.cc.orig
++++ components/safe_search_api/stub_url_checker.cc
+@@ -21,7 +21,7 @@ namespace safe_search_api {
+ namespace {
+ 
+ constexpr char kSafeSearchApiUrl[] =
+-    "https://safesearch.googleapis.com/v1:classify";
++    "trk:238:https://safesearch.googleapis.com/v1:classify";
+ 
+ std::string BuildResponse(bool is_porn) {
+   base::DictionaryValue dict;
+--- components/translate/core/browser/translate_url_fetcher.cc.orig
++++ components/translate/core/browser/translate_url_fetcher.cc
+@@ -99,6 +99,7 @@ bool TranslateURLFetcher::Request(const
+   if (!extra_request_header_.empty())
+     resource_request->headers.AddHeaderFromString(extra_request_header_);
+ 
++  fprintf(stderr, "translator: fetching something from %s\n", url_.spec().c_str());
+   simple_loader_ =
+       variations::CreateSimpleURLLoaderWithVariationsHeaderUnknownSignedIn(
+           std::move(resource_request),
+--- components/translate/core/common/translate_util.cc.orig
++++ components/translate/core/common/translate_util.cc
+@@ -20,7 +20,7 @@ const char kDetectLanguageInSubFrames[]
+ 
+ }  // namespace
+ 
+-const char kSecurityOrigin[] = "https://translate.googleapis.com/";
++const char kSecurityOrigin[] = "trk:220:https://translate.googleapis.com/";
+ 
+ const base::Feature kTranslateSubFrames{"TranslateSubFrames",
+                                         base::FEATURE_DISABLED_BY_DEFAULT};
+--- components/variations/variations_url_constants.cc.orig
++++ components/variations/variations_url_constants.cc
+@@ -8,7 +8,7 @@ namespace variations {
+ 
+ // Default server of Variations seed info.
+ const char kDefaultServerUrl[] =
+-    "https://clientservices.googleapis.com/chrome-variations/seed";
++    "trk:142:https://clientservices.googleapis.com/chrome-variations/seed";
+ 
+ const char kDefaultInsecureServerUrl[] =
+     "http://clientservices.googleapis.com/chrome-variations/seed";
+--- content/browser/speech/speech_recognition_engine.cc.orig
++++ content/browser/speech/speech_recognition_engine.cc
+@@ -33,7 +33,7 @@ namespace content {
+ namespace {
+ 
+ const char kWebServiceBaseUrl[] =
+-    "https://www.google.com/speech-api/full-duplex/v1";
++    "trk:184:https://www.google.com/speech-api/full-duplex/v1";
+ const char kDownstreamUrl[] = "/down?";
+ const char kUpstreamUrl[] = "/up?";
+ 
+--- content/browser/webauth/authenticator_common.cc.orig
++++ content/browser/webauth/authenticator_common.cc
+@@ -88,9 +88,9 @@ enum class RequestExtension {
+ namespace {
+ 
+ constexpr char kGstaticAppId[] =
+-    "https://www.gstatic.com/securitykey/origins.json";
++    "trk:276:https://www.gstatic.com/securitykey/origins.json";
+ constexpr char kGstaticCorpAppId[] =
+-    "https://www.gstatic.com/securitykey/a/google.com/origins.json";
++    "trk:277:https://www.gstatic.com/securitykey/a/google.com/origins.json";
+ 
+ WebAuthenticationDelegate* GetWebAuthenticationDelegate() {
+   return GetContentClient()->browser()->GetWebAuthenticationDelegate();
+--- content/shell/browser/shell_browser_main_parts.cc.orig
++++ content/shell/browser/shell_browser_main_parts.cc
+@@ -96,7 +96,7 @@ GURL GetStartupURL() {
+ #else
+   const base::CommandLine::StringVector& args = command_line->GetArgs();
+   if (args.empty())
+-    return GURL("https://www.google.com/");
++    return GURL("trk:183:https://www.google.com/");
+ 
+ #if defined(OS_WIN)
+   GURL url(base::WideToUTF16(args[0]));
+--- extensions/common/extension_urls.cc.orig
++++ extensions/common/extension_urls.cc
+@@ -26,9 +26,9 @@ bool IsSourceFromAnExtension(const std::
+ 
+ namespace extension_urls {
+ 
+-const char kChromeWebstoreBaseURL[] = "https://chrome.google.com/webstore";
++const char kChromeWebstoreBaseURL[] = "trk:09:https://chrome.google.com/webstore";
+ const char kChromeWebstoreUpdateURL[] =
+-    "https://clients2.google.com/service/update2/crx";
++    "trk:05:https://clients2.google.com/service/update2/crx";
+ 
+ GURL GetWebstoreLaunchURL() {
+   extensions::ExtensionsClient* client = extensions::ExtensionsClient::Get();
+--- google_apis/gaia/gaia_constants.cc.orig
++++ google_apis/gaia/gaia_constants.cc
+@@ -25,133 +25,133 @@ const char kSyncService[] = "chromiumsyn
+ const char kRemotingService[] = "chromoting";
+ 
+ // OAuth scopes.
+-const char kOAuth1LoginScope[] = "https://www.google.com/accounts/OAuthLogin";
++const char kOAuth1LoginScope[] = "trk:069:https://www.google.com/accounts/OAuthLogin";
+ 
+ // Service/scope names for device management (cloud-based policy) server.
+ const char kDeviceManagementServiceOAuth[] =
+-    "https://www.googleapis.com/auth/chromeosdevicemanagement";
++    "trk:070:https://www.googleapis.com/auth/chromeosdevicemanagement";
+ 
+ // OAuth2 scope for access to all Google APIs.
+-const char kAnyApiOAuth2Scope[] = "https://www.googleapis.com/auth/any-api";
++const char kAnyApiOAuth2Scope[] = "trk:071:https://www.googleapis.com/auth/any-api";
+ 
+ // OAuth2 scope for access to Chrome sync APIs
+ const char kChromeSyncOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/chromesync";
++    "trk:072:https://www.googleapis.com/auth/chromesync";
+ // OAuth2 scope for access to the Chrome Sync APIs for managed profiles.
+ const char kChromeSyncSupervisedOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/chromesync_playpen";
++    "trk:073:https://www.googleapis.com/auth/chromesync_playpen";
+ 
+ // OAuth2 scope for access to Kid Management API.
+ const char kKidManagementOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/kid.management";
++    "trk:074:https://www.googleapis.com/auth/kid.management";
+ 
+ // OAuth2 scope for parental consent logging for secondary account addition.
+ const char kKidManagementPrivilegedOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/kid.management.privileged";
++    "trk:075:https://www.googleapis.com/auth/kid.management.privileged";
+ 
+ // OAuth2 scope for access to Google Family Link Supervision Setup.
+ const char kKidsSupervisionSetupChildOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/kids.supervision.setup.child";
++    "trk:076:https://www.googleapis.com/auth/kids.supervision.setup.child";
+ 
+ // OAuth2 scope for access to Google Talk APIs (XMPP).
+ const char kGoogleTalkOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/googletalk";
++    "trk:077:https://www.googleapis.com/auth/googletalk";
+ 
+ // OAuth2 scope for access to Google account information.
+ const char kGoogleUserInfoEmail[] =
+-    "https://www.googleapis.com/auth/userinfo.email";
++    "trk:078:https://www.googleapis.com/auth/userinfo.email";
+ const char kGoogleUserInfoProfile[] =
+-    "https://www.googleapis.com/auth/userinfo.profile";
++    "trk:079:https://www.googleapis.com/auth/userinfo.profile";
+ 
+ // OAuth2 scope for access to the people API (read-only).
+ const char kPeopleApiReadOnlyOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/peopleapi.readonly";
++    "trk:080:https://www.googleapis.com/auth/peopleapi.readonly";
+ 
+ // OAuth2 scope for access to the Reauth flow.
+ const char kAccountsReauthOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/accounts.reauth";
++    "trk:081:https://www.googleapis.com/auth/accounts.reauth";
+ 
+ // OAuth2 scope for access to audit recording (ARI).
+ const char kAuditRecordingOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/auditrecording-pa";
++    "trk:082:https://www.googleapis.com/auth/auditrecording-pa";
+ 
+ // OAuth2 scope for access to clear cut logs.
+-const char kClearCutOAuth2Scope[] = "https://www.googleapis.com/auth/cclog";
++const char kClearCutOAuth2Scope[] = "trk:083:https://www.googleapis.com/auth/cclog";
+ 
+ // OAuth2 scope for FCM, the Firebase Cloud Messaging service.
+ const char kFCMOAuthScope[] =
+-    "https://www.googleapis.com/auth/firebase.messaging";
++    "trk:084:https://www.googleapis.com/auth/firebase.messaging";
+ 
+ // OAuth2 scope for access to Tachyon api.
+-const char kTachyonOAuthScope[] = "https://www.googleapis.com/auth/tachyon";
++const char kTachyonOAuthScope[] = "trk:085:https://www.googleapis.com/auth/tachyon";
+ 
+ // OAuth2 scope for access to the Photos API.
+-const char kPhotosOAuth2Scope[] = "https://www.googleapis.com/auth/photos";
++const char kPhotosOAuth2Scope[] = "trk:086:https://www.googleapis.com/auth/photos";
+ 
+ // OAuth2 scope for access to Cast backdrop API.
+ const char kCastBackdropOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/cast.backdrop";
++    "trk:087:https://www.googleapis.com/auth/cast.backdrop";
+ 
+ // OAuth scope for access to Cloud Translation API.
+ const char kCloudTranslationOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/cloud-translation";
++    "trk:088:https://www.googleapis.com/auth/cloud-translation";
+ 
+ // OAuth2 scope for access to passwords leak checking API.
+ const char kPasswordsLeakCheckOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/identity.passwords.leak.check";
++    "trk:089:https://www.googleapis.com/auth/identity.passwords.leak.check";
+ 
+ // OAuth2 scope for access to Chrome safe browsing API.
+ const char kChromeSafeBrowsingOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/chrome-safe-browsing";
++    "trk:090:https://www.googleapis.com/auth/chrome-safe-browsing";
+ 
+ // OAuth2 scope for access to kid permissions by URL.
+ const char kClassifyUrlKidPermissionOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/kid.permission";
++    "trk:091:https://www.googleapis.com/auth/kid.permission";
+ const char kKidFamilyReadonlyOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/kid.family.readonly";
++    "trk:092:https://www.googleapis.com/auth/kid.family.readonly";
+ 
+ // OAuth2 scope for access to payments.
+ const char kPaymentsOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/wallet.chrome";
++    "trk:093:https://www.googleapis.com/auth/wallet.chrome";
+ 
+ const char kCryptAuthOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/cryptauth";
++    "trk:094:https://www.googleapis.com/auth/cryptauth";
+ 
+ // OAuth2 scope for access to Drive.
+-const char kDriveOAuth2Scope[] = "https://www.googleapis.com/auth/drive";
++const char kDriveOAuth2Scope[] = "trk:095:https://www.googleapis.com/auth/drive";
+ 
+ // The scope required for an access token in order to query ItemSuggest.
+ const char kDriveReadOnlyOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/drive.readonly";
++    "trk:096:https://www.googleapis.com/auth/drive.readonly";
+ 
+ // OAuth2 scope for access to Assistant SDK.
+ const char kAssistantOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/assistant-sdk-prototype";
++    "trk:097:https://www.googleapis.com/auth/assistant-sdk-prototype";
+ 
+ // OAuth2 scope for access to nearby devices (fast pair) APIs.
+ const char kCloudPlatformProjectsOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/cloudplatformprojects";
++    "trk:098:https://www.googleapis.com/auth/cloudplatformprojects";
+ 
+ // OAuth2 scope for access to nearby sharing.
+ const char kNearbyShareOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/nearbysharing-pa";
++    "trk:099:https://www.googleapis.com/auth/nearbysharing-pa";
+ 
+ // OAuth2 scopes for access to GCM account tracker.
+-const char kGCMGroupServerOAuth2Scope[] = "https://www.googleapis.com/auth/gcm";
++const char kGCMGroupServerOAuth2Scope[] = "trk:100:https://www.googleapis.com/auth/gcm";
+ const char kGCMCheckinServerOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/android_checkin";
++    "trk:101:https://www.googleapis.com/auth/android_checkin";
+ 
+ // OAuth2 scope for access to readonly Chrome web store.
+ const char kChromeWebstoreOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/chromewebstore.readonly";
++    "trk:102:https://www.googleapis.com/auth/chromewebstore.readonly";
+ 
+ // OAuth2 scope for access to Account Capabilities API.
+ const char kAccountCapabilitiesOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/account.capabilities";
++    "trk:103:https://www.googleapis.com/auth/account.capabilities";
+ 
+ // OAuth2 scope for support content API.
+ const char kSupportContentOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/supportcontent";
++    "trk:104:https://www.googleapis.com/auth/supportcontent";
+ 
+ // OAuth 2 scope for NTP Photos module API.
+ const char kPhotosModuleOAuth2Scope[] =
+--- google_apis/gaia/gaia_urls.cc.orig
++++ google_apis/gaia/gaia_urls.cc
+@@ -24,6 +24,7 @@
+ namespace {
+ 
+ // Gaia service constants
++//adding trk: here currently crashes the program
+ const char kDefaultGoogleUrl[] = "http://google.com";
+ const char kDefaultGaiaUrl[] = "https://accounts.google.com";
+ const char kDefaultGoogleApisBaseUrl[] = "https://www.googleapis.com";
+--- google_apis/gcm/engine/gservices_settings.cc.orig
++++ google_apis/gcm/engine/gservices_settings.cc
+@@ -30,18 +30,18 @@ const char kRegistrationURLKey[] = "gcm_
+ 
+ const int64_t kDefaultCheckinInterval = 2 * 24 * 60 * 60;  // seconds = 2 days.
+ const int64_t kMinimumCheckinInterval = 12 * 60 * 60;  // seconds = 12 hours.
+-const char kDefaultCheckinURL[] = "https://android.clients.google.com/checkin";
++const char kDefaultCheckinURL[] = "trk:110:https://android.clients.google.com/checkin";
+ const char kDefaultMCSHostname[] = "mtalk.google.com";
+ const int kDefaultMCSMainSecurePort = 5228;
+ const int kDefaultMCSFallbackSecurePort = 443;
+ const char kDefaultRegistrationURL[] =
+-    "https://android.clients.google.com/c2dm/register3";
++    "trk:111:https://android.clients.google.com/c2dm/register3";
+ // Settings that are to be deleted are marked with this prefix in checkin
+ // response.
+ const char kDeleteSettingPrefix[] = "delete_";
+ // Settings digest starts with verison number followed by '-'.
+ const char kDigestVersionPrefix[] = "1-";
+-const char kMCSEnpointTemplate[] = "https://%s:%d";
++const char kMCSEnpointTemplate[] = "trk:112:https://%s:%d";
+ const int kMaxSecurePort = 65535;
+ 
+ std::string MakeMCSEndpoint(const std::string& mcs_hostname, int port) {
+--- jingle/notifier/base/gaia_token_pre_xmpp_auth.cc.orig
++++ jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
+@@ -36,7 +36,7 @@ class GaiaCookieMechanism : public jingl
+     // These attributes are necessary for working with non-gmail gaia
+     // accounts.
+     const std::string NS_GOOGLE_AUTH_PROTOCOL(
+-        "http://www.google.com/talk/protocol/auth");
++        "trk:179:http://www.google.com/talk/protocol/auth");
+     const jingle_xmpp::QName QN_GOOGLE_ALLOW_GENERATED_JID_XMPP_LOGIN(
+         NS_GOOGLE_AUTH_PROTOCOL, "allow-generated-jid");
+     const jingle_xmpp::QName QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT(
+--- remoting/base/breakpad_mac.mm.orig
++++ remoting/base/breakpad_mac.mm
+@@ -50,7 +50,7 @@ void InitializeCrashReporting() {
+       breakpad_config[@BREAKPAD_REPORT_INTERVAL] = @"21600";
+     }
+     if (!breakpad_config[@BREAKPAD_URL]) {
+-      breakpad_config[@BREAKPAD_URL] = @"https://clients2.google.com/cr/report";
++      breakpad_config[@BREAKPAD_URL] = @"trk:310:https://clients2.google.com/cr/report";
+     }
+ 
+     if (!BreakpadCreate(breakpad_config)) {
+--- remoting/protocol/jingle_messages.cc.orig
++++ remoting/protocol/jingle_messages.cc
+@@ -27,7 +27,7 @@ const char kJabberNamespace[] = "jabber:
+ const char kJingleNamespace[] = "urn:xmpp:jingle:1";
+ 
+ // Namespace for transport messages when using standard ICE.
+-const char kIceTransportNamespace[] = "google:remoting:ice";
++const char kIceTransportNamespace[] = "trk:100:google:remoting:ice";
+ 
+ const char kWebrtcTransportNamespace[] = "google:remoting:webrtc";
+ 
+--- rlz/lib/lib_values.cc.orig
++++ rlz/lib/lib_values.cc
+@@ -40,7 +40,7 @@ const char kSetDccResponseVariable[] = "
+ //
+ 
+ const char kFinancialPingPath[] = "/tools/pso/ping";
+-const char kFinancialServer[]   = "clients1.google.com";
++const char kFinancialServer[]   = "trk:443:clients1.google.com"; /* not using URLRequest! catch with cache.ir */
+ const int kFinancialPort = 443;
+ 
+ // Ping times in 100-nanosecond intervals.
+--- third_party/libjingle_xmpp/xmpp/constants.cc.orig
++++ third_party/libjingle_xmpp/xmpp/constants.cc
+@@ -194,7 +194,7 @@ const StaticQName QN_SASL_TEMPORARY_AUTH
+ 
+ // These are non-standard.
+ const char NS_GOOGLE_AUTH_PROTOCOL[] =
+-    "http://www.google.com/talk/protocol/auth";
++    "trk:236:http://www.google.com/talk/protocol/auth";
+ const StaticQName QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT =
+     { NS_GOOGLE_AUTH_PROTOCOL, "client-uses-full-bind-result" };
+ const StaticQName QN_GOOGLE_ALLOW_NON_GOOGLE_ID_XMPP_LOGIN =
+@@ -338,7 +338,7 @@ const char STR_SHOW_DND[] = "dnd";
+ const char STR_SHOW_XA[] = "xa";
+ const char STR_SHOW_OFFLINE[] = "offline";
+ 
+-const char NS_GOOGLE_PSTN_CONFERENCE[] = "http://www.google.com/pstn-conference";
++const char NS_GOOGLE_PSTN_CONFERENCE[] = "trk:237:http://www.google.com/pstn-conference";
+ const StaticQName QN_GOOGLE_PSTN_CONFERENCE_STATUS = { NS_GOOGLE_PSTN_CONFERENCE, "status" };
+ const StaticQName QN_ATTR_STATUS = { STR_EMPTY, "status" };
+ 
+@@ -433,7 +433,7 @@ const StaticQName QN_MUC_ROLE = { NS_MUC
+ const char STR_AFFILIATION_NONE[] = "none";
+ const char STR_ROLE_PARTICIPANT[] = "participant";
+ 
+-const char NS_GOOGLE_SESSION[] = "http://www.google.com/session";
++const char NS_GOOGLE_SESSION[] = "trk:238:http://www.google.com/session";
+ const StaticQName QN_GOOGLE_CIRCLE_ID = { STR_EMPTY, "google-circle-id" };
+ const StaticQName QN_GOOGLE_USER_ID = { STR_EMPTY, "google-user-id" };
+ const StaticQName QN_GOOGLE_SESSION_BLOCKED = { NS_GOOGLE_SESSION, "blocked" };
+--- ui/accessibility/extensions/chromevoxclassic/chromevox/background/prefs.js.orig
++++ ui/accessibility/extensions/chromevoxclassic/chromevox/background/prefs.js
+@@ -72,9 +72,9 @@ cvox.ChromeVoxPrefs.DEFAULT_PREFS = {
+   'outputContextFirst': false,
+   'position': '{}',
+   'siteSpecificScriptBase':
+-      'https://ssl.gstatic.com/accessibility/javascript/ext/',
++      'trk:242:https://ssl.gstatic.com/accessibility/javascript/ext/',
+   'siteSpecificScriptLoader':
+-      'https://ssl.gstatic.com/accessibility/javascript/ext/loader.js',
++      'trk:243:https://ssl.gstatic.com/accessibility/javascript/ext/loader.js',
+   'sticky': false,
+   'typingEcho': 0,
+   'useIBeamCursor': cvox.ChromeVox.isMac,
+--- ui/accessibility/extensions/chromevoxclassic/host/chrome/host.js.orig
++++ ui/accessibility/extensions/chromevoxclassic/host/chrome/host.js
+@@ -96,9 +96,9 @@ cvox.ChromeHost.prototype.init = functio
+           (!cvox.ApiImplementation.siteSpecificScriptLoader ||
+            !cvox.ApiImplementation.siteSpecificScriptBase);
+       cvox.ApiImplementation.siteSpecificScriptLoader =
+-          'https://ssl.gstatic.com/accessibility/javascript/ext/loader.js';
++          'trk:244:https://ssl.gstatic.com/accessibility/javascript/ext/loader.js';
+       cvox.ApiImplementation.siteSpecificScriptBase =
+-          'https://ssl.gstatic.com/accessibility/javascript/ext/';
++          'trk:245:https://ssl.gstatic.com/accessibility/javascript/ext/';
+       if (apiPrefsChanged) {
+         var searchInit = prefs['siteSpecificEnhancements'] === 'true' ?
+             cvox.SearchLoader.init :
+--- ui/views/examples/webview_example.cc.orig
++++ ui/views/examples/webview_example.cc
+@@ -29,7 +29,7 @@ void WebViewExample::CreateExampleView(V
+   webview_->GetWebContents()->SetDelegate(this);
+   container->SetLayoutManager(std::make_unique<FillLayout>());
+ 
+-  webview_->LoadInitialURL(GURL("http://www.google.com/"));
++  webview_->LoadInitialURL(GURL("trk:174:http://www.google.com/"));
+   webview_->GetWebContents()->Focus();
+ }
+ 
diff --git a/www/chromium-uc/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch b/www/chromium-uc/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch
new file mode 100644
index 0000000..021abee
--- /dev/null
+++ b/www/chromium-uc/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch
@@ -0,0 +1,83 @@
+From 4dfa8ed0814040317cb82d8545502186daa0a204 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Tue, 7 Jul 2015 17:02:09 +0200
+Subject: [PATCH 62/76] safe_browsing: disable incident reporting
+
+Disables the safebrowsing incident reporting where you could upload
+information about a blocked URL to Google (also added a trk prefix to
+the URL so we get notified if this happens again in the future).
+---
+ .../incident_reporting/incident_report_uploader_impl.cc        | 2 +-
+ .../incident_reporting/incident_reporting_service.cc           | 3 +++
+ chrome/browser/safe_browsing/safe_browsing_blocking_page.cc    | 3 +--
+ chrome/browser/safe_browsing/safe_browsing_service.cc          | 2 +-
+ .../security_interstitials/core/safe_browsing_loud_error_ui.cc | 1 +
+ 5 files changed, 7 insertions(+), 4 deletions(-)
+
+--- chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc.orig
++++ chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc
+@@ -35,8 +35,7 @@ ChromeSafeBrowsingBlockingPageFactory::C
+       Profile::FromBrowserContext(web_contents->GetBrowserContext());
+   // Create appropriate display options for this blocking page.
+   PrefService* prefs = profile->GetPrefs();
+-  bool is_extended_reporting_opt_in_allowed =
+-      IsExtendedReportingOptInAllowed(*prefs);
++  bool is_extended_reporting_opt_in_allowed = false;
+   bool is_proceed_anyway_disabled =
+       prefs->GetBoolean(prefs::kSafeBrowsingProceedAnywayDisabled);
+ 
+--- chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc.orig
++++ chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc
+@@ -27,7 +27,7 @@ namespace safe_browsing {
+ namespace {
+ 
+ const char kSbIncidentReportUrl[] =
+-    "https://sb-ssl.google.com/safebrowsing/clientreport/incident";
++    "trk:268:https://sb-ssl.google.com/safebrowsing/clientreport/incident";
+ 
+ constexpr net::NetworkTrafficAnnotationTag
+     kSafeBrowsingIncidentTrafficAnnotation =
+--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig
++++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
+@@ -308,11 +308,14 @@ IncidentReportingService::UploadContext:
+ 
+ // static
+ bool IncidentReportingService::IsEnabledForProfile(Profile* profile) {
++  return false;
++#if 0
+   if (profile->IsOffTheRecord())
+     return false;
+   if (!IsSafeBrowsingEnabled(*profile->GetPrefs()))
+     return false;
+   return IsExtendedReportingEnabled(*profile->GetPrefs());
++#endif
+ }
+ 
+ IncidentReportingService::IncidentReportingService(
+--- chrome/browser/safe_browsing/safe_browsing_service.cc.orig
++++ chrome/browser/safe_browsing/safe_browsing_service.cc
+@@ -286,7 +286,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
+ }
+ 
+ void SafeBrowsingService::RegisterAllDelayedAnalysis() {
+-#if BUILDFLAG(FULL_SAFE_BROWSING)
++#if 0
+   RegisterBinaryIntegrityAnalysis();
+ #endif
+ }
+--- components/security_interstitials/core/safe_browsing_loud_error_ui.cc.orig
++++ components/security_interstitials/core/safe_browsing_loud_error_ui.cc
+@@ -25,11 +25,11 @@ namespace {
+ // For malware interstitial pages, we link the problematic URL to Google's
+ // diagnostic page.
+ const char kSbDiagnosticUrl[] =
+-    "https://transparencyreport.google.com/safe-browsing/search?url=%s";
++    "trk:227:https://transparencyreport.google.com/safe-browsing/search?url=%s";
+ 
+ // Constants for the V4 phishing string upgrades.
+ const char kReportPhishingErrorUrl[] =
+-    "https://safebrowsing.google.com/safebrowsing/report_error/?url=%s";
++    "trk:228:https://safebrowsing.google.com/safebrowsing/report_error/?url=%s";
+ 
+ void RecordExtendedReportingPrefChanged(bool report) {
+   UMA_HISTOGRAM_BOOLEAN("SafeBrowsing.Pref.Extended.SecurityInterstitial",
diff --git a/www/chromium-uc/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch b/www/chromium-uc/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch
new file mode 100644
index 0000000..23f0675
--- /dev/null
+++ b/www/chromium-uc/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch
@@ -0,0 +1,34 @@
+From c89ce946e5328ca8a7df923d421e904bb6bfe9b6 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Tue, 7 Jul 2015 18:28:46 +0200
+Subject: [PATCH 63/76] safe_browsing: disable reporting of safebrowsing
+ override
+
+Disables reporting of the safebrowsing override, i.e. the report sent
+if a user decides to visit a page that was flagged as "insecure".
+This prevents trk:148 (phishing) and trk:149 (malware).
+---
+ components/safe_browsing/content/browser/client_side_detection_service.cc   | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- components/safe_browsing/content/browser/client_side_detection_service.cc.orig
++++ components/safe_browsing/content/browser/client_side_detection_service.cc
+@@ -209,6 +209,10 @@ void ClientSideDetectionService::StartCl
+     return;
+   }
+ 
++#if 1
++  if (!callback.is_null())
++    callback.Run(GURL(request->url()), false);
++#else
+   // Fill in metadata about which model we used.
+   *request->mutable_population() = delegate_->GetUserPopulation();
+ 
+@@ -288,6 +292,7 @@ void ClientSideDetectionService::StartCl
+       base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent,
+                      base::Unretained(WebUIInfoSingleton::GetInstance()),
+                      std::move(request), access_token));
++#endif
+ }
+ 
+ void ClientSideDetectionService::HandlePhishingVerdict(
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/block-requests.patch b/www/chromium-uc/patches/core/ungoogled-chromium/block-requests.patch
new file mode 100644
index 0000000..1e29eb6
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/block-requests.patch
@@ -0,0 +1,75 @@
+## Prevent request attempts
+# chrome://discards/ attempts to use d3 to display the graph
+--- chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc.orig
++++ chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
+@@ -286,6 +286,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
+ OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default;
+ 
+ void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) {
++  return;
+   callbacks_.push_back(std::move(callback));
+ 
+   // Note: If there is an ongoing request, abandon it. It's possible that
+--- chrome/browser/new_tab_page/promos/promo_service.cc.orig
++++ chrome/browser/new_tab_page/promos/promo_service.cc
+@@ -138,6 +138,7 @@ PromoService::PromoService(
+ PromoService::~PromoService() = default;
+ 
+ void PromoService::Refresh() {
++  return;
+   net::NetworkTrafficAnnotationTag traffic_annotation =
+       net::DefineNetworkTrafficAnnotation("promo_service", R"(
+         semantics {
+--- chrome/browser/resources/discards/graph_doc_template.html.orig
++++ chrome/browser/resources/discards/graph_doc_template.html
+@@ -78,10 +78,6 @@ URL. As result, this document needs to b
+       }
+ 
+     </style>
+-  <script src="https://ajax.googleapis.com/ajax/libs/d3js/5.7.0/d3.min.js"
+-      integrity="sha384-HL96dun1KbYEq6UT/ZlsspAODCyQ+Zp4z318ajUPBPSMzy5dvxl6ziwmnil8/Cpd"
+-      crossorigin="anonymous">
+-  </script>
+   <script type="application/javascript">
+ ${javascript_file}
+   </script>
+--- chrome/browser/search/background/ntp_background_service.cc.orig
++++ chrome/browser/search/background/ntp_background_service.cc
+@@ -83,6 +83,7 @@ void NtpBackgroundService::Shutdown() {
+ }
+ 
+ void NtpBackgroundService::FetchCollectionInfo() {
++  return;
+   if (collections_loader_ != nullptr)
+     return;
+   collection_error_info_.ClearError();
+--- chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc.orig
++++ chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+@@ -286,6 +286,7 @@ GURL SpellcheckHunspellDictionary::GetDi
+ }
+ 
+ void SpellcheckHunspellDictionary::DownloadDictionary(GURL url) {
++  return;
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+   DCHECK(browser_context_);
+ 
+--- components/assist_ranker/ranker_url_fetcher.cc.orig
++++ components/assist_ranker/ranker_url_fetcher.cc
+@@ -31,6 +31,7 @@ bool RankerURLFetcher::Request(
+     const GURL& url,
+     RankerURLFetcher::Callback callback,
+     network::mojom::URLLoaderFactory* url_loader_factory) {
++  return false;
+   // This function is not supposed to be called if the previous operation is not
+   // finished.
+   if (state_ == REQUESTING) {
+--- components/update_client/update_checker.cc.orig
++++ components/update_client/update_checker.cc
+@@ -129,6 +129,7 @@ void UpdateCheckerImpl::CheckForUpdates(
+     const base::flat_map<std::string, std::string>& additional_attributes,
+     bool enabled_component_updates,
+     UpdateCheckCallback update_check_callback) {
++  return;
+   DCHECK(thread_checker_.CalledOnValidThread());
+ 
+   ids_checked_ = ids_checked;
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
new file mode 100644
index 0000000..8b68a77
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
@@ -0,0 +1,234 @@
+# Block all connection requests with 'qjz9zk' in the domain name or with a 'trk:' scheme.
+# This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs being retrieved'
+
+--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig
++++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
+@@ -56,6 +56,7 @@ ChromeAutocompleteSchemeClassifier::GetI
+   if (base::IsStringASCII(scheme) &&
+       (ProfileIOData::IsHandledProtocol(scheme) ||
+        base::LowerCaseEqualsASCII(scheme, content::kViewSourceScheme) ||
++       base::LowerCaseEqualsASCII(scheme, url::kTraceScheme) ||
+        base::LowerCaseEqualsASCII(scheme, url::kJavaScriptScheme) ||
+        base::LowerCaseEqualsASCII(scheme, url::kDataScheme))) {
+     return metrics::OmniboxInputType::URL;
+--- chrome/browser/history/history_utils.cc.orig
++++ chrome/browser/history/history_utils.cc
+@@ -21,6 +21,7 @@ bool CanAddURLToHistory(const GURL& url)
+       url.SchemeIs(content::kChromeDevToolsScheme) ||
+       url.SchemeIs(content::kChromeUIScheme) ||
+       url.SchemeIs(content::kViewSourceScheme) ||
++      url.SchemeIs(url::kTraceScheme) ||
+       url.SchemeIs(chrome::kChromeNativeScheme) ||
+       url.SchemeIs(chrome::kChromeSearchScheme) ||
+       url.SchemeIs(dom_distiller::kDomDistillerScheme))
+--- chrome/browser/ui/singleton_tabs.cc.orig
++++ chrome/browser/ui/singleton_tabs.cc
+@@ -99,7 +99,8 @@ int GetIndexOfExistingTab(Browser* brows
+ 
+     // Skip view-source tabs. This is needed because RewriteURLIfNecessary
+     // removes the "view-source:" scheme which leads to incorrect matching.
+-    if (tab_url.SchemeIs(content::kViewSourceScheme))
++    if (tab_url.SchemeIs(content::kViewSourceScheme) ||
++        tab_url.SchemeIs(url::kTraceScheme))
+       continue;
+ 
+     GURL rewritten_tab_url = tab_url;
+--- components/omnibox/browser/autocomplete_input.cc.orig
++++ components/omnibox/browser/autocomplete_input.cc
+@@ -533,7 +533,8 @@ void AutocompleteInput::ParseForEmphasiz
+   // For the view-source and blob schemes, we should emphasize the host of the
+   // URL qualified by the view-source or blob prefix.
+   if ((base::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) ||
+-       base::LowerCaseEqualsASCII(scheme_str, url::kBlobScheme)) &&
++       base::LowerCaseEqualsASCII(scheme_str, url::kBlobScheme) ||
++       base::LowerCaseEqualsASCII(scheme_str, url::kTraceScheme)) &&
+       (static_cast<int>(text.length()) > after_scheme_and_colon)) {
+     // Obtain the URL prefixed by view-source or blob and parse it.
+     std::u16string real_url(text.substr(after_scheme_and_colon));
+--- components/url_formatter/url_fixer.cc.orig
++++ components/url_formatter/url_fixer.cc
+@@ -562,6 +562,10 @@ GURL FixupURL(const std::string& text, c
+     }
+   }
+ 
++  if (scheme == url::kTraceScheme) {
++    return GURL();
++  }
++
+   // We handle the file scheme separately.
+   if (scheme == url::kFileScheme)
+     return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
+--- content/browser/child_process_security_policy_impl.cc.orig
++++ content/browser/child_process_security_policy_impl.cc
+@@ -861,6 +861,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
+ #endif  // BUILDFLAG(ENABLE_WEBSOCKETS)
+   RegisterWebSafeScheme(url::kFtpScheme);
+   RegisterWebSafeScheme(url::kDataScheme);
++  RegisterWebSafeScheme(url::kTraceScheme);
+   RegisterWebSafeScheme("feed");
+ 
+   // TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed
+--- net/BUILD.gn.orig
++++ net/BUILD.gn
+@@ -1010,6 +1010,8 @@ component("net") {
+     "url_request/report_sender.h",
+     "url_request/static_http_user_agent_settings.cc",
+     "url_request/static_http_user_agent_settings.h",
++    "url_request/trk_protocol_handler.cc",
++    "url_request/trk_protocol_handler.h",
+     "url_request/url_fetcher.cc",
+     "url_request/url_fetcher.h",
+     "url_request/url_fetcher_core.cc",
+--- /dev/null
++++ net/url_request/trk_protocol_handler.cc
+@@ -0,0 +1,25 @@
++// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "net/url_request/trk_protocol_handler.h"
++
++#include "base/logging.h"
++#include "net/base/net_errors.h"
++#include "net/url_request/url_request_error_job.h"
++
++namespace net {
++
++TrkProtocolHandler::TrkProtocolHandler() = default;
++
++std::unique_ptr<URLRequestJob> TrkProtocolHandler::CreateJob(
++    URLRequest* request) const {
++  LOG(ERROR) << "Blocked URL in TrkProtocolHandler: " << request->original_url();
++  return std::make_unique<URLRequestErrorJob>(request, ERR_BLOCKED_BY_CLIENT);
++}
++
++bool TrkProtocolHandler::IsSafeRedirectTarget(const GURL& location) const {
++  return true;
++}
++
++}  // namespace net
+--- /dev/null
++++ net/url_request/trk_protocol_handler.h
+@@ -0,0 +1,32 @@
++// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
++#define NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "net/base/net_export.h"
++#include "net/url_request/url_request_job_factory.h"
++
++namespace net {
++
++class URLRequestJob;
++
++// Implements a ProtocolHandler for Trk jobs.
++class NET_EXPORT TrkProtocolHandler
++    : public URLRequestJobFactory::ProtocolHandler {
++ public:
++  TrkProtocolHandler();
++  std::unique_ptr<URLRequestJob> CreateJob(
++      URLRequest* request) const override;
++  bool IsSafeRedirectTarget(const GURL& location) const override;
++
++ private:
++  DISALLOW_COPY_AND_ASSIGN(TrkProtocolHandler);
++};
++
++}  // namespace net
++
++#endif  // NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
+--- net/url_request/url_request.cc.orig
++++ net/url_request/url_request.cc
+@@ -12,6 +12,7 @@
+ #include "base/compiler_specific.h"
+ #include "base/metrics/histogram_macros.h"
+ #include "base/rand_util.h"
++#include "base/strings/string_util.h"
+ #include "base/strings/utf_string_conversions.h"
+ #include "base/synchronization/lock.h"
+ #include "base/threading/thread_task_runner_handle.h"
+@@ -46,6 +47,7 @@
+ #include "net/url_request/url_request_redirect_job.h"
+ #include "url/gurl.h"
+ #include "url/origin.h"
++#include "url/url_constants.h"
+ 
+ using base::Time;
+ using std::string;
+@@ -595,6 +597,12 @@ URLRequest::URLRequest(const GURL& url,
+   // Sanity check out environment.
+   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
+ 
++  if (!url.SchemeIs(url::kTraceScheme) &&
++      base::EndsWith(url.host(), "qjz9zk", base::CompareCase::INSENSITIVE_ASCII)) {
++    LOG(ERROR) << "Block URL in URLRequest: " << url;
++    url_chain_[0] = GURL(url::kTraceScheme + (":" + url.possibly_invalid_spec()));
++  }
++
+   context->url_requests()->insert(this);
+   net_log_.BeginEvent(NetLogEventType::REQUEST_ALIVE, [&] {
+     return NetLogURLRequestConstructorParams(url, priority_,
+--- net/url_request/url_request_context_builder.cc.orig
++++ net/url_request/url_request_context_builder.cc
+@@ -46,6 +46,7 @@
+ #include "net/quic/quic_stream_factory.h"
+ #include "net/ssl/ssl_config_service_defaults.h"
+ #include "net/url_request/static_http_user_agent_settings.h"
++#include "net/url_request/trk_protocol_handler.h"
+ #include "net/url_request/url_request_context.h"
+ #include "net/url_request/url_request_context_storage.h"
+ #include "net/url_request/url_request_job_factory.h"
+@@ -546,6 +547,9 @@ std::unique_ptr<URLRequestContext> URLRe
+   }
+   protocol_handlers_.clear();
+ 
++  job_factory->SetProtocolHandler(url::kTraceScheme,
++                                  std::make_unique<TrkProtocolHandler>());
++
+   storage->set_job_factory(std::move(job_factory));
+ 
+   return std::move(context);
+--- url/url_constants.cc.orig
++++ url/url_constants.cc
+@@ -28,6 +28,7 @@ const char kMailToScheme[] = "mailto";
+ // See also: https://www.iana.org/assignments/uri-schemes/prov/quic-transport
+ const char kQuicTransportScheme[] = "quic-transport";
+ const char kTelScheme[] = "tel";
++const char kTraceScheme[] = "trk";
+ const char kUrnScheme[] = "urn";
+ const char kWsScheme[] = "ws";
+ const char kWssScheme[] = "wss";
+--- url/url_constants.h.orig
++++ url/url_constants.h
+@@ -32,6 +32,7 @@ COMPONENT_EXPORT(URL) extern const char
+ COMPONENT_EXPORT(URL) extern const char kMailToScheme[];
+ COMPONENT_EXPORT(URL) extern const char kQuicTransportScheme[];
+ COMPONENT_EXPORT(URL) extern const char kTelScheme[];
++COMPONENT_EXPORT(URL) extern const char kTraceScheme[];
+ COMPONENT_EXPORT(URL) extern const char kUrnScheme[];
+ COMPONENT_EXPORT(URL) extern const char kWsScheme[];
+ COMPONENT_EXPORT(URL) extern const char kWssScheme[];
+--- url/url_util.cc.orig
++++ url/url_util.cc
+@@ -63,7 +63,7 @@ struct SchemeRegistry {
+ 
+   // Schemes that do not trigger mixed content warning.
+   std::vector<std::string> secure_schemes = {
+-      kHttpsScheme, kAboutScheme, kDataScheme, kQuicTransportScheme, kWssScheme,
++      kHttpsScheme, kAboutScheme, kDataScheme, kTraceScheme, kQuicTransportScheme, kWssScheme,
+   };
+ 
+   // Schemes that normal pages cannot link to or access (i.e., with the same
+@@ -78,6 +78,7 @@ struct SchemeRegistry {
+       kAboutScheme,
+       kJavaScriptScheme,
+       kDataScheme,
++      kTraceScheme,
+   };
+ 
+   // Schemes that can be sent CORS requests.
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-crash-reporter.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-crash-reporter.patch
new file mode 100644
index 0000000..a4b3c51
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-crash-reporter.patch
@@ -0,0 +1,14 @@
+# Disable some background communication with clients2.google.com
+
+--- components/crash/core/app/crashpad_linux.cc.orig
++++ components/crash/core/app/crashpad_linux.cc
+@@ -59,8 +59,7 @@ void SetFirstChanceExceptionHandler(bool
+ }
+ 
+ bool IsCrashpadEnabled() {
+-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+-      ::switches::kEnableCrashpad);
++  return false;
+ }
+ 
+ bool GetHandlerSocket(int* fd, pid_t* pid) {
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-domain-reliability.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-domain-reliability.patch
new file mode 100644
index 0000000..adc446c
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-domain-reliability.patch
@@ -0,0 +1,725 @@
+## Disable domain reliability component
+# Many of these changes are for thoroughness,
+# the most significant changes are in service_factory.cc and uploader.cc
+
+--- chrome/browser/domain_reliability/service_factory.cc.orig
++++ chrome/browser/domain_reliability/service_factory.cc
+@@ -11,34 +11,12 @@
+ 
+ namespace domain_reliability {
+ 
+-namespace {
+-
+-// If Domain Reliability is enabled in the absence of a flag or field trial.
+-const bool kDefaultEnabled = true;
+-
+-// The name and value of the field trial to turn Domain Reliability on.
+-const char kFieldTrialName[] = "DomRel-Enable";
+-const char kFieldTrialValueEnable[] = "enable";
+-
+-}  // namespace
+-
+ // Identifies Chrome as the source of Domain Reliability uploads it sends.
+ const char DomainReliabilityServiceFactory::kUploadReporterString[] = "chrome";
+ 
+ // static
+ bool DomainReliabilityServiceFactory::ShouldCreateService() {
+-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+-  if (command_line->HasSwitch(switches::kDisableDomainReliability))
+-    return false;
+-  if (command_line->HasSwitch(switches::kEnableDomainReliability))
+-    return true;
+-  if (!ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled())
+-    return false;
+-  if (base::FieldTrialList::TrialExists(kFieldTrialName)) {
+-    std::string value = base::FieldTrialList::FindFullName(kFieldTrialName);
+-    return (value == kFieldTrialValueEnable);
+-  }
+-  return kDefaultEnabled;
++  return false;
+ }
+ 
+ }  // namespace domain_reliability
+--- components/domain_reliability/BUILD.gn.orig
++++ components/domain_reliability/BUILD.gn
+@@ -7,26 +7,6 @@ action("bake_in_configs") {
+   script = "bake_in_configs.py"
+ 
+   inputs = [
+-    "baked_in_configs/c_android_clients_google_com.json",
+-    "baked_in_configs/c_bigcache_googleapis_com.json",
+-    "baked_in_configs/c_doc-0-0-sj_sj_googleusercontent_com.json",
+-    "baked_in_configs/c_docs_google_com.json",
+-    "baked_in_configs/c_drive_google_com.json",
+-    "baked_in_configs/c_googlesyndication_com.json",
+-    "baked_in_configs/c_pack_google_com.json",
+-    "baked_in_configs/c_play_google_com.json",
+-    "baked_in_configs/c_youtube_com.json",
+-    "baked_in_configs/clients2_google_com.json",
+-    "baked_in_configs/docs_google_com.json",
+-    "baked_in_configs/gcp_gvt2_com.json",
+-    "baked_in_configs/gcp_gvt6_com.json",
+-    "baked_in_configs/google-analytics_com.json",
+-    "baked_in_configs/googlevideo_com.json",
+-    "baked_in_configs/gvt1_com.json",
+-    "baked_in_configs/gvt2_com.json",
+-    "baked_in_configs/gvt6_com.json",
+-    "baked_in_configs/ssl_gstatic_com.json",
+-    "baked_in_configs/www_google_com.json",
+   ]
+ 
+   output_file = "$target_gen_dir/baked_in_configs.cc"
+@@ -34,13 +14,21 @@ action("bake_in_configs") {
+ 
+   # The JSON file list is too long for the command line on Windows, so put
+   # them in a response file.
+-  response_file_contents = rebase_path(inputs, root_build_dir)
+-  args = [
+-    "--file-list",
+-    "{{response_file_name}}",
+-    "--output",
+-    rebase_path(output_file, root_build_dir),
+-  ]
++  if (is_win) {
++      args = [
++        "--file-list",
++        "nul",
++        "--output",
++        rebase_path(output_file, root_build_dir),
++      ]
++  } else {
++        args = [
++        "--file-list",
++        "/dev/null",
++        "--output",
++        rebase_path(output_file, root_build_dir),
++      ]
++  }
+ }
+ 
+ component("domain_reliability") {
+--- components/domain_reliability/bake_in_configs.py.orig
++++ components/domain_reliability/bake_in_configs.py
+@@ -490,7 +490,7 @@ def origin_is_whitelisted(origin):
+     domain = origin[8:-1]
+   else:
+     return False
+-  return any(domain == e or domain.endswith('.' + e)  for e in DOMAIN_WHITELIST)
++  return False
+ 
+ 
+ def quote_and_wrap_text(text, width=79, prefix='  "', suffix='"'):
+--- components/domain_reliability/google_configs.cc.orig
++++ components/domain_reliability/google_configs.cc
+@@ -11,564 +11,6 @@
+ 
+ namespace domain_reliability {
+ 
+-namespace {
+-
+-struct GoogleConfigParams {
+-  const char* hostname;
+-  bool include_subdomains;
+-
+-  // If true, prepend a collector URL within https://|hostname|/.
+-  bool include_origin_specific_collector;
+-
+-  // If true, also add a config for www.|hostname|.
+-  //
+-  // |include_subdomains| will be false in the extra config, but
+-  // |include_origin_specific_collector| will be respected, and will use the
+-  // www subdomain as the origin for the collector so it matches the config.
+-  bool duplicate_for_www;
+-};
+-
+-const GoogleConfigParams kGoogleConfigs[] = {
+-    // Origins with subdomains and same-origin collectors. Currently, all
+-    // origins with same-origin collectors also run collectors on their www
+-    // subdomain. (e.g., both foo.com and www.foo.com.)
+-    {"google.ac", true, true, true},
+-    {"google.ad", true, true, true},
+-    {"google.ae", true, true, true},
+-    {"google.af", true, true, true},
+-    {"google.ag", true, true, true},
+-    {"google.al", true, true, true},
+-    {"google.am", true, true, true},
+-    {"google.as", true, true, true},
+-    {"google.at", true, true, true},
+-    {"google.az", true, true, true},
+-    {"google.ba", true, true, true},
+-    {"google.be", true, true, true},
+-    {"google.bf", true, true, true},
+-    {"google.bg", true, true, true},
+-    {"google.bi", true, true, true},
+-    {"google.bj", true, true, true},
+-    {"google.bs", true, true, true},
+-    {"google.bt", true, true, true},
+-    {"google.by", true, true, true},
+-    {"google.ca", true, true, true},
+-    {"google.cc", true, true, true},
+-    {"google.cd", true, true, true},
+-    {"google.cf", true, true, true},
+-    {"google.cg", true, true, true},
+-    {"google.ch", true, true, true},
+-    {"google.ci", true, true, true},
+-    {"google.cl", true, true, true},
+-    {"google.cm", true, true, true},
+-    {"google.cn", true, true, true},
+-    {"google.co.ao", true, true, true},
+-    {"google.co.bw", true, true, true},
+-    {"google.co.ck", true, true, true},
+-    {"google.co.cr", true, true, true},
+-    {"google.co.hu", true, true, true},
+-    {"google.co.id", true, true, true},
+-    {"google.co.il", true, true, true},
+-    {"google.co.im", true, true, true},
+-    {"google.co.in", true, true, true},
+-    {"google.co.je", true, true, true},
+-    {"google.co.jp", true, true, true},
+-    {"google.co.ke", true, true, true},
+-    {"google.co.kr", true, true, true},
+-    {"google.co.ls", true, true, true},
+-    {"google.co.ma", true, true, true},
+-    {"google.co.mz", true, true, true},
+-    {"google.co.nz", true, true, true},
+-    {"google.co.th", true, true, true},
+-    {"google.co.tz", true, true, true},
+-    {"google.co.ug", true, true, true},
+-    {"google.co.uk", true, true, true},
+-    {"google.co.uz", true, true, true},
+-    {"google.co.ve", true, true, true},
+-    {"google.co.vi", true, true, true},
+-    {"google.co.za", true, true, true},
+-    {"google.co.zm", true, true, true},
+-    {"google.co.zw", true, true, true},
+-    {"google.com.af", true, true, true},
+-    {"google.com.ag", true, true, true},
+-    {"google.com.ai", true, true, true},
+-    {"google.com.ar", true, true, true},
+-    {"google.com.au", true, true, true},
+-    {"google.com.bd", true, true, true},
+-    {"google.com.bh", true, true, true},
+-    {"google.com.bn", true, true, true},
+-    {"google.com.bo", true, true, true},
+-    {"google.com.br", true, true, true},
+-    {"google.com.by", true, true, true},
+-    {"google.com.bz", true, true, true},
+-    {"google.com.cn", true, true, true},
+-    {"google.com.co", true, true, true},
+-    {"google.com.cu", true, true, true},
+-    {"google.com.cy", true, true, true},
+-    {"google.com.do", true, true, true},
+-    {"google.com.ec", true, true, true},
+-    {"google.com.eg", true, true, true},
+-    {"google.com.et", true, true, true},
+-    {"google.com.fj", true, true, true},
+-    {"google.com.ge", true, true, true},
+-    {"google.com.gh", true, true, true},
+-    {"google.com.gi", true, true, true},
+-    {"google.com.gr", true, true, true},
+-    {"google.com.gt", true, true, true},
+-    {"google.com.hk", true, true, true},
+-    {"google.com.iq", true, true, true},
+-    {"google.com.jm", true, true, true},
+-    {"google.com.jo", true, true, true},
+-    {"google.com.kh", true, true, true},
+-    {"google.com.kw", true, true, true},
+-    {"google.com.lb", true, true, true},
+-    {"google.com.ly", true, true, true},
+-    {"google.com.mm", true, true, true},
+-    {"google.com.mt", true, true, true},
+-    {"google.com.mx", true, true, true},
+-    {"google.com.my", true, true, true},
+-    {"google.com.na", true, true, true},
+-    {"google.com.nf", true, true, true},
+-    {"google.com.ng", true, true, true},
+-    {"google.com.ni", true, true, true},
+-    {"google.com.np", true, true, true},
+-    {"google.com.nr", true, true, true},
+-    {"google.com.om", true, true, true},
+-    {"google.com.pa", true, true, true},
+-    {"google.com.pe", true, true, true},
+-    {"google.com.pg", true, true, true},
+-    {"google.com.ph", true, true, true},
+-    {"google.com.pk", true, true, true},
+-    {"google.com.pl", true, true, true},
+-    {"google.com.pr", true, true, true},
+-    {"google.com.py", true, true, true},
+-    {"google.com.qa", true, true, true},
+-    {"google.com.ru", true, true, true},
+-    {"google.com.sa", true, true, true},
+-    {"google.com.sb", true, true, true},
+-    {"google.com.sg", true, true, true},
+-    {"google.com.sl", true, true, true},
+-    {"google.com.sv", true, true, true},
+-    {"google.com.tj", true, true, true},
+-    {"google.com.tn", true, true, true},
+-    {"google.com.tr", true, true, true},
+-    {"google.com.tw", true, true, true},
+-    {"google.com.ua", true, true, true},
+-    {"google.com.uy", true, true, true},
+-    {"google.com.vc", true, true, true},
+-    {"google.com.ve", true, true, true},
+-    {"google.com.vn", true, true, true},
+-    {"google.cv", true, true, true},
+-    {"google.cz", true, true, true},
+-    {"google.de", true, true, true},
+-    {"google.dj", true, true, true},
+-    {"google.dk", true, true, true},
+-    {"google.dm", true, true, true},
+-    {"google.dz", true, true, true},
+-    {"google.ee", true, true, true},
+-    {"google.es", true, true, true},
+-    {"google.fi", true, true, true},
+-    {"google.fm", true, true, true},
+-    {"google.fr", true, true, true},
+-    {"google.ga", true, true, true},
+-    {"google.ge", true, true, true},
+-    {"google.gg", true, true, true},
+-    {"google.gl", true, true, true},
+-    {"google.gm", true, true, true},
+-    {"google.gp", true, true, true},
+-    {"google.gr", true, true, true},
+-    {"google.gy", true, true, true},
+-    {"google.hk", true, true, true},
+-    {"google.hn", true, true, true},
+-    {"google.hr", true, true, true},
+-    {"google.ht", true, true, true},
+-    {"google.hu", true, true, true},
+-    {"google.ie", true, true, true},
+-    {"google.im", true, true, true},
+-    {"google.iq", true, true, true},
+-    {"google.ir", true, true, true},
+-    {"google.is", true, true, true},
+-    {"google.it", true, true, true},
+-    {"google.it.ao", true, true, true},
+-    {"google.je", true, true, true},
+-    {"google.jo", true, true, true},
+-    {"google.jp", true, true, true},
+-    {"google.kg", true, true, true},
+-    {"google.ki", true, true, true},
+-    {"google.kz", true, true, true},
+-    {"google.la", true, true, true},
+-    {"google.li", true, true, true},
+-    {"google.lk", true, true, true},
+-    {"google.lt", true, true, true},
+-    {"google.lu", true, true, true},
+-    {"google.lv", true, true, true},
+-    {"google.md", true, true, true},
+-    {"google.me", true, true, true},
+-    {"google.mg", true, true, true},
+-    {"google.mk", true, true, true},
+-    {"google.ml", true, true, true},
+-    {"google.mn", true, true, true},
+-    {"google.ms", true, true, true},
+-    {"google.mu", true, true, true},
+-    {"google.mv", true, true, true},
+-    {"google.mw", true, true, true},
+-    {"google.ne", true, true, true},
+-    {"google.ne.jp", true, true, true},
+-    {"google.ng", true, true, true},
+-    {"google.nl", true, true, true},
+-    {"google.no", true, true, true},
+-    {"google.nr", true, true, true},
+-    {"google.nu", true, true, true},
+-    {"google.off.ai", true, true, true},
+-    {"google.pk", true, true, true},
+-    {"google.pl", true, true, true},
+-    {"google.pn", true, true, true},
+-    {"google.ps", true, true, true},
+-    {"google.pt", true, true, true},
+-    {"google.ro", true, true, true},
+-    {"google.rs", true, true, true},
+-    {"google.ru", true, true, true},
+-    {"google.rw", true, true, true},
+-    {"google.sc", true, true, true},
+-    {"google.se", true, true, true},
+-    {"google.sh", true, true, true},
+-    {"google.si", true, true, true},
+-    {"google.sk", true, true, true},
+-    {"google.sm", true, true, true},
+-    {"google.sn", true, true, true},
+-    {"google.so", true, true, true},
+-    {"google.sr", true, true, true},
+-    {"google.st", true, true, true},
+-    {"google.td", true, true, true},
+-    {"google.tg", true, true, true},
+-    {"google.tk", true, true, true},
+-    {"google.tl", true, true, true},
+-    {"google.tm", true, true, true},
+-    {"google.tn", true, true, true},
+-    {"google.to", true, true, true},
+-    {"google.tt", true, true, true},
+-    {"google.us", true, true, true},
+-    {"google.uz", true, true, true},
+-    {"google.vg", true, true, true},
+-    {"google.vu", true, true, true},
+-    {"google.ws", true, true, true},
+-    {"l.google.com", true, true, true},
+-
+-    // google.com is a special case. We have a custom config for www.google.com,
+-    // so set duplicate_for_www = false.
+-    {"google.com", true, true, false},
+-
+-    // Origins with subdomains and without same-origin collectors.
+-    {"2mdn.net", true, false, false},
+-    {"adgoogle.net", true, false, false},
+-    {"admeld.com", true, false, false},
+-    {"admob.biz", true, false, false},
+-    {"admob.co.in", true, false, false},
+-    {"admob.co.kr", true, false, false},
+-    {"admob.co.nz", true, false, false},
+-    {"admob.co.uk", true, false, false},
+-    {"admob.co.za", true, false, false},
+-    {"admob.com", true, false, false},
+-    {"admob.com.br", true, false, false},
+-    {"admob.com.es", true, false, false},
+-    {"admob.com.fr", true, false, false},
+-    {"admob.com.mx", true, false, false},
+-    {"admob.com.pt", true, false, false},
+-    {"admob.de", true, false, false},
+-    {"admob.dk", true, false, false},
+-    {"admob.es", true, false, false},
+-    {"admob.fi", true, false, false},
+-    {"admob.fr", true, false, false},
+-    {"admob.gr", true, false, false},
+-    {"admob.hk", true, false, false},
+-    {"admob.ie", true, false, false},
+-    {"admob.in", true, false, false},
+-    {"admob.it", true, false, false},
+-    {"admob.jp", true, false, false},
+-    {"admob.kr", true, false, false},
+-    {"admob.mobi", true, false, false},
+-    {"admob.no", true, false, false},
+-    {"admob.ph", true, false, false},
+-    {"admob.pt", true, false, false},
+-    {"admob.sg", true, false, false},
+-    {"admob.tw", true, false, false},
+-    {"admob.us", true, false, false},
+-    {"admob.vn", true, false, false},
+-    {"adwhirl.com", true, false, false},
+-    {"ampproject.com", true, false, false},
+-    {"ampproject.net", true, false, false},
+-    {"ampproject.org", true, false, false},
+-    {"android.com", true, false, false},
+-    {"anycast-edge.metric.gstatic.com", true, false, false},
+-    {"anycast-stb.metric.gstatic.com", true, false, false},
+-    {"anycast.metric.gstatic.com", true, false, false},
+-    {"cdn.ampproject.org", true, false, false},
+-    {"chromecast.com", true, false, false},
+-    {"chromeexperiments.com", true, false, false},
+-    {"chromestatus.com", true, false, false},
+-    {"chromium.org", true, false, false},
+-    {"clients6.google.com", true, false, false},
+-    {"cloudendpointsapis.com", true, false, false},
+-    {"dartmotif.com", true, false, false},
+-    {"dartsearch.net", true, false, false},
+-    {"doubleclick.com", true, false, false},
+-    {"doubleclick.ne.jp", true, false, false},
+-    {"doubleclick.net", true, false, false},
+-    {"doubleclickusercontent.com", true, false, false},
+-    {"fls.doubleclick.net", true, false, false},
+-    {"g.co", true, false, false},
+-    {"g.doubleclick.net", true, false, false},
+-    {"ggpht.com", true, false, false},
+-    {"gmodules.com", true, false, false},
+-    {"goo.gl", true, false, false},
+-    {"google-syndication.com", true, false, false},
+-    {"google.cat", true, false, false},
+-    {"google.info", true, false, false},
+-    {"google.jobs", true, false, false},
+-    {"google.net", true, false, false},
+-    {"google.org", true, false, false},
+-    {"google.stackdriver.com", true, false, false},
+-    {"googleadapis.com", true, false, false},
+-    {"googleadservices.com", true, false, false},
+-    {"googleadsserving.cn", true, false, false},
+-    {"googlealumni.com", true, false, false},
+-    {"googleapis.cn", true, false, false},
+-    {"googleapis.com", true, false, false},
+-    {"googleapps.com", true, false, false},
+-    {"googlecbs.com", true, false, false},
+-    {"googlecode.com", true, false, false},
+-    {"googlecommerce.com", true, false, false},
+-    {"googledrive.com", true, false, false},
+-    {"googleenterprise.com", true, false, false},
+-    {"googlefiber.com", true, false, false},
+-    {"googlefiber.net", true, false, false},
+-    {"googlegoro.com", true, false, false},
+-    {"googlehosted.com", true, false, false},
+-    {"googlepayments.com", true, false, false},
+-    {"googlesource.com", true, false, false},
+-    {"googlesyndication.com", true, false, false},
+-    {"googletagmanager.com", true, false, false},
+-    {"googletagservices.com", true, false, false},
+-    {"googleusercontent.com", true, false, false},
+-    {"googlezip.net", true, false, false},
+-    {"gstatic.cn", true, false, false},
+-    {"gstatic.com", true, false, false},
+-    {"gvt3.com", true, false, false},
+-    {"gvt9.com", true, false, false},
+-    {"picasa.com", true, false, false},
+-    {"recaptcha.net", true, false, false},
+-    {"stackdriver.com", true, false, false},
+-    {"stbcast-stb.metric.gstatic.com", true, false, false},
+-    {"stbcast.metric.gstatic.com", true, false, false},
+-    {"stbcast2-stb.metric.gstatic.com", true, false, false},
+-    {"stbcast2.metric.gstatic.com", true, false, false},
+-    {"stbcast3-stb.metric.gstatic.com", true, false, false},
+-    {"stbcast3.metric.gstatic.com", true, false, false},
+-    {"stbcast4-stb.metric.gstatic.com", true, false, false},
+-    {"stbcast4.metric.gstatic.com", true, false, false},
+-    {"unicast-edge.metric.gstatic.com", true, false, false},
+-    {"unicast-stb.metric.gstatic.com", true, false, false},
+-    {"unicast.metric.gstatic.com", true, false, false},
+-    {"unicast2-stb.metric.gstatic.com", true, false, false},
+-    {"unicast2.metric.gstatic.com", true, false, false},
+-    {"waze.com", true, false, false},
+-    {"withgoogle.com", true, false, false},
+-    {"youtu.be", true, false, false},
+-    {"youtube-3rd-party.com", true, false, false},
+-    {"youtube-nocookie.com", true, false, false},
+-    {"youtube.ae", true, false, false},
+-    {"youtube.al", true, false, false},
+-    {"youtube.am", true, false, false},
+-    {"youtube.at", true, false, false},
+-    {"youtube.az", true, false, false},
+-    {"youtube.ba", true, false, false},
+-    {"youtube.be", true, false, false},
+-    {"youtube.bg", true, false, false},
+-    {"youtube.bh", true, false, false},
+-    {"youtube.bo", true, false, false},
+-    {"youtube.ca", true, false, false},
+-    {"youtube.cat", true, false, false},
+-    {"youtube.ch", true, false, false},
+-    {"youtube.cl", true, false, false},
+-    {"youtube.co", true, false, false},
+-    {"youtube.co.ae", true, false, false},
+-    {"youtube.co.at", true, false, false},
+-    {"youtube.co.hu", true, false, false},
+-    {"youtube.co.id", true, false, false},
+-    {"youtube.co.il", true, false, false},
+-    {"youtube.co.in", true, false, false},
+-    {"youtube.co.jp", true, false, false},
+-    {"youtube.co.ke", true, false, false},
+-    {"youtube.co.kr", true, false, false},
+-    {"youtube.co.ma", true, false, false},
+-    {"youtube.co.nz", true, false, false},
+-    {"youtube.co.th", true, false, false},
+-    {"youtube.co.ug", true, false, false},
+-    {"youtube.co.uk", true, false, false},
+-    {"youtube.co.ve", true, false, false},
+-    {"youtube.co.za", true, false, false},
+-    {"youtube.com", true, false, false},
+-    {"youtube.com.ar", true, false, false},
+-    {"youtube.com.au", true, false, false},
+-    {"youtube.com.az", true, false, false},
+-    {"youtube.com.bh", true, false, false},
+-    {"youtube.com.bo", true, false, false},
+-    {"youtube.com.br", true, false, false},
+-    {"youtube.com.by", true, false, false},
+-    {"youtube.com.co", true, false, false},
+-    {"youtube.com.do", true, false, false},
+-    {"youtube.com.ee", true, false, false},
+-    {"youtube.com.eg", true, false, false},
+-    {"youtube.com.es", true, false, false},
+-    {"youtube.com.gh", true, false, false},
+-    {"youtube.com.gr", true, false, false},
+-    {"youtube.com.gt", true, false, false},
+-    {"youtube.com.hk", true, false, false},
+-    {"youtube.com.hr", true, false, false},
+-    {"youtube.com.jm", true, false, false},
+-    {"youtube.com.jo", true, false, false},
+-    {"youtube.com.kw", true, false, false},
+-    {"youtube.com.lb", true, false, false},
+-    {"youtube.com.lv", true, false, false},
+-    {"youtube.com.mk", true, false, false},
+-    {"youtube.com.mt", true, false, false},
+-    {"youtube.com.mx", true, false, false},
+-    {"youtube.com.my", true, false, false},
+-    {"youtube.com.ng", true, false, false},
+-    {"youtube.com.om", true, false, false},
+-    {"youtube.com.pe", true, false, false},
+-    {"youtube.com.ph", true, false, false},
+-    {"youtube.com.pk", true, false, false},
+-    {"youtube.com.pt", true, false, false},
+-    {"youtube.com.qa", true, false, false},
+-    {"youtube.com.ro", true, false, false},
+-    {"youtube.com.sa", true, false, false},
+-    {"youtube.com.sg", true, false, false},
+-    {"youtube.com.tn", true, false, false},
+-    {"youtube.com.tr", true, false, false},
+-    {"youtube.com.tw", true, false, false},
+-    {"youtube.com.ua", true, false, false},
+-    {"youtube.com.uy", true, false, false},
+-    {"youtube.com.ve", true, false, false},
+-    {"youtube.cz", true, false, false},
+-    {"youtube.de", true, false, false},
+-    {"youtube.dk", true, false, false},
+-    {"youtube.ee", true, false, false},
+-    {"youtube.es", true, false, false},
+-    {"youtube.fi", true, false, false},
+-    {"youtube.fr", true, false, false},
+-    {"youtube.ge", true, false, false},
+-    {"youtube.gr", true, false, false},
+-    {"youtube.gt", true, false, false},
+-    {"youtube.hk", true, false, false},
+-    {"youtube.hr", true, false, false},
+-    {"youtube.hu", true, false, false},
+-    {"youtube.ie", true, false, false},
+-    {"youtube.in", true, false, false},
+-    {"youtube.is", true, false, false},
+-    {"youtube.it", true, false, false},
+-    {"youtube.jo", true, false, false},
+-    {"youtube.jp", true, false, false},
+-    {"youtube.kr", true, false, false},
+-    {"youtube.lk", true, false, false},
+-    {"youtube.lt", true, false, false},
+-    {"youtube.lv", true, false, false},
+-    {"youtube.ma", true, false, false},
+-    {"youtube.md", true, false, false},
+-    {"youtube.me", true, false, false},
+-    {"youtube.mk", true, false, false},
+-    {"youtube.mx", true, false, false},
+-    {"youtube.my", true, false, false},
+-    {"youtube.ng", true, false, false},
+-    {"youtube.nl", true, false, false},
+-    {"youtube.no", true, false, false},
+-    {"youtube.pe", true, false, false},
+-    {"youtube.ph", true, false, false},
+-    {"youtube.pk", true, false, false},
+-    {"youtube.pl", true, false, false},
+-    {"youtube.pr", true, false, false},
+-    {"youtube.pt", true, false, false},
+-    {"youtube.qa", true, false, false},
+-    {"youtube.ro", true, false, false},
+-    {"youtube.rs", true, false, false},
+-    {"youtube.ru", true, false, false},
+-    {"youtube.sa", true, false, false},
+-    {"youtube.se", true, false, false},
+-    {"youtube.sg", true, false, false},
+-    {"youtube.si", true, false, false},
+-    {"youtube.sk", true, false, false},
+-    {"youtube.sn", true, false, false},
+-    {"youtube.tn", true, false, false},
+-    {"youtube.ua", true, false, false},
+-    {"youtube.ug", true, false, false},
+-    {"youtube.uy", true, false, false},
+-    {"youtube.vn", true, false, false},
+-    {"youtubeeducation.com", true, false, false},
+-    {"youtubemobilesupport.com", true, false, false},
+-    {"ytimg.com", true, false, false},
+-
+-    // Origins without subdomains and with same-origin collectors.
+-    {"accounts.google.com", false, true, false},
+-    {"apis.google.com", false, true, false},
+-    {"app.google.stackdriver.com", false, true, false},
+-    {"b.mail.google.com", false, true, false},
+-    {"chatenabled.mail.google.com", false, true, false},
+-    {"ddm.google.com", false, true, false},
+-    {"gmail.com", false, true, false},
+-    {"gmail.google.com", false, true, false},
+-    {"mail-attachment.googleusercontent.com", false, true, false},
+-    {"mail.google.com", false, true, false},
+-    {"www.gmail.com", false, true, false},
+-
+-    // Origins without subdomains or same-origin collectors.
+-    {"ad.doubleclick.net", false, false, false},
+-    {"drive.google.com", false, false, false},
+-    {"redirector.googlevideo.com", false, false, false},
+-};
+-
+-const char* const kGoogleStandardCollectors[] = {
+-    "https://beacons.gcp.gvt2.com/domainreliability/upload",
+-    "https://beacons.gvt2.com/domainreliability/upload",
+-    "https://beacons2.gvt2.com/domainreliability/upload",
+-    "https://beacons3.gvt2.com/domainreliability/upload",
+-    "https://beacons4.gvt2.com/domainreliability/upload",
+-    "https://beacons5.gvt2.com/domainreliability/upload",
+-    "https://beacons5.gvt3.com/domainreliability/upload",
+-    "https://clients2.google.com/domainreliability/upload",
+-};
+-
+-const char* const kGoogleOriginSpecificCollectorPathString =
+-    "/domainreliability/upload";
+-
+-std::unique_ptr<const DomainReliabilityConfig> CreateGoogleConfig(
+-    const GoogleConfigParams& params,
+-    bool is_www) {
+-  if (is_www)
+-    DCHECK(params.duplicate_for_www);
+-
+-  std::string hostname = (is_www ? "www." : "") + std::string(params.hostname);
+-  bool include_subdomains = params.include_subdomains && !is_www;
+-
+-  auto config = std::make_unique<DomainReliabilityConfig>();
+-  config->origin = GURL("https://" + hostname + "/");
+-  config->include_subdomains = include_subdomains;
+-  config->collectors.clear();
+-  if (params.include_origin_specific_collector) {
+-    GURL::Replacements replacements;
+-    replacements.SetPathStr(kGoogleOriginSpecificCollectorPathString);
+-    config->collectors.push_back(
+-        std::make_unique<GURL>(config->origin.ReplaceComponents(replacements)));
+-  }
+-  for (const char* collector : kGoogleStandardCollectors) {
+-    config->collectors.push_back(std::make_unique<GURL>(collector));
+-  }
+-  config->success_sample_rate = 0.05;
+-  config->failure_sample_rate = 1.00;
+-  config->path_prefixes.clear();
+-  return config;
+-}
+-
+-}  // namespace
+-
+ std::unique_ptr<const DomainReliabilityConfig> MaybeGetGoogleConfig(
+     const std::string& hostname) {
+   bool is_www_subdomain =
+@@ -578,23 +20,6 @@ std::unique_ptr<const DomainReliabilityC
+   std::unique_ptr<const DomainReliabilityConfig> config;
+   std::unique_ptr<const DomainReliabilityConfig> superdomain_config;
+ 
+-  for (const auto& params : kGoogleConfigs) {
+-    if (params.hostname == hostname) {
+-      config = CreateGoogleConfig(params, false);
+-      break;
+-    }
+-    if (params.duplicate_for_www && is_www_subdomain &&
+-        params.hostname == hostname_parent) {
+-      config = CreateGoogleConfig(params, true);
+-      break;
+-    }
+-    // Don't break out of the loop upon finding a superdomain config, because
+-    // there might be an exact match later on.
+-    if (params.include_subdomains && params.hostname == hostname_parent) {
+-      superdomain_config = CreateGoogleConfig(params, false);
+-    }
+-  }
+-
+   if (config) {
+     DCHECK(config->origin.host() == hostname);
+     return config;
+@@ -613,11 +38,6 @@ std::vector<std::unique_ptr<const Domain
+ GetAllGoogleConfigsForTesting() {
+   std::vector<std::unique_ptr<const DomainReliabilityConfig>> configs_out;
+ 
+-  for (const auto& params : kGoogleConfigs) {
+-    configs_out.push_back(CreateGoogleConfig(params, false));
+-    if (params.duplicate_for_www)
+-      configs_out.push_back(CreateGoogleConfig(params, true));
+-  }
+   return configs_out;
+ }
+ 
+--- components/domain_reliability/uploader.cc.orig
++++ components/domain_reliability/uploader.cc
+@@ -79,7 +79,7 @@ class DomainReliabilityUploaderImpl : pu
+     if (discard_uploads_)
+       discarded_upload_count_++;
+ 
+-    if (discard_uploads_ || shutdown_) {
++    if (true) {
+       DVLOG(1) << "Discarding report instead of uploading.";
+       UploadResult result;
+       result.status = UploadResult::SUCCESS;
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-floc.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-floc.patch
new file mode 100644
index 0000000..3ef84c2
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-floc.patch
@@ -0,0 +1,78 @@
+--- chrome/browser/federated_learning/floc_id_provider_factory.cc.orig
++++ chrome/browser/federated_learning/floc_id_provider_factory.cc
+@@ -49,42 +49,7 @@ FlocIdProviderFactory::~FlocIdProviderFa
+ 
+ KeyedService* FlocIdProviderFactory::BuildServiceInstanceFor(
+     content::BrowserContext* context) const {
+-  if (!base::FeatureList::IsEnabled(kFederatedLearningOfCohorts))
+-    return nullptr;
+-
+-  Profile* profile = Profile::FromBrowserContext(context);
+-
+-  syncer::SyncService* sync_service =
+-      SyncServiceFactory::GetForProfile(profile);
+-  if (!sync_service)
+-    return nullptr;
+-
+-  PrivacySandboxSettings* privacy_sandbox_settings =
+-      PrivacySandboxSettingsFactory::GetForProfile(profile);
+-  if (!privacy_sandbox_settings)
+-    return nullptr;
+-
+-  FlocRemotePermissionService* floc_remote_permission_service =
+-      FlocRemotePermissionServiceFactory::GetForProfile(profile);
+-  if (!floc_remote_permission_service)
+-    return nullptr;
+-
+-  history::HistoryService* history_service =
+-      HistoryServiceFactory::GetForProfile(profile,
+-                                           ServiceAccessType::IMPLICIT_ACCESS);
+-  if (!history_service)
+-    return nullptr;
+-
+-  syncer::UserEventService* user_event_service =
+-      browser_sync::UserEventServiceFactory::GetForProfile(profile);
+-  if (!user_event_service)
+-    return nullptr;
+-
+-  auto floc_event_logger = std::make_unique<FlocEventLogger>(
+-      sync_service, floc_remote_permission_service, user_event_service);
+-
+-  return new FlocIdProviderImpl(profile->GetPrefs(), privacy_sandbox_settings,
+-                                history_service, std::move(floc_event_logger));
++  return nullptr;
+ }
+ 
+ }  // namespace federated_learning
+--- chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc.orig
++++ chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc
+@@ -132,8 +132,7 @@ bool ShouldDisablePrivacySandbox(
+ 
+ // Returns whether FLoC is allowable by the current state of |pref_service|.
+ bool IsFlocAllowedByPrefs(PrefService* pref_service) {
+-  return pref_service->GetBoolean(prefs::kPrivacySandboxFlocEnabled) &&
+-         pref_service->GetBoolean(prefs::kPrivacySandboxApisEnabled);
++  return false;
+ }
+ 
+ // Returns the number of days in |time|, rounded to the closest day by hour if
+@@ -207,7 +206,7 @@ PrivacySandboxSettings::PrivacySandboxSe
+ PrivacySandboxSettings::~PrivacySandboxSettings() = default;
+ 
+ bool PrivacySandboxSettings::IsFlocAllowed() const {
+-  return IsFlocAllowedByPrefs(pref_service_);
++  return false;
+ }
+ 
+ bool PrivacySandboxSettings::IsFlocAllowedForContext(
+--- components/privacy_sandbox/privacy_sandbox_prefs.cc.orig
++++ components/privacy_sandbox/privacy_sandbox_prefs.cc
+@@ -42,7 +42,7 @@ void RegisterProfilePrefs(PrefRegistrySi
+   registry->RegisterTimePref(prefs::kPrivacySandboxFlocDataAccessibleSince,
+                              base::Time());
+   registry->RegisterBooleanPref(
+-      prefs::kPrivacySandboxFlocEnabled, true,
++      prefs::kPrivacySandboxFlocEnabled, false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+ }
+ 
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch
new file mode 100644
index 0000000..e969364
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch
@@ -0,0 +1,121 @@
+# Disables references to fonts.googleapis.com
+
+--- chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html.orig
++++ chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html
+@@ -5,7 +5,7 @@
+ <meta name="viewport"
+       content="initial-scale=1, minimum-scale=1,width=device-width">
+ <title>$i18n{blockPageTitle}</title>
+-<link href="https://fonts.googleapis.com/css?family=Google+Sans" rel="stylesheet">
++<link href="chrome://resources/css/roboto.css" rel="stylesheet">
+ <link rel="stylesheet" href="../../../../../../../components/security_interstitials/core/common/resources/interstitial_core.css">
+ <link rel="stylesheet" href="../../../../../supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.css">
+ </head>
+--- chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css.orig
++++ chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css
+@@ -2,7 +2,7 @@
+  * Use of this source code is governed by a BSD-style license that can be
+  * found in the LICENSE file. */
+ 
+-@import url(https://fonts.googleapis.com/css?family=Roboto);
++@import url(chrome://resources/css/roboto.css);
+ 
+ body {
+     margin: 0 0 20px 0;
+--- chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css.orig
++++ chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css
+@@ -2,7 +2,7 @@
+  * Use of this source code is governed by a BSD-style license that can be
+  * found in the LICENSE file. */
+ 
+-@import url(https://fonts.googleapis.com/css?family=Roboto);
++@import url(chrome://resources/css/roboto.css);
+ 
+ body {
+   margin: 0 0 20px 0;
+--- chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.html.orig
++++ chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.html
+@@ -5,7 +5,7 @@
+ <meta name="viewport"
+     content="initial-scale=1, minimum-scale=1, width=device-width">
+ <title>$i18n{blockPageTitle}</title>
+-<link href="https://fonts.googleapis.com/css?family=Google+Sans" rel="stylesheet">
++<link href="chrome://resources/css/roboto.css" rel="stylesheet">
+ <link rel="stylesheet" href="../../../../../components/security_interstitials/core/common/resources/interstitial_core.css">
+ <link rel="stylesheet" href="supervised_user_block_interstitial.css">
+ <script src="../../../../../ui/webui/resources/js/cr.js"></script>
+--- components/dom_distiller/content/browser/dom_distiller_viewer_source.cc.orig
++++ components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
+@@ -300,7 +300,7 @@ bool DomDistillerViewerSource::ShouldSer
+ std::string DomDistillerViewerSource::GetContentSecurityPolicy(
+     network::mojom::CSPDirectiveName directive) {
+   if (directive == network::mojom::CSPDirectiveName::StyleSrc) {
+-    return "style-src 'self' https://fonts.googleapis.com;";
++    return "style-src 'self';";
+   } else if (directive == network::mojom::CSPDirectiveName::ChildSrc) {
+     return "child-src *;";
+   } else if (directive ==
+--- components/dom_distiller/core/html/preview.html.orig
++++ components/dom_distiller/core/html/preview.html
+@@ -11,7 +11,7 @@ found in the LICENSE file.
+   <meta name="theme-color" id="theme-color">
+   <title>Title goes here and it could be kind of lengthy - Publisher name</title>
+   <link href="../css/distilledpage.css" rel="stylesheet" type="text/css">
+-  <link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
++  <link href='chrome://resources/css/roboto.css' rel='stylesheet' type='text/css'>
+   <style>
+     .english :lang(th) {display: none}
+     .english :lang(zh) {display: none}
+--- components/dom_distiller/core/javascript/dom_distiller_viewer.js.orig
++++ components/dom_distiller/core/javascript/dom_distiller_viewer.js
+@@ -109,7 +109,7 @@ function maybeSetWebFont() {
+   }
+ 
+   const e = document.createElement('link');
+-  e.href = 'https://fonts.googleapis.com/css?family=Roboto';
++  e.href = 'chrome://resources/css/roboto.css';
+   e.rel = 'stylesheet';
+   e.type = 'text/css';
+   document.head.appendChild(e);
+--- third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css.orig
++++ third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
+@@ -12,8 +12,7 @@
+  * See the License for the specific language governing permissions and
+  * limitations under the License. */
+ 
+-@import "https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset=latin,cyrillic-ext,greek-ext,cyrillic,greek,vietnamese,latin-ext";
+-@import "https://fonts.googleapis.com/css?family=Source+Code+Pro";
++@import "chrome://resources/css/roboto.css";
+ 
+ body,
+ table,
+--- tools/md_browser/base.css.orig
++++ tools/md_browser/base.css
+@@ -16,8 +16,7 @@
+ 
+ /* Common styles and definitions. */
+ 
+-@import "//fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset=latin,cyrillic-ext,greek-ext,cyrillic,greek,vietnamese,latin-ext";
+-@import "//fonts.googleapis.com/css?family=Source+Code+Pro";
++@import "chrome://resources/css/roboto.css";
+ *,
+ *::after,
+ *::before {
+@@ -72,7 +71,7 @@ ul, ol {
+   user-select: none;
+ }
+ .u-monospace {
+-  font-family: 'Source Code Pro', monospace;
++  font-family: monospace;
+ }
+ 
+ /* Common.soy */
+@@ -82,7 +81,7 @@ ul, ol {
+   color: #000;
+   display: -ms-flexbox;
+   display: flex;
+-  font: 14px/1.54 'Open Sans', sans-serif;
++  font: 14px/1.54 'Roboto', sans-serif;
+   min-height: 100vh;
+   -ms-flex-direction: column;
+   flex-direction: column;
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-gaia.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-gaia.patch
new file mode 100644
index 0000000..bc27e5d
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-gaia.patch
@@ -0,0 +1,71 @@
+# Disables Gaia code
+# Somehow it is still activated even without being signed-in: https://github.com/Eloston/ungoogled-chromium/issues/104
+
+--- google_apis/gaia/gaia_auth_fetcher.cc.orig
++++ google_apis/gaia/gaia_auth_fetcher.cc
+@@ -293,65 +293,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
+     network::mojom::CredentialsMode credentials_mode,
+     const net::NetworkTrafficAnnotationTag& traffic_annotation) {
+   DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
+-
+-  auto resource_request = std::make_unique<network::ResourceRequest>();
+-  resource_request->url = gaia_gurl;
+-  original_url_ = gaia_gurl;
+-
+-  if (credentials_mode != network::mojom::CredentialsMode::kOmit) {
+-    DCHECK_EQ(GaiaUrls::GetInstance()->gaia_url(), gaia_gurl.GetOrigin())
+-        << gaia_gurl;
+-    url::Origin origin =
+-        url::Origin::Create(GaiaUrls::GetInstance()->gaia_url());
+-    resource_request->site_for_cookies =
+-        net::SiteForCookies::FromOrigin(origin);
+-    resource_request->trusted_params =
+-        network::ResourceRequest::TrustedParams();
+-    resource_request->trusted_params->isolation_info =
+-        net::IsolationInfo::CreateForInternalRequest(origin);
+-  }
+-
+-  if (!body.empty())
+-    resource_request->method = "POST";
+-
+-  if (!headers.empty())
+-    resource_request->headers.AddHeadersFromString(headers);
+-
+-  // The Gaia token exchange requests do not require any cookie-based
+-  // identification as part of requests.  We suppress sending any cookies to
+-  // maintain a separation between the user's browsing and Chrome's internal
+-  // services.  Where such mixing is desired (MergeSession or OAuthLogin), it
+-  // will be done explicitly.
+-  resource_request->credentials_mode = credentials_mode;
+-
+-  url_loader_ = network::SimpleURLLoader::Create(std::move(resource_request),
+-                                                 traffic_annotation);
+-  if (!body.empty()) {
+-    DCHECK(!body_content_type.empty());
+-    url_loader_->AttachStringForUpload(body, body_content_type);
+-  }
+-
+-  url_loader_->SetAllowHttpErrorResults(true);
+-
+-  VLOG(2) << "Gaia fetcher URL: " << gaia_gurl.spec();
+-  VLOG(2) << "Gaia fetcher headers: " << headers;
+-  VLOG(2) << "Gaia fetcher body: " << body;
+-
+-  // Fetchers are sometimes cancelled because a network change was detected,
+-  // especially at startup and after sign-in on ChromeOS. Retrying once should
+-  // be enough in those cases; let the fetcher retry up to 3 times just in case.
+-  // http://crbug.com/163710
+-  url_loader_->SetRetryOptions(
+-      3, network::SimpleURLLoader::RETRY_ON_NETWORK_CHANGE);
+-
+-  fetch_pending_ = true;
+-
+-  // Unretained is OK below as |url_loader_| is owned by this.
+-  url_loader_->DownloadToString(
+-      url_loader_factory_.get(),
+-      base::BindOnce(&GaiaAuthFetcher::OnURLLoadComplete,
+-                     base::Unretained(this)),
+-      kMaxMessageSize);
+ }
+ 
+ // static
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-gcm.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-gcm.patch
new file mode 100644
index 0000000..bafa024
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-gcm.patch
@@ -0,0 +1,65 @@
+# Disable Google Cloud Messaging (GCM) client
+
+--- components/gcm_driver/gcm_client_impl.cc.orig
++++ components/gcm_driver/gcm_client_impl.cc
+@@ -465,6 +465,7 @@ void GCMClientImpl::StartGCM() {
+ 
+ void GCMClientImpl::InitializeMCSClient() {
+   DCHECK(network_connection_tracker_);
++  return;
+   std::vector<GURL> endpoints;
+   endpoints.push_back(gservices_settings_.GetMCSMainEndpoint());
+   GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint();
+@@ -670,27 +671,6 @@ void GCMClientImpl::RemoveHeartbeatInter
+ 
+ void GCMClientImpl::StartCheckin() {
+   DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
+-
+-  // Make sure no checkin is in progress.
+-  if (checkin_request_)
+-    return;
+-
+-  checkin_proto::ChromeBuildProto chrome_build_proto;
+-  ToCheckinProtoVersion(chrome_build_info_, &chrome_build_proto);
+-  CheckinRequest::RequestInfo request_info(device_checkin_info_.android_id,
+-                                           device_checkin_info_.secret,
+-                                           device_checkin_info_.account_tokens,
+-                                           gservices_settings_.digest(),
+-                                           chrome_build_proto);
+-  checkin_request_ = std::make_unique<CheckinRequest>(
+-      gservices_settings_.GetCheckinURL(), request_info, GetGCMBackoffPolicy(),
+-      base::BindOnce(&GCMClientImpl::OnCheckinCompleted,
+-                     weak_ptr_factory_.GetWeakPtr()),
+-      url_loader_factory_, io_task_runner_, &recorder_);
+-  // Taking a snapshot of the accounts count here, as there might be an asynch
+-  // update of the account tokens while checkin is in progress.
+-  device_checkin_info_.SnapshotCheckinAccounts();
+-  checkin_request_->Start();
+ }
+ 
+ void GCMClientImpl::OnCheckinCompleted(
+@@ -747,24 +727,6 @@ void GCMClientImpl::SetGServicesSettings
+ 
+ void GCMClientImpl::SchedulePeriodicCheckin() {
+   DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
+-
+-  // Make sure no checkin is in progress.
+-  if (checkin_request_.get() || !device_checkin_info_.accounts_set)
+-    return;
+-
+-  // There should be only one periodic checkin pending at a time. Removing
+-  // pending periodic checkin to schedule a new one.
+-  periodic_checkin_ptr_factory_.InvalidateWeakPtrs();
+-
+-  base::TimeDelta time_to_next_checkin = GetTimeToNextCheckin();
+-  if (time_to_next_checkin < base::TimeDelta())
+-    time_to_next_checkin = base::TimeDelta();
+-
+-  io_task_runner_->PostDelayedTask(
+-      FROM_HERE,
+-      base::BindOnce(&GCMClientImpl::StartCheckin,
+-                     periodic_checkin_ptr_factory_.GetWeakPtr()),
+-      time_to_next_checkin);
+ }
+ 
+ base::TimeDelta GCMClientImpl::GetTimeToNextCheckin() const {
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-google-host-detection.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-google-host-detection.patch
new file mode 100644
index 0000000..846904d
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-google-host-detection.patch
@@ -0,0 +1,613 @@
+# Disables various detections of Google hosts and functionality specific to them
+
+--- chrome/common/google_url_loader_throttle.cc.orig
++++ chrome/common/google_url_loader_throttle.cc
+@@ -19,10 +19,6 @@
+ #include "ui/base/device_form_factor.h"
+ #endif
+ 
+-#if BUILDFLAG(ENABLE_EXTENSIONS)
+-#include "extensions/common/extension_urls.h"
+-#endif
+-
+ namespace {
+ 
+ #if defined(OS_ANDROID)
+@@ -65,52 +61,6 @@ void GoogleURLLoaderThrottle::DetachFrom
+ void GoogleURLLoaderThrottle::WillStartRequest(
+     network::ResourceRequest* request,
+     bool* defer) {
+-  if (dynamic_params_.force_safe_search) {
+-    GURL new_url;
+-    safe_search_util::ForceGoogleSafeSearch(request->url, &new_url);
+-    if (!new_url.is_empty())
+-      request->url = new_url;
+-  }
+-
+-  static_assert(safe_search_util::YOUTUBE_RESTRICT_OFF == 0,
+-                "OFF must be first");
+-  if (dynamic_params_.youtube_restrict >
+-          safe_search_util::YOUTUBE_RESTRICT_OFF &&
+-      dynamic_params_.youtube_restrict <
+-          safe_search_util::YOUTUBE_RESTRICT_COUNT) {
+-    safe_search_util::ForceYouTubeRestrict(
+-        request->url, &request->cors_exempt_headers,
+-        static_cast<safe_search_util::YouTubeRestrictMode>(
+-            dynamic_params_.youtube_restrict));
+-  }
+-
+-  if (!dynamic_params_.allowed_domains_for_apps.empty() &&
+-      request->url.DomainIs("google.com")) {
+-    request->cors_exempt_headers.SetHeader(
+-        safe_search_util::kGoogleAppsAllowedDomains,
+-        dynamic_params_.allowed_domains_for_apps);
+-  }
+-
+-#if defined(OS_ANDROID)
+-  if (!client_data_header_.empty() &&
+-      google_util::IsGoogleAssociatedDomainUrl(request->url)) {
+-    request->cors_exempt_headers.SetHeader(kCCTClientDataHeader,
+-                                           client_data_header_);
+-  }
+-
+-  bool is_google_homepage_or_search =
+-      google_util::IsGoogleHomePageUrl(request->url) ||
+-      google_util::IsGoogleSearchUrl(request->url);
+-  if (is_google_homepage_or_search) {
+-    if (base::FeatureList::IsEnabled(features::kRequestDesktopSiteForTablets) &&
+-        ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) {
+-      request->headers.SetHeader(kRequestDesktopDataHeader,
+-                                 is_tab_large_enough_ ? "1" : "0");
+-      base::UmaHistogramBoolean("Android.RequestDesktopSite.TabletEligible",
+-                                is_tab_large_enough_);
+-    }
+-  }
+-#endif
+ }
+ 
+ void GoogleURLLoaderThrottle::WillRedirectRequest(
+@@ -120,37 +70,6 @@ void GoogleURLLoaderThrottle::WillRedire
+     std::vector<std::string>* to_be_removed_headers,
+     net::HttpRequestHeaders* modified_headers,
+     net::HttpRequestHeaders* modified_cors_exempt_headers) {
+-  // URLLoaderThrottles can only change the redirect URL when the network
+-  // service is enabled. The non-network service path handles this in
+-  // ChromeNetworkDelegate.
+-  if (dynamic_params_.force_safe_search) {
+-    safe_search_util::ForceGoogleSafeSearch(redirect_info->new_url,
+-                                            &redirect_info->new_url);
+-  }
+-
+-  if (dynamic_params_.youtube_restrict >
+-          safe_search_util::YOUTUBE_RESTRICT_OFF &&
+-      dynamic_params_.youtube_restrict <
+-          safe_search_util::YOUTUBE_RESTRICT_COUNT) {
+-    safe_search_util::ForceYouTubeRestrict(
+-        redirect_info->new_url, modified_cors_exempt_headers,
+-        static_cast<safe_search_util::YouTubeRestrictMode>(
+-            dynamic_params_.youtube_restrict));
+-  }
+-
+-  if (!dynamic_params_.allowed_domains_for_apps.empty() &&
+-      redirect_info->new_url.DomainIs("google.com")) {
+-    modified_cors_exempt_headers->SetHeader(
+-        safe_search_util::kGoogleAppsAllowedDomains,
+-        dynamic_params_.allowed_domains_for_apps);
+-  }
+-
+-#if defined(OS_ANDROID)
+-  if (!client_data_header_.empty() &&
+-      !google_util::IsGoogleAssociatedDomainUrl(redirect_info->new_url)) {
+-    to_be_removed_headers->push_back(kCCTClientDataHeader);
+-  }
+-#endif
+ }
+ 
+ #if BUILDFLAG(ENABLE_EXTENSIONS)
+@@ -158,23 +77,5 @@ void GoogleURLLoaderThrottle::WillProces
+     const GURL& response_url,
+     network::mojom::URLResponseHead* response_head,
+     bool* defer) {
+-  // Built-in additional protection for the chrome web store origin by ensuring
+-  // that the X-Frame-Options protection mechanism is set to either DENY or
+-  // SAMEORIGIN.
+-  GURL webstore_url(extension_urls::GetWebstoreLaunchURL());
+-  if (response_url.SchemeIsHTTPOrHTTPS() &&
+-      response_url.DomainIs(webstore_url.host_piece())) {
+-    // TODO(mkwst): Consider shifting this to a NavigationThrottle rather than
+-    // relying on implicit ordering between this check and the time at which
+-    // ParsedHeaders is created.
+-    CHECK(response_head);
+-    CHECK(response_head->parsed_headers);
+-    if (response_head->parsed_headers->xfo !=
+-        network::mojom::XFrameOptionsValue::kDeny) {
+-      response_head->headers->SetHeader("X-Frame-Options", "SAMEORIGIN");
+-      response_head->parsed_headers->xfo =
+-          network::mojom::XFrameOptionsValue::kSameOrigin;
+-    }
+-  }
+ }
+ #endif
+--- components/google/core/common/google_util.cc.orig
++++ components/google/core/common/google_util.cc
+@@ -33,112 +33,6 @@ namespace google_util {
+ 
+ namespace {
+ 
+-bool IsPathHomePageBase(base::StringPiece path) {
+-  return (path == "/") || (path == "/webhp");
+-}
+-
+-// Removes a single trailing dot if present in |host|.
+-void StripTrailingDot(base::StringPiece* host) {
+-  if (base::EndsWith(*host, "."))
+-    host->remove_suffix(1);
+-}
+-
+-// True if the given canonical |host| is "[www.]<domain_in_lower_case>.<TLD>"
+-// with a valid TLD that appears in |allowed_tlds|. If |subdomain_permission| is
+-// ALLOW_SUBDOMAIN, we check against host "*.<domain_in_lower_case>.<TLD>"
+-// instead.
+-template <typename Container>
+-bool IsValidHostName(base::StringPiece host,
+-                     base::StringPiece domain_in_lower_case,
+-                     SubdomainPermission subdomain_permission,
+-                     const Container& allowed_tlds) {
+-  // Fast path to avoid searching the registry set.
+-  if (host.find(domain_in_lower_case) == base::StringPiece::npos)
+-    return false;
+-
+-  size_t tld_length =
+-      net::registry_controlled_domains::GetCanonicalHostRegistryLength(
+-          host, net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
+-          net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
+-  if ((tld_length == 0) || (tld_length == std::string::npos))
+-    return false;
+-
+-  // Removes the tld and the preceding dot.
+-  base::StringPiece host_minus_tld =
+-      host.substr(0, host.length() - tld_length - 1);
+-
+-  base::StringPiece tld = host.substr(host.length() - tld_length);
+-  // Remove the trailing dot from tld if present, as for Google domains it's the
+-  // same page.
+-  StripTrailingDot(&tld);
+-  if (!allowed_tlds.contains(tld))
+-    return false;
+-
+-  if (base::LowerCaseEqualsASCII(host_minus_tld, domain_in_lower_case))
+-    return true;
+-
+-  if (subdomain_permission == ALLOW_SUBDOMAIN) {
+-    std::string dot_domain = base::StrCat({".", domain_in_lower_case});
+-    return base::EndsWith(host_minus_tld, dot_domain,
+-                          base::CompareCase::INSENSITIVE_ASCII);
+-  }
+-
+-  std::string www_domain = base::StrCat({"www.", domain_in_lower_case});
+-  return base::LowerCaseEqualsASCII(host_minus_tld, www_domain);
+-}
+-
+-// True if |url| is a valid URL with HTTP or HTTPS scheme. If |port_permission|
+-// is DISALLOW_NON_STANDARD_PORTS, this also requires |url| to use the standard
+-// port for its scheme (80 for HTTP, 443 for HTTPS).
+-bool IsValidURL(const GURL& url, PortPermission port_permission) {
+-  static bool g_ignore_port_numbers =
+-      base::CommandLine::ForCurrentProcess()->HasSwitch(
+-          switches::kIgnoreGooglePortNumbers);
+-  return url.is_valid() && url.SchemeIsHTTPOrHTTPS() &&
+-         (url.port().empty() || g_ignore_port_numbers ||
+-          (port_permission == ALLOW_NON_STANDARD_PORTS));
+-}
+-
+-bool IsCanonicalHostGoogleHostname(base::StringPiece canonical_host,
+-                                   SubdomainPermission subdomain_permission) {
+-  const GURL& base_url(CommandLineGoogleBaseURL());
+-  if (base_url.is_valid() && (canonical_host == base_url.host_piece()))
+-    return true;
+-
+-  static constexpr auto google_tlds =
+-      base::MakeFixedFlatSet<base::StringPiece>({GOOGLE_TLD_LIST});
+-  return IsValidHostName(canonical_host, "google", subdomain_permission,
+-                         google_tlds);
+-}
+-
+-bool IsCanonicalHostYoutubeHostname(base::StringPiece canonical_host,
+-                                    SubdomainPermission subdomain_permission) {
+-  static constexpr auto youtube_tlds =
+-      base::MakeFixedFlatSet<base::StringPiece>({YOUTUBE_TLD_LIST});
+-
+-  return IsValidHostName(canonical_host, "youtube", subdomain_permission,
+-                         youtube_tlds) ||
+-         IsValidHostName(canonical_host, "youtubekids", subdomain_permission,
+-                         youtube_tlds);
+-}
+-
+-// True if |url| is a valid URL with a host that is in the static list of
+-// Google subdomains for google search, and an HTTP or HTTPS scheme. Requires
+-// |url| to use the standard port for its scheme (80 for HTTP, 443 for HTTPS).
+-bool IsGoogleSearchSubdomainUrl(const GURL& url) {
+-  if (!IsValidURL(url, PortPermission::DISALLOW_NON_STANDARD_PORTS))
+-    return false;
+-
+-  base::StringPiece host(url.host_piece());
+-  StripTrailingDot(&host);
+-
+-  static constexpr auto google_subdomains =
+-      base::MakeFixedFlatSet<base::StringPiece>(
+-          {"ipv4.google.com", "ipv6.google.com"});
+-
+-  return google_subdomains.contains(host);
+-}
+-
+ }  // namespace
+ 
+ // Global functions -----------------------------------------------------------
+@@ -146,12 +40,6 @@ bool IsGoogleSearchSubdomainUrl(const GU
+ const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/";
+ 
+ bool HasGoogleSearchQueryParam(base::StringPiece str) {
+-  url::Component query(0, static_cast<int>(str.length())), key, value;
+-  while (url::ExtractQueryKeyValue(str.data(), &query, &key, &value)) {
+-    base::StringPiece key_str = str.substr(key.begin, key.len);
+-    if (key_str == "q" || key_str == "as_q" || key_str == "imgurl")
+-      return true;
+-  }
+   return false;
+ }
+ 
+@@ -162,161 +50,53 @@ std::string GetGoogleLocale(const std::s
+ 
+ GURL AppendGoogleLocaleParam(const GURL& url,
+                              const std::string& application_locale) {
+-  return net::AppendQueryParameter(url, "hl",
+-                                   GetGoogleLocale(application_locale));
++  return url;
+ }
+ 
+ std::string GetGoogleCountryCode(const GURL& google_homepage_url) {
+-  base::StringPiece google_hostname = google_homepage_url.host_piece();
+-  // TODO(igorcov): This needs a fix for case when the host has a trailing dot,
+-  // like "google.com./". https://crbug.com/720295.
+-  const size_t last_dot = google_hostname.find_last_of('.');
+-  if (last_dot == std::string::npos)
+-    return std::string();
+-  base::StringPiece country_code = google_hostname.substr(last_dot + 1);
+-  // Assume the com TLD implies the US.
+-  if (country_code == "com")
+-    return "us";
+-  // Google uses the Unicode Common Locale Data Repository (CLDR), and the CLDR
+-  // code for the UK is "gb".
+-  if (country_code == "uk")
+-    return "gb";
+-  // Catalonia does not have a CLDR country code, since it's a region in Spain,
+-  // so use Spain instead.
+-  if (country_code == "cat")
+-    return "es";
+-  return std::string(country_code);
++  return "nolocale";
+ }
+ 
+ GURL GetGoogleSearchURL(const GURL& google_homepage_url) {
+-  // To transform the homepage URL into the corresponding search URL, add the
+-  // "search" and the "q=" query string.
+-  GURL::Replacements replacements;
+-  replacements.SetPathStr("search");
+-  replacements.SetQueryStr("q=");
+-  return google_homepage_url.ReplaceComponents(replacements);
++  return google_homepage_url;
+ }
+ 
+ const GURL& CommandLineGoogleBaseURL() {
+-  // Unit tests may add command-line flags after the first call to this
+-  // function, so we don't simply initialize a static |base_url| directly and
+-  // then unconditionally return it.
+-  static base::NoDestructor<std::string> switch_value;
+   static base::NoDestructor<GURL> base_url;
+-  std::string current_switch_value(
+-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+-          switches::kGoogleBaseURL));
+-  if (current_switch_value != *switch_value) {
+-    *switch_value = current_switch_value;
+-    *base_url = url_formatter::FixupURL(*switch_value, std::string());
+-    if (!base_url->is_valid() || base_url->has_query() || base_url->has_ref())
+-      *base_url = GURL();
+-  }
++  *base_url = GURL();
+   return *base_url;
+ }
+ 
+ bool StartsWithCommandLineGoogleBaseURL(const GURL& url) {
+-  const GURL& base_url(CommandLineGoogleBaseURL());
+-  return base_url.is_valid() &&
+-         base::StartsWith(url.possibly_invalid_spec(), base_url.spec(),
+-                          base::CompareCase::SENSITIVE);
++  return false;
+ }
+ 
+ bool IsGoogleHostname(base::StringPiece host,
+                       SubdomainPermission subdomain_permission) {
+-  url::CanonHostInfo host_info;
+-  return IsCanonicalHostGoogleHostname(net::CanonicalizeHost(host, &host_info),
+-                                       subdomain_permission);
++  return false;
+ }
+ 
+ bool IsGoogleDomainUrl(const GURL& url,
+                        SubdomainPermission subdomain_permission,
+                        PortPermission port_permission) {
+-  return IsValidURL(url, port_permission) &&
+-         IsCanonicalHostGoogleHostname(url.host_piece(), subdomain_permission);
++  return false;
+ }
+ 
+ bool IsGoogleHomePageUrl(const GURL& url) {
+-  // First check to see if this has a Google domain.
+-  if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN,
+-                         DISALLOW_NON_STANDARD_PORTS) &&
+-      !IsGoogleSearchSubdomainUrl(url)) {
+-    return false;
+-  }
+-
+-  // Make sure the path is a known home page path.
+-  base::StringPiece path(url.path_piece());
+-  return IsPathHomePageBase(path) ||
+-         base::StartsWith(path, "/ig", base::CompareCase::INSENSITIVE_ASCII);
++  return false;
+ }
+ 
+ bool IsGoogleSearchUrl(const GURL& url) {
+-  // First check to see if this has a Google domain.
+-  if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN,
+-                         DISALLOW_NON_STANDARD_PORTS) &&
+-      !IsGoogleSearchSubdomainUrl(url)) {
+-    return false;
+-  }
+-
+-  // Make sure the path is a known search path.
+-  base::StringPiece path(url.path_piece());
+-  bool is_home_page_base = IsPathHomePageBase(path);
+-  if (!is_home_page_base && path != "/search" && path != "/imgres")
+-    return false;
+-
+-  // Check for query parameter in URL parameter and hash fragment, depending on
+-  // the path type.
+-  return HasGoogleSearchQueryParam(url.ref_piece()) ||
+-         (!is_home_page_base && HasGoogleSearchQueryParam(url.query_piece()));
++  return false;
+ }
+ 
+ bool IsYoutubeDomainUrl(const GURL& url,
+                         SubdomainPermission subdomain_permission,
+                         PortPermission port_permission) {
+-  return IsValidURL(url, port_permission) &&
+-         IsCanonicalHostYoutubeHostname(url.host_piece(), subdomain_permission);
++  return false;
+ }
+ 
+ bool IsGoogleAssociatedDomainUrl(const GURL& url) {
+-  if (IsGoogleDomainUrl(url, ALLOW_SUBDOMAIN, ALLOW_NON_STANDARD_PORTS))
+-    return true;
+-
+-  if (IsYoutubeDomainUrl(url, ALLOW_SUBDOMAIN, ALLOW_NON_STANDARD_PORTS))
+-    return true;
+-
+-  // Some domains don't have international TLD extensions, so testing for them
+-  // is very straightforward.
+-  static const char* kSuffixesToSetHeadersFor[] = {
+-      ".android.com",
+-      ".doubleclick.com",
+-      ".doubleclick.net",
+-      ".ggpht.com",
+-      ".googleadservices.com",
+-      ".googleapis.com",
+-      ".googlesyndication.com",
+-      ".googleusercontent.com",
+-      ".googlevideo.com",
+-      ".gstatic.com",
+-      ".litepages.googlezip.net",
+-      ".ytimg.com",
+-  };
+-  const std::string host = url.host();
+-  for (size_t i = 0; i < base::size(kSuffixesToSetHeadersFor); ++i) {
+-    if (base::EndsWith(host, kSuffixesToSetHeadersFor[i],
+-                       base::CompareCase::INSENSITIVE_ASCII)) {
+-      return true;
+-    }
+-  }
+-
+-  // Exact hostnames in lowercase to set headers for.
+-  static const char* kHostsToSetHeadersFor[] = {
+-      "googleweblight.com",
+-  };
+-  for (size_t i = 0; i < base::size(kHostsToSetHeadersFor); ++i) {
+-    if (base::LowerCaseEqualsASCII(host, kHostsToSetHeadersFor[i]))
+-      return true;
+-  }
+-
+   return false;
+ }
+ 
+--- components/page_load_metrics/browser/page_load_metrics_util.cc.orig
++++ components/page_load_metrics/browser/page_load_metrics_util.cc
+@@ -196,9 +196,7 @@ bool DidObserveLoadingBehaviorInAnyFrame
+ }
+ 
+ bool IsGoogleSearchHostname(const GURL& url) {
+-  absl::optional<std::string> result =
+-      page_load_metrics::GetGoogleHostnamePrefix(url);
+-  return result && result.value() == "www";
++  return false;
+ }
+ 
+ bool IsGoogleSearchResultUrl(const GURL& url) {
+--- components/page_load_metrics/common/page_load_metrics_util.cc.orig
++++ components/page_load_metrics/common/page_load_metrics_util.cc
+@@ -36,38 +36,7 @@ const char* kBufferTimerDelayParamName =
+ }  // namespace
+ 
+ absl::optional<std::string> GetGoogleHostnamePrefix(const GURL& url) {
+-  const size_t registry_length =
+-      net::registry_controlled_domains::GetRegistryLength(
+-          url,
+-
+-          // Do not include unknown registries (registries that don't have any
+-          // matches in effective TLD names).
+-          net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
+-
+-          // Do not include private registries, such as appspot.com. We don't
+-          // want to match URLs like www.google.appspot.com.
+-          net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
+-
+-  const base::StringPiece hostname = url.host_piece();
+-  if (registry_length == 0 || registry_length == std::string::npos ||
+-      registry_length >= hostname.length()) {
+-    return absl::optional<std::string>();
+-  }
+-
+-  // Removes the tld and the preceding dot.
+-  const base::StringPiece hostname_minus_registry =
+-      hostname.substr(0, hostname.length() - (registry_length + 1));
+-
+-  if (hostname_minus_registry == "google")
+-    return std::string("");
+-
+-  if (!base::EndsWith(hostname_minus_registry, ".google",
+-                      base::CompareCase::INSENSITIVE_ASCII)) {
+-    return absl::optional<std::string>();
+-  }
+-
+-  return std::string(hostname_minus_registry.substr(
+-      0, hostname_minus_registry.length() - strlen(".google")));
++  return absl::optional<std::string>();
+ }
+ 
+ bool IsGoogleHostname(const GURL& url) {
+--- components/search_engines/template_url.cc.orig
++++ components/search_engines/template_url.cc
+@@ -527,11 +527,7 @@ std::u16string TemplateURLRef::SearchTer
+ bool TemplateURLRef::HasGoogleBaseURLs(
+     const SearchTermsData& search_terms_data) const {
+   ParseIfNecessary(search_terms_data);
+-  return std::any_of(replacements_.begin(), replacements_.end(),
+-                     [](const Replacement& replacement) {
+-                       return replacement.type == GOOGLE_BASE_URL ||
+-                              replacement.type == GOOGLE_BASE_SUGGEST_URL;
+-                     });
++  return false;
+ }
+ 
+ bool TemplateURLRef::ExtractSearchTermsFromURL(
+--- components/variations/net/variations_http_headers.cc.orig
++++ components/variations/net/variations_http_headers.cc
+@@ -26,10 +26,6 @@
+ 
+ namespace variations {
+ 
+-// The name string for the header for variations information.
+-// Note that prior to M33 this header was named X-Chrome-Variations.
+-const char kClientDataHeader[] = "X-Client-Data";
+-
+ namespace {
+ 
+ // The result of checking whether a request to a URL should have variations
+@@ -238,29 +234,7 @@ class VariationsHeaderHelper {
+   VariationsHeaderHelper& operator=(const VariationsHeaderHelper&) = delete;
+ 
+   bool AppendHeaderIfNeeded(const GURL& url, InIncognito incognito) {
+-    AppendOmniboxOnDeviceSuggestionsHeaderIfNeeded(url, resource_request_);
+-
+-    // Note the criteria for attaching client experiment headers:
+-    // 1. We only transmit to Google owned domains which can evaluate
+-    // experiments.
+-    //    1a. These include hosts which have a standard postfix such as:
+-    //         *.doubleclick.net or *.googlesyndication.com or
+-    //         exactly www.googleadservices.com or
+-    //         international TLD domains *.google.<TLD> or *.youtube.<TLD>.
+-    // 2. Only transmit for non-Incognito profiles.
+-    // 3. For the X-Client-Data header, only include non-empty variation IDs.
+-    if ((incognito == InIncognito::kYes) ||
+-        !ShouldAppendVariationsHeader(url, "Append"))
+-      return false;
+-
+-    if (variations_header_.empty())
+-      return false;
+-
+-    // Set the variations header to cors_exempt_headers rather than headers
+-    // to be exempted from CORS checks.
+-    resource_request_->cors_exempt_headers.SetHeaderIfMissing(
+-        kClientDataHeader, variations_header_);
+-    return true;
++    return false;
+   }
+ 
+  private:
+@@ -328,8 +302,6 @@ void RemoveVariationsHeaderIfNeeded(
+     const net::RedirectInfo& redirect_info,
+     const network::mojom::URLResponseHead& response_head,
+     std::vector<std::string>* to_be_removed_headers) {
+-  if (!ShouldAppendVariationsHeader(redirect_info.new_url, "Remove"))
+-    to_be_removed_headers->push_back(kClientDataHeader);
+ }
+ 
+ std::unique_ptr<network::SimpleURLLoader>
+@@ -359,14 +331,11 @@ CreateSimpleURLLoaderWithVariationsHeade
+ }
+ 
+ bool IsVariationsHeader(const std::string& header_name) {
+-  return header_name == kClientDataHeader ||
+-         header_name == kOmniboxOnDeviceSuggestionsHeader;
++  return false;
+ }
+ 
+ bool HasVariationsHeader(const network::ResourceRequest& request) {
+-  // Note: kOmniboxOnDeviceSuggestionsHeader is not listed because this function
+-  // is only used for testing.
+-  return request.cors_exempt_headers.HasHeader(kClientDataHeader);
++  return false;
+ }
+ 
+ bool ShouldAppendVariationsHeaderForTesting(
+@@ -377,12 +346,6 @@ bool ShouldAppendVariationsHeaderForTest
+ 
+ void UpdateCorsExemptHeaderForVariations(
+     network::mojom::NetworkContextParams* params) {
+-  params->cors_exempt_header_list.push_back(kClientDataHeader);
+-
+-  if (base::FeatureList::IsEnabled(kReportOmniboxOnDeviceSuggestionsHeader)) {
+-    params->cors_exempt_header_list.push_back(
+-        kOmniboxOnDeviceSuggestionsHeader);
+-  }
+ }
+ 
+ }  // namespace variations
+--- net/base/url_util.cc.orig
++++ net/base/url_util.cc
+@@ -442,27 +442,6 @@ bool HasGoogleHost(const GURL& url) {
+ }
+ 
+ bool IsGoogleHost(base::StringPiece host) {
+-  static const char* kGoogleHostSuffixes[] = {
+-      ".google.com",
+-      ".youtube.com",
+-      ".gmail.com",
+-      ".doubleclick.net",
+-      ".gstatic.com",
+-      ".googlevideo.com",
+-      ".googleusercontent.com",
+-      ".googlesyndication.com",
+-      ".google-analytics.com",
+-      ".googleadservices.com",
+-      ".googleapis.com",
+-      ".ytimg.com",
+-  };
+-  for (const char* suffix : kGoogleHostSuffixes) {
+-    // Here it's possible to get away with faster case-sensitive comparisons
+-    // because the list above is all lowercase, and a GURL's host name will
+-    // always be canonicalized to lowercase as well.
+-    if (base::EndsWith(host, suffix))
+-      return true;
+-  }
+   return false;
+ }
+ 
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-mei-preload.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-mei-preload.patch
new file mode 100644
index 0000000..731e85d
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-mei-preload.patch
@@ -0,0 +1,25 @@
+# Disables use of a binary for preloading the Media Engagement index
+# Said binary is: chrome/browser/resources/media/mei_preload/preloaded_data.pb
+# According to media/base/media_switches (for PreloadMediaEngagementData), it
+# "enables a list of origins to be considered as having a high MEI until there
+# is enough local data to determine the user's preferred behavior." This feature
+# does not seem to outweigh the benefit of removing the binary, thus this patch.
+
+--- chrome/BUILD.gn.orig
++++ chrome/BUILD.gn
+@@ -351,7 +351,6 @@ if (!is_android && !is_mac) {
+     }
+ 
+     data_deps += [
+-      "//chrome/browser/resources/media/mei_preload:component",
+       "//third_party/widevine/cdm",
+     ]
+   }
+@@ -1157,7 +1156,6 @@ if (is_win) {
+       ":keystone_registration_framework",
+       ":swiftshader_library",
+       ":widevine_cdm_library",
+-      "//chrome/browser/resources/media/mei_preload:component_bundle",
+     ]
+ 
+     if (is_chrome_branded) {
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-network-time-tracker.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-network-time-tracker.patch
new file mode 100644
index 0000000..fb27026
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-network-time-tracker.patch
@@ -0,0 +1,16 @@
+# Disable Network Time Tracker
+# This connects to Google to check if the system time is correct when a website certificate
+# date seems incorrect, according to https://bugs.chromium.org/p/chromium/issues/detail?id=725232,
+# Fixes https://github.com/Eloston/ungoogled-chromium/issues/302
+
+--- components/network_time/network_time_tracker.cc.orig
++++ components/network_time/network_time_tracker.cc
+@@ -277,7 +277,7 @@ void NetworkTimeTracker::UpdateNetworkTi
+ }
+ 
+ bool NetworkTimeTracker::AreTimeFetchesEnabled() const {
+-  return base::FeatureList::IsEnabled(kNetworkTimeServiceQuerying);
++  return false;
+ }
+ 
+ NetworkTimeTracker::FetchBehavior NetworkTimeTracker::GetFetchBehavior() const {
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch
new file mode 100644
index 0000000..a4e7e8b
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch
@@ -0,0 +1,53 @@
+--- chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc.orig
++++ chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc
+@@ -378,7 +378,7 @@ std::vector<GURL> PrivacySandboxSettings
+ }
+ 
+ bool PrivacySandboxSettings::IsPrivacySandboxAllowed() {
+-  return pref_service_->GetBoolean(prefs::kPrivacySandboxApisEnabled);
++  return false;
+ }
+ 
+ bool PrivacySandboxSettings::IsPrivacySandboxEnabled() {
+@@ -390,8 +390,6 @@ bool PrivacySandboxSettings::IsPrivacySa
+ }
+ 
+ void PrivacySandboxSettings::SetPrivacySandboxEnabled(bool enabled) {
+-  pref_service_->SetBoolean(prefs::kPrivacySandboxManuallyControlled, true);
+-  pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabled, enabled);
+ }
+ 
+ void PrivacySandboxSettings::OnCookiesCleared() {
+--- chrome/browser/resources/settings/privacy_page/privacy_page.html.orig
++++ chrome/browser/resources/settings/privacy_page/privacy_page.html
+@@ -64,19 +64,6 @@
+             sub-label="$i18n{permissionsPageDescription}"
+             on-click="onPermissionsPageClick_"
+             role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
+-        <cr-link-row id="privacySandboxLinkRow"
+-            start-icon="settings20:experiment"
+-            class="hr"
+-            label="$i18n{privacySandboxTitle}"
+-            sub-label="[[computePrivacySandboxSublabel_(
+-                prefs.privacy_sandbox.apis_enabled.*)]]"
+-            on-click="onPrivacySandboxClick_"
+-            external
+-            role-description="$i18n{subpageArrowRoleDescription}">
+-        </cr-link-row>
+-        <a id="privacySandboxLink" href="privacySandbox"
+-            target="_blank" tabindex="-1" aria-disabled="true"
+-            role="none"></a>
+       </div>
+ 
+ <if expr="use_nss_certs">
+--- components/privacy_sandbox/privacy_sandbox_prefs.cc.orig
++++ components/privacy_sandbox/privacy_sandbox_prefs.cc
+@@ -31,7 +31,7 @@ namespace privacy_sandbox {
+ 
+ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+   registry->RegisterBooleanPref(
+-      prefs::kPrivacySandboxApisEnabled, true,
++      prefs::kPrivacySandboxApisEnabled, false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterBooleanPref(
+       prefs::kPrivacySandboxManuallyControlled, false,
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-profile-avatar-downloading.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-profile-avatar-downloading.patch
new file mode 100644
index 0000000..dee938a
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-profile-avatar-downloading.patch
@@ -0,0 +1,14 @@
+# Stop downloading of profile avatar (trk:271:...)
+
+--- chrome/browser/profiles/profile_avatar_downloader.cc.orig
++++ chrome/browser/profiles/profile_avatar_downloader.cc
+@@ -27,8 +27,7 @@ ProfileAvatarDownloader::ProfileAvatarDo
+                                                  FetchCompleteCallback callback)
+     : icon_index_(icon_index), callback_(std::move(callback)) {
+   DCHECK(!callback_.is_null());
+-  GURL url(std::string(kHighResAvatarDownloadUrlPrefix) +
+-           profiles::GetDefaultAvatarIconFileNameAtIndex(icon_index));
++  GURL url(std::string("about:blank"));
+   net::NetworkTrafficAnnotationTag traffic_annotation =
+       net::DefineNetworkTrafficAnnotation("profile_avatar", R"(
+         semantics {
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-signin.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-signin.patch
new file mode 100644
index 0000000..b2b6081
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-signin.patch
@@ -0,0 +1,37 @@
+# Disables browser sign-in
+
+--- chrome/browser/ui/chrome_pages.cc.orig
++++ chrome/browser/ui/chrome_pages.cc
+@@ -480,32 +480,6 @@ GURL GetOSSettingsUrl(const std::string&
+ void ShowBrowserSignin(Browser* browser,
+                        signin_metrics::AccessPoint access_point,
+                        signin::ConsentLevel consent_level) {
+-  Profile* original_profile = browser->profile()->GetOriginalProfile();
+-  DCHECK(original_profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed));
+-
+-  // If the browser's profile is an incognito profile, make sure to use
+-  // a browser window from the original profile. The user cannot sign in
+-  // from an incognito window.
+-  auto displayer =
+-      std::make_unique<ScopedTabbedBrowserDisplayer>(original_profile);
+-  browser = displayer->browser();
+-
+-  profiles::BubbleViewMode bubble_view_mode;
+-  if (IdentityManagerFactory::GetForProfile(original_profile)
+-          ->HasPrimaryAccount(signin::ConsentLevel::kSync)) {
+-    bubble_view_mode = profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH;
+-  } else {
+-    switch (consent_level) {
+-      case signin::ConsentLevel::kSync:
+-        bubble_view_mode = profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN;
+-        break;
+-      case signin::ConsentLevel::kSignin:
+-        bubble_view_mode = profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT;
+-        break;
+-    }
+-  }
+-
+-  browser->signin_view_controller()->ShowSignin(bubble_view_mode, access_point);
+ }
+ 
+ void ShowBrowserSigninOrSettings(Browser* browser,
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-untraceable-urls.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-untraceable-urls.patch
new file mode 100644
index 0000000..612ec7d
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-untraceable-urls.patch
@@ -0,0 +1,92 @@
+# Disable additional URLs that are not caught by the "trk" scheme
+
+--- chrome/browser/plugins/plugins_resource_service.cc.orig
++++ chrome/browser/plugins/plugins_resource_service.cc
+@@ -53,9 +53,6 @@ const int kStartResourceFetchDelayMs = 6
+ // Delay between calls to update the cache 1 day and 2 minutes in testing mode.
+ const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000;
+ 
+-const char kPluginsServerUrl[] =
+-    "https://www.gstatic.com/chrome/config/plugins_3/";
+-
+ GURL GetPluginsServerURL() {
+   std::string filename;
+ #if defined(OS_WIN)
+@@ -70,7 +67,7 @@ GURL GetPluginsServerURL() {
+ #error Unknown platform
+ #endif
+ 
+-  return GURL(kPluginsServerUrl + filename);
++  return GURL("about:blank");
+ }
+ 
+ }  // namespace
+--- components/safe_browsing/content/browser/client_side_model_loader.cc.orig
++++ components/safe_browsing/content/browser/client_side_model_loader.cc
+@@ -61,8 +61,6 @@ std::string ReadFileIntoString(base::Fil
+ // Model Loader strings
+ const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024;
+ const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000;
+-const char ModelLoader::kClientModelUrlPrefix[] =
+-    "https://ssl.gstatic.com/safebrowsing/csd/";
+ const char ModelLoader::kClientModelNamePattern[] =
+     "client_model_v5%s_variation_%d.pb";
+ #if !BUILDFLAG(FULL_SAFE_BROWSING)
+@@ -123,7 +121,7 @@ ModelLoader::ModelLoader(
+     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
+     bool is_extended_reporting)
+     : name_(FillInModelName(is_extended_reporting, GetModelNumber())),
+-      url_(kClientModelUrlPrefix + name_),
++      url_("about:blank"),
+       update_renderers_callback_(update_renderers_callback),
+       url_loader_factory_(url_loader_factory),
+       last_client_model_status_(ClientModelStatus::MODEL_NEVER_FETCHED) {
+@@ -136,7 +134,7 @@ ModelLoader::ModelLoader(
+     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
+     const std::string& model_name)
+     : name_(model_name),
+-      url_(kClientModelUrlPrefix + name_),
++      url_("about:blank"),
+       update_renderers_callback_(update_renderers_callback),
+       url_loader_factory_(url_loader_factory),
+       last_client_model_status_(ClientModelStatus::MODEL_NEVER_FETCHED) {
+--- rlz/lib/financial_ping.cc.orig
++++ rlz/lib/financial_ping.cc
+@@ -338,7 +338,7 @@ FinancialPing::PingResponse FinancialPin
+ 
+   // Open network connection.
+   InternetHandle connection_handle = InternetConnectA(inet_handle,
+-      kFinancialServer, kFinancialPort, "", "", INTERNET_SERVICE_HTTP,
++      "about:blank", kFinancialPort, "", "", INTERNET_SERVICE_HTTP,
+       INTERNET_FLAG_NO_CACHE_WRITE, 0);
+   if (!connection_handle)
+     return PING_FAILURE;
+@@ -382,7 +382,7 @@ FinancialPing::PingResponse FinancialPin
+   return PING_SUCCESSFUL;
+ #else
+   std::string url =
+-      base::StringPrintf("https://%s%s", kFinancialServer, request);
++      base::StringPrintf("https://%s%s", "about:blank", request);
+ 
+   // Use a waitable event to cause this function to block, to match the
+   // wininet implementation.
+--- rlz/lib/lib_values.cc.orig
++++ rlz/lib/lib_values.cc
+@@ -40,7 +40,6 @@ const char kSetDccResponseVariable[] = "
+ //
+ 
+ const char kFinancialPingPath[] = "/tools/pso/ping";
+-const char kFinancialServer[]   = "trk:443:clients1.google.com"; /* not using URLRequest! catch with cache.ir */
+ const int kFinancialPort = 443;
+ 
+ // Ping times in 100-nanosecond intervals.
+--- rlz/lib/lib_values.h.orig
++++ rlz/lib/lib_values.h
+@@ -72,7 +72,6 @@ extern const char kSetDccResponseVariabl
+ //
+ 
+ extern const char kFinancialPingPath[];
+-extern const char kFinancialServer[];
+ 
+ extern const int kFinancialPort;
+ 
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch
new file mode 100644
index 0000000..9416c17
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch
@@ -0,0 +1,114 @@
+# Disables WebRTC log uploading to Google
+
+--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig
++++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
+@@ -127,28 +127,11 @@ void WebRtcLogUploader::LoggingStoppedDo
+   DCHECK(meta_data.get());
+   DCHECK(!upload_done_data.paths.directory.empty());
+ 
+-  std::string compressed_log = CompressLog(log_buffer.get());
+-
+-  std::string local_log_id;
+-
+   if (base::PathExists(upload_done_data.paths.directory)) {
+     webrtc_logging::DeleteOldWebRtcLogFiles(upload_done_data.paths.directory);
+-
+-    local_log_id = base::NumberToString(base::Time::Now().ToDoubleT());
+-    base::FilePath log_file_path =
+-        upload_done_data.paths.directory.AppendASCII(local_log_id)
+-            .AddExtension(FILE_PATH_LITERAL(".gz"));
+-    WriteCompressedLogToFile(compressed_log, log_file_path);
+-
+-    base::FilePath log_list_path =
+-        webrtc_logging::TextLogList::GetWebRtcLogListFileForDirectory(
+-            upload_done_data.paths.directory);
+-    AddLocallyStoredLogInfoToUploadListFile(log_list_path, local_log_id);
+   }
+ 
+-  upload_done_data.local_log_id = local_log_id;
+-  PrepareMultipartPostData(compressed_log, std::move(meta_data),
+-                           std::move(upload_done_data));
++  NotifyUploadDoneAndLogStats(net::HTTP_OK, net::OK, "", std::move(upload_done_data));
+ }
+ 
+ void WebRtcLogUploader::PrepareMultipartPostData(
+@@ -159,28 +142,7 @@ void WebRtcLogUploader::PrepareMultipart
+   DCHECK(!compressed_log.empty());
+   DCHECK(meta_data.get());
+ 
+-  std::unique_ptr<std::string> post_data(new std::string());
+-  SetupMultipart(post_data.get(), compressed_log,
+-                 upload_done_data.paths.incoming_rtp_dump,
+-                 upload_done_data.paths.outgoing_rtp_dump, *meta_data.get());
+-
+-  // If a test has set the test string pointer, write to it and skip uploading.
+-  // Still fire the upload callback so that we can run an extension API test
+-  // using the test framework for that without hanging.
+-  // TODO(grunell): Remove this when the api test for this feature is fully
+-  // implemented according to the test plan. http://crbug.com/257329.
+-  if (post_data_) {
+-    *post_data_ = *post_data;
+-    NotifyUploadDoneAndLogStats(net::HTTP_OK, net::OK, "",
+-                                std::move(upload_done_data));
+-    return;
+-  }
+-
+-  main_task_runner_->PostTask(
+-      FROM_HERE,
+-      base::BindOnce(&WebRtcLogUploader::UploadCompressedLog,
+-                     base::Unretained(this), std::move(upload_done_data),
+-                     std::move(post_data)));
++  NotifyUploadDoneAndLogStats(net::HTTP_OK, net::OK, "", std::move(upload_done_data));
+ }
+ 
+ void WebRtcLogUploader::UploadStoredLog(
+@@ -246,49 +208,6 @@ void WebRtcLogUploader::LoggingStoppedDo
+   DCHECK(log_buffer.get());
+   DCHECK(!log_paths.directory.empty());
+ 
+-  webrtc_logging::DeleteOldWebRtcLogFiles(log_paths.directory);
+-
+-  base::FilePath log_list_path =
+-      webrtc_logging::TextLogList::GetWebRtcLogListFileForDirectory(
+-          log_paths.directory);
+-
+-  // Store the native log with a ".gz" extension.
+-  std::string compressed_log = CompressLog(log_buffer.get());
+-  base::FilePath native_log_path =
+-      log_paths.directory.AppendASCII(log_id).AddExtension(
+-          FILE_PATH_LITERAL(".gz"));
+-  WriteCompressedLogToFile(compressed_log, native_log_path);
+-  AddLocallyStoredLogInfoToUploadListFile(log_list_path, log_id);
+-
+-  // Move the rtp dump files to the log directory with a name of
+-  // <log id>.rtp_[in|out].
+-  if (!log_paths.incoming_rtp_dump.empty()) {
+-    base::FilePath rtp_path =
+-        log_paths.directory.AppendASCII(log_id).AddExtension(
+-            FILE_PATH_LITERAL(".rtp_in"));
+-    base::Move(log_paths.incoming_rtp_dump, rtp_path);
+-  }
+-
+-  if (!log_paths.outgoing_rtp_dump.empty()) {
+-    base::FilePath rtp_path =
+-        log_paths.directory.AppendASCII(log_id).AddExtension(
+-            FILE_PATH_LITERAL(".rtp_out"));
+-    base::Move(log_paths.outgoing_rtp_dump, rtp_path);
+-  }
+-
+-  if (meta_data.get() && !meta_data->empty()) {
+-    base::Pickle pickle;
+-    for (const auto& it : *meta_data.get()) {
+-      pickle.WriteString(it.first);
+-      pickle.WriteString(it.second);
+-    }
+-    base::FilePath meta_path =
+-        log_paths.directory.AppendASCII(log_id).AddExtension(
+-            FILE_PATH_LITERAL(".meta"));
+-    base::WriteFile(meta_path, static_cast<const char*>(pickle.data()),
+-                    pickle.size());
+-  }
+-
+   main_task_runner_->PostTask(
+       FROM_HERE, base::BindOnce(std::move(done_callback), true, ""));
+ 
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-webstore-urls.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-webstore-urls.patch
new file mode 100644
index 0000000..8259c4d
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-webstore-urls.patch
@@ -0,0 +1,182 @@
+# Disables Chrome Webstore-related URLs and other internal functionality. Mainly for disabling auto updates via the Chrome Webstore.
+
+--- chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc.orig
++++ chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
+@@ -655,10 +655,6 @@ std::vector<url::Origin> ChromeContentBr
+     GetOriginsRequiringDedicatedProcess() {
+   std::vector<url::Origin> list;
+ 
+-  // Require a dedicated process for the webstore origin.  See
+-  // https://crbug.com/939108.
+-  list.push_back(url::Origin::Create(extension_urls::GetWebstoreLaunchURL()));
+-
+   return list;
+ }
+ 
+--- chrome/browser/extensions/chrome_content_verifier_delegate.cc.orig
++++ chrome/browser/extensions/chrome_content_verifier_delegate.cc
+@@ -288,17 +288,7 @@ bool ChromeContentVerifierDelegate::IsFr
+   // between which extensions are considered in-store.
+   // See https://crbug.com/766806 for details.
+   if (!InstallVerifier::IsFromStore(extension, context_)) {
+-    // It's possible that the webstore update url was overridden for testing
+-    // so also consider extensions with the default (production) update url
+-    // to be from the store as well. Therefore update URL is compared with
+-    // |GetDefaultWebstoreUpdateUrl|, not the |GetWebstoreUpdateUrl| used by
+-    // |IsWebstoreUpdateUrl|.
+-    ExtensionManagement* extension_management =
+-        ExtensionManagementFactory::GetForBrowserContext(context_);
+-    if (extension_management->GetEffectiveUpdateURL(extension) !=
+-        extension_urls::GetDefaultWebstoreUpdateUrl()) {
+-      return false;
+-    }
++    return false;
+   }
+   return true;
+ }
+--- chrome/browser/extensions/extension_migrator.cc.orig
++++ chrome/browser/extensions/extension_migrator.cc
+@@ -18,7 +18,9 @@ namespace extensions {
+ ExtensionMigrator::ExtensionMigrator(Profile* profile,
+                                      const std::string& old_id,
+                                      const std::string& new_id)
+-    : profile_(profile), old_id_(old_id), new_id_(new_id) {}
++    : profile_(profile), old_id_(old_id), new_id_(new_id) {
++    chrome_blank_ = GURL("chrome://blank/");
++}
+ 
+ ExtensionMigrator::~ExtensionMigrator() {
+ }
+@@ -31,7 +33,7 @@ void ExtensionMigrator::StartLoading() {
+   if (should_have_extension) {
+     std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue);
+     entry->SetKey(ExternalProviderImpl::kExternalUpdateUrl,
+-                  base::Value(extension_urls::GetWebstoreUpdateUrl().spec()));
++                  base::Value(chrome_blank_.spec()));
+ 
+     prefs->SetKey(new_id_, base::Value::FromUniquePtrValue(std::move(entry)));
+   }
+--- chrome/browser/extensions/extension_migrator.h.orig
++++ chrome/browser/extensions/extension_migrator.h
+@@ -9,6 +9,7 @@
+ 
+ #include "base/macros.h"
+ #include "chrome/browser/extensions/external_loader.h"
++#include "url/gurl.h"
+ 
+ class Profile;
+ 
+@@ -40,6 +41,7 @@ class ExtensionMigrator : public Externa
+   Profile* profile_;
+   const std::string old_id_;
+   const std::string new_id_;
++  GURL chrome_blank_;
+ };
+ 
+ }  // namespace extensions
+--- extensions/browser/updater/extension_downloader.cc.orig
++++ extensions/browser/updater/extension_downloader.cc
+@@ -93,27 +93,18 @@ const char kNotFromWebstoreInstallSource
+ const char kDefaultInstallSource[] = "";
+ const char kReinstallInstallSource[] = "reinstall";
+ 
+-const char kGoogleDotCom[] = "google.com";
+ const char kTokenServiceConsumerId[] = "extension_downloader";
+ const char kWebstoreOAuth2Scope[] =
+-    "https://www.googleapis.com/auth/chromewebstore.readonly";
++    "trk:10:https://www.googleapis.com/auth/chromewebstore.readonly";
+ 
+ ExtensionDownloaderTestDelegate* g_test_delegate = nullptr;
+ 
+ #define RETRY_HISTOGRAM(name, retry_count, url)                           \
+-  if ((url).DomainIs(kGoogleDotCom)) {                                    \
+-    UMA_HISTOGRAM_CUSTOM_COUNTS("Extensions." name "RetryCountGoogleUrl", \
+-                                retry_count,                              \
+-                                1,                                        \
+-                                kMaxRetries,                              \
+-                                kMaxRetries + 1);                         \
+-  } else {                                                                \
+     UMA_HISTOGRAM_CUSTOM_COUNTS("Extensions." name "RetryCountOtherUrl",  \
+                                 retry_count,                              \
+                                 1,                                        \
+                                 kMaxRetries,                              \
+-                                kMaxRetries + 1);                         \
+-  }
++                                kMaxRetries + 1);
+ 
+ bool ShouldRetryRequest(const network::SimpleURLLoader* loader) {
+   DCHECK(loader);
+@@ -309,12 +300,6 @@ void ExtensionDownloader::DoStartAllPend
+   ReportStats();
+   url_stats_ = URLStats();
+ 
+-  for (auto it = fetches_preparing_.begin(); it != fetches_preparing_.end();
+-       ++it) {
+-    std::vector<std::unique_ptr<ManifestFetchData>>& list = it->second;
+-    for (size_t i = 0; i < list.size(); ++i)
+-      StartUpdateCheck(std::move(list[i]));
+-  }
+   fetches_preparing_.clear();
+ }
+ 
+@@ -353,11 +338,6 @@ bool ExtensionDownloader::AddExtensionDa
+     return false;
+   }
+ 
+-  // Make sure we use SSL for store-hosted extensions.
+-  if (extension_urls::IsWebstoreUpdateUrl(update_url) &&
+-      !update_url.SchemeIsCryptographic())
+-    update_url = extension_urls::GetWebstoreUpdateUrl();
+-
+   // Skip extensions with empty IDs.
+   if (id.empty()) {
+     DLOG(WARNING) << "Found extension with empty ID";
+@@ -366,12 +346,10 @@ bool ExtensionDownloader::AddExtensionDa
+     return false;
+   }
+ 
+-  if (update_url.DomainIs(kGoogleDotCom)) {
+-    url_stats_.google_url_count++;
+-  } else if (update_url.is_empty()) {
++  if (update_url.is_empty()) {
+     url_stats_.no_url_count++;
+     // Fill in default update URL.
+-    update_url = extension_urls::GetWebstoreUpdateUrl();
++    update_url = GURL("chrome://blank/");
+   } else {
+     url_stats_.other_url_count++;
+   }
+@@ -845,20 +823,6 @@ void ExtensionDownloader::HandleManifest
+         update->info);
+   }
+ 
+-  // If the manifest response included a <daystart> element, we want to save
+-  // that value for any extensions which had sent a ping in the request.
+-  if (fetch_data->base_url().DomainIs(kGoogleDotCom) &&
+-      results->daystart_elapsed_seconds >= 0) {
+-    Time day_start =
+-        Time::Now() - base::Seconds(results->daystart_elapsed_seconds);
+-
+-    for (const ExtensionId& id : extension_ids) {
+-      ExtensionDownloaderDelegate::PingResult& result = ping_results_[id];
+-      result.did_ping = fetch_data->DidPing(id, ManifestFetchData::ROLLCALL);
+-      result.day_start = day_start;
+-    }
+-  }
+-
+   NotifyExtensionsDownloadStageChanged(
+       no_updates, ExtensionDownloaderDelegate::Stage::FINISHED);
+   NotifyExtensionsDownloadFailed(
+@@ -1417,11 +1381,7 @@ bool ExtensionDownloader::IterateFetchCr
+   // fetch.
+   switch (fetch->credentials) {
+     case ExtensionFetch::CREDENTIALS_NONE:
+-      if (fetch->url.DomainIs(kGoogleDotCom) && identity_manager_) {
+-        fetch->credentials = ExtensionFetch::CREDENTIALS_OAUTH2_TOKEN;
+-      } else {
+-        fetch->credentials = ExtensionFetch::CREDENTIALS_COOKIES;
+-      }
++      fetch->credentials = ExtensionFetch::CREDENTIALS_COOKIES;
+       return true;
+     case ExtensionFetch::CREDENTIALS_OAUTH2_TOKEN:
+       fetch->oauth2_attempt_count++;
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/doh-changes.patch b/www/chromium-uc/patches/core/ungoogled-chromium/doh-changes.patch
new file mode 100644
index 0000000..4ee53be
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/doh-changes.patch
@@ -0,0 +1,57 @@
+--- chrome/common/chrome_features.cc.orig
++++ chrome/common/chrome_features.cc
+@@ -323,12 +323,7 @@ const base::Feature kDesktopPWAsWebBundl
+ // Enable DNS over HTTPS (DoH).
+ const base::Feature kDnsOverHttps {
+   "DnsOverHttps",
+-#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
+-    defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+-      base::FEATURE_ENABLED_BY_DEFAULT
+-#else
+       base::FEATURE_DISABLED_BY_DEFAULT
+-#endif
+ };
+ 
+ // Provides a mechanism to remove providers from the dropdown list in the
+--- net/dns/public/doh_provider_entry.cc.orig
++++ net/dns/public/doh_provider_entry.cc
+@@ -117,24 +117,6 @@ const DohProviderEntry::List& DohProvide
+           /*privacy_policy=*/"https://dns.sb/privacy/",
+           /*display_globally=*/false, /*display_countries=*/{"EE", "DE"},
+           LoggingLevel::kNormal),
+-      new DohProviderEntry("Google", DohProviderIdForHistogram::kGoogle,
+-                           {"8.8.8.8", "8.8.4.4", "2001:4860:4860::8888",
+-                            "2001:4860:4860::8844"},
+-                           {"dns.google", "dns.google.com",
+-                            "8888.google"} /* dns_over_tls_hostnames */,
+-                           "https://dns.google/dns-query{?dns}",
+-                           "Google (Public DNS)" /* ui_name */,
+-                           "https://developers.google.com/speed/public-dns/"
+-                           "privacy" /* privacy_policy */,
+-                           true /* display_globally */,
+-                           {} /* display_countries */, LoggingLevel::kExtra),
+-      new DohProviderEntry(
+-          "GoogleDns64", absl::nullopt /* provider_id_for_histogram */,
+-          {"2001:4860:4860::64", "2001:4860:4860::6464"},
+-          {"dns64.dns.google"} /* dns_over_tls_hostnames */,
+-          "https://dns64.dns.google/dns-query{?dns}", "" /* ui_name */,
+-          "" /* privacy_policy */, false /* display_globally */,
+-          {} /* display_countries */, LoggingLevel::kNormal),
+       new DohProviderEntry("Iij", DohProviderIdForHistogram::kIij,
+                            {} /* ip_strs */, {} /* dns_over_tls_hostnames */,
+                            "https://public.dns.iij.jp/dns-query",
+--- services/network/public/cpp/features.cc.orig
++++ services/network/public/cpp/features.cc
+@@ -114,12 +114,7 @@ const base::Feature kSplitAuthCacheByNet
+ // Enable usage of hardcoded DoH upgrade mapping for use in automatic mode.
+ const base::Feature kDnsOverHttpsUpgrade {
+   "DnsOverHttpsUpgrade",
+-#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_ANDROID) || \
+-    defined(OS_WIN)
+-      base::FEATURE_ENABLED_BY_DEFAULT
+-#else
+       base::FEATURE_DISABLED_BY_DEFAULT
+-#endif
+ };
+ 
+ // If this feature is enabled, the mDNS responder service responds to queries
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch b/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch
new file mode 100644
index 0000000..16b7351
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch
@@ -0,0 +1,44 @@
+# Contains tests and features that are unneeded and would otherwise
+# require binaries to be whitelisted in the pruning list
+
+--- chrome/test/chromedriver/BUILD.gn.orig
++++ chrome/test/chromedriver/BUILD.gn
+@@ -311,11 +311,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+   chromedriver_output = "chromedriver"
+-}
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -337,16 +333,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
+--- third_party/devtools-frontend/src/BUILD.gn.orig
++++ third_party/devtools-frontend/src/BUILD.gn
+@@ -136,7 +136,6 @@ foreach(module_file, non_autostart_non_r
+ devtools_frontend_resources_deps = [
+   ":build_release_devtools",
+   "front_end",
+-  "test",
+ ]
+ 
+ group("devtools_all_files") {
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch b/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch
new file mode 100644
index 0000000..f86694a
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch
@@ -0,0 +1,215 @@
+--- content/browser/BUILD.gn.orig
++++ content/browser/BUILD.gn
+@@ -1274,6 +1274,10 @@ source_set("browser") {
+     "net/browser_online_state_observer.cc",
+     "net/browser_online_state_observer.h",
+     "net/cookie_store_factory.cc",
++    "net/cross_origin_embedder_policy_reporter.cc",
++    "net/cross_origin_embedder_policy_reporter.h",
++    "net/cross_origin_opener_policy_reporter.cc",
++    "net/cross_origin_opener_policy_reporter.h",
+     "net/network_errors_listing_ui.cc",
+     "net/network_errors_listing_ui.h",
+     "net/network_quality_observer_impl.cc",
+@@ -3034,10 +3038,6 @@ source_set("browser") {
+ 
+   if (enable_reporting) {
+     sources += [
+-      "net/cross_origin_embedder_policy_reporter.cc",
+-      "net/cross_origin_embedder_policy_reporter.h",
+-      "net/cross_origin_opener_policy_reporter.cc",
+-      "net/cross_origin_opener_policy_reporter.h",
+       "net/reporting_service_proxy.cc",
+       "net/reporting_service_proxy.h",
+     ]
+--- content/browser/devtools/protocol/network_handler.h.orig
++++ content/browser/devtools/protocol/network_handler.h
+@@ -309,8 +309,10 @@ class NetworkHandler : public DevToolsDo
+       Response response,
+       mojo::ScopedDataPipeConsumerHandle pipe,
+       const std::string& mime_type);
++#if BUILDFLAG(ENABLE_REPORTING)
+   std::unique_ptr<protocol::Network::ReportingApiReport> BuildProtocolReport(
+       const net::ReportingReport& report);
++#endif
+ 
+   // TODO(dgozman): Remove this.
+   const std::string host_id_;
+--- content/public/common/content_switch_dependent_feature_overrides.cc.orig
++++ content/public/common/content_switch_dependent_feature_overrides.cc
+@@ -40,9 +40,11 @@ GetSwitchDependentFeatureOverrides(const
+       {switches::kEnableExperimentalWebPlatformFeatures,
+        std::cref(features::kDocumentPolicyNegotiation),
+        base::FeatureList::OVERRIDE_ENABLE_FEATURE},
++#if BUILDFLAG(ENABLE_REPORTING)
+       {switches::kEnableExperimentalWebPlatformFeatures,
+        std::cref(net::features::kDocumentReporting),
+        base::FeatureList::OVERRIDE_ENABLE_FEATURE},
++#endif
+       {switches::kEnableExperimentalWebPlatformFeatures,
+        std::cref(features::kExperimentalContentSecurityPolicyFeatures),
+        base::FeatureList::OVERRIDE_ENABLE_FEATURE},
+--- services/network/network_context.cc.orig
++++ services/network/network_context.cc
+@@ -1140,6 +1140,11 @@ void NetworkContext::QueueSignedExchange
+     const net::NetworkIsolationKey& network_isolation_key) {
+   NOTREACHED();
+ }
++
++void NetworkContext::AddReportingApiObserver(
++    mojo::PendingRemote<network::mojom::ReportingApiObserver> observer) {
++  NOTREACHED();
++}
+ #endif  // BUILDFLAG(ENABLE_REPORTING)
+ 
+ void NetworkContext::ClearDomainReliability(
+--- services/network/network_context.h.orig
++++ services/network/network_context.h
+@@ -570,10 +570,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE)
+     return require_network_isolation_key_;
+   }
+ 
+-#if BUILDFLAG(ENABLE_REPORTING)
+   void AddReportingApiObserver(
+       mojo::PendingRemote<network::mojom::ReportingApiObserver> observer)
+       override;
++#if BUILDFLAG(ENABLE_REPORTING)
+   void OnReportAdded(const net::ReportingReport* service_report) override;
+   void OnReportUpdated(const net::ReportingReport* service_report) override;
+   void OnReportingObserverDisconnect(mojo::RemoteSetElementId mojo_id);
+--- third_party/blink/renderer/core/frame/local_frame.cc.orig
++++ third_party/blink/renderer/core/frame/local_frame.cc
+@@ -39,6 +39,7 @@
+ #include "base/values.h"
+ #include "mojo/public/cpp/bindings/self_owned_receiver.h"
+ #include "mojo/public/cpp/system/message_pipe.h"
++#include "net/net_buildflags.h"
+ #include "services/data_decoder/public/mojom/resource_snapshot_for_web_bundle.mojom-blink.h"
+ #include "services/network/public/cpp/features.h"
+ #include "services/network/public/mojom/content_security_policy.mojom-blink.h"
+@@ -2304,9 +2305,11 @@ const base::UnguessableToken& LocalFrame
+   return base::UnguessableToken::Null();
+ }
+ 
++#if BUILDFLAG(ENABLE_REPORTING)
+ mojom::blink::ReportingServiceProxy* LocalFrame::GetReportingService() {
+   return mojo_handler_->ReportingService();
+ }
++#endif
+ 
+ // static
+ void LocalFrame::NotifyUserActivation(
+--- third_party/blink/renderer/core/frame/local_frame.h.orig
++++ third_party/blink/renderer/core/frame/local_frame.h
+@@ -37,6 +37,7 @@
+ #include "build/build_config.h"
+ #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
+ #include "mojo/public/cpp/bindings/pending_receiver.h"
++#include "net/net_buildflags.h"
+ #include "services/device/public/mojom/device_posture_provider.mojom-blink-forward.h"
+ #include "services/network/public/mojom/fetch_api.mojom-blink-forward.h"
+ #include "third_party/blink/public/common/frame/frame_ad_evidence.h"
+@@ -546,7 +547,9 @@ class CORE_EXPORT LocalFrame final : pub
+ 
+   SmoothScrollSequencer& GetSmoothScrollSequencer();
+ 
++#if BUILDFLAG(ENABLE_REPORTING)
+   mojom::blink::ReportingServiceProxy* GetReportingService();
++#endif
+ 
+   // Returns the frame host ptr. The interface returned is backed by an
+   // associated interface with the legacy Chrome IPC channel.
+--- third_party/blink/renderer/core/frame/reporting_context.cc.orig
++++ third_party/blink/renderer/core/frame/reporting_context.cc
+@@ -4,6 +4,7 @@
+ 
+ #include "third_party/blink/renderer/core/frame/reporting_context.h"
+ 
++#include "net/net_buildflags.h"
+ #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
+ #include "third_party/blink/public/platform/platform.h"
+ #include "third_party/blink/public/platform/task_type.h"
+@@ -54,7 +55,9 @@ const char ReportingContext::kSupplement
+ ReportingContext::ReportingContext(ExecutionContext& context)
+     : Supplement<ExecutionContext>(context),
+       execution_context_(context),
++#if BUILDFLAG(ENABLE_REPORTING)
+       reporting_service_(&context),
++#endif
+       receiver_(this, &context) {}
+ 
+ // static
+@@ -118,7 +121,9 @@ void ReportingContext::Trace(Visitor* vi
+   visitor->Trace(observers_);
+   visitor->Trace(report_buffer_);
+   visitor->Trace(execution_context_);
++#if BUILDFLAG(ENABLE_REPORTING)
+   visitor->Trace(reporting_service_);
++#endif
+   visitor->Trace(receiver_);
+   Supplement<ExecutionContext>::Trace(visitor);
+ }
+@@ -140,6 +145,7 @@ void ReportingContext::CountReport(Repor
+   UseCounter::Count(execution_context_, feature);
+ }
+ 
++#if BUILDFLAG(ENABLE_REPORTING)
+ const HeapMojoRemote<mojom::blink::ReportingServiceProxy>&
+ ReportingContext::GetReportingService() const {
+   if (!reporting_service_.is_bound()) {
+@@ -149,6 +155,7 @@ ReportingContext::GetReportingService()
+   }
+   return reporting_service_;
+ }
++#endif
+ 
+ void ReportingContext::NotifyInternal(Report* report) {
+   // Buffer the report.
+@@ -171,6 +178,7 @@ void ReportingContext::NotifyInternal(Re
+ 
+ void ReportingContext::SendToReportingAPI(Report* report,
+                                           const String& endpoint) const {
++#if BUILDFLAG(ENABLE_REPORTING)
+   const String& type = report->type();
+   if (!(type == ReportType::kCSPViolation || type == ReportType::kDeprecation ||
+         type == ReportType::kPermissionsPolicyViolation ||
+@@ -226,6 +234,7 @@ void ReportingContext::SendToReportingAP
+         url, endpoint, body->featureId(), body->disposition(), body->message(),
+         body->sourceFile(), line_number, column_number);
+   }
++#endif
+ }
+ 
+ }  // namespace blink
+--- third_party/blink/renderer/core/frame/reporting_context.h.orig
++++ third_party/blink/renderer/core/frame/reporting_context.h
+@@ -5,6 +5,7 @@
+ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_REPORTING_CONTEXT_H_
+ #define THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_REPORTING_CONTEXT_H_
+ 
++#include "net/net_buildflags.h"
+ #include "third_party/blink/public/mojom/frame/reporting_observer.mojom-blink.h"
+ #include "third_party/blink/public/mojom/reporting/reporting.mojom-blink.h"
+ #include "third_party/blink/renderer/core/core_export.h"
+@@ -54,8 +55,10 @@ class CORE_EXPORT ReportingContext : pub
+   // Counts the use of a report type via UseCounter.
+   void CountReport(Report*);
+ 
++#if BUILDFLAG(ENABLE_REPORTING)
+   const HeapMojoRemote<mojom::blink::ReportingServiceProxy>&
+   GetReportingService() const;
++#endif
+ 
+   void NotifyInternal(Report* report);
+   // Send |report| via the Reporting API to |endpoint|.
+@@ -67,8 +70,10 @@ class CORE_EXPORT ReportingContext : pub
+ 
+   // This is declared mutable so that the service endpoint can be cached by
+   // const methods.
++#if BUILDFLAG(ENABLE_REPORTING)
+   mutable HeapMojoRemote<mojom::blink::ReportingServiceProxy>
+       reporting_service_;
++#endif
+ 
+   HeapMojoReceiver<mojom::blink::ReportingObserver, ReportingContext> receiver_;
+ };
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch b/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch
new file mode 100644
index 0000000..17b383f
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch
@@ -0,0 +1,32 @@
+# Fix building without one click signin
+
+--- chrome/browser/ui/sync/one_click_signin_links_delegate_impl.cc.orig
++++ chrome/browser/ui/sync/one_click_signin_links_delegate_impl.cc
+@@ -16,9 +16,4 @@ OneClickSigninLinksDelegateImpl::OneClic
+ OneClickSigninLinksDelegateImpl::~OneClickSigninLinksDelegateImpl() {}
+ 
+ void OneClickSigninLinksDelegateImpl::OnLearnMoreLinkClicked(bool is_dialog) {
+-  NavigateParams params(browser_, GURL(chrome::kChromeSyncLearnMoreURL),
+-                        ui::PAGE_TRANSITION_LINK);
+-  params.disposition = is_dialog ? WindowOpenDisposition::NEW_WINDOW
+-                                 : WindowOpenDisposition::NEW_FOREGROUND_TAB;
+-  Navigate(&params);
+ }
+--- chrome/browser/ui/webui/signin/inline_login_handler_impl.cc.orig
++++ chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
+@@ -360,6 +360,7 @@ void InlineSigninHelper::OnClientOAuthSu
+     const ClientOAuthResult& result,
+     Profile* /*profile*/,
+     Profile::CreateStatus /*status*/) {
++#if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN)
+   HandlerSigninReason reason = GetHandlerSigninReason(current_url_);
+   if (reason == HandlerSigninReason::kFetchLstOnly) {
+     // Constants are only available on Windows for the Google Credential
+@@ -436,6 +437,7 @@ void InlineSigninHelper::OnClientOAuthSu
+   }
+ 
+   base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
++#endif
+ }
+ 
+ void InlineSigninHelper::UntrustedSigninConfirmed(
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
new file mode 100644
index 0000000..d71a532
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
@@ -0,0 +1,1921 @@
+# Additional changes to Inox's fix-building-without-safebrowsing.patch
+
+--- 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",
+-    "//chrome/browser/new_tab_page/modules/safe_browsing:mojo_bindings",
+     "//chrome/browser/new_tab_page/modules/task_module:mojo_bindings",
+     "//chrome/browser/notifications",
+     "//chrome/browser/notifications/scheduler:factory",
+@@ -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.h",
+       "enterprise/connectors/analysis/content_analysis_dialog.cc",
+       "enterprise/connectors/analysis/content_analysis_dialog.h",
+       "enterprise/connectors/analysis/content_analysis_downloads_delegate.cc",
+@@ -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",
+-      "new_tab_page/modules/safe_browsing/safe_browsing_handler.cc",
+-      "new_tab_page/modules/safe_browsing/safe_browsing_handler.h",
+-      "new_tab_page/modules/safe_browsing/safe_browsing_prefs.cc",
+-      "new_tab_page/modules/safe_browsing/safe_browsing_prefs.h",
+       "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",
+@@ -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",
+-      "//components/safe_browsing/content/common/proto:download_file_types_proto",
++      # "//components/safe_browsing/content/common/proto:download_file_types_proto",
+     ]
+   }
++  # Use download_file_types_proto regardless of safe_browsing_mode, for
++  # now...
++  deps += [
++    "//components/safe_browsing/content/common/proto:download_file_types_proto",
++  ]
+ 
+   if (!is_fuchsia) {
+     sources += [
+--- 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));
+   Profile* profile = Profile::FromBrowserContext(browser_context);
+-  auto sb_database =
+-      g_browser_process->safe_browsing_service()
+-          ? g_browser_process->safe_browsing_service()->database_manager()
+-          : nullptr;
++  auto sb_database = nullptr;
+   auto* history_service = HistoryServiceFactory::GetForProfile(
+       profile, ServiceAccessType::IMPLICIT_ACCESS);
+   auto delegate = std::make_unique<AccuracyServiceDelegate>(profile);
+--- chrome/browser/chrome_content_browser_client.cc.orig
++++ chrome/browser/chrome_content_browser_client.cc
+@@ -4229,11 +4229,13 @@ ChromeContentBrowserClient::CreateThrott
+                    &throttles);
+ #endif
+ 
++#if BUILDFLAG(FULL_SAFE_BROWSING)
+   if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) {
+     throttles.push_back(
+         std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
+             handle));
+   }
++#endif
+ 
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+@@ -5632,26 +5634,7 @@ ChromeContentBrowserClient::GetSafeBrows
+     const std::vector<std::string>& allowlist_domains) {
+   DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ 
+-  // Should not bypass safe browsing check if the check is for enterprise
+-  // lookup.
+-  if (!safe_browsing_enabled_for_profile && !should_check_on_sb_disabled)
+-    return nullptr;
+-
+-  // |safe_browsing_service_| may be unavailable in tests.
+-  if (safe_browsing_service_ && !safe_browsing_url_checker_delegate_) {
+-    safe_browsing_url_checker_delegate_ =
+-        base::MakeRefCounted<safe_browsing::UrlCheckerDelegateImpl>(
+-            safe_browsing_service_->database_manager(),
+-            safe_browsing_service_->ui_manager());
+-  }
+-
+-  // Update allowlist domains.
+-  if (safe_browsing_url_checker_delegate_) {
+-    safe_browsing_url_checker_delegate_->SetPolicyAllowlistDomains(
+-        allowlist_domains);
+-  }
+-
+-  return safe_browsing_url_checker_delegate_;
++  return nullptr;
+ }
+ 
+ safe_browsing::RealTimeUrlLookupServiceBase*
+@@ -5672,11 +5655,6 @@ ChromeContentBrowserClient::GetUrlLookup
+         GetForProfile(profile);
+   }
+ #endif
+-
+-  if (is_consumer_lookup_enabled) {
+-    return safe_browsing::RealTimeUrlLookupServiceFactory::GetForProfile(
+-        profile);
+-  }
+   return nullptr;
+ }
+ 
+--- 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) {
+-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+-
+-  content::RenderProcessHost* render_process_host =
+-      content::RenderProcessHost::FromID(process_id);
+-  if (!render_process_host)
+-    return;
+-
+-  PrefService* pref_service =
+-      Profile::FromBrowserContext(render_process_host->GetBrowserContext())
+-          ->GetPrefs();
+-
+-  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(
+-      FROM_HERE,
+-      base::BindOnce(
+-          &safe_browsing::MojoSafeBrowsingImpl::MaybeCreate, process_id,
+-          resource_context,
+-          base::BindRepeating(get_checker_delegate, safe_browsing_enabled,
+-                              // Navigation initiated from renderer should never
+-                              // check when safe browsing is disabled, because
+-                              // enterprise check only supports mainframe URL.
+-                              /*should_check_on_sb_disabled=*/false,
+-                              allowlist_domains),
+-          std::move(receiver)));
+ }
+ 
+ // BadgeManager is not used for Android.
+--- 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) {
+-  if (pb_path.empty())
+-    return;
+-
+-  std::string binary_pb;
+-  if (!base::ReadFileToString(pb_path, &binary_pb))
+-    binary_pb.clear();
+-
+-  base::File visual_tflite_model(visual_tflite_model_path,
+-                                 base::File::FLAG_OPEN | base::File::FLAG_READ);
+-
+-  // The ClientSidePhishingModel singleton will react appropriately if the
+-  // |binary_pb| is empty or |visual_tflite_model| is invalid.
+-  safe_browsing::ClientSidePhishingModel::GetInstance()
+-      ->PopulateFromDynamicUpdate(binary_pb, std::move(visual_tflite_model));
+ }
+ 
+ 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
+-  // be used to choose which binary is downloaded.
+-  attributes["tag"] = safe_browsing::GetClientSideDetectionTag();
+   return attributes;
+ }
+ 
+--- 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;
+-using safe_browsing::DownloadFileType;
+ using safe_browsing::DownloadProtectionService;
+ using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
+ 
+@@ -1517,8 +1516,6 @@ void ChromeDownloadManagerDelegate::OnDo
+     if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
+       DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
+ #endif
+-
+-    DownloadItemModel(item).SetDangerLevel(target_info->danger_level);
+   }
+   if (ShouldBlockFile(target_info->danger_type, item)) {
+     MaybeReportDangerousDownloadBlocked(
+@@ -1670,7 +1667,6 @@ void ChromeDownloadManagerDelegate::Mayb
+     service->MaybeSendDangerousDownloadOpenedReport(download,
+                                                     show_download_in_folder);
+   }
+-#endif
+   if (!download->GetAutoOpened()) {
+     download::DownloadContent download_content =
+         download::DownloadContentFromMimeType(download->GetMimeType(), false);
+@@ -1678,6 +1674,7 @@ void ChromeDownloadManagerDelegate::Mayb
+         download->GetDangerType(), download_content, base::Time::Now(),
+         download->GetEndTime(), show_download_in_folder);
+   }
++#endif
+ }
+ 
+ void ChromeDownloadManagerDelegate::CheckDownloadAllowed(
+@@ -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 "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) {
+@@ -27,8 +28,10 @@ void RecordDangerousDownloadWarningShown
+     bool has_user_gesture) {
+   base::UmaHistogramEnumeration("Download.ShowedDownloadWarning", danger_type,
+                                 download::DOWNLOAD_DANGER_TYPE_MAX);
++#if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
+   safe_browsing::RecordDangerousDownloadWarningShown(
+       danger_type, file_path, is_https, has_user_gesture);
++#endif
+ }
+ 
+ void RecordOpenedDangerousConfirmDialog(
+--- 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_->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 &&
+@@ -1111,6 +1113,7 @@ DownloadFileType::DangerLevel DownloadTa
+ 
+ absl::optional<base::Time>
+ DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const {
++#if BUILDFLAG(FULL_SAFE_BROWSING)
+   safe_browsing::SafeBrowsingMetricsCollector* metrics_collector =
+       safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
+           GetProfile());
+@@ -1119,6 +1122,9 @@ DownloadTargetDeterminer::GetLastDownloa
+                                  safe_browsing::SafeBrowsingMetricsCollector::
+                                      EventType::DANGEROUS_DOWNLOAD_BYPASS)
+                            : absl::nullopt;
++#else
++  return absl::nullopt;
++#endif // BUILDFLAG(FULL_SAFE_BROWSING)
+ }
+ 
+ void DownloadTargetDeterminer::OnDownloadDestroyed(
+--- 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/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;
+ }
+ 
+-safe_browsing::EnterpriseRealTimeUrlCheckMode
+-ConnectorsService::GetAppliedRealTimeUrlCheck() const {
+-  if (!ConnectorsEnabled() ||
+-      !GetDmToken(prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope)
+-           .has_value()) {
+-    return safe_browsing::REAL_TIME_CHECK_DISABLED;
+-  }
+-
+-  return static_cast<safe_browsing::EnterpriseRealTimeUrlCheckMode>(
+-      Profile::FromBrowserContext(context_)->GetPrefs()->GetInteger(
+-          prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode));
+-}
+-
+ ConnectorsManager* ConnectorsService::ConnectorsManagerForTesting() {
+   return connectors_manager_.get();
+ }
+--- 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;
+ 
+-  // Returns the value to used by the enterprise real-time URL check Connector
+-  // if it is set and if the scope it's set at has a valid browser-profile
+-  // affiliation.
+-  safe_browsing::EnterpriseRealTimeUrlCheckMode GetAppliedRealTimeUrlCheck()
+-      const;
+-
+   // 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.
+--- 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_)));
+   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());
+   }
+ 
+-  absl::optional<safe_browsing::PasswordProtectionTrigger>
+-      password_protection_warning_trigger =
+-          enterprise_signals::utils::GetPasswordProtectionWarningTrigger(
+-              profile_prefs_);
+-  if (password_protection_warning_trigger.has_value()) {
+-    signals.set_password_protection_warning_trigger(
+-        static_cast<int32_t>(password_protection_warning_trigger.value()));
+-  }
+-
+   std::move(done_closure).Run();
+ }
+ 
+--- 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);
+-  info.realtime_url_check_mode = GetRealtimeUrlCheckMode();
+   info.on_security_event_providers = GetOnSecurityEventProviders();
+   info.browser_version = version_info::GetVersionNumber();
+   info.site_isolation_enabled =
+@@ -227,11 +226,6 @@ std::vector<std::string> ContextInfoFetc
+   return connectors_service_->GetAnalysisServiceProviderNames(connector);
+ }
+ 
+-safe_browsing::EnterpriseRealTimeUrlCheckMode
+-ContextInfoFetcher::GetRealtimeUrlCheckMode() {
+-  return connectors_service_->GetAppliedRealTimeUrlCheck();
+-}
+-
+ std::vector<std::string> ContextInfoFetcher::GetOnSecurityEventProviders() {
+   return connectors_service_->GetReportingServiceProviderNames(
+       enterprise_connectors::ReportingConnector::SECURITY_EVENT);
+--- 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_
+ 
+ #include <string>
++#include <memory>
+ #include <vector>
+ 
+ #include "base/callback_forward.h"
+@@ -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;
+-  safe_browsing::EnterpriseRealTimeUrlCheckMode realtime_url_check_mode;
+   std::string browser_version;
+   safe_browsing::SafeBrowsingState safe_browsing_protection_level;
+   bool site_isolation_enabled;
+@@ -88,7 +88,6 @@ class ContextInfoFetcher {
+   std::vector<std::string> GetAnalysisConnectorProviders(
+       enterprise_connectors::AnalysisConnector connector);
+ 
+-  safe_browsing::EnterpriseRealTimeUrlCheckMode GetRealtimeUrlCheckMode();
+ 
+   std::vector<std::string> GetOnSecurityEventProviders();
+ 
+--- 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
+ 
+-safe_browsing::SafeBrowsingState GetSafeBrowsingProtectionLevel(
+-    PrefService* profile_prefs) {
+-  DCHECK(profile_prefs);
+-  bool safe_browsing_enabled =
+-      profile_prefs->GetBoolean(prefs::kSafeBrowsingEnabled);
+-  bool safe_browsing_enhanced_enabled =
+-      profile_prefs->GetBoolean(prefs::kSafeBrowsingEnhanced);
+-
+-  if (safe_browsing_enabled) {
+-    if (safe_browsing_enhanced_enabled)
+-      return safe_browsing::SafeBrowsingState::ENHANCED_PROTECTION;
+-    else
+-      return safe_browsing::SafeBrowsingState::STANDARD_PROTECTION;
+-  } else {
+-    return safe_browsing::SafeBrowsingState::NO_SAFE_BROWSING;
+-  }
+-}
+-
+ absl::optional<bool> GetThirdPartyBlockingEnabled(PrefService* local_state) {
+   DCHECK(local_state);
+ #if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
+@@ -65,15 +47,6 @@ bool GetBuiltInDnsClientEnabled(PrefServ
+   return local_state->GetBoolean(prefs::kBuiltInDnsClientEnabled);
+ }
+ 
+-absl::optional<safe_browsing::PasswordProtectionTrigger>
+-GetPasswordProtectionWarningTrigger(PrefService* profile_prefs) {
+-  DCHECK(profile_prefs);
+-  if (!profile_prefs->HasPrefPath(prefs::kPasswordProtectionWarningTrigger))
+-    return absl::nullopt;
+-  return static_cast<safe_browsing::PasswordProtectionTrigger>(
+-      profile_prefs->GetInteger(prefs::kPasswordProtectionWarningTrigger));
+-}
+-
+ absl::optional<bool> GetChromeCleanupEnabled(PrefService* local_state) {
+   DCHECK(local_state);
+ #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);
+ 
+-absl::optional<safe_browsing::PasswordProtectionTrigger>
+-GetPasswordProtectionWarningTrigger(PrefService* profile_prefs);
+-
+-safe_browsing::SafeBrowsingState GetSafeBrowsingProtectionLevel(
+-    PrefService* profile_prefs);
+-
+ bool GetChromeRemoteDesktopAppBlocked(PolicyBlocklistService* service);
+ 
+ }  // namespace utils
+--- 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",
+-    "omaha_attributes_handler.cc",
+-    "omaha_attributes_handler.h",
+     "pack_extension_job.cc",
+     "pack_extension_job.h",
+     "pending_extension_info.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);
+   info.system_dns_servers = std::move(signals.system_dns_servers);
+-  switch (signals.realtime_url_check_mode) {
+-    case safe_browsing::REAL_TIME_CHECK_DISABLED:
+       info.realtime_url_check_mode = extensions::api::
+           enterprise_reporting_private::REALTIME_URL_CHECK_MODE_DISABLED;
+-      break;
+-    case safe_browsing::REAL_TIME_CHECK_FOR_MAINFRAME_ENABLED:
+-      info.realtime_url_check_mode =
+-          extensions::api::enterprise_reporting_private::
+-              REALTIME_URL_CHECK_MODE_ENABLED_MAIN_FRAME;
+-      break;
+-  }
+   info.browser_version = std::move(signals.browser_version);
+   info.built_in_dns_client_enabled = signals.built_in_dns_client_enabled;
+ 
+--- 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
+ }
+ 
+ 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
+ }
+ 
+ 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 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
+ }
+ 
+ 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"
+-#include "chrome/browser/extensions/omaha_attributes_handler.h"
+ #include "chrome/browser/extensions/pending_extension_manager.h"
+ #include "chrome/browser/extensions/permissions_updater.h"
+ #include "chrome/browser/extensions/shared_module_service.h"
+@@ -370,7 +369,6 @@ ExtensionService::ExtensionService(Profi
+       safe_browsing_verdict_handler_(extension_prefs,
+                                      ExtensionRegistry::Get(profile),
+                                      this),
+-      omaha_attributes_handler_(extension_prefs, this),
+       registry_(ExtensionRegistry::Get(profile)),
+       pending_extension_manager_(profile),
+       install_directory_(install_directory),
+@@ -852,47 +850,6 @@ bool ExtensionService::IsExtensionEnable
+   return extension_registrar_.IsExtensionEnabled(extension_id);
+ }
+ 
+-void ExtensionService::PerformActionBasedOnOmahaAttributes(
+-    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::ClearGreylistedAcknowledgedStateAndMaybeReenable(
+-    const std::string& extension_id) {
+-  bool is_on_sb_list = (blocklist_prefs::GetSafeBrowsingExtensionBlocklistState(
+-                            extension_id, extension_prefs_) !=
+-                        BitMapBlocklistState::NOT_BLOCKLISTED);
+-  bool is_on_omaha_list =
+-      blocklist_prefs::HasAnyOmahaGreylistState(extension_id, extension_prefs_);
+-  if (is_on_sb_list || is_on_omaha_list) {
+-    return;
+-  }
+-  // Clear all acknowledged states so the extension will still get disabled if
+-  // it is added to the greylist again.
+-  blocklist_prefs::ClearAcknowledgedGreylistStates(extension_id,
+-                                                   extension_prefs_);
+-  RemoveDisableReasonAndMaybeEnable(extension_id,
+-                                    disable_reason::DISABLE_GREYLIST);
+-}
+-
+-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(
+-           extension_id, extension_prefs_) == new_state);
+-  bool has_new_state_on_omaha_list = blocklist_prefs::HasOmahaBlocklistState(
+-      extension_id, new_state, extension_prefs_);
+-  DCHECK(has_new_state_on_sb_list || has_new_state_on_omaha_list);
+-#endif
+-  if (blocklist_prefs::HasAcknowledgedBlocklistState(extension_id, new_state,
+-                                                     extension_prefs_)) {
+-    // If the extension is already acknowledged, don't disable it again
+-    // because it can be already re-enabled by the user. This could happen if
+-    // the extension is added to the SafeBrowsing blocklist, and then
+-    // subsequently marked by Omaha. In this case, we don't want to disable the
+-    // extension twice.
+-    return;
+-  }
+-
+-  // Set the current greylist states to acknowledge immediately because the
+-  // extension is disabled silently. Clear the other acknowledged state because
+-  // when the state changes to another greylist state in the future, we'd like
+-  // to disable the extension again.
+-  blocklist_prefs::UpdateCurrentGreylistStatesAsAcknowledged(extension_id,
+-                                                             extension_prefs_);
+-  DisableExtension(extension_id, disable_reason::DISABLE_GREYLIST);
+ }
+ 
+ void ExtensionService::RemoveDisableReasonAndMaybeEnable(
+--- 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"
+-#include "chrome/browser/extensions/omaha_attributes_handler.h"
+ #include "chrome/browser/extensions/pending_extension_manager.h"
+ #include "chrome/browser/extensions/safe_browsing_verdict_handler.h"
+ #include "chrome/browser/profiles/profile_manager.h"
+@@ -269,28 +268,11 @@ class ExtensionService : public Extensio
+   // nothing.
+   void EnableExtension(const std::string& extension_id);
+ 
+-  // Takes Safe Browsing and Omaha blocklist states into account and decides
+-  // 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 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 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.
+   void RemoveDisableReasonAndMaybeEnable(const std::string& extension_id,
+                                          disable_reason::DisableReason reason);
+ 
+-  // Performs action based on Omaha attributes for the extension.
+-  void PerformActionBasedOnOmahaAttributes(const std::string& extension_id,
+-                                           const base::Value& attributes);
+-
+   // 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
+@@ -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.
+   ExtensionRegistry* registry_ = nullptr;
+ 
+--- 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,
+     const base::Value& attributes) {
+-  extension_service()->PerformActionBasedOnOmahaAttributes(extension_id,
+-                                                           attributes);
+ }
+ 
+ bool ExtensionSystemImpl::FinishDelayedInstallationIfReady(
+--- 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_->ClearGreylistedAcknowledgedStateAndMaybeReenable(
+-        extension->id());
+     UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Enabled",
+                               extension->location());
+   }
+@@ -125,8 +123,6 @@ void SafeBrowsingVerdictHandler::UpdateG
+         blocklist_prefs::BlocklistStateToBitMapBlocklistState(greylist_state);
+     blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
+         extension->id(), bitmap_greylist_state, extension_prefs_);
+-    extension_service_->MaybeDisableGreylistedExtension(id,
+-                                                        bitmap_greylist_state);
+     UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Disabled",
+                               extension->location());
+   }
+--- 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"
+ #include "chrome/browser/profiles/profile.h"
+-#include "chrome/browser/safe_browsing/download_protection/download_protection_service.h"
+-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
+ #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"
+@@ -299,83 +297,6 @@ BindResultCallbackToCurrentSequence(
+       base::SequencedTaskRunnerHandle::Get(), std::move(callback));
+ }
+ 
+-void DoSafeBrowsingCheckOnUIThread(
+-    content::GlobalRenderFrameHostId frame_id,
+-    std::unique_ptr<content::FileSystemAccessWriteItem> item,
+-    safe_browsing::CheckDownloadCallback callback) {
+-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+-  // Download Protection Service is not supported on Android.
+-#if BUILDFLAG(FULL_SAFE_BROWSING)
+-  safe_browsing::SafeBrowsingService* sb_service =
+-      g_browser_process->safe_browsing_service();
+-  if (!sb_service || !sb_service->download_protection_service() ||
+-      !sb_service->download_protection_service()->enabled()) {
+-    std::move(callback).Run(safe_browsing::DownloadCheckResult::UNKNOWN);
+-    return;
+-  }
+-
+-  if (!item->browser_context) {
+-    content::RenderProcessHost* rph =
+-        content::RenderProcessHost::FromID(frame_id.child_id);
+-    if (!rph) {
+-      std::move(callback).Run(safe_browsing::DownloadCheckResult::UNKNOWN);
+-      return;
+-    }
+-    item->browser_context = rph->GetBrowserContext();
+-  }
+-
+-  if (!item->web_contents) {
+-    content::RenderFrameHost* rfh = content::RenderFrameHost::FromID(frame_id);
+-    if (rfh) {
+-      DCHECK_NE(rfh->GetLifecycleState(),
+-                content::RenderFrameHost::LifecycleState::kPrerendering);
+-      item->web_contents = content::WebContents::FromRenderFrameHost(rfh);
+-    }
+-  }
+-
+-  sb_service->download_protection_service()->CheckFileSystemAccessWrite(
+-      std::move(item), std::move(callback));
+-#endif
+-}
+-
+-ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult
+-InterpretSafeBrowsingResult(safe_browsing::DownloadCheckResult result) {
+-  using Result = safe_browsing::DownloadCheckResult;
+-  switch (result) {
+-    // Only allow downloads that are marked as SAFE or UNKNOWN by SafeBrowsing.
+-    // All other types are going to be blocked. UNKNOWN could be the result of a
+-    // failed safe browsing ping.
+-    case Result::UNKNOWN:
+-    case Result::SAFE:
+-    case Result::ALLOWLISTED_BY_POLICY:
+-      return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult::
+-          kAllow;
+-
+-    case Result::DANGEROUS:
+-    case Result::UNCOMMON:
+-    case Result::DANGEROUS_HOST:
+-    case Result::POTENTIALLY_UNWANTED:
+-    case Result::BLOCKED_PASSWORD_PROTECTED:
+-    case Result::BLOCKED_TOO_LARGE:
+-    case Result::BLOCKED_UNSUPPORTED_FILE_TYPE:
+-    case Result::DANGEROUS_ACCOUNT_COMPROMISE:
+-      return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult::
+-          kBlock;
+-
+-    // This shouldn't be returned for File System Access write checks.
+-    case Result::ASYNC_SCANNING:
+-    case Result::SENSITIVE_CONTENT_WARNING:
+-    case Result::SENSITIVE_CONTENT_BLOCK:
+-    case Result::DEEP_SCANNED_SAFE:
+-    case Result::PROMPT_FOR_SCANNING:
+-      NOTREACHED();
+-      return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult::
+-          kAllow;
+-  }
+-  NOTREACHED();
+-  return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult::kBlock;
+-}
+-
+ std::string GenerateLastPickedDirectoryKey(const std::string& id) {
+   return id.empty() ? kDefaultLastPickedDirectoryKey
+                     : base::StrCat({kCustomLastPickedDirectoryKey, "-", id});
+@@ -1106,28 +1027,6 @@ void ChromeFileSystemAccessPermissionCon
+                      std::move(callback)));
+ }
+ 
+-void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks(
+-    std::unique_ptr<content::FileSystemAccessWriteItem> item,
+-    content::GlobalRenderFrameHostId frame_id,
+-    base::OnceCallback<void(AfterWriteCheckResult)> callback) {
+-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+-  content::GetUIThreadTaskRunner({})->PostTask(
+-      FROM_HERE,
+-      base::BindOnce(
+-          &DoSafeBrowsingCheckOnUIThread, frame_id, std::move(item),
+-          base::BindOnce(
+-              [](scoped_refptr<base::TaskRunner> task_runner,
+-                 base::OnceCallback<void(AfterWriteCheckResult result)>
+-                     callback,
+-                 safe_browsing::DownloadCheckResult result) {
+-                task_runner->PostTask(
+-                    FROM_HERE,
+-                    base::BindOnce(std::move(callback),
+-                                   InterpretSafeBrowsingResult(result)));
+-              },
+-              base::SequencedTaskRunnerHandle::Get(), std::move(callback))));
+-}
+-
+ void ChromeFileSystemAccessPermissionContext::
+     DidConfirmSensitiveDirectoryAccess(
+         const url::Origin& origin,
+--- 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;
+-  void PerformAfterWriteChecks(
+-      std::unique_ptr<content::FileSystemAccessWriteItem> item,
+-      content::GlobalRenderFrameHostId frame_id,
+-      base::OnceCallback<void(AfterWriteCheckResult)> callback) override;
+   bool CanObtainReadPermission(const url::Origin& origin) override;
+   bool CanObtainWritePermission(const url::Origin& origin) override;
+ 
+--- 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"
++#include "components/safe_browsing/buildflags.h"
+ #include "components/url_formatter/elide_url.h"
+ #include "content/public/browser/browser_thread.h"
+ #include "content/public/browser/desktop_capture.h"
+@@ -111,6 +112,7 @@ void DisplayMediaAccessHandler::HandleRe
+     return;
+   }
+ 
++  #if BUILDFLAG(FULL_SAFE_BROWSING)
+   // 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
+@@ -125,6 +127,7 @@ void DisplayMediaAccessHandler::HandleRe
+     observer->OnDesktopCaptureRequest();
+     return;
+   }
++  #endif // BUILDFLAG(FULL_SAFE_BROWSING)
+ 
+ #if defined(OS_MAC)
+   // Do not allow picker UI to be shown on a page that isn't in the foreground
+--- 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_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"
+@@ -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"
++#endif
+ #include "third_party/blink/public/mojom/clipboard/clipboard.mojom.h"
+ #include "ui/base/clipboard/clipboard.h"
+ #include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
+ #include "ui/events/keycodes/keyboard_codes.h"
+-#endif
+ 
+ #if defined(OS_ANDROID)
+ #include "chrome/browser/android/tab_android.h"
+@@ -826,6 +825,7 @@ autofill::LanguageCode ChromePasswordMan
+   return autofill::LanguageCode();
+ }
+ 
++#if BUILDFLAG(FULL_SAFE_BROWSING)
+ safe_browsing::PasswordProtectionService*
+ ChromePasswordManagerClient::GetPasswordProtectionService() const {
+   return safe_browsing::ChromePasswordProtectionService::
+@@ -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->MaybeStartPasswordFieldOnFocusRequest(
+-        web_contents(), web_contents()->GetLastCommittedURL(), form_action,
+-        frame_url, pps->GetAccountInfo().hosted_domain);
+-  }
+ }
+ #endif  // defined(ON_FOCUS_PING_ENABLED)
+ 
+@@ -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;
+-
+-  pps->MaybeStartProtectedPasswordEntryRequest(
+-      web_contents(), web_contents()->GetLastCommittedURL(), username,
+-      password_type, matching_reused_credentials, password_field_exists);
+ }
++#endif // BUILDFLAG(FULL_SAFE_BROWSING)
+ 
+ void ChromePasswordManagerClient::LogPasswordReuseDetectedEvent() {
+-  safe_browsing::PasswordProtectionService* pps =
+-      GetPasswordProtectionService();
+-  if (pps) {
+-    pps->MaybeLogPasswordReuseDetectedEvent(web_contents());
+-  }
+ }
+ 
+ #if !defined(OS_ANDROID)
+@@ -1365,9 +1346,11 @@ void ChromePasswordManagerClient::OnPast
+   }
+ 
+   was_on_paste_called_ = true;
++#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
+   password_reuse_detection_manager_.OnPaste(std::move(text));
++#endif // defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
+ }
+-#endif
++#endif //  !defined(OS_ANDROID)
+ 
+ void ChromePasswordManagerClient::RenderFrameCreated(
+     content::RenderFrameHost* render_frame_host) {
+@@ -1402,7 +1385,9 @@ void ChromePasswordManagerClient::OnInpu
+   if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
+     OnPaste();
+   } else {
++#if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
+     password_reuse_detection_manager_.OnKeyPressedCommitted(key_event.text);
++#endif  // defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
+   }
+ #endif  // defined(OS_ANDROID)
+ }
+@@ -1441,6 +1426,7 @@ bool ChromePasswordManagerClient::IsPass
+     is_enabled = false;
+   }
+ 
++  #if BUILDFLAG(FULL_SAFE_BROWSING)
+   // 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
+@@ -1451,6 +1437,7 @@ bool ChromePasswordManagerClient::IsPass
+     observer->OnPasswordSaveOrAutofillDenied();
+     is_enabled = false;
+   }
++  #endif // BUILDFLAG(FULL_SAFE_BROWSING)
+ 
+   if (log_manager_->IsLoggingActive()) {
+     password_manager::BrowserSavePasswordProgressLogger logger(
+--- 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;
+ 
++#if BUILDFLAG(FULL_SAFE_BROWSING)
+   safe_browsing::PasswordProtectionService* GetPasswordProtectionService()
+       const override;
+ 
+ #if defined(ON_FOCUS_PING_ENABLED)
+   void CheckSafeBrowsingReputation(const GURL& form_action,
+                                    const GURL& frame_url) override;
+-#endif
++#endif // defined(ON_FOCUS_PING_ENABLED)
+ 
+   void CheckProtectedPasswordEntry(
+       password_manager::metrics_util::PasswordType reused_password_type,
+@@ -221,6 +222,7 @@ class ChromePasswordManagerClient
+       const std::vector<password_manager::MatchingReusedCredential>&
+           matching_reused_credentials,
+       bool password_field_exists) override;
++#endif // BUILDFLAG(FULL_SAFE_BROWSING)
+ 
+   void LogPasswordReuseDetectedEvent() override;
+ 
+--- 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_);
+ 
++#if BUILDFLAG(FULL_SAFE_BROWSING)
+   if (!AbusiveOriginNotificationsPermissionRevocationConfig::IsEnabled() ||
+       !safe_browsing::IsSafeBrowsingEnabled(*profile_->GetPrefs()) ||
+       IsOriginExemptedFromFutureRevocations(profile_, origin_)) {
+@@ -182,6 +183,7 @@ void AbusiveOriginPermissionRevocationRe
+     }
+   }
+   NotifyCallback(Outcome::PERMISSION_NOT_REVOKED);
++#endif // BUILDFLAG(FULL_SAFE_BROWSING)
+ }
+ 
+ void AbusiveOriginPermissionRevocationRequest::OnSafeBrowsingVerdictReceived(
+--- 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"
+-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
+ #include "chrome/common/chrome_features.h"
+ #include "components/permissions/permission_request.h"
+ #include "components/permissions/request_type.h"
+@@ -151,9 +150,6 @@ void ContextualNotificationPermissionUiS
+ }
+ 
+ void ContextualNotificationPermissionUiSelector::Cancel() {
+-  // The computation either finishes synchronously above, or is waiting on the
+-  // Safe Browsing check.
+-  safe_browsing_request_.reset();
+ }
+ 
+ bool ContextualNotificationPermissionUiSelector::IsPermissionRequestSupported(
+@@ -179,24 +175,14 @@ void ContextualNotificationPermissionUiS
+   absl::optional<Decision> decision =
+       GetDecisionBasedOnSiteReputation(reputation);
+ 
+-  // If the PreloadData suggests this is an unacceptable site, ping Safe
+-  // Browsing to verify; but do not ping if it is not warranted.
++  // If the PreloadData suggests this is an unacceptable site, assume it is
++  // correct, since we can't access safe browsing.
+   if (!decision || (!decision->quiet_ui_reason && !decision->warning_reason)) {
+     Notify(Decision::UseNormalUiAndShowNoWarning());
+-    return;
++  } else {
++    // decision has a value, unwrap with .value()
++    Notify(decision.value());
+   }
+-
+-  DCHECK(!safe_browsing_request_);
+-  DCHECK(g_browser_process->safe_browsing_service());
+-
+-  // It is fine to use base::Unretained() here, as |safe_browsing_request_|
+-  // guarantees not to fire the callback after its destruction.
+-  safe_browsing_request_.emplace(
+-      g_browser_process->safe_browsing_service()->database_manager(),
+-      base::DefaultClock::GetInstance(), origin,
+-      base::BindOnce(&ContextualNotificationPermissionUiSelector::
+-                         OnSafeBrowsingVerdictReceived,
+-                     base::Unretained(this), *decision));
+ }
+ 
+ void ContextualNotificationPermissionUiSelector::OnSafeBrowsingVerdictReceived(
+--- 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) {
+   // 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;
+-  }
+   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"
+-#include "chrome/browser/new_tab_page/modules/safe_browsing/safe_browsing_handler.h"
+ #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"
+@@ -1277,7 +1276,6 @@ void RegisterProfilePrefs(user_prefs::Pr
+   NewTabPageHandler::RegisterProfilePrefs(registry);
+   NewTabPageUI::RegisterProfilePrefs(registry);
+   NewTabUI::RegisterProfilePrefs(registry);
+-  ntp::SafeBrowsingHandler::RegisterProfilePrefs(registry);
+   ntp_tiles::CustomLinksManagerImpl::RegisterProfilePrefs(registry);
+   PhotosService::RegisterProfilePrefs(registry);
+   PinnedTabCodec::RegisterProfilePrefs(registry);
+--- 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());
+ 
+-  bool has_delayed_warning =
+-      !!safe_browsing::SafeBrowsingUserInteractionObserver::FromWebContents(
+-          web_contents);
++  bool has_delayed_warning = false;
+ 
+   LookalikeUrlService* service = LookalikeUrlService::Get(profile_);
+   if (service->EngagedSitesNeedUpdating()) {
+--- 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(
+     metrics::ChromeUserMetricsExtension* uma_proto) {
+-  Profile* profile = cached_profile_.GetMetricsProfile();
+-
+-  if (!profile)
+-    return;
+-
+-  SafeBrowsingState state = GetSafeBrowsingState(*profile->GetPrefs());
+-
+-  base::UmaHistogramEnumeration(
+-      "SafeBrowsing.Pref.MainProfile.SafeBrowsingState", state);
+ }
+ 
+ }  // namespace safe_browsing
+--- 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(
+     content::BrowserContext* context) const {
+-  if (!g_browser_process->safe_browsing_service()) {
+-    return nullptr;
+-  }
+-  Profile* profile = Profile::FromBrowserContext(context);
+-  auto url_loader_factory =
+-      std::make_unique<network::CrossThreadPendingSharedURLLoaderFactory>(
+-          g_browser_process->safe_browsing_service()->GetURLLoaderFactory(
+-              profile));
+-  return new RealTimeUrlLookupService(
+-      network::SharedURLLoaderFactory::Create(std::move(url_loader_factory)),
+-      VerdictCacheManagerFactory::GetForProfile(profile),
+-      base::BindRepeating(&safe_browsing::GetUserPopulationForProfile, profile),
+-      profile->GetPrefs(),
+-      std::make_unique<SafeBrowsingPrimaryAccountTokenFetcher>(
+-          IdentityManagerFactory::GetForProfile(profile)),
+-      base::BindRepeating(&safe_browsing::SyncUtils::
+-                              AreSigninAndSyncSetUpForSafeBrowsingTokenFetches,
+-                          SyncServiceFactory::GetForProfile(profile),
+-                          IdentityManagerFactory::GetForProfile(profile)),
+-      profile->IsOffTheRecord(), g_browser_process->variations_service(),
+-      SafeBrowsingNavigationObserverManagerFactory::GetForBrowserContext(
+-          profile));
++  return nullptr;
+ }
+ 
+ }  // namespace safe_browsing
+--- 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();
+ }
+ 
+-void LogSafeBrowsingSecuritySensitiveAction(
+-    safe_browsing::SafeBrowsingMetricsCollector* metrics_collector) {
+-  if (metrics_collector) {
+-    metrics_collector->AddSafeBrowsingEventToPref(
+-        safe_browsing::SafeBrowsingMetricsCollector::EventType::
+-            SECURITY_SENSITIVE_SSL_INTERSTITIAL);
+-  }
+-}
+-
+ }  // namespace
+ 
+ std::unique_ptr<SSLBlockingPage>
+@@ -192,10 +183,6 @@ ChromeSecurityBlockingPageFactory::Creat
+     }
+   }
+ 
+-  LogSafeBrowsingSecuritySensitiveAction(
+-      safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
+-          Profile::FromBrowserContext(web_contents->GetBrowserContext())));
+-
+   auto controller_client = std::make_unique<SSLErrorControllerClient>(
+       web_contents, ssl_info, cert_error, request_url,
+       std::move(metrics_helper), CreateSettingsPageHelper());
+@@ -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) {
+-  LogSafeBrowsingSecuritySensitiveAction(
+-      safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
+-          Profile::FromBrowserContext(web_contents->GetBrowserContext())));
+-
+   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,
+@@ -314,10 +293,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<BlockedInterceptionBlockingPage>(
+       web_contents, cert_error, request_url, std::move(ssl_cert_reporter),
+       /*can_show_enhanced_protection_message=*/true, ssl_info,
+--- 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(
+     content::BrowserContext* profile) const {
+-  safe_browsing::SafeBrowsingService* safe_browsing_service =
+-      g_browser_process->safe_browsing_service();
+-  // In unit tests the safe browsing service can be null, if this happens,
+-  // return null instead of crashing.
+-  if (!safe_browsing_service)
+-    return nullptr;
+-
+-  return new SCTReportingService(safe_browsing_service,
+-                                 static_cast<Profile*>(profile));
++  return nullptr;
+ }
+ 
+ content::BrowserContext* SCTReportingServiceFactory::GetBrowserContextToUse(
+--- 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"
+ #include "chrome/browser/profiles/profile.h"
+-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
+ #include "chrome/browser/subresource_filter/subresource_filter_profile_context_factory.h"
+ #include "components/safe_browsing/core/browser/db/database_manager.h"
+ #include "components/subresource_filter/content/browser/content_subresource_filter_web_contents_helper.h"
+@@ -18,10 +17,7 @@ namespace {
+ // available. Otherwise returns nullptr.
+ const scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
+ GetDatabaseManagerFromSafeBrowsingService() {
+-  safe_browsing::SafeBrowsingService* safe_browsing_service =
+-      g_browser_process->safe_browsing_service();
+-  return safe_browsing_service ? safe_browsing_service->database_manager()
+-                               : nullptr;
++  return nullptr;
+ }
+ 
+ }  // namespace
+--- 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",
+-    "//components/safe_browsing/content/browser:client_side_detection",
+     "//components/safe_browsing/content/browser/password_protection",
+     "//components/safe_browsing/content/browser/web_ui",
+     "//components/safe_browsing/core/browser/db:database_manager",
+--- 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"
+ #include "components/navigation_metrics/navigation_metrics.h"
++#include "components/safe_browsing/buildflags.h"
+ #include "components/ukm/content/source_url_recorder.h"
+ #include "content/public/browser/devtools_agent_host.h"
+ #include "content/public/browser/navigation_handle.h"
+@@ -36,6 +37,7 @@ JavaScriptTabModalDialogManagerDelegateD
+ 
+ void JavaScriptTabModalDialogManagerDelegateDesktop::WillRunDialog() {
+   BrowserList::AddObserver(this);
++  #if BUILDFLAG(FULL_SAFE_BROWSING)
+   // 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
+@@ -46,6 +48,7 @@ void JavaScriptTabModalDialogManagerDele
+   if (observer) {
+     observer->OnJavaScriptDialog();
+   }
++  #endif // BUILDFLAG(FULL_SAFE_BROWSING)
+ }
+ 
+ void JavaScriptTabModalDialogManagerDelegateDesktop::DidCloseDialog() {
+--- 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"
++#endif
+ #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"
+@@ -22,6 +25,7 @@
+ 
+ namespace {
+ 
++#if BUILDFLAG(FULL_SAFE_BROWSING)
+ void CompletionCallback(
+     content::WebContentsViewDelegate::DropCompletionCallback callback,
+     const enterprise_connectors::ContentAnalysisDelegate::Data& data,
+@@ -63,6 +67,7 @@ enterprise_connectors::ContentAnalysisDe
+   }
+   return data;
+ }
++#endif // BUILDFLAG(FULL_SAFE_BROWSING)
+ 
+ // 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
+@@ -76,6 +81,7 @@ class HandleDropScanData : public conten
+       : content::WebContentsObserver(web_contents),
+         callback_(std::move(callback)) {}
+ 
++#if BUILDFLAG(FULL_SAFE_BROWSING)
+   void ScanData(
+       enterprise_connectors::ContentAnalysisDelegate::Data analysis_data) {
+     DCHECK(web_contents());
+@@ -87,6 +93,7 @@ class HandleDropScanData : public conten
+ 
+     delete this;
+   }
++#endif // BUILDFLAG(FULL_SAFE_BROWSING)
+ 
+   void WebContentsDestroyed() override { delete this; }
+ 
+@@ -106,13 +113,16 @@ void HandleOnPerformDrop(
+     content::WebContents* web_contents,
+     const content::DropData& drop_data,
+     content::WebContentsViewDelegate::DropCompletionCallback callback) {
++#if BUILDFLAG(FULL_SAFE_BROWSING)
+   enterprise_connectors::ContentAnalysisDelegate::Data data;
++#endif
+   Profile* profile =
+       Profile::FromBrowserContext(web_contents->GetBrowserContext());
+   auto connector =
+       drop_data.filenames.empty()
+           ? enterprise_connectors::AnalysisConnector::BULK_DATA_ENTRY
+           : enterprise_connectors::AnalysisConnector::FILE_ATTACHED;
++#if BUILDFLAG(FULL_SAFE_BROWSING)
+   if (!enterprise_connectors::ContentAnalysisDelegate::IsEnabled(
+           profile, web_contents->GetLastCommittedURL(), &data, connector)) {
+     std::move(callback).Run(
+@@ -154,4 +164,8 @@ void HandleOnPerformDrop(
+     std::move(callback).Run(
+         content::WebContentsViewDelegate::DropCompletionResult::kContinue);
+   }
++#else
++  std::move(callback).Run(
++      content::WebContentsViewDelegate::DropCompletionResult::kContinue);
++#endif // BUILDFLAG(FULL_SAFE_BROWSING)
+ }
+--- 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);
+   if (deep_scanning_label_->GetVisible()) {
+-    const int id = (model_->download() &&
+-                    safe_browsing::DeepScanningRequest::ShouldUploadBinary(
+-                        model_->download()))
++    const int id = model_->download()
+                        ? IDS_PROMPT_DEEP_SCANNING_DOWNLOAD
+                        : IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD;
+     const std::u16string filename = ElidedFilename(*deep_scanning_label_);
+@@ -886,11 +884,15 @@ void DownloadItemView::UpdateButtons() {
+   }
+ 
+   const bool allow_open_during_deep_scan =
++#if BUILDFLAG(FULL_SAFE_BROWSING)
+       (mode_ == download::DownloadItemMode::kDeepScanning) &&
+       !enterprise_connectors::ConnectorsServiceFactory::GetForBrowserContext(
+            model_->profile())
+            ->DelayUntilVerdict(
+                enterprise_connectors::AnalysisConnector::FILE_DOWNLOADED);
++#else
++      false;
++#endif // BUILDFLAG(FULL_SAFE_BROWSING)
+   open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) ||
+                            prompt_to_scan || allow_open_during_deep_scan);
+ 
+@@ -1427,7 +1429,9 @@ void DownloadItemView::ShowContextMenuIm
+ }
+ 
+ void DownloadItemView::OpenDownloadDuringAsyncScanning() {
++#if BUILDFLAG(FULL_SAFE_BROWSING)
+   model_->CompleteSafeBrowsingScan();
++#endif
+   model_->SetOpenWhenComplete(true);
+ }
+ 
+--- 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);
+-    model.CompleteSafeBrowsingScan();
+   }
+ }
+ 
+--- 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);
+   }
+ 
+-  if (connectors_service->GetAppliedRealTimeUrlCheck() !=
+-      safe_browsing::REAL_TIME_CHECK_DISABLED) {
+-    AddThreatProtectionPermission(kManagementOnPageVisitedEvent,
+-                                  kManagementOnPageVisitedVisibleData, &info);
+-  }
+-
+   const std::string enterprise_manager =
+       connectors_service->GetManagementDomain();
+ 
+--- 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"
++#if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
+ #include "components/safe_browsing/content/common/file_type_policies.h"
++#endif
+ #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"
+@@ -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(
+             path)) {
+       should_check_url = true;
+     }
++#endif // BUILDFLAG(SAFE_BROWSING_AVAILABLE)
+ 
+     // 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
+@@ -196,6 +200,7 @@ void ShareServiceImpl::Share(const std::
+   }
+ 
+   DCHECK(!safe_browsing_request_);
++#if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
+   if (should_check_url && g_browser_process->safe_browsing_service()) {
+     safe_browsing_request_.emplace(
+         g_browser_process->safe_browsing_service()->database_manager(),
+@@ -205,6 +210,7 @@ void ShareServiceImpl::Share(const std::
+                        std::move(files), std::move(callback)));
+     return;
+   }
++#endif // BUILDFLAG(SAFE_BROWSING_AVAILABLE)
+ 
+   OnSafeBrowsingResultReceived(title, text, share_url, std::move(files),
+                                std::move(callback),
+--- 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",
+-      "//components/safe_browsing/content/browser:client_side_detection",
+       "//components/safe_browsing/content/browser:safe_browsing_service",
+       "//components/safe_browsing/content/browser/password_protection",
+       "//components/safe_browsing/content/browser/password_protection:test_support",
+@@ -5349,7 +5348,6 @@ test("unit_tests") {
+     "//components/resources",
+     "//components/safe_browsing:buildflags",
+     "//components/safe_browsing/content/browser",
+-    "//components/safe_browsing/content/browser:client_side_detection",
+     "//components/safe_browsing/content/browser/password_protection",
+     "//components/safe_browsing/content/browser/password_protection:mock_password_protection",
+     "//components/safe_browsing/content/browser/web_ui",
+--- 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
+ }
+--- 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;
+ 
++#if (defined(ON_FOCUS_PING_ENABLED) || defined(PASSWORD_REUSE_DETECTION_ENABLED)) && \
++    BUILDFLAG(FULL_SAFE_BROWSING)
+   // Return the PasswordProtectionService associated with this instance.
+   virtual safe_browsing::PasswordProtectionService*
+   GetPasswordProtectionService() const = 0;
++#endif
+ 
+-#if defined(ON_FOCUS_PING_ENABLED)
++#if defined(ON_FOCUS_PING_ENABLED) && BUILDFLAG(FULL_SAFE_BROWSING)
+   // 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.
+@@ -351,6 +354,7 @@ class PasswordManagerClient {
+                                            const GURL& frame_url) = 0;
+ #endif
+ 
++#if defined(PASSWORD_REUSE_DETECTION_ENABLED)
+   // 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
+@@ -363,6 +367,7 @@ class PasswordManagerClient {
+       const std::string& username,
+       const std::vector<MatchingReusedCredential>& matching_reused_credentials,
+       bool password_field_exists) = 0;
++#endif
+ 
+   // Records a Chrome Sync event that GAIA password reuse was detected.
+   virtual void LogPasswordReuseDetectedEvent() = 0;
+--- 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
+                              : "";
+ 
++  #if defined(PASSWORD_REUSE_DETECTION_ENABLED)
+   client_->CheckProtectedPasswordEntry(reused_password_type, username,
+                                        matching_reused_credentials,
+                                        password_field_detected);
++  #endif
+ }
+ 
+ void PasswordReuseDetectionManager::SetClockForTesting(base::Clock* clock) {
+--- 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")
+ 
+-if (safe_browsing_mode != 0) {
++# Although this was gated on safe_browsing_mode != 0, a considerable amount
++# of source code that relies on the types included in download_file_types.pb.h
++# is not gated on BUILDFLAG(SAFE_BROWSING_AVAILABLE). This is far less
++# invasive than the alternative.
++# if (safe_browsing_mode != 0) {
+   proto_library("download_file_types_proto") {
+     sources = [ "download_file_types.proto" ]
+   }
+-}
++# }
+--- 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,
+ };
+ 
+-[EnableIf=full_safe_browsing]
+ // Interface for setting the CSD model and to start phishing classification.
+ interface PhishingDetector {
+   // A classification model for client-side phishing detection.
+--- 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;
+   }
+ 
+-  if (!RequireSecurityChecks() || !manager_->permission_context()) {
+     DidAfterWriteCheck(
+         FileSystemAccessPermissionContext::AfterWriteCheckResult::kAllow);
+-    return;
+-  }
+-
+-  ComputeHashForSourceFile(base::BindOnce(&SafeMoveHelper::DoAfterWriteCheck,
+-                                          weak_factory_.GetWeakPtr()));
+ }
+ 
+ void SafeMoveHelper::ComputeHashForSourceFile(HashCallback callback) {
+@@ -177,38 +171,6 @@ void SafeMoveHelper::ComputeHashForSourc
+                      std::move(wrapped_callback), source_url()));
+ }
+ 
+-void SafeMoveHelper::DoAfterWriteCheck(base::File::Error hash_result,
+-                                       const std::string& hash,
+-                                       int64_t size) {
+-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+-
+-  if (hash_result != base::File::FILE_OK) {
+-    // Calculating the hash failed.
+-    std::move(callback_).Run(file_system_access_error::FromStatus(
+-        blink::mojom::FileSystemAccessStatus::kOperationAborted,
+-        "Failed to perform Safe Browsing check."));
+-    return;
+-  }
+-
+-  if (!manager_) {
+-    std::move(callback_).Run(file_system_access_error::FromStatus(
+-        blink::mojom::FileSystemAccessStatus::kOperationAborted));
+-    return;
+-  }
+-
+-  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->has_user_gesture = has_transient_user_activation_;
+-  manager_->permission_context()->PerformAfterWriteChecks(
+-      std::move(item), context_.frame_id,
+-      base::BindOnce(&SafeMoveHelper::DidAfterWriteCheck,
+-                     weak_factory_.GetWeakPtr()));
+-}
+-
+ void SafeMoveHelper::DidAfterWriteCheck(
+     FileSystemAccessPermissionContext::AfterWriteCheckResult result) {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+--- 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_);
+ 
+-  void DoAfterWriteCheck(base::File::Error hash_result,
+-                         const std::string& hash,
+-                         int64_t size);
+   void DidAfterWriteCheck(
+       FileSystemAccessPermissionContext::AfterWriteCheckResult result);
+   void DidFileSkipQuarantine(base::File::Error result);
+--- 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;
+ 
+   enum class AfterWriteCheckResult { kAllow, kBlock };
+-  // Runs a recently finished write operation through checks such as malware
+-  // or other security checks to determine if the write should be allowed.
+-  virtual void PerformAfterWriteChecks(
+-      std::unique_ptr<FileSystemAccessWriteItem> item,
+-      GlobalRenderFrameHostId frame_id,
+-      base::OnceCallback<void(AfterWriteCheckResult)> callback) = 0;
+ 
+   // 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
+--- extensions/browser/updater/update_service.cc.orig
++++ extensions/browser/updater/update_service.cc
+@@ -111,13 +111,6 @@ void UpdateService::OnEvent(Events event
+       break;
+   }
+ 
+-  if (should_perform_action_on_omaha_attributes) {
+-    base::Value attributes = GetExtensionOmahaAttributes(extension_id);
+-    // Note that it's important to perform actions even if |attributes| is
+-    // empty, missing values may default to false and have associated logic.
+-    ExtensionSystem::Get(browser_context_)
+-        ->PerformActionBasedOnOmahaAttributes(extension_id, attributes);
+-  }
+ }
+ 
+ UpdateService::UpdateService(
+--- 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",
+-    "//components/safe_browsing/content/browser:client_side_detection",
+     "//components/safe_browsing/content/common:interfaces",
+     "//components/safe_browsing/content/renderer:throttles",
+     "//components/safe_browsing/content/renderer/phishing_classifier",
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch b/www/chromium-uc/patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch
new file mode 100644
index 0000000..74d5b79
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch
@@ -0,0 +1,13 @@
+# Split up the learn.doubleclick.net string literal to prevent domain substitution breaking compilation due to the use of the excluded HSTS list json file in this code.
+
+--- net/tools/transport_security_state_generator/transport_security_state_generator.cc.orig
++++ net/tools/transport_security_state_generator/transport_security_state_generator.cc
+@@ -125,7 +125,7 @@ bool CheckDuplicateEntries(const Transpo
+ bool CheckNoopEntries(const TransportSecurityStateEntries& entries) {
+   for (const auto& entry : entries) {
+     if (!entry->force_https && entry->pinset.empty() && !entry->expect_ct) {
+-      if (entry->hostname == "learn.doubleclick.net") {
++      if (entry->hostname == "learn.double" "click." "net") {
+         // This entry is deliberately used as an exclusion.
+         continue;
+       }
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/www/chromium-uc/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
new file mode 100644
index 0000000..0527dde
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
@@ -0,0 +1,5260 @@
+# Remove unused Safe Browsing and Sign-in fields from Preferences file
+# TODO: This patch should probably be split up and merged into
+# disable-signin.patch and fix-building-without-safebrowsing.patch
+
+--- android_webview/browser/aw_browser_context.cc.orig
++++ android_webview/browser/aw_browser_context.cc
+@@ -49,7 +49,6 @@
+ #include "components/prefs/pref_service_factory.h"
+ #include "components/prefs/segregated_pref_store.h"
+ #include "components/profile_metrics/browser_profile_type.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/url_formatter/url_fixer.h"
+ #include "components/user_prefs/user_prefs.h"
+ #include "components/visitedlink/browser/visitedlink_writer.h"
+@@ -470,8 +469,6 @@ void AwBrowserContext::RebuildTable(
+ }
+ 
+ void AwBrowserContext::SetExtendedReportingAllowed(bool allowed) {
+-  user_pref_service_->SetBoolean(
+-      ::prefs::kSafeBrowsingExtendedReportingOptInAllowed, allowed);
+ }
+ 
+ // TODO(amalova): Make sure NetworkContextParams is configured correctly when
+--- chrome/app/settings_strings.grdp.orig
++++ chrome/app/settings_strings.grdp
+@@ -1591,78 +1591,9 @@
+   <message name="IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_DESC_COOKIES_PAGE" desc="On the cookies page, the secondary text next to the checkbox that enables prediction of network actions.">
+     Preloads pages that Chrome thinks you might visit. To do this, Chrome may use cookies, if you allow cookies, and may encrypt and send pages through Google to hide your identity from sites.
+   </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION" desc="The section title of 'Protects you and your device from dangerous sites'">
+-    Safe Browsing (protects you and your device from dangerous sites)
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION_DESC" desc="Checkbox label: should Chrome protect user and user's device from dangerous sites">
+-    Sends URLs of some pages you visit to Google, when your security is at risk
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING" desc="The section title of the extended safe browsing checkbox to help improve safe browsing">
+-    Help improve Chrome security
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC" desc="Description for extended safe browsing">
+-    Sends URLs of some pages you visit, limited system information, and some page content to Google, to help discover new threats and protect everyone on the web.
+-  </message>
+   <message name="IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL" desc="The section label of the safe browsing section grouping safe browsing settings">
+     Safe Browsing
+   </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED" desc="Label for safe browsing enhanced protection mode">
+-    Enhanced protection
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_DESC" desc="Description of safe browsing enhanced protection mode">
+-    Faster, proactive protection against dangerous websites, downloads, and extensions. Warns you about password breaches. Requires browsing data to be sent to Google.
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_EXPAND_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the detailed description of safe browsing enhanced protection. Only visible by screen reader software.">
+-    Show enhanced protection details
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_ONE" desc="First bullet point under the safe browsing enhanced protection mode">
+-    Predicts and warns you about dangerous events before they happen
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_TWO" desc="Second bullet point under the safe browsing enhanced protection mode">
+-    Keeps you safe on Chrome and may be used to improve your security in other Google apps when you are signed in
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_THREE" desc="Third bullet point under the safe browsing enhanced protection mode">
+-    Improves security for you and everyone on the web
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_FOUR" desc="Fourth bullet point under the safe browsing enhanced protection mode">
+-    Warns you if passwords are exposed in a data breach
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_FIVE" desc="Fourth bullet point under the safe browsing enhanced protection mode">
+-    Sends URLs to Safe Browsing to check them. Also sends a small sample of pages, downloads, extension activity, and system information to help discover new threats. Temporarily links this data to your Google Account when you're signed in, to protect you across Google apps.
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD" desc="Label for safe browsing standard protection mode">
+-    Standard protection
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_DESC" desc="Description for safe browsing standard protection mode">
+-    Standard protection against websites, downloads, and extensions that are known to be dangerous.
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_EXPAND_ACCESSIBILITY_LABEL" desc="Label for the button that toggles showing the detailed description of safe browsing standard protection. Only visible by screen reader software.">
+-    Show standard protection details
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_ONE" desc="First bullet point under the safe browsing standard protection mode">
+-    Detects and warns you about dangerous events when they happen
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_TWO" desc="First bullet point under the safe browsing standard protection mode">
+-    Checks URLs with a list of unsafe sites stored in Chrome. If a site tries to steal your password, or when you download a harmful file, Chrome may also send URLs, including bits of page content, to Safe Browsing.
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_STANDARD_HELP_IMPROVE" desc="The name of the toggle to enable reporting to help improve safe browsing">
+-    Help improve security on the web for everyone
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_NONE" desc="Label for safe browsing no protection mode">
+-    No protection (not recommended)
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_NONE_DESC" desc="Description for safe browsing no protection mode">
+-    Does not protect you against dangerous websites, downloads, and extensions. You’ll still get Safe Browsing protection, where available, in other Google services, like Gmail and Search.
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_DISABLE_DIALOG_TITLE" desc="Title for the confirmation dialog to turn off SafeBrowsing">
+-    Turn off Safe Browsing?
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_DISABLE_DIALOG_DESC" desc="Description for the confirmation dialog to turn off SafeBrowsing">
+-    Safe Browsing protects you against attackers who may trick you into doing something dangerous like installing malicious software or revealing personal information like passwords, phone numbers, or credit cards. If you turn it off, be careful when browsing unfamiliar or unreputable sites.
+-  </message>
+-  <message name="IDS_SETTINGS_SAFEBROWSING_DISABLE_DIALOG_CONFIRM" desc="Title for the confirmation dialog to turn off SafeBrowsing">
+-    Turn off
+-  </message>
+   <message name="IDS_SETTINGS_ENABLE_DO_NOT_TRACK" desc="The label of the checkbox to enable/disable sending the 'Do Not track' header">
+     Send a "Do Not Track" request with your browsing traffic
+   </message>
+--- chrome/browser/android/signin/signin_manager_android.cc.orig
++++ chrome/browser/android/signin/signin_manager_android.cc
+@@ -14,7 +14,6 @@
+ #include "chrome/android/chrome_jni_headers/SigninManagerImpl_jni.h"
+ #include "chrome/common/pref_names.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "google_apis/gaia/gaia_auth_util.h"
+ 
+ #include "base/android/callback_android.h"
+@@ -30,7 +29,6 @@
+ #include "components/policy/core/browser/browser_policy_connector.h"
+ #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/accounts_cookie_mutator.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "content/public/browser/browser_context.h"
+@@ -95,8 +93,6 @@ class ProfileDataRemover : public conten
+       // All the Profile data has been wiped. Clear the last signed in username
+       // as well, so that the next signin doesn't trigger the account
+       // change dialog.
+-      profile_->GetPrefs()->ClearPref(prefs::kGoogleServicesLastAccountId);
+-      profile_->GetPrefs()->ClearPref(prefs::kGoogleServicesLastUsername);
+     }
+ 
+     origin_runner_->PostTask(FROM_HERE, std::move(callback_));
+@@ -132,11 +128,6 @@ SigninManagerAndroid::SigninManagerAndro
+   DCHECK(user_cloud_policy_manager_);
+   DCHECK(user_policy_signin_service_);
+ 
+-  signin_allowed_.Init(
+-      prefs::kSigninAllowed, profile_->GetPrefs(),
+-      base::BindRepeating(&SigninManagerAndroid::OnSigninAllowedPrefChanged,
+-                          base::Unretained(this)));
+-
+   force_browser_signin_.Init(prefs::kForceBrowserSignin,
+                              g_browser_process->local_state());
+ 
+@@ -160,7 +151,7 @@ void SigninManagerAndroid::Shutdown() {
+ }
+ 
+ bool SigninManagerAndroid::IsSigninAllowed() const {
+-  return signin_allowed_.GetValue();
++  return false;
+ }
+ 
+ jboolean SigninManagerAndroid::IsSigninAllowedByPolicy(JNIEnv* env) const {
+--- chrome/browser/android/signin/signin_manager_android.h.orig
++++ chrome/browser/android/signin/signin_manager_android.h
+@@ -117,9 +117,6 @@ class SigninManagerAndroid : public Keye
+ 
+   Profile* const profile_ = nullptr;
+ 
+-  // Handler for prefs::kSigninAllowed set in user's profile.
+-  BooleanPrefMember signin_allowed_;
+-
+   // Handler for prefs::kForceBrowserSignin. This preference is set in Local
+   // State, not in user prefs.
+   BooleanPrefMember force_browser_signin_;
+--- chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc.orig
++++ chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc
+@@ -18,7 +18,6 @@
+ #include "chrome/browser/profiles/profile_manager.h"
+ #include "chrome/common/pref_names.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "extensions/browser/extension_system.h"
+ 
+ namespace lock_screen_apps {
+@@ -90,8 +89,6 @@ void LockScreenProfileCreatorImpl::OnPro
+     // SafeBrowsingService when the user has safe browsing disabled (reasoning
+     // similar to http://crbug.com/461493).
+     // TODO(tbarzic): Revisit this if webviews get enabled for lock screen apps.
+-    profile->GetPrefs()->SetBoolean(prefs::kSafeBrowsingEnabled, false);
+-    profile->GetPrefs()->SetBoolean(prefs::kSafeBrowsingEnhanced, false);
+     return;
+   }
+ 
+--- chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc.orig
++++ chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
+@@ -37,7 +37,6 @@
+ #include "components/arc/session/arc_session.h"
+ #include "components/crx_file/id_util.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "content/public/test/browser_task_environment.h"
+ #include "extensions/common/extension.h"
+ #include "extensions/common/extension_builder.h"
+--- chrome/browser/ash/login/signin/device_id_browsertest.cc.orig
++++ chrome/browser/ash/login/signin/device_id_browsertest.cc
+@@ -24,7 +24,6 @@
+ #include "chrome/common/chrome_switches.h"
+ #include "chrome/test/base/in_process_browser_test.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/user_manager/known_user.h"
+ #include "components/user_manager/user_manager.h"
+ #include "content/public/test/browser_test.h"
+@@ -249,15 +248,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE
+   SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword,
+                kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId);
+ 
+-  // Simulate user that has device ID saved only in preferences (pre-M44).
+-  PrefService* prefs =
+-      ProfileHelper::Get()
+-          ->GetProfileByUser(user_manager::UserManager::Get()->GetActiveUser())
+-          ->GetPrefs();
+-  prefs->SetString(
+-      prefs::kGoogleServicesSigninScopedDeviceId,
+-      GetDeviceId(AccountId::FromUserEmail(FakeGaiaMixin::kFakeUserEmail)));
+-
+   // Can't use SetKnownUserDeviceId here, because it forbids changing a device
+   // ID.
+   user_manager::known_user::SetStringPref(
+@@ -282,13 +272,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE
+   SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword,
+                kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId);
+ 
+-  PrefService* prefs =
+-      ProfileHelper::Get()
+-          ->GetProfileByUser(user_manager::UserManager::Get()->GetActiveUser())
+-          ->GetPrefs();
+-  EXPECT_TRUE(
+-      prefs->GetString(prefs::kGoogleServicesSigninScopedDeviceId).empty());
+-
+   // Can't use SetKnownUserDeviceId here, because it forbids changing a device
+   // ID.
+   user_manager::known_user::SetStringPref(
+--- chrome/browser/chrome_content_browser_client.cc.orig
++++ chrome/browser/chrome_content_browser_client.cc
+@@ -225,7 +225,6 @@
+ #include "components/safe_browsing/core/browser/realtime/url_lookup_service.h"
+ #include "components/safe_browsing/core/browser/url_checker_delegate.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/insecure_form_navigation_throttle.h"
+ #include "components/security_interstitials/content/origin_policy_ui.h"
+ #include "components/security_interstitials/content/ssl_cert_reporter.h"
+--- chrome/browser/download/download_browsertest.cc.orig
++++ chrome/browser/download/download_browsertest.cc
+@@ -103,7 +103,6 @@
+ #include "components/safe_browsing/content/browser/safe_browsing_service_interface.h"
+ #include "components/safe_browsing/content/common/proto/download_file_types.pb.h"
+ #include "components/safe_browsing/core/common/proto/csd.pb.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_state/core/features.h"
+ #include "components/security_state/core/security_state.h"
+ #include "components/services/quarantine/test_support.h"
+--- chrome/browser/download/download_item_model.cc.orig
++++ chrome/browser/download/download_item_model.cc
+@@ -783,6 +783,7 @@ void DownloadItemModel::ExecuteCommand(D
+       DownloadUIModel::ExecuteCommand(download_commands, command);
+       break;
+     case DownloadCommands::DEEP_SCAN:
++#if BUILDFLAG(FULL_SAFE_BROWSING)
+       safe_browsing::SafeBrowsingService* sb_service =
+           g_browser_process->safe_browsing_service();
+       if (!sb_service)
+@@ -808,6 +809,7 @@ void DownloadItemModel::ExecuteCommand(D
+           safe_browsing::DeepScanningRequest::DeepScanTrigger::
+               TRIGGER_APP_PROMPT,
+           safe_browsing::DownloadCheckResult::UNKNOWN, std::move(settings));
++#endif
+       break;
+   }
+ }
+--- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc.orig
++++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
+@@ -38,7 +38,6 @@
+ #include "components/policy/core/common/chrome_schema.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/url_matcher/url_matcher.h"
+ #include "content/public/browser/web_contents.h"
+ #include "crypto/secure_hash.h"
+--- chrome/browser/enterprise/connectors/connectors_manager.cc.orig
++++ chrome/browser/enterprise/connectors/connectors_manager.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <memory>
+ 
++#include "base/bind.h"
+ #include "base/feature_list.h"
+ #include "base/no_destructor.h"
+ #include "base/values.h"
+@@ -13,7 +14,6 @@
+ #include "chrome/browser/enterprise/connectors/connectors_prefs.h"
+ #include "components/policy/core/browser/url_util.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/url_matcher/url_matcher.h"
+ #include "url/gurl.h"
+ 
+--- chrome/browser/enterprise/connectors/connectors_service.cc.orig
++++ chrome/browser/enterprise/connectors/connectors_service.cc
+@@ -36,7 +36,6 @@
+ #include "components/policy/core/common/cloud/machine_level_user_cloud_policy_store.h"
+ #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
+ #include "components/policy/core/common/policy_types.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/signin/public/identity_manager/consent_level.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/user_prefs/user_prefs.h"
+@@ -406,8 +405,7 @@ std::string ConnectorsService::GetManage
+ 
+   absl::optional<policy::PolicyScope> scope = absl::nullopt;
+   for (const char* scope_pref :
+-       {prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope,
+-        ConnectorScopePref(AnalysisConnector::FILE_ATTACHED),
++       {ConnectorScopePref(AnalysisConnector::FILE_ATTACHED),
+         ConnectorScopePref(AnalysisConnector::FILE_DOWNLOADED),
+         ConnectorScopePref(AnalysisConnector::BULK_DATA_ENTRY),
+         ConnectorScopePref(ReportingConnector::SECURITY_EVENT)}) {
+@@ -458,20 +456,6 @@ std::string ConnectorsService::GetManage
+ 
+ absl::optional<std::string> ConnectorsService::GetDMTokenForRealTimeUrlCheck()
+     const {
+-  if (!ConnectorsEnabled())
+-    return absl::nullopt;
+-
+-  if (Profile::FromBrowserContext(context_)->GetPrefs()->GetInteger(
+-          prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode) ==
+-      safe_browsing::REAL_TIME_CHECK_DISABLED) {
+-    return absl::nullopt;
+-  }
+-
+-  absl::optional<DmToken> dm_token =
+-      GetDmToken(prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope);
+-
+-  if (dm_token.has_value())
+-    return dm_token.value().value;
+   return absl::nullopt;
+ }
+ 
+--- chrome/browser/enterprise/connectors/connectors_service.h.orig
++++ chrome/browser/enterprise/connectors/connectors_service.h
+@@ -13,7 +13,6 @@
+ #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
+ #include "components/keyed_service/core/keyed_service.h"
+ #include "components/policy/core/common/policy_types.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "content/public/browser/browser_context.h"
+ 
+ namespace base {
+--- chrome/browser/enterprise/signals/context_info_fetcher.cc.orig
++++ chrome/browser/enterprise/signals/context_info_fetcher.cc
+@@ -183,11 +183,6 @@ void ContextInfoFetcher::Fetch(ContextIn
+   info.third_party_blocking_enabled =
+       utils::GetThirdPartyBlockingEnabled(g_browser_process->local_state());
+ 
+-  Profile* profile = Profile::FromBrowserContext(browser_context_);
+-  info.safe_browsing_protection_level =
+-      utils::GetSafeBrowsingProtectionLevel(profile->GetPrefs());
+-  info.password_protection_warning_trigger =
+-      utils::GetPasswordProtectionWarningTrigger(profile->GetPrefs());
+ 
+ #if defined(OS_WIN)
+   base::ThreadPool::CreateCOMSTATaskRunner({base::MayBlock()})
+--- chrome/browser/enterprise/signals/context_info_fetcher.h.orig
++++ chrome/browser/enterprise/signals/context_info_fetcher.h
+@@ -12,7 +12,6 @@
+ #include "base/callback_forward.h"
+ #include "build/build_config.h"
+ #include "chrome/browser/enterprise/signals/signals_common.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ 
+ namespace content {
+ class BrowserContext;
+@@ -39,11 +38,8 @@ struct ContextInfo {
+   std::vector<std::string> on_bulk_data_entry_providers;
+   std::vector<std::string> on_security_event_providers;
+   std::string browser_version;
+-  safe_browsing::SafeBrowsingState safe_browsing_protection_level;
+   bool site_isolation_enabled;
+   bool built_in_dns_client_enabled;
+-  absl::optional<safe_browsing::PasswordProtectionTrigger>
+-      password_protection_warning_trigger;
+   absl::optional<bool> chrome_cleanup_enabled;
+   bool chrome_remote_desktop_app_blocked;
+   absl::optional<bool> third_party_blocking_enabled;
+--- chrome/browser/enterprise/signals/signals_utils.cc.orig
++++ chrome/browser/enterprise/signals/signals_utils.cc
+@@ -10,7 +10,6 @@
+ #include "components/policy/content/policy_blocklist_service.h"
+ #include "components/policy/core/browser/url_blocklist_manager.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ 
+ #if defined(OS_WIN)
+ #include "components/component_updater/pref_names.h"
+--- chrome/browser/enterprise/signals/signals_utils.h.orig
++++ chrome/browser/enterprise/signals/signals_utils.h
+@@ -5,8 +5,6 @@
+ #ifndef CHROME_BROWSER_ENTERPRISE_SIGNALS_SIGNALS_UTILS_H_
+ #define CHROME_BROWSER_ENTERPRISE_SIGNALS_SIGNALS_UTILS_H_
+ 
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+-
+ #include "third_party/abseil-cpp/absl/types/optional.h"
+ 
+ class PolicyBlocklistService;
+--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig
++++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
+@@ -77,45 +77,10 @@ api::enterprise_reporting_private::Conte
+   info.browser_version = std::move(signals.browser_version);
+   info.built_in_dns_client_enabled = signals.built_in_dns_client_enabled;
+ 
+-  switch (signals.safe_browsing_protection_level) {
+-    case safe_browsing::SafeBrowsingState::NO_SAFE_BROWSING:
+-      info.safe_browsing_protection_level = extensions::api::
+-          enterprise_reporting_private::SAFE_BROWSING_LEVEL_DISABLED;
+-      break;
+-    case safe_browsing::SafeBrowsingState::STANDARD_PROTECTION:
+-      info.safe_browsing_protection_level = extensions::api::
+-          enterprise_reporting_private::SAFE_BROWSING_LEVEL_STANDARD;
+-      break;
+-    case safe_browsing::SafeBrowsingState::ENHANCED_PROTECTION:
+-      info.safe_browsing_protection_level = extensions::api::
+-          enterprise_reporting_private::SAFE_BROWSING_LEVEL_ENHANCED;
+-      break;
+-  }
+-  if (!signals.password_protection_warning_trigger.has_value()) {
+-    info.password_protection_warning_trigger = extensions::api::
+-        enterprise_reporting_private::PASSWORD_PROTECTION_TRIGGER_POLICY_UNSET;
+-  } else {
+-    switch (signals.password_protection_warning_trigger.value()) {
+-      case safe_browsing::PASSWORD_PROTECTION_OFF:
+-        info.password_protection_warning_trigger =
+-            extensions::api::enterprise_reporting_private::
+-                PASSWORD_PROTECTION_TRIGGER_PASSWORD_PROTECTION_OFF;
+-        break;
+-      case safe_browsing::PASSWORD_REUSE:
+-        info.password_protection_warning_trigger =
+-            extensions::api::enterprise_reporting_private::
+-                PASSWORD_PROTECTION_TRIGGER_PASSWORD_REUSE;
+-        break;
+-      case safe_browsing::PHISHING_REUSE:
+-        info.password_protection_warning_trigger =
+-            extensions::api::enterprise_reporting_private::
+-                PASSWORD_PROTECTION_TRIGGER_PHISHING_REUSE;
+-        break;
+-      case safe_browsing::PASSWORD_PROTECTION_TRIGGER_MAX:
+-        NOTREACHED();
+-        break;
+-    }
+-  }
++  info.safe_browsing_protection_level = extensions::api::
++      enterprise_reporting_private::SAFE_BROWSING_LEVEL_DISABLED;
++  info.password_protection_warning_trigger = extensions::api::
++      enterprise_reporting_private::PASSWORD_PROTECTION_TRIGGER_POLICY_UNSET;
+ 
+   return info;
+ }
+--- chrome/browser/extensions/api/identity/identity_apitest.cc.orig
++++ chrome/browser/extensions/api/identity/identity_apitest.cc
+@@ -56,7 +56,6 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/core/browser/account_reconcilor.h"
+ #include "components/signin/public/base/list_accounts_test_utils.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/base/signin_switches.h"
+ #include "components/signin/public/identity_manager/accounts_mutator.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+--- chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc.orig
++++ chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
+@@ -30,7 +30,6 @@
+ #include "chrome/common/channel_info.h"
+ #include "chrome/common/extensions/api/identity.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/base/signin_switches.h"
+ #include "components/signin/public/identity_manager/access_token_info.h"
+ #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
+@@ -64,7 +63,7 @@ const char* const kExtensionsIdentityAPI
+     "extensions_identity_api";
+ 
+ bool IsBrowserSigninAllowed(Profile* profile) {
+-  return profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed);
++  return false;
+ }
+ 
+ std::string GetOAuth2MintTokenFlowVersion() {
+--- chrome/browser/extensions/api/preference/preference_api.cc.orig
++++ chrome/browser/extensions/api/preference/preference_api.cc
+@@ -35,7 +35,6 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/privacy_sandbox/privacy_sandbox_prefs.h"
+ #include "components/proxy_config/proxy_config_pref_names.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/spellcheck/browser/pref_names.h"
+ #include "components/translate/core/browser/translate_pref_names.h"
+ #include "extensions/browser/extension_pref_value_map.h"
+@@ -109,11 +108,6 @@ const PrefMappingEntry kPrefMapping[] =
+      APIPermissionID::kPrivacy},
+     {"doNotTrackEnabled", prefs::kEnableDoNotTrack, APIPermissionID::kPrivacy,
+      APIPermissionID::kPrivacy},
+-    {"safeBrowsingEnabled", prefs::kSafeBrowsingEnabled,
+-     APIPermissionID::kPrivacy, APIPermissionID::kPrivacy},
+-    {"safeBrowsingExtendedReportingEnabled",
+-     prefs::kSafeBrowsingScoutReportingEnabled, APIPermissionID::kPrivacy,
+-     APIPermissionID::kPrivacy},
+     {"searchSuggestEnabled", prefs::kSearchSuggestEnabled,
+      APIPermissionID::kPrivacy, APIPermissionID::kPrivacy},
+     {"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService,
+@@ -844,18 +838,6 @@ ExtensionFunction::ResponseAction SetPre
+         base::Value(browser_pref_value->GetBool()));
+   }
+ 
+-  // Whenever an extension takes control of the |kSafeBrowsingEnabled|
+-  // preference, it must also set |kSafeBrowsingEnhanced| to false.
+-  // See crbug.com/1064722 for more background.
+-  //
+-  // TODO(crbug.com/1064722): Consider extending
+-  // chrome.privacy.services.safeBrowsingEnabled to a three-state enum.
+-  if (prefs::kSafeBrowsingEnabled == browser_pref) {
+-    preference_api->SetExtensionControlledPref(extension_id(),
+-                                               prefs::kSafeBrowsingEnhanced,
+-                                               scope, base::Value(false));
+-  }
+-
+   preference_api->SetExtensionControlledPref(
+       extension_id(), browser_pref, scope,
+       base::Value::FromUniquePtrValue(std::move(browser_pref_value)));
+@@ -908,18 +890,6 @@ ExtensionFunction::ResponseAction ClearP
+   PreferenceAPI::Get(browser_context())
+       ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope);
+ 
+-  // Whenever an extension clears the |kSafeBrowsingEnabled| preference,
+-  // it must also clear |kSafeBrowsingEnhanced|. See crbug.com/1064722 for
+-  // more background.
+-  //
+-  // TODO(crbug.com/1064722): Consider extending
+-  // chrome.privacy.services.safeBrowsingEnabled to a three-state enum.
+-  if (prefs::kSafeBrowsingEnabled == browser_pref) {
+-    PreferenceAPI::Get(browser_context())
+-        ->RemoveExtensionControlledPref(extension_id(),
+-                                        prefs::kSafeBrowsingEnhanced, scope);
+-  }
+-
+   return RespondNow(NoArguments());
+ }
+ 
+--- chrome/browser/extensions/api/preference/preference_apitest.cc.orig
++++ chrome/browser/extensions/api/preference/preference_apitest.cc
+@@ -28,7 +28,6 @@
+ #include "components/keep_alive_registry/scoped_keep_alive.h"
+ #include "components/password_manager/core/common/password_manager_pref_names.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/translate/core/browser/translate_pref_names.h"
+ #include "content/public/browser/notification_service.h"
+ #include "content/public/test/browser_test.h"
+@@ -73,7 +72,6 @@ class ExtensionPreferenceApiTest : publi
+               prefs->GetInteger(prefs::kNetworkPredictionOptions));
+     EXPECT_TRUE(
+         prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService));
+-    EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
+     EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
+   }
+ 
+@@ -99,7 +97,6 @@ class ExtensionPreferenceApiTest : publi
+               prefs->GetInteger(prefs::kNetworkPredictionOptions));
+     EXPECT_FALSE(
+         prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService));
+-    EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
+     EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
+   }
+ 
+@@ -163,7 +160,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionPreferen
+   prefs->SetInteger(prefs::kNetworkPredictionOptions,
+                     chrome_browser_net::NETWORK_PREDICTION_NEVER);
+   prefs->SetBoolean(password_manager::prefs::kCredentialsEnableService, false);
+-  prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false);
+   prefs->SetBoolean(prefs::kSearchSuggestEnabled, false);
+   prefs->SetString(prefs::kWebRTCIPHandlingPolicy,
+                    blink::kWebRTCIPHandlingDefaultPublicInterfaceOnly);
+--- chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc.orig
++++ chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
+@@ -36,7 +36,6 @@
+ #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "content/public/browser/browser_context.h"
+ #include "extensions/browser/event_router.h"
+--- chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc.orig
++++ chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
+@@ -35,7 +35,6 @@
+ #include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
+ #include "components/policy/core/common/cloud/realtime_reporting_job_configuration.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/signin/public/identity_manager/identity_test_environment.h"
+ #include "content/public/test/browser_task_environment.h"
+ #include "extensions/browser/test_event_router.h"
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig
++++ chrome/browser/extensions/api/settings_private/prefs_util.cc
+@@ -43,7 +43,6 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/privacy_sandbox/privacy_sandbox_prefs.h"
+ #include "components/proxy_config/proxy_config_pref_names.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/search_engines/default_search_manager.h"
+ #include "components/spellcheck/browser/pref_names.h"
+ #include "components/translate/core/browser/translate_pref_names.h"
+@@ -283,16 +282,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+       settings_api::PrefType::PREF_TYPE_BOOLEAN;
+ 
+   // Security page
+-  (*s_allowlist)[::kGeneratedPasswordLeakDetectionPref] =
+-      settings_api::PrefType::PREF_TYPE_BOOLEAN;
+-  (*s_allowlist)[::prefs::kSafeBrowsingEnabled] =
+-      settings_api::PrefType::PREF_TYPE_BOOLEAN;
+-  (*s_allowlist)[::prefs::kSafeBrowsingEnhanced] =
+-      settings_api::PrefType::PREF_TYPE_BOOLEAN;
+-  (*s_allowlist)[::prefs::kSafeBrowsingScoutReportingEnabled] =
+-      settings_api::PrefType::PREF_TYPE_BOOLEAN;
+-  (*s_allowlist)[::safe_browsing::kGeneratedSafeBrowsingPref] =
+-      settings_api::PrefType::PREF_TYPE_NUMBER;
+   (*s_allowlist)[::prefs::kHttpsOnlyModeEnabled] =
+       settings_api::PrefType::PREF_TYPE_BOOLEAN;
+ 
+--- chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc.orig
++++ chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
+@@ -647,9 +647,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore
+ IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest,
+                        GetReferrerChainForNonSafeBrowsingUser) {
+   PrefService* pref_service = browser()->profile()->GetPrefs();
+-  EXPECT_TRUE(pref_service->GetBoolean(prefs::kSafeBrowsingEnabled));
+-  // Disable SafeBrowsing.
+-  pref_service->SetBoolean(prefs::kSafeBrowsingEnabled, false);
+ 
+   GURL page_url = GetTestServerURLWithReferrers("empty_referrer_chain.html");
+   ASSERT_TRUE(OpenTestURL(page_url));
+--- chrome/browser/extensions/extension_allowlist.cc.orig
++++ chrome/browser/extensions/extension_allowlist.cc
+@@ -9,7 +9,6 @@
+ #include "chrome/browser/profiles/profile.h"
+ #include "chrome/browser/safe_browsing/safe_browsing_metrics_collector_factory.h"
+ #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "extensions/browser/allowlist_state.h"
+ #include "extensions/browser/extension_registry.h"
+ #include "extensions/browser/extension_system.h"
+@@ -68,10 +67,6 @@ ExtensionAllowlist::ExtensionAllowlist(P
+   // Register to Enhanced Safe Browsing setting changes for allowlist
+   // enforcements.
+   pref_change_registrar_.Init(profile_->GetPrefs());
+-  pref_change_registrar_.Add(
+-      prefs::kSafeBrowsingEnhanced,
+-      base::BindRepeating(&ExtensionAllowlist::OnSafeBrowsingEnhancedChanged,
+-                          base::Unretained(this)));
+ }
+ 
+ ExtensionAllowlist::~ExtensionAllowlist() = default;
+@@ -240,15 +235,8 @@ void ExtensionAllowlist::OnExtensionInst
+ }
+ 
+ void ExtensionAllowlist::SetAllowlistEnforcementFields() {
+-  if (safe_browsing::IsEnhancedProtectionEnabled(*profile_->GetPrefs())) {
+-    warnings_enabled_ = base::FeatureList::IsEnabled(
+-        extensions_features::kSafeBrowsingCrxAllowlistShowWarnings);
+-    should_auto_disable_extensions_ = base::FeatureList::IsEnabled(
+-        extensions_features::kSafeBrowsingCrxAllowlistAutoDisable);
+-  } else {
+     warnings_enabled_ = false;
+     should_auto_disable_extensions_ = false;
+-  }
+ }
+ 
+ // `ApplyEnforcement` can be called when an extension becomes not allowlisted or
+@@ -398,15 +386,6 @@ void ExtensionAllowlist::NotifyExtension
+ }
+ 
+ void ExtensionAllowlist::ReportExtensionReEnabledEvent() {
+-  auto* metrics_collector =
+-      safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
+-          profile_);
+-  DCHECK(metrics_collector);
+-  if (metrics_collector) {
+-    metrics_collector->AddSafeBrowsingEventToPref(
+-        safe_browsing::SafeBrowsingMetricsCollector::EventType::
+-            NON_ALLOWLISTED_EXTENSION_RE_ENABLED);
+-  }
+ }
+ 
+ }  // namespace extensions
+--- chrome/browser/extensions/installed_loader.cc.orig
++++ chrome/browser/extensions/installed_loader.cc
+@@ -797,12 +797,6 @@ void InstalledLoader::RecordExtensionsMe
+                               enabled_not_allowlisted_count);
+   base::UmaHistogramCounts100("Extensions.NotAllowlistedDisabled",
+                               disabled_not_allowlisted_count);
+-  if (safe_browsing::IsEnhancedProtectionEnabled(*profile->GetPrefs())) {
+-    base::UmaHistogramCounts100("Extensions.NotAllowlistedEnabledAndEsbUser",
+-                                enabled_not_allowlisted_count);
+-    base::UmaHistogramCounts100("Extensions.NotAllowlistedDisabledAndEsbUser",
+-                                disabled_not_allowlisted_count);
+-  }
+ }
+ 
+ int InstalledLoader::GetCreationFlags(const ExtensionInfo* info) {
+--- chrome/browser/net/profile_network_context_service.cc.orig
++++ chrome/browser/net/profile_network_context_service.cc
+@@ -43,7 +43,6 @@
+ #include "components/pref_registry/pref_registry_syncable.h"
+ #include "components/prefs/pref_registry_simple.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "content/public/browser/browser_context.h"
+ #include "content/public/browser/browser_thread.h"
+ #include "content/public/browser/network_service_instance.h"
+@@ -741,13 +740,6 @@ void ProfileNetworkContextService::Confi
+   network_context_params->enable_certificate_reporting = true;
+   network_context_params->enable_expect_ct_reporting = true;
+ 
+-  // Initialize the network context to do SCT auditing only if the current
+-  // profile is opted in to Safe Browsing Extended Reporting.
+-  if (!profile_->IsOffTheRecord() &&
+-      safe_browsing::IsExtendedReportingEnabled(*profile_->GetPrefs())) {
+-    network_context_params->enable_sct_auditing = true;
+-  }
+-
+   network_context_params->ct_policy = GetCTPolicy();
+ 
+ #if BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED)
+--- chrome/browser/net/trial_comparison_cert_verifier_browsertest.cc.orig
++++ chrome/browser/net/trial_comparison_cert_verifier_browsertest.cc
+@@ -11,7 +11,6 @@
+ #include "chrome/test/base/in_process_browser_test.h"
+ #include "chrome/test/base/ui_test_utils.h"
+ #include "components/metrics/content/subprocess_metrics_provider.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "content/public/test/browser_test.h"
+ #include "net/base/features.h"
+ #include "net/cert/trial_comparison_cert_verifier.h"
+--- chrome/browser/net/trial_comparison_cert_verifier_controller.cc.orig
++++ chrome/browser/net/trial_comparison_cert_verifier_controller.cc
+@@ -19,7 +19,6 @@
+ #include "chrome/browser/safe_browsing/certificate_reporting_service.h"
+ #include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h"
+ #include "chrome/common/channel_info.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/certificate_error_report.h"
+ #include "content/public/browser/browser_task_traits.h"
+ #include "content/public/browser/browser_thread.h"
+@@ -42,12 +41,6 @@ TrialComparisonCertVerifierController::T
+     // enabled.
+     return;
+   }
+-
+-  pref_change_registrar_.Init(profile_->GetPrefs());
+-  pref_change_registrar_.Add(
+-      prefs::kSafeBrowsingScoutReportingEnabled,
+-      base::BindRepeating(&TrialComparisonCertVerifierController::RefreshState,
+-                          base::Unretained(this)));
+ }
+ 
+ TrialComparisonCertVerifierController::
+@@ -101,9 +94,7 @@ bool TrialComparisonCertVerifierControll
+   if (!MaybeAllowedForProfile(profile_))
+     return false;
+ 
+-  const PrefService& prefs = *profile_->GetPrefs();
+-
+-  return safe_browsing::IsExtendedReportingEnabled(prefs);
++  return false;
+ }
+ 
+ void TrialComparisonCertVerifierController::SendTrialReport(
+--- chrome/browser/net/trial_comparison_cert_verifier_controller.h.orig
++++ chrome/browser/net/trial_comparison_cert_verifier_controller.h
+@@ -14,7 +14,6 @@
+ #include "base/memory/ref_counted.h"
+ #include "base/memory/weak_ptr.h"
+ #include "base/threading/thread_checker.h"
+-#include "components/prefs/pref_change_registrar.h"
+ #include "mojo/public/cpp/bindings/pending_receiver.h"
+ #include "mojo/public/cpp/bindings/pending_remote.h"
+ #include "mojo/public/cpp/bindings/receiver_set.h"
+@@ -77,7 +76,6 @@ class TrialComparisonCertVerifierControl
+   void RefreshState();
+ 
+   Profile* profile_;
+-  PrefChangeRegistrar pref_change_registrar_;
+ 
+   mojo::ReceiverSet<
+       cert_verifier::mojom::TrialComparisonCertVerifierReportClient>
+--- chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc.orig
++++ chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc
+@@ -20,7 +20,6 @@
+ #include "chrome/test/base/testing_browser_process.h"
+ #include "chrome/test/base/testing_profile.h"
+ #include "chrome/test/base/testing_profile_manager.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/cert_logger.pb.h"
+ #include "components/sync_preferences/testing_pref_service_syncable.h"
+ #include "content/public/browser/browser_task_traits.h"
+--- chrome/browser/password_manager/generated_password_leak_detection_pref.cc.orig
++++ chrome/browser/password_manager/generated_password_leak_detection_pref.cc
+@@ -13,7 +13,6 @@
+ #include "chrome/common/extensions/api/settings_private.h"
+ #include "components/password_manager/core/common/password_manager_pref_names.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ 
+ namespace {
+@@ -43,8 +42,7 @@ bool IsUserSignedInAndSyncing(Profile* p
+ // Returns whether the effective value of the Safe Browsing preferences for
+ // |profile| is standard protection.
+ bool IsSafeBrowsingStandard(Profile* profile) {
+-  return profile->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled) &&
+-         !profile->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnhanced);
++  return false;
+ }
+ 
+ }  // namespace
+@@ -63,16 +61,6 @@ GeneratedPasswordLeakDetectionPref::Gene
+       base::BindRepeating(
+           &GeneratedPasswordLeakDetectionPref::OnSourcePreferencesChanged,
+           base::Unretained(this)));
+-  user_prefs_registrar_.Add(
+-      prefs::kSafeBrowsingEnabled,
+-      base::BindRepeating(
+-          &GeneratedPasswordLeakDetectionPref::OnSourcePreferencesChanged,
+-          base::Unretained(this)));
+-  user_prefs_registrar_.Add(
+-      prefs::kSafeBrowsingEnhanced,
+-      base::BindRepeating(
+-          &GeneratedPasswordLeakDetectionPref::OnSourcePreferencesChanged,
+-          base::Unretained(this)));
+ 
+   if (auto* identity_manager = IdentityManagerFactory::GetForProfile(profile))
+     identity_manager_observer_.Observe(identity_manager);
+--- chrome/browser/permissions/abusive_origin_permission_revocation_request.cc.orig
++++ chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
+@@ -17,7 +17,6 @@
+ #include "components/permissions/permissions_client.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/safe_browsing/core/browser/db/database_manager.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ 
+ namespace {
+ constexpr char kExcludedKey[] = "exempted";
+--- chrome/browser/permissions/prediction_based_permission_ui_selector.cc.orig
++++ chrome/browser/permissions/prediction_based_permission_ui_selector.cc
+@@ -23,7 +23,6 @@
+ #include "components/permissions/prediction_service/prediction_service.h"
+ #include "components/permissions/prediction_service/prediction_service_messages.pb.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ 
+ namespace {
+ 
+--- chrome/browser/policy/browser_signin_policy_handler.cc.orig
++++ chrome/browser/policy/browser_signin_policy_handler.cc
+@@ -15,7 +15,6 @@
+ #include "components/policy/core/common/policy_map.h"
+ #include "components/policy/policy_constants.h"
+ #include "components/prefs/pref_value_map.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ 
+ namespace policy {
+ BrowserSigninPolicyHandler::BrowserSigninPolicyHandler(Schema chrome_schema)
+@@ -48,28 +47,18 @@ void BrowserSigninPolicyHandler::ApplyPo
+ #endif
+       FALLTHROUGH;
+     case BrowserSigninMode::kEnabled:
++#if !defined(OS_ANDROID)
+       prefs->SetValue(
+-#if defined(OS_ANDROID)
+-          // The new kSigninAllowedOnNextStartup pref is only used on Desktop.
+-          // Keep the old kSigninAllowed pref for Android until the policy is
+-          // fully deprecated in M71 and can be removed.
+-          prefs::kSigninAllowed,
+-#else
+           prefs::kSigninAllowedOnNextStartup,
+-#endif
+           base::Value(true));
++#endif
+       break;
+     case BrowserSigninMode::kDisabled:
++#if !defined(OS_ANDROID)
+       prefs->SetValue(
+-#if defined(OS_ANDROID)
+-          // The new kSigninAllowedOnNextStartup pref is only used on Desktop.
+-          // Keep the old kSigninAllowed pref for Android until the policy is
+-          // fully deprecated in M71 and can be removed.
+-          prefs::kSigninAllowed,
+-#else
+           prefs::kSigninAllowedOnNextStartup,
+-#endif
+           base::Value(false));
++#endif
+       break;
+   }
+ }
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig
++++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
+@@ -83,12 +83,9 @@
+ #include "components/policy/core/common/schema.h"
+ #include "components/policy/policy_constants.h"
+ #include "components/proxy_config/proxy_policy_handler.h"
+-#include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/search_engines/default_search_policy_handler.h"
+ #include "components/search_engines/search_engines_pref_names.h"
+ #include "components/security_interstitials/core/pref_names.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/spellcheck/spellcheck_buildflags.h"
+ #include "components/sync/base/pref_names.h"
+ #include "components/sync/driver/sync_policy_handler.h"
+@@ -209,15 +206,6 @@ const PolicyToPreferenceMapEntry kSimple
+   { key::kQuicAllowed,
+     prefs::kQuicAllowed,
+     base::Value::Type::BOOLEAN },
+-  { key::kSafeBrowsingEnabled,
+-    prefs::kSafeBrowsingEnabled,
+-    base::Value::Type::BOOLEAN },
+-  { key::kSafeBrowsingForTrustedSourcesEnabled,
+-    prefs::kSafeBrowsingForTrustedSourcesEnabled,
+-    base::Value::Type::BOOLEAN },
+-  { key::kSafeBrowsingExtendedReportingEnabled,
+-    prefs::kSafeBrowsingScoutReportingEnabled,
+-    base::Value::Type::BOOLEAN },
+   { key::kUrlKeyedAnonymizedDataCollectionEnabled,
+     unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled,
+     base::Value::Type::BOOLEAN },
+@@ -353,15 +341,6 @@ const PolicyToPreferenceMapEntry kSimple
+   { key::kGloballyScopeHTTPAuthCacheEnabled,
+     prefs::kGloballyScopeHTTPAuthCacheEnabled,
+     base::Value::Type::BOOLEAN },
+-  { key::kPasswordProtectionWarningTrigger,
+-    prefs::kPasswordProtectionWarningTrigger,
+-    base::Value::Type::INTEGER },
+-  { key::kPasswordProtectionLoginURLs,
+-    prefs::kPasswordProtectionLoginURLs,
+-    base::Value::Type::LIST },
+-  { key::kPasswordProtectionChangePasswordURL,
+-    prefs::kPasswordProtectionChangePasswordURL,
+-    base::Value::Type::STRING },
+   { key::kSafeSitesFilterBehavior,
+     policy_prefs::kSafeSitesFilterBehavior,
+     base::Value::Type::INTEGER },
+@@ -470,18 +449,12 @@ const PolicyToPreferenceMapEntry kSimple
+   { key::kMaxConnectionsPerProxy,
+     prefs::kMaxConnectionsPerProxy,
+     base::Value::Type::INTEGER },
+-  { key::kRestrictSigninToPattern,
+-    prefs::kGoogleServicesUsernamePattern,
+-    base::Value::Type::STRING },
+   { key::kDefaultWebBluetoothGuardSetting,
+     prefs::kManagedDefaultWebBluetoothGuardSetting,
+     base::Value::Type::INTEGER },
+   { key::kDefaultMediaStreamSetting,
+     prefs::kManagedDefaultMediaStreamSetting,
+     base::Value::Type::INTEGER },
+-  { key::kDisableSafeBrowsingProceedAnyway,
+-    prefs::kSafeBrowsingProceedAnywayDisabled,
+-    base::Value::Type::BOOLEAN },
+   { key::kCECPQ2Enabled,
+     prefs::kCECPQ2Enabled,
+     base::Value::Type::BOOLEAN },
+@@ -684,9 +657,6 @@ const PolicyToPreferenceMapEntry kSimple
+   { key::kIntranetRedirectBehavior,
+     omnibox::kIntranetRedirectBehavior,
+     base::Value::Type::INTEGER },
+-  { key::kAdvancedProtectionAllowed,
+-    prefs::kAdvancedProtectionAllowed,
+-    base::Value::Type::BOOLEAN },
+   { key::kAccessibilityImageLabelsEnabled,
+     prefs::kAccessibilityImageLabelsEnabled,
+     base::Value::Type::BOOLEAN },
+@@ -1642,8 +1612,6 @@ std::unique_ptr<ConfigurationPolicyHandl
+   handlers->AddHandler(std::make_unique<JavascriptPolicyHandler>());
+   handlers->AddHandler(std::make_unique<NetworkPredictionPolicyHandler>());
+   handlers->AddHandler(std::make_unique<RestoreOnStartupPolicyHandler>());
+-  handlers->AddHandler(
+-      std::make_unique<safe_browsing::SafeBrowsingPolicyHandler>());
+   handlers->AddHandler(std::make_unique<SimpleDeprecatingPolicyHandler>(
+       std::make_unique<SimplePolicyHandler>(key::kAuthServerWhitelist,
+                                             prefs::kAuthServerAllowlist,
+@@ -1667,9 +1635,6 @@ std::unique_ptr<ConfigurationPolicyHandl
+           key::kWindowOcclusionEnabled,
+           policy::policy_prefs::kNativeWindowOcclusionEnabled,
+           base::Value::Type::BOOLEAN)));
+-  handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
+-      key::kSafeBrowsingAllowlistDomains, prefs::kSafeBrowsingAllowlistDomains,
+-      base::Value::Type::LIST));
+   handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>());
+   handlers->AddHandler(std::make_unique<BrowsingHistoryPolicyHandler>());
+ 
+@@ -1762,12 +1727,6 @@ std::unique_ptr<ConfigurationPolicyHandl
+           key::kOnSecurityEventEnterpriseConnector,
+           enterprise_connectors::kOnSecurityEventPref,
+           enterprise_connectors::kOnSecurityEventScopePref, chrome_schema));
+-  handlers->AddHandler(
+-      std::make_unique<
+-          enterprise_connectors::EnterpriseConnectorsPolicyHandler>(
+-          key::kEnterpriseRealTimeUrlCheckMode,
+-          prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
+-          prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema));
+ 
+   handlers->AddHandler(std::make_unique<BrowsingDataLifetimePolicyHandler>(
+       key::kClearBrowsingDataOnExitList,
+@@ -1806,17 +1765,6 @@ std::unique_ptr<ConfigurationPolicyHandl
+   signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
+       key::kForceBrowserSignin, prefs::kForceBrowserSignin,
+       base::Value::Type::BOOLEAN));
+-  signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
+-      key::kSigninAllowed,
+-#if defined(OS_ANDROID)
+-      // The new kSigninAllowedOnNextStartup pref is only used on Desktop.
+-      // Keep the old kSigninAllowed pref for Android until the policy is
+-      // fully deprecated in M71 and can be removed.
+-      prefs::kSigninAllowed,
+-#else   // defined(OS_ANDROID)
+-      prefs::kSigninAllowedOnNextStartup,
+-#endif  // defined(OS_ANDROID)
+-      base::Value::Type::BOOLEAN));
+   handlers->AddHandler(std::make_unique<LegacyPoliciesDeprecatingPolicyHandler>(
+       std::move(signin_legacy_policies),
+       std::make_unique<BrowserSigninPolicyHandler>(chrome_schema)));
+--- chrome/browser/prefs/browser_prefs.cc.orig
++++ chrome/browser/prefs/browser_prefs.cc
+@@ -139,7 +139,6 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/privacy_sandbox/privacy_sandbox_prefs.h"
+ #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/search_engines/template_url_prepopulate_data.h"
+ #include "components/security_interstitials/content/insecure_form_blocking_page.h"
+ #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
+@@ -921,7 +920,6 @@ void RegisterLocalState(PrefRegistrySimp
+   ProfileNetworkContextService::RegisterLocalStatePrefs(registry);
+   profiles::RegisterPrefs(registry);
+   RegisterScreenshotPrefs(registry);
+-  safe_browsing::RegisterLocalStatePrefs(registry);
+   secure_origin_allowlist::RegisterPrefs(registry);
+ #if !defined(OS_ANDROID)
+   SerialPolicyAllowedPorts::RegisterPrefs(registry);
+@@ -1171,7 +1169,6 @@ void RegisterProfilePrefs(user_prefs::Pr
+   PushMessagingAppIdentifier::RegisterProfilePrefs(registry);
+   QuietNotificationPermissionUiState::RegisterProfilePrefs(registry);
+   RegisterBrowserUserPrefs(registry);
+-  safe_browsing::RegisterProfilePrefs(registry);
+   SearchPrefetchService::RegisterProfilePrefs(registry);
+   blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs(
+       registry);
+--- chrome/browser/prefs/chrome_command_line_pref_store.cc.orig
++++ chrome/browser/prefs/chrome_command_line_pref_store.cc
+@@ -31,7 +31,6 @@
+ #include "components/language/core/browser/pref_names.h"
+ #include "components/proxy_config/proxy_config_dictionary.h"
+ #include "components/proxy_config/proxy_config_pref_names.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/safe_browsing/core/common/safebrowsing_switches.h"
+ #include "components/sync/base/pref_names.h"
+ #include "content/public/common/content_switches.h"
+@@ -78,8 +77,6 @@ const CommandLinePrefStore::BooleanSwitc
+         {switches::kAllowCrossOriginAuthPrompt,
+          prefs::kAllowCrossOriginAuthPrompt, true},
+         {switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true},
+-        {safe_browsing::switches::kSbEnableEnhancedProtection,
+-         prefs::kSafeBrowsingEnhanced, true},
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+         {chromeos::switches::kEnableTouchpadThreeFingerClick,
+          prefs::kEnableTouchpadThreeFingerClick, true},
+--- chrome/browser/prefs/chrome_pref_service_factory.cc.orig
++++ chrome/browser/prefs/chrome_pref_service_factory.cc
+@@ -48,10 +48,8 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/prefs/pref_store.h"
+ #include "components/prefs/pref_value_store.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/search_engines/default_search_manager.h"
+ #include "components/search_engines/search_engines_pref_names.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/sync/base/model_type.h"
+ #include "components/sync/base/pref_names.h"
+ #include "components/sync_preferences/pref_model_associator.h"
+@@ -121,8 +119,6 @@ const prefs::TrackedPreferenceMetadata k
+     {5, extensions::pref_names::kExtensions, EnforcementLevel::NO_ENFORCEMENT,
+      PrefTrackingStrategy::SPLIT, ValueType::IMPERSONAL},
+ #endif
+-    {6, prefs::kGoogleServicesLastUsername, EnforcementLevel::ENFORCE_ON_LOAD,
+-     PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL},
+     {7, prefs::kSearchProviderOverrides, EnforcementLevel::ENFORCE_ON_LOAD,
+      PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
+ #if !defined(OS_ANDROID)
+@@ -146,8 +142,6 @@ const prefs::TrackedPreferenceMetadata k
+      PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
+     // kSyncRemainingRollbackTries is deprecated and will be removed a few
+     // releases after M50.
+-    {18, prefs::kSafeBrowsingIncidentsSent, EnforcementLevel::ENFORCE_ON_LOAD,
+-     PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
+ #if defined(OS_WIN)
+     {19, prefs::kSwReporterPromptVersion, EnforcementLevel::ENFORCE_ON_LOAD,
+      PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
+@@ -156,10 +150,6 @@ const prefs::TrackedPreferenceMetadata k
+     {22, prefs::kSwReporterPromptSeed, EnforcementLevel::ENFORCE_ON_LOAD,
+      PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL},
+ #endif
+-    {23, prefs::kGoogleServicesAccountId, EnforcementLevel::ENFORCE_ON_LOAD,
+-     PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL},
+-    {24, prefs::kGoogleServicesLastAccountId, EnforcementLevel::ENFORCE_ON_LOAD,
+-     PrefTrackingStrategy::ATOMIC, ValueType::PERSONAL},
+ #if defined(OS_WIN)
+     {25, prefs::kSettingsResetPromptPromptWave,
+      EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC,
+--- chrome/browser/prefs/pref_functional_browsertest.cc.orig
++++ chrome/browser/prefs/pref_functional_browsertest.cc
+@@ -24,7 +24,6 @@
+ #include "components/content_settings/core/common/content_settings_types.h"
+ #include "components/content_settings/core/common/pref_names.h"
+ #include "components/embedder_support/pref_names.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/sync_preferences/pref_service_syncable.h"
+ #include "content/public/browser/web_contents.h"
+ #include "content/public/test/browser_test.h"
+@@ -220,9 +219,6 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTe
+   prefs->SetInteger(prefs::kNetworkPredictionOptions,
+                     chrome_browser_net::NETWORK_PREDICTION_NEVER);
+ 
+-  EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
+-  prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false);
+-
+   EXPECT_TRUE(prefs->GetBoolean(embedder_support::kAlternateErrorPagesEnabled));
+   prefs->SetBoolean(embedder_support::kAlternateErrorPagesEnabled, false);
+ 
+@@ -236,7 +232,6 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTe
+ 
+   EXPECT_EQ(chrome_browser_net::NETWORK_PREDICTION_NEVER,
+             prefs->GetInteger(prefs::kNetworkPredictionOptions));
+-  EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
+   EXPECT_FALSE(
+       prefs->GetBoolean(embedder_support::kAlternateErrorPagesEnabled));
+   EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
+--- chrome/browser/profiles/gaia_info_update_service.cc.orig
++++ chrome/browser/profiles/gaia_info_update_service.cc
+@@ -19,7 +19,6 @@
+ #include "chrome/common/pref_names.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/public/base/avatar_icon_util.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/account_info.h"
+ #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
+ #include "components/signin/public/identity_manager/consent_level.h"
+--- chrome/browser/profiles/gaia_info_update_service_unittest.cc.orig
++++ chrome/browser/profiles/gaia_info_update_service_unittest.cc
+@@ -27,7 +27,6 @@
+ #include "chrome/test/base/testing_profile_manager.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/profile_metrics/state.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/account_info.h"
+ #include "components/sync_preferences/pref_service_syncable.h"
+ #include "content/public/test/browser_task_environment.h"
+--- chrome/browser/profiles/profile_attributes_entry.cc.orig
++++ chrome/browser/profiles/profile_attributes_entry.cc
+@@ -29,7 +29,6 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/prefs/scoped_user_pref_update.h"
+ #include "components/profile_metrics/state.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/account_info.h"
+ #include "third_party/abseil-cpp/absl/types/optional.h"
+ #include "ui/base/resource/resource_bundle.h"
+@@ -490,7 +489,7 @@ bool ProfileAttributesEntry::IsUsingDefa
+ }
+ 
+ bool ProfileAttributesEntry::IsSignedInWithCredentialProvider() const {
+-  return GetBool(prefs::kSignedInWithCredentialProvider);
++  return false;
+ }
+ 
+ size_t ProfileAttributesEntry::GetAvatarIconIndex() const {
+@@ -672,9 +671,6 @@ void ProfileAttributesEntry::SetLastDown
+ }
+ 
+ void ProfileAttributesEntry::SetSignedInWithCredentialProvider(bool value) {
+-  if (value != GetBool(prefs::kSignedInWithCredentialProvider)) {
+-    SetBool(prefs::kSignedInWithCredentialProvider, value);
+-  }
+ }
+ 
+ void ProfileAttributesEntry::LockForceSigninProfile(bool is_lock) {
+--- chrome/browser/profiles/profile_attributes_storage.cc.orig
++++ chrome/browser/profiles/profile_attributes_storage.cc
+@@ -36,7 +36,6 @@
+ #include "components/prefs/scoped_user_pref_update.h"
+ #include "components/profile_metrics/state.h"
+ #include "components/signin/public/base/persistent_repeating_timer.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "content/public/browser/browser_task_traits.h"
+ #include "content/public/browser/browser_thread.h"
+ #include "third_party/icu/source/i18n/unicode/coll.h"
+@@ -374,8 +373,6 @@ void ProfileAttributesStorage::AddProfil
+   if (params.account_id.HasAccountIdKey())
+     info.SetStringKey(ProfileAttributesEntry::kAccountIdKey,
+                       params.account_id.GetAccountIdKey());
+-  info.SetBoolKey(prefs::kSignedInWithCredentialProvider,
+-                  params.is_signed_in_with_credential_provider);
+   attributes->SetKey(key, std::move(info));
+ 
+   ProfileAttributesEntry* entry = InitEntryWithKey(key, params.is_omitted);
+--- chrome/browser/profiles/profile_impl.cc.orig
++++ chrome/browser/profiles/profile_impl.cc
+@@ -150,7 +150,6 @@
+ #include "components/prefs/scoped_user_pref_update.h"
+ #include "components/profile_metrics/browser_profile_type.h"
+ #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/site_isolation/site_isolation_policy.h"
+ #include "components/spellcheck/spellcheck_buildflags.h"
+--- chrome/browser/profiles/profile_manager.cc.orig
++++ chrome/browser/profiles/profile_manager.cc
+@@ -94,7 +94,6 @@
+ #include "components/search_engines/default_search_manager.h"
+ #include "components/signin/public/base/signin_buildflags.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/consent_level.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/signin/public/identity_manager/primary_account_mutator.h"
+@@ -2105,8 +2104,7 @@ void ProfileManager::AddProfileToStorage
+       entry->SetAuthInfo(account_info.gaia, username,
+                          is_consented_primary_account);
+ 
+-      entry->SetSignedInWithCredentialProvider(profile->GetPrefs()->GetBoolean(
+-          prefs::kSignedInWithCredentialProvider));
++      entry->SetSignedInWithCredentialProvider(false);
+ 
+ #if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
+       // Sign out if force-sign-in policy is enabled and profile is not signed
+@@ -2161,14 +2159,13 @@ void ProfileManager::AddProfileToStorage
+ 
+   init_params.is_ephemeral = IsEphemeral(profile);
+   init_params.is_signed_in_with_credential_provider =
+-      profile->GetPrefs()->GetBoolean(prefs::kSignedInWithCredentialProvider);
++      false;
+ 
+   storage.AddProfile(std::move(init_params));
+ }
+ 
+ void ProfileManager::SetNonPersonalProfilePrefs(Profile* profile) {
+   PrefService* prefs = profile->GetPrefs();
+-  prefs->SetBoolean(prefs::kSigninAllowed, false);
+   prefs->SetBoolean(bookmarks::prefs::kEditBookmarksEnabled, false);
+   prefs->SetBoolean(bookmarks::prefs::kShowBookmarkBar, false);
+   prefs->ClearPref(DefaultSearchManager::kDefaultSearchProviderDataPrefName);
+--- chrome/browser/profiles/profile_window.cc.orig
++++ chrome/browser/profiles/profile_window.cc
+@@ -40,7 +40,6 @@
+ #include "chrome/common/url_constants.h"
+ #include "components/flags_ui/pref_service_flags_storage.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/account_info.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "content/public/browser/browser_thread.h"
+--- chrome/browser/profiles/profiles_state.cc.orig
++++ chrome/browser/profiles/profiles_state.cc
+@@ -42,7 +42,6 @@
+ #include <algorithm>
+ #include "chrome/browser/profiles/gaia_info_update_service.h"
+ #include "chrome/browser/profiles/gaia_info_update_service_factory.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #endif
+ 
+ #if BUILDFLAG(IS_CHROMEOS_LACROS)
+--- chrome/browser/resources/settings/privacy_page/disable_safebrowsing_dialog.html.orig
++++ chrome/browser/resources/settings/privacy_page/disable_safebrowsing_dialog.html
+@@ -1,12 +1,9 @@
+     <cr-dialog id="dialog" close-text="$i18n{close}">
+-      <div slot="title">$i18n{safeBrowsingDisableDialog}</div>
+-      <div slot="body">$i18n{safeBrowsingDisableDialogDesc}</div>
+       <div slot="button-container">
+         <cr-button class="cancel-button" on-click="onDialogCancel_">
+           $i18n{cancel}
+         </cr-button>
+         <cr-button class="action-button" on-click="onDialogConfirm_">
+-          $i18n{safeBrowsingDisableDialogConfirm}
+         </cr-button>
+       </div>
+     </cr-dialog>
+--- chrome/browser/resources/settings/privacy_page/privacy_page.html.orig
++++ chrome/browser/resources/settings/privacy_page/privacy_page.html
+@@ -535,7 +535,7 @@
+           </category-setting-exceptions>
+         </settings-subpage>
+       </template>
+-      <template is="dom-if" if="[[enableSafeBrowsingSubresourceFilter_]]"
++      <template is="dom-if" if="[[false]]"
+           no-search>
+         <template is="dom-if" route-path="/content/ads" no-search>
+           <settings-subpage page-title="$i18n{siteSettingsAds}"
+--- chrome/browser/resources/settings/privacy_page/privacy_page.ts.orig
++++ chrome/browser/resources/settings/privacy_page/privacy_page.ts
+@@ -90,7 +90,7 @@ export class SettingsPrivacyPageElement
+       enableSafeBrowsingSubresourceFilter_: {
+         type: Boolean,
+         value() {
+-          return loadTimeData.getBoolean('enableSafeBrowsingSubresourceFilter');
++          return false;
+         }
+       },
+ 
+--- chrome/browser/resources/settings/privacy_page/security_page.html.orig
++++ chrome/browser/resources/settings/privacy_page/security_page.html
+@@ -53,105 +53,6 @@
+       <img id="banner" alt=""
+           src="chrome://settings/images/safe_browsing_banner.svg">
+     </picture>
+-    <div id="safeBrowsingSection">
+-      <h2>$i18n{safeBrowsingSectionLabel}</h2>
+-      <settings-radio-group id="safeBrowsingRadioGroup" no-set-pref
+-          pref="{{prefs.generated.safe_browsing}}"
+-          selectable-elements="cr-radio-button, settings-collapse-radio-button"
+-          on-change="onSafeBrowsingRadioChange_">
+-        <settings-collapse-radio-button id="safeBrowsingEnhanced"
+-            name="[[safeBrowsingSettingEnum_.ENHANCED]]"
+-            pref="[[prefs.generated.safe_browsing]]"
+-            label="$i18n{safeBrowsingEnhanced}"
+-            sub-label="$i18n{safeBrowsingEnhancedDesc}"
+-            indicator-aria-label="$i18n{controlledSettingPolicy}"
+-            expand-aria-label="$i18n{safeBrowsingEnhancedExpandA11yLabel}"
+-            on-expand-clicked="onEnhancedProtectionExpandButtonClicked_"
+-            no-automatic-collapse>
+-          <div slot="collapse">
+-            <div class="bullet-line">
+-              <iron-icon icon="cr:security"></iron-icon>
+-              <div class="secondary">
+-                $i18n{safeBrowsingEnhancedBulOne}
+-              </div>
+-            </div>
+-            <div class="bullet-line">
+-              <iron-icon icon="settings20:googleg"></iron-icon>
+-              <div class="secondary">
+-                $i18n{safeBrowsingEnhancedBulTwo}
+-              </div>
+-            </div>
+-            <div class="bullet-line">
+-              <iron-icon icon="settings:public"></iron-icon>
+-              <div class="secondary">
+-                $i18n{safeBrowsingEnhancedBulThree}
+-              </div>
+-            </div>
+-            <div class="bullet-line">
+-              <iron-icon icon="settings20:vpn-key"></iron-icon>
+-              <div class="secondary">
+-                $i18n{safeBrowsingEnhancedBulFour}
+-              </div>
+-            </div>
+-            <div class="bullet-line last-collapse-item">
+-              <iron-icon icon="settings20:data"></iron-icon>
+-              <div class="secondary cr-padded-text">
+-                $i18n{safeBrowsingEnhancedBulFive}
+-              </div>
+-            </div>
+-          </div>
+-        </settings-collapse-radio-button>
+-        <settings-collapse-radio-button id="safeBrowsingStandard"
+-            name="[[safeBrowsingSettingEnum_.STANDARD]]"
+-            pref="[[prefs.generated.safe_browsing]]"
+-            label="$i18n{safeBrowsingStandard}"
+-            sub-label="$i18n{safeBrowsingStandardDesc}"
+-            indicator-aria-label="$i18n{controlledSettingPolicy}"
+-            expand-aria-label="$i18n{safeBrowsingStandardExpandA11yLabel}"
+-            info-opened="{{infoOpened_}}"
+-            on-expand-clicked="onStandardProtectionExpandButtonClicked_"
+-            no-automatic-collapse>
+-          <div slot="collapse">
+-            <div class="bullet-line">
+-              <iron-icon icon="cr:security"></iron-icon>
+-              <div class="secondary">
+-                  $i18n{safeBrowsingStandardBulOne}
+-              </div>
+-            </div>
+-            <div class="bullet-line">
+-              <iron-icon icon="settings20:data"></iron-icon>
+-              <div class="secondary cr-padded-text">
+-                  $i18n{safeBrowsingStandardBulTwo}
+-              </div>
+-            </div>
+-          </div>
+-          <div slot="noSelectionCollapse">
+-            <settings-toggle-button id="safeBrowsingReportingToggle"
+-                pref="{{prefs.safebrowsing.scout_reporting_enabled}}"
+-                label="$i18n{safeBrowsingStandardReportingLabel}"
+-                sub-label="$i18n{safeBrowsingEnableExtendedReportingDesc}"
+-                on-change="onSafeBrowsingExtendedReportingChange_"
+-                disabled="[[getDisabledExtendedSafeBrowsing_(
+-                              prefs.generated.safe_browsing.*)]]">
+-            </settings-toggle-button>
+-            <settings-toggle-button id="passwordsLeakToggle"
+-                label="$i18n{passwordsLeakDetectionLabel}"
+-                pref="{{prefs.generated.password_leak_detection}}"
+-                sub-label="[[getPasswordsLeakToggleSubLabel_(
+-                              prefs.profile.password_manager_leak_detection.*,
+-                              prefs.generated.password_leak_detection.*)]]">
+-            </settings-toggle-button>
+-          </div>
+-        </settings-collapse-radio-button>
+-        <settings-collapse-radio-button id="safeBrowsingDisabled" no-collapse
+-            name="[[safeBrowsingSettingEnum_.DISABLED]]"
+-            pref="[[prefs.generated.safe_browsing]]"
+-            label="$i18n{safeBrowsingNone}"
+-            sub-label="$i18n{safeBrowsingNoneDesc}"
+-            indicator-aria-label="$i18n{controlledSettingPolicy}">
+-        </settings-collapse-radio-button>
+-      </settings-radio-group>
+-    </div>
+     <div class="cr-row first">
+       <h2>$i18n{advancedPageTitle}</h2>
+     </div>
+@@ -202,8 +103,3 @@
+         on-click="onAdvancedProtectionProgramLinkClick_"
+         external>
+     </cr-link-row>
+-    <template is="dom-if" if="[[showDisableSafebrowsingDialog_]]" restamp>
+-      <settings-disable-safebrowsing-dialog prefs="{{prefs}}"
+-          on-close="onDisableSafebrowsingDialogClose_">
+-      </settings-disable-safebrowsing-dialog>
+-    </template>
+--- chrome/browser/resources/settings/privacy_page/security_page.ts.orig
++++ chrome/browser/resources/settings/privacy_page/security_page.ts
+@@ -182,15 +182,6 @@ export class SettingsSecurityPageElement
+ 
+   ready() {
+     super.ready();
+-
+-    // Expand initial pref value manually because automatic
+-    // expanding is disabled.
+-    const prefValue = this.getPref('generated.safe_browsing').value;
+-    if (prefValue === SafeBrowsingSetting.ENHANCED) {
+-      this.$.safeBrowsingEnhanced.expanded = true;
+-    } else if (prefValue === SafeBrowsingSetting.STANDARD) {
+-      this.$.safeBrowsingStandard.expanded = true;
+-    }
+   }
+ 
+   /**
+@@ -239,8 +230,7 @@ export class SettingsSecurityPageElement
+   }
+ 
+   private getDisabledExtendedSafeBrowsing_(): boolean {
+-    return this.getPref('generated.safe_browsing').value !==
+-        SafeBrowsingSetting.STANDARD;
++    return true;
+   }
+ 
+   private getPasswordsLeakToggleSubLabel_(): string {
+--- chrome/browser/resources/settings/site_settings_page/site_settings_page.ts.orig
++++ chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
+@@ -47,7 +47,7 @@ function getCategoryItemMap(): Map<Conte
+       enabledLabel: 'siteSettingsAdsAllowed',
+       disabledLabel: 'siteSettingsAdsBlocked',
+       shouldShow: () =>
+-          loadTimeData.getBoolean('enableSafeBrowsingSubresourceFilter'),
++          false,
+     },
+     {
+       route: routes.SITE_SETTINGS_AR,
+--- chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc.orig
++++ chrome/browser/safe_browsing/ad_redirect_trigger_browsertest.cc
+@@ -19,7 +19,6 @@
+ #include "components/prefs/testing_pref_service.h"
+ #include "components/safe_browsing/content/browser/triggers/ad_redirect_trigger.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "content/public/browser/render_frame_host.h"
+ #include "content/public/browser/web_contents.h"
+ #include "content/public/test/browser_test.h"
+--- chrome/browser/safe_browsing/advanced_protection_status_manager.cc.orig
++++ chrome/browser/safe_browsing/advanced_protection_status_manager.cc
+@@ -13,7 +13,6 @@
+ #include "chrome/browser/signin/identity_manager_factory.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/signin/public/identity_manager/account_info.h"
+ #include "components/signin/public/identity_manager/accounts_mutator.h"
+ #include "components/signin/public/identity_manager/consent_level.h"
+@@ -63,9 +62,7 @@ void AdvancedProtectionStatusManager::Ma
+ 
+   is_under_advanced_protection_ = core_info.is_under_advanced_protection;
+ 
+-  if (pref_service_->HasPrefPath(prefs::kAdvancedProtectionLastRefreshInUs)) {
+-    last_refreshed_ = base::Time::FromDeltaSinceWindowsEpoch(base::Microseconds(
+-        pref_service_->GetInt64(prefs::kAdvancedProtectionLastRefreshInUs)));
++  if (false) {
+     if (is_under_advanced_protection_)
+       ScheduleNextRefresh();
+   } else {
+@@ -231,20 +228,10 @@ void AdvancedProtectionStatusManager::Ca
+ 
+ void AdvancedProtectionStatusManager::UpdateLastRefreshTime() {
+   last_refreshed_ = base::Time::Now();
+-  pref_service_->SetInt64(
+-      prefs::kAdvancedProtectionLastRefreshInUs,
+-      last_refreshed_.ToDeltaSinceWindowsEpoch().InMicroseconds());
+ }
+ 
+ bool AdvancedProtectionStatusManager::IsUnderAdvancedProtection() const {
+-  if (!pref_service_->GetBoolean(prefs::kAdvancedProtectionAllowed))
+-    return false;
+-
+-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+-          kForceTreatUserAsAdvancedProtection))
+-    return true;
+-
+-  return is_under_advanced_protection_;
++  return false;
+ }
+ 
+ bool AdvancedProtectionStatusManager::IsUnconsentedPrimaryAccount(
+--- chrome/browser/safe_browsing/advanced_protection_status_manager_unittest.cc.orig
++++ chrome/browser/safe_browsing/advanced_protection_status_manager_unittest.cc
+@@ -10,7 +10,6 @@
+ #include "base/test/task_environment.h"
+ #include "build/chromeos_buildflags.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/signin/public/identity_manager/account_info.h"
+ #include "components/signin/public/identity_manager/accounts_mutator.h"
+ #include "components/signin/public/identity_manager/identity_test_environment.h"
+--- chrome/browser/safe_browsing/android/services_delegate_android.h.orig
++++ chrome/browser/safe_browsing/android/services_delegate_android.h
+@@ -7,7 +7,6 @@
+ 
+ #include "base/macros.h"
+ #include "chrome/browser/safe_browsing/services_delegate.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ 
+ namespace safe_browsing {
+ 
+--- chrome/browser/safe_browsing/certificate_reporting_service.cc.orig
++++ chrome/browser/safe_browsing/certificate_reporting_service.cc
+@@ -14,7 +14,6 @@
+ #include "chrome/browser/profiles/profile.h"
+ #include "chrome/browser/safe_browsing/safe_browsing_service.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/certificate_error_report.h"
+ #include "content/public/browser/browser_thread.h"
+ #include "services/network/public/cpp/shared_url_loader_factory.h"
+--- chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc.orig
++++ chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc
+@@ -27,7 +27,6 @@
+ #include "chrome/test/base/in_process_browser_test.h"
+ #include "chrome/test/base/ui_test_utils.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/cert_report_helper.h"
+ #include "components/security_interstitials/content/certificate_error_report.h"
+ #include "components/variations/variations_params_manager.h"
+--- chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.cc.orig
++++ chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.cc
+@@ -43,7 +43,6 @@
+ #include "components/component_updater/component_updater_service.h"
+ #include "components/component_updater/pref_names.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "content/public/browser/browser_task_traits.h"
+ #include "content/public/browser/browser_thread.h"
+ #include "net/http/http_status_code.h"
+--- chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc.orig
++++ chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc
+@@ -44,7 +44,6 @@
+ #include "components/policy/core/common/mock_configuration_policy_provider.h"
+ #include "components/policy/policy_constants.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "content/public/test/browser_test.h"
+ #include "testing/gmock/include/gmock/gmock.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+--- chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.cc.orig
++++ chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.cc
+@@ -12,7 +12,6 @@
+ #include "chrome/browser/profiles/profile.h"
+ #include "chrome/browser/profiles/profile_manager.h"
+ #include "chrome/common/channel_info.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/version_info/version_info.h"
+ 
+ namespace safe_browsing {
+--- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig
++++ chrome/browser/safe_browsing/chrome_password_protection_service.cc
+@@ -63,7 +63,6 @@
+ #include "components/safe_browsing/core/browser/verdict_cache_manager.h"
+ #include "components/safe_browsing/core/common/features.h"
+ #include "components/safe_browsing/core/common/proto/csd.pb.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/safe_browsing/core/common/safebrowsing_constants.h"
+ #include "components/safe_browsing/core/common/utils.h"
+ #include "components/security_interstitials/content/unsafe_resource_util.h"
+@@ -1220,14 +1219,6 @@ bool ChromePasswordProtectionService::Ha
+ }
+ 
+ void ChromePasswordProtectionService::OnWarningTriggerChanged() {
+-  const base::Value* pref_value = pref_change_registrar_->prefs()->Get(
+-      prefs::kPasswordProtectionWarningTrigger);
+-  // If password protection is not turned off, do nothing.
+-  if (static_cast<PasswordProtectionTrigger>(pref_value->GetInt()) !=
+-      PASSWORD_PROTECTION_OFF) {
+-    return;
+-  }
+-
+   // Clears captured enterprise password hashes or GSuite sync password hashes.
+   password_manager::PasswordReuseManager* reuse_manager =
+       GetPasswordReuseManager();
+@@ -1385,7 +1376,7 @@ PrefService* ChromePasswordProtectionSer
+ }
+ 
+ bool ChromePasswordProtectionService::IsSafeBrowsingEnabled() {
+-  return ::safe_browsing::IsSafeBrowsingEnabled(*GetPrefs());
++  return false;
+ }
+ 
+ bool ChromePasswordProtectionService::IsExtendedReporting() {
+@@ -1405,44 +1396,7 @@ bool ChromePasswordProtectionService::Is
+ bool ChromePasswordProtectionService::IsPingingEnabled(
+     LoginReputationClientRequest::TriggerType trigger_type,
+     ReusedPasswordAccountType password_type) {
+-  if (!IsSafeBrowsingEnabled()) {
+-    return false;
+-  }
+-  bool extended_reporting_enabled = IsExtendedReporting();
+-  if (trigger_type == LoginReputationClientRequest::PASSWORD_REUSE_EVENT) {
+-    if (password_type.account_type() ==
+-        ReusedPasswordAccountType::SAVED_PASSWORD) {
+-      return true;
+-    }
+-
+-    // Only override policy if password protection is off for Gmail users.
+-    if (GetPasswordProtectionWarningTriggerPref(password_type) ==
+-        PASSWORD_PROTECTION_OFF) {
+-      return false;
+-    }
+-    // If the account type is UNKNOWN (i.e. AccountInfo fields could not be
+-    // retrieved from server), pings should be gated by SBER.
+-    if (password_type.account_type() == ReusedPasswordAccountType::UNKNOWN) {
+-      return extended_reporting_enabled;
+-    }
+-
+-// Only saved password and GAIA password reuse warnings are shown to users on
+-// Android, so other types of password reuse events should be gated by Safe
+-// Browsing extended reporting.
+-#if defined(OS_ANDROID)
+-    if (password_type.account_type() ==
+-            ReusedPasswordAccountType::SAVED_PASSWORD ||
+-        IsSyncingGMAILPasswordWithSignedInProtectionEnabled(password_type)) {
+-      return true;
+-    }
+-
+-    return extended_reporting_enabled;
+-#else
+-    return true;
+-#endif
+-  }
+-
+-  return !IsIncognito() && extended_reporting_enabled;
++  return false;
+ }
+ 
+ RequestOutcome ChromePasswordProtectionService::GetPingNotSentReason(
+@@ -1661,22 +1615,6 @@ MaybeCreateNavigationThrottle(content::N
+                  : nullptr;
+ }
+ 
+-PasswordProtectionTrigger
+-ChromePasswordProtectionService::GetPasswordProtectionWarningTriggerPref(
+-    ReusedPasswordAccountType password_type) const {
+-  if (password_type.account_type() == ReusedPasswordAccountType::GMAIL ||
+-      (password_type.account_type() ==
+-       ReusedPasswordAccountType::SAVED_PASSWORD))
+-    return PHISHING_REUSE;
+-
+-  bool is_policy_managed = profile_->GetPrefs()->HasPrefPath(
+-      prefs::kPasswordProtectionWarningTrigger);
+-  PasswordProtectionTrigger trigger_level =
+-      static_cast<PasswordProtectionTrigger>(profile_->GetPrefs()->GetInteger(
+-          prefs::kPasswordProtectionWarningTrigger));
+-  return is_policy_managed ? trigger_level : PHISHING_REUSE;
+-}
+-
+ bool ChromePasswordProtectionService::IsURLAllowlistedForPasswordEntry(
+     const GURL& url) const {
+   if (!profile_)
+--- chrome/browser/safe_browsing/chrome_password_protection_service.h.orig
++++ chrome/browser/safe_browsing/chrome_password_protection_service.h
+@@ -211,13 +211,6 @@ class ChromePasswordProtectionService :
+   bool UserClickedThroughSBInterstitial(
+       PasswordProtectionRequest* request) override;
+ 
+-  // If |prefs::kPasswordProtectionWarningTrigger| is not managed by enterprise
+-  // policy, this function should always return PHISHING_REUSE. Otherwise,
+-  // returns the specified pref value adjusted for the given username's account
+-  // type.
+-  PasswordProtectionTrigger GetPasswordProtectionWarningTriggerPref(
+-      ReusedPasswordAccountType password_type) const override;
+-
+   // If |url| matches Safe Browsing allowlist domains, password protection
+   // change password URL, or password protection login URLs in the enterprise
+   // policy.
+--- chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc.orig
++++ chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc
+@@ -38,7 +38,6 @@
+ #include "components/safe_browsing/content/browser/password_protection/password_protection_test_util.h"
+ #include "components/safe_browsing/core/browser/password_protection/metrics_util.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_state/core/security_state.h"
+ #include "components/signin/public/identity_manager/account_info.h"
+ #include "components/signin/public/identity_manager/identity_test_environment.h"
+--- chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc.orig
++++ chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc
+@@ -28,9 +28,7 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/prefs/scoped_user_pref_update.h"
+ #include "components/safe_browsing/content/browser/password_protection/password_protection_request_content.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_state/core/security_state.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/signin/public/identity_manager/identity_test_utils.h"
+ #include "components/sync/driver/sync_service.h"
+--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig
++++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
+@@ -34,7 +34,6 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ 
+ #include "content/public/browser/browser_task_traits.h"
+ #include "content/public/browser/browser_thread.h"
+--- chrome/browser/safe_browsing/download_protection/check_client_download_request.cc.orig
++++ chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
+@@ -38,7 +38,6 @@
+ #include "components/safe_browsing/content/common/file_type_policies.h"
+ #include "components/safe_browsing/core/common/features.h"
+ #include "components/safe_browsing/core/common/proto/csd.pb.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/safe_browsing/core/common/utils.h"
+ #include "components/url_matcher/url_matcher.h"
+ #include "content/public/browser/browser_context.h"
+--- chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc.orig
++++ chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc
+@@ -24,7 +24,6 @@
+ #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
+ #include "components/safe_browsing/content/common/file_type_policies.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/safe_browsing/core/common/utils.h"
+ #include "content/public/browser/browser_context.h"
+ #include "content/public/browser/browser_task_traits.h"
+--- chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc.orig
++++ chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc
+@@ -93,7 +93,6 @@
+ #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
+ #include "components/safe_browsing/core/common/features.h"
+ #include "components/safe_browsing/core/common/proto/csd.pb.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/safe_browsing/core/common/safebrowsing_switches.h"
+ #include "components/signin/public/identity_manager/identity_test_environment.h"
+ #include "content/public/browser/browser_task_traits.h"
+--- chrome/browser/safe_browsing/generated_safe_browsing_pref.cc.orig
++++ chrome/browser/safe_browsing/generated_safe_browsing_pref.cc
+@@ -7,7 +7,6 @@
+ #include "chrome/browser/profiles/profile.h"
+ #include "chrome/common/extensions/api/settings_private.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ 
+ namespace settings_api = extensions::api::settings_private;
+ 
+@@ -18,21 +17,6 @@ const char kGeneratedSafeBrowsingPref[]
+ GeneratedSafeBrowsingPref::GeneratedSafeBrowsingPref(Profile* profile)
+     : profile_(profile) {
+   user_prefs_registrar_.Init(profile->GetPrefs());
+-  user_prefs_registrar_.Add(
+-      prefs::kSafeBrowsingEnabled,
+-      base::BindRepeating(
+-          &GeneratedSafeBrowsingPref::OnSafeBrowsingPreferencesChanged,
+-          base::Unretained(this)));
+-  user_prefs_registrar_.Add(
+-      prefs::kSafeBrowsingEnhanced,
+-      base::BindRepeating(
+-          &GeneratedSafeBrowsingPref::OnSafeBrowsingPreferencesChanged,
+-          base::Unretained(this)));
+-  user_prefs_registrar_.Add(
+-      prefs::kSafeBrowsingScoutReportingEnabled,
+-      base::BindRepeating(
+-          &GeneratedSafeBrowsingPref::OnSafeBrowsingPreferencesChanged,
+-          base::Unretained(this)));
+ }
+ 
+ extensions::settings_private::SetPrefResult GeneratedSafeBrowsingPref::SetPref(
+@@ -48,31 +32,14 @@ extensions::settings_private::SetPrefRes
+     return extensions::settings_private::SetPrefResult::PREF_TYPE_MISMATCH;
+ 
+   // If SBER is forcefully disabled, Enhanced cannot be selected by the user.
+-  const PrefService::Preference* reporting_pref =
+-      profile_->GetPrefs()->FindPreference(
+-          prefs::kSafeBrowsingScoutReportingEnabled);
+-  const bool reporting_on = reporting_pref->GetValue()->GetBool();
+-  const bool reporting_enforced = !reporting_pref->IsUserModifiable();
++  const bool reporting_on = false;
++  const bool reporting_enforced = false;
+ 
+   if (reporting_enforced && !reporting_on &&
+       selection == SafeBrowsingSetting::ENHANCED) {
+     return extensions::settings_private::SetPrefResult::PREF_NOT_MODIFIABLE;
+   }
+ 
+-  // kSafeBrowsingEnabled is considered the canonical source for Safe Browsing
+-  // management.
+-  const PrefService::Preference* enabled_pref =
+-      profile_->GetPrefs()->FindPreference(prefs::kSafeBrowsingEnabled);
+-  if (!enabled_pref->IsUserModifiable()) {
+-    return extensions::settings_private::SetPrefResult::PREF_NOT_MODIFIABLE;
+-  }
+-
+-  // Update both Safe Browsing preferences to match selection.
+-  profile_->GetPrefs()->SetBoolean(prefs::kSafeBrowsingEnabled,
+-                                   selection != SafeBrowsingSetting::DISABLED);
+-  profile_->GetPrefs()->SetBoolean(prefs::kSafeBrowsingEnhanced,
+-                                   selection == SafeBrowsingSetting::ENHANCED);
+-
+   return extensions::settings_private::SetPrefResult::SUCCESS;
+ }
+ 
+@@ -83,10 +50,8 @@ GeneratedSafeBrowsingPref::GetPrefObject
+   pref_object->key = kGeneratedSafeBrowsingPref;
+   pref_object->type = extensions::api::settings_private::PREF_TYPE_NUMBER;
+ 
+-  auto safe_browsing_enabled =
+-      profile_->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled);
+-  auto safe_browsing_enhanced_enabled =
+-      profile_->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnhanced);
++  auto safe_browsing_enabled = false;
++  auto safe_browsing_enhanced_enabled = false;
+ 
+   if (safe_browsing_enhanced_enabled && safe_browsing_enabled) {
+     pref_object->value = std::make_unique<base::Value>(
+@@ -116,29 +81,18 @@ void GeneratedSafeBrowsingPref::ApplySaf
+   // three different preferences. It is possible that these may be in
+   // temporarily conflicting managed states. The enabled preference is always
+   // taken as the canonical source of management.
+-  const PrefService::Preference* enabled_pref =
+-      profile->GetPrefs()->FindPreference(prefs::kSafeBrowsingEnabled);
+-  const bool enabled_enforced = !enabled_pref->IsUserModifiable();
+-  const bool enabled_recommended =
+-      (enabled_pref && enabled_pref->GetRecommendedValue());
+-  const bool enabled_recommended_on =
+-      enabled_recommended && enabled_pref->GetRecommendedValue()->GetBool();
++  const bool enabled_enforced = false;
++  const bool enabled_recommended = false;
++  const bool enabled_recommended_on = false;
+ 
+   // The enhanced preference may have a recommended setting. This only takes
+   // effect if the enabled preference also has a recommended setting.
+-  const PrefService::Preference* enhanced_pref =
+-      profile->GetPrefs()->FindPreference(prefs::kSafeBrowsingEnhanced);
+-  const bool enhanced_recommended_on =
+-      enhanced_pref->GetRecommendedValue() &&
+-      enhanced_pref->GetRecommendedValue()->GetBool();
++  const bool enhanced_recommended_on = false;
+ 
+   // A forcefully disabled reporting preference will disallow enhanced from
+   // being selected and thus it must also be considered.
+-  const PrefService::Preference* reporting_pref =
+-      profile->GetPrefs()->FindPreference(
+-          prefs::kSafeBrowsingScoutReportingEnabled);
+-  const bool reporting_on = reporting_pref->GetValue()->GetBool();
+-  const bool reporting_enforced = !reporting_pref->IsUserModifiable();
++  const bool reporting_on = false;
++  const bool reporting_enforced = false;
+ 
+   if (!enabled_enforced && !enabled_recommended && !reporting_enforced) {
+     // No relevant policies are applied.
+@@ -148,8 +102,6 @@ void GeneratedSafeBrowsingPref::ApplySaf
+   if (enabled_enforced) {
+     // Preference is fully controlled.
+     pref_object->enforcement = settings_api::Enforcement::ENFORCEMENT_ENFORCED;
+-    extensions::settings_private::GeneratedPref::ApplyControlledByFromPref(
+-        pref_object, enabled_pref);
+     return;
+   }
+ 
+@@ -174,8 +126,6 @@ void GeneratedSafeBrowsingPref::ApplySaf
+     // Reporting has been forcefully disabled by policy. Enhanced protection is
+     // thus also implicitly disabled by the same policy.
+     pref_object->enforcement = settings_api::Enforcement::ENFORCEMENT_ENFORCED;
+-    extensions::settings_private::GeneratedPref::ApplyControlledByFromPref(
+-        pref_object, reporting_pref);
+ 
+     pref_object->user_selectable_values =
+         std::make_unique<std::vector<std::unique_ptr<base::Value>>>();
+--- chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc.orig
++++ chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc
+@@ -22,7 +22,6 @@
+ #include "chrome/test/base/testing_profile.h"
+ #include "chrome/test/base/testing_profile_manager.h"
+ #include "components/safe_browsing/core/common/proto/csd.pb.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/sync_preferences/testing_pref_service_syncable.h"
+ #include "content/public/test/browser_task_environment.h"
+ #include "content/public/test/test_utils.h"
+--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig
++++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
+@@ -42,7 +42,6 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/safe_browsing/core/common/features.h"
+ #include "components/safe_browsing/core/common/proto/csd.pb.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "content/public/browser/browser_thread.h"
+ #include "content/public/browser/download_item_utils.h"
+ #include "services/network/public/cpp/shared_url_loader_factory.h"
+--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc.orig
++++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
+@@ -36,7 +36,6 @@
+ #include "chrome/test/base/testing_profile.h"
+ #include "chrome/test/base/testing_profile_manager.h"
+ #include "components/safe_browsing/core/common/proto/csd.pb.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/sync_preferences/testing_pref_service_syncable.h"
+ #include "content/public/test/browser_task_environment.h"
+ #include "extensions/browser/quota_service.h"
+--- chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc.orig
++++ chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc
+@@ -43,7 +43,6 @@
+ #include "components/history/core/browser/history_database_params.h"
+ #include "components/history/core/browser/history_service.h"
+ #include "components/safe_browsing/core/common/proto/csd.pb.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/sync_preferences/testing_pref_service_syncable.h"
+ #include "content/public/test/browser_task_environment.h"
+ #include "content/public/test/test_utils.h"
+--- chrome/browser/safe_browsing/incident_reporting/state_store.cc.orig
++++ chrome/browser/safe_browsing/incident_reporting/state_store.cc
+@@ -14,7 +14,6 @@
+ #include "chrome/browser/safe_browsing/incident_reporting/incident.h"
+ #include "chrome/browser/safe_browsing/incident_reporting/platform_state_store.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ 
+ namespace safe_browsing {
+ 
+--- chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc.orig
++++ chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc
+@@ -21,7 +21,6 @@
+ #include "chrome/test/base/testing_profile.h"
+ #include "chrome/test/base/testing_profile_manager.h"
+ #include "components/pref_registry/pref_registry_syncable.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/sync_preferences/pref_service_syncable.h"
+ #include "components/sync_preferences/pref_service_syncable_factory.h"
+ #include "content/public/test/browser_task_environment.h"
+--- chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc.orig
++++ chrome/browser/safe_browsing/metrics/safe_browsing_metrics_provider.cc
+@@ -7,7 +7,6 @@
+ #include "base/metrics/histogram_functions.h"
+ #include "chrome/browser/profiles/profile.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ 
+ namespace safe_browsing {
+ 
+--- chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc.orig
++++ chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
+@@ -74,7 +74,6 @@
+ #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h"
+ #include "components/safe_browsing/core/browser/verdict_cache_manager.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/safe_browsing/core/common/web_ui_constants.h"
+ #include "components/security_interstitials/content/security_interstitial_controller_client.h"
+ #include "components/security_interstitials/content/security_interstitial_tab_helper.h"
+--- chrome/browser/safe_browsing/safe_browsing_service.cc.orig
++++ chrome/browser/safe_browsing/safe_browsing_service.cc
+@@ -103,7 +103,6 @@ base::FilePath SafeBrowsingService::GetB
+ 
+ SafeBrowsingService::SafeBrowsingService()
+     : services_delegate_(ServicesDelegate::Create(this)),
+-      estimated_extended_reporting_by_prefs_(SBER_LEVEL_OFF),
+       shutdown_(false),
+       enabled_(false),
+       enabled_by_prefs_(false) {}
+@@ -257,8 +256,6 @@ TriggerManager* SafeBrowsingService::tri
+ 
+ PasswordProtectionService* SafeBrowsingService::GetPasswordProtectionService(
+     Profile* profile) const {
+-  if (IsSafeBrowsingEnabled(*profile->GetPrefs()))
+-    return ChromePasswordProtectionServiceFactory::GetForProfile(profile);
+   return nullptr;
+ }
+ 
+@@ -387,9 +384,6 @@ void SafeBrowsingService::OnProfileAdded
+   std::unique_ptr<PrefChangeRegistrar> registrar =
+       std::make_unique<PrefChangeRegistrar>();
+   registrar->Init(pref_service);
+-  registrar->Add(prefs::kSafeBrowsingEnabled,
+-                 base::BindRepeating(&SafeBrowsingService::RefreshState,
+-                                     base::Unretained(this)));
+   // ClientSideDetectionService will need to be refresh the models
+   // renderers have if extended-reporting changes.
+   registrar->Add(prefs::kSafeBrowsingScoutReportingEnabled,
+@@ -418,14 +412,6 @@ void SafeBrowsingService::OnProfileAdded
+                           NoCachedPopulationReason::kChangeMbbPref));
+   user_population_prefs_[pref_service] = std::move(registrar);
+ 
+-  // Record the current pref state for standard protection.
+-  UMA_HISTOGRAM_BOOLEAN(kSafeBrowsingEnabledHistogramName,
+-                        pref_service->GetBoolean(prefs::kSafeBrowsingEnabled));
+-  // Record the current pref state for enhanced protection. Enhanced protection
+-  // is a subset of the standard protection. Thus, |kSafeBrowsingEnabled| count
+-  // should always be more than the count of enhanced protection.
+-  UMA_HISTOGRAM_BOOLEAN("SafeBrowsing.Pref.Enhanced",
+-                        pref_service->GetBoolean(prefs::kSafeBrowsingEnhanced));
+   // Extended Reporting metrics are handled together elsewhere.
+   RecordExtendedReportingMetrics(*pref_service);
+ 
+@@ -465,18 +451,6 @@ void SafeBrowsingService::RefreshState()
+ 
+   // Check if any profile requires the service to be active.
+   enabled_by_prefs_ = false;
+-  estimated_extended_reporting_by_prefs_ = SBER_LEVEL_OFF;
+-  for (const auto& pref : prefs_map_) {
+-    if (IsSafeBrowsingEnabled(*pref.first)) {
+-      enabled_by_prefs_ = true;
+-
+-      ExtendedReportingLevel erl =
+-          safe_browsing::GetExtendedReportingLevel(*pref.first);
+-      if (erl != SBER_LEVEL_OFF) {
+-        estimated_extended_reporting_by_prefs_ = erl;
+-      }
+-    }
+-  }
+ 
+   if (enabled_by_prefs_)
+     Start();
+--- chrome/browser/safe_browsing/safe_browsing_service.h.orig
++++ chrome/browser/safe_browsing/safe_browsing_service.h
+@@ -28,7 +28,6 @@
+ #include "components/safe_browsing/buildflags.h"
+ #include "components/safe_browsing/content/browser/safe_browsing_service_interface.h"
+ #include "components/safe_browsing/core/browser/db/util.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "content/public/browser/browser_context.h"
+ #include "content/public/browser/browser_thread.h"
+ #include "services/network/public/mojom/network_context.mojom-forward.h"
+@@ -97,15 +96,6 @@ class SafeBrowsingService : public SafeB
+   // Called on the main thread to let us know that the io_thread is going away.
+   void ShutDown();
+ 
+-  // NOTE(vakh): This is not the most reliable way to find out if extended
+-  // reporting has been enabled. That's why it starts with estimated_. It
+-  // returns true if any of the profiles have extended reporting enabled. It may
+-  // be called on any thread. That can lead to a race condition, but that's
+-  // acceptable.
+-  ExtendedReportingLevel estimated_extended_reporting_by_prefs() const {
+-    return estimated_extended_reporting_by_prefs_;
+-  }
+-
+   // Get current enabled status. Must be called on IO thread.
+   bool enabled() const {
+     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+@@ -287,10 +277,6 @@ class SafeBrowsingService : public SafeB
+   // Provides phishing and malware statistics. Accessed on UI thread.
+   std::unique_ptr<PingManager> ping_manager_;
+ 
+-  // Whether SafeBrowsing Extended Reporting is enabled by the current set of
+-  // profiles. Updated on the UI thread.
+-  ExtendedReportingLevel estimated_extended_reporting_by_prefs_;
+-
+   // Whether the service has been shutdown.
+   bool shutdown_;
+ 
+--- chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc.orig
++++ chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc
+@@ -27,7 +27,6 @@
+ #include "components/safe_browsing/core/browser/db/database_manager.h"
+ #include "components/safe_browsing/core/browser/ping_manager.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "content/public/browser/browser_task_traits.h"
+ #include "content/public/browser/browser_thread.h"
+ #include "content/public/browser/download_item_utils.h"
+@@ -142,11 +141,9 @@ bool AndroidTelemetryService::CanSendPin
+     return false;
+   }
+ 
+-  if (!IsSafeBrowsingEnabled(*GetPrefs())) {
+-    RecordApkDownloadTelemetryOutcome(
+-        ApkDownloadTelemetryOutcome::NOT_SENT_SAFE_BROWSING_NOT_ENABLED);
+-    return false;
+-  }
++  RecordApkDownloadTelemetryOutcome(
++      ApkDownloadTelemetryOutcome::NOT_SENT_SAFE_BROWSING_NOT_ENABLED);
++  return false;
+ 
+   if (profile_->IsOffTheRecord()) {
+     RecordApkDownloadTelemetryOutcome(
+--- chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc.orig
++++ chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc
+@@ -18,7 +18,6 @@
+ #include "components/download/public/common/mock_download_item.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "content/public/browser/browser_task_traits.h"
+ #include "content/public/browser/browser_thread.h"
+ #include "content/public/browser/download_item_utils.h"
+--- chrome/browser/safe_browsing/url_checker_delegate_impl.cc.orig
++++ chrome/browser/safe_browsing/url_checker_delegate_impl.cc
+@@ -21,7 +21,6 @@
+ #include "components/safe_browsing/core/browser/db/database_manager.h"
+ #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/unsafe_resource_util.h"
+ #include "content/public/browser/browser_task_traits.h"
+ #include "content/public/browser/browser_thread.h"
+--- chrome/browser/signin/account_consistency_mode_manager.cc.orig
++++ chrome/browser/signin/account_consistency_mode_manager.cc
+@@ -19,7 +19,6 @@
+ #include "components/pref_registry/pref_registry_syncable.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/public/base/signin_buildflags.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "google_apis/google_api_keys.h"
+ 
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -98,7 +97,6 @@ AccountConsistencyModeManager::AccountCo
+   // pref.
+   bool signin_allowed = IsDiceSignInAllowed() &&
+                         prefs->GetBoolean(prefs::kSigninAllowedOnNextStartup);
+-  prefs->SetBoolean(prefs::kSigninAllowed, signin_allowed);
+ 
+   UMA_HISTOGRAM_BOOLEAN("Signin.SigninAllowed", signin_allowed);
+ #endif
+@@ -196,16 +194,7 @@ AccountConsistencyModeManager::ComputeAc
+     // AccountManager is not available, when DICE has been disabled on Lacros.
+ #endif
+ 
+-#if BUILDFLAG(ENABLE_DICE_SUPPORT)
+-  if (!profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed)) {
+     VLOG(1) << "Desktop Identity Consistency disabled as sign-in to Chrome"
+                "is not allowed";
+-    return AccountConsistencyMethod::kDisabled;
+-  }
+-
+-  return AccountConsistencyMethod::kDice;
+-#endif
+-
+-  NOTREACHED();
+   return AccountConsistencyMethod::kDisabled;
+ }
+--- chrome/browser/signin/account_consistency_mode_manager_unittest.cc.orig
++++ chrome/browser/signin/account_consistency_mode_manager_unittest.cc
+@@ -20,7 +20,6 @@
+ #include "components/prefs/testing_pref_store.h"
+ #include "components/signin/public/base/account_consistency_method.h"
+ #include "components/signin/public/base/signin_buildflags.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/sync_preferences/testing_pref_service_syncable.h"
+ #include "content/public/test/browser_task_environment.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+--- chrome/browser/signin/chrome_device_id_helper.cc.orig
++++ chrome/browser/signin/chrome_device_id_helper.cc
+@@ -16,7 +16,6 @@
+ #include "base/logging.h"
+ #include "chrome/browser/ash/profiles/profile_helper.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/base/signin_switches.h"
+ #include "components/user_manager/known_user.h"
+ #include "components/user_manager/user_manager.h"
+@@ -67,21 +66,11 @@ void MigrateSigninScopedDeviceId(Profile
+     return;
+   const AccountId account_id = user->GetAccountId();
+   if (user_manager::known_user::GetDeviceId(account_id).empty()) {
+-    const std::string legacy_device_id = profile->GetPrefs()->GetString(
+-        prefs::kGoogleServicesSigninScopedDeviceId);
+-    if (!legacy_device_id.empty()) {
+-      // Need to move device ID from the old location to the new one, if it has
+-      // not been done yet.
+-      user_manager::known_user::SetDeviceId(account_id, legacy_device_id);
+-    } else {
+-      user_manager::known_user::SetDeviceId(
+-          account_id, GenerateSigninScopedDeviceId(
+-                          user_manager::UserManager::Get()
+-                              ->IsUserNonCryptohomeDataEphemeral(account_id)));
+-    }
++    user_manager::known_user::SetDeviceId(
++        account_id, GenerateSigninScopedDeviceId(
++                        user_manager::UserManager::Get()
++                            ->IsUserNonCryptohomeDataEphemeral(account_id)));
+   }
+-  profile->GetPrefs()->SetString(prefs::kGoogleServicesSigninScopedDeviceId,
+-                                 std::string());
+ }
+ 
+ #endif
+--- chrome/browser/signin/chrome_signin_client.cc.orig
++++ chrome/browser/signin/chrome_signin_client.cc
+@@ -38,7 +38,6 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/core/browser/cookie_settings_util.h"
+ #include "components/signin/public/base/signin_buildflags.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/access_token_info.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/signin/public/identity_manager/scope_set.h"
+--- chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc.orig
++++ chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc
+@@ -21,7 +21,6 @@
+ #include "components/network_session_configurator/common/network_switches.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/core/browser/signin_header_helper.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/identity_test_utils.h"
+ #include "components/user_manager/user.h"
+ #include "components/user_manager/user_manager.h"
+--- chrome/browser/signin/dice_browsertest.cc.orig
++++ chrome/browser/signin/dice_browsertest.cc
+@@ -59,7 +59,6 @@
+ #include "components/signin/public/base/account_consistency_method.h"
+ #include "components/signin/public/base/signin_client.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/signin/public/identity_manager/identity_test_utils.h"
+ #include "components/signin/public/identity_manager/primary_account_mutator.h"
+--- chrome/browser/signin/header_modification_delegate_impl.cc.orig
++++ chrome/browser/signin/header_modification_delegate_impl.cc
+@@ -15,7 +15,6 @@
+ #include "chrome/browser/sync/sync_service_factory.h"
+ #include "chrome/common/pref_names.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/account_info.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/signin/public/identity_manager/tribool.h"
+@@ -113,7 +112,7 @@ void HeaderModificationDelegateImpl::Pro
+ #endif
+ #if BUILDFLAG(ENABLE_DICE_SUPPORT)
+       sync_service && sync_service->IsSyncFeatureEnabled(),
+-      prefs->GetString(prefs::kGoogleServicesSigninScopedDeviceId),
++      std::string(),
+ #endif
+       cookie_settings_.get());
+ }
+--- chrome/browser/signin/mirror_browsertest.cc.orig
++++ chrome/browser/signin/mirror_browsertest.cc
+@@ -31,7 +31,6 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/core/browser/dice_header_helper.h"
+ #include "components/signin/core/browser/signin_header_helper.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "content/public/common/content_client.h"
+ #include "content/public/test/browser_test.h"
+ #include "google_apis/gaia/gaia_urls.h"
+--- chrome/browser/signin/signin_manager.cc.orig
++++ chrome/browser/signin/signin_manager.cc
+@@ -5,7 +5,6 @@
+ #include "chrome/browser/signin/signin_manager.h"
+ 
+ #include "components/prefs/pref_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/signin/public/identity_manager/primary_account_mutator.h"
+@@ -13,11 +12,6 @@
+ SigninManager::SigninManager(PrefService* prefs,
+                              signin::IdentityManager* identity_manager)
+     : prefs_(prefs), identity_manager_(identity_manager) {
+-  signin_allowed_.Init(
+-      prefs::kSigninAllowed, prefs_,
+-      base::BindRepeating(&SigninManager::OnSigninAllowedPrefChanged,
+-                          base::Unretained(this)));
+-
+   UpdateUnconsentedPrimaryAccount();
+   identity_manager_->AddObserver(this);
+ }
+@@ -63,16 +57,6 @@ SigninManager::ComputeUnconsentedPrimary
+         signin::ConsentLevel::kSync);
+   }
+ 
+-  // Clearing the primary sync account when sign-in is not allowed is handled
+-  // by PrimaryAccountPolicyManager. That flow is extremely hard to follow
+-  // especially for the case when the user is syncing with a managed account
+-  // as in that case the whole profile needs to be deleted.
+-  //
+-  // It was considered simpler to keep the logic to update the unconsented
+-  // primary account in a single place.
+-  if (!signin_allowed_.GetValue())
+-    return absl::nullopt;
+-
+   signin::AccountsInCookieJarInfo cookie_info =
+       identity_manager_->GetAccountsInCookieJar();
+ 
+--- chrome/browser/signin/signin_promo_util.cc.orig
++++ chrome/browser/signin/signin_promo_util.cc
+@@ -8,7 +8,6 @@
+ #include "chrome/browser/profiles/profile.h"
+ #include "chrome/browser/signin/identity_manager_factory.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/signin/public/identity_manager/primary_account_mutator.h"
+ #include "net/base/network_change_notifier.h"
+@@ -36,7 +35,7 @@ bool ShouldShowPromo(Profile* profile) {
+     return false;
+ 
+   // Don't show if sign-in is not allowed.
+-  if (!original_profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed))
++  if (true)
+     return false;
+ 
+   // Display the signin promo if the user is not signed in.
+--- chrome/browser/signin/signin_ui_util.cc.orig
++++ chrome/browser/signin/signin_ui_util.cc
+@@ -34,7 +34,6 @@
+ #include "components/feature_engagement/public/tracker.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/account_info.h"
+ #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
+ #include "components/signin/public/identity_manager/consent_level.h"
+--- chrome/browser/signin/signin_util.cc.orig
++++ chrome/browser/signin/signin_util.cc
+@@ -30,7 +30,6 @@
+ #include "components/google/core/common/google_util.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/signin/public/identity_manager/identity_utils.h"
+ #include "components/signin/public/identity_manager/primary_account_mutator.h"
+@@ -232,7 +231,7 @@ void EnsurePrimaryAccountAllowedForProfi
+ 
+   CoreAccountInfo primary_account =
+       identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync);
+-  if (profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed) &&
++  if (false &&
+       signin::IsUsernameAllowedByPatternFromPrefs(
+           g_browser_process->local_state(), primary_account.email)) {
+     return;
+--- chrome/browser/signin/signin_util_win.cc.orig
++++ chrome/browser/signin/signin_util_win.cc
+@@ -34,7 +34,6 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/core/browser/about_signin_internals.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/accounts_mutator.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ 
+@@ -136,9 +135,6 @@ void ImportCredentialsFromProvider(Profi
+                                        account_id, nullptr));
+     }
+   }
+-
+-  // Mark this profile as having been signed in with the credential provider.
+-  profile->GetPrefs()->SetBoolean(prefs::kSignedInWithCredentialProvider, true);
+ }
+ 
+ // Extracts the |cred_provider_gaia_id| and |cred_provider_email| for the user
+@@ -313,20 +309,7 @@ bool ReauthWithCredentialProviderIfPossi
+   //  - The profile is marked as having been signed in with a system credential.
+   //  - The profile is already signed in.
+   //  - The profile is in an auth error state.
+-  auto* identity_manager = IdentityManagerFactory::GetForProfile(profile);
+-  if (!(profile->GetPrefs()->GetBoolean(
+-            prefs::kSignedInWithCredentialProvider) &&
+-        identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync) &&
+-        identity_manager->HasAccountWithRefreshTokenInPersistentErrorState(
+-            identity_manager->GetPrimaryAccountId(
+-                signin::ConsentLevel::kSync)))) {
+     return false;
+-  }
+-
+-  std::wstring gaia_id = base::UTF8ToWide(
+-      identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync)
+-          .gaia.c_str());
+-  return TrySigninWithCredentialProvider(profile, gaia_id, false);
+ }
+ 
+ }  // namespace signin_util
+--- chrome/browser/signin/signin_util_win_browsertest.cc.orig
++++ chrome/browser/signin/signin_util_win_browsertest.cc
+@@ -31,7 +31,6 @@
+ #include "chrome/test/base/in_process_browser_test.h"
+ #include "chrome/test/base/testing_browser_process.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/signin/public/identity_manager/identity_test_utils.h"
+ #include "components/signin/public/identity_manager/primary_account_mutator.h"
+--- chrome/browser/ssl/certificate_reporting_test_utils.cc.orig
++++ chrome/browser/ssl/certificate_reporting_test_utils.cc
+@@ -15,7 +15,6 @@
+ #include "build/build_config.h"
+ #include "chrome/browser/profiles/profile.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/cert_report_helper.h"
+ #include "components/security_interstitials/content/certificate_error_report.h"
+ #include "components/variations/variations_associated_data.h"
+--- chrome/browser/ssl/sct_reporting_service.cc.orig
++++ chrome/browser/ssl/sct_reporting_service.cc
+@@ -9,7 +9,6 @@
+ #include "chrome/browser/net/system_network_context_manager.h"
+ #include "chrome/browser/safe_browsing/safe_browsing_service.h"
+ #include "chrome/common/chrome_features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "content/public/browser/network_service_instance.h"
+ #include "content/public/browser/storage_partition.h"
+ #include "net/traffic_annotation/network_traffic_annotation.h"
+@@ -119,8 +118,5 @@ void SCTReportingService::SetReportingEn
+ }
+ 
+ void SCTReportingService::OnPreferenceChanged() {
+-  const bool enabled = safe_browsing_service_ &&
+-                       safe_browsing_service_->enabled_by_prefs() &&
+-                       safe_browsing::IsExtendedReportingEnabled(pref_service_);
+-  SetReportingEnabled(enabled);
++  SetReportingEnabled(false);
+ }
+--- chrome/browser/ssl/ssl_browsertest.cc.orig
++++ chrome/browser/ssl/ssl_browsertest.cc
+@@ -94,7 +94,6 @@
+ #include "components/policy/policy_constants.h"
+ #include "components/prefs/testing_pref_service.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/bad_clock_blocking_page.h"
+ #include "components/security_interstitials/content/captive_portal_blocking_page.h"
+ #include "components/security_interstitials/content/cert_report_helper.h"
+--- chrome/browser/ssl/ssl_error_controller_client.cc.orig
++++ chrome/browser/ssl/ssl_error_controller_client.cc
+@@ -23,7 +23,6 @@
+ #include "chrome/browser/ssl/stateful_ssl_host_state_delegate_factory.h"
+ #include "chrome/common/pref_names.h"
+ #include "chrome/common/url_constants.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/content_metrics_helper.h"
+ #include "components/security_interstitials/content/settings_page_helper.h"
+ #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
+--- chrome/browser/supervised_user/supervised_user_pref_store.cc.orig
++++ chrome/browser/supervised_user/supervised_user_pref_store.cc
+@@ -23,7 +23,6 @@
+ #include "chrome/common/pref_names.h"
+ #include "components/feed/core/shared_prefs/pref_names.h"
+ #include "components/prefs/pref_value_map.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "extensions/buildflags/buildflags.h"
+ 
+ namespace {
+@@ -55,10 +54,6 @@ SupervisedUserSettingsPrefMappingEntry k
+         prefs::kSupervisedUserSafeSites,
+     },
+     {
+-        supervised_users::kSigninAllowed,
+-        prefs::kSigninAllowed,
+-    },
+-    {
+         supervised_users::kUserName,
+         prefs::kProfileName,
+     },
+@@ -124,7 +119,6 @@ void SupervisedUserPrefStore::OnNewSetti
+     prefs_->SetInteger(prefs::kForceYouTubeRestrict,
+                        safe_search_util::YOUTUBE_RESTRICT_MODERATE);
+     prefs_->SetBoolean(prefs::kHideWebStoreIcon, false);
+-    prefs_->SetBoolean(prefs::kSigninAllowed, false);
+     prefs_->SetBoolean(feed::prefs::kEnableSnippets, false);
+ 
+     // Copy supervised user settings to prefs.
+--- chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc.orig
++++ chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
+@@ -37,7 +37,6 @@
+ #include "components/autofill/core/common/autofill_features.h"
+ #include "components/autofill/core/common/autofill_payments_features.h"
+ #include "components/signin/public/base/signin_buildflags.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/strings/grit/components_strings.h"
+ #include "components/sync/driver/sync_service.h"
+--- chrome/browser/ui/browser_command_controller.cc.orig
++++ chrome/browser/ui/browser_command_controller.cc
+@@ -57,7 +57,6 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/sessions/core/tab_restore_service.h"
+ #include "components/signin/public/base/signin_buildflags.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "content/public/browser/native_web_keyboard_event.h"
+ #include "content/public/browser/navigation_controller.h"
+ #include "content/public/browser/navigation_entry.h"
+@@ -184,10 +183,6 @@ BrowserCommandController::BrowserCommand
+           &BrowserCommandController::UpdateCommandsForFullscreenMode,
+           base::Unretained(this)));
+ #endif
+-  pref_signin_allowed_.Init(
+-      prefs::kSigninAllowed, profile()->GetOriginalProfile()->GetPrefs(),
+-      base::BindRepeating(&BrowserCommandController::OnSigninAllowedPrefChange,
+-                          base::Unretained(this)));
+ 
+   InitCommandState();
+ 
+@@ -1526,7 +1521,7 @@ void BrowserCommandController::UpdateSho
+     return;
+ 
+   command_updater_.UpdateCommandEnabled(
+-      IDC_SHOW_SIGNIN, show_main_ui && pref_signin_allowed_.GetValue());
++      IDC_SHOW_SIGNIN, false);
+ }
+ 
+ // static
+--- chrome/browser/ui/browser_command_controller.h.orig
++++ chrome/browser/ui/browser_command_controller.h
+@@ -211,7 +211,6 @@ class BrowserCommandController : public
+ 
+   PrefChangeRegistrar profile_pref_registrar_;
+   PrefChangeRegistrar local_pref_registrar_;
+-  BooleanPrefMember pref_signin_allowed_;
+ 
+   // In locked fullscreen mode disallow enabling/disabling commands.
+   bool is_locked_fullscreen_ = false;
+--- chrome/browser/ui/browser_command_controller_unittest.cc.orig
++++ chrome/browser/ui/browser_command_controller_unittest.cc
+@@ -27,7 +27,6 @@
+ #include "chrome/test/base/test_browser_window.h"
+ #include "chrome/test/base/testing_browser_process.h"
+ #include "chrome/test/base/testing_profile_manager.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "content/public/browser/native_web_keyboard_event.h"
+ #include "ui/events/keycodes/dom/dom_code.h"
+ #include "ui/events/keycodes/keyboard_codes.h"
+--- chrome/browser/ui/chrome_pages.cc.orig
++++ chrome/browser/ui/chrome_pages.cc
+@@ -61,7 +61,6 @@
+ 
+ #if !defined(OS_ANDROID)
+ #include "chrome/browser/signin/identity_manager_factory.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #endif
+ 
+@@ -484,13 +483,7 @@ void ShowBrowserSignin(Browser* browser,
+ 
+ void ShowBrowserSigninOrSettings(Browser* browser,
+                                  signin_metrics::AccessPoint access_point) {
+-  Profile* original_profile = browser->profile()->GetOriginalProfile();
+-  DCHECK(original_profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed));
+-  if (IdentityManagerFactory::GetForProfile(original_profile)
+-          ->HasPrimaryAccount(signin::ConsentLevel::kSync))
+-    ShowSettings(browser);
+-  else
+-    ShowBrowserSignin(browser, access_point, signin::ConsentLevel::kSync);
++  ShowSettings(browser);
+ }
+ #endif
+ 
+--- chrome/browser/ui/hats/trust_safety_sentiment_service.cc.orig
++++ chrome/browser/ui/hats/trust_safety_sentiment_service.cc
+@@ -19,8 +19,6 @@
+ #include "components/content_settings/core/common/pref_names.h"
+ #include "components/password_manager/core/common/password_manager_pref_names.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/unified_consent/pref_names.h"
+ 
+ namespace {
+@@ -81,9 +79,6 @@ bool HasNonDefaultPrivacySetting(Profile
+   auto* prefs = profile->GetPrefs();
+ 
+   std::vector<std::string> prefs_to_check = {
+-      prefs::kSafeBrowsingEnabled,
+-      prefs::kSafeBrowsingEnhanced,
+-      prefs::kSafeBrowsingScoutReportingEnabled,
+       prefs::kEnableDoNotTrack,
+       password_manager::prefs::kPasswordLeakDetectionEnabled,
+       prefs::kCookieControlsMode,
+@@ -101,13 +96,9 @@ bool HasNonDefaultPrivacySetting(Profile
+   // Users consenting to sync automatically enable UKM collection
+   auto* ukm_pref = prefs->FindPreference(
+       unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled);
+-  auto* sync_consent_pref =
+-      prefs->FindPreference(prefs::kGoogleServicesConsentedToSync);
+ 
+   bool has_non_default_ukm =
+-      ukm_pref->GetValue()->GetBool() !=
+-          sync_consent_pref->GetValue()->GetBool() &&
+-      (ukm_pref->IsUserControlled() || sync_consent_pref->IsUserControlled());
++      ukm_pref->GetValue()->GetBool() != false && ukm_pref->IsUserControlled();
+ 
+   // Check the default value for each user facing content setting. Note that
+   // this will not include content setting exceptions set via permission
+--- chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc.orig
++++ chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc
+@@ -20,7 +20,6 @@
+ #include "components/password_manager/core/browser/password_manager_metrics_util.h"
+ #include "components/safe_browsing/content/browser/password_protection/password_protection_test_util.h"
+ #include "components/safe_browsing/core/browser/password_protection/metrics_util.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/account_info.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/signin/public/identity_manager/identity_test_utils.h"
+--- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig
++++ chrome/browser/ui/views/profiles/profile_menu_view.cc
+@@ -53,7 +53,6 @@
+ #include "chrome/grit/generated_resources.h"
+ #include "chrome/grit/theme_resources.h"
+ #include "components/signin/core/browser/signin_error_controller.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/consent_level.h"
+ #include "components/signin/public/identity_manager/primary_account_mutator.h"
+ #include "components/strings/grit/components_strings.h"
+@@ -501,7 +500,6 @@ void ProfileMenuView::BuildAutofillButto
+ 
+ void ProfileMenuView::BuildSyncInfo() {
+   Profile* profile = browser()->profile();
+-  if (!profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed))
+     return;
+ 
+   signin::IdentityManager* identity_manager =
+--- chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc.orig
++++ chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
+@@ -55,7 +55,6 @@
+ #include "components/feature_engagement/public/tracker.h"
+ #include "components/feature_engagement/test/test_tracker.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/consent_level.h"
+ #include "components/signin/public/identity_manager/identity_test_utils.h"
+ #include "components/sync/driver/sync_service.h"
+--- chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc.orig
++++ chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
+@@ -122,7 +122,6 @@ PasswordReuseModalWarningDialog::Passwor
+     OnWarningDone done_callback)
+     : content::WebContentsObserver(web_contents),
+       done_callback_(std::move(done_callback)),
+-      service_(service),
+       url_(web_contents->GetLastCommittedURL()),
+       password_type_(password_type) {
+   bool show_check_passwords = false;
+@@ -163,29 +162,13 @@ PasswordReuseModalWarningDialog::Passwor
+   SetCancelCallback(make_done_callback(WarningAction::IGNORE_WARNING));
+   SetCloseCallback(make_done_callback(WarningAction::CLOSE));
+ 
+-  // |service| maybe NULL in tests.
+-  if (service_)
+-    service_->AddObserver(this);
+-
+-  if (password_type.account_type() ==
+-      ReusedPasswordAccountType::SAVED_PASSWORD) {
+-    const std::u16string message_body =
+-        service_->GetWarningDetailText(password_type);
+-
+-    CreateSavedPasswordReuseModalWarningDialog(message_body);
+-  } else {
+-    views::Label* message_body_label = CreateMessageBodyLabel(
+-        service_
+-            ? service_->GetWarningDetailText(password_type)
+-            : l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS));
+-    CreateGaiaPasswordReuseModalWarningDialog(message_body_label);
+-  }
++  views::Label* message_body_label = CreateMessageBodyLabel(
++      l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS));
++  CreateGaiaPasswordReuseModalWarningDialog(message_body_label);
+   modal_construction_start_time_ = base::TimeTicks::Now();
+ }
+ 
+ PasswordReuseModalWarningDialog::~PasswordReuseModalWarningDialog() {
+-  if (service_)
+-    service_->RemoveObserver(this);
+   LogModalWarningDialogLifetime(modal_construction_start_time_);
+ }
+ 
+--- chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h.orig
++++ chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h
+@@ -60,7 +60,6 @@ class PasswordReuseModalWarningDialog
+ 
+  private:
+   OnWarningDone done_callback_;
+-  ChromePasswordProtectionService* service_;
+   const GURL url_;
+   const ReusedPasswordAccountType password_type_;
+ 
+--- chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc.orig
++++ chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc
+@@ -44,7 +44,6 @@
+ #include "components/keyed_service/content/browser_context_dependency_manager.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/prefs/scoped_user_pref_update.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/identity_test_utils.h"
+ #include "content/public/browser/render_frame_host.h"
+ #include "content/public/browser/render_process_host.h"
+--- chrome/browser/ui/webui/browser_command/browser_command_handler.cc.orig
++++ chrome/browser/ui/webui/browser_command/browser_command_handler.cc
+@@ -16,7 +16,6 @@
+ #include "chrome/common/webui_url_constants.h"
+ #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
+ #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "ui/base/page_transition_types.h"
+ #include "ui/base/window_open_disposition.h"
+ 
+@@ -61,13 +60,6 @@ void BrowserCommandHandler::CanExecuteCo
+       can_execute =
+           !chrome::enterprise_util::HasBrowserPoliciesApplied(profile_);
+       break;
+-    case Command::kOpenSafeBrowsingEnhancedProtectionSettings: {
+-      bool managed = safe_browsing::SafeBrowsingPolicyHandler::
+-          IsSafeBrowsingProtectionLevelSetByPolicy(profile_->GetPrefs());
+-      bool already_enabled =
+-          safe_browsing::IsEnhancedProtectionEnabled(*(profile_->GetPrefs()));
+-      can_execute = !managed && !already_enabled;
+-    } break;
+     case Command::kOpenFeedbackForm:
+       can_execute = true;
+       break;
+--- chrome/browser/ui/webui/downloads/downloads_dom_handler.cc.orig
++++ chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
+@@ -37,7 +37,6 @@
+ #include "chrome/common/url_constants.h"
+ #include "components/download/public/common/download_item.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "content/public/browser/browser_thread.h"
+ #include "content/public/browser/download_manager.h"
+ #include "content/public/browser/render_process_host.h"
+--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig
++++ chrome/browser/ui/webui/management/management_ui_handler.cc
+@@ -29,7 +29,6 @@
+ #include "chrome/browser/profiles/profile.h"
+ #include "chrome/browser/ui/managed_ui.h"
+ #include "chrome/common/pref_names.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/strings/grit/components_strings.h"
+ #include "content/public/browser/storage_partition.h"
+ #include "content/public/browser/web_contents.h"
+--- chrome/browser/ui/webui/profile_info_watcher.cc.orig
++++ chrome/browser/ui/webui/profile_info_watcher.cc
+@@ -12,7 +12,6 @@
+ #include "chrome/browser/signin/identity_manager_factory.h"
+ #include "chrome/common/pref_names.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ 
+ ProfileInfoWatcher::ProfileInfoWatcher(Profile* profile,
+@@ -25,11 +24,6 @@ ProfileInfoWatcher::ProfileInfoWatcher(P
+   // The profile_manager might be NULL in testing environments.
+   if (profile_manager)
+     profile_manager->GetProfileAttributesStorage().AddObserver(this);
+-
+-  signin_allowed_pref_.Init(
+-      prefs::kSigninAllowed, profile_->GetPrefs(),
+-      base::BindRepeating(&ProfileInfoWatcher::RunCallback,
+-                          base::Unretained(this)));
+ }
+ 
+ ProfileInfoWatcher::~ProfileInfoWatcher() {
+--- chrome/browser/ui/webui/profile_info_watcher.h.orig
++++ chrome/browser/ui/webui/profile_info_watcher.h
+@@ -49,7 +49,6 @@ class ProfileInfoWatcher : public Profil
+   // Called when the authenticated username changes.
+   base::RepeatingClosure callback_;
+ 
+-  BooleanPrefMember signin_allowed_pref_;
+ };
+ 
+ #endif  // CHROME_BROWSER_UI_WEBUI_PROFILE_INFO_WATCHER_H_
+--- chrome/browser/ui/webui/reset_password/reset_password_ui.cc.orig
++++ chrome/browser/ui/webui/reset_password/reset_password_ui.cc
+@@ -17,7 +17,6 @@
+ #include "components/safe_browsing/content/browser/password_protection/password_protection_service.h"
+ #include "components/safe_browsing/core/browser/password_protection/metrics_util.h"
+ #include "components/safe_browsing/core/common/proto/csd.pb.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/strings/grit/components_strings.h"
+ #include "components/url_formatter/url_formatter.h"
+ #include "components/user_prefs/user_prefs.h"
+--- chrome/browser/ui/webui/settings/people_handler.cc.orig
++++ chrome/browser/ui/webui/settings/people_handler.cc
+@@ -41,7 +41,6 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/core/browser/signin_error_controller.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/accounts_mutator.h"
+ #include "components/signin/public/identity_manager/consent_level.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+@@ -290,10 +289,6 @@ void PeopleHandler::RegisterMessages() {
+ void PeopleHandler::OnJavascriptAllowed() {
+   PrefService* prefs = profile_->GetPrefs();
+   profile_pref_registrar_.Init(prefs);
+-  profile_pref_registrar_.Add(
+-      prefs::kSigninAllowed,
+-      base::BindRepeating(&PeopleHandler::UpdateSyncStatus,
+-                          base::Unretained(this)));
+ 
+   signin::IdentityManager* identity_manager(
+       IdentityManagerFactory::GetInstance()->GetForProfile(profile_));
+--- chrome/browser/ui/webui/settings/safety_check_handler.cc.orig
++++ chrome/browser/ui/webui/settings/safety_check_handler.cc
+@@ -28,7 +28,6 @@
+ #include "chrome/grit/chromium_strings.h"
+ #include "chrome/grit/generated_resources.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/strings/grit/components_strings.h"
+ #include "components/version_info/version_info.h"
+ #include "content/public/browser/browser_context.h"
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig
++++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+@@ -67,7 +67,6 @@
+ #include "components/password_manager/core/browser/manage_passwords_referrer.h"
+ #include "components/password_manager/core/common/password_manager_features.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/signin/public/base/signin_buildflags.h"
+ #include "components/strings/grit/components_chromium_strings.h"
+ #include "components/strings/grit/components_strings.h"
+@@ -1391,46 +1390,6 @@ void AddPrivacyStrings(content::WebUIDat
+     {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
+     {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
+     {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT},
+-    {"safeBrowsingEnableExtendedReporting",
+-     IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING},
+-    {"safeBrowsingEnableExtendedReportingDesc",
+-     IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC},
+-    {"safeBrowsingEnhanced", IDS_SETTINGS_SAFEBROWSING_ENHANCED},
+-    {"safeBrowsingEnhancedDesc", IDS_SETTINGS_SAFEBROWSING_ENHANCED_DESC},
+-    {"safeBrowsingEnhancedExpandA11yLabel",
+-     IDS_SETTINGS_SAFEBROWSING_ENHANCED_EXPAND_ACCESSIBILITY_LABEL},
+-    {"safeBrowsingEnhancedBulOne",
+-     IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_ONE},
+-    {"safeBrowsingEnhancedBulTwo",
+-     IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_TWO},
+-    {"safeBrowsingEnhancedBulThree",
+-     IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_THREE},
+-    {"safeBrowsingEnhancedBulFour",
+-     IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_FOUR},
+-    {"safeBrowsingEnhancedBulFive",
+-     IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_FIVE},
+-    {"safeBrowsingStandard", IDS_SETTINGS_SAFEBROWSING_STANDARD},
+-    {"safeBrowsingStandardDesc", IDS_SETTINGS_SAFEBROWSING_STANDARD_DESC},
+-    {"safeBrowsingStandardExpandA11yLabel",
+-     IDS_SETTINGS_SAFEBROWSING_STANDARD_EXPAND_ACCESSIBILITY_LABEL},
+-    {"safeBrowsingStandardBulOne",
+-     IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_ONE},
+-    {"safeBrowsingStandardBulTwo",
+-     IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_TWO},
+-    {"safeBrowsingStandardReportingLabel",
+-     IDS_SETTINGS_SAFEBROWSING_STANDARD_HELP_IMPROVE},
+-    {"safeBrowsingNone", IDS_SETTINGS_SAFEBROWSING_NONE},
+-    {"safeBrowsingNoneDesc", IDS_SETTINGS_SAFEBROWSING_NONE_DESC},
+-    {"safeBrowsingDisableDialog",
+-     IDS_SETTINGS_SAFEBROWSING_DISABLE_DIALOG_TITLE},
+-    {"safeBrowsingDisableDialogDesc",
+-     IDS_SETTINGS_SAFEBROWSING_DISABLE_DIALOG_DESC},
+-    {"safeBrowsingDisableDialogConfirm",
+-     IDS_SETTINGS_SAFEBROWSING_DISABLE_DIALOG_CONFIRM},
+-    {"safeBrowsingEnableProtection",
+-     IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION},
+-    {"safeBrowsingEnableProtectionDesc",
+-     IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION_DESC},
+     {"safeBrowsingSectionLabel", IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL},
+     {"syncAndGoogleServicesPrivacyDescription",
+      IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT},
+@@ -2626,11 +2585,6 @@ void AddSiteSettingsStrings(content::Web
+   html_source->AddLocalizedStrings(kSensorsLocalizedStrings);
+ 
+   html_source->AddBoolean(
+-      "enableSafeBrowsingSubresourceFilter",
+-      base::FeatureList::IsEnabled(
+-          subresource_filter::kSafeBrowsingSubresourceFilter));
+-
+-  html_source->AddBoolean(
+       "enableBlockAutoplayContentSetting",
+       base::FeatureList::IsEnabled(media::kAutoplayDisableSettings));
+ 
+--- chrome/browser/ui/webui/settings/settings_ui.cc.orig
++++ chrome/browser/ui/webui/settings/settings_ui.cc
+@@ -72,7 +72,6 @@
+ #include "components/pref_registry/pref_registry_syncable.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "content/public/browser/url_data_source.h"
+ #include "content/public/browser/web_contents.h"
+ #include "content/public/browser/web_ui.h"
+@@ -274,9 +273,7 @@ SettingsUI::SettingsUI(content::WebUI* w
+           ? "enable-branding-update"
+           : "");
+ 
+-  html_source->AddBoolean("signinAllowed", !profile->IsGuestSession() &&
+-                                               profile->GetPrefs()->GetBoolean(
+-                                                   prefs::kSigninAllowed));
++  html_source->AddBoolean("signinAllowed", false);
+ 
+   html_source->AddBoolean("showImportPasswords",
+                           base::FeatureList::IsEnabled(
+--- chrome/browser/ui/webui/signin/dice_turn_sync_on_helper.cc.orig
++++ chrome/browser/ui/webui/signin/dice_turn_sync_on_helper.cc
+@@ -46,7 +46,6 @@
+ #include "components/policy/core/common/management/management_service.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/accounts_mutator.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/signin/public/identity_manager/primary_account_mutator.h"
+@@ -248,8 +247,7 @@ DiceTurnSyncOnHelper::DiceTurnSyncOnHelp
+   // last authenticated account of the current profile, then Chrome will show a
+   // confirmation dialog before starting sync.
+   // TODO(skym): Warn for high risk upgrade scenario (https://crbug.com/572754).
+-  std::string last_email =
+-      profile_->GetPrefs()->GetString(prefs::kGoogleServicesLastUsername);
++  std::string last_email;
+   delegate_->ShowMergeSyncDataConfirmation(
+       last_email, account_info_.email,
+       base::BindOnce(&DiceTurnSyncOnHelper::OnMergeAccountConfirmation,
+--- chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_unittest.cc.orig
++++ chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_unittest.cc
+@@ -38,7 +38,6 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/public/base/account_consistency_method.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/signin/public/identity_manager/identity_test_environment.h"
+ #include "components/signin/public/identity_manager/primary_account_mutator.h"
+--- chrome/browser/ui/webui/signin/inline_login_handler.cc.orig
++++ chrome/browser/ui/webui/signin/inline_login_handler.cc
+@@ -27,7 +27,6 @@
+ #include "chrome/common/pref_names.h"
+ #include "components/metrics/metrics_pref_names.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "content/public/browser/storage_partition.h"
+ #include "content/public/browser/web_contents.h"
+ #include "content/public/browser/web_ui.h"
+@@ -127,8 +126,6 @@ void InlineLoginHandler::ContinueHandleI
+   std::string default_email;
+   if (reason == signin_metrics::Reason::kSigninPrimaryAccount ||
+       reason == signin_metrics::Reason::kForcedSigninPrimaryAccount) {
+-    default_email =
+-        profile->GetPrefs()->GetString(prefs::kGoogleServicesLastUsername);
+   } else {
+     if (!net::GetValueForKeyInQuery(current_url, "email", &default_email))
+       default_email.clear();
+--- chrome/browser/ui/webui/signin/inline_login_handler_impl.cc.orig
++++ chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
+@@ -70,7 +70,6 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/core/browser/about_signin_internals.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/account_info.h"
+ #include "components/signin/public/identity_manager/accounts_cookie_mutator.h"
+ #include "components/signin/public/identity_manager/accounts_mutator.h"
+--- chrome/browser/ui/webui/signin/signin_error_ui.cc.orig
++++ chrome/browser/ui/webui/signin/signin_error_ui.cc
+@@ -23,7 +23,6 @@
+ #include "chrome/grit/generated_resources.h"
+ #include "chrome/grit/signin_resources.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/strings/grit/components_strings.h"
+ #include "content/public/browser/web_ui.h"
+ #include "content/public/browser/web_ui_data_source.h"
+@@ -115,9 +114,7 @@ void SigninErrorUI::Initialize(Browser*
+   if (is_profile_blocked) {
+     source->AddLocalizedString("profileBlockedMessage",
+                                IDS_OLD_PROFILES_DISABLED_MESSAGE);
+-    std::string allowed_domain = signin_ui_util::GetAllowedDomain(
+-        g_browser_process->local_state()->GetString(
+-            prefs::kGoogleServicesUsernamePattern));
++    std::string allowed_domain;
+     if (allowed_domain.empty()) {
+       source->AddLocalizedString(
+           "profileBlockedAddPersonSuggestion",
+--- chrome/browser/ui/webui/signin/signin_utils_desktop.cc.orig
++++ chrome/browser/ui/webui/signin/signin_utils_desktop.cc
+@@ -18,7 +18,6 @@
+ #include "chrome/grit/chromium_strings.h"
+ #include "chrome/grit/generated_resources.h"
+ #include "components/guest_view/browser/guest_view_manager.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/signin/public/identity_manager/identity_utils.h"
+ #include "google_apis/gaia/gaia_auth_util.h"
+@@ -30,7 +29,7 @@ SigninUIError CanOfferSignin(Profile* pr
+   if (!profile)
+     return SigninUIError::Other(email);
+ 
+-  if (!profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed))
++  if (true)
+     return SigninUIError::Other(email);
+ 
+   if (!ChromeSigninClient::ProfileAllowsSigninCookies(profile))
+@@ -103,8 +102,7 @@ SigninUIError CanOfferSignin(Profile* pr
+     // With force sign in enabled, cross account sign in is not allowed.
+     if (signin_util::IsForceSigninEnabled() &&
+         IsCrossAccountError(profile, email, gaia_id)) {
+-      std::string last_email =
+-          profile->GetPrefs()->GetString(prefs::kGoogleServicesLastUsername);
++      std::string last_email;
+       return SigninUIError::ProfileWasUsedByAnotherAccount(email, last_email);
+     }
+   }
+--- chrome/browser/ui/webui/welcome/welcome_ui.cc.orig
++++ chrome/browser/ui/webui/welcome/welcome_ui.cc
+@@ -24,7 +24,6 @@
+ #include "chrome/grit/welcome_resources.h"
+ #include "chrome/grit/welcome_resources_map.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/strings/grit/components_strings.h"
+ #include "net/base/url_util.h"
+ #include "ui/base/webui/web_ui_util.h"
+@@ -166,7 +165,7 @@ WelcomeUI::WelcomeUI(content::WebUI* web
+       "returningUserModules",
+       welcome::GetModules(profile).FindKey("returning-user")->GetString());
+   html_source->AddBoolean(
+-      "signinAllowed", profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed));
++      "signinAllowed", false);
+   html_source->SetRequestFilter(
+       base::BindRepeating(&ShouldHandleRequestCallback,
+                           weak_ptr_factory_.GetWeakPtr()),
+--- chrome/browser/unified_consent/unified_consent_service_factory.cc.orig
++++ chrome/browser/unified_consent/unified_consent_service_factory.cc
+@@ -13,7 +13,6 @@
+ #include "components/embedder_support/pref_names.h"
+ #include "components/keyed_service/content/browser_context_dependency_manager.h"
+ #include "components/prefs/pref_registry_simple.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/spellcheck/browser/pref_names.h"
+ #include "components/sync_preferences/pref_service_syncable.h"
+ #include "components/unified_consent/unified_consent_metrics.h"
+@@ -35,7 +34,6 @@ namespace {
+ std::vector<std::string> GetSyncedServicePrefNames() {
+   return {
+     prefs::kSearchSuggestEnabled, embedder_support::kAlternateErrorPagesEnabled,
+-        prefs::kSafeBrowsingEnabled, prefs::kSafeBrowsingScoutReportingEnabled,
+         spellcheck::prefs::kSpellCheckUseSpellingService,
+ #if defined(OS_ANDROID)
+         prefs::kContextualSearchEnabled
+--- chrome/common/extensions/api/privacy.json.orig
++++ chrome/common/extensions/api/privacy.json
+@@ -63,16 +63,6 @@
+             "value": ["passwordSavingEnabled", {"type":"boolean"}],
+             "description": "If enabled, the password manager will ask if you want to save passwords. This preference's value is a boolean, defaulting to <code>true</code>."
+           },
+-          "safeBrowsingEnabled": {
+-            "$ref": "types.ChromeSetting",
+-            "value": ["safeBrowsingEnabled", {"type":"boolean"}],
+-            "description": "If enabled, Chrome does its best to protect you from phishing and malware. This preference's value is a boolean, defaulting to <code>true</code>."
+-          },
+-          "safeBrowsingExtendedReportingEnabled": {
+-            "$ref": "types.ChromeSetting",
+-            "value": ["safeBrowsingExtendedReportingEnabled", {"type":"boolean"}],
+-            "description": "If enabled, Chrome will send additional information to Google when SafeBrowsing blocks a page, such as the content of the blocked page. This preference's value is a boolean, defaulting to <code>false</code>."
+-          },
+           "searchSuggestEnabled": {
+             "$ref": "types.ChromeSetting",
+             "value": ["searchSuggestEnabled", {"type":"boolean"}],
+--- components/password_manager/core/browser/leak_detection_delegate.cc.orig
++++ components/password_manager/core/browser/leak_detection_delegate.cc
+@@ -22,7 +22,6 @@
+ #include "components/password_manager/core/common/password_manager_features.h"
+ #include "components/password_manager/core/common/password_manager_pref_names.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "services/network/public/cpp/shared_url_loader_factory.h"
+ 
+ namespace password_manager {
+@@ -169,28 +168,7 @@ void LeakDetectionDelegate::OnError(Leak
+ 
+ bool CanStartLeakCheck(const PrefService& prefs,
+                        const PasswordManagerClient* client) {
+-  const bool is_leak_protection_on =
+-      prefs.GetBoolean(password_manager::prefs::kPasswordLeakDetectionEnabled);
+-
+-  // Leak detection can only start if:
+-  // 1. The user has not opted out and Safe Browsing is turned on, or
+-  // 2. The user is an enhanced protection user
+-  safe_browsing::SafeBrowsingState sb_state =
+-      safe_browsing::GetSafeBrowsingState(prefs);
+-  switch (sb_state) {
+-    case safe_browsing::SafeBrowsingState::NO_SAFE_BROWSING:
+-      LogString(client, Logger::STRING_LEAK_DETECTION_DISABLED_SAFE_BROWSING);
+-      return false;
+-    case safe_browsing::SafeBrowsingState::STANDARD_PROTECTION:
+-      if (!is_leak_protection_on)
+-        LogString(client, Logger::STRING_LEAK_DETECTION_DISABLED_FEATURE);
+-      return is_leak_protection_on;
+-    case safe_browsing::SafeBrowsingState::ENHANCED_PROTECTION:
+-      // feature is on.
+-      break;
+-  }
+-
+-  return true;
++  return false;
+ }
+ 
+ }  // namespace password_manager
+--- components/password_manager/core/browser/password_bubble_experiment.cc.orig
++++ components/password_manager/core/browser/password_bubble_experiment.cc
+@@ -18,7 +18,6 @@
+ #include "components/prefs/pref_registry_simple.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/public/base/signin_buildflags.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/sync/driver/sync_service.h"
+ #include "components/sync/driver/sync_user_settings.h"
+ 
+--- components/password_manager/core/browser/password_reuse_detector.cc.orig
++++ components/password_manager/core/browser/password_reuse_detector.cc
+@@ -15,7 +15,6 @@
+ #include "components/password_manager/core/browser/password_reuse_detector_consumer.h"
+ #include "components/password_manager/core/browser/password_store_consumer.h"
+ #include "components/password_manager/core/browser/psl_matching_helper.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "google_apis/gaia/gaia_auth_util.h"
+ #include "google_apis/gaia/gaia_urls.h"
+ #include "url/origin.h"
+@@ -205,9 +204,7 @@ PasswordReuseDetector::CheckNonGaiaEnter
+   // Skips password reuse check if |domain| matches enterprise login URL or
+   // enterprise change password URL.
+   GURL page_url(domain);
+-  if (enterprise_password_urls_.has_value() &&
+-      safe_browsing::MatchesURLList(page_url,
+-                                    enterprise_password_urls_.value())) {
++  if (enterprise_password_urls_.has_value()) {
+     return absl::nullopt;
+   }
+ 
+--- components/password_manager/core/browser/password_reuse_manager_impl.cc.orig
++++ components/password_manager/core/browser/password_reuse_manager_impl.cc
+@@ -9,7 +9,6 @@
+ #include "components/password_manager/core/browser/password_store_signin_notifier.h"
+ #include "components/password_manager/core/common/password_manager_features.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ 
+ namespace password_manager {
+ 
+@@ -318,20 +317,6 @@ void PasswordReuseManagerImpl::ScheduleP
+ 
+ void PasswordReuseManagerImpl::ScheduleEnterprisePasswordURLUpdate() {
+   DCHECK(main_task_runner_->RunsTasksInCurrentSequence());
+-
+-  if (!prefs_)
+-    return;
+-  std::vector<GURL> enterprise_login_urls;
+-  safe_browsing::GetPasswordProtectionLoginURLsPref(*prefs_,
+-                                                    &enterprise_login_urls);
+-  GURL enterprise_change_password_url =
+-      safe_browsing::GetPasswordProtectionChangePasswordURLPref(*prefs_);
+-  if (!reuse_detector_)
+-    return;
+-  ScheduleTask(base::BindOnce(&PasswordReuseDetector::UseEnterprisePasswordURLs,
+-                              base::Unretained(reuse_detector_),
+-                              std::move(enterprise_login_urls),
+-                              std::move(enterprise_change_password_url)));
+ }
+ 
+ void PasswordReuseManagerImpl::OnGetPasswordStoreResults(
+--- components/password_manager/core/browser/password_store.cc.orig
++++ components/password_manager/core/browser/password_store.cc
+@@ -39,7 +39,6 @@
+ #include "components/password_manager/core/common/password_manager_features.h"
+ #include "components/password_manager/core/common/password_manager_pref_names.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/sync/model/proxy_model_type_controller_delegate.h"
+ 
+ namespace password_manager {
+--- components/password_manager/core/browser/password_sync_util.cc.orig
++++ components/password_manager/core/browser/password_sync_util.cc
+@@ -8,7 +8,6 @@
+ #include "build/build_config.h"
+ #include "components/password_manager/core/browser/password_form.h"
+ #include "components/password_manager/core/common/password_manager_features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/sync/base/user_selectable_type.h"
+ #include "components/sync/driver/sync_user_settings.h"
+@@ -88,11 +87,6 @@ bool IsGaiaCredentialPage(const std::str
+ 
+ bool ShouldSaveEnterprisePasswordHash(const PasswordForm& form,
+                                       const PrefService& prefs) {
+-  if (base::FeatureList::IsEnabled(features::kPasswordReuseDetectionEnabled)) {
+-    return safe_browsing::MatchesPasswordProtectionLoginURL(form.url, prefs) ||
+-           safe_browsing::MatchesPasswordProtectionChangePasswordURL(form.url,
+-                                                                     prefs);
+-  }
+   return false;
+ }
+ 
+--- components/password_manager/core/browser/sync_credentials_filter_unittest.cc.orig
++++ components/password_manager/core/browser/sync_credentials_filter_unittest.cc
+@@ -29,7 +29,6 @@
+ #include "components/password_manager/core/common/password_manager_features.h"
+ #include "components/prefs/pref_registry_simple.h"
+ #include "components/prefs/testing_pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+ 
+ namespace password_manager {
+--- components/safe_browsing/content/browser/base_blocking_page.cc.orig
++++ components/safe_browsing/content/browser/base_blocking_page.cc
+@@ -13,7 +13,6 @@
+ #include "base/time/time.h"
+ #include "components/safe_browsing/content/browser/safe_browsing_controller_client.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/security_interstitial_controller_client.h"
+ #include "components/security_interstitials/content/settings_page_helper.h"
+ #include "components/security_interstitials/content/unsafe_resource_util.h"
+--- components/safe_browsing/content/browser/client_side_detection_service.cc.orig
++++ components/safe_browsing/content/browser/client_side_detection_service.cc
+@@ -28,7 +28,6 @@
+ #include "components/safe_browsing/core/common/features.h"
+ #include "components/safe_browsing/core/common/proto/client_model.pb.h"
+ #include "components/safe_browsing/core/common/proto/csd.pb.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/safe_browsing/core/common/safebrowsing_constants.h"
+ #include "components/safe_browsing/core/common/utils.h"
+ #include "content/public/browser/browser_task_traits.h"
+--- components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.cc.orig
++++ components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.cc
+@@ -20,7 +20,6 @@
+ #include "components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager_util.h"
+ #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/safe_browsing/core/common/utils.h"
+ #include "components/sessions/content/session_tab_helper.h"
+ #include "content/public/browser/navigation_details.h"
+@@ -306,7 +305,7 @@ GURL SafeBrowsingNavigationObserverManag
+ bool SafeBrowsingNavigationObserverManager::IsEnabledAndReady(
+     PrefService* prefs,
+     bool has_safe_browsing_service) {
+-  return IsSafeBrowsingEnabled(*prefs) && has_safe_browsing_service;
++  return false;
+ }
+ 
+ // static
+--- components/safe_browsing/content/browser/triggers/suspicious_site_trigger_unittest.cc.orig
++++ components/safe_browsing/content/browser/triggers/suspicious_site_trigger_unittest.cc
+@@ -11,7 +11,6 @@
+ #include "build/build_config.h"
+ #include "components/prefs/testing_pref_service.h"
+ #include "components/safe_browsing/content/browser/triggers/mock_trigger_manager.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "content/public/test/browser_task_environment.h"
+ #include "content/public/test/navigation_simulator.h"
+ #include "content/public/test/test_renderer_host.h"
+--- components/safe_browsing/content/browser/triggers/trigger_manager.cc.orig
++++ components/safe_browsing/content/browser/triggers/trigger_manager.cc
+@@ -12,7 +12,6 @@
+ #include "components/safe_browsing/content/browser/base_ui_manager.h"
+ #include "components/safe_browsing/content/browser/threat_details.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/core/unsafe_resource.h"
+ #include "content/public/browser/browser_context.h"
+ #include "content/public/browser/browser_thread.h"
+@@ -85,16 +84,16 @@ SBErrorOptions TriggerManager::GetSBErro
+     const PrefService& pref_service,
+     content::WebContents* web_contents) {
+   return SBErrorOptions(/*is_main_frame_load_blocked=*/false,
+-                        IsExtendedReportingOptInAllowed(pref_service),
++                        /*IsExtendedReportingOptInAllowed(pref_service)*/false,
+                         web_contents->GetBrowserContext()->IsOffTheRecord(),
+-                        IsExtendedReportingEnabled(pref_service),
+-                        IsExtendedReportingPolicyManaged(pref_service),
+-                        IsEnhancedProtectionEnabled(pref_service),
++                        /*IsExtendedReportingEnabled(pref_service)*/false,
++                        /*IsExtendedReportingPolicyManaged(pref_service)*/false,
++                        /*IsEnhancedProtectionEnabled(pref_service)*/false,
+                         /*is_proceed_anyway_disabled=*/false,
+                         /*should_open_links_in_new_tab=*/false,
+                         /*always_show_back_to_safety=*/true,
+-                        /*is_enhanced_protection_message_enabled=*/true,
+-                        IsSafeBrowsingPolicyManaged(pref_service),
++                        /*is_enhanced_protection_message_enabled=*/false,
++                        /*IsSafeBrowsingPolicyManaged(pref_service)*/false,
+                         /*help_center_article_link=*/std::string());
+ }
+ 
+--- components/safe_browsing/content/browser/triggers/trigger_throttler.cc.orig
++++ components/safe_browsing/content/browser/triggers/trigger_throttler.cc
+@@ -197,28 +197,6 @@ void TriggerThrottler::LoadTriggerEvents
+   trigger_events_.clear();
+   if (!local_state_prefs_)
+     return;
+-
+-  const base::DictionaryValue* event_dict = local_state_prefs_->GetDictionary(
+-      prefs::kSafeBrowsingTriggerEventTimestamps);
+-  for (auto trigger_pair : event_dict->DictItems()) {
+-    // Check that the first item in the pair is convertible to a trigger type
+-    // and that the second item is a list.
+-    int trigger_type_int;
+-    if (!base::StringToInt(trigger_pair.first, &trigger_type_int) ||
+-        trigger_type_int < static_cast<int>(TriggerType::kMinTriggerType) ||
+-        trigger_type_int > static_cast<int>(TriggerType::kMaxTriggerType)) {
+-      continue;
+-    }
+-    if (!trigger_pair.second.is_list())
+-      continue;
+-
+-    const TriggerType trigger_type = static_cast<TriggerType>(trigger_type_int);
+-    for (const auto& timestamp : trigger_pair.second.GetList()) {
+-      if (timestamp.is_double())
+-        trigger_events_[trigger_type].push_back(
+-            base::Time::FromDoubleT(timestamp.GetDouble()));
+-    }
+-  }
+ }
+ 
+ void TriggerThrottler::WriteTriggerEventsToPref() {
+@@ -234,9 +212,6 @@ void TriggerThrottler::WriteTriggerEvent
+       pref_timestamps->Append(base::Value(timestamp.ToDoubleT()));
+     }
+   }
+-
+-  local_state_prefs_->Set(prefs::kSafeBrowsingTriggerEventTimestamps,
+-                          trigger_dict);
+ }
+ 
+ size_t TriggerThrottler::GetDailyQuotaForTrigger(
+--- components/safe_browsing/content/browser/triggers/trigger_throttler_unittest.cc.orig
++++ components/safe_browsing/content/browser/triggers/trigger_throttler_unittest.cc
+@@ -9,7 +9,6 @@
+ #include "base/test/simple_test_clock.h"
+ #include "components/prefs/testing_pref_service.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "testing/gmock/include/gmock/gmock.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+ 
+--- components/safe_browsing/content/browser/ui_manager.cc.orig
++++ components/safe_browsing/content/browser/ui_manager.cc
+@@ -18,7 +18,6 @@
+ #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
+ #include "components/safe_browsing/core/browser/ping_manager.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/security_interstitial_tab_helper.h"
+ #include "components/security_interstitials/content/unsafe_resource_util.h"
+ #include "components/security_interstitials/core/unsafe_resource.h"
+--- components/safe_browsing/content/browser/ui_manager_unittest.cc.orig
++++ components/safe_browsing/content/browser/ui_manager_unittest.cc
+@@ -14,7 +14,6 @@
+ #include "components/safe_browsing/content/browser/safe_browsing_controller_client.h"
+ #include "components/safe_browsing/content/browser/ui_manager.h"
+ #include "components/safe_browsing/core/browser/db/util.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/security_interstitial_controller_client.h"
+ #include "components/security_interstitials/content/settings_page_helper.h"
+ #include "components/security_interstitials/content/unsafe_resource_util.h"
+--- components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc.orig
++++ components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc
+@@ -32,7 +32,6 @@
+ #include "components/safe_browsing/core/browser/referrer_chain_provider.h"
+ #include "components/safe_browsing/core/common/features.h"
+ #include "components/safe_browsing/core/common/proto/csd.pb.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "services/network/public/mojom/cookie_manager.mojom.h"
+ #if BUILDFLAG(FULL_SAFE_BROWSING)
+ #include "components/enterprise/common/proto/connectors.pb.h"
+@@ -2035,18 +2034,13 @@ void SafeBrowsingUIHandler::GetPrefs(con
+   AllowJavascript();
+   DCHECK(!args->GetList().empty());
+   std::string callback_id = args->GetList()[0].GetString();
+-  ResolveJavascriptCallback(base::Value(callback_id),
+-                            safe_browsing::GetSafeBrowsingPreferencesList(
+-                                user_prefs::UserPrefs::Get(browser_context_)));
++  ResolveJavascriptCallback(base::Value(callback_id), base::ListValue());
+ }
+ 
+ void SafeBrowsingUIHandler::GetPolicies(const base::ListValue* args) {
+   AllowJavascript();
+   DCHECK(!args->GetList().empty());
+   std::string callback_id = args->GetList()[0].GetString();
+-  ResolveJavascriptCallback(base::Value(callback_id),
+-                            safe_browsing::GetSafeBrowsingPoliciesList(
+-                                user_prefs::UserPrefs::Get(browser_context_)));
+ }
+ 
+ void SafeBrowsingUIHandler::GetCookie(const base::ListValue* args) {
+--- components/safe_browsing/core/browser/db/hit_report.h.orig
++++ components/safe_browsing/core/browser/db/hit_report.h
+@@ -8,7 +8,6 @@
+ #define COMPONENTS_SAFE_BROWSING_CORE_BROWSER_DB_HIT_REPORT_H_
+ 
+ #include "components/safe_browsing/core/browser/db/util.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "url/gurl.h"
+ 
+ namespace safe_browsing {
+@@ -42,7 +41,6 @@ struct HitReport {
+   // NOTE(vakh): Unused at the moment, but may be used later.
+   std::string population_id;
+ 
+-  ExtendedReportingLevel extended_reporting_level;
+   bool is_enhanced_protection = false;
+   bool is_metrics_reporting_active;
+ 
+--- components/safe_browsing/core/browser/db/util.h.orig
++++ components/safe_browsing/core/browser/db/util.h
+@@ -18,7 +18,6 @@
+ #include "base/strings/string_piece.h"
+ #include "base/trace_event/traced_value.h"
+ #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ 
+ namespace safe_browsing {
+ 
+--- components/safe_browsing/core/browser/db/v4_local_database_manager.cc.orig
++++ components/safe_browsing/core/browser/db/v4_local_database_manager.cc
+@@ -337,10 +337,9 @@ const V4LocalDatabaseManager*
+ scoped_refptr<V4LocalDatabaseManager> V4LocalDatabaseManager::Create(
+     const base::FilePath& base_path,
+     scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
+-    scoped_refptr<base::SequencedTaskRunner> io_task_runner,
+-    ExtendedReportingLevelCallback extended_reporting_level_callback) {
++    scoped_refptr<base::SequencedTaskRunner> io_task_runner) {
+   return base::WrapRefCounted(new V4LocalDatabaseManager(
+-      base_path, extended_reporting_level_callback, std::move(ui_task_runner),
++      base_path, std::move(ui_task_runner),
+       std::move(io_task_runner), nullptr));
+ }
+ 
+@@ -363,14 +362,12 @@ void V4LocalDatabaseManager::CollectData
+ 
+ V4LocalDatabaseManager::V4LocalDatabaseManager(
+     const base::FilePath& base_path,
+-    ExtendedReportingLevelCallback extended_reporting_level_callback,
+     scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
+     scoped_refptr<base::SequencedTaskRunner> io_task_runner,
+     scoped_refptr<base::SequencedTaskRunner> task_runner_for_tests)
+     : SafeBrowsingDatabaseManager(std::move(ui_task_runner),
+                                   std::move(io_task_runner)),
+       base_path_(base_path),
+-      extended_reporting_level_callback_(extended_reporting_level_callback),
+       list_infos_(GetListInfos()),
+       task_runner_(task_runner_for_tests
+                        ? task_runner_for_tests
+@@ -1137,8 +1134,7 @@ void V4LocalDatabaseManager::SetupUpdate
+                           weak_factory_.GetWeakPtr());
+ 
+   v4_update_protocol_manager_ = V4UpdateProtocolManager::Create(
+-      url_loader_factory, config, update_callback,
+-      extended_reporting_level_callback_);
++      url_loader_factory, config, update_callback);
+ }
+ 
+ void V4LocalDatabaseManager::UpdateRequestCompleted(
+--- components/safe_browsing/core/browser/db/v4_local_database_manager.h.orig
++++ components/safe_browsing/core/browser/db/v4_local_database_manager.h
+@@ -37,8 +37,7 @@ class V4LocalDatabaseManager : public Sa
+   static scoped_refptr<V4LocalDatabaseManager> Create(
+       const base::FilePath& base_path,
+       scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
+-      scoped_refptr<base::SequencedTaskRunner> io_task_runner,
+-      ExtendedReportingLevelCallback extended_reporting_level_callback);
++      scoped_refptr<base::SequencedTaskRunner> io_task_runner);
+ 
+   V4LocalDatabaseManager(const V4LocalDatabaseManager&) = delete;
+   V4LocalDatabaseManager& operator=(const V4LocalDatabaseManager&) = delete;
+@@ -108,7 +107,6 @@ class V4LocalDatabaseManager : public Sa
+   // Must be initialized by calling StartOnIOThread() before using.
+   V4LocalDatabaseManager(
+       const base::FilePath& base_path,
+-      ExtendedReportingLevelCallback extended_reporting_level_callback,
+       scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
+       scoped_refptr<base::SequencedTaskRunner> io_task_runner,
+       scoped_refptr<base::SequencedTaskRunner> task_runner_for_tests);
+@@ -367,10 +365,6 @@ class V4LocalDatabaseManager : public Sa
+   // ready to process next update.
+   DatabaseUpdatedCallback db_updated_callback_;
+ 
+-  // Callback to get the current extended reporting level. Needed by the update
+-  // manager.
+-  ExtendedReportingLevelCallback extended_reporting_level_callback_;
+-
+   // The client_state of each list currently being synced. This is updated each
+   // time a database update completes, and used to send list client_state
+   // information in the full hash request.
+--- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig
++++ components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
+@@ -88,7 +88,6 @@ void SetSbV4UrlPrefixForTesting(const ch
+ 
+ std::string GetReportUrl(const V4ProtocolConfig& config,
+                          const std::string& method,
+-                         const ExtendedReportingLevel* reporting_level,
+                          const bool is_enhanced_protection) {
+   std::string url = base::StringPrintf(
+       "%s/%s?client=%s&appver=%s&pver=4.0", kSbReportsURLPrefix, method.c_str(),
+@@ -98,8 +97,6 @@ std::string GetReportUrl(const V4Protoco
+     base::StringAppendF(&url, "&key=%s",
+                         net::EscapeQueryParamValue(api_key, true).c_str());
+   }
+-  if (reporting_level)
+-    url.append(base::StringPrintf("&ext=%d", *reporting_level));
+   if (is_enhanced_protection)
+     url.append(base::StringPrintf("&enh=%d", is_enhanced_protection));
+   return url;
+--- components/safe_browsing/core/browser/db/v4_protocol_manager_util.h.orig
++++ components/safe_browsing/core/browser/db/v4_protocol_manager_util.h
+@@ -18,10 +18,11 @@
+ #include <vector>
+ 
+ #include "base/containers/flat_set.h"
++#include "base/files/file_path.h"
+ #include "base/gtest_prod_util.h"
+ #include "base/strings/string_piece.h"
++#include "base/time/time.h"
+ #include "components/safe_browsing/core/browser/db/safebrowsing.pb.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "url/gurl.h"
+ 
+ namespace net {
+@@ -88,7 +89,6 @@ V4ProtocolConfig GetV4ProtocolConfig(con
+ std::string GetReportUrl(
+     const V4ProtocolConfig& config,
+     const std::string& method,
+-    const ExtendedReportingLevel* reporting_level = nullptr,
+     const bool is_enhanced_protection = false);
+ 
+ // Different types of threats that SafeBrowsing protects against. This is the
+--- components/safe_browsing/core/browser/db/v4_update_protocol_manager.cc.orig
++++ components/safe_browsing/core/browser/db/v4_update_protocol_manager.cc
+@@ -78,19 +78,8 @@ static const int kV4TimerStartIntervalSe
+ // Maximum time, in seconds, to wait for a response to an update request.
+ static const int kV4TimerUpdateWaitSecMax = 15 * 60;  // 15 minutes
+ 
+-ChromeClientInfo::SafeBrowsingReportingPopulation GetReportingLevelProtoValue(
+-    ExtendedReportingLevel reporting_level) {
+-  switch (reporting_level) {
+-    case SBER_LEVEL_OFF:
+-      return ChromeClientInfo::OPT_OUT;
+-    case SBER_LEVEL_LEGACY:
+-      return ChromeClientInfo::EXTENDED;
+-    case SBER_LEVEL_SCOUT:
+-      return ChromeClientInfo::SCOUT;
+-    default:
+-      NOTREACHED() << "Unexpected reporting_level!";
+-      return ChromeClientInfo::UNSPECIFIED;
+-  }
++ChromeClientInfo::SafeBrowsingReportingPopulation GetReportingLevelProtoValue() {
++  return ChromeClientInfo::OPT_OUT;
+ }
+ 
+ // The default V4UpdateProtocolManagerFactory.
+@@ -108,12 +97,10 @@ class V4UpdateProtocolManagerFactoryImpl
+   std::unique_ptr<V4UpdateProtocolManager> CreateProtocolManager(
+       scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
+       const V4ProtocolConfig& config,
+-      V4UpdateCallback update_callback,
+-      ExtendedReportingLevelCallback extended_reporting_level_callback)
++      V4UpdateCallback update_callback)
+       override {
+     return base::WrapUnique(
+-        new V4UpdateProtocolManager(url_loader_factory, config, update_callback,
+-                                    extended_reporting_level_callback));
++        new V4UpdateProtocolManager(url_loader_factory, config, update_callback));
+   }
+ };
+ 
+@@ -126,14 +113,12 @@ V4UpdateProtocolManagerFactory* V4Update
+ std::unique_ptr<V4UpdateProtocolManager> V4UpdateProtocolManager::Create(
+     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
+     const V4ProtocolConfig& config,
+-    V4UpdateCallback update_callback,
+-    ExtendedReportingLevelCallback extended_reporting_level_callback) {
++    V4UpdateCallback update_callback) {
+   if (!factory_) {
+     factory_ = new V4UpdateProtocolManagerFactoryImpl();
+   }
+   return factory_->CreateProtocolManager(url_loader_factory, config,
+-                                         update_callback,
+-                                         extended_reporting_level_callback);
++                                         update_callback);
+ }
+ 
+ void V4UpdateProtocolManager::ResetUpdateErrors() {
+@@ -144,8 +129,7 @@ void V4UpdateProtocolManager::ResetUpdat
+ V4UpdateProtocolManager::V4UpdateProtocolManager(
+     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
+     const V4ProtocolConfig& config,
+-    V4UpdateCallback update_callback,
+-    ExtendedReportingLevelCallback extended_reporting_level_callback)
++    V4UpdateCallback update_callback)
+     : update_error_count_(0),
+       update_back_off_mult_(1),
+       next_update_interval_(
+@@ -153,8 +137,7 @@ V4UpdateProtocolManager::V4UpdateProtoco
+                                       kV4TimerStartIntervalSecMax))),
+       config_(config),
+       url_loader_factory_(url_loader_factory),
+-      update_callback_(update_callback),
+-      extended_reporting_level_callback_(extended_reporting_level_callback) {
++      update_callback_(update_callback) {
+   // Do not auto-schedule updates. Let the owner (V4LocalDatabaseManager) do it
+   // when it is ready to process updates.
+ }
+@@ -249,11 +232,6 @@ std::string V4UpdateProtocolManager::Get
+         RICE);
+   }
+ 
+-  if (!extended_reporting_level_callback_.is_null()) {
+-    request.mutable_chrome_client_info()->set_reporting_population(
+-        GetReportingLevelProtoValue(extended_reporting_level_callback_.Run()));
+-  }
+-
+   V4ProtocolManagerUtil::SetClientInfoFromConfig(request.mutable_client(),
+                                                  config_);
+ 
+--- components/safe_browsing/core/browser/db/v4_update_protocol_manager.h.orig
++++ components/safe_browsing/core/browser/db/v4_update_protocol_manager.h
+@@ -24,7 +24,6 @@
+ #include "components/safe_browsing/core/browser/db/util.h"
+ #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
+ #include "components/safe_browsing/core/common/proto/webui.pb.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "third_party/abseil-cpp/absl/types/optional.h"
+ 
+ class GURL;
+@@ -45,9 +44,6 @@ class V4UpdateProtocolManagerFactory;
+ using V4UpdateCallback =
+     base::RepeatingCallback<void(std::unique_ptr<ParsedServerResponse>)>;
+ 
+-using ExtendedReportingLevelCallback =
+-    base::RepeatingCallback<ExtendedReportingLevel()>;
+-
+ class V4UpdateProtocolManager {
+  public:
+   V4UpdateProtocolManager(const V4UpdateProtocolManager&) = delete;
+@@ -65,8 +61,7 @@ class V4UpdateProtocolManager {
+   static std::unique_ptr<V4UpdateProtocolManager> Create(
+       scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
+       const V4ProtocolConfig& config,
+-      V4UpdateCallback update_callback,
+-      ExtendedReportingLevelCallback extended_reporting_level_callback);
++      V4UpdateCallback update_callback);
+ 
+   void OnURLLoaderComplete(std::unique_ptr<std::string> response_body);
+ 
+@@ -88,8 +83,7 @@ class V4UpdateProtocolManager {
+   V4UpdateProtocolManager(
+       scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
+       const V4ProtocolConfig& config,
+-      V4UpdateCallback update_callback,
+-      ExtendedReportingLevelCallback extended_reporting_level_callback);
++      V4UpdateCallback update_callback);
+ 
+  private:
+   FRIEND_TEST_ALL_PREFIXES(V4UpdateProtocolManagerTest,
+@@ -207,8 +201,6 @@ class V4UpdateProtocolManager {
+   // complete.
+   base::OneShotTimer timeout_timer_;
+ 
+-  ExtendedReportingLevelCallback extended_reporting_level_callback_;
+-
+   SEQUENCE_CHECKER(sequence_checker_);
+ };
+ 
+@@ -226,8 +218,7 @@ class V4UpdateProtocolManagerFactory {
+   virtual std::unique_ptr<V4UpdateProtocolManager> CreateProtocolManager(
+       scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
+       const V4ProtocolConfig& config,
+-      V4UpdateCallback update_callback,
+-      ExtendedReportingLevelCallback extended_reporting_level_callback) = 0;
++      V4UpdateCallback update_callback) = 0;
+ };
+ 
+ }  // namespace safe_browsing
+--- components/safe_browsing/core/browser/password_protection/password_protection_service_base.h.orig
++++ components/safe_browsing/core/browser/password_protection/password_protection_service_base.h
+@@ -28,7 +28,6 @@
+ #include "components/safe_browsing/core/browser/safe_browsing_metrics_collector.h"
+ #include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h"
+ #include "components/safe_browsing/core/common/proto/csd.pb.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/sessions/core/session_id.h"
+ #include "components/signin/public/identity_manager/account_info.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+@@ -149,10 +148,6 @@ class PasswordProtectionServiceBase : pu
+   // Returns if the warning UI is enabled.
+   bool IsWarningEnabled(ReusedPasswordAccountType password_type);
+ 
+-  // Returns the pref value of password protection warning trigger.
+-  virtual PasswordProtectionTrigger GetPasswordProtectionWarningTriggerPref(
+-      ReusedPasswordAccountType password_type) const = 0;
+-
+   // If |url| matches Safe Browsing allowlist domains, password protection
+   // change password URL, or password protection login URLs in the enterprise
+   // policy.
+--- components/safe_browsing/core/browser/ping_manager.cc.orig
++++ components/safe_browsing/core/browser/ping_manager.cc
+@@ -141,7 +141,7 @@ GURL PingManager::SafeBrowsingHitUrl(
+          hit_report.threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING ||
+          hit_report.threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE);
+   std::string url =
+-      GetReportUrl(config_, "report", &hit_report.extended_reporting_level,
++      GetReportUrl(config_, "report",
+                    hit_report.is_enhanced_protection);
+   std::string threat_list = "none";
+   switch (hit_report.threat_type) {
+--- components/safe_browsing/core/browser/realtime/policy_engine.cc.orig
++++ components/safe_browsing/core/browser/realtime/policy_engine.cc
+@@ -8,7 +8,6 @@
+ #include "base/metrics/histogram_macros.h"
+ #include "build/build_config.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/safe_browsing/core/common/utils.h"
+ #include "components/unified_consent/pref_names.h"
+ #include "components/user_prefs/user_prefs.h"
+@@ -35,7 +34,7 @@ bool RealTimePolicyEngine::IsUserMbbOpte
+ 
+ // static
+ bool RealTimePolicyEngine::IsUserEpOptedIn(PrefService* pref_service) {
+-  return IsEnhancedProtectionEnabled(*pref_service);
++  return false;
+ }
+ 
+ // static
+@@ -81,9 +80,7 @@ bool RealTimePolicyEngine::CanPerformEnt
+     return false;
+   }
+ 
+-  return pref_service->GetInteger(
+-             prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode) ==
+-         REAL_TIME_CHECK_FOR_MAINFRAME_ENABLED;
++  return false;
+ }
+ 
+ // static
+--- components/safe_browsing/core/browser/realtime/url_lookup_service.cc.orig
++++ components/safe_browsing/core/browser/realtime/url_lookup_service.cc
+@@ -19,7 +19,6 @@
+ #include "components/safe_browsing/core/browser/referrer_chain_provider.h"
+ #include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/unified_consent/pref_names.h"
+ #include "net/base/ip_address.h"
+ #include "net/base/load_flags.h"
+@@ -61,10 +60,6 @@ RealTimeUrlLookupService::RealTimeUrlLoo
+       variations_(variations_service) {
+   pref_change_registrar_.Init(pref_service_);
+   pref_change_registrar_.Add(
+-      prefs::kSafeBrowsingEnhanced,
+-      base::BindRepeating(&RealTimeUrlLookupService::OnPrefChanged,
+-                          base::Unretained(this)));
+-  pref_change_registrar_.Add(
+       unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled,
+       base::BindRepeating(&RealTimeUrlLookupService::OnPrefChanged,
+                           base::Unretained(this)));
+@@ -144,7 +139,7 @@ bool RealTimeUrlLookupService::CanSendPa
+ }
+ 
+ bool RealTimeUrlLookupService::CanCheckSubresourceURL() const {
+-  return IsEnhancedProtectionEnabled(*pref_service_);
++  return false;
+ }
+ 
+ bool RealTimeUrlLookupService::CanCheckSafeBrowsingDb() const {
+--- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig
++++ components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
+@@ -16,7 +16,6 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/safe_browsing/core/browser/referrer_chain_provider.h"
+ #include "components/safe_browsing/core/browser/verdict_cache_manager.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/safe_browsing/core/common/safebrowsing_constants.h"
+ #include "components/safe_browsing/core/common/utils.h"
+ #include "net/base/ip_address.h"
+--- components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc.orig
++++ components/safe_browsing/core/browser/safe_browsing_metrics_collector.cc
+@@ -11,13 +11,11 @@
+ #include "base/time/time.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/prefs/scoped_user_pref_update.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ 
+ namespace {
+ 
+ using EventType = safe_browsing::SafeBrowsingMetricsCollector::EventType;
+ using UserState = safe_browsing::SafeBrowsingMetricsCollector::UserState;
+-using SafeBrowsingState = safe_browsing::SafeBrowsingState;
+ 
+ const int kMetricsLoggingIntervalDay = 1;
+ 
+@@ -54,11 +52,6 @@ SafeBrowsingMetricsCollector::SafeBrowsi
+     PrefService* pref_service)
+     : pref_service_(pref_service) {
+   pref_change_registrar_.Init(pref_service_);
+-  pref_change_registrar_.Add(
+-      prefs::kSafeBrowsingEnhanced,
+-      base::BindRepeating(
+-          &SafeBrowsingMetricsCollector::OnEnhancedProtectionPrefChanged,
+-          base::Unretained(this)));
+ }
+ 
+ void SafeBrowsingMetricsCollector::Shutdown() {
+@@ -66,16 +59,6 @@ void SafeBrowsingMetricsCollector::Shutd
+ }
+ 
+ void SafeBrowsingMetricsCollector::StartLogging() {
+-  base::TimeDelta log_interval = base::Days(kMetricsLoggingIntervalDay);
+-  base::Time last_log_time =
+-      base::Time::FromDeltaSinceWindowsEpoch(base::Seconds(
+-          pref_service_->GetInt64(prefs::kSafeBrowsingMetricsLastLogTime)));
+-  base::TimeDelta delay = base::Time::Now() - last_log_time;
+-  if (delay >= log_interval) {
+-    LogMetricsAndScheduleNextLogging();
+-  } else {
+-    ScheduleNextLoggingAfterInterval(log_interval - delay);
+-  }
+ }
+ 
+ void SafeBrowsingMetricsCollector::LogMetricsAndScheduleNextLogging() {
+@@ -83,9 +66,6 @@ void SafeBrowsingMetricsCollector::LogMe
+   LogDailyEventMetrics();
+   RemoveOldEventsFromPref();
+ 
+-  pref_service_->SetInt64(
+-      prefs::kSafeBrowsingMetricsLastLogTime,
+-      base::Time::Now().ToDeltaSinceWindowsEpoch().InSeconds());
+   ScheduleNextLoggingAfterInterval(base::Days(kMetricsLoggingIntervalDay));
+ }
+ 
+@@ -98,181 +78,40 @@ void SafeBrowsingMetricsCollector::Sched
+ }
+ 
+ void SafeBrowsingMetricsCollector::LogDailyOptInMetrics() {
+-  base::UmaHistogramEnumeration("SafeBrowsing.Pref.Daily.SafeBrowsingState",
+-                                GetSafeBrowsingState(*pref_service_));
+-  base::UmaHistogramBoolean("SafeBrowsing.Pref.Daily.Extended",
+-                            IsExtendedReportingEnabled(*pref_service_));
+-  base::UmaHistogramBoolean("SafeBrowsing.Pref.Daily.SafeBrowsingModeManaged",
+-                            IsSafeBrowsingPolicyManaged(*pref_service_));
+ }
+ 
+ void SafeBrowsingMetricsCollector::LogDailyEventMetrics() {
+-  SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_);
+-  if (sb_state == SafeBrowsingState::NO_SAFE_BROWSING) {
+-    return;
+-  }
+-  UserState user_state = GetUserState();
+-
+-  int total_bypass_count = 0;
+-  int total_security_sensitive_event_count = 0;
+-  for (int event_type_int = 0; event_type_int <= EventType::kMaxValue;
+-       event_type_int += 1) {
+-    EventType event_type = static_cast<EventType>(event_type_int);
+-    if (IsBypassEventType(event_type)) {
+-      int bypass_count = GetEventCountSince(user_state, event_type,
+-                                            base::Time::Now() - base::Days(28));
+-      base::UmaHistogramCounts100("SafeBrowsing.Daily.BypassCountLast28Days." +
+-                                      GetUserStateMetricSuffix(user_state) +
+-                                      "." +
+-                                      GetEventTypeMetricSuffix(event_type),
+-                                  bypass_count);
+-      total_bypass_count += bypass_count;
+-    }
+-    if (IsSecuritySensitiveEventType(event_type)) {
+-      int security_sensitive_event_count = GetEventCountSince(
+-          user_state, event_type, base::Time::Now() - base::Days(28));
+-      base::UmaHistogramCounts100(
+-          "SafeBrowsing.Daily.SecuritySensitiveCountLast28Days." +
+-              GetUserStateMetricSuffix(user_state) + "." +
+-              GetEventTypeMetricSuffix(event_type),
+-          security_sensitive_event_count);
+-      total_security_sensitive_event_count += security_sensitive_event_count;
+-    }
+-  }
+-  base::UmaHistogramCounts100("SafeBrowsing.Daily.BypassCountLast28Days." +
+-                                  GetUserStateMetricSuffix(user_state) +
+-                                  ".AllEvents",
+-                              total_bypass_count);
+-  base::UmaHistogramCounts100(
+-      "SafeBrowsing.Daily.SecuritySensitiveCountLast28Days." +
+-          GetUserStateMetricSuffix(user_state) + ".AllEvents",
+-      total_security_sensitive_event_count);
+ }
+ 
+ void SafeBrowsingMetricsCollector::RemoveOldEventsFromPref() {
+-  DictionaryPrefUpdate update(pref_service_,
+-                              prefs::kSafeBrowsingEventTimestamps);
+-  base::DictionaryValue* mutable_state_dict = update.Get();
+-  bool is_pref_valid = mutable_state_dict->is_dict();
+-  base::UmaHistogramBoolean("SafeBrowsing.MetricsCollector.IsPrefValid",
+-                            is_pref_valid);
+-  if (!is_pref_valid) {
+-    return;
+-  }
+-
+-  for (auto state_map : mutable_state_dict->DictItems()) {
+-    for (auto event_map : state_map.second.DictItems()) {
+-      event_map.second.EraseListValueIf([&](const auto& timestamp) {
+-        return base::Time::Now() - PrefValueToTime(timestamp) >
+-               base::Days(kEventMaxDurationDay);
+-      });
+-    }
+-  }
+ }
+ 
+ void SafeBrowsingMetricsCollector::AddSafeBrowsingEventToPref(
+     EventType event_type) {
+-  SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_);
+-  // Skip the event if Safe Browsing is disabled.
+-  if (sb_state == SafeBrowsingState::NO_SAFE_BROWSING) {
+-    return;
+-  }
+-
+-  AddSafeBrowsingEventAndUserStateToPref(GetUserState(), event_type);
+ }
+ 
+ absl::optional<base::Time>
+ SafeBrowsingMetricsCollector::GetLatestEventTimestamp(EventType event_type) {
+-  // Events are not logged when Safe Browsing is disabled.
+-  SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_);
+-  if (sb_state == SafeBrowsingState::NO_SAFE_BROWSING) {
+     return absl::nullopt;
+-  }
+-
+-  const absl::optional<Event> event =
+-      GetLatestEventFromEventType(GetUserState(), event_type);
+-  return event ? absl::optional<base::Time>(event.value().timestamp)
+-               : absl::nullopt;
+ }
+ 
+ absl::optional<base::Time>
+ SafeBrowsingMetricsCollector::GetLatestSecuritySensitiveEventTimestamp() {
+-  std::vector<absl::optional<base::Time>> security_sensitive_event_times{
+-      GetLatestEventTimestamp(SECURITY_SENSITIVE_SAFE_BROWSING_INTERSTITIAL),
+-      GetLatestEventTimestamp(SECURITY_SENSITIVE_SSL_INTERSTITIAL),
+-      GetLatestEventTimestamp(SECURITY_SENSITIVE_PASSWORD_PROTECTION),
+-      GetLatestEventTimestamp(SECURITY_SENSITIVE_DOWNLOAD)};
+   absl::optional<base::Time> latest_event_time = absl::nullopt;
+-  for (absl::optional<base::Time> security_sensitive_event_time :
+-       security_sensitive_event_times) {
+-    if (!security_sensitive_event_time) {
+-      continue;
+-    }
+-    if (!latest_event_time ||
+-        (latest_event_time.value() < security_sensitive_event_time.value())) {
+-      latest_event_time = security_sensitive_event_time;
+-    }
+-  }
+   return latest_event_time;
+ }
+ 
+ void SafeBrowsingMetricsCollector::AddSafeBrowsingEventAndUserStateToPref(
+     UserState user_state,
+     EventType event_type) {
+-  DictionaryPrefUpdate update(pref_service_,
+-                              prefs::kSafeBrowsingEventTimestamps);
+-  base::DictionaryValue* mutable_state_dict = update.Get();
+-
+-  base::Value* event_dict =
+-      mutable_state_dict->FindDictKey(UserStateToPrefKey(user_state));
+-  if (!event_dict) {
+-    event_dict =
+-        mutable_state_dict->SetKey(UserStateToPrefKey(user_state),
+-                                   base::Value(base::Value::Type::DICTIONARY));
+-  }
+-
+-  base::Value* timestamps =
+-      event_dict->FindListKey(EventTypeToPrefKey(event_type));
+-  if (!timestamps) {
+-    timestamps = event_dict->SetKey(EventTypeToPrefKey(event_type),
+-                                    base::Value(base::Value::Type::LIST));
+-  }
+-
+-  // Remove the oldest timestamp if the length of the timestamps hits the limit.
+-  while (timestamps->GetList().size() >= kTimestampsMaxLength) {
+-    timestamps->EraseListIter(timestamps->GetList().begin());
+-  }
+-
+-  timestamps->Append(TimeToPrefValue(base::Time::Now()));
+ }
+ 
+ void SafeBrowsingMetricsCollector::OnEnhancedProtectionPrefChanged() {
+-  // Pref changed by policy is not initiated by users, so this case is ignored.
+-  if (IsSafeBrowsingPolicyManaged(*pref_service_)) {
+-    return;
+-  }
+-
+-  if (!pref_service_->GetBoolean(prefs::kSafeBrowsingEnhanced)) {
+-    AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection,
+-                                           EventType::USER_STATE_DISABLED);
+-    int disabled_times_last_week = GetEventCountSince(
+-        UserState::kEnhancedProtection, EventType::USER_STATE_DISABLED,
+-        base::Time::Now() - base::Days(7));
+-    if (disabled_times_last_week <= kEsbDisabledMetricsQuota) {
+-      LogEnhancedProtectionDisabledMetrics();
+-    }
+-  } else {
+-    AddSafeBrowsingEventAndUserStateToPref(UserState::kEnhancedProtection,
+-                                           EventType::USER_STATE_ENABLED);
+-  }
+ }
+ 
+ const base::Value* SafeBrowsingMetricsCollector::GetSafeBrowsingEventDictionary(
+     UserState user_state) {
+-  const base::DictionaryValue* state_dict =
+-      pref_service_->GetDictionary(prefs::kSafeBrowsingEventTimestamps);
+-
+-  return state_dict->FindDictKey(UserStateToPrefKey(user_state));
++  return nullptr;
+ }
+ 
+ absl::optional<SafeBrowsingMetricsCollector::Event>
+@@ -370,20 +209,7 @@ int SafeBrowsingMetricsCollector::GetEve
+ }
+ 
+ UserState SafeBrowsingMetricsCollector::GetUserState() {
+-  if (IsSafeBrowsingPolicyManaged(*pref_service_)) {
+-    return UserState::kManaged;
+-  }
+-
+-  SafeBrowsingState sb_state = GetSafeBrowsingState(*pref_service_);
+-  switch (sb_state) {
+-    case SafeBrowsingState::ENHANCED_PROTECTION:
+-      return UserState::kEnhancedProtection;
+-    case SafeBrowsingState::STANDARD_PROTECTION:
+-      return UserState::kStandardProtection;
+-    case SafeBrowsingState::NO_SAFE_BROWSING:
+-      NOTREACHED() << "Unexpected Safe Browsing state.";
+-      return UserState::kStandardProtection;
+-  }
++  NOTREACHED() << "Unexpected Safe Browsing state.";
+ }
+ 
+ bool SafeBrowsingMetricsCollector::IsBypassEventType(const EventType& type) {
+--- components/safe_browsing/core/common/BUILD.gn.orig
++++ components/safe_browsing/core/common/BUILD.gn
+@@ -6,20 +6,8 @@ import("//build/config/features.gni")
+ import("//components/safe_browsing/buildflags.gni")
+ import("//mojo/public/tools/bindings/mojom.gni")
+ 
+-static_library("safe_browsing_prefs") {
+-  sources = [
+-    "safe_browsing_prefs.cc",
+-    "safe_browsing_prefs.h",
+-  ]
+-
+-  deps = [
+-    ":common",
+-    "//components/pref_registry:pref_registry",
+-    "//components/prefs",
+-    "//net:net",
+-  ]
+-
+-  public_deps = [ "//base" ]
++group("safe_browsing_prefs") {
++  # SafeBrowsing prefs are disabled
+ }
+ 
+ source_set("safe_browsing_policy_handler") {
+--- components/safe_browsing/core/common/safe_browsing_policy_handler.cc.orig
++++ components/safe_browsing/core/common/safe_browsing_policy_handler.cc
+@@ -11,7 +11,6 @@
+ #include "components/policy/policy_constants.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/prefs/pref_value_map.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/strings/grit/components_strings.h"
+ #include "third_party/abseil-cpp/absl/types/optional.h"
+ 
+@@ -172,34 +171,14 @@ void SafeBrowsingPolicyHandler::ApplyPol
+ 
+   if (!value.has_value())
+     return;
+-
+-  switch (value.value()) {
+-    case ProtectionLevel::kNoProtection:
+-      prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false);
+-      prefs->SetBoolean(prefs::kSafeBrowsingEnhanced, false);
+-      return;
+-    case ProtectionLevel::kStandardProtection:
+-      prefs->SetBoolean(prefs::kSafeBrowsingEnabled, true);
+-      prefs->SetBoolean(prefs::kSafeBrowsingEnhanced, false);
+-      return;
+-    case ProtectionLevel::kEnhancedProtection:
+-      // |kSafeBrowsingEnhanced| is enabled, but so is
+-      // |kSafeBrowsingEnabled| because the extensions API should see Safe
+-      // Browsing as enabled. See https://crbug.com/1064722 for more background.
+-      prefs->SetBoolean(prefs::kSafeBrowsingEnabled, true);
+-      prefs->SetBoolean(prefs::kSafeBrowsingEnhanced, true);
+-      return;
+-  }
+ }
+ 
+ // static
+ SafeBrowsingPolicyHandler::ProtectionLevel
+ SafeBrowsingPolicyHandler::GetSafeBrowsingProtectionLevel(
+     const PrefService* pref_sevice) {
+-  bool safe_browsing_enhanced =
+-      pref_sevice->GetBoolean(prefs::kSafeBrowsingEnhanced);
+-  bool safe_browsing_enabled =
+-      pref_sevice->GetBoolean(prefs::kSafeBrowsingEnabled);
++  bool safe_browsing_enhanced = false;
++  bool safe_browsing_enabled = false;
+ 
+   if (safe_browsing_enhanced)
+     return ProtectionLevel::kEnhancedProtection;
+@@ -213,10 +192,8 @@ SafeBrowsingPolicyHandler::GetSafeBrowsi
+ // static
+ bool SafeBrowsingPolicyHandler::IsSafeBrowsingProtectionLevelSetByPolicy(
+     const PrefService* pref_service) {
+-  bool is_safe_browsing_enabled_managed =
+-      pref_service->IsManagedPreference(prefs::kSafeBrowsingEnabled);
+-  bool is_safe_browsing_enhanced_managed =
+-      pref_service->IsManagedPreference(prefs::kSafeBrowsingEnhanced);
++  bool is_safe_browsing_enabled_managed = false;
++  bool is_safe_browsing_enhanced_managed = false;
+   DCHECK_EQ(is_safe_browsing_enabled_managed,
+             is_safe_browsing_enhanced_managed);
+   return is_safe_browsing_enabled_managed && is_safe_browsing_enhanced_managed;
+--- components/safe_browsing/core/common/safe_browsing_prefs_unittest.cc.orig
++++ components/safe_browsing/core/common/safe_browsing_prefs_unittest.cc
+@@ -12,7 +12,6 @@
+ #include "components/prefs/pref_registry_simple.h"
+ #include "components/prefs/testing_pref_service.h"
+ #include "components/safe_browsing/core/common/features.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+ #include "url/gurl.h"
+ 
+--- components/safety_check/safety_check.cc.orig
++++ components/safety_check/safety_check.cc
+@@ -4,26 +4,9 @@
+ 
+ #include "components/safety_check/safety_check.h"
+ 
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+-
+ namespace safety_check {
+ 
+ SafeBrowsingStatus CheckSafeBrowsing(PrefService* pref_service) {
+-  const PrefService::Preference* enabled_pref =
+-      pref_service->FindPreference(prefs::kSafeBrowsingEnabled);
+-  bool is_sb_enabled = pref_service->GetBoolean(prefs::kSafeBrowsingEnabled);
+-  bool is_sb_managed = enabled_pref->IsManaged();
+-
+-  if (is_sb_enabled && pref_service->GetBoolean(prefs::kSafeBrowsingEnhanced))
+-    return SafeBrowsingStatus::kEnabledEnhanced;
+-  if (is_sb_enabled && is_sb_managed)
+-    return SafeBrowsingStatus::kEnabledStandard;
+-  if (is_sb_enabled && !is_sb_managed)
+-    return SafeBrowsingStatus::kEnabledStandardAvailableEnhanced;
+-  if (is_sb_managed)
+-    return SafeBrowsingStatus::kDisabledByAdmin;
+-  if (enabled_pref->IsExtensionControlled())
+-    return SafeBrowsingStatus::kDisabledByExtension;
+   return SafeBrowsingStatus::kDisabled;
+ }
+ 
+--- components/security_interstitials/content/bad_clock_blocking_page.cc.orig
++++ components/security_interstitials/content/bad_clock_blocking_page.cc
+@@ -7,7 +7,6 @@
+ #include <utility>
+ 
+ #include "base/strings/string_number_conversions.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/cert_report_helper.h"
+ #include "components/security_interstitials/content/security_interstitial_controller_client.h"
+ #include "components/security_interstitials/content/security_interstitial_page.h"
+--- components/security_interstitials/content/captive_portal_blocking_page.cc.orig
++++ components/security_interstitials/content/captive_portal_blocking_page.cc
+@@ -15,7 +15,6 @@
+ #include "build/build_config.h"
+ #include "components/captive_portal/core/captive_portal_detector.h"
+ #include "components/captive_portal/core/captive_portal_metrics.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/cert_report_helper.h"
+ #include "components/security_interstitials/content/security_interstitial_controller_client.h"
+ #include "components/security_interstitials/content/ssl_cert_reporter.h"
+--- components/security_interstitials/content/cert_report_helper.cc.orig
++++ components/security_interstitials/content/cert_report_helper.cc
+@@ -14,7 +14,6 @@
+ #include "build/branding_buildflags.h"
+ #include "build/build_config.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/ssl_cert_reporter.h"
+ #include "components/security_interstitials/core/controller_client.h"
+ #include "components/security_interstitials/core/metrics_helper.h"
+@@ -86,8 +85,7 @@ void CertReportHelper::PopulateExtendedR
+     return;
+ 
+   load_time_data->SetBoolKey(
+-      security_interstitials::kBoxChecked,
+-      safe_browsing::IsExtendedReportingEnabled(*GetPrefs(web_contents_)));
++      security_interstitials::kBoxChecked, false);
+ 
+   load_time_data->SetStringKey(
+       security_interstitials::kOptInLink,
+@@ -124,14 +122,8 @@ void CertReportHelper::HandleReportingCo
+     PrefService* pref_service) {
+   switch (command) {
+     case security_interstitials::CMD_DO_REPORT:
+-      safe_browsing::SetExtendedReportingPrefAndMetric(
+-          pref_service, true, /* value */
+-          safe_browsing::SBER_OPTIN_SITE_SECURITY_INTERSTITIAL);
+       break;
+     case security_interstitials::CMD_DONT_REPORT:
+-      safe_browsing::SetExtendedReportingPrefAndMetric(
+-          pref_service, false, /* value */
+-          safe_browsing::SBER_OPTIN_SITE_SECURITY_INTERSTITIAL);
+       break;
+     case security_interstitials::CMD_PROCEED:
+       user_action_ = CertificateErrorReport::USER_PROCEEDED;
+@@ -149,7 +141,7 @@ void CertReportHelper::FinishCertCollect
+   if (!ShouldShowCertificateReporterCheckbox())
+     return;
+ 
+-  if (!safe_browsing::IsExtendedReportingEnabled(*GetPrefs(web_contents_)))
++  if (true)
+     return;
+ 
+   if (metrics_helper_) {
+@@ -180,51 +172,11 @@ void CertReportHelper::FinishCertCollect
+ }
+ 
+ bool CertReportHelper::ShouldShowCertificateReporterCheckbox() {
+-  // Only show the checkbox iff the user is part of the respective Finch group
+-  // and the window is not incognito and the feature is not disabled by policy
+-  // and enhanced protection is off.
+-  const bool in_incognito =
+-      web_contents_->GetBrowserContext()->IsOffTheRecord();
+-  const PrefService* pref_service = GetPrefs(web_contents_);
+-  bool can_show_checkbox =
+-      safe_browsing::IsExtendedReportingOptInAllowed(*pref_service) &&
+-      !safe_browsing::IsExtendedReportingPolicyManaged(*pref_service);
+-  bool is_enhanced_protection_enabled =
+-      safe_browsing::IsEnhancedProtectionEnabled(*pref_service);
+-
+-  return base::FieldTrialList::FindFullName(kFinchExperimentName) ==
+-             kFinchGroupShowPossiblySend &&
+-         !in_incognito && can_show_checkbox && !is_enhanced_protection_enabled;
++  return false;
+ }
+ 
+ bool CertReportHelper::ShouldShowEnhancedProtectionMessage() {
+-  // Only show the enhanced protection message if all the following are true:
+-  // |can_show_enhanced_protection_message_| is set to true AND
+-  // the window is not incognito AND
+-  // Safe Browsing is not managed by policy AND
+-  // the user is not already in enhanced protection mode.
+-  if (!can_show_enhanced_protection_message_) {
+-    return false;
+-  }
+-
+-  const bool in_incognito =
+-      web_contents_->GetBrowserContext()->IsOffTheRecord();
+-  const PrefService* pref_service = GetPrefs(web_contents_);
+-  bool is_enhanced_protection_enabled =
+-      safe_browsing::IsEnhancedProtectionEnabled(*pref_service);
+-  bool is_safe_browsing_managed =
+-      safe_browsing::IsSafeBrowsingPolicyManaged(*pref_service);
+-
+-  if (in_incognito) {
+-    return false;
+-  }
+-  if (is_enhanced_protection_enabled) {
+-    return false;
+-  }
+-  if (is_safe_browsing_managed) {
+-    return false;
+-  }
+-  return true;
++  return false;
+ }
+ 
+ bool CertReportHelper::ShouldReportCertificateError() {
+--- components/security_interstitials/content/mitm_software_blocking_page.cc.orig
++++ components/security_interstitials/content/mitm_software_blocking_page.cc
+@@ -6,7 +6,6 @@
+ 
+ #include <utility>
+ 
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/cert_report_helper.h"
+ #include "components/security_interstitials/content/security_interstitial_controller_client.h"
+ #include "components/security_interstitials/content/security_interstitial_page.h"
+--- components/security_interstitials/content/security_interstitial_controller_client.cc.orig
++++ components/security_interstitials/content/security_interstitial_controller_client.cc
+@@ -7,7 +7,6 @@
+ #include <utility>
+ 
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/settings_page_helper.h"
+ #include "components/security_interstitials/core/metrics_helper.h"
+ #include "content/public/browser/web_contents.h"
+@@ -98,11 +97,6 @@ SecurityInterstitialControllerClient::Ge
+   return prefs_;
+ }
+ 
+-const std::string
+-SecurityInterstitialControllerClient::GetExtendedReportingPrefName() const {
+-  return prefs::kSafeBrowsingScoutReportingEnabled;
+-}
+-
+ bool SecurityInterstitialControllerClient::CanLaunchDateAndTimeSettings() {
+   NOTREACHED();
+   return false;
+--- components/security_interstitials/content/security_interstitial_controller_client.h.orig
++++ components/security_interstitials/content/security_interstitial_controller_client.h
+@@ -54,8 +54,6 @@ class SecurityInterstitialControllerClie
+   bool CanGoBackBeforeNavigation() override;
+ 
+  protected:
+-  // security_interstitials::ControllerClient overrides.
+-  const std::string GetExtendedReportingPrefName() const override;
+   content::WebContents* web_contents_;
+ 
+  private:
+--- components/security_interstitials/content/security_interstitial_page.cc.orig
++++ components/security_interstitials/content/security_interstitial_page.cc
+@@ -11,7 +11,6 @@
+ #include "base/values.h"
+ #include "components/grit/components_resources.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/security_interstitial_controller_client.h"
+ #include "components/security_interstitials/core/common_string_util.h"
+ #include "content/public/browser/page_navigator.h"
+@@ -32,13 +31,6 @@ SecurityInterstitialPage::SecurityInters
+       on_show_extended_reporting_pref_exists_(false),
+       on_show_extended_reporting_pref_value_(false),
+       controller_(std::move(controller)) {
+-  // Determine if any prefs need to be updated prior to showing the security
+-  // interstitial. Note that some content embedders (such as Android WebView)
+-  // uses security interstitials without a prefservice.
+-  if (controller_->GetPrefService()) {
+-    safe_browsing::UpdatePrefsBeforeSecurityInterstitial(
+-        controller_->GetPrefService());
+-  }
+   SetUpMetrics();
+ }
+ 
+@@ -88,15 +80,8 @@ SecurityInterstitialControllerClient* Se
+ }
+ 
+ void SecurityInterstitialPage::SetUpMetrics() {
+-  // Remember the initial state of the extended reporting pref, to be compared
+-  // to the same data when the interstitial is closed.
+-  PrefService* prefs = controller_->GetPrefService();
+-  if (prefs) {
+-    on_show_extended_reporting_pref_exists_ =
+-        safe_browsing::ExtendedReportingPrefExists(*prefs);
+-    on_show_extended_reporting_pref_value_ =
+-        safe_browsing::IsExtendedReportingEnabled(*prefs);
+-  }
++  on_show_extended_reporting_pref_exists_ = false;
++  on_show_extended_reporting_pref_value_ = false;
+ }
+ 
+ std::u16string SecurityInterstitialPage::GetFormattedHostName() const {
+--- components/security_interstitials/content/ssl_blocking_page.cc.orig
++++ components/security_interstitials/content/ssl_blocking_page.cc
+@@ -12,7 +12,6 @@
+ #include "base/metrics/histogram_macros.h"
+ #include "base/strings/string_number_conversions.h"
+ #include "base/time/time.h"
+-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/security_interstitials/content/cert_report_helper.h"
+ #include "components/security_interstitials/content/security_interstitial_controller_client.h"
+ #include "components/security_interstitials/content/security_interstitial_page.h"
+--- components/security_interstitials/core/controller_client.cc.orig
++++ components/security_interstitials/core/controller_client.cc
+@@ -36,7 +36,6 @@ MetricsHelper* ControllerClient::metrics
+ 
+ void ControllerClient::SetReportingPreference(bool report) {
+   DCHECK(GetPrefService());
+-  GetPrefService()->SetBoolean(GetExtendedReportingPrefName(), report);
+   metrics_helper_->RecordUserInteraction(
+       report ? MetricsHelper::SET_EXTENDED_REPORTING_ENABLED
+              : MetricsHelper::SET_EXTENDED_REPORTING_DISABLED);
+--- components/security_interstitials/core/controller_client.h.orig
++++ components/security_interstitials/core/controller_client.h
+@@ -122,9 +122,6 @@ class ControllerClient {
+ 
+   void SetBaseHelpCenterUrlForTesting(const GURL& test_url);
+ 
+- protected:
+-  virtual const std::string GetExtendedReportingPrefName() const = 0;
+-
+  private:
+   std::unique_ptr<MetricsHelper> metrics_helper_;
+   // Link to the help center.
+--- components/signin/core/browser/account_investigator.cc.orig
++++ components/signin/core/browser/account_investigator.cc
+@@ -13,7 +13,6 @@
+ #include "components/prefs/pref_registry_simple.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
+ #include "google_apis/gaia/gaia_auth_util.h"
+ #include "google_apis/gaia/google_service_auth_error.h"
+@@ -66,25 +65,12 @@ AccountInvestigator::~AccountInvestigato
+ 
+ // static
+ void AccountInvestigator::RegisterPrefs(PrefRegistrySimple* registry) {
+-  registry->RegisterStringPref(prefs::kGaiaCookieHash, std::string());
+-  registry->RegisterDoublePref(prefs::kGaiaCookieChangedTime, 0);
+-  registry->RegisterDoublePref(prefs::kGaiaCookiePeriodicReportTime, 0);
+ }
+ 
+ void AccountInvestigator::Initialize() {
+   identity_manager_->AddObserver(this);
+   previously_authenticated_ =
+       identity_manager_->HasPrimaryAccount(signin::ConsentLevel::kSync);
+-
+-  // TODO(crbug.com/1121923): Refactor to use signin::PersistentRepeatingTimer
+-  // instead.
+-  Time previous = Time::FromDoubleT(
+-      pref_service_->GetDouble(prefs::kGaiaCookiePeriodicReportTime));
+-  if (previous.is_null())
+-    previous = Time::Now();
+-  const base::TimeDelta delay =
+-      CalculatePeriodicDelay(previous, Time::Now(), kPeriodicReportingInterval);
+-  timer_.Start(FROM_HERE, delay, this, &AccountInvestigator::TryPeriodicReport);
+ }
+ 
+ void AccountInvestigator::Shutdown() {
+@@ -111,7 +97,7 @@ void AccountInvestigator::OnAccountsInCo
+   // a valid cached ListAccounts response ready for us. Or even both of these
+   // could be simultaneously happening, although this should be extremely
+   // infrequent.
+-  const std::string old_hash(pref_service_->GetString(prefs::kGaiaCookieHash));
++  const std::string old_hash;
+   const std::string new_hash(
+       HashAccounts(signed_in_accounts, signed_out_accounts));
+   const bool currently_authenticated =
+@@ -119,9 +105,6 @@ void AccountInvestigator::OnAccountsInCo
+   if (old_hash != new_hash) {
+     SharedCookieJarReport(signed_in_accounts, signed_out_accounts, Time::Now(),
+                           ReportingType::ON_CHANGE);
+-    pref_service_->SetString(prefs::kGaiaCookieHash, new_hash);
+-    pref_service_->SetDouble(prefs::kGaiaCookieChangedTime,
+-                             Time::Now().ToDoubleT());
+   } else if (currently_authenticated && !previously_authenticated_) {
+     SignedInAccountRelationReport(signed_in_accounts, signed_out_accounts,
+                                   ReportingType::ON_CHANGE);
+@@ -247,10 +230,6 @@ void AccountInvestigator::DoPeriodicRepo
+   }
+ 
+   periodic_pending_ = false;
+-  pref_service_->SetDouble(prefs::kGaiaCookiePeriodicReportTime,
+-                           Time::Now().ToDoubleT());
+-  timer_.Start(FROM_HERE, kPeriodicReportingInterval, this,
+-               &AccountInvestigator::TryPeriodicReport);
+ }
+ 
+ void AccountInvestigator::SharedCookieJarReport(
+@@ -258,8 +237,7 @@ void AccountInvestigator::SharedCookieJa
+     const std::vector<ListedAccount>& signed_out_accounts,
+     const Time now,
+     const ReportingType type) {
+-  const Time last_changed = Time::FromDoubleT(
+-      pref_service_->GetDouble(prefs::kGaiaCookieChangedTime));
++  const Time last_changed = Time::Now();
+   base::TimeDelta stable_age;
+   if (!last_changed.is_null())
+     stable_age = std::max(now - last_changed, base::TimeDelta());
+--- components/signin/core/browser/account_investigator_unittest.cc.orig
++++ components/signin/core/browser/account_investigator_unittest.cc
+@@ -12,7 +12,6 @@
+ #include "build/build_config.h"
+ #include "components/prefs/pref_registry_simple.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
+ #include "components/signin/public/identity_manager/identity_test_environment.h"
+ #include "components/sync_preferences/testing_pref_service_syncable.h"
+--- components/signin/core/browser/account_reconcilor_unittest.cc.orig
++++ components/signin/core/browser/account_reconcilor_unittest.cc
+@@ -29,7 +29,6 @@
+ #include "components/signin/public/base/list_accounts_test_utils.h"
+ #include "components/signin/public/base/signin_buildflags.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/base/test_signin_client.h"
+ #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
+ #include "components/signin/public/identity_manager/identity_test_environment.h"
+--- components/signin/core/browser/dice_account_reconcilor_delegate.cc.orig
++++ components/signin/core/browser/dice_account_reconcilor_delegate.cc
+@@ -12,7 +12,6 @@
+ #include "base/ranges/algorithm.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/public/base/signin_client.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ 
+ namespace signin {
+ 
+--- components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc.orig
++++ components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc
+@@ -8,7 +8,6 @@
+ 
+ #include "components/prefs/pref_registry_simple.h"
+ #include "components/signin/public/base/account_consistency_method.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/base/test_signin_client.h"
+ #include "components/sync_preferences/testing_pref_service_syncable.h"
+ #include "google_apis/gaia/gaia_auth_util.h"
+--- components/signin/core/browser/signin_investigator.cc.orig
++++ components/signin/core/browser/signin_investigator.cc
+@@ -7,7 +7,6 @@
+ #include "base/check.h"
+ #include "base/metrics/histogram_macros.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "google_apis/gaia/gaia_auth_util.h"
+ 
+ using signin_metrics::AccountEquality;
+@@ -26,13 +25,9 @@ SigninInvestigator::SigninInvestigator(c
+ SigninInvestigator::~SigninInvestigator() {}
+ 
+ bool SigninInvestigator::AreAccountsEqualWithFallback() {
+-  const std::string last_id =
+-      provider_->GetPrefs()->GetString(prefs::kGoogleServicesLastAccountId);
+-  bool same_email = gaia::AreEmailsSame(
+-      current_email_,
+-      provider_->GetPrefs()->GetString(prefs::kGoogleServicesLastUsername));
+-  if (!current_id_.empty() && !last_id.empty()) {
+-    bool same_id = current_id_ == last_id;
++  bool same_email = false;
++  if (false) {
++    bool same_id = false;
+     if (same_email && same_id) {
+       LogAccountEquality(AccountEquality::BOTH_EQUAL);
+     } else if (same_email) {
+@@ -51,9 +46,7 @@ bool SigninInvestigator::AreAccountsEqua
+ 
+ InvestigatedScenario SigninInvestigator::Investigate() {
+   InvestigatedScenario scenario;
+-  if (provider_->GetPrefs()
+-          ->GetString(prefs::kGoogleServicesLastUsername)
+-          .empty()) {
++  if (true) {
+     scenario = InvestigatedScenario::kFirstSignIn;
+   } else if (AreAccountsEqualWithFallback()) {
+     scenario = InvestigatedScenario::kSameAccount;
+--- components/signin/core/browser/signin_investigator_unittest.cc.orig
++++ components/signin/core/browser/signin_investigator_unittest.cc
+@@ -9,7 +9,6 @@
+ #include "components/prefs/pref_registry_simple.h"
+ #include "components/signin/core/browser/signin_investigator.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/identity_test_environment.h"
+ #include "components/sync_preferences/testing_pref_service_syncable.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+--- components/signin/internal/identity_manager/account_tracker_service.cc.orig
++++ components/signin/internal/identity_manager/account_tracker_service.cc
+@@ -29,7 +29,6 @@
+ #include "components/prefs/scoped_user_pref_update.h"
+ #include "components/signin/internal/identity_manager/account_capabilities_constants.h"
+ #include "components/signin/internal/identity_manager/account_info_util.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/base/signin_switches.h"
+ #include "components/signin/public/identity_manager/account_capabilities.h"
+ #include "components/signin/public/identity_manager/tribool.h"
+@@ -152,9 +151,6 @@ AccountTrackerService::~AccountTrackerSe
+ 
+ // static
+ void AccountTrackerService::RegisterPrefs(PrefRegistrySimple* registry) {
+-  registry->RegisterListPref(prefs::kAccountInfo);
+-  registry->RegisterIntegerPref(prefs::kAccountIdMigrationState,
+-                                AccountTrackerService::MIGRATION_NOT_STARTED);
+ }
+ 
+ void AccountTrackerService::Initialize(PrefService* pref_service,
+@@ -455,14 +451,12 @@ AccountTrackerService::ComputeNewMigrati
+ 
+ void AccountTrackerService::SetMigrationState(AccountIdMigrationState state) {
+   DCHECK(state != MIGRATION_DONE || AreAllAccountsMigrated());
+-  pref_service_->SetInteger(prefs::kAccountIdMigrationState, state);
+ }
+ 
+ // static
+ AccountTrackerService::AccountIdMigrationState
+ AccountTrackerService::GetMigrationState(const PrefService* pref_service) {
+-  return static_cast<AccountTrackerService::AccountIdMigrationState>(
+-      pref_service->GetInteger(prefs::kAccountIdMigrationState));
++  return MIGRATION_NOT_STARTED;
+ }
+ 
+ base::FilePath AccountTrackerService::GetImagePathFor(
+@@ -519,24 +513,7 @@ void AccountTrackerService::OnAccountIma
+     const CoreAccountId& account_id,
+     const std::string& image_url_with_size,
+     bool success) {
+-  if (!success || !pref_service_)
+-    return;
+-
+-  base::DictionaryValue* dict = nullptr;
+-  ListPrefUpdate update(pref_service_, prefs::kAccountInfo);
+-  for (size_t i = 0; i < update->GetList().size(); ++i, dict = nullptr) {
+-    if (update->GetDictionary(i, &dict)) {
+-      std::string value;
+-      if (dict->GetString(kAccountKeyPath, &value) &&
+-          value == account_id.ToString())
+-        break;
+-    }
+-  }
+-
+-  if (!dict) {
+-    return;
+-  }
+-  dict->SetString(kLastDownloadedImageURLWithSizePath, image_url_with_size);
++  return;
+ }
+ 
+ void AccountTrackerService::RemoveAccountImageFromDisk(
+@@ -548,11 +525,10 @@ void AccountTrackerService::RemoveAccoun
+ }
+ 
+ void AccountTrackerService::LoadFromPrefs() {
+-  const base::ListValue* list = pref_service_->GetList(prefs::kAccountInfo);
+   std::set<CoreAccountId> to_remove;
+-  for (size_t i = 0; i < list->GetList().size(); ++i) {
++  for (size_t i = 0; false; ++i) {
+     const base::DictionaryValue* dict = nullptr;
+-    if (list->GetDictionary(i, &dict)) {
++    if (false) {
+       std::string value;
+       if (dict->GetString(kAccountKeyPath, &value)) {
+         // Ignore incorrectly persisted non-canonical account ids.
+@@ -588,14 +564,6 @@ void AccountTrackerService::LoadFromPref
+           account_info.is_child_account = is_child_status.value()
+                                               ? signin::Tribool::kTrue
+                                               : signin::Tribool::kFalse;
+-          // Migrate to kAccountChildAttributePath.
+-          ListPrefUpdate update(pref_service_, prefs::kAccountInfo);
+-          base::DictionaryValue* update_dict = nullptr;
+-          update->GetDictionary(i, &update_dict);
+-          DCHECK(update_dict);
+-          SetAccountCapabilityPath(update_dict, kAccountChildAttributePath,
+-                                   account_info.is_child_account);
+-          update_dict->RemoveKey(kDeprecatedChildStatusPath);
+         } else {
+           account_info.is_child_account =
+               FindAccountCapabilityPath(*dict, kAccountChildAttributePath);
+@@ -654,13 +622,11 @@ void AccountTrackerService::LoadFromPref
+ }
+ 
+ void AccountTrackerService::SaveToPrefs(const AccountInfo& account_info) {
+-  if (!pref_service_)
+-    return;
++  return;
+ 
+   base::DictionaryValue* dict = nullptr;
+-  ListPrefUpdate update(pref_service_, prefs::kAccountInfo);
+-  for (size_t i = 0; i < update->GetList().size(); ++i, dict = nullptr) {
+-    if (update->GetDictionary(i, &dict)) {
++  if (false) {
++    while (false) {
+       std::string value;
+       if (dict->GetString(kAccountKeyPath, &value) &&
+           value == account_info.account_id.ToString())
+@@ -670,9 +636,6 @@ void AccountTrackerService::SaveToPrefs(
+ 
+   if (!dict) {
+     dict = new base::DictionaryValue();
+-    update->Append(base::WrapUnique(dict));
+-    // |dict| is invalidated at this point, so it needs to be reset.
+-    update->GetDictionary(update->GetList().size() - 1, &dict);
+     dict->SetString(kAccountKeyPath, account_info.account_id.ToString());
+   }
+ 
+@@ -699,14 +662,7 @@ void AccountTrackerService::RemoveFromPr
+   if (!pref_service_)
+     return;
+ 
+-  ListPrefUpdate update(pref_service_, prefs::kAccountInfo);
+   const std::string account_id = account_info.account_id.ToString();
+-  update->EraseListValueIf([&account_id](const base::Value& value) {
+-    if (!value.is_dict())
+-      return false;
+-    const std::string* account_key = value.FindStringKey(kAccountKeyPath);
+-    return account_key && *account_key == account_id;
+-  });
+ }
+ 
+ CoreAccountId AccountTrackerService::PickAccountIdForAccount(
+--- components/signin/internal/identity_manager/account_tracker_service.h.orig
++++ components/signin/internal/identity_manager/account_tracker_service.h
+@@ -236,6 +236,8 @@ class AccountTrackerService {
+   AccountInfoCallback on_account_updated_callback_;
+   AccountInfoCallback on_account_removed_callback_;
+ 
++  AccountIdMigrationState migration_state_;
++
+   // Task runner used for file operations on avatar images.
+   scoped_refptr<base::SequencedTaskRunner> image_storage_task_runner_;
+ 
+--- components/signin/internal/identity_manager/account_tracker_service_unittest.cc.orig
++++ components/signin/internal/identity_manager/account_tracker_service_unittest.cc
+@@ -26,7 +26,6 @@
+ #include "components/signin/internal/identity_manager/account_tracker_service.h"
+ #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service.h"
+ #include "components/signin/public/base/avatar_icon_util.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/base/signin_switches.h"
+ #include "components/signin/public/base/test_signin_client.h"
+ #include "components/signin/public/identity_manager/account_capabilities.h"
+--- components/signin/internal/identity_manager/gaia_cookie_manager_service.cc.orig
++++ components/signin/internal/identity_manager/gaia_cookie_manager_service.cc
+@@ -29,7 +29,6 @@
+ #include "components/signin/internal/identity_manager/ubertoken_fetcher_impl.h"
+ #include "components/signin/public/base/signin_buildflags.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/set_accounts_in_cookie_result.h"
+ #include "google_apis/gaia/gaia_constants.h"
+ #include "google_apis/gaia/gaia_urls.h"
+@@ -456,9 +455,7 @@ GaiaCookieManagerService::GaiaCookieMana
+       listAccountsUnexpectedServerResponseRetried_(false),
+       external_cc_result_fetched_(false),
+       list_accounts_stale_(true) {
+-  std::string gaia_cookie_last_list_accounts_data =
+-      signin_client_->GetPrefs()->GetString(
+-          prefs::kGaiaCookieLastListAccountsData);
++  std::string gaia_cookie_last_list_accounts_data;
+ 
+   if (!gaia_cookie_last_list_accounts_data.empty()) {
+     if (!gaia::ParseListAccountsData(gaia_cookie_last_list_accounts_data,
+@@ -482,8 +479,6 @@ GaiaCookieManagerService::~GaiaCookieMan
+ 
+ // static
+ void GaiaCookieManagerService::RegisterPrefs(PrefRegistrySimple* registry) {
+-  registry->RegisterStringPref(prefs::kGaiaCookieLastListAccountsData,
+-                               std::string());
+ }
+ 
+ void GaiaCookieManagerService::InitCookieListener() {
+@@ -906,16 +901,12 @@ void GaiaCookieManagerService::OnListAcc
+                                    &signed_out_accounts_)) {
+     listed_accounts_.clear();
+     signed_out_accounts_.clear();
+-    signin_client_->GetPrefs()->ClearPref(
+-        prefs::kGaiaCookieLastListAccountsData);
+     GoogleServiceAuthError error(
+         GoogleServiceAuthError::UNEXPECTED_SERVICE_RESPONSE);
+     OnListAccountsFailure(error);
+     return;
+   }
+ 
+-  signin_client_->GetPrefs()->SetString(prefs::kGaiaCookieLastListAccountsData,
+-                                        data);
+   RecordListAccountsFailure(GoogleServiceAuthError::NONE);
+ 
+   InitializeListedAccountsIds();
+--- components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc.orig
++++ components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc
+@@ -25,7 +25,6 @@
+ #include "components/prefs/testing_pref_service.h"
+ #include "components/signin/internal/identity_manager/account_tracker_service.h"
+ #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/base/test_signin_client.h"
+ #include "google_apis/gaia/gaia_constants.h"
+ #include "google_apis/gaia/gaia_urls.h"
+--- components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc.orig
++++ components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc
+@@ -17,7 +17,6 @@
+ #include "components/prefs/pref_service.h"
+ #include "components/signin/public/base/signin_client.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/account_info.h"
+ #include "components/signin/public/webdata/token_web_data.h"
+ #include "components/webdata/common/web_data_service_base.h"
+@@ -94,7 +93,7 @@ signin::LoadCredentialsState LoadCredent
+ bool ShouldMigrateToDice(signin::AccountConsistencyMethod account_consistency,
+                          PrefService* prefs) {
+   return account_consistency == signin::AccountConsistencyMethod::kDice &&
+-         !prefs->GetBoolean(prefs::kTokenServiceDiceCompatible);
++         true;
+ }
+ 
+ }  // namespace
+@@ -243,7 +242,6 @@ MutableProfileOAuth2TokenServiceDelegate
+ // static
+ void MutableProfileOAuth2TokenServiceDelegate::RegisterProfilePrefs(
+     PrefRegistrySimple* registry) {
+-  registry->RegisterBooleanPref(prefs::kTokenServiceDiceCompatible, false);
+ }
+ 
+ std::unique_ptr<OAuth2AccessTokenFetcher>
+@@ -602,9 +600,6 @@ void MutableProfileOAuth2TokenServiceDel
+         UpdateCredentials(loading_primary_account_id_, old_login_token);
+     }
+   }
+-
+-  if (migrate_to_dice)
+-    client_->GetPrefs()->SetBoolean(prefs::kTokenServiceDiceCompatible, true);
+ }
+ 
+ void MutableProfileOAuth2TokenServiceDelegate::UpdateCredentials(
+@@ -795,8 +790,6 @@ void MutableProfileOAuth2TokenServiceDel
+ }
+ 
+ void MutableProfileOAuth2TokenServiceDelegate::FinishLoadingCredentials() {
+-  if (account_consistency_ == signin::AccountConsistencyMethod::kDice)
+-    DCHECK(client_->GetPrefs()->GetBoolean(prefs::kTokenServiceDiceCompatible));
+   FireRefreshTokensLoaded();
+ }
+ 
+@@ -827,8 +820,7 @@ void MutableProfileOAuth2TokenServiceDel
+                  LOAD_CREDENTIALS_FINISHED_WITH_DB_CANNOT_BE_OPENED);
+ 
+   if (account_consistency_ == signin::AccountConsistencyMethod::kDice &&
+-      !client_->GetPrefs()->GetBoolean(prefs::kTokenServiceDiceCompatible)) {
++      true) {
+     RevokeAllCredentials();
+-    client_->GetPrefs()->SetBoolean(prefs::kTokenServiceDiceCompatible, true);
+   }
+ }
+--- components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc.orig
++++ components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc
+@@ -25,7 +25,6 @@
+ #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
+ #include "components/signin/public/base/account_consistency_method.h"
+ #include "components/signin/public/base/device_id_helper.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/base/test_signin_client.h"
+ #include "components/signin/public/identity_manager/account_info.h"
+ #include "components/signin/public/webdata/token_web_data.h"
+--- components/signin/internal/identity_manager/primary_account_manager.cc.orig
++++ components/signin/internal/identity_manager/primary_account_manager.cc
+@@ -22,7 +22,6 @@
+ #include "components/signin/public/base/account_consistency_method.h"
+ #include "components/signin/public/base/signin_client.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/base/signin_switches.h"
+ 
+ using signin::PrimaryAccountChangeEvent;
+@@ -47,22 +46,10 @@ PrimaryAccountManager::~PrimaryAccountMa
+ 
+ // static
+ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
+-  registry->RegisterStringPref(prefs::kGoogleServicesLastAccountId,
+-                               std::string());
+-  registry->RegisterStringPref(prefs::kGoogleServicesLastUsername,
+-                               std::string());
+-  registry->RegisterStringPref(prefs::kGoogleServicesAccountId, std::string());
+-  registry->RegisterBooleanPref(prefs::kGoogleServicesConsentedToSync, false);
+-  registry->RegisterBooleanPref(prefs::kAutologinEnabled, true);
+-  registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList);
+-  registry->RegisterBooleanPref(prefs::kSigninAllowed, true);
+-  registry->RegisterBooleanPref(prefs::kSignedInWithCredentialProvider, false);
+ }
+ 
+ // static
+ void PrimaryAccountManager::RegisterPrefs(PrefRegistrySimple* registry) {
+-  registry->RegisterStringPref(prefs::kGoogleServicesUsernamePattern,
+-                               std::string());
+ }
+ 
+ void PrimaryAccountManager::Initialize(PrefService* local_state) {
+@@ -70,25 +57,7 @@ void PrimaryAccountManager::Initialize(P
+   DCHECK(!IsInitialized());
+   initialized_ = true;
+ 
+-  // If the user is clearing the token service from the command line, then
+-  // clear their login info also (not valid to be logged in without any
+-  // tokens).
+-  base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
+-  if (cmd_line->HasSwitch(switches::kClearTokenService))
+-    SetPrimaryAccountInternal(CoreAccountInfo(), false);
+-
+-  std::string pref_account_id =
+-      client_->GetPrefs()->GetString(prefs::kGoogleServicesAccountId);
+-
+-  // Initial value for the kGoogleServicesConsentedToSync preference if it is
+-  // missing.
+-  const PrefService::Preference* consented_pref =
+-      client_->GetPrefs()->FindPreference(
+-          prefs::kGoogleServicesConsentedToSync);
+-  if (consented_pref->IsDefaultValue()) {
+-    client_->GetPrefs()->SetBoolean(prefs::kGoogleServicesConsentedToSync,
+-                                    !pref_account_id.empty());
+-  }
++  std::string pref_account_id;
+ 
+   if (!pref_account_id.empty()) {
+     if (account_tracker_service_->GetMigrationState() ==
+@@ -98,14 +67,11 @@ void PrimaryAccountManager::Initialize(P
+       // |account_info.gaia| could be empty if |account_id| is already gaia id.
+       if (!account_info.gaia.empty()) {
+         pref_account_id = account_info.gaia;
+-        client_->GetPrefs()->SetString(prefs::kGoogleServicesAccountId,
+-                                       account_info.gaia);
+       }
+     }
+   }
+ 
+-  bool consented =
+-      client_->GetPrefs()->GetBoolean(prefs::kGoogleServicesConsentedToSync);
++  bool consented = false;
+   CoreAccountId account_id = CoreAccountId::FromString(pref_account_id);
+   CoreAccountInfo account_info =
+       account_tracker_service_->GetAccountInfo(account_id);
+@@ -166,8 +132,7 @@ void PrimaryAccountManager::SetSyncPrima
+ 
+ #if DCHECK_IS_ON()
+   {
+-    std::string pref_account_id =
+-        client_->GetPrefs()->GetString(prefs::kGoogleServicesAccountId);
++    std::string pref_account_id;
+     bool consented_to_sync =
+         client_->GetPrefs()->GetBoolean(prefs::kGoogleServicesConsentedToSync);
+ 
+@@ -183,10 +148,6 @@ void PrimaryAccountManager::SetSyncPrima
+   // Go ahead and update the last signed in account info here as well. Once a
+   // user is signed in the corresponding preferences should match. Doing it here
+   // as opposed to on signin allows us to catch the upgrade scenario.
+-  client_->GetPrefs()->SetString(prefs::kGoogleServicesLastAccountId,
+-                                 account_info.account_id.ToString());
+-  client_->GetPrefs()->SetString(prefs::kGoogleServicesLastUsername,
+-                                 account_info.email);
+ 
+   // Commit primary sync account info immediately so that it does not get lost
+   // if Chrome crashes before the next commit interval.
+@@ -200,20 +161,11 @@ void PrimaryAccountManager::SetPrimaryAc
+ 
+   PrefService* prefs = client_->GetPrefs();
+   const std::string& account_id = primary_account_info_.account_id.ToString();
+-  if (account_id.empty()) {
+-    DCHECK(!consented_to_sync);
+-    prefs->ClearPref(prefs::kGoogleServicesAccountId);
+-    prefs->ClearPref(prefs::kGoogleServicesConsentedToSync);
+-  } else {
+-    prefs->SetString(prefs::kGoogleServicesAccountId, account_id);
+-    prefs->SetBoolean(prefs::kGoogleServicesConsentedToSync, consented_to_sync);
+-  }
+ }
+ 
+ bool PrimaryAccountManager::HasPrimaryAccount(
+     signin::ConsentLevel consent_level) const {
+-  bool consented_pref =
+-      client_->GetPrefs()->GetBoolean(prefs::kGoogleServicesConsentedToSync);
++  bool consented_pref = false;
+   if (primary_account_info().account_id.empty()) {
+     DCHECK(!consented_pref);
+     return false;
+--- components/signin/internal/identity_manager/primary_account_manager_unittest.cc.orig
++++ components/signin/internal/identity_manager/primary_account_manager_unittest.cc
+@@ -24,7 +24,6 @@
+ #include "components/signin/internal/identity_manager/fake_profile_oauth2_token_service_delegate.h"
+ #include "components/signin/internal/identity_manager/primary_account_policy_manager.h"
+ #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/base/signin_switches.h"
+ #include "components/signin/public/base/test_signin_client.h"
+ #include "components/sync_preferences/testing_pref_service_syncable.h"
+--- components/signin/internal/identity_manager/primary_account_mutator_impl.cc.orig
++++ components/signin/internal/identity_manager/primary_account_mutator_impl.cc
+@@ -14,7 +14,6 @@
+ #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
+ #include "components/signin/public/base/signin_buildflags.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "google_apis/gaia/core_account_id.h"
+ 
+ namespace signin {
+@@ -58,7 +57,7 @@ PrimaryAccountMutatorImpl::SetPrimaryAcc
+   DCHECK(!account_info.gaia.empty());
+ 
+ #if !BUILDFLAG(IS_CHROMEOS_ASH)
+-  bool is_signin_allowed = pref_service_->GetBoolean(prefs::kSigninAllowed);
++  bool is_signin_allowed = false;
+ #if BUILDFLAG(IS_CHROMEOS_LACROS)
+   // Check that `prefs::kSigninAllowed` has not been set to false in a context
+   // where Lacros wants to set a Primary Account. Lacros doesn't offer account
+--- components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc.orig
++++ components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc
+@@ -10,7 +10,6 @@
+ #include "components/signin/internal/identity_manager/primary_account_manager.h"
+ #include "components/signin/public/base/signin_client.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/account_info.h"
+ #include "components/signin/public/identity_manager/identity_utils.h"
+ 
+@@ -28,18 +27,7 @@ void PrimaryAccountPolicyManagerImpl::In
+   // local_state can be null during unit tests.
+   if (local_state) {
+     local_state_pref_registrar_.Init(local_state);
+-    local_state_pref_registrar_.Add(
+-        prefs::kGoogleServicesUsernamePattern,
+-        base::BindRepeating(&PrimaryAccountPolicyManagerImpl::
+-                                OnGoogleServicesUsernamePatternChanged,
+-                            weak_pointer_factory_.GetWeakPtr(),
+-                            primary_account_manager));
+   }
+-  signin_allowed_.Init(
+-      prefs::kSigninAllowed, client_->GetPrefs(),
+-      base::BindRepeating(
+-          &PrimaryAccountPolicyManagerImpl::OnSigninAllowedPrefChanged,
+-          base::Unretained(this), primary_account_manager));
+ 
+   CoreAccountInfo account_info = primary_account_manager->GetPrimaryAccountInfo(
+       signin::ConsentLevel::kSync);
+--- components/signin/internal/identity_manager/primary_account_policy_manager_impl.h.orig
++++ components/signin/internal/identity_manager/primary_account_policy_manager_impl.h
+@@ -56,9 +56,6 @@ class PrimaryAccountPolicyManagerImpl :
+   // profile-specific local prefs (like kGoogleServicesUsernamePattern).
+   PrefChangeRegistrar local_state_pref_registrar_;
+ 
+-  // Helper object to listen for changes to the signin allowed preference.
+-  BooleanPrefMember signin_allowed_;
+-
+   base::WeakPtrFactory<PrimaryAccountPolicyManagerImpl> weak_pointer_factory_{
+       this};
+ };
+--- components/signin/internal/identity_manager/primary_account_policy_manager_impl_unittest.cc.orig
++++ components/signin/internal/identity_manager/primary_account_policy_manager_impl_unittest.cc
+@@ -15,7 +15,6 @@
+ #include "components/signin/internal/identity_manager/primary_account_policy_manager_impl.h"
+ #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
+ #include "components/signin/public/base/account_consistency_method.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/base/test_signin_client.h"
+ #include "components/sync_preferences/testing_pref_service_syncable.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+--- components/signin/internal/identity_manager/profile_oauth2_token_service.cc.orig
++++ components/signin/internal/identity_manager/profile_oauth2_token_service.cc
+@@ -12,7 +12,6 @@
+ #include "components/prefs/pref_registry_simple.h"
+ #include "components/signin/internal/identity_manager/profile_oauth2_token_service_delegate.h"
+ #include "components/signin/public/base/device_id_helper.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "google_apis/gaia/gaia_constants.h"
+ #include "google_apis/gaia/google_service_auth_error.h"
+ #include "google_apis/gaia/oauth2_access_token_consumer.h"
+@@ -132,8 +131,6 @@ bool ProfileOAuth2TokenService::HasRefre
+ // static
+ void ProfileOAuth2TokenService::RegisterProfilePrefs(
+     PrefRegistrySimple* registry) {
+-  registry->RegisterStringPref(prefs::kGoogleServicesSigninScopedDeviceId,
+-                               std::string());
+ }
+ 
+ ProfileOAuth2TokenServiceDelegate* ProfileOAuth2TokenService::GetDelegate() {
+--- components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc.orig
++++ components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc
+@@ -25,7 +25,6 @@
+ #include "components/account_manager_core/mock_account_manager_facade.h"
+ #include "components/signin/internal/identity_manager/account_tracker_service.h"
+ #include "components/signin/internal/identity_manager/profile_oauth2_token_service_observer.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/base/test_signin_client.h"
+ #include "components/signin/public/identity_manager/account_info.h"
+ #include "components/sync_preferences/testing_pref_service_syncable.h"
+--- components/signin/public/base/BUILD.gn.orig
++++ components/signin/public/base/BUILD.gn
+@@ -34,8 +34,6 @@ static_library("base") {
+     "signin_client.h",
+     "signin_metrics.cc",
+     "signin_metrics.h",
+-    "signin_pref_names.cc",
+-    "signin_pref_names.h",
+     "signin_switches.cc",
+     "signin_switches.h",
+   ]
+--- components/signin/public/base/device_id_helper.cc.orig
++++ components/signin/public/base/device_id_helper.cc
+@@ -9,7 +9,6 @@
+ #include "base/guid.h"
+ #include "build/chromeos_buildflags.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/base/signin_switches.h"
+ 
+ namespace signin {
+@@ -17,19 +16,12 @@ namespace signin {
+ #if !BUILDFLAG(IS_CHROMEOS_ASH)
+ 
+ std::string GetSigninScopedDeviceId(PrefService* prefs) {
+-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+-          switches::kDisableSigninScopedDeviceId)) {
+-    return std::string();
+-  }
+-
+-  return GetOrCreateScopedDeviceId(prefs);
++  return std::string();
+ }
+ 
+ std::string RecreateSigninScopedDeviceId(PrefService* prefs) {
+   std::string signin_scoped_device_id = GenerateSigninScopedDeviceId();
+   DCHECK(!signin_scoped_device_id.empty());
+-  prefs->SetString(prefs::kGoogleServicesSigninScopedDeviceId,
+-                   signin_scoped_device_id);
+   return signin_scoped_device_id;
+ }
+ 
+@@ -38,13 +30,7 @@ std::string GenerateSigninScopedDeviceId
+ }
+ 
+ std::string GetOrCreateScopedDeviceId(PrefService* prefs) {
+-  std::string signin_scoped_device_id =
+-      prefs->GetString(prefs::kGoogleServicesSigninScopedDeviceId);
+-  if (signin_scoped_device_id.empty()) {
+-    // If device_id doesn't exist then generate new and save in prefs.
+-    signin_scoped_device_id = RecreateSigninScopedDeviceId(prefs);
+-  }
+-  return signin_scoped_device_id;
++  return RecreateSigninScopedDeviceId(prefs);
+ }
+ 
+ #endif
+--- components/signin/public/base/device_id_helper_unittest.cc.orig
++++ components/signin/public/base/device_id_helper_unittest.cc
+@@ -8,7 +8,6 @@
+ 
+ #include "build/build_config.h"
+ #include "build/chromeos_buildflags.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/sync_preferences/testing_pref_service_syncable.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+ 
+@@ -24,40 +23,23 @@ TEST(DeviceIdHelper, GenerateSigninScope
+ 
+ TEST(DeviceIdHelper, RecreateSigninScopedDeviceId) {
+   sync_preferences::TestingPrefServiceSyncable prefs;
+-  prefs.registry()->RegisterStringPref(
+-      prefs::kGoogleServicesSigninScopedDeviceId, std::string());
+-  ASSERT_TRUE(
+-      prefs.GetString(prefs::kGoogleServicesSigninScopedDeviceId).empty());
+ 
+   std::string device_id_1 = RecreateSigninScopedDeviceId(&prefs);
+   EXPECT_FALSE(device_id_1.empty());
+-  EXPECT_EQ(device_id_1,
+-            prefs.GetString(prefs::kGoogleServicesSigninScopedDeviceId));
+ 
+   std::string device_id_2 = RecreateSigninScopedDeviceId(&prefs);
+   EXPECT_FALSE(device_id_2.empty());
+   EXPECT_NE(device_id_1, device_id_2);
+-  EXPECT_EQ(device_id_2,
+-            prefs.GetString(prefs::kGoogleServicesSigninScopedDeviceId));
+ }
+ 
+ TEST(DeviceIdHelper, GetOrCreateScopedDeviceId) {
+   sync_preferences::TestingPrefServiceSyncable prefs;
+-  prefs.registry()->RegisterStringPref(
+-      prefs::kGoogleServicesSigninScopedDeviceId, std::string());
+-
+-  ASSERT_TRUE(
+-      prefs.GetString(prefs::kGoogleServicesSigninScopedDeviceId).empty());
+ 
+   std::string device_id_1 = GetOrCreateScopedDeviceId(&prefs);
+   EXPECT_FALSE(device_id_1.empty());
+-  EXPECT_EQ(device_id_1,
+-            prefs.GetString(prefs::kGoogleServicesSigninScopedDeviceId));
+ 
+   std::string device_id_2 = GetOrCreateScopedDeviceId(&prefs);
+   EXPECT_EQ(device_id_1, device_id_2);
+-  EXPECT_EQ(device_id_2,
+-            prefs.GetString(prefs::kGoogleServicesSigninScopedDeviceId));
+ }
+ 
+ #endif
+--- components/signin/public/identity_manager/identity_utils.cc.orig
++++ components/signin/public/identity_manager/identity_utils.cc
+@@ -11,7 +11,6 @@
+ #include "base/strings/string_util.h"
+ #include "base/strings/utf_string_conversions.h"
+ #include "components/prefs/pref_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "third_party/icu/source/i18n/unicode/regex.h"
+ 
+ namespace signin {
+@@ -56,8 +55,7 @@ bool IsUsernameAllowedByPattern(base::St
+ 
+ bool IsUsernameAllowedByPatternFromPrefs(const PrefService* prefs,
+                                          const std::string& username) {
+-  return IsUsernameAllowedByPattern(
+-      username, prefs->GetString(prefs::kGoogleServicesUsernamePattern));
++  return true;
+ }
+ 
+ }  // namespace signin
+--- components/signin/public/identity_manager/identity_utils_unittest.cc.orig
++++ components/signin/public/identity_manager/identity_utils_unittest.cc
+@@ -7,7 +7,6 @@
+ #include "components/prefs/pref_registry_simple.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/prefs/testing_pref_service.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+ 
+ namespace {
+--- components/signin/public/identity_manager/primary_account_mutator_unittest.cc.orig
++++ components/signin/public/identity_manager/primary_account_mutator_unittest.cc
+@@ -15,7 +15,6 @@
+ #include "build/chromeos_buildflags.h"
+ #include "components/signin/public/base/signin_buildflags.h"
+ #include "components/signin/public/base/signin_metrics.h"
+-#include "components/signin/public/base/signin_pref_names.h"
+ #include "components/signin/public/identity_manager/consent_level.h"
+ #include "components/signin/public/identity_manager/identity_test_environment.h"
+ #include "components/signin/public/identity_manager/identity_test_utils.h"
+--- tools/metrics/histograms/enums.xml.orig
++++ tools/metrics/histograms/enums.xml
+@@ -83754,7 +83754,6 @@ Full version information for the fingerp
+   <int value="3" label="kRestoreOnStartup"/>
+   <int value="4" label="kURLsToRestoreOnStartup"/>
+   <int value="5" label="extensions::pref_names::kExtensions"/>
+-  <int value="6" label="kGoogleServicesLastUsername"/>
+   <int value="7" label="kSearchProviderOverrides"/>
+   <int value="8" label="kDefaultSearchProviderSearchURL (Obsolete 12/2016)"/>
+   <int value="9" label="kDefaultSearchProviderKeyword (Obsolete 12/2016)"/>
+@@ -83769,10 +83768,7 @@ Full version information for the fingerp
+   <int value="18" label="kSafeBrowsingIncidentsSent"/>
+   <int value="19" label="kSwReporterPromptVersion"/>
+   <int value="20" label="kSwReporterPromptReason"/>
+-  <int value="21" label="kGoogleServicesUsername (Obsolete 9/2019)"/>
+   <int value="22" label="kSwReporterPromptSeed"/>
+-  <int value="23" label="kGoogleServicesAccountId"/>
+-  <int value="24" label="kGoogleServicesLastAccountId"/>
+   <int value="25" label="kSettingsResetPromptPromptWave"/>
+   <int value="26" label="kSettingsResetPromptLastTriggeredForDefaultSearch"/>
+   <int value="27" label="kSettingsResetPromptLastTriggeredForStartupUrls"/>
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch b/www/chromium-uc/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch
new file mode 100644
index 0000000..0ef3743
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch
@@ -0,0 +1,29 @@
+--- components/search_engines/prepopulated_engines.json.orig
++++ components/search_engines/prepopulated_engines.json
+@@ -113,21 +113,11 @@
+     },
+ 
+     "google": {
+-      "name": "Google",
+-      "keyword": "google.com",
+-      "favicon_url": "https://www.google.com/images/branding/product/ico/googleg_lodp.ico",
+-      "search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:iOSSearchLanguage}{google:prefetchSource}{google:searchClient}{google:sourceId}{google:contextualSearchVersion}ie={inputEncoding}",
+-      "suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:omniboxFocusType}{google:cursorPosition}{google:currentPageUrl}{google:pageClassification}{google:searchVersion}{google:sessionToken}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}",
+-      "image_url": "{google:baseSearchByImageURL}upload",
+-      "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}",
+-      "image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight}",
+-      "alternate_urls": [
+-        "{google:baseURL}#q={searchTerms}",
+-        "{google:baseURL}search#q={searchTerms}",
+-        "{google:baseURL}webhp#q={searchTerms}",
+-        "{google:baseURL}s#q={searchTerms}",
+-        "{google:baseURL}s?q={searchTerms}"
+-      ],
++      "name": "No Search",
++      "keyword": "nosearch",
++      "favicon_url": "about:blank",
++      "search_url": "http://{searchTerms}",
++      "new_tab_url": "about:blank",
+       "type": "SEARCH_ENGINE_GOOGLE",
+       "preconnect_to_search_url" : "ALLOWED",
+       "id": 1
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch b/www/chromium-uc/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch
new file mode 100644
index 0000000..50efc58
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch
@@ -0,0 +1,115 @@
+# Disables translation and removes the "Translate to" context menu when --translate-script-url flag is not set
+--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig
++++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
+@@ -133,6 +133,7 @@
+ #include "components/spellcheck/common/spellcheck_common.h"
+ #include "components/spellcheck/spellcheck_buildflags.h"
+ #include "components/strings/grit/components_strings.h"
++#include "components/translate/core/common/translate_switches.h"
+ #include "components/translate/core/browser/translate_download_manager.h"
+ #include "components/translate/core/browser/translate_manager.h"
+ #include "components/translate/core/browser/translate_prefs.h"
+@@ -1751,6 +1752,8 @@ void RenderViewContextMenu::AppendPageIt
+     menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
+   }
+ 
++  const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
++  if (command_line.HasSwitch(translate::switches::kTranslateScriptURL)) {
+   ChromeTranslateClient* chrome_translate_client =
+       ChromeTranslateClient::FromWebContents(embedder_web_contents_);
+   const bool canTranslate =
+@@ -1772,6 +1775,7 @@ void RenderViewContextMenu::AppendPageIt
+         IDC_CONTENT_CONTEXT_TRANSLATE,
+         l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_TRANSLATE, language));
+   }
++  } // if (command_line.HasSwitch(translate::switches::kTranslateScriptURL))
+ }
+ 
+ void RenderViewContextMenu::AppendExitFullscreenItem() {
+--- components/translate/core/browser/translate_language_list.cc.orig
++++ components/translate/core/browser/translate_language_list.cc
+@@ -11,6 +11,7 @@
+ 
+ #include "base/bind.h"
+ #include "base/check.h"
++#include "base/command_line.h"
+ #include "base/json/json_reader.h"
+ #include "base/lazy_instance.h"
+ #include "base/notreached.h"
+@@ -23,6 +24,7 @@
+ #include "components/translate/core/browser/translate_event_details.h"
+ #include "components/translate/core/browser/translate_url_fetcher.h"
+ #include "components/translate/core/browser/translate_url_util.h"
++#include "components/translate/core/common/translate_switches.h"
+ #include "components/translate/core/common/translate_util.h"
+ #include "net/base/url_util.h"
+ #include "third_party/abseil-cpp/absl/types/optional.h"
+@@ -219,6 +221,9 @@ GURL TranslateLanguageList::TranslateLan
+ }
+ 
+ void TranslateLanguageList::RequestLanguageList() {
++  const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
++  if (!command_line.HasSwitch(translate::switches::kTranslateScriptURL))
++    return;
+   // If resource requests are not allowed, we'll get a callback when they are.
+   if (!resource_requests_allowed_) {
+     request_pending_ = true;
+--- components/translate/core/browser/translate_manager.cc.orig
++++ components/translate/core/browser/translate_manager.cc
+@@ -887,8 +887,9 @@ void TranslateManager::FilterIsTranslate
+         ->LogAutofillAssistantDeferredTriggerDecision();
+   }
+ 
+-  if (!ignore_missing_key_for_testing_ &&
+-      !::google_apis::HasAPIKeyConfigured()) {
++  const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
++  if (!command_line.HasSwitch(translate::switches::kTranslateScriptURL) ||
++      (!ignore_missing_key_for_testing_ && !::google_apis::HasAPIKeyConfigured())) {
+     // Without an API key, translate won't work, so don't offer to translate in
+     // the first place. Leave kOfferTranslateEnabled on, though, because that
+     // settings syncs and we don't want to turn off translate everywhere else.
+--- components/translate/core/browser/translate_ranker_impl.cc.orig
++++ components/translate/core/browser/translate_ranker_impl.cc
+@@ -156,12 +156,9 @@ TranslateRankerImpl::TranslateRankerImpl
+                                          ukm::UkmRecorder* ukm_recorder)
+     : ukm_recorder_(ukm_recorder),
+       is_uma_logging_enabled_(false),
+-      is_query_enabled_(base::FeatureList::IsEnabled(kTranslateRankerQuery)),
+-      is_enforcement_enabled_(
+-          base::FeatureList::IsEnabled(kTranslateRankerEnforcement)),
+-      is_previous_language_matches_override_enabled_(
+-          base::FeatureList::IsEnabled(
+-              translate::kTranslateRankerPreviousLanguageMatchesOverride)) {
++      is_query_enabled_(false),
++      is_enforcement_enabled_(false),
++      is_previous_language_matches_override_enabled_(false) {
+   if (is_query_enabled_ || is_enforcement_enabled_) {
+     model_loader_ = std::make_unique<assist_ranker::RankerModelLoaderImpl>(
+         base::BindRepeating(&ValidateModel),
+@@ -235,6 +232,8 @@ bool TranslateRankerImpl::ShouldOfferTra
+   // (or become False).
+   const bool kDefaultResponse = true;
+ 
++  return kDefaultResponse;
++
+   translate_event->set_ranker_request_timestamp_sec(
+       (base::TimeTicks::Now() - base::TimeTicks()).InSeconds());
+   translate_event->set_ranker_version(GetModelVersion());
+--- components/translate/core/browser/translate_script.cc.orig
++++ components/translate/core/browser/translate_script.cc
+@@ -137,8 +137,13 @@ void TranslateScript::OnScriptFetchCompl
+                         server_params.c_str());
+ 
+     GURL security_origin = translate::GetTranslateSecurityOrigin();
+-    base::StringAppendF(&data_, "var securityOrigin = '%s';",
+-                        security_origin.spec().c_str());
++    const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
++    if (command_line.HasSwitch(translate::switches::kTranslateScriptURL)) {
++      base::StringAppendF(&data_, "var securityOrigin = '%s';",
++                          security_origin.spec().c_str());
++    } else {
++      base::StringAppendF(&data_, "var securityOrigin = '';");
++    }
+ 
+     // Load embedded translate.js.
+     data_.append(ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(