Update to Chromium 123.0.6312.58

chromium_version.txt

@@ -1 +1 @@
-122.0.6261.128
+123.0.6312.58

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

@@ -51,7 +51,7 @@ Subject: Disable fetching of all field trials
      /**
 --- a/components/variations/service/variations_service.cc
 +++ b/components/variations/service/variations_service.cc
-@@ -223,17 +223,7 @@ bool GetInstanceManipulations(const net:
+@@ -224,17 +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() {

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

@@ -1,14 +1,14 @@
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2352,7 +2352,6 @@ static_library("browser") {
+@@ -2367,7 +2367,6 @@ static_library("browser") {
      "//components/reporting/util:task_runner_context",
      "//components/resources",
      "//components/safe_browsing/content/browser",
 -    "//components/safe_browsing/content/browser:client_side_detection",
      "//components/safe_browsing/content/browser:safe_browsing_service",
      "//components/safe_browsing/content/browser/password_protection",
      "//components/safe_browsing/content/browser/web_ui",
-@@ -3744,8 +3743,6 @@ static_library("browser") {
+@@ -3763,8 +3762,6 @@ static_library("browser") {
        "download/download_commands.h",
        "download/download_crx_util.cc",
        "download/download_crx_util.h",
@@ -42,24 +42,24 @@
    virtual subresource_filter::RulesetService*
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -72,7 +72,6 @@
+@@ -73,7 +73,6 @@
  #include "chrome/browser/printing/print_job_manager.h"
  #include "chrome/browser/profiles/profile_manager.h"
  #include "chrome/browser/resource_coordinator/resource_coordinator_parts.h"
 -#include "chrome/browser/safe_browsing/safe_browsing_service.h"
  #include "chrome/browser/shell_integration.h"
  #include "chrome/browser/site_isolation/prefs_observer.h"
  #include "chrome/browser/ssl/secure_origin_prefs_observer.h"
-@@ -439,8 +438,6 @@ void BrowserProcessImpl::StartTearDown()
+@@ -446,8 +445,6 @@ void BrowserProcessImpl::StartTearDown()
  #endif
    metrics_services_manager_.reset();
    intranet_redirect_detector_.reset();
 -  if (safe_browsing_service_.get())
 -    safe_browsing_service()->ShutDown();
    network_time_tracker_.reset();
 
- #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -1097,14 +1094,6 @@ StatusTray* BrowserProcessImpl::status_t
+ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
+@@ -1118,14 +1115,6 @@ StatusTray* BrowserProcessImpl::status_t
    return status_tray_.get();
  }
 
@@ -74,7 +74,7 @@
  subresource_filter::RulesetService*
  BrowserProcessImpl::subresource_filter_ruleset_service() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -1370,26 +1359,6 @@ void BrowserProcessImpl::CreateBackgroun
+@@ -1391,26 +1380,6 @@ void BrowserProcessImpl::CreateBackgroun
  #endif
  }
 
@@ -123,15 +123,15 @@
        subresource_filter_ruleset_service_;
 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-@@ -65,7 +65,6 @@
+@@ -66,7 +66,6 @@
  #include "chrome/browser/profiles/keep_alive/scoped_profile_keep_alive.h"
  #include "chrome/browser/profiles/profile.h"
  #include "chrome/browser/reading_list/reading_list_model_factory.h"
 -#include "chrome/browser/safe_browsing/safe_browsing_service.h"
  #include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h"
  #include "chrome/browser/search_engines/template_url_service_factory.h"
  #include "chrome/browser/share/share_history.h"
-@@ -635,10 +634,6 @@ void ChromeBrowsingDataRemoverDelegate::
+@@ -637,10 +636,6 @@ void ChromeBrowsingDataRemoverDelegate::
      base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
 
      network::mojom::NetworkContext* safe_browsing_context = nullptr;
@@ -144,7 +144,7 @@
      browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_,
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -5019,10 +5019,6 @@ ChromeContentBrowserClient::CreateThrott
+@@ -5047,10 +5047,6 @@ ChromeContentBrowserClient::CreateThrott
    throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
        handle, handle->GetWebContents()->GetBrowserContext()));
 
@@ -155,7 +155,7 @@
    throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
        handle,
        base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
-@@ -5070,16 +5066,6 @@ ChromeContentBrowserClient::CreateThrott
+@@ -5098,16 +5094,6 @@ ChromeContentBrowserClient::CreateThrott
        &throttles);
  #endif
 
@@ -172,7 +172,7 @@
    if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) {
      throttles.push_back(
          std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
-@@ -5344,8 +5330,6 @@ bool ChromeContentBrowserClient::IsPlugi
+@@ -5400,8 +5386,6 @@ bool ChromeContentBrowserClient::IsPlugi
  void ChromeContentBrowserClient::InitOnUIThread() {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
@@ -207,7 +207,7 @@
  }  // namespace
 --- a/chrome/browser/download/chrome_download_manager_delegate.cc
 +++ b/chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -498,13 +498,6 @@ void ChromeDownloadManagerDelegate::SetD
+@@ -499,13 +499,6 @@ void ChromeDownloadManagerDelegate::SetD
 
    download_manager_ = dm;
 
@@ -221,7 +221,7 @@
    if (download_manager_) {
      download_manager_->AddObserver(this);
    }
-@@ -898,17 +891,6 @@ void ChromeDownloadManagerDelegate::Choo
+@@ -911,17 +904,6 @@ void ChromeDownloadManagerDelegate::Choo
  void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
      base::FilePath* filename,
      const GURL& source_url) {
@@ -364,7 +364,7 @@
  #include "chrome/browser/download/download_file_icon_extractor.h"
  #include "chrome/browser/download/download_open_prompt.h"
  #include "chrome/browser/download/download_prefs.h"
-@@ -1377,9 +1376,6 @@ DownloadsAcceptDangerFunction::Downloads
+@@ -1378,9 +1377,6 @@ DownloadsAcceptDangerFunction::Downloads
 
  DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
 
@@ -374,7 +374,7 @@
  ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
    std::optional<downloads::AcceptDanger::Params> params =
        downloads::AcceptDanger::Params::Create(args());
-@@ -1417,42 +1413,7 @@ void DownloadsAcceptDangerFunction::Prom
+@@ -1418,42 +1414,7 @@ void DownloadsAcceptDangerFunction::Prom
      return;
    }
    RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -655,7 +655,7 @@
  #include "chrome/browser/sessions/exit_type_service.h"
  #include "chrome/browser/sharing/sharing_service_factory.h"
  #include "chrome/browser/signin/identity_manager_factory.h"
-@@ -633,17 +632,6 @@ void ProfileImpl::LoadPrefsForNormalStar
+@@ -639,17 +638,6 @@ void ProfileImpl::LoadPrefsForNormalStar
 
    mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
        pref_validation_delegate;
@@ -703,15 +703,15 @@
 
    if (is_android) {
      deps += [ "//chrome/browser/password_manager/android:utils" ]
-@@ -499,6 +501,7 @@ static_library("advanced_protection") {
+@@ -501,6 +503,7 @@ static_library("advanced_protection") {
  }
 
  source_set("metrics_collector") {
 +  if (false) {
    sources = [
      "safe_browsing_metrics_collector_factory.cc",
      "safe_browsing_metrics_collector_factory.h",
-@@ -518,6 +521,7 @@ source_set("metrics_collector") {
+@@ -520,6 +523,7 @@ source_set("metrics_collector") {
      "//components/safe_browsing/core/common:safe_browsing_prefs",
      "//content/public/browser",
    ]
@@ -816,7 +816,7 @@
 
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -5212,7 +5212,6 @@ static_library("ui") {
+@@ -5195,7 +5195,6 @@ static_library("ui") {
        "views/download/bubble/download_dialog_view.h",
        "views/download/bubble/download_toolbar_button_view.cc",
        "views/download/bubble/download_toolbar_button_view.h",
@@ -826,7 +826,7 @@
        "views/download/download_item_view.cc",
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -479,22 +479,6 @@ void TabHelpers::AttachTabHelpers(WebCon
+@@ -483,22 +483,6 @@ void TabHelpers::AttachTabHelpers(WebCon
    //     See https://crbug.com/910288.
    resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
        web_contents);
@@ -968,7 +968,7 @@
    bool IsDeletingHistoryAllowed();
 --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
 +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
-@@ -280,66 +280,6 @@ CreateHttpsOnlyModePage(content::WebCont
+@@ -280,68 +280,6 @@ CreateHttpsOnlyModePage(content::WebCont
        security_interstitials::https_only_mode::HttpInterstitialState{});
  }
 
@@ -1028,14 +1028,16 @@
 -  auto* ui_manager =
 -      g_browser_process->safe_browsing_service()->ui_manager().get();
 -  return base::WrapUnique<security_interstitials::SecurityInterstitialPage>(
--      ui_manager->CreateBlockingPage(web_contents, main_frame_url, {resource},
--                                     /*forward_extension_event=*/false));
+-      ui_manager->CreateBlockingPage(
+-          web_contents, main_frame_url, {resource},
+-          /*forward_extension_event=*/false,
+-          /*blocked_page_shown_timestamp=*/absl::nullopt));
 -}
 -
  std::unique_ptr<EnterpriseBlockPage> CreateEnterpriseBlockPage(
      content::WebContents* web_contents) {
    const GURL kRequestUrl("https://enterprise-block.example.net");
-@@ -349,94 +289,6 @@ std::unique_ptr<EnterpriseBlockPage> Cre
+@@ -352,94 +290,6 @@ std::unique_ptr<EnterpriseBlockPage> Cre
                                                          kRequestUrl));
  }
 
@@ -1130,7 +1132,7 @@
  #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
  std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
      content::WebContents* web_contents) {
-@@ -543,12 +395,8 @@ void InterstitialHTMLSource::StartDataRe
+@@ -546,12 +396,8 @@ void InterstitialHTMLSource::StartDataRe
      interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
    } else if (path_without_query == "/blocked-interception") {
      interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
@@ -1143,7 +1145,7 @@
    } else if (path_without_query == "/clock") {
      interstitial_delegate = CreateBadClockBlockingPage(web_contents);
    } else if (path_without_query == "/lookalike") {
-@@ -563,16 +411,12 @@ void InterstitialHTMLSource::StartDataRe
+@@ -566,16 +412,12 @@ void InterstitialHTMLSource::StartDataRe
      interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
    }
 
@@ -1166,14 +1168,14 @@
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
 @@ -102,7 +102,6 @@
- #include "components/password_manager/core/common/password_manager_features.h"
+ #include "components/pdf/common/constants.h"
  #include "components/permissions/features.h"
  #include "components/safe_browsing/buildflags.h"
 -#include "components/safe_browsing/content/renderer/threat_dom_details.h"
  #include "components/spellcheck/spellcheck_buildflags.h"
  #include "components/subresource_filter/content/renderer/subresource_filter_agent.h"
  #include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h"
-@@ -453,12 +452,8 @@ void ChromeContentRendererClient::Render
+@@ -458,12 +457,8 @@ void ChromeContentRendererClient::Render
    subresource_filter_ruleset_dealer_ =
        std::make_unique<subresource_filter::UnverifiedRulesetDealer>();
 

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
-@@ -800,94 +800,6 @@ std::tuple<GURL, std::string> AutofillCr
+@@ -802,95 +802,6 @@ std::tuple<GURL, std::string> AutofillCr
  }
 
  bool AutofillCrowdsourcingManager::StartRequest(FormRequestData request_data) {
@@ -87,6 +87,7 @@
 -  // variable.
 -  auto* raw_simple_loader = simple_loader.get();
 -  url_loaders_.push_back(std::move(simple_loader));
+-  raw_simple_loader->SetTimeoutDuration(kFetchTimeout);
 -  raw_simple_loader->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
 -      client_->GetURLLoaderFactory().get(),
 -      base::BindOnce(&AutofillCrowdsourcingManager::OnSimpleLoaderComplete,

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

@@ -10,7 +10,7 @@
      extension_misc::kAssessmentAssistantExtensionId,
 --- a/chrome/browser/extensions/component_loader.cc
 +++ b/chrome/browser/extensions/component_loader.cc
-@@ -394,11 +394,6 @@ void ComponentLoader::AddWebStoreApp() {
+@@ -395,11 +395,6 @@ void ComponentLoader::AddWebStoreApp() {
      return;
    }
  #endif
@@ -36,10 +36,10 @@
    {
 --- a/chrome/browser/extensions/webstore_installer.cc
 +++ b/chrome/browser/extensions/webstore_installer.cc
-@@ -520,20 +520,6 @@ void WebstoreInstaller::DownloadNextPend
- void WebstoreInstaller::DownloadCrx(
-     const std::string& extension_id,
-     InstallSource source) {
+@@ -519,20 +519,6 @@ void WebstoreInstaller::DownloadNextPend
+
+ void WebstoreInstaller::DownloadCrx(const extensions::ExtensionId& extension_id,
+                                     InstallSource source) {
 -  download_url_ = GetWebstoreInstallURL(extension_id, source);
 -  MaybeAppendAuthUserParameter(approval_->authuser, &download_url_);
 -

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

@@ -2,7 +2,7 @@
 
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -457,14 +457,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

@@ -167,7 +167,7 @@ by default.
  DownloadFeedbackFactory* DownloadFeedback::factory_ = nullptr;
 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
 +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
-@@ -273,7 +273,7 @@ GURL SpellcheckHunspellDictionary::GetDi
+@@ -274,7 +274,7 @@ GURL SpellcheckHunspellDictionary::GetDi
    DCHECK(!bdict_file.empty());
 
    static const char kDownloadServerUrl[] =
@@ -189,7 +189,7 @@ by default.
  bool g_upgrade_bubble_is_showing = false;
 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
 +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
-@@ -75,17 +75,17 @@ namespace {
+@@ -71,17 +71,17 @@ namespace {
  // The URL for the the Learn More page shown on incognito new tab.
  const char kLearnMoreIncognitoUrl[] =
  #if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -234,8 +234,8 @@ by default.
 -    L"https://support.google.com/chrome?p=chrome_uninstall_survey");
 +    L"trk:253:https://support.google.com/chrome?p=chrome_uninstall_survey");
 
- bool NavigateToUrlWithEdge(const std::wstring& url) {
-   std::wstring protocol_url = L"microsoft-edge:" + url;
+ // Launches the url directly with the user's default handler for |url|.
+ bool NavigateToUrlWithHttps(const std::wstring& url) {
 --- a/chromecast/crash/linux/minidump_uploader.cc
 +++ b/chromecast/crash/linux/minidump_uploader.cc
 @@ -40,7 +40,7 @@ namespace {
@@ -416,7 +416,7 @@ by default.
    GURL url(base::WideToUTF16(args[0]));
 --- a/extensions/common/extension_urls.cc
 +++ b/extensions/common/extension_urls.cc
-@@ -29,10 +29,10 @@ bool IsSourceFromAnExtension(const std::
+@@ -30,10 +30,10 @@ bool IsSourceFromAnExtension(const std::
 
  namespace extension_urls {
 

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

@@ -16,7 +16,7 @@ the URL so we get notified if this happens again in the future).
 
 --- a/chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc
 +++ b/chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc
-@@ -44,8 +44,7 @@ ChromeSafeBrowsingBlockingPageFactory::C
+@@ -45,8 +45,7 @@ ChromeSafeBrowsingBlockingPageFactory::C
        Profile::FromBrowserContext(web_contents->GetBrowserContext());
    // Create appropriate display options for this blocking page.
    PrefService* prefs = profile->GetPrefs();
@@ -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
-@@ -318,7 +318,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
+@@ -322,7 +322,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
-@@ -241,6 +241,10 @@ void ClientSideDetectionService::StartCl
+@@ -245,6 +245,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);
 
-@@ -322,6 +326,7 @@ void ClientSideDetectionService::StartCl
+@@ -326,6 +330,7 @@ void ClientSideDetectionService::StartCl
        base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent,
                       base::Unretained(WebUIInfoSingleton::GetInstance()),
                       std::move(request), access_token));