Update to Chromium 104.0.5112.81 (#2029)

* Update to Chromium 104.0.5112.65

* Update to Chromium 104.0.5112.81

chromium_version.txt

@@ -1 +1 @@
-103.0.5060.134
+104.0.5112.81

flags.gn

@@ -7,7 +7,6 @@ enable_js_type_check=false
 enable_mdns=false
 enable_mse_mpeg2ts_stream_parser=true
 enable_nacl=false
-enable_one_click_signin=false
 enable_reading_list=false
 enable_remoting=false
 enable_reporting=false

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

@@ -1,14 +1,14 @@
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2236,7 +2236,6 @@ static_library("browser") {
+@@ -2229,7 +2229,6 @@ static_library("browser") {
      "//components/reputation/core:proto",
      "//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",
-@@ -3792,8 +3791,6 @@ static_library("browser") {
+@@ -3649,8 +3648,6 @@ static_library("browser") {
        "download/download_commands.h",
        "download/download_crx_util.cc",
        "download/download_crx_util.h",
@@ -50,7 +50,7 @@
  #include "chrome/browser/shell_integration.h"
  #include "chrome/browser/site_isolation/prefs_observer.h"
  #include "chrome/browser/ssl/secure_origin_prefs_observer.h"
-@@ -393,8 +392,6 @@ void BrowserProcessImpl::StartTearDown()
+@@ -406,8 +405,6 @@ void BrowserProcessImpl::StartTearDown()
 
    metrics_services_manager_.reset();
    intranet_redirect_detector_.reset();
@@ -59,7 +59,7 @@
    network_time_tracker_.reset();
 
  #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -1025,14 +1022,6 @@ StatusTray* BrowserProcessImpl::status_t
+@@ -1038,14 +1035,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_);
-@@ -1273,26 +1262,6 @@ void BrowserProcessImpl::CreateBackgroun
+@@ -1286,26 +1275,6 @@ void BrowserProcessImpl::CreateBackgroun
  #endif
  }
 
@@ -131,7 +131,7 @@
  #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"
-@@ -617,10 +616,6 @@ void ChromeBrowsingDataRemoverDelegate::
+@@ -625,10 +624,6 @@ void ChromeBrowsingDataRemoverDelegate::
      base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
 
      network::mojom::NetworkContext* safe_browsing_context = nullptr;
@@ -144,7 +144,7 @@
                                                     host_content_settings_map_);
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -962,34 +962,6 @@ void SetApplicationLocaleOnIOThread(cons
+@@ -968,34 +968,6 @@ void SetApplicationLocaleOnIOThread(cons
    GetIOThreadApplicationLocale() = locale;
  }
 
@@ -179,15 +179,15 @@
  #if BUILDFLAG(ENABLE_EXTENSIONS)
 
  AppLoadedInTabSource ClassifyAppLoadedInTabSource(
-@@ -1499,7 +1471,6 @@ void ChromeContentBrowserClient::PostAft
+@@ -1511,7 +1483,6 @@ void ChromeContentBrowserClient::PostAft
    InitNetworkContextsParentDirectory();
 
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
 -  safe_browsing_service_ = g_browser_process->safe_browsing_service();
  }
 
  bool ChromeContentBrowserClient::IsBrowserStartupComplete() {
-@@ -4351,14 +4322,9 @@ ChromeContentBrowserClient::CreateThrott
+@@ -4378,14 +4349,9 @@ ChromeContentBrowserClient::CreateThrott
    throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
        handle, handle->GetWebContents()->GetBrowserContext()));
 
@@ -203,7 +203,7 @@
        base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
        base::BindOnce(
            &ShouldIgnoreSslInterstitialBecauseNavigationDefaultedToHttps)));
-@@ -4393,16 +4359,6 @@ ChromeContentBrowserClient::CreateThrott
+@@ -4420,16 +4386,6 @@ ChromeContentBrowserClient::CreateThrott
                     &throttles);
  #endif
 
@@ -279,7 +279,7 @@
  void ChromeDownloadManagerDelegate::SanitizeDownloadParameters(
 --- a/chrome/browser/download/download_item_model.cc
 +++ b/chrome/browser/download/download_item_model.cc
-@@ -89,7 +89,7 @@ class DownloadItemModelData : public bas
+@@ -92,7 +92,7 @@ class DownloadItemModelData : public bas
 
    // Danger level of the file determined based on the file type and whether
    // there was a user action associated with the download.
@@ -288,16 +288,16 @@
 
    // Whether the download is currently being revived.
    bool is_being_revived_;
-@@ -126,7 +126,7 @@ DownloadItemModelData::DownloadItemModel
+@@ -133,7 +133,7 @@ DownloadItemModelData::DownloadItemModel
      : should_show_in_shelf_(true),
        was_ui_notified_(false),
        should_prefer_opening_in_browser_(false),
 -      danger_level_(DownloadFileType::NOT_DANGEROUS),
 +      danger_level_(safe_browsing::DownloadFileType::NOT_DANGEROUS),
        is_being_revived_(false) {}
 
- }  // namespace
-@@ -410,13 +410,13 @@ void DownloadItemModel::SetShouldPreferO
+ #if BUILDFLAG(FULL_SAFE_BROWSING)
+@@ -443,13 +443,13 @@ void DownloadItemModel::SetShouldPreferO
    data->should_prefer_opening_in_browser_ = preference;
  }
 
@@ -314,7 +314,7 @@
    DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
    data->danger_level_ = danger_level;
  }
-@@ -636,9 +636,6 @@ bool DownloadItemModel::IsCommandEnabled
+@@ -669,9 +669,6 @@ bool DownloadItemModel::IsCommandEnabled
        // filename. Don't base an "Always open" decision based on it. Also
        // exclude extensions.
        return download_->CanOpenDownload() &&
@@ -369,7 +369,7 @@
    // If no mime type or explicitly specified a name, don't replace file
    // extension.
    if (sniffed_mime_type.empty() || !suggested_filename.empty())
-@@ -1128,30 +1121,7 @@ DownloadFileType::DangerLevel DownloadTa
+@@ -1129,30 +1122,7 @@ DownloadFileType::DangerLevel DownloadTa
        download_->HasUserGesture())
      return DownloadFileType::NOT_DANGEROUS;
 
@@ -505,7 +505,7 @@
  class DownloadsShowFunction : public ExtensionFunction {
 --- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc
 +++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc
-@@ -54,38 +54,7 @@ SafeBrowsingPrivateGetReferrerChainFunct
+@@ -54,39 +54,7 @@ SafeBrowsingPrivateGetReferrerChainFunct
          base::StringPrintf("Could not find tab with id %d.", params->tab_id)));
    }
 
@@ -521,7 +521,8 @@
 -  safe_browsing::ReferrerChain referrer_chain;
 -  SafeBrowsingNavigationObserverManager::AttributionResult result =
 -      navigation_observer_manager->IdentifyReferrerChainByRenderFrameHost(
--          contents->GetMainFrame(), kReferrerUserGestureLimit, &referrer_chain);
+-          contents->GetPrimaryMainFrame(), kReferrerUserGestureLimit,
+-          &referrer_chain);
 -
 -  // If the referrer chain is incomplete we'll append the most recent
 -  // navigations to referrer chain for diagnostic purposes. This only happens if
@@ -694,7 +695,7 @@
    // SimpleURLLoader -> (owned loader, extension id).
 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc
 +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -863,9 +863,6 @@ void ChromeMetricsServiceClient::Registe
+@@ -865,9 +865,6 @@ void ChromeMetricsServiceClient::Registe
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<HttpsEngagementMetricsProvider>());
 
@@ -718,7 +719,7 @@
  // static
 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -330,7 +330,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -335,7 +335,6 @@ void ChromeBrowserMainExtraPartsProfiles
  #if BUILDFLAG(IS_CHROMEOS_LACROS)
    CertDbInitializerFactory::GetInstance();
  #endif
@@ -736,7 +737,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"
-@@ -618,17 +617,6 @@ void ProfileImpl::LoadPrefsForNormalStar
+@@ -620,17 +619,6 @@ void ProfileImpl::LoadPrefsForNormalStar
 
    mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
        pref_validation_delegate;
@@ -756,7 +757,7 @@
        CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false),
 --- a/chrome/browser/profiles/profiles_state.cc
 +++ b/chrome/browser/profiles/profiles_state.cc
-@@ -256,9 +256,6 @@ void RemoveBrowsingDataForProfile(const
+@@ -257,9 +257,6 @@ void RemoveBrowsingDataForProfile(const
    // The BrowsingDataRemover relies on many objects that aren't created in unit
    // tests. Previously this code would depend on content::ResourceDispatcherHost
    // but that's gone, so do a similar hack for now.
@@ -784,15 +785,15 @@
 
    if (safe_browsing_mode != 0) {
      # "Safe Browsing Basic" files used for safe browsing in full mode
-@@ -455,6 +457,7 @@ static_library("advanced_protection") {
+@@ -458,6 +460,7 @@ static_library("advanced_protection") {
  }
 
  source_set("metrics_collector") {
 +  if (false) {
    sources = [
      "safe_browsing_metrics_collector_factory.cc",
      "safe_browsing_metrics_collector_factory.h",
-@@ -472,6 +475,7 @@ source_set("metrics_collector") {
+@@ -475,6 +478,7 @@ source_set("metrics_collector") {
      "//components/safe_browsing/core/common:safe_browsing_prefs",
      "//content/public/browser",
    ]
@@ -894,7 +895,7 @@
 
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -4241,7 +4241,6 @@ static_library("ui") {
+@@ -4270,7 +4270,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",
@@ -904,7 +905,7 @@
        "views/download/download_item_view.cc",
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -392,22 +392,6 @@ void TabHelpers::AttachTabHelpers(WebCon
+@@ -400,22 +400,6 @@ void TabHelpers::AttachTabHelpers(WebCon
    //     See https://crbug.com/910288.
    resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
        web_contents);
@@ -947,7 +948,7 @@
  }
 
  void DownloadsDOMHandler::DiscardDangerous(const std::string& id) {
-@@ -320,12 +316,6 @@ void DownloadsDOMHandler::RemoveDownload
+@@ -321,12 +317,6 @@ void DownloadsDOMHandler::RemoveDownload
    IdSet ids;
 
    for (auto* download : to_remove) {
@@ -960,7 +961,7 @@
      DownloadItemModel item_model(download);
      if (!item_model.ShouldShowInShelf() ||
          download->GetState() == download::DownloadItem::IN_PROGRESS) {
-@@ -399,44 +389,6 @@ void DownloadsDOMHandler::FinalizeRemova
+@@ -400,44 +390,6 @@ void DownloadsDOMHandler::FinalizeRemova
    }
  }
 
@@ -1073,7 +1074,7 @@
 -    }
 -  }
 -  const content::GlobalRenderFrameHostId primary_main_frame_id =
--      web_contents->GetMainFrame()->GetGlobalId();
+-      web_contents->GetPrimaryMainFrame()->GetGlobalId();
 -  safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource;
 -  resource.url = request_url;
 -  resource.is_subresource = request_url != main_frame_url;
@@ -1129,7 +1130,7 @@
 -    }
 -  }
 -  const content::GlobalRenderFrameHostId primary_main_frame_id =
--      web_contents->GetMainFrame()->GetGlobalId();
+-      web_contents->GetPrimaryMainFrame()->GetGlobalId();
 -  safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource;
 -  resource.url = request_url;
 -  resource.is_subresource = request_url != main_frame_url;
@@ -1196,7 +1197,7 @@
  #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"
-@@ -424,12 +423,8 @@ void ChromeContentRendererClient::Render
+@@ -425,12 +424,8 @@ void ChromeContentRendererClient::Render
    subresource_filter_ruleset_dealer_ =
        std::make_unique<subresource_filter::UnverifiedRulesetDealer>();
 
@@ -1207,8 +1208,8 @@
    thread->AddObserver(subresource_filter_ruleset_dealer_.get());
 -  thread->AddObserver(phishing_model_setter_.get());
 
-   thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get());
-
+   blink::WebScriptController::RegisterExtension(
+       extensions_v8::LoadTimesExtension::Get());
 --- a/components/security_interstitials/content/cert_report_helper.cc
 +++ b/components/security_interstitials/content/cert_report_helper.cc
 @@ -177,7 +177,6 @@ void CertReportHelper::FinishCertCollect

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
-@@ -356,11 +356,6 @@ void ComponentLoader::AddWebStoreApp() {
+@@ -360,11 +360,6 @@ void ComponentLoader::AddWebStoreApp() {
    if (!IsNormalSession())
      return;
  #endif
@@ -57,7 +57,7 @@
  }
 
  // http://crbug.com/165634
-@@ -709,21 +695,6 @@ void WebstoreInstaller::UpdateDownloadPr
+@@ -714,21 +700,6 @@ void WebstoreInstaller::UpdateDownloadPr
  void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
    DCHECK(!crx_installer_.get());

patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch

@@ -180,20 +180,8 @@ by default.
  ProfileAvatarDownloader::ProfileAvatarDownloader(size_t icon_index,
 --- a/chrome/browser/resources/default_apps/external_extensions.json
 +++ b/chrome/browser/resources/default_apps/external_extensions.json
-@@ -23,17 +23,17 @@
-   },
-   // Google Sheets
-   "aapocclcgogkmnckokdopfmhonfmgoek" : {
--    "external_update_url": "https://clients2.google.com/service/update2/crx",
-+    "external_update_url": "trk:03:https://clients2.google.com/service/update2/crx",
-     "web_app_migration_flag": "MigrateDefaultChromeAppToWebAppsGSuite"
-   },
-   // Google Slides
-   "felcaaldnbdncclmgdcncolpebgiejap" : {
--    "external_update_url": "https://clients2.google.com/service/update2/crx",
-+    "external_update_url": "trk:04:https://clients2.google.com/service/update2/crx",
-     "web_app_migration_flag": "MigrateDefaultChromeAppToWebAppsGSuite"
-   },
+@@ -3,7 +3,7 @@
+ {
    // Drive extension
    "ghbmnnjooekpmoecnnnilnnbdlolhkhi" : {
 -    "external_update_url": "https://clients2.google.com/service/update2/crx"
@@ -510,8 +498,8 @@ by default.
    extensions::ExtensionsClient* client = extensions::ExtensionsClient::Get();
 --- a/google_apis/gaia/gaia_constants.cc
 +++ b/google_apis/gaia/gaia_constants.cc
-@@ -25,149 +25,149 @@ const char kSyncService[] = "chromiumsyn
- const char kRemotingService[] = "chromoting";
+@@ -17,149 +17,149 @@ const char kUnexpectedServiceResponse[]
+ const char kGaiaService[] = "gaia";
 
  // OAuth scopes.
 -const char kOAuth1LoginScope[] = "https://www.google.com/accounts/OAuthLogin";

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
-@@ -36,8 +36,7 @@ ChromeSafeBrowsingBlockingPageFactory::C
+@@ -35,8 +35,7 @@ ChromeSafeBrowsingBlockingPageFactory::C
        Profile::FromBrowserContext(web_contents->GetBrowserContext());
    // Create appropriate display options for this blocking page.
    PrefService* prefs = profile->GetPrefs();