Update to Chromium 98.0.4758.80 (#1817)

* Update to Chromium 98.0.4758.74

* Update to Chromium 98.0.4758.80

chromium_version.txt

@@ -1 +1 @@
-97.0.4692.99
+98.0.4758.80

flags.gn

@@ -7,7 +7,6 @@ enable_js_type_check=false
 enable_mdns=false
 enable_mse_mpeg2ts_stream_parser=true
 enable_nacl=false
-enable_nacl_nonsfi=false
 enable_one_click_signin=false
 enable_reading_list=false
 enable_remoting=false

patches/core/debian/disable/unrar.patch

@@ -65,15 +65,15 @@ bug: http://bugs.debian.org/914487
  
 --- a/chrome/services/file_util/safe_archive_analyzer.cc
 +++ b/chrome/services/file_util/safe_archive_analyzer.cc
-@@ -7,7 +7,6 @@
- #include "base/macros.h"
+@@ -6,7 +6,6 @@
+ 
  #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
+@@ -46,8 +45,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile
                                           AnalyzeRarFileCallback callback) {
    DCHECK(rar_file.IsValid());
  

patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2208,7 +2208,6 @@ static_library("browser") {
+@@ -2204,7 +2204,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",
-@@ -3740,8 +3739,6 @@ static_library("browser") {
+@@ -3758,8 +3757,6 @@ static_library("browser") {
        "download/download_commands.h",
        "download/download_crx_util.cc",
        "download/download_crx_util.h",
@@ -19,7 +19,7 @@
        "download/download_dir_util.cc",
 --- a/chrome/browser/browser_process.h
 +++ b/chrome/browser/browser_process.h
-@@ -55,10 +55,6 @@ class NetworkQualityTracker;
+@@ -53,10 +53,6 @@ class NetworkQualityTracker;
  class SharedURLLoaderFactory;
  }
  
@@ -30,7 +30,7 @@
  namespace subresource_filter {
  class RulesetService;
  }
-@@ -218,9 +214,6 @@ class BrowserProcess {
+@@ -213,9 +209,6 @@ class BrowserProcess {
    // on this platform (or this is a unit test).
    virtual StatusTray* status_tray() = 0;
  
@@ -42,7 +42,7 @@
    virtual subresource_filter::RulesetService*
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -70,7 +70,6 @@
+@@ -69,7 +69,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"
@@ -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"
-@@ -396,8 +395,6 @@ void BrowserProcessImpl::StartTearDown()
+@@ -395,8 +394,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();
-@@ -1031,14 +1028,6 @@ StatusTray* BrowserProcessImpl::status_t
+@@ -1021,14 +1018,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_);
-@@ -1302,26 +1291,6 @@ void BrowserProcessImpl::CreateBackgroun
+@@ -1282,26 +1271,6 @@ void BrowserProcessImpl::CreateBackgroun
  #endif
  }
  
@@ -103,7 +103,7 @@
    created_subresource_filter_ruleset_service_ = true;
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
-@@ -190,7 +190,6 @@ class BrowserProcessImpl : public Browse
+@@ -189,7 +189,6 @@ class BrowserProcessImpl : public Browse
        std::unique_ptr<BackgroundModeManager> manager) override;
  #endif
    StatusTray* status_tray() override;
@@ -111,7 +111,7 @@
    subresource_filter::RulesetService* subresource_filter_ruleset_service()
        override;
    federated_learning::FlocSortingLshClustersService*
-@@ -344,9 +343,6 @@ class BrowserProcessImpl : public Browse
+@@ -339,9 +338,6 @@ class BrowserProcessImpl : public Browse
    std::unique_ptr<BackgroundModeManager> background_mode_manager_;
  #endif
  
@@ -123,7 +123,7 @@
        subresource_filter_ruleset_service_;
 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-@@ -70,7 +70,6 @@
+@@ -66,7 +66,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"
@@ -131,7 +131,7 @@
  #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::
+@@ -633,10 +632,6 @@ void ChromeBrowsingDataRemoverDelegate::
      base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
  
      network::mojom::NetworkContext* safe_browsing_context = nullptr;
@@ -144,7 +144,7 @@
          delete_begin, delete_end, filter_builder, host_content_settings_map_,
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -929,34 +929,6 @@ void SetApplicationLocaleOnIOThread(cons
+@@ -936,34 +936,6 @@ void SetApplicationLocaleOnIOThread(cons
    GetIOThreadApplicationLocale() = locale;
  }
  
@@ -173,13 +173,13 @@
 -  }
 -
 - private:
--  CertificateReportingService* service_;
+-  raw_ptr<CertificateReportingService> service_;
 -};
 -
  #if BUILDFLAG(ENABLE_EXTENSIONS)
  
  AppLoadedInTabSource ClassifyAppLoadedInTabSource(
-@@ -1438,7 +1410,6 @@ void ChromeContentBrowserClient::PostAft
+@@ -1450,7 +1422,6 @@ void ChromeContentBrowserClient::PostAft
    InitNetworkContextsParentDirectory();
  
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -187,7 +187,7 @@
  }
  
  bool ChromeContentBrowserClient::IsBrowserStartupComplete() {
-@@ -4229,7 +4200,7 @@ ChromeContentBrowserClient::CreateThrott
+@@ -4252,7 +4223,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,16 +4229,6 @@ ChromeContentBrowserClient::CreateThrott
+@@ -4281,16 +4252,6 @@ ChromeContentBrowserClient::CreateThrott
                     &throttles);
  #endif
  
@@ -238,7 +238,7 @@
  }  // namespace
 --- a/chrome/browser/download/chrome_download_manager_delegate.cc
 +++ b/chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -436,13 +436,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
+@@ -435,13 +435,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
  
  void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
    download_manager_ = dm;
@@ -252,7 +252,7 @@
  }
  
  #if defined(OS_ANDROID)
-@@ -791,16 +784,6 @@ void ChromeDownloadManagerDelegate::Choo
+@@ -790,16 +783,6 @@ void ChromeDownloadManagerDelegate::Choo
  
  void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
      base::FilePath* filename) {
@@ -459,7 +459,7 @@
 --- 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"
@@ -537,7 +537,7 @@
            referrer_entries)));
 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
-@@ -683,18 +683,6 @@ void WebstorePrivateBeginInstallWithMani
+@@ -682,18 +682,6 @@ void WebstorePrivateBeginInstallWithMani
  
  void WebstorePrivateBeginInstallWithManifest3Function::
      ReportFrictionAcceptedEvent() {
@@ -556,7 +556,7 @@
  }
  
  void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
-@@ -1159,52 +1147,9 @@ WebstorePrivateGetReferrerChainFunction:
+@@ -1158,52 +1146,9 @@ WebstorePrivateGetReferrerChainFunction:
  
  ExtensionFunction::ResponseAction
  WebstorePrivateGetReferrerChainFunction::Run() {
@@ -663,7 +663,7 @@
      std::unique_ptr<std::string> response_body) {
 --- a/chrome/browser/extensions/blocklist_state_fetcher.h
 +++ b/chrome/browser/extensions/blocklist_state_fetcher.h
-@@ -37,8 +37,6 @@ class BlocklistStateFetcher {
+@@ -36,8 +36,6 @@ class BlocklistStateFetcher {
  
    virtual void Request(const std::string& id, RequestCallback callback);
  
@@ -672,7 +672,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);
  
@@ -682,7 +682,7 @@
    // SimpleURLLoader -> (owned loader, extension id).
 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc
 +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -824,9 +824,6 @@ void ChromeMetricsServiceClient::Registe
+@@ -825,9 +825,6 @@ void ChromeMetricsServiceClient::Registe
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<HttpsEngagementMetricsProvider>());
  
@@ -706,7 +706,7 @@
  // static
 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -298,7 +298,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -307,7 +307,6 @@ void ChromeBrowserMainExtraPartsProfiles
  #if BUILDFLAG(IS_CHROMEOS_LACROS)
    CertDbInitializerFactory::GetInstance();
  #endif
@@ -744,7 +744,7 @@
        CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false),
 --- a/chrome/browser/profiles/profiles_state.cc
 +++ b/chrome/browser/profiles/profiles_state.cc
-@@ -259,9 +259,6 @@ void RemoveBrowsingDataForProfile(const
+@@ -253,9 +253,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.
@@ -764,7 +764,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",
      ]
    }
@@ -772,7 +772,7 @@
  
    if (safe_browsing_mode != 0) {
      # "Safe Browsing Basic" files used for safe browsing in full mode
-@@ -414,6 +416,7 @@ static_library("advanced_protection") {
+@@ -440,6 +442,7 @@ static_library("advanced_protection") {
  }
  
  source_set("metrics_collector") {
@@ -780,7 +780,7 @@
    sources = [
      "safe_browsing_metrics_collector_factory.cc",
      "safe_browsing_metrics_collector_factory.h",
-@@ -431,6 +434,7 @@ source_set("metrics_collector") {
+@@ -457,6 +460,7 @@ source_set("metrics_collector") {
      "//components/safe_browsing/core/common:safe_browsing_prefs",
      "//content/public/browser",
    ]
@@ -790,7 +790,7 @@
  source_set("test_support") {
 --- a/chrome/browser/ssl/security_state_tab_helper.cc
 +++ b/chrome/browser/ssl/security_state_tab_helper.cc
-@@ -210,89 +210,6 @@ bool SecurityStateTabHelper::UsedPolicyI
+@@ -180,89 +180,6 @@ bool SecurityStateTabHelper::UsedPolicyI
  
  security_state::MaliciousContentStatus
  SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -882,7 +882,7 @@
  
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -3957,7 +3957,6 @@ static_library("ui") {
+@@ -4061,7 +4061,6 @@ static_library("ui") {
        "views/device_chooser_content_view.h",
        "views/devtools_process_observer.cc",
        "views/devtools_process_observer.h",
@@ -892,7 +892,7 @@
        "views/download/download_item_view.cc",
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -343,16 +343,6 @@ void TabHelpers::AttachTabHelpers(WebCon
+@@ -353,22 +353,6 @@ void TabHelpers::AttachTabHelpers(WebCon
    //     See https://crbug.com/910288.
    resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
        web_contents);
@@ -901,6 +901,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>());
@@ -991,7 +997,7 @@
 +++ 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"
@@ -1018,7 +1024,7 @@
    bool IsDeletingHistoryAllowed();
 --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
 +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
-@@ -281,116 +281,6 @@ CreateHttpsOnlyModePage(content::WebCont
+@@ -268,116 +268,6 @@ CreateHttpsOnlyModePage(content::WebCont
                                                        request_url));
  }
  
@@ -1135,16 +1141,16 @@
  #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
  std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
      content::WebContents* web_contents) {
-@@ -507,8 +397,6 @@ void InterstitialHTMLSource::StartDataRe
+@@ -492,8 +382,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
+@@ -510,16 +398,12 @@ void InterstitialHTMLSource::StartDataRe
      interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
    }
  
@@ -1166,7 +1172,7 @@
      html = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
-@@ -98,7 +98,6 @@
+@@ -94,7 +94,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"

patches/core/inox-patchset/0005-disable-default-extensions.patch

@@ -22,7 +22,7 @@
  }
  
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -503,18 +498,6 @@ void ComponentLoader::AddDefaultComponen
+@@ -501,18 +496,6 @@ void ComponentLoader::AddDefaultComponen
      AddHangoutServicesExtension();
  #endif  // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
  
@@ -76,7 +76,7 @@
  }
  
  // http://crbug.com/165634
-@@ -712,21 +698,6 @@ void WebstoreInstaller::UpdateDownloadPr
+@@ -711,21 +697,6 @@ void WebstoreInstaller::UpdateDownloadPr
  void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
    DCHECK(!crx_installer_.get());

patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch

@@ -1,6 +1,6 @@
 --- a/net/dns/host_resolver_manager.cc
 +++ b/net/dns/host_resolver_manager.cc
-@@ -139,10 +139,10 @@ const unsigned kMinimumTTLSeconds = kCac
+@@ -144,10 +144,10 @@ const unsigned kMinimumTTLSeconds = kCac
  // cached.
  const int kIPv6ProbePeriodMs = 1000;
  

patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch

@@ -90,7 +90,7 @@ by default.
    if base_tag != '':
 --- a/chrome/browser/ash/customization/customization_document.cc
 +++ b/chrome/browser/ash/customization/customization_document.cc
-@@ -200,7 +200,7 @@ std::string ReadFileInBackground(const b
+@@ -198,7 +198,7 @@ std::string ReadFileInBackground(const b
  
  // Template URL where to fetch OEM services customization manifest from.
  const char ServicesCustomizationDocument::kManifestUrl[] =
@@ -101,7 +101,7 @@ by default.
  // creates and uses to publish OEM default apps to the extensions system.
 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
 +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
-@@ -87,7 +87,7 @@ namespace {
+@@ -88,7 +88,7 @@ namespace {
  
  using api::file_manager_private::ProfileInfo;
  
@@ -125,7 +125,7 @@ by default.
  // elements of |list| equals |hash|.
 --- a/chrome/browser/extensions/install_signer.cc
 +++ b/chrome/browser/extensions/install_signer.cc
-@@ -67,7 +67,7 @@ const int kSignatureFormatVersion = 2;
+@@ -66,7 +66,7 @@ const int kSignatureFormatVersion = 2;
  const size_t kSaltBytes = 32;
  
  const char kBackendUrl[] =
@@ -203,7 +203,7 @@ by default.
  
 --- a/chrome/browser/safe_browsing/download_protection/download_feedback.cc
 +++ b/chrome/browser/safe_browsing/download_protection/download_feedback.cc
-@@ -193,7 +193,7 @@ const int64_t DownloadFeedback::kMaxUplo
+@@ -192,7 +192,7 @@ const int64_t DownloadFeedback::kMaxUplo
  
  // static
  const char DownloadFeedback::kSbFeedbackURL[] =
@@ -236,7 +236,7 @@ by default.
  // yet.
 --- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
 +++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
-@@ -49,7 +49,7 @@ const char* kUpdateBrowserRedirectUrl =
+@@ -50,7 +50,7 @@ const char* kUpdateBrowserRedirectUrl =
  #else
      // The URL to be used to re-install Chrome when auto-update failed for
      // too long.
@@ -316,17 +316,6 @@ by default.
  
  bool NavigateToUrlWithEdge(const std::wstring& url) {
    std::wstring protocol_url = L"microsoft-edge:" + url;
---- a/chromecast/browser/service/cast_service_simple.cc
-+++ b/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())
 --- a/chromecast/crash/linux/minidump_uploader.cc
 +++ b/chromecast/crash/linux/minidump_uploader.cc
 @@ -41,7 +41,7 @@ namespace {
@@ -384,7 +373,7 @@ by default.
  
 --- a/components/google/core/common/google_util.cc
 +++ b/components/google/core/common/google_util.cc
-@@ -143,7 +143,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
+@@ -142,7 +142,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
  
  // Global functions -----------------------------------------------------------
  
@@ -395,7 +384,7 @@ by default.
    url::Component query(0, static_cast<int>(str.length())), key, value;
 --- a/components/history/core/browser/web_history_service.cc
 +++ b/components/history/core/browser/web_history_service.cc
-@@ -42,13 +42,13 @@ namespace history {
+@@ -43,13 +43,13 @@ namespace history {
  namespace {
  
  const char kHistoryOAuthScope[] =
@@ -455,7 +444,7 @@ by default.
 +    "trk:238:https://safesearch.googleapis.com/v1:classify";
  
  std::string BuildResponse(bool is_porn) {
-   base::DictionaryValue dict;
+   base::Value dict(base::Value::Type::DICTIONARY);
 --- a/components/translate/core/browser/translate_url_fetcher.cc
 +++ b/components/translate/core/browser/translate_url_fetcher.cc
 @@ -99,6 +99,7 @@ bool TranslateURLFetcher::Request(const
@@ -501,7 +490,7 @@ by default.
  
 --- a/content/browser/webauth/authenticator_common.cc
 +++ b/content/browser/webauth/authenticator_common.cc
-@@ -88,9 +88,9 @@ enum class RequestExtension {
+@@ -89,9 +89,9 @@ enum class RequestExtension {
  namespace {
  
  constexpr char kGstaticAppId[] =
@@ -766,7 +755,7 @@ by default.
  std::string MakeMCSEndpoint(const std::string& mcs_hostname, int port) {
 --- a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
 +++ b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
-@@ -36,7 +36,7 @@ class GaiaCookieMechanism : public jingl
+@@ -35,7 +35,7 @@ class GaiaCookieMechanism : public jingl
      // These attributes are necessary for working with non-gmail gaia
      // accounts.
      const std::string NS_GOOGLE_AUTH_PROTOCOL(

patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch

@@ -56,7 +56,7 @@ the URL so we get notified if this happens again in the future).
  IncidentReportingService::IncidentReportingService(
 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc
 +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
-@@ -285,7 +285,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
+@@ -281,7 +281,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
  }
  
  void SafeBrowsingService::RegisterAllDelayedAnalysis() {

patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch

@@ -13,7 +13,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
 
 --- a/components/safe_browsing/content/browser/client_side_detection_service.cc
 +++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
-@@ -209,6 +209,10 @@ void ClientSideDetectionService::StartCl
+@@ -215,6 +215,10 @@ void ClientSideDetectionService::StartCl
      return;
    }
  
@@ -24,7 +24,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
    // Fill in metadata about which model we used.
    *request->mutable_population() = delegate_->GetUserPopulation();
  
-@@ -288,6 +292,7 @@ void ClientSideDetectionService::StartCl
+@@ -294,6 +298,7 @@ void ClientSideDetectionService::StartCl
        base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent,
                       base::Unretained(WebUIInfoSingleton::GetInstance()),
                       std::move(request), access_token));

patches/core/ungoogled-chromium/block-requests.patch

@@ -65,9 +65,9 @@
    if (state_ == REQUESTING) {
 --- a/components/update_client/update_checker.cc
 +++ b/components/update_client/update_checker.cc
-@@ -112,6 +112,7 @@ void UpdateCheckerImpl::CheckForUpdates(
+@@ -109,6 +109,7 @@ void UpdateCheckerImpl::CheckForUpdates(
+     const IdToComponentPtrMap& components,
      const base::flat_map<std::string, std::string>& additional_attributes,
-     bool enabled_component_updates,
      UpdateCheckCallback update_check_callback) {
 +  return;
    DCHECK(thread_checker_.CalledOnValidThread());

patches/core/ungoogled-chromium/block-trk-and-subdomains.patch

@@ -3,7 +3,7 @@
 
 --- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
-@@ -56,6 +56,7 @@ ChromeAutocompleteSchemeClassifier::GetI
+@@ -57,6 +57,7 @@ ChromeAutocompleteSchemeClassifier::GetI
    if (base::IsStringASCII(scheme) &&
        (ProfileIOData::IsHandledProtocol(scheme) ||
         base::LowerCaseEqualsASCII(scheme, content::kViewSourceScheme) ||
@@ -23,19 +23,19 @@
        url.SchemeIs(dom_distiller::kDomDistillerScheme))
 --- a/chrome/browser/ui/singleton_tabs.cc
 +++ b/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))
+@@ -102,7 +102,8 @@ int GetIndexOfExistingTab(Browser* brows
+     // RewriteURLIfNecessary removes the "view-source:" scheme which could lead
+     // to incorrect matching, so ensure that the target and the candidate are
+     // either both view-source:, or neither is.
+-    if (tab_url.SchemeIs(content::kViewSourceScheme) != target_is_view_source) {
++    if (tab_url.SchemeIs(content::kViewSourceScheme) != target_is_view_source ||
++        tab_url.SchemeIs(url::kTraceScheme)) {
        continue;
+     }
  
-     GURL rewritten_tab_url = tab_url;
 --- a/components/omnibox/browser/autocomplete_input.cc
 +++ b/components/omnibox/browser/autocomplete_input.cc
-@@ -533,7 +533,8 @@ void AutocompleteInput::ParseForEmphasiz
+@@ -562,7 +562,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) ||
@@ -60,17 +60,17 @@
      return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
 --- a/content/browser/child_process_security_policy_impl.cc
 +++ b/content/browser/child_process_security_policy_impl.cc
-@@ -853,6 +853,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
+@@ -733,6 +733,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
+   RegisterWebSafeScheme(url::kWssScheme);
  #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
+   // other origins, so we should not treat them as web safe. Remove callers of
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1012,6 +1012,8 @@ component("net") {
+@@ -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",
@@ -109,7 +109,7 @@
 +}  // namespace net
 --- /dev/null
 +++ b/net/url_request/trk_protocol_handler.h
-@@ -0,0 +1,32 @@
+@@ -0,0 +1,30 @@
 +// 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.
@@ -118,7 +118,6 @@
 +#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"
 +
@@ -131,12 +130,11 @@
 +    : public URLRequestJobFactory::ProtocolHandler {
 + public:
 +  TrkProtocolHandler();
++  TrkProtocolHandler(const TrkProtocolHandler&) = delete;
++  TrkProtocolHandler& operator=(const TrkProtocolHandler&) = delete;
 +  std::unique_ptr<URLRequestJob> CreateJob(
 +      URLRequest* request) const override;
 +  bool IsSafeRedirectTarget(const GURL& location) const override;
-+
-+ private:
-+  DISALLOW_COPY_AND_ASSIGN(TrkProtocolHandler);
 +};
 +
 +}  // namespace net
@@ -160,7 +158,7 @@
  
  using base::Time;
  using std::string;
-@@ -594,6 +596,12 @@ URLRequest::URLRequest(const GURL& url,
+@@ -611,6 +613,12 @@ URLRequest::URLRequest(const GURL& url,
    // Sanity check out environment.
    DCHECK(base::ThreadTaskRunnerHandle::IsSet());
  
@@ -175,7 +173,7 @@
      return NetLogURLRequestConstructorParams(url, priority_,
 --- a/net/url_request/url_request_context_builder.cc
 +++ b/net/url_request/url_request_context_builder.cc
-@@ -46,6 +46,7 @@
+@@ -45,6 +45,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"
@@ -183,7 +181,7 @@
  #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
+@@ -545,6 +546,9 @@ std::unique_ptr<URLRequestContext> URLRe
    }
    protocol_handlers_.clear();
  

patches/core/ungoogled-chromium/disable-domain-reliability.patch

@@ -111,7 +111,7 @@
  def quote_and_wrap_text(text, width=79, prefix='  "', suffix='"'):
 --- a/components/domain_reliability/google_configs.cc
 +++ b/components/domain_reliability/google_configs.cc
-@@ -11,564 +11,6 @@
+@@ -11,548 +11,6 @@
  
  namespace domain_reliability {
  
@@ -402,9 +402,6 @@
 -    {"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},
@@ -461,19 +458,6 @@
 -    {"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},
@@ -676,7 +660,7 @@
  std::unique_ptr<const DomainReliabilityConfig> MaybeGetGoogleConfig(
      const std::string& hostname) {
    bool is_www_subdomain =
-@@ -578,23 +20,6 @@ std::unique_ptr<const DomainReliabilityC
+@@ -562,23 +20,6 @@ std::unique_ptr<const DomainReliabilityC
    std::unique_ptr<const DomainReliabilityConfig> config;
    std::unique_ptr<const DomainReliabilityConfig> superdomain_config;
  
@@ -700,7 +684,7 @@
    if (config) {
      DCHECK(config->origin.host() == hostname);
      return config;
-@@ -613,11 +38,6 @@ std::vector<std::unique_ptr<const Domain
+@@ -597,11 +38,6 @@ std::vector<std::unique_ptr<const Domain
  GetAllGoogleConfigsForTesting() {
    std::vector<std::unique_ptr<const DomainReliabilityConfig>> configs_out;
  
@@ -714,7 +698,7 @@
  
 --- a/components/domain_reliability/uploader.cc
 +++ b/components/domain_reliability/uploader.cc
-@@ -79,7 +79,7 @@ class DomainReliabilityUploaderImpl : pu
+@@ -80,7 +80,7 @@ class DomainReliabilityUploaderImpl : pu
      if (discard_uploads_)
        discarded_upload_count_++;
  

patches/core/ungoogled-chromium/disable-gaia.patch

@@ -3,7 +3,7 @@
 
 --- a/google_apis/gaia/gaia_auth_fetcher.cc
 +++ b/google_apis/gaia/gaia_auth_fetcher.cc
-@@ -293,66 +293,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
+@@ -292,66 +292,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
      network::mojom::CredentialsMode credentials_mode,
      const net::NetworkTrafficAnnotationTag& traffic_annotation) {
    DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";

patches/core/ungoogled-chromium/disable-google-host-detection.patch

@@ -130,7 +130,7 @@
  #endif
 --- a/components/google/core/common/google_util.cc
 +++ b/components/google/core/common/google_util.cc
-@@ -33,112 +33,6 @@ namespace google_util {
+@@ -32,112 +32,6 @@ namespace google_util {
  
  namespace {
  
@@ -243,7 +243,7 @@
  }  // namespace
  
  // Global functions -----------------------------------------------------------
-@@ -146,12 +40,6 @@ bool IsGoogleSearchSubdomainUrl(const GU
+@@ -145,12 +39,6 @@ bool IsGoogleSearchSubdomainUrl(const GU
  const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/";
  
  bool HasGoogleSearchQueryParam(base::StringPiece str) {
@@ -256,7 +256,7 @@
    return false;
  }
  
-@@ -162,161 +50,53 @@ std::string GetGoogleLocale(const std::s
+@@ -161,161 +49,53 @@ std::string GetGoogleLocale(const std::s
  
  GURL AppendGoogleLocaleParam(const GURL& url,
                               const std::string& application_locale) {
@@ -430,7 +430,7 @@
  
 --- a/components/page_load_metrics/browser/page_load_metrics_util.cc
 +++ b/components/page_load_metrics/browser/page_load_metrics_util.cc
-@@ -196,9 +196,7 @@ bool DidObserveLoadingBehaviorInAnyFrame
+@@ -199,9 +199,7 @@ bool DidObserveLoadingBehaviorInAnyFrame
  }
  
  bool IsGoogleSearchHostname(const GURL& url) {

patches/core/ungoogled-chromium/disable-mei-preload.patch

@@ -7,7 +7,7 @@
 
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -356,7 +356,6 @@ if (!is_android && !is_mac) {
+@@ -347,7 +347,6 @@ if (!is_android && !is_mac) {
      }
  
      data_deps += [
@@ -15,7 +15,7 @@
        "//third_party/widevine/cdm",
      ]
    }
-@@ -1157,7 +1156,6 @@ if (is_win) {
+@@ -1150,7 +1149,6 @@ if (is_win) {
        ":keystone_registration_framework",
        ":swiftshader_library",
        ":widevine_cdm_library",

patches/core/ungoogled-chromium/disable-privacy-sandbox.patch

@@ -20,7 +20,7 @@
  void PrivacySandboxSettings::OnCookiesCleared() {
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-@@ -64,19 +64,6 @@
+@@ -80,19 +80,6 @@
              sub-label="$i18n{permissionsPageDescription}"
              on-click="onPermissionsPageClick_"
              role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>

patches/core/ungoogled-chromium/disable-signin.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/ui/chrome_pages.cc
 +++ b/chrome/browser/ui/chrome_pages.cc
-@@ -480,32 +480,6 @@ GURL GetOSSettingsUrl(const std::string&
+@@ -486,32 +486,6 @@ GURL GetOSSettingsUrl(const std::string&
  void ShowBrowserSignin(Browser* browser,
                         signin_metrics::AccessPoint access_point,
                         signin::ConsentLevel consent_level) {

patches/core/ungoogled-chromium/disable-webstore-urls.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
 +++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
-@@ -655,10 +655,6 @@ std::vector<url::Origin> ChromeContentBr
+@@ -641,10 +641,6 @@ std::vector<url::Origin> ChromeContentBr
      GetOriginsRequiringDedicatedProcess() {
    std::vector<url::Origin> list;
  
@@ -15,7 +15,7 @@
  
 --- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc
 +++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc
-@@ -288,17 +288,7 @@ bool ChromeContentVerifierDelegate::IsFr
+@@ -290,17 +290,7 @@ bool ChromeContentVerifierDelegate::IsFr
    // between which extensions are considered in-store.
    // See https://crbug.com/766806 for details.
    if (!InstallVerifier::IsFromStore(extension, context_)) {
@@ -60,14 +60,14 @@
 +++ b/chrome/browser/extensions/extension_migrator.h
 @@ -9,6 +9,7 @@
  
- #include "base/macros.h"
+ #include "base/memory/raw_ptr.h"
  #include "chrome/browser/extensions/external_loader.h"
 +#include "url/gurl.h"
  
  class Profile;
  
 @@ -40,6 +41,7 @@ class ExtensionMigrator : public Externa
-   Profile* profile_;
+   raw_ptr<Profile> profile_;
    const std::string old_id_;
    const std::string new_id_;
 +  GURL chrome_blank_;

patches/core/ungoogled-chromium/doh-changes.patch

@@ -1,6 +1,6 @@
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -333,12 +333,7 @@ const base::Feature kDesktopPWAsWebBundl
+@@ -336,12 +336,7 @@ const base::FeatureParam<int> kDisableHt
  // Enable DNS over HTTPS (DoH).
  const base::Feature kDnsOverHttps {
    "DnsOverHttps",

patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch

@@ -3,7 +3,7 @@
 
 --- a/chrome/test/chromedriver/BUILD.gn
 +++ b/chrome/test/chromedriver/BUILD.gn
-@@ -311,11 +311,7 @@ source_set("lib") {
+@@ -314,11 +314,7 @@ source_set("lib") {
    }
  }
  
@@ -15,7 +15,7 @@
  
  executable("$chromedriver_output") {
    testonly = true
-@@ -337,16 +333,6 @@ executable("$chromedriver_output") {
+@@ -340,16 +336,6 @@ executable("$chromedriver_output") {
    }
  }
  
@@ -34,9 +34,9 @@
    deps = [
 --- a/third_party/devtools-frontend/src/BUILD.gn
 +++ b/third_party/devtools-frontend/src/BUILD.gn
-@@ -109,7 +109,6 @@ foreach(module_file, non_autostart_non_r
+@@ -14,7 +14,6 @@ import("./third_party/blink/public/publi
+ 
  devtools_frontend_resources_deps = [
-   ":build_release_devtools",
    "front_end",
 -  "test",
  ]

patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch

@@ -1,82 +1,3 @@
---- a/content/browser/BUILD.gn
-+++ b/content/browser/BUILD.gn
-@@ -1218,6 +1218,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",
-@@ -2983,10 +2987,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",
-     ]
---- a/content/browser/devtools/protocol/network_handler.h
-+++ b/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_;
---- a/content/public/common/content_switch_dependent_feature_overrides.cc
-+++ b/content/public/common/content_switch_dependent_feature_overrides.cc
-@@ -36,9 +36,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},
---- a/services/network/network_context.cc
-+++ b/services/network/network_context.cc
-@@ -1145,6 +1145,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(
---- a/services/network/network_context.h
-+++ b/services/network/network_context.h
-@@ -578,10 +578,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE)
-     return cors_non_wildcard_request_headers_support_;
-   }
- 
--#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);
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
 @@ -39,6 +39,7 @@
@@ -87,7 +8,7 @@
  #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"
-@@ -2325,9 +2326,11 @@ const base::UnguessableToken& LocalFrame
+@@ -2289,9 +2290,11 @@ const base::UnguessableToken& LocalFrame
    return base::UnguessableToken::Null();
  }
  
@@ -109,7 +30,7 @@
  #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"
-@@ -548,7 +549,9 @@ class CORE_EXPORT LocalFrame final : pub
+@@ -543,7 +544,9 @@ class CORE_EXPORT LocalFrame final
  
    SmoothScrollSequencer& GetSmoothScrollSequencer();
  
@@ -191,7 +112,7 @@
  #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
+@@ -55,8 +56,10 @@ class CORE_EXPORT ReportingContext : pub
    // Counts the use of a report type via UseCounter.
    void CountReport(Report*);
  
@@ -202,7 +123,7 @@
  
    void NotifyInternal(Report* report);
    // Send |report| via the Reporting API to |endpoint|.
-@@ -67,8 +70,10 @@ class CORE_EXPORT ReportingContext : pub
+@@ -68,8 +71,10 @@ class CORE_EXPORT ReportingContext : pub
  
    // This is declared mutable so that the service endpoint can be cached by
    // const methods.

patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch

@@ -14,7 +14,7 @@
  }
 --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
 +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
-@@ -360,6 +360,7 @@ void InlineSigninHelper::OnClientOAuthSu
+@@ -359,6 +359,7 @@ void InlineSigninHelper::OnClientOAuthSu
      const ClientOAuthResult& result,
      Profile* /*profile*/,
      Profile::CreateStatus /*status*/) {
@@ -22,7 +22,7 @@
    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
+@@ -435,6 +436,7 @@ void InlineSigninHelper::OnClientOAuthSu
    }
  
    base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);

patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -1965,7 +1965,6 @@ static_library("browser") {
+@@ -1957,7 +1957,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",
@@ -10,7 +10,7 @@
      "//chrome/browser/new_tab_page/modules/task_module:mojo_bindings",
      "//chrome/browser/notifications",
      "//chrome/browser/notifications/scheduler:factory",
-@@ -3760,9 +3759,6 @@ static_library("browser") {
+@@ -3778,9 +3777,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",
@@ -20,7 +20,7 @@
        "enterprise/connectors/analysis/content_analysis_dialog.cc",
        "enterprise/connectors/analysis/content_analysis_dialog.h",
        "enterprise/connectors/analysis/content_analysis_downloads_delegate.cc",
-@@ -4003,10 +3999,6 @@ static_library("browser") {
+@@ -4023,10 +4019,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",
@@ -31,7 +31,7 @@
        "new_tab_page/modules/task_module/task_module_handler.cc",
        "new_tab_page/modules/task_module/task_module_handler.h",
        "new_tab_page/modules/task_module/task_module_service.cc",
-@@ -7108,9 +7100,14 @@ static_library("browser") {
+@@ -7201,9 +7193,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",
@@ -63,7 +63,7 @@
    auto delegate = std::make_unique<AccuracyServiceDelegate>(profile);
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -4229,11 +4229,13 @@ ChromeContentBrowserClient::CreateThrott
+@@ -4252,11 +4252,13 @@ ChromeContentBrowserClient::CreateThrott
                     &throttles);
  #endif
  
@@ -77,7 +77,7 @@
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
-@@ -5645,26 +5647,7 @@ ChromeContentBrowserClient::GetSafeBrows
+@@ -5657,26 +5659,7 @@ ChromeContentBrowserClient::GetSafeBrows
      const std::vector<std::string>& allowlist_domains) {
    DCHECK_CURRENTLY_ON(BrowserThread::IO);
  
@@ -105,7 +105,7 @@
  }
  
  safe_browsing::RealTimeUrlLookupServiceBase*
-@@ -5685,11 +5668,6 @@ ChromeContentBrowserClient::GetUrlLookup
+@@ -5697,11 +5680,6 @@ ChromeContentBrowserClient::GetUrlLookup
          GetForProfile(profile);
    }
  #endif
@@ -119,7 +119,7 @@
  
 --- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
 +++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
-@@ -139,45 +139,6 @@ void MaybeCreateSafeBrowsingForRenderer(
+@@ -143,45 +143,6 @@ void MaybeCreateSafeBrowsingForRenderer(
          const std::vector<std::string>& allowlist_domains)>
          get_checker_delegate,
      mojo::PendingReceiver<safe_browsing::mojom::SafeBrowsing> receiver) {
@@ -165,9 +165,9 @@
  }
  
  // BadgeManager is not used for Android.
---- a/chrome/browser/component_updater/client_side_phishing_component_installer.cc
-+++ b/chrome/browser/component_updater/client_side_phishing_component_installer.cc
-@@ -36,20 +36,6 @@ const char kClientSidePhishingManifestNa
+--- a/chrome/browser/component_updater/chrome_client_side_phishing_component_installer.cc
++++ b/chrome/browser/component_updater/chrome_client_side_phishing_component_installer.cc
+@@ -30,20 +30,6 @@ namespace {
  
  void LoadFromDisk(const base::FilePath& pb_path,
                    const base::FilePath& visual_tflite_model_path) {
@@ -187,9 +187,9 @@
 -      ->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 {
+ void PopulateModelFromFiles(const base::FilePath& install_dir) {
+@@ -57,9 +43,6 @@ void PopulateModelFromFiles(const base::
+ update_client::InstallerAttributes GetInstallerAttributes() {
    update_client::InstallerAttributes attributes;
  
 -  // Pass the tag parameter to the installer as the "tag" attribute; it will
@@ -200,7 +200,7 @@
  
 --- a/chrome/browser/download/chrome_download_manager_delegate.cc
 +++ b/chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -135,7 +135,6 @@ using content::DownloadManager;
+@@ -134,7 +134,6 @@ using content::DownloadManager;
  using download::DownloadItem;
  using download::DownloadPathReservationTracker;
  using download::PathValidationResult;
@@ -208,7 +208,7 @@
  using safe_browsing::DownloadProtectionService;
  using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
  
-@@ -1527,8 +1526,6 @@ void ChromeDownloadManagerDelegate::OnDo
+@@ -1526,8 +1525,6 @@ void ChromeDownloadManagerDelegate::OnDo
      if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
        DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
  #endif
@@ -217,7 +217,7 @@
    }
    if (ShouldBlockFile(target_info->danger_type, item)) {
      MaybeReportDangerousDownloadBlocked(
-@@ -1680,7 +1677,6 @@ void ChromeDownloadManagerDelegate::Mayb
+@@ -1679,7 +1676,6 @@ void ChromeDownloadManagerDelegate::Mayb
      service->MaybeSendDangerousDownloadOpenedReport(download,
                                                      show_download_in_folder);
    }
@@ -225,7 +225,7 @@
    if (!download->GetAutoOpened()) {
      download::DownloadContent download_content =
          download::DownloadContentFromMimeType(download->GetMimeType(), false);
-@@ -1688,6 +1684,7 @@ void ChromeDownloadManagerDelegate::Mayb
+@@ -1687,6 +1683,7 @@ void ChromeDownloadManagerDelegate::Mayb
          download->GetDangerType(), download_content, base::Time::Now(),
          download->GetEndTime(), show_download_in_folder);
    }
@@ -233,7 +233,7 @@
  }
  
  void ChromeDownloadManagerDelegate::CheckDownloadAllowed(
-@@ -1764,30 +1761,6 @@ void ChromeDownloadManagerDelegate::Chec
+@@ -1763,30 +1760,6 @@ void ChromeDownloadManagerDelegate::Chec
      std::move(callback).Run(true);
      return;
    }
@@ -331,7 +331,7 @@
  #include "components/policy/core/browser/url_util.h"
 --- a/chrome/browser/enterprise/connectors/connectors_service.cc
 +++ b/chrome/browser/enterprise/connectors/connectors_service.cc
-@@ -475,19 +475,6 @@ absl::optional<std::string> ConnectorsSe
+@@ -459,19 +459,6 @@ absl::optional<std::string> ConnectorsSe
    return absl::nullopt;
  }
  
@@ -353,7 +353,7 @@
  }
 --- a/chrome/browser/enterprise/connectors/connectors_service.h
 +++ b/chrome/browser/enterprise/connectors/connectors_service.h
-@@ -78,12 +78,6 @@ class ConnectorsService : public KeyedSe
+@@ -79,12 +79,6 @@ class ConnectorsService : public KeyedSe
    // is no token to use.
    absl::optional<std::string> GetDMTokenForRealTimeUrlCheck() const;
  
@@ -368,7 +368,7 @@
    // precedence.
 --- a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc
 +++ b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc
-@@ -32,9 +32,6 @@ void CommonSignalsDecorator::Decorate(Si
+@@ -41,9 +41,6 @@ void CommonSignalsDecorator::Decorate(Si
    // Get signals from policy values.
    signals.set_built_in_dns_client_enabled(
        enterprise_signals::utils::GetBuiltInDnsClientEnabled(local_state_));
@@ -378,7 +378,7 @@
  
    absl::optional<bool> third_party_blocking_enabled =
        enterprise_signals::utils::GetThirdPartyBlockingEnabled(local_state_);
-@@ -49,15 +46,6 @@ void CommonSignalsDecorator::Decorate(Si
+@@ -58,15 +55,6 @@ void CommonSignalsDecorator::Decorate(Si
      signals.set_chrome_cleanup_enabled(chrome_cleanup_enabled.value());
    }
  
@@ -391,12 +391,12 @@
 -        static_cast<int32_t>(password_protection_warning_trigger.value()));
 -  }
 -
-   auto callback =
-       base::BindOnce(&CommonSignalsDecorator::OnHardwareInfoRetrieved,
-                      weak_ptr_factory_.GetWeakPtr(), std::ref(signals),
+   if (cached_device_model_ && cached_device_manufacturer_) {
+     UpdateFromCache(signals);
+     LogSignalsCollectionLatency(kLatencyHistogramWithCacheVariant, start_time);
 --- a/chrome/browser/enterprise/signals/context_info_fetcher.cc
 +++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc
-@@ -169,7 +169,6 @@ void ContextInfoFetcher::Fetch(ContextIn
+@@ -199,7 +199,6 @@ void ContextInfoFetcher::Fetch(ContextIn
        GetAnalysisConnectorProviders(enterprise_connectors::FILE_DOWNLOADED);
    info.on_bulk_data_entry_providers =
        GetAnalysisConnectorProviders(enterprise_connectors::BULK_DATA_ENTRY);
@@ -404,7 +404,7 @@
    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
+@@ -257,11 +256,6 @@ std::vector<std::string> ContextInfoFetc
    return connectors_service_->GetAnalysisServiceProviderNames(connector);
  }
  
@@ -426,7 +426,7 @@
  #include <vector>
  
  #include "base/callback_forward.h"
-@@ -37,7 +38,6 @@ struct ContextInfo {
+@@ -38,7 +39,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;
@@ -434,7 +434,7 @@
    std::string browser_version;
    safe_browsing::SafeBrowsingState safe_browsing_protection_level;
    bool site_isolation_enabled;
-@@ -88,7 +88,6 @@ class ContextInfoFetcher {
+@@ -89,7 +89,6 @@ class ContextInfoFetcher {
    std::vector<std::string> GetAnalysisConnectorProviders(
        enterprise_connectors::AnalysisConnector connector);
  
@@ -502,7 +502,7 @@
  }  // namespace utils
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
-@@ -646,8 +646,6 @@ static_library("extensions") {
+@@ -642,8 +642,6 @@ static_library("extensions") {
      "menu_manager_factory.h",
      "navigation_observer.cc",
      "navigation_observer.h",
@@ -533,7 +533,7 @@
  
 --- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
 +++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
-@@ -326,6 +326,7 @@ void SafeBrowsingPrivateEventRouter::OnD
+@@ -340,6 +340,7 @@ void SafeBrowsingPrivateEventRouter::OnD
      event_router_->BroadcastEvent(std::move(extension_event));
    }
  
@@ -541,7 +541,7 @@
    absl::optional<enterprise_connectors::ReportingSettings> settings =
        GetReportingSettings();
    if (!settings.has_value() ||
-@@ -356,6 +357,7 @@ void SafeBrowsingPrivateEventRouter::OnD
+@@ -370,6 +371,7 @@ void SafeBrowsingPrivateEventRouter::OnD
  
    ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()),
                        std::move(event));
@@ -549,7 +549,7 @@
  }
  
  void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialShown(
-@@ -383,6 +385,7 @@ void SafeBrowsingPrivateEventRouter::OnS
+@@ -397,6 +399,7 @@ void SafeBrowsingPrivateEventRouter::OnS
      event_router_->BroadcastEvent(std::move(extension_event));
    }
  
@@ -557,7 +557,7 @@
    absl::optional<enterprise_connectors::ReportingSettings> settings =
        GetReportingSettings();
    if (!settings.has_value() ||
-@@ -406,6 +409,7 @@ void SafeBrowsingPrivateEventRouter::OnS
+@@ -420,6 +423,7 @@ void SafeBrowsingPrivateEventRouter::OnS
  
    ReportRealtimeEvent(kKeyInterstitialEvent, std::move(settings.value()),
                        std::move(event));
@@ -565,7 +565,7 @@
  }
  
  void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialProceeded(
-@@ -433,6 +437,7 @@ void SafeBrowsingPrivateEventRouter::OnS
+@@ -447,6 +451,7 @@ void SafeBrowsingPrivateEventRouter::OnS
      event_router_->BroadcastEvent(std::move(extension_event));
    }
  
@@ -573,7 +573,7 @@
    absl::optional<enterprise_connectors::ReportingSettings> settings =
        GetReportingSettings();
    if (!settings.has_value() ||
-@@ -452,6 +457,7 @@ void SafeBrowsingPrivateEventRouter::OnS
+@@ -466,6 +471,7 @@ void SafeBrowsingPrivateEventRouter::OnS
  
    ReportRealtimeEvent(kKeyInterstitialEvent, std::move(settings.value()),
                        std::move(event));
@@ -581,7 +581,7 @@
  }
  
  void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorResult(
-@@ -465,6 +471,7 @@ void SafeBrowsingPrivateEventRouter::OnA
+@@ -479,6 +485,7 @@ void SafeBrowsingPrivateEventRouter::OnA
      const enterprise_connectors::ContentAnalysisResponse::Result& result,
      const int64_t content_size,
      safe_browsing::EventResult event_result) {
@@ -589,7 +589,7 @@
    if (result.tag() == "malware") {
      DCHECK_EQ(1, result.triggered_rules().size());
      OnDangerousDeepScanningResult(
-@@ -476,6 +483,7 @@ void SafeBrowsingPrivateEventRouter::OnA
+@@ -490,6 +497,7 @@ void SafeBrowsingPrivateEventRouter::OnA
      OnSensitiveDataEvent(url, file_name, download_digest_sha256, mime_type,
                           trigger, scan_id, result, content_size, event_result);
    }
@@ -597,7 +597,7 @@
  }
  
  void SafeBrowsingPrivateEventRouter::OnDangerousDeepScanningResult(
-@@ -491,6 +499,7 @@ void SafeBrowsingPrivateEventRouter::OnD
+@@ -505,6 +513,7 @@ void SafeBrowsingPrivateEventRouter::OnD
      const std::string& malware_category,
      const std::string& evidence_locker_filepath,
      const std::string& scan_id) {
@@ -605,7 +605,7 @@
    absl::optional<enterprise_connectors::ReportingSettings> settings =
        GetReportingSettings();
    if (!settings.has_value() ||
-@@ -528,6 +537,7 @@ void SafeBrowsingPrivateEventRouter::OnD
+@@ -542,6 +551,7 @@ void SafeBrowsingPrivateEventRouter::OnD
  
    ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()),
                        std::move(event));
@@ -613,7 +613,7 @@
  }
  
  void SafeBrowsingPrivateEventRouter::OnSensitiveDataEvent(
-@@ -540,6 +550,7 @@ void SafeBrowsingPrivateEventRouter::OnS
+@@ -554,6 +564,7 @@ void SafeBrowsingPrivateEventRouter::OnS
      const enterprise_connectors::ContentAnalysisResponse::Result& result,
      const int64_t content_size,
      safe_browsing::EventResult event_result) {
@@ -621,7 +621,7 @@
    absl::optional<enterprise_connectors::ReportingSettings> settings =
        GetReportingSettings();
    if (!settings.has_value() ||
-@@ -572,6 +583,7 @@ void SafeBrowsingPrivateEventRouter::OnS
+@@ -586,6 +597,7 @@ void SafeBrowsingPrivateEventRouter::OnS
  
    ReportRealtimeEvent(kKeySensitiveDataEvent, std::move(settings.value()),
                        std::move(event));
@@ -629,7 +629,7 @@
  }
  
  void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorWarningBypassed(
-@@ -584,6 +596,7 @@ void SafeBrowsingPrivateEventRouter::OnA
+@@ -598,6 +610,7 @@ void SafeBrowsingPrivateEventRouter::OnA
      safe_browsing::DeepScanAccessPoint access_point,
      const enterprise_connectors::ContentAnalysisResponse::Result& result,
      const int64_t content_size) {
@@ -637,7 +637,7 @@
    absl::optional<enterprise_connectors::ReportingSettings> settings =
        GetReportingSettings();
    if (!settings.has_value() ||
-@@ -616,6 +629,7 @@ void SafeBrowsingPrivateEventRouter::OnA
+@@ -630,6 +643,7 @@ void SafeBrowsingPrivateEventRouter::OnA
  
    ReportRealtimeEvent(kKeySensitiveDataEvent, std::move(settings.value()),
                        std::move(event));
@@ -645,7 +645,7 @@
  }
  
  void SafeBrowsingPrivateEventRouter::OnUnscannedFileEvent(
-@@ -628,6 +642,7 @@ void SafeBrowsingPrivateEventRouter::OnU
+@@ -642,6 +656,7 @@ void SafeBrowsingPrivateEventRouter::OnU
      const std::string& reason,
      const int64_t content_size,
      safe_browsing::EventResult event_result) {
@@ -653,7 +653,7 @@
    absl::optional<enterprise_connectors::ReportingSettings> settings =
        GetReportingSettings();
    if (!settings.has_value() ||
-@@ -654,6 +669,7 @@ void SafeBrowsingPrivateEventRouter::OnU
+@@ -668,6 +683,7 @@ void SafeBrowsingPrivateEventRouter::OnU
  
    ReportRealtimeEvent(kKeyUnscannedFileEvent, std::move(settings.value()),
                        std::move(event));
@@ -661,7 +661,7 @@
  }
  
  void SafeBrowsingPrivateEventRouter::OnDangerousDownloadEvent(
-@@ -679,6 +695,7 @@ void SafeBrowsingPrivateEventRouter::OnD
+@@ -693,6 +709,7 @@ void SafeBrowsingPrivateEventRouter::OnD
      const std::string& scan_id,
      const int64_t content_size,
      safe_browsing::EventResult event_result) {
@@ -669,7 +669,7 @@
    absl::optional<enterprise_connectors::ReportingSettings> settings =
        GetReportingSettings();
    if (!settings.has_value() ||
-@@ -709,6 +726,7 @@ void SafeBrowsingPrivateEventRouter::OnD
+@@ -723,6 +740,7 @@ void SafeBrowsingPrivateEventRouter::OnD
  
    ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()),
                        std::move(event));
@@ -677,7 +677,7 @@
  }
  
  void SafeBrowsingPrivateEventRouter::OnDangerousDownloadWarningBypassed(
-@@ -732,6 +750,7 @@ void SafeBrowsingPrivateEventRouter::OnD
+@@ -746,6 +764,7 @@ void SafeBrowsingPrivateEventRouter::OnD
      const std::string& mime_type,
      const std::string& scan_id,
      const int64_t content_size) {
@@ -685,7 +685,7 @@
    absl::optional<enterprise_connectors::ReportingSettings> settings =
        GetReportingSettings();
    if (!settings.has_value() ||
-@@ -762,6 +781,7 @@ void SafeBrowsingPrivateEventRouter::OnD
+@@ -776,6 +795,7 @@ void SafeBrowsingPrivateEventRouter::OnD
  
    ReportRealtimeEvent(kKeyDangerousDownloadEvent, std::move(settings.value()),
                        std::move(event));
@@ -693,7 +693,7 @@
  }
  
  void SafeBrowsingPrivateEventRouter::OnLoginEvent(
-@@ -1087,7 +1107,11 @@ void SafeBrowsingPrivateEventRouter::Rep
+@@ -1101,7 +1121,11 @@ void SafeBrowsingPrivateEventRouter::Rep
  }
  
  std::string SafeBrowsingPrivateEventRouter::GetProfileUserName() const {
@@ -705,6 +705,24 @@
  }
  
  #if BUILDFLAG(IS_CHROMEOS_ASH)
+--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
++++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
+@@ -600,15 +600,6 @@ void ChromeExtensionsBrowserClient::Noti
+     content::BrowserContext* context,
+     const ExtensionId& extension_id,
+     const std::string& code) const {
+-  auto* telemetry_service =
+-      safe_browsing::ExtensionTelemetryServiceFactory::GetForProfile(
+-          Profile::FromBrowserContext(context));
+-  if (!telemetry_service || !telemetry_service->enabled())
+-    return;
+-
+-  auto signal = std::make_unique<safe_browsing::TabsExecuteScriptSignal>(
+-      extension_id, code);
+-  telemetry_service->AddSignal(std::move(signal));
+ }
+ 
+ // static
 --- a/chrome/browser/extensions/extension_service.cc
 +++ b/chrome/browser/extensions/extension_service.cc
 @@ -52,7 +52,6 @@
@@ -731,7 +749,7 @@
        registry_(ExtensionRegistry::Get(profile)),
        pending_extension_manager_(profile),
        install_directory_(install_directory),
-@@ -851,100 +848,6 @@ bool ExtensionService::IsExtensionEnable
+@@ -857,100 +854,6 @@ bool ExtensionService::IsExtensionEnable
    return extension_registrar_.IsExtensionEnabled(extension_id);
  }
  
@@ -842,7 +860,7 @@
  #include "chrome/browser/extensions/pending_extension_manager.h"
  #include "chrome/browser/extensions/safe_browsing_verdict_handler.h"
  #include "chrome/browser/profiles/profile_manager.h"
-@@ -267,40 +266,11 @@ class ExtensionService : public Extensio
+@@ -271,40 +270,11 @@ class ExtensionService : public Extensio
    // nothing.
    void EnableExtension(const std::string& extension_id);
  
@@ -883,14 +901,14 @@
    // 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
-@@ -636,8 +606,6 @@ class ExtensionService : public Extensio
+@@ -640,8 +610,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;
+   raw_ptr<ExtensionRegistry> registry_ = nullptr;
  
 --- a/chrome/browser/extensions/extension_system_impl.cc
 +++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -948,7 +966,7 @@
  #include "chrome/browser/ui/file_system_access_dialogs.h"
  #include "chrome/common/chrome_paths.h"
  #include "components/content_settings/core/browser/host_content_settings_map.h"
-@@ -301,83 +299,6 @@ BindResultCallbackToCurrentSequence(
+@@ -304,83 +302,6 @@ BindResultCallbackToCurrentSequence(
        base::SequencedTaskRunnerHandle::Get(), std::move(callback));
  }
  
@@ -1032,7 +1050,7 @@
  std::string GenerateLastPickedDirectoryKey(const std::string& id) {
    return id.empty() ? kDefaultLastPickedDirectoryKey
                      : base::StrCat({kCustomLastPickedDirectoryKey, "-", id});
-@@ -1130,28 +1051,6 @@ void ChromeFileSystemAccessPermissionCon
+@@ -1133,28 +1054,6 @@ void ChromeFileSystemAccessPermissionCon
                       std::move(callback)));
  }
  
@@ -1063,7 +1081,7 @@
          const url::Origin& origin,
 --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
 +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
-@@ -85,10 +85,6 @@ class ChromeFileSystemAccessPermissionCo
+@@ -86,10 +86,6 @@ class ChromeFileSystemAccessPermissionCo
        HandleType handle_type,
        content::GlobalRenderFrameHostId frame_id,
        base::OnceCallback<void(SensitiveDirectoryResult)> callback) override;
@@ -1076,7 +1094,7 @@
  
 --- a/chrome/browser/media/webrtc/display_media_access_handler.cc
 +++ b/chrome/browser/media/webrtc/display_media_access_handler.cc
-@@ -25,6 +25,7 @@
+@@ -24,6 +24,7 @@
  #include "chrome/browser/safe_browsing/user_interaction_observer.h"
  #include "chrome/common/pref_names.h"
  #include "components/prefs/pref_service.h"
@@ -1084,7 +1102,7 @@
  #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
+@@ -106,6 +107,7 @@ void DisplayMediaAccessHandler::HandleRe
      return;
    }
  
@@ -1092,7 +1110,7 @@
    // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
    // warnings until user interaction. If the current page has a delayed warning,
    // it'll have a user interaction observer attached. Show the warning
-@@ -125,6 +127,7 @@ void DisplayMediaAccessHandler::HandleRe
+@@ -120,6 +122,7 @@ void DisplayMediaAccessHandler::HandleRe
      observer->OnDesktopCaptureRequest();
      return;
    }
@@ -1100,17 +1118,33 @@
  
  #if defined(OS_MAC)
    // Do not allow picker UI to be shown on a page that isn't in the foreground
+--- a/chrome/browser/notifications/notification_display_service_impl.cc
++++ b/chrome/browser/notifications/notification_display_service_impl.cc
+@@ -88,13 +88,6 @@ NotificationDisplayServiceImpl::Notifica
+             profile_));
+ #endif
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
+-    defined(OS_WIN)
+-    AddNotificationHandler(
+-        NotificationHandler::Type::TAILORED_SECURITY,
+-        std::make_unique<safe_browsing::TailoredSecurityNotificationHandler>());
+-#endif
+-
+ #if BUILDFLAG(ENABLE_EXTENSIONS)
+     AddNotificationHandler(
+         NotificationHandler::Type::EXTENSION,
 --- a/chrome/browser/password_manager/chrome_password_manager_client.cc
 +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -33,7 +33,6 @@
- #include "chrome/browser/password_manager/password_reuse_manager_factory.h"
+@@ -35,7 +35,6 @@
+ #include "chrome/browser/password_manager/password_scripts_fetcher_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 @@
+@@ -112,11 +111,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"
@@ -1123,7 +1157,7 @@
  
  #if defined(OS_ANDROID)
  #include "chrome/browser/android/tab_android.h"
-@@ -828,6 +827,7 @@ autofill::LanguageCode ChromePasswordMan
+@@ -830,6 +829,7 @@ autofill::LanguageCode ChromePasswordMan
    return autofill::LanguageCode();
  }
  
@@ -1131,7 +1165,7 @@
  safe_browsing::PasswordProtectionService*
  ChromePasswordManagerClient::GetPasswordProtectionService() const {
    return safe_browsing::ChromePasswordProtectionService::
-@@ -838,13 +838,6 @@ ChromePasswordManagerClient::GetPassword
+@@ -840,13 +840,6 @@ ChromePasswordManagerClient::GetPassword
  void ChromePasswordManagerClient::CheckSafeBrowsingReputation(
      const GURL& form_action,
      const GURL& frame_url) {
@@ -1145,7 +1179,7 @@
  }
  #endif  // defined(ON_FOCUS_PING_ENABLED)
  
-@@ -854,22 +847,10 @@ void ChromePasswordManagerClient::CheckP
+@@ -856,22 +849,10 @@ void ChromePasswordManagerClient::CheckP
      const std::vector<password_manager::MatchingReusedCredential>&
          matching_reused_credentials,
      bool password_field_exists) {
@@ -1169,7 +1203,7 @@
  }
  
  #if !defined(OS_ANDROID)
-@@ -1383,9 +1364,11 @@ void ChromePasswordManagerClient::OnPast
+@@ -1390,9 +1371,11 @@ void ChromePasswordManagerClient::OnPast
    }
  
    was_on_paste_called_ = true;
@@ -1182,7 +1216,7 @@
  
  void ChromePasswordManagerClient::RenderFrameCreated(
      content::RenderFrameHost* render_frame_host) {
-@@ -1420,7 +1403,9 @@ void ChromePasswordManagerClient::OnInpu
+@@ -1427,7 +1410,9 @@ void ChromePasswordManagerClient::OnInpu
    if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
      OnPaste();
    } else {
@@ -1192,7 +1226,7 @@
    }
  #endif  // defined(OS_ANDROID)
  }
-@@ -1459,6 +1444,7 @@ bool ChromePasswordManagerClient::IsPass
+@@ -1466,6 +1451,7 @@ bool ChromePasswordManagerClient::IsPass
      is_enabled = false;
    }
  
@@ -1200,7 +1234,7 @@
    // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
    // warnings until user interaction. If the current page has a delayed warning,
    // it'll have a user interaction observer attached. Disable password
-@@ -1469,6 +1455,7 @@ bool ChromePasswordManagerClient::IsPass
+@@ -1476,6 +1462,7 @@ bool ChromePasswordManagerClient::IsPass
      observer->OnPasswordSaveOrAutofillDenied();
      is_enabled = false;
    }
@@ -1210,7 +1244,7 @@
      password_manager::BrowserSavePasswordProgressLogger logger(
 --- a/chrome/browser/password_manager/chrome_password_manager_client.h
 +++ b/chrome/browser/password_manager/chrome_password_manager_client.h
-@@ -207,13 +207,14 @@ class ChromePasswordManagerClient
+@@ -204,13 +204,14 @@ class ChromePasswordManagerClient
    void AnnotateNavigationEntry(bool has_password_field) override;
    autofill::LanguageCode GetPageLanguage() const override;
  
@@ -1226,7 +1260,7 @@
  
    void CheckProtectedPasswordEntry(
        password_manager::metrics_util::PasswordType reused_password_type,
-@@ -221,6 +222,7 @@ class ChromePasswordManagerClient
+@@ -218,6 +219,7 @@ class ChromePasswordManagerClient
        const std::vector<password_manager::MatchingReusedCredential>&
            matching_reused_credentials,
        bool password_field_exists) override;
@@ -1326,7 +1360,7 @@
  #include "chrome/browser/new_tab_page/modules/task_module/task_module_service.h"
  #include "chrome/browser/new_tab_page/promos/promo_service.h"
  #include "chrome/browser/search/background/ntp_custom_background_service.h"
-@@ -1294,7 +1293,6 @@ void RegisterProfilePrefs(user_prefs::Pr
+@@ -1283,7 +1282,6 @@ void RegisterProfilePrefs(user_prefs::Pr
    NewTabPageHandler::RegisterProfilePrefs(registry);
    NewTabPageUI::RegisterProfilePrefs(registry);
    NewTabUI::RegisterProfilePrefs(registry);
@@ -1334,9 +1368,19 @@
    ntp_tiles::CustomLinksManagerImpl::RegisterProfilePrefs(registry);
    PhotosService::RegisterProfilePrefs(registry);
    PinnedTabCodec::RegisterProfilePrefs(registry);
+--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
++++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+@@ -506,7 +506,6 @@ void ChromeBrowserMainExtraPartsProfiles
+     SystemExtensionsProviderFactory::GetInstance();
+ #endif
+   TabRestoreServiceFactory::GetInstance();
+-  safe_browsing::TailoredSecurityServiceFactory::GetInstance();
+   TemplateURLFetcherFactory::GetInstance();
+   TemplateURLServiceFactory::GetInstance();
+ #if !defined(OS_ANDROID)
 --- a/chrome/browser/reputation/reputation_service.cc
 +++ b/chrome/browser/reputation/reputation_service.cc
-@@ -120,9 +120,7 @@ void ReputationService::GetReputationSta
+@@ -119,9 +119,7 @@ void ReputationService::GetReputationSta
                                              ReputationCheckCallback callback) {
    DCHECK(url.SchemeIsHTTPOrHTTPS());
  
@@ -1425,9 +1469,9 @@
  }  // namespace
  
  std::unique_ptr<SSLBlockingPage>
-@@ -192,10 +183,6 @@ ChromeSecurityBlockingPageFactory::Creat
-     }
-   }
+@@ -174,10 +165,6 @@ ChromeSecurityBlockingPageFactory::Creat
+           Profile::FromBrowserContext(web_contents->GetBrowserContext()));
+   state->DidDisplayErrorPage(cert_error);
  
 -  LogSafeBrowsingSecuritySensitiveAction(
 -      safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
@@ -1436,18 +1480,7 @@
    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
+@@ -247,10 +234,6 @@ ChromeSecurityBlockingPageFactory::Creat
      std::unique_ptr<SSLCertReporter> ssl_cert_reporter,
      const net::SSLInfo& ssl_info,
      const std::string& mitm_software_name) {
@@ -1458,7 +1491,7 @@
    auto page = std::make_unique<MITMSoftwareBlockingPage>(
        web_contents, cert_error, request_url, std::move(ssl_cert_reporter),
        /*can_show_enhanced_protection_message=*/true, ssl_info,
-@@ -314,10 +293,6 @@ ChromeSecurityBlockingPageFactory::Creat
+@@ -272,10 +255,6 @@ ChromeSecurityBlockingPageFactory::Creat
      const GURL& request_url,
      std::unique_ptr<SSLCertReporter> ssl_cert_reporter,
      const net::SSLInfo& ssl_info) {
@@ -1512,7 +1545,7 @@
  }  // namespace
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -533,7 +533,6 @@ static_library("ui") {
+@@ -544,7 +544,6 @@ static_library("ui") {
      "//components/renderer_context_menu",
      "//components/resources",
      "//components/safe_browsing/content/browser",
@@ -1520,7 +1553,7 @@
      "//components/safe_browsing/content/browser/password_protection",
      "//components/safe_browsing/content/browser/web_ui",
      "//components/safe_browsing/core/browser/db:database_manager",
-@@ -4397,8 +4396,6 @@ static_library("ui") {
+@@ -4499,8 +4498,6 @@ static_library("ui") {
        "views/safe_browsing/password_reuse_modal_warning_dialog.h",
        "views/safe_browsing/prompt_for_scanning_modal_dialog.cc",
        "views/safe_browsing/prompt_for_scanning_modal_dialog.h",
@@ -1628,7 +1661,7 @@
  }
 --- a/chrome/browser/ui/views/download/download_item_view.cc
 +++ b/chrome/browser/ui/views/download/download_item_view.cc
-@@ -837,9 +837,7 @@ void DownloadItemView::UpdateLabels() {
+@@ -838,9 +838,7 @@ void DownloadItemView::UpdateLabels() {
    deep_scanning_label_->SetVisible(mode_ ==
                                     download::DownloadItemMode::kDeepScanning);
    if (deep_scanning_label_->GetVisible()) {
@@ -1639,7 +1672,7 @@
                         ? 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() {
+@@ -887,11 +885,15 @@ void DownloadItemView::UpdateButtons() {
    }
  
    const bool allow_open_during_deep_scan =
@@ -1655,7 +1688,7 @@
    open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) ||
                             prompt_to_scan || allow_open_during_deep_scan);
  
-@@ -1427,7 +1429,9 @@ void DownloadItemView::ShowContextMenuIm
+@@ -1428,7 +1430,9 @@ void DownloadItemView::ShowContextMenuIm
  }
  
  void DownloadItemView::OpenDownloadDuringAsyncScanning() {
@@ -1692,7 +1725,7 @@
  
 --- a/chrome/browser/webshare/share_service_impl.cc
 +++ b/chrome/browser/webshare/share_service_impl.cc
-@@ -14,7 +14,9 @@
+@@ -15,7 +15,9 @@
  #include "chrome/browser/browser_process.h"
  #include "chrome/browser/safe_browsing/safe_browsing_service.h"
  #include "chrome/common/chrome_features.h"
@@ -1702,7 +1735,7 @@
  #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::
+@@ -195,11 +197,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);
@@ -1716,7 +1749,7 @@
  
      // In the case where the original blob handle was to a native file (of
      // unknown size), the serialized data does not contain an accurate file
-@@ -196,6 +200,7 @@ void ShareServiceImpl::Share(const std::
+@@ -209,6 +213,7 @@ void ShareServiceImpl::Share(const std::
    }
  
    DCHECK(!safe_browsing_request_);
@@ -1724,7 +1757,7 @@
    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::
+@@ -218,6 +223,7 @@ void ShareServiceImpl::Share(const std::
                         std::move(files), std::move(callback)));
      return;
    }
@@ -1734,7 +1767,7 @@
                                 std::move(callback),
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -1205,7 +1205,6 @@ if (!is_android && !is_fuchsia) {
+@@ -1212,7 +1212,6 @@ if (!is_android && !is_fuchsia) {
        "//components/resources",
        "//components/safe_browsing:buildflags",
        "//components/safe_browsing/content/browser",
@@ -1742,7 +1775,7 @@
        "//components/safe_browsing/content/browser:safe_browsing_service",
        "//components/safe_browsing/content/browser/password_protection",
        "//components/safe_browsing/content/browser/password_protection:test_support",
-@@ -5405,7 +5404,6 @@ test("unit_tests") {
+@@ -5348,7 +5347,6 @@ test("unit_tests") {
      "//components/resources",
      "//components/safe_browsing:buildflags",
      "//components/safe_browsing/content/browser",
@@ -1763,7 +1796,7 @@
  }
 --- a/components/password_manager/core/browser/password_manager_client.h
 +++ b/components/password_manager/core/browser/password_manager_client.h
-@@ -339,11 +339,14 @@ class PasswordManagerClient {
+@@ -340,11 +340,14 @@ class PasswordManagerClient {
    // Returns the current best guess as to the page's display language.
    virtual autofill::LanguageCode GetPageLanguage() const;
  
@@ -1779,7 +1812,7 @@
    // Checks the safe browsing reputation of the webpage when the
    // user focuses on a username/password field. This is used for reporting
    // only, and won't trigger a warning.
-@@ -351,6 +354,7 @@ class PasswordManagerClient {
+@@ -352,6 +355,7 @@ class PasswordManagerClient {
                                             const GURL& frame_url) = 0;
  #endif
  
@@ -1787,7 +1820,7 @@
    // Checks the safe browsing reputation of the webpage where password reuse
    // happens. This is called by the PasswordReuseDetectionManager when a
    // protected password is typed on the wrong domain. This may trigger a
-@@ -363,6 +367,7 @@ class PasswordManagerClient {
+@@ -364,6 +368,7 @@ class PasswordManagerClient {
        const std::string& username,
        const std::vector<MatchingReusedCredential>& matching_reused_credentials,
        bool password_field_exists) = 0;
@@ -1849,7 +1882,7 @@
    public_deps = [ "//google_apis:google_apis" ]
 --- a/content/browser/file_system_access/safe_move_helper.cc
 +++ b/content/browser/file_system_access/safe_move_helper.cc
-@@ -150,14 +150,8 @@ void SafeMoveHelper::Start(SafeMoveHelpe
+@@ -151,14 +151,8 @@ void SafeMoveHelper::Start(SafeMoveHelpe
      return;
    }
  
@@ -1864,7 +1897,7 @@
  }
  
  void SafeMoveHelper::ComputeHashForSourceFile(HashCallback callback) {
-@@ -177,38 +171,6 @@ void SafeMoveHelper::ComputeHashForSourc
+@@ -178,38 +172,6 @@ void SafeMoveHelper::ComputeHashForSourc
                       std::move(wrapped_callback), source_url()));
  }
  
@@ -1932,7 +1965,7 @@
    // possible to request one. This is used to block file dialogs from being
 --- a/extensions/browser/updater/update_service.cc
 +++ b/extensions/browser/updater/update_service.cc
-@@ -115,13 +115,6 @@ void UpdateService::OnEvent(Events event
+@@ -122,13 +122,6 @@ void UpdateService::OnEvent(Events event
        break;
    }
  

patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch

@@ -8,7 +8,7 @@
 -      "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}",
+-      "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:clientCacheTimeToLive}{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}",

patches/core/ungoogled-chromium/toggle-translation-via-switch.patch

@@ -1,7 +1,7 @@
 # Disables translation and removes the "Translate to" context menu when --translate-script-url flag is not set
 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
 +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -135,6 +135,7 @@
+@@ -136,6 +136,7 @@
  #include "components/spellcheck/common/spellcheck_common.h"
  #include "components/spellcheck/spellcheck_buildflags.h"
  #include "components/strings/grit/components_strings.h"
@@ -9,7 +9,7 @@
  #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"
-@@ -1767,6 +1768,8 @@ void RenderViewContextMenu::AppendPageIt
+@@ -1765,6 +1766,8 @@ void RenderViewContextMenu::AppendPageIt
      menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
    }
  
@@ -18,7 +18,7 @@
    ChromeTranslateClient* chrome_translate_client =
        ChromeTranslateClient::FromWebContents(embedder_web_contents_);
    const bool canTranslate =
-@@ -1788,6 +1791,7 @@ void RenderViewContextMenu::AppendPageIt
+@@ -1786,6 +1789,7 @@ void RenderViewContextMenu::AppendPageIt
          IDC_CONTENT_CONTEXT_TRANSLATE,
          l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_TRANSLATE, language));
    }

patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch

@@ -9,7 +9,7 @@
 
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2383,6 +2383,7 @@ static_library("browser") {
+@@ -2379,6 +2379,7 @@ static_library("browser") {
      "//third_party/libyuv",
      "//third_party/metrics_proto",
      "//third_party/re2",
@@ -19,7 +19,7 @@
      "//third_party/widevine/cdm:headers",
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -149,6 +149,7 @@
+@@ -148,6 +148,7 @@
  #include "components/translate/core/browser/translate_ranker_impl.h"
  #include "components/translate/core/common/translate_util.h"
  #include "components/ui_devtools/switches.h"
@@ -44,7 +44,7 @@
  #endif  // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -221,6 +221,7 @@ source_set("browser") {
+@@ -223,6 +223,7 @@ source_set("browser") {
      "//third_party/libyuv",
      "//third_party/re2",
      "//third_party/sqlite",
@@ -54,7 +54,7 @@
      "//third_party/zlib",
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -68,6 +68,7 @@
+@@ -69,6 +69,7 @@
  #include "components/services/storage/public/mojom/cache_storage_control.mojom.h"
  #include "components/services/storage/public/mojom/indexed_db_control.mojom.h"
  #include "components/tracing/common/tracing_switches.h"
@@ -62,7 +62,7 @@
  #include "components/viz/common/switches.h"
  #include "components/viz/host/gpu_client.h"
  #include "content/browser/bad_message.h"
-@@ -3429,6 +3430,8 @@ void RenderProcessHostImpl::PropagateBro
+@@ -3338,6 +3339,8 @@ void RenderProcessHostImpl::PropagateBro
      switches::kEnableWebGLDraftExtensions,
      switches::kEnableWebGLImageChromium,
      switches::kFileUrlPathAlias,
@@ -91,7 +91,7 @@
  #include "ui/accessibility/accessibility_features.h"
  #include "ui/base/ui_base_features.h"
  #include "ui/events/blink/blink_features.h"
-@@ -473,6 +474,10 @@ void SetRuntimeFeaturesFromCommandLine(c
+@@ -484,6 +485,10 @@ void SetRuntimeFeaturesFromCommandLine(c
        {wrf::EnableWebGPU, switches::kEnableUnsafeWebGPU, true},
        {wrf::ForceOverlayFullscreenVideo, switches::kForceOverlayFullscreenVideo,
         true},
@@ -104,7 +104,7 @@
      if (command_line.HasSwitch(mapping.switch_name))
 --- a/third_party/blink/public/platform/web_runtime_features.h
 +++ b/third_party/blink/public/platform/web_runtime_features.h
-@@ -218,6 +218,8 @@ class WebRuntimeFeatures {
+@@ -221,6 +221,8 @@ class WebRuntimeFeatures {
    BLINK_PLATFORM_EXPORT static void EnableMediaControlsExpandGesture(bool);
    BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
    BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
@@ -123,7 +123,7 @@
  #include "base/time/time.h"
  #include "cc/input/overscroll_behavior.h"
  #include "cc/input/scroll_snap_data.h"
-@@ -854,6 +855,14 @@ Range* Document::CreateRangeAdjustedToTr
+@@ -870,6 +871,14 @@ Range* Document::CreateRangeAdjustedToTr
                                       Position::BeforeNode(*shadow_host));
  }
  
@@ -138,7 +138,7 @@
  SelectorQueryCache& Document::GetSelectorQueryCache() {
    if (!selector_query_cache_)
      selector_query_cache_ = std::make_unique<SelectorQueryCache>();
-@@ -2138,6 +2147,15 @@ void Document::UpdateStyleAndLayoutTreeF
+@@ -2173,6 +2182,15 @@ void Document::UpdateStyleAndLayoutTreeF
  #if DCHECK_IS_ON()
    AssertLayoutTreeUpdated(*this, true /* allow_dirty_container_subtrees */);
  #endif
@@ -156,7 +156,7 @@
  void Document::InvalidateStyleAndLayoutForFontUpdates() {
 --- a/third_party/blink/renderer/core/dom/document.h
 +++ b/third_party/blink/renderer/core/dom/document.h
-@@ -454,6 +454,10 @@ class CORE_EXPORT Document : public Cont
+@@ -457,6 +457,10 @@ class CORE_EXPORT Document : public Cont
      has_xml_declaration_ = has_xml_declaration ? 1 : 0;
    }
  
@@ -167,7 +167,7 @@
    AtomicString visibilityState() const;
    bool IsPageVisible() const;
    bool hidden() const;
-@@ -2070,6 +2074,9 @@ class CORE_EXPORT Document : public Cont
+@@ -2086,6 +2090,9 @@ class CORE_EXPORT Document : public Cont
  
    base::ElapsedTimer start_time_;
  
@@ -179,7 +179,7 @@
    HeapVector<Member<ScriptElementBase>> current_script_stack_;
 --- a/third_party/blink/renderer/core/dom/element.cc
 +++ b/third_party/blink/renderer/core/dom/element.cc
-@@ -2119,6 +2119,11 @@ DOMRectList* Element::getClientRects() {
+@@ -2052,6 +2052,11 @@ DOMRectList* Element::getClientRects() {
    DCHECK(element_layout_object);
    GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
        quads, *element_layout_object);
@@ -191,7 +191,7 @@
    return MakeGarbageCollected<DOMRectList>(quads);
  }
  
-@@ -2136,6 +2141,9 @@ FloatRect Element::GetBoundingClientRect
+@@ -2069,6 +2074,9 @@ FloatRect Element::GetBoundingClientRect
    DCHECK(element_layout_object);
    GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
                                                          *element_layout_object);
@@ -266,7 +266,7 @@
                const TextDirection&,
 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
-@@ -912,9 +912,15 @@ TextMetrics* CanvasRenderingContext2D::m
+@@ -921,9 +921,15 @@ TextMetrics* CanvasRenderingContext2D::m
    TextDirection direction =
        ToTextDirection(GetState().GetDirection(), canvas());
  
@@ -285,7 +285,7 @@
  void CanvasRenderingContext2D::fillFormattedText(
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1688,6 +1688,7 @@ component("platform") {
+@@ -1684,6 +1684,7 @@ component("platform") {
      "//components/paint_preview/common",
      "//components/power_scheduler",
      "//components/search_engines:search_engine_utils",
@@ -295,7 +295,7 @@
      "//crypto",
 --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -685,4 +685,12 @@ void WebRuntimeFeatures::EnableCLSScroll
+@@ -697,4 +697,12 @@ void WebRuntimeFeatures::EnableCLSScroll
    RuntimeEnabledFeatures::SetCLSScrollAnchoringEnabled(enable);
  }
  
@@ -310,7 +310,7 @@
  }  // namespace blink
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1078,6 +1078,12 @@
+@@ -1102,6 +1102,12 @@
        origin_trial_feature_name: "Fledge",
      },
      {

patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch

@@ -34,7 +34,7 @@ approach to change color components.
  #endif  // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -3432,6 +3432,7 @@ void RenderProcessHostImpl::PropagateBro
+@@ -3341,6 +3341,7 @@ void RenderProcessHostImpl::PropagateBro
      switches::kFileUrlPathAlias,
      switches::kFingerprintingClientRectsNoise,
      switches::kFingerprintingCanvasMeasureTextNoise,
@@ -44,7 +44,7 @@ approach to change color components.
      switches::kForceGpuMemAvailableMb,
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -478,6 +478,8 @@ void SetRuntimeFeaturesFromCommandLine(c
+@@ -489,6 +489,8 @@ void SetRuntimeFeaturesFromCommandLine(c
         switches::kFingerprintingClientRectsNoise, true},
        {wrf::EnableFingerprintingCanvasMeasureTextNoise,
         switches::kFingerprintingCanvasMeasureTextNoise, true},
@@ -55,7 +55,7 @@ approach to change color components.
      if (command_line.HasSwitch(mapping.switch_name))
 --- a/third_party/blink/public/platform/web_runtime_features.h
 +++ b/third_party/blink/public/platform/web_runtime_features.h
-@@ -220,6 +220,7 @@ class WebRuntimeFeatures {
+@@ -223,6 +223,7 @@ class WebRuntimeFeatures {
    BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
    BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
    BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
@@ -72,8 +72,8 @@ approach to change color components.
 +#include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
  #include "third_party/blink/renderer/platform/graphics/stroke_data.h"
  #include "third_party/blink/renderer/platform/graphics/video_frame_image_util.h"
- #include "third_party/blink/renderer/platform/heap/heap.h"
-@@ -2332,6 +2333,9 @@ ImageData* BaseRenderingContext2D::getIm
+ #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
+@@ -2055,6 +2056,9 @@ ImageData* BaseRenderingContext2D::getIm
            snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();
        DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
      }
@@ -85,7 +85,7 @@ approach to change color components.
    return image_data;
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1646,7 +1646,9 @@ component("platform") {
+@@ -1641,7 +1641,9 @@ component("platform") {
      "//third_party/blink/renderer:non_test_config",
    ]
  
@@ -98,7 +98,7 @@ approach to change color components.
      "//third_party/blink/renderer/platform/blob",
 --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -693,4 +693,8 @@ void WebRuntimeFeatures::EnableFingerpri
+@@ -705,4 +705,8 @@ void WebRuntimeFeatures::EnableFingerpri
    RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable);
  }
  
@@ -151,10 +151,10 @@ approach to change color components.
  #include "third_party/skia/include/core/SkPaint.h"
  #include "third_party/skia/include/core/SkSurface.h"
 +#include "third_party/skia/include/private/SkColorData.h"
+ #include "ui/gfx/geometry/skia_conversions.h"
  #include "v8/include/v8.h"
  
- namespace blink {
-@@ -80,4 +84,154 @@ void StaticBitmapImage::DrawHelper(cc::P
+@@ -79,4 +83,154 @@ void StaticBitmapImage::DrawHelper(cc::P
        WebCoreClampingModeToSkiaRectConstraint(draw_options.clamping_mode));
  }
  
@@ -322,7 +322,7 @@ approach to change color components.
    // Methods overridden by all sub-classes
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1084,6 +1084,9 @@
+@@ -1108,6 +1108,9 @@
        name: "FingerprintingCanvasMeasureTextNoise",
      },
      {

patches/extra/bromite/flag-max-connections-per-host.patch

@@ -17,7 +17,7 @@ with limited CPU/memory resources and it is disabled by default.
 
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2138,6 +2138,7 @@ static_library("browser") {
+@@ -2134,6 +2134,7 @@ static_library("browser") {
      "//components/net_log",
      "//components/network_hints/common:mojo_bindings",
      "//components/network_session_configurator/browser",
@@ -49,12 +49,11 @@ with limited CPU/memory resources and it is disabled by default.
  #endif  // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -19,11 +19,13 @@
+@@ -19,10 +19,12 @@
  #include "base/debug/leak_annotations.h"
  #include "base/files/file_path.h"
  #include "base/location.h"
 +#include "base/logging.h"
- #include "base/macros.h"
  #include "base/memory/ptr_util.h"
  #include "base/metrics/histogram_macros.h"
  #include "base/path_service.h"
@@ -63,7 +62,7 @@ with limited CPU/memory resources and it is disabled by default.
  #include "base/synchronization/waitable_event.h"
  #include "base/task/single_thread_task_runner.h"
  #include "base/task/task_traits.h"
-@@ -104,6 +106,7 @@
+@@ -103,6 +105,7 @@
  #include "components/metrics/metrics_service.h"
  #include "components/metrics_services_manager/metrics_services_manager.h"
  #include "components/metrics_services_manager/metrics_services_manager_client.h"
@@ -71,7 +70,7 @@ with limited CPU/memory resources and it is disabled by default.
  #include "components/network_time/network_time_tracker.h"
  #include "components/permissions/permissions_client.h"
  #include "components/policy/core/common/policy_service.h"
-@@ -136,6 +139,7 @@
+@@ -135,6 +138,7 @@
  #include "media/media_buildflags.h"
  #include "mojo/public/cpp/bindings/pending_receiver.h"
  #include "net/log/net_log.h"
@@ -79,7 +78,7 @@ with limited CPU/memory resources and it is disabled by default.
  #include "ppapi/buildflags/buildflags.h"
  #include "printing/buildflags/buildflags.h"
  #include "services/network/public/cpp/features.h"
-@@ -346,6 +350,18 @@ void BrowserProcessImpl::Init() {
+@@ -345,6 +349,18 @@ void BrowserProcessImpl::Init() {
                               base::BindRepeating(&ApplyMetricsReportingPolicy));
  #endif
  
@@ -100,7 +99,7 @@ with limited CPU/memory resources and it is disabled by default.
  
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1580,6 +1580,10 @@ const char kLogJsConsoleMessagesDescript
+@@ -1583,6 +1583,10 @@ const char kLogJsConsoleMessagesDescript
      "Enable logging JS console messages in system logs, please note that they "
      "may contain PII.";
  
@@ -113,7 +112,7 @@ with limited CPU/memory resources and it is disabled by default.
  const char kMediaRouterCastAllowAllIPsDescription[] =
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -906,6 +906,9 @@ extern const char kLiteVideoForceOverrid
+@@ -916,6 +916,9 @@ extern const char kLensCameraAssistedSea
  extern const char kLogJsConsoleMessagesName[];
  extern const char kLogJsConsoleMessagesDescription[];
  

patches/extra/debian/disable/google-api-warning.patch

@@ -1,9 +1,9 @@
 description: disable the google api key warning when those aren't found
 author: Michael Gilbert <mgilbert@debian.org>
 
---- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -662,9 +662,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+--- a/chrome/browser/ui/startup/infobar_utils.cc
++++ b/chrome/browser/ui/startup/infobar_utils.cc
+@@ -113,9 +113,6 @@ void AddInfoBarsIfNecessary(Browser* bro
      infobars::ContentInfoBarManager* infobar_manager =
          infobars::ContentInfoBarManager::FromWebContents(web_contents);
  

patches/extra/debian/disable/welcome-page.patch

@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/857767
 
 --- a/chrome/browser/profiles/profile_manager.cc
 +++ b/chrome/browser/profiles/profile_manager.cc
-@@ -1309,7 +1309,7 @@ void ProfileManager::InitProfileUserPref
+@@ -1347,7 +1347,7 @@ void ProfileManager::InitProfileUserPref
      profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
                                     supervised_user_id);
    }

patches/extra/inox-patchset/0006-modify-default-prefs.patch

@@ -12,7 +12,7 @@
  void BackgroundModeManager::RegisterProfile(Profile* profile) {
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1246,7 +1246,7 @@ void ChromeContentBrowserClient::Registe
+@@ -1253,7 +1253,7 @@ void ChromeContentBrowserClient::Registe
  void ChromeContentBrowserClient::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -21,28 +21,6 @@
    // Register user prefs for mapping SitePerProcess and IsolateOrigins in
    // user policy in addition to the same named ones in Local State (which are
    // used for mapping the command-line flags).
---- a/chrome/browser/net/prediction_options.cc
-+++ b/chrome/browser/net/prediction_options.cc
-@@ -31,7 +31,7 @@ NetworkPredictionStatus CanPrefetchAndPr
-       }
-       return NetworkPredictionStatus::DISABLED_DUE_TO_NETWORK;
-     default:
--      DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options);
-+      //DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options);
-       return NetworkPredictionStatus::DISABLED_ALWAYS;
-   }
- }
---- a/chrome/browser/net/prediction_options.h
-+++ b/chrome/browser/net/prediction_options.h
-@@ -22,7 +22,7 @@ enum NetworkPredictionOptions {
-   NETWORK_PREDICTION_ALWAYS,
-   NETWORK_PREDICTION_WIFI_ONLY,
-   NETWORK_PREDICTION_NEVER,
--  NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_WIFI_ONLY,
-+  NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_NEVER,
- };
- 
- enum class NetworkPredictionStatus {
 --- a/chrome/browser/net/profile_network_context_service.cc
 +++ b/chrome/browser/net/profile_network_context_service.cc
 @@ -324,7 +324,7 @@ void ProfileNetworkContextService::Updat
@@ -54,9 +32,20 @@
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
    registry->RegisterBooleanPref(prefs::kQuicAllowed, true);
    registry->RegisterBooleanPref(prefs::kGloballyScopeHTTPAuthCacheEnabled,
+--- a/chrome/browser/prefetch/prefetch_prefs.h
++++ b/chrome/browser/prefetch/prefetch_prefs.h
+@@ -22,7 +22,7 @@ enum class NetworkPredictionOptions {
+   kWifiOnlyDeprecated = 1,
+   kDisabled = 2,
+   kExtended = 3,
+-  kDefault = kWifiOnlyDeprecated,
++  kDefault = kDisabled,
+ };
+ 
+ // Enum representing possible values of the Preload Pages opt-in state.  Since
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
-@@ -276,7 +276,7 @@ const char Profile::kProfileKey[] = "__P
+@@ -277,7 +277,7 @@ const char Profile::kProfileKey[] = "__P
  void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kSearchSuggestEnabled,
@@ -105,7 +94,7 @@
    registry->RegisterDictionaryPref(prefs::kAppWindowPlacement);
 --- a/chrome/service/cloud_print/connector_settings.cc
 +++ b/chrome/service/cloud_print/connector_settings.cc
-@@ -59,7 +59,7 @@ void ConnectorSettings::InitFrom(Service
+@@ -60,7 +60,7 @@ void ConnectorSettings::InitFrom(Service
    DCHECK(server_url_.is_valid());
  
    connect_new_printers_ = prefs->GetBoolean(
@@ -140,7 +129,7 @@
        prefs::kAutofillProfileValidity, "",
 --- a/components/bookmarks/browser/bookmark_utils.cc
 +++ b/components/bookmarks/browser/bookmark_utils.cc
-@@ -437,7 +437,7 @@ bool DoesBookmarkContainWords(const std:
+@@ -438,7 +438,7 @@ bool DoesBookmarkContainWords(const std:
  void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kShowBookmarkBar,

patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch

@@ -1,6 +1,6 @@
 --- a/sandbox/linux/BUILD.gn
 +++ b/sandbox/linux/BUILD.gn
-@@ -327,6 +327,12 @@ if (is_linux || is_chromeos) {
+@@ -296,6 +296,12 @@ if (is_linux || is_chromeos) {
        # These files have a suspicious comparison.
        # TODO fix this and re-enable this warning.
        "-Wno-sign-compare",

patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/startup/startup_tab_provider.cc
 +++ b/chrome/browser/ui/startup/startup_tab_provider.cc
-@@ -105,7 +105,7 @@ bool ValidateUrl(const GURL& url) {
+@@ -107,7 +107,7 @@ bool ValidateUrl(const GURL& url) {
  
  StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const {
  // Chrome OS has its own welcome flow provided by OOBE.

patches/extra/inox-patchset/0019-disable-battery-status-service.patch

@@ -84,7 +84,7 @@
  }
 --- a/services/device/battery/battery_status_service.h
 +++ b/services/device/battery/battery_status_service.h
-@@ -60,15 +60,10 @@ class BatteryStatusService {
+@@ -59,15 +59,10 @@ class BatteryStatusService {
    // Updates current battery status and sends new status to interested
    // render processes. Can be called on any thread via a callback.
    void NotifyConsumers(const mojom::BatteryStatus& status);

patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch

@@ -9,7 +9,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run
 
 --- a/chrome/browser/chrome_browser_main.cc
 +++ b/chrome/browser/chrome_browser_main.cc
-@@ -1498,8 +1498,6 @@ int ChromeBrowserMainParts::PreMainMessa
+@@ -1490,8 +1490,6 @@ int ChromeBrowserMainParts::PreMainMessa
    // and preferences have been registered since some of the import code depends
    // on preferences.
    if (first_run::IsChromeFirstRun()) {

patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch

@@ -12,7 +12,7 @@ it as hidden as it was before?
 
 --- a/net/cert/x509_util.cc
 +++ b/net/cert/x509_util.cc
-@@ -241,7 +241,7 @@ bool GetTLSServerEndPointChannelBinding(
+@@ -243,7 +243,7 @@ bool GetTLSServerEndPointChannelBinding(
  }
  
  // RSA keys created by CreateKeyAndSelfSignedCert will be of this length.

patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch

@@ -10,9 +10,9 @@ Out with all those tracking cookies!
 
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -126,7 +126,7 @@ void ContentSettingsRegistry::Init() {
-   // WARNING: The string names of the permissions passed in below are used to
-   // generate preference names and should never be changed!
+@@ -131,7 +131,7 @@ void ContentSettingsRegistry::Init() {
+   // PrefProvider::DiscardOrMigrateObsoletePreferences() and
+   // DefaultProvider::DiscardOrMigrateObsoletePreferences() accordingly.
  
 -  Register(ContentSettingsType::COOKIES, "cookies", CONTENT_SETTING_ALLOW,
 +  Register(ContentSettingsType::COOKIES, "cookies", CONTENT_SETTING_SESSION_ONLY,

patches/extra/iridium-browser/updater-disable-auto-update.patch

@@ -16,7 +16,7 @@ the case anyway, since we are based off Chromium, not Chrome.
 
 --- a/chrome/browser/app_controller_mac.mm
 +++ b/chrome/browser/app_controller_mac.mm
-@@ -864,7 +864,7 @@ static base::mac::ScopedObjCClassSwizzle
+@@ -865,7 +865,7 @@ static base::mac::ScopedObjCClassSwizzle
    CFStringRef checkInterval = CFSTR("checkInterval");
    CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
    if (!plist) {

patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -142,6 +142,8 @@
+@@ -140,6 +140,8 @@
  #include "chrome/browser/ui/tabs/tab_strip_model.h"
  #include "chrome/browser/ui/tabs/tab_utils.h"
  #include "chrome/browser/ui/ui_features.h"
@@ -9,7 +9,7 @@
  #include "chrome/browser/ui/web_applications/app_browser_controller.h"
  #include "chrome/browser/ui/web_applications/web_app_launch_utils.h"
  #include "chrome/browser/ui/webui/signin/login_ui_service.h"
-@@ -467,6 +469,7 @@ Browser::Browser(const CreateParams& par
+@@ -464,6 +466,7 @@ Browser::Browser(const CreateParams& par
        omit_from_session_restore_(params.omit_from_session_restore),
        should_trigger_session_restore_(params.should_trigger_session_restore),
        cancel_download_confirmation_state_(NOT_PROMPTED),
@@ -17,7 +17,7 @@
        override_bounds_(params.initial_bounds),
        initial_show_state_(params.initial_show_state),
        initial_workspace_(params.initial_workspace),
-@@ -830,7 +833,7 @@ Browser::WarnBeforeClosingResult Browser
+@@ -831,7 +834,7 @@ Browser::WarnBeforeClosingResult Browser
    // If the browser can close right away (there are no pending downloads we need
    // to prompt about) then there's no need to warn. In the future, we might need
    // to check other conditions as well.
@@ -26,7 +26,7 @@
      return WarnBeforeClosingResult::kOkToClose;
  
    DCHECK(!warn_before_closing_callback_)
-@@ -860,6 +863,7 @@ bool Browser::TryToCloseWindow(
+@@ -861,6 +864,7 @@ bool Browser::TryToCloseWindow(
  
  void Browser::ResetTryToCloseWindow() {
    cancel_download_confirmation_state_ = NOT_PROMPTED;
@@ -34,7 +34,7 @@
    unload_controller_.ResetTryToCloseWindow();
  }
  
-@@ -2690,6 +2694,62 @@ bool Browser::CanCloseWithInProgressDown
+@@ -2684,6 +2688,62 @@ bool Browser::CanCloseWithInProgressDown
    return false;
  }
  
@@ -97,7 +97,7 @@
  void Browser::InProgressDownloadResponse(bool cancel_downloads) {
    if (cancel_downloads) {
      cancel_download_confirmation_state_ = RESPONSE_RECEIVED;
-@@ -2708,6 +2768,22 @@ void Browser::InProgressDownloadResponse
+@@ -2702,6 +2762,22 @@ void Browser::InProgressDownloadResponse
  
    std::move(warn_before_closing_callback_)
        .Run(WarnBeforeClosingResult::kDoNotClose);
@@ -130,7 +130,7 @@
  #include "chrome/browser/ui/signin_view_controller.h"
  #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
  #include "chrome/browser/ui/unload_controller.h"
-@@ -1009,12 +1010,17 @@ class Browser : public TabStripModelObse
+@@ -1010,12 +1011,17 @@ class Browser : public TabStripModelObse
    // Returns true if the window can close, false otherwise.
    bool CanCloseWithInProgressDownloads();
  
@@ -148,7 +148,7 @@
    // Called when all warnings have completed when attempting to close the
    // browser directly (e.g. via hotkey, close button, terminate signal, etc.)
    // Used as a WarnBeforeClosingCallback by ShouldCloseWindow().
-@@ -1177,6 +1183,8 @@ class Browser : public TabStripModelObse
+@@ -1178,6 +1184,8 @@ class Browser : public TabStripModelObse
    // when the browser is closed with in-progress downloads.
    CancelDownloadConfirmationState cancel_download_confirmation_state_;
  

patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -751,6 +751,9 @@ bool HandleNewTabPageLocationOverride(
+@@ -758,6 +758,9 @@ bool HandleNewTabPageLocationOverride(
    Profile* profile = Profile::FromBrowserContext(browser_context);
    std::string ntp_location =
        profile->GetPrefs()->GetString(prefs::kNewTabPageLocationOverride);

patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch

@@ -42,7 +42,7 @@
  #include "base/feature_list.h"
  #include "base/format_macros.h"
  #include "base/metrics/histogram.h"
-@@ -276,6 +278,15 @@ AutocompleteController::AutocompleteCont
+@@ -270,6 +272,15 @@ AutocompleteController::AutocompleteCont
        search_service_worker_signal_sent_(false),
        template_url_service_(provider_client_->GetTemplateURLService()) {
    provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
@@ -60,7 +60,7 @@
    if (provider_types & AutocompleteProvider::TYPE_BUILTIN)
 --- a/components/omnibox/browser/history_url_provider.cc
 +++ b/components/omnibox/browser/history_url_provider.cc
-@@ -551,6 +551,9 @@ void HistoryURLProvider::Start(const Aut
+@@ -552,6 +552,9 @@ void HistoryURLProvider::Start(const Aut
    if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)
      matches_.push_back(what_you_typed_match);
  

patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -6014,7 +6014,7 @@ bool ChromeContentBrowserClient::ShouldA
+@@ -6053,7 +6053,7 @@ bool ChromeContentBrowserClient::ShouldA
      const url::Origin& embedder_origin,
      const content::PepperPluginInfo& plugin_info) {
  #if BUILDFLAG(ENABLE_PDF)
@@ -22,7 +22,7 @@
  }
 --- a/chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc
 +++ b/chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc
-@@ -66,7 +66,7 @@ class PDFIFrameNavigationThrottleTest :
+@@ -67,7 +67,7 @@ class PDFIFrameNavigationThrottleTest :
      // Register a fake PDF Viewer plugin into our plugin service.
      content::WebPluginInfo info;
      info.name =
@@ -251,7 +251,7 @@
  #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -250,6 +250,7 @@ static_library("common") {
+@@ -248,6 +248,7 @@ static_library("common") {
      "//components/no_state_prefetch/common",
      "//components/no_state_prefetch/common:mojo_bindings",
      "//components/page_load_metrics/common:common",
@@ -272,7 +272,7 @@
    content::WebPluginMimeType pdf_mime_type(
 --- a/chrome/common/chrome_content_client.h
 +++ b/chrome/common/chrome_content_client.h
-@@ -42,8 +42,8 @@ class ChromeContentClient : public conte
+@@ -41,8 +41,8 @@ class ChromeContentClient : public conte
    static const base::FilePath::CharType kNaClPluginFileName[];
  #endif
  
@@ -360,7 +360,7 @@
      FILE_PATH_LITERAL("internal-pdf-viewer");
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
-@@ -1048,7 +1048,7 @@ WebPlugin* ChromeContentRendererClient::
+@@ -1038,7 +1038,7 @@ WebPlugin* ChromeContentRendererClient::
              }
            }
          } else if (info.name ==
@@ -369,7 +369,7 @@
            // Report PDF load metrics. Since the PDF plugin is comprised of an
            // extension that loads a second plugin, avoid double counting by
            // ignoring the creation of the second plugin.
-@@ -1080,7 +1080,7 @@ WebPlugin* ChromeContentRendererClient::
+@@ -1070,7 +1070,7 @@ WebPlugin* ChromeContentRendererClient::
  
  #if BUILDFLAG(ENABLE_PDF)
          if (info.name ==
@@ -378,7 +378,7 @@
            return pdf::CreateInternalPlugin(
                info, std::move(params), render_frame,
                std::make_unique<ChromePdfInternalPluginDelegate>());
-@@ -1093,7 +1093,7 @@ WebPlugin* ChromeContentRendererClient::
+@@ -1083,7 +1083,7 @@ WebPlugin* ChromeContentRendererClient::
          PluginUMAReporter::GetInstance()->ReportPluginDisabled(orig_mime_type,
                                                                 url);
          if (info.name ==

patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch

@@ -52,7 +52,7 @@
  
 --- a/chrome/renderer/chrome_render_frame_observer.h
 +++ b/chrome/renderer/chrome_render_frame_observer.h
-@@ -139,6 +139,7 @@ class ChromeRenderFrameObserver : public
+@@ -138,6 +138,7 @@ class ChromeRenderFrameObserver : public
  #if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
    safe_browsing::PhishingClassifierDelegate* phishing_classifier_ = nullptr;
  #endif
@@ -70,7 +70,7 @@
  #include "base/containers/contains.h"
  #include "base/debug/crash_logging.h"
  #include "base/format_macros.h"
-@@ -197,6 +198,12 @@ bool IsCreatedByExtension(const Template
+@@ -198,6 +199,12 @@ bool IsCreatedByExtension(const Template
           template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION;
  }
  
@@ -83,7 +83,7 @@
  }  // namespace
  
  // TemplateURLService::LessWithPrefix -----------------------------------------
-@@ -282,6 +289,7 @@ TemplateURLService::TemplateURLService(
+@@ -283,6 +290,7 @@ TemplateURLService::TemplateURLService(
      std::unique_ptr<TemplateURLServiceClient> client,
      const base::RepeatingClosure& dsp_change_callback)
      : prefs_(prefs),
@@ -91,7 +91,7 @@
        search_terms_data_(std::move(search_terms_data)),
        web_data_service_(web_data_service),
        client_(std::move(client)),
-@@ -363,8 +371,8 @@ bool TemplateURLService::CanAddAutogener
+@@ -364,8 +372,8 @@ bool TemplateURLService::CanAddAutogener
    // that may interfere with search queries).  An easy heuristic for this is
    // whether the user has a TemplateURL that has been manually modified (e.g.,
    // renamed) connected to the same host.
@@ -102,7 +102,7 @@
  }
  
  bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
-@@ -1500,6 +1508,8 @@ SyncDataMap TemplateURLService::CreateGU
+@@ -1501,6 +1509,8 @@ SyncDataMap TemplateURLService::CreateGU
  
  void TemplateURLService::Init(const Initializer* initializers,
                                int num_initializers) {
@@ -111,7 +111,7 @@
    if (client_)
      client_->SetOwner(this);
  
-@@ -1636,6 +1646,9 @@ void TemplateURLService::ChangeToLoadedS
+@@ -1637,6 +1647,9 @@ void TemplateURLService::ChangeToLoadedS
  
  bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
      const std::string& host) const {
@@ -125,7 +125,7 @@
 +++ b/components/search_engines/template_url_service.h
 @@ -706,6 +706,8 @@ class TemplateURLService : public WebDat
    // ---------- Browser state related members ---------------------------------
-   PrefService* prefs_ = nullptr;
+   raw_ptr<PrefService> prefs_ = nullptr;
  
 +  bool should_autocollect_; // Whether search engines should be auto-collected
 +

patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch

@@ -7,8 +7,8 @@
 +#include "base/command_line.h"
  #include "base/debug/alias.h"
  #include "base/i18n/rtl.h"
- #include "base/metrics/user_metrics.h"
-@@ -636,6 +637,8 @@ void Tab::OnGestureEvent(ui::GestureEven
+ #include "base/memory/raw_ptr.h"
+@@ -637,6 +638,8 @@ void Tab::OnGestureEvent(ui::GestureEven
  }
  
  std::u16string Tab::GetTooltipText(const gfx::Point& p) const {
@@ -27,7 +27,7 @@
  #include "base/compiler_specific.h"
  #include "base/containers/adapters.h"
  #include "base/containers/contains.h"
-@@ -1844,6 +1845,8 @@ void TabStrip::OnMouseEventInTab(views::
+@@ -1846,6 +1847,8 @@ void TabStrip::OnMouseEventInTab(views::
  }
  
  void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) {

patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/browser_command_controller.cc
 +++ b/chrome/browser/ui/browser_command_controller.cc
-@@ -1154,7 +1154,8 @@ void BrowserCommandController::InitComma
+@@ -1153,7 +1153,8 @@ void BrowserCommandController::InitComma
    command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
                                          normal_window);
  

patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
-@@ -24,6 +24,7 @@
+@@ -25,6 +25,7 @@
  #include "chrome/browser/profiles/profile.h"
  #include "chrome/browser/profiles/profile_manager.h"
  #include "chrome/browser/sync/sync_service_factory.h"
@@ -8,7 +8,7 @@
  #include "components/browsing_data/core/pref_names.h"
  #include "components/keep_alive_registry/keep_alive_types.h"
  #include "components/keep_alive_registry/scoped_keep_alive.h"
-@@ -151,6 +152,21 @@ class BrowsingDataRemoverObserver
+@@ -152,6 +153,21 @@ class BrowsingDataRemoverObserver
  #endif
  };
  
@@ -30,7 +30,7 @@
  uint64_t GetOriginTypeMask(const base::Value& data_types) {
    uint64_t result = 0;
    for (const auto& data_type : data_types.GetList()) {
-@@ -292,8 +308,9 @@ void ChromeBrowsingDataLifetimeManager::
+@@ -293,8 +309,9 @@ void ChromeBrowsingDataLifetimeManager::
      bool keep_browser_alive) {
    auto* data_types = profile_->GetPrefs()->GetList(
        browsing_data::prefs::kClearBrowsingDataOnExitList);
@@ -42,7 +42,7 @@
      profile_->GetPrefs()->SetBoolean(
          browsing_data::prefs::kClearBrowsingDataOnExitDeletionPending, true);
      auto* remover = profile_->GetBrowsingDataRemover();
-@@ -304,8 +321,8 @@ void ChromeBrowsingDataLifetimeManager::
+@@ -305,8 +322,8 @@ void ChromeBrowsingDataLifetimeManager::
        DCHECK(keep_browser_alive);
  #endif
      remover->RemoveAndReply(base::Time(), base::Time::Max(),

patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch

@@ -7,8 +7,8 @@
 +#include "base/command_line.h"
  #include "base/containers/flat_map.h"
  #include "base/cxx17_backports.h"
- #include "base/metrics/histogram_macros.h"
-@@ -1779,6 +1780,10 @@ bool TabStripModel::CloseTabs(base::span
+ #include "base/memory/raw_ptr.h"
+@@ -1765,6 +1766,10 @@ bool TabStripModel::CloseTabs(base::span
    if (items.empty())
      return true;
  

patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch

@@ -19,9 +19,9 @@
  #include "base/bind.h"
 +#include "base/command_line.h"
  #include "base/i18n/rtl.h"
- #include "base/macros.h"
  #include "base/metrics/histogram_macros.h"
-@@ -196,7 +197,8 @@ void AppModalDialogManager::RunBeforeUnl
+ #include "base/strings/utf_string_conversions.h"
+@@ -195,7 +196,8 @@ void AppModalDialogManager::RunBeforeUnl
    ChromeJavaScriptDialogExtraData* extra_data =
        &javascript_dialog_extra_data_[web_contents];
  

patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch

@@ -21,7 +21,7 @@
  #include "base/callback_helpers.h"
  #include "base/compiler_specific.h"
  #include "base/containers/flat_set.h"
-@@ -911,7 +912,8 @@ void HistoryBackend::InitImpl(
+@@ -936,7 +937,8 @@ void HistoryBackend::InitImpl(
    db_->GetStartDate(&first_recorded_time_);
  
    // Start expiring old stuff.

patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch

@@ -13,15 +13,15 @@
  #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 --- a/components/url_formatter/url_formatter.cc
 +++ b/components/url_formatter/url_formatter.cc
-@@ -8,6 +8,7 @@
+@@ -9,6 +9,7 @@
  #include <utility>
  #include <vector>
  
 +#include "base/command_line.h"
  #include "base/lazy_instance.h"
+ #include "base/memory/raw_ptr.h"
  #include "base/numerics/safe_conversions.h"
- #include "base/strings/strcat.h"
-@@ -264,6 +265,13 @@ IDNConversionResult IDNToUnicodeWithAdju
+@@ -268,6 +269,13 @@ IDNConversionResult IDNToUnicodeWithAdju
    host16.reserve(host.length());
    host16.insert(host16.end(), host.begin(), host.end());
  

patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch

@@ -1,15 +1,15 @@
 # Add flag --hide-crashed-bubble to hide the bubble box:
 # "Restore Pages? Chromium didn't shut down correctly."
 
---- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -638,7 +638,8 @@ void StartupBrowserCreatorImpl::AddInfoB
-   if (command_line_.HasSwitch(switches::kKioskMode))
+--- a/chrome/browser/ui/startup/infobar_utils.cc
++++ b/chrome/browser/ui/startup/infobar_utils.cc
+@@ -80,7 +80,8 @@ void AddInfoBarsIfNecessary(Browser* bro
      return;
  
--  if (HasPendingUncleanExit(browser->profile()))
-+  if (HasPendingUncleanExit(browser->profile()) &&
-+      !command_line_.HasSwitch("hide-crashed-bubble"))
+   // Web apps should not display the session restore bubble (crbug.com/1264121)
+-  if (!is_web_app && HasPendingUncleanExit(browser->profile()))
++  if (!is_web_app && HasPendingUncleanExit(browser->profile()) &&
++      !startup_command_line.HasSwitch("hide-crashed-bubble"))
      SessionCrashedBubble::ShowIfNotOffTheRecordProfile(
          browser, /*skip_tab_checking=*/false);
  

patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/views/tabs/tab.cc
 +++ b/chrome/browser/ui/views/tabs/tab.cc
-@@ -972,7 +972,11 @@ void Tab::UpdateIconVisibility() {
+@@ -973,7 +973,11 @@ void Tab::UpdateIconVisibility() {
    if (IsActive()) {
      // Close button is shown on active tabs regardless of the size.
      showing_close_button_ = true;
@@ -12,7 +12,7 @@
  
      showing_alert_indicator_ =
          has_alert_icon && alert_icon_width <= available_width;
-@@ -993,6 +997,8 @@ void Tab::UpdateIconVisibility() {
+@@ -994,6 +998,8 @@ void Tab::UpdateIconVisibility() {
        available_width -= favicon_width;
  
      showing_close_button_ = large_enough_for_close_button;

patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch

@@ -8,7 +8,7 @@
  #include "base/metrics/user_metrics.h"
  #include "base/task/post_task.h"
  #include "base/task/thread_pool.h"
-@@ -109,6 +110,18 @@ DragOperation GetDropEffect(const ui::Dr
+@@ -108,6 +109,18 @@ DragOperation GetDropEffect(const ui::Dr
    return DragOperation::kMove;
  }
  
@@ -27,7 +27,7 @@
  }  // namespace
  
  BrowserRootView::DropInfo::DropInfo() = default;
-@@ -120,7 +133,9 @@ BrowserRootView::DropInfo::~DropInfo() {
+@@ -119,7 +132,9 @@ BrowserRootView::DropInfo::~DropInfo() {
  
  BrowserRootView::BrowserRootView(BrowserView* browser_view,
                                   views::Widget* widget)
@@ -38,7 +38,7 @@
  
  BrowserRootView::~BrowserRootView() {
    // It's possible to destroy the browser while a drop is active.  In this case,
-@@ -245,7 +260,7 @@ bool BrowserRootView::OnMouseWheel(const
+@@ -243,7 +258,7 @@ bool BrowserRootView::OnMouseWheel(const
  
    // Scroll-event-changes-tab is incompatible with scrolling tabstrip, so
    // disable it if the latter feature is enabled.
@@ -49,7 +49,7 @@
      // tabstrip, or the empty space beside the tabstrip.
 --- a/chrome/browser/ui/views/frame/browser_root_view.h
 +++ b/chrome/browser/ui/views/frame/browser_root_view.h
-@@ -143,6 +143,8 @@ class BrowserRootView : public views::in
+@@ -144,6 +144,8 @@ class BrowserRootView : public views::in
    int scroll_remainder_x_ = 0;
    int scroll_remainder_y_ = 0;
  

patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
 +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
-@@ -275,12 +275,28 @@ void ToolbarView::Init() {
+@@ -275,14 +275,30 @@ void ToolbarView::Init() {
  
    std::unique_ptr<ToolbarAccountIconContainerView>
        toolbar_account_icon_container;
@@ -19,6 +19,8 @@
 -  show_avatar_toolbar_button = browser_->profile()->IsOffTheRecord() ||
 -                               browser_->profile()->IsGuestSession();
 +  show_avatar_toolbar_button = in_incognito_or_guest_mode;
+ #elif BUILDFLAG(IS_CHROMEOS_LACROS)
+   show_avatar_toolbar_button = !profiles::IsPublicSession();
  #endif
 +
 +  if (flag_value == "always")

patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch

@@ -13,9 +13,9 @@
  #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -260,5 +260,7 @@ const base::Feature kPartitionedCookies{
- const base::Feature kExtraCookieValidityChecks{
-     "ExtraCookieValidityChecks", base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -260,5 +260,7 @@ const base::Feature kFirstPartySetsV2Com
+ const base::Feature kRecordRadioWakeupTrigger{
+     "RecordRadioWakeupTrigger", base::FEATURE_DISABLED_BY_DEFAULT};
  
 +const base::Feature kSetIpv6ProbeFalse{"SetIpv6ProbeFalse", base::FEATURE_DISABLED_BY_DEFAULT};
 +
@@ -23,9 +23,9 @@
  }  // namespace net
 --- a/net/base/features.h
 +++ b/net/base/features.h
-@@ -392,6 +392,8 @@ NET_EXPORT extern const base::Feature kP
- // feature flag, assuming no breakage occurs with it enabled.
- NET_EXPORT extern const base::Feature kExtraCookieValidityChecks;
+@@ -389,6 +389,8 @@ NET_EXPORT extern const base::Feature kF
+ // Android.
+ NET_EXPORT extern const base::Feature kRecordRadioWakeupTrigger;
  
 +NET_EXPORT extern const base::Feature kSetIpv6ProbeFalse;
 +
@@ -34,7 +34,7 @@
  
 --- a/net/dns/host_resolver_manager.cc
 +++ b/net/dns/host_resolver_manager.cc
-@@ -139,11 +139,6 @@ const unsigned kMinimumTTLSeconds = kCac
+@@ -144,11 +144,6 @@ const unsigned kMinimumTTLSeconds = kCac
  // cached.
  const int kIPv6ProbePeriodMs = 1000;
  
@@ -46,7 +46,7 @@
  enum DnsResolveStatus {
    RESOLVE_STATUS_DNS_SUCCESS = 0,
    RESOLVE_STATUS_PROC_SUCCESS,
-@@ -3698,7 +3693,7 @@ bool HostResolverManager::IsIPv6Reachabl
+@@ -3727,7 +3722,7 @@ bool HostResolverManager::IsIPv6Reachabl
        (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
            kIPv6ProbePeriodMs) {
      SetLastIPv6ProbeResult(

patches/extra/ungoogled-chromium/add-suggestions-url-field.patch

@@ -3,7 +3,7 @@
 
 --- a/chrome/browser/resources/settings/search_engines_page/search_engine_dialog.html
 +++ b/chrome/browser/resources/settings/search_engines_page/search_engine_dialog.html
-@@ -20,6 +20,13 @@
+@@ -27,6 +27,13 @@
              value="{{queryUrl_}}" on-focus="validate_" on-input="validate_"
              disabled$="[[model.urlLocked]]">
          </cr-input>
@@ -34,8 +34,8 @@
 +      suggestionsUrl_: String,
        dialogTitle_: String,
        actionButtonText_: String,
-     };
-@@ -64,6 +66,7 @@ export class SettingsSearchEngineDialogE
+ 
+@@ -70,6 +72,7 @@ export class SettingsSearchEngineDialogE
    private searchEngine_: string;
    private keyword_: string;
    private queryUrl_: string;
@@ -43,7 +43,7 @@
    private dialogTitle_: string;
    private actionButtonText_: string;
    private browserProxy_: SearchEnginesBrowserProxy =
-@@ -93,6 +96,7 @@ export class SettingsSearchEngineDialogE
+@@ -100,6 +103,7 @@ export class SettingsSearchEngineDialogE
        this.searchEngine_ = this.model.name;
        this.keyword_ = this.model.keyword;
        this.queryUrl_ = this.model.url;
@@ -51,7 +51,7 @@
      } else {
        this.dialogTitle_ =
            loadTimeData.getString('searchEnginesAddSearchEngine');
-@@ -128,8 +132,12 @@ export class SettingsSearchEngineDialogE
+@@ -135,8 +139,12 @@ export class SettingsSearchEngineDialogE
        }
      }
  
@@ -66,7 +66,7 @@
    }
  
    private cancel_() {
-@@ -138,7 +146,8 @@ export class SettingsSearchEngineDialogE
+@@ -145,7 +153,8 @@ export class SettingsSearchEngineDialogE
  
    private onActionButtonTap_() {
      this.browserProxy_.searchEngineEditCompleted(
@@ -76,7 +76,7 @@
      this.$.dialog.close();
    }
  
-@@ -166,9 +175,11 @@ export class SettingsSearchEngineDialogE
+@@ -173,9 +182,11 @@ export class SettingsSearchEngineDialogE
  
    private updateActionButtonState_() {
      const allValid = [
@@ -272,7 +272,7 @@
    bool CanEdit(const TemplateURL* url) const;
 --- a/chrome/browser/ui/search_engines/template_url_table_model.cc
 +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
-@@ -109,21 +109,25 @@ void TemplateURLTableModel::Remove(int i
+@@ -108,21 +108,25 @@ void TemplateURLTableModel::Remove(int i
  void TemplateURLTableModel::Add(int index,
                                  const std::u16string& short_name,
                                  const std::u16string& keyword,
@@ -303,7 +303,7 @@
    DCHECK(index >= 0 && index <= RowCount());
    DCHECK(!url.empty());
    TemplateURL* template_url = GetTemplateURL(index);
-@@ -132,7 +136,8 @@ void TemplateURLTableModel::ModifyTempla
+@@ -131,7 +135,8 @@ void TemplateURLTableModel::ModifyTempla
    DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url ||
           template_url->SupportsReplacement(
               template_url_service_->search_terms_data()));
@@ -315,7 +315,7 @@
  TemplateURL* TemplateURLTableModel::GetTemplateURL(int index) {
 --- a/chrome/browser/ui/search_engines/template_url_table_model.h
 +++ b/chrome/browser/ui/search_engines/template_url_table_model.h
-@@ -54,13 +54,15 @@ class TemplateURLTableModel : public ui:
+@@ -53,13 +53,15 @@ class TemplateURLTableModel : public ui:
    void Add(int index,
             const std::u16string& short_name,
             const std::u16string& keyword,
@@ -425,7 +425,7 @@
  
 --- a/components/search_engines/template_url_service.cc
 +++ b/components/search_engines/template_url_service.cc
-@@ -641,7 +641,8 @@ void TemplateURLService::IncrementUsageC
+@@ -642,7 +642,8 @@ void TemplateURLService::IncrementUsageC
  void TemplateURLService::ResetTemplateURL(TemplateURL* url,
                                            const std::u16string& title,
                                            const std::u16string& keyword,
@@ -435,7 +435,7 @@
    DCHECK(!IsCreatedByExtension(url));
    DCHECK(!keyword.empty());
    DCHECK(!search_url.empty());
-@@ -656,6 +657,7 @@ void TemplateURLService::ResetTemplateUR
+@@ -657,6 +658,7 @@ void TemplateURLService::ResetTemplateUR
    data.safe_for_autoreplace = false;
    data.last_modified = clock_->Now();
    data.is_active = TemplateURLData::ActiveStatus::kTrue;

patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -2763,7 +2763,13 @@ const FeatureEntry::FeatureVariation kWi
+@@ -2647,7 +2647,13 @@ const FeatureEntry::FeatureVariation kSn
  // calculate and verify checksum.
  //
  // When adding a new choice, add it to the end of the list.

patches/extra/ungoogled-chromium/disable-download-quarantine.patch

@@ -2,7 +2,7 @@
 
 --- a/components/download/internal/common/base_file.cc
 +++ b/components/download/internal/common/base_file.cc
-@@ -23,7 +23,6 @@
+@@ -22,7 +22,6 @@
  #include "components/download/public/common/download_interrupt_reasons_utils.h"
  #include "components/download/public/common/download_item.h"
  #include "components/download/public/common/download_stats.h"
@@ -10,7 +10,7 @@
  #include "crypto/secure_hash.h"
  
  #if defined(OS_WIN)
-@@ -530,105 +529,6 @@ DownloadInterruptReason BaseFile::Publis
+@@ -529,105 +528,6 @@ DownloadInterruptReason BaseFile::Publis
  }
  #endif  // defined(OS_ANDROID)
  
@@ -116,7 +116,7 @@
  
  void BaseFile::AnnotateWithSourceInformation(
      const std::string& client_guid,
-@@ -636,32 +536,8 @@ void BaseFile::AnnotateWithSourceInforma
+@@ -635,32 +535,8 @@ void BaseFile::AnnotateWithSourceInforma
      const GURL& referrer_url,
      mojo::PendingRemote<quarantine::mojom::Quarantine> remote_quarantine,
      OnAnnotationDoneCallback on_annotation_done_callback) {
@@ -153,7 +153,7 @@
  }  // namespace download
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -81,7 +81,6 @@ source_set("browser") {
+@@ -83,7 +83,6 @@ source_set("browser") {
      "//components/permissions:permissions_common",
      "//components/power_scheduler",
      "//components/services/filesystem:lib",
@@ -163,15 +163,15 @@
      "//components/services/storage/dom_storage:local_storage_proto",
 --- a/content/browser/file_system_access/safe_move_helper.cc
 +++ b/content/browser/file_system_access/safe_move_helper.cc
-@@ -12,7 +12,6 @@
- #include "base/task/thread_pool.h"
+@@ -13,7 +13,6 @@
  #include "base/threading/sequenced_task_runner_handle.h"
  #include "build/build_config.h"
+ #include "build/chromeos_buildflags.h"
 -#include "components/services/quarantine/quarantine.h"
  #include "content/browser/file_system_access/file_system_access_error.h"
  #include "content/public/browser/content_browser_client.h"
  #include "content/public/common/content_client.h"
-@@ -193,20 +192,8 @@ void SafeMoveHelper::DidAfterWriteCheck(
+@@ -194,20 +193,8 @@ void SafeMoveHelper::DidAfterWriteCheck(
    // not exist anymore. In case of error, the source file URL will point to a
    // valid filesystem location.
    base::OnceCallback<void(base::File::Error)> result_callback;
@@ -192,7 +192,7 @@
    manager_->DoFileSystemOperation(
        FROM_HERE, &storage::FileSystemOperationRunner::Move,
        std::move(result_callback), source_url(), dest_url(), options_,
-@@ -222,7 +209,6 @@ void SafeMoveHelper::DidFileSkipQuaranti
+@@ -223,7 +210,6 @@ void SafeMoveHelper::DidFileSkipQuaranti
  void SafeMoveHelper::DidFileDoQuarantine(
      const storage::FileSystemURL& target_url,
      const GURL& referrer_url,
@@ -200,7 +200,7 @@
      base::File::Error result) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
  
-@@ -253,37 +239,9 @@ void SafeMoveHelper::DidFileDoQuarantine
+@@ -254,37 +240,9 @@ void SafeMoveHelper::DidFileDoQuarantine
        referrer_url.is_valid() && referrer_url.SchemeIsHTTPOrHTTPS()
            ? referrer_url
            : GURL();
@@ -274,7 +274,7 @@
 --- a/content/browser/renderer_host/pepper/pepper_file_io_host.h
 +++ b/content/browser/renderer_host/pepper/pepper_file_io_host.h
 @@ -13,7 +13,6 @@
- #include "base/macros.h"
+ #include "base/memory/raw_ptr.h"
  #include "base/memory/ref_counted.h"
  #include "base/memory/weak_ptr.h"
 -#include "components/services/quarantine/public/mojom/quarantine.mojom.h"

patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch

@@ -2,7 +2,7 @@
 
 --- a/components/url_formatter/url_formatter.cc
 +++ b/components/url_formatter/url_formatter.cc
-@@ -463,14 +463,14 @@ ComponentResult IDNToUnicodeOneComponent
+@@ -467,14 +467,14 @@ ComponentResult IDNToUnicodeOneComponent
  }  // namespace
  
  const FormatUrlType kFormatUrlOmitNothing = 0;

patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch

@@ -1,6 +1,6 @@
 --- a/components/optimization_guide/core/optimization_guide_features.cc
 +++ b/components/optimization_guide/core/optimization_guide_features.cc
-@@ -41,7 +41,7 @@ const base::Feature kOptimizationHintsFi
+@@ -43,7 +43,7 @@ const base::Feature kOptimizationHintsFi
  
  // Enables fetching from a remote Optimization Guide Service.
  const base::Feature kRemoteOptimizationGuideFetching{

patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch

@@ -3,7 +3,7 @@
 
 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -3617,8 +3617,7 @@ ScriptValue WebGLRenderingContextBase::g
+@@ -3630,8 +3630,7 @@ ScriptValue WebGLRenderingContextBase::g
                pname, IdentifiabilityBenignStringToken(
                           String(ContextGL()->GetString(GL_RENDERER))));
          }
@@ -13,7 +13,7 @@
        }
        SynthesizeGLError(
            GL_INVALID_ENUM, "getParameter",
-@@ -3632,8 +3631,7 @@ ScriptValue WebGLRenderingContextBase::g
+@@ -3645,8 +3644,7 @@ ScriptValue WebGLRenderingContextBase::g
                pname, IdentifiabilityBenignStringToken(
                           String(ContextGL()->GetString(GL_VENDOR))));
          }

patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch

@@ -2,7 +2,7 @@
 
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -422,7 +422,7 @@ const base::Feature kComputePressure{"Co
+@@ -432,7 +432,7 @@ const base::Feature kComputePressure{"Co
  // Prefetch request properties are updated to be privacy-preserving. See
  // crbug.com/988956.
  const base::Feature kPrefetchPrivacyChanges{"PrefetchPrivacyChanges",

patches/extra/ungoogled-chromium/enable-menu-on-reload-button.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/ui/views/toolbar/reload_button.cc
 +++ b/chrome/browser/ui/views/toolbar/reload_button.cc
-@@ -84,7 +84,7 @@ bool ReloadButton::GetMenuEnabled() cons
+@@ -83,7 +83,7 @@ bool ReloadButton::GetMenuEnabled() cons
  }
  
  void ReloadButton::SetMenuEnabled(bool enable) {

patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/ui/browser_commands.cc
 +++ b/chrome/browser/ui/browser_commands.cc
-@@ -441,11 +441,6 @@ int GetContentRestrictions(const Browser
+@@ -442,11 +442,6 @@ int GetContentRestrictions(const Browser
      CoreTabHelper* core_tab_helper =
          CoreTabHelper::FromWebContents(current_tab);
      content_restrictions = core_tab_helper->content_restrictions();
@@ -14,7 +14,7 @@
    }
    return content_restrictions;
  }
-@@ -1351,8 +1346,7 @@ bool CanSavePage(const Browser* browser)
+@@ -1352,8 +1347,7 @@ bool CanSavePage(const Browser* browser)
        DownloadPrefs::DownloadRestriction::ALL_FILES) {
      return false;
    }
@@ -37,7 +37,7 @@
  OfflinePageModel::OfflinePageModel() = default;
 --- a/content/common/url_schemes.cc
 +++ b/content/common/url_schemes.cc
-@@ -23,6 +23,9 @@ namespace {
+@@ -23,13 +23,22 @@ namespace {
  bool g_registered_url_schemes = false;
  
  const char* const kDefaultSavableSchemes[] = {
@@ -47,8 +47,7 @@
    url::kHttpScheme,
    url::kHttpsScheme,
    url::kFileScheme,
-@@ -30,7 +33,13 @@ const char* const kDefaultSavableSchemes
-   url::kFtpScheme,
+   url::kFileSystemScheme,
    kChromeDevToolsScheme,
    kChromeUIScheme,
 -  url::kDataScheme
@@ -64,7 +63,7 @@
  // These lists are lazily initialized below and are leaked on shutdown to
 --- a/content/public/common/url_utils.cc
 +++ b/content/public/common/url_utils.cc
-@@ -26,11 +26,7 @@ bool HasWebUIScheme(const GURL& url) {
+@@ -27,11 +27,7 @@ bool HasWebUIScheme(const GURL& url) {
  }
  
  bool IsSavableURL(const GURL& url) {

patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch

@@ -13,7 +13,7 @@
        AddChildView(std::make_unique<views::InkDropContainerView>());
 --- a/chrome/browser/ui/views/tabs/tab_strip.cc
 +++ b/chrome/browser/ui/views/tabs/tab_strip.cc
-@@ -2339,8 +2339,6 @@ void TabStrip::NewTabButtonPressed(const
+@@ -2341,8 +2341,6 @@ void TabStrip::NewTabButtonPressed(const
  
      const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
      if (mouse.IsOnlyMiddleMouseButton()) {
@@ -22,7 +22,7 @@
          ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
          CHECK(clipboard);
          std::u16string clipboard_text;
-@@ -2348,7 +2346,6 @@ void TabStrip::NewTabButtonPressed(const
+@@ -2350,7 +2348,6 @@ void TabStrip::NewTabButtonPressed(const
                              /* data_dst = */ nullptr, &clipboard_text);
          if (!clipboard_text.empty())
            controller_->CreateNewTabWithLocation(clipboard_text);

patches/extra/ungoogled-chromium/prepopulated-search-engines.patch

@@ -8,7 +8,7 @@
 #
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -1325,6 +1325,9 @@ std::vector<std::unique_ptr<TemplateURLD
+@@ -1331,6 +1331,9 @@ std::vector<std::unique_ptr<TemplateURLD
    std::vector<std::unique_ptr<TemplateURLData>> t_urls;
    for (size_t i = 0; i < num_engines; ++i)
      t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(*engines[i]));

patches/extra/ungoogled-chromium/remove-uneeded-ui.patch

@@ -161,7 +161,7 @@
        <cr-button id="addCreditCard" class="header-aligned-button"
 --- a/chrome/browser/resources/settings/basic_page/basic_page.html
 +++ b/chrome/browser/resources/settings/basic_page/basic_page.html
-@@ -102,7 +102,7 @@
+@@ -59,7 +59,7 @@
              <settings-privacy-review-promo></settings-privacy-review-promo>
            </settings-section>
          </template>
@@ -172,8 +172,8 @@
                section="safetyCheck" nest-under-section="privacy"
 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.html
 +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html
-@@ -8,7 +8,7 @@
-         border-top: none;
+@@ -13,7 +13,7 @@
+         padding-inline-start: 0;
        }
      </style>
 -<if expr="not chromeos and not lacros">
@@ -181,16 +181,18 @@
      <!-- Signout is not supported yet on lacros, https://crbug.com/1217645 -->
      <settings-toggle-button id="signinAllowedToggle"
          class="hr"
-@@ -52,12 +52,6 @@
+@@ -70,14 +70,6 @@
      </settings-toggle-button>
  </if><!-- not chromeos -->
  </if><!-- _google_chrome -->
--    <settings-toggle-button id="urlCollectionToggle"
--        class="hr"
--        pref="{{prefs.url_keyed_anonymized_data_collection.enabled}}"
--        label="$i18n{urlKeyedAnonymizedDataCollection}"
--        sub-label="$i18n{urlKeyedAnonymizedDataCollectionDesc}">
--    </settings-toggle-button>
+-    <template is="dom-if" if="[[showUrlCollectionToggle_()]]" restamp>
+-      <settings-toggle-button id="urlCollectionToggle"
+-          class="hr"
+-          pref="{{prefs.url_keyed_anonymized_data_collection.enabled}}"
+-          label="$i18n{urlKeyedAnonymizedDataCollection}"
+-          sub-label="$i18n{urlKeyedAnonymizedDataCollectionDesc}">
+-      </settings-toggle-button>
+-    </template>
  <if expr="_google_chrome">
      <settings-toggle-button id="spellCheckControl"
          class="hr"
@@ -220,17 +222,6 @@
        </div>
        <template is="dom-if" if="[[isDefaultSearchControlledByPolicy_(
            prefs.default_search_provider_data.template_url_data)]]">
---- a/chrome/browser/resources/settings/settings_menu/settings_menu.html
-+++ b/chrome/browser/resources/settings/settings_menu/settings_menu.html
-@@ -118,7 +118,7 @@
-             $i18n{autofillPageTitle}
-             <paper-ripple></paper-ripple>
-           </a>
--          <template is="dom-if" if="[[!enableLandingPageRedesign_]]">
-+          <template is="dom-if" if="[[false]]">
-             <a role="menuitem" href="/safetyCheck"
-                 hidden="[[!pageVisibility.safetyCheck]]"
-                 id="safetyCheck"
 --- a/chrome/browser/resources/settings/settings_page/settings_subpage.html
 +++ b/chrome/browser/resources/settings/settings_page/settings_subpage.html
 @@ -72,7 +72,7 @@
@@ -244,7 +235,7 @@
          </cr-icon-button>
 --- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
 +++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
-@@ -176,6 +176,7 @@ void ProfileMenuView::BuildMenu() {
+@@ -175,6 +175,7 @@ void ProfileMenuView::BuildMenu() {
  }
  
  gfx::ImageSkia ProfileMenuView::GetSyncIcon() const {
@@ -252,7 +243,7 @@
    Profile* profile = browser()->profile();
    if (profile->IsOffTheRecord() || profile->IsGuestSession())
      return gfx::ImageSkia();
-@@ -450,8 +451,7 @@ void ProfileMenuView::BuildIdentity() {
+@@ -457,8 +458,7 @@ void ProfileMenuView::BuildIdentity() {
          menu_subtitle_);
    } else {
      menu_title_ = std::u16string();

pruning.list

@@ -42,6 +42,7 @@ buildtools/third_party/eu-strip/bin/eu-strip
 chrome/app/etw_events/MSG00001.bin
 chrome/app/etw_events/chrome_events_winTEMP.BIN
 chrome/browser/ash/power/ml/smart_dim/20190521_example_preprocessor_config.pb
+chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/pumpkin/pumpkin_files.zip
 chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/alert_modal.ogg
 chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/alert_nonmodal.ogg
 chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/button.ogg
@@ -72,7 +73,7 @@ chrome/browser/resources/chromeos/accessibility/select_to_speak/earcons/null_sel
 chrome/browser/resources/media/mei_preload/preloaded_data.pb
 chrome/browser/ui/app_list/search/search_result_ranker/20190722_example_preprocessor_config.pb
 chrome/browser/ui/app_list/search/search_result_ranker/search_ranker_assets/20190923_example_preprocessor_config.pb
-chrome/build/pgo_profiles/chrome-linux-4692-1641404809-2e9cd7e4fa1c8c41d8f32f8bc0dd52e2646c649a.profdata
+chrome/build/pgo_profiles/chrome-linux-4758-1643195016-f5cfe4c93eff056f51290a33e603a214804dbd80.profdata
 chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/Network Share Test.lnk
 chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/New folder - Shortcut.lnk
 chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/long_name.lnk
@@ -84,6 +85,7 @@ chrome/credential_provider/eventlog/gcp_eventlog_messages.mc
 chrome/installer/linux/debian/repo_signing_keys.gpg
 chrome/installer/test/data/SETUP.EX_
 chrome/services/cups_proxy/test/data/basic_handshake.bin
+chrome/updater/test/data/selfupdate_test_key.der
 chrome/updater/test/data/signed.exe
 chrome/updater/test/data/signed.exe.gz
 chrome/updater/test/data/tag_extractor_corpus/signed.exe
@@ -281,12 +283,17 @@ device/fido/response_data_fuzzer_corpus/make_credential_response_corpus
 device/fido/response_data_fuzzer_corpus/register1
 device/fido/response_data_fuzzer_corpus/sign0
 device/fido/response_data_fuzzer_corpus/sign1
+docs/website/site/administrators/ios-mdm-policy-format/ios_chrome_policy.plist
 fuchsia/engine/test/data/bear-44.1kHz.webm
 fuchsia/engine/test/data/bear-48kHz.webm
 fuchsia/engine/test/data/bear-vp8a.webm
 fuchsia/engine/test/data/bear-vp9-opus.webm
 fuchsia/engine/test/data/bear-vp9.webm
 headless/test/data/protocol/emulation/resources/video.webm
+ios/chrome/browser/crash_report/seed_corpuses/process_snapshot_dump_1
+ios/chrome/browser/crash_report/seed_corpuses/process_snapshot_dump_2
+ios/chrome/browser/crash_report/seed_corpuses/process_snapshot_dump_3
+ios/chrome/browser/crash_report/seed_corpuses/process_snapshot_dump_4
 ios/chrome/browser/ui/main/browser_view_wrangler.mm
 ios/chrome/test/data/sessions/corrupted.plist
 ios/chrome/test/data/sessions/session_m57.plist
@@ -1187,7 +1194,6 @@ net/data/pac_file_fetcher_unittest/gzipped_pac
 net/data/pac_file_fetcher_unittest/utf16be_pac
 net/data/parse_certificate_unittest/v3_certificate_template.pk8
 net/data/spdy_tests/examples_07.hpack
-net/data/ssl/certificates/aia-intermediate.der
 net/data/ssl/certificates/client-empty-password.p12
 net/data/ssl/certificates/client-nokey.p12
 net/data/ssl/certificates/client-null-password.p12
@@ -1210,7 +1216,6 @@ net/data/ssl/certificates/crlset_by_root_subject_no_spki.raw
 net/data/ssl/certificates/crlset_known_interception_by_root.raw
 net/data/ssl/certificates/duplicate_cn_1.p12
 net/data/ssl/certificates/duplicate_cn_2.p12
-net/data/ssl/certificates/empty_subject_cert.der
 net/data/ssl/certificates/foaf.me.chromium-test-cert.der
 net/data/ssl/certificates/google.binary.p7b
 net/data/ssl/certificates/google.single.der
@@ -2461,183 +2466,183 @@ third_party/android_rust_toolchain/toolchain/bin/rust-analyzer
 third_party/android_rust_toolchain/toolchain/bin/rustc
 third_party/android_rust_toolchain/toolchain/bin/rustdoc
 third_party/android_rust_toolchain/toolchain/bin/rustfmt
-third_party/android_rust_toolchain/toolchain/lib/librustc_driver-4ace254e416bb1d5.so
-third_party/android_rust_toolchain/toolchain/lib/libstd-aaab3975206b8bfa.so
-third_party/android_rust_toolchain/toolchain/lib/libtest-a8f6f2fc413cd5a2.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libaddr2line-f42cba4d705c74b4.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libadler-7481ee5a85c59746.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/liballoc-c925d8e88324f72a.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libcfg_if-079cc96abd1d3d00.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libcompiler_builtins-9ee7802d8df3a8ec.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libcore-419d935ddfa567de.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libgetopts-7285e79f17376973.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libgimli-5e2c26b557018d03.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libhashbrown-910f826335959e5b.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/liblibc-5b0fe13598ee9132.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libminiz_oxide-c5fb12cd1fbbbab7.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libobject-0ea3df832e21011f.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libpanic_abort-a501a99d045dfefa.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libpanic_unwind-a1da2815a7f32cf7.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libproc_macro-d036cb0ee889b411.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libprofiler_builtins-e18b482ee191d107.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/librustc_demangle-a959d042139a893c.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/librustc_std_workspace_alloc-3d9107aa6613c657.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/librustc_std_workspace_core-189bc5e6f3521026.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/librustc_std_workspace_std-1d51de1817b7fc98.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libstd-ccccec45f98e3e9b.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libstd-ccccec45f98e3e9b.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libstd_detect-fcabe14e7be419ae.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libterm-aa80bb9f5bc685f9.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libtest-9d0829eabbe19b24.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libtest-9d0829eabbe19b24.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libunicode_width-9df5a1692e48f4da.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libunwind-8289ac39b2561055.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libaddr2line-d807da11b6b445a4.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libadler-668588d21affd20c.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/liballoc-aba160c21b803577.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libcfg_if-e82f0653d2cce1aa.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libcompiler_builtins-713d15b3c734ca30.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libcore-54e364e7905374e5.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libgetopts-7a265463a6f44a51.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libgimli-7366cef02c2f3727.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libhashbrown-545a230dbce69a48.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/liblibc-45f7071a88e4ccaf.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libminiz_oxide-e5a7b859c52f4df8.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libobject-3a6fecd3398a5819.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libpanic_abort-bc0daa74f99f4ab4.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libpanic_unwind-4910929a41968548.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libproc_macro-bdf802c0da2c41fb.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libprofiler_builtins-b1d5ecf7835e5c67.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/librustc_demangle-946667753b6e7f0a.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/librustc_std_workspace_alloc-edc769bb11c78453.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/librustc_std_workspace_core-2c02a65ebc823001.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/librustc_std_workspace_std-8f9be98b9c45c12b.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libstd-92ca6485c5c36e10.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libstd-92ca6485c5c36e10.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libstd_detect-54aedb81be092a33.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libterm-658443e40a59d33b.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libtest-25ad2607ea04ab52.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libtest-25ad2607ea04ab52.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libunicode_width-69bb95e32d96060a.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libunwind-c05dcb07934fb28c.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libaddr2line-8cf7bb96cab85c75.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libadler-15f25f163cc604f4.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/liballoc-9c5741b144584967.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libcfg_if-7e8e9b60aa18a01b.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libcompiler_builtins-cb921e2b7b20135d.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libcore-085401804b47a2d4.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libgetopts-289ecadd26ff316d.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libgimli-59c340c6e0bcc796.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libhashbrown-250bbb6425eb978c.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/liblibc-dd6e009c4c9c35de.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libminiz_oxide-a42a29ce6dcfa753.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libobject-7b1baf3376f814f0.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libpanic_abort-1bac26607b95d6a1.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libpanic_unwind-b077014943b27386.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libproc_macro-8aa579a84c4f7b31.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libprofiler_builtins-b4cd7496a3f6499d.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/librustc_demangle-9c1222db2ee4d5f6.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/librustc_std_workspace_alloc-33199b2d12ec3071.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/librustc_std_workspace_core-c4b9df87cfa140a5.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/librustc_std_workspace_std-618fd82ed4b09fe2.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libstd-73db552e6880d29a.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libstd-73db552e6880d29a.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libstd_detect-fbc6264e43c13187.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libterm-32bd9b10b09997b9.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libtest-0f2eeedfc8d0d0bd.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libtest-0f2eeedfc8d0d0bd.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libunicode_width-2bfe1530006efbf0.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libunwind-0d10620bbcf79467.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libaddr2line-353d3dc123668e78.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libadler-e77caf5ab66be07d.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/liballoc-a491a1b4bdea57e2.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libcfg_if-ebb6dcf45c0054ce.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libcompiler_builtins-e8ee15432cabe6f6.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libcore-317b1cf996ce312d.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libgetopts-889fbbed5447cf61.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libgimli-682d740f4b22c84f.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libhashbrown-da87df9cbec9e4be.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/liblibc-908d54044ab24310.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libminiz_oxide-6cf07ed1e345499d.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libobject-965a92282e18eb08.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_abort-d174486fec69a635.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_unwind-87a30b8f2453b8e8.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libproc_macro-94d92a0c1b2f4211.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libprofiler_builtins-5f68fa7cefdd64a3.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_demangle-de7a41f24ab6fcd5.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_alloc-701611517bf41fcc.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_core-780210bbf8e3d755.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_std-d0a46dd29e04b2aa.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-a88f60f34df1c6b6.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-a88f60f34df1c6b6.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libstd_detect-ec67ffa4474c10d4.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libterm-e5f4ba3ad0838632.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-a591c006cc22a86d.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-a591c006cc22a86d.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libunicode_width-7d4c54d57bf1733b.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libunwind-3899fe985715ac90.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libaddr2line-e1aacf817a7526a5.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libadler-a26dfba16c838a41.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/liballoc-1d1c50e0eeaeb00d.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libcfg_if-b2fde898b0ffdcad.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libcompiler_builtins-e8fac6af4b84ee0f.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libcore-d0e33278116e9449.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libgetopts-95271c46afdeb5da.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libgimli-548fcbb63d7af4d3.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libhashbrown-74efc5c356a34609.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/liblibc-f88fb2153a8242d0.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libminiz_oxide-1e901bc056e26527.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libobject-a54f359d080bcce6.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libpanic_abort-787effad3344f642.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libpanic_unwind-1b3c0a9a7c52c156.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libproc_macro-f2bbe6163718ffb3.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libprofiler_builtins-74a3ae1421cda577.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/librustc_demangle-01fbddda881d6f9e.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/librustc_std_workspace_alloc-f97bfd95dfc51998.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/librustc_std_workspace_core-d967e38751867d1f.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/librustc_std_workspace_std-a13cce70272dace1.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libstd-c907fd243af973b0.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libstd-c907fd243af973b0.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libstd_detect-340284a3d2a33bf9.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libterm-79e436eaccefb5d8.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libtest-9f1d90e4d16e6513.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libtest-9f1d90e4d16e6513.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libunicode_width-39c2992b94f67ec3.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libunwind-f88bd2d65adfa010.rlib
+third_party/android_rust_toolchain/toolchain/lib/librustc_driver-40e4a751f7ac31d2.so
+third_party/android_rust_toolchain/toolchain/lib/libstd-e2b5a9efc098561c.so
+third_party/android_rust_toolchain/toolchain/lib/libtest-0449e44b93e20f7d.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libaddr2line-4b023f98f1304e2c.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libadler-1a7a52cfa52abb49.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/liballoc-3f1ca82c4f761f6b.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libcfg_if-ca62d680223a30f6.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libcompiler_builtins-a716b61bf0bb00dd.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libcore-d79c0387369d954d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libgetopts-4b35d59916617774.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libgimli-8eb906e4629e1aa2.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libhashbrown-23bab81a6a9743e5.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/liblibc-9014124c0e0f7586.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libmemchr-85a3e003fa0c5bd6.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libminiz_oxide-cb6b80a671e23b32.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libobject-f59855e6e93e74ae.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libpanic_abort-05b3ca9d42bdca5c.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libpanic_unwind-db0c20f8f1d59147.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libproc_macro-308cc522081bc128.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libprofiler_builtins-38960d6e6f1051bb.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/librustc_demangle-6a846c687129a234.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/librustc_std_workspace_alloc-6f6ca50a3b234404.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/librustc_std_workspace_core-1453f920b721134d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/librustc_std_workspace_std-92b9be4a3a4ac64e.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libstd-be6a8a4750ecc80c.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libstd-be6a8a4750ecc80c.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libstd_detect-13bf4956c6925340.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libtest-25f178cd57943597.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libtest-25f178cd57943597.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libunicode_width-6940f65de77f1ad3.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libunwind-6b660d3cd8d51743.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libaddr2line-83cd719109cc062b.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libadler-d6b725276cc6b70b.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/liballoc-f46b6099e4f0abab.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libcfg_if-7da692c7f6cc4183.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libcompiler_builtins-efbf614ce5e07b15.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libcore-d96757ff7df8d505.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libgetopts-231149e2a51c723b.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libgimli-9221a0010611db1c.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libhashbrown-834cac8d2e197a3b.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/liblibc-7ebb4e7fe383a8bd.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libmemchr-a8878bfdffa7e098.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libminiz_oxide-3973283ec1081cb4.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libobject-fd1900ef2d0f399b.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libpanic_abort-a187b73729dab34d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libpanic_unwind-d68f811863d467bf.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libproc_macro-b135b36bb2140d4e.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libprofiler_builtins-50fdbc2c7f6c58f2.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/librustc_demangle-68180474355d16a8.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/librustc_std_workspace_alloc-11b0b05fd04f6df6.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/librustc_std_workspace_core-7d137f1169dd22fc.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/librustc_std_workspace_std-f4bdb9272c6e5e9a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libstd-620e4ca9eee7e441.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libstd-620e4ca9eee7e441.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libstd_detect-31d7093e61e48ee4.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libtest-d305da33fa8b286a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libtest-d305da33fa8b286a.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libunicode_width-816d7262a308a4ba.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libunwind-2bbcafb02e109930.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libaddr2line-b80f82c22f9f60c0.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libadler-e31bae26f342a1b5.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/liballoc-52a266b148d631d6.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libcfg_if-d4117a0520cea529.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libcompiler_builtins-b795b1b692373fbf.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libcore-401f457f6c278aa1.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libgetopts-bfa07d02c978c2dd.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libgimli-5eb2a77b32a5ab90.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libhashbrown-3ddbfc5d56bc8dc7.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/liblibc-bfedf45dea7d807c.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libmemchr-1b714fb0956e04c1.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libminiz_oxide-a245e29218fffb96.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libobject-bcdf7d4aeb504c6f.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libpanic_abort-707fb726ec0350a1.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libpanic_unwind-309d26e29de8caf7.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libproc_macro-8c08821478540900.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libprofiler_builtins-74ddc1fb7d700bb3.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/librustc_demangle-d738fa85497395d5.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/librustc_std_workspace_alloc-878199316db4a4e1.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/librustc_std_workspace_core-0d0b13c11ab27f68.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/librustc_std_workspace_std-ef928b172451ce10.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libstd-5e28d8982fc7b91b.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libstd-5e28d8982fc7b91b.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libstd_detect-bcdbe86f9f0c2062.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libtest-9aa3ce45fd85b93e.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libtest-9aa3ce45fd85b93e.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libunicode_width-cdbc725d2bbd619c.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libunwind-1e23b4bd45da4a0b.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libaddr2line-9e1ffbc049922e5c.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libadler-8fe562b9faa018ab.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/liballoc-93a850051ed74ad6.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libcfg_if-32e13546a754f906.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libcompiler_builtins-5582ded72b28292b.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libcore-e84a4cca2c643be7.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libgetopts-faf0593875844c2d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libgimli-55e0a894ead54f81.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libhashbrown-d9fe0481ea794295.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/liblibc-14f59d904f48f7d9.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libmemchr-4da74ff1ade5db2b.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libminiz_oxide-3fdbcb62edd1eb1b.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libobject-dbdd19ceba29da0a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_abort-fa261e638b50d9e7.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_unwind-4ad2cb1b3b16d3e7.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libproc_macro-b0e646d089b33d4f.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libprofiler_builtins-8a8d9a87df90adcd.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_demangle-260188203a434405.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_alloc-f22f8646734effca.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_core-c3560c242d220eaa.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_std-9788da9329699b7d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-c9e3707a155ee09e.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-c9e3707a155ee09e.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libstd_detect-1dcf1a755250d2b1.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-d7a093d13151eb77.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-d7a093d13151eb77.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libunicode_width-89e1d7bf245a65a0.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libunwind-bfee566df6bd8bc5.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/src/rust/library/stdarch/crates/std_detect/src/detect/test_data/linux-rpi3.auxv
+third_party/android_rust_toolchain/toolchain/lib/rustlib/src/rust/library/stdarch/crates/std_detect/src/detect/test_data/linux-x64-i7-6850k.auxv
+third_party/android_rust_toolchain/toolchain/lib/rustlib/src/rust/library/stdarch/crates/std_detect/src/detect/test_data/macos-virtualbox-linux-x86-4850HQ.auxv
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libaddr2line-a00cb46dbd9b8a36.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libadler-73472fe2be106d2a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/liballoc-47f8b89c93c2e7b8.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libcfg_if-352fee0861bd04e0.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libcompiler_builtins-2cb03042cfd4f2e6.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libcore-636e6b93ffc9afe0.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libgetopts-67da7ba4b634b7a3.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libgimli-88eac0d321fa24a8.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libhashbrown-ea684a4f206ed9e3.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/liblibc-a4bf760a9574c4db.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libmemchr-1caaea53adce6d2f.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libminiz_oxide-93ba7d748b88220a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libobject-bd8a586ab2dd3dd1.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libpanic_abort-2b490101db23a9fe.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libpanic_unwind-42b63aee7fb72e29.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libproc_macro-fb615a50aa953db3.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libprofiler_builtins-64b2716947b6b842.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/librustc_demangle-88e3c315a8f29cb3.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/librustc_std_workspace_alloc-162fd7309731908d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/librustc_std_workspace_core-36260baac2ca51dc.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/librustc_std_workspace_std-d71b5c408318ffe4.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libstd-9c1432c0e40e55f7.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libstd-9c1432c0e40e55f7.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libstd_detect-e1cee4266124ab4a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libtest-ff2ee25811ba5524.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libtest-ff2ee25811ba5524.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libunicode_width-d7d34d3cc731c379.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libunwind-815085681c5485f0.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/bin/rust-llvm-dwp
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-ed0b8c1a876bd3aa.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-60043a2b0579dce9.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-3f5a270a1dd8bd86.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-f38647c10e6a861f.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-8c2eb7da7ad93e34.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-d1ae12a8f14b3e58.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-6f262b416a4edee5.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-dbe7723b4c12f286.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-91d9c574f322bdd6.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-9b8c635993f7f58f.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-779920a63ea1b2c6.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-c2d9e691484217b4.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-d0104a9fbb8558e7.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-494f1a3a067119a7.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-820ed3136989d3af.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-78a9f9fbd6a248b2.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-45170a94feacc05d.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-b6229e7e9641b39f.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-834d2768d40b2dac.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-3c2a67e03a81ae2d.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-aaab3975206b8bfa.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-aaab3975206b8bfa.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect-884a9446f78fbb55.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libterm-c295c369cb47e192.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-a8f6f2fc413cd5a2.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-a8f6f2fc413cd5a2.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-350f7c96bda990a5.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-257d6e4c75a5cce0.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-3446f50ba83847e5.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-00c73df04db19007.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-d9d70f22a2604764.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-699ff169487543ec.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-3db59cf333b93069.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-8dabc414acc0cdb5.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-b932a1c7c8ed8e80.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-18e1cb2a024368a2.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-fcdd8d4d3694d283.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-01c6058560e0a0af.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemchr-7342061944bf2a5d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-d43fb4a629d3f4c0.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-2c288e101d249fcc.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-7de93b478b2b634a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-fe4c874eab717abd.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-97b4f94afd883484.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-12fd592ac769a7fa.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-171f0d9ffe075ad8.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-55b8024a1b86d394.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-ea5cb65ce190d83e.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-cb64de54a44a7460.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-e2b5a9efc098561c.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-e2b5a9efc098561c.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect-8e8da0841e7beb7a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-0449e44b93e20f7d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-0449e44b93e20f7d.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-41cc586a96de90ad.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-92b0bd70e14aa31d.rlib
 third_party/android_rust_toolchain/toolchain/lib64/libc++.so.1
 third_party/android_rust_toolchain/toolchain/libexec/cargo-credential-1password
-third_party/android_rust_toolchain/toolchain/src/stdlibs/library/stdarch/crates/std_detect/src/detect/test_data/linux-rpi3.auxv
-third_party/android_rust_toolchain/toolchain/src/stdlibs/library/stdarch/crates/std_detect/src/detect/test_data/linux-x64-i7-6850k.auxv
-third_party/android_rust_toolchain/toolchain/src/stdlibs/library/stdarch/crates/std_detect/src/detect/test_data/macos-virtualbox-linux-x86-4850HQ.auxv
 third_party/angle/samples/multi_texture/basemap.tga
 third_party/angle/samples/multi_texture/lightmap.tga
 third_party/angle/samples/particle_system/smoke.tga
@@ -2986,6 +2991,7 @@ third_party/blink/manual_tests/resources/orange.mov
 third_party/blink/manual_tests/resources/plain-text-paste.dmg
 third_party/blink/manual_tests/resources/spinbox.swf
 third_party/blink/perf_tests/sun_spider/resources/TimeProfile20us.tracetemplate
+third_party/blink/perf_tests/webcodecs/resources/720p.h264
 third_party/blink/renderer/bindings/core/v8/serialization/fuzz_corpus/blink-0bb59816-x86
 third_party/blink/renderer/bindings/core/v8/serialization/fuzz_corpus/blink-10205257-x86
 third_party/blink/renderer/bindings/core/v8/serialization/fuzz_corpus/blink-12221360-x86
@@ -8112,6 +8118,8 @@ third_party/catapult/telemetry/telemetry/internal/testing/bear.webm
 third_party/catapult/telemetry/telemetry/internal/testing/jebgalgnebhfojomionfpkfelancnnkf.crx
 third_party/catapult/telemetry/telemetry/internal/testing/screen_3_frames.mov
 third_party/catapult/telemetry/telemetry/internal/testing/vid.mp4
+third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/internal/_api_implementation.so
+third_party/catapult/third_party/gae_ts_mon/gae_ts_mon/protobuf/google/protobuf/pyext/_message.so
 third_party/catapult/third_party/google-endpoints/Crypto/Cipher/_AES.so
 third_party/catapult/third_party/google-endpoints/Crypto/Cipher/_ARC2.so
 third_party/catapult/third_party/google-endpoints/Crypto/Cipher/_ARC4.so
@@ -8155,6 +8163,7 @@ third_party/catapult/third_party/vinn/third_party/v8/linux/arm/d8
 third_party/catapult/third_party/vinn/third_party/v8/linux/mips/d8
 third_party/catapult/third_party/vinn/third_party/v8/linux/mips64/d8
 third_party/catapult/third_party/vinn/third_party/v8/linux/x86_64/d8
+third_party/catapult/third_party/vinn/third_party/v8/mac/arm/d8
 third_party/catapult/third_party/vinn/third_party/v8/mac/x86_64/d8
 third_party/catapult/third_party/vinn/third_party/v8/win/AMD64/API-MS-Win-Core-Heap-Obsolete-L1-1-0.dll
 third_party/catapult/third_party/vinn/third_party/v8/win/AMD64/API-MS-Win-Core-Kernel32-Private-L1-1-0.dll
@@ -8267,6 +8276,8 @@ third_party/closure_compiler/compiler/compiler.jar
 third_party/crashpad/crashpad/handler/win/z7_test.dll
 third_party/crashpad/crashpad/snapshot/elf/elf_image_reader_fuzzer_corpus/crashpad_snapshot_test_both_dt_hash_styles.so
 third_party/crashpad/crashpad/snapshot/elf/elf_image_reader_fuzzer_corpus/ret42
+third_party/crashpad/crashpad/snapshot/ios/testdata/crash-1fa088dda0adb41459d063078a0f384a0bb8eefa
+third_party/crashpad/crashpad/snapshot/ios/testdata/crash-5726011582644224
 third_party/crashpad/crashpad/util/net/testdata/binary_http_body.dat
 third_party/dawn/third_party/tint/test/bug/tint/804.spv
 third_party/dawn/third_party/tint/test/bug/tint/807.spv
@@ -8565,6 +8576,7 @@ third_party/devtools-frontend/src/test/screenshots/image_diff/mac/libc++.dylib
 third_party/devtools-frontend/src/test/screenshots/image_diff/mac/libchrome_zlib.dylib
 third_party/ffmpeg/tests/reference.pnm
 third_party/flatbuffers/src/android/gradle/wrapper/gradle-wrapper.jar
+third_party/flatbuffers/src/dart/test/monsterdata_test.mon
 third_party/flatbuffers/src/kotlin/gradle/wrapper/gradle-wrapper.jar
 third_party/flatbuffers/src/samples/monster.bfbs
 third_party/flatbuffers/src/tests/FlatBuffers.Test.Swift/monsterdata_test.mon
@@ -10735,6 +10747,7 @@ third_party/harfbuzz-ng/src/test/api/fonts/AdobeVFPrototype.ac.nosubrs.otf
 third_party/harfbuzz-ng/src/test/api/fonts/AdobeVFPrototype.ac.otf
 third_party/harfbuzz-ng/src/test/api/fonts/AdobeVFPrototype.ac.retaingids.otf
 third_party/harfbuzz-ng/src/test/api/fonts/AdobeVFPrototype_vsindex.otf
+third_party/harfbuzz-ng/src/test/api/fonts/Cantarell.A.otf
 third_party/harfbuzz-ng/src/test/api/fonts/MathTestFontEmpty.otf
 third_party/harfbuzz-ng/src/test/api/fonts/MathTestFontFull.otf
 third_party/harfbuzz-ng/src/test/api/fonts/MathTestFontNone.otf
@@ -10858,6 +10871,7 @@ third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-ha
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-6603291950841856
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer-6712347260092416
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-harfbuzz_fuzzer.exe-5470269447340032
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-draw-fuzzer-4856957815619584
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-draw-fuzzer-5088336521986048
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-draw-fuzzer-5103082208493568
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-draw-fuzzer-5641612227772416
@@ -11102,7 +11116,9 @@ third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6231212713312256
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6241118484955136
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6246465148813312
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6254792024915968
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6276691949518848
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6315334756335616
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6316256152780800
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6372147008241664
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6382598554255360
@@ -11137,6 +11153,7 @@ third_party/harfbuzz-ng/src/test/fuzzing/fonts/fuzz-3-harfbuzz_fuzzer(2)
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/fuzz-3-harfbuzz_fuzzer(3)
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/fuzz-3-harfbuzz_fuzzer(4)
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/fuzz-3-harfbuzz_fuzzer(5)
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/leak-34f1798a142fd0dfdd71a96fb6aa7de19a62865e
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/oom-6ef8c96d3710262511bcc730dce9c00e722cb653
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/oom-ccc61c92d589f895174cdef6ff2e3b20e9999a1a
 third_party/harfbuzz-ng/src/test/fuzzing/sets/intersect_01
@@ -11891,10 +11908,18 @@ third_party/icu/source/data/in/nfkc_cf.nrm
 third_party/icu/source/data/in/pnames.icu
 third_party/icu/source/data/in/ubidi.icu
 third_party/icu/source/data/in/ucase.icu
+third_party/icu/source/data/in/uemoji.icu
 third_party/icu/source/data/in/ulayout.icu
 third_party/icu/source/data/in/unames.icu
 third_party/icu/source/data/in/uprops.icu
 third_party/icu/source/data/in/uts46.nrm
+third_party/icu/source/test/fuzzer/collator_rulebased_ICU-21041.fuzz
+third_party/icu/source/test/testdata/TestFont1.otf
+third_party/icu/source/test/testdata/encoded.utf16be
+third_party/icu/source/test/testdata/importtest.bin
+third_party/icu/source/test/testdata/old_e_testtypes.res
+third_party/icu/source/test/testdata/old_l_testtypes.res
+third_party/icu/source/test/testdata/uni-text.bin
 third_party/icu/tzres/metaZones.res
 third_party/icu/tzres/timezoneTypes.res
 third_party/icu/tzres/zoneinfo64.res
@@ -12134,7 +12159,6 @@ third_party/libjxl/src/third_party/testdata/imagecompression.info/flower_foveon.
 third_party/libjxl/src/third_party/testdata/jxl/blending/cropped_traffic_light.jxl
 third_party/libjxl/src/third_party/testdata/jxl/color_management/sRGB-D2700.icc
 third_party/libjxl/src/third_party/testdata/jxl/spline_on_first_frame.jxl
-third_party/liblouis/src/.travis/secrets/deploy_key.enc
 third_party/liblouis/src/tables/fr-bfu-comp8.utb
 third_party/liblouis/src/tables/hr-chardefs.cti
 third_party/liblouis/src/tables/hu-chardefs.cti
@@ -14454,13 +14478,7 @@ third_party/llvm/lld/test/ELF/Inputs/no-symtab.o
 third_party/llvm/lld/test/ELF/Inputs/ppc64le-quadword-ldst.o
 third_party/llvm/lld/test/ELF/Inputs/version-use.so
 third_party/llvm/lld/test/ELF/lto/Inputs/drop-debug-info.bc
-third_party/llvm/lld/test/mach-o/Inputs/lib-search-paths/usr/lib/libmyshared.dylib
-third_party/llvm/lld/test/mach-o/Inputs/lib-search-paths/usr/lib/libmystatic.a
-third_party/llvm/lld/test/mach-o/Inputs/lib-search-paths/usr/local/lib/file.o
-third_party/llvm/lld/test/mach-o/Inputs/libbar.a
-third_party/llvm/lld/test/mach-o/Inputs/libfoo.a
 third_party/llvm/lld/test/wasm/corrupted.wasm.test
-third_party/llvm/lldb/examples/python/scripted_process/main.stack-dump
 third_party/llvm/lldb/test/API/commands/trace/intelpt-trace-multi-file/a.out
 third_party/llvm/lldb/test/API/commands/trace/intelpt-trace-multi-file/libbar.so
 third_party/llvm/lldb/test/API/commands/trace/intelpt-trace-multi-file/libfoo.so
@@ -15252,6 +15270,7 @@ third_party/llvm/llvm/test/tools/llvm-cov/Inputs/multiple_objects_not_all_instru
 third_party/llvm/llvm/test/tools/llvm-cov/Inputs/multiple_objects_not_all_instrumented/not_instrumented
 third_party/llvm/llvm/test/tools/llvm-cov/Inputs/multithreaded_report/main.covmapping
 third_party/llvm/llvm/test/tools/llvm-cov/Inputs/multithreaded_report/main.profdata
+third_party/llvm/llvm/test/tools/llvm-cov/Inputs/name_allowlist.covmapping
 third_party/llvm/llvm/test/tools/llvm-cov/Inputs/name_whitelist.covmapping
 third_party/llvm/llvm/test/tools/llvm-cov/Inputs/native_separators.covmapping
 third_party/llvm/llvm/test/tools/llvm-cov/Inputs/path_equivalence.covmapping
@@ -15500,6 +15519,7 @@ third_party/llvm/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-uleb-mal
 third_party/llvm/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-uleb-times
 third_party/llvm/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-uleb-times-skipping-uleb
 third_party/llvm/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-stabs-x86_64
+third_party/llvm/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-tlv.o
 third_party/llvm/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-bad-export-info-malformed-uleb128
 third_party/llvm/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-bad-export-info-malformed-uleb128_too_big
 third_party/llvm/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-bad-kind
@@ -15575,6 +15595,7 @@ third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/dotnet_contents_uncompresse
 third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/dotnet_hashonly.pdb
 third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/tpi.bin
 third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/unknown-record.obj
+third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/basic.memprofraw
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/c-general.profraw
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/compat-sample.profdata
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/compat.profdata.v1
@@ -15582,12 +15603,14 @@ third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/compat.profdata.v2
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/compat.profdata.v4
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/compressed.profraw
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/gcc-sample-profile.gcov
+third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/multi.memprofraw
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/unknown.section.compressed.extbin.profdata
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/unknown.section.extbin.profdata
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/weight-instr-bar.profdata
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/weight-instr-foo.profdata
 third_party/llvm/llvm/test/tools/llvm-profgen/Inputs/coroutine.perfbin
 third_party/llvm/llvm/test/tools/llvm-profgen/Inputs/cs-preinline-cost.perfbin
+third_party/llvm/llvm/test/tools/llvm-profgen/Inputs/fs-discriminator.perfbin
 third_party/llvm/llvm/test/tools/llvm-profgen/Inputs/func-split.perfbin
 third_party/llvm/llvm/test/tools/llvm-profgen/Inputs/inline-cs-noprobe.perfbin
 third_party/llvm/llvm/test/tools/llvm-profgen/Inputs/inline-cs-pseudoprobe.perfbin
@@ -15664,10 +15687,6 @@ third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/trivial.obj.macho-i38
 third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/trivial.obj.macho-ppc
 third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/trivial.obj.macho-ppc64
 third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/trivial.obj.macho-x86-64
-third_party/llvm/llvm/test/tools/llvm-readobj/XCOFF/Inputs/basic-neg-sym-count.o
-third_party/llvm/llvm/test/tools/llvm-readobj/XCOFF/Inputs/basic-neg-time.o
-third_party/llvm/llvm/test/tools/llvm-readobj/XCOFF/Inputs/basic.o
-third_party/llvm/llvm/test/tools/llvm-readobj/XCOFF/Inputs/basic64.o
 third_party/llvm/llvm/test/tools/llvm-readobj/XCOFF/Inputs/file-aux-wrong64.o
 third_party/llvm/llvm/test/tools/llvm-readobj/XCOFF/Inputs/needed-libs-32.o
 third_party/llvm/llvm/test/tools/llvm-readobj/XCOFF/Inputs/needed-libs-64.o
@@ -16230,7 +16249,96 @@ third_party/swiftshader/tests/kokoro/gcp_ubuntu/tstellar-gpg-key.asc
 third_party/swiftshader/tests/regres/llvm/10.0.0-darwin.sig
 third_party/swiftshader/tests/regres/llvm/10.0.0-ubuntu.sig
 third_party/swiftshader/tests/regres/llvm/10.0.0-win64.sig
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_000.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_001.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_002.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_003.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_004.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_005.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_006.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_007.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_008.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_009.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_010.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_011.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_012.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_013.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_014.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_015.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_016.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_017.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_018.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_019.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_020.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_021.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_022.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_023.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_024.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_025.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_026.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_027.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_028.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_029.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_030.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_031.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_032.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_033.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_034.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_035.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_036.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_037.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_038.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_039.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_040.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_041.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_042.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_043.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_044.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_045.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_046.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_047.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_048.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_049.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_050.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_051.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_052.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_053.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_054.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_055.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_056.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_057.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_058.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_059.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_060.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_061.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_062.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_063.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_064.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_065.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_066.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_067.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_068.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_069.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_070.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_071.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_072.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_073.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_074.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_075.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_076.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_077.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_078.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_079.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_080.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_081.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_082.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_083.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_084.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_085.spv
+third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_086.spv
 third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/simple.spv
+third_party/tensorflow-text/src/docs/api_docs/python/text/api_report.pb
+third_party/tensorflow-text/src/tensorflow_text/python/ops/test_data/fast_wordpiece_tokenizer_model.fb
 third_party/tensorflow-text/src/tensorflow_text/python/ops/test_data/segmenter_hub_module/saved_model.pb
 third_party/tensorflow-text/src/tensorflow_text/python/ops/test_data/segmenter_hub_module/tfhub_module.pb
 third_party/tensorflow-text/src/tensorflow_text/python/ops/test_data/segmenter_hub_module/variables/variables.data-00000-of-00001
@@ -16659,7 +16767,6 @@ third_party/tflite_support/src/tensorflow_lite_support/custom_ops/kernel/testdat
 third_party/tflite_support/src/tensorflow_lite_support/custom_ops/kernel/testdata/whitespace_tokenizer_to_ragged_2d_input.tflite
 third_party/tflite_support/src/tensorflow_lite_support/custom_ops/kernel/testdata/whitespace_tokenizer_to_tensor.tflite
 third_party/tflite_support/src/tensorflow_lite_support/custom_ops/testdata/sentencepiece_tokenizer_flex_op.tflite
-third_party/tlslite/tests/verifierDB
 third_party/usrsctp/usrsctplib/fuzzer/CORPUS_CONNECT/addip-000000
 third_party/usrsctp/usrsctplib/fuzzer/CORPUS_CONNECT/addip-000001
 third_party/usrsctp/usrsctplib/fuzzer/CORPUS_CONNECT/addip-000002