Update to Chromium 136.0.7103.49

Author: Ahrotahn

chromium_version.txt

@@ -1 +1 @@
-135.0.7049.114
+136.0.7103.49

domain_substitution.list

@@ -51,11 +51,16 @@ Subject: Disable fetching of all field trials
      /**
 --- a/components/variations/service/variations_service.cc
 +++ b/components/variations/service/variations_service.cc
-@@ -222,17 +222,7 @@ bool GetInstanceManipulations(const net:
+@@ -224,22 +224,7 @@ bool GetInstanceManipulations(const net:
  // Variations seed fetching is only enabled in official Chrome builds, if a URL
  // is specified on the command line, and for testing.
  bool IsFetchingEnabled() {
--#if !BUILDFLAG(GOOGLE_CHROME_BRANDING)
+-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+-          switches::kDisableVariationsSeedFetch)) {
+     return false;
+-  }
+-#else
 -  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
 -          switches::kVariationsServerURL) &&
 -      !g_should_fetch_for_testing) {
@@ -64,9 +69,8 @@ Subject: Disable fetching of all field trials
 -        << switches::kVariationsServerURL << " specified.";
 -    return false;
 -  }
--#endif
+-#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
 -  return true;
-+  return false;
  }
 
  // Returns the already downloaded first run seed, and clear the seed from the

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

@@ -1,6 +1,6 @@
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -3648,8 +3648,6 @@ static_library("browser") {
+@@ -3685,8 +3685,6 @@ static_library("browser") {
        "download/download_commands.cc",
        "download/download_crx_util.cc",
        "download/download_crx_util.h",
@@ -11,7 +11,7 @@
        "download/download_dir_util.cc",
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -5405,10 +5405,6 @@ ChromeContentBrowserClient::CreateThrott
+@@ -5467,10 +5467,6 @@ ChromeContentBrowserClient::CreateThrott
    throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
        handle, handle->GetWebContents()->GetBrowserContext()));
 
@@ -94,7 +94,7 @@
  ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
    std::optional<downloads::AcceptDanger::Params> params =
        downloads::AcceptDanger::Params::Create(args());
-@@ -1418,42 +1414,7 @@ void DownloadsAcceptDangerFunction::Prom
+@@ -1430,44 +1426,7 @@ void DownloadsAcceptDangerFunction::Prom
      return;
    }
    RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -105,8 +105,10 @@
 -      base::BindOnce(&DownloadsAcceptDangerFunction::DangerPromptCallback, this,
 -                     download_id));
 -  // DownloadDangerPrompt deletes itself
--  if (on_prompt_created_ && !on_prompt_created_->is_null())
+-  if (on_prompt_created_ && !on_prompt_created_->is_null()) {
 -    std::move(*on_prompt_created_).Run(prompt);
+-    on_prompt_created_ = nullptr;
+-  }
 -  // Function finishes in DangerPromptCallback().
 -}
 -
@@ -235,31 +237,31 @@
                             std::unique_ptr<std::string> response_body);
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
-@@ -8,6 +8,7 @@ import("//components/safe_browsing/build
+@@ -7,6 +7,7 @@ import("//components/safe_browsing/build
  import("//extensions/buildflags/buildflags.gni")
 
  static_library("safe_browsing") {
 +  if (false) {
    sources = [
      "chrome_controller_client.cc",
      "chrome_controller_client.h",
-@@ -75,6 +76,7 @@ static_library("safe_browsing") {
+@@ -73,6 +74,7 @@ static_library("safe_browsing") {
      "//mojo/public/cpp/system",
      "//services/preferences/public/cpp",
    ]
 +  }
 
-   if (is_android) {
-     deps += [
-@@ -553,6 +555,7 @@ static_library("advanced_protection") {
+   # Note: is_android is not equivalent to safe_browsing_mode == 2.
+   # Sources and dependencies added to this block must not depend on anything
+@@ -564,6 +566,7 @@ static_library("advanced_protection") {
  }
 
  source_set("metrics_collector") {
 +  if (false) {
    sources = [
      "safe_browsing_metrics_collector_factory.cc",
      "safe_browsing_metrics_collector_factory.h",
-@@ -572,6 +575,7 @@ source_set("metrics_collector") {
+@@ -583,6 +586,7 @@ source_set("metrics_collector") {
      "//components/safe_browsing/core/common:safe_browsing_prefs",
      "//content/public/browser",
    ]
@@ -312,24 +314,11 @@
  #include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h"
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
-@@ -113,7 +113,6 @@
+@@ -112,7 +112,6 @@
  #include "components/pdf/common/pdf_util.h"
  #include "components/permissions/features.h"
  #include "components/safe_browsing/buildflags.h"
 -#include "components/safe_browsing/content/renderer/threat_dom_details.h"
  #include "components/sampling_profiler/process_type.h"
  #include "components/sampling_profiler/thread_profiler.h"
  #include "components/security_interstitials/content/renderer/security_interstitial_page_controller_delegate_impl.h"
-@@ -484,12 +483,8 @@ void ChromeContentRendererClient::Render
-     thread->AddObserver(fingerprinting_protection_ruleset_dealer_.get());
-   }
- 
--  phishing_model_setter_ =
--      std::make_unique<safe_browsing::PhishingModelSetterImpl>();
--
-   thread->AddObserver(chrome_observer_.get());
-   thread->AddObserver(subresource_filter_ruleset_dealer_.get());
--  thread->AddObserver(phishing_model_setter_.get());
- 
-   blink::WebScriptController::RegisterExtension(
-       extensions_v8::LoadTimesExtension::Get());

patches/core/inox-patchset/0001-fix-building-without-safebrowsing.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
-@@ -888,93 +888,6 @@ std::tuple<GURL, std::string> AutofillCr
+@@ -890,93 +890,6 @@ std::tuple<GURL, std::string> AutofillCr
  }
 
  bool AutofillCrowdsourcingManager::StartRequest(FormRequestData request_data) {

patches/core/inox-patchset/0003-disable-autofill-download-manager.patch

@@ -10,7 +10,7 @@
        extension_misc::kAssessmentAssistantExtensionId,
 --- a/chrome/browser/extensions/component_loader.cc
 +++ b/chrome/browser/extensions/component_loader.cc
-@@ -410,11 +410,6 @@ void ComponentLoader::AddWebStoreApp() {
+@@ -407,11 +407,6 @@ void ComponentLoader::AddWebStoreApp() {
      return;
    }
  #endif
@@ -36,7 +36,7 @@
    {
 --- a/chrome/browser/extensions/webstore_installer.cc
 +++ b/chrome/browser/extensions/webstore_installer.cc
-@@ -485,20 +485,6 @@ void WebstoreInstaller::DownloadNextPend
+@@ -488,20 +488,6 @@ void WebstoreInstaller::DownloadNextPend
 
  void WebstoreInstaller::DownloadCrx(const extensions::ExtensionId& extension_id,
                                      InstallSource source) {
@@ -57,7 +57,7 @@
  }
 
  // http://crbug.com/165634
-@@ -644,25 +630,6 @@ void WebstoreInstaller::UpdateDownloadPr
+@@ -656,25 +642,6 @@ void WebstoreInstaller::UpdateDownloadPr
  void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
    DCHECK(!crx_installer_.get());

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

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

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

@@ -2,11 +2,11 @@
 
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -479,14 +479,6 @@ group("gn_all") {
-       deps += [ "//chromeos:chromeos_unittests" ]
+@@ -477,14 +477,6 @@ group("gn_all") {
+       ]
      }
 
--    if (is_chromeos_ash || is_mac || is_win) {
+-    if (is_chromeos || is_mac || is_win) {
 -      deps += [
 -        "//rlz:rlz_id",
 -        "//rlz:rlz_lib",
@@ -19,11 +19,11 @@
        deps += [
 --- a/rlz/buildflags/buildflags.gni
 +++ b/rlz/buildflags/buildflags.gni
-@@ -7,7 +7,7 @@ import("//build/config/chromeos/ui_mode.
+@@ -6,7 +6,7 @@ import("//build/config/chrome_build.gni"
 
  # Whether we are using the rlz library or not.  Platforms like Android send
  # rlz codes for searches but do not use the library.
--enable_rlz_support = is_win || is_apple || is_chromeos_ash
+-enable_rlz_support = is_win || is_apple || is_chromeos
 +enable_rlz_support = false
 
  declare_args() {

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

@@ -90,7 +90,7 @@ by default.
    // once per machine.
 --- a/chrome/browser/extensions/install_signer.cc
 +++ b/chrome/browser/extensions/install_signer.cc
-@@ -64,7 +64,7 @@ const int kSignatureFormatVersion = 2;
+@@ -63,7 +63,7 @@ const int kSignatureFormatVersion = 2;
  const size_t kSaltBytes = 32;
 
  const char kBackendUrl[] =
@@ -405,7 +405,7 @@ by default.
    GURL url(base::WideToUTF16(args[0]));
 --- a/extensions/common/extension_urls.cc
 +++ b/extensions/common/extension_urls.cc
-@@ -39,10 +39,10 @@ const GURL* g_item_snippet_url_for_test_
+@@ -38,11 +38,11 @@ const GURL* g_item_snippet_url_for_test_
 
  }  // namespace
 
@@ -415,7 +415,9 @@ by default.
 +const char kNewChromeWebstoreBaseURL[] = "trk:08:https://chromewebstore.google.com/";
  const char kChromeWebstoreUpdateURL[] =
 -    "https://clients2.google.com/service/update2/crx";
+-const char kChromeWebstoreApiURL[] = "https://chromewebstore.googleapis.com/";
 +    "trk:05:https://clients2.google.com/service/update2/crx";
++const char kChromeWebstoreApiURL[] = "trk:07:https://chromewebstore.googleapis.com/";
 
  const char kAppMenuUtmSource[] = "ext_app_menu";
  const char kExtensionsMenuUtmSource[] = "ext_extensions_menu";
@@ -683,7 +685,7 @@ by default.
 
 --- a/rlz/lib/lib_values.cc
 +++ b/rlz/lib/lib_values.cc
-@@ -40,7 +40,7 @@ const char kSetDccResponseVariable[] = "
+@@ -45,7 +45,7 @@ const char kSetDccResponseVariable[] = "
  //
 
  const char kFinancialPingPath[] = "/tools/pso/ping";

patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.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
-@@ -382,7 +382,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
+@@ -378,7 +378,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
  }
 
  void SafeBrowsingServiceImpl::RegisterAllDelayedAnalysis() {

patches/core/iridium-browser/safe_browsing-disable-incident-reporting.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
-@@ -316,6 +316,10 @@ void ClientSideDetectionService::StartCl
+@@ -324,6 +324,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);
 
-@@ -398,6 +402,7 @@ void ClientSideDetectionService::StartCl
+@@ -406,6 +410,7 @@ void ClientSideDetectionService::StartCl
        base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent,
                       base::Unretained(WebUIInfoSingleton::GetInstance()),
                       std::move(request), access_token));

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

@@ -8,7 +8,7 @@
 # Dev tools attempts to download css data
 --- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
 +++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
-@@ -318,6 +318,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
+@@ -307,6 +307,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
  OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default;
 
  void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) {
@@ -48,23 +48,25 @@
 
 --- a/components/affiliations/core/browser/hash_affiliation_fetcher.cc
 +++ b/components/affiliations/core/browser/hash_affiliation_fetcher.cc
-@@ -127,6 +127,9 @@ AffiliationFetcherDelegate* HashAffiliat
+@@ -137,6 +137,10 @@ AffiliationFetcherDelegate* HashAffiliat
  }
 
  void HashAffiliationFetcher::StartRequest(
-+    const std::vector<FacetURI>& a, RequestInfo b) {}
++    const std::vector<FacetURI>& a, RequestInfo b,
++      base::OnceCallback<void(FetchResult)> c) {}
 +[[maybe_unused]]
 +void HashAffiliationFetcher::DeadStartRequest(
      const std::vector<FacetURI>& facet_uris,
-     RequestInfo request_info) {
-   requested_facet_uris_ = facet_uris;
+     RequestInfo request_info,
+     base::OnceCallback<void(FetchResult)> result_callback) {
 --- a/components/affiliations/core/browser/hash_affiliation_fetcher.h
 +++ b/components/affiliations/core/browser/hash_affiliation_fetcher.h
-@@ -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);
+@@ -40,6 +40,8 @@ class HashAffiliationFetcher : public Af
+       const std::vector<FacetURI>& facet_uris,
+       RequestInfo request_info,
+       base::OnceCallback<void(FetchResult)> result_callback) override;
++  void DeadStartRequest(const std::vector<FacetURI>& a, RequestInfo b,
++      base::OnceCallback<void(FetchResult)> c);
    const std::vector<FacetURI>& GetRequestedFacetURIs() const override;
 
    // Builds the URL for the Affiliation API's lookup method.
@@ -80,7 +82,7 @@
    if (state_ == REQUESTING) {
 --- a/components/update_client/update_checker.cc
 +++ b/components/update_client/update_checker.cc
-@@ -103,6 +103,7 @@ void UpdateCheckerImpl::CheckForUpdates(
+@@ -104,6 +104,7 @@ void UpdateCheckerImpl::CheckForUpdates(
      scoped_refptr<UpdateContext> context,
      const base::flat_map<std::string, std::string>& additional_attributes,
      UpdateCheckCallback update_check_callback) {

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

@@ -70,10 +70,10 @@
    // other origins, so we should not treat them as web safe. Remove callers of
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1073,6 +1073,8 @@ component("net") {
-     "url_request/referrer_policy.h",
+@@ -1081,6 +1081,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",
 +    "url_request/trk_protocol_handler.cc",
 +    "url_request/trk_protocol_handler.h",
      "url_request/url_request.cc",
@@ -150,15 +150,15 @@
  #include "base/strings/utf_string_conversions.h"
  #include "base/synchronization/lock.h"
  #include "base/task/single_thread_task_runner.h"
-@@ -54,6 +55,7 @@
+@@ -55,6 +56,7 @@
  #include "net/url_request/url_request_redirect_job.h"
  #include "url/gurl.h"
  #include "url/origin.h"
 +#include "url/url_constants.h"
 
  namespace net {
 
-@@ -642,6 +644,12 @@ URLRequest::URLRequest(base::PassKey<URL
+@@ -653,6 +655,12 @@ URLRequest::URLRequest(base::PassKey<URL
    // Sanity check out environment.
    DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());
 
@@ -173,15 +173,15 @@
      return NetLogURLRequestConstructorParams(url, priority_,
 --- a/net/url_request/url_request_context_builder.cc
 +++ b/net/url_request/url_request_context_builder.cc
-@@ -49,6 +49,7 @@
+@@ -50,6 +50,7 @@
  #include "net/socket/network_binding_client_socket_factory.h"
  #include "net/ssl/ssl_config_service_defaults.h"
  #include "net/url_request/static_http_user_agent_settings.h"
 +#include "net/url_request/trk_protocol_handler.h"
  #include "net/url_request/url_request_context.h"
  #include "net/url_request/url_request_job_factory.h"
  #include "url/url_constants.h"
-@@ -596,6 +597,9 @@ std::unique_ptr<URLRequestContext> URLRe
+@@ -597,6 +598,9 @@ std::unique_ptr<URLRequestContext> URLRe
    }
    protocol_handlers_.clear();
 

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

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -2708,24 +2708,6 @@ void ChromeContentBrowserClient::AppendE
+@@ -2714,24 +2714,6 @@ void ChromeContentBrowserClient::AppendE
      command_line->AppendSwitchASCII(switches::kMetricsClientID,
                                      client_info->client_id);
    }
@@ -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
-@@ -321,6 +321,11 @@ GWP_ASAN_EXPORT std::optional<AllocatorS
+@@ -323,6 +323,11 @@ GWP_ASAN_EXPORT std::optional<AllocatorS
 
  // Exported for testing.
  GWP_ASAN_EXPORT std::optional<AllocatorSettings> GetAllocatorSettings(

patches/core/ungoogled-chromium/disable-crash-reporter.patch

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