Update to Chromium 118.0.5993.70

chromium_version.txt

@@ -1 +1 @@
-117.0.5938.150
+118.0.5993.70

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

@@ -1,14 +1,14 @@
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2276,7 +2276,6 @@ static_library("browser") {
+@@ -2303,7 +2303,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",
-@@ -3664,8 +3663,6 @@ static_library("browser") {
+@@ -3703,8 +3702,6 @@ static_library("browser") {
        "download/download_commands.h",
        "download/download_crx_util.cc",
        "download/download_crx_util.h",
@@ -47,10 +47,10 @@
  #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/screen_ai/screen_ai_downloader.h"
  #include "chrome/browser/shell_integration.h"
  #include "chrome/browser/site_isolation/prefs_observer.h"
-@@ -436,8 +435,6 @@ void BrowserProcessImpl::StartTearDown()
+ #include "chrome/browser/ssl/secure_origin_prefs_observer.h"
+@@ -435,8 +434,6 @@ void BrowserProcessImpl::StartTearDown()
  #endif
    metrics_services_manager_.reset();
    intranet_redirect_detector_.reset();
@@ -59,7 +59,7 @@
    network_time_tracker_.reset();
 
  #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -1079,14 +1076,6 @@ StatusTray* BrowserProcessImpl::status_t
+@@ -1078,14 +1075,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_);
-@@ -1322,26 +1311,6 @@ void BrowserProcessImpl::CreateBackgroun
+@@ -1319,26 +1308,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"
-@@ -624,10 +623,6 @@ void ChromeBrowsingDataRemoverDelegate::
+@@ -628,10 +627,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
-@@ -1066,34 +1066,6 @@ void SetApplicationLocaleOnIOThread(cons
+@@ -1072,34 +1072,6 @@ void SetApplicationLocaleOnIOThread(cons
    GetIOThreadApplicationLocale() = locale;
  }
 
@@ -179,7 +179,7 @@
  #if BUILDFLAG(ENABLE_EXTENSIONS)
 
  AppLoadedInTabSource ClassifyAppLoadedInTabSource(
-@@ -5095,14 +5067,9 @@ ChromeContentBrowserClient::CreateThrott
+@@ -5141,14 +5113,9 @@ ChromeContentBrowserClient::CreateThrott
    throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
        handle, handle->GetWebContents()->GetBrowserContext()));
 
@@ -195,7 +195,7 @@
        base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
        base::BindOnce(
            &ShouldIgnoreSslInterstitialBecauseNavigationDefaultedToHttps)));
-@@ -5148,16 +5115,6 @@ ChromeContentBrowserClient::CreateThrott
+@@ -5194,16 +5161,6 @@ ChromeContentBrowserClient::CreateThrott
        &throttles);
  #endif
 
@@ -212,7 +212,7 @@
    if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) {
      throttles.push_back(
          std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
-@@ -5428,8 +5385,6 @@ void ChromeContentBrowserClient::Overrid
+@@ -5476,8 +5433,6 @@ void ChromeContentBrowserClient::Overrid
  void ChromeContentBrowserClient::InitOnUIThread() {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
@@ -246,7 +246,7 @@
  }  // namespace
 --- a/chrome/browser/download/chrome_download_manager_delegate.cc
 +++ b/chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -471,13 +471,6 @@ void ChromeDownloadManagerDelegate::SetD
+@@ -473,13 +473,6 @@ void ChromeDownloadManagerDelegate::SetD
 
    download_manager_ = dm;
 
@@ -260,7 +260,7 @@
    if (download_manager_) {
      download_manager_->AddObserver(this);
    }
-@@ -854,17 +847,6 @@ void ChromeDownloadManagerDelegate::Choo
+@@ -871,17 +864,6 @@ void ChromeDownloadManagerDelegate::Choo
  void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
      base::FilePath* filename,
      const GURL& source_url) {
@@ -280,7 +280,7 @@
  void ChromeDownloadManagerDelegate::SanitizeDownloadParameters(
 --- a/chrome/browser/download/download_item_model.cc
 +++ b/chrome/browser/download/download_item_model.cc
-@@ -108,7 +108,7 @@ class DownloadItemModelData : public bas
+@@ -109,7 +109,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.
@@ -289,7 +289,7 @@
 
    // Whether the download is currently being revived.
    bool is_being_revived_;
-@@ -158,7 +158,7 @@ DownloadItemModelData* DownloadItemModel
+@@ -159,7 +159,7 @@ DownloadItemModelData* DownloadItemModel
  DownloadItemModelData::DownloadItemModelData()
      : should_show_in_shelf_(true),
        was_ui_notified_(false),
@@ -298,7 +298,7 @@
        is_being_revived_(false) {}
 
  #if BUILDFLAG(FULL_SAFE_BROWSING)
-@@ -542,13 +542,13 @@ void DownloadItemModel::SetShouldPreferO
+@@ -543,13 +543,13 @@ void DownloadItemModel::SetShouldPreferO
    data->should_prefer_opening_in_browser_ = preference;
  }
 
@@ -315,7 +315,7 @@
    DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
    data->danger_level_ = danger_level;
  }
-@@ -728,9 +728,6 @@ bool DownloadItemModel::IsCommandEnabled
+@@ -729,9 +729,6 @@ bool DownloadItemModel::IsCommandEnabled
        // filename. Don't base an "Always open" decision based on it. Also
        // exclude extensions.
        return download_->CanOpenDownload() &&
@@ -567,7 +567,7 @@
  }
 
  void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
-@@ -1254,56 +1242,9 @@ WebstorePrivateGetReferrerChainFunction:
+@@ -1265,56 +1253,9 @@ WebstorePrivateGetReferrerChainFunction:
 
  ExtensionFunction::ResponseAction
  WebstorePrivateGetReferrerChainFunction::Run() {
@@ -765,15 +765,15 @@
 
    if (safe_browsing_mode != 0) {
      # "Safe Browsing Basic" files used for safe browsing in full mode
-@@ -514,6 +516,7 @@ static_library("advanced_protection") {
+@@ -521,6 +523,7 @@ static_library("advanced_protection") {
  }
 
  source_set("metrics_collector") {
 +  if (false) {
    sources = [
      "safe_browsing_metrics_collector_factory.cc",
      "safe_browsing_metrics_collector_factory.h",
-@@ -533,6 +536,7 @@ source_set("metrics_collector") {
+@@ -540,6 +543,7 @@ source_set("metrics_collector") {
      "//components/safe_browsing/core/common:safe_browsing_prefs",
      "//content/public/browser",
    ]
@@ -878,7 +878,7 @@
 
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -4828,7 +4828,6 @@ static_library("ui") {
+@@ -4876,7 +4876,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",
@@ -888,7 +888,7 @@
        "views/download/download_item_view.cc",
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -450,22 +450,6 @@ void TabHelpers::AttachTabHelpers(WebCon
+@@ -446,22 +446,6 @@ void TabHelpers::AttachTabHelpers(WebCon
    //     See https://crbug.com/910288.
    resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
        web_contents);
@@ -913,15 +913,15 @@
    SecurityStateTabHelper::CreateForWebContents(web_contents);
 --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
 +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
-@@ -23,7 +23,6 @@
- #include "base/threading/thread.h"
+@@ -24,7 +24,6 @@
  #include "base/values.h"
  #include "chrome/browser/browser_process.h"
+ #include "chrome/browser/download/bubble/download_bubble_ui_controller.h"
 -#include "chrome/browser/download/download_danger_prompt.h"
  #include "chrome/browser/download/download_history.h"
  #include "chrome/browser/download/download_item_model.h"
  #include "chrome/browser/download/download_item_warning_data.h"
-@@ -178,13 +177,6 @@ void DownloadsDOMHandler::SaveDangerousR
+@@ -195,13 +194,6 @@ void DownloadsDOMHandler::SaveDangerousR
    }
 
    CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS);
@@ -935,7 +935,7 @@
  }
 
  void DownloadsDOMHandler::DiscardDangerous(const std::string& id) {
-@@ -362,12 +354,6 @@ void DownloadsDOMHandler::RemoveDownload
+@@ -379,12 +371,6 @@ void DownloadsDOMHandler::RemoveDownload
    IdSet ids;
 
    for (auto* download : to_remove) {
@@ -948,7 +948,7 @@
      DownloadItemModel item_model(download);
      if (!item_model.ShouldShowInShelf() ||
          download->GetState() == download::DownloadItem::IN_PROGRESS) {
-@@ -485,44 +471,6 @@ void DownloadsDOMHandler::FinalizeRemova
+@@ -512,44 +498,6 @@ void DownloadsDOMHandler::FinalizeRemova
    }
  }
 
@@ -1024,7 +1024,7 @@
    bool IsDeletingHistoryAllowed();
 --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
 +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
-@@ -280,65 +280,6 @@ CreateHttpsOnlyModePage(content::WebCont
+@@ -281,67 +281,6 @@ CreateHttpsOnlyModePage(content::WebCont
        security_interstitials::https_only_mode::HttpInterstitialState{});
  }
 
@@ -1069,9 +1069,11 @@
 -  resource.threat_type = threat_type;
 -  resource.render_process_id = primary_main_frame_id.child_id;
 -  resource.render_frame_id = primary_main_frame_id.frame_routing_id;
--  resource.threat_source = g_browser_process->safe_browsing_service()
--                               ->database_manager()
--                               ->GetThreatSource();
+-  resource.threat_source =
+-      g_browser_process->safe_browsing_service()
+-          ->database_manager()
+-          ->GetBrowseUrlThreatSource(
+-              safe_browsing::CheckBrowseUrlType::kHashDatabase);
 -
 -  // Normally safebrowsing interstitial types which block the main page load
 -  // (SB_THREAT_TYPE_URL_MALWARE, SB_THREAT_TYPE_URL_PHISHING, and
@@ -1090,7 +1092,7 @@
  std::unique_ptr<EnterpriseBlockPage> CreateEnterpriseBlockPage(
      content::WebContents* web_contents) {
    const GURL kRequestUrl("https://enterprise-block.example.net");
-@@ -348,88 +289,6 @@ std::unique_ptr<EnterpriseBlockPage> Cre
+@@ -351,92 +290,6 @@ std::unique_ptr<EnterpriseBlockPage> Cre
                                                          kRequestUrl));
  }
 
@@ -1110,9 +1112,11 @@
 -  resource.threat_type = safe_browsing::SB_THREAT_TYPE_MANAGED_POLICY_WARN;
 -  resource.render_process_id = primary_main_frame_id.child_id;
 -  resource.render_frame_id = primary_main_frame_id.frame_routing_id;
--  resource.threat_source = g_browser_process->safe_browsing_service()
--                               ->database_manager()
--                               ->GetThreatSource();
+-  resource.threat_source =
+-      g_browser_process->safe_browsing_service()
+-          ->database_manager()
+-          ->GetBrowseUrlThreatSource(
+-              safe_browsing::CheckBrowseUrlType::kHashDatabase);
 -
 -  return std::make_unique<EnterpriseWarnPage>(
 -      ui_manager, web_contents, kRequestUrl,
@@ -1159,9 +1163,11 @@
 -  resource.threat_type = threat_type;
 -  resource.render_process_id = primary_main_frame_id.child_id;
 -  resource.render_frame_id = primary_main_frame_id.frame_routing_id;
--  resource.threat_source = g_browser_process->safe_browsing_service()
--                               ->database_manager()
--                               ->GetThreatSource();
+-  resource.threat_source =
+-      g_browser_process->safe_browsing_service()
+-          ->database_manager()
+-          ->GetBrowseUrlThreatSource(
+-              safe_browsing::CheckBrowseUrlType::kHashDatabase);
 -
 -  // Normally safebrowsing interstitial types which block the main page load
 -  // (SB_THREAT_TYPE_URL_MALWARE, SB_THREAT_TYPE_URL_PHISHING, and
@@ -1179,7 +1185,7 @@
  #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
  std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
      content::WebContents* web_contents) {
-@@ -536,12 +395,8 @@ void InterstitialHTMLSource::StartDataRe
+@@ -543,12 +396,8 @@ void InterstitialHTMLSource::StartDataRe
      interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
    } else if (path_without_query == "/blocked-interception") {
      interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
@@ -1192,7 +1198,7 @@
    } else if (path_without_query == "/clock") {
      interstitial_delegate = CreateBadClockBlockingPage(web_contents);
    } else if (path_without_query == "/lookalike") {
-@@ -556,16 +411,12 @@ void InterstitialHTMLSource::StartDataRe
+@@ -563,16 +412,12 @@ void InterstitialHTMLSource::StartDataRe
      interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
    }
 
@@ -1222,7 +1228,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"
-@@ -436,12 +435,8 @@ void ChromeContentRendererClient::Render
+@@ -440,12 +439,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/autofill_download_manager.cc
 +++ b/components/autofill/core/browser/autofill_download_manager.cc
-@@ -762,95 +762,6 @@ std::tuple<GURL, std::string> AutofillDo
+@@ -769,95 +769,6 @@ std::tuple<GURL, std::string> AutofillDo
  }
 
  bool AutofillDownloadManager::StartRequest(FormRequestData request_data) {

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
-@@ -389,11 +389,6 @@ void ComponentLoader::AddWebStoreApp() {
+@@ -394,11 +394,6 @@ void ComponentLoader::AddWebStoreApp() {
      return;
    }
  #endif

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

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

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

@@ -318,7 +318,7 @@ by default.
    url::Component query(0, static_cast<int>(str.length())), key, value;
 --- a/components/history/core/browser/web_history_service.cc
 +++ b/components/history/core/browser/web_history_service.cc
-@@ -41,13 +41,13 @@ namespace history {
+@@ -42,13 +42,13 @@ namespace history {
 
  namespace {
 
@@ -337,7 +337,7 @@ by default.
      "https://history.google.com/history/api/lookup?client=audio";
 --- a/components/safe_browsing/content/browser/client_side_detection_service.cc
 +++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
-@@ -72,7 +72,7 @@ const int ClientSideDetectionService::kN
+@@ -71,7 +71,7 @@ const int ClientSideDetectionService::kN
  const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30;
 
  const char ClientSideDetectionService::kClientReportPhishingUrl[] =
@@ -427,7 +427,7 @@ by default.
    WebAuthRequestSecurityChecker(const WebAuthRequestSecurityChecker&) = delete;
 --- a/content/shell/browser/shell_browser_main_parts.cc
 +++ b/content/shell/browser/shell_browser_main_parts.cc
-@@ -90,7 +90,7 @@ GURL GetStartupURL() {
+@@ -91,7 +91,7 @@ GURL GetStartupURL() {
  #else
    const base::CommandLine::StringVector& args = command_line->GetArgs();
    if (args.empty())
@@ -454,7 +454,7 @@ by default.
  const char kExtensionsMenuUtmSource[] = "ext_extensions_menu";
 --- a/google_apis/gaia/gaia_constants.cc
 +++ b/google_apis/gaia/gaia_constants.cc
-@@ -14,161 +14,161 @@ const char kChromeSource[] = "ChromiumBr
+@@ -14,157 +14,157 @@ const char kChromeSource[] = "ChromiumBr
  const char kUnexpectedServiceResponse[] = "UnexpectedServiceResponse";
 
  // OAuth scopes.
@@ -559,11 +559,6 @@ by default.
 -    "https://www.googleapis.com/auth/cast.backdrop";
 +    "trk:089:https://www.googleapis.com/auth/cast.backdrop";
 
- // OAuth scope for access to Cloud Translation API.
- const char kCloudTranslationOAuth2Scope[] =
--    "https://www.googleapis.com/auth/cloud-translation";
-+    "trk:090:https://www.googleapis.com/auth/cloud-translation";
-
  // OAuth2 scope for access to passwords leak checking API.
  const char kPasswordsLeakCheckOAuth2Scope[] =
 -    "https://www.googleapis.com/auth/identity.passwords.leak.check";