1 files changed, 155 insertions, 152 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
index 18fc72a..855718c 100644
--- 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
@@ -1,6 +1,6 @@
---- chrome/browser/BUILD.gn.orig
-+++ chrome/browser/BUILD.gn
-@@ -2195,7 +2195,6 @@ static_library("browser") {
+--- a/chrome/browser/BUILD.gn
++++ b/chrome/browser/BUILD.gn
+@@ -2174,7 +2174,6 @@ static_library("browser") {
      "//components/reputation/core:proto",
      "//components/resources",
      "//components/safe_browsing/content/browser",
@@ -8,7 +8,7 @@
      "//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") {
+@@ -3719,8 +3718,6 @@ static_library("browser") {
        "download/download_commands.h",
        "download/download_crx_util.cc",
        "download/download_crx_util.h",
@@ -17,9 +17,9 @@
        "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;
+--- a/chrome/browser/browser_process.h
++++ b/chrome/browser/browser_process.h
+@@ -54,10 +54,6 @@ class NetworkQualityTracker;
  class SharedURLLoaderFactory;
  }
  
@@ -30,7 +30,7 @@
  namespace subresource_filter {
  class RulesetService;
  }
-@@ -218,9 +214,6 @@ class BrowserProcess {
+@@ -210,9 +206,6 @@ class BrowserProcess {
    // on this platform (or this is a unit test).
    virtual StatusTray* status_tray() = 0;
  
@@ -40,8 +40,8 @@
    // 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
+--- a/chrome/browser/browser_process_impl.cc
++++ b/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"
@@ -50,7 +50,7 @@
  #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()
+@@ -393,8 +392,6 @@ void BrowserProcessImpl::StartTearDown()
  
    metrics_services_manager_.reset();
    intranet_redirect_detector_.reset();
@@ -59,7 +59,7 @@
    network_time_tracker_.reset();
  #if BUILDFLAG(ENABLE_PLUGINS)
    plugins_resource_service_.reset();
-@@ -1030,14 +1027,6 @@ StatusTray* BrowserProcessImpl::status_t
+@@ -1028,14 +1025,6 @@ StatusTray* BrowserProcessImpl::status_t
    return status_tray_.get();
  }
  
@@ -74,7 +74,7 @@
  subresource_filter::RulesetService*
  BrowserProcessImpl::subresource_filter_ruleset_service() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -1300,26 +1289,6 @@ void BrowserProcessImpl::CreateBackgroun
+@@ -1280,26 +1269,6 @@ void BrowserProcessImpl::CreateBackgroun
  #endif
  }
  
@@ -101,17 +101,17 @@
  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
+--- a/chrome/browser/browser_process_impl.h
++++ b/chrome/browser/browser_process_impl.h
+@@ -189,7 +189,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
+ 
+@@ -336,9 +335,6 @@ class BrowserProcessImpl : public Browse
    std::unique_ptr<BackgroundModeManager> background_mode_manager_;
  #endif
  
@@ -121,17 +121,17 @@
    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 @@
+--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
++++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+@@ -63,7 +63,6 @@
+ #include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h"
+ #include "chrome/browser/profiles/keep_alive/scoped_profile_keep_alive.h"
  #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::
+@@ -617,10 +616,6 @@ void ChromeBrowsingDataRemoverDelegate::
      base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
  
      network::mojom::NetworkContext* safe_browsing_context = nullptr;
@@ -140,11 +140,11 @@
 -    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
+     if (!filter_builder->IsCrossSiteClearSiteData()) {
+       browsing_data::RemoveEmbedderCookieData(
+--- a/chrome/browser/chrome_content_browser_client.cc
++++ b/chrome/browser/chrome_content_browser_client.cc
+@@ -950,34 +950,6 @@ void SetApplicationLocaleOnIOThread(cons
    GetIOThreadApplicationLocale() = locale;
  }
  
@@ -173,13 +173,13 @@
 -  }
 -
 - private:
--  CertificateReportingService* service_;
+-  raw_ptr<CertificateReportingService> service_;
 -};
 -
  #if BUILDFLAG(ENABLE_EXTENSIONS)
  
  AppLoadedInTabSource ClassifyAppLoadedInTabSource(
-@@ -1423,7 +1395,6 @@ void ChromeContentBrowserClient::PostAft
+@@ -1465,7 +1437,6 @@ void ChromeContentBrowserClient::PostAft
    InitNetworkContextsParentDirectory();
  
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -187,7 +187,7 @@
  }
  
  bool ChromeContentBrowserClient::IsBrowserStartupComplete() {
-@@ -4229,7 +4200,7 @@ ChromeContentBrowserClient::CreateThrott
+@@ -4279,7 +4250,7 @@ ChromeContentBrowserClient::CreateThrott
    content::WebContents* web_contents = handle->GetWebContents();
    throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
        handle,
@@ -196,7 +196,7 @@
        base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
        base::BindOnce(
            &ShouldIgnoreSslInterstitialBecauseNavigationDefaultedToHttps)));
-@@ -4258,15 +4229,6 @@ ChromeContentBrowserClient::CreateThrott
+@@ -4314,16 +4285,6 @@ ChromeContentBrowserClient::CreateThrott
                     &throttles);
  #endif
  
@@ -205,15 +205,16 @@
 -      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));
+-  MaybeAddThrottle(
+-      safe_browsing::SafeBrowsingNavigationThrottle::MaybeCreateThrottleFor(
+-          handle, ui_manager),
+-      &throttles);
 -
    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
+--- a/chrome/browser/component_updater/file_type_policies_component_installer.cc
++++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc
 @@ -40,20 +40,6 @@ const uint8_t kFileTypePoliciesPublicKey
  const char kFileTypePoliciesManifestName[] = "File Type Policies";
  
@@ -235,9 +236,9 @@
  }
  
  }  // namespace
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig
-+++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -436,13 +436,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
+--- a/chrome/browser/download/chrome_download_manager_delegate.cc
++++ b/chrome/browser/download/chrome_download_manager_delegate.cc
+@@ -431,13 +431,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
  
  void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
    download_manager_ = dm;
@@ -250,15 +251,16 @@
 -  }
  }
  
- #if defined(OS_ANDROID)
-@@ -791,16 +784,6 @@ void ChromeDownloadManagerDelegate::Choo
- 
+ #if BUILDFLAG(IS_ANDROID)
+@@ -791,17 +784,6 @@ void ChromeDownloadManagerDelegate::Choo
  void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
-     base::FilePath* filename) {
+     base::FilePath* filename,
+     const GURL& source_url) {
 -  safe_browsing::FileTypePolicies* file_type_policies =
 -      safe_browsing::FileTypePolicies::GetInstance();
 -
--  if (file_type_policies->GetFileDangerLevel(*filename) ==
+-  const PrefService* prefs = profile_->GetPrefs();
+-  if (file_type_policies->GetFileDangerLevel(*filename, source_url, prefs) ==
 -      safe_browsing::DownloadFileType::NOT_DANGEROUS)
 -    return;
 -
@@ -268,9 +270,9 @@
  }
  
  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
+--- a/chrome/browser/download/download_item_model.cc
++++ b/chrome/browser/download/download_item_model.cc
+@@ -87,7 +87,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.
@@ -279,7 +281,7 @@
  
    // Whether the download is currently being revived.
    bool is_being_revived_;
-@@ -123,7 +123,7 @@ DownloadItemModelData::DownloadItemModel
+@@ -124,7 +124,7 @@ DownloadItemModelData::DownloadItemModel
      : should_show_in_shelf_(true),
        was_ui_notified_(false),
        should_prefer_opening_in_browser_(false),
@@ -288,7 +290,7 @@
        is_being_revived_(false) {}
  
  }  // namespace
-@@ -381,13 +381,13 @@ void DownloadItemModel::SetShouldPreferO
+@@ -382,13 +382,13 @@ void DownloadItemModel::SetShouldPreferO
    data->should_prefer_opening_in_browser_ = preference;
  }
  
@@ -305,7 +307,7 @@
    DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
    data->danger_level_ = danger_level;
  }
-@@ -599,9 +599,6 @@ bool DownloadItemModel::IsCommandEnabled
+@@ -604,9 +604,6 @@ bool DownloadItemModel::IsCommandEnabled
        // filename. Don't base an "Always open" decision based on it. Also
        // exclude extensions.
        return download_->CanOpenDownload() &&
@@ -315,9 +317,9 @@
               !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
+--- a/chrome/browser/download/download_prefs.cc
++++ b/chrome/browser/download/download_prefs.cc
+@@ -251,14 +251,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
          base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) +
          extension);
  
@@ -333,7 +335,7 @@
    }
  }
  
-@@ -475,10 +468,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
+@@ -466,10 +459,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
  bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension(
      const base::FilePath& file_name) {
    base::FilePath::StringType extension = file_name.Extension();
@@ -344,9 +346,9 @@
  
    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:
+--- a/chrome/browser/download/download_target_determiner.cc
++++ b/chrome/browser/download/download_target_determiner.cc
+@@ -298,13 +298,6 @@ base::FilePath DownloadTargetDeterminer:
        download_->GetURL(), download_->GetContentDisposition(), referrer_charset,
        suggested_filename, sniffed_mime_type, default_filename);
  
@@ -360,13 +362,14 @@
    // 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
+@@ -1111,30 +1104,7 @@ DownloadFileType::DangerLevel DownloadTa
        download_->HasUserGesture())
      return DownloadFileType::NOT_DANGEROUS;
  
 -  DownloadFileType::DangerLevel danger_level =
 -      safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel(
--          virtual_path_.BaseName());
+-          virtual_path_.BaseName(), download_->GetURL(),
+-          GetProfile()->GetPrefs());
 -
 -  // 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
@@ -391,8 +394,8 @@
  }
  
  absl::optional<base::Time>
---- chrome/browser/extensions/api/downloads/downloads_api.cc.orig
-+++ chrome/browser/extensions/api/downloads/downloads_api.cc
+--- a/chrome/browser/extensions/api/downloads/downloads_api.cc
++++ b/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"
@@ -455,10 +458,10 @@
  }
  
  DownloadsShowFunction::DownloadsShowFunction() {}
---- chrome/browser/extensions/api/downloads/downloads_api.h.orig
-+++ chrome/browser/extensions/api/downloads/downloads_api.h
+--- a/chrome/browser/extensions/api/downloads/downloads_api.h
++++ b/chrome/browser/extensions/api/downloads/downloads_api.h
 @@ -13,7 +13,6 @@
- #include "base/macros.h"
+ #include "base/memory/raw_ptr.h"
  #include "base/scoped_observation.h"
  #include "base/time/time.h"
 -#include "chrome/browser/download/download_danger_prompt.h"
@@ -493,8 +496,8 @@
  };
  
  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
+--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc
++++ b/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)));
    }
@@ -534,9 +537,9 @@
    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
+--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
++++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+@@ -716,18 +716,6 @@ void WebstorePrivateBeginInstallWithMani
  
  void WebstorePrivateBeginInstallWithManifest3Function::
      ReportFrictionAcceptedEvent() {
@@ -555,7 +558,7 @@
  }
  
  void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
-@@ -1159,52 +1147,9 @@ WebstorePrivateGetReferrerChainFunction:
+@@ -1192,52 +1180,9 @@ WebstorePrivateGetReferrerChainFunction:
  
  ExtensionFunction::ResponseAction
  WebstorePrivateGetReferrerChainFunction::Run() {
@@ -609,9 +612,9 @@
  }
  
  WebstorePrivateGetExtensionStatusFunction::
---- chrome/browser/extensions/blocklist_state_fetcher.cc.orig
-+++ chrome/browser/extensions/blocklist_state_fetcher.cc
-@@ -34,33 +34,8 @@ BlocklistStateFetcher::~BlocklistStateFe
+--- a/chrome/browser/extensions/blocklist_state_fetcher.cc
++++ b/chrome/browser/extensions/blocklist_state_fetcher.cc
+@@ -38,23 +38,8 @@ BlocklistStateFetcher::~BlocklistStateFe
  void BlocklistStateFetcher::Request(const std::string& id,
                                      RequestCallback callback) {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -631,23 +634,13 @@
 -  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(
+@@ -65,8 +50,7 @@ void BlocklistStateFetcher::SendRequest(
    std::string request_str;
    request.SerializeToString(&request_str);
  
@@ -657,7 +650,7 @@
    net::NetworkTrafficAnnotationTag traffic_annotation =
        net::DefineNetworkTrafficAnnotation("extension_blacklist", R"(
          semantics {
-@@ -122,12 +96,6 @@ void BlocklistStateFetcher::SendRequest(
+@@ -114,12 +98,6 @@ void BlocklistStateFetcher::SendRequest(
                       base::Unretained(this), fetcher));
  }
  
@@ -670,9 +663,9 @@
  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 {
+--- a/chrome/browser/extensions/blocklist_state_fetcher.h
++++ b/chrome/browser/extensions/blocklist_state_fetcher.h
+@@ -36,8 +36,6 @@ class BlocklistStateFetcher {
  
    virtual void Request(const std::string& id, RequestCallback callback);
  
@@ -681,7 +674,7 @@
   protected:
    void OnURLLoaderComplete(network::SimpleURLLoader* url_loader,
                             std::unique_ptr<std::string> response_body);
-@@ -57,7 +55,6 @@ class BlocklistStateFetcher {
+@@ -56,7 +54,6 @@ class BlocklistStateFetcher {
  
    void SendRequest(const std::string& id);
  
@@ -689,20 +682,20 @@
    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
+--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
++++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
+@@ -856,9 +856,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)
+ #if !BUILDFLAG(IS_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
+--- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
++++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
 @@ -138,9 +138,6 @@ void TrialComparisonCertVerifierControll
    std::string serialized_report;
    if (!report.Serialize(&serialized_report))
@@ -713,19 +706,19 @@
  }
  
  // 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
+--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
++++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+@@ -317,7 +317,6 @@ void ChromeBrowserMainExtraPartsProfiles
  #if BUILDFLAG(IS_CHROMEOS_LACROS)
    CertDbInitializerFactory::GetInstance();
  #endif
 -  CertificateReportingServiceFactory::GetInstance();
- #if !defined(OS_ANDROID)
+ #if !BUILDFLAG(IS_ANDROID)
    ChromeBrowsingDataLifetimeManagerFactory::GetInstance();
  #endif
---- chrome/browser/profiles/profile_impl.cc.orig
-+++ chrome/browser/profiles/profile_impl.cc
-@@ -93,7 +93,6 @@
+--- a/chrome/browser/profiles/profile_impl.cc
++++ b/chrome/browser/profiles/profile_impl.cc
+@@ -94,7 +94,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"
@@ -733,7 +726,7 @@
  #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
+@@ -621,17 +620,6 @@ void ProfileImpl::LoadPrefsForNormalStar
  
    mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
        pref_validation_delegate;
@@ -751,9 +744,9 @@
  
    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
+--- a/chrome/browser/profiles/profiles_state.cc
++++ b/chrome/browser/profiles/profiles_state.cc
+@@ -255,9 +255,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.
@@ -763,8 +756,8 @@
    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
+--- a/chrome/browser/safe_browsing/BUILD.gn
++++ b/chrome/browser/safe_browsing/BUILD.gn
 @@ -5,6 +5,7 @@ import("//components/safe_browsing/build
  import("//extensions/buildflags/buildflags.gni")
  
@@ -773,7 +766,7 @@
    sources = [
      "chrome_controller_client.cc",
      "chrome_controller_client.h",
-@@ -88,6 +89,7 @@ static_library("safe_browsing") {
+@@ -89,6 +90,7 @@ static_library("safe_browsing") {
        "//extensions/browser",
      ]
    }
@@ -781,7 +774,7 @@
  
    if (safe_browsing_mode != 0) {
      # "Safe Browsing Basic" files used for safe browsing in full mode
-@@ -411,6 +413,7 @@ static_library("advanced_protection") {
+@@ -446,6 +448,7 @@ static_library("advanced_protection") {
  }
  
  source_set("metrics_collector") {
@@ -789,7 +782,7 @@
    sources = [
      "safe_browsing_metrics_collector_factory.cc",
      "safe_browsing_metrics_collector_factory.h",
-@@ -428,6 +431,7 @@ source_set("metrics_collector") {
+@@ -463,6 +466,7 @@ source_set("metrics_collector") {
      "//components/safe_browsing/core/common:safe_browsing_prefs",
      "//content/public/browser",
    ]
@@ -797,9 +790,9 @@
  }
  
  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
+--- a/chrome/browser/ssl/security_state_tab_helper.cc
++++ b/chrome/browser/ssl/security_state_tab_helper.cc
+@@ -180,89 +180,6 @@ bool SecurityStateTabHelper::UsedPolicyI
  
  security_state::MaliciousContentStatus
  SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -839,7 +832,7 @@
 -              MALICIOUS_CONTENT_STATUS_SIGNED_IN_SYNC_PASSWORD_REUSE;
 -        }
 -#endif
--        FALLTHROUGH;
+-        [[fallthrough]];
 -      case safe_browsing::SB_THREAT_TYPE_SIGNED_IN_NON_SYNC_PASSWORD_REUSE:
 -#if BUILDFLAG(FULL_SAFE_BROWSING)
 -        if (safe_browsing::ChromePasswordProtectionService::
@@ -849,7 +842,7 @@
 -              MALICIOUS_CONTENT_STATUS_SIGNED_IN_NON_SYNC_PASSWORD_REUSE;
 -        }
 -#endif
--        FALLTHROUGH;
+-        [[fallthrough]];
 -      case safe_browsing::SB_THREAT_TYPE_ENTERPRISE_PASSWORD_REUSE:
 -#if BUILDFLAG(FULL_SAFE_BROWSING)
 -        if (safe_browsing::ChromePasswordProtectionService::
@@ -889,19 +882,19 @@
    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",
+--- a/chrome/browser/ui/BUILD.gn
++++ b/chrome/browser/ui/BUILD.gn
+@@ -4152,7 +4152,6 @@ static_library("ui") {
+       "views/download/bubble/download_dialog_view.h",
+       "views/download/bubble/download_toolbar_button_view.cc",
+       "views/download/bubble/download_toolbar_button_view.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
+--- a/chrome/browser/ui/tab_helpers.cc
++++ b/chrome/browser/ui/tab_helpers.cc
+@@ -363,22 +363,6 @@ void TabHelpers::AttachTabHelpers(WebCon
    //     See https://crbug.com/910288.
    resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
        web_contents);
@@ -910,6 +903,12 @@
 -      safe_browsing::SafeBrowsingNavigationObserverManagerFactory::
 -          GetForBrowserContext(profile),
 -      profile->GetPrefs(), g_browser_process->safe_browsing_service());
+-  if (base::FeatureList::IsEnabled(
+-          safe_browsing::kTailoredSecurityIntegration)) {
+-    safe_browsing::TailoredSecurityUrlObserver::CreateForWebContents(
+-        web_contents,
+-        safe_browsing::TailoredSecurityServiceFactory::GetForProfile(profile));
+-  }
 -  safe_browsing::SafeBrowsingTabObserver::CreateForWebContents(
 -      web_contents,
 -      std::make_unique<safe_browsing::ChromeSafeBrowsingTabObserverDelegate>());
@@ -918,8 +917,8 @@
    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
+--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
++++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
 @@ -23,7 +23,6 @@
  #include "base/threading/thread.h"
  #include "base/values.h"
@@ -928,7 +927,7 @@
  #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
+@@ -172,9 +171,6 @@ void DownloadsDOMHandler::SaveDangerousR
    }
  
    CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS);
@@ -938,7 +937,7 @@
  }
  
  void DownloadsDOMHandler::AcceptIncognitoWarning(const std::string& id) {
-@@ -325,12 +321,6 @@ void DownloadsDOMHandler::RemoveDownload
+@@ -326,12 +322,6 @@ void DownloadsDOMHandler::RemoveDownload
    IdSet ids;
  
    for (auto* download : to_remove) {
@@ -951,7 +950,7 @@
      DownloadItemModel item_model(download);
      if (!item_model.ShouldShowInShelf() ||
          download->GetState() == download::DownloadItem::IN_PROGRESS) {
-@@ -404,44 +394,6 @@ void DownloadsDOMHandler::FinalizeRemova
+@@ -405,44 +395,6 @@ void DownloadsDOMHandler::FinalizeRemova
    }
  }
  
@@ -996,17 +995,17 @@
  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
+--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.h
++++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.h
 @@ -12,7 +12,6 @@
  
- #include "base/macros.h"
+ #include "base/memory/raw_ptr.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
+@@ -95,18 +94,6 @@ class DownloadsDOMHandler : public conte
    // null-checking |original_notifier_|.
    content::DownloadManager* GetOriginalNotifierManager() const;
  
@@ -1025,9 +1024,9 @@
    // 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
+--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
++++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+@@ -273,120 +273,6 @@ CreateHttpsOnlyModePage(content::WebCont
                                                        request_url));
  }
  
@@ -1037,7 +1036,8 @@
 -      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 (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "url",
+-                                 &url_param)) {
 -    if (GURL(url_param).is_valid()) {
 -      request_url = GURL(url_param);
 -    }
@@ -1046,7 +1046,8 @@
 -  // 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 (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "type",
+-                                 &type_param)) {
 -    if (type_param == "malware") {
 -      threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
 -    } else if (type_param == "phishing") {
@@ -1094,14 +1095,16 @@
 -      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 (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "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 (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "type",
+-                                 &type_param)) {
 -    if (type_param == "malware") {
 -      threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
 -    } else if (type_param == "phishing") {
@@ -1144,16 +1147,16 @@
  #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
  std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
      content::WebContents* web_contents) {
-@@ -507,8 +397,6 @@ void InterstitialHTMLSource::StartDataRe
+@@ -501,8 +387,6 @@ void InterstitialHTMLSource::StartDataRe
+     interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
+   } else if (path_without_query == "/blocked-interception") {
      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
+@@ -519,16 +403,12 @@ void InterstitialHTMLSource::StartDataRe
      interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
    }
  
@@ -1173,9 +1176,9 @@
      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 @@
+--- a/chrome/renderer/chrome_content_renderer_client.cc
++++ b/chrome/renderer/chrome_content_renderer_client.cc
+@@ -91,7 +91,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"
@@ -1183,8 +1186,8 @@
  #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
+--- a/components/security_interstitials/content/cert_report_helper.cc
++++ b/components/security_interstitials/content/cert_report_helper.cc
 @@ -177,7 +177,6 @@ void CertReportHelper::FinishCertCollect
      return;
    }