Update to Chromium 125.0.6422.60

chromium_version.txt

@@ -1 +1 @@
-124.0.6367.207
+125.0.6422.60

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
-@@ -50,7 +50,7 @@ public abstract class ChromeFeatureList
+@@ -51,7 +51,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
      }
 
      /**
-@@ -62,8 +62,7 @@ public abstract class ChromeFeatureList
+@@ -63,8 +63,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
      }
 
      /**
-@@ -75,8 +74,7 @@ public abstract class ChromeFeatureList
+@@ -76,8 +75,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
      }
 
      /**
-@@ -88,8 +86,7 @@ public abstract class ChromeFeatureList
+@@ -89,8 +87,7 @@ public abstract class ChromeFeatureList
       */
      public static double getFieldTrialParamByFeatureAsDouble(
              String featureName, String paramName, double defaultValue) {

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

@@ -1,6 +1,6 @@
 --- a/net/dns/host_resolver_manager.cc
 +++ b/net/dns/host_resolver_manager.cc
-@@ -150,10 +150,10 @@ const size_t kMaxHostLength = 4096;
+@@ -151,10 +151,10 @@ const size_t kMaxHostLength = 4096;
  // cached.
  const int kIPv6ProbePeriodMs = 1000;
 
@@ -13,4 +13,4 @@
 +                                     0x00, 0x00, 0x00, 0x01};
 
  // True if |hostname| ends with either ".local" or ".local.".
- bool ResemblesMulticastDNSName(base::StringPiece hostname) {
+ bool ResemblesMulticastDNSName(std::string_view hostname) {

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

@@ -2,7 +2,7 @@
 
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -459,14 +459,6 @@ group("gn_all") {
+@@ -460,14 +460,6 @@ group("gn_all") {
        deps += [ "//chromeos:chromeos_unittests" ]
      }
 

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
-@@ -523,7 +523,7 @@ void WebRtcLogUploader::UploadCompressed
+@@ -525,7 +525,7 @@ void WebRtcLogUploader::UploadCompressed
            }
          })");
 
@@ -178,7 +178,7 @@ by default.
                base::ToLowerASCII(bdict_file));
 --- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
 +++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
-@@ -42,7 +42,7 @@ const char* kUpdateBrowserRedirectUrl =
+@@ -44,7 +44,7 @@ const char* kUpdateBrowserRedirectUrl =
  #else
      // The URL to be used to re-install Chrome when auto-update failed for
      // too long.
@@ -227,7 +227,7 @@ by default.
 
 --- a/chrome/installer/setup/google_chrome_behaviors.cc
 +++ b/chrome/installer/setup/google_chrome_behaviors.cc
-@@ -37,7 +37,7 @@ namespace installer {
+@@ -36,7 +36,7 @@ namespace installer {
  namespace {
 
  constexpr std::wstring_view kUninstallSurveyUrl(
@@ -366,7 +366,7 @@ by default.
 +const char kSecurityOrigin[] = "trk:220:https://translate.googleapis.com/";
 
  // The feature is explicitly disabled on Webview and Weblayer.
- // TODO(crbug.com/1292622): Enable the feature on Webview.
+ // TODO(crbug.com/40819484): Enable the feature on Webview.
 --- a/components/variations/variations_url_constants.cc
 +++ b/components/variations/variations_url_constants.cc
 @@ -8,7 +8,7 @@ namespace variations {
@@ -380,7 +380,7 @@ by default.
      "http://clientservices.googleapis.com/chrome-variations/seed";
 --- a/content/browser/speech/network_speech_recognition_engine_impl.cc
 +++ b/content/browser/speech/network_speech_recognition_engine_impl.cc
-@@ -34,7 +34,7 @@ namespace content {
+@@ -35,7 +35,7 @@ namespace content {
  namespace {
 
  const char kWebServiceBaseUrl[] =
@@ -416,7 +416,7 @@ by default.
    GURL url(base::WideToUTF16(args[0]));
 --- a/extensions/common/extension_urls.cc
 +++ b/extensions/common/extension_urls.cc
-@@ -30,10 +30,10 @@ bool IsSourceFromAnExtension(const std::
+@@ -32,10 +32,10 @@ bool IsSourceFromAnExtension(const std::
 
  namespace extension_urls {
 

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

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

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

@@ -13,7 +13,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
 
 --- a/components/safe_browsing/content/browser/client_side_detection_service.cc
 +++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
-@@ -245,6 +245,10 @@ void ClientSideDetectionService::StartCl
+@@ -249,6 +249,10 @@ void ClientSideDetectionService::StartCl
      return;
    }
 
@@ -24,7 +24,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
    std::string request_data;
    request->SerializeToString(&request_data);
 
-@@ -326,6 +330,7 @@ void ClientSideDetectionService::StartCl
+@@ -330,6 +334,7 @@ void ClientSideDetectionService::StartCl
        base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent,
                       base::Unretained(WebUIInfoSingleton::GetInstance()),
                       std::move(request), access_token));

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

@@ -48,8 +48,8 @@
 
 --- a/components/affiliations/core/browser/hash_affiliation_fetcher.cc
 +++ b/components/affiliations/core/browser/hash_affiliation_fetcher.cc
-@@ -53,6 +53,9 @@ HashAffiliationFetcher::HashAffiliationF
- HashAffiliationFetcher::~HashAffiliationFetcher() = default;
+@@ -121,6 +121,9 @@ AffiliationFetcherDelegate* HashAffiliat
+ }
 
  void HashAffiliationFetcher::StartRequest(
 +    const std::vector<FacetURI>& a, RequestInfo b) {}
@@ -60,14 +60,14 @@
    requested_facet_uris_ = facet_uris;
 --- a/components/affiliations/core/browser/hash_affiliation_fetcher.h
 +++ b/components/affiliations/core/browser/hash_affiliation_fetcher.h
-@@ -22,6 +22,7 @@ class HashAffiliationFetcher : public Af
-
+@@ -37,6 +37,7 @@ class HashAffiliationFetcher : public Af
+   // AffiliationFetcherInterface
    void StartRequest(const std::vector<FacetURI>& facet_uris,
                      RequestInfo request_info) override;
 +  void DeadStartRequest(const std::vector<FacetURI>& a, RequestInfo b);
-
-   // AffiliationFetcherInterface
    const std::vector<FacetURI>& GetRequestedFacetURIs() const override;
+
+   // Builds the URL for the Affiliation API's lookup method.
 --- a/components/assist_ranker/ranker_url_fetcher.cc
 +++ b/components/assist_ranker/ranker_url_fetcher.cc
 @@ -31,6 +31,7 @@ bool RankerURLFetcher::Request(

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

@@ -3,7 +3,7 @@
 
 --- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
-@@ -58,6 +58,7 @@ ChromeAutocompleteSchemeClassifier::GetI
+@@ -56,6 +56,7 @@ ChromeAutocompleteSchemeClassifier::GetI
    if (base::IsStringASCII(scheme) &&
        (ProfileIOData::IsHandledProtocol(scheme) ||
         base::EqualsCaseInsensitiveASCII(scheme, content::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
-@@ -836,6 +836,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
+@@ -825,6 +825,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
-@@ -988,6 +988,8 @@ component("net") {
+@@ -996,6 +996,8 @@ component("net") {
      "url_request/referrer_policy.h",
      "url_request/static_http_user_agent_settings.cc",
      "url_request/static_http_user_agent_settings.h",
@@ -181,7 +181,7 @@
  #include "net/url_request/url_request_context.h"
  #include "net/url_request/url_request_job_factory.h"
  #include "url/url_constants.h"
-@@ -561,6 +562,9 @@ std::unique_ptr<URLRequestContext> URLRe
+@@ -577,6 +578,9 @@ std::unique_ptr<URLRequestContext> URLRe
    }
    protocol_handlers_.clear();
 
@@ -191,17 +191,6 @@
    context->set_job_factory(std::move(job_factory));
 
    if (cookie_deprecation_label_.has_value()) {
---- a/url/url_constants.cc
-+++ b/url/url_constants.cc
-@@ -42,6 +42,8 @@ const char kMailToScheme[] = "mailto";
- const char16_t kMailToScheme16[] = u"mailto";
- const char kTelScheme[] = "tel";
- const char16_t kTelScheme16[] = u"tel";
-+const char kTraceScheme[] = "trk";
-+const char16_t kTraceScheme16[] = u"trk";
- const char kUrnScheme[] = "urn";
- const char16_t kUrnScheme16[] = u"urn";
- const char kUuidInPackageScheme[] = "uuid-in-package";
 --- a/url/url_constants.h
 +++ b/url/url_constants.h
 @@ -45,6 +45,8 @@ inline constexpr char kMailToScheme[] =

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
-@@ -2514,24 +2514,6 @@ void ChromeContentBrowserClient::AppendE
+@@ -2548,24 +2548,6 @@ void ChromeContentBrowserClient::AppendE
      command_line->AppendSwitchASCII(switches::kMetricsClientID,
                                      client_info->client_id);
    }
@@ -44,18 +44,18 @@
                              const base::FilePath& exe_path,
 --- a/components/gwp_asan/client/gwp_asan.cc
 +++ b/components/gwp_asan/client/gwp_asan.cc
-@@ -239,6 +239,11 @@ bool IsMutuallyExclusiveFeatureAllowed(c
+@@ -241,6 +241,11 @@ bool IsMutuallyExclusiveFeatureAllowed(c
 
  // Exported for testing.
  GWP_ASAN_EXPORT std::optional<AllocatorSettings> GetAllocatorSettings(
-+    const base::Feature& a, bool b, const char* c) {
++    const base::Feature& a, bool b) {
 +  return std::nullopt;
 +}
 +[[maybe_unused]]
 +std::optional<AllocatorSettings> DeadGetAllocatorSettings(
      const base::Feature& feature,
-     bool boost_sampling,
-     const char* process_type) {
+     bool boost_sampling) {
+   if (!base::FeatureList::IsEnabled(feature))
 --- a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
 +++ b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
 @@ -748,8 +748,6 @@ void CrashpadClient::CrashWithoutDump(co

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

@@ -521,7 +521,7 @@
 -  const base::StringPiece hostname = url.host_piece();
 -  if (registry_length == 0 || registry_length == std::string::npos ||
 -      registry_length >= hostname.length()) {
--    return std::optional<std::string>();
+-    return std::nullopt;
 -  }
 -
 -  // Removes the tld and the preceding dot.
@@ -533,12 +533,11 @@
 -
 -  if (!base::EndsWith(hostname_minus_registry, ".google",
 -                      base::CompareCase::INSENSITIVE_ASCII)) {
--    return std::optional<std::string>();
+     return std::nullopt;
 -  }
 -
 -  return std::string(hostname_minus_registry.substr(
 -      0, hostname_minus_registry.length() - strlen(".google")));
-+  return std::optional<std::string>();
  }
 
  bool IsGoogleHostname(const GURL& url) {

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

@@ -7,15 +7,15 @@
 
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -369,7 +369,6 @@ if (!is_android && !is_mac) {
+@@ -372,7 +372,6 @@ if (!is_android && !is_mac) {
        }
 
        data_deps += [
 -        "//chrome/browser/resources/media/mei_preload:component",
          "//third_party/widevine/cdm",
        ]
        if (invoker.collect_inputs_only) {
-@@ -1215,7 +1214,6 @@ if (is_win) {
+@@ -1218,7 +1217,6 @@ if (is_win) {
        ":optimization_guide_library",
        ":swiftshader_library",
        ":widevine_cdm_library",

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

@@ -11,7 +11,7 @@
               "AttributionReportingTriggerContextId",
 --- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
-@@ -123,7 +123,7 @@ std::set<browsing_topics::Topic> GetTopi
+@@ -125,7 +125,7 @@ std::set<browsing_topics::Topic> GetTopi
 
  // static
  bool PrivacySandboxSettingsImpl::IsAllowed(Status status) {
@@ -20,7 +20,7 @@
  }
 
  // static
-@@ -744,7 +744,7 @@ void PrivacySandboxSettingsImpl::SetTopi
+@@ -757,7 +757,7 @@ void PrivacySandboxSettingsImpl::SetTopi
  }
 
  bool PrivacySandboxSettingsImpl::IsPrivacySandboxRestricted() const {
@@ -29,7 +29,7 @@
  }
 
  bool PrivacySandboxSettingsImpl::IsPrivacySandboxCurrentlyUnrestricted() const {
-@@ -813,11 +813,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
+@@ -826,11 +826,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
      return Status::kIncognitoProfile;
    }
 

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
-@@ -175,31 +175,13 @@ void WebRtcLogUploader::OnLoggingStopped
+@@ -176,31 +176,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,
-@@ -216,28 +198,7 @@ void WebRtcLogUploader::PrepareMultipart
+@@ -217,28 +199,7 @@ void WebRtcLogUploader::PrepareMultipart
    DCHECK(!compressed_log.empty());
    DCHECK(meta_data.get());
 
@@ -65,7 +65,7 @@
  }
 
  void WebRtcLogUploader::UploadStoredLog(
-@@ -303,48 +264,6 @@ void WebRtcLogUploader::LoggingStoppedDo
+@@ -305,48 +266,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
-@@ -100,7 +100,7 @@ void RegisterBrowserUserPrefs(user_prefs
+@@ -107,7 +107,7 @@ void RegisterBrowserUserPrefs(user_prefs
    registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
    registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
    registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);

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

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
 +++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
-@@ -707,12 +707,6 @@ std::vector<url::Origin> ChromeContentBr
+@@ -720,12 +720,6 @@ std::vector<url::Origin> ChromeContentBr
      GetOriginsRequiringDedicatedProcess() {
    std::vector<url::Origin> list;
 

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

@@ -1,6 +1,6 @@
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -363,12 +363,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm
+@@ -361,12 +361,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm
  // Enable DNS over HTTPS (DoH).
  BASE_FEATURE(kDnsOverHttps,
               "DnsOverHttps",
@@ -15,7 +15,7 @@
  // Set whether fallback to insecure DNS is allowed by default. This setting may
 --- a/net/dns/public/doh_provider_entry.cc
 +++ b/net/dns/public/doh_provider_entry.cc
-@@ -165,30 +165,6 @@ const DohProviderEntry::List& DohProvide
+@@ -166,30 +166,6 @@ const DohProviderEntry::List& DohProvide
            /*display_globally=*/false, /*display_countries=*/{"EE", "DE"},
            LoggingLevel::kNormal),
        new DohProviderEntry(