1 files changed, 0 insertions, 1195 deletions
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
deleted file mode 100644
index 18fc72a..0000000
--- a/www/chromium-uc/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch
+++ /dev/null
@@ -1,1195 +0,0 @@
--- 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() {