merge: update to 134.0.6998.35 from upstream

2026-04-14 00:14:20 +09:00 · 2025-03-08 08:41:50 +00:00
parent 7cd6abac26 2d603520e2
commit 6a7a82ca76
79 changed files with 1793 additions and 3091 deletions
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -41,12 +41,12 @@ validate_with_source_task:
          ./utils/clone.py -o chromium_src
          rm -rf chromium_src/uc_staging
          find chromium_src -type d -name '.git' -exec rm -rf "{}" \; -prune
-          tar cf chromium_download_cache/chromium-$(cat chromium_version.txt).tar.xz \
+          tar cf chromium_download_cache/chromium-$(cat chromium_version.txt)-lite.tar.xz \
            --transform s/chromium_src/chromium-$(cat chromium_version.txt)/ chromium_src
        fi
    unpack_source_script: |
        if [ ! -d chromium_src ]; then
-          ./utils/downloads.py unpack --skip-unused -i downloads.ini -c chromium_download_cache chromium_src
+          ./utils/downloads.py unpack -i downloads.ini -c chromium_download_cache chromium_src
        fi
    validate_patches_script:
        - ./devutils/validate_patches.py -l chromium_src -v
--- a/chromium_version.txt
+++ b/chromium_version.txt
@@ -1 +1 @@
-133.0.6943.141
+134.0.6998.35
--- a/devutils/update_lists.py
+++ b/devutils/update_lists.py
@@ -109,8 +109,10 @@ DOMAIN_EXCLUDE_PREFIXES = [
    # Exclusions for Visual Studio Project generation with GN (PR #445)
    'tools/gn/',
    # Exclusions for files covered with other patches/unnecessary
-    'components/search_engines/prepopulated_engines.json',
+    'third_party/search_engines_data/resources/definitions/prepopulated_engines.json',
    'third_party/blink/renderer/core/dom/document.cc',
+    # Exclusion to allow download of sysroots
+    'build/linux/sysroot_scripts/sysroots.json',
    # Google Web Store extension stuff
    'tools/search_engine_choice/generate_search_engine_icons.py',
    'extensions/common/api/_api_features.json',
--- a/docs/flags.md
+++ b/docs/flags.md
@@ -68,6 +68,7 @@ These are also available on the `chrome://flags` page.
  `ReducedSystemInfo` | Reduces the amount of system information obatainable through headers and javascript, also causes hardwareConcurrency to respond with two cores.
  `RemoveClientHints` | Removes client hints (information sent to servers about your system, similar to a user agent).
  `SetIpv6ProbeFalse` | Forces the result of the browser's IPv6 probing (i.e. IPv6 connectivity test) to be unsuccessful. This causes IPv4 addresses to be prioritized over IPv6 addresses. Without this flag, the probing result is set to be successful, which causes IPv6 to be used over IPv4 when possible.
+  `SpoofWebGLInfo` | Return generic values for WebGLDebugRendererInfo to remove a potential data leak while preventing potential website breakage.

 - ### Available only on desktop

--- a/domain_regex.list
+++ b/domain_regex.list
@@ -1,7 +1,7 @@
 fonts(\\*?)\.googleapis(\\*?)\.com#f0ntz\g<1>.9oo91e8p1\g<2>.qjz9zk
 google([A-Za-z\-]*?\\*?)\.com(?!mon)#9oo91e\g<1>.qjz9zk
 gstatic([A-Za-z\-]*?\\*?)\.com#95tat1c\g<1>.qjz9zk
-chrome([A-Za-z\-]*?\\*?)\.com#ch40me\g<1>.qjz9zk
+chrome([A-Za-z\-]*?\\*?)\.com(?!ponent)#ch40me\g<1>.qjz9zk
 chromium([A-Za-z\-]*?\\*?)\.org#ch40m1um\g<1>.qjz9zk
 mozilla([A-Za-z\-]*?\\*?)\.org#m0z111a\g<1>.qjz9zk
 facebook([A-Za-z\-]*?\\*?)\.com#f8c3b00k\g<1>.qjz9zk
--- a/domain_substitution.list
+++ b/domain_substitution.list
--- a/downloads.ini
+++ b/downloads.ini
@@ -1,8 +1,8 @@
 # Official Chromium source code archive
 # NOTE: Substitutions beginning with underscore are provided by utils
 [chromium]
-url = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-%(_chromium_version)s.tar.xz
-download_filename = chromium-%(_chromium_version)s.tar.xz
-hash_url = chromium|chromium-%(_chromium_version)s.tar.xz.hashes|https://commondatastorage.googleapis.com/chromium-browser-official/chromium-%(_chromium_version)s.tar.xz.hashes
+url = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-%(_chromium_version)s-lite.tar.xz
+download_filename = chromium-%(_chromium_version)s-lite.tar.xz
+hash_url = chromium|chromium-%(_chromium_version)s-lite.tar.xz.hashes|https://commondatastorage.googleapis.com/chromium-browser-official/chromium-%(_chromium_version)s-lite.tar.xz.hashes
 output_path = ./
 strip_leading_dirs = chromium-%(_chromium_version)s
--- a/patches/core/bromite/disable-fetching-field-trials.patch
+++ b/patches/core/bromite/disable-fetching-field-trials.patch
@@ -51,7 +51,7 @@ Subject: Disable fetching of all field trials
     /**
 --- a/components/variations/service/variations_service.cc
 +++ b/components/variations/service/variations_service.cc
-@@ -221,17 +221,7 @@ bool GetInstanceManipulations(const net:
+@@ -222,17 +222,7 @@ bool GetInstanceManipulations(const net:
 // Variations seed fetching is only enabled in official Chrome builds, if a URL
 // is specified on the command line, and for testing.
 bool IsFetchingEnabled() {
--- 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
-@@ -2231,7 +2231,6 @@ static_library("browser") {
+@@ -2266,7 +2266,6 @@ static_library("browser") {
     "//components/reporting/util:task_runner_context",
     "//components/resources",
     "//components/safe_browsing/content/browser",
@@ -8,7 +8,7 @@
     "//components/safe_browsing/content/browser:safe_browsing_service",
     "//components/safe_browsing/content/browser/notification_content_detection",
     "//components/safe_browsing/content/browser/password_protection",
-@@ -3581,8 +3580,6 @@ static_library("browser") {
+@@ -3618,8 +3617,6 @@ static_library("browser") {
       "download/download_commands.cc",
       "download/download_crx_util.cc",
       "download/download_crx_util.h",
@@ -17,134 +17,9 @@
       "download/download_dir_policy_handler.cc",
       "download/download_dir_policy_handler.h",
       "download/download_dir_util.cc",
--- a/chrome/browser/browser_process.h
-+++ b/chrome/browser/browser_process.h
-@@ -66,10 +66,6 @@ class NetworkQualityTracker;
- class SharedURLLoaderFactory;
- }
- 
-namespace safe_browsing {
-class SafeBrowsingService;
-}
-
- namespace signin {
- class ActivePrimaryAccountsMetricsRecorder;
- }
-@@ -233,9 +229,6 @@ class BrowserProcess {
-   // on this platform (or this is a unit test).
-   virtual StatusTray* status_tray() = 0;
- 
-  // Returns the SafeBrowsing service.
-  virtual safe_browsing::SafeBrowsingService* safe_browsing_service() = 0;
-
-   // Returns the service providing versioned storage for rules used by the Safe
-   // Browsing subresource filter.
-   virtual subresource_filter::RulesetService*
--- a/chrome/browser/browser_process_impl.cc
-+++ b/chrome/browser/browser_process_impl.cc
-@@ -77,7 +77,6 @@
- #include "chrome/browser/printing/print_job_manager.h"
- #include "chrome/browser/profiles/profile_manager.h"
- #include "chrome/browser/resource_coordinator/resource_coordinator_parts.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
- #include "chrome/browser/shell_integration.h"
- #include "chrome/browser/site_isolation/prefs_observer.h"
- #include "chrome/browser/ssl/secure_origin_prefs_observer.h"
-@@ -476,8 +475,6 @@ void BrowserProcessImpl::StartTearDown()
- #endif
-   metrics_services_manager_.reset();
-   intranet_redirect_detector_.reset();
-  if (safe_browsing_service_.get())
-    safe_browsing_service()->ShutDown();
-   network_time_tracker_.reset();
- 
- #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
-@@ -1159,14 +1156,6 @@ StatusTray* BrowserProcessImpl::status_t
-   return status_tray_.get();
- }
- 
-safe_browsing::SafeBrowsingService*
-BrowserProcessImpl::safe_browsing_service() {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  if (!created_safe_browsing_service_)
-    CreateSafeBrowsingService();
-  return safe_browsing_service_.get();
-}
-
- subresource_filter::RulesetService*
- BrowserProcessImpl::subresource_filter_ruleset_service() {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -1468,26 +1457,6 @@ void BrowserProcessImpl::CreateBackgroun
- #endif
- }
- 
-void BrowserProcessImpl::CreateSafeBrowsingService() {
-  DCHECK(!safe_browsing_service_);
-  // Set this flag to true so that we don't retry indefinitely to
-  // create the service class if there was an error.
-  created_safe_browsing_service_ = true;
-
-  // The factory can be overridden in tests.
-  if (!safe_browsing::SafeBrowsingServiceInterface::HasFactory()) {
-    safe_browsing::SafeBrowsingServiceInterface::RegisterFactory(
-        safe_browsing::GetSafeBrowsingServiceFactory());
-  }
-
-  // TODO(crbug.com/41437292): Port consumers of the |safe_browsing_service_| to
-  // use the interface in components/safe_browsing, and remove this cast.
-  safe_browsing_service_ = static_cast<safe_browsing::SafeBrowsingService*>(
-      safe_browsing::SafeBrowsingServiceInterface::CreateSafeBrowsingService());
-  if (safe_browsing_service_)
-    safe_browsing_service_->Initialize();
-}
-
- void BrowserProcessImpl::CreateSubresourceFilterRulesetService() {
-   DCHECK(!subresource_filter_ruleset_service_);
-   created_subresource_filter_ruleset_service_ = true;
--- a/chrome/browser/browser_process_impl.h
-+++ b/chrome/browser/browser_process_impl.h
-@@ -199,7 +199,6 @@ class BrowserProcessImpl : public Browse
-       std::unique_ptr<BackgroundModeManager> manager) override;
- #endif
-   StatusTray* status_tray() override;
-  safe_browsing::SafeBrowsingService* safe_browsing_service() override;
-   subresource_filter::RulesetService* subresource_filter_ruleset_service()
-       override;
-   subresource_filter::RulesetService*
-@@ -368,9 +367,6 @@ class BrowserProcessImpl : public Browse
-   std::unique_ptr<BackgroundModeManager> background_mode_manager_;
- #endif
- 
-  bool created_safe_browsing_service_ = false;
-  scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_service_;
-
-   bool created_subresource_filter_ruleset_service_ = false;
-   std::unique_ptr<subresource_filter::RulesetService>
-       subresource_filter_ruleset_service_;
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-@@ -70,7 +70,6 @@
- #include "chrome/browser/profiles/keep_alive/scoped_profile_keep_alive.h"
- #include "chrome/browser/profiles/profile.h"
- #include "chrome/browser/reading_list/reading_list_model_factory.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
- #include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h"
- #include "chrome/browser/search_engine_choice/search_engine_choice_service_factory.h"
- #include "chrome/browser/search_engines/template_url_service_factory.h"
-@@ -660,10 +659,6 @@ void ChromeBrowsingDataRemoverDelegate::
-     base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
- 
-     network::mojom::NetworkContext* safe_browsing_context = nullptr;
-    safe_browsing::SafeBrowsingService* sb_service =
-        g_browser_process->safe_browsing_service();
-    if (sb_service)
-      safe_browsing_context = sb_service->GetNetworkContext(profile_);
- 
-     // Cleared for DATA_TYPE_HISTORY, DATA_TYPE_COOKIES and DATA_TYPE_PASSWORDS.
-     browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_,
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -5391,10 +5391,6 @@ ChromeContentBrowserClient::CreateThrott
+@@ -5403,10 +5403,6 @@ ChromeContentBrowserClient::CreateThrott
   throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
       handle, handle->GetWebContents()->GetBrowserContext()));
 
@@ -155,7 +30,7 @@
   throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
       handle,
       base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
-@@ -5449,16 +5445,6 @@ ChromeContentBrowserClient::CreateThrott
+@@ -5461,16 +5457,6 @@ ChromeContentBrowserClient::CreateThrott
       &throttles);
 #endif
 
@@ -172,7 +47,7 @@
   if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) {
     throttles.push_back(
         std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
-@@ -5754,8 +5740,6 @@ bool ChromeContentBrowserClient::IsPlugi
+@@ -5771,8 +5757,6 @@ bool ChromeContentBrowserClient::IsPlugi
 void ChromeContentBrowserClient::InitOnUIThread() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
@@ -183,7 +58,7 @@
   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
-@@ -43,21 +43,6 @@ const uint8_t kFileTypePoliciesPublicKey
+@@ -38,21 +38,6 @@ const uint8_t kFileTypePoliciesPublicKey
 const char kFileTypePoliciesManifestName[] = "File Type Policies";
 
 void LoadFileTypesFromDisk(const base::FilePath& pb_path) {
@@ -221,7 +96,7 @@
   if (download_manager_) {
     download_manager_->AddObserver(this);
   }
-@@ -1058,17 +1051,6 @@ void ChromeDownloadManagerDelegate::Choo
+@@ -1074,17 +1067,6 @@ void ChromeDownloadManagerDelegate::Choo
 void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
     base::FilePath* filename,
     const GURL& source_url) {
@@ -494,51 +369,9 @@
 };
 
 class DownloadsShowFunction : public ExtensionFunction {
--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc
-+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc
-@@ -53,39 +53,7 @@ SafeBrowsingPrivateGetReferrerChainFunct
-         base::StringPrintf("Could not find tab with id %d.", params->tab_id)));
-   }
- 
-  Profile* profile = Profile::FromBrowserContext(browser_context());
-  if (!SafeBrowsingNavigationObserverManager::IsEnabledAndReady(
-          profile->GetPrefs(), g_browser_process->safe_browsing_service()))
-    return RespondNow(NoArguments());
-
-  SafeBrowsingNavigationObserverManager* navigation_observer_manager =
-      safe_browsing::SafeBrowsingNavigationObserverManagerFactory::
-          GetForBrowserContext(profile);
-
-  safe_browsing::ReferrerChain referrer_chain;
-  SafeBrowsingNavigationObserverManager::AttributionResult result =
-      navigation_observer_manager->IdentifyReferrerChainByRenderFrameHost(
-          contents->GetPrimaryMainFrame(), kReferrerUserGestureLimit,
-          &referrer_chain);
-
-  // If the referrer chain is incomplete we'll append the most recent
-  // navigations to referrer chain for diagnostic purposes. This only happens if
-  // the user is not in incognito mode and has opted into extended reporting or
-  // Scout reporting. Otherwise, |CountOfRecentNavigationsToAppend| returns 0.
-  int recent_navigations_to_collect =
-      SafeBrowsingNavigationObserverManager::CountOfRecentNavigationsToAppend(
-          profile, profile->GetPrefs(), result);
-  if (recent_navigations_to_collect > 0) {
-    navigation_observer_manager->AppendRecentNavigations(
-        recent_navigations_to_collect, &referrer_chain);
-  }
-
-   std::vector<api::safe_browsing_private::ReferrerChainEntry> referrer_entries;
-  referrer_entries.reserve(referrer_chain.size());
-  for (const auto& entry : referrer_chain) {
-    referrer_entries.emplace_back(
-        safe_browsing_util::ReferrerToReferrerChainEntry(entry));
-  }
-   return RespondNow(ArgumentList(
-       api::safe_browsing_private::GetReferrerChain::Results::Create(
-           referrer_entries)));
 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
-@@ -708,18 +708,6 @@ void WebstorePrivateBeginInstallWithMani
+@@ -713,18 +713,6 @@ void WebstorePrivateBeginInstallWithMani
 
 void WebstorePrivateBeginInstallWithManifest3Function::
     ReportFrictionAcceptedEvent() {
@@ -557,92 +390,9 @@
 }
 
 void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
-@@ -1205,54 +1193,9 @@ WebstorePrivateGetReferrerChainFunction:
- 
- ExtensionFunction::ResponseAction
- WebstorePrivateGetReferrerChainFunction::Run() {
-  Profile* profile = Profile::FromBrowserContext(browser_context());
-  if (!SafeBrowsingNavigationObserverManager::IsEnabledAndReady(
-          profile->GetPrefs(), g_browser_process->safe_browsing_service()))
-    return RespondNow(ArgumentList(
-        api::webstore_private::GetReferrerChain::Results::Create("")));
-
-  content::RenderFrameHost* outermost_render_frame_host =
-      render_frame_host() ? render_frame_host()->GetOutermostMainFrame()
-                          : nullptr;
-
-  if (!outermost_render_frame_host) {
-    return RespondNow(ErrorWithArguments(
-        api::webstore_private::GetReferrerChain::Results::Create(""),
-        kWebstoreUserCancelledError));
-  }
-
-  SafeBrowsingNavigationObserverManager* navigation_observer_manager =
-      safe_browsing::SafeBrowsingNavigationObserverManagerFactory::
-          GetForBrowserContext(profile);
-
-  safe_browsing::ReferrerChain referrer_chain;
-  SafeBrowsingNavigationObserverManager::AttributionResult result =
-      navigation_observer_manager->IdentifyReferrerChainByRenderFrameHost(
-          outermost_render_frame_host, kExtensionReferrerUserGestureLimit,
-          &referrer_chain);
-
-  // If the referrer chain is incomplete we'll append the most recent
-  // navigations to referrer chain for diagnostic purposes. This only happens if
-  // the user is not in incognito mode and has opted into extended reporting or
-  // Scout reporting. Otherwise, |CountOfRecentNavigationsToAppend| returns 0.
-  int recent_navigations_to_collect =
-      SafeBrowsingNavigationObserverManager::CountOfRecentNavigationsToAppend(
-          profile, profile->GetPrefs(), result);
-  if (recent_navigations_to_collect > 0) {
-    navigation_observer_manager->AppendRecentNavigations(
-        recent_navigations_to_collect, &referrer_chain);
-  }
-
-  safe_browsing::ExtensionWebStoreInstallRequest request;
-  request.mutable_referrer_chain()->Swap(&referrer_chain);
-  request.mutable_referrer_chain_options()->set_recent_navigations_to_collect(
-      recent_navigations_to_collect);
-
-  // Base64 encode the request to avoid issues with base::Value rejecting
-  // strings which are not valid UTF8.
-   return RespondNow(
-       ArgumentList(api::webstore_private::GetReferrerChain::Results::Create(
-          base::Base64Encode(request.SerializeAsString()))));
-+          "")));
- }
- 
- WebstorePrivateGetExtensionStatusFunction::
 --- a/chrome/browser/extensions/blocklist_state_fetcher.cc
 +++ b/chrome/browser/extensions/blocklist_state_fetcher.cc
-@@ -38,24 +38,8 @@ BlocklistStateFetcher::~BlocklistStateFe
- void BlocklistStateFetcher::Request(const std::string& id,
-                                     RequestCallback callback) {
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  if (!safe_browsing_config_) {
-    if (g_browser_process && g_browser_process->safe_browsing_service()) {
-      SetSafeBrowsingConfig(
-          g_browser_process->safe_browsing_service()->GetV4ProtocolConfig());
-    } else {
-      base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
-          FROM_HERE, base::BindOnce(std::move(callback), BLOCKLISTED_UNKNOWN));
-      return;
-    }
-  }
-
-  bool request_already_sent = base::Contains(callbacks_, id);
-  callbacks_.insert(std::make_pair(id, std::move(callback)));
-  if (request_already_sent) {
-    return;
-  }
-
-  SendRequest(id);
-+  base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
-+      FROM_HERE, base::BindOnce(std::move(callback), BLOCKLISTED_UNKNOWN));
- }
- 
- void BlocklistStateFetcher::SendRequest(const std::string& id) {
-@@ -66,8 +50,7 @@ void BlocklistStateFetcher::SendRequest(
+@@ -75,8 +75,7 @@ void BlocklistStateFetcher::SendRequest(
   std::string request_str;
   request.SerializeToString(&request_str);
 
@@ -652,7 +402,7 @@
   net::NetworkTrafficAnnotationTag traffic_annotation =
       net::DefineNetworkTrafficAnnotation("extension_blacklist", R"(
         semantics {
-@@ -122,12 +105,6 @@ void BlocklistStateFetcher::SendRequest(
+@@ -131,12 +130,6 @@ void BlocklistStateFetcher::SendRequest(
                      base::Unretained(this), fetcher));
 }
 
@@ -676,57 +426,9 @@
  protected:
   void OnURLLoaderComplete(network::SimpleURLLoader* url_loader,
                            std::unique_ptr<std::string> response_body);
-@@ -56,7 +54,6 @@ class BlocklistStateFetcher {
- 
-   void SendRequest(const std::string& id);
- 
-  std::unique_ptr<safe_browsing::V4ProtocolConfig> safe_browsing_config_;
-   scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
- 
-   // SimpleURLLoader -> (owned loader, extension id).
--- a/chrome/browser/profiles/profile_impl.cc
-+++ b/chrome/browser/profiles/profile_impl.cc
-@@ -96,7 +96,6 @@
- #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
- #include "chrome/browser/reading_list/reading_list_model_factory.h"
- #include "chrome/browser/reduce_accept_language/reduce_accept_language_factory.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
- #include "chrome/browser/sessions/exit_type_service.h"
- #include "chrome/browser/sharing/sharing_service_factory.h"
- #include "chrome/browser/signin/identity_manager_factory.h"
-@@ -634,17 +633,6 @@ void ProfileImpl::LoadPrefsForNormalStar
- 
-   mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
-       pref_validation_delegate;
-  scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_service(
-      g_browser_process->safe_browsing_service());
-  if (safe_browsing_service.get()) {
-    auto pref_validation_delegate_impl =
-        safe_browsing_service->CreatePreferenceValidationDelegate(this);
-    if (pref_validation_delegate_impl) {
-      mojo::MakeSelfOwnedReceiver(
-          std::move(pref_validation_delegate_impl),
-          pref_validation_delegate.InitWithNewPipeAndPassReceiver());
-    }
-  }
- 
-   prefs_ = CreateProfilePrefService(
-       pref_registry_, CreateExtensionPrefStore(this, false),
--- a/chrome/browser/profiles/profiles_state.cc
-+++ b/chrome/browser/profiles/profiles_state.cc
-@@ -290,9 +290,6 @@ void RemoveBrowsingDataForProfile(const
-   // The BrowsingDataRemover relies on many objects that aren't created in unit
-   // tests. Previously this code would depend on content::ResourceDispatcherHost
-   // but that's gone, so do a similar hack for now.
-  if (!g_browser_process->safe_browsing_service())
-    return;
-
-   Profile* profile =
-       g_browser_process->profile_manager()->GetProfileByPath(profile_path);
-   if (!profile)
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
-@@ -7,6 +7,7 @@ import("//components/safe_browsing/build
+@@ -8,6 +8,7 @@ import("//components/safe_browsing/build
 import("//extensions/buildflags/buildflags.gni")
 
 static_library("safe_browsing") {
@@ -734,7 +436,7 @@
   sources = [
     "chrome_controller_client.cc",
     "chrome_controller_client.h",
-@@ -77,6 +78,7 @@ static_library("safe_browsing") {
+@@ -78,6 +79,7 @@ static_library("safe_browsing") {
     "//mojo/public/cpp/system",
     "//services/preferences/public/cpp",
   ]
@@ -742,7 +444,7 @@
 
   if (is_android) {
     deps += [
-@@ -547,6 +549,7 @@ static_library("advanced_protection") {
+@@ -549,6 +551,7 @@ static_library("advanced_protection") {
 }
 
 source_set("metrics_collector") {
@@ -750,7 +452,7 @@
   sources = [
     "safe_browsing_metrics_collector_factory.cc",
     "safe_browsing_metrics_collector_factory.h",
-@@ -566,6 +569,7 @@ source_set("metrics_collector") {
+@@ -568,6 +571,7 @@ source_set("metrics_collector") {
     "//components/safe_browsing/core/common:safe_browsing_prefs",
     "//content/public/browser",
   ]
@@ -758,104 +460,9 @@
 }
 
 source_set("test_support") {
--- a/chrome/browser/ssl/chrome_security_state_tab_helper.cc
-+++ b/chrome/browser/ssl/chrome_security_state_tab_helper.cc
-@@ -179,92 +179,5 @@ bool ChromeSecurityStateTabHelper::UsedP
- 
- security_state::MaliciousContentStatus
- ChromeSecurityStateTabHelper::GetMaliciousContentStatus() const {
-  using enum safe_browsing::SBThreatType;
-
-  content::NavigationEntry* entry =
-      web_contents()->GetController().GetVisibleEntry();
-  if (!entry) {
-    return security_state::MALICIOUS_CONTENT_STATUS_NONE;
-  }
-  safe_browsing::SafeBrowsingService* sb_service =
-      g_browser_process->safe_browsing_service();
-  if (!sb_service) {
-    return security_state::MALICIOUS_CONTENT_STATUS_NONE;
-  }
-  scoped_refptr<SafeBrowsingUIManager> sb_ui_manager = sb_service->ui_manager();
-  safe_browsing::SBThreatType threat_type;
-  if (sb_ui_manager->IsUrlAllowlistedOrPendingForWebContents(
-          entry->GetURL(), entry, web_contents(), false, &threat_type)) {
-    switch (threat_type) {
-      case SB_THREAT_TYPE_UNUSED:
-      case SB_THREAT_TYPE_SAFE:
-      case SB_THREAT_TYPE_URL_PHISHING:
-      case SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING:
-        return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
-      case SB_THREAT_TYPE_URL_MALWARE:
-        return security_state::MALICIOUS_CONTENT_STATUS_MALWARE;
-      case SB_THREAT_TYPE_URL_UNWANTED:
-        return security_state::MALICIOUS_CONTENT_STATUS_UNWANTED_SOFTWARE;
-      case SB_THREAT_TYPE_SAVED_PASSWORD_REUSE:
-#if BUILDFLAG(FULL_SAFE_BROWSING)
-        return security_state::MALICIOUS_CONTENT_STATUS_SAVED_PASSWORD_REUSE;
-#endif
-      case SB_THREAT_TYPE_SIGNED_IN_SYNC_PASSWORD_REUSE:
-#if BUILDFLAG(FULL_SAFE_BROWSING)
-        if (safe_browsing::ChromePasswordProtectionService::
-                ShouldShowPasswordReusePageInfoBubble(
-                    web_contents(), PasswordType::PRIMARY_ACCOUNT_PASSWORD)) {
-          return security_state::
-              MALICIOUS_CONTENT_STATUS_SIGNED_IN_SYNC_PASSWORD_REUSE;
-        }
-#endif
-        [[fallthrough]];
-      case SB_THREAT_TYPE_SIGNED_IN_NON_SYNC_PASSWORD_REUSE:
-#if BUILDFLAG(FULL_SAFE_BROWSING)
-        if (safe_browsing::ChromePasswordProtectionService::
-                ShouldShowPasswordReusePageInfoBubble(
-                    web_contents(), PasswordType::OTHER_GAIA_PASSWORD)) {
-          return security_state::
-              MALICIOUS_CONTENT_STATUS_SIGNED_IN_NON_SYNC_PASSWORD_REUSE;
-        }
-#endif
-        [[fallthrough]];
-      case SB_THREAT_TYPE_ENTERPRISE_PASSWORD_REUSE:
-#if BUILDFLAG(FULL_SAFE_BROWSING)
-        if (safe_browsing::ChromePasswordProtectionService::
-                ShouldShowPasswordReusePageInfoBubble(
-                    web_contents(), PasswordType::ENTERPRISE_PASSWORD)) {
-          return security_state::
-              MALICIOUS_CONTENT_STATUS_ENTERPRISE_PASSWORD_REUSE;
-        }
-#endif
-        // If user has already changed password or FULL_SAFE_BROWSING isn't
-        // enabled, returns the regular social engineering content status.
-        return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
-      case SB_THREAT_TYPE_BILLING:
-        return security_state::MALICIOUS_CONTENT_STATUS_BILLING;
-      case SB_THREAT_TYPE_MANAGED_POLICY_BLOCK:
-        return security_state::MALICIOUS_CONTENT_STATUS_MANAGED_POLICY_BLOCK;
-      case SB_THREAT_TYPE_MANAGED_POLICY_WARN:
-        return security_state::MALICIOUS_CONTENT_STATUS_MANAGED_POLICY_WARN;
-      case DEPRECATED_SB_THREAT_TYPE_URL_PASSWORD_PROTECTION_PHISHING:
-      case DEPRECATED_SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE:
-      case SB_THREAT_TYPE_URL_BINARY_MALWARE:
-      case SB_THREAT_TYPE_EXTENSION:
-      case SB_THREAT_TYPE_API_ABUSE:
-      case SB_THREAT_TYPE_SUBRESOURCE_FILTER:
-      case SB_THREAT_TYPE_CSD_ALLOWLIST:
-      case SB_THREAT_TYPE_AD_SAMPLE:
-      case SB_THREAT_TYPE_BLOCKED_AD_POPUP:
-      case SB_THREAT_TYPE_BLOCKED_AD_REDIRECT:
-      case SB_THREAT_TYPE_SUSPICIOUS_SITE:
-      case SB_THREAT_TYPE_APK_DOWNLOAD:
-      case SB_THREAT_TYPE_HIGH_CONFIDENCE_ALLOWLIST:
-        // These threat types are not currently associated with
-        // interstitials, and thus resources with these threat types are
-        // not ever whitelisted or pending whitelisting.
-        NOTREACHED();
-    }
-  }
-   return security_state::MALICIOUS_CONTENT_STATUS_NONE;
- }
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -493,37 +493,8 @@ void TabHelpers::AttachTabHelpers(WebCon
+@@ -486,35 +486,8 @@ void TabHelpers::AttachTabHelpers(WebCon
   //     See https://crbug.com/910288.
   resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
       web_contents);
@@ -873,9 +480,7 @@
 -        web_contents,
 -        safe_browsing::TailoredSecurityServiceFactory::GetForProfile(profile));
 -  }
-  if (base::FeatureList::IsEnabled(
-          safe_browsing::kSafeBrowsingAsyncRealTimeCheck) &&
-      g_browser_process->safe_browsing_service()) {
+-  if (g_browser_process->safe_browsing_service()) {
 -    safe_browsing::AsyncCheckTracker::CreateForWebContents(
 -        web_contents, g_browser_process->safe_browsing_service()->ui_manager(),
 -        safe_browsing::AsyncCheckTracker::
@@ -895,10 +500,10 @@
   if (site_engagement::SiteEngagementService::IsEnabled()) {
 --- a/chrome/browser/ui/views/download/BUILD.gn
 +++ b/chrome/browser/ui/views/download/BUILD.gn
-@@ -24,7 +24,6 @@ source_set("download") {
-     "bubble/download_bubble_started_animation_views.h",
-     "bubble/download_dialog_view.cc",
+@@ -27,7 +27,6 @@ source_set("download") {
     "bubble/download_dialog_view.h",
+     "bubble/download_toolbar_ui_controller.cc",
+     "bubble/download_toolbar_ui_controller.h",
 -    "download_danger_prompt_views.cc",
     "download_in_progress_dialog_view.cc",
     "download_in_progress_dialog_view.h",
@@ -913,7 +518,7 @@
 #include "chrome/browser/download/download_history.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_item_warning_data.h"
-@@ -687,12 +686,6 @@ void DownloadsDOMHandler::RemoveDownload
+@@ -536,12 +535,6 @@ void DownloadsDOMHandler::RemoveDownload
   IdSet ids;
 
   for (download::DownloadItem* download : to_remove) {
@@ -936,205 +541,9 @@
 #include "chrome/browser/download/download_warning_desktop_hats_utils.h"
 #include "chrome/browser/ui/webui/downloads/downloads.mojom-forward.h"
 #include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h"
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
-+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
-@@ -292,65 +292,6 @@ CreateHttpsOnlyModePage(content::WebCont
-       /*use_new_interstitial=*/IsNewHttpsFirstModeInterstitialEnabled());
- }
- 
-std::unique_ptr<security_interstitials::SecurityInterstitialPage>
-CreateSafeBrowsingBlockingPage(content::WebContents* web_contents) {
-  safe_browsing::SBThreatType threat_type =
-      safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_MALWARE;
-  GURL request_url("http://example.com");
-  std::string url_param;
-  if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "url",
-                                 &url_param)) {
-    if (GURL(url_param).is_valid()) {
-      request_url = GURL(url_param);
-    }
-  }
-  std::string type_param;
-  if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "type",
-                                 &type_param)) {
-    if (type_param == "malware") {
-      threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_MALWARE;
-    } else if (type_param == "phishing") {
-      threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_PHISHING;
-    } else if (type_param == "unwanted") {
-      threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_UNWANTED;
-    } else if (type_param == "clientside_phishing") {
-      threat_type =
-          safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING;
-    } else if (type_param == "billing") {
-      threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_BILLING;
-    }
-  }
-  auto* primary_main_frame = web_contents->GetPrimaryMainFrame();
-  const content::GlobalRenderFrameHostId primary_main_frame_id =
-      primary_main_frame->GetGlobalId();
-  safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource;
-  resource.url = request_url;
-  resource.threat_type = threat_type;
-  resource.rfh_locator = UnsafeResourceLocator::CreateForRenderFrameToken(
-      primary_main_frame_id.child_id,
-      primary_main_frame->GetFrameToken().value());
-  resource.threat_source =
-      g_browser_process->safe_browsing_service()
-          ->database_manager()
-          ->GetBrowseUrlThreatSource(
-              safe_browsing::CheckBrowseUrlType::kHashDatabase);
-
-  // Normally safebrowsing interstitial types which block the main page load
-  // (SB_THREAT_TYPE_URL_MALWARE, SB_THREAT_TYPE_URL_PHISHING, and
-  // SB_THREAT_TYPE_URL_UNWANTED on main-frame loads) would expect there to be a
-  // pending navigation when the SafeBrowsingBlockingPage is created. This demo
-  // creates a SafeBrowsingBlockingPage but does not actually show a real
-  // interstitial. Instead it extracts the html and displays it manually, so the
-  // parts which depend on the NavigationEntry are not hit.
-  auto* ui_manager =
-      g_browser_process->safe_browsing_service()->ui_manager().get();
-  return base::WrapUnique<security_interstitials::SecurityInterstitialPage>(
-      ui_manager->CreateBlockingPage(
-          web_contents, request_url, {resource},
-          /*forward_extension_event=*/false,
-          /*blocked_page_shown_timestamp=*/std::nullopt));
-}
-
- std::unique_ptr<EnterpriseBlockPage> CreateEnterpriseBlockPage(
-     content::WebContents* web_contents) {
-   const GURL kRequestUrl("https://enterprise-block.example.net");
-@@ -370,36 +311,6 @@ std::unique_ptr<ManagedProfileRequiredPa
-                                                                kRequestUrl));
- }
- 
-std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWarnPage(
-    content::WebContents* web_contents) {
-  const GURL kRequestUrl("https://enterprise-warn.example.net");
-
-  auto* ui_manager =
-      g_browser_process->safe_browsing_service()->ui_manager().get();
-
-  auto* primary_main_frame = web_contents->GetPrimaryMainFrame();
-  const content::GlobalRenderFrameHostId primary_main_frame_id =
-      primary_main_frame->GetGlobalId();
-  safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource;
-  resource.url = kRequestUrl;
-  resource.threat_type =
-      safe_browsing::SBThreatType::SB_THREAT_TYPE_MANAGED_POLICY_WARN;
-  resource.rfh_locator = UnsafeResourceLocator::CreateForRenderFrameToken(
-      primary_main_frame_id.child_id,
-      primary_main_frame->GetFrameToken().value());
-  resource.threat_source =
-      g_browser_process->safe_browsing_service()
-          ->database_manager()
-          ->GetBrowseUrlThreatSource(
-              safe_browsing::CheckBrowseUrlType::kHashDatabase);
-
-  return std::make_unique<EnterpriseWarnPage>(
-      ui_manager, web_contents, kRequestUrl,
-      safe_browsing::SafeBrowsingBlockingPage::UnsafeResourceList({resource}),
-      std::make_unique<EnterpriseWarnControllerClient>(web_contents,
-                                                       kRequestUrl));
-}
-
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
- std::unique_ptr<SupervisedUserVerificationPageForYouTube>
- CreateSupervisedUserVerificationPageForYouTube(
-@@ -436,63 +347,6 @@ CreateSupervisedUserVerificationPageForB
- }
- #endif
- 
-std::unique_ptr<TestSafeBrowsingBlockingPageQuiet>
-CreateSafeBrowsingQuietBlockingPage(content::WebContents* web_contents) {
-  safe_browsing::SBThreatType threat_type =
-      safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_MALWARE;
-  GURL request_url("http://example.com");
-  std::string url_param;
-  if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "url",
-                                 &url_param)) {
-    if (GURL(url_param).is_valid()) {
-      request_url = GURL(url_param);
-    }
-  }
-  std::string type_param;
-  bool is_giant_webview = false;
-  if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "type",
-                                 &type_param)) {
-    if (type_param == "malware") {
-      threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_MALWARE;
-    } else if (type_param == "phishing") {
-      threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_PHISHING;
-    } else if (type_param == "unwanted") {
-      threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_UNWANTED;
-    } else if (type_param == "billing") {
-      threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_BILLING;
-    } else if (type_param == "giant") {
-      threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_URL_MALWARE;
-      is_giant_webview = true;
-    }
-  }
-  auto* primary_main_frame = web_contents->GetPrimaryMainFrame();
-  const content::GlobalRenderFrameHostId primary_main_frame_id =
-      primary_main_frame->GetGlobalId();
-  safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource;
-  resource.url = request_url;
-  resource.threat_type = threat_type;
-  resource.rfh_locator = UnsafeResourceLocator::CreateForRenderFrameToken(
-      primary_main_frame_id.child_id,
-      primary_main_frame->GetFrameToken().value());
-  resource.threat_source =
-      g_browser_process->safe_browsing_service()
-          ->database_manager()
-          ->GetBrowseUrlThreatSource(
-              safe_browsing::CheckBrowseUrlType::kHashDatabase);
-
-  // Normally safebrowsing interstitial types which block the main page load
-  // (SB_THREAT_TYPE_URL_MALWARE, SB_THREAT_TYPE_URL_PHISHING, and
-  // SB_THREAT_TYPE_URL_UNWANTED on main-frame loads) would expect there to be a
-  // pending navigation when the SafeBrowsingBlockingPage is created. This demo
-  // creates a SafeBrowsingBlockingPage but does not actually show a real
-  // interstitial. Instead it extracts the html and displays it manually, so the
-  // parts which depend on the NavigationEntry are not hit.
-  return base::WrapUnique<TestSafeBrowsingBlockingPageQuiet>(
-      TestSafeBrowsingBlockingPageQuiet::CreateBlockingPage(
-          g_browser_process->safe_browsing_service()->ui_manager().get(),
-          web_contents, request_url, resource, is_giant_webview));
-}
-
- #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
- std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
-     content::WebContents* web_contents) {
-@@ -601,12 +455,8 @@ void InterstitialHTMLSource::StartDataRe
-     interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
-   } else if (path_without_query == "/blocked-interception") {
-     interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
-  } else if (path_without_query == "/safebrowsing") {
-    interstitial_delegate = CreateSafeBrowsingBlockingPage(web_contents);
-   } else if (path_without_query == "/enterprise-block") {
-     interstitial_delegate = CreateEnterpriseBlockPage(web_contents);
-  } else if (path_without_query == "/enterprise-warn") {
-    interstitial_delegate = CreateEnterpriseWarnPage(web_contents);
-   } else if (path_without_query == "/clock") {
-     interstitial_delegate = CreateBadClockBlockingPage(web_contents);
-   } else if (path_without_query == "/lookalike") {
-@@ -638,12 +488,7 @@ void InterstitialHTMLSource::StartDataRe
- #endif
-   }
- 
-  if (path_without_query == "/quietsafebrowsing") {
-    std::unique_ptr<TestSafeBrowsingBlockingPageQuiet> blocking_page =
-        CreateSafeBrowsingQuietBlockingPage(web_contents);
-    html = blocking_page->GetHTML();
-    interstitial_delegate = std::move(blocking_page);
-  } else if (path_without_query == "/supervised-user-ask-parent") {
-+  if (path_without_query == "/supervised-user-ask-parent") {
-     html = GetSupervisedUserInterstitialHTML(path);
-   } else if (interstitial_delegate.get()) {
-     html = interstitial_delegate.get()->GetHTMLContents();
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
-@@ -110,7 +110,6 @@
+@@ -113,7 +113,6 @@
 #include "components/pdf/common/pdf_util.h"
 #include "components/permissions/features.h"
 #include "components/safe_browsing/buildflags.h"
@@ -1142,7 +551,7 @@
 #include "components/sampling_profiler/process_type.h"
 #include "components/sampling_profiler/thread_profiler.h"
 #include "components/security_interstitials/content/renderer/security_interstitial_page_controller_delegate_impl.h"
-@@ -477,12 +476,8 @@ void ChromeContentRendererClient::Render
+@@ -484,12 +483,8 @@ void ChromeContentRendererClient::Render
     thread->AddObserver(fingerprinting_protection_ruleset_dealer_.get());
   }
 
--- 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/crowdsourcing/autofill_crowdsourcing_manager.cc
 +++ b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc
-@@ -874,93 +874,6 @@ std::tuple<GURL, std::string> AutofillCr
+@@ -868,93 +868,6 @@ std::tuple<GURL, std::string> AutofillCr
 }
 
 bool AutofillCrowdsourcingManager::StartRequest(FormRequestData request_data) {
--- a/patches/core/inox-patchset/0015-disable-update-pings.patch
+++ b/patches/core/inox-patchset/0015-disable-update-pings.patch
@@ -1,6 +1,6 @@
 --- a/chrome/updater/configurator.cc
 +++ b/chrome/updater/configurator.cc
-@@ -113,7 +113,7 @@ base::TimeDelta Configurator::UpdateDela
+@@ -114,7 +114,7 @@ base::TimeDelta Configurator::UpdateDela
 
 std::vector<GURL> Configurator::UpdateUrl() const {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
--- 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
-@@ -476,14 +476,6 @@ group("gn_all") {
+@@ -477,14 +477,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
@@ -112,7 +112,7 @@ by default.
     scoped_refptr<base::SequencedTaskRunner> task_runner)
 --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
 +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -533,7 +533,7 @@ void WebRtcLogUploader::UploadCompressed
+@@ -538,7 +538,7 @@ void WebRtcLogUploader::UploadCompressed
           }
         })");
 
@@ -178,21 +178,21 @@ by default.
               base::ToLowerASCII(bdict_file));
 --- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
 +++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
-@@ -44,7 +44,7 @@ const char* kUpdateBrowserRedirectUrl =
- #else
-     // The URL to be used to re-install Chrome when auto-update failed for
-     // too long.
-    "https://www.google.com/chrome";
-+    "trk:242:https://www.google.com/chrome";
- #endif
+@@ -33,7 +33,7 @@
+ namespace {
+ 
+ // The URL to be used to re-install Chrome when auto-update failed for too long.
+-const char* kUpdateBrowserRedirectUrl = "https://www.google.com/chrome";
+const char* kUpdateBrowserRedirectUrl = "trk:242:https://www.google.com/chrome";
 
 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
@@ -72,17 +72,17 @@ namespace {
 // The URL for the the Learn More page shown on incognito new tab.
 const char kLearnMoreIncognitoUrl[] =
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS)
 -    "https://support.google.com/chromebook/?p=incognito";
 +    "trk:246:https://support.google.com/chromebook/?p=incognito";
 #else
@@ -202,7 +202,7 @@ by default.
 
 // The URL for the Learn More page shown on guest session new tab.
 const char kLearnMoreGuestSessionUrl[] =
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS)
 -    "https://support.google.com/chromebook/?p=chromebook_guest";
 +    "trk:248:https://support.google.com/chromebook/?p=chromebook_guest";
 #else
@@ -274,7 +274,7 @@ by default.
 
 --- a/components/google/core/common/google_util.cc
 +++ b/components/google/core/common/google_util.cc
-@@ -151,7 +151,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
+@@ -147,7 +147,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
 
 // Global functions -----------------------------------------------------------
 
@@ -403,6 +403,22 @@ by default.
 
 #if BUILDFLAG(IS_WIN)
   GURL url(base::WideToUTF16(args[0]));
+--- a/extensions/common/extension_urls.cc
+++ b/extensions/common/extension_urls.cc
+@@ -39,10 +39,10 @@ const GURL* g_item_snippet_url_for_test_
+ 
+ }  // namespace
+ 
+-const char kChromeWebstoreBaseURL[] = "https://chrome.google.com/webstore";
+-const char kNewChromeWebstoreBaseURL[] = "https://chromewebstore.google.com/";
+const char kChromeWebstoreBaseURL[] = "trk:09:https://chrome.google.com/webstore";
+const char kNewChromeWebstoreBaseURL[] = "trk:08:https://chromewebstore.google.com/";
+ const char kChromeWebstoreUpdateURL[] =
+-    "https://clients2.google.com/service/update2/crx";
+    "trk:05:https://clients2.google.com/service/update2/crx";
+ 
+ const char kAppMenuUtmSource[] = "ext_app_menu";
+ const char kExtensionsMenuUtmSource[] = "ext_extensions_menu";
 --- a/google_apis/gaia/gaia_constants.cc
 +++ b/google_apis/gaia/gaia_constants.cc
@@ -14,169 +14,169 @@ const char kChromeSource[] = "ChromiumBr
--- a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch
+++ b/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch
@@ -56,7 +56,7 @@ the URL so we get notified if this happens again in the future).
 IncidentReportingService::IncidentReportingService(
 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc
 +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
-@@ -383,7 +383,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
+@@ -379,7 +379,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
 }
 
 void SafeBrowsingServiceImpl::RegisterAllDelayedAnalysis() {
--- a/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch
+++ b/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch
@@ -13,7 +13,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).

 --- a/components/safe_browsing/content/browser/client_side_detection_service.cc
 +++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
-@@ -310,6 +310,10 @@ void ClientSideDetectionService::StartCl
+@@ -314,6 +314,10 @@ void ClientSideDetectionService::StartCl
     return;
   }
 
@@ -24,7 +24,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
   std::string request_data;
   request->SerializeToString(&request_data);
 
-@@ -392,6 +396,7 @@ void ClientSideDetectionService::StartCl
+@@ -396,6 +400,7 @@ void ClientSideDetectionService::StartCl
       base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent,
                      base::Unretained(WebUIInfoSingleton::GetInstance()),
                      std::move(request), access_token));
--- a/patches/core/ungoogled-chromium/block-requests.patch
+++ b/patches/core/ungoogled-chromium/block-requests.patch
@@ -8,7 +8,7 @@
 # Dev tools attempts to download css data
 --- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
 +++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
-@@ -290,6 +290,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
+@@ -301,6 +301,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
 OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default;
 
 void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) {
@@ -18,7 +18,7 @@
   // Note: If there is an ongoing request, abandon it. It's possible that
 --- a/chrome/browser/new_tab_page/promos/promo_service.cc
 +++ b/chrome/browser/new_tab_page/promos/promo_service.cc
-@@ -170,6 +170,7 @@ PromoService::PromoService(
+@@ -175,6 +175,7 @@ PromoService::PromoService(
 PromoService::~PromoService() = default;
 
 void PromoService::Refresh() {
--- 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
-@@ -568,7 +568,8 @@ void AutocompleteInput::ParseForEmphasiz
+@@ -582,7 +582,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,7 +70,7 @@
   // other origins, so we should not treat them as web safe. Remove callers of
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1065,6 +1065,8 @@ component("net") {
+@@ -1071,6 +1071,8 @@ component("net") {
     "url_request/referrer_policy.h",
     "url_request/static_http_user_agent_settings.cc",
     "url_request/static_http_user_agent_settings.h",
--- a/patches/core/ungoogled-chromium/disable-crash-reporter.patch
+++ b/patches/core/ungoogled-chromium/disable-crash-reporter.patch
@@ -2,7 +2,7 @@

 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -2702,24 +2702,6 @@ void ChromeContentBrowserClient::AppendE
+@@ -2700,24 +2700,6 @@ void ChromeContentBrowserClient::AppendE
     command_line->AppendSwitchASCII(switches::kMetricsClientID,
                                     client_info->client_id);
   }
@@ -29,7 +29,7 @@
   if (logging::DialogsAreSuppressed())
 --- a/components/crash/core/app/crashpad.cc
 +++ b/components/crash/core/app/crashpad.cc
-@@ -68,6 +68,12 @@ void InitializeDatabasePath(const base::
+@@ -72,6 +72,12 @@ void InitializeDatabasePath(const base::
 }
 
 bool InitializeCrashpadImpl(bool initial_client,
--- a/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch
+++ b/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch
@@ -2,7 +2,7 @@

 --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
 +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
-@@ -292,7 +292,7 @@ bool DomDistillerViewerSource::ShouldSer
+@@ -297,7 +297,7 @@ bool DomDistillerViewerSource::ShouldSer
 std::string DomDistillerViewerSource::GetContentSecurityPolicy(
     network::mojom::CSPDirectiveName directive) {
   if (directive == network::mojom::CSPDirectiveName::StyleSrc) {
@@ -35,16 +35,20 @@
   document.head.appendChild(e);
 --- a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
 +++ b/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
-@@ -12,8 +12,7 @@
+@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. */
 
-@import "https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset=latin,cyrillic-ext,greek-ext,cyrillic,greek,vietnamese,latin-ext";
-@import "https://fonts.googleapis.com/css?family=Source+Code+Pro";
+-@import url('https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,100..900;1,100..900&display=swap');
+-@import url('https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,200..900;1,200..900&display=swap');
 +@import "chrome://resources/css/roboto.css";
 
- body,
- table,
+ :root {
+   --font-family-normal: 'Noto Sans',
+    'Roboto',
+     'Lucida Grande',
+     'Lucida Sans Unicode',
+     Helvetica,
 --- a/tools/md_browser/base.css
 +++ b/tools/md_browser/base.css
@@ -16,8 +16,7 @@
--- a/patches/core/ungoogled-chromium/disable-gcm.patch
+++ b/patches/core/ungoogled-chromium/disable-gcm.patch
@@ -2,7 +2,7 @@

 --- a/components/gcm_driver/gcm_client_impl.cc
 +++ b/components/gcm_driver/gcm_client_impl.cc
-@@ -449,6 +449,7 @@ void GCMClientImpl::StartGCM() {
+@@ -432,6 +432,7 @@ void GCMClientImpl::StartGCM() {
 
 void GCMClientImpl::InitializeMCSClient() {
   DCHECK(network_connection_tracker_);
@@ -10,7 +10,7 @@
   std::vector<GURL> endpoints;
   endpoints.push_back(gservices_settings_.GetMCSMainEndpoint());
   GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint();
-@@ -653,28 +654,6 @@ void GCMClientImpl::RemoveHeartbeatInter
+@@ -611,23 +612,6 @@ void GCMClientImpl::RemoveHeartbeatInter
 
 void GCMClientImpl::StartCheckin() {
   DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
@@ -22,24 +22,19 @@
 -  checkin_proto::ChromeBuildProto chrome_build_proto;
 -  ToCheckinProtoVersion(chrome_build_info_, &chrome_build_proto);
 -
-  std::map<std::string, std::string> empty_account_tokens;
-
 -  CheckinRequest::RequestInfo request_info(
 -      device_checkin_info_.android_id, device_checkin_info_.secret,
-      empty_account_tokens, gservices_settings_.digest(), chrome_build_proto);
+-      gservices_settings_.digest(), chrome_build_proto);
 -  checkin_request_ = std::make_unique<CheckinRequest>(
 -      gservices_settings_.GetCheckinURL(), request_info, GetGCMBackoffPolicy(),
 -      base::BindOnce(&GCMClientImpl::OnCheckinCompleted,
 -                     weak_ptr_factory_.GetWeakPtr()),
 -      url_loader_factory_, io_task_runner_, &recorder_);
-  // Taking a snapshot of the accounts count here, as there might be an asynch
-  // update of the account tokens while checkin is in progress.
-  device_checkin_info_.SnapshotCheckinAccounts();
 -  checkin_request_->Start();
 }
 
 void GCMClientImpl::OnCheckinCompleted(
-@@ -731,24 +710,6 @@ void GCMClientImpl::SetGServicesSettings
+@@ -684,24 +668,6 @@ void GCMClientImpl::SetGServicesSettings
 
 void GCMClientImpl::SchedulePeriodicCheckin() {
   DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
--- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch
+++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch
@@ -197,7 +197,7 @@
 #if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
 --- a/components/google/core/common/google_util.cc
 +++ b/components/google/core/common/google_util.cc
-@@ -36,117 +36,6 @@ namespace google_util {
+@@ -32,117 +32,6 @@ namespace google_util {
 
 namespace {
 
@@ -315,7 +315,7 @@
 }  // namespace
 
 // Global functions -----------------------------------------------------------
-@@ -154,13 +43,6 @@ bool IsGoogleSearchSubdomainUrl(const GU
+@@ -150,13 +39,6 @@ bool IsGoogleSearchSubdomainUrl(const GU
 const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/";
 
 bool HasGoogleSearchQueryParam(std::string_view str) {
@@ -329,7 +329,7 @@
   return false;
 }
 
-@@ -171,170 +53,53 @@ std::string GetGoogleLocale(const std::s
+@@ -167,170 +49,53 @@ std::string GetGoogleLocale(const std::s
 
 GURL AppendGoogleLocaleParam(const GURL& url,
                              const std::string& application_locale) {
@@ -475,7 +475,7 @@
 -
 -  // Some domains don't have international TLD extensions, so testing for them
 -  // is very straightforward.
-  static const char* kSuffixesToSetHeadersFor[] = {
+-  static auto kSuffixesToSetHeadersFor = std::to_array<const char*>({
 -      ".android.com",
 -      ".doubleclick.com",
 -      ".doubleclick.net",
@@ -489,7 +489,7 @@
 -      ".litepages.googlezip.net",
 -      ".youtubekids.com",
 -      ".ytimg.com",
-  };
+-  });
 -  const std::string host = url.host();
 -  for (auto* i : kSuffixesToSetHeadersFor) {
 -    if (base::EndsWith(host, i, base::CompareCase::INSENSITIVE_ASCII)) {
@@ -498,9 +498,9 @@
 -  }
 -
 -  // Exact hostnames in lowercase to set headers for.
-  static const char* kHostsToSetHeadersFor[] = {
+-  static auto kHostsToSetHeadersFor = std::to_array<const char*>({
 -      "googleweblight.com",
-  };
+-  });
 -  for (auto* i : kHostsToSetHeadersFor) {
 -    if (base::EqualsCaseInsensitiveASCII(host, i)) {
 -      return true;
@@ -565,15 +565,14 @@
 bool IsProbablyGoogleSearchUrl(const GURL& url) {
 --- a/components/search_engines/template_url.cc
 +++ b/components/search_engines/template_url.cc
-@@ -609,11 +609,7 @@ std::u16string TemplateURLRef::SearchTer
+@@ -614,10 +614,7 @@ std::u16string TemplateURLRef::SearchTer
 bool TemplateURLRef::HasGoogleBaseURLs(
     const SearchTermsData& search_terms_data) const {
   ParseIfNecessary(search_terms_data);
-  return base::ranges::any_of(
-      replacements_, [](const Replacement& replacement) {
-        return replacement.type == GOOGLE_BASE_URL ||
-               replacement.type == GOOGLE_BASE_SUGGEST_URL;
-      });
+-  return std::ranges::any_of(replacements_, [](const Replacement& replacement) {
+-    return replacement.type == GOOGLE_BASE_URL ||
+-           replacement.type == GOOGLE_BASE_SUGGEST_URL;
+-  });
 +  return false;
 }
 
@@ -682,7 +681,7 @@
 }  // namespace variations
 --- a/content/browser/preloading/prefetch/prefetch_container.cc
 +++ b/content/browser/preloading/prefetch/prefetch_container.cc
-@@ -988,7 +988,7 @@ void PrefetchContainer::AddRedirectHop(c
+@@ -986,7 +986,7 @@ void PrefetchContainer::AddRedirectHop(c
   // some which are added by throttles). These aren't yet supported for
   // prefetch, including browsing topics and client hints.
   net::HttpRequestHeaders updated_headers;
--- a/patches/core/ungoogled-chromium/disable-mei-preload.patch
+++ b/patches/core/ungoogled-chromium/disable-mei-preload.patch
@@ -7,15 +7,15 @@

 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -372,7 +372,6 @@ if (!is_android && !is_mac) {
-       }
+@@ -368,7 +368,6 @@ if (!is_android && !is_mac) {
+     }
 
-       data_deps += [
-        "//chrome/browser/resources/media/mei_preload:component",
-         "//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component",
-         "//third_party/widevine/cdm",
-       ]
-@@ -1212,7 +1211,6 @@ if (is_win) {
+     data_deps += [
+-      "//chrome/browser/resources/media/mei_preload:component",
+       "//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component",
+       "//third_party/widevine/cdm",
+     ]
+@@ -1198,7 +1197,6 @@ if (is_win) {
       ":optimization_guide_library",
       ":swiftshader_binaries",
       ":widevine_cdm_library",
@@ -25,7 +25,7 @@
 
 --- a/chrome/browser/resources/BUILD.gn
 +++ b/chrome/browser/resources/BUILD.gn
-@@ -90,11 +90,6 @@ group("resources") {
+@@ -87,11 +87,6 @@ group("resources") {
     public_deps += [ "accessibility:reading_mode_gdocs_extension_resources" ]
   }
 
--- a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch
+++ b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch
@@ -1,14 +1,46 @@
--- a/components/attribution_reporting/features.cc
-+++ b/components/attribution_reporting/features.cc
-@@ -11,7 +11,7 @@ namespace attribution_reporting::feature
- // Controls whether the Conversion Measurement API infrastructure is enabled.
- BASE_FEATURE(kConversionMeasurement,
-              "ConversionMeasurement",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             base::FEATURE_DISABLED_BY_DEFAULT);
+--- a/components/browsing_data/content/browsing_data_model.cc
+++ b/components/browsing_data/content/browsing_data_model.cc
+@@ -1002,12 +1002,6 @@ void BrowsingDataModel::PopulateFromDisk
+       base::FeatureList::IsEnabled(blink::features::kSharedStorageAPI);
+   bool is_shared_dictionary_enabled = base::FeatureList::IsEnabled(
+       network::features::kCompressionDictionaryTransportBackend);
+-  bool is_interest_group_enabled =
+-      base::FeatureList::IsEnabled(blink::features::kInterestGroupStorage);
+-  bool is_attribution_reporting_enabled = base::FeatureList::IsEnabled(
+-      attribution_reporting::features::kConversionMeasurement);
+-  bool is_private_aggregation_enabled =
+-      base::FeatureList::IsEnabled(blink::features::kPrivateAggregationApi);
 
- BASE_FEATURE(kAttributionAggregatableNamedBudgets,
-              "AttributionAggregatableNamedBudgets",
+   base::RepeatingClosure completion =
+       base::BindRepeating([](const base::OnceClosure&) {},
+@@ -1044,27 +1038,7 @@ void BrowsingDataModel::PopulateFromDisk
+         base::BindOnce(&OnSharedDictionaryUsageLoaded, this, completion));
+   }
+ 
+-  // Interest Groups
+-  if (is_interest_group_enabled) {
+-    content::InterestGroupManager* manager =
+-        storage_partition_->GetInterestGroupManager();
+-    if (manager) {
+-      manager->GetAllInterestGroupDataKeys(
+-          base::BindOnce(&OnInterestGroupsLoaded, this, completion));
+-    }
+-  }
+-
+-  // Attribution Reporting
+-  if (is_attribution_reporting_enabled) {
+-    storage_partition_->GetAttributionDataModel()->GetAllDataKeys(
+-        base::BindOnce(&OnAttributionReportingLoaded, this, completion));
+-  }
+ 
+-  // Private Aggregation
+-  if (is_private_aggregation_enabled) {
+-    storage_partition_->GetPrivateAggregationDataModel()->GetAllDataKeys(
+-        base::BindOnce(&OnPrivateAggregationLoaded, this, completion));
+-  }
+ 
+ #if BUILDFLAG(ENABLE_LIBRARY_CDMS)
+   storage_partition_->GetCdmStorageDataModel()->GetUsagePerAllStorageKeys(
 --- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
@@ -131,7 +131,7 @@ std::set<browsing_topics::Topic> GetTopi
@@ -20,7 +52,7 @@
 }
 
 // static
-@@ -851,7 +851,7 @@ void PrivacySandboxSettingsImpl::SetTopi
+@@ -850,7 +850,7 @@ void PrivacySandboxSettingsImpl::SetTopi
 }
 
 bool PrivacySandboxSettingsImpl::IsPrivacySandboxRestricted() const {
@@ -29,7 +61,7 @@
 }
 
 bool PrivacySandboxSettingsImpl::IsPrivacySandboxCurrentlyUnrestricted() const {
-@@ -937,11 +937,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
+@@ -936,11 +936,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
     return Status::kIncognitoProfile;
   }
 
@@ -41,3 +73,223 @@
 }
 
 PrivacySandboxSettingsImpl::Status
+--- a/content/browser/attribution_reporting/attribution_suitable_context.cc
+++ b/content/browser/attribution_reporting/attribution_suitable_context.cc
+@@ -44,67 +44,7 @@ std::optional<AttributionSuitableContext
+ // static
+ std::optional<AttributionSuitableContext> AttributionSuitableContext::Create(
+     RenderFrameHostImpl* initiator_frame) {
+-  if (!initiator_frame) {
+     return std::nullopt;
+-  }
+-
+-  if (!base::FeatureList::IsEnabled(
+-          attribution_reporting::features::kConversionMeasurement)) {
+-    return std::nullopt;
+-  }
+-
+-  if (!initiator_frame->IsFeatureEnabled(
+-          network::mojom::PermissionsPolicyFeature::kAttributionReporting)) {
+-    return std::nullopt;
+-  }
+-  RenderFrameHostImpl* initiator_root_frame =
+-      initiator_frame->GetOutermostMainFrame();
+-  CHECK(initiator_root_frame);
+-
+-  // We need a suitable origin here because we need to be able to eventually
+-  // store it as either the source or destination origin. Using
+-  // `is_web_secure_context` only would allow opaque origins to pass through,
+-  // but they cannot be handled by the storage layer.
+-  std::optional<attribution_reporting::SuitableOrigin>
+-      initiator_root_frame_origin = SuitableOrigin::Create(
+-          initiator_root_frame->GetLastCommittedOrigin());
+-  if (!initiator_root_frame_origin.has_value()) {
+-    return std::nullopt;
+-  }
+-  // If the `initiator_frame` is a subframe, it's origin's security isn't
+-  // covered by the SuitableOrigin check above, we therefore validate that it's
+-  // origin is secure using `is_web_secure_context`.
+-  if (initiator_frame != initiator_root_frame &&
+-      !initiator_frame->policy_container_host()
+-           ->policies()
+-           .is_web_secure_context) {
+-    return std::nullopt;
+-  }
+-
+-  auto* web_contents = WebContents::FromRenderFrameHost(initiator_frame);
+-  if (!web_contents) {
+-    return std::nullopt;
+-  }
+-  auto* manager = AttributionManager::FromWebContents(web_contents);
+-  CHECK(manager);
+-
+-  auto* attribution_host = AttributionHost::FromWebContents(web_contents);
+-  CHECK(attribution_host);
+-
+-  AttributionDataHostManager* data_host_manager = manager->GetDataHostManager();
+-  CHECK(data_host_manager);
+-
+-  return AttributionSuitableContext(
+-      /*context_origin=*/std::move(initiator_root_frame_origin.value()),
+-      initiator_frame->IsNestedWithinFencedFrame(),
+-      initiator_root_frame->GetGlobalId(), initiator_frame->navigation_id(),
+-      attribution_host->GetMostRecentNavigationInputEvent(),
+-      AttributionOsLevelManager::GetAttributionReportingOsRegistrars(
+-          web_contents),
+-      !url_matcher::util::GetGoogleAmpViewerEmbeddedURL(
+-           initiator_root_frame->GetLastCommittedURL())
+-           .is_empty(),
+-      data_host_manager->AsWeakPtr());
+ }
+ 
+ // static
+--- a/content/browser/interest_group/ad_auction_service_impl.cc
+++ b/content/browser/interest_group/ad_auction_service_impl.cc
+@@ -217,11 +217,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD
+ void AdAuctionServiceImpl::CreateMojoService(
+     RenderFrameHost* render_frame_host,
+     mojo::PendingReceiver<blink::mojom::AdAuctionService> receiver) {
+-  CHECK(render_frame_host);
+-
+-  // The object is bound to the lifetime of `render_frame_host` and the mojo
+-  // connection. See DocumentService for details.
+-  new AdAuctionServiceImpl(*render_frame_host, std::move(receiver));
+ }
+ 
+ void AdAuctionServiceImpl::JoinInterestGroup(
+--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
+@@ -1482,38 +1482,7 @@ void StoragePartitionImpl::Initialize(
+ 
+   bucket_manager_ = std::make_unique<BucketManager>(this);
+ 
+-  if (base::FeatureList::IsEnabled(
+-          attribution_reporting::features::kConversionMeasurement)) {
+-    // The Conversion Measurement API is not available in Incognito mode, but
+-    // this is enforced by the `AttributionManagerImpl` itself for better error
+-    // reporting and metrics.
+-    attribution_manager_ = std::make_unique<AttributionManagerImpl>(
+-        this, path, special_storage_policy_);
+-  }
+ 
+-  if (base::FeatureList::IsEnabled(blink::features::kInterestGroupStorage)) {
+-    // Auction worklets on non-Android use dedicated processes; on Android due
+-    // to high cost of process launch they try to reuse renderers.
+-    interest_group_manager_ = std::make_unique<InterestGroupManagerImpl>(
+-        path, is_in_memory(),
+-#if BUILDFLAG(IS_ANDROID)
+-        InterestGroupManagerImpl::ProcessMode::kInRenderer,
+-#else
+-        InterestGroupManagerImpl::ProcessMode::kDedicated,
+-#endif
+-        GetURLLoaderFactoryForBrowserProcess(),
+-        base::BindRepeating(&BrowserContext::GetKAnonymityServiceDelegate,
+-                            // This use of Unretained is safe since the browser
+-                            // context owns this storage partition.
+-                            base::Unretained(browser_context_)));
+-  }
+-
+-  // The Topics API is not available in Incognito mode.
+-  if (!is_in_memory() &&
+-      base::FeatureList::IsEnabled(blink::features::kBrowsingTopics)) {
+-    browsing_topics_site_data_manager_ =
+-        std::make_unique<BrowsingTopicsSiteDataManagerImpl>(path);
+-  }
+ 
+   GeneratedCodeCacheSettings settings =
+       GetContentClient()->browser()->GetGeneratedCodeCacheSettings(
+@@ -1542,8 +1511,6 @@ void StoragePartitionImpl::Initialize(
+ 
+   font_access_manager_ = FontAccessManager::Create();
+ 
+-  aggregation_service_ =
+-      std::make_unique<AggregationServiceImpl>(is_in_memory(), path, this);
+ 
+ #if BUILDFLAG(ENABLE_LIBRARY_CDMS)
+   if (is_in_memory()) {
+@@ -1567,11 +1534,6 @@ void StoragePartitionImpl::Initialize(
+         std::make_unique<SharedStorageHeaderObserver>(this);
+   }
+ 
+-  if (base::FeatureList::IsEnabled(blink::features::kPrivateAggregationApi)) {
+-    private_aggregation_manager_ =
+-        std::make_unique<PrivateAggregationManagerImpl>(is_in_memory(), path,
+-                                                        this);
+-  }
+ }
+ 
+ void StoragePartitionImpl::OnStorageServiceDisconnected() {
+--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
+@@ -3857,12 +3857,6 @@ void WebContentsImpl::Init(const WebCont
+   DateTimeChooser::CreateDateTimeChooser(this);
+ #endif
+ 
+-  // AttributionHost must be created after `view_->CreateView()` is called as it
+-  // may invoke `WebContentsAndroid::AddObserver()`.
+-  if (base::FeatureList::IsEnabled(
+-          attribution_reporting::features::kConversionMeasurement)) {
+-    AttributionHost::CreateForWebContents(this);
+-  }
+ 
+   RedirectChainDetector::CreateForWebContents(this);
+   BtmWebContentsObserver::MaybeCreateForWebContents(this);
+--- a/content/services/auction_worklet/private_aggregation_bindings.cc
+++ b/content/services/auction_worklet/private_aggregation_bindings.cc
+@@ -402,56 +402,6 @@ PrivateAggregationBindings::~PrivateAggr
+ 
+ void PrivateAggregationBindings::AttachToContext(
+     v8::Local<v8::Context> context) {
+-  if (!base::FeatureList::IsEnabled(blink::features::kPrivateAggregationApi) ||
+-      !blink::features::kPrivateAggregationApiEnabledInProtectedAudience
+-           .Get()) {
+-    return;
+-  }
+-
+-  v8::Local<v8::External> v8_this =
+-      v8::External::New(v8_helper_->isolate(), this);
+-
+-  v8::Local<v8::Object> private_aggregation =
+-      v8::Object::New(v8_helper_->isolate());
+-
+-  v8::Local<v8::Function> send_histogram_report_function =
+-      v8::Function::New(
+-          context, &PrivateAggregationBindings::ContributeToHistogram, v8_this)
+-          .ToLocalChecked();
+-  private_aggregation
+-      ->Set(context,
+-            v8_helper_->CreateStringFromLiteral("contributeToHistogram"),
+-            send_histogram_report_function)
+-      .Check();
+-
+-  if (blink::features::kPrivateAggregationApiProtectedAudienceExtensionsEnabled
+-          .Get()) {
+-    v8::Local<v8::Function> report_contribution_for_event_function =
+-        v8::Function::New(
+-            context, &PrivateAggregationBindings::ContributeToHistogramOnEvent,
+-            v8_this)
+-            .ToLocalChecked();
+-    private_aggregation
+-        ->Set(
+-            context,
+-            v8_helper_->CreateStringFromLiteral("contributeToHistogramOnEvent"),
+-            report_contribution_for_event_function)
+-        .Check();
+-  }
+-
+-  v8::Local<v8::Function> enable_debug_mode_function =
+-      v8::Function::New(context, &PrivateAggregationBindings::EnableDebugMode,
+-                        v8_this)
+-          .ToLocalChecked();
+-  private_aggregation
+-      ->Set(context, v8_helper_->CreateStringFromLiteral("enableDebugMode"),
+-            enable_debug_mode_function)
+-      .Check();
+-
+-  context->Global()
+-      ->Set(context, v8_helper_->CreateStringFromLiteral("privateAggregation"),
+-            private_aggregation)
+-      .Check();
+ }
+ 
+ void PrivateAggregationBindings::Reset() {
--- a/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch
+++ b/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch
@@ -2,7 +2,7 @@

 --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
 +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -184,31 +184,13 @@ void WebRtcLogUploader::OnLoggingStopped
+@@ -186,31 +186,13 @@ void WebRtcLogUploader::OnLoggingStopped
   DCHECK(meta_data.get());
   DCHECK(!upload_done_data.paths.directory.empty());
 
@@ -35,7 +35,7 @@
   } else {
     main_task_runner_->PostTask(
         FROM_HERE,
-@@ -225,28 +207,7 @@ void WebRtcLogUploader::PrepareMultipart
+@@ -227,28 +209,7 @@ void WebRtcLogUploader::PrepareMultipart
   DCHECK(!compressed_log.empty());
   DCHECK(meta_data.get());
 
@@ -65,7 +65,7 @@
 }
 
 void WebRtcLogUploader::UploadStoredLog(
-@@ -313,48 +274,6 @@ void WebRtcLogUploader::LoggingStoppedDo
+@@ -315,48 +276,6 @@ void WebRtcLogUploader::LoggingStoppedDo
   DCHECK(log_buffer.get());
   DCHECK(!log_paths.directory.empty());
 
@@ -116,7 +116,7 @@
 
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -114,7 +114,7 @@ void RegisterBrowserUserPrefs(user_prefs
+@@ -113,7 +113,7 @@ void RegisterBrowserUserPrefs(user_prefs
   registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
   registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
   registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);
--- a/patches/core/ungoogled-chromium/disable-webstore-urls.patch
+++ b/patches/core/ungoogled-chromium/disable-webstore-urls.patch
@@ -2,7 +2,7 @@

 --- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
 +++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
-@@ -677,12 +677,6 @@ std::vector<url::Origin> ChromeContentBr
+@@ -680,12 +680,6 @@ std::vector<url::Origin> ChromeContentBr
     GetOriginsRequiringDedicatedProcess() {
   std::vector<url::Origin> list;
 
@@ -17,7 +17,7 @@
 
 --- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc
 +++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc
-@@ -305,17 +305,7 @@ bool ChromeContentVerifierDelegate::IsFr
+@@ -300,17 +300,7 @@ bool ChromeContentVerifierDelegate::IsFr
   // between which extensions are considered in-store.
   // See https://crbug.com/766806 for details.
   if (!InstallVerifier::IsFromStore(extension, context_)) {
@@ -177,7 +177,7 @@
       fetch->oauth2_attempt_count++;
 --- a/extensions/common/extension_urls.cc
 +++ b/extensions/common/extension_urls.cc
-@@ -67,8 +67,6 @@ GURL AppendUtmSource(const GURL& url, st
+@@ -68,8 +68,6 @@ GURL AppendUtmSource(const GURL& url, st
 
 GURL GetWebstoreExtensionsCategoryURL() {
   GURL base_url = GetNewWebstoreLaunchURL();
--- a/patches/core/ungoogled-chromium/extensions-manifestv2.patch
+++ b/patches/core/ungoogled-chromium/extensions-manifestv2.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
 +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
-@@ -575,17 +575,6 @@ void ExtensionInfoGenerator::CreateExten
+@@ -599,17 +599,6 @@ void ExtensionInfoGenerator::CreateExten
     info->controlled_info.emplace();
     info->controlled_info->text =
         l10n_util::GetStringUTF8(IDS_EXTENSIONS_INSTALL_LOCATION_ENTERPRISE);
@@ -20,7 +20,7 @@
   bool is_enabled = state == developer::ExtensionState::kEnabled;
 --- a/chrome/browser/extensions/extension_management.cc
 +++ b/chrome/browser/extensions/extension_management.cc
-@@ -310,31 +310,7 @@ bool ExtensionManagement::IsAllowedManif
+@@ -318,31 +318,7 @@ bool ExtensionManagement::IsAllowedManif
     int manifest_version,
     const std::string& extension_id,
     Manifest::Type manifest_type) {
@@ -52,7 +52,7 @@
 }
 
 bool ExtensionManagement::IsAllowedManifestVersion(const Extension* extension) {
-@@ -355,26 +331,8 @@ bool ExtensionManagement::IsExemptFromMV
+@@ -363,26 +339,8 @@ bool ExtensionManagement::IsExemptFromMV
     return false;
   }
 
@@ -81,7 +81,7 @@
 bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
 --- a/chrome/browser/extensions/manifest_v2_experiment_manager.cc
 +++ b/chrome/browser/extensions/manifest_v2_experiment_manager.cc
-@@ -144,22 +144,6 @@ bool ManifestV2ExperimentManagerFactory:
+@@ -145,22 +145,6 @@ bool ManifestV2ExperimentManagerFactory:
 
 // Determines the current stage of the MV2 deprecation experiments.
 MV2ExperimentStage CalculateCurrentExperimentStage() {
@@ -104,7 +104,7 @@
   return MV2ExperimentStage::kNone;
 }
 
-@@ -199,19 +183,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefF
+@@ -200,19 +184,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefF
 // Returns true if legacy extensions should be disabled, looking at both
 // experiment stage and global state.
 bool ShouldDisableLegacyExtensions(MV2ExperimentStage stage) {
@@ -126,12 +126,12 @@
 // Returns true if the given `stage` is one in which extension enablement should
 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
 +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
-@@ -462,7 +462,7 @@ content::WebUIDataSource* CreateAndAddEx
-       base::FeatureList::IsEnabled(
+@@ -467,7 +467,7 @@ content::WebUIDataSource* CreateAndAddEx
           extensions_features::kExtensionsMenuAccessControlWithPermittedSites));
-   source->AddBoolean("safetyHubShowReviewPanel",
-                     base::FeatureList::IsEnabled(features::kSafetyHub));
-+                     false);
+   source->AddBoolean(
+       "safetyHubThreeDotDetails",
+-      base::FeatureList::IsEnabled(features::kSafetyHubThreeDotDetails));
+      false);
 
   // MV2 deprecation.
   auto* mv2_experiment_manager = ManifestV2ExperimentManager::Get(profile);
--- a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch
+++ b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch
@@ -3,15 +3,15 @@

 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -374,7 +374,6 @@ if (!is_android && !is_mac) {
-       data_deps += [
-         "//chrome/browser/resources/media/mei_preload:component",
-         "//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component",
-        "//components/privacy_sandbox/privacy_sandbox_attestations/preload:component",
-         "//third_party/widevine/cdm",
-       ]
-       if (invoker.collect_inputs_only) {
-@@ -943,8 +942,6 @@ if (is_win) {
+@@ -370,7 +370,6 @@ if (!is_android && !is_mac) {
+     data_deps += [
+       "//chrome/browser/resources/media/mei_preload:component",
+       "//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component",
+-      "//components/privacy_sandbox/privacy_sandbox_attestations/preload:component",
+       "//third_party/widevine/cdm",
+     ]
+ 
+@@ -929,8 +928,6 @@ if (is_win) {
 
   bundle_data("chrome_framework_resources") {
     sources = [
@@ -20,7 +20,7 @@
       # This image is used to badge the lock icon in the
       # authentication dialogs, such as those used for installation
       # from disk image and Keystone promotion (if so enabled).  It
-@@ -1217,7 +1214,6 @@ if (is_win) {
+@@ -1203,7 +1200,6 @@ if (is_win) {
       ":widevine_cdm_library",
       "//chrome/browser/resources/media/mei_preload:component_bundle",
       "//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component_bundle",
@@ -30,7 +30,7 @@
     if (is_chrome_branded) {
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -727,10 +727,6 @@ static_library("browser") {
+@@ -746,10 +746,6 @@ static_library("browser") {
     "navigation_predictor/navigation_predictor_metrics_document_data.h",
     "navigation_predictor/navigation_predictor_preconnect_client.cc",
     "navigation_predictor/navigation_predictor_preconnect_client.h",
@@ -41,7 +41,7 @@
     "net/cert_verifier_service_time_updater.cc",
     "net/cert_verifier_service_time_updater.h",
     "net/chrome_mojo_proxy_resolver_factory.cc",
-@@ -3450,10 +3446,6 @@ static_library("browser") {
+@@ -3482,10 +3478,6 @@ static_library("browser") {
   } else {
     #!is_android
     sources += [
@@ -52,7 +52,7 @@
       "accessibility/caption_bubble_context_browser.h",
       "accessibility/embedded_a11y_extension_loader.cc",
       "accessibility/embedded_a11y_extension_loader.h",
-@@ -4180,10 +4172,6 @@ static_library("browser") {
+@@ -4225,10 +4217,6 @@ static_library("browser") {
       "//chrome/browser/new_tab_page/chrome_colors",
       "//chrome/browser/policy:path_parser",
       "//chrome/browser/resources:component_extension_resources",
@@ -63,7 +63,7 @@
       "//chrome/browser/search/background",
       "//chrome/browser/smart_card",
       "//chrome/browser/themes",
-@@ -4314,9 +4302,6 @@ static_library("browser") {
+@@ -4354,9 +4342,6 @@ static_library("browser") {
       "//components/webauthn/core/browser:passkey_model",
       "//services/device/public/cpp/bluetooth",
       "//services/device/public/cpp/hid",
@@ -73,25 +73,25 @@
       "//third_party/crashpad/crashpad/client:common",
       "//third_party/zxcvbn-cpp",
       "//ui/views",
-@@ -4411,8 +4396,6 @@ static_library("browser") {
-     #!is_android
-     if (!is_chromeos) {
+@@ -4453,8 +4438,6 @@ static_library("browser") {
       sources += [
+         "accessibility/soda_installer_impl.cc",
+         "accessibility/soda_installer_impl.h",
 -        "component_updater/screen_ai_component_installer.cc",
 -        "component_updater/screen_ai_component_installer.h",
+         "device_identity/device_oauth2_token_store_desktop.cc",
+         "device_identity/device_oauth2_token_store_desktop.h",
         "device_notifications/device_status_icon_renderer.cc",
-         "device_notifications/device_status_icon_renderer.h",
-         "external_protocol/auto_launch_protocols_policy_handler.cc",
-@@ -4429,8 +4412,6 @@ static_library("browser") {
-         "policy/chrome_browser_cloud_management_register_watcher.h",
-         "policy/file_selection_dialogs_policy_handler.cc",
-         "policy/file_selection_dialogs_policy_handler.h",
+@@ -4493,8 +4476,6 @@ static_library("browser") {
+         "profiles/profile_activity_metrics_recorder.h",
+         "profiles/profile_list_desktop.cc",
+         "profiles/profile_list_desktop.h",
 -        "screen_ai/screen_ai_downloader_non_chromeos.cc",
 -        "screen_ai/screen_ai_downloader_non_chromeos.h",
-         "usb/usb_status_icon.cc",
-         "usb/usb_status_icon.h",
-       ]
-@@ -5157,7 +5138,6 @@ static_library("browser") {
+         "signin/force_signin_verifier.cc",
+         "signin/force_signin_verifier.h",
+         "signin/signin_manager.cc",
+@@ -5294,7 +5275,6 @@ static_library("browser") {
       "//chrome/browser/policy:system_features_disable_list",
       "//chrome/browser/push_notification:push_notification",
       "//chrome/browser/resources:app_icon_resources",
@@ -99,15 +99,15 @@
       "//chrome/browser/support_tool/ash",
       "//chrome/browser/ui/ash/accelerator",
       "//chrome/browser/ui/ash/accessibility",
-@@ -5375,7 +5355,6 @@ static_library("browser") {
-       "//components/webapk:proto",
+@@ -5552,7 +5532,6 @@ static_library("browser") {
       "//device/vr/public/mojom:isolated_xr_service",
       "//remoting/host/chromeos:features",
+       "//services/device/public/cpp/geolocation",
 -      "//services/screen_ai/public/cpp:metrics",
       "//third_party/nearby:rpc_resources_proto",
       "//third_party/nearby:wire_format_proto",
       "//ui/chromeos",
-@@ -7995,12 +7974,6 @@ static_library("browser") {
+@@ -7778,12 +7757,6 @@ static_library("browser") {
   }
 
   if (enable_pdf) {
@@ -122,7 +122,7 @@
       "//chrome/browser/pdf:pdf_pref_names",
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -243,12 +243,10 @@
+@@ -249,12 +249,10 @@
 #if BUILDFLAG(IS_CHROMEOS)
 #include "chrome/browser/chromeos/extensions/telemetry/chromeos_telemetry_extensions_browser_api_provider.h"
 #include "chrome/browser/hid/hid_pinned_notification.h"
@@ -135,7 +135,7 @@
 #include "chrome/browser/usb/usb_status_icon.h"
 #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
 #endif
-@@ -1320,9 +1318,6 @@ void BrowserProcessImpl::PreMainMessageL
+@@ -1351,9 +1349,6 @@ void BrowserProcessImpl::PreMainMessageL
   soda_installer_impl_ = std::make_unique<speech::SodaInstallerImplChromeOS>();
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
@@ -147,7 +147,7 @@
   bool result = base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
-@@ -92,9 +92,6 @@ namespace speech {
+@@ -93,9 +93,6 @@ namespace speech {
 class SodaInstaller;
 }  // namespace speech
 
@@ -157,7 +157,7 @@
 
 // Real implementation of BrowserProcess that creates and returns the services.
 class BrowserProcessImpl : public BrowserProcess,
-@@ -425,9 +422,6 @@ class BrowserProcessImpl : public Browse
+@@ -437,9 +434,6 @@ class BrowserProcessImpl : public Browse
   // to ensure that SodaInstallerImpl gets destructed first.
   std::unique_ptr<speech::SodaInstaller> soda_installer_impl_;
 
@@ -169,16 +169,16 @@
   std::unique_ptr<BrowserProcessPlatformPart> platform_part_;
 --- a/chrome/browser/chrome_browser_interface_binders.cc
 +++ b/chrome/browser/chrome_browser_interface_binders.cc
-@@ -221,8 +221,6 @@
+@@ -127,8 +127,6 @@
 
 #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
     BUILDFLAG(IS_CHROMEOS)
 -#include "chrome/browser/screen_ai/screen_ai_service_router.h"
 -#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
 #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h"
- #include "chrome/browser/ui/webui/discards/discards.mojom.h"
- #include "chrome/browser/ui/webui/discards/discards_ui.h"
-@@ -735,27 +733,6 @@ void BindMediaFoundationPreferences(
+ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h"
+ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
+@@ -692,27 +690,6 @@ void BindMediaFoundationPreferences(
 }
 #endif  // BUILDFLAG(IS_WIN)
 
@@ -206,17 +206,15 @@
 
 void PopulateChromeFrameBinders(
     mojo::BinderMapWithContext<content::RenderFrameHost*>* map,
-@@ -893,13 +870,6 @@ void PopulateChromeFrameBinders(
+@@ -843,11 +820,6 @@ void PopulateChromeFrameBinders(
         base::BindRepeating(&web_app::SubAppsServiceImpl::CreateIfAllowed));
   }
 
 -  map->Add<screen_ai::mojom::ScreenAIAnnotator>(
 -      base::BindRepeating(&BindScreenAIAnnotator));
 -
-  if (features::IsReadAnythingWithScreen2xEnabled()) {
-    map->Add<screen_ai::mojom::Screen2xMainContentExtractor>(
-        base::BindRepeating(&BindScreen2xMainContentExtractor));
-  }
+-  map->Add<screen_ai::mojom::Screen2xMainContentExtractor>(
+-      base::BindRepeating(&BindScreen2xMainContentExtractor));
 #endif
 
 #if BUILDFLAG(IS_WIN)
@@ -231,7 +229,7 @@
 #endif  // BUILDFLAG(IS_ANDROID)
 
 #if !BUILDFLAG(IS_ANDROID)
-@@ -227,9 +225,6 @@ void RegisterComponentsForUpdate() {
+@@ -234,9 +232,6 @@ void RegisterComponentsForUpdate() {
 
   RegisterAutofillStatesComponent(cus, g_browser_process->local_state());
 
@@ -243,7 +241,7 @@
 
 --- a/chrome/browser/navigation_predictor/navigation_predictor.cc
 +++ b/chrome/browser/navigation_predictor/navigation_predictor.cc
-@@ -18,8 +18,6 @@
+@@ -17,8 +17,6 @@
 #include "base/time/default_tick_clock.h"
 #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service.h"
 #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
@@ -252,7 +250,7 @@
 #include "chrome/browser/preloading/preloading_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/no_state_prefetch/browser/no_state_prefetch_manager.h"
-@@ -106,10 +104,6 @@ base::TimeDelta MLModelExecutionTimerSta
+@@ -105,10 +103,6 @@ base::TimeDelta MLModelExecutionTimerSta
       blink::features::kPreloadingModelTimerStartDelay.Get());
 }
 
@@ -263,7 +261,7 @@
 
 base::TimeDelta MLModelMaxHoverTime() {
   return blink::features::kPreloadingModelMaxHoverTime.Get();
-@@ -416,80 +410,6 @@ void NavigationPredictor::ProcessPointer
+@@ -415,80 +409,6 @@ void NavigationPredictor::ProcessPointer
 }
 
 void NavigationPredictor::OnMLModelExecutionTimerFired() {
@@ -354,9 +352,33 @@
       {"thumbnailPageAriaLabel", IDS_PDF_THUMBNAIL_PAGE_ARIA_LABEL},
       {"tooltipAttachments", IDS_PDF_TOOLTIP_ATTACHMENTS},
       {"tooltipDocumentOutline", IDS_PDF_TOOLTIP_DOCUMENT_OUTLINE},
+--- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
+++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
+@@ -262,21 +262,6 @@ void PredictionBasedPermissionUiSelector
+     if (inner_text.size() > kPageContentMaxLength) {
+       inner_text.resize(kPageContentMaxLength);
+     }
+-    if (PredictionModelHandlerProvider* prediction_model_handler_provider =
+-            PredictionModelHandlerProviderFactory::GetForBrowserContext(
+-                profile_)) {
+-      if (GenAiModelHandler* gen_ai_model_handler =
+-              prediction_model_handler_provider->GetGenAiModelHandler()) {
+-        VLOG(1) << "[PermissionsAIv1] Inquire model.";
+-        gen_ai_model_handler->InquireGenAiOnDeviceModel(
+-            std::move(inner_text), request_type,
+-            base::BindRepeating(&PredictionBasedPermissionUiSelector::
+-                                    GenAIModelExecutionCallback,
+-                                weak_ptr_factory_.GetWeakPtr(),
+-                                std::move(features), request_type));
+-        return;
+-      }
+-    }
+     VLOG(1) << "[PermissionsAIv1] On device genAI model session unavailable";
+   } else {
+     VLOG(1) << "[PermissionsAIv1] The page's contnet too short or empty";
 --- a/chrome/browser/prefs/BUILD.gn
 +++ b/chrome/browser/prefs/BUILD.gn
-@@ -263,7 +263,6 @@ source_set("impl") {
+@@ -265,7 +265,6 @@ source_set("impl") {
   } else {
     deps += [
       "//chrome/browser/promos:utils",
@@ -366,7 +388,7 @@
       "//chrome/browser/search_engines",
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -1961,9 +1961,6 @@ void RegisterLocalState(PrefRegistrySimp
+@@ -1891,9 +1891,6 @@ void RegisterLocalState(PrefRegistrySimp
   DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
 #endif
 
@@ -378,7 +400,7 @@
   PlatformAuthPolicyObserver::RegisterPrefs(registry);
 --- a/chrome/browser/profiles/BUILD.gn
 +++ b/chrome/browser/profiles/BUILD.gn
-@@ -300,7 +300,6 @@ source_set("profiles_extra_parts_impl")
+@@ -302,7 +302,6 @@ source_set("profiles_extra_parts_impl")
       "//chrome/browser/feedback",
       "//chrome/browser/hid",
       "//chrome/browser/media/router/discovery/access_code:access_code_sink_service",
@@ -388,7 +410,7 @@
       "//chrome/browser/search_engine_choice",
 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -103,7 +103,6 @@
+@@ -107,7 +107,6 @@
 #include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
 #include "chrome/browser/metrics/variations/google_groups_manager_factory.h"
 #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
@@ -396,7 +418,7 @@
 #include "chrome/browser/net/dns_probe_service_factory.h"
 #include "chrome/browser/net/profile_network_context_service_factory.h"
 #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
-@@ -503,7 +502,6 @@
+@@ -508,7 +507,6 @@
 #include "chrome/browser/new_tab_page/promos/promo_service_factory.h"
 #include "chrome/browser/payments/payment_request_display_manager_factory.h"
 #include "chrome/browser/privacy_sandbox/privacy_sandbox_survey_desktop_controller_factory.h"
@@ -404,7 +426,7 @@
 #include "chrome/browser/search/background/ntp_background_service_factory.h"
 #include "chrome/browser/search/background/ntp_custom_background_service_factory.h"
 #include "chrome/browser/serial/serial_chooser_context_factory.h"
-@@ -995,7 +993,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1007,7 +1005,6 @@ void ChromeBrowserMainExtraPartsProfiles
 #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
   net::ServerCertificateDatabaseServiceFactory::GetInstance();
 #endif  // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
@@ -412,7 +434,7 @@
 #if BUILDFLAG(IS_CHROMEOS)
   NearbySharingServiceFactory::GetInstance();
   if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) {
-@@ -1047,9 +1044,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1059,9 +1056,6 @@ void ChromeBrowserMainExtraPartsProfiles
   OneTimePermissionsTrackerFactory::GetInstance();
 #endif
   OpenerHeuristicServiceFactory::GetInstance();
@@ -422,7 +444,21 @@
   OptimizationGuideKeyedServiceFactory::GetInstance();
   OriginKeyedPermissionActionServiceFactory::GetInstance();
   OriginTrialsFactory::GetInstance();
-@@ -1200,13 +1194,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1125,13 +1119,6 @@ void ChromeBrowserMainExtraPartsProfiles
+   policy::UserPolicySigninServiceFactory::GetInstance();
+ #endif
+   PolicyBlocklistFactory::GetInstance();
+-  if (base::FeatureList::IsEnabled(
+-          permissions::features::kPermissionOnDeviceNotificationPredictions) ||
+-      base::FeatureList::IsEnabled(
+-          permissions::features::kPermissionOnDeviceGeolocationPredictions) ||
+-      base::FeatureList::IsEnabled(permissions::features::kPermissionsAIv1)) {
+-    PredictionModelHandlerProviderFactory::GetInstance();
+-  }
+   PredictionServiceFactory::GetInstance();
+   predictors::AutocompleteActionPredictorFactory::GetInstance();
+   predictors::LoadingPredictorFactory::GetInstance();
+@@ -1213,13 +1200,6 @@ void ChromeBrowserMainExtraPartsProfiles
 #else
   SafetyHubMenuNotificationServiceFactory::GetInstance();
   SafetyHubHatsServiceFactory::GetInstance();
@@ -438,7 +474,7 @@
   if (ash::features::IsScannerEnabled()) {
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -829,24 +829,6 @@ void ProfileImpl::DoFinalInit(CreateMode
+@@ -846,24 +846,6 @@ void ProfileImpl::DoFinalInit(CreateMode
   // The password settings service needs to start listening to settings
   // changes from Google Mobile Services, as early as possible.
   PasswordManagerSettingsServiceFactory::GetForProfile(this);
@@ -465,7 +501,7 @@
   // The announcement notification  service might not be available for some
 --- a/chrome/browser/profiles/profile_manager.cc
 +++ b/chrome/browser/profiles/profile_manager.cc
-@@ -49,7 +49,6 @@
+@@ -51,7 +51,6 @@
 #include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
@@ -473,19 +509,19 @@
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/delete_profile_helper.h"
 #include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h"
-@@ -1493,9 +1492,6 @@ void ProfileManager::DoFinalInitForServi
+@@ -1497,9 +1496,6 @@ void ProfileManager::DoFinalInitForServi
   // Ensure NavigationPredictorKeyedService is started.
   NavigationPredictorKeyedServiceFactory::GetForProfile(profile);
 
 -  // Ensure PreloadingModelKeyedService is started.
 -  PreloadingModelKeyedServiceFactory::GetForProfile(profile);
 -
-   IdentityManagerFactory::GetForProfile(profile)->OnNetworkInitialized();
-   AccountReconcilorFactory::GetForProfile(profile);
- #if BUILDFLAG(IS_ANDROID)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+   contextual_cueing::ContextualCueingServiceFactory::GetForProfile(profile);
+ #endif
 --- a/chrome/browser/resources/BUILD.gn
 +++ b/chrome/browser/resources/BUILD.gn
-@@ -93,7 +93,6 @@ group("resources") {
+@@ -90,7 +90,6 @@ group("resources") {
   if (is_mac) {
     public_deps += [
       "//chrome/browser/resources/media/mei_preload:component",
@@ -508,7 +544,7 @@
 ${this.showErrorDialog ? html`<viewer-error-dialog id="error-dialog">
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -1681,8 +1681,6 @@ static_library("ui") {
+@@ -1705,8 +1705,6 @@ static_library("ui") {
       "//chrome/browser/reading_list",
       "//chrome/browser/safe_browsing",
       "//chrome/browser/safe_browsing:advanced_protection",
@@ -517,7 +553,7 @@
       "//chrome/browser/smart_card:smart_card",
       "//chrome/browser/tab_group_sync:utils",
       "//chrome/browser/themes",
-@@ -2361,7 +2359,6 @@ static_library("ui") {
+@@ -2376,7 +2374,6 @@ static_library("ui") {
       "//chrome/browser/policy:onc",
       "//chrome/browser/policy:system_features_disable_list",
       "//chrome/browser/push_notification:push_notification",
@@ -545,7 +581,7 @@
     "//chrome/common",
 --- a/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
 +++ b/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
-@@ -103,10 +103,4 @@ void ChromePDFDocumentHelperClient::SetP
+@@ -97,10 +97,4 @@ void ChromePDFDocumentHelperClient::SetP
 
 void ChromePDFDocumentHelperClient::OnSearchifyStarted(
     content::WebContents* contents) {
@@ -558,7 +594,7 @@
 }
 --- a/chrome/browser/ui/webui/settings/accessibility_main_handler.cc
 +++ b/chrome/browser/ui/webui/settings/accessibility_main_handler.cc
-@@ -36,11 +36,6 @@ void AccessibilityMainHandler::RegisterM
+@@ -35,11 +35,6 @@ void AccessibilityMainHandler::RegisterM
       base::BindRepeating(
           &AccessibilityMainHandler::HandleCheckAccessibilityImageLabels,
           base::Unretained(this)));
@@ -570,9 +606,9 @@
 }
 
 void AccessibilityMainHandler::OnJavascriptAllowed() {
-@@ -51,11 +46,6 @@ void AccessibilityMainHandler::OnJavascr
+@@ -50,11 +45,6 @@ void AccessibilityMainHandler::OnJavascr
           base::Unretained(this)));
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
 
 -  if (features::IsMainNodeAnnotationsEnabled()) {
 -    CHECK(!component_ready_observer_.IsObserving());
@@ -582,9 +618,9 @@
 }
 
 void AccessibilityMainHandler::OnJavascriptDisallowed() {
-@@ -63,35 +53,6 @@ void AccessibilityMainHandler::OnJavascr
+@@ -62,35 +52,6 @@ void AccessibilityMainHandler::OnJavascr
   accessibility_subscription_ = {};
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
 
 -  if (features::IsMainNodeAnnotationsEnabled()) {
 -    component_ready_observer_.Reset();
@@ -620,7 +656,7 @@
 void AccessibilityMainHandler::HandleGetScreenReaderState(
 --- a/chrome/browser/ui/webui/settings/accessibility_main_handler.h
 +++ b/chrome/browser/ui/webui/settings/accessibility_main_handler.h
-@@ -20,8 +20,7 @@ namespace settings {
+@@ -19,8 +19,7 @@ namespace settings {
 // Settings handler for the main accessibility settings page,
 // chrome://settings/accessibility.
 class AccessibilityMainHandler
@@ -630,7 +666,7 @@
  public:
   AccessibilityMainHandler();
   ~AccessibilityMainHandler() override;
-@@ -33,9 +32,6 @@ class AccessibilityMainHandler
+@@ -32,9 +31,6 @@ class AccessibilityMainHandler
   void OnJavascriptAllowed() override;
   void OnJavascriptDisallowed() override;
 
@@ -640,9 +676,9 @@
 
  private:
   void HandleGetScreenReaderState(const base::Value::List& args);
-@@ -52,9 +48,6 @@ class AccessibilityMainHandler
+@@ -51,9 +47,6 @@ class AccessibilityMainHandler
   base::CallbackListSubscription accessibility_subscription_;
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
 
 -  base::ScopedObservation<screen_ai::ScreenAIInstallState,
 -                          screen_ai::ScreenAIInstallState::Observer>
@@ -661,19 +697,17 @@
 #include "chrome/browser/speech/extension_api/tts_engine_extension_api.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/browser.h"
-@@ -364,26 +362,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
+@@ -364,24 +362,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
   prefs_lang = language::ExtractBaseLanguage(prefs_lang);
   SetDefaultLanguageCode(prefs_lang);
 
 -  if (use_screen_ai_service_) {
-    if (features::IsReadAnythingWithScreen2xEnabled()) {
-      screen_ai::ScreenAIServiceRouterFactory::GetForBrowserContext(profile_)
-          ->GetServiceStateAsync(
-              screen_ai::ScreenAIServiceRouter::Service::kMainContentExtraction,
-              base::BindOnce(&ReadAnythingUntrustedPageHandler::
-                                 OnScreenAIServiceInitialized,
-                             weak_factory_.GetWeakPtr()));
-    }
+-    screen_ai::ScreenAIServiceRouterFactory::GetForBrowserContext(profile_)
+-        ->GetServiceStateAsync(
+-            screen_ai::ScreenAIServiceRouter::Service::kMainContentExtraction,
+-            base::BindOnce(
+-                &ReadAnythingUntrustedPageHandler::OnScreenAIServiceInitialized,
+-                weak_factory_.GetWeakPtr()));
 -#if BUILDFLAG(ENABLE_PDF)
 -    // PDF searchify feature adds OCR text to images while loading the PDF, so
 -    // warming up the OCR service is not needed.
@@ -688,7 +722,7 @@
 
   // Enable accessibility for the top level render frame and all descendants.
   // This causes AXTreeSerializer to reset and send accessibility events of
-@@ -808,12 +786,6 @@ void ReadAnythingUntrustedPageHandler::S
+@@ -804,12 +784,6 @@ void ReadAnythingUntrustedPageHandler::S
           weak_factory_.GetSafeRef(), inner_contents[0], kReadAnythingAXMode);
     }
   }
@@ -703,7 +737,7 @@
 
 --- a/chrome/renderer/BUILD.gn
 +++ b/chrome/renderer/BUILD.gn
-@@ -377,18 +377,6 @@ static_library("renderer") {
+@@ -370,18 +370,6 @@ static_library("renderer") {
     ]
   } else {
     sources += [
@@ -722,7 +756,7 @@
       "media/chrome_speech_recognition_client.cc",
       "media/chrome_speech_recognition_client.h",
       "searchbox/searchbox.cc",
-@@ -402,7 +390,6 @@ static_library("renderer") {
+@@ -395,7 +383,6 @@ static_library("renderer") {
       "//components/crx_file",
       "//components/trusted_vault",
       "//services/screen_ai/buildflags",
@@ -764,7 +798,7 @@
 void ChromeRenderFrameObserver::DidMeaningfulLayout(
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -2019,9 +2019,6 @@ if (!is_android) {
+@@ -2079,9 +2079,6 @@ if (!is_android) {
       "//chrome/browser/resource_coordinator:tab_manager_features",
       "//chrome/browser/safe_browsing:advanced_protection",
       "//chrome/browser/safe_browsing:verdict_cache_manager_factory",
@@ -774,15 +808,7 @@
       "//chrome/browser/search",
       "//chrome/browser/search_engines",
       "//chrome/browser/segmentation_platform:test_utils",
-@@ -2060,7 +2057,6 @@ if (!is_android) {
-       "//chrome/browser/ui/omnibox",
-       "//chrome/browser/ui/page_action:icon_type",
-       "//chrome/browser/ui/page_info",
-      "//chrome/browser/ui/pdf",
-       "//chrome/browser/ui/permission_bubble:browser_tests",
-       "//chrome/browser/ui/prefs:browser_tests",
-       "//chrome/browser/ui/promos:utils",
-@@ -2422,9 +2418,6 @@ if (!is_android) {
+@@ -2485,9 +2482,6 @@ if (!is_android) {
       "//services/network/public/proto:sct_audit_report_proto",
       "//services/preferences/public/cpp",
       "//services/preferences/public/cpp/tracked",
@@ -792,7 +818,7 @@
       "//services/service_manager/public/cpp",
       "//services/strings",
       "//services/test/echo/public/mojom",
-@@ -7911,7 +7904,6 @@ test("unit_tests") {
+@@ -8020,7 +8014,6 @@ test("unit_tests") {
 
     # Non-android deps for "unit_tests" target.
     deps += [
@@ -800,7 +826,7 @@
       "//chrome:packed_resources_integrity_header",
       "//chrome/browser/apps:icon_standardizer",
       "//chrome/browser/apps/app_service",
-@@ -8060,7 +8052,6 @@ test("unit_tests") {
+@@ -8166,7 +8159,6 @@ test("unit_tests") {
       "//services/device/public/cpp/bluetooth",
       "//services/metrics/public/cpp:ukm_builders",
       "//services/network:test_support",
@@ -808,17 +834,17 @@
       "//services/video_effects/test:test_support",
       "//third_party/crashpad/crashpad/util",
       "//third_party/libaddressinput",
-@@ -8495,7 +8486,6 @@ test("unit_tests") {
+@@ -8585,7 +8577,6 @@ test("unit_tests") {
       "//chrome/browser/nearby_sharing/contacts:unit_tests",
       "//chrome/browser/nearby_sharing/local_device_data:unit_tests",
       "//chrome/browser/policy:unit_tests",
 -      "//chrome/browser/screen_ai:unit_tests",
+       "//chrome/browser/smart_card:unit_tests",
       "//chrome/browser/support_tool/ash:unit_tests",
       "//chrome/browser/ui/ash:unit_tests",
-       "//chrome/browser/ui/views/crostini:unit_tests",
 --- a/chrome/test/chromedriver/BUILD.gn
 +++ b/chrome/test/chromedriver/BUILD.gn
-@@ -406,7 +406,7 @@ source_set("lib") {
+@@ -409,7 +409,7 @@ source_set("lib") {
   }
 }
 
@@ -892,7 +918,7 @@
   AutocompleteInput input(text, page_classification, *scheme_classifier_);
 --- a/components/pdf/renderer/pdf_accessibility_tree.cc
 +++ b/components/pdf/renderer/pdf_accessibility_tree.cc
-@@ -536,20 +536,6 @@ void PdfAccessibilityTree::SetAccessibil
+@@ -535,20 +535,6 @@ void PdfAccessibilityTree::SetAccessibil
                      std::move(chars), std::move(page_objects)));
 }
 
@@ -915,15 +941,15 @@
     const chrome_pdf::AccessibilityPageInfo& page_info,
 --- a/components/pdf/renderer/pdf_accessibility_tree_builder.cc
 +++ b/components/pdf/renderer/pdf_accessibility_tree_builder.cc
-@@ -9,7 +9,6 @@
- 
+@@ -11,7 +11,6 @@
+ #include "base/containers/fixed_flat_map.h"
 #include "base/i18n/break_iterator.h"
 #include "base/strings/utf_string_conversion_utils.h"
 -#include "components/pdf/renderer/pdf_ocr_helper.h"
 #include "components/strings/grit/components_strings.h"
 #include "pdf/accessibility_structs.h"
 #include "pdf/pdf_features.h"
-@@ -910,8 +909,6 @@ ui::AXNodeData* PdfAccessibilityTreeBuil
+@@ -994,8 +993,6 @@ ui::AXNodeData* PdfAccessibilityTreeBuil
   wrapper_node->relative_bounds.bounds = gfx::RectF(position, gfx::SizeF(1, 1));
 
   ui::AXNodeData* text_node = CreateStaticTextNode();
@@ -934,7 +960,7 @@
   return wrapper_node;
 --- a/components/pdf/renderer/pdf_view_web_plugin_client.cc
 +++ b/components/pdf/renderer/pdf_view_web_plugin_client.cc
-@@ -204,34 +204,6 @@ PdfViewWebPluginClient::CreateAssociated
+@@ -203,34 +203,6 @@ PdfViewWebPluginClient::CreateAssociated
   return GetFrame()->CreateAssociatedURLLoader(options);
 }
 
@@ -1018,7 +1044,7 @@
 fuzzer_test("update_client_protocol_serializer_fuzzer") {
 --- a/content/shell/BUILD.gn
 +++ b/content/shell/BUILD.gn
-@@ -803,10 +803,6 @@ if (is_apple) {
+@@ -804,10 +804,6 @@ if (is_apple) {
       deps = [ "//third_party/icu:icudata" ]
     }
 
@@ -1041,7 +1067,7 @@
   for (uint32_t i = 0; i < char_count; ++i) {
 --- a/pdf/pdf_view_web_plugin.cc
 +++ b/pdf/pdf_view_web_plugin.cc
-@@ -1297,11 +1297,6 @@ void PdfViewWebPlugin::DocumentLoadCompl
+@@ -1299,11 +1299,6 @@ void PdfViewWebPlugin::DocumentLoadCompl
   if (accessibility_state_ == AccessibilityState::kPending)
     LoadAccessibility();
 
@@ -1053,7 +1079,7 @@
 
   if (!full_frame_)
     return;
-@@ -2243,7 +2238,7 @@ void PdfViewWebPlugin::EnableAccessibili
+@@ -2284,7 +2279,7 @@ void PdfViewWebPlugin::EnableAccessibili
 
 SkBitmap PdfViewWebPlugin::GetImageForOcr(int32_t page_index,
                                           int32_t page_object_index) {
@@ -1062,7 +1088,7 @@
 }
 
 void PdfViewWebPlugin::HandleAccessibilityAction(
-@@ -2780,19 +2775,6 @@ void PdfViewWebPlugin::PrepareAndSetAcce
+@@ -2834,19 +2829,6 @@ void PdfViewWebPlugin::PrepareAndSetAcce
     return;
   }
 
@@ -1084,7 +1110,7 @@
 
 --- a/pdf/pdfium/pdfium_engine.cc
 +++ b/pdf/pdfium/pdfium_engine.cc
-@@ -2659,7 +2659,7 @@ void PDFiumEngine::HandleLongPress(const
+@@ -2686,7 +2686,7 @@ void PDFiumEngine::HandleLongPress(const
 
 SkBitmap PDFiumEngine::GetImageForOcr(int page_index, int image_index) {
   DCHECK(PageIndexInBounds(page_index));
@@ -1135,7 +1161,7 @@
 group("devtools_all_files") {
 --- a/third_party/devtools-frontend/src/front_end/BUILD.gn
 +++ b/third_party/devtools-frontend/src/front_end/BUILD.gn
-@@ -193,7 +193,6 @@ group("unittests") {
+@@ -196,7 +196,6 @@ group("unittests") {
     "panels/timeline:unittests",
     "panels/timeline/components:unittests",
     "panels/timeline/components/insights:unittests",
--- a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
+++ b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
--- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
+++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
--- 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
-@@ -171,6 +171,7 @@
+@@ -175,6 +175,7 @@
 #include "components/supervised_user/core/browser/supervised_user_preferences.h"
 #include "components/supervised_user/core/browser/supervised_user_service.h"
 #include "components/supervised_user/core/browser/supervised_user_url_filter.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"
-@@ -2259,6 +2260,7 @@ void RenderViewContextMenu::AppendPageIt
+@@ -2208,6 +2209,7 @@ void RenderViewContextMenu::AppendPageIt
   }
 
   if (CanTranslate(/*menu_logging=*/true)) {
@@ -19,7 +19,7 @@
 }
 --- a/components/translate/core/browser/translate_language_list.cc
 +++ b/components/translate/core/browser/translate_language_list.cc
-@@ -11,6 +11,7 @@
+@@ -12,6 +12,7 @@
 #include <string_view>
 
 #include "base/check.h"
--- 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
-@@ -2440,6 +2440,7 @@ static_library("browser") {
+@@ -2476,6 +2476,7 @@ static_library("browser") {
     "//third_party/libyuv",
     "//third_party/metrics_proto",
     "//third_party/re2",
@@ -44,7 +44,7 @@
 #endif  // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -282,6 +282,7 @@ source_set("browser") {
+@@ -284,6 +284,7 @@ source_set("browser") {
     "//third_party/re2",
     "//third_party/snappy",
     "//third_party/sqlite",
@@ -61,8 +61,8 @@
 +#include "components/ungoogled/ungoogled_switches.h"
 #include "components/viz/common/switches.h"
 #include "components/viz/host/gpu_client.h"
- #include "content/browser/bad_message.h"
-@@ -3353,6 +3354,8 @@ void RenderProcessHostImpl::PropagateBro
+ #include "components/viz/host/host_frame_sink_manager.h"
+@@ -3412,6 +3413,8 @@ void RenderProcessHostImpl::PropagateBro
       switches::kEnableWebGLImageChromium,
       switches::kEnableWebGPUDeveloperFeatures,
       switches::kFileUrlPathAlias,
@@ -91,7 +91,7 @@
 #include "ui/accessibility/accessibility_features.h"
 #include "ui/base/ui_base_features.h"
 #include "ui/events/blink/blink_features.h"
-@@ -491,6 +492,10 @@ void SetRuntimeFeaturesFromCommandLine(c
+@@ -481,6 +482,10 @@ void SetRuntimeFeaturesFromCommandLine(c
        true},
       {wrf::EnableWebAudioBypassOutputBufferingOptOut,
        blink::switches::kWebAudioBypassOutputBufferingOptOut, true},
@@ -116,15 +116,15 @@
 
 --- a/third_party/blink/renderer/core/dom/document.cc
 +++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -41,6 +41,7 @@
+@@ -42,6 +42,7 @@
 #include "base/metrics/histogram_functions.h"
 #include "base/not_fatal_until.h"
 #include "base/notreached.h"
 +#include "base/rand_util.h"
- #include "base/ranges/algorithm.h"
 #include "base/task/single_thread_task_runner.h"
 #include "base/time/time.h"
-@@ -863,6 +864,11 @@ Document::Document(const DocumentInit& i
+ #include "base/trace_event/trace_event.h"
+@@ -866,6 +867,11 @@ Document::Document(const DocumentInit& i
   TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this),
                          TRACE_EVENT_FLAG_FLOW_OUT);
   DCHECK(agent_);
@@ -136,7 +136,7 @@
   if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) &&
       features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) {
     script_runner_delayer_->Activate();
-@@ -982,6 +988,14 @@ const Position Document::PositionAdjuste
+@@ -992,6 +998,14 @@ const Position Document::PositionAdjuste
   return Position::BeforeNode(*shadow_host);
 }
 
@@ -150,10 +150,10 @@
 +
 SelectorQueryCache& Document::GetSelectorQueryCache() {
   if (!selector_query_cache_)
-     selector_query_cache_ = std::make_unique<SelectorQueryCache>();
+     selector_query_cache_ = MakeGarbageCollected<SelectorQueryCache>();
 --- a/third_party/blink/renderer/core/dom/document.h
 +++ b/third_party/blink/renderer/core/dom/document.h
-@@ -551,6 +551,10 @@ class CORE_EXPORT Document : public Cont
+@@ -550,6 +550,10 @@ class CORE_EXPORT Document : public Cont
     has_xml_declaration_ = has_xml_declaration ? 1 : 0;
   }
 
@@ -164,7 +164,7 @@
   V8VisibilityState visibilityState() const;
   String visibilityStateAsString() const;
   bool IsPageVisible() const;
-@@ -2632,6 +2636,9 @@ class CORE_EXPORT Document : public Cont
+@@ -2641,6 +2645,9 @@ class CORE_EXPORT Document : public Cont
 
   base::ElapsedTimer start_time_;
 
@@ -176,7 +176,7 @@
 
 --- a/third_party/blink/renderer/core/dom/element.cc
 +++ b/third_party/blink/renderer/core/dom/element.cc
-@@ -2659,6 +2659,11 @@ DOMRectList* Element::getClientRects() {
+@@ -2749,6 +2749,11 @@ DOMRectList* Element::getClientRects() {
   DCHECK(element_layout_object);
   GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
                                                     *element_layout_object);
@@ -188,7 +188,7 @@
   return MakeGarbageCollected<DOMRectList>(quads);
 }
 
-@@ -2686,6 +2691,9 @@ gfx::RectF Element::GetBoundingClientRec
+@@ -2776,6 +2781,9 @@ gfx::RectF Element::GetBoundingClientRec
   DCHECK(element_layout_object);
   GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
                                                    *element_layout_object);
@@ -200,7 +200,7 @@
 
 --- a/third_party/blink/renderer/core/dom/range.cc
 +++ b/third_party/blink/renderer/core/dom/range.cc
-@@ -1617,6 +1617,12 @@ DOMRectList* Range::getClientRects() con
+@@ -1632,6 +1632,12 @@ DOMRectList* Range::getClientRects() con
   Vector<gfx::QuadF> quads;
   GetBorderAndTextQuads(quads);
 
@@ -213,7 +213,7 @@
   return MakeGarbageCollected<DOMRectList>(quads);
 }
 
-@@ -1624,7 +1630,11 @@ DOMRect* Range::getBoundingClientRect()
+@@ -1639,7 +1645,11 @@ DOMRect* Range::getBoundingClientRect()
   // TODO(crbug.com/1499981): This should be removed once synchronized scrolling
   // impact is understood.
   SyncScrollAttemptHeuristic::DidAccessScrollOffset();
@@ -266,7 +266,7 @@
               const TextDirection&,
 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
-@@ -223,6 +223,9 @@ class Isolate;
+@@ -227,6 +227,9 @@ class Isolate;
 class Value;
 }  // namespace v8
 
@@ -276,9 +276,9 @@
 namespace blink {
 
 class DOMMatrixInit;
-@@ -3718,8 +3721,22 @@ TextMetrics* BaseRenderingContext2D::mea
-   const CanvasRenderingContext2DState& state = GetState();
-   TextDirection direction = ToTextDirection(state.GetDirection(), canvas);
+@@ -3705,8 +3708,22 @@ TextMetrics* BaseRenderingContext2D::mea
+   TextDirection direction = ToTextDirection(
+       state.GetDirection(), GetCanvasRenderingContextHost(), computed_style);
 
 -  return MakeGarbageCollected<TextMetrics>(
 -      font, direction, state.GetTextBaseline(), state.GetTextAlign(), text);
@@ -303,7 +303,7 @@
 void BaseRenderingContext2D::SnapshotStateForFilter() {
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1771,6 +1771,7 @@ component("platform") {
+@@ -1762,6 +1762,7 @@ component("platform") {
     "//components/paint_preview/common",
     "//components/search_engines:search_engine_utils",
     "//components/translate/core/language_detection:language_detection",
@@ -338,8 +338,8 @@
 #include "third_party/blink/renderer/platform/wtf/vector.h"
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -2022,6 +2022,12 @@
-       depends_on: ["FindDecomposedInShortText"],
+@@ -2053,6 +2053,12 @@
+       status: "experimental",
     },
     {
 +      name: "FingerprintingClientRectsNoise",
--- 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
-@@ -3356,6 +3356,7 @@ void RenderProcessHostImpl::PropagateBro
+@@ -3415,6 +3415,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
-@@ -496,6 +496,8 @@ void SetRuntimeFeaturesFromCommandLine(c
+@@ -486,6 +486,8 @@ void SetRuntimeFeaturesFromCommandLine(c
        switches::kFingerprintingClientRectsNoise, true},
       {wrf::EnableFingerprintingCanvasMeasureTextNoise,
        switches::kFingerprintingCanvasMeasureTextNoise, true},
@@ -65,7 +65,7 @@ approach to change color components.
 };
 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
-@@ -2969,6 +2969,9 @@ ImageData* BaseRenderingContext2D::getIm
+@@ -2973,6 +2973,9 @@ ImageData* BaseRenderingContext2D::getIm
           snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();
       DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
     }
@@ -77,7 +77,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
-@@ -1715,7 +1715,9 @@ component("platform") {
+@@ -1706,7 +1706,9 @@ component("platform") {
     "//third_party/blink/renderer:non_test_config",
   ]
 
@@ -314,7 +314,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
-@@ -2028,6 +2028,9 @@
+@@ -2059,6 +2059,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
-@@ -2121,6 +2121,7 @@ static_library("browser") {
+@@ -2156,6 +2156,7 @@ static_library("browser") {
     "//components/net_log",
     "//components/network_hints/common:mojo_bindings",
     "//components/network_session_configurator/browser",
@@ -49,7 +49,7 @@ with limited CPU/memory resources and it is disabled by default.
 #endif  // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -21,12 +21,14 @@
+@@ -26,6 +26,7 @@
 #include "base/functional/callback.h"
 #include "base/functional/callback_helpers.h"
 #include "base/location.h"
@@ -57,6 +57,7 @@ with limited CPU/memory resources and it is disabled by default.
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
+@@ -33,6 +34,7 @@
 #include "base/notreached.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
@@ -64,7 +65,7 @@ with limited CPU/memory resources and it is disabled by default.
 #include "base/synchronization/waitable_event.h"
 #include "base/task/sequenced_task_runner.h"
 #include "base/task/single_thread_task_runner.h"
-@@ -111,6 +113,7 @@
+@@ -117,6 +119,7 @@
 #include "components/metrics/metrics_service.h"
 #include "components/metrics_services_manager/metrics_services_manager.h"
 #include "components/metrics_services_manager/metrics_services_manager_client.h"
@@ -72,7 +73,7 @@ with limited CPU/memory resources and it is disabled by default.
 #include "components/network_time/network_time_tracker.h"
 #include "components/os_crypt/async/browser/os_crypt_async.h"
 #include "components/permissions/permissions_client.h"
-@@ -144,6 +147,7 @@
+@@ -150,6 +153,7 @@
 #include "extensions/common/constants.h"
 #include "media/media_buildflags.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
@@ -80,7 +81,7 @@ with limited CPU/memory resources and it is disabled by default.
 #include "ppapi/buildflags/buildflags.h"
 #include "printing/buildflags/buildflags.h"
 #include "services/network/public/cpp/features.h"
-@@ -402,6 +406,18 @@ void BrowserProcessImpl::Init() {
+@@ -414,6 +418,18 @@ void BrowserProcessImpl::Init() {
   pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
                              base::BindRepeating(&ApplyMetricsReportingPolicy));
 
@@ -101,7 +102,7 @@ with limited CPU/memory resources and it is disabled by default.
 
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -2502,6 +2502,10 @@ const char kMantisFeatureKeyDescription[
+@@ -2507,6 +2507,10 @@ const char kMantisFeatureKeyDescription[
     "Feature key to use the Mantis feature on ChromeOS.";
 #endif  // BUILDFLAG(IS_CHROMEOS)
 
@@ -114,7 +115,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
-@@ -1434,6 +1434,9 @@ extern const char kMantisFeatureKeyName[
+@@ -1431,6 +1431,9 @@ extern const char kMantisFeatureKeyName[
 extern const char kMantisFeatureKeyDescription[];
 #endif  // IS_CHROMEOS
 
--- 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
-@@ -1556,7 +1556,7 @@ void ChromeContentBrowserClient::Registe
+@@ -1546,7 +1546,7 @@ void ChromeContentBrowserClient::Registe
 void ChromeContentBrowserClient::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -23,7 +23,7 @@
   // used for mapping the command-line flags).
 --- a/chrome/browser/net/profile_network_context_service.cc
 +++ b/chrome/browser/net/profile_network_context_service.cc
-@@ -510,7 +510,7 @@ void ProfileNetworkContextService::Confi
+@@ -503,7 +503,7 @@ void ProfileNetworkContextService::Confi
 void ProfileNetworkContextService::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
@@ -56,7 +56,7 @@
     </cr-dialog>
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -97,7 +97,7 @@ void RegisterBrowserUserPrefs(user_prefs
+@@ -96,7 +96,7 @@ void RegisterBrowserUserPrefs(user_prefs
   registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
   registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
   registry->RegisterBooleanPref(
@@ -85,6 +85,17 @@
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kAutofillPaymentCvcStorage, true,
+--- a/components/bookmarks/browser/bookmark_utils.cc
+++ b/components/bookmarks/browser/bookmark_utils.cc
+@@ -462,7 +462,7 @@ bool DoesBookmarkContainWords(const std:
+ 
+ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+   registry->RegisterBooleanPref(
+-      prefs::kShowBookmarkBar, false,
+      prefs::kShowBookmarkBar, true,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterBooleanPref(prefs::kEditBookmarksEnabled, true);
+   registry->RegisterBooleanPref(
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -94,7 +94,7 @@ void CookieSettings::RegisterProfilePref
@@ -98,7 +109,7 @@
 
 --- a/components/password_manager/core/browser/password_manager.cc
 +++ b/components/password_manager/core/browser/password_manager.cc
-@@ -331,7 +331,7 @@ bool HasManuallyFilledFields(const Passw
+@@ -364,7 +364,7 @@ bool HasManuallyFilledFields(const Passw
 void PasswordManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
@@ -107,7 +118,7 @@
       user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
 #if BUILDFLAG(IS_IOS)
   // Deprecated pref in profile prefs.
-@@ -339,7 +339,7 @@ void PasswordManager::RegisterProfilePre
+@@ -372,7 +372,7 @@ void PasswordManager::RegisterProfilePre
                                 false);
 #endif  // BUILDFLAG(IS_IOS)
   registry->RegisterBooleanPref(
--- a/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch
@@ -7,8 +7,8 @@
 +#include "base/command_line.h"
 #include "base/observer_list.h"
 #include "build/build_config.h"
- #include "build/chromeos_buildflags.h"
-@@ -87,9 +88,12 @@ bool BookmarkTabHelper::ShouldShowBookma
+ #include "chrome/browser/bookmarks/bookmark_model_factory.h"
+@@ -86,9 +87,12 @@ bool BookmarkTabHelper::ShouldShowBookma
   const bool has_saved_tab_groups =
       tab_group_service && !tab_group_service->GetAllGroups().empty();
 
--- a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -145,6 +145,7 @@
+@@ -143,6 +143,7 @@
 #include "chrome/browser/ui/unload_controller.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/contents_web_view.h"
@@ -8,7 +8,7 @@
 #include "chrome/browser/ui/web_applications/app_browser_controller.h"
 #include "chrome/browser/ui/web_applications/web_app_launch_utils.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
-@@ -580,6 +581,7 @@ Browser::Browser(const CreateParams& par
+@@ -578,6 +579,7 @@ Browser::Browser(const CreateParams& par
       omit_from_session_restore_(params.omit_from_session_restore),
       should_trigger_session_restore_(params.should_trigger_session_restore),
       cancel_download_confirmation_state_(NOT_PROMPTED),
@@ -16,7 +16,7 @@
       override_bounds_(params.initial_bounds),
       initial_show_state_(params.initial_show_state),
       initial_workspace_(params.initial_workspace),
-@@ -1041,20 +1043,22 @@ Browser::WarnBeforeClosingResult Browser
+@@ -1031,20 +1033,22 @@ Browser::WarnBeforeClosingResult Browser
     return WarnBeforeClosingResult::kOkToClose;
   }
 
@@ -52,7 +52,7 @@
   }
 
   DCHECK(!warn_before_closing_callback_)
-@@ -1092,6 +1096,7 @@ bool Browser::TryToCloseWindow(
+@@ -1082,6 +1086,7 @@ bool Browser::TryToCloseWindow(
 
 void Browser::ResetTryToCloseWindow() {
   cancel_download_confirmation_state_ = NOT_PROMPTED;
@@ -60,7 +60,7 @@
   unload_controller_.ResetTryToCloseWindow();
 }
 
-@@ -3278,6 +3283,58 @@ bool Browser::CanCloseWithInProgressDown
+@@ -3283,6 +3288,58 @@ bool Browser::CanCloseWithInProgressDown
   return false;
 }
 
@@ -119,7 +119,7 @@
 void Browser::InProgressDownloadResponse(bool cancel_downloads) {
   if (cancel_downloads) {
     cancel_download_confirmation_state_ = RESPONSE_RECEIVED;
-@@ -3303,6 +3360,22 @@ void Browser::InProgressDownloadResponse
+@@ -3308,6 +3365,22 @@ void Browser::InProgressDownloadResponse
 
   std::move(warn_before_closing_callback_)
       .Run(WarnBeforeClosingResult::kDoNotClose);
@@ -144,7 +144,7 @@
 void Browser::CookieMigrationNoticeResponse(bool proceed_closing) {
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
-@@ -32,6 +32,7 @@
+@@ -31,6 +31,7 @@
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/browser_window/public/browser_window_interface.h"
 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
@@ -152,7 +152,7 @@
 #include "chrome/browser/ui/signin/signin_view_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
-@@ -1185,12 +1186,17 @@ class Browser : public TabStripModelObse
+@@ -1184,12 +1185,17 @@ class Browser : public TabStripModelObse
   // Returns true if the window can close, false otherwise.
   bool CanCloseWithInProgressDownloads();
 
@@ -170,7 +170,7 @@
   // Called when the user has decided whether to proceed or not with the browser
   // closure, in case the cookie migration notice was shown. |proceed_closing|
   // is true if the browser can  be closed.
-@@ -1356,6 +1362,8 @@ class Browser : public TabStripModelObse
+@@ -1355,6 +1361,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
-@@ -935,10 +935,14 @@ bool HandleNewTabPageLocationOverride(
+@@ -925,10 +925,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
-@@ -226,6 +226,7 @@ std::string GetCombinedOriginListValue(c
+@@ -230,6 +230,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);
 }
 
-@@ -464,6 +465,7 @@ void FlagsState::SetOriginListFlag(const
+@@ -474,6 +475,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-grab-handle.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc
 +++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc
-@@ -83,6 +83,7 @@ class FrameGrabHandle : public views::Vi
+@@ -81,6 +81,7 @@ class FrameGrabHandle : public views::Vi
     // Reserve some space for the frame to be grabbed by, even if the tabstrip
     // is full.
     // TODO(tbergquist): Define this relative to the NTB insets again.
--- 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,7 +41,7 @@
 #include "base/feature_list.h"
 #include "base/format_macros.h"
 #include "base/functional/bind.h"
-@@ -536,6 +537,15 @@ AutocompleteController::AutocompleteCont
+@@ -541,6 +542,15 @@ AutocompleteController::AutocompleteCont
       steady_state_omnibox_position_(
           metrics::OmniboxEventProto::UNKNOWN_POSITION) {
   provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
@@ -59,7 +59,7 @@
   // so their async requests can be kicked off before waiting a few milliseconds
 --- a/components/omnibox/browser/history_url_provider.cc
 +++ b/components/omnibox/browser/history_url_provider.cc
-@@ -490,6 +490,9 @@ void HistoryURLProvider::Start(const Aut
+@@ -489,6 +489,9 @@ void HistoryURLProvider::Start(const Aut
   if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)
     matches_.push_back(what_you_typed_match);
 
@@ -79,7 +79,7 @@
 #include "base/feature_list.h"
 #include "base/functional/bind.h"
 #include "base/functional/callback.h"
-@@ -628,6 +629,9 @@ void SearchProvider::Run(bool query_is_p
+@@ -629,6 +630,9 @@ void SearchProvider::Run(bool query_is_p
 }
 
 void SearchProvider::DoHistoryQuery(bool minimal_changes) {
@@ -91,7 +91,7 @@
   if (minimal_changes)
 --- a/components/url_formatter/url_fixer.cc
 +++ b/components/url_formatter/url_fixer.cc
-@@ -14,6 +14,8 @@
+@@ -15,6 +15,8 @@
 #include <string_view>
 
 #include "base/check_op.h"
--- a/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
@@ -2,7 +2,7 @@

 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -495,7 +495,9 @@ void TabHelpers::AttachTabHelpers(WebCon
+@@ -488,7 +488,9 @@ void TabHelpers::AttachTabHelpers(WebCon
   site_protection::SiteProtectionMetricsObserver::CreateForWebContents(
       web_contents);
   SafetyTipWebContentsObserver::CreateForWebContents(web_contents);
@@ -60,8 +60,8 @@
 #include "base/containers/contains.h"
 #include "base/containers/flat_map.h"
 #include "base/debug/crash_logging.h"
-@@ -209,6 +210,12 @@ std::unique_ptr<TemplateURL> UpdateExist
-                                        std::move(account_data));
+@@ -243,6 +244,12 @@ TemplateURLData UpdateTemplateURLDataIfP
+   return data;
 }
 
 +bool ShouldAutocollect() {
@@ -73,7 +73,7 @@
 }  // namespace
 
 // TemplateURLService::LessWithPrefix -----------------------------------------
-@@ -388,6 +395,7 @@ TemplateURLService::TemplateURLService(
+@@ -422,6 +429,7 @@ TemplateURLService::TemplateURLService(
     std::unique_ptr<TemplateURLServiceClient> client,
     const base::RepeatingClosure& dsp_change_callback)
     : prefs_(prefs),
@@ -81,7 +81,7 @@
       search_engine_choice_service_(search_engine_choice_service),
       search_terms_data_(std::move(search_terms_data)),
       web_data_service_(web_data_service),
-@@ -487,8 +495,8 @@ bool TemplateURLService::CanAddAutogener
+@@ -521,8 +529,8 @@ bool TemplateURLService::CanAddAutogener
   // that may interfere with search queries).  An easy heuristic for this is
   // whether the user has a TemplateURL that has been manually modified (e.g.,
   // renamed) connected to the same host.
@@ -92,7 +92,7 @@
 }
 
 bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy(
-@@ -2108,6 +2116,8 @@ SyncDataMap TemplateURLService::CreateGU
+@@ -2132,6 +2140,8 @@ SyncDataMap TemplateURLService::CreateGU
 }
 
 void TemplateURLService::Init() {
@@ -101,7 +101,7 @@
   if (client_) {
     client_->SetOwner(this);
   }
-@@ -2290,6 +2300,9 @@ void TemplateURLService::ChangeToLoadedS
+@@ -2314,6 +2324,9 @@ void TemplateURLService::ChangeToLoadedS
 
 bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
     const std::string& host) const {
@@ -113,7 +113,7 @@
     return true;
 --- a/components/search_engines/template_url_service.h
 +++ b/components/search_engines/template_url_service.h
-@@ -911,6 +911,8 @@ class TemplateURLService final : public
+@@ -875,6 +875,8 @@ class TemplateURLService final : public
   raw_ref<search_engines::SearchEngineChoiceService>
       search_engine_choice_service_;
 
--- a/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch
@@ -8,11 +8,11 @@
 #include "base/debug/alias.h"
 #include "base/functional/bind.h"
 #include "base/i18n/rtl.h"
-@@ -709,6 +710,13 @@ void Tab::OnGestureEvent(ui::GestureEven
+@@ -708,6 +709,13 @@ void Tab::OnGestureEvent(ui::GestureEven
   event->SetHandled();
 }
 
-+std::u16string Tab::GetTooltipText(const gfx::Point& p) const {
+std::u16string Tab::GetRenderedTooltipText(const gfx::Point& p) const {
 +  if (base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("tab-hover-cards") == "tooltip")
 +    return GetTooltipText(data_.title, GetAlertStateToShow(data_.alert_state));
 +  // Tab hover cards replace tooltips for tabs.
@@ -28,7 +28,7 @@
   void OnMouseEntered(const ui::MouseEvent& event) override;
   void OnMouseExited(const ui::MouseEvent& event) override;
   void OnGestureEvent(ui::GestureEvent* event) override;
-+  std::u16string GetTooltipText(const gfx::Point& p) const override;
+  std::u16string GetRenderedTooltipText(const gfx::Point& p) const override;
   gfx::Size CalculatePreferredSize(
       const views::SizeBounds& available_size) const override;
   void PaintChildren(const views::PaintInfo& info) override;
@@ -42,7 +42,7 @@
 #include "base/check.h"
 #include "base/compiler_specific.h"
 #include "base/containers/adapters.h"
-@@ -1841,6 +1842,8 @@ void TabStrip::OnMouseEventInTab(views::
+@@ -1865,6 +1866,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
-@@ -1450,7 +1450,8 @@ void BrowserCommandController::InitComma
+@@ -1427,7 +1427,8 @@ void BrowserCommandController::InitComma
   command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
                                         normal_window);
 
@@ -17,10 +17,10 @@
 #include "chrome/browser/ui/views/frame/tab_strip_region_view.h"
 
 +#include "base/command_line.h"
- #include "base/feature_list.h"
 #include "base/functional/bind.h"
 #include "base/strings/utf_string_conversions.h"
-@@ -127,6 +128,7 @@ TabStripRegionView::TabStripRegionView(s
+ #include "base/task/single_thread_task_runner.h"
+@@ -125,6 +126,7 @@ TabStripRegionView::TabStripRegionView(s
   std::unique_ptr<TabStripComboButton> tab_strip_combo_button;
   std::unique_ptr<ProductSpecificationsButton> product_specifications_button;
   if (browser &&
--- 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
-@@ -227,6 +227,7 @@ std::string GetCombinedOriginListValue(c
+@@ -231,6 +231,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);
 }
 
-@@ -466,6 +467,7 @@ void FlagsState::SetOriginListFlag(const
+@@ -476,6 +477,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-clear-data-on-exit.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/browser_features.cc
 +++ b/chrome/browser/browser_features.cc
-@@ -352,4 +352,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur
+@@ -367,4 +367,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur
              "RemovalOfIWAsFromTabCapture",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
--- 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/adapters.h"
 #include "base/containers/flat_map.h"
 #include "base/containers/span.h"
-@@ -725,6 +726,10 @@ void TabStripModel::CloseAllTabsInGroup(
+@@ -723,6 +724,10 @@ void TabStripModel::CloseAllTabsInGroup(
 
 void TabStripModel::CloseWebContentsAt(int index, uint32_t close_types) {
   CHECK(ContainsIndex(index));
@@ -19,7 +19,7 @@
   CloseTabs({GetWebContentsAt(index)}, close_types);
 }
 
-@@ -1864,9 +1869,13 @@ TabStripModel::GetGroupsDestroyedFromRem
+@@ -1968,9 +1973,13 @@ TabStripModel::GetGroupsDestroyedFromRem
 void TabStripModel::ExecuteCloseTabsByIndices(
     base::RepeatingCallback<std::vector<int>()> get_indices_to_close,
     uint32_t close_types) {
--- a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch
@@ -3,15 +3,15 @@

 --- a/chrome/browser/download/download_crx_util.cc
 +++ b/chrome/browser/download/download_crx_util.cc
-@@ -8,6 +8,7 @@
- 
+@@ -9,6 +9,7 @@
 #include <memory>
 
+ #include "base/auto_reset.h"
 +#include "base/command_line.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_management.h"
-@@ -102,6 +103,14 @@ scoped_refptr<extensions::CrxInstaller>
+@@ -103,6 +104,14 @@ scoped_refptr<extensions::CrxInstaller>
   return installer;
 }
 
@@ -26,7 +26,7 @@
 bool IsExtensionDownload(const DownloadItem& download_item) {
   if (download_item.GetTargetDisposition() ==
       DownloadItem::TARGET_DISPOSITION_PROMPT)
-@@ -110,7 +119,7 @@ bool IsExtensionDownload(const DownloadI
+@@ -111,7 +120,7 @@ bool IsExtensionDownload(const DownloadI
   if (download_item.GetMimeType() == extensions::Extension::kMimeType ||
       extensions::UserScript::IsURLUserScript(download_item.GetURL(),
                                               download_item.GetMimeType())) {
@@ -69,15 +69,7 @@
   // Don't prompt for file types that are marked for opening automatically.
 --- a/chrome/browser/extensions/extension_management.cc
 +++ b/chrome/browser/extensions/extension_management.cc
-@@ -8,6 +8,7 @@
- #include <string>
- #include <utility>
- 
-+#include "base/command_line.h"
- #include "base/containers/contains.h"
- #include "base/feature_list.h"
- #include "base/functional/bind.h"
-@@ -276,6 +277,13 @@ bool ExtensionManagement::IsInstallation
+@@ -284,6 +284,13 @@ bool ExtensionManagement::IsInstallation
 bool ExtensionManagement::IsOffstoreInstallAllowed(
     const GURL& url,
     const GURL& referrer_url) const {
--- a/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch
@@ -13,7 +13,7 @@
 #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -1221,6 +1221,8 @@ WindowOpenDisposition NavigationPolicyTo
+@@ -1204,6 +1204,8 @@ WindowOpenDisposition NavigationPolicyTo
     case blink::kWebNavigationPolicyNewWindow:
       return WindowOpenDisposition::NEW_WINDOW;
     case blink::kWebNavigationPolicyNewPopup:
--- a/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch
@@ -8,7 +8,7 @@
 #include "base/feature_list.h"
 #include "base/functional/bind.h"
 #include "base/functional/callback_helpers.h"
-@@ -37,6 +38,7 @@
+@@ -36,6 +37,7 @@
 #include "chrome/browser/ui/views/side_panel/side_panel_ui.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h"
@@ -16,7 +16,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/feature_engagement/public/event_constants.h"
-@@ -544,6 +546,17 @@ void ExtensionsToolbarContainer::AnchorA
+@@ -543,6 +545,17 @@ void ExtensionsToolbarContainer::AnchorA
   widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView(
       anchor_view && anchor_view->GetVisible() ? anchor_view
                                                : GetExtensionsButton());
@@ -34,7 +34,7 @@
   widget->Show();
 }
 
-@@ -943,6 +956,9 @@ void ExtensionsToolbarContainer::UpdateC
+@@ -942,6 +955,9 @@ void ExtensionsToolbarContainer::UpdateC
 }
 
 bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const {
--- a/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/views/frame/browser_view.cc
 +++ b/chrome/browser/ui/views/frame/browser_view.cc
-@@ -2033,6 +2033,10 @@ void BrowserView::ExitFullscreen() {
+@@ -2141,6 +2141,10 @@ void BrowserView::ExitFullscreen() {
 void BrowserView::UpdateExclusiveAccessBubble(
     const ExclusiveAccessBubbleParams& params,
     ExclusiveAccessBubbleHideCallback first_hide_callback) {
--- a/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/views/tabs/tab.cc
 +++ b/chrome/browser/ui/views/tabs/tab.cc
-@@ -1145,7 +1145,11 @@ void Tab::UpdateIconVisibility() {
+@@ -1130,7 +1130,11 @@ void Tab::UpdateIconVisibility() {
     // Close button is shown on active tabs regardless of the size.
     showing_close_button_ = true;
 #endif  // BUILDFLAG(IS_CHROMEOS)
@@ -12,7 +12,7 @@
 
     showing_alert_indicator_ =
         has_alert_icon && alert_icon_width <= available_width;
-@@ -1174,6 +1178,8 @@ void Tab::UpdateIconVisibility() {
+@@ -1159,6 +1163,8 @@ void Tab::UpdateIconVisibility() {
         !controller_->IsLockedForOnTask() &&
 #endif
         large_enough_for_close_button;
--- a/patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch
@@ -29,7 +29,7 @@
 #if BUILDFLAG(IS_ANDROID)
   return ShouldReduceUserAgentMinorVersion(user_agent_reduction) &&
          base::FeatureList::IsEnabled(
-@@ -492,6 +496,8 @@ blink::UserAgentMetadata GetUserAgentMet
+@@ -462,6 +466,8 @@ blink::UserAgentMetadata GetUserAgentMet
 
 blink::UserAgentMetadata GetUserAgentMetadata(const PrefService* pref_service,
                                               bool only_low_entropy_ch) {
@@ -37,7 +37,7 @@
 +    only_low_entropy_ch = true;
   blink::UserAgentMetadata metadata;
 
-   bool enable_updated_grease_by_policy = true;
+   // Low entropy client hints.
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
@@ -21,6 +21,7 @@
--- 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
-@@ -495,6 +495,17 @@ void ToolbarView::Init() {
+@@ -498,6 +498,17 @@ void ToolbarView::Init() {
                                browser_->profile()->IsGuestSession() ||
                                browser_->profile()->IsRegularProfile();
 #endif
--- a/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch
@@ -0,0 +1,54 @@
+# Return generic values for WebGLDebugRendererInfo to remove a potential data
+# leak while preventing potential website breakage
+
+--- a/chrome/browser/ungoogled_flag_entries.h
+++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -136,4 +136,8 @@
+      "Remove Client Hints",
+      "Removes client hints (information sent to servers about your system, similar to a user agent). ungoogled-chromium flag.",
+      kOsAll, FEATURE_VALUE_TYPE(blink::features::kRemoveClientHints)},
+    {"spoof-webgl-info",
+     "Spoof WebGL Info",
+     "Return generic values for WebGLDebugRendererInfo to remove a potential data leak while preventing potential website breakage. ungoogled-chromium flag.",
+     kOsAll, FEATURE_VALUE_TYPE(blink::features::kSpoofWebGLInfo)},
+ #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
+--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
+@@ -23,6 +23,7 @@ namespace blink::features {
+ BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT);
+ BASE_FEATURE(kReducedSystemInfo, "ReducedSystemInfo", base::FEATURE_DISABLED_BY_DEFAULT);
+ BASE_FEATURE(kRemoveClientHints, "RemoveClientHints", base::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kSpoofWebGLInfo, "SpoofWebGLInfo", base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+ // -----------------------------------------------------------------------------
+ // Feature definitions and associated constants (feature params, et cetera)
+--- a/third_party/blink/public/common/features.h
+++ b/third_party/blink/public/common/features.h
+@@ -23,6 +23,7 @@ namespace features {
+ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDisableLinkDrag);
+ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kReducedSystemInfo);
+ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kRemoveClientHints);
+BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kSpoofWebGLInfo);
+ 
+ // -----------------------------------------------------------------------------
+ // Feature declarations and associated constants (feature params, et cetera)
+--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+@@ -3864,6 +3864,8 @@ ScriptValue WebGLRenderingContextBase::g
+               pname, IdentifiabilityBenignStringToken(
+                          String(ContextGL()->GetString(GL_RENDERER))));
+         }
+        if (base::FeatureList::IsEnabled(blink::features::kSpoofWebGLInfo))
+          return WebGLAny(script_state, String("ANGLE (Google, Vulkan 1.3.0 (SwiftShader Device (Subzero) (0x0000C0DE)), SwiftShader driver-5.0.0)"));
+         return WebGLAny(script_state,
+                         String(ContextGL()->GetString(GL_RENDERER)));
+       }
+@@ -3879,6 +3881,8 @@ ScriptValue WebGLRenderingContextBase::g
+               pname, IdentifiabilityBenignStringToken(
+                          String(ContextGL()->GetString(GL_VENDOR))));
+         }
+        if (base::FeatureList::IsEnabled(blink::features::kSpoofWebGLInfo))
+          return WebGLAny(script_state, String("Google Inc. (Google)"));
+         return WebGLAny(script_state,
+                         String(ContextGL()->GetString(GL_VENDOR)));
+       }
--- a/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch
+++ b/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -4340,10 +4340,12 @@ const FeatureEntry::FeatureVariation kMe
+@@ -4408,10 +4408,12 @@ const FeatureEntry::FeatureVariation kTa
 #include "chrome/browser/ungoogled_flag_choices.h"
 #include "chrome/browser/bromite_flag_choices.h"
 #include "chrome/browser/ungoogled_platform_flag_choices.h"
--- a/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch
+++ b/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch
@@ -27,7 +27,7 @@
 #include "services/network/public/cpp/resource_request_body.h"
 #include "services/network/public/cpp/supports_loading_mode/supports_loading_mode_parser.h"
 #include "services/network/public/cpp/url_loader_completion_status.h"
-@@ -400,10 +401,10 @@ void AddAdditionalRequestHeaders(
+@@ -387,10 +388,10 @@ void AddAdditionalRequestHeaders(
       net::HttpRequestHeaders::kUserAgent,
       ComputeUserAgentValue(*headers, user_agent_override, browser_context));
 
@@ -44,7 +44,7 @@
   if (NeedsHTTPOrigin(headers, method)) {
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -132,6 +132,7 @@
+@@ -135,6 +135,7 @@
 #include "services/metrics/public/cpp/ukm_source_id.h"
 #include "services/network/public/cpp/features.h"
 #include "services/network/public/cpp/not_implemented_url_loader_factory.h"
@@ -52,7 +52,7 @@
 #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
 #include "services/network/public/mojom/fetch_api.mojom.h"
 #include "services/network/public/mojom/restricted_cookie_manager.mojom.h"
-@@ -4650,10 +4651,13 @@ void RenderFrameImpl::FinalizeRequestInt
+@@ -4636,10 +4637,13 @@ void RenderFrameImpl::FinalizeRequestInt
 
   request.SetHasUserGesture(frame_->HasTransientUserActivation());
 
@@ -128,7 +128,7 @@
 // ignore Accept-CH response headers for a site that is specified in the
 --- a/services/network/public/cpp/features.h
 +++ b/services/network/public/cpp/features.h
-@@ -18,6 +18,10 @@ class Origin;
+@@ -17,6 +17,10 @@ class Origin;
 }  // namespace url
 
 namespace network::features {
@@ -228,7 +228,7 @@
 +#endif  // SERVICES_NETWORK_PUBLIC_CPP_REFERRER_SANITIZER_H_
 --- a/third_party/blink/renderer/modules/service_worker/web_service_worker_fetch_context_impl.cc
 +++ b/third_party/blink/renderer/modules/service_worker/web_service_worker_fetch_context_impl.cc
-@@ -11,10 +11,12 @@
+@@ -12,10 +12,12 @@
 #include "base/task/single_thread_task_runner.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "net/cookies/site_for_cookies.h"
@@ -241,7 +241,7 @@
 #include "third_party/blink/public/platform/url_loader_throttle_provider.h"
 #include "third_party/blink/public/platform/web_url_request_extra_data.h"
 #include "third_party/blink/public/platform/websocket_handshake_throttle_provider.h"
-@@ -160,10 +162,13 @@ void WebServiceWorkerFetchContextImpl::F
+@@ -161,10 +163,13 @@ void WebServiceWorkerFetchContextImpl::F
 
   request.SetURLRequestExtraData(std::move(url_request_extra_data));
 
@@ -258,7 +258,7 @@
 +  request.SetReferrerPolicy(std::move(sanitized_referrer.second));
 }
 
- WebVector<std::unique_ptr<URLLoaderThrottle>>
+ std::vector<std::unique_ptr<URLLoaderThrottle>>
 --- a/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicated_or_shared_worker_fetch_context_impl.cc
 +++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicated_or_shared_worker_fetch_context_impl.cc
@@ -12,6 +12,7 @@
@@ -294,4 +294,4 @@
 +  request.SetReferrerPolicy(std::move(sanitized_referrer.second));
 }
 
- WebVector<std::unique_ptr<URLLoaderThrottle>>
+ std::vector<std::unique_ptr<URLLoaderThrottle>>
--- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch
+++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch
@@ -24,7 +24,7 @@
 BASE_FEATURE(kAvoidH2Reprioritization,
 --- a/net/base/features.h
 +++ b/net/base/features.h
-@@ -18,6 +18,8 @@
+@@ -20,6 +20,8 @@
 
 namespace net::features {
 
@@ -47,7 +47,7 @@
 // True if |hostname| ends with either ".local" or ".local.".
 bool ResemblesMulticastDNSName(std::string_view hostname) {
   return hostname.ends_with(".local") || hostname.ends_with(".local.");
-@@ -1426,33 +1421,10 @@ int HostResolverManager::StartIPv6Reacha
+@@ -1425,33 +1420,10 @@ int HostResolverManager::StartIPv6Reacha
     return OK;
   }
 
--- a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
+++ b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
@@ -123,7 +123,7 @@
 
 --- a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
 +++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
-@@ -69,6 +69,15 @@ bool EditSearchEngineController::IsURLVa
+@@ -67,6 +67,15 @@ bool EditSearchEngineController::IsURLVa
       .is_valid();
 }
 
@@ -139,7 +139,7 @@
 bool EditSearchEngineController::IsKeywordValid(
     const std::u16string& keyword_input) const {
   std::u16string keyword_input_trimmed(
-@@ -93,10 +102,12 @@ bool EditSearchEngineController::IsKeywo
+@@ -91,10 +100,12 @@ bool EditSearchEngineController::IsKeywo
 void EditSearchEngineController::AcceptAddOrEdit(
     const std::u16string& title_input,
     const std::u16string& keyword_input,
@@ -153,7 +153,7 @@
 
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile_);
-@@ -124,7 +135,8 @@ void EditSearchEngineController::AcceptA
+@@ -122,7 +133,8 @@ void EditSearchEngineController::AcceptA
   } else {
     // Adding or modifying an entry via the Delegate.
     edit_keyword_delegate_->OnEditedKeyword(template_url_, title_input,
@@ -271,7 +271,7 @@
   bool CanEdit(const TemplateURL* url) const;
 --- a/chrome/browser/ui/search_engines/template_url_table_model.cc
 +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
-@@ -201,21 +201,25 @@ void TemplateURLTableModel::Remove(size_
+@@ -203,21 +203,25 @@ void TemplateURLTableModel::Remove(size_
 void TemplateURLTableModel::Add(size_t index,
                                 const std::u16string& short_name,
                                 const std::u16string& keyword,
@@ -302,7 +302,7 @@
   DCHECK(index <= RowCount());
   DCHECK(!url.empty());
   TemplateURL* template_url = GetTemplateURL(index);
-@@ -224,7 +228,8 @@ void TemplateURLTableModel::ModifyTempla
+@@ -226,7 +230,8 @@ void TemplateURLTableModel::ModifyTempla
   DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url ||
          template_url->SupportsReplacement(
              template_url_service_->search_terms_data()));
@@ -428,7 +428,7 @@
 
 --- a/components/search_engines/template_url_service.cc
 +++ b/components/search_engines/template_url_service.cc
-@@ -892,7 +892,8 @@ void TemplateURLService::IncrementUsageC
+@@ -924,7 +924,8 @@ void TemplateURLService::IncrementUsageC
 void TemplateURLService::ResetTemplateURL(TemplateURL* url,
                                           const std::u16string& title,
                                           const std::u16string& keyword,
@@ -438,7 +438,7 @@
   DCHECK(!IsCreatedByExtension(url));
   DCHECK(!keyword.empty());
   DCHECK(!search_url.empty());
-@@ -907,6 +908,7 @@ void TemplateURLService::ResetTemplateUR
+@@ -939,6 +940,7 @@ void TemplateURLService::ResetTemplateUR
   data.safe_for_autoreplace = false;
   data.last_modified = clock_->Now();
   data.is_active = TemplateURLData::ActiveStatus::kTrue;
@@ -448,7 +448,7 @@
 }
 --- a/components/search_engines/template_url_service.h
 +++ b/components/search_engines/template_url_service.h
-@@ -324,7 +324,8 @@ class TemplateURLService final : public
+@@ -326,7 +326,8 @@ class TemplateURLService final : public
   void ResetTemplateURL(TemplateURL* url,
                         const std::u16string& title,
                         const std::u16string& keyword,
--- 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
-@@ -4336,7 +4336,13 @@ const FeatureEntry::FeatureVariation kMe
+@@ -4404,7 +4404,13 @@ const FeatureEntry::FeatureVariation kTa
 // calculate and verify checksum.
 //
 // When adding a new choice, add it to the end of the list.
--- a/patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch
+++ b/patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -109,7 +109,7 @@ void RegisterBrowserUserPrefs(user_prefs
+@@ -108,7 +108,7 @@ void RegisterBrowserUserPrefs(user_prefs
                                 false);
 #endif
   registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy,
--- a/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch
+++ b/patches/extra/ungoogled-chromium/disable-capture-all-screens.patch
@@ -29,7 +29,7 @@
 -  ContentSettingsForOneType content_settings =
 -      host_content_settings_map->GetSettingsForOneType(
 -          ContentSettingsType::ALL_SCREEN_CAPTURE);
-  std::move(callback).Run(base::ranges::any_of(
+-  std::move(callback).Run(std::ranges::any_of(
 -      content_settings, [](const ContentSettingPatternSource& source) {
 -        return source.GetContentSetting() ==
 -               ContentSetting::CONTENT_SETTING_ALLOW;
--- a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch
+++ b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch
@@ -142,7 +142,7 @@
 }  // namespace download
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -118,7 +118,6 @@ source_set("browser") {
+@@ -120,7 +120,6 @@ source_set("browser") {
     "//components/payments/mojom",
     "//components/power_monitor",
     "//components/services/filesystem:lib",
--- a/patches/extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch
+++ b/patches/extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch
@@ -1,6 +1,6 @@
 --- a/components/safe_browsing/core/common/features.cc
 +++ b/components/safe_browsing/core/common/features.cc
-@@ -117,7 +117,7 @@ BASE_FEATURE(kDlpRegionalizedEndpoints,
+@@ -121,7 +121,7 @@ BASE_FEATURE(kDlpRegionalizedEndpoints,
 
 BASE_FEATURE(kDownloadsPageReferrerUrl,
              "DownloadsPageReferrerUrl",
--- 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
-@@ -1996,7 +1996,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
+@@ -1980,7 +1980,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
 // crbug.com/988956.
 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
-@@ -566,11 +566,6 @@ int GetContentRestrictions(const Browser
+@@ -558,11 +558,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;
 }
-@@ -1748,8 +1743,7 @@ bool CanSavePage(const Browser* browser)
+@@ -1727,8 +1722,7 @@ bool CanSavePage(const Browser* browser)
       policy::DownloadRestriction::ALL_FILES) {
     return false;
   }
@@ -62,7 +62,7 @@
 // These lists are lazily initialized below and are leaked on shutdown to
 --- a/content/public/common/url_utils.cc
 +++ b/content/public/common/url_utils.cc
-@@ -40,11 +40,7 @@ bool IsPdfInternalPluginAllowedOrigin(co
+@@ -33,11 +33,7 @@ bool HasWebUIOrigin(const url::Origin& o
 }
 
 bool IsSavableURL(const GURL& url) {
--- 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
@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc
 +++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc
-@@ -231,12 +231,10 @@ TabStripRegionView::TabStripRegionView(s
+@@ -227,12 +227,10 @@ TabStripRegionView::TabStripRegionView(s
       new_tab_button_->GetViewAccessibility().SetName(
           l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB));
 
@@ -15,7 +15,7 @@
 
 --- a/chrome/browser/ui/views/tabs/tab_strip.cc
 +++ b/chrome/browser/ui/views/tabs/tab_strip.cc
-@@ -2083,8 +2083,6 @@ void TabStrip::NewTabButtonPressed(const
+@@ -2107,8 +2107,6 @@ void TabStrip::NewTabButtonPressed(const
 
     const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
     if (mouse.IsOnlyMiddleMouseButton()) {
@@ -24,7 +24,7 @@
         ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
         CHECK(clipboard)
             << "Clipboard instance is not available, cannot proceed with "
-@@ -2095,7 +2093,6 @@ void TabStrip::NewTabButtonPressed(const
+@@ -2119,7 +2117,6 @@ void TabStrip::NewTabButtonPressed(const
         if (!clipboard_text.empty()) {
           controller_->CreateNewTabWithLocation(clipboard_text);
         }
--- a/patches/extra/ungoogled-chromium/first-run-page.patch
+++ b/patches/extra/ungoogled-chromium/first-run-page.patch
@@ -18,7 +18,7 @@
 #include "chrome/browser/ui/webui/usb_internals/usb_internals_ui.h"
 #include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"
 #include "chrome/browser/ui/webui/version/version_ui.h"
-@@ -249,6 +250,7 @@ void RegisterChromeWebUIConfigs() {
+@@ -244,6 +245,7 @@ void RegisterChromeWebUIConfigs() {
   map.AddWebUIConfig(std::make_unique<SiteEngagementUIConfig>());
   map.AddWebUIConfig(std::make_unique<SyncInternalsUIConfig>());
   map.AddWebUIConfig(std::make_unique<TranslateInternalsUIConfig>());
--- a/patches/extra/ungoogled-chromium/keep-expired-flags.patch
+++ b/patches/extra/ungoogled-chromium/keep-expired-flags.patch
@@ -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"
-@@ -657,13 +658,17 @@ void FlagsState::GetFlagFeatureEntries(
+@@ -667,13 +668,17 @@ void FlagsState::GetFlagFeatureEntries(
   int current_platform = GetCurrentPlatform();
 
   for (const FeatureEntry& entry : feature_entries_) {
@@ -27,7 +27,7 @@
 
     base::Value::List supported_platforms;
     AddOsStrings(entry.supported_platforms, &supported_platforms);
-@@ -1064,6 +1069,7 @@ bool FlagsState::IsSupportedFeature(cons
+@@ -1074,6 +1079,7 @@ bool FlagsState::IsSupportedFeature(cons
     if (!entry.InternalNameMatches(name))
       continue;
     if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry))
--- a/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch
+++ b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch
@@ -3,7 +3,7 @@
 #
 --- a/components/omnibox/common/omnibox_features.cc
 +++ b/components/omnibox/common/omnibox_features.cc
-@@ -326,7 +326,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor
+@@ -314,7 +314,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor
 // Enables additional site search providers for the Site search Starter Pack.
 BASE_FEATURE(kStarterPackExpansion,
              "StarterPackExpansion",
--- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch
+++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch
@@ -35,7 +35,7 @@

 --- a/chrome/app/settings_chromium_strings.grdp
 +++ b/chrome/app/settings_chromium_strings.grdp
-@@ -369,13 +369,13 @@
+@@ -370,13 +370,13 @@
 
   <!-- Performance Page -->
   <message name="IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_SETTING_DESCRIPTION" desc="Description for the memory saver mode setting">
@@ -54,7 +54,7 @@
   <!-- Languages Page -->
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -1183,7 +1183,7 @@
+@@ -1186,7 +1186,7 @@
     Active site
   </message>
   <message name="IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_ADD_DIALOG_HELP" desc="Help text shown on the second tab of the tab discarding exception list add dialog. Explains how to use the filter format to add an exclusion rule to the list.">
@@ -63,7 +63,7 @@
   </message>
   <message name="IDS_SETTINGS_PERFORMANCE_BATTERY_PAGE_TITLE" desc="Title of the power section in the performance settings page.">
     Power
-@@ -1207,7 +1207,7 @@
+@@ -1210,7 +1210,7 @@
     Inactive tabs appearance
   </message>
   <message name="IDS_SETTINGS_PERFORMANCE_DISCARD_RING_TREATMENT_ENABLED_DESCRIPTION_WITH_LEARN_LINK" desc="Label for a performance settings toggle description that controls whether the inactive tab UI is shown. Also contains a link to the help center article.">
@@ -72,7 +72,7 @@
   </message>
   <message name="IDS_SETTINGS_PERFORMANCE_TAB_HOVER_PREVIEW_CARD_LINK_TITLE" desc="Title for the link row that points to tab hover preview card apperance settings.">
     Tab hover preview card appearance
-@@ -1219,7 +1219,7 @@
+@@ -1222,7 +1222,7 @@
     Performance issue alerts
   </message>
   <message name="IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_DESCRIPTION" desc="Label for a performance settings toggle that controls whether performance intervention notifications should be shown and link to learn more about performance issue alerts.">
@@ -255,18 +255,18 @@
   <template is="dom-if"
 --- a/chrome/browser/resources/settings/basic_page/basic_page.html
 +++ b/chrome/browser/resources/settings/basic_page/basic_page.html
-@@ -65,7 +65,7 @@
+@@ -70,7 +70,7 @@
+         <!--  TODO(crbug.com/40267370): Add a test to basic_page_test.ts
         to check that settings-safety-hub-entry-point is not visible
         in the guest mode. -->
-         <template is="dom-if"
-            if="[[showSafetyHubEntryPointPage_(pageVisibility.safetyHub)]]"
-+            if="[[false]]"
+-        <template is="dom-if" if="[[showPage_(pageVisibility.safetyHub)]]"
+        <template is="dom-if" if="[[false]]"
             restamp>
           <settings-section page-title="$i18n{safetyHub}"
               section="safetyHubEntryPoint" 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/c
+@@ -13,7 +13,6 @@ import 'chrome://resources/cr_elements/c
 import 'chrome://resources/cr_elements/cr_shared_vars.css.js';
 import '../ai_page/ai_page.js';
 import '../appearance_page/appearance_page.js';
@@ -274,7 +274,7 @@
 import '../privacy_page/privacy_page.js';
 import '../safety_hub/safety_hub_entry_point.js';
 import '../autofill_page/autofill_page.js';
-@@ -272,7 +271,6 @@ export class SettingsBasicPageElement ex
+@@ -274,7 +273,6 @@ export class SettingsBasicPageElement ex
       this.showPrivacyGuidePromo_ = false;
       return;
     }
@@ -308,7 +308,7 @@
       <cr-link-row id="historySearchRow"
 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts
 +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
-@@ -205,10 +205,6 @@ export class SettingsPersonalizationOpti
+@@ -206,10 +206,6 @@ export class SettingsPersonalizationOpti
         'chrome-signin-user-choice-info-change',
         this.setChromeSigninUserChoiceInfo_.bind(this));
     // </if>
@@ -339,7 +339,7 @@
             class="hr" label="$i18n{thirdPartyCookiesLinkRowLabel}"
 --- a/chrome/browser/resources/settings/privacy_page/security_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/security_page.html
-@@ -241,9 +241,3 @@
+@@ -237,9 +237,3 @@
       </cr-link-row>
 </if>
 
@@ -386,7 +386,7 @@
 void RecentTabsSubMenuModel::BuildLocalEntries() {
 --- a/chrome/browser/ui/toolbar/app_menu_model.cc
 +++ b/chrome/browser/ui/toolbar/app_menu_model.cc
-@@ -964,16 +964,6 @@ void ExtensionsMenuModel::Build(Browser*
+@@ -963,16 +963,6 @@ void ExtensionsMenuModel::Build(Browser*
   SetElementIdentifierAt(
       GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
       kManageExtensionsMenuItem);
@@ -405,7 +405,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
 +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
-@@ -1119,12 +1119,4 @@ void BookmarkMenuDelegate::BuildOtherNod
+@@ -1206,15 +1206,4 @@ void BookmarkMenuDelegate::BuildOtherNod
   ui::ImageModel bookmarks_side_panel_icon = ui::ImageModel::FromVectorIcon(
       kBookmarksSidePanelIcon, ui::kColorMenuIcon,
       ui::SimpleMenuModel::kDefaultIconSize);
@@ -413,7 +413,10 @@
 -      IDC_SHOW_BOOKMARK_SIDE_PANEL,
 -      l10n_util::GetStringUTF16(IDS_BOOKMARKS_ALL_BOOKMARKS_OPEN_SIDE_PANEL),
 -      bookmarks_side_panel_icon);
-  if (!other_node->children().empty()) {
+-  bool other_folder_children_count =
+-      GetBookmarkMergedSurfaceService()->GetChildrenCount(
+-          BookmarkParentFolder::OtherFolder());
+-  if (other_folder_children_count) {
 -    menu->AppendSeparator();
 -    other_node_menu_separator_ = menu->GetSubmenu()->children().back().get();
 -  }
@@ -437,7 +440,7 @@
 void CookieControlsContentView::AddDescriptionRow() {
 --- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
 +++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
-@@ -231,6 +231,7 @@ void ProfileMenuView::BuildMenu() {
+@@ -230,6 +230,7 @@ void ProfileMenuView::BuildMenu() {
 }
 
 gfx::ImageSkia ProfileMenuView::GetSyncIcon() const {
@@ -445,7 +448,7 @@
   Profile* profile = browser()->profile();
   if (profile->IsOffTheRecord() || profile->IsGuestSession()) {
     return gfx::ImageSkia();
-@@ -659,16 +660,8 @@ void ProfileMenuView::BuildIdentity() {
+@@ -668,16 +669,8 @@ void ProfileMenuView::BuildIdentity() {
         badge_image_model, menu_title_, menu_subtitle_, management_label);
   } else {
     std::string profile_user_display_name, profile_user_email;
@@ -500,7 +503,7 @@
   // Specify the maximum message and title width explicitly.
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -909,40 +909,20 @@ void AddPerformanceStrings(content::WebU
+@@ -932,40 +932,20 @@ void AddPerformanceStrings(content::WebU
        IDS_SETTINGS_PERFORMANCE_TAB_HOVER_PREVIEW_CARD_LINK_SUBTITLE},
       {"performanceInterventionEnabledLabel",
        IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_LABEL},
@@ -550,7 +553,7 @@
 
   html_source->AddString(
       "tabDiscardTimerFiveMinutes",
-@@ -988,11 +968,6 @@ void AddPerformanceStrings(content::WebU
+@@ -1011,11 +991,6 @@ void AddPerformanceStrings(content::WebU
           base::NumberToString16(
               performance_manager::user_tuning::BatterySaverModeManager::
                   kLowBatteryThresholdPercent)));
@@ -562,7 +565,7 @@
 
   html_source->AddString("discardRingTreatmentLearnMoreUrl",
                          chrome::kDiscardRingTreatmentLearnMoreUrl);
-@@ -3441,7 +3416,7 @@ void AddSiteSettingsStrings(content::Web
+@@ -3453,7 +3428,7 @@ void AddSiteSettingsStrings(content::Web
       base::FeatureList::IsEnabled(blink::features::kWebPrinting));
 
   html_source->AddBoolean("enableFederatedIdentityApiContentSetting",
@@ -573,7 +576,7 @@
   html_source->AddBoolean(
 --- a/chrome/browser/ui/webui/settings/settings_ui.cc
 +++ b/chrome/browser/ui/webui/settings/settings_ui.cc
-@@ -625,13 +625,7 @@ SettingsUI::SettingsUI(content::WebUI* w
+@@ -623,13 +623,7 @@ SettingsUI::SettingsUI(content::WebUI* w
     auto* optimization_guide_service =
         OptimizationGuideKeyedServiceFactory::GetForProfile(profile);
     for (auto [key, name] : optimization_guide_features) {
@@ -590,8 +593,8 @@
     html_source->AddBoolean("showAdvancedFeaturesMainControl",
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -872,7 +872,7 @@ BASE_FEATURE(kLacrosUseAshWidevine,
- #endif
+@@ -854,7 +854,7 @@ BASE_FEATURE(kOnDeviceWebSpeech,
+              base::FEATURE_DISABLED_BY_DEFAULT);
 
 // Enables the Live Caption feature on supported devices.
 -BASE_FEATURE(kLiveCaption, "LiveCaption", base::FEATURE_ENABLED_BY_DEFAULT);
@@ -601,7 +604,7 @@
 // getDisplayMedia captures. Note: This flag does not control if the "Share this
 --- a/ui/views/controls/menu/menu_item_view.cc
 +++ b/ui/views/controls/menu/menu_item_view.cc
-@@ -860,7 +860,7 @@ void MenuItemView::SetAlerted() {
+@@ -868,7 +868,7 @@ void MenuItemView::SetAlerted() {
 }
 
 bool MenuItemView::ShouldShowNewBadge() const {
--- a/patches/extra/ungoogled-chromium/spoof-webgl-renderer-info.patch
+++ b/patches/extra/ungoogled-chromium/spoof-webgl-renderer-info.patch
@@ -1,24 +0,0 @@
-# Return generic values for WebGLDebugRendererInfo to remove a potential data
-# leak while preventing potential website breakage
-
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -3834,7 +3834,7 @@ ScriptValue WebGLRenderingContextBase::g
-                          String(ContextGL()->GetString(GL_RENDERER))));
-         }
-         return WebGLAny(script_state,
-                        String(ContextGL()->GetString(GL_RENDERER)));
-+                        String("ANGLE (Google, Vulkan 1.3.0 (SwiftShader Device (Subzero) (0x0000C0DE)), SwiftShader driver-5.0.0)"));
-       }
-       SynthesizeGLError(
-           GL_INVALID_ENUM, "getParameter",
-@@ -3848,8 +3848,7 @@ ScriptValue WebGLRenderingContextBase::g
-               pname, IdentifiabilityBenignStringToken(
-                          String(ContextGL()->GetString(GL_VENDOR))));
-         }
-        return WebGLAny(script_state,
-                        String(ContextGL()->GetString(GL_VENDOR)));
-+        return WebGLAny(script_state, String("Google Inc. (Google)"));
-       }
-       SynthesizeGLError(
-           GL_INVALID_ENUM, "getParameter",
--- a/patches/series
+++ b/patches/series
@@ -60,7 +60,6 @@ extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch
 extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
 extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch
 extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch
-extra/ungoogled-chromium/spoof-webgl-renderer-info.patch
 extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch
 extra/ungoogled-chromium/add-suggestions-url-field.patch
 extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch
@@ -106,6 +105,7 @@ extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch
 extra/ungoogled-chromium/enable-extra-locales.patch
 extra/ungoogled-chromium/disable-chromelabs.patch
 extra/ungoogled-chromium/remove-pac-size-limit.patch
+extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch

 helium/add-extra-channel-info.patch
 helium/change-chromium-branding.patch
--- a/patches/upstream-fixes/glue_core_pools.patch
+++ b/patches/upstream-fixes/glue_core_pools.patch
@@ -3,7 +3,7 @@
 # This removes the remaining references needed to build
 --- a/base/allocator/partition_allocator/partition_alloc.gni
 +++ b/base/allocator/partition_allocator/partition_alloc.gni
-@@ -194,9 +194,6 @@ declare_args() {
+@@ -251,9 +251,6 @@ declare_args() {
   force_enable_raw_ptr_exclusion = false
 }
 
--- a/patches/upstream-fixes/missing-dependencies.patch
+++ b/patches/upstream-fixes/missing-dependencies.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
-@@ -885,6 +885,7 @@ source_set("extensions") {
+@@ -880,6 +880,7 @@ source_set("extensions") {
       "//components/resources",
       "//components/safe_browsing:buildflags",
       "//components/safe_browsing/content/browser/web_ui:web_ui",
@@ -10,7 +10,7 @@
       "//components/safe_browsing/core/common:safe_browsing_prefs",
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -556,6 +556,7 @@ static_library("url_constants") {
+@@ -552,6 +552,7 @@ static_library("url_constants") {
     "//components/optimization_guide/optimization_guide_internals/webui:url_constants",
     "//components/password_manager/content/common",
     "//components/safe_browsing/core/common",
--- a/pruning.list
+++ b/pruning.list
@@ -247,6 +247,77 @@ content/browser/indexed_db/fuzzer_corpus/indexed_db_key/string_type
 content/browser/indexed_db/fuzzer_corpus/indexed_db_key_path/ascii
 content/browser/indexed_db/fuzzer_corpus/indexed_db_key_path/ascii_utf8_vector
 content/browser/indexed_db/fuzzer_corpus/indexed_db_key_path/utf8
+content/test/data/android/SelfConsumingObject.dex
+content/test/data/background_resource_fetch/SpaceOnly.otf
+content/test/data/cache_storage/invalid_bucket_id/0430f1a484a0ea6d8de562488c5fbeec0111d16f/ba31f73b-95e8-44fb-a273-265e7e76f5ab/3767fbd3edc759b5_0
+content/test/data/cache_storage/invalid_bucket_id/0430f1a484a0ea6d8de562488c5fbeec0111d16f/ba31f73b-95e8-44fb-a273-265e7e76f5ab/index
+content/test/data/cache_storage/invalid_bucket_id/0430f1a484a0ea6d8de562488c5fbeec0111d16f/ba31f73b-95e8-44fb-a273-265e7e76f5ab/index-dir/the-real-index
+content/test/data/cache_storage/padding_v2/0430f1a484a0ea6d8de562488c5fbeec0111d16f/676288ed-4de0-44af-97d6-dbd75b07a8a3/4bfb34f348c2269e_0
+content/test/data/cache_storage/padding_v2/0430f1a484a0ea6d8de562488c5fbeec0111d16f/676288ed-4de0-44af-97d6-dbd75b07a8a3/index
+content/test/data/cache_storage/padding_v2/0430f1a484a0ea6d8de562488c5fbeec0111d16f/676288ed-4de0-44af-97d6-dbd75b07a8a3/index-dir/the-real-index
+content/test/data/cache_storage/storage_key/0430f1a484a0ea6d8de562488c5fbeec0111d16f/ba31f73b-95e8-44fb-a273-265e7e76f5ab/3767fbd3edc759b5_0
+content/test/data/cache_storage/storage_key/0430f1a484a0ea6d8de562488c5fbeec0111d16f/ba31f73b-95e8-44fb-a273-265e7e76f5ab/index
+content/test/data/cache_storage/storage_key/0430f1a484a0ea6d8de562488c5fbeec0111d16f/ba31f73b-95e8-44fb-a273-265e7e76f5ab/index-dir/the-real-index
+content/test/data/download-test1.lib
+content/test/data/download/empty.bin
+content/test/data/download/gzip-content.gz
+content/test/data/fuzzer_corpus/signed_exchange_certificate_chain_data/wildcard_example.org.public.pem.cbor
+content/test/data/gzip-content.svgz
+content/test/data/indexeddb/corrupt_leveldb/file__0.indexeddb.leveldb/000003.log
+content/test/data/indexeddb/corrupt_leveldb/file__0.indexeddb.leveldb/MANIFEST-000002
+content/test/data/indexeddb/crbug899446/file__0.indexeddb.leveldb/000003.log
+content/test/data/indexeddb/crbug899446/file__0.indexeddb.leveldb/MANIFEST-000001
+content/test/data/indexeddb/crbug899446_noai/file__0.indexeddb.leveldb/000003.log
+content/test/data/indexeddb/crbug899446_noai/file__0.indexeddb.leveldb/MANIFEST-000001
+content/test/data/indexeddb/missing_sst/file__0.indexeddb.leveldb/000008.sst
+content/test/data/indexeddb/missing_sst/file__0.indexeddb.leveldb/MANIFEST-000007
+content/test/data/indexeddb/schema_version_123456/file__0.indexeddb.leveldb/000003.log
+content/test/data/indexeddb/schema_version_123456/file__0.indexeddb.leveldb/MANIFEST-000002
+content/test/data/indexeddb/ssv_version_987654/file__0.indexeddb.leveldb/000003.log
+content/test/data/indexeddb/ssv_version_987654/file__0.indexeddb.leveldb/MANIFEST-000002
+content/test/data/indexeddb/v3_migration_test/file__0.indexeddb.blob/1/00/5
+content/test/data/indexeddb/v3_migration_test/file__0.indexeddb.leveldb/000003.log
+content/test/data/indexeddb/v3_migration_test/file__0.indexeddb.leveldb/MANIFEST-000001
+content/test/data/interest_group/auction_only.wbn
+content/test/data/interest_group/auction_only_both_new_and_old_names.wbn
+content/test/data/interest_group/auction_only_new_name.wbn
+content/test/data/interest_group/multiply.wasm
+content/test/data/shared_dictionary/path/compressed.data
+content/test/data/site_isolation/nosniff.png.octet-stream
+content/test/data/sxg/127.0.0.1.public.pem.cbor
+content/test/data/sxg/google-com.example.org.public.pem.cbor
+content/test/data/sxg/google-com.example.org_test.sxg
+content/test/data/sxg/test.example.com_invalid_test.sxg
+content/test/data/sxg/test.example.org-long-validity.public.pem.cbor
+content/test/data/sxg/test.example.org-noext.public.pem.cbor
+content/test/data/sxg/test.example.org-validity-too-long.public.pem.cbor
+content/test/data/sxg/test.example.org.public.pem.cbor
+content/test/data/sxg/test.example.org_bad_content_type.sxg
+content/test/data/sxg/test.example.org_cert_validity_too_long.sxg
+content/test/data/sxg/test.example.org_csp.sxg
+content/test/data/sxg/test.example.org_fr_variant.sxg
+content/test/data/sxg/test.example.org_hello.txt.sxg
+content/test/data/sxg/test.example.org_long_cert_validity.sxg
+content/test/data/sxg/test.example.org_noext_test.sxg
+content/test/data/sxg/test.example.org_test.html.gz.sxg
+content/test/data/sxg/test.example.org_test.sxg
+content/test/data/sxg/test.example.org_test_bad_mice.sxg
+content/test/data/sxg/test.example.org_test_bad_mice_small.sxg
+content/test/data/sxg/test.example.org_test_download.sxg
+content/test/data/sxg/test.example.org_test_invalid_cbor_header.sxg
+content/test/data/sxg/test.example.org_test_invalid_content_type.sxg
+content/test/data/sxg/test.example.org_test_invalid_magic_string.sxg
+content/test/data/sxg/test.example.org_test_missing_nosniff.sxg
+content/test/data/sxg/test.example.org_vary_cookie.sxg
+content/test/data/web_bundle/broken_bundle_base_b2.wbn
+content/test/data/web_bundle/broken_bundle_broken_first_entry_b2.wbn
+content/test/data/web_bundle/broken_bundle_broken_script_entry_b2.wbn
+content/test/data/web_bundle/cross_origin_b2.wbn
+content/test/data/web_bundle/foo_base_url_bundle_b2.wbn
+content/test/data/web_bundle/foo_primary_url_bundle_b2.wbn
+content/test/data/web_bundle/same_origin_b2.wbn
+content/test/data/web_bundle/uuid-in-package.wbn
+content/test/data/web_bundle/web_bundle_browsertest_b2.wbn
 device/fido/response_data_fuzzer_corpus/get_assertion_response_corpus
 device/fido/response_data_fuzzer_corpus/make_credential_response_corpus
 device/fido/response_data_fuzzer_corpus/register1
@@ -259,29 +330,6 @@ fuchsia_web/webengine/test/data/bear-vp8a.webm
 fuchsia_web/webengine/test/data/bear-vp9-opus.webm
 fuchsia_web/webengine/test/data/bear-vp9.webm
 headless/test/data/protocol/emulation/resources/video.webm
-ios/chrome/app/profile/profile_controller.mm
-ios/chrome/browser/crash_report/model/seed_corpuses/process_snapshot_dump_1
-ios/chrome/browser/crash_report/model/seed_corpuses/process_snapshot_dump_2
-ios/chrome/browser/crash_report/model/seed_corpuses/process_snapshot_dump_3
-ios/chrome/browser/crash_report/model/seed_corpuses/process_snapshot_dump_4
-ios/chrome/browser/omnibox/ui_bundled/popup/carousel/omnibox_popup_carousel_control.mm
-ios/chrome/browser/omnibox/ui_bundled/popup/omnibox_popup_view_controller.mm
-ios/chrome/browser/omnibox/ui_bundled/popup/row/omnibox_popup_row_content_configuration.mm
-ios/chrome/browser/sessions/model/session_restoration_web_state_list_observer.mm
-ios/chrome/test/data/optimization_guide/additional_file_doesnt_exist.crx3
-ios/chrome/test/data/optimization_guide/additional_file_exists.crx3
-ios/chrome/test/data/optimization_guide/signed_valid_model.crx3
-ios/chrome/test/data/sessions/corrupted.plist
-ios/chrome/test/data/sessions/session_m57.plist
-ios/chrome/test/data/sessions/session_m58.plist
-ios/chrome/test/data/voice/test_sound.m4a
-ios/testing/data/http_server_files/bundle.pkpasses
-ios/testing/data/http_server_files/generic.pkpass
-ios/testing/data/http_server_files/redchair.usdz
-ios/testing/data/http_server_files/semi_bundle.pkpasses
-ios/testing/data/http_server_files/video_sample.mov
-ios/web/navigation/navigation_item_impl_unittest.mm
-ios/web/test/data/testpass.pkpass
 media/formats/mp4/h264_annex_b_fuzz_corpus/chunk1-config-idr.bin
 media/formats/mp4/h264_annex_b_fuzz_corpus/chunk2-non-idr.bin
 media/formats/mp4/h264_annex_b_fuzz_corpus/chunk3-non-idr.bin
@@ -1185,13 +1233,20 @@ net/data/ssl/certificates/client-empty-password.p12
 net/data/ssl/certificates/client-nokey.p12
 net/data/ssl/certificates/client-null-password.p12
 net/data/ssl/certificates/client.p12
+net/data/ssl/certificates/client_1.p12
 net/data/ssl/certificates/client_1.pk8
 net/data/ssl/certificates/client_1_u16_password.p12
+net/data/ssl/certificates/client_2.p12
 net/data/ssl/certificates/client_2.pk8
+net/data/ssl/certificates/client_3.p12
 net/data/ssl/certificates/client_3.pk8
+net/data/ssl/certificates/client_4.p12
 net/data/ssl/certificates/client_4.pk8
+net/data/ssl/certificates/client_5.p12
 net/data/ssl/certificates/client_5.pk8
+net/data/ssl/certificates/client_6.p12
 net/data/ssl/certificates/client_6.pk8
+net/data/ssl/certificates/client_7.p12
 net/data/ssl/certificates/client_7.pk8
 net/data/ssl/certificates/client_with_ec_key.p12
 net/data/ssl/certificates/crlset_blocked_interception_by_intermediate.raw
@@ -1252,6 +1307,7 @@ services/device/usb/fuzz_corpus/webusb_descriptors_unittest_example
 services/test/data/passage_embeddings/dummy_embeddings_model.tflite
 services/test/data/passage_embeddings/sentencepiece.model
 services/test/data/video_effects/models/selfie_segmentation.tflite
+services/test/data/video_effects/models/selfie_segmentation_landscape.crx3
 services/test/data/video_effects/models/selfie_segmentation_landscape.tflite
 sql/test/data/recovery_387868
 testing/libfuzzer/fuzzers/flatbuffers_corpus/monsterdata_test.mon
@@ -6900,6 +6956,8 @@ third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/SHAKE-256.b
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/SLH-DSA.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/TLS12.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/TLS13.bz2
+third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/cSHAKE-128.bz2
+third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/cSHAKE-256.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/ctrDRBG.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/hmacDRBG.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/expected/kdf-components.bz2
@@ -6942,6 +7000,8 @@ third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/SHAKE-256.bz
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/SLH-DSA.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/TLS12.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/TLS13.bz2
+third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/cSHAKE-128.bz2
+third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/cSHAKE-256.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/ctrDRBG.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/hmacDRBG.bz2
 third_party/boringssl/src/util/fipstools/acvp/acvptool/test/vectors/kdf-components.bz2
@@ -7016,7 +7076,6 @@ third_party/catapult/third_party/vinn/third_party/parse5/test/data/tree_construc
 third_party/catapult/third_party/vinn/third_party/parse5/test/data/tree_construction/plain-text-unsafe.dat
 third_party/catapult/tracing/skp_data/google_homepage.skp
 third_party/catapult/tracing/skp_data/lthi_cats.skp
-third_party/closure_compiler/compiler/compiler.jar
 third_party/cpuinfo/src/test/dmesg/alldocube-iwork8.log
 third_party/cpuinfo/src/test/dmesg/galaxy-a3-2016-eu.log
 third_party/cpuinfo/src/test/dmesg/galaxy-grand-prime-value-edition.log
@@ -7672,13 +7731,16 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-multiple-frames.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-no-nav.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-single-frame.json.gz
+third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/crux.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/dom-size-long.json.gz
+third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/dom-size-overlap.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/dom-size.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/enhanced-traces.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/extension-tracks-and-marks.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/fenced-frame-fledge.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/font-display.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/forced-layouts-and-no-gpu.json.gz
+third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/forced-reflow.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/generic-about-tracing.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/idle-callback.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/idle-tasks.json.gz
@@ -7699,6 +7761,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/larg
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/large-recalc-style.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lcp-images-rasterizer.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lcp-images.json.gz
+third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lcp-late-paint-event.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lcp-multiple-frames.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lcp-web-font.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/load-simple.json.gz
@@ -7709,6 +7772,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/many
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/missing-process-data.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/missing-tracing-start.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/missing-url.json.gz
+third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/multi-frame-dom-stats.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/multiple-lcp-main-frame.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/multiple-navigations-render-blocking.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/multiple-navigations-same-id.json.gz
@@ -7759,6 +7823,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/web-
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/web-dev-initial-url.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/web-dev-modifications.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/web-dev-outermost-frames.json.gz
+third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/web-dev-screenshot-source-ids.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/web-dev-with-advanced-instrumentation.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/web-dev-with-commit.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/web-dev.json.gz
@@ -7769,6 +7834,7 @@ 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
 third_party/devtools-frontend/src/test/e2e/resources/network/webbundle_bad_metadata.wbn
+third_party/devtools-frontend/src/test/e2e/resources/performance/timeline/web.dev-trace.json.gz
 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
@@ -10110,13 +10176,6 @@ third_party/icu/tzres/metaZones.res
 third_party/icu/tzres/timezoneTypes.res
 third_party/icu/tzres/zoneinfo64.res
 third_party/jni_zero/test/java/src/org/jni_zero/JavapClass.class
-third_party/libavif/src/android_jni/gradle/wrapper/gradle-wrapper.jar
-third_party/libavif/src/tests/data/cosmos1650_yuv444_10bpc_p3pq.y4m
-third_party/libavif/src/tests/data/kodim03_yuv420_8bpc.y4m
-third_party/libavif/src/tests/data/kodim23_yuv420_8bpc.y4m
-third_party/libavif/src/tests/data/sRGB2014.icc
-third_party/libavif/src/tests/data/sources/colors.psd
-third_party/libavif/src/tests/data/sources/seine.psd
 third_party/libc++/src/test/std/input.output/iostream.objects/wide.stream.objects/test.dat
 third_party/libdrm/src/intel/tests/gen4-3d.batch
 third_party/libdrm/src/intel/tests/gen5-3d.batch
@@ -12552,6 +12611,7 @@ third_party/openh264/src/res/test_qcif_cabac.264
 third_party/openh264/src/res/test_scalinglist_jm.264
 third_party/openh264/src/res/test_vd_1d.264
 third_party/openh264/src/res/test_vd_rc.264
+third_party/openscreen/src/buildtools/linux64-format/clang-format
 third_party/openscreen/src/buildtools/third_party/eu-strip/bin/eu-strip
 third_party/openscreen/src/cast/common/channel/message_framer_fuzzer_seeds/03d4b4028b559489768e2cccd6015c907f70a2c0
 third_party/openscreen/src/cast/common/channel/message_framer_fuzzer_seeds/333be5dfffb2c6eeadf31be2dc219ef841c99ea0
@@ -12700,22 +12760,22 @@ third_party/quic_trace/src/examples/example.json.gz
 third_party/quic_trace/src/examples/example.qtr
 third_party/r8/custom_d8.jar
 third_party/r8/custom_r8.jar
-third_party/rust/chromium_crates_io/vendor/bstr-1.11.1/src/unicode/fsm/grapheme_break_fwd.bigendian.dfa
-third_party/rust/chromium_crates_io/vendor/bstr-1.11.1/src/unicode/fsm/grapheme_break_fwd.littleendian.dfa
-third_party/rust/chromium_crates_io/vendor/bstr-1.11.1/src/unicode/fsm/grapheme_break_rev.bigendian.dfa
-third_party/rust/chromium_crates_io/vendor/bstr-1.11.1/src/unicode/fsm/grapheme_break_rev.littleendian.dfa
-third_party/rust/chromium_crates_io/vendor/bstr-1.11.1/src/unicode/fsm/regional_indicator_rev.bigendian.dfa
-third_party/rust/chromium_crates_io/vendor/bstr-1.11.1/src/unicode/fsm/regional_indicator_rev.littleendian.dfa
-third_party/rust/chromium_crates_io/vendor/bstr-1.11.1/src/unicode/fsm/sentence_break_fwd.bigendian.dfa
-third_party/rust/chromium_crates_io/vendor/bstr-1.11.1/src/unicode/fsm/sentence_break_fwd.littleendian.dfa
-third_party/rust/chromium_crates_io/vendor/bstr-1.11.1/src/unicode/fsm/simple_word_fwd.bigendian.dfa
-third_party/rust/chromium_crates_io/vendor/bstr-1.11.1/src/unicode/fsm/simple_word_fwd.littleendian.dfa
-third_party/rust/chromium_crates_io/vendor/bstr-1.11.1/src/unicode/fsm/whitespace_anchored_fwd.bigendian.dfa
-third_party/rust/chromium_crates_io/vendor/bstr-1.11.1/src/unicode/fsm/whitespace_anchored_fwd.littleendian.dfa
-third_party/rust/chromium_crates_io/vendor/bstr-1.11.1/src/unicode/fsm/whitespace_anchored_rev.bigendian.dfa
-third_party/rust/chromium_crates_io/vendor/bstr-1.11.1/src/unicode/fsm/whitespace_anchored_rev.littleendian.dfa
-third_party/rust/chromium_crates_io/vendor/bstr-1.11.1/src/unicode/fsm/word_break_fwd.bigendian.dfa
-third_party/rust/chromium_crates_io/vendor/bstr-1.11.1/src/unicode/fsm/word_break_fwd.littleendian.dfa
+third_party/rust/chromium_crates_io/vendor/bstr-1.11.3/src/unicode/fsm/grapheme_break_fwd.bigendian.dfa
+third_party/rust/chromium_crates_io/vendor/bstr-1.11.3/src/unicode/fsm/grapheme_break_fwd.littleendian.dfa
+third_party/rust/chromium_crates_io/vendor/bstr-1.11.3/src/unicode/fsm/grapheme_break_rev.bigendian.dfa
+third_party/rust/chromium_crates_io/vendor/bstr-1.11.3/src/unicode/fsm/grapheme_break_rev.littleendian.dfa
+third_party/rust/chromium_crates_io/vendor/bstr-1.11.3/src/unicode/fsm/regional_indicator_rev.bigendian.dfa
+third_party/rust/chromium_crates_io/vendor/bstr-1.11.3/src/unicode/fsm/regional_indicator_rev.littleendian.dfa
+third_party/rust/chromium_crates_io/vendor/bstr-1.11.3/src/unicode/fsm/sentence_break_fwd.bigendian.dfa
+third_party/rust/chromium_crates_io/vendor/bstr-1.11.3/src/unicode/fsm/sentence_break_fwd.littleendian.dfa
+third_party/rust/chromium_crates_io/vendor/bstr-1.11.3/src/unicode/fsm/simple_word_fwd.bigendian.dfa
+third_party/rust/chromium_crates_io/vendor/bstr-1.11.3/src/unicode/fsm/simple_word_fwd.littleendian.dfa
+third_party/rust/chromium_crates_io/vendor/bstr-1.11.3/src/unicode/fsm/whitespace_anchored_fwd.bigendian.dfa
+third_party/rust/chromium_crates_io/vendor/bstr-1.11.3/src/unicode/fsm/whitespace_anchored_fwd.littleendian.dfa
+third_party/rust/chromium_crates_io/vendor/bstr-1.11.3/src/unicode/fsm/whitespace_anchored_rev.bigendian.dfa
+third_party/rust/chromium_crates_io/vendor/bstr-1.11.3/src/unicode/fsm/whitespace_anchored_rev.littleendian.dfa
+third_party/rust/chromium_crates_io/vendor/bstr-1.11.3/src/unicode/fsm/word_break_fwd.bigendian.dfa
+third_party/rust/chromium_crates_io/vendor/bstr-1.11.3/src/unicode/fsm/word_break_fwd.littleendian.dfa
 third_party/rust/chromium_crates_io/vendor/fdeflate-0.3.7/tests/input-chunking-sensitivity-example1.zz
 third_party/rust/chromium_crates_io/vendor/fdeflate-0.3.7/tests/input-chunking-sensitivity-example2.zz
 third_party/rust/chromium_crates_io/vendor/fdeflate-0.3.7/tests/input-chunking-sensitivity-example3.zz
@@ -12723,6 +12783,9 @@ third_party/rust/chromium_crates_io/vendor/flate2-1.0.35/examples/hello_world.tx
 third_party/rust/chromium_crates_io/vendor/flate2-1.0.35/tests/corrupt-gz-file.bin
 third_party/rust/chromium_crates_io/vendor/flate2-1.0.35/tests/good-file.gz
 third_party/rust/chromium_crates_io/vendor/flate2-1.0.35/tests/multi.gz
+third_party/rust/chromium_crates_io/vendor/icu_datetime-2.0.0-beta1/tests/data/blob.postcard
+third_party/rust/chromium_crates_io/vendor/icu_datetime-2.0.0-beta1/tests/fixtures/tests/patterns.bin
+third_party/rust/chromium_crates_io/vendor/icu_datetime-2.0.0-beta1/tests/fixtures/tests/skeletons.bin
 third_party/rust/chromium_crates_io/vendor/regex-1.11.1/testdata/fowler/dat/basic.dat
 third_party/rust/chromium_crates_io/vendor/regex-1.11.1/tests/fuzz/testdata/crash-7eb3351f0965e5d6c1cb98aa8585949ef96531ff
 third_party/rust/chromium_crates_io/vendor/regex-1.11.1/tests/fuzz/testdata/crash-8760b19b25d74e3603d4c643e9c7404fdd3631f9
@@ -12751,8 +12814,8 @@ third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/gen/sparse
 third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/gen/sparse/multi_pattern_v2_fwd.littleendian.dfa
 third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/gen/sparse/multi_pattern_v2_rev.bigendian.dfa
 third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.9/tests/gen/sparse/multi_pattern_v2_rev.littleendian.dfa
-third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.14/tests/fst/xid_continue.fst
-third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.14/tests/fst/xid_start.fst
+third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.15/tests/fst/xid_continue.fst
+third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.15/tests/fst/xid_start.fst
 third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-0.52.6/lib/windows.0.52.0.lib
 third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.6/lib/windows.0.52.0.lib
 third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.6/lib/windows.0.52.0.lib
@@ -13613,6 +13676,25 @@ third_party/vulkan-loader/src/tests/framework/data/binaries/dummy_library_pe_64.
 third_party/vulkan-loader/src/tests/framework/data/binaries/dummy_library_pe_64.so
 third_party/vulkan-loader/src/tests/framework/data/binaries/libdummy_library_elf_32.so
 third_party/vulkan-loader/src/tests/framework/data/binaries/libdummy_library_elf_64.so
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-instance_create_fuzzer-5599244505186304
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-instance_create_fuzzer-5817896795701248
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-instance_create_fuzzer-6541440380895232
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-instance_enumerate_fuzzer-5126563864051712
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-instance_enumerate_fuzzer-6308459683315712
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_create_fuzzer-4558978302214144
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_create_fuzzer-4568454561071104
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_create_fuzzer-4820577276723200
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_create_fuzzer-5177827962454016
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_create_fuzzer-5198773675425792
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_create_fuzzer-5416197367070720
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_create_fuzzer-5801855065915392
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_create_fuzzer-6353004288081920
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-instance_enumerate_fuzzer-6583684169269248
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-json_load_fuzzer-4512865114259456
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-json_load_fuzzer-6182254813249536
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-json_load_fuzzer-6265355951996928
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-json_load_fuzzer-6363106126659584
+third_party/vulkan-loader/src/tests/framework/data/fuzz_test_minimized_test_cases/clusterfuzz-testcase-minimized-json_load_fuzzer-6482033715838976
 third_party/vulkan-tools/src/vulkaninfo/iOS/vulkaninfo.xcodeproj/project.xcworkspace/xcuserdata/lunarg.xcuserdatad/UserInterfaceState.xcuserstate
 third_party/vulkan_memory_allocator/bin/Shader.frag.spv
 third_party/vulkan_memory_allocator/bin/Shader.vert.spv
@@ -14105,12 +14187,12 @@ third_party/win_build_output/midl/chrome/updater/app/server/win/x86/updater_inte
 third_party/win_build_output/midl/chrome/updater/app/server/win/x86/updater_legacy_idl.tlb
 third_party/win_build_output/midl/chrome/updater/app/server/win/x86/updater_legacy_idl_system.tlb
 third_party/win_build_output/midl/chrome/updater/app/server/win/x86/updater_legacy_idl_user.tlb
+third_party/win_build_output/midl/chrome/windows_services/elevated_tracing_service/arm64/tracing_service_idl.tlb
+third_party/win_build_output/midl/chrome/windows_services/elevated_tracing_service/x64/tracing_service_idl.tlb
+third_party/win_build_output/midl/chrome/windows_services/elevated_tracing_service/x86/tracing_service_idl.tlb
 third_party/win_build_output/midl/chrome/windows_services/service_program/arm64/test_service_idl.tlb
 third_party/win_build_output/midl/chrome/windows_services/service_program/x64/test_service_idl.tlb
 third_party/win_build_output/midl/chrome/windows_services/service_program/x86/test_service_idl.tlb
-third_party/win_build_output/midl/components/tracing/arm64/tracing_service_idl.tlb
-third_party/win_build_output/midl/components/tracing/x64/tracing_service_idl.tlb
-third_party/win_build_output/midl/components/tracing/x86/tracing_service_idl.tlb
 third_party/win_build_output/midl/remoting/host/win/arm64/chromoting_lib.tlb
 third_party/win_build_output/midl/remoting/host/win/x64/chromoting_lib.tlb
 third_party/win_build_output/midl/remoting/host/win/x86/chromoting_lib.tlb
--- a/utils/_extraction.py
+++ b/utils/_extraction.py
@@ -14,7 +14,6 @@ import tarfile
 from pathlib import Path, PurePosixPath

 from _common import (USE_REGISTRY, PlatformEnum, ExtractorEnum, get_logger, get_running_platform)
-from prune_binaries import CONTINGENT_PATHS

 DEFAULT_EXTRACTORS = {
    ExtractorEnum.SEVENZIP: USE_REGISTRY,
@@ -90,7 +89,7 @@ def _process_relative_to(unpack_root, relative_to):
    relative_root.rmdir()


-def _extract_tar_with_7z(binary, archive_path, output_dir, relative_to, skip_unused, sysroot):
+def _extract_tar_with_7z(binary, archive_path, output_dir, relative_to):
    get_logger().debug('Using 7-zip extractor')
    if not relative_to is None and (output_dir / relative_to).exists():
        get_logger().error('Temporary unpacking directory already exists: %s',
@@ -98,11 +97,6 @@ def _extract_tar_with_7z(binary, archive_path, output_dir, relative_to, skip_unu
        raise Exception()
    cmd1 = (binary, 'x', str(archive_path), '-so')
    cmd2 = (binary, 'x', '-si', '-aoa', '-ttar', '-o{}'.format(str(output_dir)))
-    if skip_unused:
-        for cpath in CONTINGENT_PATHS:
-            if sysroot and f'{sysroot}-sysroot' in cpath:
-                continue
-            cmd2 += ('-x!%s/%s' % (str(relative_to), cpath[:-1]), )
    get_logger().debug('7z command line: %s | %s', ' '.join(cmd1), ' '.join(cmd2))

    proc1 = subprocess.Popen(cmd1, stdout=subprocess.PIPE)
@@ -118,15 +112,10 @@ def _extract_tar_with_7z(binary, archive_path, output_dir, relative_to, skip_unu
    _process_relative_to(output_dir, relative_to)


-def _extract_tar_with_tar(binary, archive_path, output_dir, relative_to, skip_unused, sysroot):
+def _extract_tar_with_tar(binary, archive_path, output_dir, relative_to):
    get_logger().debug('Using BSD or GNU tar extractor')
    output_dir.mkdir(exist_ok=True)
    cmd = (binary, '-xf', str(archive_path), '-C', str(output_dir))
-    if skip_unused:
-        for cpath in CONTINGENT_PATHS:
-            if sysroot and f'{sysroot}-sysroot' in cpath:
-                continue
-            cmd += ('--exclude=%s/%s' % (str(relative_to), cpath[:-1]), )
    get_logger().debug('tar command line: %s', ' '.join(cmd))
    result = subprocess.run(cmd, check=False)
    if result.returncode != 0:
@@ -138,15 +127,10 @@ def _extract_tar_with_tar(binary, archive_path, output_dir, relative_to, skip_un
    _process_relative_to(output_dir, relative_to)


-def _extract_tar_with_winrar(binary, archive_path, output_dir, relative_to, skip_unused, sysroot):
+def _extract_tar_with_winrar(binary, archive_path, output_dir, relative_to):
    get_logger().debug('Using WinRAR extractor')
    output_dir.mkdir(exist_ok=True)
    cmd = (binary, 'x', '-o+', str(archive_path), str(output_dir))
-    if skip_unused:
-        for cpath in CONTINGENT_PATHS:
-            if sysroot and f'{sysroot}-sysroot' in cpath:
-                continue
-            cmd += ('-x%s%s%s' % (str(relative_to), os.sep, cpath[:-1].replace('/')), )
    get_logger().debug('WinRAR command line: %s', ' '.join(cmd))
    result = subprocess.run(cmd, check=False)
    if result.returncode != 0:
@@ -156,7 +140,7 @@ def _extract_tar_with_winrar(binary, archive_path, output_dir, relative_to, skip
    _process_relative_to(output_dir, relative_to)


-def _extract_tar_with_python(archive_path, output_dir, relative_to, skip_unused, sysroot):
+def _extract_tar_with_python(archive_path, output_dir, relative_to):
    get_logger().debug('Using pure Python tar extractor')

    class NoAppendList(list):
@@ -183,12 +167,6 @@ def _extract_tar_with_python(archive_path, output_dir, relative_to, skip_unused,
        tar_file_obj.members = NoAppendList()
        for tarinfo in tar_file_obj:
            try:
-                if skip_unused and [
-                        cpath for cpath in CONTINGENT_PATHS
-                        if tarinfo.name.startswith(str(relative_to) + '/' + cpath)
-                        and not (sysroot and f'{sysroot}-sysroot' in cpath)
-                ]:
-                    continue
                if relative_to is None:
                    destination = output_dir / PurePosixPath(tarinfo.name)
                else:
@@ -212,7 +190,7 @@ def _extract_tar_with_python(archive_path, output_dir, relative_to, skip_unused,
                raise


-def extract_tar_file(archive_path, output_dir, relative_to, skip_unused, sysroot, extractors=None):
+def extract_tar_file(archive_path, output_dir, relative_to, extractors=None):
    """
    Extract regular or compressed tar archive into the output directory.

@@ -235,8 +213,7 @@ def extract_tar_file(archive_path, output_dir, relative_to, skip_unused, sysroot
            sevenzip_cmd = str(_find_7z_by_registry())
        sevenzip_bin = _find_extractor_by_cmd(sevenzip_cmd)
        if sevenzip_bin is not None:
-            _extract_tar_with_7z(sevenzip_bin, archive_path, output_dir, relative_to, skip_unused,
-                                 sysroot)
+            _extract_tar_with_7z(sevenzip_bin, archive_path, output_dir, relative_to)
            return

        # Use WinRAR if 7-zip is not found
@@ -245,8 +222,7 @@ def extract_tar_file(archive_path, output_dir, relative_to, skip_unused, sysroot
            winrar_cmd = str(_find_winrar_by_registry())
        winrar_bin = _find_extractor_by_cmd(winrar_cmd)
        if winrar_bin is not None:
-            _extract_tar_with_winrar(winrar_bin, archive_path, output_dir, relative_to, skip_unused,
-                                     sysroot)
+            _extract_tar_with_winrar(winrar_bin, archive_path, output_dir, relative_to)
            return
        get_logger().warning(
            'Neither 7-zip nor WinRAR were found. Falling back to Python extractor...')
@@ -254,17 +230,16 @@ def extract_tar_file(archive_path, output_dir, relative_to, skip_unused, sysroot
        # NOTE: 7-zip isn't an option because it doesn't preserve file permissions
        tar_bin = _find_extractor_by_cmd(extractors.get(ExtractorEnum.TAR))
        if not tar_bin is None:
-            _extract_tar_with_tar(tar_bin, archive_path, output_dir, relative_to, skip_unused,
-                                  sysroot)
+            _extract_tar_with_tar(tar_bin, archive_path, output_dir, relative_to)
            return
    else:
        # This is not a normal code path, so make it clear.
        raise NotImplementedError(current_platform)
    # Fallback to Python-based extractor on all platforms
-    _extract_tar_with_python(archive_path, output_dir, relative_to, skip_unused, sysroot)
+    _extract_tar_with_python(archive_path, output_dir, relative_to)


-def extract_with_7z(archive_path, output_dir, relative_to, skip_unused, sysroot, extractors=None):
+def extract_with_7z(archive_path, output_dir, relative_to, extractors=None):
    """
    Extract archives with 7-zip into the output directory.
    Only supports archives with one layer of unpacking, so compressed tar archives don't work.
@@ -294,11 +269,6 @@ def extract_with_7z(archive_path, output_dir, relative_to, skip_unused, sysroot,
                           output_dir / relative_to)
        raise Exception()
    cmd = (sevenzip_bin, 'x', str(archive_path), '-aoa', '-o{}'.format(str(output_dir)))
-    if skip_unused:
-        for cpath in CONTINGENT_PATHS:
-            if sysroot and f'{sysroot}-sysroot' in cpath:
-                continue
-            cmd += ('-x!%s/%s' % (str(relative_to), cpath[:-1]), )
    get_logger().debug('7z command line: %s', ' '.join(cmd))

    result = subprocess.run(cmd, check=False)
@@ -309,12 +279,7 @@ def extract_with_7z(archive_path, output_dir, relative_to, skip_unused, sysroot,
    _process_relative_to(output_dir, relative_to)


-def extract_with_winrar(archive_path,
-                        output_dir,
-                        relative_to,
-                        skip_unused,
-                        sysroot,
-                        extractors=None):
+def extract_with_winrar(archive_path, output_dir, relative_to, extractors=None):
    """
    Extract archives with WinRAR into the output directory.
    Only supports archives with one layer of unpacking, so compressed tar archives don't work.
@@ -342,11 +307,6 @@ def extract_with_winrar(archive_path,
                           output_dir / relative_to)
        raise Exception()
    cmd = (winrar_bin, 'x', '-o+', str(archive_path), str(output_dir))
-    if skip_unused:
-        for cpath in CONTINGENT_PATHS:
-            if sysroot and f'{sysroot}-sysroot' in cpath:
-                continue
-            cmd += ('-x%s%s%s' % (str(relative_to), os.sep, cpath[:-1].replace('/', os.sep)), )
    get_logger().debug('WinRAR command line: %s', ' '.join(cmd))

    result = subprocess.run(cmd, check=False)
--- a/utils/clone.py
+++ b/utils/clone.py
@@ -18,7 +18,6 @@ from stat import S_IWRITE
 from subprocess import run

 from _common import add_common_params, get_chromium_version, get_logger
-from prune_binaries import CONTINGENT_PATHS

 # Config file for gclient
 # Instances of 'src' replaced with UC_OUT, which will be replaced with the output directory
@@ -233,72 +232,6 @@ def clone(args): # pylint: disable=too-many-branches, too-many-locals, too-many-
         str(args.output / 'tools' / 'gn' / 'bootstrap'))

    get_logger().info('Removing uneeded files')
-    # Match removals for the tarball:
-    # https://source.chromium.org/chromium/chromium/tools/build/+/main:recipes/recipe_modules/chromium/resources/export_tarball.py
-    remove_dirs = (
-        (args.output / 'base' / 'tracing' / 'test' / 'data'),
-        (args.output / 'chrome' / 'test' / 'data'),
-        (args.output / 'components' / 'test' / 'data'),
-        (args.output / 'content' / 'test' / 'data'),
-        (args.output / 'courgette' / 'testdata'),
-        (args.output / 'extensions' / 'test' / 'data'),
-        (args.output / 'media' / 'test' / 'data'),
-        (args.output / 'native_client' / 'src' / 'trusted' / 'service_runtime' / 'testdata'),
-        (args.output / 'testing' / 'libfuzzer' / 'fuzzers' / 'wasm_corpus'),
-        (args.output / 'third_party' / 'blink' / 'perf_tests'),
-        (args.output / 'third_party' / 'blink' / 'tools'),
-        (args.output / 'third_party' / 'blink' / 'web_tests'),
-        (args.output / 'third_party' / 'breakpad' / 'breakpad' / 'src' / 'processor' / 'testdata'),
-        (args.output / 'third_party' / 'catapult' / 'tracing' / 'test_data'),
-        (args.output / 'third_party' / 'dawn' / 'test'),
-        (args.output / 'third_party' / 'expat' / 'src' / 'testdata'),
-        (args.output / 'third_party' / 'harfbuzz-ng' / 'src' / 'test'),
-        (args.output / 'third_party' / 'hunspell' / 'tests'),
-        (args.output / 'third_party' / 'hunspell_dictionaries'),
-        (args.output / 'third_party' / 'jdk' / 'current'),
-        (args.output / 'third_party' / 'jdk' / 'extras'),
-        (args.output / 'third_party' / 'liblouis' / 'src' / 'tests' / 'braille-specs'),
-        (args.output / 'third_party' / 'llvm' / 'llvm' / 'test'),
-        (args.output / 'third_party' / 'ots' / 'src' / 'tests' / 'fonts'),
-        (args.output / 'third_party' / 'rust-src' / 'src' / 'gcc' / 'gcc' / 'testsuite'),
-        (args.output / 'third_party' / 'rust-src' / 'src' / 'llvm-project' / 'clang' / 'test'),
-        (args.output / 'third_party' / 'rust-src' / 'src' / 'llvm-project' / 'llvm' / 'test'),
-        (args.output / 'third_party' / 'screen-ai' / 'linux' / 'resources'),
-        (args.output / 'third_party' / 'sqlite' / 'src' / 'test'),
-        (args.output / 'third_party' / 'swiftshader' / 'tests' / 'regres'),
-        (args.output / 'third_party' / 'test_fonts' / 'test_fonts'),
-        (args.output / 'third_party' / 'xdg-utils' / 'tests'),
-        (args.output / 'tools' / 'perf' / 'testdata'),
-        (args.output / 'v8' / 'test'),
-    )
-    keep_files = (
-        (args.output / 'chrome' / 'test' / 'data' / 'webui' / 'i18n_process_css_test.html'),
-        (args.output / 'chrome' / 'test' / 'data' / 'webui' / 'mojo' / 'foobar.mojom'),
-        (args.output / 'chrome' / 'test' / 'data' / 'webui' / 'web_ui_test.mojom'),
-        (args.output / 'v8' / 'test' / 'torque' / 'test-torque.tq'),
-    )
-    keep_suffix = ('.gn', '.gni', '.grd', '.gyp', '.isolate', '.pydeps')
-    # Include Contingent Paths
-    for cpath in CONTINGENT_PATHS:
-        if args.sysroot and f'{args.sysroot}-sysroot' in cpath:
-            continue
-        remove_dirs += (args.output / Path(cpath), )
-    for remove_dir in remove_dirs:
-        for path in sorted(remove_dir.rglob('*'), key=lambda l: len(str(l)), reverse=True):
-            if path.is_file() and path not in keep_files and path.suffix not in keep_suffix:
-                try:
-                    path.unlink()
-                # read-only files can't be deleted on Windows
-                # so remove the flag and try again.
-                except PermissionError:
-                    path.chmod(S_IWRITE)
-                    path.unlink()
-            elif path.is_dir() and not any(path.iterdir()):
-                try:
-                    path.rmdir()
-                except PermissionError:
-                    path.chmod(S_IWRITE)
-                    path.rmdir()
    for path in sorted(args.output.rglob('*'), key=lambda l: len(str(l)), reverse=True):
        if not path.is_symlink() and '.git' not in path.parts:
            if path.is_file() and (('out' in path.parts and 'node_modules' not in path.parts)
--- a/utils/domain_substitution.py
+++ b/utils/domain_substitution.py
@@ -283,7 +283,7 @@ def revert_substitution(domainsub_cache, source_tree):
                                     dir=str(resolved_tree)) as tmp_extract_name:
        extract_path = Path(tmp_extract_name)
        get_logger().debug('Extracting domain substitution cache...')
-        extract_tar_file(domainsub_cache, extract_path, None, False, None)
+        extract_tar_file(domainsub_cache, extract_path, None)

        # Validate source tree file hashes match
        get_logger().debug('Validating substituted files in source tree...')
--- a/utils/downloads.py
+++ b/utils/downloads.py
@@ -332,13 +332,7 @@ def check_downloads(download_info, cache_dir, components, chunk_bytes=262144):
                raise HashMismatchError(download_path)


-def unpack_downloads(download_info,
-                     cache_dir,
-                     components,
-                     output_dir,
-                     skip_unused,
-                     sysroot,
-                     extractors=None):
+def unpack_downloads(download_info, cache_dir, components, output_dir, extractors=None):
    """
    Unpack downloads in the downloads cache to output_dir. Assumes all downloads are retrieved.

@@ -346,8 +340,6 @@ def unpack_downloads(download_info,
    cache_dir is the pathlib.Path directory containing the download cache
    components is a list of component names to unpack, if not empty.
    output_dir is the pathlib.Path directory to unpack the downloads to.
-    skip_unused is a boolean that determines if unused paths should be extracted.
-    sysroot is a string containing a sysroot to unpack if any.
    extractors is a dictionary of PlatformEnum to a command or path to the
        extractor binary. Defaults to 'tar' for tar, and '_use_registry' for 7-Zip and WinRAR.

@@ -377,8 +369,6 @@ def unpack_downloads(download_info,
        extractor_func(archive_path=download_path,
                       output_dir=output_dir / Path(download_properties.output_path),
                       relative_to=strip_leading_dirs_path,
-                       skip_unused=skip_unused,
-                       sysroot=sysroot,
                       extractors=extractors)


@@ -409,6 +399,9 @@ def _retrieve_callback(args):


 def _unpack_callback(args):
+    if args.skip_unused or args.sysroot:
+        get_logger().warning('The --skip-unused and --sysroot flags for downloads.py are'
+                             ' no longer functional and will be removed in the future.')
    extractors = {
        ExtractorEnum.SEVENZIP: args.sevenz_path,
        ExtractorEnum.WINRAR: args.winrar_path,
@@ -416,8 +409,7 @@ def _unpack_callback(args):
    }
    info = DownloadInfo(args.ini)
    info.check_sections_exist(args.components)
-    unpack_downloads(info, args.cache, args.components, args.output, args.skip_unused, args.sysroot,
-                     extractors)
+    unpack_downloads(info, args.cache, args.components, args.output, extractors)


 def main():
@@ -479,13 +471,8 @@ def main():
        help=('Command or path to WinRAR\'s "winrar" binary. If "_use_registry" is '
              'specified, determine the path from the registry. Default: %(default)s'))
    unpack_parser.add_argument('output', type=Path, help='The directory to unpack to.')
-    unpack_parser.add_argument('--skip-unused',
-                               action='store_true',
-                               help='Skip extraction of unused directories (CONTINGENT_PATHS).')
-    unpack_parser.add_argument('--sysroot',
-                               choices=('amd64', 'i386'),
-                               help=('Extracts the sysroot for the given architecture '
-                                     'when --skip-unused is set.'))
+    unpack_parser.add_argument('--skip-unused', action='store_true', help='Deprecated')
+    unpack_parser.add_argument('--sysroot', choices=('amd64', 'i386'), help='Deprecated')
    unpack_parser.set_defaults(callback=_unpack_callback)

    args = parser.parse_args()
--- a/utils/prune_binaries.py
+++ b/utils/prune_binaries.py
@@ -16,37 +16,97 @@ from pathlib import Path
 from _common import ENCODING, get_logger, add_common_params

 # List of paths to prune if they exist, excluded from domain_substitution and pruning lists
-# These allow the lists to be compatible between cloned and tarball sources
+# These allow the lists to be compatible between cloned, tarball, and lite tarball sources
 CONTINGENT_PATHS = (
-    # Overridable git sources
-    'third_party/angle/third_party/VK-GL-CTS/src/',
    # CIPD sources
+    'buildtools/linux64/',
+    'third_party/checkstyle/cipd/',
    'third_party/dawn/third_party/ninja/',
    'third_party/dawn/tools/golang/',
    'third_party/devtools-frontend/src/third_party/esbuild/',
    'third_party/google-java-format/',
+    'third_party/libei/cipd/',
+    'third_party/ninja/',
    'third_party/openscreen/src/third_party/ninja/',
+    'third_party/siso/cipd/',
    'third_party/updater/chrome_linux64/',
+    'third_party/updater/chrome_linux64_sans_iid/cipd/',
    'third_party/updater/chromium_linux64/',
+    'third_party/updater/chromium_linux64_sans_iid/cipd/',
+    'tools/luci-go/',
+    'tools/resultdb/',
+    'tools/skia_goldctl/linux/',
    # GCS sources
-    'build/linux/debian_bullseye_amd64-sysroot/',
-    'build/linux/debian_bullseye_i386-sysroot/',
+    'buildtools/linux64-format/',
+    'third_party/blink/renderer/core/css/perftest_data/',
    'third_party/js_code_coverage/',
    'third_party/openscreen/src/buildtools/linux64/format/',
+    'third_party/opus/tests/resources/',
+    'third_party/subresource-filter-ruleset/data/',
+    'tools/perf/page_sets/maps_perf_test/dataset/',
+    # Sysroots(GCS), include all arches the clone script is able to obtain
+    'build/linux/debian_bullseye_amd64-sysroot/',
+    'build/linux/debian_bullseye_arm64-sysroot/',
+    'build/linux/debian_bullseye_armhf-sysroot/',
+    'build/linux/debian_bullseye_i386-sysroot/',
+    'build/linux/debian_bullseye_mips64el-sysroot/',
+    'build/linux/debian_bullseye_mipsel-sysroot/',
    # other
    'third_party/depot_tools/external_bin/',
+    # Match removals for the tarball:
+    # https://source.chromium.org/chromium/chromium/tools/build/+/main:recipes/recipe_modules/chromium/resources/export_tarball.py
+    # nonessential
+    'third_party/blink/tools/',
+    'third_party/blink/web_tests/',
+    'third_party/hunspell_dictionaries/',
+    'third_party/hunspell/tests/',
+    'third_party/jdk/current/',
+    'third_party/jdk/extras/',
+    'third_party/liblouis/src/tests/braille-specs/',
+    'third_party/xdg-utils/tests/',
+    'v8/test/',
+    # test
+    'base/tracing/test/data/',
+    'chrome/test/data/',
+    'components/test/data/',
+    'content/test/data/accessibility/',
+    'content/test/data/gpu/',
+    'content/test/data/media/',
+    'courgette/testdata/',
+    'extensions/test/data/',
+    'media/test/data/',
+    'native_client/src/trusted/service_runtime/testdata/',
+    'testing/libfuzzer/fuzzers/wasm_corpus/',
+    'third_party/blink/perf_tests/',
+    'third_party/breakpad/breakpad/src/processor/testdata/',
+    'third_party/catapult/tracing/test_data/',
+    'third_party/dawn/test/',
+    'third_party/expat/src/testdata/',
+    'third_party/harfbuzz-ng/src/test/',
+    'third_party/llvm/llvm/test/',
+    'third_party/ots/src/tests/fonts/',
+    'third_party/rust-src/src/gcc/gcc/testsuite/',
+    'third_party/rust-src/src/llvm-project/clang/test/',
+    'third_party/rust-src/src/llvm-project/llvm/test/',
+    'third_party/screen-ai/linux/resources/',
+    'third_party/sqlite/src/test/',
+    'third_party/swiftshader/tests/regres/',
+    'third_party/test_fonts/test_fonts/',
+    'tools/perf/testdata/',
    # lite tarball paths:
    # https://source.chromium.org/chromium/chromium/tools/build/+/main:recipes/recipes/publish_tarball.py
    'android_webview/',
    'buildtools/reclient/',
+    'chrome/android/',
    'chromecast/',
+    'ios/',
    'native_client/',
    'native_client_sdk/',
    'third_party/android_platform/',
+    'third_party/angle/third_party/VK-GL-CTS/',
    'third_party/apache-linux/',
-    'third_party/blink/manual_tests/',
-    'third_party/blink/perf_tests/',
    'third_party/catapult/third_party/vinn/third_party/v8/',
+    'third_party/closure_compiler/',
    'third_party/instrumented_libs/',
    'third_party/llvm/',
    'third_party/llvm-build/',
@@ -55,8 +115,20 @@ CONTINGENT_PATHS = (
    'third_party/rust-src/',
    'third_party/rust-toolchain/',
    'third_party/webgl/',
+    'third_party/blink/manual_tests/',
+    'third_party/blink/perf_tests/',
 )

+# Files that should be excluded when pruning contingent paths.
+KEEP_FILES = (
+    'chrome/test/data/webui/i18n_process_css_test.html',
+    'chrome/test/data/webui/mojo/foobar.mojom',
+    'v8/test/torque/test-torque.tq',
+)
+
+# File suffixes that should be excluded when pruning contingent paths.
+KEEP_SUFFIXES = ('.gn', '.gni', '.grd', '.grdp', '.isolate', '.pydeps')
+

 def prune_files(unpack_root, prune_list):
    """
@@ -80,13 +152,17 @@ def prune_files(unpack_root, prune_list):
    return unremovable_files


-def _prune_path(path):
+def _prune_path(path, unpack_root=None):
    """
-    Delete all files and directories in path.
+    Delete files and directories in path.

    path is a pathlib.Path to the directory to be pruned
+    unpack_root is a pathlib.Path to the source tree
    """
    for node in sorted(path.rglob('*'), key=lambda l: len(str(l)), reverse=True):
+        if unpack_root is not None and (node.suffix in KEEP_SUFFIXES
+                                        or str(node.relative_to(unpack_root)) in KEEP_FILES):
+            continue
        if node.is_file() or node.is_symlink():
            try:
                node.unlink()
@@ -120,7 +196,7 @@ def prune_dirs(unpack_root, keep_contingent_paths, sysroot):
                get_logger().info('%s: %s', 'Exempt', cpath)
                continue
            get_logger().info('%s: %s', 'Exists' if Path(cpath).exists() else 'Absent', cpath)
-            _prune_path(unpack_root / cpath)
+            _prune_path(unpack_root / cpath, unpack_root)


 def _callback(args):