merge: update to ungoogled-chromium 138.0.7204.49

chromium_version.txt

@@ -1 +1 @@
-137.0.7151.104
+138.0.7204.49

flags.gn

@@ -5,7 +5,6 @@ disable_fieldtrial_testing_config=true
 enable_hangout_services_extension=false
 enable_mdns=false
 enable_nacl=false
-enable_reading_list=false
 enable_remoting=false
 enable_reporting=false
 enable_service_discovery=false

patches/core/bromite/disable-fetching-field-trials.patch

@@ -10,7 +10,7 @@ Subject: Disable fetching of all field trials
 
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -59,7 +59,7 @@ public abstract class ChromeFeatureList
+@@ -60,7 +60,7 @@ public abstract class ChromeFeatureList
       * |kFeaturesExposedToJava| in chrome/browser/flags/android/chrome_feature_list.cc
       */
      public static String getFieldTrialParamByFeature(String featureName, String paramName) {
@@ -19,7 +19,7 @@ Subject: Disable fetching of all field trials
      }
  
      /**
-@@ -71,8 +71,7 @@ public abstract class ChromeFeatureList
+@@ -72,8 +72,7 @@ public abstract class ChromeFeatureList
       */
      public static boolean getFieldTrialParamByFeatureAsBoolean(
              String featureName, String paramName, boolean defaultValue) {
@@ -29,7 +29,7 @@ Subject: Disable fetching of all field trials
      }
  
      /**
-@@ -84,8 +83,7 @@ public abstract class ChromeFeatureList
+@@ -85,8 +84,7 @@ public abstract class ChromeFeatureList
       */
      public static int getFieldTrialParamByFeatureAsInt(
              String featureName, String paramName, int defaultValue) {
@@ -39,7 +39,7 @@ Subject: Disable fetching of all field trials
      }
  
      /**
-@@ -97,8 +95,7 @@ public abstract class ChromeFeatureList
+@@ -98,8 +96,7 @@ public abstract class ChromeFeatureList
       */
      public static double getFieldTrialParamByFeatureAsDouble(
              String featureName, String paramName, double defaultValue) {

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

@@ -1,6 +1,6 @@
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -3696,8 +3696,6 @@ static_library("browser") {
+@@ -3752,8 +3752,6 @@ static_library("browser") {
        "download/download_auto_open_policy_handler.cc",
        "download/download_auto_open_policy_handler.h",
        "download/download_commands.cc",
@@ -9,19 +9,19 @@
        "download/download_dir_policy_handler.cc",
        "download/download_dir_policy_handler.h",
        "download/download_dir_util.cc",
---- a/chrome/browser/chrome_content_browser_client.cc
-+++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -5511,10 +5511,6 @@ ChromeContentBrowserClient::CreateThrott
-   throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
-       handle, handle->GetWebContents()->GetBrowserContext()));
+--- a/chrome/browser/chrome_content_browser_client_navigation_throttles.cc
++++ b/chrome/browser/chrome_content_browser_client_navigation_throttles.cc
+@@ -391,10 +391,6 @@ void CreateAndAddChromeThrottlesForNavig
+   registry.AddThrottle(std::make_unique<PolicyBlocklistNavigationThrottle>(
+       registry, handle.GetWebContents()->GetBrowserContext()));
  
 -  // Before setting up SSL error detection, configure SSLErrorHandler to invoke
 -  // the relevant extension API whenever an SSL interstitial is shown.
 -  SSLErrorHandler::SetClientCallbackOnInterstitialsShown(
 -      base::BindRepeating(&MaybeTriggerSecurityInterstitialShownEvent));
-   throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
-       handle,
-       base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
+   registry.AddThrottle(std::make_unique<SSLErrorNavigationThrottle>(
+       registry, base::BindOnce(&HandleSSLErrorWrapper),
+       base::BindOnce(&IsInHostedApp),
 --- a/chrome/browser/component_updater/file_type_policies_component_installer.cc
 +++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc
 @@ -38,21 +38,6 @@ const uint8_t kFileTypePoliciesPublicKey
@@ -180,7 +180,7 @@
  class DownloadsShowFunction : public ExtensionFunction {
 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
-@@ -705,18 +705,6 @@ void WebstorePrivateBeginInstallWithMani
+@@ -702,18 +702,6 @@ void WebstorePrivateBeginInstallWithMani
  
  void WebstorePrivateBeginInstallWithManifest3Function::
      ReportFrictionAcceptedEvent() {
@@ -253,7 +253,7 @@
  
    # Note: is_android is not equivalent to safe_browsing_mode == 2.
    # Sources and dependencies added to this block must not depend on anything
-@@ -577,6 +579,7 @@ static_library("advanced_protection") {
+@@ -579,6 +581,7 @@ static_library("advanced_protection") {
  }
  
  source_set("metrics_collector") {
@@ -261,7 +261,7 @@
    sources = [
      "safe_browsing_metrics_collector_factory.cc",
      "safe_browsing_metrics_collector_factory.h",
-@@ -596,6 +599,7 @@ source_set("metrics_collector") {
+@@ -598,6 +601,7 @@ source_set("metrics_collector") {
      "//components/safe_browsing/core/common:safe_browsing_prefs",
      "//content/public/browser",
    ]

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
-@@ -891,93 +891,6 @@ std::tuple<GURL, std::string> AutofillCr
+@@ -924,93 +924,6 @@ std::tuple<GURL, std::string> AutofillCr
  }
  
  bool AutofillCrowdsourcingManager::StartRequest(FormRequestData request_data) {

patches/core/inox-patchset/0015-disable-update-pings.patch

@@ -1,6 +1,6 @@
 --- a/chrome/updater/configurator.cc
 +++ b/chrome/updater/configurator.cc
-@@ -115,7 +115,7 @@ base::TimeDelta Configurator::UpdateDela
+@@ -133,7 +133,7 @@ base::TimeDelta Configurator::UpdateDela
  
  std::vector<GURL> Configurator::UpdateUrl() const {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

patches/core/inox-patchset/0021-disable-rlz.patch

@@ -2,7 +2,7 @@
 
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -477,14 +477,6 @@ group("gn_all") {
+@@ -476,14 +476,6 @@ group("gn_all") {
        ]
      }
  

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
-@@ -535,7 +535,7 @@ void WebRtcLogUploader::UploadCompressed
+@@ -531,7 +531,7 @@ void WebRtcLogUploader::UploadCompressed
            }
          })");
  
@@ -189,7 +189,7 @@ by default.
  
 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
 +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
-@@ -73,17 +73,17 @@ namespace {
+@@ -75,17 +75,17 @@ namespace {
  // The URL for the the Learn More page shown on incognito new tab.
  const char kLearnMoreIncognitoUrl[] =
  #if BUILDFLAG(IS_CHROMEOS)
@@ -227,7 +227,7 @@ by default.
  
 --- a/chrome/installer/setup/google_chrome_behaviors.cc
 +++ b/chrome/installer/setup/google_chrome_behaviors.cc
-@@ -36,7 +36,7 @@ namespace installer {
+@@ -37,7 +37,7 @@ namespace installer {
  namespace {
  
  constexpr std::wstring_view kUninstallSurveyUrl(

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

@@ -39,7 +39,7 @@ the URL so we get notified if this happens again in the future).
      kSafeBrowsingIncidentTrafficAnnotation =
 --- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
 +++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
-@@ -304,11 +304,14 @@ IncidentReportingService::UploadContext:
+@@ -303,11 +303,14 @@ IncidentReportingService::UploadContext:
  
  // static
  bool IncidentReportingService::IsEnabledForProfile(Profile* profile) {

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

@@ -38,7 +38,7 @@
  
 --- a/components/affiliations/core/browser/hash_affiliation_fetcher.cc
 +++ b/components/affiliations/core/browser/hash_affiliation_fetcher.cc
-@@ -132,6 +132,10 @@ HashAffiliationFetcher::~HashAffiliation
+@@ -128,6 +128,10 @@ HashAffiliationFetcher::~HashAffiliation
  }
  
  void HashAffiliationFetcher::StartRequest(
@@ -72,14 +72,14 @@
    if (state_ == REQUESTING) {
 --- a/components/themes/ntp_background_service.cc
 +++ b/components/themes/ntp_background_service.cc
-@@ -96,6 +96,7 @@ void NtpBackgroundService::Shutdown() {
+@@ -88,6 +88,7 @@ void NtpBackgroundService::Shutdown() {
  }
  
  void NtpBackgroundService::FetchCollectionInfo() {
 +  return;
+   // If a request is currently in progress, drop the new request.
    if (collections_loader_ != nullptr) {
      return;
-   }
 --- a/components/update_client/update_checker.cc
 +++ b/components/update_client/update_checker.cc
 @@ -104,6 +104,7 @@ void UpdateCheckerImpl::CheckForUpdates(

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
-@@ -582,7 +582,8 @@ void AutocompleteInput::ParseForEmphasiz
+@@ -578,7 +578,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) ||
@@ -60,7 +60,7 @@
      return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
 --- a/content/browser/child_process_security_policy_impl.cc
 +++ b/content/browser/child_process_security_policy_impl.cc
-@@ -939,6 +939,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
+@@ -938,6 +938,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
    RegisterWebSafeScheme(url::kWssScheme);
  #endif  // BUILDFLAG(ENABLE_WEBSOCKETS)
    RegisterWebSafeScheme(url::kDataScheme);
@@ -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
-@@ -1094,6 +1094,8 @@ component("net") {
+@@ -1101,6 +1101,8 @@ component("net") {
      "url_request/static_http_user_agent_settings.cc",
      "url_request/static_http_user_agent_settings.h",
      "url_request/storage_access_status_cache.h",

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
-@@ -2752,24 +2752,6 @@ void ChromeContentBrowserClient::AppendE
+@@ -2636,24 +2636,6 @@ void ChromeContentBrowserClient::AppendE
      command_line->AppendSwitchASCII(switches::kMetricsClientID,
                                      client_info->client_id);
    }
@@ -26,7 +26,7 @@
 -  command_line->AppendSwitchASCII(switches::kEnableCrashReporter, switch_value);
  #endif
  
-   if (logging::DialogsAreSuppressed())
+   if (logging::DialogsAreSuppressed()) {
 --- a/components/crash/core/app/crashpad.cc
 +++ b/components/crash/core/app/crashpad.cc
 @@ -72,6 +72,12 @@ void InitializeDatabasePath(const base::
@@ -44,7 +44,7 @@
                              const base::FilePath& exe_path,
 --- a/components/gwp_asan/client/gwp_asan.cc
 +++ b/components/gwp_asan/client/gwp_asan.cc
-@@ -323,6 +323,11 @@ GWP_ASAN_EXPORT std::optional<AllocatorS
+@@ -340,6 +340,11 @@ GWP_ASAN_EXPORT std::optional<AllocatorS
  
  // Exported for testing.
  GWP_ASAN_EXPORT std::optional<AllocatorSettings> GetAllocatorSettings(

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

@@ -705,7 +705,7 @@
  
 --- a/components/domain_reliability/uploader.cc
 +++ b/components/domain_reliability/uploader.cc
-@@ -81,7 +81,7 @@ class DomainReliabilityUploaderImpl : pu
+@@ -80,7 +80,7 @@ class DomainReliabilityUploaderImpl : pu
      if (discard_uploads_)
        discarded_upload_count_++;
  

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
-@@ -432,6 +432,7 @@ void GCMClientImpl::StartGCM() {
+@@ -431,6 +431,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();
-@@ -611,23 +612,6 @@ void GCMClientImpl::RemoveHeartbeatInter
+@@ -610,23 +611,6 @@ void GCMClientImpl::RemoveHeartbeatInter
  
  void GCMClientImpl::StartCheckin() {
    DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
@@ -34,7 +34,7 @@
  }
  
  void GCMClientImpl::OnCheckinCompleted(
-@@ -684,24 +668,6 @@ void GCMClientImpl::SetGServicesSettings
+@@ -683,24 +667,6 @@ void GCMClientImpl::SetGServicesSettings
  
  void GCMClientImpl::SchedulePeriodicCheckin() {
    DCHECK(io_task_runner_->RunsTasksInCurrentSequence());

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

@@ -565,7 +565,7 @@
  bool IsProbablyGoogleSearchUrl(const GURL& url) {
 --- a/components/search_engines/template_url.cc
 +++ b/components/search_engines/template_url.cc
-@@ -615,10 +615,7 @@ std::u16string TemplateURLRef::SearchTer
+@@ -621,10 +621,7 @@ std::u16string TemplateURLRef::SearchTer
  bool TemplateURLRef::HasGoogleBaseURLs(
      const SearchTermsData& search_terms_data) const {
    ParseIfNecessary(search_terms_data);
@@ -692,7 +692,7 @@
  
 --- a/net/base/url_util.cc
 +++ b/net/base/url_util.cc
-@@ -519,28 +519,6 @@ bool HasGoogleHost(const GURL& url) {
+@@ -537,28 +537,6 @@ bool HasGoogleHost(const GURL& url) {
  }
  
  bool IsGoogleHost(std::string_view host) {

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

@@ -7,7 +7,7 @@
 
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -372,7 +372,6 @@ if (!is_android && !is_mac) {
+@@ -369,7 +369,6 @@ if (!is_android && !is_mac) {
      }
  
      data_deps += [
@@ -15,7 +15,7 @@
        "//components/webapps/isolated_web_apps/preload:component",
        "//third_party/widevine/cdm",
      ]
-@@ -1206,7 +1205,6 @@ if (is_win) {
+@@ -1204,7 +1203,6 @@ if (is_win) {
        ":optimization_guide_library",
        ":swiftshader_binaries",
        ":widevine_cdm_library",
@@ -25,8 +25,8 @@
  
 --- a/chrome/browser/resources/BUILD.gn
 +++ b/chrome/browser/resources/BUILD.gn
-@@ -89,11 +89,6 @@ group("resources") {
-     public_deps += [ "accessibility:reading_mode_gdocs_extension_resources" ]
+@@ -97,11 +97,6 @@ group("resources") {
+     ]
    }
  
 -  if (is_mac) {

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

@@ -1,6 +1,6 @@
 --- a/components/browsing_data/content/browsing_data_model.cc
 +++ b/components/browsing_data/content/browsing_data_model.cc
-@@ -998,12 +998,6 @@ void BrowsingDataModel::PopulateFromDisk
+@@ -992,12 +992,6 @@ void BrowsingDataModel::PopulateFromDisk
        base::FeatureList::IsEnabled(network::features::kSharedStorageAPI);
    bool is_shared_dictionary_enabled = base::FeatureList::IsEnabled(
        network::features::kCompressionDictionaryTransportBackend);
@@ -13,7 +13,7 @@
  
    base::RepeatingClosure completion =
        base::BindRepeating([](const base::OnceClosure&) {},
-@@ -1040,27 +1034,7 @@ void BrowsingDataModel::PopulateFromDisk
+@@ -1034,27 +1028,7 @@ void BrowsingDataModel::PopulateFromDisk
          base::BindOnce(&OnSharedDictionaryUsageLoaded, this, completion));
    }
  
@@ -52,7 +52,7 @@
  }
  
  // static
-@@ -864,7 +864,7 @@ void PrivacySandboxSettingsImpl::SetTopi
+@@ -888,7 +888,7 @@ void PrivacySandboxSettingsImpl::SetTopi
  }
  
  bool PrivacySandboxSettingsImpl::IsPrivacySandboxRestricted() const {
@@ -61,7 +61,7 @@
  }
  
  bool PrivacySandboxSettingsImpl::IsPrivacySandboxCurrentlyUnrestricted() const {
-@@ -933,11 +933,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
+@@ -957,11 +957,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
      return Status::kIncognitoProfile;
    }
  
@@ -164,7 +164,7 @@
  // static
 --- a/content/browser/interest_group/ad_auction_service_impl.cc
 +++ b/content/browser/interest_group/ad_auction_service_impl.cc
-@@ -193,11 +193,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD
+@@ -192,11 +192,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD
  void AdAuctionServiceImpl::CreateMojoService(
      RenderFrameHost* render_frame_host,
      mojo::PendingReceiver<blink::mojom::AdAuctionService> receiver) {
@@ -178,7 +178,7 @@
  void AdAuctionServiceImpl::JoinInterestGroup(
 --- a/content/browser/storage_partition_impl.cc
 +++ b/content/browser/storage_partition_impl.cc
-@@ -1466,38 +1466,7 @@ void StoragePartitionImpl::Initialize(
+@@ -1469,38 +1469,7 @@ void StoragePartitionImpl::Initialize(
  
    bucket_manager_ = std::make_unique<BucketManager>(this);
  
@@ -217,7 +217,7 @@
  
    GeneratedCodeCacheSettings settings =
        GetContentClient()->browser()->GetGeneratedCodeCacheSettings(
-@@ -1526,8 +1495,6 @@ void StoragePartitionImpl::Initialize(
+@@ -1529,8 +1498,6 @@ void StoragePartitionImpl::Initialize(
  
    font_access_manager_ = FontAccessManager::Create();
  
@@ -226,7 +226,7 @@
  
  #if BUILDFLAG(ENABLE_LIBRARY_CDMS)
    if (is_in_memory()) {
-@@ -1551,11 +1518,6 @@ void StoragePartitionImpl::Initialize(
+@@ -1554,11 +1521,6 @@ void StoragePartitionImpl::Initialize(
          std::make_unique<SharedStorageHeaderObserver>(this);
    }
  
@@ -240,7 +240,7 @@
  void StoragePartitionImpl::OnStorageServiceDisconnected() {
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3979,12 +3979,6 @@ void WebContentsImpl::Init(const WebCont
+@@ -4107,12 +4107,6 @@ void WebContentsImpl::Init(const WebCont
    DateTimeChooser::CreateDateTimeChooser(this);
  #endif
  

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
-@@ -183,31 +183,13 @@ void WebRtcLogUploader::OnLoggingStopped
+@@ -179,31 +179,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,
-@@ -224,28 +206,7 @@ void WebRtcLogUploader::PrepareMultipart
+@@ -220,28 +202,7 @@ void WebRtcLogUploader::PrepareMultipart
    DCHECK(!compressed_log.empty());
    DCHECK(meta_data.get());
  
@@ -65,7 +65,7 @@
  }
  
  void WebRtcLogUploader::UploadStoredLog(
-@@ -312,48 +273,6 @@ void WebRtcLogUploader::LoggingStoppedDo
+@@ -308,48 +269,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
+@@ -130,7 +130,7 @@ void RegisterBrowserUserPrefs(user_prefs
    registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
    registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
    registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);

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

@@ -55,7 +55,7 @@
                                                base::FEATURE_ENABLED_BY_DEFAULT),
 --- a/services/network/public/cpp/features.cc
 +++ b/services/network/public/cpp/features.cc
-@@ -124,12 +124,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
+@@ -108,12 +108,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
  // Enable usage of hardcoded DoH upgrade mapping for use in automatic mode.
  BASE_FEATURE(kDnsOverHttpsUpgrade,
               "DnsOverHttpsUpgrade",

patches/core/ungoogled-chromium/extensions-manifestv2.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator_desktop.cc
 +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator_desktop.cc
-@@ -61,17 +61,6 @@ void ExtensionInfoGenerator::FillExtensi
+@@ -54,17 +54,6 @@ void ExtensionInfoGenerator::FillExtensi
      info.controlled_info.emplace();
      info.controlled_info->text =
          l10n_util::GetStringUTF8(IDS_EXTENSIONS_INSTALL_LOCATION_ENTERPRISE);
@@ -17,7 +17,7 @@
 -    }
    }
  
-   // Dependent extensions.
+   // Pinned to toolbar.
 --- a/chrome/browser/extensions/extension_management.cc
 +++ b/chrome/browser/extensions/extension_management.cc
 @@ -322,31 +322,7 @@ bool ExtensionManagement::IsAllowedManif
@@ -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
-@@ -146,22 +146,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;
  }
  
-@@ -201,19 +185,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) {
@@ -137,7 +137,7 @@
    source->AddResourcePath("images/product_logo.png",
 --- a/extensions/common/extension.cc
 +++ b/extensions/common/extension.cc
-@@ -96,13 +96,6 @@ bool IsManifestSupported(int manifest_ve
+@@ -104,13 +104,6 @@ bool IsManifestSupported(int manifest_ve
    // Supported versions are always safe.
    if (manifest_version >= kMinimumSupportedManifestVersion &&
        manifest_version <= kMaximumSupportedManifestVersion) {

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

@@ -3,7 +3,7 @@
 
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -373,7 +373,6 @@ if (!is_android && !is_mac) {
+@@ -370,7 +370,6 @@ if (!is_android && !is_mac) {
  
      data_deps += [
        "//chrome/browser/resources/media/mei_preload:component",
@@ -11,7 +11,7 @@
        "//components/webapps/isolated_web_apps/preload:component",
        "//third_party/widevine/cdm",
      ]
-@@ -937,8 +936,6 @@ if (is_win) {
+@@ -934,8 +933,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
-@@ -1210,7 +1207,6 @@ if (is_win) {
+@@ -1208,7 +1205,6 @@ if (is_win) {
        ":swiftshader_binaries",
        ":widevine_cdm_library",
        "//chrome/browser/resources/media/mei_preload:component_bundle",
@@ -30,7 +30,7 @@
  
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -763,10 +763,6 @@ static_library("browser") {
+@@ -775,10 +775,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 @@
      "navigation_predictor/search_engine_preconnector_keyed_service_factory.cc",
      "navigation_predictor/search_engine_preconnector_keyed_service_factory.h",
      "net/cert_verifier_service_time_updater.cc",
-@@ -3562,10 +3558,6 @@ static_library("browser") {
+@@ -3618,10 +3614,6 @@ static_library("browser") {
    } else {
      #!is_android
      sources += [
@@ -52,27 +52,27 @@
        "accessibility/caption_bubble_context_browser.h",
        "accessibility/embedded_a11y_extension_loader.cc",
        "accessibility/embedded_a11y_extension_loader.h",
-@@ -4285,8 +4277,6 @@ static_library("browser") {
+@@ -4329,8 +4321,6 @@ static_library("browser") {
        "//chrome/app:command_ids",
        "//chrome/app/theme:chrome_unscaled_resources_grit",
        "//chrome/app/vector_icons",
 -      "//chrome/browser/accessibility/tree_fixing:prefs",
 -      "//chrome/browser/accessibility/tree_fixing:service",
+       "//chrome/browser/actor",
        "//chrome/browser/apps/app_service",
        "//chrome/browser/apps/link_capturing",
-       "//chrome/browser/contextual_cueing",
-@@ -4307,10 +4297,6 @@ static_library("browser") {
+@@ -4350,10 +4340,6 @@ static_library("browser") {
+       "//chrome/browser/metrics/desktop_session_duration",
        "//chrome/browser/new_tab_page/chrome_colors",
        "//chrome/browser/policy:path_parser",
-       "//chrome/browser/resources:component_extension_resources",
 -      "//chrome/browser/screen_ai:prefs",
 -      "//chrome/browser/screen_ai:screen_ai_install_state",
 -      "//chrome/browser/screen_ai:screen_ai_service_router_factory",
 -      "//chrome/browser/screen_ai/public:optical_character_recognizer",
        "//chrome/browser/search/background",
+       "//chrome/browser/sharing_hub",
        "//chrome/browser/smart_card",
-       "//chrome/browser/themes",
-@@ -4444,9 +4430,6 @@ static_library("browser") {
+@@ -4512,9 +4498,6 @@ static_library("browser") {
        "//components/webauthn/core/browser",
        "//components/webauthn/core/browser:passkey_model",
        "//services/device/public/cpp/hid",
@@ -82,7 +82,7 @@
        "//third_party/crashpad/crashpad/client:common",
        "//third_party/zxcvbn-cpp",
        "//ui/views",
-@@ -4546,8 +4529,6 @@ static_library("browser") {
+@@ -4630,8 +4613,6 @@ static_library("browser") {
        sources += [
          "accessibility/soda_installer_impl.cc",
          "accessibility/soda_installer_impl.h",
@@ -91,7 +91,7 @@
          "device_identity/device_oauth2_token_store_desktop.cc",
          "device_identity/device_oauth2_token_store_desktop.h",
          "device_notifications/device_status_icon_renderer.cc",
-@@ -4586,8 +4567,6 @@ static_library("browser") {
+@@ -4670,8 +4651,6 @@ static_library("browser") {
          "profiles/profile_activity_metrics_recorder.h",
          "profiles/profile_list_desktop.cc",
          "profiles/profile_list_desktop.h",
@@ -100,15 +100,15 @@
          "signin/force_signin_verifier.cc",
          "signin/force_signin_verifier.h",
          "signin/signin_manager.cc",
-@@ -5388,7 +5367,6 @@ static_library("browser") {
+@@ -5471,7 +5450,6 @@ static_library("browser") {
        "//chrome/browser/policy:system_features_disable_list",
        "//chrome/browser/push_notification:push_notification",
        "//chrome/browser/resources:app_icon_resources",
 -      "//chrome/browser/screen_ai:screen_ai_dlc_installer",
+       "//chrome/browser/sharesheet",
        "//chrome/browser/support_tool/ash",
        "//chrome/browser/ui/ash/accelerator",
-       "//chrome/browser/ui/ash/accessibility",
-@@ -5653,7 +5631,6 @@ static_library("browser") {
+@@ -5738,7 +5716,6 @@ static_library("browser") {
        "//remoting/host/chromeos:browser_interop",
        "//remoting/host/chromeos:features",
        "//services/device/public/cpp/geolocation",
@@ -116,7 +116,7 @@
        "//third_party/nearby:rpc_resources_proto",
        "//third_party/nearby:wire_format_proto",
        "//ui/chromeos",
-@@ -7895,12 +7872,6 @@ static_library("browser") {
+@@ -7993,12 +7970,6 @@ static_library("browser") {
    }
  
    if (enable_pdf) {
@@ -145,7 +145,7 @@
  }
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -250,12 +250,10 @@
+@@ -246,12 +246,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"
@@ -158,7 +158,7 @@
  #include "chrome/browser/usb/usb_status_icon.h"
  #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
  #endif
-@@ -1381,9 +1379,6 @@ void BrowserProcessImpl::PreMainMessageL
+@@ -1382,9 +1380,6 @@ void BrowserProcessImpl::PreMainMessageL
    soda_installer_impl_ = std::make_unique<speech::SodaInstallerImplChromeOS>();
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -192,7 +192,7 @@
    std::unique_ptr<BrowserProcessPlatformPart> platform_part_;
 --- a/chrome/browser/chrome_browser_interface_binders.cc
 +++ b/chrome/browser/chrome_browser_interface_binders.cc
-@@ -82,8 +82,6 @@
+@@ -81,8 +81,6 @@
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
      BUILDFLAG(IS_CHROMEOS)
@@ -229,7 +229,7 @@
  
  void BindModelBroker(
      content::RenderFrameHost* frame_host,
-@@ -530,11 +507,6 @@ void PopulateChromeFrameBinders(
+@@ -532,11 +509,6 @@ void PopulateChromeFrameBinders(
          base::BindRepeating(&web_app::SubAppsServiceImpl::CreateIfAllowed));
    }
  
@@ -252,7 +252,7 @@
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if !BUILDFLAG(IS_ANDROID)
-@@ -237,9 +235,6 @@ void RegisterComponentsForUpdate() {
+@@ -239,9 +237,6 @@ void RegisterComponentsForUpdate() {
  
    RegisterAutofillStatesComponent(cus, g_browser_process->local_state());
  
@@ -367,7 +367,7 @@
  void NavigationPredictor::SetModelScoreCallbackForTesting(
 --- a/chrome/browser/pdf/pdf_extension_util.cc
 +++ b/chrome/browser/pdf/pdf_extension_util.cc
-@@ -100,7 +100,6 @@ void AddPdfViewerStrings(base::Value::Di
+@@ -110,7 +110,6 @@ void AddPdfViewerStrings(base::Value::Di
        {"rotationStateLabel90", IDS_PDF_ROTATION_STATE_LABEL_90},
        {"rotationStateLabel180", IDS_PDF_ROTATION_STATE_LABEL_180},
        {"rotationStateLabel270", IDS_PDF_ROTATION_STATE_LABEL_270},
@@ -375,33 +375,76 @@
        {"thumbnailPageAriaLabel", IDS_PDF_THUMBNAIL_PAGE_ARIA_LABEL},
        {"tooltipAttachments", IDS_PDF_TOOLTIP_ATTACHMENTS},
        {"tooltipDocumentOutline", IDS_PDF_TOOLTIP_DOCUMENT_OUTLINE},
+--- a/chrome/browser/permissions/BUILD.gn
++++ b/chrome/browser/permissions/BUILD.gn
+@@ -42,8 +42,6 @@ source_set("permissions") {
+     "permissions_aiv1_handler.h",
+     "prediction_based_permission_ui_selector.cc",
+     "prediction_based_permission_ui_selector.h",
+-    "prediction_model_handler_provider.cc",
+-    "prediction_model_handler_provider.h",
+     "prediction_service_factory.cc",
+     "prediction_service_factory.h",
+     "prediction_service_request.cc",
 --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
 +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
-@@ -283,21 +283,6 @@ void PredictionBasedPermissionUiSelector
+@@ -250,30 +250,6 @@ void PredictionBasedPermissionUiSelector
+   if (snapshot.drawsNothing()) {
+     VLOG(1) << "[PermissionsAIv3] The page's snapshot is empty";
+   } else {
+-    PredictionModelHandlerProvider* prediction_model_handler_provider =
+-        PredictionModelHandlerProviderFactory::GetForBrowserContext(profile_);
+-    LogPredictionModelHandlerProviderForAiv3(
+-        prediction_model_handler_provider != nullptr);
+-    if (prediction_model_handler_provider) {
+-      PermissionsAiv3Handler* aiv3_handler =
+-          prediction_model_handler_provider->GetPermissionsAiv3Handler(
+-              request_metadata.request_type);
+-
+-      LogPermissionsAiv3HandlerForAiv3(aiv3_handler != nullptr);
+-      if (aiv3_handler) {
+-        VLOG(1) << "[PermissionsAIv3] Inquire model";
+-
+-        aiv3_handler->ExecuteModel(
+-            base::BindRepeating(
+-                &PredictionBasedPermissionUiSelector::
+-                    OnDeviceAiv3ModelExecutionCallback,
+-                weak_ptr_factory_.GetWeakPtr(),
+-                /*model_inquire_start_time=*/base::TimeTicks::Now(),
+-                std::move(features), std::move(request_metadata)),
+-            std::make_unique<SkBitmap>(snapshot));
+-        return;
+-      }
+-    }
+     VLOG(1) << "[PermissionsAIv3] On device AI model session unavailable";
+   }
+   InquireServerModel(features, std::move(request_metadata),
+@@ -404,22 +380,6 @@ void PredictionBasedPermissionUiSelector
      if (inner_text.size() > kPageContentMaxLength) {
        inner_text.resize(kPageContentMaxLength);
      }
 -    if (PredictionModelHandlerProvider* prediction_model_handler_provider =
 -            PredictionModelHandlerProviderFactory::GetForBrowserContext(
 -                profile_)) {
--      if (PermissionsAiv1Handler* aiv1_model_handler =
+-      if (PermissionsAiv1Handler* aiv1_handler =
 -              prediction_model_handler_provider->GetPermissionsAiv1Handler()) {
--        VLOG(1) << "[PermissionsAIv1] Inquire model.";
--        aiv1_model_handler->InquireAiOnDeviceModel(
--            std::move(inner_text), request_type,
+-        VLOG(1) << "[PermissionsAIv1] Inquire model";
+-        aiv1_handler->InquireAiOnDeviceModel(
+-            std::move(inner_text), request_metadata.request_type,
 -            base::BindRepeating(&PredictionBasedPermissionUiSelector::
--                                    AiOnDeviceModelExecutionCallback,
+-                                    OnDeviceAiv1ModelExecutionCallback,
 -                                weak_ptr_factory_.GetWeakPtr(),
--                                std::move(features), request_type));
+-                                std::move(features),
+-                                std::move(request_metadata)));
 -        return;
 -      }
 -    }
      VLOG(1) << "[PermissionsAIv1] On device AI model session unavailable";
    } else {
-     VLOG(1) << "[PermissionsAIv1] The page's contnet too short or empty";
+     VLOG(1) << "[PermissionsAIv1] The page's content is too short or empty";
 --- a/chrome/browser/prefs/BUILD.gn
 +++ b/chrome/browser/prefs/BUILD.gn
-@@ -274,7 +274,6 @@ source_set("impl") {
+@@ -286,7 +286,6 @@ source_set("impl") {
    } else {
      deps += [
        "//chrome/browser/promos:utils",
@@ -411,7 +454,7 @@
        "//chrome/browser/search_engines",
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -1807,9 +1807,6 @@ void RegisterLocalState(PrefRegistrySimp
+@@ -1842,9 +1842,6 @@ void RegisterLocalState(PrefRegistrySimp
    DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
  #endif
  
@@ -423,7 +466,7 @@
    PlatformAuthPolicyObserver::RegisterPrefs(registry);
 --- a/chrome/browser/profiles/BUILD.gn
 +++ b/chrome/browser/profiles/BUILD.gn
-@@ -297,7 +297,6 @@ source_set("profiles_extra_parts_impl")
+@@ -305,7 +305,6 @@ source_set("profiles_extra_parts_impl")
      ]
    } else {
      deps += [
@@ -431,7 +474,7 @@
        "//chrome/browser/apps/app_service",
        "//chrome/browser/autofill",
        "//chrome/browser/contextual_cueing",
-@@ -305,7 +304,6 @@ source_set("profiles_extra_parts_impl")
+@@ -313,7 +312,6 @@ source_set("profiles_extra_parts_impl")
        "//chrome/browser/feedback",
        "//chrome/browser/hid",
        "//chrome/browser/media/router/discovery/access_code:access_code_sink_service",
@@ -441,7 +484,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
-@@ -104,7 +104,6 @@
+@@ -105,7 +105,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"
@@ -449,15 +492,15 @@
  #include "chrome/browser/navigation_predictor/search_engine_preconnector.h"
  #include "chrome/browser/navigation_predictor/search_engine_preconnector_keyed_service_factory.h"
  #include "chrome/browser/net/dns_probe_service_factory.h"
-@@ -326,7 +325,6 @@
- #include "chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_factory.h"
+@@ -332,7 +331,6 @@
+ #include "chrome/browser/prefs/persistent_renderer_prefs_manager_factory.h"
  #include "chrome/browser/privacy_sandbox/privacy_sandbox_survey_desktop_controller_factory.h"
  #include "chrome/browser/profile_resetter/reset_report_uploader_factory.h"
 -#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
  #include "chrome/browser/search/background/ntp_background_service_factory.h"
  #include "chrome/browser/search/background/ntp_custom_background_service_factory.h"
  #include "chrome/browser/search/instant_service_factory.h"
-@@ -1025,7 +1023,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1039,7 +1037,6 @@ void ChromeBrowserMainExtraPartsProfiles
  #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
    net::ServerCertificateDatabaseServiceFactory::GetInstance();
  #endif
@@ -465,7 +508,7 @@
  #if BUILDFLAG(IS_CHROMEOS)
    NearbySharingServiceFactory::GetInstance();
    if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) {
-@@ -1077,9 +1074,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1091,9 +1088,6 @@ void ChromeBrowserMainExtraPartsProfiles
    OneTimePermissionsTrackerFactory::GetInstance();
  #endif
    OpenerHeuristicServiceFactory::GetInstance();
@@ -475,7 +518,7 @@
    OptimizationGuideKeyedServiceFactory::GetInstance();
    OriginKeyedPermissionActionServiceFactory::GetInstance();
    OriginTrialsFactory::GetInstance();
-@@ -1146,13 +1140,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1168,13 +1162,6 @@ void ChromeBrowserMainExtraPartsProfiles
    policy::UserPolicySigninServiceFactory::GetInstance();
  #endif
    PolicyBlocklistFactory::GetInstance();
@@ -489,7 +532,7 @@
    PredictionServiceFactory::GetInstance();
    predictors::AutocompleteActionPredictorFactory::GetInstance();
    predictors::LoadingPredictorFactory::GetInstance();
-@@ -1239,13 +1226,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1261,13 +1248,6 @@ void ChromeBrowserMainExtraPartsProfiles
  #else
    SafetyHubMenuNotificationServiceFactory::GetInstance();
    SafetyHubHatsServiceFactory::GetInstance();
@@ -503,7 +546,7 @@
  #endif
  #if BUILDFLAG(IS_CHROMEOS)
    if (ash::features::IsScannerEnabled()) {
-@@ -1356,7 +1336,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1378,7 +1358,6 @@ void ChromeBrowserMainExtraPartsProfiles
    TrackingProtectionSettingsFactory::GetInstance();
    translate::TranslateRankerFactory::GetInstance();
  #if !BUILDFLAG(IS_ANDROID)
@@ -527,7 +570,7 @@
    // System Profile.
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -846,24 +846,6 @@ void ProfileImpl::DoFinalInit(CreateMode
+@@ -845,24 +845,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);
@@ -562,7 +605,7 @@
  #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"
-@@ -1506,9 +1505,6 @@ void ProfileManager::DoFinalInitForServi
+@@ -1509,9 +1508,6 @@ void ProfileManager::DoFinalInitForServi
    // Ensure NavigationPredictorKeyedService is started.
    NavigationPredictorKeyedServiceFactory::GetForProfile(profile);
  
@@ -574,7 +617,7 @@
  #if BUILDFLAG(IS_ANDROID)
 --- a/chrome/browser/resources/BUILD.gn
 +++ b/chrome/browser/resources/BUILD.gn
-@@ -92,7 +92,6 @@ group("resources") {
+@@ -100,7 +100,6 @@ group("resources") {
    if (is_mac) {
      public_deps += [
        "//chrome/browser/resources/media/mei_preload:component",
@@ -584,7 +627,7 @@
  
 --- a/chrome/browser/resources/pdf/pdf_viewer.html
 +++ b/chrome/browser/resources/pdf/pdf_viewer.html
-@@ -98,10 +98,6 @@ import {AnnotationMode} from './constant
+@@ -100,10 +100,6 @@ import {AnnotationMode} from './constant
        </cr-page-selector>
      ` : ''}
    </if>
@@ -597,7 +640,7 @@
  ${this.showErrorDialog ? html`<viewer-error-dialog id="error-dialog">
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -1723,8 +1723,6 @@ static_library("ui") {
+@@ -1657,8 +1657,6 @@ static_library("ui") {
        "//chrome/browser/regional_capabilities",
        "//chrome/browser/safe_browsing",
        "//chrome/browser/safe_browsing:advanced_protection",
@@ -606,7 +649,7 @@
        "//chrome/browser/smart_card:smart_card",
        "//chrome/browser/tab_group_sync:utils",
        "//chrome/browser/themes",
-@@ -2416,7 +2414,6 @@ static_library("ui") {
+@@ -2370,7 +2368,6 @@ static_library("ui") {
        "//chrome/browser/policy:onc",
        "//chrome/browser/policy:system_features_disable_list",
        "//chrome/browser/push_notification:push_notification",
@@ -750,7 +793,7 @@
  #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,24 +362,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
+@@ -369,24 +367,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
    prefs_lang = language::ExtractBaseLanguage(prefs_lang);
    SetDefaultLanguageCode(prefs_lang);
  
@@ -775,7 +818,7 @@
  
    // Enable accessibility for the top level render frame and all descendants.
    // This causes AXTreeSerializer to reset and send accessibility events of
-@@ -829,12 +809,6 @@ void ReadAnythingUntrustedPageHandler::S
+@@ -856,12 +836,6 @@ void ReadAnythingUntrustedPageHandler::S
            weak_factory_.GetSafeRef(), inner_contents[0], kReadAnythingAXMode);
      }
    }
@@ -790,7 +833,7 @@
  
 --- a/chrome/renderer/BUILD.gn
 +++ b/chrome/renderer/BUILD.gn
-@@ -371,18 +371,6 @@ static_library("renderer") {
+@@ -373,18 +373,6 @@ static_library("renderer") {
      ]
    } else {
      sources += [
@@ -809,7 +852,7 @@
        "media/chrome_speech_recognition_client.cc",
        "media/chrome_speech_recognition_client.h",
        "searchbox/searchbox.cc",
-@@ -396,7 +384,6 @@ static_library("renderer") {
+@@ -399,7 +387,6 @@ static_library("renderer") {
        "//components/crx_file",
        "//components/trusted_vault",
        "//services/screen_ai/buildflags",
@@ -824,10 +867,10 @@
  
  #if !BUILDFLAG(IS_ANDROID)
 -#include "chrome/renderer/accessibility/read_anything/read_anything_app_controller.h"
+ #include "chrome/renderer/actor/tool_executor.h"
  #include "chrome/renderer/searchbox/searchbox_extension.h"
  #endif  // !BUILDFLAG(IS_ANDROID)
- 
-@@ -321,21 +320,6 @@ void ChromeRenderFrameObserver::DidCommi
+@@ -318,21 +317,6 @@ void ChromeRenderFrameObserver::DidCommi
  }
  
  void ChromeRenderFrameObserver::DidClearWindowObject() {
@@ -851,7 +894,7 @@
  void ChromeRenderFrameObserver::DidMeaningfulLayout(
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -2250,9 +2250,6 @@ if (!is_android) {
+@@ -2275,9 +2275,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",
@@ -861,7 +904,7 @@
        "//chrome/browser/search",
        "//chrome/browser/search_engines",
        "//chrome/browser/segmentation_platform:test_utils",
-@@ -2664,9 +2661,6 @@ if (!is_android) {
+@@ -2699,9 +2696,6 @@ if (!is_android) {
        "//services/network/public/proto:sct_audit_report_proto",
        "//services/preferences/public/cpp",
        "//services/preferences/public/cpp/tracked",
@@ -871,30 +914,30 @@
        "//services/service_manager/public/cpp",
        "//services/strings",
        "//services/test/echo/public/mojom",
-@@ -8211,7 +8205,6 @@ test("unit_tests") {
- 
-     # Non-android deps for "unit_tests" target.
+@@ -8265,7 +8259,6 @@ test("unit_tests") {
+     #
+     # TODO(crbug.com/417513088): Maybe merge with the non-android `deps` declaration above?
      deps += [
 -      "../browser/screen_ai:screen_ai_install_state",
        "//chrome:packed_resources_integrity_header",
        "//chrome/browser/apps:icon_standardizer",
        "//chrome/browser/apps/app_service",
-@@ -8246,7 +8239,6 @@ test("unit_tests") {
+@@ -8299,7 +8292,6 @@ test("unit_tests") {
+       "//chrome/browser/profile_resetter:fake_profile_resetter",
        "//chrome/browser/resource_coordinator:tab_manager_features",
-       "//chrome/browser/resources:component_extension_resources_grit",
        "//chrome/browser/resources/new_tab_page_instant:resources_grit",
 -      "//chrome/browser/screen_ai:unit_tests",
        "//chrome/browser/search/background",
        "//chrome/browser/search/background:constants",
        "//chrome/browser/search_engine_choice:unit_tests",
-@@ -8358,7 +8350,6 @@ test("unit_tests") {
+@@ -8413,7 +8405,6 @@ test("unit_tests") {
        "//components/webapps/browser",
        "//services/metrics/public/cpp:ukm_builders",
        "//services/network:test_support",
 -      "//services/screen_ai:test_support",
-       "//services/video_effects/test:test_support",
        "//third_party/crashpad/crashpad/util",
        "//third_party/libaddressinput",
+       "//third_party/lzma_sdk/google:unit_tests",
 --- a/chrome/test/chromedriver/BUILD.gn
 +++ b/chrome/test/chromedriver/BUILD.gn
 @@ -408,7 +408,7 @@ source_set("lib") {
@@ -918,9 +961,9 @@
  python_library("fixtures") {
 --- a/chrome/utility/BUILD.gn
 +++ b/chrome/utility/BUILD.gn
-@@ -144,7 +144,6 @@ static_library("utility") {
-       "//chrome/common/importer:interfaces",
+@@ -145,7 +145,6 @@ static_library("utility") {
        "//components/autofill/core/common",
+       "//components/user_data_importer/common",
        "//services/proxy_resolver:lib",
 -      "//services/screen_ai",
      ]
@@ -960,7 +1003,7 @@
  #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
 --- a/components/BUILD.gn
 +++ b/components/BUILD.gn
-@@ -597,7 +597,6 @@ test("components_unittests") {
+@@ -600,7 +600,6 @@ test("components_unittests") {
        "//components/media_router/common/providers/cast/channel:unit_tests",
        "//components/page_info:unit_tests",
        "//components/permissions:unit_tests",
@@ -1023,24 +1066,20 @@
    return wrapper_node;
 --- a/components/pdf/renderer/pdf_view_web_plugin_client.cc
 +++ b/components/pdf/renderer/pdf_view_web_plugin_client.cc
-@@ -203,34 +203,6 @@ PdfViewWebPluginClient::CreateAssociated
+@@ -203,44 +203,6 @@ PdfViewWebPluginClient::CreateAssociated
    return GetFrame()->CreateAssociatedURLLoader(options);
  }
  
+-void PdfViewWebPluginClient::GetOcrMaxImageDimension(
+-    base::OnceCallback<void(uint32_t)> callback) {
+-  ConnectOcrIfNeeded();
+-  return screen_ai_annotator_->GetMaxImageDimension(std::move(callback));
+-}
+-
 -void PdfViewWebPluginClient::PerformOcr(
 -    const SkBitmap& image,
 -    base::OnceCallback<void(screen_ai::mojom::VisualAnnotationPtr)> callback) {
--  CHECK(base::FeatureList::IsEnabled(ax::mojom::features::kScreenAIOCREnabled));
--
--  if (!screen_ai_annotator_.is_bound()) {
--    render_frame_->GetBrowserInterfaceBroker().GetInterface(
--        screen_ai_annotator_.BindNewPipeAndPassReceiver());
--    screen_ai_annotator_->SetClientType(
--        screen_ai::mojom::OcrClientType::kPdfViewer);
--    screen_ai_annotator_.set_disconnect_handler(
--        base::BindOnce(&PdfViewWebPluginClient::OnOcrDisconnected,
--                       weak_factory_.GetWeakPtr()));
--  }
+-  ConnectOcrIfNeeded();
 -  screen_ai_annotator_->PerformOcrAndReturnAnnotation(image,
 -                                                      std::move(callback));
 -}
@@ -1054,6 +1093,20 @@
 -  screen_ai_annotator_.reset();
 -  CHECK(ocr_disconnect_callback_);
 -  ocr_disconnect_callback_.Run();
+-}
+-
+-void PdfViewWebPluginClient::ConnectOcrIfNeeded() {
+-  CHECK(base::FeatureList::IsEnabled(ax::mojom::features::kScreenAIOCREnabled));
+-
+-  if (!screen_ai_annotator_.is_bound()) {
+-    render_frame_->GetBrowserInterfaceBroker().GetInterface(
+-        screen_ai_annotator_.BindNewPipeAndPassReceiver());
+-    screen_ai_annotator_->SetClientType(
+-        screen_ai::mojom::OcrClientType::kPdfViewer);
+-    screen_ai_annotator_.set_disconnect_handler(
+-        base::BindOnce(&PdfViewWebPluginClient::OnOcrDisconnected,
+-                       weak_factory_.GetWeakPtr()));
+-  }
 -}
  
  void PdfViewWebPluginClient::UpdateTextInputState() {
@@ -1068,10 +1121,12 @@
  
  namespace blink {
  class WebLocalFrame;
-@@ -87,16 +86,10 @@ class PdfViewWebPluginClient : public ch
+@@ -87,19 +86,10 @@ class PdfViewWebPluginClient : public ch
        chrome_pdf::PdfAccessibilityImageFetcher* image_fetcher,
        blink::WebPluginContainer* plugin_element,
        bool print_preview) override;
+-  void GetOcrMaxImageDimension(
+-      base::OnceCallback<void(uint32_t)> callback) override;
 -  void PerformOcr(
 -      const SkBitmap& image,
 -      base::OnceCallback<void(screen_ai::mojom::VisualAnnotationPtr)> callback)
@@ -1082,10 +1137,11 @@
    blink::WebLocalFrame* GetFrame() const;
  
 -  void OnOcrDisconnected();
+-  void ConnectOcrIfNeeded();
  
    const raw_ptr<content::RenderFrame> render_frame_;
  
-@@ -105,8 +98,6 @@ class PdfViewWebPluginClient : public ch
+@@ -108,8 +98,6 @@ class PdfViewWebPluginClient : public ch
  
    raw_ptr<blink::WebPluginContainer> plugin_container_;
  
@@ -1107,7 +1163,7 @@
  fuzzer_test("update_client_protocol_serializer_fuzzer") {
 --- a/content/shell/BUILD.gn
 +++ b/content/shell/BUILD.gn
-@@ -830,10 +830,6 @@ if (is_apple) {
+@@ -825,10 +825,6 @@ if (is_apple) {
        deps = [ "//third_party/icu:icudata" ]
      }
  
@@ -1130,19 +1186,22 @@
    page_objects.links = page->GetLinkInfo(text_runs);
 --- a/pdf/pdf_view_web_plugin.cc
 +++ b/pdf/pdf_view_web_plugin.cc
-@@ -1348,11 +1348,6 @@ void PdfViewWebPlugin::DocumentLoadCompl
+@@ -1378,14 +1378,6 @@ void PdfViewWebPlugin::DocumentLoadCompl
    if (accessibility_state_ == AccessibilityState::kPending)
      LoadAccessibility();
  
 -  // To avoid delaying page load for searchify, start searchify after document
 -  // load is completed.
+-  // Maximum image dimension is asked once and stored for the next usages, so
+-  // `BindOnce` is sufficient.
 -  client_->SetOcrDisconnectedCallback(engine_->GetOcrDisconnectHandler());
 -  engine_->StartSearchify(
+-      base::BindOnce(&Client::GetOcrMaxImageDimension, client_->GetWeakPtr()),
 -      base::BindRepeating(&Client::PerformOcr, client_->GetWeakPtr()));
  
    if (!full_frame_)
      return;
-@@ -2446,7 +2441,7 @@ void PdfViewWebPlugin::EnableAccessibili
+@@ -2482,7 +2474,7 @@ void PdfViewWebPlugin::EnableAccessibili
  
  SkBitmap PdfViewWebPlugin::GetImageForOcr(int32_t page_index,
                                            int32_t page_object_index) {
@@ -1151,7 +1210,7 @@
  }
  
  void PdfViewWebPlugin::HandleAccessibilityAction(
-@@ -2973,19 +2968,6 @@ void PdfViewWebPlugin::PrepareAndSetAcce
+@@ -3001,19 +2993,6 @@ void PdfViewWebPlugin::PrepareAndSetAcce
      return;
    }
  
@@ -1173,25 +1232,26 @@
  
 --- a/pdf/pdfium/pdfium_engine.cc
 +++ b/pdf/pdfium/pdfium_engine.cc
-@@ -2697,7 +2697,7 @@ void PDFiumEngine::HandleLongPress(const
- 
- SkBitmap PDFiumEngine::GetImageForOcr(int page_index, int image_index) {
-   DCHECK(PageIndexInBounds(page_index));
--  return pages_[page_index]->GetImageForOcr(image_index);
+@@ -2674,8 +2674,7 @@ SkBitmap PDFiumEngine::GetImageForOcr(in
+   // This function is not used after launch of PDF Searchify. Default OCR
+   // expected resolution is used to avoid unnecessary update of the call chain.
+   // TODO(crbug.com/360803943): Remove this function and call chain.
+-  return pages_[page_index]->GetImageForOcr(image_index,
+-                                            /*max_image_dimension=*/2048);
 +  return SkBitmap();
  }
  
  bool PDFiumEngine::GetPrintScaling() {
 --- a/services/passage_embeddings/passage_embeddings_service.cc
 +++ b/services/passage_embeddings/passage_embeddings_service.cc
-@@ -22,7 +22,6 @@ PassageEmbeddingsService::PassageEmbeddi
- PassageEmbeddingsService::~PassageEmbeddingsService() = default;
+@@ -23,7 +23,6 @@ PassageEmbeddingsService::~PassageEmbedd
  
+ #if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
  void PassageEmbeddingsService::OnEmbedderDisconnect() {
 -  embedder_.reset();
  }
+ #endif
  
- void PassageEmbeddingsService::LoadModels(
 --- a/services/passage_embeddings/passage_embeddings_service.h
 +++ b/services/passage_embeddings/passage_embeddings_service.h
 @@ -11,7 +11,6 @@

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

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -606,8 +606,6 @@ static_library("browser") {
+@@ -613,8 +613,6 @@ static_library("browser") {
      "infobars/simple_alert_infobar_creator.h",
      "interstitials/chrome_settings_page_helper.cc",
      "interstitials/chrome_settings_page_helper.h",
@@ -11,7 +11,7 @@
      "invalidation/profile_invalidation_provider_factory.cc",
      "invalidation/profile_invalidation_provider_factory.h",
      "k_anonymity_service/k_anonymity_service_client.cc",
-@@ -2315,7 +2313,6 @@ static_library("browser") {
+@@ -2346,7 +2344,6 @@ static_library("browser") {
      "//components/resources",
      "//components/safe_browsing/content/browser",
      "//components/safe_browsing/content/browser:safe_browsing_service",
@@ -19,7 +19,7 @@
      "//components/safe_browsing/content/browser/password_protection",
      "//components/safe_browsing/content/browser/web_ui",
      "//components/safe_browsing/content/common/proto:download_file_types_proto",
-@@ -3905,10 +3902,6 @@ static_library("browser") {
+@@ -3956,10 +3953,6 @@ static_library("browser") {
        "new_tab_page/modules/modules_switches.h",
        "new_tab_page/modules/new_tab_page_modules.cc",
        "new_tab_page/modules/new_tab_page_modules.h",
@@ -30,7 +30,7 @@
        "new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.cc",
        "new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h",
        "new_tab_page/modules/v2/calendar/calendar_fake_data_helper.cc",
-@@ -8517,7 +8510,6 @@ static_library("browser_generated_files"
+@@ -8621,7 +8614,6 @@ static_library("browser_generated_files"
        "//chrome/browser/new_tab_page/chrome_colors:generate_chrome_colors_info",
        "//chrome/browser/new_tab_page/chrome_colors:generate_colors_info",
        "//chrome/browser/new_tab_page/modules/file_suggestion:mojo_bindings",
@@ -38,7 +38,7 @@
        "//chrome/browser/new_tab_page/modules/v2/authentication:mojo_bindings",
        "//chrome/browser/new_tab_page/modules/v2/calendar:mojo_bindings",
        "//chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption:mojo_bindings",
-@@ -9007,8 +8999,6 @@ static_library("test_support") {
+@@ -9116,8 +9108,6 @@ static_library("test_support") {
      "//components/reporting/util:status",
      "//components/reporting/util:status_macros",
      "//components/reporting/util:task_runner_context",
@@ -82,7 +82,7 @@
  using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
  
  #if BUILDFLAG(SAFE_BROWSING_DOWNLOAD_PROTECTION)
-@@ -1840,7 +1839,6 @@ void ChromeDownloadManagerDelegate::OnDo
+@@ -1873,7 +1872,6 @@ void ChromeDownloadManagerDelegate::OnDo
      DownloadItemModel model(item);
      model.DetermineAndSetShouldPreferOpeningInBrowser(
          target_info.target_path, target_info.is_filetype_handled_safely);
@@ -90,7 +90,7 @@
    }
    if (ShouldBlockFile(item, target_info.danger_type)) {
      MaybeReportDangerousDownloadBlocked(
-@@ -1921,49 +1919,20 @@ bool ChromeDownloadManagerDelegate::IsOp
+@@ -1954,49 +1952,20 @@ bool ChromeDownloadManagerDelegate::IsOp
  bool ChromeDownloadManagerDelegate::ShouldBlockFile(
      download::DownloadItem* item,
      download::DownloadDangerType danger_type) const {
@@ -301,8 +301,8 @@
 -#include "chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.h"
 -#include "chrome/browser/safe_browsing/download_protection/check_client_download_request.h"
  #include "chrome/browser/safe_browsing/safe_browsing_navigation_observer_manager_factory.h"
+ #include "chrome/browser/signin/identity_manager_factory.h"
  #include "chrome/grit/generated_resources.h"
- #include "components/enterprise/buildflags/buildflags.h"
 --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.cc
 +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.cc
 @@ -126,7 +126,7 @@ ContentAnalysisDownloadsDelegate::GetCus
@@ -695,7 +695,7 @@
  #if BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS)
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
-@@ -330,8 +330,6 @@ source_set("extensions") {
+@@ -348,8 +348,6 @@ source_set("extensions") {
      "management/management_util.h",
      "manifest_check_level.h",
      "mv2_experiment_stage.h",
@@ -703,7 +703,7 @@
 -    "omaha_attributes_handler.h",
      "pack_extension_job.cc",
      "pack_extension_job.h",
-     "permissions/permissions_updater.cc",
+     "permissions/active_tab_permission_granter.cc",
 --- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
 +++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
 @@ -99,16 +99,8 @@ api::enterprise_reporting_private::Conte
@@ -749,15 +749,15 @@
  void Blocklist::GetMalwareIDs(const std::set<ExtensionId>& ids,
 --- a/chrome/browser/extensions/chrome_extension_system.cc
 +++ b/chrome/browser/extensions/chrome_extension_system.cc
-@@ -465,8 +465,6 @@ void ChromeExtensionSystem::PerformActio
+@@ -463,8 +463,6 @@ void ChromeExtensionSystem::InstallUpdat
+ void ChromeExtensionSystem::PerformActionBasedOnOmahaAttributes(
+     const std::string& extension_id,
      const base::Value::Dict& attributes) {
- #if BUILDFLAG(ENABLE_EXTENSIONS)
-   // TODO(crbug.com/413460628): Port ExtensionService to desktop Android.
 -  extension_service()->PerformActionBasedOnOmahaAttributes(extension_id,
 -                                                           attributes);
- #else
-   NOTIMPLEMENTED();
- #endif
+ }
+ 
+ }  // namespace extensions
 --- a/chrome/browser/extensions/extension_allowlist_factory.cc
 +++ b/chrome/browser/extensions/extension_allowlist_factory.cc
 @@ -45,7 +45,6 @@ ExtensionAllowlistFactory::ExtensionAllo
@@ -828,9 +828,9 @@
  #include "chrome/browser/extensions/safe_browsing_verdict_handler.h"
  #include "chrome/browser/profiles/profile_manager_observer.h"
  #include "chrome/browser/upgrade_detector/upgrade_observer.h"
-@@ -170,10 +169,6 @@ class ExtensionService : public Extensio
-   // nothing.
-   void EnableExtension(const std::string& extension_id);
+@@ -166,10 +165,6 @@ class ExtensionService : public Extensio
+   // KeyedService two-phase shutdown.
+   void Shutdown();
  
 -  // Performs action based on Omaha attributes for the extension.
 -  void PerformActionBasedOnOmahaAttributes(const std::string& extension_id,
@@ -839,7 +839,7 @@
    // Performs action based on verdicts received from the Extension Telemetry
    // server. Currently, these verdicts are limited to off-store extensions.
    void PerformActionBasedOnExtensionTelemetryServiceVerdicts(
-@@ -386,8 +381,6 @@ class ExtensionService : public Extensio
+@@ -374,8 +369,6 @@ class ExtensionService : public Extensio
    ExtensionTelemetryServiceVerdictHandler
        extension_telemetry_service_verdict_handler_;
  
@@ -901,7 +901,7 @@
    }
 --- a/chrome/browser/notifications/persistent_notification_handler.cc
 +++ b/chrome/browser/notifications/persistent_notification_handler.cc
-@@ -235,16 +235,6 @@ void PersistentNotificationHandler::Disa
+@@ -307,16 +307,6 @@ void PersistentNotificationHandler::Disa
    NotificationPermissionContext::UpdatePermission(profile, origin,
                                                    CONTENT_SETTING_BLOCK);
  #endif
@@ -918,7 +918,7 @@
  }
  
  void PersistentNotificationHandler::OpenSettings(Profile* profile,
-@@ -282,42 +272,6 @@ void PersistentNotificationHandler::OnMa
+@@ -355,42 +345,6 @@ void PersistentNotificationHandler::OnMa
      Profile* profile,
      bool did_show_warning,
      bool did_user_unsubscribe) {
@@ -963,31 +963,45 @@
  #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
 --- a/chrome/browser/notifications/platform_notification_service_impl.cc
 +++ b/chrome/browser/notifications/platform_notification_service_impl.cc
-@@ -773,24 +773,6 @@ void PlatformNotificationServiceImpl::Up
+@@ -775,38 +775,8 @@ void PlatformNotificationServiceImpl::Up
      std::unique_ptr<PersistentNotificationMetadata> persistent_metadata,
      bool should_show_warning,
      std::optional<std::string> serialized_content_detection_metadata) {
 -  if (base::FeatureList::IsEnabled(
--          safe_browsing::kReportNotificationContentDetectionData) &&
--      serialized_content_detection_metadata.has_value()) {
--    scoped_refptr<content::PlatformNotificationContext> notification_context =
--        profile_->GetStoragePartitionForUrl(notification.origin_url())
--            ->GetPlatformNotificationContext();
--    if (notification_context) {
--      notification_context->WriteNotificationMetadata(
--          notification.id(), notification.origin_url(),
--          safe_browsing::kMetadataDictionaryKey,
--          serialized_content_detection_metadata.value(),
--          base::BindOnce(
--              &PlatformNotificationServiceImpl::DidUpdatePersistentMetadata,
--              weak_ptr_factory_.GetWeakPtr(), std::move(persistent_metadata),
--              notification, should_show_warning));
--      return;
+-          safe_browsing::kReportNotificationContentDetectionData)) {
+-    content::PlatformNotificationContext::WriteResourcesResultCallback
+-        callback = base::BindOnce(
+-            &PlatformNotificationServiceImpl::DidUpdatePersistentMetadata,
+-            weak_ptr_factory_.GetWeakPtr(), std::move(persistent_metadata),
+-            notification, should_show_warning);
+-#if BUILDFLAG(IS_ANDROID)
+-    if (should_show_warning) {
+-      // Keep track of suspicious notification ids.
+-      safe_browsing::UpdateSuspiciousNotificationIds(
+-          HostContentSettingsMapFactory::GetForProfile(profile_),
+-          notification.origin_url(), notification.id());
 -    }
+-#endif
+-    if (serialized_content_detection_metadata.has_value()) {
+-      scoped_refptr<content::PlatformNotificationContext> notification_context =
+-          profile_->GetStoragePartitionForUrl(notification.origin_url())
+-              ->GetPlatformNotificationContext();
+-      if (notification_context) {
+-        notification_context->WriteNotificationMetadata(
+-            notification.id(), notification.origin_url(),
+-            safe_browsing::kMetadataDictionaryKey,
+-            serialized_content_detection_metadata.value(), std::move(callback));
+-        return;
+-      }
+-    }
+-    std::move(callback).Run(/*success=*/false);
+-  } else {
+     DoUpdatePersistentMetadataThenDisplay(std::move(persistent_metadata),
+                                           notification, should_show_warning);
 -  }
-   DoUpdatePersistentMetadataThenDisplay(std::move(persistent_metadata),
-                                         notification, should_show_warning);
  }
+ 
+ void PlatformNotificationServiceImpl::LogPersistentNotificationShownMetrics(
 --- a/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
 +++ b/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
 @@ -16,7 +16,6 @@
@@ -1075,7 +1089,7 @@
  
 --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
 +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.cc
-@@ -463,55 +463,5 @@ bool PredictionBasedPermissionUiSelector
+@@ -597,68 +597,6 @@ bool PredictionBasedPermissionUiSelector
  
  PredictionSource PredictionBasedPermissionUiSelector::GetPredictionTypeToUse(
      permissions::RequestType request_type) {
@@ -1090,12 +1104,12 @@
 -
 -  if (request_type == permissions::RequestType::kNotifications &&
 -      !is_notification_cpss_enabled) {
--    return PredictionSource::USE_NONE;
+-    return PredictionSource::kNoCpssModel;
 -  }
 -
 -  if (request_type == permissions::RequestType::kGeolocation &&
 -      !is_geolocation_cpss_enabled) {
--    return PredictionSource::USE_NONE;
+-    return PredictionSource::kNoCpssModel;
 -  }
 -
 -  bool use_server_side = false;
@@ -1109,10 +1123,22 @@
 -#endif  // BUILDFLAG(IS_ANDROID)
 -  }
 -  if (use_server_side) {
--    if (base::FeatureList::IsEnabled(permissions::features::kPermissionsAIv1)) {
--      return PredictionSource::USE_ONDEVICE_AI_AND_SERVER_SIDE;
+-    // Aiv3 takes priority over Aiv1 if both are enabled.
+-#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
+-    if (request_type == permissions::RequestType::kNotifications &&
+-        base::FeatureList::IsEnabled(permissions::features::kPermissionsAIv3)) {
+-      return PredictionSource::kOnDeviceAiv3AndServerSideModel;
 -    }
--    return PredictionSource::USE_SERVER_SIDE;
+-    if (request_type == permissions::RequestType::kGeolocation &&
+-        base::FeatureList::IsEnabled(
+-            permissions::features::kPermissionsAIv3Geolocation)) {
+-      return PredictionSource::kOnDeviceAiv3AndServerSideModel;
+-    }
+-#endif  // BUILDFLAG(BUILD_WITH_TFLITE_LIB)
+-    if (base::FeatureList::IsEnabled(permissions::features::kPermissionsAIv1)) {
+-      return PredictionSource::kOnDeviceAiv1AndServerSideModel;
+-    }
+-    return PredictionSource::kServerSideCpssV3Model;
 -  }
 -
 -#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
@@ -1125,15 +1151,16 @@
 -        permissions::features::kPermissionOnDeviceGeolocationPredictions);
 -  }
 -  if (use_ondevice_tflite) {
--    return PredictionSource::USE_ONDEVICE_TFLITE;
+-    return PredictionSource::kOnDeviceCpssV1Model;
 -  }
 -#endif  // BUILDFLAG(BUILD_WITH_TFLITE_LIB)
 -
-   return PredictionSource::USE_NONE;
+   return PredictionSource::kNoCpssModel;
  }
+ 
 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
 +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -2506,8 +2506,6 @@ std::unique_ptr<ConfigurationPolicyHandl
+@@ -2494,8 +2494,6 @@ std::unique_ptr<ConfigurationPolicyHandl
    handlers->AddHandler(
        std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
            chrome_schema));
@@ -1144,7 +1171,7 @@
        std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -283,7 +283,6 @@
+@@ -284,7 +284,6 @@
  #include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h"
  #include "chrome/browser/new_tab_page/modules/file_suggestion/drive_service.h"
  #include "chrome/browser/new_tab_page/modules/file_suggestion/microsoft_files_page_handler.h"
@@ -1152,7 +1179,7 @@
  #include "chrome/browser/new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h"
  #include "chrome/browser/new_tab_page/modules/v2/calendar/google_calendar_page_handler.h"
  #include "chrome/browser/new_tab_page/modules/v2/calendar/outlook_calendar_page_handler.h"
-@@ -2054,7 +2053,6 @@ void RegisterProfilePrefs(user_prefs::Pr
+@@ -2089,7 +2088,6 @@ void RegisterProfilePrefs(user_prefs::Pr
    NewTabFooterUI::RegisterProfilePrefs(registry);
    NewTabPageHandler::RegisterProfilePrefs(registry);
    NewTabPageUI::RegisterProfilePrefs(registry);
@@ -1162,7 +1189,7 @@
    promos_utils::RegisterProfilePrefs(registry);
 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -854,9 +854,7 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -867,9 +867,7 @@ void ChromeBrowserMainExtraPartsProfiles
      enterprise_connectors::TelomereEventRouterFactory::GetInstance();
    }
  #endif
@@ -1174,7 +1201,7 @@
    enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
-@@ -93,13 +93,6 @@ static_library("safe_browsing") {
+@@ -94,13 +94,6 @@ static_library("safe_browsing") {
      allow_circular_includes_from += [ "//chrome/browser/ash/file_manager" ]
    }
  
@@ -1339,7 +1366,7 @@
    // certificate. So, when users click proceed on an interstitial, move the tab
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -4586,8 +4586,6 @@ static_library("ui") {
+@@ -4535,8 +4535,6 @@ static_library("ui") {
        "views/safe_browsing/prompt_for_scanning_modal_dialog.h",
        "views/safe_browsing/tailored_security_desktop_dialog_manager.cc",
        "views/safe_browsing/tailored_security_desktop_dialog_manager.h",
@@ -1358,7 +1385,7 @@
  #include "content/public/browser/browser_context.h"
  #include "content/public/browser/browser_thread.h"
  #include "revoked_permissions_service.h"
-@@ -386,34 +385,6 @@ RevokedPermissionsService::RevokedPermis
+@@ -409,34 +408,6 @@ RevokedPermissionsService::RevokedPermis
            base::Unretained(this)));
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -1383,7 +1410,7 @@
 -  }
 -
 -  if (base::FeatureList::IsEnabled(
--          safe_browsing::kSafetyHubDisruptiveNotificationRevocation)) {
+-          features::kSafetyHubDisruptiveNotificationRevocation)) {
 -    disruptive_notification_manager_ =
 -        std::make_unique<DisruptiveNotificationPermissionsManager>(
 -            hcsm(),
@@ -1393,7 +1420,7 @@
  
    bool migration_completed = pref_change_registrar_->prefs()->GetBoolean(
        safety_hub_prefs::kUnusedSitePermissionsRevocationMigrationCompleted);
-@@ -1154,9 +1125,7 @@ bool RevokedPermissionsService::IsUnused
+@@ -1204,9 +1175,7 @@ bool RevokedPermissionsService::IsUnused
  }
  
  bool RevokedPermissionsService::IsAbusiveNotificationAutoRevocationEnabled() {
@@ -1416,7 +1443,7 @@
  
 --- a/chrome/browser/ui/toasts/toast_service.cc
 +++ b/chrome/browser/ui/toasts/toast_service.cc
-@@ -33,7 +33,6 @@
+@@ -34,7 +34,6 @@
  #include "components/plus_addresses/features.h"
  #include "components/plus_addresses/grit/plus_addresses_strings.h"
  #include "components/safe_browsing/core/common/features.h"
@@ -1424,7 +1451,7 @@
  #include "components/strings/grit/components_strings.h"
  #include "components/tabs/public/tab_interface.h"
  #include "components/vector_icons/vector_icons.h"
-@@ -140,57 +139,6 @@ void ToastService::RegisterToasts(
+@@ -146,57 +145,6 @@ void ToastService::RegisterToasts(
              .Build());
    }
  
@@ -1621,7 +1648,7 @@
  #include "components/safe_browsing/core/browser/db/database_manager.h"
  #include "content/public/browser/web_contents.h"
  #include "mojo/public/cpp/bindings/self_owned_receiver.h"
-@@ -208,11 +210,13 @@ void ShareServiceImpl::Share(const std::
+@@ -210,11 +212,13 @@ void ShareServiceImpl::Share(const std::
  
      // Check if at least one file is marked by the download protection service
      // to send a ping to check this file type.
@@ -1635,7 +1662,7 @@
  
      // In the case where the original blob handle was to a native file (of
      // unknown size), the serialized data does not contain an accurate file
-@@ -222,6 +226,7 @@ void ShareServiceImpl::Share(const std::
+@@ -224,6 +228,7 @@ void ShareServiceImpl::Share(const std::
    }
  
    DCHECK(!safe_browsing_request_);
@@ -1643,7 +1670,7 @@
    if (should_check_url && g_browser_process->safe_browsing_service()) {
      safe_browsing_request_.emplace(
          g_browser_process->safe_browsing_service()->database_manager(),
-@@ -231,6 +236,7 @@ void ShareServiceImpl::Share(const std::
+@@ -233,6 +238,7 @@ void ShareServiceImpl::Share(const std::
                         std::move(files), std::move(callback)));
      return;
    }
@@ -1663,7 +1690,7 @@
        kChromeUITabSearchHost,
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -2523,7 +2523,6 @@ if (!is_android) {
+@@ -2558,7 +2558,6 @@ if (!is_android) {
        "//components/resources",
        "//components/safe_browsing:buildflags",
        "//components/safe_browsing/content/browser",
@@ -1671,7 +1698,7 @@
        "//components/safe_browsing/content/browser:safe_browsing_service",
        "//components/safe_browsing/content/browser/password_protection",
        "//components/safe_browsing/content/browser/password_protection:test_support",
-@@ -6871,7 +6870,6 @@ test("unit_tests") {
+@@ -6921,7 +6920,6 @@ test("unit_tests") {
      "//components/resources",
      "//components/safe_browsing:buildflags",
      "//components/safe_browsing/content/browser",
@@ -1752,7 +1779,7 @@
 -  safe_browsing::SafeBrowsingState safe_browsing_protection_level;
    bool site_isolation_enabled;
  
-   // Enterprise cloud content analysis exclusive
+   // Enterprise cloud content analysis exclusives
 --- a/components/enterprise/browser/reporting/chrome_profile_request_generator.cc
 +++ b/components/enterprise/browser/reporting/chrome_profile_request_generator.cc
 @@ -229,16 +229,10 @@ void ChromeProfileRequestGenerator::OnAg
@@ -1771,7 +1798,7 @@
 -            profile_signals.safe_browsing_protection_level));
      profile_signals_report->set_site_isolation_enabled(
          profile_signals.site_isolation_enabled);
-     profile_report->set_allocated_profile_signals_report(
+ 
 --- a/components/enterprise/browser/reporting/report_util.cc
 +++ b/components/enterprise/browser/reporting/report_util.cc
 @@ -80,25 +80,6 @@ em::SettingValue TranslateSettingValue(
@@ -1876,7 +1903,7 @@
    const base::Value::List* enabled_opt_in_events_value =
 --- a/components/password_manager/core/browser/leak_detection/leak_detection_check_impl.cc
 +++ b/components/password_manager/core/browser/leak_detection/leak_detection_check_impl.cc
-@@ -336,12 +336,7 @@ bool LeakDetectionCheck::IsURLBlockedByP
+@@ -314,12 +314,7 @@ bool LeakDetectionCheck::IsURLBlockedByP
      const PrefService& prefs,
      const GURL& form_url,
      autofill::SavePasswordProgressLogger* logger) {
@@ -2033,7 +2060,7 @@
  void RealTimeUrlLookupService::MaybeFillReferringWebApk(
 --- a/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
 +++ b/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
-@@ -595,17 +595,6 @@ void RealTimeUrlLookupServiceBase::Start
+@@ -593,17 +593,6 @@ void RealTimeUrlLookupServiceBase::Start
    request->set_report_type(is_sampled_report ? RTLookupRequest::SAMPLED_REPORT
                                               : RTLookupRequest::FULL_REPORT);
    request->set_frame_type(RTLookupRequest::MAIN_FRAME);

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
-@@ -174,6 +174,7 @@
+@@ -171,6 +171,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"
-@@ -2242,6 +2243,7 @@ void RenderViewContextMenu::AppendPageIt
+@@ -2281,6 +2282,7 @@ void RenderViewContextMenu::AppendPageIt
    }
  
    if (CanTranslate(/*menu_logging=*/true)) {
@@ -47,7 +47,7 @@
      request_pending_ = true;
 --- a/components/translate/core/browser/translate_manager.cc
 +++ b/components/translate/core/browser/translate_manager.cc
-@@ -837,8 +837,9 @@ void TranslateManager::FilterIsTranslate
+@@ -821,8 +821,9 @@ void TranslateManager::FilterIsTranslate
          TriggerDecision::kDisabledOffline);
    }
  

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

@@ -9,7 +9,7 @@
 
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2532,6 +2532,7 @@ static_library("browser") {
+@@ -2564,6 +2564,7 @@ static_library("browser") {
      "//third_party/libyuv",
      "//third_party/metrics_proto",
      "//third_party/re2",
@@ -62,7 +62,7 @@
  #include "components/viz/common/switches.h"
  #include "components/viz/host/gpu_client.h"
  #include "components/viz/host/host_frame_sink_manager.h"
-@@ -3491,6 +3492,8 @@ void RenderProcessHostImpl::PropagateBro
+@@ -3507,6 +3508,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"
-@@ -490,6 +491,10 @@ void SetRuntimeFeaturesFromCommandLine(c
+@@ -487,6 +488,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
-@@ -43,6 +43,7 @@
- #include "base/metrics/histogram_macros.h"
- #include "base/not_fatal_until.h"
+@@ -41,6 +41,7 @@
+ #include "base/i18n/time_formatting.h"
+ #include "base/metrics/histogram_functions.h"
  #include "base/notreached.h"
 +#include "base/rand_util.h"
  #include "base/task/single_thread_task_runner.h"
  #include "base/time/time.h"
- #include "base/timer/elapsed_timer.h"
-@@ -889,6 +890,11 @@ Document::Document(const DocumentInit& i
+ #include "base/trace_event/trace_event.h"
+@@ -890,6 +891,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();
-@@ -1015,6 +1021,14 @@ const Position Document::PositionAdjuste
+@@ -1020,6 +1026,14 @@ const Position Document::PositionAdjuste
    return Position::BeforeNode(*shadow_host);
  }
  
@@ -153,7 +153,7 @@
      selector_query_cache_ = MakeGarbageCollected<SelectorQueryCache>();
 --- a/third_party/blink/renderer/core/dom/document.h
 +++ b/third_party/blink/renderer/core/dom/document.h
-@@ -556,6 +556,10 @@ class CORE_EXPORT Document : public Cont
+@@ -558,6 +558,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;
-@@ -2732,6 +2736,9 @@ class CORE_EXPORT Document : public Cont
+@@ -2747,6 +2751,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
-@@ -2878,6 +2878,11 @@ DOMRectList* Element::getClientRects() {
+@@ -2959,6 +2959,11 @@ DOMRectList* Element::getClientRects() {
    DCHECK(element_layout_object);
    GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
                                                      *element_layout_object);
@@ -188,7 +188,7 @@
    return MakeGarbageCollected<DOMRectList>(quads);
  }
  
-@@ -2905,6 +2910,9 @@ gfx::RectF Element::GetBoundingClientRec
+@@ -2986,6 +2991,9 @@ gfx::RectF Element::GetBoundingClientRec
    DCHECK(element_layout_object);
    GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
                                                     *element_layout_object);
@@ -276,7 +276,7 @@
  namespace blink {
  namespace {
  
-@@ -1293,13 +1296,26 @@ TextMetrics* BaseRenderingContext2D::mea
+@@ -1276,13 +1279,26 @@ TextMetrics* BaseRenderingContext2D::mea
    TextDirection direction =
        ToTextDirection(state.GetDirection(), host, computed_style);
  
@@ -308,7 +308,7 @@
  String BaseRenderingContext2D::lang() const {
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1797,6 +1797,7 @@ component("platform") {
+@@ -1793,6 +1793,7 @@ component("platform") {
      "//components/paint_preview/common",
      "//components/search_engines:search_engine_utils",
      "//components/translate/core/language_detection:language_detection",
@@ -343,7 +343,7 @@
  #include "third_party/skia/include/core/SkSurface.h"
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -2176,6 +2176,12 @@
+@@ -2254,6 +2254,12 @@
        status: "stable",
      },
      {

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
-@@ -3494,6 +3494,7 @@ void RenderProcessHostImpl::PropagateBro
+@@ -3510,6 +3510,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
-@@ -495,6 +495,8 @@ void SetRuntimeFeaturesFromCommandLine(c
+@@ -492,6 +492,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
-@@ -615,6 +615,9 @@ ImageData* BaseRenderingContext2D::getIm
+@@ -599,6 +599,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
-@@ -1741,7 +1741,9 @@ component("platform") {
+@@ -1737,7 +1737,9 @@ component("platform") {
      "//third_party/blink/renderer:non_test_config",
    ]
  
@@ -305,7 +305,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
-@@ -2182,6 +2182,9 @@
+@@ -2260,6 +2260,9 @@
        name: "FingerprintingCanvasMeasureTextNoise",
      },
      {

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

@@ -17,7 +17,7 @@ with limited CPU/memory resources and it is disabled by default.
 
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2209,6 +2209,7 @@ static_library("browser") {
+@@ -2241,6 +2241,7 @@ static_library("browser") {
      "//components/net_log",
      "//components/network_hints/common:mojo_bindings",
      "//components/network_session_configurator/browser",
@@ -81,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"
-@@ -418,6 +422,18 @@ void BrowserProcessImpl::Init() {
+@@ -419,6 +423,18 @@ void BrowserProcessImpl::Init() {
    pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
                               base::BindRepeating(&ApplyMetricsReportingPolicy));
  
@@ -102,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
-@@ -2603,6 +2603,10 @@ const char kMantisFeatureKeyDescription[
+@@ -2632,6 +2632,10 @@ const char kMantisFeatureKeyDescription[
      "Feature key to use the Mantis feature on ChromeOS.";
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -115,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
-@@ -1506,6 +1506,9 @@ extern const char kMantisFeatureKeyName[
+@@ -1528,6 +1528,9 @@ extern const char kMantisFeatureKeyName[
  extern const char kMantisFeatureKeyDescription[];
  #endif  // IS_CHROMEOS
  

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

@@ -3,14 +3,14 @@ author: Michael Gilbert <mgilbert@debian.org>
 
 --- a/chrome/browser/ui/startup/infobar_utils.cc
 +++ b/chrome/browser/ui/startup/infobar_utils.cc
-@@ -163,10 +163,6 @@ void AddInfoBarsIfNecessary(Browser* bro
-     infobars::ContentInfoBarManager* infobar_manager =
-         infobars::ContentInfoBarManager::FromWebContents(web_contents);
+@@ -171,10 +171,6 @@ void AddInfoBarsIfNecessary(Browser* bro
+   infobars::ContentInfoBarManager* infobar_manager =
+       infobars::ContentInfoBarManager::FromWebContents(web_contents);
  
--    if (!google_apis::HasAPIKeyConfigured()) {
--      GoogleApiKeysInfoBarDelegate::Create(infobar_manager);
--    }
+-  if (!google_apis::HasAPIKeyConfigured()) {
+-    GoogleApiKeysInfoBarDelegate::Create(infobar_manager);
+-  }
 -
-     if (ObsoleteSystem::IsObsoleteNowOrSoon()) {
-       PrefService* local_state = g_browser_process->local_state();
-       if (!local_state ||
+   if (ObsoleteSystem::IsObsoleteNowOrSoon()) {
+     PrefService* local_state = g_browser_process->local_state();
+     if (!local_state ||

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
-@@ -1567,7 +1567,7 @@ void ChromeContentBrowserClient::Registe
+@@ -1407,7 +1407,7 @@ void ChromeContentBrowserClient::Registe
  void ChromeContentBrowserClient::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -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
+@@ -113,7 +113,7 @@ void RegisterBrowserUserPrefs(user_prefs
    registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
    registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
    registry->RegisterBooleanPref(
@@ -87,7 +87,7 @@
        kAutofillPaymentCvcStorage, true,
 --- a/components/bookmarks/browser/bookmark_utils.cc
 +++ b/components/bookmarks/browser/bookmark_utils.cc
-@@ -457,7 +457,7 @@ bool DoesBookmarkContainWords(const std:
+@@ -449,7 +449,7 @@ bool DoesBookmarkContainWords(const std:
  
  void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(

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

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

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

@@ -1,27 +1,16 @@
---- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
-+++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
-@@ -4,6 +4,7 @@
- 
- #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
- 
-+#include "base/command_line.h"
- #include "base/observer_list.h"
- #include "build/build_config.h"
- #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();
- 
-+  const std::string flag_value =
-+    base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("bookmark-bar-ntp");
-   // The bookmark bar is only shown on the NTP if the user
-   // has added something to it.
--  return IsNTP(web_contents()) && (has_bookmarks || has_saved_tab_groups);
-+  return IsNTP(web_contents()) && (has_bookmarks || has_saved_tab_groups) &&
-+      (flag_value != "never");
+--- a/chrome/browser/ui/browser.cc
++++ b/chrome/browser/ui/browser.cc
+@@ -3824,6 +3824,10 @@ void Browser::UpdateBookmarkBarState(Boo
  }
  
- void BookmarkTabHelper::AddObserver(BookmarkTabHelperObserver* observer) {
+ bool Browser::ShouldShowBookmarkBar() const {
++  if (base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("bookmark-bar-ntp") == "never") {
++    return false;
++  }
++
+   if (profile_->IsGuestSession()) {
+     return false;
+   }
 --- a/chrome/browser/ungoogled_flag_choices.h
 +++ b/chrome/browser/ungoogled_flag_choices.h
 @@ -34,4 +34,10 @@ const FeatureEntry::Choice kScrollEventC

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

@@ -8,7 +8,7 @@
  #include "chrome/browser/ui/views/status_bubble_views.h"
  #include "chrome/browser/ui/web_applications/app_browser_controller.h"
  #include "chrome/browser/ui/web_applications/web_app_launch_utils.h"
-@@ -587,6 +588,7 @@ Browser::Browser(const CreateParams& par
+@@ -640,6 +641,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),
-@@ -1050,20 +1052,22 @@ Browser::WarnBeforeClosingResult Browser
+@@ -1102,20 +1104,22 @@ Browser::WarnBeforeClosingResult Browser
      return WarnBeforeClosingResult::kOkToClose;
    }
  
@@ -52,7 +52,7 @@
    }
  
    DCHECK(!warn_before_closing_callback_)
-@@ -1101,6 +1105,7 @@ bool Browser::TryToCloseWindow(
+@@ -1153,6 +1157,7 @@ bool Browser::TryToCloseWindow(
  
  void Browser::ResetTryToCloseWindow() {
    cancel_download_confirmation_state_ = NOT_PROMPTED;
@@ -60,7 +60,7 @@
    unload_controller_.ResetTryToCloseWindow();
  }
  
-@@ -3447,6 +3452,58 @@ bool Browser::CanCloseWithInProgressDown
+@@ -3542,6 +3547,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;
-@@ -3472,6 +3529,22 @@ void Browser::InProgressDownloadResponse
+@@ -3567,6 +3624,22 @@ void Browser::InProgressDownloadResponse
  
    std::move(warn_before_closing_callback_)
        .Run(WarnBeforeClosingResult::kDoNotClose);
@@ -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.
-@@ -1415,6 +1421,8 @@ class Browser : public TabStripModelObse
+@@ -1413,6 +1419,8 @@ class Browser : public TabStripModelObse
    // when the browser is closed with in-progress downloads.
    CancelDownloadConfirmationState cancel_download_confirmation_state_;
  

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

@@ -1,20 +1,21 @@
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -943,10 +943,14 @@ bool HandleNewTabPageLocationOverride(
+@@ -821,11 +821,15 @@ bool HandleNewTabPageLocationOverride(
  
    // Don't change the URL when incognito mode.
-   if (profile->IsOffTheRecord())
+   if (profile->IsOffTheRecord()) {
 +   if (!base::CommandLine::ForCurrentProcess()->HasSwitch("custom-ntp"))
      return false;
+   }
  
    std::string ntp_location =
        profile->GetPrefs()->GetString(prefs::kNewTabPageLocationOverride);
 +  if (base::CommandLine::ForCurrentProcess()->HasSwitch("custom-ntp"))
 +    ntp_location = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("custom-ntp");
 +  if (profile->IsOffTheRecord() && ntp_location.find("chrome://") != std::string::npos) return false;
-   if (ntp_location.empty())
+   if (ntp_location.empty()) {
      return false;
-   url::Component scheme;
+   }
 --- a/chrome/browser/ungoogled_flag_entries.h
 +++ b/chrome/browser/ungoogled_flag_entries.h
 @@ -76,4 +76,8 @@
@@ -28,7 +29,7 @@
  #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 --- a/components/webui/flags/flags_state.cc
 +++ b/components/webui/flags/flags_state.cc
-@@ -234,6 +234,7 @@ std::string GetCombinedOriginListValue(c
+@@ -233,6 +233,7 @@ std::string GetCombinedOriginListValue(c
        command_line.GetSwitchValueASCII(command_line_switch);
    const std::string new_value =
        flags_storage.GetOriginListFlag(internal_entry_name);
@@ -36,7 +37,7 @@
    return CombineAndSanitizeOriginLists(existing_value, new_value);
  }
  
-@@ -484,6 +485,7 @@ void FlagsState::SetOriginListFlag(const
+@@ -483,6 +484,7 @@ void FlagsState::SetOriginListFlag(const
                                     const std::string& value,
                                     FlagsStorage* flags_storage) {
    const std::string new_value =

patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch

@@ -11,7 +11,7 @@
  #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -18,6 +18,8 @@
+@@ -19,6 +19,8 @@
  
  namespace blink::features {
  
@@ -40,8 +40,8 @@
 +#include "third_party/blink/public/common/features.h"
  #include "third_party/blink/public/common/input/web_menu_source_type.h"
  #include "third_party/blink/public/platform/web_input_event_result.h"
- #include "third_party/blink/renderer/core/dom/document.h"
-@@ -1434,10 +1435,14 @@ FrameSelection& SelectionController::Sel
+ #include "third_party/blink/renderer/core/annotation/annotation_agent_impl.h"
+@@ -1436,10 +1437,14 @@ FrameSelection& SelectionController::Sel
  }
  
  bool IsSelectionOverLink(const MouseEventWithHitTestResults& event) {

patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch

@@ -10,7 +10,7 @@
  }
 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
 +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
-@@ -57,6 +57,7 @@
+@@ -59,6 +59,7 @@
  #include "ui/base/webui/jstemplate_builder.h"
  #include "ui/base/webui/web_ui_util.h"
  #include "ui/color/color_provider.h"
@@ -18,7 +18,7 @@
  #include "ui/gfx/color_utils.h"
  #include "ui/native_theme/native_theme.h"
  
-@@ -454,7 +455,9 @@ void NTPResourceCache::CreateNewTabIncog
+@@ -467,7 +468,9 @@ void NTPResourceCache::CreateNewTabIncog
        profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
  
    // Colors.

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"
-@@ -546,6 +547,15 @@ AutocompleteController::AutocompleteCont
+@@ -566,6 +567,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
-@@ -489,6 +489,9 @@ void HistoryURLProvider::Start(const Aut
+@@ -488,6 +488,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"
-@@ -629,6 +630,9 @@ void SearchProvider::Run(bool query_is_p
+@@ -628,6 +629,9 @@ void SearchProvider::Run(bool query_is_p
  }
  
  void SearchProvider::DoHistoryQuery(bool minimal_changes) {

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
-@@ -543,7 +543,9 @@ void TabHelpers::AttachTabHelpers(WebCon
+@@ -545,7 +545,9 @@ void TabHelpers::AttachTabHelpers(WebCon
        profile, web_contents);
  #endif  // BUILDFLAG(SAFE_BROWSING_AVAILABLE)
    SafetyTipWebContentsObserver::CreateForWebContents(web_contents);
@@ -25,7 +25,7 @@
  #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 --- a/chrome/renderer/chrome_render_frame_observer.cc
 +++ b/chrome/renderer/chrome_render_frame_observer.cc
-@@ -256,14 +256,16 @@ void ChromeRenderFrameObserver::DidFinis
+@@ -253,14 +253,16 @@ void ChromeRenderFrameObserver::DidFinis
    if (frame->Parent() || frame->IsInFencedFrameTree())
      return;
  
@@ -52,7 +52,7 @@
  
 --- a/components/search_engines/template_url_service.cc
 +++ b/components/search_engines/template_url_service.cc
-@@ -20,6 +20,7 @@
+@@ -15,6 +15,7 @@
  #include "base/base64url.h"
  #include "base/check_deref.h"
  #include "base/check_is_test.h"
@@ -60,8 +60,8 @@
  #include "base/containers/contains.h"
  #include "base/containers/fixed_flat_map.h"
  #include "base/containers/flat_map.h"
-@@ -309,6 +310,12 @@ std::string_view SyncChangeTypeToHistogr
-   NOTREACHED();
+@@ -346,6 +347,12 @@ bool ShouldCommitUpdateToAccount(
+   return account_data_changed;
  }
  
 +bool ShouldAutocollect() {
@@ -73,7 +73,7 @@
  }  // namespace
  
  // TemplateURLService::LessWithPrefix -----------------------------------------
-@@ -489,6 +496,7 @@ TemplateURLService::TemplateURLService(
+@@ -526,6 +533,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),
        prepopulate_data_resolver_(prepopulate_data_resolver),
        search_terms_data_(std::move(search_terms_data)),
-@@ -594,8 +602,8 @@ bool TemplateURLService::CanAddAutogener
+@@ -631,8 +639,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(
-@@ -2438,6 +2446,8 @@ SyncDataMap TemplateURLService::CreateGU
+@@ -2441,6 +2449,8 @@ SyncDataMap TemplateURLService::CreateGU
  }
  
  void TemplateURLService::Init() {
@@ -101,7 +101,7 @@
    if (client_) {
      client_->SetOwner(this);
    }
-@@ -2620,6 +2630,9 @@ void TemplateURLService::ChangeToLoadedS
+@@ -2623,6 +2633,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
-@@ -901,6 +901,8 @@ class TemplateURLService final : public
+@@ -911,6 +911,8 @@ class TemplateURLService final : public
  
    raw_ref<TemplateURLPrepopulateData::Resolver> prepopulate_data_resolver_;
  

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

@@ -24,7 +24,7 @@
  // BrowserView::GetAccessibleTabLabel to get the updated accessible name.
 --- a/chrome/browser/ui/views/tabs/tab.h
 +++ b/chrome/browser/ui/views/tabs/tab.h
-@@ -89,6 +89,7 @@ class Tab : public gfx::AnimationDelegat
+@@ -93,6 +93,7 @@ class Tab : public gfx::AnimationDelegat
    void OnMouseEntered(const ui::MouseEvent& event) override;
    void OnMouseExited(const ui::MouseEvent& event) override;
    void OnGestureEvent(ui::GestureEvent* event) override;
@@ -42,7 +42,7 @@
  #include "base/check.h"
  #include "base/compiler_specific.h"
  #include "base/containers/adapters.h"
-@@ -1946,6 +1947,8 @@ void TabStrip::OnMouseEventInTab(views::
+@@ -1936,6 +1937,8 @@ void TabStrip::OnMouseEventInTab(views::
  }
  
  void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) {

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

@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/browser_command_controller.cc
 +++ b/chrome/browser/ui/browser_command_controller.cc
-@@ -1535,7 +1535,8 @@ void BrowserCommandController::InitComma
+@@ -1555,7 +1555,8 @@ void BrowserCommandController::InitComma
    command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
                                          normal_window);
  
@@ -10,9 +10,22 @@
    command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH,
                                          enable_tab_search_commands);
    command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH_CLOSE,
+--- a/chrome/browser/ui/ui_features.cc
++++ b/chrome/browser/ui/ui_features.cc
+@@ -458,6 +458,10 @@ static std::string GetCountryCode() {
+ }
+ 
+ bool IsTabSearchMoving() {
++  if (base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button")) {
++    return false;
++  }
++
+   static const bool is_tab_search_moving = [] {
+     if (GetCountryCode() == "us" &&
+         base::FeatureList::IsEnabled(
 --- a/chrome/browser/ui/views/frame/browser_view.cc
 +++ b/chrome/browser/ui/views/frame/browser_view.cc
-@@ -5200,6 +5200,7 @@ void BrowserView::AddedToWidget() {
+@@ -5283,6 +5283,7 @@ void BrowserView::AddedToWidget() {
  
    toolbar_->Init();
  
@@ -49,15 +62,3 @@
 +     "Removes the tabsearch button from the tabstrip. ungoogled-chromium flag",
 +     kOsDesktop, SINGLE_VALUE_TYPE("remove-tabsearch-button")},
  #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
---- a/chrome/common/chrome_features.cc
-+++ b/chrome/common/chrome_features.cc
-@@ -538,7 +538,8 @@ BASE_FEATURE(kTabstripComboButton,
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
- bool IsTabSearchMoving() {
--  return base::FeatureList::IsEnabled(features::kTabstripComboButton);
-+  return base::FeatureList::IsEnabled(features::kTabstripComboButton) &&
-+      !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button");
- }
- 
- const base::FeatureParam<bool> kTabstripComboButtonHasBackground{

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/webui/flags/flags_state.cc
 +++ b/components/webui/flags/flags_state.cc
-@@ -235,6 +235,7 @@ std::string GetCombinedOriginListValue(c
+@@ -234,6 +234,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);
  }
  
-@@ -486,6 +487,7 @@ void FlagsState::SetOriginListFlag(const
+@@ -485,6 +486,7 @@ void FlagsState::SetOriginListFlag(const
                                     FlagsStorage* flags_storage) {
    const std::string new_value =
        internal_name == "custom-ntp" ? value :

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
-@@ -349,4 +349,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur
+@@ -359,4 +359,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur
               "RemovalOfIWAsFromTabCapture",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -8,7 +8,7 @@
  }  // namespace features
 --- a/chrome/browser/browser_features.h
 +++ b/chrome/browser/browser_features.h
-@@ -133,6 +133,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT
+@@ -135,6 +135,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT
  // module, e.g.
  // //chrome/browser/<foo_module>/features.h
  //

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"
-@@ -998,6 +999,10 @@ void TabStripModel::CloseAllTabsInGroup(
+@@ -1161,6 +1162,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);
  }
  
-@@ -2466,9 +2471,13 @@ TabStripModel::GetGroupsDestroyedFromRem
+@@ -2789,9 +2794,13 @@ TabStripModel::GetGroupsDestroyedFromRem
  void TabStripModel::ExecuteCloseTabsByIndices(
      base::RepeatingCallback<std::vector<int>()> get_indices_to_close,
      uint32_t close_types) {

patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch

@@ -11,7 +11,7 @@
  #include "build/build_config.h"
  #include "chrome/browser/extensions/crx_installer.h"
  #include "chrome/browser/extensions/extension_install_prompt.h"
-@@ -112,6 +113,14 @@ scoped_refptr<extensions::CrxInstaller>
+@@ -113,6 +114,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)
-@@ -120,7 +129,7 @@ bool IsExtensionDownload(const DownloadI
+@@ -121,7 +130,7 @@ bool IsExtensionDownload(const DownloadI
    if (download_item.GetMimeType() == extensions::Extension::kMimeType ||
        extensions::UserScript::IsURLUserScript(download_item.GetURL(),
                                                download_item.GetMimeType())) {

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
-@@ -1207,6 +1207,8 @@ WindowOpenDisposition NavigationPolicyTo
+@@ -1208,6 +1208,8 @@ WindowOpenDisposition NavigationPolicyTo
      case blink::kWebNavigationPolicyNewWindow:
        return WindowOpenDisposition::NEW_WINDOW;
      case blink::kWebNavigationPolicyNewPopup:

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

@@ -21,7 +21,7 @@
  #include "base/compiler_specific.h"
  #include "base/containers/flat_set.h"
  #include "base/feature_list.h"
-@@ -1338,7 +1339,8 @@ void HistoryBackend::InitImpl(
+@@ -1327,7 +1328,8 @@ void HistoryBackend::InitImpl(
    db_->GetStartDate(&first_recorded_time_);
  
    // Start expiring old stuff.
@@ -31,7 +31,7 @@
  }
  
  void HistoryBackend::OnMemoryPressure(
-@@ -1561,6 +1563,8 @@ void HistoryBackend::AddPagesWithDetails
+@@ -1549,6 +1551,8 @@ void HistoryBackend::AddPagesWithDetails
  }
  
  bool HistoryBackend::IsExpiredVisitTime(const base::Time& time) const {

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

@@ -11,7 +11,7 @@
  #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 --- a/net/socket/ssl_client_socket_impl.cc
 +++ b/net/socket/ssl_client_socket_impl.cc
-@@ -203,7 +203,8 @@ class SSLClientSocketImpl::SSLContext {
+@@ -198,7 +198,8 @@ class SSLClientSocketImpl::SSLContext {
      SSL_CTX_sess_set_new_cb(ssl_ctx_.get(), NewSessionCallback);
      SSL_CTX_set_timeout(ssl_ctx_.get(), 1 * 60 * 60 /* one hour */);
  

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

@@ -3,7 +3,7 @@
 
 --- a/chrome/browser/ui/startup/infobar_utils.cc
 +++ b/chrome/browser/ui/startup/infobar_utils.cc
-@@ -131,7 +131,8 @@ void AddInfoBarsIfNecessary(Browser* bro
+@@ -136,7 +136,8 @@ void AddInfoBarsIfNecessary(Browser* bro
    }
  
    // Web apps should not display the session restore bubble (crbug.com/1264121)

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"
-@@ -36,6 +37,7 @@
+@@ -35,6 +36,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"
-@@ -545,6 +547,17 @@ void ExtensionsToolbarContainer::AnchorA
+@@ -544,6 +546,17 @@ void ExtensionsToolbarContainer::AnchorA
    widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView(
        anchor_view && anchor_view->GetVisible() ? anchor_view
                                                 : GetExtensionsButton());
@@ -34,7 +34,7 @@
    widget->Show();
  }
  
-@@ -944,6 +957,9 @@ void ExtensionsToolbarContainer::UpdateC
+@@ -943,6 +956,9 @@ void ExtensionsToolbarContainer::UpdateC
  }
  
  bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const {

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
-@@ -2265,6 +2265,10 @@ void BrowserView::ExitFullscreen() {
+@@ -2370,6 +2370,10 @@ void BrowserView::ExitFullscreen() {
  void BrowserView::UpdateExclusiveAccessBubble(
      const ExclusiveAccessBubbleParams& params,
      ExclusiveAccessBubbleHideCallback first_hide_callback) {

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
-@@ -1178,7 +1178,11 @@ void Tab::UpdateIconVisibility() {
+@@ -1174,7 +1174,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;
-@@ -1207,6 +1211,8 @@ void Tab::UpdateIconVisibility() {
+@@ -1203,6 +1207,8 @@ void Tab::UpdateIconVisibility() {
          !controller_->IsLockedForOnTask() &&
  #endif
          large_enough_for_close_button;

patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch

@@ -40,7 +40,7 @@
    // Low entropy client hints.
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -19,6 +19,7 @@
+@@ -20,6 +20,7 @@
  namespace blink::features {
  
  BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT);

patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch

@@ -31,7 +31,7 @@
        data, container_policy);
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -20,6 +20,7 @@ namespace blink::features {
+@@ -21,6 +21,7 @@ namespace blink::features {
  
  BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT);
  BASE_FEATURE(kReducedSystemInfo, "ReducedSystemInfo", base::FEATURE_DISABLED_BY_DEFAULT);

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
-@@ -464,6 +464,17 @@ void ToolbarView::Init() {
+@@ -471,6 +471,17 @@ void ToolbarView::Init() {
                                 browser_->profile()->IsGuestSession() ||
                                 browser_->profile()->IsRegularProfile();
  #endif

patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch

@@ -58,7 +58,7 @@
  #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -21,6 +21,11 @@ namespace blink::features {
+@@ -22,6 +22,11 @@ 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);
@@ -86,7 +86,7 @@
  // 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
-@@ -3897,6 +3897,8 @@ ScriptValue WebGLRenderingContextBase::g
+@@ -3915,6 +3915,8 @@ ScriptValue WebGLRenderingContextBase::g
                pname, IdentifiabilityBenignStringToken(
                           String(ContextGL()->GetString(GL_RENDERER))));
          }
@@ -95,7 +95,7 @@
          return WebGLAny(script_state,
                          String(ContextGL()->GetString(GL_RENDERER)));
        }
-@@ -3912,6 +3914,8 @@ ScriptValue WebGLRenderingContextBase::g
+@@ -3930,6 +3932,8 @@ ScriptValue WebGLRenderingContextBase::g
                pname, IdentifiabilityBenignStringToken(
                           String(ContextGL()->GetString(GL_VENDOR))));
          }

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
-@@ -4619,10 +4619,12 @@ const FeatureEntry::FeatureVariation
+@@ -4732,10 +4732,12 @@ const FeatureEntry::FeatureVariation kHi
  #include "chrome/browser/ungoogled_flag_choices.h"
  #include "chrome/browser/bromite_flag_choices.h"
  #include "chrome/browser/ungoogled_platform_flag_choices.h"

patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch

@@ -19,7 +19,7 @@
  #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -166,6 +166,7 @@
+@@ -168,6 +168,7 @@
  #include "services/network/public/cpp/permissions_policy/fenced_frame_permissions_policies.h"
  #include "services/network/public/cpp/permissions_policy/permissions_policy_declaration.h"
  #include "services/network/public/cpp/permissions_policy/permissions_policy_features.h"
@@ -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"
-@@ -386,10 +387,10 @@ void AddAdditionalRequestHeaders(
+@@ -388,10 +389,10 @@ void AddAdditionalRequestHeaders(
        net::HttpRequestHeaders::kUserAgent,
        ComputeUserAgentValue(*headers, user_agent_override, browser_context));
  
@@ -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"
-@@ -4666,10 +4667,13 @@ void RenderFrameImpl::FinalizeRequestInt
+@@ -4664,10 +4665,13 @@ void RenderFrameImpl::FinalizeRequestInt
  
    request.SetHasUserGesture(frame_->HasTransientUserActivation());
  

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

@@ -13,7 +13,7 @@
  #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -14,6 +14,8 @@
+@@ -18,6 +18,8 @@
  
  namespace net::features {
  
@@ -35,7 +35,7 @@
  // https://vasilvv.github.io/httpbis-alps/draft-vvv-httpbis-alps.html.
 --- a/net/dns/host_resolver_manager.cc
 +++ b/net/dns/host_resolver_manager.cc
-@@ -153,11 +153,6 @@ const size_t kMaxHostLength = 4096;
+@@ -152,11 +152,6 @@ const size_t kMaxHostLength = 4096;
  // cached.
  const int kIPv6ProbePeriodMs = 1000;
  
@@ -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.");
-@@ -1490,33 +1485,10 @@ int HostResolverManager::StartIPv6Reacha
+@@ -1489,33 +1484,10 @@ int HostResolverManager::StartIPv6Reacha
      return OK;
    }
  

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

@@ -165,7 +165,7 @@
  
 --- a/chrome/browser/ui/search_engines/edit_search_engine_controller.h
 +++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.h
-@@ -23,7 +23,8 @@ class EditSearchEngineControllerDelegate
+@@ -22,7 +22,8 @@ class EditSearchEngineControllerDelegate
    virtual void OnEditedKeyword(TemplateURL* template_url,
                                 const std::u16string& title,
                                 const std::u16string& keyword,
@@ -175,7 +175,7 @@
  
   protected:
    virtual ~EditSearchEngineControllerDelegate() = default;
-@@ -54,6 +55,8 @@ class EditSearchEngineController {
+@@ -53,6 +54,8 @@ class EditSearchEngineController {
    // character results in a valid url.
    bool IsURLValid(const std::string& url_input) const;
  
@@ -184,7 +184,7 @@
    // Returns true if the value of |keyword_input| represents a valid keyword.
    // The keyword is valid if it is non-empty and does not conflict with an
    // existing entry. NOTE: this is just the keyword, not the title and url.
-@@ -62,7 +65,8 @@ class EditSearchEngineController {
+@@ -61,7 +64,8 @@ class EditSearchEngineController {
    // Completes the add or edit of a search engine.
    void AcceptAddOrEdit(const std::u16string& title_input,
                         const std::u16string& keyword_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
-@@ -207,21 +207,25 @@ void TemplateURLTableModel::Remove(size_
+@@ -201,21 +201,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);
-@@ -230,7 +234,8 @@ void TemplateURLTableModel::ModifyTempla
+@@ -224,7 +228,8 @@ void TemplateURLTableModel::ModifyTempla
    DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url ||
           template_url->SupportsReplacement(
               template_url_service_->search_terms_data()));
@@ -314,7 +314,7 @@
  TemplateURL* TemplateURLTableModel::GetTemplateURL(size_t index) {
 --- a/chrome/browser/ui/search_engines/template_url_table_model.h
 +++ b/chrome/browser/ui/search_engines/template_url_table_model.h
-@@ -61,13 +61,15 @@ class TemplateURLTableModel : public ui:
+@@ -58,13 +58,15 @@ class TemplateURLTableModel : public ui:
    void Add(size_t index,
             const std::u16string& short_name,
             const std::u16string& keyword,
@@ -334,7 +334,7 @@
    void ReloadIcon(size_t index);
 --- a/chrome/browser/ui/webui/settings/search_engines_handler.cc
 +++ b/chrome/browser/ui/webui/settings/search_engines_handler.cc
-@@ -50,6 +50,7 @@ namespace {
+@@ -49,6 +49,7 @@ namespace {
  const char kSearchEngineField[] = "searchEngine";
  const char kKeywordField[] = "keyword";
  const char kQueryUrlField[] = "queryUrl";
@@ -351,7 +351,7 @@
    dict.Set("urlLocked", ((template_url->prepopulate_id() > 0) ||
                           (template_url->starter_pack_id() > 0)));
    GURL icon_url = template_url->favicon_url();
-@@ -414,12 +417,14 @@ void SearchEnginesHandler::HandleSearchE
+@@ -418,12 +421,14 @@ void SearchEnginesHandler::HandleSearchE
  void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url,
                                             const std::u16string& title,
                                             const std::u16string& keyword,
@@ -369,7 +369,7 @@
    }
  
    edit_controller_.reset();
-@@ -449,6 +454,8 @@ bool SearchEnginesHandler::CheckFieldVal
+@@ -453,6 +458,8 @@ bool SearchEnginesHandler::CheckFieldVal
      is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value));
    } else if (field_name.compare(kQueryUrlField) == 0) {
      is_valid = edit_controller_->IsURLValid(field_value);
@@ -378,7 +378,7 @@
    } else {
      NOTREACHED();
    }
-@@ -471,18 +478,21 @@ void SearchEnginesHandler::HandleSearchE
+@@ -475,18 +482,21 @@ void SearchEnginesHandler::HandleSearchE
      return;
    }
  
@@ -428,7 +428,7 @@
  
 --- a/components/search_engines/template_url_service.cc
 +++ b/components/search_engines/template_url_service.cc
-@@ -1006,7 +1006,8 @@ void TemplateURLService::IncrementUsageC
+@@ -998,7 +998,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());
-@@ -1021,6 +1022,7 @@ void TemplateURLService::ResetTemplateUR
+@@ -1013,6 +1014,7 @@ void TemplateURLService::ResetTemplateUR
    data.safe_for_autoreplace = false;
    data.last_modified = clock_->Now();
    data.is_active = TemplateURLData::ActiveStatus::kTrue;
@@ -448,7 +448,7 @@
                    syncer::kSeparateLocalAndAccountSearchEngines)
 --- a/components/search_engines/template_url_service.h
 +++ b/components/search_engines/template_url_service.h
-@@ -346,7 +346,8 @@ class TemplateURLService final : public
+@@ -341,7 +341,8 @@ class TemplateURLService final : public
    void ResetTemplateURL(TemplateURL* url,
                          const std::u16string& title,
                          const std::u16string& keyword,

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
-@@ -4615,7 +4615,13 @@ const FeatureEntry::FeatureVariation
+@@ -4728,7 +4728,13 @@ const FeatureEntry::FeatureVariation kHi
  // calculate and verify checksum.
  //
  // When adding a new choice, add it to the end of the list.

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
+@@ -125,7 +125,7 @@ void RegisterBrowserUserPrefs(user_prefs
                                  false);
  #endif
    registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy,

patches/extra/ungoogled-chromium/disable-chromelabs.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
 +++ b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
-@@ -144,35 +144,6 @@ bool AreNewChromeLabsExperimentsAvailabl
+@@ -140,35 +140,6 @@ bool AreNewChromeLabsExperimentsAvailabl
  }
  
  bool IsChromeLabsEnabled() {

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

@@ -142,7 +142,7 @@
  }  // namespace download
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -131,7 +131,6 @@ source_set("browser") {
+@@ -132,7 +132,6 @@ source_set("browser") {
      "//components/performance_manager/scenario_api",
      "//components/power_monitor",
      "//components/services/filesystem:lib",

patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch

@@ -3,7 +3,7 @@
 
 --- a/chrome/browser/intranet_redirect_detector.cc
 +++ b/chrome/browser/intranet_redirect_detector.cc
-@@ -118,9 +118,7 @@ void IntranetRedirectDetector::FinishSle
+@@ -117,9 +117,7 @@ void IntranetRedirectDetector::FinishSle
    simple_loaders_.clear();
    resulting_origins_.clear();
  

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
-@@ -2089,7 +2089,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
+@@ -2099,7 +2099,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
  // crbug.com/988956.
  BASE_FEATURE(kPrefetchPrivacyChanges,
               "PrefetchPrivacyChanges",

patches/extra/ungoogled-chromium/enable-extra-locales.patch

@@ -2,7 +2,7 @@
 
 --- a/build/config/locales.gni
 +++ b/build/config/locales.gni
-@@ -166,12 +166,6 @@ _non_android_locales = [ "cy" ]
+@@ -186,12 +186,6 @@ _non_android_locales = [ "cy" ]
  
  # Setup |platform_pak_locales| for each platform.
  platform_pak_locales = all_chrome_locales

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
-@@ -562,11 +562,6 @@ int GetContentRestrictions(const Browser
+@@ -600,11 +600,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;
  }
-@@ -1822,8 +1817,7 @@ bool CanSavePage(const Browser* browser)
+@@ -1917,8 +1912,7 @@ bool CanSavePage(const Browser* browser)
        policy::DownloadRestriction::ALL_FILES) {
      return false;
    }

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

@@ -15,7 +15,7 @@
  
 --- a/chrome/browser/ui/views/tabs/tab_strip.cc
 +++ b/chrome/browser/ui/views/tabs/tab_strip.cc
-@@ -2208,8 +2208,6 @@ void TabStrip::NewTabButtonPressed(const
+@@ -2198,8 +2198,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 "
-@@ -2220,7 +2218,6 @@ void TabStrip::NewTabButtonPressed(const
+@@ -2210,7 +2208,6 @@ void TabStrip::NewTabButtonPressed(const
          if (!clipboard_text.empty()) {
            controller_->CreateNewTabWithLocation(clipboard_text);
          }

patches/extra/ungoogled-chromium/keep-expired-flags.patch

@@ -1,6 +1,6 @@
 --- a/components/webui/flags/flags_state.cc
 +++ b/components/webui/flags/flags_state.cc
-@@ -31,6 +31,7 @@
+@@ -30,6 +30,7 @@
  #include "base/strings/utf_string_conversions.h"
  #include "base/values.h"
  #include "build/build_config.h"
@@ -8,7 +8,7 @@
  #include "components/variations/field_trial_config/field_trial_util.h"
  #include "components/variations/variations_associated_data.h"
  #include "components/variations/variations_switches.h"
-@@ -686,14 +687,19 @@ void FlagsState::GetFlagFeatureEntries(
+@@ -685,14 +686,19 @@ void FlagsState::GetFlagFeatureEntries(
    int current_platform = GetCurrentPlatform();
  
    for (const FeatureEntry& entry : feature_entries_) {
@@ -29,7 +29,7 @@
  
      base::Value::List supported_platforms;
      AddOsStrings(entry.supported_platforms, &supported_platforms);
-@@ -1102,7 +1108,9 @@ bool FlagsState::IsSupportedFeature(cons
+@@ -1101,7 +1107,9 @@ bool FlagsState::IsSupportedFeature(cons
        continue;
      }
      if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry)) {

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

@@ -2,7 +2,7 @@
 #
 --- a/components/omnibox/common/omnibox_features.cc
 +++ b/components/omnibox/common/omnibox_features.cc
-@@ -320,7 +320,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor
+@@ -313,7 +313,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor
  // Enables additional site search providers for the Site search Starter Pack.
  BASE_FEATURE(kStarterPackExpansion,
               "StarterPackExpansion",

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

@@ -34,7 +34,7 @@
 
 --- a/chrome/app/settings_chromium_strings.grdp
 +++ b/chrome/app/settings_chromium_strings.grdp
-@@ -364,13 +364,13 @@
+@@ -369,13 +369,13 @@
  
    <!-- Performance Page -->
    <message name="IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_SETTING_DESCRIPTION" desc="Description for the memory saver mode setting">
@@ -53,7 +53,7 @@
    <!-- Languages Page -->
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -1216,7 +1216,7 @@
+@@ -965,7 +965,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.">
@@ -62,7 +62,7 @@
    </message>
    <message name="IDS_SETTINGS_PERFORMANCE_BATTERY_PAGE_TITLE" desc="Title of the power section in the performance settings page.">
      Power
-@@ -1240,7 +1240,7 @@
+@@ -989,7 +989,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.">
@@ -71,7 +71,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
-@@ -1252,7 +1252,7 @@
+@@ -1001,7 +1001,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.">
@@ -193,9 +193,9 @@
            <cr-link-row id="captions"
                class="hr"
                label="$i18n{captionsTitle}"
-@@ -105,11 +105,6 @@
-           </settings-toggle-button>
-         </template>
+@@ -102,11 +102,6 @@
+             sub-label="$i18n{toastAlertLevelDescription}">
+         </settings-toggle-button>
  </if>
 -        <cr-link-row class="hr" label="$i18n{moreFeaturesLink}"
 -            on-click="onMoreFeaturesLinkClick_" sub-label="$i18n{a11yWebStore}"
@@ -251,7 +251,7 @@
    <template is="dom-if"
 --- a/chrome/browser/resources/settings/basic_page/basic_page.html
 +++ b/chrome/browser/resources/settings/basic_page/basic_page.html
-@@ -74,7 +74,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. -->
@@ -270,7 +270,7 @@
  import '../privacy_page/privacy_page.js';
  import '../safety_hub/safety_hub_entry_point.js';
  import '../autofill_page/autofill_page.js';
-@@ -283,7 +282,6 @@ export class SettingsBasicPageElement ex
+@@ -265,7 +264,6 @@ export class SettingsBasicPageElement ex
        this.showPrivacyGuidePromo_ = false;
        return;
      }
@@ -299,12 +299,12 @@
 -        label="$i18n{urlKeyedAnonymizedDataCollection}"
 -        sub-label="$i18n{urlKeyedAnonymizedDataCollectionDesc}">
 -    </settings-toggle-button>
-     <template is="dom-if" if="[[shouldShowHistorySearchControl_(
-         showHistorySearchControl_, enableAiSettingsPageRefresh_)]]" restamp>
-       <cr-link-row id="historySearchRow"
+ <if expr="_google_chrome">
+ <if expr="not chromeos_ash">
+     <settings-toggle-button id="spellCheckControl"
 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts
 +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
-@@ -202,10 +202,6 @@ export class SettingsPersonalizationOpti
+@@ -179,10 +179,6 @@ export class SettingsPersonalizationOpti
          'chrome-signin-user-choice-info-change',
          this.setChromeSigninUserChoiceInfo_.bind(this));
      // </if>
@@ -317,7 +317,7 @@
    // <if expr="chromeos_ash">
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-@@ -53,15 +53,6 @@
+@@ -51,15 +51,6 @@
              label="$i18n{clearBrowsingData}"
              sub-label="$i18n{clearBrowsingDataDescription}"
              on-click="onClearBrowsingDataClick_"></cr-link-row>
@@ -349,9 +349,9 @@
      <template is="dom-if" if="[[!enableHttpsFirstModeNewSettings_]]" restamp>
        <settings-toggle-button id="httpsOnlyModeToggle"
            pref="{{prefs.generated.https_first_mode_enabled}}"
-@@ -229,9 +222,3 @@
-       </cr-link-row>
- </if>
+@@ -179,9 +172,3 @@
+         on-click="onManageCertificatesClick_" external>
+     </cr-link-row>
  
 -    <cr-link-row id="advanced-protection-program-link" class="hr"
 -        label="$i18n{advancedProtectionProgramTitle}"
@@ -485,7 +485,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
-@@ -959,40 +959,20 @@ void AddPerformanceStrings(content::WebU
+@@ -941,40 +941,20 @@ void AddPerformanceStrings(content::WebU
         IDS_SETTINGS_PERFORMANCE_TAB_HOVER_PREVIEW_CARD_LINK_SUBTITLE},
        {"performanceInterventionEnabledLabel",
         IDS_SETTINGS_PERFORMANCE_INTERVENTION_NOTIFICATION_ENABLED_LABEL},
@@ -535,7 +535,7 @@
  
    html_source->AddString(
        "tabDiscardTimerFiveMinutes",
-@@ -1038,11 +1018,6 @@ void AddPerformanceStrings(content::WebU
+@@ -1020,11 +1000,6 @@ void AddPerformanceStrings(content::WebU
            base::NumberToString16(
                performance_manager::user_tuning::BatterySaverModeManager::
                    kLowBatteryThresholdPercent)));
@@ -547,7 +547,7 @@
  
    html_source->AddString("discardRingTreatmentLearnMoreUrl",
                           chrome::kDiscardRingTreatmentLearnMoreUrl);
-@@ -3494,7 +3469,7 @@ void AddSiteSettingsStrings(content::Web
+@@ -3468,7 +3443,7 @@ void AddSiteSettingsStrings(content::Web
        base::FeatureList::IsEnabled(blink::features::kWebPrinting));
  
    html_source->AddBoolean("enableFederatedIdentityApiContentSetting",
@@ -558,21 +558,38 @@
    html_source->AddBoolean(
 --- a/chrome/browser/ui/webui/settings/settings_ui.cc
 +++ b/chrome/browser/ui/webui/settings/settings_ui.cc
-@@ -673,13 +673,7 @@ SettingsUI::SettingsUI(content::WebUI* w
-     auto* optimization_guide_service =
-         OptimizationGuideKeyedServiceFactory::GetForProfile(profile);
-     for (auto [key, name] : optimization_guide_features) {
--      const bool visible = optimization_guide_service &&
--                           optimization_guide_service->IsSettingVisible(key);
--      html_source->AddBoolean(name, visible);
--
--      // The main toggle is visible only if at least one of the sub toggles is
--      // visible.
--      is_any_ai_feature_enabled |= visible;
-+      html_source->AddBoolean(name, false);
-     }
+@@ -619,27 +619,20 @@ SettingsUI::SettingsUI(content::WebUI* w
+            autofill::AutofillAiAction::kListEntityInstancesInSettings)},
+   };
  
-     html_source->AddBoolean("showAdvancedFeaturesMainControl",
+-  const bool show_ai_settings_for_testing = base::FeatureList::IsEnabled(
+-      optimization_guide::features::kAiSettingsPageForceAvailable);
+-
+-  // Show the AI features section in the AI page if any of the AI features are
+-  // enabled.
+-  bool show_ai_features_section = show_ai_settings_for_testing;
+   for (auto [name, visible] : optimization_guide_features) {
+-    html_source->AddBoolean(name, visible || show_ai_settings_for_testing);
+-    show_ai_features_section |= visible;
++    html_source->AddBoolean(name, false);
+   }
+ 
+   // Within the AI subpage are separate sections for Glic and for all other AI
+   // features, the visibility of these are separately controlled but we want to
+   // show the subpage if any of the AI features or Glic are enabled.
+   html_source->AddBoolean("showAiPage",
+-                          show_glic_section || show_ai_features_section);
++                          false);
+   html_source->AddBoolean("showAiPageAiFeatureSection",
+-                          show_ai_features_section);
++                          false);
+   html_source->AddBoolean(
+       "enableAiSettingsInPrivacyGuide",
+-      optimization_guide::features::IsPrivacyGuideAiSettingsEnabled());
++      false);
+ 
+   // Delete Browsing Data
+   html_source->AddBoolean(
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
 @@ -852,7 +852,7 @@ BASE_FEATURE(kOnDeviceWebSpeech,
@@ -586,7 +603,7 @@
  // fails to load. Used to diagnose issues when rolling out new versions of the
 --- a/ui/views/controls/menu/menu_item_view.cc
 +++ b/ui/views/controls/menu/menu_item_view.cc
-@@ -869,7 +869,7 @@ void MenuItemView::SetAlerted() {
+@@ -875,7 +875,7 @@ void MenuItemView::SetAlerted() {
  }
  
  bool MenuItemView::ShouldShowNewBadge() const {

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
-@@ -257,9 +257,6 @@ declare_args() {
+@@ -255,9 +255,6 @@ declare_args() {
    force_enable_raw_ptr_exclusion = false
  }
  

patches/upstream-fixes/missing-dependencies.patch

@@ -10,7 +10,7 @@
  
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
-@@ -958,6 +958,7 @@ source_set("extensions") {
+@@ -971,6 +971,7 @@ source_set("extensions") {
        "//components/resources",
        "//components/safe_browsing:buildflags",
        "//components/safe_browsing/content/browser/web_ui:web_ui",
@@ -30,7 +30,7 @@
  #include "chrome/browser/ui/safety_hub/safety_hub_util.h"
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -545,6 +545,7 @@ static_library("url_constants") {
+@@ -549,6 +549,7 @@ static_library("url_constants") {
      "//components/optimization_guide/optimization_guide_internals/webui:url_constants",
      "//components/password_manager/content/common",
      "//components/safe_browsing/core/common",
@@ -60,7 +60,7 @@
    public_deps = [
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -112,6 +112,7 @@ source_set("browser") {
+@@ -113,6 +113,7 @@ source_set("browser") {
      "//components/filename_generation",
      "//components/fingerprinting_protection_filter/interventions/common:features",
      "//components/input",

pruning.list

@@ -143,6 +143,7 @@ chrome/updater/test/data/enterprise/win/google/test_gold.admx
 chrome/updater/test/data/selfupdate_test_key.der
 chrome/updater/test/data/signed.exe
 chrome/updater/test/data/signed.exe.gz
+chrome/updater/test/data/tag.exe
 chrome/updater/test/data/tagged_encode_utf8.exe
 chrome/updater/test/data/tagged_msi/GUH-ampersand-ending.msi
 chrome/updater/test/data/tagged_msi/GUH-bad-format.msi
@@ -158,6 +159,7 @@ chrome/updater/test/data/tagged_msi/GUH-multiple.msi
 chrome/updater/test/data/tagged_msi/GUH-size-greater-than-max.msi
 chrome/updater/test/data/tagged_msi/GUH-special-value.msi
 chrome/updater/test/data/tagged_msi/GUH-untagged.msi
+chrome/updater/test/data/test_certificate.pfx
 chrome/updater/test/data/test_installer/arm64/Testapp2Setup.exe
 chrome/updater/test/data/test_installer/x64/Testapp2Setup.exe
 chrome/updater/test/data/test_installer/x86/Testapp2Setup.exe
@@ -2384,6 +2386,8 @@ third_party/blink/renderer/bindings/core/v8/serialization/fuzz_corpus/v8-f6e6f76
 third_party/blink/renderer/bindings/core/v8/serialization/fuzz_corpus/v8-f76c5727-x86
 third_party/blink/renderer/bindings/core/v8/serialization/fuzz_corpus/v8-fa63a87d-x86
 third_party/blink/renderer/bindings/core/v8/serialization/fuzz_corpus/v8-fff15497-x86
+third_party/blink/renderer/core/testing/data/exported-names.wasm
+third_party/blink/renderer/core/testing/data/invalid-module.wasm
 third_party/blink/renderer/core/testing/data/test.webm
 third_party/blink/renderer/platform/text_codec_fuzzer_seed_corpus/0091b89571c844a754df4bdd133ad4d5b628e51d
 third_party/blink/renderer/platform/text_codec_fuzzer_seed_corpus/017fd5359998719d5fa3b3df5fc7b72fdb163936
@@ -7841,8 +7845,14 @@ third_party/dawn/third_party/dxc/test/tools/llvm-symbolizer/pdb/Inputs/test.pdb
 third_party/dawn/third_party/dxc/tools/clang/test/DXC/Inputs/bom-inc-utf16le.hlsli
 third_party/dawn/third_party/dxc/tools/clang/test/DXC/Inputs/bom-main-utf16le.hlsl
 third_party/dawn/third_party/dxc/tools/clang/test/LitDXILValidation/ser_hitobject_accessors_failing.ll
+third_party/dawn/third_party/dxc/tools/clang/test/LitDXILValidation/ser_hitobject_fromrayquery_failing.ll
+third_party/dawn/third_party/dxc/tools/clang/test/LitDXILValidation/ser_hitobject_invoke_failing.ll
 third_party/dawn/third_party/dxc/tools/clang/test/LitDXILValidation/ser_hitobject_make_failing.ll
+third_party/dawn/third_party/dxc/tools/clang/test/LitDXILValidation/ser_hitobject_trace_failing.ll
+third_party/dawn/third_party/dxc/tools/clang/test/LitDXILValidation/ser_hitobject_trace_invaliduav.ll
 third_party/dawn/third_party/dxc/tools/clang/test/LitDXILValidation/ser_maybereorder_failing.ll
+third_party/dawn/third_party/dxc/tools/clang/test/LitDXILValidation/ser_reorder_scope_sm68_failing.ll
+third_party/dawn/third_party/dxc/tools/clang/test/LitDXILValidation/ser_reordercoherent_invalid_sm.ll
 third_party/dawn/third_party/dxc/tools/clang/test/Misc/Inputs/serialized-diags-stable.dia
 third_party/dawn/third_party/dxc/tools/clang/test/Preprocessor/Inputs/headermap-rel/foo.hmap
 third_party/dawn/third_party/dxc/tools/clang/test/Preprocessor/Inputs/headermap-rel2/project-headers.hmap
@@ -8038,6 +8048,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/crux
 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/dupe-js-inline-maps.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/dupe-js.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/example-dot-com.json.gz
@@ -8076,6 +8087,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lcp-
 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
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/loading-dt1.json.gz
+third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/long-task-from-worker-thread.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/mainWasm_profile.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/many-redirects.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/many-requests.json.gz
@@ -8099,6 +8111,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/one-
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/over-20-invalidations-per-event.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/parser-blocking-after-paint.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/postmessage-initiators.json.gz
+third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/preconnect-advice.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/primary-page-frame.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/react-console-timestamp.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/react-hello-world.json.gz
@@ -8147,6 +8160,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-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-with-timings.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/web-dev.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/web-sockets.json.gz
 third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/wrong-main-frame-bug.json.gz
@@ -8512,7 +8526,6 @@ third_party/glslang/src/Test/remap.invalid-spirv-1.spv
 third_party/glslang/src/Test/remap.invalid-spirv-2.spv
 third_party/glslang/src/Test/remap.literal64.everything.spv
 third_party/glslang/src/Test/remap.literal64.none.spv
-third_party/google-closure-library/scripts/ci/CloseAdobeDialog.exe
 third_party/hunspell/fuzz/bdict_corpus/02a25363e79f11115132055fb880773b325f6aef
 third_party/hunspell/fuzz/bdict_corpus/0883e336027e9e21911a277a9d8fa4c1b9490edd
 third_party/hunspell/fuzz/bdict_corpus/0c70b309d63d09ac033b8c80abff19457c93772a
@@ -12649,6 +12662,12 @@ third_party/zlib/google/test/data/empty.zip
 third_party/zlib/google/test/data/evil.zip
 third_party/zlib/google/test/data/evil_via_absolute_file_name.zip
 third_party/zlib/google/test/data/evil_via_invalid_utf8.zip
+third_party/zlib/google/test/data/symlink_absolute_path.zip
+third_party/zlib/google/test/data/symlink_duplicate_link.zip
+third_party/zlib/google/test/data/symlink_evil_relative_path.zip
+third_party/zlib/google/test/data/symlink_follow_own_link.zip
+third_party/zlib/google/test/data/symlink_too_large.zip
+third_party/zlib/google/test/data/symlinks.zip
 third_party/zlib/google/test/data/test.zip
 third_party/zlib/google/test/data/test_encrypted.zip
 third_party/zlib/google/test/data/test_mismatch_size.zip

revision.txt

@@ -1 +1 @@
-5
+1