Update to Chromium 105.0.5195.52

2026-04-14 00:14:20 +09:00 · 2022-08-24 13:57:18 -05:00
parent 5a493a6484
commit 7ee3b040c3
55 changed files with 1359 additions and 913 deletions
--- a/chromium_version.txt
+++ b/chromium_version.txt
@@ -1 +1 @@
-104.0.5112.102
+105.0.5195.52
--- a/devutils/update_lists.py
+++ b/devutils/update_lists.py
@@ -61,6 +61,8 @@ PRUNING_EXCLUDE_PATTERNS = [
    'build/android/chromium-debug.keystore',
    'third_party/icu/android/icudtl.dat',
    'third_party/icu/common/icudtb.dat',
+    # Exclusion for performance tracing
+    'third_party/perfetto/src/trace_processor/importers/proto/atoms.descriptor',
    # Exclusions for safe file extensions
    '*.avif',
    '*.ttf',
--- a/domain_substitution.list
+++ b/domain_substitution.list
--- a/patches/core/debian/disable/unrar.patch
+++ b/patches/core/debian/disable/unrar.patch
@@ -4,7 +4,7 @@ bug: http://bugs.debian.org/914487

 --- a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
 +++ b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
-@@ -96,7 +96,7 @@ void FileAnalyzer::Start(const base::Fil
+@@ -97,7 +97,7 @@ void FileAnalyzer::Start(const base::Fil
   if (inspection_type == DownloadFileType::ZIP) {
     StartExtractZipFeatures();
   } else if (inspection_type == DownloadFileType::RAR) {
--- a/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch
+++ b/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2229,7 +2229,6 @@ static_library("browser") {
+@@ -2226,7 +2226,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",
-@@ -3649,8 +3648,6 @@ static_library("browser") {
+@@ -3674,8 +3673,6 @@ static_library("browser") {
       "download/download_commands.h",
       "download/download_crx_util.cc",
       "download/download_crx_util.h",
@@ -111,7 +111,7 @@
   subresource_filter::RulesetService* subresource_filter_ruleset_service()
       override;
 
-@@ -327,9 +326,6 @@ class BrowserProcessImpl : public Browse
+@@ -329,9 +328,6 @@ class BrowserProcessImpl : public Browse
   std::unique_ptr<BackgroundModeManager> background_mode_manager_;
 #endif
 
@@ -131,7 +131,7 @@
 #include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/share/share_history.h"
-@@ -625,10 +624,6 @@ void ChromeBrowsingDataRemoverDelegate::
+@@ -630,10 +629,6 @@ void ChromeBrowsingDataRemoverDelegate::
     base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
 
     network::mojom::NetworkContext* safe_browsing_context = nullptr;
@@ -144,7 +144,7 @@
                                                    host_content_settings_map_);
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -968,34 +968,6 @@ void SetApplicationLocaleOnIOThread(cons
+@@ -1003,34 +1003,6 @@ void SetApplicationLocaleOnIOThread(cons
   GetIOThreadApplicationLocale() = locale;
 }
 
@@ -179,15 +179,7 @@
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 
 AppLoadedInTabSource ClassifyAppLoadedInTabSource(
-@@ -1511,7 +1483,6 @@ void ChromeContentBrowserClient::PostAft
-   InitNetworkContextsParentDirectory();
- 
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  safe_browsing_service_ = g_browser_process->safe_browsing_service();
- }
- 
- bool ChromeContentBrowserClient::IsBrowserStartupComplete() {
-@@ -4378,14 +4349,9 @@ ChromeContentBrowserClient::CreateThrott
+@@ -4487,14 +4459,9 @@ ChromeContentBrowserClient::CreateThrott
   throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
       handle, handle->GetWebContents()->GetBrowserContext()));
 
@@ -203,7 +195,7 @@
       base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
       base::BindOnce(
           &ShouldIgnoreSslInterstitialBecauseNavigationDefaultedToHttps)));
-@@ -4420,16 +4386,6 @@ ChromeContentBrowserClient::CreateThrott
+@@ -4529,16 +4496,6 @@ ChromeContentBrowserClient::CreateThrott
                    &throttles);
 #endif
 
@@ -220,6 +212,15 @@
   if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) {
     throttles.push_back(
         std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
+@@ -4765,8 +4722,6 @@ void ChromeContentBrowserClient::Overrid
+ void ChromeContentBrowserClient::InitOnUIThread() {
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ 
+-  safe_browsing_service_ = g_browser_process->safe_browsing_service();
+-
+   // Initialize `network_contexts_parent_directory_`.
+   base::FilePath user_data_dir;
+   base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
 --- a/chrome/browser/component_updater/file_type_policies_component_installer.cc
 +++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc
@@ -39,20 +39,6 @@ const uint8_t kFileTypePoliciesPublicKey
@@ -245,21 +246,21 @@
 }  // namespace
 --- a/chrome/browser/download/chrome_download_manager_delegate.cc
 +++ b/chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -438,13 +438,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
+@@ -451,13 +451,6 @@ void ChromeDownloadManagerDelegate::SetD
 
- void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
   download_manager_ = dm;
-
+ 
 -  safe_browsing::SafeBrowsingService* sb_service =
 -      g_browser_process->safe_browsing_service();
 -  if (sb_service && !profile_->IsOffTheRecord()) {
 -    // Include this download manager in the set monitored by safe browsing.
 -    sb_service->AddDownloadManager(dm);
 -  }
- }
- 
- #if BUILDFLAG(IS_ANDROID)
-@@ -797,17 +790,6 @@ void ChromeDownloadManagerDelegate::Choo
+-
+   if (download_manager_) {
+     download_manager_->AddObserver(this);
+   }
+@@ -810,17 +803,6 @@ void ChromeDownloadManagerDelegate::Choo
 void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
     base::FilePath* filename,
     const GURL& source_url) {
@@ -279,7 +280,7 @@
 void ChromeDownloadManagerDelegate::SanitizeDownloadParameters(
 --- a/chrome/browser/download/download_item_model.cc
 +++ b/chrome/browser/download/download_item_model.cc
-@@ -92,7 +92,7 @@ class DownloadItemModelData : public bas
+@@ -97,7 +97,7 @@ class DownloadItemModelData : public bas
 
   // Danger level of the file determined based on the file type and whether
   // there was a user action associated with the download.
@@ -288,7 +289,7 @@
 
   // Whether the download is currently being revived.
   bool is_being_revived_;
-@@ -133,7 +133,7 @@ DownloadItemModelData::DownloadItemModel
+@@ -143,7 +143,7 @@ DownloadItemModelData::DownloadItemModel
     : should_show_in_shelf_(true),
       was_ui_notified_(false),
       should_prefer_opening_in_browser_(false),
@@ -297,7 +298,7 @@
       is_being_revived_(false) {}
 
 #if BUILDFLAG(FULL_SAFE_BROWSING)
-@@ -443,13 +443,13 @@ void DownloadItemModel::SetShouldPreferO
+@@ -444,13 +444,13 @@ void DownloadItemModel::SetShouldPreferO
   data->should_prefer_opening_in_browser_ = preference;
 }
 
@@ -314,7 +315,7 @@
   DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
   data->danger_level_ = danger_level;
 }
-@@ -669,9 +669,6 @@ bool DownloadItemModel::IsCommandEnabled
+@@ -672,9 +672,6 @@ bool DownloadItemModel::IsCommandEnabled
       // filename. Don't base an "Always open" decision based on it. Also
       // exclude extensions.
       return download_->CanOpenDownload() &&
@@ -326,7 +327,7 @@
       return !download_->IsSavePackageDownload() &&
 --- a/chrome/browser/download/download_prefs.cc
 +++ b/chrome/browser/download/download_prefs.cc
-@@ -252,14 +252,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
+@@ -263,14 +263,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
         base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) +
         extension);
 
@@ -342,7 +343,7 @@
   }
 }
 
-@@ -471,10 +464,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
+@@ -458,10 +451,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
 bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension(
     const base::FilePath& file_name) {
   base::FilePath::StringType extension = file_name.Extension();
@@ -355,7 +356,7 @@
   extension.erase(0, 1);
 --- a/chrome/browser/download/download_target_determiner.cc
 +++ b/chrome/browser/download/download_target_determiner.cc
-@@ -297,13 +297,6 @@ base::FilePath DownloadTargetDeterminer:
+@@ -299,13 +299,6 @@ base::FilePath DownloadTargetDeterminer:
       download_->GetURL(), download_->GetContentDisposition(), referrer_charset,
       suggested_filename, sniffed_mime_type, default_filename);
 
@@ -369,7 +370,7 @@
   // If no mime type or explicitly specified a name, don't replace file
   // extension.
   if (sniffed_mime_type.empty() || !suggested_filename.empty())
-@@ -1129,30 +1122,7 @@ DownloadFileType::DangerLevel DownloadTa
+@@ -1160,30 +1153,7 @@ DownloadFileType::DangerLevel DownloadTa
       download_->HasUserGesture())
     return DownloadFileType::NOT_DANGEROUS;
 
@@ -403,15 +404,15 @@
 absl::optional<base::Time>
 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc
 +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
-@@ -35,7 +35,6 @@
- #include "chrome/browser/browser_process.h"
+@@ -37,7 +37,6 @@
+ #include "chrome/browser/download/bubble/download_bubble_prefs.h"
 #include "chrome/browser/download/download_core_service.h"
 #include "chrome/browser/download/download_core_service_factory.h"
 -#include "chrome/browser/download/download_danger_prompt.h"
 #include "chrome/browser/download/download_file_icon_extractor.h"
 #include "chrome/browser/download/download_open_prompt.h"
 #include "chrome/browser/download/download_prefs.h"
-@@ -1261,9 +1260,6 @@ DownloadsAcceptDangerFunction::Downloads
+@@ -1302,9 +1301,6 @@ DownloadsAcceptDangerFunction::Downloads
 
 DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
 
@@ -421,7 +422,7 @@
 ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
   std::unique_ptr<downloads::AcceptDanger::Params> params(
       downloads::AcceptDanger::Params::Create(args()));
-@@ -1301,42 +1297,7 @@ void DownloadsAcceptDangerFunction::Prom
+@@ -1342,42 +1338,7 @@ void DownloadsAcceptDangerFunction::Prom
     return;
   }
   RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -695,7 +696,7 @@
   // SimpleURLLoader -> (owned loader, extension id).
 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc
 +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -865,9 +865,6 @@ void ChromeMetricsServiceClient::Registe
+@@ -867,9 +867,6 @@ void ChromeMetricsServiceClient::Registe
   metrics_service_->RegisterMetricsProvider(
       std::make_unique<HttpsEngagementMetricsProvider>());
 
@@ -719,7 +720,7 @@
 // static
 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -335,7 +335,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -349,7 +349,6 @@ void ChromeBrowserMainExtraPartsProfiles
 #if BUILDFLAG(IS_CHROMEOS_LACROS)
   CertDbInitializerFactory::GetInstance();
 #endif
@@ -769,7 +770,7 @@
   if (!profile)
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
-@@ -6,6 +6,7 @@ import("//components/safe_browsing/build
+@@ -7,6 +7,7 @@ import("//components/safe_browsing/build
 import("//extensions/buildflags/buildflags.gni")
 
 static_library("safe_browsing") {
@@ -777,7 +778,7 @@
   sources = [
     "chrome_controller_client.cc",
     "chrome_controller_client.h",
-@@ -91,6 +92,7 @@ static_library("safe_browsing") {
+@@ -93,6 +94,7 @@ static_library("safe_browsing") {
       "//extensions/browser",
     ]
   }
@@ -785,7 +786,7 @@
 
   if (safe_browsing_mode != 0) {
     # "Safe Browsing Basic" files used for safe browsing in full mode
-@@ -458,6 +460,7 @@ static_library("advanced_protection") {
+@@ -463,6 +465,7 @@ static_library("advanced_protection") {
 }
 
 source_set("metrics_collector") {
@@ -793,7 +794,7 @@
   sources = [
     "safe_browsing_metrics_collector_factory.cc",
     "safe_browsing_metrics_collector_factory.h",
-@@ -475,6 +478,7 @@ source_set("metrics_collector") {
+@@ -480,6 +483,7 @@ source_set("metrics_collector") {
     "//components/safe_browsing/core/common:safe_browsing_prefs",
     "//content/public/browser",
   ]
@@ -895,7 +896,7 @@
 
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -4270,7 +4270,6 @@ static_library("ui") {
+@@ -4312,7 +4312,6 @@ static_library("ui") {
       "views/download/bubble/download_dialog_view.h",
       "views/download/bubble/download_toolbar_button_view.cc",
       "views/download/bubble/download_toolbar_button_view.h",
@@ -905,7 +906,7 @@
       "views/download/download_item_view.cc",
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -400,22 +400,6 @@ void TabHelpers::AttachTabHelpers(WebCon
+@@ -402,22 +402,6 @@ void TabHelpers::AttachTabHelpers(WebCon
   //     See https://crbug.com/910288.
   resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
       web_contents);
@@ -938,7 +939,7 @@
 #include "chrome/browser/download/download_history.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_prefs.h"
-@@ -172,9 +171,6 @@ void DownloadsDOMHandler::SaveDangerousR
+@@ -173,9 +172,6 @@ void DownloadsDOMHandler::SaveDangerousR
   }
 
   CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS);
@@ -948,7 +949,7 @@
 }
 
 void DownloadsDOMHandler::DiscardDangerous(const std::string& id) {
-@@ -321,12 +317,6 @@ void DownloadsDOMHandler::RemoveDownload
+@@ -322,12 +318,6 @@ void DownloadsDOMHandler::RemoveDownload
   IdSet ids;
 
   for (auto* download : to_remove) {
@@ -961,7 +962,7 @@
     DownloadItemModel item_model(download);
     if (!item_model.ShouldShowInShelf() ||
         download->GetState() == download::DownloadItem::IN_PROGRESS) {
-@@ -400,44 +390,6 @@ void DownloadsDOMHandler::FinalizeRemova
+@@ -416,44 +406,6 @@ void DownloadsDOMHandler::FinalizeRemova
   }
 }
 
@@ -1016,7 +1017,7 @@
 #include "chrome/browser/ui/webui/downloads/downloads.mojom-forward.h"
 #include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h"
 #include "content/public/browser/web_contents_observer.h"
-@@ -94,18 +93,6 @@ class DownloadsDOMHandler : public conte
+@@ -95,18 +94,6 @@ class DownloadsDOMHandler : public conte
   // null-checking |original_notifier_|.
   content::DownloadManager* GetOriginalNotifierManager() const;
 
@@ -1037,7 +1038,7 @@
   bool IsDeletingHistoryAllowed();
 --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
 +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
-@@ -274,120 +274,6 @@ CreateHttpsOnlyModePage(content::WebCont
+@@ -272,120 +272,6 @@ CreateHttpsOnlyModePage(content::WebCont
                                                       request_url));
 }
 
@@ -1158,7 +1159,7 @@
 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
 std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
     content::WebContents* web_contents) {
-@@ -502,8 +388,6 @@ void InterstitialHTMLSource::StartDataRe
+@@ -492,8 +378,6 @@ void InterstitialHTMLSource::StartDataRe
     interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
   } else if (path_without_query == "/blocked-interception") {
     interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
@@ -1167,7 +1168,7 @@
   } else if (path_without_query == "/clock") {
     interstitial_delegate = CreateBadClockBlockingPage(web_contents);
   } else if (path_without_query == "/lookalike") {
-@@ -520,16 +404,12 @@ void InterstitialHTMLSource::StartDataRe
+@@ -508,16 +392,12 @@ void InterstitialHTMLSource::StartDataRe
     interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
   }
 
@@ -1189,7 +1190,7 @@
     html = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
-@@ -96,7 +96,6 @@
+@@ -98,7 +98,6 @@
 #include "components/paint_preview/buildflags/buildflags.h"
 #include "components/password_manager/core/common/password_manager_features.h"
 #include "components/safe_browsing/buildflags.h"
@@ -1197,7 +1198,7 @@
 #include "components/spellcheck/spellcheck_buildflags.h"
 #include "components/subresource_filter/content/renderer/subresource_filter_agent.h"
 #include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h"
-@@ -425,12 +424,8 @@ void ChromeContentRendererClient::Render
+@@ -426,12 +425,8 @@ void ChromeContentRendererClient::Render
   subresource_filter_ruleset_dealer_ =
       std::make_unique<subresource_filter::UnverifiedRulesetDealer>();
 
--- a/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch
+++ b/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch
@@ -1,6 +1,6 @@
 --- a/components/autofill/core/browser/autofill_download_manager.cc
 +++ b/components/autofill/core/browser/autofill_download_manager.cc
-@@ -801,94 +801,6 @@ std::tuple<GURL, std::string> AutofillDo
+@@ -799,94 +799,6 @@ std::tuple<GURL, std::string> AutofillDo
 }
 
 bool AutofillDownloadManager::StartRequest(FormRequestData request_data) {
--- a/patches/core/inox-patchset/0021-disable-rlz.patch
+++ b/patches/core/inox-patchset/0021-disable-rlz.patch
@@ -2,7 +2,7 @@

 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -482,14 +482,6 @@ group("gn_all") {
+@@ -471,14 +471,6 @@ group("gn_all") {
     deps += [ "//chromeos:chromeos_unittests" ]
   }
 
--- a/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
+++ b/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
@@ -213,7 +213,7 @@ by default.
               base::ToLowerASCII(bdict_file));
 --- a/chrome/browser/supervised_user/supervised_user_service.cc
 +++ b/chrome/browser/supervised_user/supervised_user_service.cc
-@@ -85,7 +85,7 @@ namespace {
+@@ -88,7 +88,7 @@ namespace {
 
 // The URL from which to download a host denylist if no local one exists yet.
 const char kDenylistURL[] =
@@ -235,7 +235,7 @@ by default.
 bool g_upgrade_bubble_is_showing = false;
 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
 +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
-@@ -71,17 +71,17 @@ namespace {
+@@ -73,17 +73,17 @@ namespace {
 // The URL for the the Learn More page shown on incognito new tab.
 const char kLearnMoreIncognitoUrl[] =
 #if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -686,8 +686,8 @@ by default.
 -    "https://www.googleapis.com/auth/photos.image.readonly";
 +    "trk:108:https://www.googleapis.com/auth/photos.image.readonly";
 
- // Used to mint uber auth tokens when needed.
- const char kGaiaSid[] = "sid";
+ // OAuth 2 scope for the Discover feed.
+ const char kFeedOAuth2Scope[] = "https://www.googleapis.com/auth/googlenow";
 --- a/google_apis/gaia/gaia_urls.cc
 +++ b/google_apis/gaia/gaia_urls.cc
@@ -24,6 +24,7 @@
--- a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
+++ b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
@@ -35,7 +35,7 @@
 
 --- a/components/omnibox/browser/autocomplete_input.cc
 +++ b/components/omnibox/browser/autocomplete_input.cc
-@@ -562,7 +562,8 @@ void AutocompleteInput::ParseForEmphasiz
+@@ -571,7 +571,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::EqualsCaseInsensitiveASCII(scheme_str, kViewSourceScheme) ||
@@ -70,15 +70,15 @@
   // other origins, so we should not treat them as web safe. Remove callers of
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -999,6 +999,8 @@ component("net") {
+@@ -1002,6 +1002,8 @@ component("net") {
     "url_request/report_sender.h",
     "url_request/static_http_user_agent_settings.cc",
     "url_request/static_http_user_agent_settings.h",
 +    "url_request/trk_protocol_handler.cc",
 +    "url_request/trk_protocol_handler.h",
-     "url_request/url_fetcher.cc",
-     "url_request/url_fetcher.h",
-     "url_request/url_fetcher_core.cc",
+     "url_request/url_request.cc",
+     "url_request/url_request.h",
+     "url_request/url_request_context.cc",
 --- /dev/null
 +++ b/net/url_request/trk_protocol_handler.cc
@@ -0,0 +1,25 @@
@@ -181,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"
-@@ -630,6 +631,9 @@ std::unique_ptr<URLRequestContext> URLRe
+@@ -633,6 +634,9 @@ std::unique_ptr<URLRequestContext> URLRe
   }
   protocol_handlers_.clear();
 
@@ -215,7 +215,7 @@
 COMPONENT_EXPORT(URL) extern const char kUuidInPackageScheme[];
 --- a/url/url_util.cc
 +++ b/url/url_util.cc
-@@ -63,7 +63,7 @@ struct SchemeRegistry {
+@@ -73,7 +73,7 @@ struct SchemeRegistry {
 
   // Schemes that do not trigger mixed content warning.
   std::vector<std::string> secure_schemes = {
@@ -224,7 +224,7 @@
   };
 
   // Schemes that normal pages cannot link to or access (i.e., with the same
-@@ -78,6 +78,7 @@ struct SchemeRegistry {
+@@ -88,6 +88,7 @@ struct SchemeRegistry {
       kAboutScheme,
       kJavaScriptScheme,
       kDataScheme,
--- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch
+++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch
@@ -578,7 +578,7 @@
 }  // namespace variations
 --- a/net/base/url_util.cc
 +++ b/net/base/url_util.cc
-@@ -456,27 +456,6 @@ bool HasGoogleHost(const GURL& url) {
+@@ -455,27 +455,6 @@ bool HasGoogleHost(const GURL& url) {
 }
 
 bool IsGoogleHost(base::StringPiece host) {
--- a/patches/core/ungoogled-chromium/disable-mei-preload.patch
+++ b/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) {
+@@ -378,7 +378,6 @@ if (!is_android && !is_mac) {
     }
 
     data_deps += [
@@ -15,7 +15,7 @@
       "//third_party/widevine/cdm",
     ]
   }
-@@ -1182,7 +1181,6 @@ if (is_win) {
+@@ -1204,7 +1203,6 @@ if (is_win) {
       ":optimization_guide_library",
       ":swiftshader_library",
       ":widevine_cdm_library",
--- a/patches/core/ungoogled-chromium/disable-network-time-tracker.patch
+++ b/patches/core/ungoogled-chromium/disable-network-time-tracker.patch
@@ -5,7 +5,7 @@

 --- a/components/network_time/network_time_tracker.cc
 +++ b/components/network_time/network_time_tracker.cc
-@@ -291,7 +291,7 @@ void NetworkTimeTracker::UpdateNetworkTi
+@@ -294,7 +294,7 @@ void NetworkTimeTracker::UpdateNetworkTi
 }
 
 bool NetworkTimeTracker::AreTimeFetchesEnabled() const {
--- a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch
+++ b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-@@ -85,21 +85,6 @@
+@@ -69,21 +69,6 @@
             sub-label="$i18n{permissionsPageDescription}"
             on-click="onPermissionsPageClick_"
             role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
@@ -24,7 +24,7 @@
 <if expr="use_nss_certs">
 --- a/components/privacy_sandbox/privacy_sandbox_prefs.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc
-@@ -71,7 +71,7 @@ namespace privacy_sandbox {
+@@ -60,7 +60,7 @@ namespace privacy_sandbox {
 
 void RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(
@@ -32,19 +32,16 @@
 +      prefs::kPrivacySandboxApisEnabled, false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(prefs::kPrivacySandboxApisEnabledV2, false);
-   registry->RegisterBooleanPref(prefs::kPrivacySandboxApisEnabledV2Init, false);
+   registry->RegisterBooleanPref(
 --- a/components/privacy_sandbox/privacy_sandbox_settings.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_settings.cc
-@@ -351,48 +351,10 @@ bool PrivacySandboxSettings::IsSharedSto
+@@ -329,45 +329,10 @@ bool PrivacySandboxSettings::IsSharedSto
 }
 
 bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const {
-  // If the delegate is restricting access, or indicates confirmation has not
-  // occurred, the Privacy Sandbox is disabled.
-  if (delegate_->IsPrivacySandboxRestricted() ||
-      !delegate_->IsPrivacySandboxConfirmed()) {
+-  // If the delegate is restricting access the Privacy Sandbox is disabled.
+-  if (delegate_->IsPrivacySandboxRestricted())
 -    return false;
-  }
 -
 -  // For Measurement and Relevance APIs, we explicitly do not require the
 -  // underlying pref to be enabled if there is a local flag enabling the APIs to
--- a/patches/core/ungoogled-chromium/disable-signin.patch
+++ b/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
-@@ -527,32 +527,6 @@ GURL GetOSSettingsUrl(const std::string&
+@@ -572,32 +572,6 @@ void ShowFirmwareUpdatesApp(Profile* pro
 void ShowBrowserSignin(Browser* browser,
                        signin_metrics::AccessPoint access_point,
                        signin::ConsentLevel consent_level) {
--- a/patches/core/ungoogled-chromium/disable-webstore-urls.patch
+++ b/patches/core/ungoogled-chromium/disable-webstore-urls.patch
@@ -106,7 +106,7 @@
 
 bool ShouldRetryRequest(const network::SimpleURLLoader* loader) {
   DCHECK(loader);
-@@ -335,10 +326,6 @@ void ExtensionDownloader::DoStartAllPend
+@@ -345,10 +336,6 @@ void ExtensionDownloader::DoStartAllPend
     AddToFetches(fetches_preparing, std::move(task));
   pending_tasks_.clear();
 
@@ -117,7 +117,7 @@
 }
 
 void ExtensionDownloader::SetIdentityManager(
-@@ -359,9 +346,7 @@ void ExtensionDownloader::SetBackoffPoli
+@@ -377,9 +364,7 @@ ManifestFetchData* ExtensionDownloader::
 
 void ExtensionDownloader::UpdateURLStats(const GURL& update_url,
                                          Manifest::Type extension_type) {
@@ -128,7 +128,7 @@
     url_stats_.no_url_count++;
   } else {
     url_stats_.other_url_count++;
-@@ -398,11 +383,6 @@ bool ExtensionDownloader::AddExtensionDa
+@@ -416,11 +401,6 @@ bool ExtensionDownloader::AddExtensionDa
     return false;
   }
 
@@ -140,7 +140,7 @@
   // Skip extensions with empty IDs.
   if (task.id.empty()) {
     DLOG(WARNING) << "Found extension with empty ID";
-@@ -413,7 +393,7 @@ bool ExtensionDownloader::AddExtensionDa
+@@ -431,7 +411,7 @@ bool ExtensionDownloader::AddExtensionDa
   UpdateURLStats(task.update_url, task.type);
   if (task.update_url.is_empty()) {
     // Fill in default update URL.
@@ -149,7 +149,7 @@
   }
 
   DCHECK(!task.update_url.is_empty());
-@@ -826,20 +806,6 @@ void ExtensionDownloader::HandleManifest
+@@ -849,20 +829,6 @@ void ExtensionDownloader::HandleManifest
         update.second->info);
   }
 
@@ -170,7 +170,7 @@
   ExtensionIdSet extension_ids_with_errors;
   for (const auto& failure : failures)
     extension_ids_with_errors.insert(failure.first.id);
-@@ -1409,11 +1375,7 @@ bool ExtensionDownloader::IterateFetchCr
+@@ -1446,11 +1412,7 @@ bool ExtensionDownloader::IterateFetchCr
   // fetch.
   switch (fetch->credentials) {
     case ExtensionFetch::CREDENTIALS_NONE:
--- a/patches/core/ungoogled-chromium/doh-changes.patch
+++ b/patches/core/ungoogled-chromium/doh-changes.patch
@@ -1,6 +1,6 @@
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -328,12 +328,7 @@ const base::Feature kKeepForceInstalledP
+@@ -313,12 +313,7 @@ const base::Feature kDisruptiveNotificat
 // Enable DNS over HTTPS (DoH).
 const base::Feature kDnsOverHttps {
   "DnsOverHttps",
--- a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
+++ b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
@@ -2,7 +2,7 @@

 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -627,8 +627,6 @@ static_library("browser") {
+@@ -626,8 +626,6 @@ static_library("browser") {
     "internal_auth.h",
     "interstitials/chrome_settings_page_helper.cc",
     "interstitials/chrome_settings_page_helper.h",
@@ -11,18 +11,10 @@
     "invalidation/profile_invalidation_provider_factory.cc",
     "invalidation/profile_invalidation_provider_factory.h",
     "language/accept_languages_service_factory.cc",
-@@ -1975,7 +1973,6 @@ static_library("browser") {
-     "//chrome/browser/net:probe_message_proto",
-     "//chrome/browser/new_tab_page/modules/drive:mojo_bindings",
-     "//chrome/browser/new_tab_page/modules/photos:mojo_bindings",
-    "//chrome/browser/new_tab_page/modules/safe_browsing:mojo_bindings",
-     "//chrome/browser/new_tab_page/modules/task_module:mojo_bindings",
-     "//chrome/browser/notifications",
-     "//chrome/browser/notifications/scheduler:factory",
-@@ -3669,10 +3666,6 @@ static_library("browser") {
-       "download/offline_item_model_manager_factory.h",
-       "enterprise/connectors/analysis/analysis_service_settings.cc",
+@@ -3696,10 +3694,6 @@ static_library("browser") {
       "enterprise/connectors/analysis/analysis_service_settings.h",
+       "enterprise/connectors/analysis/analysis_settings.cc",
+       "enterprise/connectors/analysis/analysis_settings.h",
 -      "enterprise/connectors/analysis/content_analysis_delegate.cc",
 -      "enterprise/connectors/analysis/content_analysis_delegate.h",
 -      "enterprise/connectors/analysis/content_analysis_delegate_base.cc",
@@ -30,7 +22,7 @@
       "enterprise/connectors/analysis/content_analysis_dialog.cc",
       "enterprise/connectors/analysis/content_analysis_dialog.h",
       "enterprise/connectors/analysis/content_analysis_downloads_delegate.cc",
-@@ -3929,10 +3922,6 @@ static_library("browser") {
+@@ -3970,10 +3964,6 @@ static_library("browser") {
       "new_tab_page/modules/photos/photos_service.h",
       "new_tab_page/modules/photos/photos_service_factory.cc",
       "new_tab_page/modules/photos/photos_service_factory.h",
@@ -41,7 +33,15 @@
       "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",
-@@ -7524,9 +7513,14 @@ static_library("browser") {
+@@ -4407,7 +4397,6 @@ static_library("browser") {
+       "//chrome/browser/new_tab_page/modules/drive:mojo_bindings",
+       "//chrome/browser/new_tab_page/modules/feed:mojo_bindings",
+       "//chrome/browser/new_tab_page/modules/photos:mojo_bindings",
+-      "//chrome/browser/new_tab_page/modules/safe_browsing:mojo_bindings",
+       "//chrome/browser/new_tab_page/modules/task_module:mojo_bindings",
+       "//chrome/browser/policy:path_parser",
+       "//chrome/browser/profile_resetter:profile_reset_report_proto",
+@@ -7675,9 +7664,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",
@@ -73,7 +73,7 @@
   auto delegate = std::make_unique<AccuracyServiceDelegate>(profile);
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -4386,11 +4386,13 @@ ChromeContentBrowserClient::CreateThrott
+@@ -4496,11 +4496,13 @@ ChromeContentBrowserClient::CreateThrott
                    &throttles);
 #endif
 
@@ -87,7 +87,7 @@
 
 // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
 // of lacros-chrome is complete.
-@@ -5783,26 +5785,7 @@ ChromeContentBrowserClient::GetSafeBrows
+@@ -5903,26 +5905,7 @@ ChromeContentBrowserClient::GetSafeBrows
     const std::vector<std::string>& allowlist_domains) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
@@ -115,7 +115,7 @@
 }
 
 safe_browsing::RealTimeUrlLookupServiceBase*
-@@ -5823,11 +5806,6 @@ ChromeContentBrowserClient::GetUrlLookup
+@@ -5943,11 +5926,6 @@ ChromeContentBrowserClient::GetUrlLookup
         GetForProfile(profile);
   }
 #endif
@@ -129,7 +129,7 @@
 
 --- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
 +++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
-@@ -143,34 +143,6 @@ void MaybeCreateSafeBrowsingForRenderer(
+@@ -145,34 +145,6 @@ void MaybeCreateSafeBrowsingForRenderer(
         const std::vector<std::string>& allowlist_domains)>
         get_checker_delegate,
     mojo::PendingReceiver<safe_browsing::mojom::SafeBrowsing> receiver) {
@@ -199,7 +199,7 @@
 
 --- a/chrome/browser/devtools/devtools_window.cc
 +++ b/chrome/browser/devtools/devtools_window.cc
-@@ -70,6 +70,7 @@
+@@ -71,6 +71,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/url_constants.h"
@@ -207,9 +207,20 @@
 #include "third_party/blink/public/common/input/web_gesture_event.h"
 #include "third_party/blink/public/common/input/web_input_event.h"
 #include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
+--- a/chrome/browser/download/bubble/download_bubble_controller.cc
+++ b/chrome/browser/download/bubble/download_bubble_controller.cc
+@@ -400,8 +400,6 @@ void DownloadBubbleUIController::Process
+       ProcessDownloadWarningButtonPress(model, command);
+       break;
+     case DownloadCommands::REVIEW:
+-      model->ReviewScanningVerdict(
+-          browser_->tab_strip_model()->GetActiveWebContents());
+       break;
+     case DownloadCommands::RETRY:
+       RetryDownload(model, command);
 --- a/chrome/browser/download/chrome_download_manager_delegate.cc
 +++ b/chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -132,7 +132,6 @@ using content::DownloadManager;
+@@ -133,7 +133,6 @@ using content::DownloadManager;
 using download::DownloadItem;
 using download::DownloadPathReservationTracker;
 using download::PathValidationResult;
@@ -217,16 +228,73 @@
 using safe_browsing::DownloadProtectionService;
 using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
 
-@@ -1526,8 +1525,6 @@ void ChromeDownloadManagerDelegate::OnDo
+@@ -1497,8 +1496,6 @@ void ChromeDownloadManagerDelegate::OnDo
     if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
       DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
 #endif
 -
 -    DownloadItemModel(item).SetDangerLevel(target_info->danger_level);
   }
-   if (ShouldBlockFile(target_info->danger_type)) {
+   if (ShouldBlockFile(item, target_info->danger_type)) {
     MaybeReportDangerousDownloadBlocked(
-@@ -1661,7 +1658,6 @@ void ChromeDownloadManagerDelegate::Mayb
+@@ -1577,56 +1574,6 @@ bool ChromeDownloadManagerDelegate::IsOp
+ bool ChromeDownloadManagerDelegate::ShouldBlockFile(
+     download::DownloadItem* item,
+     download::DownloadDangerType danger_type) const {
+-  DownloadPrefs::DownloadRestriction download_restriction =
+-      download_prefs_->download_restriction();
+-
+-  if (IsDangerTypeBlocked(danger_type))
+-    return true;
+-
+-  // TODO(crbug/1061111): Move this into IsDangerTypeBlocked once the UX is
+-  // ready.
+-  if (danger_type ==
+-      download::DOWNLOAD_DANGER_TYPE_BLOCKED_UNSUPPORTED_FILETYPE)
+-    return true;
+-
+-  bool file_type_dangerous =
+-      (item &&
+-       DownloadItemModel(item).GetDangerLevel() !=
+-           DownloadFileType::NOT_DANGEROUS &&
+-       danger_type == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS);
+-
+-  switch (download_restriction) {
+-    case (DownloadPrefs::DownloadRestriction::NONE):
+-      return false;
+-
+-    case (DownloadPrefs::DownloadRestriction::POTENTIALLY_DANGEROUS_FILES):
+-      return danger_type != download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS ||
+-             file_type_dangerous;
+-
+-    case (DownloadPrefs::DownloadRestriction::DANGEROUS_FILES): {
+-      return (danger_type == download::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT ||
+-              danger_type == download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE ||
+-              danger_type == download::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL ||
+-              danger_type ==
+-                  download::DOWNLOAD_DANGER_TYPE_DANGEROUS_ACCOUNT_COMPROMISE ||
+-              file_type_dangerous);
+-    }
+-
+-    case (DownloadPrefs::DownloadRestriction::MALICIOUS_FILES): {
+-      return (danger_type == download::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT ||
+-              danger_type == download::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST ||
+-              danger_type == download::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL ||
+-              danger_type ==
+-                  download::DOWNLOAD_DANGER_TYPE_DANGEROUS_ACCOUNT_COMPROMISE);
+-    }
+-
+-    case (DownloadPrefs::DownloadRestriction::ALL_FILES):
+-      return true;
+-
+-    default:
+-      LOG(ERROR) << "Invalid download restruction value: "
+-                 << static_cast<int>(download_restriction);
+-  }
+ 
+   return false;
+ }
+@@ -1641,7 +1588,6 @@ void ChromeDownloadManagerDelegate::Mayb
     service->MaybeSendDangerousDownloadOpenedReport(download,
                                                     show_download_in_folder);
   }
@@ -234,7 +302,7 @@
   if (!download->GetAutoOpened()) {
     download::DownloadContent download_content =
         download::DownloadContentFromMimeType(download->GetMimeType(), false);
-@@ -1669,6 +1665,7 @@ void ChromeDownloadManagerDelegate::Mayb
+@@ -1649,6 +1595,7 @@ void ChromeDownloadManagerDelegate::Mayb
         download->GetDangerType(), download_content, base::Time::Now(),
         download->GetEndTime(), show_download_in_folder);
   }
@@ -242,7 +310,7 @@
 }
 
 void ChromeDownloadManagerDelegate::CheckDownloadAllowed(
-@@ -1738,8 +1735,7 @@ void ChromeDownloadManagerDelegate::Chec
+@@ -1718,8 +1665,7 @@ void ChromeDownloadManagerDelegate::Chec
   DCHECK(download_item);
   DCHECK(download_item->IsSavePackageDownload());
 
@@ -275,7 +343,7 @@
 void RecordOpenedDangerousConfirmDialog(
 --- a/chrome/browser/download/download_target_determiner.cc
 +++ b/chrome/browser/download/download_target_determiner.cc
-@@ -882,12 +882,14 @@ void DownloadTargetDeterminer::CheckVisi
+@@ -913,12 +913,14 @@ void DownloadTargetDeterminer::CheckVisi
     bool visited_referrer_before) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_);
@@ -290,7 +358,7 @@
   danger_level_ = GetDangerLevel(
       visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER);
   if (danger_level_ != DownloadFileType::NOT_DANGEROUS &&
-@@ -1127,6 +1129,7 @@ DownloadFileType::DangerLevel DownloadTa
+@@ -1158,6 +1160,7 @@ DownloadFileType::DangerLevel DownloadTa
 
 absl::optional<base::Time>
 DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const {
@@ -298,7 +366,7 @@
   safe_browsing::SafeBrowsingMetricsCollector* metrics_collector =
       safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
           GetProfile());
-@@ -1135,6 +1138,9 @@ DownloadTargetDeterminer::GetLastDownloa
+@@ -1166,6 +1169,9 @@ DownloadTargetDeterminer::GetLastDownloa
                                  safe_browsing::SafeBrowsingMetricsCollector::
                                      EventType::DANGEROUS_DOWNLOAD_BYPASS)
                            : absl::nullopt;
@@ -310,8 +378,8 @@
 void DownloadTargetDeterminer::OnDownloadDestroyed(
 --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
 +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
-@@ -33,7 +33,6 @@
- #include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service_factory.h"
+@@ -36,7 +36,6 @@
+ #include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.h"
 #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h"
 #include "chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.h"
 -#include "chrome/browser/safe_browsing/download_protection/check_client_download_request.h"
@@ -333,7 +401,7 @@
 std::u16string ContentAnalysisDownloadsDelegate::GetBypassJustificationLabel()
 --- a/chrome/browser/enterprise/connectors/connectors_service.cc
 +++ b/chrome/browser/enterprise/connectors/connectors_service.cc
-@@ -400,19 +400,6 @@ absl::optional<std::string> ConnectorsSe
+@@ -409,19 +409,6 @@ absl::optional<std::string> ConnectorsSe
   return absl::nullopt;
 }
 
@@ -355,7 +423,7 @@
 }
 --- a/chrome/browser/enterprise/connectors/connectors_service.h
 +++ b/chrome/browser/enterprise/connectors/connectors_service.h
-@@ -74,12 +74,6 @@ class ConnectorsService : public KeyedSe
+@@ -81,12 +81,6 @@ class ConnectorsService : public KeyedSe
   // is no token to use.
   absl::optional<std::string> GetDMTokenForRealTimeUrlCheck() const;
 
@@ -398,9 +466,20 @@
   if (cached_device_model_ && cached_device_manufacturer_) {
     UpdateFromCache(signals);
     LogSignalsCollectionLatency(kLatencyHistogramWithCacheVariant, start_time);
+--- a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
+++ b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
+@@ -384,7 +384,7 @@ void RealtimeReportingClient::ReportReal
+ }
+ 
+ std::string RealtimeReportingClient::GetProfileUserName() const {
+-  return safe_browsing::GetProfileEmail(identity_manager_);
+  return std::string();
+ }
+ 
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
 --- a/chrome/browser/enterprise/connectors/reporting/reporting_service_settings.cc
 +++ b/chrome/browser/enterprise/connectors/reporting/reporting_service_settings.cc
-@@ -69,17 +69,6 @@ ReportingServiceSettings::ReportingServi
+@@ -70,16 +70,6 @@ ReportingServiceSettings::ReportingServi
       else
         DVLOG(1) << "Enabled event name list contains a non string value!";
     }
@@ -411,9 +490,8 @@
 -    // when new events may be added in the future. And this is also to support
 -    // existing customer policies that were created before we introduced the
 -    // concept of enabling/disabling events.
-    for (auto* event_name :
-         extensions::SafeBrowsingPrivateEventRouter::kAllEvents) {
-      enabled_event_names_.insert(event_name);
+-    for (const char* event : kAllReportingEvents) {
+-      enabled_event_names_.insert(event);
 -    }
   }
 
@@ -526,7 +604,7 @@
 }  // namespace utils
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
-@@ -302,10 +302,6 @@ static_library("extensions") {
+@@ -305,10 +305,6 @@ static_library("extensions") {
     "api/runtime/chrome_runtime_api_delegate.h",
     "api/safe_browsing_private/safe_browsing_private_api.cc",
     "api/safe_browsing_private/safe_browsing_private_api.h",
@@ -537,7 +615,7 @@
     "api/safe_browsing_private/safe_browsing_util.cc",
     "api/safe_browsing_private/safe_browsing_util.h",
     "api/scripting/scripting_api.cc",
-@@ -634,8 +630,6 @@ static_library("extensions") {
+@@ -641,8 +637,6 @@ static_library("extensions") {
     "menu_manager_factory.h",
     "navigation_observer.cc",
     "navigation_observer.h",
@@ -548,7 +626,7 @@
     "pending_extension_info.cc",
 --- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
 +++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
-@@ -85,17 +85,8 @@ api::enterprise_reporting_private::Conte
+@@ -98,17 +98,8 @@ api::enterprise_reporting_private::Conte
           : nullptr;
   info.os_firewall = ToInfoSettingValue(signals.os_firewall);
   info.system_dns_servers = std::move(signals.system_dns_servers);
@@ -568,17 +646,17 @@
 
 --- a/chrome/browser/extensions/browser_context_keyed_service_factories.cc
 +++ b/chrome/browser/extensions/browser_context_keyed_service_factories.cc
-@@ -125,7 +125,6 @@ void EnsureBrowserContextKeyedServiceFac
+@@ -117,7 +117,6 @@ void EnsureBrowserContextKeyedServiceFac
 #endif
   extensions::PreferenceAPI::GetFactoryInstance();
   extensions::ProcessesAPI::GetFactoryInstance();
 -  extensions::SafeBrowsingPrivateEventRouterFactory::GetInstance();
   extensions::SessionsAPI::GetFactoryInstance();
- #if BUILDFLAG(IS_CHROMEOS)
-   extensions::SessionStateChangedEventDispatcher::GetFactoryInstance();
+   extensions::SettingsPrivateEventRouterFactory::GetInstance();
+   extensions::SettingsOverridesAPI::GetFactoryInstance();
 --- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
 +++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
-@@ -621,52 +621,22 @@ void ChromeExtensionsBrowserClient::Noti
+@@ -623,52 +623,22 @@ void ChromeExtensionsBrowserClient::Noti
     content::BrowserContext* context,
     const ExtensionId& extension_id,
     const std::string& code) const {
@@ -643,7 +721,7 @@
 #include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/extensions/permissions_updater.h"
 #include "chrome/browser/extensions/shared_module_service.h"
-@@ -192,7 +191,6 @@ void ExtensionService::BlocklistExtensio
+@@ -194,7 +193,6 @@ void ExtensionService::BlocklistExtensio
   blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
       extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE,
       extension_prefs_);
@@ -651,7 +729,7 @@
 }
 
 bool ExtensionService::OnExternalExtensionUpdateUrlFound(
-@@ -358,9 +356,6 @@ ExtensionService::ExtensionService(Profi
+@@ -360,9 +358,6 @@ ExtensionService::ExtensionService(Profi
       safe_browsing_verdict_handler_(extension_prefs,
                                      ExtensionRegistry::Get(profile),
                                      this),
@@ -661,7 +739,7 @@
       registry_(ExtensionRegistry::Get(profile)),
       pending_extension_manager_(profile),
       install_directory_(install_directory),
-@@ -860,100 +855,6 @@ bool ExtensionService::IsExtensionEnable
+@@ -866,100 +861,6 @@ bool ExtensionService::IsExtensionEnable
   return extension_registrar_.IsExtensionEnabled(extension_id);
 }
 
@@ -962,7 +1040,7 @@
 std::string GenerateLastPickedDirectoryKey(const std::string& id) {
   return id.empty() ? kDefaultLastPickedDirectoryKey
                     : base::StrCat({kCustomLastPickedDirectoryKey, "-", id});
-@@ -1165,28 +1086,6 @@ void ChromeFileSystemAccessPermissionCon
+@@ -1167,28 +1088,6 @@ void ChromeFileSystemAccessPermissionCon
                      std::move(callback)));
 }
 
@@ -1014,7 +1092,7 @@
 #include "components/url_formatter/elide_url.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_capture.h"
-@@ -107,6 +108,7 @@ void DisplayMediaAccessHandler::HandleRe
+@@ -109,6 +110,7 @@ void DisplayMediaAccessHandler::HandleRe
     return;
   }
 
@@ -1022,7 +1100,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
-@@ -122,6 +124,7 @@ void DisplayMediaAccessHandler::HandleRe
+@@ -124,6 +126,7 @@ void DisplayMediaAccessHandler::HandleRe
     observer->OnDesktopCaptureRequest();
     return;
   }
@@ -1069,7 +1147,7 @@
 
 #if BUILDFLAG(IS_ANDROID)
 #include "chrome/browser/android/tab_android.h"
-@@ -882,6 +881,7 @@ autofill::LanguageCode ChromePasswordMan
+@@ -885,6 +884,7 @@ autofill::LanguageCode ChromePasswordMan
   return autofill::LanguageCode();
 }
 
@@ -1077,7 +1155,7 @@
 safe_browsing::PasswordProtectionService*
 ChromePasswordManagerClient::GetPasswordProtectionService() const {
   return safe_browsing::ChromePasswordProtectionService::
-@@ -917,13 +917,9 @@ void ChromePasswordManagerClient::CheckP
+@@ -920,13 +920,9 @@ void ChromePasswordManagerClient::CheckP
       web_contents(), web_contents()->GetLastCommittedURL(), username,
       password_type, matching_reused_credentials, password_field_exists);
 }
@@ -1092,7 +1170,7 @@
 }
 
 #if !BUILDFLAG(IS_ANDROID)
-@@ -932,36 +928,10 @@ void ChromePasswordManagerClient::MaybeR
+@@ -935,36 +931,10 @@ void ChromePasswordManagerClient::MaybeR
     bool is_federated,
     const url::Origin& federated_origin,
     const std::u16string& login_user_name) const {
@@ -1129,7 +1207,7 @@
 }
 #endif
 
-@@ -1464,7 +1434,9 @@ void ChromePasswordManagerClient::OnPast
+@@ -1472,7 +1442,9 @@ void ChromePasswordManagerClient::OnPast
   }
 
   was_on_paste_called_ = true;
@@ -1139,7 +1217,7 @@
 }
 
 void ChromePasswordManagerClient::RenderFrameCreated(
-@@ -1500,7 +1472,9 @@ void ChromePasswordManagerClient::OnInpu
+@@ -1508,7 +1480,9 @@ void ChromePasswordManagerClient::OnInpu
   if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
     OnPaste();
   } else {
@@ -1149,7 +1227,7 @@
   }
 #endif  // BUILDFLAG(IS_ANDROID)
 }
-@@ -1539,6 +1513,7 @@ bool ChromePasswordManagerClient::IsPass
+@@ -1547,6 +1521,7 @@ bool ChromePasswordManagerClient::IsPass
     is_enabled = false;
   }
 
@@ -1157,7 +1235,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
-@@ -1549,6 +1524,7 @@ bool ChromePasswordManagerClient::IsPass
+@@ -1557,6 +1532,7 @@ bool ChromePasswordManagerClient::IsPass
     observer->OnPasswordSaveOrAutofillDenied();
     is_enabled = false;
   }
@@ -1191,24 +1269,6 @@
 
   void LogPasswordReuseDetectedEvent() override;
 
--- a/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
-+++ b/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
-@@ -136,6 +136,7 @@ void AbusiveOriginPermissionRevocationRe
-   DCHECK(profile_);
-   DCHECK(callback_);
- 
-+#if BUILDFLAG(FULL_SAFE_BROWSING)
-   if (!AbusiveOriginNotificationsPermissionRevocationConfig::IsEnabled() ||
-       !safe_browsing::IsSafeBrowsingEnabled(*profile_->GetPrefs()) ||
-       IsOriginExemptedFromFutureRevocations(profile_, origin_)) {
-@@ -182,6 +183,7 @@ void AbusiveOriginPermissionRevocationRe
-     }
-   }
-   NotifyCallback(Outcome::PERMISSION_NOT_REVOKED);
-+#endif // BUILDFLAG(FULL_SAFE_BROWSING)
- }
- 
- void AbusiveOriginPermissionRevocationRequest::OnSafeBrowsingVerdictReceived(
 --- a/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
 +++ b/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
@@ -16,7 +16,6 @@
@@ -1219,7 +1279,7 @@
 #include "chrome/common/chrome_features.h"
 #include "components/permissions/permission_request.h"
 #include "components/permissions/request_type.h"
-@@ -150,9 +149,6 @@ void ContextualNotificationPermissionUiS
+@@ -159,9 +158,6 @@ void ContextualNotificationPermissionUiS
 }
 
 void ContextualNotificationPermissionUiSelector::Cancel() {
@@ -1229,7 +1289,7 @@
 }
 
 bool ContextualNotificationPermissionUiSelector::IsPermissionRequestSupported(
-@@ -178,24 +174,14 @@ void ContextualNotificationPermissionUiS
+@@ -187,24 +183,14 @@ void ContextualNotificationPermissionUiS
   absl::optional<Decision> decision =
       GetDecisionBasedOnSiteReputation(reputation);
 
@@ -1259,6 +1319,62 @@
 }
 
 void ContextualNotificationPermissionUiSelector::OnSafeBrowsingVerdictReceived(
+--- a/chrome/browser/permissions/permission_revocation_request.cc
+++ b/chrome/browser/permissions/permission_revocation_request.cc
+@@ -135,27 +135,7 @@ void PermissionRevocationRequest::CheckA
+   DCHECK(profile_);
+   DCHECK(callback_);
+ 
+-  if (!safe_browsing::IsSafeBrowsingEnabled(*profile_->GetPrefs()) ||
+-      IsOriginExemptedFromFutureRevocations(profile_, origin_) ||
+-      (!NotificationsPermissionRevocationConfig::
+-           IsAbusiveOriginPermissionRevocationEnabled() &&
+-       !NotificationsPermissionRevocationConfig::
+-           IsDisruptiveOriginPermissionRevocationEnabled())) {
+     NotifyCallback(Outcome::PERMISSION_NOT_REVOKED);
+-    return;
+-  }
+-
+-  CrowdDenyPreloadData* crowd_deny = CrowdDenyPreloadData::GetInstance();
+-  permissions::PermissionUmaUtil::RecordCrowdDenyVersionAtAbuseCheckTime(
+-      crowd_deny->version_on_disk());
+-
+-  if (!crowd_deny->IsReadyToUse())
+-    crowd_deny_request_start_time_ = base::TimeTicks::Now();
+-
+-  crowd_deny->GetReputationDataForSiteAsync(
+-      url::Origin::Create(origin_),
+-      base::BindOnce(&PermissionRevocationRequest::OnSiteReputationReady,
+-                     weak_factory_.GetWeakPtr()));
+ }
+ 
+ void PermissionRevocationRequest::OnSiteReputationReady(
+@@ -165,25 +145,6 @@ void PermissionRevocationRequest::OnSite
+         base::TimeTicks::Now() - crowd_deny_request_start_time_.value();
+   }
+ 
+-  if (site_reputation && !site_reputation->warning_only() &&
+-      (site_reputation->notification_ux_quality() ==
+-           CrowdDenyPreloadData::SiteReputation::ABUSIVE_PROMPTS ||
+-       site_reputation->notification_ux_quality() ==
+-           CrowdDenyPreloadData::SiteReputation::ABUSIVE_CONTENT ||
+-       site_reputation->notification_ux_quality() ==
+-           CrowdDenyPreloadData::SiteReputation::DISRUPTIVE_BEHAVIOR)) {
+-    DCHECK(g_browser_process->safe_browsing_service());
+-
+-    if (g_browser_process->safe_browsing_service()) {
+-      safe_browsing_request_.emplace(
+-          g_browser_process->safe_browsing_service()->database_manager(),
+-          base::DefaultClock::GetInstance(), url::Origin::Create(origin_),
+-          base::BindOnce(
+-              &PermissionRevocationRequest::OnSafeBrowsingVerdictReceived,
+-              weak_factory_.GetWeakPtr(), site_reputation));
+-      return;
+-    }
+-  }
+   NotifyCallback(Outcome::PERMISSION_NOT_REVOKED);
+ }
+ 
 --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
 +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
@@ -322,47 +322,5 @@ bool PredictionBasedPermissionUiSelector
@@ -1311,7 +1427,7 @@
 }
 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
 +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -91,6 +91,7 @@
+@@ -90,6 +90,7 @@
 #include "components/policy/core/common/schema.h"
 #include "components/policy/policy_constants.h"
 #include "components/proxy_config/proxy_policy_handler.h"
@@ -1319,7 +1435,7 @@
 #include "components/safe_browsing/content/common/file_type_policies_prefs.h"
 #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
 #include "components/safe_browsing/core/common/safe_browsing_prefs.h"
-@@ -1738,8 +1739,6 @@ std::unique_ptr<ConfigurationPolicyHandl
+@@ -1764,8 +1765,6 @@ std::unique_ptr<ConfigurationPolicyHandl
   handlers->AddHandler(
       std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
           chrome_schema));
@@ -1328,7 +1444,7 @@
   handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>());
   handlers->AddHandler(
       std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
-@@ -1796,13 +1795,6 @@ std::unique_ptr<ConfigurationPolicyHandl
+@@ -1823,13 +1822,6 @@ std::unique_ptr<ConfigurationPolicyHandl
           prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
           prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema));
 
@@ -1344,15 +1460,15 @@
 
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -255,7 +255,6 @@
+@@ -256,7 +256,6 @@
 #include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h"
 #include "chrome/browser/new_tab_page/modules/drive/drive_service.h"
 #include "chrome/browser/new_tab_page/modules/photos/photos_service.h"
 -#include "chrome/browser/new_tab_page/modules/safe_browsing/safe_browsing_handler.h"
 #include "chrome/browser/new_tab_page/modules/task_module/task_module_service.h"
 #include "chrome/browser/new_tab_page/promos/promo_service.h"
- #include "chrome/browser/search/background/ntp_custom_background_service.h"
-@@ -1421,7 +1420,6 @@ void RegisterProfilePrefs(user_prefs::Pr
+ #include "chrome/browser/policy/developer_tools_policy_handler.h"
+@@ -1442,7 +1441,6 @@ void RegisterProfilePrefs(user_prefs::Pr
   NewTabPageHandler::RegisterProfilePrefs(registry);
   NewTabPageUI::RegisterProfilePrefs(registry);
   NewTabUI::RegisterProfilePrefs(registry);
@@ -1362,8 +1478,8 @@
   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
-@@ -551,7 +551,6 @@ void ChromeBrowserMainExtraPartsProfiles
-     ash::SystemExtensionsProviderFactory::GetInstance();
+@@ -570,7 +570,6 @@ void ChromeBrowserMainExtraPartsProfiles
+   }
 #endif
   TabRestoreServiceFactory::GetInstance();
 -  safe_browsing::TailoredSecurityServiceFactory::GetInstance();
@@ -1372,7 +1488,7 @@
 #if !BUILDFLAG(IS_ANDROID)
 --- a/chrome/browser/reputation/reputation_service.cc
 +++ b/chrome/browser/reputation/reputation_service.cc
-@@ -119,9 +119,7 @@ void ReputationService::GetReputationSta
+@@ -121,9 +121,7 @@ void ReputationService::GetReputationSta
                                             ReputationCheckCallback callback) {
   DCHECK(url.SchemeIsHTTPOrHTTPS());
 
@@ -1548,7 +1664,7 @@
 }  // namespace
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -559,7 +559,6 @@ static_library("ui") {
+@@ -544,7 +544,6 @@ static_library("ui") {
     "//components/renderer_context_menu",
     "//components/resources",
     "//components/safe_browsing/content/browser",
@@ -1556,10 +1672,10 @@
     "//components/safe_browsing/content/browser/password_protection",
     "//components/safe_browsing/content/browser/web_ui",
     "//components/safe_browsing/core/browser/db:database_manager",
-@@ -4726,8 +4725,6 @@ static_library("ui") {
-       "views/safe_browsing/password_reuse_modal_warning_dialog.h",
-       "views/safe_browsing/prompt_for_scanning_modal_dialog.cc",
+@@ -4779,8 +4778,6 @@ static_library("ui") {
       "views/safe_browsing/prompt_for_scanning_modal_dialog.h",
+       "views/safe_browsing/tailored_security_desktop_dialog.cc",
+       "views/safe_browsing/tailored_security_desktop_dialog.h",
 -      "views/safe_browsing/tailored_security_unconsented_modal.cc",
 -      "views/safe_browsing/tailored_security_unconsented_modal.h",
       "views/send_tab_to_self/manage_account_devices_link_view.cc",
@@ -1664,18 +1780,18 @@
 }
 --- 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()) {
-    const int id = (model_->download() &&
+-    const int id = (model_->GetDownloadItem() &&
 -                    safe_browsing::DeepScanningRequest::ShouldUploadBinary(
-                        model_->download()))
-+    const int id = model_->download()
+-                        model_->GetDownloadItem()))
+    const int id = model_->GetDownloadItem()
                        ? IDS_PROMPT_DEEP_SCANNING_DOWNLOAD
                        : IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD;
     const std::u16string filename = ElidedFilename(*deep_scanning_label_);
-@@ -865,11 +863,15 @@ void DownloadItemView::UpdateButtons() {
+@@ -866,11 +864,15 @@ void DownloadItemView::UpdateButtons() {
   }
 
   const bool allow_open_during_deep_scan =
@@ -1691,7 +1807,7 @@
   open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) ||
                            prompt_to_scan || allow_open_during_deep_scan);
 
-@@ -1363,7 +1365,9 @@ void DownloadItemView::ShowContextMenuIm
+@@ -1366,7 +1368,9 @@ void DownloadItemView::ShowContextMenuIm
 }
 
 void DownloadItemView::OpenDownloadDuringAsyncScanning() {
@@ -1703,7 +1819,7 @@
 
 --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
 +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
-@@ -362,7 +362,6 @@ void DownloadsDOMHandler::OpenDuringScan
+@@ -363,7 +363,6 @@ void DownloadsDOMHandler::OpenDuringScan
   if (download) {
     DownloadItemModel model(download);
     model.SetOpenWhenComplete(true);
@@ -1711,6 +1827,19 @@
   }
 }
 
+@@ -374,12 +373,6 @@ void DownloadsDOMHandler::ReviewDangerou
+     return;
+   }
+ 
+-  CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_REVIEW_DANGEROUS);
+-  download::DownloadItem* download = GetDownloadByStringId(id);
+-  if (download) {
+-    DownloadItemModel model(download);
+-    model.ReviewScanningVerdict(GetWebUIWebContents());
+-  }
+ }
+ 
+ // DownloadsDOMHandler, private: --------------------------------------------
 --- a/chrome/browser/ui/webui/management/management_ui_handler.cc
 +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
@@ -845,12 +845,6 @@ base::Value ManagementUIHandler::GetThre
@@ -1770,7 +1899,7 @@
                                std::move(callback),
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -1344,7 +1344,6 @@ if (!is_android) {
+@@ -1377,7 +1377,6 @@ if (!is_android) {
       "//components/resources",
       "//components/safe_browsing:buildflags",
       "//components/safe_browsing/content/browser",
@@ -1778,7 +1907,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",
-@@ -5715,7 +5714,6 @@ test("unit_tests") {
+@@ -5766,7 +5765,6 @@ test("unit_tests") {
     "//components/resources",
     "//components/safe_browsing:buildflags",
     "//components/safe_browsing/content/browser",
@@ -1788,7 +1917,7 @@
     "//components/safe_browsing/content/browser/web_ui",
 --- a/components/password_manager/content/browser/content_password_manager_driver.cc
 +++ b/components/password_manager/content/browser/content_password_manager_driver.cc
-@@ -417,7 +417,7 @@ void ContentPasswordManagerDriver::Check
+@@ -423,7 +423,7 @@ void ContentPasswordManagerDriver::Check
   if (!password_manager::bad_message::CheckFrameNotPrerendering(
           render_frame_host_))
     return;
@@ -1864,7 +1993,7 @@
 +# }
 --- a/components/safe_browsing/content/common/safe_browsing.mojom
 +++ b/components/safe_browsing/content/common/safe_browsing.mojom
-@@ -132,7 +132,6 @@ interface PhishingDetector {
+@@ -133,7 +133,6 @@ interface PhishingDetector {
     => (PhishingDetectorResult result, string request_proto);
 };
 
@@ -1993,7 +2122,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
-@@ -122,13 +122,6 @@ void UpdateService::OnEvent(Events event
+@@ -125,13 +125,6 @@ void UpdateService::OnEvent(Events event
       break;
   }
 
--- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
+++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
@@ -11,8 +11,8 @@
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
 #include "components/url_formatter/url_fixer.h"
 #include "components/user_prefs/user_prefs.h"
- #include "components/variations/variations_client.h"
-@@ -519,8 +518,6 @@ void AwBrowserContext::RebuildTable(
+ #include "components/visitedlink/browser/visitedlink_writer.h"
+@@ -469,8 +468,6 @@ void AwBrowserContext::RebuildTable(
 }
 
 void AwBrowserContext::SetExtendedReportingAllowed(bool allowed) {
@@ -23,7 +23,7 @@
 // TODO(amalova): Make sure NetworkContextParams is configured correctly when
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -1860,69 +1860,9 @@
+@@ -1889,69 +1889,9 @@
   <message name="IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_DESC_COOKIES_PAGE" desc="On the cookies page, the secondary text next to the checkbox that enables prediction of network actions.">
     Preloads pages that Chrome thinks you might visit. To do this, Chrome may use cookies, if you allow cookies, and may encrypt and send pages through Google to hide your identity from sites.
   </message>
@@ -155,7 +155,7 @@
   BooleanPrefMember force_browser_signin_;
 --- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc
 +++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc
-@@ -18,7 +18,6 @@
+@@ -19,7 +19,6 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
@@ -163,7 +163,7 @@
 #include "extensions/browser/extension_system.h"
 
 namespace lock_screen_apps {
-@@ -89,8 +88,6 @@ void LockScreenProfileCreatorImpl::OnPro
+@@ -91,8 +90,6 @@ void LockScreenProfileCreatorImpl::OnPro
     // SafeBrowsingService when the user has safe browsing disabled (reasoning
     // similar to http://crbug.com/461493).
     // TODO(tbarzic): Revisit this if webviews get enabled for lock screen apps.
@@ -174,14 +174,14 @@
 
 --- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
 +++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
-@@ -38,7 +38,6 @@
+@@ -39,7 +39,6 @@
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/crx_file/id_util.h"
 #include "components/prefs/pref_service.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/user_manager/scoped_user_manager.h"
 #include "content/public/test/browser_task_environment.h"
 #include "extensions/common/extension.h"
- #include "extensions/common/extension_builder.h"
 --- a/chrome/browser/ash/login/signin/device_id_browsertest.cc
 +++ b/chrome/browser/ash/login/signin/device_id_browsertest.cc
@@ -25,7 +25,6 @@
@@ -192,7 +192,7 @@
 #include "components/user_manager/known_user.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/test/browser_test.h"
-@@ -256,15 +255,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE
+@@ -255,15 +254,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE
   SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword,
                kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId);
 
@@ -208,7 +208,7 @@
   // Can't use SetKnownUserDeviceId here, because it forbids changing a device
   // ID.
   user_manager::KnownUser known_user(g_browser_process->local_state());
-@@ -290,13 +280,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE
+@@ -289,13 +279,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE
   SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword,
                kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId);
 
@@ -224,28 +224,18 @@
   user_manager::KnownUser known_user(g_browser_process->local_state());
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -232,7 +232,6 @@
+@@ -237,7 +237,6 @@
 #include "components/safe_browsing/core/browser/realtime/url_lookup_service.h"
 #include "components/safe_browsing/core/browser/url_checker_delegate.h"
 #include "components/safe_browsing/core/common/features.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
 #include "components/security_interstitials/content/insecure_form_navigation_throttle.h"
- #include "components/security_interstitials/content/origin_policy_ui.h"
 #include "components/security_interstitials/content/ssl_cert_reporter.h"
--- a/chrome/browser/download/bubble/download_bubble_prefs.cc
-+++ b/chrome/browser/download/bubble/download_bubble_prefs.cc
-@@ -11,7 +11,6 @@
- #include "chrome/common/pref_names.h"
- #include "components/prefs/pref_service.h"
- #include "components/safe_browsing/core/common/features.h"
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
- 
- namespace download {
- 
+ #include "components/security_interstitials/content/ssl_error_handler.h"
 --- a/chrome/browser/download/download_browsertest.cc
 +++ b/chrome/browser/download/download_browsertest.cc
-@@ -100,7 +100,6 @@
- #include "components/safe_browsing/content/browser/safe_browsing_service_interface.h"
+@@ -101,7 +101,6 @@
+ #include "components/safe_browsing/content/common/file_type_policies_test_util.h"
 #include "components/safe_browsing/content/common/proto/download_file_types.pb.h"
 #include "components/safe_browsing/core/common/proto/csd.pb.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
@@ -254,7 +244,7 @@
 #include "content/public/browser/browser_task_traits.h"
 --- a/chrome/browser/download/download_item_model.cc
 +++ b/chrome/browser/download/download_item_model.cc
-@@ -840,6 +840,7 @@ void DownloadItemModel::ExecuteCommand(D
+@@ -849,6 +849,7 @@ void DownloadItemModel::ExecuteCommand(D
       DownloadUIModel::ExecuteCommand(download_commands, command);
       break;
     case DownloadCommands::DEEP_SCAN:
@@ -262,7 +252,7 @@
       safe_browsing::SafeBrowsingService* sb_service =
           g_browser_process->safe_browsing_service();
       if (!sb_service)
-@@ -865,6 +866,7 @@ void DownloadItemModel::ExecuteCommand(D
+@@ -874,6 +875,7 @@ void DownloadItemModel::ExecuteCommand(D
           safe_browsing::DeepScanningRequest::DeepScanTrigger::
               TRIGGER_APP_PROMPT,
           safe_browsing::DownloadCheckResult::UNKNOWN, std::move(settings));
@@ -272,7 +262,7 @@
 }
 --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
 +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
-@@ -38,7 +38,6 @@
+@@ -41,7 +41,6 @@
 #include "components/policy/core/common/chrome_schema.h"
 #include "components/prefs/pref_service.h"
 #include "components/safe_browsing/core/common/features.h"
@@ -280,25 +270,9 @@
 #include "components/url_matcher/url_matcher.h"
 #include "content/public/browser/web_contents.h"
 #include "crypto/secure_hash.h"
--- a/chrome/browser/enterprise/connectors/connectors_manager.cc
-+++ b/chrome/browser/enterprise/connectors/connectors_manager.cc
-@@ -6,12 +6,12 @@
- 
- #include <memory>
- 
-+#include "base/bind.h"
- #include "base/feature_list.h"
- #include "base/values.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/browser/enterprise/connectors/connectors_prefs.h"
- #include "components/prefs/pref_service.h"
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
- #include "components/url_matcher/url_matcher.h"
- #include "url/gurl.h"
- 
 --- a/chrome/browser/enterprise/connectors/connectors_service.cc
 +++ b/chrome/browser/enterprise/connectors/connectors_service.cc
-@@ -38,7 +38,6 @@
+@@ -39,7 +39,6 @@
 #include "components/policy/core/common/cloud/machine_level_user_cloud_policy_store.h"
 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
 #include "components/policy/core/common/policy_types.h"
@@ -306,7 +280,7 @@
 #include "components/signin/public/base/consent_level.h"
 #include "components/signin/public/identity_manager/identity_manager.h"
 #include "components/user_prefs/user_prefs.h"
-@@ -330,8 +329,7 @@ std::string ConnectorsService::GetManage
+@@ -339,8 +338,7 @@ std::string ConnectorsService::GetManage
 
   absl::optional<policy::PolicyScope> scope = absl::nullopt;
   for (const char* scope_pref :
@@ -316,7 +290,7 @@
         ConnectorScopePref(AnalysisConnector::FILE_DOWNLOADED),
         ConnectorScopePref(AnalysisConnector::BULK_DATA_ENTRY),
         ConnectorScopePref(AnalysisConnector::PRINT),
-@@ -383,20 +381,6 @@ std::string ConnectorsService::GetManage
+@@ -392,20 +390,6 @@ std::string ConnectorsService::GetManage
 
 absl::optional<std::string> ConnectorsService::GetDMTokenForRealTimeUrlCheck()
     const {
@@ -406,7 +380,7 @@
 class PolicyBlocklistService;
 --- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
 +++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
-@@ -90,45 +90,10 @@ api::enterprise_reporting_private::Conte
+@@ -103,45 +103,10 @@ api::enterprise_reporting_private::Conte
   info.browser_version = std::move(signals.browser_version);
   info.built_in_dns_client_enabled = signals.built_in_dns_client_enabled;
 
@@ -580,7 +554,7 @@
                    blink::kWebRTCIPHandlingDefaultPublicInterfaceOnly);
 --- 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
-@@ -39,7 +39,6 @@
+@@ -41,7 +41,6 @@
 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
 #include "components/prefs/pref_service.h"
 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
@@ -590,7 +564,7 @@
 #include "components/url_matcher/url_util.h"
 --- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
 +++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
-@@ -37,7 +37,6 @@
+@@ -40,7 +40,6 @@
 #include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
 #include "components/policy/core/common/cloud/realtime_reporting_job_configuration.h"
 #include "components/safe_browsing/core/common/features.h"
@@ -600,7 +574,7 @@
 #include "extensions/browser/test_event_router.h"
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -43,7 +43,6 @@
+@@ -42,7 +42,6 @@
 #include "components/prefs/pref_service.h"
 #include "components/privacy_sandbox/privacy_sandbox_prefs.h"
 #include "components/proxy_config/proxy_config_pref_names.h"
@@ -608,7 +582,7 @@
 #include "components/search_engines/default_search_manager.h"
 #include "components/spellcheck/browser/pref_names.h"
 #include "components/translate/core/browser/translate_pref_names.h"
-@@ -300,16 +299,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -299,16 +298,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
 
   // Security page
@@ -627,7 +601,7 @@
 
 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
 +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
-@@ -649,9 +649,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore
+@@ -655,9 +655,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstore
 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateGetReferrerChainApiTest,
                        GetReferrerChainForNonSafeBrowsingUser) {
   PrefService* pref_service = browser()->profile()->GetPrefs();
@@ -848,8 +822,8 @@
 
   if (auto* identity_manager = IdentityManagerFactory::GetForProfile(profile))
     identity_manager_observer_.Observe(identity_manager);
--- a/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
-+++ b/chrome/browser/permissions/abusive_origin_permission_revocation_request.cc
+--- a/chrome/browser/permissions/permission_revocation_request.cc
+++ b/chrome/browser/permissions/permission_revocation_request.cc
@@ -17,7 +17,6 @@
 #include "components/permissions/permissions_client.h"
 #include "components/prefs/pref_service.h"
@@ -913,7 +887,7 @@
 }
 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
 +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -93,12 +93,9 @@
+@@ -92,14 +92,11 @@
 #include "components/proxy_config/proxy_policy_handler.h"
 #include "components/safe_browsing/buildflags.h"
 #include "components/safe_browsing/content/common/file_type_policies_prefs.h"
@@ -921,12 +895,14 @@
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
 #include "components/search_engines/default_search_policy_handler.h"
 #include "components/search_engines/search_engines_pref_names.h"
+ #include "components/security_interstitials/core/https_only_mode_policy_handler.h"
 #include "components/security_interstitials/core/pref_names.h"
+ #include "components/services/storage/public/cpp/storage_prefs.h"
 -#include "components/signin/public/base/signin_pref_names.h"
 #include "components/spellcheck/spellcheck_buildflags.h"
 #include "components/sync/base/pref_names.h"
 #include "components/sync/driver/sync_policy_handler.h"
-@@ -208,9 +205,6 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -212,9 +209,6 @@ const PolicyToPreferenceMapEntry kSimple
   { key::kDefaultPopupsSetting,
     prefs::kManagedDefaultPopupsSetting,
     base::Value::Type::INTEGER },
@@ -936,7 +912,7 @@
   { key::kEditBookmarksEnabled,
     bookmarks::prefs::kEditBookmarksEnabled,
     base::Value::Type::BOOLEAN },
-@@ -230,9 +224,6 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -234,9 +228,6 @@ const PolicyToPreferenceMapEntry kSimple
     prefs::kPrintingEnabled,
     base::Value::Type::BOOLEAN },
 #endif // BUILDFLAG(ENABLE_PRINTING)
@@ -946,7 +922,7 @@
   { key::kSavingBrowserHistoryDisabled,
     prefs::kSavingBrowserHistoryDisabled,
     base::Value::Type::BOOLEAN },
-@@ -291,9 +282,6 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -295,9 +286,6 @@ const PolicyToPreferenceMapEntry kSimple
   { key::kAdsSettingForIntrusiveAdsSites,
     prefs::kManagedDefaultAdsSetting,
     base::Value::Type::INTEGER },
@@ -956,7 +932,7 @@
   { key::kAllowCrossOriginAuthPrompt,
     prefs::kAllowCrossOriginAuthPrompt,
     base::Value::Type::BOOLEAN },
-@@ -487,15 +475,6 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -503,15 +491,6 @@ const PolicyToPreferenceMapEntry kSimple
   { key::kPasswordDismissCompromisedAlertEnabled,
     password_manager::prefs::kPasswordDismissCompromisedAlertEnabled,
     base::Value::Type::BOOLEAN },
@@ -972,7 +948,7 @@
   { key::kPolicyRefreshRate,
     policy_prefs::kUserPolicyRefreshRate,
     base::Value::Type::INTEGER },
-@@ -531,9 +510,6 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -550,9 +529,6 @@ const PolicyToPreferenceMapEntry kSimple
   { key::kRestoreOnStartupURLs,
     prefs::kURLsToRestoreOnStartup,
     base::Value::Type::LIST },
@@ -982,30 +958,27 @@
   { key::kSafeSitesFilterBehavior,
     policy_prefs::kSafeSitesFilterBehavior,
     base::Value::Type::INTEGER },
-@@ -653,12 +629,6 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -672,9 +648,6 @@ const PolicyToPreferenceMapEntry kSimple
   { key::kAdditionalDnsQueryTypesEnabled,
     prefs::kAdditionalDnsQueryTypesEnabled,
     base::Value::Type::BOOLEAN },
-  { key::kSafeBrowsingForTrustedSourcesEnabled,
-    prefs::kSafeBrowsingForTrustedSourcesEnabled,
-    base::Value::Type::BOOLEAN },
 -  { key::kSafeBrowsingExtendedReportingEnabled,
 -    prefs::kSafeBrowsingScoutReportingEnabled,
 -    base::Value::Type::BOOLEAN },
   { key::kForceGoogleSafeSearch,
     prefs::kForceGoogleSafeSearch,
     base::Value::Type::BOOLEAN },
-@@ -825,9 +795,6 @@ const PolicyToPreferenceMapEntry kSimple
-   { key::kMaxConnectionsPerProxy,
-     prefs::kMaxConnectionsPerProxy,
+@@ -1454,9 +1427,6 @@ const PolicyToPreferenceMapEntry kSimple
+   { key::kIdleProfileCloseTimeout,
+     prefs::kIdleProfileCloseTimeout,
     base::Value::Type::INTEGER },
 -  { key::kRestrictSigninToPattern,
 -    prefs::kGoogleServicesUsernamePattern,
 -    base::Value::Type::STRING },
-   { key::kDefaultWebBluetoothGuardSetting,
-     prefs::kManagedDefaultWebBluetoothGuardSetting,
-     base::Value::Type::INTEGER },
-@@ -1788,12 +1755,6 @@ std::unique_ptr<ConfigurationPolicyHandl
+   { key::kHardwareAccelerationModeEnabled,
+     prefs::kHardwareAccelerationModeEnabled,
+     base::Value::Type::BOOLEAN },
+@@ -1815,12 +1785,6 @@ std::unique_ptr<ConfigurationPolicyHandl
           SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
           SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED));
 
@@ -1018,10 +991,17 @@
 
   handlers->AddHandler(
       std::make_unique<ManagedAccountRestrictionsPolicyHandler>(chrome_schema));
-@@ -1964,17 +1925,6 @@ std::unique_ptr<ConfigurationPolicyHandl
-   signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
-       key::kForceBrowserSignin, prefs::kForceBrowserSignin,
-       base::Value::Type::BOOLEAN));
+@@ -1995,24 +1959,6 @@ std::unique_ptr<ConfigurationPolicyHandl
+ #else   // BUILDFLAG(IS_CHROMEOS)
+   std::vector<std::unique_ptr<ConfigurationPolicyHandler>>
+       signin_legacy_policies;
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
+-    BUILDFLAG(IS_LINUX)
+-  signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
+-      key::kForceBrowserSignin, prefs::kForceBrowserSignin,
+-      base::Value::Type::BOOLEAN));
+-#endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
+-        // BUILDFLAG(IS_LINUX)
 -  signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
 -      key::kSigninAllowed,
 -#if BUILDFLAG(IS_ANDROID)
@@ -1046,15 +1026,15 @@
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/security_interstitials/content/insecure_form_blocking_page.h"
 #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
-@@ -1045,7 +1044,6 @@ void RegisterLocalState(PrefRegistrySimp
-   ProfileNetworkContextService::RegisterLocalStatePrefs(registry);
-   profiles::RegisterPrefs(registry);
+@@ -1068,7 +1067,6 @@ void RegisterLocalState(PrefRegistrySimp
+   PushMessagingServiceImpl::RegisterPrefs(registry);
+ #endif
   RegisterScreenshotPrefs(registry);
 -  safe_browsing::RegisterLocalStatePrefs(registry);
   secure_origin_allowlist::RegisterPrefs(registry);
   segmentation_platform::SegmentationPlatformService::RegisterLocalStatePrefs(
       registry);
-@@ -1306,8 +1304,6 @@ void RegisterProfilePrefs(user_prefs::Pr
+@@ -1327,8 +1325,6 @@ void RegisterProfilePrefs(user_prefs::Pr
   PushMessagingAppIdentifier::RegisterProfilePrefs(registry);
   QuietNotificationPermissionUiState::RegisterProfilePrefs(registry);
   RegisterBrowserUserPrefs(registry);
@@ -1073,7 +1053,7 @@
 #include "components/safe_browsing/core/common/safebrowsing_switches.h"
 #include "components/sync/base/pref_names.h"
 #include "content/public/common/content_switches.h"
-@@ -75,8 +74,6 @@ const CommandLinePrefStore::BooleanSwitc
+@@ -80,8 +79,6 @@ const CommandLinePrefStore::BooleanSwitc
         {switches::kAllowCrossOriginAuthPrompt,
          prefs::kAllowCrossOriginAuthPrompt, true},
         {switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true},
@@ -1238,7 +1218,7 @@
 #include "components/signin/public/identity_manager/identity_manager.h"
 #include "components/signin/public/identity_manager/primary_account_mutator.h"
 #include "components/sync/base/stop_source.h"
-@@ -2270,8 +2269,7 @@ void ProfileManager::AddProfileToStorage
+@@ -2276,8 +2275,7 @@ void ProfileManager::AddProfileToStorage
       entry->SetAuthInfo(account_info.gaia, username,
                          is_consented_primary_account);
 
@@ -1248,7 +1228,7 @@
 
 #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
       // Sign out if force-sign-in policy is enabled and profile is not signed
-@@ -2326,14 +2324,13 @@ void ProfileManager::AddProfileToStorage
+@@ -2332,14 +2330,13 @@ void ProfileManager::AddProfileToStorage
 
   init_params.is_ephemeral = IsEphemeral(profile);
   init_params.is_signed_in_with_credential_provider =
@@ -1301,7 +1281,7 @@
     </cr-dialog>
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-@@ -595,7 +595,7 @@
+@@ -579,7 +579,7 @@
           </category-setting-exceptions>
         </settings-subpage>
       </template>
@@ -1312,13 +1292,13 @@
           <settings-subpage page-title="$i18n{siteSettingsAds}"
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
-@@ -102,7 +102,7 @@ export class SettingsPrivacyPageElement
+@@ -98,7 +98,7 @@ export class SettingsPrivacyPageElement
       enableSafeBrowsingSubresourceFilter_: {
         type: Boolean,
         value() {
 -          return loadTimeData.getBoolean('enableSafeBrowsingSubresourceFilter');
 +          return false;
-         }
+         },
       },
 
 --- a/chrome/browser/resources/settings/privacy_page/security_page.html
@@ -1429,7 +1409,7 @@
     <div class="cr-row first">
       <h2>$i18n{advancedPageTitle}</h2>
     </div>
-@@ -213,8 +114,3 @@
+@@ -241,8 +142,3 @@
         on-click="onAdvancedProtectionProgramLinkClick_"
         external>
     </cr-link-row>
@@ -1440,7 +1420,7 @@
 -    </template>
 --- a/chrome/browser/resources/settings/privacy_page/security_page.ts
 +++ b/chrome/browser/resources/settings/privacy_page/security_page.ts
-@@ -199,17 +199,6 @@ export class SettingsSecurityPageElement
+@@ -214,17 +214,6 @@ export class SettingsSecurityPageElement
 
   override ready() {
     super.ready();
@@ -1458,7 +1438,7 @@
   }
 
   /**
-@@ -258,8 +247,7 @@ export class SettingsSecurityPageElement
+@@ -273,8 +262,7 @@ export class SettingsSecurityPageElement
   }
 
   private getDisabledExtendedSafeBrowsing_(): boolean {
@@ -1470,7 +1450,7 @@
   private getPasswordsLeakToggleSubLabel_(): string {
 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
 +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
-@@ -48,7 +48,7 @@ function getCategoryItemMap(): Map<Conte
+@@ -47,7 +47,7 @@ function getCategoryItemMap(): Map<Conte
       enabledLabel: 'siteSettingsAdsAllowed',
       disabledLabel: 'siteSettingsAdsBlocked',
       shouldShow: () =>
@@ -1602,7 +1582,7 @@
 #include "components/safe_browsing/core/common/safebrowsing_constants.h"
 #include "components/safe_browsing/core/common/utils.h"
 #include "components/security_interstitials/content/unsafe_resource_util.h"
-@@ -1213,14 +1212,6 @@ bool ChromePasswordProtectionService::Ha
+@@ -1212,14 +1211,6 @@ bool ChromePasswordProtectionService::Ha
 }
 
 void ChromePasswordProtectionService::OnWarningTriggerChanged() {
@@ -1617,7 +1597,7 @@
   // Clears captured enterprise password hashes or GSuite sync password hashes.
   password_manager::PasswordReuseManager* reuse_manager =
       GetPasswordReuseManager();
-@@ -1379,7 +1370,7 @@ PrefService* ChromePasswordProtectionSer
+@@ -1378,7 +1369,7 @@ PrefService* ChromePasswordProtectionSer
 }
 
 bool ChromePasswordProtectionService::IsSafeBrowsingEnabled() {
@@ -1626,7 +1606,7 @@
 }
 
 bool ChromePasswordProtectionService::IsExtendedReporting() {
-@@ -1399,44 +1390,7 @@ bool ChromePasswordProtectionService::Is
+@@ -1398,44 +1389,7 @@ bool ChromePasswordProtectionService::Is
 bool ChromePasswordProtectionService::IsPingingEnabled(
     LoginReputationClientRequest::TriggerType trigger_type,
     ReusedPasswordAccountType password_type) {
@@ -1672,7 +1652,7 @@
 }
 
 RequestOutcome ChromePasswordProtectionService::GetPingNotSentReason(
-@@ -1665,22 +1619,6 @@ MaybeCreateCommitDeferringCondition(
+@@ -1664,22 +1618,6 @@ MaybeCreateCommitDeferringCondition(
              : nullptr;
 }
 
@@ -1755,7 +1735,7 @@
 #include "content/public/browser/browser_task_traits.h"
 --- a/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc
 +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc
-@@ -95,7 +95,6 @@
+@@ -96,7 +96,6 @@
 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
 #include "components/safe_browsing/core/common/features.h"
 #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -2564,7 +2544,7 @@
 #include "components/sync/driver/sync_service.h"
 --- a/chrome/browser/ui/browser_command_controller.cc
 +++ b/chrome/browser/ui/browser_command_controller.cc
-@@ -58,7 +58,6 @@
+@@ -59,7 +59,6 @@
 #include "components/services/screen_ai/buildflags/buildflags.h"
 #include "components/sessions/core/tab_restore_service.h"
 #include "components/signin/public/base/signin_buildflags.h"
@@ -2572,7 +2552,7 @@
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
-@@ -247,10 +246,6 @@ BrowserCommandController::BrowserCommand
+@@ -214,10 +213,6 @@ BrowserCommandController::BrowserCommand
           &BrowserCommandController::UpdateCommandsForFullscreenMode,
           base::Unretained(this)));
 #endif
@@ -2583,7 +2563,7 @@
 
   InitCommandState();
 
-@@ -1648,7 +1643,7 @@ void BrowserCommandController::UpdateSho
+@@ -1617,7 +1612,7 @@ void BrowserCommandController::UpdateSho
     return;
 
   command_updater_.UpdateCommandEnabled(
@@ -2622,7 +2602,7 @@
 #include "components/signin/public/identity_manager/identity_manager.h"
 #endif
 
-@@ -531,13 +530,7 @@ void ShowBrowserSignin(Browser* browser,
+@@ -576,13 +575,7 @@ void ShowBrowserSignin(Browser* browser,
 
 void ShowBrowserSigninOrSettings(Browser* browser,
                                  signin_metrics::AccessPoint access_point) {
@@ -2690,10 +2670,10 @@
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "components/signin/public/base/consent_level.h"
 -#include "components/signin/public/base/signin_pref_names.h"
- #include "components/signin/public/base/signin_switches.h"
 #include "components/signin/public/identity_manager/primary_account_mutator.h"
 #include "components/strings/grit/components_strings.h"
-@@ -512,7 +511,6 @@ void ProfileMenuView::BuildAutofillButto
+ #include "components/vector_icons/vector_icons.h"
+@@ -511,7 +510,6 @@ void ProfileMenuView::BuildAutofillButto
 
 void ProfileMenuView::BuildSyncInfo() {
   Profile* profile = browser()->profile();
@@ -2776,15 +2756,15 @@
 #include "content/public/browser/render_process_host.h"
 --- a/chrome/browser/ui/webui/browser_command/browser_command_handler.cc
 +++ b/chrome/browser/ui/webui/browser_command/browser_command_handler.cc
-@@ -17,7 +17,6 @@
+@@ -22,7 +22,6 @@
 #include "chrome/common/webui_url_constants.h"
 #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
 #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
 -#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
+ #include "components/user_education/common/tutorial_service.h"
+ #include "ui/base/interaction/element_identifier.h"
 #include "ui/base/page_transition_types.h"
- #include "ui/base/window_open_disposition.h"
- 
-@@ -61,13 +60,6 @@ void BrowserCommandHandler::CanExecuteCo
+@@ -68,13 +67,6 @@ void BrowserCommandHandler::CanExecuteCo
     case Command::kOpenSafetyCheck:
       can_execute = !chrome::enterprise_util::IsBrowserManaged(profile_);
       break;
@@ -2889,7 +2869,7 @@
 #include "components/signin/public/identity_manager/account_info.h"
 #include "components/signin/public/identity_manager/accounts_mutator.h"
 #include "components/signin/public/identity_manager/identity_manager.h"
-@@ -303,10 +302,6 @@ void PeopleHandler::RegisterMessages() {
+@@ -302,10 +301,6 @@ void PeopleHandler::RegisterMessages() {
 void PeopleHandler::OnJavascriptAllowed() {
   PrefService* prefs = profile_->GetPrefs();
   profile_pref_registrar_.Init(prefs);
@@ -2920,7 +2900,7 @@
 #include "components/signin/public/base/signin_buildflags.h"
 #include "components/strings/grit/components_chromium_strings.h"
 #include "components/strings/grit/components_strings.h"
-@@ -1481,44 +1480,6 @@ void AddPrivacyStrings(content::WebUIDat
+@@ -1465,44 +1464,6 @@ void AddPrivacyStrings(content::WebUIDat
     {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
     {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
     {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT},
@@ -2965,7 +2945,7 @@
     {"safeBrowsingSectionLabel", IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL},
     {"syncAndGoogleServicesPrivacyDescription",
      IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT},
-@@ -2844,11 +2805,6 @@ void AddSiteSettingsStrings(content::Web
+@@ -2870,11 +2831,6 @@ void AddSiteSettingsStrings(content::Web
   html_source->AddLocalizedStrings(kSensorsLocalizedStrings);
 
   html_source->AddBoolean(
@@ -2984,10 +2964,10 @@
 #include "components/prefs/pref_service.h"
 #include "components/safe_browsing/core/common/features.h"
 -#include "components/signin/public/base/signin_pref_names.h"
- #include "components/signin/public/base/signin_switches.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
-@@ -258,9 +257,7 @@ SettingsUI::SettingsUI(content::WebUI* w
+ #include "content/public/browser/web_ui.h"
+@@ -257,9 +256,7 @@ SettingsUI::SettingsUI(content::WebUI* w
         std::make_unique<IncompatibleApplicationsHandler>());
 #endif  // BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
 
@@ -3079,7 +3059,7 @@
   }
 --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc
 +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc
-@@ -44,7 +44,6 @@
+@@ -45,7 +45,6 @@
 #include "components/policy/core/common/management/management_service.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/public/base/signin_metrics.h"
@@ -3087,7 +3067,7 @@
 #include "components/signin/public/identity_manager/accounts_mutator.h"
 #include "components/signin/public/identity_manager/identity_manager.h"
 #include "components/signin/public/identity_manager/primary_account_mutator.h"
-@@ -222,8 +221,7 @@ TurnSyncOnHelper::TurnSyncOnHelper(
+@@ -223,8 +222,7 @@ TurnSyncOnHelper::TurnSyncOnHelper(
   // last authenticated account of the current profile, then Chrome will show a
   // confirmation dialog before starting sync.
   // TODO(skym): Warn for high risk upgrade scenario (https://crbug.com/572754).
@@ -3104,9 +3084,9 @@
 #include "components/signin/public/base/consent_level.h"
 #include "components/signin/public/base/signin_metrics.h"
 -#include "components/signin/public/base/signin_pref_names.h"
- #include "components/signin/public/base/signin_switches.h"
 #include "components/signin/public/identity_manager/identity_manager.h"
 #include "components/signin/public/identity_manager/identity_test_environment.h"
+ #include "components/signin/public/identity_manager/identity_test_utils.h"
 --- a/chrome/browser/ui/webui/welcome/welcome_ui.cc
 +++ b/chrome/browser/ui/webui/welcome/welcome_ui.cc
@@ -24,7 +24,6 @@
@@ -3285,7 +3265,7 @@
 #include "components/signin/public/identity_manager/identity_manager.h"
 #include "components/sync/base/user_selectable_type.h"
 #include "components/sync/driver/sync_user_settings.h"
-@@ -91,11 +90,6 @@ bool IsGaiaCredentialPage(const std::str
+@@ -92,11 +91,6 @@ bool IsGaiaCredentialPage(const std::str
 
 bool ShouldSaveEnterprisePasswordHash(const PasswordForm& form,
                                       const PrefService& prefs) {
@@ -3472,7 +3452,7 @@
 #include "components/security_interstitials/content/unsafe_resource_util.h"
 --- a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc
 +++ b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.cc
-@@ -34,7 +34,6 @@
+@@ -35,7 +35,6 @@
 #include "components/safe_browsing/core/browser/referrer_chain_provider.h"
 #include "components/safe_browsing/core/common/features.h"
 #include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -3480,7 +3460,7 @@
 #include "content/public/browser/global_routing_id.h"
 #include "services/network/public/mojom/cookie_manager.mojom.h"
 #if BUILDFLAG(FULL_SAFE_BROWSING)
-@@ -1385,17 +1384,7 @@ std::string SerializeHitReport(const Hit
+@@ -1370,17 +1369,7 @@ std::string SerializeHitReport(const Hit
   }
   hit_report_dict.Set("threat_source", threat_source);
   std::string extended_reporting_level;
@@ -3498,7 +3478,7 @@
   hit_report_dict.Set("extended_reporting_level", extended_reporting_level);
   hit_report_dict.Set("is_enhanced_protection",
                       hit_report.is_enhanced_protection);
-@@ -2292,18 +2281,13 @@ void SafeBrowsingUIHandler::GetPrefs(con
+@@ -2258,18 +2247,13 @@ void SafeBrowsingUIHandler::GetPrefs(con
   AllowJavascript();
   DCHECK(!args.empty());
   std::string callback_id = args[0].GetString();
@@ -3576,7 +3556,7 @@
       list_infos_(GetListInfos()),
       task_runner_(task_runner_for_tests
                        ? task_runner_for_tests
-@@ -1122,8 +1119,7 @@ void V4LocalDatabaseManager::SetupUpdate
+@@ -1124,8 +1121,7 @@ void V4LocalDatabaseManager::SetupUpdate
                           weak_factory_.GetWeakPtr());
 
   v4_update_protocol_manager_ = V4UpdateProtocolManager::Create(
@@ -4316,12 +4296,12 @@
@@ -86,8 +85,7 @@ void CertReportHelper::PopulateExtendedR
     return;
 
-   load_time_data->SetBoolKey(
+   load_time_data.Set(
 -      security_interstitials::kBoxChecked,
 -      safe_browsing::IsExtendedReportingEnabled(*GetPrefs(web_contents_)));
 +      security_interstitials::kBoxChecked, false);
 
-   load_time_data->SetStringKey(
+   load_time_data.Set(
       security_interstitials::kOptInLink,
@@ -124,14 +122,8 @@ void CertReportHelper::HandleReportingCo
     PrefService* pref_service) {
@@ -4468,7 +4448,7 @@
   SetUpMetrics();
 }
 
-@@ -88,15 +80,8 @@ SecurityInterstitialControllerClient* Se
+@@ -86,15 +78,8 @@ SecurityInterstitialControllerClient* Se
 }
 
 void SecurityInterstitialPage::SetUpMetrics() {
@@ -4759,14 +4739,15 @@
 }
 
 void AccountTrackerService::RemoveAccountImageFromDisk(
-@@ -584,185 +555,16 @@ void AccountTrackerService::RemoveAccoun
+@@ -584,186 +555,16 @@ void AccountTrackerService::RemoveAccoun
 }
 
 void AccountTrackerService::LoadFromPrefs() {
-  const base::Value* list = pref_service_->GetList(prefs::kAccountInfo);
+-  const base::Value::List& list =
+-      pref_service_->GetValueList(prefs::kAccountInfo);
 -  std::set<CoreAccountId> to_remove;
-  for (size_t i = 0; i < list->GetListDeprecated().size(); ++i) {
-    const base::Value& dict_value = list->GetListDeprecated()[i];
+-  for (size_t i = 0; i < list.size(); ++i) {
+-    const base::Value& dict_value = list[i];
 -    if (dict_value.is_dict()) {
 -      const base::DictionaryValue& dict =
 -          base::Value::AsDictionaryValue(dict_value);
@@ -5202,7 +5183,7 @@
 ProfileOAuth2TokenServiceDelegate* ProfileOAuth2TokenService::GetDelegate() {
 --- a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc
 +++ b/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc
-@@ -24,7 +24,6 @@
+@@ -25,7 +25,6 @@
 #include "components/account_manager_core/mock_account_manager_facade.h"
 #include "components/signin/internal/identity_manager/account_tracker_service.h"
 #include "components/signin/internal/identity_manager/profile_oauth2_token_service_observer.h"
@@ -5360,7 +5341,7 @@
 #include "components/signin/public/identity_manager/identity_test_utils.h"
 --- a/tools/metrics/histograms/enums.xml
 +++ b/tools/metrics/histograms/enums.xml
-@@ -93848,7 +93848,6 @@ Full version information for the fingerp
+@@ -95254,7 +95254,6 @@ Full version information for the fingerp
   <int value="3" label="kRestoreOnStartup"/>
   <int value="4" label="kURLsToRestoreOnStartup"/>
   <int value="5" label="extensions::pref_names::kExtensions"/>
@@ -5368,7 +5349,7 @@
   <int value="7" label="kSearchProviderOverrides"/>
   <int value="8" label="kDefaultSearchProviderSearchURL (Obsolete 12/2016)"/>
   <int value="9" label="kDefaultSearchProviderKeyword (Obsolete 12/2016)"/>
-@@ -93863,10 +93862,7 @@ Full version information for the fingerp
+@@ -95269,10 +95268,7 @@ Full version information for the fingerp
   <int value="18" label="kSafeBrowsingIncidentsSent"/>
   <int value="19" label="kSwReporterPromptVersion"/>
   <int value="20" label="kSwReporterPromptReason"/>
--- a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch
+++ b/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
-@@ -141,6 +141,7 @@
+@@ -139,6 +139,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"
-@@ -1750,6 +1751,8 @@ void RenderViewContextMenu::AppendPageIt
+@@ -1795,6 +1796,8 @@ void RenderViewContextMenu::AppendPageIt
   if (has_sharing_menu_items)
     menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
 
@@ -18,9 +18,9 @@
   ChromeTranslateClient* chrome_translate_client =
       ChromeTranslateClient::FromWebContents(embedder_web_contents_);
   const bool canTranslate =
-@@ -1771,6 +1774,7 @@ void RenderViewContextMenu::AppendPageIt
-         IDC_CONTENT_CONTEXT_TRANSLATE,
-         l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_TRANSLATE, language));
+@@ -1807,6 +1810,7 @@ void RenderViewContextMenu::AppendPageIt
+         l10n_util::GetStringFUTF16(IDS_CONTENT_CONTEXT_TRANSLATE,
+                                    GetTargetLanguageDisplayName()));
   }
 +  } // if (command_line.HasSwitch(translate::switches::kTranslateScriptURL))
 }
--- a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
+++ b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
@@ -9,7 +9,7 @@

 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2406,6 +2406,7 @@ static_library("browser") {
+@@ -2408,6 +2408,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
-@@ -147,6 +147,7 @@
+@@ -152,6 +152,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
-@@ -232,6 +232,7 @@ source_set("browser") {
+@@ -236,6 +236,7 @@ source_set("browser") {
     "//third_party/libyuv",
     "//third_party/re2",
     "//third_party/sqlite",
@@ -62,9 +62,9 @@
 #include "components/viz/common/switches.h"
 #include "components/viz/host/gpu_client.h"
 #include "content/browser/bad_message.h"
-@@ -3240,6 +3241,8 @@ void RenderProcessHostImpl::PropagateBro
-     switches::kEnableWebGLDraftExtensions,
+@@ -3259,6 +3260,8 @@ void RenderProcessHostImpl::PropagateBro
     switches::kEnableWebGLImageChromium,
+     switches::kEnableWebGPUDeveloperFeatures,
     switches::kFileUrlPathAlias,
 +    switches::kFingerprintingClientRectsNoise,
 +    switches::kFingerprintingCanvasMeasureTextNoise,
@@ -91,9 +91,9 @@
 #include "ui/accessibility/accessibility_features.h"
 #include "ui/base/ui_base_features.h"
 #include "ui/events/blink/blink_features.h"
-@@ -477,6 +478,10 @@ void SetRuntimeFeaturesFromCommandLine(c
-        true},
-       {wrf::EnableWebGPU, switches::kEnableUnsafeWebGPU, true},
+@@ -493,6 +494,10 @@ void SetRuntimeFeaturesFromCommandLine(c
+       {wrf::EnableWebGPUDeveloperFeatures,
+        switches::kEnableWebGPUDeveloperFeatures, true},
       {wrf::EnableDirectSockets, switches::kIsolatedAppOrigins, true},
 +      {wrf::EnableFingerprintingClientRectsNoise,
 +       switches::kFingerprintingClientRectsNoise, 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
-@@ -212,6 +212,8 @@ class WebRuntimeFeatures {
+@@ -213,6 +213,8 @@ class WebRuntimeFeatures {
   BLINK_PLATFORM_EXPORT static void EnableMediaControlsExpandGesture(bool);
   BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
   BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
@@ -121,9 +121,9 @@
 #include "base/notreached.h"
 +#include "base/rand_util.h"
 #include "base/time/time.h"
+ #include "cc/animation/animation_host.h"
 #include "cc/animation/animation_timeline.h"
- #include "cc/input/overscroll_behavior.h"
-@@ -902,6 +903,14 @@ Range* Document::CreateRangeAdjustedToTr
+@@ -909,6 +910,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>();
-@@ -2223,6 +2232,15 @@ void Document::UpdateStyleAndLayoutTreeF
+@@ -2232,6 +2241,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
-@@ -501,6 +501,10 @@ class CORE_EXPORT Document : public Cont
+@@ -510,6 +510,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;
-@@ -2254,6 +2258,9 @@ class CORE_EXPORT Document : public Cont
+@@ -2264,6 +2268,9 @@ class CORE_EXPORT Document : public Cont
 
   base::ElapsedTimer start_time_;
 
@@ -175,11 +175,11 @@
 +  double noise_factor_y_;
 +
   Member<ScriptRunner> script_runner_;
+   Member<ScriptRunnerDelayer> script_runner_delayer_;
 
-   HeapVector<Member<ScriptElementBase>> current_script_stack_;
 --- a/third_party/blink/renderer/core/dom/element.cc
 +++ b/third_party/blink/renderer/core/dom/element.cc
-@@ -2128,6 +2128,11 @@ DOMRectList* Element::getClientRects() {
+@@ -2127,6 +2127,11 @@ DOMRectList* Element::getClientRects() {
   DCHECK(element_layout_object);
   GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
                                                     *element_layout_object);
@@ -191,7 +191,7 @@
   return MakeGarbageCollected<DOMRectList>(quads);
 }
 
-@@ -2145,6 +2150,9 @@ gfx::RectF Element::GetBoundingClientRec
+@@ -2144,6 +2149,9 @@ gfx::RectF Element::GetBoundingClientRec
   DCHECK(element_layout_object);
   GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
                                                    *element_layout_object);
@@ -285,7 +285,7 @@
 void CanvasRenderingContext2D::fillFormattedText(
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1638,6 +1638,7 @@ component("platform") {
+@@ -1649,6 +1649,7 @@ component("platform") {
     "//components/paint_preview/common",
     "//components/power_scheduler",
     "//components/search_engines:search_engine_utils",
@@ -295,8 +295,8 @@
     "//components/webrtc:net_address_utils",
 --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -659,4 +659,12 @@ void WebRuntimeFeatures::EnableSpeculati
-   RuntimeEnabledFeatures::SetSpeculationRulesPrefetchProxyEnabled(enable);
+@@ -683,4 +683,12 @@ void WebRuntimeFeatures::EnableGetDispla
+       enable);
 }
 
 +void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool 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
-@@ -1111,6 +1111,12 @@
+@@ -1091,6 +1091,12 @@
       origin_trial_feature_name: "Focusgroup",
     },
     {
--- a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch
+++ b/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
-@@ -3243,6 +3243,7 @@ void RenderProcessHostImpl::PropagateBro
+@@ -3262,6 +3262,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
-@@ -482,6 +482,8 @@ void SetRuntimeFeaturesFromCommandLine(c
+@@ -498,6 +498,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
-@@ -214,6 +214,7 @@ class WebRuntimeFeatures {
+@@ -215,6 +215,7 @@ class WebRuntimeFeatures {
   BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
   BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
   BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
@@ -73,7 +73,7 @@ approach to change color components.
 #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/garbage_collected.h"
-@@ -2046,6 +2047,9 @@ ImageData* BaseRenderingContext2D::getIm
+@@ -2047,6 +2048,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
-@@ -1596,7 +1596,9 @@ component("platform") {
+@@ -1607,7 +1607,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
-@@ -667,4 +667,8 @@ void WebRuntimeFeatures::EnableFingerpri
+@@ -691,4 +691,8 @@ void WebRuntimeFeatures::EnableFingerpri
   RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable);
 }
 
@@ -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
-@@ -1117,6 +1117,9 @@
+@@ -1097,6 +1097,9 @@
       name: "FingerprintingCanvasMeasureTextNoise",
     },
     {
--- a/patches/extra/bromite/flag-max-connections-per-host.patch
+++ b/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
-@@ -2151,6 +2151,7 @@ static_library("browser") {
+@@ -2149,6 +2149,7 @@ static_library("browser") {
     "//components/net_log",
     "//components/network_hints/common:mojo_bindings",
     "//components/network_session_configurator/browser",
@@ -99,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
-@@ -1667,6 +1667,10 @@ const char kUnthrottledNestedTimeoutDesc
+@@ -1772,6 +1772,10 @@ const char kUnthrottledNestedTimeoutDesc
     "websites abusing the API will still eventually have their setTimeouts "
     "clamped.";
 
@@ -112,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
-@@ -938,6 +938,9 @@ extern const char kLogJsConsoleMessagesD
+@@ -993,6 +993,9 @@ extern const char kLogJsConsoleMessagesD
 extern const char kUnthrottledNestedTimeoutName[];
 extern const char kUnthrottledNestedTimeoutDescription[];
 
--- a/patches/extra/debian/disable/welcome-page.patch
+++ b/patches/extra/debian/disable/welcome-page.patch
@@ -4,12 +4,15 @@ bug-debian: http://bugs.debian.org/857767

 --- a/chrome/browser/profiles/profile_manager.cc
 +++ b/chrome/browser/profiles/profile_manager.cc
-@@ -1430,7 +1430,7 @@ void ProfileManager::InitProfileUserPref
+@@ -1442,11 +1442,6 @@ void ProfileManager::InitProfileUserPref
     profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
                                    supervised_user_id);
   }
 -#if !BUILDFLAG(IS_ANDROID)
-+#if 0
-   // TODO(pmonette): Fix IsNewProfile() to handle the case where the profile is
-   // new even if the "Preferences" file already existed. (For example: The
-   // master_preferences file is dumped into the default profile on first run,
+-  if (profile->IsNewProfile()) {
+-    profile->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, false);
+-  }
+-#endif  // !BUILDFLAG(IS_ANDROID)
+ }
+ 
+ void ProfileManager::RegisterTestingProfile(std::unique_ptr<Profile> profile,
--- a/patches/extra/inox-patchset/0006-modify-default-prefs.patch
+++ b/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
-@@ -1301,7 +1301,7 @@ void ChromeContentBrowserClient::Registe
+@@ -1361,7 +1361,7 @@ void ChromeContentBrowserClient::Registe
 void ChromeContentBrowserClient::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -118,7 +118,7 @@
   // Non-synced prefs. Used for per-device choices, e.g., signin promo.
 --- a/components/bookmarks/browser/bookmark_utils.cc
 +++ b/components/bookmarks/browser/bookmark_utils.cc
-@@ -436,7 +436,7 @@ bool DoesBookmarkContainWords(const std:
+@@ -438,7 +438,7 @@ bool DoesBookmarkContainWords(const std:
 
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
@@ -129,7 +129,7 @@
   registry->RegisterBooleanPref(
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -64,7 +64,7 @@ void CookieSettings::RegisterProfilePref
+@@ -66,7 +66,7 @@ void CookieSettings::RegisterProfilePref
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(
       prefs::kCookieControlsMode,
@@ -140,13 +140,17 @@
 
 --- a/components/password_manager/core/browser/password_manager.cc
 +++ b/components/password_manager/core/browser/password_manager.cc
-@@ -211,10 +211,10 @@ bool HasMutedCredentials(const std::vect
+@@ -228,14 +228,14 @@ bool IsSingleUsernameSubmission(const Pa
 void PasswordManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
 -      prefs::kCredentialsEnableService, true,
 +      prefs::kCredentialsEnableService, false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
+ #if BUILDFLAG(IS_IOS)
+   registry->RegisterBooleanPref(prefs::kCredentialProviderEnabledOnStartup,
+                                 false);
+ #endif
   registry->RegisterBooleanPref(
 -      prefs::kCredentialsEnableAutosignin, true,
 +      prefs::kCredentialsEnableAutosignin, false,
--- a/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch
+++ b/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch
@@ -5,7 +5,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
-@@ -1638,8 +1638,6 @@ int ChromeBrowserMainParts::PreMainMessa
+@@ -1649,8 +1649,6 @@ int ChromeBrowserMainParts::PreMainMessa
   // and preferences have been registered since some of the import code depends
   // on preferences.
   if (first_run::IsChromeFirstRun()) {
--- a/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch
+++ b/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
-@@ -243,7 +243,7 @@ bool GetTLSServerEndPointChannelBinding(
+@@ -241,7 +241,7 @@ bool GetTLSServerEndPointChannelBinding(
 }
 
 // RSA keys created by CreateKeyAndSelfSignedCert will be of this length.
--- a/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch
+++ b/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch
@@ -29,7 +29,7 @@ TLDR: Do not let files sneak onto the disk too easily.

 --- a/chrome/browser/download/download_prefs.cc
 +++ b/chrome/browser/download/download_prefs.cc
-@@ -263,7 +263,7 @@ void DownloadPrefs::RegisterProfilePrefs
+@@ -274,7 +274,7 @@ void DownloadPrefs::RegisterProfilePrefs
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kPromptForDownload,
--- a/patches/extra/iridium-browser/updater-disable-auto-update.patch
+++ b/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
-@@ -846,7 +846,7 @@ class AppControllerProfileObserver : pub
+@@ -826,7 +826,7 @@ class AppControllerNativeThemeObserver :
   CFStringRef checkInterval = CFSTR("checkInterval");
   CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
   if (!plist) {
--- a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch
@@ -17,16 +17,15 @@
       override_bounds_(params.initial_bounds),
       initial_show_state_(params.initial_show_state),
       initial_workspace_(params.initial_workspace),
-@@ -842,7 +845,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.
-  if (CanCloseWithInProgressDownloads())
-+  if (CanCloseWithInProgressDownloads() && CanCloseWithMultipleTabs())
+@@ -841,6 +844,7 @@ Browser::WarnBeforeClosingResult Browser
+   // true or there are no pending downloads we need to prompt about) then
+   // there's no need to warn.
+   if (force_skip_warning_user_on_close_ || CanCloseWithInProgressDownloads())
+   if (CanCloseWithMultipleTabs())
     return WarnBeforeClosingResult::kOkToClose;
 
   DCHECK(!warn_before_closing_callback_)
-@@ -872,6 +875,7 @@ bool Browser::TryToCloseWindow(
+@@ -875,6 +879,7 @@ bool Browser::TryToCloseWindow(
 
 void Browser::ResetTryToCloseWindow() {
   cancel_download_confirmation_state_ = NOT_PROMPTED;
@@ -34,7 +33,7 @@
   unload_controller_.ResetTryToCloseWindow();
 }
 
-@@ -2742,6 +2746,62 @@ bool Browser::CanCloseWithInProgressDown
+@@ -2774,6 +2779,62 @@ bool Browser::CanCloseWithInProgressDown
   return false;
 }
 
@@ -97,7 +96,7 @@
 void Browser::InProgressDownloadResponse(bool cancel_downloads) {
   if (cancel_downloads) {
     cancel_download_confirmation_state_ = RESPONSE_RECEIVED;
-@@ -2760,6 +2820,22 @@ void Browser::InProgressDownloadResponse
+@@ -2792,6 +2853,22 @@ void Browser::InProgressDownloadResponse
 
   std::move(warn_before_closing_callback_)
       .Run(WarnBeforeClosingResult::kDoNotClose);
@@ -130,7 +129,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"
-@@ -1041,12 +1042,17 @@ class Browser : public TabStripModelObse
+@@ -1055,12 +1056,17 @@ class Browser : public TabStripModelObse
   // Returns true if the window can close, false otherwise.
   bool CanCloseWithInProgressDownloads();
 
@@ -148,7 +147,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().
-@@ -1213,6 +1219,8 @@ class Browser : public TabStripModelObse
+@@ -1230,6 +1236,8 @@ class Browser : public TabStripModelObse
   // when the browser is closed with in-progress downloads.
   CancelDownloadConfirmationState cancel_download_confirmation_state_;
 
--- a/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch
+++ b/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
-@@ -785,10 +785,14 @@ bool HandleNewTabPageLocationOverride(
+@@ -820,10 +820,14 @@ bool HandleNewTabPageLocationOverride(
 
   // Don't change the URL when incognito mode.
   if (profile->IsOffTheRecord())
@@ -28,7 +28,7 @@
 #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 --- a/components/flags_ui/flags_state.cc
 +++ b/components/flags_ui/flags_state.cc
-@@ -218,6 +218,7 @@ std::string GetCombinedOriginListValue(c
+@@ -220,6 +220,7 @@ std::string GetCombinedOriginListValue(c
       command_line.GetSwitchValueASCII(command_line_switch);
   const std::string new_value =
       flags_storage.GetOriginListFlag(internal_entry_name);
@@ -36,7 +36,7 @@
   return CombineAndSanitizeOriginLists(existing_value, new_value);
 }
 
-@@ -414,6 +415,7 @@ void FlagsState::SetOriginListFlag(const
+@@ -416,6 +417,7 @@ void FlagsState::SetOriginListFlag(const
                                    const std::string& value,
                                    FlagsStorage* flags_storage) {
   const std::string new_value =
--- a/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch
@@ -41,8 +41,8 @@
 +#include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/format_macros.h"
- #include "base/metrics/histogram.h"
-@@ -295,6 +297,15 @@ AutocompleteController::AutocompleteCont
+ #include "base/metrics/histogram_functions.h"
+@@ -296,6 +298,15 @@ AutocompleteController::AutocompleteCont
       search_service_worker_signal_sent_(false),
       template_url_service_(provider_client_->GetTemplateURLService()) {
   provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
@@ -55,12 +55,12 @@
 +    if (!base::Contains(flag_value, "chrome"))
 +      provider_types &= ~AutocompleteProvider::TYPE_BUILTIN;
 +  }
-   if (provider_types & AutocompleteProvider::TYPE_BOOKMARK) {
-     bookmark_provider_ = new BookmarkProvider(provider_client_.get());
-     providers_.push_back(bookmark_provider_.get());
+ 
+   if (OmniboxFieldTrial::kAutocompleteStabilityAsyncProvidersFirst.Get()) {
+     // Providers run in the order they're added. Run these async providers 1st
 --- a/components/omnibox/browser/history_url_provider.cc
 +++ b/components/omnibox/browser/history_url_provider.cc
-@@ -480,6 +480,9 @@ void HistoryURLProvider::Start(const Aut
+@@ -483,6 +483,9 @@ void HistoryURLProvider::Start(const Aut
   if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)
     matches_.push_back(what_you_typed_match);
 
--- a/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch
@@ -27,7 +27,7 @@
   return true;
 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
 +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
-@@ -309,7 +309,8 @@ void LocationBarView::Init() {
+@@ -312,7 +312,8 @@ void LocationBarView::Init() {
     }
     params.types_enabled.push_back(PageActionIconType::kSendTabToSelf);
     params.types_enabled.push_back(PageActionIconType::kClickToCall);
--- a/patches/extra/ungoogled-chromium/add-flag-for-referrer-header.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-for-referrer-header.patch
@@ -30,7 +30,7 @@
 #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 --- a/content/browser/utility_process_host.cc
 +++ b/content/browser/utility_process_host.cc
-@@ -232,6 +232,7 @@ bool UtilityProcessHost::StartProcess()
+@@ -233,6 +233,7 @@ bool UtilityProcessHost::StartProcess()
 
     // Browser command-line switches to propagate to the utility process.
     static const char* const kSwitchNames[] = {
@@ -46,9 +46,9 @@
 #include "base/bind.h"
 +#include "base/command_line.h"
 #include "base/debug/dump_without_crashing.h"
+ #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
- #include "build/build_config.h"
-@@ -62,6 +63,15 @@ void NetworkServiceNetworkDelegate::Mayb
+@@ -63,6 +64,15 @@ void NetworkServiceNetworkDelegate::Mayb
     return;
   }
 
--- a/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
@@ -13,7 +13,7 @@
 #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 --- a/chrome/renderer/chrome_render_frame_observer.cc
 +++ b/chrome/renderer/chrome_render_frame_observer.cc
-@@ -246,14 +246,16 @@ void ChromeRenderFrameObserver::DidFinis
+@@ -247,14 +247,16 @@ void ChromeRenderFrameObserver::DidFinis
   if (frame->Parent())
     return;
 
@@ -80,7 +80,7 @@
 }
 
 bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
-@@ -1565,6 +1573,8 @@ SyncDataMap TemplateURLService::CreateGU
+@@ -1566,6 +1574,8 @@ SyncDataMap TemplateURLService::CreateGU
 
 void TemplateURLService::Init(const Initializer* initializers,
                               int num_initializers) {
@@ -89,7 +89,7 @@
   if (client_)
     client_->SetOwner(this);
 
-@@ -1703,6 +1713,9 @@ void TemplateURLService::ChangeToLoadedS
+@@ -1704,6 +1714,9 @@ void TemplateURLService::ChangeToLoadedS
 
 bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
     const std::string& host) const {
--- a/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch
@@ -27,7 +27,7 @@
 #include "base/compiler_specific.h"
 #include "base/containers/adapters.h"
 #include "base/containers/contains.h"
-@@ -1466,6 +1467,8 @@ void TabStrip::OnMouseEventInTab(views::
+@@ -1627,6 +1628,8 @@ void TabStrip::OnMouseEventInTab(views::
 }
 
 void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) {
--- a/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch
+++ b/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
-@@ -1242,7 +1242,8 @@ void BrowserCommandController::InitComma
+@@ -1213,7 +1213,8 @@ void BrowserCommandController::InitComma
   command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
                                         normal_window);
 
--- a/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch
@@ -11,7 +11,7 @@
 #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 --- a/components/flags_ui/flags_state.cc
 +++ b/components/flags_ui/flags_state.cc
-@@ -219,6 +219,7 @@ std::string GetCombinedOriginListValue(c
+@@ -221,6 +221,7 @@ std::string GetCombinedOriginListValue(c
   const std::string new_value =
       flags_storage.GetOriginListFlag(internal_entry_name);
   if (command_line_switch == "custom-ntp") return existing_value.empty() ? new_value : existing_value;
@@ -19,7 +19,7 @@
   return CombineAndSanitizeOriginLists(existing_value, new_value);
 }
 
-@@ -416,6 +417,7 @@ void FlagsState::SetOriginListFlag(const
+@@ -418,6 +419,7 @@ void FlagsState::SetOriginListFlag(const
                                    FlagsStorage* flags_storage) {
   const std::string new_value =
       internal_name == "custom-ntp" ? value :
--- a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch
@@ -8,7 +8,7 @@
 #include "base/containers/flat_map.h"
 #include "base/cxx17_backports.h"
 #include "base/memory/raw_ptr.h"
-@@ -1910,6 +1911,10 @@ bool TabStripModel::CloseTabs(base::span
+@@ -1862,6 +1863,10 @@ bool TabStripModel::CloseTabs(base::span
   if (items.empty())
     return true;
 
--- a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch
@@ -50,7 +50,7 @@
 bool IsExtensionDownload(const download::DownloadItem& download_item);
 --- a/chrome/browser/download/download_target_determiner.cc
 +++ b/chrome/browser/download/download_target_determiner.cc
-@@ -1075,10 +1075,12 @@ DownloadConfirmationReason DownloadTarge
+@@ -1106,10 +1106,12 @@ DownloadConfirmationReason DownloadTarge
     return DownloadConfirmationReason::SAVE_AS;
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
--- a/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch
+++ b/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"
-@@ -1008,7 +1009,8 @@ void HistoryBackend::InitImpl(
+@@ -1010,7 +1011,8 @@ void HistoryBackend::InitImpl(
   db_->GetStartDate(&first_recorded_time_);
 
   // Start expiring old stuff.
--- a/patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch
@@ -1,13 +1,13 @@
 --- a/chrome/browser/ui/views/frame/browser_view.cc
 +++ b/chrome/browser/ui/views/frame/browser_view.cc
-@@ -898,6 +898,7 @@ BrowserView::BrowserView(std::unique_ptr
-   contents_container_ = AddChildView(std::move(contents_container));
-   set_contents_view(contents_container_);
- 
-+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch("hide-sidepanel-button"))
-     right_aligned_side_panel_ = AddChildView(std::make_unique<SidePanel>(this));
-     right_aligned_side_panel_separator_ =
+@@ -915,6 +915,7 @@ BrowserView::BrowserView(std::unique_ptr
         AddChildView(std::make_unique<ContentsSeparator>());
+     side_panel_coordinator_ = std::make_unique<SidePanelCoordinator>(this);
+   } else {
+   if (!base::CommandLine::ForCurrentProcess()->HasSwitch("hide-sidepanel-button"))
+     right_aligned_side_panel_ = AddChildView(std::make_unique<SidePanel>(this));
+   }
+ 
 --- a/chrome/browser/ungoogled_flag_entries.h
 +++ b/chrome/browser/ungoogled_flag_entries.h
@@ -104,4 +104,8 @@
--- a/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch
@@ -8,7 +8,7 @@
 #include "base/metrics/user_metrics.h"
 #include "base/task/thread_pool.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
-@@ -108,6 +109,18 @@ DragOperation GetDropEffect(const ui::Dr
+@@ -111,6 +112,18 @@ DragOperation GetDropEffect(const ui::Dr
   return DragOperation::kMove;
 }
 
@@ -27,7 +27,7 @@
 }  // namespace
 
 BrowserRootView::DropInfo::DropInfo() = default;
-@@ -119,7 +132,9 @@ BrowserRootView::DropInfo::~DropInfo() {
+@@ -122,7 +135,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,
-@@ -241,7 +256,7 @@ bool BrowserRootView::OnMouseWheel(const
+@@ -244,7 +259,7 @@ bool BrowserRootView::OnMouseWheel(const
 
   // Scroll-event-changes-tab is incompatible with scrolling tabstrip, so
   // disable it if the latter feature is enabled.
--- a/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch
+++ b/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
-@@ -280,14 +280,30 @@ void ToolbarView::Init() {
+@@ -282,14 +282,30 @@ void ToolbarView::Init() {
 
   std::unique_ptr<ToolbarAccountIconContainerView>
       toolbar_account_icon_container;
--- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch
+++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch
@@ -13,25 +13,26 @@
 #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -318,5 +318,7 @@ const base::FeatureParam<int>
-         &kOptimizeNetworkBuffers, "filter_source_stream_buffer_size",
-         32 * 1024};
+@@ -11,6 +11,8 @@
+ 
+ namespace net::features {
 
 +const base::Feature kSetIpv6ProbeFalse{"SetIpv6ProbeFalse", base::FEATURE_DISABLED_BY_DEFAULT};
 +
- }  // namespace features
- }  // namespace net
+ const base::Feature kAcceptLanguageHeader{"AcceptLanguageHeader",
+                                           base::FEATURE_ENABLED_BY_DEFAULT};
+ 
 --- a/net/base/features.h
 +++ b/net/base/features.h
-@@ -443,6 +443,8 @@ NET_EXPORT extern const base::FeaturePar
- NET_EXPORT extern const base::FeatureParam<int>
-     kOptimizeNetworkBuffersFilterSourceStreamBufferSize;
+@@ -17,6 +17,8 @@
+ 
+ namespace net::features {
 
 +NET_EXPORT extern const base::Feature kSetIpv6ProbeFalse;
 +
- }  // namespace features
- }  // namespace net
- 
+ // Toggles the `Accept-Language` HTTP request header, which
+ // https://github.com/WICG/lang-client-hint proposes that we deprecate.
+ NET_EXPORT extern const base::Feature kAcceptLanguageHeader;
 --- a/net/dns/host_resolver_manager.cc
 +++ b/net/dns/host_resolver_manager.cc
@@ -153,11 +153,6 @@ const unsigned kMinimumTTLSeconds = kCac
--- a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
+++ b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
@@ -76,13 +76,11 @@
     this.$.dialog.close();
   }
 
-@@ -175,9 +184,11 @@ export class SettingsSearchEngineEditDia
- 
-   private updateActionButtonState_() {
-     const allValid = [
-      this.$.searchEngine, this.$.keyword, this.$.queryUrl
-+      this.$.searchEngine, this.$.keyword, this.$.queryUrl,
-+      this.$.suggestionsUrl
+@@ -178,8 +187,10 @@ export class SettingsSearchEngineEditDia
+       this.$.searchEngine,
+       this.$.keyword,
+       this.$.queryUrl,
+      this.$.suggestionsUrl,
     ].every(function(inputElement) {
 -      return !inputElement.invalid && inputElement.value.length > 0;
 +      return !inputElement.invalid && (inputElement.value.length > 0 ||
@@ -232,9 +230,9 @@
 +    const std::string& url,
 +    const std::string& suggestions_url) {
   DCHECK(!url.empty());
-   const int index = table_model_->IndexOfTemplateURL(template_url);
-   if (index == -1) {
-@@ -48,10 +52,12 @@ void KeywordEditorController::ModifyTemp
+   const absl::optional<size_t> index =
+       table_model_->IndexOfTemplateURL(template_url);
+@@ -49,10 +53,12 @@ void KeywordEditorController::ModifyTemp
 
   // Don't do anything if the entry didn't change.
   if ((template_url->short_name() == title) &&
@@ -244,8 +242,8 @@
 +      (template_url->suggestions_url() == suggestions_url))
     return;
 
-  table_model_->ModifyTemplateURL(index, title, keyword, url);
-+  table_model_->ModifyTemplateURL(index, title, keyword, url, suggestions_url);
+-  table_model_->ModifyTemplateURL(index.value(), title, keyword, url);
+  table_model_->ModifyTemplateURL(index.value(), title, keyword, url, suggestions_url);
 
   base::RecordAction(UserMetricsAction("KeywordEditor_ModifiedKeyword"));
 }
@@ -272,14 +270,14 @@
   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
-@@ -115,21 +115,25 @@ void TemplateURLTableModel::Remove(int i
- void TemplateURLTableModel::Add(int index,
+@@ -112,21 +112,25 @@ void TemplateURLTableModel::Remove(size_
+ void TemplateURLTableModel::Add(size_t index,
                                 const std::u16string& short_name,
                                 const std::u16string& keyword,
 -                                const std::string& url) {
 +                                const std::string& url,
 +                                const std::string& suggestions_url) {
-   DCHECK(index >= 0 && index <= RowCount());
+   DCHECK(index <= RowCount());
   DCHECK(!url.empty());
   TemplateURLData data;
   data.SetShortName(short_name);
@@ -290,20 +288,20 @@
   template_url_service_->Add(std::make_unique<TemplateURL>(data));
 }
 
-void TemplateURLTableModel::ModifyTemplateURL(int index,
+-void TemplateURLTableModel::ModifyTemplateURL(size_t index,
 -                                              const std::u16string& title,
 -                                              const std::u16string& keyword,
 -                                              const std::string& url) {
 +void TemplateURLTableModel::ModifyTemplateURL(
-+    int index,
+    size_t index,
 +    const std::u16string& title,
 +    const std::u16string& keyword,
 +    const std::string& url,
 +    const std::string& suggestions_url) {
-   DCHECK(index >= 0 && index <= RowCount());
+   DCHECK(index <= RowCount());
   DCHECK(!url.empty());
   TemplateURL* template_url = GetTemplateURL(index);
-@@ -138,7 +142,8 @@ void TemplateURLTableModel::ModifyTempla
+@@ -135,7 +139,8 @@ void TemplateURLTableModel::ModifyTempla
   DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url ||
          template_url->SupportsReplacement(
              template_url_service_->search_terms_data()));
@@ -312,11 +310,11 @@
 +                                          suggestions_url);
 }
 
- TemplateURL* TemplateURLTableModel::GetTemplateURL(int index) {
+ TemplateURL* TemplateURLTableModel::GetTemplateURL(size_t index) {
 --- a/chrome/browser/ui/search_engines/template_url_table_model.h
 +++ b/chrome/browser/ui/search_engines/template_url_table_model.h
-@@ -53,13 +53,15 @@ class TemplateURLTableModel : public ui:
-   void Add(int index,
+@@ -54,13 +54,15 @@ class TemplateURLTableModel : public ui:
+   void Add(size_t index,
            const std::u16string& short_name,
            const std::u16string& keyword,
 -           const std::string& url);
@@ -324,7 +322,7 @@
 +           const std::string& suggestions_url);
 
   // Update the entry at the specified index.
-   void ModifyTemplateURL(int index,
+   void ModifyTemplateURL(size_t index,
                          const std::u16string& title,
                          const std::u16string& keyword,
 -                         const std::string& url);
@@ -332,7 +330,7 @@
 +                         const std::string& suggestions_url);
 
   // Reloads the icon at the specified index.
-   void ReloadIcon(int index);
+   void ReloadIcon(size_t index);
 --- a/chrome/browser/ui/webui/settings/search_engines_handler.cc
 +++ b/chrome/browser/ui/webui/settings/search_engines_handler.cc
@@ -37,6 +37,7 @@ namespace {
@@ -343,7 +341,7 @@
 
 // Dummy number used for indicating that a new search engine is added.
 const int kNewSearchEngineIndex = -1;
-@@ -216,6 +217,8 @@ base::Value::Dict SearchEnginesHandler::
+@@ -207,6 +208,8 @@ base::Value::Dict SearchEnginesHandler::
   Profile* profile = Profile::FromWebUI(web_ui());
   dict.Set("url",
            template_url->url_ref().DisplayURL(UIThreadSearchTermsData()));
@@ -352,7 +350,7 @@
   dict.Set("urlLocked", template_url->prepopulate_id() > 0);
   GURL icon_url = template_url->favicon_url();
   if (icon_url.is_valid())
-@@ -317,12 +320,14 @@ void SearchEnginesHandler::HandleSearchE
+@@ -314,12 +317,14 @@ void SearchEnginesHandler::HandleSearchE
 void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url,
                                            const std::u16string& title,
                                            const std::u16string& keyword,
@@ -370,7 +368,7 @@
 
   edit_controller_.reset();
 }
-@@ -350,6 +355,8 @@ bool SearchEnginesHandler::CheckFieldVal
+@@ -347,6 +352,8 @@ bool SearchEnginesHandler::CheckFieldVal
     is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value));
   else if (field_name.compare(kQueryUrlField) == 0)
     is_valid = edit_controller_->IsURLValid(field_value);
@@ -379,7 +377,7 @@
   else
     NOTREACHED();
 
-@@ -369,18 +376,21 @@ void SearchEnginesHandler::HandleSearchE
+@@ -366,18 +373,21 @@ void SearchEnginesHandler::HandleSearchE
   if (!edit_controller_.get())
     return;
 
--- a/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch
+++ b/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
-@@ -3270,7 +3270,13 @@ const FeatureEntry::FeatureVariation kDe
+@@ -3290,7 +3290,13 @@ const FeatureEntry::FeatureVariation
 // calculate and verify checksum.
 //
 // When adding a new choice, add it to the end of the list.
--- a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch
+++ b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch
@@ -150,7 +150,7 @@
 }  // namespace download
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -87,7 +87,6 @@ source_set("browser") {
+@@ -89,7 +89,6 @@ source_set("browser") {
     "//components/permissions:permissions_common",
     "//components/power_scheduler",
     "//components/services/filesystem:lib",
--- a/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch
+++ b/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
-@@ -87,7 +87,7 @@ const base::Feature kOptimizationHintsFi
+@@ -82,7 +82,7 @@ const base::Feature kOptimizationHints{"
 
 // Enables fetching from a remote Optimization Guide Service.
 const base::Feature kRemoteOptimizationGuideFetching{
--- a/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch
+++ b/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
-@@ -3682,8 +3682,7 @@ ScriptValue WebGLRenderingContextBase::g
+@@ -3667,8 +3667,7 @@ ScriptValue WebGLRenderingContextBase::g
               pname, IdentifiabilityBenignStringToken(
                          String(ContextGL()->GetString(GL_RENDERER))));
         }
@@ -13,7 +13,7 @@
       }
       SynthesizeGLError(
           GL_INVALID_ENUM, "getParameter",
-@@ -3697,8 +3696,7 @@ ScriptValue WebGLRenderingContextBase::g
+@@ -3682,8 +3681,7 @@ ScriptValue WebGLRenderingContextBase::g
               pname, IdentifiabilityBenignStringToken(
                          String(ContextGL()->GetString(GL_VENDOR))));
         }
--- a/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch
+++ b/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
-@@ -491,7 +491,7 @@ const base::Feature kComputePressure{"Co
+@@ -502,7 +502,7 @@ const base::Feature kComputePressure{"Co
 // Prefetch request properties are updated to be privacy-preserving. See
 // crbug.com/988956.
 const base::Feature kPrefetchPrivacyChanges{"PrefetchPrivacyChanges",
--- a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch
+++ b/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
-@@ -434,11 +434,6 @@ int GetContentRestrictions(const Browser
+@@ -440,11 +440,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;
 }
-@@ -1341,8 +1336,7 @@ bool CanSavePage(const Browser* browser)
+@@ -1343,8 +1338,7 @@ bool CanSavePage(const Browser* browser)
       DownloadPrefs::DownloadRestriction::ALL_FILES) {
     return false;
   }
--- a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch
+++ b/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
-@@ -1738,8 +1738,6 @@ void TabStrip::NewTabButtonPressed(const
+@@ -1902,8 +1902,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;
-@@ -1747,7 +1745,6 @@ void TabStrip::NewTabButtonPressed(const
+@@ -1911,7 +1909,6 @@ void TabStrip::NewTabButtonPressed(const
                             /* data_dst = */ nullptr, &clipboard_text);
         if (!clipboard_text.empty())
           controller_->CreateNewTabWithLocation(clipboard_text);
--- a/patches/extra/ungoogled-chromium/keep-expired-flags.patch
+++ b/patches/extra/ungoogled-chromium/keep-expired-flags.patch
@@ -1,6 +1,6 @@
 --- a/components/flags_ui/flags_state.cc
 +++ b/components/flags_ui/flags_state.cc
-@@ -22,6 +22,7 @@
+@@ -23,6 +23,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
@@ -8,7 +8,7 @@
 #include "components/flags_ui/feature_entry.h"
 #include "components/flags_ui/flags_storage.h"
 #include "components/flags_ui/flags_ui_switches.h"
-@@ -589,14 +590,18 @@ void FlagsState::GetFlagFeatureEntries(
+@@ -591,13 +592,17 @@ void FlagsState::GetFlagFeatureEntries(
   int current_platform = GetCurrentPlatform();
 
   for (const FeatureEntry& entry : feature_entries_) {
@@ -19,16 +19,15 @@
 +      else
       continue;
 
-     base::Value data(base::Value::Type::DICTIONARY);
-     data.SetStringKey("internal_name", entry.internal_name);
-     data.SetStringKey("name", base::StringPiece(entry.visible_name));
-     data.SetStringKey("description",
-                      base::StringPiece(entry.visible_description));
-+                      base::StringPiece(desc));
+     base::Value::Dict data;
+     data.Set("internal_name", entry.internal_name);
+     data.Set("name", entry.visible_name);
+-    data.Set("description", entry.visible_description);
+    data.Set("description", desc);
 
-     base::Value supported_platforms(base::Value::Type::LIST);
+     base::Value::List supported_platforms;
     AddOsStrings(entry.supported_platforms, &supported_platforms);
-@@ -959,6 +964,7 @@ bool FlagsState::IsSupportedFeature(cons
+@@ -977,6 +982,7 @@ bool FlagsState::IsSupportedFeature(cons
     if (!entry.InternalNameMatches(name))
       continue;
     if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry))
--- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch
+++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch
@@ -10,14 +10,15 @@
 # Check passwords and managed passwords sections from the passwords page
 # the Google account line from the Payment methods page
 # Safety check section on the settings page
+# Privacy guide promo on the privacy page
 # Google sign-in and Anonymized Data Collection sections
+# Privacy guide section on the privacy page
 # Advanced Protection Program link on the security settings page
 # the 'Learn more' link from the search engine entry on the settings page
 # Safety Check entry on the side menu on the settings page
 # the (?) learn more button on many settings pages
 # unneeded elements from the profile menu
 # the 'Learn more' link on crashed tabs
-# the Privacy Guide promo and section on the privacy and security page

 --- a/chrome/browser/resources/extensions/item_list.html
 +++ b/chrome/browser/resources/extensions/item_list.html
@@ -79,16 +80,16 @@
     <div class="bulletpoints first">$i18nRaw{incognitoTabFeatures}</div>
 --- a/chrome/browser/resources/settings/a11y_page/a11y_page.html
 +++ b/chrome/browser/resources/settings/a11y_page/a11y_page.html
-@@ -21,7 +21,7 @@
+@@ -22,7 +22,7 @@
               external$="[[captionSettingsOpensExternally_]]">
           </cr-link-row>
         </template>
 -        <template is="dom-if" if="[[!captionSettingsOpensExternally_]]">
 +        <template is="dom-if" if="[[false]]">
           <cr-link-row id="captions"
+               class="hr"
               label="$i18n{captionsTitle}"
-               on-click="onCaptionsClick_"
-@@ -51,10 +51,6 @@
+@@ -53,10 +53,6 @@
             label="$i18n{accessibleImageLabelsTitle}"
             sub-label="$i18n{accessibleImageLabelsSubtitle}">
         </settings-toggle-button>
@@ -171,6 +172,16 @@
             restamp>
           <settings-section page-title="$i18n{safetyCheckSectionTitle}"
               section="safetyCheck" nest-under-section="privacy"
+--- a/chrome/browser/resources/settings/basic_page/basic_page.ts
+++ b/chrome/browser/resources/settings/basic_page/basic_page.ts
+@@ -11,7 +11,6 @@ import 'chrome://resources/cr_elements/s
+ import 'chrome://resources/cr_elements/shared_vars_css.m.js';
+ import 'chrome://resources/polymer/v3_0/iron-flex-layout/iron-flex-layout-classes.js';
+ import '../appearance_page/appearance_page.js';
+-import '../privacy_page/privacy_guide_promo.js';
+ import '../privacy_page/privacy_page.js';
+ import '../safety_check_page/safety_check_page.js';
+ import '../autofill_page/autofill_page.js';
 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.html
 +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html
@@ -13,7 +13,7 @@
@@ -197,12 +208,30 @@
 <if expr="_google_chrome">
     <settings-toggle-button id="spellCheckControl"
         class="hr"
+--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
+@@ -45,15 +45,6 @@
+             label="$i18n{clearBrowsingData}"
+             sub-label="$i18n{clearBrowsingDataDescription}"
+             on-click="onClearBrowsingDataTap_"></cr-link-row>
+-        <template is="dom-if" if="[[showPrivacyGuideEntryPoint_]]">
+-          <cr-link-row id="privacyGuideLinkRow" class="hr"
+-              start-icon="settings20:wind-rose"
+-              label="$i18n{privacyGuideLabel}"
+-              sub-label="$i18n{privacyGuideSublabel}"
+-              on-click="onPrivacyGuideClick_"
+-              role-description="$i18n{subpageArrowRoleDescription}">
+-          </cr-link-row>
+-        </template>
+         <cr-link-row id="cookiesLinkRow" start-icon="settings:cookie"
+             class="hr" label="$i18n{cookiePageTitle}"
+             sub-label="[[cookieSettingDescription_]]"
 --- a/chrome/browser/resources/settings/privacy_page/security_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/security_page.html
-@@ -107,10 +107,3 @@
-         sub-label="$i18n{manageCertificatesDescription}"
-         on-click="onManageCertificatesClick_"></cr-link-row>
+@@ -135,10 +135,3 @@
+     </template>
 </if>
+ 
 -    <cr-link-row id="advanced-protection-program-link"
 -        class="hr"
 -        label="$i18n{advancedProtectionProgramTitle}"
@@ -225,7 +254,7 @@
           prefs.default_search_provider_data.template_url_data)]]">
 --- a/chrome/browser/resources/settings/settings_page/settings_subpage.html
 +++ b/chrome/browser/resources/settings/settings_page/settings_subpage.html
-@@ -80,7 +80,7 @@
+@@ -89,7 +89,7 @@
       </template>
       <h1 class="cr-title-text">[[pageTitle]]</h1>
       <slot name="subpage-title-extra"></slot>
@@ -236,7 +265,7 @@
         </cr-icon-button>
 --- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
 +++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
-@@ -175,6 +175,7 @@ void ProfileMenuView::BuildMenu() {
+@@ -174,6 +174,7 @@ void ProfileMenuView::BuildMenu() {
 }
 
 gfx::ImageSkia ProfileMenuView::GetSyncIcon() const {
@@ -244,7 +273,7 @@
   Profile* profile = browser()->profile();
   if (profile->IsOffTheRecord() || profile->IsGuestSession())
     return gfx::ImageSkia();
-@@ -461,8 +462,7 @@ void ProfileMenuView::BuildIdentity() {
+@@ -460,8 +461,7 @@ void ProfileMenuView::BuildIdentity() {
         menu_subtitle_);
   } else {
     menu_title_ = std::u16string();
@@ -274,14 +303,3 @@
   action_button_ =
       actions_container->AddChildView(std::make_unique<views::MdTextButton>(
           base::BindRepeating(&SadTabView::PerformAction,
--- a/chrome/common/chrome_features.cc
-+++ b/chrome/common/chrome_features.cc
-@@ -783,7 +783,7 @@ const base::Feature kPrerenderFallbackTo
-     "PrerenderFallbackToPreconnect", base::FEATURE_ENABLED_BY_DEFAULT};
- 
- const base::Feature kPrivacyGuide{"PrivacyGuide",
-                                  base::FEATURE_ENABLED_BY_DEFAULT};
-+                                  base::FEATURE_DISABLED_BY_DEFAULT};
- 
- const base::Feature kPrivacyGuide2{"PrivacyGuide2",
-                                    base::FEATURE_DISABLED_BY_DEFAULT};
--- a/pruning.list
+++ b/pruning.list
@@ -31,7 +31,7 @@ base/test/data/tzdata/icu/44/le/timezoneTypes.res
 base/test/data/tzdata/icu/44/le/zoneinfo64.res
 build/android/CheckInstallApk-debug.apk
 build/android/java/test/missing_symbol/c.jar
-build/android/stacktrace/java_deobfuscate.jar
+build/android/stacktrace/java_deobfuscate_java.jar
 build/android/tests/symbolize/liba.so
 build/android/tests/symbolize/libb.so
 build/gn_helpers.pyc
@@ -72,7 +72,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-5112-1659546792-1870321c902fd7dca1271b1e96ff9ea74063d09a.profdata
+chrome/build/pgo_profiles/chrome-linux-5195-1661252531-bbb1032abc1f63f4076f207ffc254ca9175d93d6.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
@@ -178,7 +178,6 @@ components/signin/public/base/signin_pref_names.h
 components/test/data/ad_tagging/allow.zip
 components/test/data/ad_tagging/bear-320x240-video-only.webm
 components/test/data/ad_tagging/disallow.zip
-components/test/data/autofill/automated_integration/testdata/Default/Web Data
 components/test/data/autofill_assistant/model/model.tflite
 components/test/data/cast_certificate/testsuite/testsuite1.pb
 components/test/data/crx_file/sample.zip
@@ -245,8 +244,9 @@ components/test/data/value_store/000005.log
 components/test/data/value_store/MANIFEST-000004
 components/test/data/web_package/24_responses.wbn
 components/test/data/web_package/hello_b2.wbn
-components/test/data/web_package/hello_signed.wbn
+components/test/data/web_package/hello_vouched_subsets.wbn
 components/test/data/web_package/simple_b2.wbn
+components/test/data/web_package/simple_b2_signed.wbn
 components/test/data/webp_transcode/test_small.tiff
 components/viz/test/data/render_pass_data/multi_surface_test/youtube_tab_focused/youtube_tab_focused.zip
 components/viz/test/data/render_pass_data/top_real_world_desktop/accu_weather_2018/accu_weather_2018.zip
@@ -417,6 +417,16 @@ net/data/cache_tests/dirty_entry5/data_1
 net/data/cache_tests/dirty_entry5/data_2
 net/data/cache_tests/dirty_entry5/data_3
 net/data/cache_tests/dirty_entry5/index
+net/data/cache_tests/good_2_0/data_0
+net/data/cache_tests/good_2_0/data_1
+net/data/cache_tests/good_2_0/data_2
+net/data/cache_tests/good_2_0/data_3
+net/data/cache_tests/good_2_0/index
+net/data/cache_tests/good_2_1/data_0
+net/data/cache_tests/good_2_1/data_1
+net/data/cache_tests/good_2_1/data_2
+net/data/cache_tests/good_2_1/data_3
+net/data/cache_tests/good_2_1/index
 net/data/cache_tests/insert_empty1/data_0
 net/data/cache_tests/insert_empty1/data_1
 net/data/cache_tests/insert_empty1/data_2
@@ -1864,6 +1874,7 @@ services/device/usb/fuzz_corpus/usb_string_descriptors_example
 services/device/usb/fuzz_corpus/webusb_descriptors_unittest_example
 sql/test/data/recovery_387868
 testing/libfuzzer/fuzzers/flatbuffers_corpus/monsterdata_test.mon
+testing/libfuzzer/fuzzers/woff2_corpus/6df91fe5cbca947ae7b7b43d4cd4a861213fae9f
 testing/scripts/variations_smoke_test_data/webview_test_seed
 third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/Africa/Abidjan
 third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/Africa/Accra
@@ -2483,6 +2494,7 @@ third_party/afl/src/testcases/images/jxr/not_kitty.jxr
 third_party/afl/src/testcases/images/tiff/not_kitty.tiff
 third_party/afl/src/testcases/multimedia/h264/small_movie.mp4
 third_party/afl/src/testcases/others/pcap/small_capture.pcap
+third_party/android_build_tools/lint/custom_lint.jar
 third_party/android_rust_toolchain/toolchain/bin/cargo
 third_party/android_rust_toolchain/toolchain/bin/cargo-clippy
 third_party/android_rust_toolchain/toolchain/bin/cargo-fmt
@@ -2491,187 +2503,272 @@ 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-a20935b6c8ca35d0.so
-third_party/android_rust_toolchain/toolchain/lib/libstd-4ad33afe32d41a89.so
-third_party/android_rust_toolchain/toolchain/lib/libtest-f487aa631def87ca.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libaddr2line-c93ffef6aa7cfcf7.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libadler-5a38d1c1f3364429.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/liballoc-5473161316271313.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libcfg_if-daf295746307f266.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libcompiler_builtins-2f768c7bc3db4464.rlib
+third_party/android_rust_toolchain/toolchain/lib/librustc_driver-163e0989fc4624b3.so
+third_party/android_rust_toolchain/toolchain/lib/libstd-1a032a628808d786.so
+third_party/android_rust_toolchain/toolchain/lib/libtest-850762076e29a090.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libaddr2line-d5fe90796d53d5fd.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libadler-cecab3758615a0c2.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/liballoc-72449ea025353214.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libcfg_if-07dee3ec161dba11.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libcompiler_builtins-9a7242c453d2cc04.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libcore-52c6200e6b547f8a.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libgetopts-464bbac5ec6ef7e8.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libgimli-7bd4b0c0b8f598d1.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libhashbrown-46d5652bbdad6a83.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/liblibc-efd0614abe75e67b.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libmemchr-6c0e0f4c9f483f6f.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libminiz_oxide-a9e0a7b5779b82aa.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libobject-e41bcfedfea5a66e.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libpanic_abort-5eb85b94d83a66ce.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libpanic_unwind-c5a289704644cef6.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libproc_macro-a352d8996d685060.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libprofiler_builtins-46290c806a66f31f.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/librustc_demangle-cc82572bf95f2e92.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/librustc_std_workspace_alloc-9e11d04c085eb19d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libgetopts-81828531fe950977.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libgimli-84a74f75bc5e2a5e.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libhashbrown-df080055462bab8e.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/liblibc-11da31a71ce5621e.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libmemchr-9ba613a8ef9650b4.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libminiz_oxide-68576ce819b0956c.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libobject-34331a2ee838d341.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libpanic_abort-a1b8a15e87e69f46.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libpanic_unwind-57578b9f5a65f345.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libproc_macro-5cb8b1b18853cc8d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libprofiler_builtins-2d6b85c435608260.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/librustc_demangle-0358c68362f68b98.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/librustc_std_workspace_alloc-e83198dcd78a46aa.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/librustc_std_workspace_core-8b7e2a1d97e9a64b.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/librustc_std_workspace_std-e2d57148221704ae.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libstd-ca805309e4c63752.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libstd-ca805309e4c63752.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libstd_detect-f76d72a767bb37a0.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libtest-9c06831408e2a0d4.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libtest-9c06831408e2a0d4.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libunicode_width-053ddf70613beca7.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libunwind-501c410a457ebd83.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/librustc_std_workspace_std-41b23ae6f6886de9.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libstd-3e0ae91886b4339c.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libstd-3e0ae91886b4339c.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libstd_detect-f648a5edf149a2d2.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libtest-23a9ea9d4713589f.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libtest-23a9ea9d4713589f.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libunicode_width-53c5c1f8e0e6a36b.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libunwind-7db0e28e6af6929a.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-linux-android/lib/libunwind.a
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libaddr2line-2b0824590cf4cd70.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libadler-a3bdc742c82b75f7.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/liballoc-2cc6383e91a6fd00.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libcfg_if-770b41d09d661db1.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libcompiler_builtins-94074c6e80023188.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-unknown-none/lib/liballoc-89e0dc81e5bfeec9.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-unknown-none/lib/libcompiler_builtins-162007068a6ee438.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-unknown-none/lib/libcore-f63e71ab7cb22a95.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/aarch64-unknown-none/lib/librustc_std_workspace_core-f1b6bb354b430e56.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libaddr2line-a84dfa825db6fd8a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libadler-d8597e9ab8c03972.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/liballoc-61911acaa52d2151.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libcfg_if-53ced1a6f7c6400b.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libcompiler_builtins-c339f51c5d91824d.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libcore-27768f48168d210e.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libgetopts-64e54521f4566448.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libgimli-7b1ef5c593eabebd.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libhashbrown-704f58bbe66fe33a.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/liblibc-0a8177c2db393ff3.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libmemchr-df30b1a34554f5cf.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libminiz_oxide-dbe4b5a94c4ab120.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libobject-0a1d60d0f079fc21.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libpanic_abort-ee9412a2a6fa92a0.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libpanic_unwind-01ed84148e793370.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libproc_macro-bc82ac5526aa7a9f.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libprofiler_builtins-e2f0bdf50b4eef1d.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/librustc_demangle-8c9cf626ba8b08c6.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/librustc_std_workspace_alloc-fafc3d9ec29dd043.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libgetopts-f23d3f662bc7976e.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libgimli-e80cdfa8bec02ae7.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libhashbrown-738d228b33ad4c3b.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/liblibc-dce58bac7a61c4f2.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libmemchr-93005a463f2944b9.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libminiz_oxide-1197a2c3810b641d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libobject-33f7928d409ba8e7.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libpanic_abort-487f0619052b78bf.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libpanic_unwind-0f2539541e7ae40d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libproc_macro-237d98a209fad84a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libprofiler_builtins-803b5e9c406ea806.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/librustc_demangle-151a25b654d29e69.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/librustc_std_workspace_alloc-dbcd7edda063c8f5.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/librustc_std_workspace_core-14a8f0f6c8c3fa72.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/librustc_std_workspace_std-d47c61521a8ede3d.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libstd-211ca23e4581a2e5.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libstd-211ca23e4581a2e5.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libstd_detect-00583edfa7366757.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libtest-41da6bc085d6bd28.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libtest-41da6bc085d6bd28.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libunicode_width-10be16661549e908.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libunwind-4c4a1cf8c3f3f8e4.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/librustc_std_workspace_std-7feae9edfa7309c3.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libstd-d1eb16205d18ecee.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libstd-d1eb16205d18ecee.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libstd_detect-4cfd7dbbe5e29c87.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libtest-a6bcbb22f9f5b6dc.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libtest-a6bcbb22f9f5b6dc.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libunicode_width-4933378c47087529.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libunwind-7f5ac86e06ccb16b.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/armv7-linux-androideabi/lib/libunwind.a
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libaddr2line-d83f5ed4177103f8.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libadler-88f382bcaa6f9341.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/liballoc-73da9505d5e3acfd.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libcfg_if-12dd7f4b2fc52dbb.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libcompiler_builtins-bc0b2075737a07fd.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libaddr2line-ff1c1e8244286d6d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libadler-b60c02bdda978eec.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/liballoc-5e8d713e307567ba.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libcfg_if-09b2e61e187de41e.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libcompiler_builtins-7d5900c611cad1ca.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libcore-c7e2f6e875940eee.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libgetopts-6ac400cd378769a4.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libgimli-2107d785da74eea0.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libhashbrown-361f38a55bcdba6c.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/liblibc-355863c2595c7115.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libmemchr-305e0521031c0383.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libminiz_oxide-c6e95b66b60ecd07.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libobject-752c392d264a9a21.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libpanic_abort-62e1da93ba574bc7.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libpanic_unwind-04a15e9f9435603c.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libproc_macro-59d72470a467fb45.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libprofiler_builtins-71f04ae2b0192c55.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/librustc_demangle-65c859bb577d132b.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/librustc_std_workspace_alloc-8273ed8973045347.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libgetopts-7e8a934ccfe62701.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libgimli-2c0c1316e361eb45.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libhashbrown-6b1445256bad5170.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/liblibc-e8059da0b203857c.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libmemchr-a91ef1d7f76d398d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libminiz_oxide-6b07f43d05a30e96.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libobject-c2c29bf9573b391e.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libpanic_abort-afc0f98a1964c2bc.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libpanic_unwind-0d0a10c405c37bc0.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libproc_macro-88a2c716dd49e187.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libprofiler_builtins-fb939642233f1ddf.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/librustc_demangle-d9b5c0bada318deb.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/librustc_std_workspace_alloc-634d86f1e743c8a0.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/librustc_std_workspace_core-5a8e2e93f68ae0a5.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/librustc_std_workspace_std-19223d5894ebbb04.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libstd-500f4a1bac8ee0aa.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libstd-500f4a1bac8ee0aa.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libstd_detect-6fe7ec36bde37f52.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libtest-bb84b8060bb341ce.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libtest-bb84b8060bb341ce.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libunicode_width-64ffc66061dfb0ae.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libunwind-7ca7de9c405ee68a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/librustc_std_workspace_std-edf8361b45fca732.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libstd-566464021a2a501e.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libstd-566464021a2a501e.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libstd_detect-9519f36a8c40d458.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libtest-11b92fb9ec439f3c.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libtest-11b92fb9ec439f3c.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libunicode_width-d0ef81726bf0322a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libunwind-2f5aa8da994d5134.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-linux-android/lib/libunwind.a
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libaddr2line-60ab4381b1995b64.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libadler-9d64b26614286140.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/liballoc-6b2c5d4e4d8f07b4.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libcfg_if-0544f53d32939142.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libcompiler_builtins-a4e98f85ad44a6c6.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libaddr2line-6539f3c0f2190a29.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libadler-1dbc13d8c50063d3.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/liballoc-cfd8476cafbcc297.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libcfg_if-5a0575148d7a24fb.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libcompiler_builtins-ea9432fbe5fc280d.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libcore-dcd019f29e27b8ad.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libgetopts-2e1bdd0c6ab11617.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libgimli-96652e5457c6fe61.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libhashbrown-60b093c9d323abf9.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/liblibc-508827996952c83d.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libmemchr-09f1efa12970f6a0.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libminiz_oxide-6880b165f85ec689.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libobject-cfd1e1cd0ad09b92.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_abort-deadbb0dc40b017d.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_unwind-4e0bfa906985c690.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libproc_macro-c2e52fda9fa4ceff.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libprofiler_builtins-9713211b4176f018.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_demangle-b3be175d1e61d3be.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_alloc-b73df348c04d1d7c.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libgetopts-a4fde2dcaf4f94a3.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libgimli-02e889d9077a5c9f.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libhashbrown-ef77505b42c50596.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/liblibc-e402d06528804933.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libmemchr-20a658d233bb7b69.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libminiz_oxide-c3dc30356f350f79.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libobject-1073fb88a10798c6.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_abort-c95e70f567d9efa7.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_unwind-17315d8bf0593512.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libproc_macro-d52ace6ed1bf83d6.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libprofiler_builtins-f6172aa3bd0b15b2.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_demangle-02d05c75e67f8ae5.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_alloc-4f047a3a61533e3c.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_core-c2725f1de8275bcb.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_std-0f155fa2cff7fe7d.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-607ab2273fcfd6e5.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-607ab2273fcfd6e5.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libstd_detect-7024bc3fc726de65.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-441d58cb4ce98d6b.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-441d58cb4ce98d6b.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libunicode_width-cc05f9521ca3791f.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libunwind-49f68ec4255e8449.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_std-d4f5a5b3aca66354.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-37a7e71838490ec9.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-37a7e71838490ec9.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libstd_detect-c76be8f8f3fd6fb3.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-dc42c7c40ceef34d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-dc42c7c40ceef34d.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libunicode_width-03a9ae9afbee9e30.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libunwind-6d2bd1da428ecb2b.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-gnu/lib/libunwind.a
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libaddr2line-f7268d553b2fc1ee.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libadler-3c5bb5c726b249cf.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/liballoc-af4c9ddf46e5f747.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libcfg_if-1172892ab47542e4.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libcompiler_builtins-fca7cd0c94bc6858.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libcore-13bc2f3a97c87d07.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libgetopts-08384685fc6ee97e.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libgimli-d491a6246c1f1b90.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libhashbrown-8859900216284d99.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/liblibc-d31d7d76f4af3ada.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libmemchr-11770e300c79aa6a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libminiz_oxide-1ae62a283cec6bc1.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libobject-a28eedfd238c7e54.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libpanic_abort-3c2bbaf684728cf0.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libpanic_unwind-7b689dc5f884fe2d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libproc_macro-666783f7a471202f.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libprofiler_builtins-d51da65102ca89b4.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/librustc_demangle-d5eece3284bafef4.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/librustc_std_workspace_alloc-8f6537b944749bee.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/librustc_std_workspace_core-da1ad265946f59e0.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/librustc_std_workspace_std-04916bc83c2ef487.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libstd-65e71d9a4d6a9df0.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libstd-65e71d9a4d6a9df0.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libstd_detect-f3f4f0a7886d4af1.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libtest-de0080b556253b0f.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libtest-de0080b556253b0f.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libunicode_width-f177b7d2a92eae27.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libunwind-ab535cf7c38695fd.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/libunwind.a
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/self-contained/crt1.o
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/self-contained/crtbegin.o
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/self-contained/crtbeginS.o
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/self-contained/crtend.o
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/self-contained/crtendS.o
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/self-contained/crti.o
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/self-contained/crtn.o
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/self-contained/libc.a
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/self-contained/libunwind.a
+third_party/android_rust_toolchain/toolchain/lib/rustlib/i686-unknown-linux-musl/lib/self-contained/rcrt1.o
+third_party/android_rust_toolchain/toolchain/lib/rustlib/riscv32i-unknown-none-elf/lib/liballoc-2d5b574a92ac8738.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/riscv32i-unknown-none-elf/lib/libcompiler_builtins-2697cd30acdc8aad.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/riscv32i-unknown-none-elf/lib/libcore-417d0766a3b14cdf.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/riscv32i-unknown-none-elf/lib/librustc_std_workspace_core-b263ed2115eafcba.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-9fc3e6cf2b20d3f4.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libadler-2d37c359dceb126e.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/liballoc-9524416c5fc3ec52.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libcfg_if-363b2e3d4169432b.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libcompiler_builtins-887b5dc498f92f5a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libaddr2line-aed6dcbbb4568565.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libadler-48e5a698c28d7a92.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/liballoc-288509144ac1fab2.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libcfg_if-b6dc26f2e2175df4.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libcompiler_builtins-70c8796e34a2759d.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libcore-29ea1f1e3529e839.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libgetopts-68c5393267b71ab1.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libgimli-1a98905f3697a83b.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libhashbrown-b28caad17dccccbb.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/liblibc-057ed7161b012b35.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libmemchr-505a5f9cf8a5abb4.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libminiz_oxide-76bd8b51f43f5264.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libobject-703a04079dd759bc.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libpanic_abort-97b98d9204db393d.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libpanic_unwind-90e9549776dcb813.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libproc_macro-d42f7d6de8b3dd8a.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libprofiler_builtins-fe74c6573cbb00cf.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/librustc_demangle-7437d9c964239c96.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/librustc_std_workspace_alloc-7c214331c04b36b4.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libgetopts-f12c3be1bef74080.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libgimli-8f73f74c0a7f7369.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libhashbrown-036e002905b5915a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/liblibc-2ce0149503a5406b.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libmemchr-e84b719c3f0eb2a8.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libminiz_oxide-eb491dd1897e5cf2.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libobject-6f4d9ea85c427e08.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libpanic_abort-c545bbb57be3c1ff.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libpanic_unwind-033dc492519e245f.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libproc_macro-e6a09660c3d1cbfb.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libprofiler_builtins-aa9571adb6128c1a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/librustc_demangle-fa30a87e96788c0a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/librustc_std_workspace_alloc-a4cbff2228f19311.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/librustc_std_workspace_core-2169007f883e3379.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/librustc_std_workspace_std-16408bf611e2bc61.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libstd-9ec70ac58bc6b91c.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libstd-9ec70ac58bc6b91c.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libstd_detect-cf82c805eff64005.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libtest-9a24a887cff8c22e.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libtest-9a24a887cff8c22e.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libunicode_width-dea58171c8f8b899.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libunwind-bfeddbd2bee4534c.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/librustc_std_workspace_std-ce7d9a07ef0d4bf6.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libstd-47bb19f211337a5d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libstd-47bb19f211337a5d.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libstd_detect-882221125771e48f.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libtest-986b4bf591cda411.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libtest-986b4bf591cda411.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libunicode_width-b8a416c24decb6d7.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libunwind-76c218d887cf76f6.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-linux-android/lib/libunwind.a
-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-c35ba5b203308b02.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-8c70154dcc30ac3b.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-518660e541849abe.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-fd46a7f383df28dc.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-bfde03568534f1d3.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-f66cc41f57c8e655.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-9f45dc81593621c1.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-dcef94ef7fd63817.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-766823dfd6298b4a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-1344b2a0433f2ef1.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-aac13a4a74d65b56.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-dfd7ef1079720574.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-1a154f16ab48cc88.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-31edee0d210dc784.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-6de336429cc925ca.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemchr-d0cfe65607715f58.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-065ce02a75c57f3d.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-f459deee2ab16f84.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-26f9d635b3d70647.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-1c67eefde5cfeca1.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-22f2c7277b317c86.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-81f9709bd3b7a512.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-1e5d5ab9322b0c61.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-9ebe42f90471c6b5.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-3c557d6533b4c2ed.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-2c9d5ab6994ead5b.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-242d83cd4da265d8.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-94de6018bd322eee.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemchr-63f6547c644f8b1f.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-df770c11db274640.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-d9ee336cb6e841e5.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-c0f86a1812d2f85c.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-3c2399f365a31be8.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-d0fd52854e083782.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-23e7f838ca11c727.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-bb734b50645f6d74.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-86477e937270a3e6.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-1f074ec22dffdb6c.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-342b765a40c8127f.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-4ad33afe32d41a89.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-4ad33afe32d41a89.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect-c8c8f8431a5807b8.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-f487aa631def87ca.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-f487aa631def87ca.so
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-676059f929ba1ed1.rlib
-third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-40c3500ff0106b52.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-3f64d724e8b846c0.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-1a032a628808d786.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-1a032a628808d786.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect-46da1ad8146d3be4.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-850762076e29a090.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-850762076e29a090.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-996e8bf4f68d9a69.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-39abcd5df2a99dac.rlib
 third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind.a
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libaddr2line-61b40447dc8f5a40.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libadler-73ca73a92d12eddd.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/liballoc-61a12ce9bda2606b.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-48b64b790dbb116f.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-03601fed288b373d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-278de11d28d67f68.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-8951abcd3194bff4.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libgimli-893ebf8fd6f46b40.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-48ceb6c840808520.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-58be34d26c6b0a91.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libmemchr-a97ebe2c40d980cc.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libminiz_oxide-38392aa3bf7dba79.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libobject-f2bc0ccf6134427b.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-10e8509f40c6fabf.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-f21d10acc3110fe5.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-e2b2d77aafb9de1d.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libprofiler_builtins-70f98a0d1de62468.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-b1aa82210e660ae5.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-e7dffd8151fd41b8.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-c2c427f81d0f1fc4.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-2059930665e66abc.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-49fd15774a18f5b5.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-49fd15774a18f5b5.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-9cf414d495da011e.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-a12d1f108d9c47e0.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-a12d1f108d9c47e0.so
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libunicode_width-6528d0ca49287e4a.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-aea8c404924d63b5.rlib
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind.a
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crt1.o
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crtbegin.o
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crtbeginS.o
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crtend.o
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crtendS.o
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crti.o
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crtn.o
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/libc.a
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/libunwind.a
+third_party/android_rust_toolchain/toolchain/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/rcrt1.o
 third_party/android_rust_toolchain/toolchain/lib64/libc++.so.1
 third_party/android_rust_toolchain/toolchain/libexec/cargo-credential-1password
 third_party/angle/samples/multi_texture/basemap.tga
@@ -3002,6 +3099,26 @@ third_party/angle/third_party/VK-GL-CTS/src/external/openglcts/data/spirv/spirv_
 third_party/angle/third_party/VK-GL-CTS/src/external/openglcts/data/spirv/spirv_validation_capabilities/binary_p1s3.nspv
 third_party/angle/third_party/VK-GL-CTS/src/external/openglcts/data/spirv/spirv_validation_capabilities/binary_p1s4.nspv
 third_party/angle/third_party/VK-GL-CTS/src/external/openglcts/data/spirv/spirv_validation_capabilities/binary_p2s0.nspv
+third_party/angle/third_party/astc-encoder/src/Test/Data/HDR-A-1x1.astc
+third_party/angle/third_party/astc-encoder/src/Test/Data/HDR-A-1x1.exr
+third_party/angle/third_party/astc-encoder/src/Test/Data/LDR-A-1x1.astc
+third_party/angle/third_party/astc-encoder/src/Test/Data/LDRS-A-1x1.astc
+third_party/angle/third_party/astc-encoder/src/Test/Data/Tiles/hdr-complex.exr
+third_party/angle/third_party/astc-encoder/src/Test/Data/Tiles/hdr.astc
+third_party/angle/third_party/astc-encoder/src/Test/Data/Tiles/hdr.exr
+third_party/angle/third_party/astc-encoder/src/Test/Data/Tiles/hdr.hdr
+third_party/angle/third_party/astc-encoder/src/Test/Data/Tiles/ldr.astc
+third_party/angle/third_party/astc-encoder/src/Test/Data/Tiles/ldr.dds
+third_party/angle/third_party/astc-encoder/src/Test/Data/Tiles/ldr.ktx
+third_party/angle/third_party/astc-encoder/src/Test/Data/Tiles/ldr.tga
+third_party/angle/third_party/astc-encoder/src/Test/Images/HDRIHaven/HDR-RGB/hdr-rgb-arboretum.hdr
+third_party/angle/third_party/astc-encoder/src/Test/Images/HDRIHaven/HDR-RGB/hdr-rgb-bellparkpier.hdr
+third_party/angle/third_party/astc-encoder/src/Test/Images/HDRIHaven/HDR-RGB/hdr-rgb-canarywharf.hdr
+third_party/angle/third_party/astc-encoder/src/Test/Images/HDRIHaven/HDR-RGB/hdr-rgb-eveningroad.hdr
+third_party/angle/third_party/astc-encoder/src/Test/Images/HDRIHaven/HDR-RGB/hdr-rgb-riverwalk.hdr
+third_party/angle/third_party/astc-encoder/src/Test/Images/Small/HDR-RGB/hdr-rgb-00.hdr
+third_party/angle/third_party/astc-encoder/src/Test/Images/Small/LDR-L/ldr-l-00-3.dds
+third_party/angle/third_party/astc-encoder/src/Test/Images/Small/LDR-L/ldr-l-01-3.dds
 third_party/angle/third_party/glmark2/src/data/models/asteroid-high.3ds
 third_party/angle/third_party/glmark2/src/data/models/asteroid-low.3ds
 third_party/angle/third_party/glmark2/src/data/models/cat.3ds
@@ -8153,6 +8270,8 @@ third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/ACVP-AES-GM
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/ACVP-AES-KW.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/ACVP-AES-KWP.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/ACVP-AES-XTS.bz2
+third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/ACVP-TDES-CBC.bz2
+third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/ACVP-TDES-ECB.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/CMAC-AES.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/ECDSA.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/HMAC-SHA-1.bz2
@@ -8181,6 +8300,8 @@ third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/ACVP-AES-GMA
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/ACVP-AES-KW.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/ACVP-AES-KWP.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/ACVP-AES-XTS.bz2
+third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/ACVP-TDES-CBC.bz2
+third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/ACVP-TDES-ECB.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/CMAC-AES.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/ECDSA.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/HMAC-SHA-1.bz2
@@ -8244,7 +8365,6 @@ third_party/breakpad/breakpad/src/tools/windows/dump_syms/testdata/omap_stretche
 third_party/breakpad/breakpad/src/tools/windows/dump_syms/testdata/omap_stretched_filled.pdb
 third_party/breakpad/breakpad/src/tools/windows/dump_syms/testdata/pe_only_symbol_test.dll
 third_party/breakpad/symupload.exe
-third_party/catapult/catapult_build/bin/mac-arm64/protoc
 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
@@ -8763,6 +8883,7 @@ third_party/depot_tools/ninja.exe
 third_party/depot_tools/subprocess2.pyc
 third_party/devtools-frontend/src/node_modules/tar-fs/test/fixtures/invalid.tar
 third_party/devtools-frontend/src/node_modules/terser/node_modules/source-map/lib/mappings.wasm
+third_party/devtools-frontend/src/test/e2e/resources/media/corrupt.webm
 third_party/devtools-frontend/src/test/e2e/resources/media/fisch.webm
 third_party/devtools-frontend/src/test/e2e/resources/network/webbundle.wbn
 third_party/devtools-frontend/src/test/e2e/resources/network/webbundle_bad_inner_request.wbn
@@ -8770,8 +8891,6 @@ third_party/devtools-frontend/src/test/e2e/resources/network/webbundle_bad_metad
 third_party/devtools-frontend/src/test/e2e/resources/performance/wasm/profiling.wasm
 third_party/devtools-frontend/src/test/e2e/resources/sources/wasm/add.wasm
 third_party/devtools-frontend/src/test/e2e/resources/sources/wasm/callstack-wasm-to-js.wasm
-third_party/devtools-frontend/src/test/e2e/resources/sources/wasm/global_variable.wasm
-third_party/devtools-frontend/src/test/e2e/resources/sources/wasm/global_variable_with_dwarf.wasm
 third_party/devtools-frontend/src/test/e2e/resources/sources/wasm/memory.wasm
 third_party/devtools-frontend/src/test/e2e/resources/sources/wasm/scopes.wasm
 third_party/devtools-frontend/src/test/e2e/resources/sources/wasm/stepping-with-state.wasm
@@ -8795,6 +8914,30 @@ 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
+third_party/flatbuffers/src/tests/annotated_binary/annotated_binary.bfbs
+third_party/flatbuffers/src/tests/annotated_binary/annotated_binary.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_root_offset.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_root_table_too_short.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_root_table_vtable_offset.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_string_length.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_string_length_cut_short.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_struct_array_field_cut_short.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_struct_field_cut_short.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_table_field_offset.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_table_field_size.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_union_type_value.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_vector_length_cut_short.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_vector_scalars_cut_short.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_vector_strings_cut_short.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_vector_structs_cut_short.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_vector_tables_cut_short.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_vector_union_type_value.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_vector_unions_cut_short.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_vtable_field_offset.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_vtable_ref_table_size.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_vtable_ref_table_size_short.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_vtable_size.bin
+third_party/flatbuffers/src/tests/annotated_binary/tests/invalid_vtable_size_short.bin
 third_party/flatbuffers/src/tests/arrays_test.bfbs
 third_party/flatbuffers/src/tests/gold_flexbuffer_example.bin
 third_party/flatbuffers/src/tests/javatest.bin
@@ -9099,6 +9242,7 @@ third_party/grpc/src/src/php/tests/generated_code/GPBMetadata/Math.php
 third_party/grpc/src/src/php/tests/interop/GPBMetadata/Src/Proto/Grpc/Testing/Messages.php
 third_party/grpc/src/src/php/tests/interop/GPBMetadata/Src/Proto/Grpc/Testing/PBEmpty.php
 third_party/grpc/src/src/php/tests/interop/GPBMetadata/Src/Proto/Grpc/Testing/Test.php
+third_party/grpc/src/test/core/address_utils/sockaddr_uri_corpus/sample.dat
 third_party/grpc/src/test/core/end2end/fuzzers/client_fuzzer_corpus/001946397b463a3562c5951f6325069d8a3a2ded
 third_party/grpc/src/test/core/end2end/fuzzers/client_fuzzer_corpus/0083d5addbeca55271ed7ef93c8016bf7ca76903
 third_party/grpc/src/test/core/end2end/fuzzers/client_fuzzer_corpus/00c8446b230bebbae2b473552b174a06b446337a
@@ -9659,6 +9803,7 @@ third_party/grpc/src/test/core/end2end/fuzzers/client_fuzzer_corpus/cedd54df6d34
 third_party/grpc/src/test/core/end2end/fuzzers/client_fuzzer_corpus/cf75632ee185df2cbbbe148e2e1ad5410f11d361
 third_party/grpc/src/test/core/end2end/fuzzers/client_fuzzer_corpus/cf922d44bf08d223d3ebcd37a7e77d3e43555d08
 third_party/grpc/src/test/core/end2end/fuzzers/client_fuzzer_corpus/cfa40fccc5ea4304e83ca26f4e567765c2c08627
+third_party/grpc/src/test/core/end2end/fuzzers/client_fuzzer_corpus/clusterfuzz-testcase-minimized-client_fuzzer-6514364929933312.test
 third_party/grpc/src/test/core/end2end/fuzzers/client_fuzzer_corpus/clusterfuzz-testcase-minimized-grpc_client_fuzzer-5765697914404864
 third_party/grpc/src/test/core/end2end/fuzzers/client_fuzzer_corpus/crash-12b69708d452b3cefe2da4a708a1030a661d37fc
 third_party/grpc/src/test/core/end2end/fuzzers/client_fuzzer_corpus/crash-133500314833c9037b34a4c34ad779dd78a0fa8d
@@ -11093,6 +11238,7 @@ third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb
 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
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-draw-fuzzer-5667125715927040
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-draw-fuzzer-5668491560747008
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-draw-fuzzer-5681465586352128
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-draw-fuzzer-5686960406659072
@@ -11281,6 +11427,7 @@ 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-5685097303375872
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5689082504806400
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5690658895953920
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5693568490012672
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5695279609675776
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5695865298092032
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5695925913911296
@@ -11606,6 +11753,22 @@ third_party/harfbuzz-ng/src/test/shape/data/text-rendering-tests/fonts/TestSFNTO
 third_party/harfbuzz-ng/src/test/shape/data/text-rendering-tests/fonts/TestSVGgradientTransform.otf
 third_party/harfbuzz-ng/src/test/shape/data/text-rendering-tests/fonts/TestSVGgzip.otf
 third_party/harfbuzz-ng/src/test/shape/data/text-rendering-tests/fonts/TestSVGmultiGlyphs.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/32bit_var_store/32bit_var_store.notdef-outline-retain-gids.61,62,63,64.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/32bit_var_store/32bit_var_store.notdef-outline-retain-gids.61,62.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/32bit_var_store/32bit_var_store.notdef-outline-retain-gids.61,63.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/32bit_var_store/32bit_var_store.notdef-outline-retain-gids.61,64.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/32bit_var_store/32bit_var_store.notdef-outline-retain-gids.61.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/32bit_var_store/32bit_var_store.notdef-outline-retain-gids.62.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/32bit_var_store/32bit_var_store.notdef-outline-retain-gids.63.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/32bit_var_store/32bit_var_store.notdef-outline-retain-gids.64.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/32bit_var_store/32bit_var_store.notdef-outline.61,62,63,64.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/32bit_var_store/32bit_var_store.notdef-outline.61,62.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/32bit_var_store/32bit_var_store.notdef-outline.61,63.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/32bit_var_store/32bit_var_store.notdef-outline.61,64.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/32bit_var_store/32bit_var_store.notdef-outline.61.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/32bit_var_store/32bit_var_store.notdef-outline.62.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/32bit_var_store/32bit_var_store.notdef-outline.63.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/32bit_var_store/32bit_var_store.notdef-outline.64.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-desubroutinize-retain-gids.1FC,21,41,20,62,63.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-desubroutinize-retain-gids.61,62,63.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf
@@ -12033,6 +12196,7 @@ third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub8/gsub8_manuall
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.61.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.retain-all-codepoint.otf
+third_party/harfbuzz-ng/src/test/subset/data/fonts/32bit_var_store.otf
 third_party/harfbuzz-ng/src/test/subset/data/fonts/AdobeVFPrototype.otf
 third_party/harfbuzz-ng/src/test/subset/data/fonts/NotoSerifMyanmar-Regular.otf
 third_party/harfbuzz-ng/src/test/subset/data/fonts/SourceHanSans-Regular_subset.otf
@@ -14387,6 +14551,9 @@ third_party/libwebm/source/webm_parser/fuzzing/corpus/fe7ac2ef276b817af3487bab5f
 third_party/libwebm/source/webm_parser/fuzzing/corpus/fe7ef7c0e835873b7b1cd780f248114f18adf13a
 third_party/libwebm/source/webm_parser/fuzzing/corpus/ff5274cad94d590347d6cdba7637078f82e3d44a
 third_party/libwebm/source/webm_parser/fuzzing/corpus/ffff6a92363e0e55a9688d9bc025cd8dea3b50d4
+third_party/libwebp/src/examples/test_ref.ppm
+third_party/libwebp/src/gradle/wrapper/gradle-wrapper.jar
+third_party/libwebp/src/swig/libwebp.jar
 third_party/libxml/fuzz/seed_corpus/1f50fd9aa3a95df4a16b2ff4ce266ca83a4ff1fc
 third_party/libxml/fuzz/seed_corpus/3ae23066e6ca32d416573bf52ee2229db42b91ce
 third_party/libxml/fuzz/seed_corpus/5b3fdf55aa19abd6531bcff7b036b925eedf1cb3
@@ -14710,7 +14877,14 @@ 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/MachO/Inputs/eh-frame-arm64-r.o
+third_party/llvm/lld/test/MachO/Inputs/eh-frame-x86_64-r.o
 third_party/llvm/lld/test/wasm/corrupted.wasm.test
+third_party/llvm/lldb/test/API/commands/trace/intelpt-multi-core-trace/cores/45.intelpt_trace
+third_party/llvm/lldb/test/API/commands/trace/intelpt-multi-core-trace/cores/45.perf_context_switch_trace
+third_party/llvm/lldb/test/API/commands/trace/intelpt-multi-core-trace/cores/51.intelpt_trace
+third_party/llvm/lldb/test/API/commands/trace/intelpt-multi-core-trace/cores/51.perf_context_switch_trace
+third_party/llvm/lldb/test/API/commands/trace/intelpt-multi-core-trace/modules/m.out
 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
@@ -14832,6 +15006,7 @@ third_party/llvm/llvm/test/Bitcode/DISubprogram-v5.ll.bc
 third_party/llvm/llvm/test/Bitcode/DITemplateParameter-5.0.ll.bc
 third_party/llvm/llvm/test/Bitcode/Inputs/PR23310.bc
 third_party/llvm/llvm/test/Bitcode/Inputs/apple-clang-700-O3-g-1.bc
+third_party/llvm/llvm/test/Bitcode/Inputs/bitcode-parseconstant-delay-select.bc
 third_party/llvm/llvm/test/Bitcode/Inputs/branch-weight.bc
 third_party/llvm/llvm/test/Bitcode/Inputs/byval-upgrade.bc
 third_party/llvm/llvm/test/Bitcode/Inputs/comdat-name-too-large.bc
@@ -14999,6 +15174,7 @@ third_party/llvm/llvm/test/Bitcode/upgrade-subprogram-this.ll.bc
 third_party/llvm/llvm/test/Bitcode/upgrade-subprogram.ll.bc
 third_party/llvm/llvm/test/Bitcode/upgrade-var-annotation.ll.bc
 third_party/llvm/llvm/test/Bitcode/upgrade-vecreduce-intrinsics.ll.bc
+third_party/llvm/llvm/test/Bitcode/upgrade-vector-insert-extract-intrinsics.ll.bc
 third_party/llvm/llvm/test/Bitcode/upgrade-void-ret-attr-11.0.ll.bc
 third_party/llvm/llvm/test/Bitcode/variableArgumentIntrinsic.3.2.ll.bc
 third_party/llvm/llvm/test/Bitcode/vectorInstructions.3.2.ll.bc
@@ -15536,6 +15712,7 @@ third_party/llvm/llvm/test/tools/llvm-cov/Inputs/prevent_false_instantiations.co
 third_party/llvm/llvm/test/tools/llvm-cov/Inputs/range_based_for.gcda
 third_party/llvm/llvm/test/tools/llvm-cov/Inputs/range_based_for.gcno
 third_party/llvm/llvm/test/tools/llvm-cov/Inputs/regionMarkers.covmapping
+third_party/llvm/llvm/test/tools/llvm-cov/Inputs/relative_dir/main.covmapping
 third_party/llvm/llvm/test/tools/llvm-cov/Inputs/report.covmapping
 third_party/llvm/llvm/test/tools/llvm-cov/Inputs/report.profdata
 third_party/llvm/llvm/test/tools/llvm-cov/Inputs/showExpansions.covmapping
@@ -15870,6 +16047,8 @@ third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/inline.memprofraw
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/memprof-inline.exe
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/multi.memprofexe
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/multi.memprofraw
+third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/pic.memprofexe
+third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/pic.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
@@ -16032,8 +16211,8 @@ third_party/llvm/llvm/utils/lit/tests/Inputs/shtest-shell/cat_nonprinting.bin
 third_party/llvm/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.bin
 third_party/llvm/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.utf16
 third_party/llvm/mlir/test/IR/zero_whitespace.mlir
-third_party/lzma_sdk/7zr.exe
-third_party/lzma_sdk/Executable/7za.exe
+third_party/lzma_sdk/bin/7za.exe
+third_party/lzma_sdk/bin/7zr.exe
 third_party/minizip/minizip_uncompress_corpus/As.zip
 third_party/minizip/minizip_uncompress_corpus/comments.zip
 third_party/minizip/minizip_uncompress_corpus/corpus.zip
@@ -16336,7 +16515,9 @@ third_party/ots/src/tests/fonts/bad/dcc4f3316f90bc8a4c05e0086d2b49fddd3a059b.otf
 third_party/ots/src/tests/fonts/bad/ea8c4b1d5178ae184ffd0346f12fd426850729cc.otf
 third_party/ots/src/tests/fonts/bad/eaeb6d903b14ee184f887aa8a0a81b917e252da9.otf
 third_party/ots/src/tests/fonts/bad/edaf09c932e0582b1473384f66d5571da752a4d2.otf
+third_party/ots/src/tests/fonts/fuzzing/05a7abc8e4c954ef105d056bd6249c6fda96d4a8.otf
 third_party/ots/src/tests/fonts/fuzzing/10531f9105aa03bf6e0f9754ec8af33ed457ad5c.otf
+third_party/ots/src/tests/fonts/fuzzing/18052b7fc1ca5c188b54864f163bebf80f488811.otf
 third_party/ots/src/tests/fonts/fuzzing/205edd09bd3d141cc9580f650109556cc28b22cb.otf
 third_party/ots/src/tests/fonts/fuzzing/2a12de12323bfd99b9c4bb33ed20b66b8ff0915f.otf
 third_party/ots/src/tests/fonts/fuzzing/43979b90b2dd929723cf4fe1715990bcb9c9a56b.otf
@@ -16349,12 +16530,13 @@ third_party/ots/src/tests/fonts/fuzzing/94895e7495f726fa316ca3f2a03c98b86dc20560
 third_party/ots/src/tests/fonts/fuzzing/94bdbcb520c5301750167dc433803ac7933da028.otf
 third_party/ots/src/tests/fonts/fuzzing/b9e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2.otf
 third_party/ots/src/tests/fonts/fuzzing/d69ecb7001e46df61c33e2ec74fdcdd32e018db3.ttc
+third_party/ots/src/tests/fonts/good/02d99e81593bcabce56b6a589254e8bc77e00208.otf
+third_party/ots/src/tests/fonts/good/171ec9ef597e59a0f33cdeae1d4cf43af1d255ce.otf
 third_party/ots/src/tests/fonts/good/27f2cd91ff43713d977b2b253e82b8fcb781e674.otf
 third_party/ots/src/tests/fonts/good/2eba8164a0811c8422ecde8900bf476bb4a05ca3.otf
 third_party/ots/src/tests/fonts/good/4c471c403831e131c7887e9e0b9a547495749579.otf
 third_party/ots/src/tests/fonts/good/84df123947f7f5f9a5456e755f91bef963b1dd7c.otf
 third_party/ots/src/tests/fonts/good/89166e0ffdfdac0309d31012d1d5c1de8fe65a52.otf
-third_party/ots/src/tests/fonts/good/9780d8ca01f53d2f413b9d0403c0412b1f5bbd06.otf
 third_party/ots/src/tests/fonts/good/a64a622a50d6400592a9590c003afb02e9e4436d.otf
 third_party/ots/src/tests/fonts/good/a69c0298f6d3e29903a492ce1f175932dabf800e.otf
 third_party/ots/src/tests/fonts/good/c3886b3124a97b9b9212c426c50366773e9ef10c.otf
@@ -16389,8 +16571,16 @@ third_party/protobuf/csharp/keys/Google.Protobuf.snk
 third_party/protobuf/csharp/src/Google.Protobuf.Test/testprotos.pb
 third_party/protobuf/objectivec/Tests/golden_message
 third_party/protobuf/objectivec/Tests/golden_packed_fields_message
-third_party/protobuf/python/compatibility_tests/v2.5.0/tests/google/protobuf/internal/golden_message
-third_party/protobuf/python/compatibility_tests/v2.5.0/tests/google/protobuf/internal/golden_packed_fields_message
+third_party/protobuf/php/src/GPBMetadata/Google/Protobuf/Any.php
+third_party/protobuf/php/src/GPBMetadata/Google/Protobuf/Api.php
+third_party/protobuf/php/src/GPBMetadata/Google/Protobuf/Duration.php
+third_party/protobuf/php/src/GPBMetadata/Google/Protobuf/FieldMask.php
+third_party/protobuf/php/src/GPBMetadata/Google/Protobuf/GPBEmpty.php
+third_party/protobuf/php/src/GPBMetadata/Google/Protobuf/SourceContext.php
+third_party/protobuf/php/src/GPBMetadata/Google/Protobuf/Struct.php
+third_party/protobuf/php/src/GPBMetadata/Google/Protobuf/Timestamp.php
+third_party/protobuf/php/src/GPBMetadata/Google/Protobuf/Type.php
+third_party/protobuf/php/src/GPBMetadata/Google/Protobuf/Wrappers.php
 third_party/protobuf/src/google/protobuf/testdata/bad_utf8_string
 third_party/protobuf/src/google/protobuf/testdata/golden_message
 third_party/protobuf/src/google/protobuf/testdata/golden_message_maps
@@ -16444,7 +16634,6 @@ third_party/rust/libloading/v0_7/crate/tests/nagisa32.dll
 third_party/rust/libloading/v0_7/crate/tests/nagisa64.dll
 third_party/rust/regex/v1/crate/src/testdata/basic.dat
 third_party/rust/regex/v1/crate/tests/fowler.rs
-third_party/rust/unicode_segmentation/v1/crate/src/tables.rs
 third_party/skia/modules/canvaskit/tests/assets/Roboto-Regular.otf
 third_party/skia/modules/canvaskit/tests/assets/red_line.skp
 third_party/skia/modules/canvaskit/tests/assets/test.ttc
@@ -17030,9 +17219,14 @@ third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/unidirectional_se
 third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/unpack.bin
 third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/weight_shared_between_convs.bin
 third_party/tflite/src/tensorflow/lite/tools/optimize/testdata/where.bin
+third_party/tflite/src/tensorflow/python/checkpoint/testdata/table_legacy_saveable_object.data-00000-of-00001
+third_party/tflite/src/tensorflow/python/checkpoint/testdata/table_legacy_saveable_object.index
 third_party/tflite/src/tensorflow/python/compiler/tensorrt/model_tests/sample_model/saved_model.pb
 third_party/tflite/src/tensorflow/python/compiler/tensorrt/test/testdata/mnist/model.ckpt-46900.data-00000-of-00001
 third_party/tflite/src/tensorflow/python/compiler/tensorrt/test/testdata/mnist/model.ckpt-46900.index
+third_party/tflite/src/tensorflow/python/compiler/tensorrt/test/testdata/tf_variablev2_saved_model/saved_model.pb
+third_party/tflite/src/tensorflow/python/compiler/tensorrt/test/testdata/tf_variablev2_saved_model/variables/variables.data-00000-of-00001
+third_party/tflite/src/tensorflow/python/compiler/tensorrt/test/testdata/tf_variablev2_saved_model/variables/variables.index
 third_party/tflite/src/tensorflow/python/compiler/tensorrt/test/testdata/tftrt_2.0_saved_model/saved_model.pb
 third_party/tflite/src/tensorflow/python/compiler/tensorrt/test/testdata/tftrt_2.0_saved_model/variables/variables.data-00000-of-00002
 third_party/tflite/src/tensorflow/python/compiler/tensorrt/test/testdata/tftrt_2.0_saved_model/variables/variables.data-00001-of-00002