Merge pull request #1490 from Ahrotahn/update

Update to Chromium 90.0.4430.85

chromium_version.txt

@@ -1 +1 @@
-89.0.4389.114
+90.0.4430.85

devutils/update_lists.py

@@ -63,7 +63,6 @@
     'third_party/icu/android_small/icudtl.dat',
     'third_party/icu/android_small/icudtl_extra.dat',
     'third_party/icu/common/icudtb.dat',
-    'third_party/jetifier_standalone/lib/jetifier-standalone.jar',
     # Exclusions for safe file extensions
     '*.avif',
     '*.ttf',

flags.gn

@@ -1,3 +1,4 @@
+build_with_tflite_lib=false
 chrome_pgo_phase=0
 clang_use_chrome_plugins=false
 enable_hangout_services_extension=false

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
-@@ -122,9 +122,7 @@ public abstract class ChromeFeatureList
+@@ -123,9 +123,7 @@ public abstract class ChromeFeatureList
       *   the specified parameter does not exist.
       */
      public static String getFieldTrialParamByFeature(String featureName, String paramName) {
@@ -21,7 +21,7 @@ Subject: Disable fetching of all field trials
      }
 
      /**
-@@ -141,10 +139,7 @@ public abstract class ChromeFeatureList
+@@ -142,10 +140,7 @@ public abstract class ChromeFeatureList
       */
      public static int getFieldTrialParamByFeatureAsInt(
              String featureName, String paramName, int defaultValue) {
@@ -33,7 +33,7 @@ Subject: Disable fetching of all field trials
      }
 
      /**
-@@ -161,10 +156,7 @@ public abstract class ChromeFeatureList
+@@ -162,10 +157,7 @@ public abstract class ChromeFeatureList
       */
      public static double getFieldTrialParamByFeatureAsDouble(
              String featureName, String paramName, double defaultValue) {
@@ -45,7 +45,7 @@ Subject: Disable fetching of all field trials
      }
 
      /**
-@@ -181,10 +173,7 @@ public abstract class ChromeFeatureList
+@@ -196,10 +188,7 @@ public abstract class ChromeFeatureList
       */
      public static boolean getFieldTrialParamByFeatureAsBoolean(
              String featureName, String paramName, boolean defaultValue) {
@@ -56,10 +56,10 @@ Subject: Disable fetching of all field trials
 +        return defaultValue;
      }
 
-     /** Alphabetical: */
+     /* Alphabetical: */
 --- a/components/variations/service/variations_service.cc
 +++ b/components/variations/service/variations_service.cc
-@@ -239,17 +239,7 @@ bool GetInstanceManipulations(const net:
+@@ -240,17 +240,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,6 +1,6 @@
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -3539,8 +3539,6 @@ static_library("browser") {
+@@ -3540,8 +3540,6 @@ static_library("browser") {
        "download/download_commands.h",
        "download/download_crx_util.cc",
        "download/download_crx_util.h",
@@ -22,7 +22,7 @@
  namespace subresource_filter {
  class RulesetService;
  }
-@@ -212,9 +208,6 @@ class BrowserProcess {
+@@ -209,9 +205,6 @@ class BrowserProcess {
    // on this platform (or this is a unit test).
    virtual StatusTray* status_tray() = 0;
 
@@ -42,7 +42,7 @@
  #include "chrome/browser/shell_integration.h"
  #include "chrome/browser/site_isolation/prefs_observer.h"
  #include "chrome/browser/ssl/secure_origin_prefs_observer.h"
-@@ -376,8 +375,6 @@ void BrowserProcessImpl::StartTearDown()
+@@ -367,8 +366,6 @@ void BrowserProcessImpl::StartTearDown()
 
    metrics_services_manager_.reset();
    intranet_redirect_detector_.reset();
@@ -51,7 +51,7 @@
    network_time_tracker_.reset();
  #if BUILDFLAG(ENABLE_PLUGINS)
    plugins_resource_service_.reset();
-@@ -983,14 +980,6 @@ StatusTray* BrowserProcessImpl::status_t
+@@ -968,14 +965,6 @@ StatusTray* BrowserProcessImpl::status_t
    return status_tray_.get();
  }
 
@@ -66,7 +66,7 @@
  subresource_filter::RulesetService*
  BrowserProcessImpl::subresource_filter_ruleset_service() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -1229,26 +1218,6 @@ void BrowserProcessImpl::CreateBackgroun
+@@ -1225,26 +1214,6 @@ void BrowserProcessImpl::CreateBackgroun
  #endif
  }
 
@@ -95,15 +95,15 @@
    created_subresource_filter_ruleset_service_ = true;
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
-@@ -170,7 +170,6 @@ class BrowserProcessImpl : public Browse
-   void set_background_mode_manager_for_test(
+@@ -175,7 +175,6 @@ class BrowserProcessImpl : public Browse
        std::unique_ptr<BackgroundModeManager> manager) override;
+ #endif
    StatusTray* status_tray() override;
 -  safe_browsing::SafeBrowsingService* safe_browsing_service() override;
    subresource_filter::RulesetService* subresource_filter_ruleset_service()
        override;
    federated_learning::FlocSortingLshClustersService*
-@@ -318,9 +317,6 @@ class BrowserProcessImpl : public Browse
+@@ -323,9 +322,6 @@ class BrowserProcessImpl : public Browse
    std::unique_ptr<BackgroundModeManager> background_mode_manager_;
  #endif
 
@@ -115,15 +115,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
-@@ -73,7 +73,6 @@
+@@ -72,7 +72,6 @@
  #include "chrome/browser/privacy_sandbox/privacy_sandbox_settings.h"
  #include "chrome/browser/privacy_sandbox/privacy_sandbox_settings_factory.h"
  #include "chrome/browser/profiles/profile.h"
 -#include "chrome/browser/safe_browsing/safe_browsing_service.h"
  #include "chrome/browser/search_engines/template_url_service_factory.h"
  #include "chrome/browser/spellchecker/spellcheck_factory.h"
  #include "chrome/browser/spellchecker/spellcheck_service.h"
-@@ -669,10 +668,6 @@ void ChromeBrowsingDataRemoverDelegate::
+@@ -668,10 +667,6 @@ void ChromeBrowsingDataRemoverDelegate::
      base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
 
      network::mojom::NetworkContext* safe_browsing_context = nullptr;
@@ -136,7 +136,7 @@
          delete_begin, delete_end, filter_builder, host_content_settings_map_,
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -920,30 +920,6 @@ void SetApplicationLocaleOnIOThread(cons
+@@ -957,30 +957,6 @@ void SetApplicationLocaleOnIOThread(cons
    GetIOThreadApplicationLocale() = locale;
  }
 
@@ -167,15 +167,15 @@
  #if BUILDFLAG(ENABLE_EXTENSIONS)
 
  AppLoadedInTabSource ClassifyAppLoadedInTabSource(
-@@ -1491,7 +1467,6 @@ void ChromeContentBrowserClient::PostAft
+@@ -1402,7 +1378,6 @@ void ChromeContentBrowserClient::PostAft
    InitNetworkContextsParentDirectory();
 
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
 -  safe_browsing_service_ = g_browser_process->safe_browsing_service();
  }
 
  bool ChromeContentBrowserClient::IsBrowserStartupComplete() {
-@@ -4131,7 +4106,7 @@ ChromeContentBrowserClient::CreateThrott
+@@ -4109,7 +4084,7 @@ ChromeContentBrowserClient::CreateThrott
        base::BindRepeating(&MaybeTriggerSecurityInterstitialShownEvent));
    throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
        handle,
@@ -184,7 +184,7 @@
        base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
        base::BindOnce(
            &TypedNavigationUpgradeThrottle::
-@@ -4153,9 +4128,6 @@ ChromeContentBrowserClient::CreateThrott
+@@ -4131,9 +4106,6 @@ ChromeContentBrowserClient::CreateThrott
                     &throttles);
  #endif
 
@@ -219,7 +219,7 @@
  }  // namespace
 --- a/chrome/browser/download/chrome_download_manager_delegate.cc
 +++ b/chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -393,13 +393,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
+@@ -394,13 +394,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
 
  void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
    download_manager_ = dm;
@@ -233,7 +233,7 @@
  }
 
  #if defined(OS_ANDROID)
-@@ -740,16 +733,6 @@ void ChromeDownloadManagerDelegate::Choo
+@@ -741,16 +734,6 @@ void ChromeDownloadManagerDelegate::Choo
 
  void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
      base::FilePath* filename) {
@@ -332,7 +332,7 @@
        download_->GetURL(), download_->GetContentDisposition(), referrer_charset,
        suggested_filename, sniffed_mime_type, default_filename);
 
--  // We don't replace the file extension if safe browsing consider the file
+-  // We don't replace the file extension if sfafe browsing consider the file
 -  // extension to be unsafe. Just let safe browsing scan the generated file.
 -  if (safe_browsing::FileTypePolicies::GetInstance()->IsCheckedBinaryFile(
 -          generated_filename)) {
@@ -342,7 +342,7 @@
    // If no mime type or explicitly specified a name, don't replace file
    // extension.
    if (sniffed_mime_type.empty() || !suggested_filename.empty())
-@@ -1090,29 +1083,7 @@ DownloadFileType::DangerLevel DownloadTa
+@@ -1097,29 +1090,7 @@ DownloadFileType::DangerLevel DownloadTa
        download_->HasUserGesture())
      return DownloadFileType::NOT_DANGEROUS;
 
@@ -383,7 +383,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"
-@@ -1312,9 +1311,6 @@ DownloadsAcceptDangerFunction::Downloads
+@@ -1307,9 +1306,6 @@ DownloadsAcceptDangerFunction::Downloads
 
  DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
 
@@ -393,7 +393,7 @@
  ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
    std::unique_ptr<downloads::AcceptDanger::Params> params(
        downloads::AcceptDanger::Params::Create(*args_));
-@@ -1352,41 +1348,7 @@ void DownloadsAcceptDangerFunction::Prom
+@@ -1347,41 +1343,7 @@ void DownloadsAcceptDangerFunction::Prom
      return;
    }
    RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -405,7 +405,7 @@
 -                     download_id));
 -  // DownloadDangerPrompt deletes itself
 -  if (on_prompt_created_ && !on_prompt_created_->is_null())
--    on_prompt_created_->Run(prompt);
+-    std::move(*on_prompt_created_).Run(prompt);
 -  // Function finishes in DangerPromptCallback().
 -}
 -
@@ -446,11 +446,12 @@
  #include "chrome/common/extensions/api/downloads.h"
  #include "components/download/content/public/all_download_item_notifier.h"
  #include "components/download/public/common/download_path_reservation_tracker.h"
-@@ -187,25 +186,16 @@ class DownloadsRemoveFileFunction : publ
+@@ -187,26 +186,16 @@ class DownloadsRemoveFileFunction : publ
 
  class DownloadsAcceptDangerFunction : public ExtensionFunction {
   public:
--  typedef base::Callback<void(DownloadDangerPrompt*)> OnPromptCreatedCallback;
+-  using OnPromptCreatedCallback =
+-      base::OnceCallback<void(DownloadDangerPrompt*)>;
 -  static void OnPromptCreatedForTesting(
 -      OnPromptCreatedCallback* callback) {
 -    on_prompt_created_ = callback;
@@ -649,7 +650,7 @@
    // SimpleURLLoader -> (owned loader, extension id).
 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc
 +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -780,9 +780,6 @@ void ChromeMetricsServiceClient::Registe
+@@ -796,9 +796,6 @@ void ChromeMetricsServiceClient::Registe
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<HttpsEngagementMetricsProvider>());
 
@@ -673,25 +674,25 @@
  // static
 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -264,7 +264,6 @@ void ChromeBrowserMainExtraPartsProfiles
- #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
-   CaptivePortalServiceFactory::GetInstance();
+@@ -272,7 +272,6 @@ void ChromeBrowserMainExtraPartsProfiles
+ #if BUILDFLAG(IS_CHROMEOS_LACROS)
+   CertDbInitializerFactory::GetInstance();
  #endif
 -  CertificateReportingServiceFactory::GetInstance();
  #if !defined(OS_ANDROID)
    ChromeBrowsingDataLifetimeManagerFactory::GetInstance();
  #endif
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -94,7 +94,6 @@
+@@ -93,7 +93,6 @@
  #include "chrome/browser/profiles/profile_metrics.h"
  #include "chrome/browser/push_messaging/push_messaging_service_factory.h"
  #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
 -#include "chrome/browser/safe_browsing/safe_browsing_service.h"
  #include "chrome/browser/sharing/sharing_service_factory.h"
  #include "chrome/browser/signin/identity_manager_factory.h"
  #include "chrome/browser/signin/signin_ui_util.h"
-@@ -639,17 +638,6 @@ void ProfileImpl::LoadPrefsForNormalStar
+@@ -629,17 +628,6 @@ void ProfileImpl::LoadPrefsForNormalStar
 
    mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
        pref_validation_delegate;
@@ -711,7 +712,7 @@
        CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false),
 --- a/chrome/browser/profiles/profiles_state.cc
 +++ b/chrome/browser/profiles/profiles_state.cc
-@@ -248,9 +248,6 @@ void RemoveBrowsingDataForProfile(const
+@@ -249,9 +249,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.
@@ -731,17 +732,33 @@
    sources = [
      "chrome_controller_client.cc",
      "chrome_controller_client.h",
-@@ -68,6 +69,7 @@ static_library("safe_browsing") {
-     }
-     deps += [ "//extensions/browser" ]
+@@ -82,6 +83,7 @@ static_library("safe_browsing") {
+       "//extensions/browser",
+     ]
    }
 +  }
 
    if (safe_browsing_mode != 0) {
      # "Safe Browsing Basic" files used for safe browsing in full mode
+@@ -388,6 +390,7 @@ static_library("advanced_protection") {
+ }
+
+ source_set("metrics_collector") {
++  if (false) {
+   sources = [
+     "safe_browsing_metrics_collector.cc",
+     "safe_browsing_metrics_collector.h",
+@@ -405,6 +408,7 @@ source_set("metrics_collector") {
+     "//components/safe_browsing/core/common:safe_browsing_prefs",
+     "//content/public/browser",
+   ]
++  }
+ }
+
+ source_set("test_support") {
 --- a/chrome/browser/ssl/security_state_tab_helper.cc
 +++ b/chrome/browser/ssl/security_state_tab_helper.cc
-@@ -275,92 +275,6 @@ bool SecurityStateTabHelper::UsedPolicyI
+@@ -257,92 +257,6 @@ bool SecurityStateTabHelper::UsedPolicyI
 
  security_state::MaliciousContentStatus
  SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -755,7 +772,7 @@
 -    return security_state::MALICIOUS_CONTENT_STATUS_NONE;
 -  scoped_refptr<SafeBrowsingUIManager> sb_ui_manager = sb_service->ui_manager();
 -  safe_browsing::SBThreatType threat_type;
--  if (sb_ui_manager->IsUrlWhitelistedOrPendingForWebContents(
+-  if (sb_ui_manager->IsUrlAllowlistedOrPendingForWebContents(
 -          entry->GetURL(), false, entry, web_contents(), false, &threat_type)) {
 -    switch (threat_type) {
 -      case safe_browsing::SB_THREAT_TYPE_UNUSED:
@@ -814,10 +831,10 @@
 -          DEPRECATED_SB_THREAT_TYPE_URL_PASSWORD_PROTECTION_PHISHING:
 -      case safe_browsing::SB_THREAT_TYPE_URL_BINARY_MALWARE:
 -      case safe_browsing::SB_THREAT_TYPE_EXTENSION:
--      case safe_browsing::SB_THREAT_TYPE_BLACKLISTED_RESOURCE:
+-      case safe_browsing::SB_THREAT_TYPE_BLOCKLISTED_RESOURCE:
 -      case safe_browsing::SB_THREAT_TYPE_API_ABUSE:
 -      case safe_browsing::SB_THREAT_TYPE_SUBRESOURCE_FILTER:
--      case safe_browsing::SB_THREAT_TYPE_CSD_WHITELIST:
+-      case safe_browsing::SB_THREAT_TYPE_CSD_ALLOWLIST:
 -      case safe_browsing::SB_THREAT_TYPE_AD_SAMPLE:
 -      case safe_browsing::SB_THREAT_TYPE_BLOCKED_AD_POPUP:
 -      case safe_browsing::SB_THREAT_TYPE_BLOCKED_AD_REDIRECT:
@@ -836,7 +853,7 @@
 
 --- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
 +++ b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
-@@ -110,10 +110,7 @@ void ChromeSubresourceFilterClient::OnAd
+@@ -57,10 +57,7 @@ void ChromeSubresourceFilterClient::Show
 
  const scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
  ChromeSubresourceFilterClient::GetSafeBrowsingDatabaseManager() {
@@ -850,7 +867,7 @@
  subresource_filter::ProfileInteractionManager*
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -3586,7 +3586,6 @@ static_library("ui") {
+@@ -3640,7 +3640,6 @@ static_library("ui") {
        "views/device_chooser_content_view.h",
        "views/devtools_process_observer.cc",
        "views/devtools_process_observer.h",
@@ -860,7 +877,7 @@
        "views/download/download_item_view.cc",
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -314,11 +314,6 @@ void TabHelpers::AttachTabHelpers(WebCon
+@@ -317,11 +317,6 @@ void TabHelpers::AttachTabHelpers(WebCon
    resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
        web_contents);
    ResourceLoadingHintsWebContentsObserver::CreateForWebContents(web_contents);