Upgrade to Chromium 81.0.4044.92

chromium_version.txt

@@ -1 +1 @@
-80.0.3987.163
+81.0.4044.92

devutils/update_lists.py

@@ -30,8 +30,8 @@ _ENCODING = 'UTF-8'
 PRUNING_INCLUDE_PATTERNS = [
     'components/domain_reliability/baked_in_configs/*',
     # Removals for patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
-    'components/safe_browsing/common/safe_browsing_prefs.cc',
-    'components/safe_browsing/common/safe_browsing_prefs.h',
+    'components/safe_browsing/core/common/safe_browsing_prefs.cc',
+    'components/safe_browsing/core/common/safe_browsing_prefs.h',
     'components/signin/public/base/signin_pref_names.cc',
     'components/signin/public/base/signin_pref_names.h',
 ]
@@ -95,7 +95,7 @@ DOMAIN_EXCLUDE_PREFIXES = [
     'components/test/',
     'net/http/transport_security_state_static.json',
     # Exclusions for Visual Studio Project generation with GN (PR #445)
-    'tools/gn/tools/gn/visual_studio_writer.cc',
+    'tools/gn/src/gn/visual_studio_writer.cc',
     # Exclusions for files covered with other patches/unnecessary
     'components/search_engines/prepopulated_engines.json',
     'third_party/blink/renderer/core/dom/document.cc',

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

@@ -8,8 +8,8 @@ Subject: Disable fetching of all field trials
  components/variations/service/variations_service.cc          |  4 ++++
  2 files changed, 7 insertions(+), 9 deletions(-)
 
---- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+--- 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
 @@ -108,10 +108,7 @@ public abstract class ChromeFeatureList 
       */
      public static int getFieldTrialParamByFeatureAsInt(
@@ -48,7 +48,7 @@ Subject: Disable fetching of all field trials
      // Alphabetical:
 --- a/components/variations/service/variations_service.cc
 +++ b/components/variations/service/variations_service.cc
-@@ -241,17 +241,7 @@ bool GetInstanceManipulations(const net:
+@@ -242,17 +242,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/debian/disable/unrar.patch

@@ -15,8 +15,8 @@ bug: http://bugs.debian.org/914487
      StartExtractDmgFeatures();
 --- a/chrome/common/safe_browsing/BUILD.gn
 +++ b/chrome/common/safe_browsing/BUILD.gn
-@@ -78,41 +78,6 @@ if (safe_browsing_mode == 1) {
-     ]
+@@ -72,39 +72,6 @@ if (safe_browsing_mode == 1) {
+     public_deps = [ "//components/safe_browsing/core:csd_proto" ]
    }
  
 -  source_set("rar_analyzer") {
@@ -31,7 +31,7 @@ bug: http://bugs.debian.org/914487
 -      ":file_type_policies",
 -      "//base",
 -      "//base:i18n",
--      "//components/safe_browsing:features",
+-      "//components/safe_browsing/core:features",
 -      "//third_party/unrar:unrar",
 -    ]
 -
@@ -49,20 +49,18 @@ bug: http://bugs.debian.org/914487
 -      "UNRAR_NO_EXCEPTIONS",
 -    ]
 -
--    public_deps = [
--      "//components/safe_browsing:csd_proto",
--    ]
+-    public_deps = [ "//components/safe_browsing/core:csd_proto" ]
 -  }
 -
    source_set("disk_image_type_sniffer_mac") {
      sources = [
        "disk_image_type_sniffer_mac.cc",
-@@ -185,7 +150,6 @@ source_set("safe_browsing") {
+@@ -171,7 +138,6 @@ source_set("safe_browsing") {
        ":archive_analyzer_results",
        ":binary_feature_extractor",
        ":download_type_util",
 -      ":rar_analyzer",
-       "//components/safe_browsing:features",
+       "//components/safe_browsing/core:features",
      ]
  
 --- a/chrome/services/file_util/safe_archive_analyzer.cc

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

@@ -1,6 +1,6 @@
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -3097,8 +3097,6 @@ jumbo_static_library("browser") {
+@@ -3105,8 +3105,6 @@ jumbo_static_library("browser") {
        "download/download_commands.h",
        "download/download_crx_util.cc",
        "download/download_crx_util.h",
@@ -50,7 +50,7 @@
    virtual subresource_filter::RulesetService*
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -69,7 +69,6 @@
+@@ -67,7 +67,6 @@
  #include "chrome/browser/printing/print_preview_dialog_controller.h"
  #include "chrome/browser/profiles/profile_manager.h"
  #include "chrome/browser/resource_coordinator/resource_coordinator_parts.h"
@@ -58,7 +58,7 @@
  #include "chrome/browser/shell_integration.h"
  #include "chrome/browser/site_isolation/prefs_observer.h"
  #include "chrome/browser/ssl/secure_origin_prefs_observer.h"
-@@ -362,8 +361,6 @@ void BrowserProcessImpl::StartTearDown()
+@@ -356,8 +355,6 @@ void BrowserProcessImpl::StartTearDown()
  
    metrics_services_manager_.reset();
    intranet_redirect_detector_.reset();
@@ -67,7 +67,7 @@
    network_time_tracker_.reset();
  #if BUILDFLAG(ENABLE_PLUGINS)
    plugins_resource_service_.reset();
-@@ -952,22 +949,6 @@ StatusTray* BrowserProcessImpl::status_t
+@@ -957,22 +954,6 @@ StatusTray* BrowserProcessImpl::status_t
    return status_tray_.get();
  }
  
@@ -90,7 +90,7 @@
  subresource_filter::RulesetService*
  BrowserProcessImpl::subresource_filter_ruleset_service() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -1223,26 +1204,6 @@ void BrowserProcessImpl::CreateBackgroun
+@@ -1225,26 +1206,6 @@ void BrowserProcessImpl::CreateBackgroun
  #endif
  }
  
@@ -146,10 +146,10 @@
  #include "chrome/browser/previews/previews_service_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/translate/chrome_translate_client.h"
- #include "chrome/browser/web_data_service_factory.h"
-@@ -665,36 +664,6 @@ void ChromeBrowsingDataRemoverDelegate::
+ #include "chrome/browser/ui/find_bar/find_bar_state.h"
+ #include "chrome/browser/ui/find_bar/find_bar_state_factory.h"
+@@ -651,36 +650,6 @@ void ChromeBrowsingDataRemoverDelegate::
          ContentSettingsType::CLIENT_HINTS, base::Time(), base::Time::Max(),
          website_settings_filter);
  
@@ -183,12 +183,12 @@
 -      }
 -    }
 -
-     MediaDeviceIDSalt::Reset(profile_->GetPrefs());
-   }
+     if (filter_builder->GetMode() == BrowsingDataFilterBuilder::BLACKLIST) {
+       MediaDeviceIDSalt::Reset(profile_->GetPrefs());
  
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -834,30 +834,6 @@ void SetApplicationLocaleOnIOThread(cons
+@@ -874,30 +874,6 @@ void SetApplicationLocaleOnIOThread(cons
    GetIOThreadApplicationLocale() = locale;
  }
  
@@ -219,7 +219,7 @@
  #if defined(OS_ANDROID)
  float GetDeviceScaleAdjustment() {
    static const float kMinFSM = 1.05f;
-@@ -1290,7 +1266,6 @@ void ChromeContentBrowserClient::PostAft
+@@ -1337,7 +1313,6 @@ void ChromeContentBrowserClient::PostAft
    InitNetworkContextsParentDirectory();
  
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -227,7 +227,7 @@
  }
  
  bool ChromeContentBrowserClient::IsBrowserStartupComplete() {
-@@ -2097,7 +2072,7 @@ void ChromeContentBrowserClient::AppendE
+@@ -2130,7 +2105,7 @@ void ChromeContentBrowserClient::AppendE
        // Disable client-side phishing detection in the renderer if it is
        // disabled in the Profile preferences or the browser process.
        if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) ||
@@ -236,16 +236,16 @@
          command_line->AppendSwitch(
              switches::kDisableClientSidePhishingDetection);
        }
-@@ -3959,7 +3934,7 @@ ChromeContentBrowserClient::CreateThrott
- 
+@@ -3971,7 +3946,7 @@ ChromeContentBrowserClient::CreateThrott
+       base::BindRepeating(&MaybeTriggerSecurityInterstitialShownEvent));
    throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
        handle,
 -      std::make_unique<CertificateReportingServiceCertReporter>(web_contents),
 +      nullptr,
-       base::Bind(&SSLErrorHandler::HandleSSLError),
-       base::Bind(&IsInHostedApp)));
+       base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp)));
  
-@@ -3981,12 +3956,6 @@ ChromeContentBrowserClient::CreateThrott
+   throttles.push_back(std::make_unique<LoginNavigationThrottle>(handle));
+@@ -3992,12 +3967,6 @@ ChromeContentBrowserClient::CreateThrott
        GooglePasswordManagerNavigationThrottle::MaybeCreateThrottleFor(handle));
  #endif
  
@@ -283,7 +283,7 @@
  }  // namespace
 --- a/chrome/browser/download/chrome_download_manager_delegate.cc
 +++ b/chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -321,13 +321,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
+@@ -327,13 +327,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
  
  void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
    download_manager_ = dm;
@@ -297,7 +297,7 @@
  }
  
  #if defined(OS_ANDROID)
-@@ -633,16 +626,6 @@ void ChromeDownloadManagerDelegate::Choo
+@@ -638,16 +631,6 @@ void ChromeDownloadManagerDelegate::Choo
  
  void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
      base::FilePath* filename) {
@@ -316,7 +316,7 @@
  void ChromeDownloadManagerDelegate::SanitizeDownloadParameters(
 --- a/chrome/browser/download/download_item_model.cc
 +++ b/chrome/browser/download/download_item_model.cc
-@@ -75,7 +75,7 @@ class DownloadItemModelData : public bas
+@@ -78,7 +78,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.
@@ -325,7 +325,7 @@
  
    // Whether the download is currently being revived.
    bool is_being_revived_;
-@@ -112,7 +112,7 @@ DownloadItemModelData::DownloadItemModel
+@@ -115,7 +115,7 @@ DownloadItemModelData::DownloadItemModel
      : should_show_in_shelf_(true),
        was_ui_notified_(false),
        should_prefer_opening_in_browser_(false),
@@ -334,7 +334,7 @@
        is_being_revived_(false) {}
  
  } // namespace
-@@ -388,13 +388,13 @@ void DownloadItemModel::SetShouldPreferO
+@@ -397,13 +397,13 @@ void DownloadItemModel::SetShouldPreferO
    data->should_prefer_opening_in_browser_ = preference;
  }
  
@@ -351,7 +351,7 @@
    DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
    data->danger_level_ = danger_level;
  }
-@@ -546,9 +546,6 @@ bool DownloadItemModel::IsCommandEnabled
+@@ -560,9 +560,6 @@ bool DownloadItemModel::IsCommandEnabled
        // filename. Don't base an "Always open" decision based on it. Also
        // exclude extensions.
        return download_->CanOpenDownload() &&
@@ -403,7 +403,7 @@
      net::HttpContentDisposition content_disposition_header(
          download_->GetContentDisposition(), referrer_charset);
      bool should_replace_extension =
-@@ -1063,29 +1061,7 @@ DownloadFileType::DangerLevel DownloadTa
+@@ -1068,29 +1066,7 @@ DownloadFileType::DangerLevel DownloadTa
        download_->HasUserGesture())
      return DownloadFileType::NOT_DANGEROUS;
  
@@ -444,7 +444,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"
-@@ -1325,9 +1324,6 @@ DownloadsAcceptDangerFunction::Downloads
+@@ -1327,9 +1326,6 @@ DownloadsAcceptDangerFunction::Downloads
  
  DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
  
@@ -454,7 +454,7 @@
  bool DownloadsAcceptDangerFunction::RunAsync() {
    std::unique_ptr<downloads::AcceptDanger::Params> params(
        downloads::AcceptDanger::Params::Create(*args_));
-@@ -1365,40 +1361,7 @@ void DownloadsAcceptDangerFunction::Prom
+@@ -1367,40 +1363,7 @@ void DownloadsAcceptDangerFunction::Prom
      return;
    }
    RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -574,7 +574,7 @@
            referrer_entries)));
 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
-@@ -721,51 +721,9 @@ WebstorePrivateGetReferrerChainFunction:
+@@ -732,51 +732,9 @@ WebstorePrivateGetReferrerChainFunction:
  
  ExtensionFunction::ResponseAction
  WebstorePrivateGetReferrerChainFunction::Run() {
@@ -629,7 +629,7 @@
  WebstorePrivateGetExtensionStatusFunction::
 --- a/chrome/browser/extensions/blacklist_state_fetcher.cc
 +++ b/chrome/browser/extensions/blacklist_state_fetcher.cc
-@@ -32,28 +32,8 @@ BlacklistStateFetcher::~BlacklistStateFe
+@@ -31,28 +31,8 @@ BlacklistStateFetcher::~BlacklistStateFe
  void BlacklistStateFetcher::Request(const std::string& id,
                                      const RequestCallback& callback) {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -660,7 +660,7 @@
  }
  
  void BlacklistStateFetcher::SendRequest(const std::string& id) {
-@@ -64,8 +44,7 @@ void BlacklistStateFetcher::SendRequest(
+@@ -63,8 +43,7 @@ void BlacklistStateFetcher::SendRequest(
    std::string request_str;
    request.SerializeToString(&request_str);
  
@@ -670,7 +670,7 @@
    net::NetworkTrafficAnnotationTag traffic_annotation =
        net::DefineNetworkTrafficAnnotation("extension_blacklist", R"(
          semantics {
-@@ -112,12 +91,6 @@ void BlacklistStateFetcher::SendRequest(
+@@ -111,12 +90,6 @@ void BlacklistStateFetcher::SendRequest(
                       base::Unretained(this), fetcher));
  }
  
@@ -704,7 +704,7 @@
    // SimpleURLLoader -> (owned loader, extension id).
 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc
 +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -767,9 +767,6 @@ void ChromeMetricsServiceClient::Registe
+@@ -776,9 +776,6 @@ void ChromeMetricsServiceClient::Registe
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<HttpsEngagementMetricsProvider>());
  
@@ -728,7 +728,7 @@
  // static
 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -224,7 +224,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -226,7 +226,6 @@ void ChromeBrowserMainExtraPartsProfiles
  #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
    CaptivePortalServiceFactory::GetInstance();
  #endif
@@ -738,7 +738,7 @@
    ClientHintsFactory::GetInstance();
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -91,7 +91,6 @@
+@@ -89,7 +89,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"
@@ -746,7 +746,7 @@
  #include "chrome/browser/sharing/sharing_service_factory.h"
  #include "chrome/browser/signin/identity_manager_factory.h"
  #include "chrome/browser/signin/signin_ui_util.h"
-@@ -581,17 +580,6 @@ void ProfileImpl::LoadPrefsForNormalStar
+@@ -583,17 +582,6 @@ void ProfileImpl::LoadPrefsForNormalStar
  
    mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
        pref_validation_delegate;
@@ -766,7 +766,7 @@
        CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false),
 --- a/chrome/browser/profiles/profiles_state.cc
 +++ b/chrome/browser/profiles/profiles_state.cc
-@@ -227,9 +227,6 @@ void RemoveBrowsingDataForProfile(const 
+@@ -222,9 +222,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.
@@ -794,32 +794,9 @@
  
    if (safe_browsing_mode != 0) {
      # "Safe Browsing Basic" files used for safe browsing in full mode
---- a/chrome/browser/ssl/captive_portal_blocking_page.cc
-+++ b/chrome/browser/ssl/captive_portal_blocking_page.cc
-@@ -222,10 +222,7 @@ void CaptivePortalBlockingPage::Populate
-   load_time_data->SetString("recurrentErrorParagraph", "");
-   load_time_data->SetBoolean("show_recurrent_error_paragraph", false);
- 
--  if (cert_report_helper())
--    cert_report_helper()->PopulateExtendedReportingOption(load_time_data);
--  else
--    load_time_data->SetBoolean(security_interstitials::kDisplayCheckBox, false);
-+  load_time_data->SetBoolean(security_interstitials::kDisplayCheckBox, false);
- }
- 
- void CaptivePortalBlockingPage::CommandReceived(const std::string& command) {
-@@ -240,8 +237,6 @@ void CaptivePortalBlockingPage::CommandR
-   security_interstitials::SecurityInterstitialCommand cmd =
-       static_cast<security_interstitials::SecurityInterstitialCommand>(
-           command_num);
--  cert_report_helper()->HandleReportingCommands(cmd,
--                                                controller()->GetPrefService());
-   switch (cmd) {
-     case security_interstitials::CMD_OPEN_LOGIN:
-       captive_portal::CaptivePortalMetrics::LogCaptivePortalBlockingPageEvent(
 --- a/chrome/browser/ssl/security_state_tab_helper.cc
 +++ b/chrome/browser/ssl/security_state_tab_helper.cc
-@@ -251,92 +251,6 @@ bool SecurityStateTabHelper::UsedPolicyI
+@@ -250,92 +250,6 @@ bool SecurityStateTabHelper::UsedPolicyI
  
  security_state::MaliciousContentStatus
  SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -936,7 +913,7 @@
  void ChromeSubresourceFilterClient::OnReloadRequested() {
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -2764,7 +2764,6 @@ jumbo_static_library("ui") {
+@@ -2814,7 +2814,6 @@ jumbo_static_library("ui") {
        "views/device_chooser_content_view.h",
        "views/devtools_process_observer.cc",
        "views/devtools_process_observer.h",
@@ -946,7 +923,7 @@
        "views/download/download_item_view.cc",
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -256,10 +256,6 @@ void TabHelpers::AttachTabHelpers(WebCon
+@@ -272,10 +272,6 @@ void TabHelpers::AttachTabHelpers(WebCon
    PreviewsUITabHelper::CreateForWebContents(web_contents);
    RecentlyAudibleHelper::CreateForWebContents(web_contents);
    ResourceLoadingHintsWebContentsObserver::CreateForWebContents(web_contents);
@@ -957,7 +934,7 @@
    ReputationWebContentsObserver::CreateForWebContents(web_contents);
    SearchEngineTabHelper::CreateForWebContents(web_contents);
    SecurityStateTabHelper::CreateForWebContents(web_contents);
-@@ -310,7 +306,6 @@ void TabHelpers::AttachTabHelpers(WebCon
+@@ -333,7 +329,6 @@ void TabHelpers::AttachTabHelpers(WebCon
    pdf::PDFWebContentsHelper::CreateForWebContentsWithClient(
        web_contents, std::make_unique<ChromePDFWebContentsHelperClient>());
    SadTabHelper::CreateForWebContents(web_contents);
@@ -989,7 +966,7 @@
    IdSet ids;
  
    for (auto* download : to_remove) {
--    if (download->IsDangerous()) {
+-    if (download->IsDangerous() || download->IsMixedContent()) {
 -      // Don't allow users to revive dangerous downloads; just nuke 'em.
 -      download->Remove();
 -      continue;
@@ -998,7 +975,7 @@
      DownloadItemModel item_model(download);
      if (!item_model.ShouldShowInShelf() ||
          download->GetState() == download::DownloadItem::IN_PROGRESS) {
-@@ -379,32 +369,6 @@ void DownloadsDOMHandler::FinalizeRemova
+@@ -379,44 +369,6 @@ void DownloadsDOMHandler::FinalizeRemova
    }
  }
  
@@ -1025,6 +1002,18 @@
 -  if (!item || item->IsDone())
 -    return;
 -  CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS);
+-
+-  // If a download is mixed content, validate that first. Is most cases, mixed
+-  // content warnings will occur first, but in the worst case scenario, we show
+-  // a dangerous warning twice. That's better than showing a mixed content
+-  // warning, then dismissing the dangerous download warning. Since mixed
+-  // content downloads triggering the UI are temporary and rare to begin with,
+-  // this should very rarely occur.
+-  if (item->IsMixedContent()) {
+-    item->ValidateMixedContentDownload();
+-    return;
+-  }
+-
 -  item->ValidateDangerousDownload();
 -}
 -
@@ -1062,7 +1051,7 @@
    bool IsDeletingHistoryAllowed();
 --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
 +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
-@@ -250,117 +250,6 @@ LookalikeUrlInterstitialPage* CreateLook
+@@ -273,115 +273,6 @@ LookalikeUrlInterstitialPage* CreateLook
                                                       safe_url));
  }
  
@@ -1105,10 +1094,9 @@
 -  resource.is_subresource = request_url != main_frame_url;
 -  resource.is_subframe = false;
 -  resource.threat_type = threat_type;
--  resource.web_contents_getter =
--      security_interstitials::UnsafeResource::GetWebContentsGetter(
--          web_contents->GetMainFrame()->GetProcess()->GetID(),
--          web_contents->GetMainFrame()->GetRoutingID());
+-  resource.web_contents_getter = security_interstitials::GetWebContentsGetter(
+-      web_contents->GetMainFrame()->GetProcess()->GetID(),
+-      web_contents->GetMainFrame()->GetRoutingID());
 -  resource.threat_source = g_browser_process->safe_browsing_service()
 -                               ->database_manager()
 -                               ->GetThreatSource();
@@ -1157,10 +1145,9 @@
 -  resource.is_subresource = request_url != main_frame_url;
 -  resource.is_subframe = false;
 -  resource.threat_type = threat_type;
--  resource.web_contents_getter =
--      security_interstitials::UnsafeResource::GetWebContentsGetter(
--          web_contents->GetMainFrame()->GetProcess()->GetID(),
--          web_contents->GetMainFrame()->GetRoutingID());
+-  resource.web_contents_getter = security_interstitials::GetWebContentsGetter(
+-      web_contents->GetMainFrame()->GetProcess()->GetID(),
+-      web_contents->GetMainFrame()->GetRoutingID());
 -  resource.threat_source = g_browser_process->safe_browsing_service()
 -                               ->database_manager()
 -                               ->GetThreatSource();
@@ -1180,16 +1167,16 @@
  #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
  CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage(
      content::WebContents* web_contents) {
-@@ -473,8 +362,6 @@ void InterstitialHTMLSource::StartDataRe
-   } else if (path_without_query == "/blocked-interception") {
-     interstitial_delegate.reset(
+@@ -497,8 +388,6 @@ void InterstitialHTMLSource::StartDataRe
          CreateBlockedInterceptionBlockingPage(web_contents));
+   } else if (path_without_query == "/legacy-tls") {
+     interstitial_delegate.reset(CreateLegacyTLSBlockingPage(web_contents));
 -  } else if (path_without_query == "/safebrowsing") {
 -    interstitial_delegate.reset(CreateSafeBrowsingBlockingPage(web_contents));
    } else if (path_without_query == "/clock") {
      interstitial_delegate.reset(CreateBadClockBlockingPage(web_contents));
    } else if (path_without_query == "/lookalike") {
-@@ -486,13 +373,6 @@ void InterstitialHTMLSource::StartDataRe
+@@ -510,13 +399,6 @@ void InterstitialHTMLSource::StartDataRe
    } else if (path_without_query == "/origin_policy") {
      interstitial_delegate.reset(
          CreateOriginPolicyInterstitialPage(web_contents));
@@ -1206,24 +1193,13 @@
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
 @@ -86,7 +86,6 @@
- #include "components/page_load_metrics/renderer/metrics_render_frame_observer.h"
+ #include "components/paint_preview/buildflags/buildflags.h"
  #include "components/pdf/renderer/pepper_pdf_host.h"
  #include "components/safe_browsing/buildflags.h"
--#include "components/safe_browsing/renderer/threat_dom_details.h"
+-#include "components/safe_browsing/content/renderer/threat_dom_details.h"
  #include "components/spellcheck/spellcheck_buildflags.h"
- #include "components/startup_metric_utils/common/startup_metric.mojom.h"
  #include "components/subresource_filter/content/renderer/subresource_filter_agent.h"
---- a/components/safe_browsing/features.cc
-+++ b/components/safe_browsing/features.cc
-@@ -87,7 +87,7 @@ constexpr base::FeatureParam<bool> kShou
-     &kPasswordProtectionForSignedInUsers, "DeprecateOldProto", false};
- 
- const base::Feature kSuspiciousSiteTriggerQuotaFeature{
--    "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_DISABLED_BY_DEFAULT};
- 
- const base::Feature kThreatDomDetailsTagAndAttributeFeature{
-     "ThreatDomDetailsTagAttributes", base::FEATURE_DISABLED_BY_DEFAULT};
+ #include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h"
 --- a/components/security_interstitials/content/cert_report_helper.cc
 +++ b/components/security_interstitials/content/cert_report_helper.cc
 @@ -160,7 +160,6 @@ void CertReportHelper::FinishCertCollect

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

@@ -10,7 +10,7 @@
  #if defined(OS_CHROMEOS)
 --- a/chrome/browser/extensions/component_loader.cc
 +++ b/chrome/browser/extensions/component_loader.cc
-@@ -338,11 +338,6 @@ void ComponentLoader::AddWebStoreApp() {
+@@ -347,11 +347,6 @@ void ComponentLoader::AddWebStoreApp() {
    if (!IsNormalSession())
      return;
  #endif
@@ -22,7 +22,7 @@
  }
  
  #if defined(OS_CHROMEOS)
-@@ -447,11 +442,6 @@ void ComponentLoader::AddDefaultComponen
+@@ -455,11 +450,6 @@ void ComponentLoader::AddDefaultComponen
    AddKeyboardApp();
  #else  // defined(OS_CHROMEOS)
    DCHECK(!skip_session_components);
@@ -34,7 +34,7 @@
  #endif  // defined(OS_CHROMEOS)
  
    if (!skip_session_components) {
-@@ -526,13 +516,6 @@ void ComponentLoader::AddDefaultComponen
+@@ -533,13 +523,6 @@ void ComponentLoader::AddDefaultComponen
      AddHangoutServicesExtension();
  #endif  // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
  

patches/core/inox-patchset/0010-disable-gcm-status-check.patch

@@ -1,83 +0,0 @@
---- a/components/gcm_driver/gcm_channel_status_request.cc
-+++ b/components/gcm_driver/gcm_channel_status_request.cc
-@@ -23,8 +23,6 @@ namespace gcm {
- 
- namespace {
- 
--const char kRequestContentType[] = "application/octet-stream";
--const char kGCMChannelTag[] = "gcm_channel";
- const int kDefaultPollIntervalSeconds = 60 * 60;  // 60 minutes.
- const int kMinPollIntervalSeconds = 30 * 60;  // 30 minutes.
- 
-@@ -55,69 +53,8 @@ int GCMChannelStatusRequest::min_poll_in
- }
- 
- void GCMChannelStatusRequest::Start() {
--  // url_loader_factory_ can be null for tests.
--  if (!url_loader_factory_)
--    return;
--
--  DCHECK(!simple_url_loader_);
--
--  GURL request_url(channel_status_request_url_);
--
--  sync_pb::ExperimentStatusRequest proto_data;
--  proto_data.add_experiment_name(kGCMChannelTag);
--  std::string upload_data;
--  if (!proto_data.SerializeToString(&upload_data)) {
--     NOTREACHED();
--  }
--
--  net::NetworkTrafficAnnotationTag traffic_annotation =
--      net::DefineNetworkTrafficAnnotation("gcm_channel_status_request", R"(
--        semantics {
--          sender: "GCM Driver"
--          description:
--            "Google Chrome interacts with Google Cloud Messaging to receive "
--            "push messages for various browser features, as well as on behalf "
--            "of websites and extensions. The channel status request "
--            "periodically confirms with Google servers whether the feature "
--            "should be enabled."
--          trigger:
--            "Periodically when Chrome has established an active Google Cloud "
--            "Messaging subscription. The first request will be issued a minute "
--            "after the first subscription activates. Subsequent requests will "
--            "be issued each hour with a jitter of 15 minutes. Google can "
--            "adjust this interval when it deems necessary."
--          data:
--            "A user agent string containing the Chrome version, channel and "
--            "platform will be sent to the server. No user identifier is sent "
--            "along with the request."
--          destination: GOOGLE_OWNED_SERVICE
--        }
--        policy {
--          cookies_allowed: NO
--          setting:
--            "Support for interacting with Google Cloud Messaging is enabled by "
--            "default, and there is no configuration option to completely "
--            "disable it. Websites wishing to receive push messages must "
--            "acquire express permission from the user for the 'Notification' "
--            "permission."
--          policy_exception_justification:
--            "Not implemented, considered not useful."
--        })");
--
--  auto resource_request = std::make_unique<network::ResourceRequest>();
--
--  resource_request->url = request_url;
--  resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
--  resource_request->method = "POST";
--  resource_request->headers.SetHeader(net::HttpRequestHeaders::kUserAgent,
--                                      user_agent_);
--  simple_url_loader_ = network::SimpleURLLoader::Create(
--      std::move(resource_request), traffic_annotation);
--  simple_url_loader_->AttachStringForUpload(upload_data, kRequestContentType);
--  simple_url_loader_->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
--      url_loader_factory_.get(),
--      base::BindOnce(&GCMChannelStatusRequest::OnSimpleLoaderComplete,
--                     base::Unretained(this)));
-+  // Simulate an empty response and disable GCM.
-+  callback_.Run(false, false, 0);
- }
- 
- void GCMChannelStatusRequest::OnSimpleLoaderComplete(

patches/core/inox-patchset/0014-disable-translation-lang-fetch.patch

@@ -49,7 +49,7 @@
 +      is_previous_language_matches_override_enabled_(false) {
    if (is_query_enabled_ || is_enforcement_enabled_) {
      model_loader_ = std::make_unique<assist_ranker::RankerModelLoaderImpl>(
-         base::Bind(&ValidateModel),
+         base::BindRepeating(&ValidateModel),
 @@ -237,6 +233,8 @@ bool TranslateRankerImpl::ShouldOfferTra
    // (or become False).
    const bool kDefaultResponse = true;

patches/core/inox-patchset/0017-disable-new-avatar-menu.patch

@@ -1,6 +1,6 @@
 --- a/components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc
 +++ b/components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc
-@@ -80,7 +80,7 @@ void PrimaryAccountPolicyManagerImpl::On
+@@ -81,7 +81,7 @@ void PrimaryAccountPolicyManagerImpl::On
  }
  
  bool PrimaryAccountPolicyManagerImpl::IsSigninAllowed() const {

patches/core/inox-patchset/chromium-exclude_unwind_tables.patch

@@ -1,31 +0,0 @@
---- a/build/config/compiler/compiler.gni
-+++ b/build/config/compiler/compiler.gni
-@@ -82,19 +82,19 @@ declare_args() {
-   # is_component_build=false. Very large debug symbols can have unwanted side
-   # effects so this is enforced by default for chromium.
-   forbid_non_component_debug_builds = build_with_chromium
-+
-+  # Exclude unwind tables for official builds as unwinding can be done from stack
-+  # dumps produced by Crashpad at a later time "offline" in the crash server.
-+  # For unofficial (e.g. development) builds and non-Chrome branded (e.g. Cronet
-+  # which doesn't use Crashpad, crbug.com/479283) builds it's useful to be able
-+  # to unwind at runtime.
-+  exclude_unwind_tables =
-+      is_official_build || (is_chromecast && !is_cast_desktop_build &&
-+                            !is_debug && !cast_is_debug && !is_fuchsia)
- }
- 
- assert(!is_cfi || use_thin_lto, "CFI requires ThinLTO")
- 
--# Exclude unwind tables for official builds as unwinding can be done from stack
--# dumps produced by Crashpad at a later time "offline" in the crash server.
--# For unofficial (e.g. development) builds and non-Chrome branded (e.g. Cronet
--# which doesn't use Crashpad, crbug.com/479283) builds it's useful to be able
--# to unwind at runtime.
--exclude_unwind_tables =
--    is_official_build || (is_chromecast && !is_cast_desktop_build &&
--                          !is_debug && !cast_is_debug && !is_fuchsia)
--
- # If true, optimize for size. Does not affect windows builds.
- # Linux & Mac favor speed over size.
- # TODO(brettw) it's weird that Mac and desktop Linux are different. We should

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

@@ -159,7 +159,7 @@ by default.
  // elements of |list| equals |hash|.
 --- a/chrome/browser/extensions/install_signer.cc
 +++ b/chrome/browser/extensions/install_signer.cc
-@@ -65,7 +65,7 @@ const int kSignatureFormatVersion = 2;
+@@ -66,7 +66,7 @@ const int kSignatureFormatVersion = 2;
  const size_t kSaltBytes = 32;
  
  const char kBackendUrl[] =
@@ -170,13 +170,15 @@ by default.
      "-----BEGIN PUBLIC KEY-----"                                        \
 --- a/chrome/browser/nacl_host/nacl_infobar_delegate.cc
 +++ b/chrome/browser/nacl_host/nacl_infobar_delegate.cc
-@@ -42,5 +42,5 @@ base::string16 NaClInfoBarDelegate::GetL
+@@ -32,7 +32,7 @@ base::string16 NaClInfoBarDelegate::GetL
  }
  
  GURL NaClInfoBarDelegate::GetLinkURL() const {
 -  return GURL("https://support.google.com/chrome/?p=ib_nacl");
 +  return GURL("trk:143:https://support.google.com/chrome/?p=ib_nacl");
  }
+ 
+ base::string16 NaClInfoBarDelegate::GetMessageText() const {
 --- a/chrome/browser/profiles/profile_avatar_downloader.cc
 +++ b/chrome/browser/profiles/profile_avatar_downloader.cc
 @@ -18,7 +18,7 @@
@@ -190,7 +192,7 @@ by default.
  ProfileAvatarDownloader::ProfileAvatarDownloader(
 --- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/prefs.js
 +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/prefs.js
-@@ -86,9 +86,9 @@ ChromeVoxPrefs.DEFAULT_PREFS = {
+@@ -219,9 +219,9 @@ ChromeVoxPrefs.DEFAULT_PREFS = {
    'position': '{}',
    'siteSpecificEnhancements': true,
    'siteSpecificScriptBase':
@@ -225,15 +227,12 @@ by default.
  
 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc
 +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
-@@ -70,9 +70,9 @@ const int ClientSideDetectionService::kN
+@@ -56,7 +56,7 @@ const int ClientSideDetectionService::kN
  const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30;
  
  const char ClientSideDetectionService::kClientReportPhishingUrl[] =
 -    "https://sb-ssl.google.com/safebrowsing/clientreport/phishing";
 +    "trk:148:https://sb-ssl.google.com/safebrowsing/clientreport/phishing";
- const char ClientSideDetectionService::kClientReportMalwareUrl[] =
--    "https://sb-ssl.google.com/safebrowsing/clientreport/malware-check";
-+    "trk:149:https://sb-ssl.google.com/safebrowsing/clientreport/malware-check";
  
  struct ClientSideDetectionService::ClientPhishingReportInfo {
    std::unique_ptr<network::SimpleURLLoader> loader;
@@ -272,7 +271,7 @@ by default.
  
 --- a/chrome/browser/tracing/crash_service_uploader.cc
 +++ b/chrome/browser/tracing/crash_service_uploader.cc
-@@ -41,7 +41,7 @@ using std::string;
+@@ -40,7 +40,7 @@ using std::string;
  
  namespace {
  
@@ -332,7 +331,7 @@ by default.
  
 --- a/chrome/common/url_constants.cc
 +++ b/chrome/common/url_constants.cc
-@@ -249,7 +249,7 @@ const char kSyncErrorsHelpURL[] =
+@@ -248,7 +248,7 @@ const char kSyncErrorsHelpURL[] =
      "https://support.google.com/chrome/?p=settings_sync_error";
  
  const char kSyncGoogleDashboardURL[] =
@@ -341,15 +340,15 @@ by default.
  
  const char kSyncLearnMoreURL[] =
      "https://support.google.com/chrome/?p=settings_sign_in";
-@@ -353,7 +353,7 @@ const char kNaturalScrollHelpURL[] =
+@@ -355,7 +355,7 @@ const char kNaturalScrollHelpURL[] =
  const char kOemEulaURLPath[] = "oem";
  
  const char kOnlineEulaURLPath[] =
 -    "https://www.google.com/intl/%s/chrome/eula_text.html";
 +    "trk:250:https://www.google.com/intl/%s/chrome/eula_text.html";
  
- const char kTPMFirmwareUpdateLearnMoreURL[] =
-     "https://support.google.com/chromebook/?p=tpm_update";
+ const char kOsSettingsSearchHelpURL[] =
+     "https://support.google.com/chromebook/?p=settings_search_help";
 --- a/chrome/installer/setup/google_chrome_behaviors.cc
 +++ b/chrome/installer/setup/google_chrome_behaviors.cc
 @@ -44,7 +44,7 @@ base::string16 LocalizeUrl(const wchar_t
@@ -523,7 +522,7 @@ by default.
  
 --- a/components/password_manager/core/browser/password_store.cc
 +++ b/components/password_manager/core/browser/password_store.cc
-@@ -239,10 +239,10 @@ void PasswordStore::GetLogins(const Form
+@@ -258,10 +258,10 @@ void PasswordStore::GetLogins(const Form
    // TODO(mdm): actually delete them at some point, say M24 or so.
    base::Time cutoff;  // the null time
    if (form.scheme == PasswordForm::Scheme::kHtml &&
@@ -551,7 +550,7 @@ by default.
  
 --- a/components/policy/resources/policy_templates.json
 +++ b/components/policy/resources/policy_templates.json
-@@ -3910,7 +3910,7 @@
+@@ -3937,7 +3937,7 @@
          'dynamic_refresh': True,
          'per_profile': True,
        },
@@ -560,7 +559,7 @@ by default.
        'id': 34,
        'caption': '''Configure the list of force-installed apps and extensions''',
        'tags': ['full-admin-access'],
-@@ -8174,7 +8174,7 @@
+@@ -8269,7 +8269,7 @@
        'features': {
          'dynamic_refresh': True,
        },
@@ -593,7 +592,7 @@ by default.
  
 --- a/components/search_engines/prepopulated_engines.json
 +++ b/components/search_engines/prepopulated_engines.json
-@@ -105,7 +105,7 @@
+@@ -115,7 +115,7 @@
      "google": {
        "name": "Google",
        "keyword": "google.com",

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

@@ -27,7 +27,7 @@ the URL so we get notified if this happens again in the future).
      kSafeBrowsingIncidentTrafficAnnotation =
 --- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
 +++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
-@@ -311,11 +311,7 @@ IncidentReportingService::UploadContext:
+@@ -301,11 +301,7 @@ IncidentReportingService::UploadContext:
  
  // static
  bool IncidentReportingService::IsEnabledForProfile(Profile* profile) {
@@ -42,7 +42,7 @@ the URL so we get notified if this happens again in the future).
  IncidentReportingService::IncidentReportingService(
 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
 +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
-@@ -62,8 +62,7 @@ class SafeBrowsingBlockingPageFactoryImp
+@@ -64,8 +64,7 @@ class SafeBrowsingBlockingPageFactoryImp
      PrefService* prefs =
          Profile::FromBrowserContext(web_contents->GetBrowserContext())
              ->GetPrefs();

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

@@ -13,20 +13,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
 
 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc
 +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
-@@ -61,12 +61,6 @@ enum MalwareReportTypes {
-   REPORT_RESULT_MAX
- };
- 
--void UpdateEnumUMAHistogram(MalwareReportTypes report_type) {
--  DCHECK(report_type >= 0 && report_type < REPORT_RESULT_MAX);
--  UMA_HISTOGRAM_ENUMERATION("SBClientMalware.SentReports", report_type,
--                            REPORT_RESULT_MAX);
--}
--
- }  // namespace
- 
- const int ClientSideDetectionService::kInitialClientModelFetchDelayMs = 10000;
-@@ -271,94 +265,8 @@ void ClientSideDetectionService::StartCl
+@@ -218,94 +218,8 @@ void ClientSideDetectionService::StartCl
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
    std::unique_ptr<ClientPhishingRequest> request(verdict);
  
@@ -122,88 +109,4 @@ This prevents trk:148 (phishing) and trk:149 (malware).
 +    callback.Run(GURL(request->url()), false);
  }
  
- void ClientSideDetectionService::StartClientReportMalwareRequest(
-@@ -367,81 +275,8 @@ void ClientSideDetectionService::StartCl
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-   std::unique_ptr<ClientMalwareRequest> request(verdict);
- 
--  if (!enabled_) {
--    if (!callback.is_null())
--      callback.Run(GURL(request->url()), GURL(request->url()), false);
--    return;
--  }
--
--  std::string request_data;
--  if (!request->SerializeToString(&request_data)) {
--    UpdateEnumUMAHistogram(REPORT_FAILED_SERIALIZATION);
--    DVLOG(1) << "Unable to serialize the CSD request. Proto file changed?";
--    if (!callback.is_null())
--      callback.Run(GURL(request->url()), GURL(request->url()), false);
--    return;
--  }
--
--  net::NetworkTrafficAnnotationTag traffic_annotation =
--      net::DefineNetworkTrafficAnnotation(
--          "safe_browsing_client_side_malware_detector", R"(
--          semantics {
--            sender: "Safe Browsing Client-Side Malware Detector"
--            description:
--              "If the client-side malware detector determines that a requested "
--              "page's IP is in the blacklisted malware IPs, it will send a "
--              "request to Safe Browsing to ask for a final verdict. If Safe "
--              "Browsing agrees the page is dangerous, Chrome will show a "
--              "full-page interstitial warning."
--            trigger:
--              "Whenever the IP of the page is in malware blacklist."
--            data:
--              "Top-level page URL without CGI parameters, its non-https "
--              "referrer, URLs of resources that match IP blacklist."
--            destination: GOOGLE_OWNED_SERVICE
--          }
--          policy {
--            cookies_allowed: YES
--            cookies_store: "Safe browsing cookie store"
--            setting:
--              "Users can enable or disable this feature by toggling 'Protect "
--              "you and your device from dangerous sites' in Chrome settings "
--              "under Privacy. This feature is enabled by default."
--            chrome_policy {
--              SafeBrowsingEnabled {
--                policy_options {mode: MANDATORY}
--                SafeBrowsingEnabled: false
--              }
--            }
--          })");
--  auto resource_request = std::make_unique<network::ResourceRequest>();
--  resource_request->url = GetClientReportUrl(kClientReportMalwareUrl);
--  resource_request->method = "POST";
--  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
--  auto loader = network::SimpleURLLoader::Create(std::move(resource_request),
--                                                 traffic_annotation);
--  loader->AttachStringForUpload(request_data, "application/octet-stream");
--  loader->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
--      url_loader_factory_.get(),
--      base::BindOnce(&ClientSideDetectionService::OnURLLoaderComplete,
--                     base::Unretained(this), loader.get()));
--
--  // Remember which callback and URL correspond to the current fetcher object.
--  std::unique_ptr<ClientMalwareReportInfo> info(new ClientMalwareReportInfo);
--  auto* loader_ptr = loader.get();
--  info->loader = std::move(loader);
--  info->callback = callback;
--  info->original_url = GURL(request->url());
--  client_malware_reports_[loader_ptr] = std::move(info);
--
--  UMA_HISTOGRAM_ENUMERATION("SBClientMalware.SentReports", REPORT_SENT,
--                            REPORT_RESULT_MAX);
--
--  UMA_HISTOGRAM_COUNTS_1M("SBClientMalware.IPBlacklistRequestPayloadSize",
--                          request_data.size());
--
--  // Record that we made a malware request
--  malware_report_times_.push(base::Time::Now());
-+  if (!callback.is_null())
-+    callback.Run(GURL(request->url()), GURL(request->url()), false);
- }
- 
  void ClientSideDetectionService::HandlePhishingVerdict(

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

@@ -23,7 +23,7 @@
        url.SchemeIs(dom_distiller::kDomDistillerScheme) ||
 --- a/chrome/browser/ui/singleton_tabs.cc
 +++ b/chrome/browser/ui/singleton_tabs.cc
-@@ -100,7 +100,8 @@ int GetIndexOfExistingTab(Browser* brows
+@@ -99,7 +99,8 @@ int GetIndexOfExistingTab(Browser* brows
  
      // Skip view-source tabs. This is needed because RewriteURLIfNecessary
      // removes the "view-source:" scheme which leads to incorrect matching.
@@ -33,35 +33,6 @@
        continue;
  
      GURL rewritten_tab_url = tab_url;
---- a/chromecast/browser/url_request_context_factory.cc
-+++ b/chromecast/browser/url_request_context_factory.cc
-@@ -40,6 +40,7 @@
- #include "net/proxy_resolution/proxy_resolution_service.h"
- #include "net/quic/quic_context.h"
- #include "net/ssl/ssl_config_service_defaults.h"
-+#include "net/url_request/trk_protocol_handler.h"
- #include "net/url_request/url_request_context.h"
- #include "net/url_request/url_request_context_builder.h"
- #include "net/url_request/url_request_context_getter.h"
-@@ -248,13 +249,17 @@ void URLRequestContextFactory::Initializ
-       new net::URLRequestJobFactoryImpl());
-   // Keep ProtocolHandlers added in sync with
-   // CastContentBrowserClient::IsHandledURL().
-+  bool set_protocol = false;
-   for (content::ProtocolHandlerMap::iterator it = protocol_handlers->begin();
-        it != protocol_handlers->end();
-        ++it) {
--    bool set_protocol =
-+    set_protocol =
-         job_factory->SetProtocolHandler(it->first, std::move(it->second));
-     DCHECK(set_protocol);
-   }
-+  set_protocol = job_factory->SetProtocolHandler(
-+      url::kTraceScheme, base::WrapUnique(new net::TrkProtocolHandler));
-+  DCHECK(set_protocol);
- 
-   // Set up interceptors in the reverse order.
-   std::unique_ptr<net::URLRequestJobFactory> top_job_factory =
 --- a/components/omnibox/browser/autocomplete_input.cc
 +++ b/components/omnibox/browser/autocomplete_input.cc
 @@ -496,7 +496,8 @@ void AutocompleteInput::ParseForEmphasiz
@@ -87,7 +58,7 @@
    return url::FindAndCompareScheme(utf8_input, url::kHttpScheme, nullptr);
 --- a/components/url_formatter/url_fixer.cc
 +++ b/components/url_formatter/url_fixer.cc
-@@ -552,6 +552,10 @@ GURL FixupURL(const std::string& text, c
+@@ -566,6 +566,10 @@ GURL FixupURL(const std::string& text, c
      }
    }
  
@@ -100,7 +71,7 @@
      return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
 --- a/content/browser/child_process_security_policy_impl.cc
 +++ b/content/browser/child_process_security_policy_impl.cc
-@@ -617,6 +617,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
+@@ -620,6 +620,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
  #endif  // BUILDFLAG(ENABLE_WEBSOCKETS)
    RegisterWebSafeScheme(url::kFtpScheme);
    RegisterWebSafeScheme(url::kDataScheme);
@@ -110,7 +81,7 @@
    // TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1662,6 +1662,8 @@ component("net") {
+@@ -1075,6 +1075,8 @@ component("net") {
        "url_request/report_sender.h",
        "url_request/static_http_user_agent_settings.cc",
        "url_request/static_http_user_agent_settings.h",
@@ -225,7 +196,7 @@
  #include "net/url_request/url_request_context.h"
  #include "net/url_request/url_request_context_storage.h"
  #include "net/url_request/url_request_intercepting_job_factory.h"
-@@ -629,6 +630,9 @@ std::unique_ptr<URLRequestContext> URLRe
+@@ -628,6 +629,9 @@ std::unique_ptr<URLRequestContext> URLRe
    }
    protocol_handlers_.clear();
  
@@ -257,7 +228,7 @@
  
 --- a/url/url_util.cc
 +++ b/url/url_util.cc
-@@ -49,7 +49,7 @@ struct SchemeRegistry {
+@@ -54,7 +54,7 @@ struct SchemeRegistry {
  
    // Schemes that do not trigger mixed content warning.
    std::vector<std::string> secure_schemes = {
@@ -266,7 +237,7 @@
    };
  
    // Schemes that normal pages cannot link to or access (i.e., with the same
-@@ -64,6 +64,7 @@ struct SchemeRegistry {
+@@ -69,6 +69,7 @@ struct SchemeRegistry {
        kAboutScheme,
        kJavaScriptScheme,
        kDataScheme,

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

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/tracing/crash_service_uploader.cc
 +++ b/chrome/browser/tracing/crash_service_uploader.cc
-@@ -130,11 +130,16 @@ void TraceCrashServiceUploader::DoUpload
+@@ -129,11 +129,16 @@ void TraceCrashServiceUploader::DoUpload
    progress_callback_ = progress_callback;
    done_callback_ = std::move(done_callback);
  
@@ -24,7 +24,7 @@
  }
  
  void TraceCrashServiceUploader::DoCompressOnBackgroundThread(
-@@ -307,6 +312,7 @@ bool TraceCrashServiceUploader::Compress
+@@ -306,6 +311,7 @@ bool TraceCrashServiceUploader::Compress
  void TraceCrashServiceUploader::CreateAndStartURLLoader(
      const std::string& upload_url,
      const std::string& post_data) {

patches/core/ungoogled-chromium/disable-domain-reliability.patch

@@ -29,7 +29,7 @@
    ]
  
    output_file = "$target_gen_dir/baked_in_configs.cc"
-@@ -39,13 +19,21 @@ action("bake_in_configs") {
+@@ -37,13 +17,21 @@ action("bake_in_configs") {
  
    # The JSON file list is too long for the command line on Windows, so put
    # them in a response file.

patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch

@@ -2,7 +2,7 @@
 
 --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
 +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
-@@ -295,7 +295,7 @@ bool DomDistillerViewerSource::ShouldSer
+@@ -294,7 +294,7 @@ bool DomDistillerViewerSource::ShouldSer
  }
  
  std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc() {
@@ -24,7 +24,7 @@
      .english :lang(zh) {display: none}
 --- a/components/dom_distiller/core/javascript/dom_distiller_viewer.js
 +++ b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
-@@ -132,7 +132,7 @@ function maybeSetWebFont() {
+@@ -116,7 +116,7 @@ function maybeSetWebFont() {
    }
  
    const e = document.createElement('link');

patches/core/ungoogled-chromium/disable-gaia.patch

@@ -3,7 +3,7 @@
 
 --- a/chrome/browser/browser_resources.grd
 +++ b/chrome/browser/browser_resources.grd
-@@ -173,7 +173,6 @@
+@@ -142,7 +142,6 @@
        <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_login.html" compress="gzip" flattenhtml="true" allowexternalscript="true" type="BINDATA" preprocess="true" />
        <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_login.css" compress="gzip" flattenhtml="true" type="BINDATA" preprocess="true" />
        <include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_login.js" compress="gzip" flattenhtml="true" type="BINDATA" />
@@ -23,7 +23,7 @@
    source->AddLocalizedString(
 --- a/google_apis/gaia/gaia_auth_fetcher.cc
 +++ b/google_apis/gaia/gaia_auth_fetcher.cc
-@@ -296,64 +296,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
+@@ -293,65 +293,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
      network::mojom::CredentialsMode credentials_mode,
      const net::NetworkTrafficAnnotationTag& traffic_annotation) {
    DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
@@ -35,9 +35,10 @@
 -  if (credentials_mode != network::mojom::CredentialsMode::kOmit) {
 -    DCHECK_EQ(GaiaUrls::GetInstance()->gaia_url(), gaia_gurl.GetOrigin())
 -        << gaia_gurl;
--    resource_request->site_for_cookies = GaiaUrls::GetInstance()->gaia_url();
 -    url::Origin origin =
 -        url::Origin::Create(GaiaUrls::GetInstance()->gaia_url());
+-    resource_request->site_for_cookies =
+-        net::SiteForCookies::FromOrigin(origin);
 -    resource_request->trusted_params =
 -        network::ResourceRequest::TrustedParams();
 -    resource_request->trusted_params->network_isolation_key =

patches/core/ungoogled-chromium/disable-google-host-detection.patch

@@ -2,18 +2,18 @@
 
 --- a/chrome/common/google_url_loader_throttle.cc
 +++ b/chrome/common/google_url_loader_throttle.cc
-@@ -9,10 +9,6 @@
- #include "services/network/public/cpp/resource_response.h"
+@@ -10,10 +10,6 @@
+ #include "components/variations/net/variations_http_headers.h"
  #include "services/network/public/mojom/url_response_head.mojom.h"
  
 -#if BUILDFLAG(ENABLE_EXTENSIONS)
 -#include "extensions/common/extension_urls.h"
 -#endif
 -
- GoogleURLLoaderThrottle::GoogleURLLoaderThrottle(
-     bool is_off_the_record,
-     chrome::mojom::DynamicParams dynamic_params)
-@@ -26,36 +22,6 @@ void GoogleURLLoaderThrottle::DetachFrom
+ namespace {
+ 
+ #if defined(OS_ANDROID)
+@@ -42,43 +38,6 @@ void GoogleURLLoaderThrottle::DetachFrom
  void GoogleURLLoaderThrottle::WillStartRequest(
      network::ResourceRequest* request,
      bool* defer) {
@@ -47,10 +47,17 @@
 -    request->headers.SetHeader(safe_search_util::kGoogleAppsAllowedDomains,
 -                               dynamic_params_.allowed_domains_for_apps);
 -  }
+-
+-#if defined(OS_ANDROID)
+-  if (!client_data_header_.empty() &&
+-      google_util::IsGoogleAssociatedDomainUrl(request->url)) {
+-    request->headers.SetHeader(kClientDataHeader, client_data_header_);
+-  }
+-#endif
  }
  
  void GoogleURLLoaderThrottle::WillRedirectRequest(
-@@ -64,32 +30,6 @@ void GoogleURLLoaderThrottle::WillRedire
+@@ -87,39 +46,6 @@ void GoogleURLLoaderThrottle::WillRedire
      bool* /* defer */,
      std::vector<std::string>* to_be_removed_headers,
      net::HttpRequestHeaders* modified_headers) {
@@ -80,10 +87,17 @@
 -    modified_headers->SetHeader(safe_search_util::kGoogleAppsAllowedDomains,
 -                                dynamic_params_.allowed_domains_for_apps);
 -  }
+-
+-#if defined(OS_ANDROID)
+-  if (!client_data_header_.empty() &&
+-      !google_util::IsGoogleAssociatedDomainUrl(redirect_info->new_url)) {
+-    to_be_removed_headers->push_back(kClientDataHeader);
+-  }
+-#endif
  }
  
  #if BUILDFLAG(ENABLE_EXTENSIONS)
-@@ -97,17 +37,5 @@ void GoogleURLLoaderThrottle::WillProces
+@@ -127,17 +53,5 @@ void GoogleURLLoaderThrottle::WillProces
      const GURL& response_url,
      network::mojom::URLResponseHead* response_head,
      bool* defer) {
@@ -458,7 +472,7 @@
  bool IsGoogleHostname(const GURL& url) {
 --- a/components/search_engines/template_url.cc
 +++ b/components/search_engines/template_url.cc
-@@ -505,11 +505,7 @@ base::string16 TemplateURLRef::SearchTer
+@@ -507,11 +507,7 @@ base::string16 TemplateURLRef::SearchTer
  bool TemplateURLRef::HasGoogleBaseURLs(
      const SearchTermsData& search_terms_data) const {
    ParseIfNecessary(search_terms_data);
@@ -473,7 +487,7 @@
  bool TemplateURLRef::ExtractSearchTermsFromURL(
 --- a/components/variations/net/variations_http_headers.cc
 +++ b/components/variations/net/variations_http_headers.cc
-@@ -28,10 +28,6 @@ namespace variations {
+@@ -27,10 +27,6 @@ namespace variations {
  
  namespace {
  
@@ -484,7 +498,7 @@
  // The result of checking if a URL should have variations headers appended.
  // This enum is used to record UMA histogram values, and should not be
  // reordered.
-@@ -88,26 +84,7 @@ class VariationsHeaderHelper {
+@@ -87,26 +83,7 @@ class VariationsHeaderHelper {
    }
  
    bool AppendHeaderIfNeeded(const GURL& url, InIncognito incognito) {
@@ -512,7 +526,7 @@
    }
  
   private:
-@@ -150,8 +127,6 @@ void RemoveVariationsHeaderIfNeeded(
+@@ -149,8 +126,6 @@ void RemoveVariationsHeaderIfNeeded(
      const net::RedirectInfo& redirect_info,
      const network::mojom::URLResponseHead& response_head,
      std::vector<std::string>* to_be_removed_headers) {
@@ -521,7 +535,7 @@
  }
  
  std::unique_ptr<network::SimpleURLLoader>
-@@ -181,11 +156,11 @@ CreateSimpleURLLoaderWithVariationsHeade
+@@ -180,11 +155,11 @@ CreateSimpleURLLoaderWithVariationsHeade
  }
  
  bool IsVariationsHeader(const std::string& header_name) {
@@ -535,7 +549,7 @@
  }
  
  bool ShouldAppendVariationsHeaderForTesting(const GURL& url) {
-@@ -194,7 +169,6 @@ bool ShouldAppendVariationsHeaderForTest
+@@ -193,7 +168,6 @@ bool ShouldAppendVariationsHeaderForTest
  
  void UpdateCorsExemptHeaderForVariations(
      network::mojom::NetworkContextParams* params) {

patches/core/ungoogled-chromium/disable-mei-preload.patch

@@ -7,7 +7,7 @@
 
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -358,7 +358,6 @@ if (!is_android && !is_mac) {
+@@ -335,7 +335,6 @@ if (!is_android && !is_mac) {
      }
  
      data_deps += [
@@ -15,8 +15,8 @@
        "//third_party/widevine/cdm",
      ]
  
-@@ -1214,7 +1213,6 @@ if (is_win) {
-       ":packed_resources",
+@@ -1109,7 +1108,6 @@ if (is_win) {
+       ":keystone_registration_framework",
        ":swiftshader_library",
        ":widevine_cdm_library",
 -      "//chrome/browser/resources/media/mei_preload:component_bundle",

patches/core/ungoogled-chromium/disable-signin.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/ui/chrome_pages.cc
 +++ b/chrome/browser/ui/chrome_pages.cc
-@@ -509,23 +509,6 @@ GURL GetOSSettingsUrl(const std::string&
+@@ -492,23 +492,6 @@ GURL GetOSSettingsUrl(const std::string&
  #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
  void ShowBrowserSignin(Browser* browser,
                         signin_metrics::AccessPoint access_point) {

patches/core/ungoogled-chromium/disable-translate.patch

@@ -1,8 +1,8 @@
 # Disables browser translation
 
---- a/components/translate/content/renderer/translate_helper.cc
-+++ b/components/translate/content/renderer/translate_helper.cc
-@@ -73,8 +73,7 @@ TranslateHelper::TranslateHelper(content
+--- a/components/translate/content/renderer/translate_agent.cc
++++ b/components/translate/content/renderer/translate_agent.cc
+@@ -73,8 +73,7 @@ TranslateAgent::TranslateAgent(content::
      : content::RenderFrameObserver(render_frame),
        world_id_(world_id),
        extension_scheme_(extension_scheme) {
@@ -11,10 +11,10 @@
 +  CancelPendingTranslation();
  }
  
- TranslateHelper::~TranslateHelper() {
+ TranslateAgent::~TranslateAgent() {}
 --- a/components/translate/core/browser/translate_manager.cc
 +++ b/components/translate/core/browser/translate_manager.cc
-@@ -692,8 +692,7 @@ void TranslateManager::FilterIsTranslate
+@@ -708,8 +708,7 @@ void TranslateManager::FilterIsTranslate
          TranslateBrowserMetrics::INITIATION_STATUS_NO_NETWORK);
    }
  
@@ -26,14 +26,13 @@
      // that settings syncs and we don't want to turn off translate everywhere
 --- a/components/translate/core/browser/translate_script.cc
 +++ b/components/translate/core/browser/translate_script.cc
-@@ -149,9 +149,8 @@ void TranslateScript::OnScriptFetchCompl
-     base::StringAppendF(&data_, "var serverParams = '%s';\n",
+@@ -142,8 +142,7 @@ void TranslateScript::OnScriptFetchCompl
                          server_params.c_str());
  
--    GURL security_origin = translate::GetTranslateSecurityOrigin();
-     base::StringAppendF(
--        &data_, "var securityOrigin = '%s';", security_origin.spec().c_str());
-+        &data_, "var securityOrigin = '';");
+     GURL security_origin = translate::GetTranslateSecurityOrigin();
+-    base::StringAppendF(&data_, "var securityOrigin = '%s';",
+-                        security_origin.spec().c_str());
++    base::StringAppendF(&data_, "var securityOrigin = '';");
  
      // Load embedded translate.js.
      data_.append(ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(

patches/core/ungoogled-chromium/disable-untraceable-urls.patch

@@ -23,7 +23,7 @@
  }  // namespace
 --- a/chrome/browser/safe_browsing/client_side_model_loader.cc
 +++ b/chrome/browser/safe_browsing/client_side_model_loader.cc
-@@ -34,8 +34,6 @@ namespace safe_browsing {
+@@ -33,8 +33,6 @@ namespace safe_browsing {
  // Model Loader strings
  const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024;
  const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000;
@@ -32,15 +32,15 @@
  const char ModelLoader::kClientModelNamePattern[] =
      "client_model_v5%s_variation_%d.pb";
  const char ModelLoader::kClientModelFinchExperiment[] =
-@@ -89,7 +87,7 @@ ModelLoader::ModelLoader(
+@@ -88,7 +86,7 @@ ModelLoader::ModelLoader(
      scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
      bool is_extended_reporting)
      : name_(FillInModelName(is_extended_reporting, GetModelNumber())),
 -      url_(kClientModelUrlPrefix + name_),
 +      url_("about:blank"),
        update_renderers_callback_(update_renderers_callback),
-       url_loader_factory_(url_loader_factory) {
-   DCHECK(url_.is_valid());
+       url_loader_factory_(url_loader_factory),
+       last_client_model_status_(ClientModelStatus::MODEL_NEVER_FETCHED) {
 @@ -101,7 +99,7 @@ ModelLoader::ModelLoader(
      scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
      const std::string& model_name)
@@ -48,8 +48,8 @@
 -      url_(kClientModelUrlPrefix + name_),
 +      url_("about:blank"),
        update_renderers_callback_(update_renderers_callback),
-       url_loader_factory_(url_loader_factory) {
-   DCHECK(url_.is_valid());
+       url_loader_factory_(url_loader_factory),
+       last_client_model_status_(ClientModelStatus::MODEL_NEVER_FETCHED) {
 --- a/chrome/browser/safe_browsing/client_side_model_loader.h
 +++ b/chrome/browser/safe_browsing/client_side_model_loader.h
 @@ -42,7 +42,6 @@ class ModelLoader {
@@ -59,7 +59,7 @@
 -  static const char kClientModelUrlPrefix[];
    static const char kClientModelNamePattern[];
  
-   // Constructs a model loader to fetch a model using |url_loader_factory|.
+   // Enum used to keep stats about why we fail to get the client model. This
 --- a/rlz/lib/financial_ping.cc
 +++ b/rlz/lib/financial_ping.cc
 @@ -339,7 +339,7 @@ FinancialPing::PingResponse FinancialPin

patches/core/ungoogled-chromium/disable-webstore-urls.patch

@@ -15,7 +15,7 @@
  
 --- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc
 +++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc
-@@ -256,13 +256,7 @@ ChromeContentVerifierDelegate::GetVerify
+@@ -286,13 +286,7 @@ bool ChromeContentVerifierDelegate::IsFr
    // between which extensions are considered in-store.
    // See https://crbug.com/766806 for details.
    if (!InstallVerifier::IsFromStore(extension)) {
@@ -24,12 +24,12 @@
 -    // to be from the store as well.
 -    if (ManifestURL::GetUpdateURL(&extension) !=
 -        extension_urls::GetDefaultWebstoreUpdateUrl()) {
--      return NONE;
+-      return false;
 -    }
-+    return NONE;
++    return false;
    }
- 
-   return default_mode_;
+   return true;
+ }
 --- a/chrome/browser/extensions/extension_migrator.cc
 +++ b/chrome/browser/extensions/extension_migrator.cc
 @@ -18,7 +18,9 @@ namespace extensions {
@@ -142,7 +142,7 @@
    } else {
      url_stats_.other_url_count++;
    }
-@@ -702,20 +680,6 @@ void ExtensionDownloader::HandleManifest
+@@ -709,20 +687,6 @@ void ExtensionDownloader::HandleManifest
          fetch_data->request_ids()));
    }
  
@@ -163,7 +163,7 @@
    NotifyExtensionsDownloadStageChanged(
        no_updates, ExtensionDownloaderDelegate::Stage::FINISHED);
    NotifyExtensionsDownloadFailed(
-@@ -1193,11 +1157,7 @@ bool ExtensionDownloader::IterateFetchCr
+@@ -1218,11 +1182,7 @@ bool ExtensionDownloader::IterateFetchCr
    // fetch.
    switch (fetch->credentials) {
      case ExtensionFetch::CREDENTIALS_NONE:

patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -3446,8 +3446,6 @@ jumbo_static_library("ui") {
+@@ -3523,8 +3523,6 @@ jumbo_static_library("ui") {
          "views/sync/dice_bubble_sync_promo_view.h",
          "views/sync/dice_signin_button_view.cc",
          "views/sync/dice_signin_button_view.h",

patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch

@@ -2,12 +2,11 @@
 
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -4901,19 +4901,7 @@ ChromeContentBrowserClient::GetSafeBrows
-     content::ResourceContext* resource_context) {
+@@ -4964,18 +4964,7 @@ ChromeContentBrowserClient::GetSafeBrows
+     bool safe_browsing_enabled_for_profile) {
    DCHECK_CURRENTLY_ON(BrowserThread::IO);
  
--  ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
--  if (!io_data->safe_browsing_enabled()->GetValue())
+-  if (!safe_browsing_enabled_for_profile)
 -    return nullptr;
 -
 -  // |safe_browsing_service_| may be unavailable in tests.
@@ -25,7 +24,7 @@
  base::Optional<std::string>
 --- a/chrome/browser/download/download_item_model.cc
 +++ b/chrome/browser/download/download_item_model.cc
-@@ -23,9 +23,6 @@
+@@ -25,9 +25,6 @@
  #include "chrome/browser/download/download_stats.h"
  #include "chrome/browser/download/offline_item_utils.h"
  #include "chrome/browser/profiles/profile.h"
@@ -35,15 +34,15 @@
  #include "chrome/grit/chromium_strings.h"
  #include "chrome/grit/generated_resources.h"
  #include "components/download/public/common/download_danger_type.h"
-@@ -43,7 +40,6 @@
- 
+@@ -46,7 +43,6 @@
  using base::TimeDelta;
  using download::DownloadItem;
+ using MixedContentStatus = download::DownloadItem::MixedContentStatus;
 -using safe_browsing::DownloadFileType;
  
  namespace {
  
-@@ -284,14 +280,7 @@ bool DownloadItemModel::IsMalicious() co
+@@ -293,14 +289,7 @@ bool DownloadItemModel::IsMixedContent()
  }
  
  bool DownloadItemModel::ShouldAllowDownloadFeedback() const {
@@ -65,12 +64,12 @@
  #include "chrome/browser/native_file_system/native_file_system_permission_request_manager.h"
  #include "chrome/browser/profiles/profile.h"
 -#include "chrome/browser/safe_browsing/download_protection/download_protection_service.h"
- #include "chrome/browser/sessions/session_tab_helper.h"
  #include "chrome/browser/ui/browser_dialogs.h"
  #include "chrome/common/chrome_paths.h"
-@@ -328,78 +327,6 @@ class ReadPermissionGrantImpl
-   PermissionStatus status_ = PermissionStatus::GRANTED;
- };
+ #include "components/content_settings/core/browser/host_content_settings_map.h"
+@@ -208,79 +207,6 @@ BindResultCallbackToCurrentSequence(
+       base::SequencedTaskRunnerHandle::Get(), std::move(callback));
+ }
  
 -void DoSafeBrowsingCheckOnUIThread(
 -    int process_id,
@@ -136,6 +135,7 @@
 -    case Result::SENSITIVE_CONTENT_WARNING:
 -    case Result::SENSITIVE_CONTENT_BLOCK:
 -    case Result::DEEP_SCANNED_SAFE:
+-    case Result::PROMPT_FOR_SCANNING:
 -      NOTREACHED();
 -      return ChromeNativeFileSystemPermissionContext::AfterWriteCheckResult::
 -          kAllow;
@@ -147,8 +147,8 @@
  }  // namespace
  
  ChromeNativeFileSystemPermissionContext::Grants::Grants() = default;
-@@ -680,29 +607,6 @@ void ChromeNativeFileSystemPermissionCon
-                      process_id, frame_id, std::move(callback)));
+@@ -363,29 +289,6 @@ void ChromeNativeFileSystemPermissionCon
+                      frame_id, std::move(callback)));
  }
  
 -void ChromeNativeFileSystemPermissionContext::PerformAfterWriteChecks(
@@ -174,27 +174,26 @@
 -              base::SequencedTaskRunnerHandle::Get(), std::move(callback))));
 -}
 -
- ChromeNativeFileSystemPermissionContext::Grants
- ChromeNativeFileSystemPermissionContext::GetPermissionGrants(
-     const url::Origin& origin,
+ void ChromeNativeFileSystemPermissionContext::
+     DidConfirmSensitiveDirectoryAccess(
+         const url::Origin& origin,
 --- a/chrome/browser/native_file_system/chrome_native_file_system_permission_context.h
 +++ b/chrome/browser/native_file_system/chrome_native_file_system_permission_context.h
-@@ -152,12 +152,6 @@ class ChromeNativeFileSystemPermissionCo
+@@ -58,11 +58,6 @@ class ChromeNativeFileSystemPermissionCo
+       int process_id,
        int frame_id,
        base::OnceCallback<void(PermissionStatus)> callback) override;
- 
 -  void PerformAfterWriteChecks(
 -      std::unique_ptr<content::NativeFileSystemWriteItem> item,
 -      int process_id,
 -      int frame_id,
 -      base::OnceCallback<void(AfterWriteCheckResult)> callback) override;
--
+   bool CanRequestWritePermission(const url::Origin& origin) override;
+ 
    // Returns a snapshot of the currently granted permissions.
-   // TODO(https://crbug.com/984769): Eliminate process_id and frame_id from this
-   // method when grants stop being scoped to a frame.
 --- a/chrome/browser/password_manager/chrome_password_manager_client.cc
 +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -25,7 +25,6 @@
+@@ -26,7 +26,6 @@
  #include "chrome/browser/password_manager/password_store_factory.h"
  #include "chrome/browser/prerender/prerender_contents.h"
  #include "chrome/browser/profiles/profile.h"
@@ -202,20 +201,20 @@
  #include "chrome/browser/signin/identity_manager_factory.h"
  #include "chrome/browser/site_isolation/site_isolation_policy.h"
  #include "chrome/browser/sync/profile_sync_service_factory.h"
-@@ -93,11 +92,11 @@
+@@ -94,11 +93,11 @@
  #if BUILDFLAG(FULL_SAFE_BROWSING)
  #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h"
  #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h"
 +#endif
- #include "ui/base/clipboard/clipboard.h"
- #include "ui/events/keycodes/keyboard_codes.h"
  #include "services/service_manager/public/cpp/connector.h"
  #include "third_party/blink/public/mojom/clipboard/clipboard.mojom.h"
+ #include "ui/base/clipboard/clipboard.h"
+ #include "ui/events/keycodes/keyboard_codes.h"
 -#endif
  
  #if defined(OS_ANDROID)
  #include "chrome/browser/android/tab_android.h"
-@@ -543,6 +542,7 @@ bool ChromePasswordManagerClient::IsIsol
+@@ -558,6 +557,7 @@ bool ChromePasswordManagerClient::IsIsol
    return SiteIsolationPolicy::IsIsolationForPasswordSitesEnabled();
  }
  
@@ -223,7 +222,7 @@
  #if defined(ON_FOCUS_PING_ENABLED) || \
      defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
  safe_browsing::PasswordProtectionService*
-@@ -565,6 +565,7 @@ void ChromePasswordManagerClient::CheckS
+@@ -580,6 +580,7 @@ void ChromePasswordManagerClient::CheckS
    }
  }
  #endif  // defined(ON_FOCUS_PING_ENABLED)
@@ -231,7 +230,7 @@
  
  #if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
  void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
-@@ -572,24 +573,11 @@ void ChromePasswordManagerClient::CheckP
+@@ -587,24 +588,11 @@ void ChromePasswordManagerClient::CheckP
      const std::string& username,
      const std::vector<std::string>& matching_domains,
      bool password_field_exists) {
@@ -256,7 +255,7 @@
  }
  #endif  // defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
  
-@@ -713,7 +701,9 @@ void ChromePasswordManagerClient::OnInpu
+@@ -728,7 +716,9 @@ void ChromePasswordManagerClient::OnInpu
    if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
      OnPaste();
    } else {
@@ -266,7 +265,7 @@
    }
  #endif  // defined(OS_ANDROID)
  }
-@@ -839,9 +829,11 @@ void ChromePasswordManagerClient::OnPast
+@@ -854,9 +844,11 @@ void ChromePasswordManagerClient::OnPast
    base::string16 text;
    clipboard->ReadText(ui::ClipboardBuffer::kCopyPaste, &text);
    was_on_paste_called_ = true;
@@ -281,7 +280,7 @@
      const gfx::RectF& bounds) {
 --- a/chrome/browser/password_manager/chrome_password_manager_client.h
 +++ b/chrome/browser/password_manager/chrome_password_manager_client.h
-@@ -184,7 +184,7 @@ class ChromePasswordManagerClient
+@@ -192,7 +192,7 @@ class ChromePasswordManagerClient
    void OnImeFinishComposingTextEvent() override;
  #endif  // defined(OS_ANDROID)
  
@@ -292,13 +291,14 @@
    safe_browsing::PasswordProtectionService* GetPasswordProtectionService()
 --- a/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
 +++ b/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
-@@ -18,9 +18,7 @@
- #include "chrome/browser/permissions/permission_request.h"
+@@ -17,10 +17,8 @@
+ #include "chrome/browser/permissions/crowd_deny_preload_data.h"
  #include "chrome/browser/permissions/quiet_notification_permission_ui_config.h"
  #include "chrome/browser/permissions/quiet_notification_permission_ui_state.h"
 -#include "chrome/browser/safe_browsing/safe_browsing_service.h"
  #include "chrome/common/chrome_features.h"
--#include "components/safe_browsing/db/database_manager.h"
+ #include "components/permissions/permission_request.h"
+-#include "components/safe_browsing/core/db/database_manager.h"
  
  namespace {
  
@@ -393,7 +393,7 @@
  }
 --- a/chrome/browser/ui/views/download/download_item_view.cc
 +++ b/chrome/browser/ui/views/download/download_item_view.cc
-@@ -1127,6 +1127,7 @@ void DownloadItemView::ShowDeepScanningD
+@@ -1304,6 +1304,7 @@ void DownloadItemView::ShowDeepScanningD
            },
            base::Unretained(this))));
  
@@ -401,7 +401,7 @@
    int delay_delivery = g_browser_process->local_state()->GetInteger(
        prefs::kDelayDeliveryUntilVerdict);
    if (delay_delivery != safe_browsing::DELAY_DOWNLOADS &&
-@@ -1138,6 +1139,9 @@ void DownloadItemView::ShowDeepScanningD
+@@ -1315,6 +1316,9 @@ void DownloadItemView::ShowDeepScanningD
    } else {
      open_button_->SetEnabled(false);
    }
@@ -411,7 +411,7 @@
  
    file_name_label_->SetVisible(false);
    status_label_->SetVisible(false);
-@@ -1445,7 +1449,9 @@ base::string16 DownloadItemView::ElidedF
+@@ -1625,7 +1629,9 @@ base::string16 DownloadItemView::ElidedF
  }
  
  void DownloadItemView::OpenDownloadDuringAsyncScanning() {
@@ -423,7 +423,7 @@
  
 --- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
 +++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
-@@ -159,10 +159,7 @@ PasswordReuseModalWarningDialog::Passwor
+@@ -183,10 +183,7 @@ PasswordReuseModalWarningDialog::Passwor
          placeholder_offsets);
    } else {
      views::Label* message_body_label = CreateMessageBodyLabel(
@@ -434,19 +434,19 @@
 +        l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS));
      CreateGaiaPasswordReuseModalWarningDialog(message_body_label);
    }
- }
+   modal_construction_start_time_ = base::TimeTicks::Now();
 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -78,8 +78,6 @@
+@@ -81,8 +81,6 @@
  #include "components/nacl/common/buildflags.h"
  #include "components/prefs/pref_service.h"
  #include "components/safe_browsing/buildflags.h"
--#include "components/safe_browsing/web_ui/constants.h"
--#include "components/safe_browsing/web_ui/safe_browsing_ui.h"
+-#include "components/safe_browsing/content/web_ui/safe_browsing_ui.h"
+-#include "components/safe_browsing/core/web_ui/constants.h"
  #include "components/security_interstitials/content/connection_help_ui.h"
  #include "components/security_interstitials/content/known_interception_disclosure_ui.h"
  #include "components/security_interstitials/content/urls.h"
-@@ -414,8 +412,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc
+@@ -423,8 +421,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc
      return &NewWebUI<PredictorsUI>;
    if (url.host_piece() == chrome::kChromeUIQuotaInternalsHost)
      return &NewWebUI<QuotaInternalsUI>;
@@ -468,7 +468,7 @@
  }
 --- a/components/password_manager/core/browser/password_manager_client.h
 +++ b/components/password_manager/core/browser/password_manager_client.h
-@@ -279,7 +279,7 @@ class PasswordManagerClient {
+@@ -290,7 +290,7 @@ class PasswordManagerClient {
    // Returns the current best guess as to the page's display language.
    virtual std::string GetPageLanguage() const;
  
@@ -477,9 +477,9 @@
    // Return the PasswordProtectionService associated with this instance.
    virtual safe_browsing::PasswordProtectionService*
    GetPasswordProtectionService() const = 0;
---- a/components/safe_browsing/common/safe_browsing.mojom
-+++ b/components/safe_browsing/common/safe_browsing.mojom
-@@ -127,7 +127,6 @@ enum PhishingDetectorResult {
+--- a/components/safe_browsing/content/common/safe_browsing.mojom
++++ b/components/safe_browsing/content/common/safe_browsing.mojom
+@@ -117,7 +117,6 @@ enum PhishingDetectorResult {
    INVALID_SCORE = 4,
  };
  
@@ -592,7 +592,7 @@
    base::WeakPtrFactory<NativeFileSystemFileWriterImpl> weak_factory_{this};
 --- a/content/public/browser/native_file_system_permission_context.h
 +++ b/content/public/browser/native_file_system_permission_context.h
-@@ -95,13 +95,6 @@ class NativeFileSystemPermissionContext 
+@@ -100,13 +100,6 @@ class NativeFileSystemPermissionContext 
        base::OnceCallback<void(SensitiveDirectoryResult)> callback) = 0;
  
    enum class AfterWriteCheckResult { kAllow, kBlock };

patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch

@@ -2,7 +2,7 @@
 
 --- a/net/tools/transport_security_state_generator/transport_security_state_generator.cc
 +++ b/net/tools/transport_security_state_generator/transport_security_state_generator.cc
-@@ -124,7 +124,7 @@ bool CheckDuplicateEntries(const Transpo
+@@ -125,7 +125,7 @@ bool CheckDuplicateEntries(const Transpo
  bool CheckNoopEntries(const TransportSecurityStateEntries& entries) {
    for (const auto& entry : entries) {
      if (!entry->force_https && entry->pinset.empty() && !entry->expect_ct) {

patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch

@@ -1,6 +1,6 @@
 --- a/components/search_engines/prepopulated_engines.json
 +++ b/components/search_engines/prepopulated_engines.json
-@@ -103,21 +103,11 @@
+@@ -113,21 +113,11 @@
      },
  
      "google": {

patches/core/ungoogled-chromium/use-local-devtools-files.patch

@@ -5,14 +5,13 @@
 
 --- a/third_party/devtools-frontend/src/BUILD.gn
 +++ b/third_party/devtools-frontend/src/BUILD.gn
-@@ -1780,15 +1780,14 @@ generated_non_autostart_non_remote_modul
+@@ -2144,14 +2144,13 @@ generated_non_autostart_non_remote_modul
    "$resources_out_dir/timeline/timeline_module.js",
    "$resources_out_dir/web_audio/web_audio_module.js",
    "$resources_out_dir/workspace_diff/workspace_diff_module.js",
 -]
 -
 -generated_remote_modules = [
-   "$resources_out_dir/accessibility/accessibility_module.js",
    "$resources_out_dir/audits_worker/audits_worker_module.js",
    "$resources_out_dir/dagre_layout/dagre_layout_module.js",
    "$resources_out_dir/emulated_devices/emulated_devices_module.js",
@@ -23,16 +22,16 @@
  generated_test_modules = [
    "$resources_out_dir/accessibility_test_runner/accessibility_test_runner_module.js",
    "$resources_out_dir/application_test_runner/application_test_runner_module.js",
-@@ -1855,7 +1854,6 @@ devtools_frontend_resources_deps = [
-   ":copy_htaccess",
-   ":copy_inspector_images",
-   ":copy_lighthouse_locale_files",
--  ":copy_wasm_deps",
-   ":devtools_extension_api",
-   ":frontend_protocol_sources",
-   ":supported_css_properties",
-@@ -1938,7 +1936,6 @@ action("generate_devtools_grd") {
-       generated_scripts + generated_worker_bundles +
+@@ -2227,7 +2226,6 @@ devtools_frontend_resources_deps = devto
+                                      ":copy_htaccess",
+                                      ":copy_inspector_images",
+                                      ":copy_lighthouse_locale_files",
+-                                     ":copy_wasm_deps",
+                                      ":devtools_extension_api",
+                                      ":frontend_protocol_sources",
+                                      ":supported_css_properties",
+@@ -2294,7 +2292,6 @@ action("generate_devtools_grd") {
+       devtools_embedder_scripts + generated_scripts + generated_worker_bundles +
        [
          "$resources_out_dir/devtools_extension_api.js",
 -        "$resources_out_dir/sdk/wasm_source_map/pkg/wasm_source_map_bg.wasm",
@@ -51,14 +50,7 @@
  }
 --- a/third_party/devtools-frontend/src/front_end/devtools_app.json
 +++ b/third_party/devtools-frontend/src/front_end/devtools_app.json
-@@ -4,16 +4,16 @@
-     { "name": "inspector_main", "type": "autostart" },
-     { "name": "mobile_throttling", "type": "autostart" },
- 
--    { "name": "accessibility", "type": "remote" },
-+    { "name": "accessibility" },
-     { "name": "animation" },
-     { "name": "audits" },
+@@ -10,10 +10,10 @@
      { "name": "browser_debugger" },
      { "name": "css_overview" },
      { "name": "cookie_table" },

patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch

@@ -9,7 +9,7 @@
 
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2226,6 +2226,7 @@ jumbo_static_library("browser") {
+@@ -2237,6 +2237,7 @@ jumbo_static_library("browser") {
      "//third_party/metrics_proto",
      "//third_party/re2",
      "//third_party/smhasher:cityhash",
@@ -19,7 +19,7 @@
      "//third_party/zlib",
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -150,6 +150,7 @@
+@@ -154,6 +154,7 @@
  #include "third_party/blink/public/common/features.h"
  #include "third_party/blink/public/common/forcedark/forcedark_switches.h"
  #include "third_party/leveldatabase/leveldb_features.h"
@@ -27,7 +27,7 @@
  #include "ui/accessibility/accessibility_features.h"
  #include "ui/accessibility/accessibility_switches.h"
  #include "ui/base/ui_base_features.h"
-@@ -1517,6 +1518,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1580,6 +1581,14 @@ const FeatureEntry kFeatureEntries[] = {
       "Force punycode hostnames",
       "Force punycode in hostnames instead of Unicode when displaying Internationalized Domain Names (IDNs).",
       kOsAll, SINGLE_VALUE_TYPE("force-punycode-hostnames")},
@@ -44,7 +44,7 @@
       SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -208,6 +208,7 @@ jumbo_source_set("browser") {
+@@ -204,6 +204,7 @@ jumbo_source_set("browser") {
      "//third_party/libyuv",
      "//third_party/re2",
      "//third_party/sqlite",
@@ -54,7 +54,7 @@
      "//third_party/zlib/google:zip",
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -225,6 +225,7 @@
+@@ -223,6 +223,7 @@
  #include "third_party/blink/public/common/page/launching_process_state.h"
  #include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
  #include "third_party/blink/public/public_buildflags.h"
@@ -62,7 +62,7 @@
  #include "third_party/skia/include/core/SkBitmap.h"
  #include "ui/accessibility/accessibility_switches.h"
  #include "ui/base/ui_base_switches.h"
-@@ -3150,6 +3151,8 @@ void RenderProcessHostImpl::PropagateBro
+@@ -3149,6 +3150,8 @@ void RenderProcessHostImpl::PropagateBro
      switches::kEnableWebGLDraftExtensions,
      switches::kEnableWebGLImageChromium,
      switches::kFileUrlPathAlias,
@@ -73,7 +73,7 @@
      switches::kForceDisableWebRtcApmInAudioService,
 --- a/content/child/BUILD.gn
 +++ b/content/child/BUILD.gn
-@@ -125,6 +125,7 @@ target(link_target_type, "child") {
+@@ -124,6 +124,7 @@ target(link_target_type, "child") {
      "//third_party/blink/public/common",
      "//third_party/blink/public/strings",
      "//third_party/ced",
@@ -91,7 +91,7 @@
  #include "ui/accessibility/accessibility_features.h"
  #include "ui/base/ui_base_features.h"
  #include "ui/events/blink/blink_features.h"
-@@ -447,6 +448,10 @@ void SetRuntimeFeaturesFromCommandLine(c
+@@ -442,6 +443,10 @@ void SetRuntimeFeaturesFromCommandLine(c
         switches::kEnableAccessibilityObjectModel, true},
        {wrf::EnableAllowSyncXHRInPageDismissal,
         switches::kAllowSyncXHRInPageDismissal, true},
@@ -123,7 +123,7 @@
  #include "base/time/time.h"
  #include "cc/input/overscroll_behavior.h"
  #include "cc/input/scroll_snap_data.h"
-@@ -1307,6 +1308,14 @@ Range* Document::CreateRangeAdjustedToTr
+@@ -866,6 +867,14 @@ Range* Document::CreateRangeAdjustedToTr
                                       Position::BeforeNode(*shadow_host));
  }
  
@@ -138,7 +138,7 @@
  SelectorQueryCache& Document::GetSelectorQueryCache() {
    if (!selector_query_cache_)
      selector_query_cache_ = std::make_unique<SelectorQueryCache>();
-@@ -2872,6 +2881,15 @@ void Document::UpdateStyleAndLayoutTree(
+@@ -2436,6 +2445,15 @@ void Document::UpdateStyleAndLayoutTree(
  #if DCHECK_IS_ON()
    AssertLayoutTreeUpdated(*this);
  #endif
@@ -156,7 +156,7 @@
  void Document::UpdateActiveStyle() {
 --- a/third_party/blink/renderer/core/dom/document.h
 +++ b/third_party/blink/renderer/core/dom/document.h
-@@ -416,6 +416,10 @@ class CORE_EXPORT Document : public Cont
+@@ -417,6 +417,10 @@ class CORE_EXPORT Document : public Cont
      has_xml_declaration_ = has_xml_declaration ? 1 : 0;
    }
  
@@ -167,7 +167,7 @@
    String visibilityState() const;
    bool IsPageVisible() const;
    bool hidden() const;
-@@ -1968,6 +1972,9 @@ class CORE_EXPORT Document : public Cont
+@@ -1957,6 +1961,9 @@ class CORE_EXPORT Document : public Cont
  
    base::ElapsedTimer start_time_;
  
@@ -179,7 +179,7 @@
    HeapVector<Member<ScriptElementBase>> current_script_stack_;
 --- a/third_party/blink/renderer/core/dom/element.cc
 +++ b/third_party/blink/renderer/core/dom/element.cc
-@@ -1902,6 +1902,11 @@ DOMRectList* Element::getClientRects() {
+@@ -1948,6 +1948,11 @@ DOMRectList* Element::getClientRects() {
    DCHECK(element_layout_object);
    GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
        quads, *element_layout_object);
@@ -188,10 +188,10 @@
 +      quad.Scale(GetDocument().GetNoiseFactorX(), GetDocument().GetNoiseFactorY());
 +    }
 +  }
-   return DOMRectList::Create(quads);
+   return MakeGarbageCollected<DOMRectList>(quads);
  }
  
-@@ -1919,6 +1924,9 @@ DOMRect* Element::getBoundingClientRect(
+@@ -1965,6 +1970,9 @@ DOMRect* Element::getBoundingClientRect(
    DCHECK(element_layout_object);
    GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
                                                          *element_layout_object);
@@ -213,7 +213,7 @@
 +    }
 +  }
 +
-   return DOMRectList::Create(quads);
+   return MakeGarbageCollected<DOMRectList>(quads);
  }
  
  DOMRect* Range::getBoundingClientRect() const {
@@ -266,7 +266,7 @@
                const TextDirection&,
 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
-@@ -821,9 +821,15 @@ TextMetrics* CanvasRenderingContext2D::m
+@@ -822,9 +822,15 @@ TextMetrics* CanvasRenderingContext2D::m
    else
      direction = ToTextDirection(GetState().GetDirection(), canvas());
  
@@ -285,7 +285,7 @@
  void CanvasRenderingContext2D::DrawTextInternal(
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1519,6 +1519,7 @@ jumbo_component("platform") {
+@@ -1524,6 +1524,7 @@ jumbo_component("platform") {
      "//third_party/emoji-segmenter",
      "//third_party/icu",
      "//third_party/libyuv",
@@ -295,7 +295,7 @@
      "//ui/base:base",
 --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -696,4 +696,12 @@ void WebRuntimeFeatures::EnableAccelerat
+@@ -690,4 +690,12 @@ void WebRuntimeFeatures::EnableAccelerat
    RuntimeEnabledFeatures::SetAcceleratedSmallCanvasesEnabled(enable);
  }
  
@@ -310,7 +310,7 @@
  }  // namespace blink
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -724,6 +724,12 @@
+@@ -738,6 +738,12 @@
        name: "FileSystem",
        status: "stable",
      },

patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch

@@ -23,7 +23,7 @@ approach to change color components.
 
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1531,6 +1531,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1594,6 +1594,10 @@ const FeatureEntry kFeatureEntries[] = {
       "Enable Canvas::measureText() fingerprint deception",
       "Scale the output values of Canvas::measureText() with a randomly selected factor in the range -0.0003% to 0.0003%, which are recomputed on every document initialization.",
       kOsAll, SINGLE_VALUE_TYPE(switches::kFingerprintingCanvasMeasureTextNoise)},
@@ -36,7 +36,7 @@ approach to change color components.
       SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -3153,6 +3153,7 @@ void RenderProcessHostImpl::PropagateBro
+@@ -3152,6 +3152,7 @@ void RenderProcessHostImpl::PropagateBro
      switches::kFileUrlPathAlias,
      switches::kFingerprintingClientRectsNoise,
      switches::kFingerprintingCanvasMeasureTextNoise,
@@ -46,7 +46,7 @@ approach to change color components.
      switches::kForceDisableWebRtcApmInAudioService,
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -452,6 +452,8 @@ void SetRuntimeFeaturesFromCommandLine(c
+@@ -447,6 +447,8 @@ void SetRuntimeFeaturesFromCommandLine(c
         switches::kFingerprintingClientRectsNoise, true},
        {wrf::EnableFingerprintingCanvasMeasureTextNoise,
         switches::kFingerprintingCanvasMeasureTextNoise, true},
@@ -67,7 +67,7 @@ approach to change color components.
    BLINK_PLATFORM_EXPORT static void EnableHTMLImports(bool);
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1478,7 +1478,9 @@ jumbo_component("platform") {
+@@ -1482,7 +1482,9 @@ jumbo_component("platform") {
      "//third_party/blink/renderer:non_test_config",
    ]
  
@@ -80,7 +80,7 @@ approach to change color components.
      ":blink_platform_public_deps",
 --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -704,4 +704,8 @@ void WebRuntimeFeatures::EnableFingerpri
+@@ -698,4 +698,8 @@ void WebRuntimeFeatures::EnableFingerpri
    RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable);
  }
  
@@ -137,7 +137,7 @@ approach to change color components.
  #include "v8/include/v8.h"
  
  namespace blink {
-@@ -117,9 +121,164 @@ bool StaticBitmapImage::CopyToByteArray(
+@@ -128,7 +132,162 @@ bool StaticBitmapImage::CopyToByteArray(
    DCHECK(read_pixels_successful ||
           !sk_image->bounds().intersect(SkIRect::MakeXYWH(
               rect.X(), rect.Y(), info.width(), info.height())));
@@ -299,14 +299,12 @@ approach to change color components.
 +#undef writable_addr
 +#undef shuffleComponent
 +
- const gpu::SyncToken& StaticBitmapImage::GetSyncToken() const {
-   static const gpu::SyncToken sync_token;
-   return sync_token;
+ }  // namespace blink
 --- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
 +++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
-@@ -30,6 +30,8 @@ class PLATFORM_EXPORT StaticBitmapImage 
-   static scoped_refptr<StaticBitmapImage> Create(sk_sp<SkData> data,
-                                                  const SkImageInfo&);
+@@ -34,6 +34,8 @@ class PLATFORM_EXPORT StaticBitmapImage 
+ 
+   StaticBitmapImage(ImageOrientation orientation) : orientation_(orientation) {}
  
 +  static void ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY);
 +
@@ -315,7 +313,7 @@ approach to change color components.
    // Methods overridden by all sub-classes
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -730,6 +730,9 @@
+@@ -744,6 +744,9 @@
      {
        name: "FingerprintingCanvasMeasureTextNoise",
      },

patches/extra/bromite/flag-max-connections-per-host.patch

@@ -17,7 +17,7 @@ with limited CPU/memory resources and it is disabled by default.
 
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2063,6 +2063,7 @@ jumbo_static_library("browser") {
+@@ -2068,6 +2068,7 @@ jumbo_static_library("browser") {
      "//components/net_log",
      "//components/network_hints/common:mojo_bindings",
      "//components/network_session_configurator/browser",
@@ -27,7 +27,7 @@ with limited CPU/memory resources and it is disabled by default.
      "//components/offline_items_collection/core",
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -739,6 +739,11 @@ const FeatureEntry::Choice kForceEffecti
+@@ -769,6 +769,11 @@ const FeatureEntry::Choice kForceEffecti
       net::kEffectiveConnectionType4G},
  };
  
@@ -39,7 +39,7 @@ with limited CPU/memory resources and it is disabled by default.
  // Ensure that all effective connection types returned by Network Quality
  // Estimator (NQE) are also exposed via flags.
  static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 ==
-@@ -2508,6 +2513,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2524,6 +2529,9 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kAutofillCreditCardUploadDescription, kOsAll,
       FEATURE_VALUE_TYPE(autofill::features::kAutofillUpstream)},
  #endif  // TOOLKIT_VIEWS || OS_ANDROID
@@ -66,7 +66,7 @@ with limited CPU/memory resources and it is disabled by default.
  #include "base/synchronization/waitable_event.h"
  #include "base/task/post_task.h"
  #include "base/task/task_traits.h"
-@@ -96,6 +98,7 @@
+@@ -94,6 +96,7 @@
  #include "components/metrics/metrics_service.h"
  #include "components/metrics_services_manager/metrics_services_manager.h"
  #include "components/metrics_services_manager/metrics_services_manager_client.h"
@@ -74,7 +74,7 @@ with limited CPU/memory resources and it is disabled by default.
  #include "components/network_time/network_time_tracker.h"
  #include "components/optimization_guide/optimization_guide_features.h"
  #include "components/optimization_guide/optimization_guide_service.h"
-@@ -132,6 +135,7 @@
+@@ -129,6 +132,7 @@
  #include "extensions/common/constants.h"
  #include "media/media_buildflags.h"
  #include "mojo/public/cpp/bindings/pending_receiver.h"
@@ -82,7 +82,7 @@ with limited CPU/memory resources and it is disabled by default.
  #include "ppapi/buildflags/buildflags.h"
  #include "printing/buildflags/buildflags.h"
  #include "services/network/public/cpp/features.h"
-@@ -314,6 +318,18 @@ void BrowserProcessImpl::Init() {
+@@ -308,6 +312,18 @@ void BrowserProcessImpl::Init() {
                               base::Bind(&ApplyMetricsReportingPolicy));
  #endif
  
@@ -103,7 +103,7 @@ with limited CPU/memory resources and it is disabled by default.
  
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1266,6 +1266,10 @@ extern const char kMediaInspectorLogging
+@@ -1168,6 +1168,10 @@ const char kMediaInspectorLoggingDescrip
      "project; #enable-devtools-experiments must also be enabled as well on "
      "desktop platforms";
  
@@ -116,7 +116,7 @@ with limited CPU/memory resources and it is disabled by default.
  const char kMediaRouterCastAllowAllIPsDescription[] =
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -766,6 +766,9 @@ extern const char kMarkHttpAsWarningAndD
+@@ -694,6 +694,9 @@ extern const char kMarkHttpAsWarningAndD
  extern const char kMediaInspectorLoggingName[];
  extern const char kMediaInspectorLoggingDescription[];
  

patches/extra/debian/disable/android.patch

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
 
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -397,7 +397,7 @@ group("gn_all") {
+@@ -404,7 +404,7 @@ group("gn_all") {
    #       seems currently broken for this platform at the moment, and the
    #       corresponding code build and works on Linux unmodified.
    #       See instructions in the corresponding BUILD.gn.

patches/extra/debian/disable/fuzzers.patch

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
 
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -747,8 +747,7 @@ group("gn_all") {
+@@ -759,8 +759,7 @@ group("gn_all") {
      }
    }
  
@@ -15,14 +15,12 @@ author: Michael Gilbert <mgilbert@debian.org>
        "//testing/libfuzzer/fuzzers",
 --- a/content/test/BUILD.gn
 +++ b/content/test/BUILD.gn
-@@ -2308,12 +2308,6 @@ test("content_perftests") {
+@@ -2306,10 +2306,6 @@ test("content_perftests") {
    }
  }
  
 -group("fuzzers") {
--  deps = [
--    "//content/test/fuzzer",
--  ]
+-  deps = [ "//content/test/fuzzer" ]
 -}
 -
  # This group defines the isolate files needed to run

patches/extra/debian/disable/google-api-warning.patch

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
 
 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
 +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -855,10 +855,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -876,10 +876,6 @@ void StartupBrowserCreatorImpl::AddInfoB
  
      InfoBarService* infobar_service =
          InfoBarService::FromWebContents(web_contents);

patches/extra/debian/disable/welcome-page.patch

@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/857767
 
 --- a/chrome/browser/profiles/profile_manager.cc
 +++ b/chrome/browser/profiles/profile_manager.cc
-@@ -1055,7 +1055,7 @@ void ProfileManager::InitProfileUserPref
+@@ -1063,7 +1063,7 @@ void ProfileManager::InitProfileUserPref
      profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
                                     supervised_user_id);
    }

patches/extra/debian/fixes/connection-message.patch

@@ -11,5 +11,5 @@ bug-debian: http://bugs.debian.org/864539
 -    devices you may be using.
 +    devices you may be using. Also check that any proxy server currently in use is reachable and configured correctly.
    </message>
-   <if expr="not is_ios or not is_android">
-     <message name="IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG_HEADER" desc="When a page fails to load, sometimes we suggest checking the DNS configuration.  This is a header above above some details.">
+   <if expr="not is_ios">
+     <message name="IDS_ERRORPAGES_SUGGESTION_SECURE_DNS_CONFIG_HEADER" desc="When a page fails to load, sometimes we suggest checking the secure DNS configuration.  This is a header above above some details.">

patches/extra/debian/fixes/ps-print.patch

@@ -1,13 +0,0 @@
-description: add postscript (ps) printing capability
-author: Salvatore Bonaccorso
-
---- a/chrome/browser/ui/libgtkui/print_dialog_gtk.cc
-+++ b/chrome/browser/ui/libgtkui/print_dialog_gtk.cc
-@@ -336,6 +336,7 @@ void PrintDialogGtk::ShowDialog(
-   // Since we only generate PDF, only show printers that support PDF.
-   // TODO(thestig) Add more capabilities to support?
-   GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
-+      GTK_PRINT_CAPABILITY_GENERATE_PS |
-       GTK_PRINT_CAPABILITY_GENERATE_PDF |
-       GTK_PRINT_CAPABILITY_PAGE_SET |
-       GTK_PRINT_CAPABILITY_COPIES |

patches/extra/debian/gn/parallel.patch

@@ -11,18 +11,18 @@ author: Michael Gilbert <mgilbert@debian.org>
    parser.add_option(
        '--skip-generate-buildfiles',
        action='store_true',
-@@ -119,8 +120,12 @@ def main(argv):
+@@ -120,8 +121,12 @@ def main(argv):
  
    shutil.copy2(
        os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir)
 -  subprocess.check_call(
--      ['ninja', '-C', gn_build_dir, 'gn', '-w', 'dupbuild=err'])
+-      [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn'])
 +  if options.jobs:
 +    subprocess.check_call(
-+        ['ninja', '-C', gn_build_dir, 'gn', '-w', 'dupbuild=err', '-j'+str(options.jobs)])
++        [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', '-j'+str(options.jobs), 'gn'])
 +  else:
 +    subprocess.check_call(
-+        ['ninja', '-C', gn_build_dir, 'gn', '-w', 'dupbuild=err'])
++        [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn'])
    shutil.copy2(os.path.join(gn_build_dir, 'gn'), gn_path)
  
    if not options.skip_generate_buildfiles:

patches/extra/inox-patchset/0006-modify-default-prefs.patch

@@ -12,7 +12,7 @@
  void BackgroundModeManager::RegisterProfile(Profile* profile) {
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1144,7 +1144,7 @@ void ChromeContentBrowserClient::Registe
+@@ -1191,7 +1191,7 @@ void ChromeContentBrowserClient::Registe
  void ChromeContentBrowserClient::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -94,19 +94,19 @@
    registry->RegisterDictionaryPref(prefs::kAppWindowPlacement);
 --- a/chrome/browser/ui/navigation_correction_tab_observer.cc
 +++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
-@@ -57,7 +57,7 @@ void NavigationCorrectionTabObserver::Se
- // static
+@@ -59,7 +59,7 @@ void NavigationCorrectionTabObserver::Se
  void NavigationCorrectionTabObserver::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* prefs) {
--  prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, true,
-+  prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, false,
+   prefs->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
+-                             true,
++                             false,
                               user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
  }
  
 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
 +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
-@@ -107,10 +107,6 @@ void LocalDiscoveryUI::RegisterProfilePr
-     user_prefs::PrefRegistrySyncable* registry) {
+@@ -109,10 +109,6 @@ void LocalDiscoveryUI::RegisterProfilePr
+   registry->RegisterBooleanPref(prefs::kLocalDiscoveryEnabled, true);
    registry->RegisterBooleanPref(
        prefs::kLocalDiscoveryNotificationsEnabled,
 -#if defined(OS_WIN)
@@ -170,7 +170,7 @@
        prefs::kShowManagedBookmarksInBookmarkBar,
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -58,7 +58,7 @@ void CookieSettings::GetCookieSettings(
+@@ -59,7 +59,7 @@ void CookieSettings::GetCookieSettings(
  void CookieSettings::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
@@ -181,7 +181,7 @@
        prefs::kCookieControlsMode,
 --- a/components/password_manager/core/browser/password_manager.cc
 +++ b/components/password_manager/core/browser/password_manager.cc
-@@ -178,10 +178,10 @@ void AddLocallySavedPredictions(FieldInf
+@@ -185,10 +185,10 @@ void AddLocallySavedPredictions(FieldInf
  void PasswordManager::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(

patches/extra/inox-patchset/0008-restore-classic-ntp.patch

@@ -1,8 +1,8 @@
 --- a/chrome/browser/search/search.cc
 +++ b/chrome/browser/search/search.cc
-@@ -176,26 +176,7 @@ struct NewTabURLDetails {
- 
-     const GURL local_url(chrome::kChromeSearchLocalNtpUrl);
+@@ -182,26 +182,7 @@ struct NewTabURLDetails {
+                              : chrome::kChromeSearchLocalNtpUrl);
+ #endif
  
 -    if (ShouldShowLocalNewTab(profile))
 -      return NewTabURLDetails(local_url, NEW_TAB_URL_VALID);

patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch

@@ -1,6 +1,6 @@
 --- a/sandbox/linux/BUILD.gn
 +++ b/sandbox/linux/BUILD.gn
-@@ -318,6 +318,12 @@ if (is_linux) {
+@@ -311,6 +311,12 @@ if (is_linux) {
        # These files have a suspicious comparison.
        # TODO fix this and re-enable this warning.
        "-Wno-sign-compare",

patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/startup/startup_tab_provider.cc
 +++ b/chrome/browser/ui/startup/startup_tab_provider.cc
-@@ -46,7 +46,7 @@ bool ProfileHasOtherTabbedBrowser(Profil
+@@ -47,7 +47,7 @@ bool ProfileHasOtherTabbedBrowser(Profil
  
  StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const {
  // Chrome OS has its own welcome flow provided by OOBE.

patches/extra/inox-patchset/0019-disable-battery-status-service.patch

@@ -1,17 +1,17 @@
 --- a/services/device/battery/battery_status_service.cc
 +++ b/services/device/battery/battery_status_service.cc
-@@ -21,10 +21,7 @@ BatteryStatusService::BatteryStatusServi
-     : main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()),
-       update_callback_(base::Bind(&BatteryStatusService::NotifyConsumers,
-                                   base::Unretained(this))),
+@@ -22,10 +22,7 @@ BatteryStatusService::BatteryStatusServi
+       update_callback_(
+           base::BindRepeating(&BatteryStatusService::NotifyConsumers,
+                               base::Unretained(this))),
 -      status_updated_(false),
        is_shutdown_(false) {
--  callback_list_.set_removal_callback(base::Bind(
+-  callback_list_.set_removal_callback(base::BindRepeating(
 -      &BatteryStatusService::ConsumersChanged, base::Unretained(this)));
  }
  
- BatteryStatusService::~BatteryStatusService() {
-@@ -67,58 +64,16 @@ BatteryStatusService::AddCallback(const 
+ BatteryStatusService::~BatteryStatusService() = default;
+@@ -40,58 +37,16 @@ BatteryStatusService::AddCallback(const 
    DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
    DCHECK(!is_shutdown_);
  
@@ -72,7 +72,7 @@
    is_shutdown_ = true;
  }
  
-@@ -129,9 +84,6 @@ BatteryStatusService::GetUpdateCallbackF
+@@ -102,9 +57,6 @@ BatteryStatusService::GetUpdateCallbackF
  
  void BatteryStatusService::SetBatteryManagerForTesting(
      std::unique_ptr<BatteryStatusManager> test_battery_manager) {

patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch

@@ -9,7 +9,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run
 
 --- a/chrome/browser/chrome_browser_main.cc
 +++ b/chrome/browser/chrome_browser_main.cc
-@@ -1580,8 +1580,6 @@ int ChromeBrowserMainParts::PreMainMessa
+@@ -1576,8 +1576,6 @@ int ChromeBrowserMainParts::PreMainMessa
    // and preferences have been registered since some of the import code depends
    // on preferences.
    if (first_run::IsChromeFirstRun()) {

patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch

@@ -12,7 +12,7 @@ it as hidden as it was before?
 
 --- a/net/cert/x509_util.cc
 +++ b/net/cert/x509_util.cc
-@@ -191,7 +191,7 @@ bool GetTLSServerEndPointChannelBinding(
+@@ -238,7 +238,7 @@ bool GetTLSServerEndPointChannelBinding(
  }
  
  // RSA keys created by CreateKeyAndSelfSignedCert will be of this length.

patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch

@@ -10,7 +10,7 @@ Out with all those tracking cookies!
 
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -135,7 +135,7 @@ void ContentSettingsRegistry::Init() {
+@@ -140,7 +140,7 @@ void ContentSettingsRegistry::Init() {
    // WARNING: The string names of the permissions passed in below are used to
    // generate preference names and should never be changed!
  

patches/extra/iridium-browser/updater-disable-auto-update.patch

@@ -16,7 +16,7 @@ the case anyway, since we are based off Chromium, not Chrome.
 
 --- a/chrome/browser/app_controller_mac.mm
 +++ b/chrome/browser/app_controller_mac.mm
-@@ -661,7 +661,7 @@ static base::mac::ScopedObjCClassSwizzle
+@@ -660,7 +660,7 @@ static base::mac::ScopedObjCClassSwizzle
    CFStringRef checkInterval = CFSTR("checkInterval");
    CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
    if (!plist) {

patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1486,6 +1486,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1549,6 +1549,10 @@ const FeatureEntry kFeatureEntries[] = {
       "Enable stacking in tab strip",
       "Forces tabs to be stacked in the tab strip. Otherwise, they follow default behavior.",
       kOsAll, SINGLE_VALUE_TYPE("enable-stacked-tab-strip")},
@@ -15,7 +15,7 @@
       SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
 --- a/chrome/renderer/chrome_render_frame_observer.cc
 +++ b/chrome/renderer/chrome_render_frame_observer.cc
-@@ -152,9 +152,10 @@ ChromeRenderFrameObserver::ChromeRenderF
+@@ -165,9 +165,10 @@ ChromeRenderFrameObserver::ChromeRenderF
    if (!render_frame->IsMainFrame())
      return;
  
@@ -27,7 +27,7 @@
    if (!command_line.HasSwitch(switches::kDisableClientSidePhishingDetection))
      SetClientSidePhishingDetection(true);
  #endif
-@@ -342,14 +343,16 @@ void ChromeRenderFrameObserver::DidFinis
+@@ -367,14 +368,16 @@ void ChromeRenderFrameObserver::DidFinis
    if (frame->Parent())
      return;
  
@@ -54,9 +54,9 @@
  
 --- a/chrome/renderer/chrome_render_frame_observer.h
 +++ b/chrome/renderer/chrome_render_frame_observer.h
-@@ -107,6 +107,7 @@ class ChromeRenderFrameObserver : public
+@@ -115,6 +115,7 @@ class ChromeRenderFrameObserver : public
    // Have the same lifetime as us.
-   translate::TranslateHelper* translate_helper_;
+   translate::TranslateAgent* translate_agent_;
    safe_browsing::PhishingClassifierDelegate* phishing_classifier_;
 +  bool should_autocollect_; // Whether to autocollect search engines
  
@@ -122,7 +122,7 @@
    if (client_)
      client_->SetOwner(this);
  
-@@ -1620,6 +1630,9 @@ void TemplateURLService::ChangeToLoadedS
+@@ -1617,6 +1627,9 @@ void TemplateURLService::ChangeToLoadedS
  
  bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
      const std::string& host) const {
@@ -132,7 +132,7 @@
    const TemplateURLSet* urls = provider_map_->GetURLsForHost(host);
    if (!urls)
      return true;
-@@ -1630,7 +1643,8 @@ bool TemplateURLService::CanAddAutogener
+@@ -1627,7 +1640,8 @@ bool TemplateURLService::CanAddAutogener
  }
  
  bool TemplateURLService::CanReplace(const TemplateURL* t_url) const {

patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch

@@ -3,7 +3,7 @@
 
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -243,6 +243,16 @@ const unsigned kOsDesktop = kOsMac | kOs
+@@ -247,6 +247,16 @@ const unsigned kOsDesktop = kOsMac | kOs
  const unsigned kOsAura = kOsWin | kOsLinux | kOsCrOS;
  #endif  // USE_AURA || OS_ANDROID
  
@@ -20,7 +20,7 @@
  const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
      {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
      {flags_ui::kGenericExperimentChoiceEnabled,
-@@ -1468,6 +1478,10 @@ const FeatureEntry::Choice kEnableCrOSAc
+@@ -1531,6 +1541,10 @@ const FeatureEntry::Choice kEnableCrOSAc
  //
  // When adding a new choice, add it to the end of the list.
  const FeatureEntry kFeatureEntries[] = {
@@ -41,7 +41,7 @@
  #include "chrome/browser/chrome_notification_types.h"
  #include "chrome/browser/extensions/crx_installer.h"
  #include "chrome/browser/extensions/extension_install_prompt.h"
-@@ -126,6 +127,14 @@ scoped_refptr<extensions::CrxInstaller>
+@@ -126,6 +127,14 @@ scoped_refptr<extensions::CrxInstaller> 
    return installer;
  }
  
@@ -67,7 +67,7 @@
    }
 --- a/chrome/browser/download/download_crx_util.h
 +++ b/chrome/browser/download/download_crx_util.h
-@@ -43,6 +43,10 @@ scoped_refptr<extensions::CrxInstaller>
+@@ -43,6 +43,10 @@ scoped_refptr<extensions::CrxInstaller> 
      Profile* profile,
      const download::DownloadItem& download_item);
  
@@ -80,7 +80,7 @@
  bool IsExtensionDownload(const download::DownloadItem& download_item);
 --- a/chrome/browser/download/download_target_determiner.cc
 +++ b/chrome/browser/download/download_target_determiner.cc
-@@ -1013,10 +1013,12 @@ DownloadConfirmationReason DownloadTarge
+@@ -1018,10 +1018,12 @@ DownloadConfirmationReason DownloadTarge
      return DownloadConfirmationReason::SAVE_AS;
  
  #if BUILDFLAG(ENABLE_EXTENSIONS)

patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch

@@ -10,7 +10,7 @@
  #include "base/i18n/rtl.h"
  #include "base/macros.h"
  #include "base/metrics/histogram_macros.h"
-@@ -201,7 +202,8 @@ void JavaScriptDialogManager::RunBeforeU
+@@ -200,7 +201,8 @@ void JavaScriptDialogManager::RunBeforeU
    ChromeJavaScriptDialogExtraData* extra_data =
        &javascript_dialog_extra_data_[web_contents];
  

patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1490,6 +1490,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1553,6 +1553,10 @@ const FeatureEntry kFeatureEntries[] = {
       "Disable search engine collection",
       "Prevents search engines from being added automatically.",
       kOsAll, SINGLE_VALUE_TYPE("disable-search-engine-collection")},

patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch

@@ -3,7 +3,7 @@
 
 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
 +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -827,7 +827,8 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -848,7 +848,8 @@ void StartupBrowserCreatorImpl::AddInfoB
    if (!browser || !profile_ || browser->tab_strip_model()->count() == 0)
      return;
  

patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -266,6 +266,16 @@ const FeatureEntry::Choice kShowAvatarBu
+@@ -270,6 +270,16 @@ const FeatureEntry::Choice kShowAvatarBu
       "never"}
  };
  
@@ -17,7 +17,7 @@
  const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
      {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
      {flags_ui::kGenericExperimentChoiceEnabled,
-@@ -3698,6 +3708,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3708,6 +3718,11 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(
           autofill::features::kAutofillEnableAccountWalletStorage)},
  
@@ -31,15 +31,15 @@
       flag_descriptions::kEnableZeroStateSuggestionsName,
 --- a/chrome/browser/ui/views/frame/browser_root_view.cc
 +++ b/chrome/browser/ui/views/frame/browser_root_view.cc
-@@ -8,6 +8,7 @@
- #include <string>
+@@ -9,6 +9,7 @@
+ #include <utility>
  
  #include "base/bind.h"
 +#include "base/command_line.h"
  #include "base/metrics/user_metrics.h"
  #include "base/task/post_task.h"
  #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
-@@ -90,6 +91,18 @@ int GetDropEffect(const ui::DropTargetEv
+@@ -99,6 +100,18 @@ int GetDropEffect(const ui::DropTargetEv
    return ui::DragDropTypes::DRAG_MOVE;
  }
  
@@ -58,7 +58,7 @@
  }  // namespace
  
  BrowserRootView::DropInfo::DropInfo() = default;
-@@ -104,7 +117,9 @@ const char BrowserRootView::kViewClassNa
+@@ -113,7 +126,9 @@ const char BrowserRootView::kViewClassNa
  
  BrowserRootView::BrowserRootView(BrowserView* browser_view,
                                   views::Widget* widget)
@@ -69,7 +69,7 @@
  
  BrowserRootView::~BrowserRootView() {
    // It's possible to destroy the browser while a drop is active.  In this case,
-@@ -251,7 +266,7 @@ const char* BrowserRootView::GetClassNam
+@@ -260,7 +275,7 @@ const char* BrowserRootView::GetClassNam
  }
  
  bool BrowserRootView::OnMouseWheel(const ui::MouseWheelEvent& event) {
@@ -80,7 +80,7 @@
      views::View* hit_view = GetEventHandlerForPoint(event.location());
 --- a/chrome/browser/ui/views/frame/browser_root_view.h
 +++ b/chrome/browser/ui/views/frame/browser_root_view.h
-@@ -127,6 +127,8 @@ class BrowserRootView : public views::in
+@@ -129,6 +129,8 @@ class BrowserRootView : public views::in
    int scroll_remainder_x_ = 0;
    int scroll_remainder_y_ = 0;
  

patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -253,6 +253,19 @@ const FeatureEntry::Choice kExtensionHan
+@@ -257,6 +257,19 @@ const FeatureEntry::Choice kExtensionHan
       "always-prompt-for-install"},
  };
  
@@ -20,7 +20,7 @@
  const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
      {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
      {flags_ui::kGenericExperimentChoiceEnabled,
-@@ -3792,6 +3805,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3809,6 +3822,11 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(arc::kEnableUnifiedAudioFocusFeature)},
  #endif  // defined(OS_CHROMEOS)
  
@@ -34,7 +34,7 @@
       flag_descriptions::kUseAngleDescription, kOsWin,
 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
 +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
-@@ -217,6 +217,15 @@ void ToolbarView::Init() {
+@@ -218,6 +218,15 @@ void ToolbarView::Init() {
  
    std::unique_ptr<ToolbarAccountIconContainerView>
        toolbar_account_icon_container;
@@ -50,7 +50,7 @@
    bool show_avatar_toolbar_button = true;
    if (base::FeatureList::IsEnabled(
            autofill::features::kAutofillEnableToolbarStatusChip)) {
-@@ -228,11 +237,17 @@ void ToolbarView::Init() {
+@@ -229,11 +238,17 @@ void ToolbarView::Init() {
    } else {
  #if defined(OS_CHROMEOS)
      // ChromeOS only badges Incognito and Guest icons in the browser window.

patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1468,6 +1468,10 @@ const FeatureEntry::Choice kEnableCrOSAc
+@@ -1531,6 +1531,10 @@ const FeatureEntry::Choice kEnableCrOSAc
  //
  // When adding a new choice, add it to the end of the list.
  const FeatureEntry kFeatureEntries[] = {
@@ -15,7 +15,7 @@
       SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
 +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
-@@ -71,14 +71,13 @@ using content::WebContents;
+@@ -75,14 +75,13 @@ using content::WebContents;
  namespace {
  
  bool DetermineTabStripLayoutStacked(PrefService* prefs, bool* adjust_layout) {

patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch

@@ -23,7 +23,7 @@
  enum DnsResolveStatus {
    RESOLVE_STATUS_DNS_SUCCESS = 0,
    RESOLVE_STATUS_PROC_SUCCESS,
-@@ -3565,7 +3561,7 @@ bool HostResolverManager::IsIPv6Reachabl
+@@ -3594,7 +3590,7 @@ bool HostResolverManager::IsIPv6Reachabl
    if ((tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
        kIPv6ProbePeriodMs) {
      SetLastIPv6ProbeResult(

patches/extra/ungoogled-chromium/add-suggestions-url-field.patch

@@ -54,7 +54,7 @@
    /** @private */
 @@ -111,7 +119,8 @@ Polymer({
    /** @private */
-   onActionButtonTap_: function() {
+   onActionButtonTap_() {
      this.browserProxy_.searchEngineEditCompleted(
 -        this.searchEngine_, this.keyword_, this.queryUrl_);
 +        this.searchEngine_, this.keyword_, this.queryUrl_,
@@ -64,7 +64,7 @@
  
 @@ -148,9 +157,11 @@ Polymer({
    /** @private */
-   updateActionButtonState_: function() {
+   updateActionButtonState_() {
      const allValid = [
 -      this.$.searchEngine, this.$.keyword, this.$.queryUrl
 +      this.$.searchEngine, this.$.keyword, this.$.queryUrl,
@@ -435,7 +435,7 @@
    Update(url, TemplateURL(data));
  }
  
-@@ -1980,7 +1982,7 @@ TemplateURL* TemplateURLService::Add(std
+@@ -1979,7 +1981,7 @@ TemplateURL* TemplateURLService::Add(std
          // Neither engine can be replaced. Uniquify the existing keyword.
          base::string16 new_keyword = UniquifyKeyword(*existing_turl, false);
          ResetTemplateURL(existing_turl, existing_turl->short_name(),

patches/extra/ungoogled-chromium/default-to-https-scheme.patch

@@ -73,7 +73,7 @@
      ++prefix_end;
 --- a/components/url_formatter/url_fixer.cc
 +++ b/components/url_formatter/url_fixer.cc
-@@ -438,9 +438,9 @@ std::string SegmentURLInternal(std::stri
+@@ -452,9 +452,9 @@ std::string SegmentURLInternal(std::stri
          (*text)[semicolon] = ';';
      }
      if (!found_scheme) {

patches/extra/ungoogled-chromium/disable-download-quarantine.patch

@@ -194,7 +194,7 @@
    // Quarantining a file before its contents are available is only supported on
    // Windows and Linux.
    if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) {
-@@ -453,7 +453,7 @@ void PepperFileIOHost::OnLocalFileOpened
+@@ -454,7 +454,7 @@ void PepperFileIOHost::OnLocalFileOpened
  #endif
  }
  
@@ -213,7 +213,7 @@
  #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
  #include "ipc/ipc_listener.h"
  #include "ipc/ipc_platform_file.h"
-@@ -92,10 +91,6 @@ class PepperFileIOHost : public ppapi::h
+@@ -90,10 +89,6 @@ class PepperFileIOHost : public ppapi::h
                           const base::FilePath& path,
                           base::File::Error error_code);
  

patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch

@@ -3,7 +3,7 @@
 
 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -3343,16 +3343,14 @@ ScriptValue WebGLRenderingContextBase::g
+@@ -3368,16 +3368,14 @@ ScriptValue WebGLRenderingContextBase::g
        return ScriptValue::CreateNull(script_state->GetIsolate());
      case WebGLDebugRendererInfo::kUnmaskedRendererWebgl:
        if (ExtensionEnabled(kWebGLDebugRendererInfoName))

patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/ui/browser_commands.cc
 +++ b/chrome/browser/ui/browser_commands.cc
-@@ -382,12 +382,6 @@ int GetContentRestrictions(const Browser
+@@ -413,12 +413,6 @@ int GetContentRestrictions(const Browser
      CoreTabHelper* core_tab_helper =
          CoreTabHelper::FromWebContents(current_tab);
      content_restrictions = core_tab_helper->content_restrictions();
@@ -15,7 +15,7 @@
      if (current_tab->ShowingInterstitialPage())
        content_restrictions |= CONTENT_RESTRICTION_PRINT;
    }
-@@ -1055,8 +1049,7 @@ bool CanSavePage(const Browser* browser)
+@@ -1111,8 +1105,7 @@ bool CanSavePage(const Browser* browser)
            prefs::kAllowFileSelectionDialogs)) {
      return false;
    }
@@ -38,8 +38,8 @@
  OfflinePageModel::OfflinePageModel() = default;
 --- a/content/common/url_schemes.cc
 +++ b/content/common/url_schemes.cc
-@@ -20,6 +20,9 @@ namespace content {
- namespace {
+@@ -22,6 +22,9 @@ namespace {
+ bool g_registered_url_schemes = false;
  
  const char* const kDefaultSavableSchemes[] = {
 +  url::kAboutScheme,
@@ -48,7 +48,7 @@
    url::kHttpScheme,
    url::kHttpsScheme,
    url::kFileScheme,
-@@ -27,7 +30,13 @@ const char* const kDefaultSavableSchemes
+@@ -29,7 +32,13 @@ const char* const kDefaultSavableSchemes
    url::kFtpScheme,
    kChromeDevToolsScheme,
    kChromeUIScheme,

patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch

@@ -13,7 +13,7 @@
        AddChildView(std::make_unique<views::InkDropContainerView>());
 --- a/chrome/browser/ui/views/tabs/tab_strip.cc
 +++ b/chrome/browser/ui/views/tabs/tab_strip.cc
-@@ -3219,15 +3219,12 @@ void TabStrip::ButtonPressed(views::Butt
+@@ -3422,15 +3422,12 @@ void TabStrip::ButtonPressed(views::Butt
  
        const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
        if (mouse.IsOnlyMiddleMouseButton()) {

patches/extra/ungoogled-chromium/popups-to-tabs.patch

@@ -2,7 +2,7 @@
 
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
-@@ -275,7 +275,7 @@ WindowOpenDisposition RenderViewImpl::Na
+@@ -260,7 +260,7 @@ WindowOpenDisposition RenderViewImpl::Na
      case blink::kWebNavigationPolicyNewWindow:
        return WindowOpenDisposition::NEW_WINDOW;
      case blink::kWebNavigationPolicyNewPopup:

patches/extra/ungoogled-chromium/searx.patch

@@ -48,7 +48,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -50,6 +52,7 @@ const PrepopulatedEngine* const engines_
+@@ -51,6 +53,7 @@ const PrepopulatedEngine* const engines_
  
  // Albania
  const PrepopulatedEngine* const engines_AL[] = {
@@ -56,7 +56,7 @@
      &duckduckgo,
      &google,
      &yahoo,
-@@ -59,6 +62,7 @@ const PrepopulatedEngine* const engines_
+@@ -60,6 +63,7 @@ const PrepopulatedEngine* const engines_
  
  // Argentina
  const PrepopulatedEngine* const engines_AR[] = {
@@ -64,7 +64,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -67,6 +71,7 @@ const PrepopulatedEngine* const engines_
+@@ -69,6 +73,7 @@ const PrepopulatedEngine* const engines_
  
  // Austria
  const PrepopulatedEngine* const engines_AT[] = {
@@ -72,7 +72,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -75,6 +80,7 @@ const PrepopulatedEngine* const engines_
+@@ -78,6 +83,7 @@ const PrepopulatedEngine* const engines_
  
  // Australia
  const PrepopulatedEngine* const engines_AU[] = {
@@ -80,15 +80,15 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -83,6 +89,7 @@ const PrepopulatedEngine* const engines_
+@@ -87,6 +93,7 @@ const PrepopulatedEngine* const engines_
  
  // Bosnia and Herzegovina
  const PrepopulatedEngine* const engines_BA[] = {
 +    &searx,
      &duckduckgo,
      &google,
-     &yahoo,
-@@ -92,6 +99,7 @@ const PrepopulatedEngine* const engines_
+     &bing,
+@@ -96,6 +103,7 @@ const PrepopulatedEngine* const engines_
  
  // Belgium
  const PrepopulatedEngine* const engines_BE[] = {
@@ -96,7 +96,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -100,6 +108,7 @@ const PrepopulatedEngine* const engines_
+@@ -105,6 +113,7 @@ const PrepopulatedEngine* const engines_
  
  // Bulgaria
  const PrepopulatedEngine* const engines_BG[] = {
@@ -104,7 +104,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -109,6 +118,7 @@ const PrepopulatedEngine* const engines_
+@@ -114,6 +123,7 @@ const PrepopulatedEngine* const engines_
  
  // Bahrain
  const PrepopulatedEngine* const engines_BH[] = {
@@ -112,7 +112,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -118,6 +128,7 @@ const PrepopulatedEngine* const engines_
+@@ -124,6 +134,7 @@ const PrepopulatedEngine* const engines_
  
  // Burundi
  const PrepopulatedEngine* const engines_BI[] = {
@@ -120,7 +120,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -127,6 +138,7 @@ const PrepopulatedEngine* const engines_
+@@ -134,6 +145,7 @@ const PrepopulatedEngine* const engines_
  
  // Brunei
  const PrepopulatedEngine* const engines_BN[] = {
@@ -128,7 +128,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -135,6 +147,7 @@ const PrepopulatedEngine* const engines_
+@@ -143,6 +155,7 @@ const PrepopulatedEngine* const engines_
  
  // Bolivia
  const PrepopulatedEngine* const engines_BO[] = {
@@ -136,7 +136,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -143,6 +156,7 @@ const PrepopulatedEngine* const engines_
+@@ -152,6 +165,7 @@ const PrepopulatedEngine* const engines_
  
  // Brazil
  const PrepopulatedEngine* const engines_BR[] = {
@@ -144,7 +144,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -151,6 +165,7 @@ const PrepopulatedEngine* const engines_
+@@ -161,6 +175,7 @@ const PrepopulatedEngine* const engines_
  
  // Belarus
  const PrepopulatedEngine* const engines_BY[] = {
@@ -152,7 +152,7 @@
      &duckduckgo,
      &google,
      &yandex_by,
-@@ -160,6 +175,7 @@ const PrepopulatedEngine* const engines_
+@@ -171,6 +186,7 @@ const PrepopulatedEngine* const engines_
  
  // Belize
  const PrepopulatedEngine* const engines_BZ[] = {
@@ -160,13 +160,15 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -168,11 +184,12 @@ const PrepopulatedEngine* const engines_
+@@ -180,6 +196,7 @@ const PrepopulatedEngine* const engines_
  
  // Canada
  const PrepopulatedEngine* const engines_CA[] = {
--    &duckduckgo, &google, &bing, &yahoo_ca, &yahoo_qc,
-+    &searx, &duckduckgo, &google, &bing, &yahoo_ca, &yahoo_qc,
- };
++    &searx,
+     &duckduckgo,
+     &google,
+     &bing,
+@@ -189,6 +206,7 @@ const PrepopulatedEngine* const engines_
  
  // Switzerland
  const PrepopulatedEngine* const engines_CH[] = {
@@ -174,7 +176,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -181,6 +198,7 @@ const PrepopulatedEngine* const engines_
+@@ -198,6 +216,7 @@ const PrepopulatedEngine* const engines_
  
  // Chile
  const PrepopulatedEngine* const engines_CL[] = {
@@ -182,21 +184,23 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -189,11 +207,12 @@ const PrepopulatedEngine* const engines_
+@@ -207,6 +226,7 @@ const PrepopulatedEngine* const engines_
  
  // China
  const PrepopulatedEngine* const engines_CN[] = {
--    &duckduckgo, &baidu, &so_360, &google, &sogou, &bing,
-+    &searx, &duckduckgo, &baidu, &so_360, &google, &sogou, &bing,
- };
++    &searx,
+     &duckduckgo,
+     &baidu,
+     &sogou,
+@@ -217,6 +237,7 @@ const PrepopulatedEngine* const engines_
  
  // Colombia
  const PrepopulatedEngine* const engines_CO[] = {
 +    &searx,
      &duckduckgo,
      &google,
-     &yahoo_co,
-@@ -202,6 +221,7 @@ const PrepopulatedEngine* const engines_
+     &bing,
+@@ -226,6 +247,7 @@ const PrepopulatedEngine* const engines_
  
  // Costa Rica
  const PrepopulatedEngine* const engines_CR[] = {
@@ -204,7 +208,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -210,6 +230,7 @@ const PrepopulatedEngine* const engines_
+@@ -235,6 +257,7 @@ const PrepopulatedEngine* const engines_
  
  // Czech Republic
  const PrepopulatedEngine* const engines_CZ[] = {
@@ -212,7 +216,7 @@
      &duckduckgo,
      &google,
      &seznam_cz,
-@@ -219,6 +240,7 @@ const PrepopulatedEngine* const engines_
+@@ -244,6 +267,7 @@ const PrepopulatedEngine* const engines_
  
  // Germany
  const PrepopulatedEngine* const engines_DE[] = {
@@ -220,7 +224,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -227,6 +249,7 @@ const PrepopulatedEngine* const engines_
+@@ -253,6 +277,7 @@ const PrepopulatedEngine* const engines_
  
  // Denmark
  const PrepopulatedEngine* const engines_DK[] = {
@@ -228,7 +232,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -235,6 +258,7 @@ const PrepopulatedEngine* const engines_
+@@ -262,6 +287,7 @@ const PrepopulatedEngine* const engines_
  
  // Dominican Republic
  const PrepopulatedEngine* const engines_DO[] = {
@@ -236,7 +240,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -243,6 +267,7 @@ const PrepopulatedEngine* const engines_
+@@ -271,6 +297,7 @@ const PrepopulatedEngine* const engines_
  
  // Algeria
  const PrepopulatedEngine* const engines_DZ[] = {
@@ -244,7 +248,7 @@
      &duckduckgo,
      &google,
      &yahoo,
-@@ -252,6 +277,7 @@ const PrepopulatedEngine* const engines_
+@@ -280,6 +307,7 @@ const PrepopulatedEngine* const engines_
  
  // Ecuador
  const PrepopulatedEngine* const engines_EC[] = {
@@ -252,7 +256,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -260,6 +286,7 @@ const PrepopulatedEngine* const engines_
+@@ -289,6 +317,7 @@ const PrepopulatedEngine* const engines_
  
  // Estonia
  const PrepopulatedEngine* const engines_EE[] = {
@@ -260,7 +264,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -269,6 +296,7 @@ const PrepopulatedEngine* const engines_
+@@ -299,6 +328,7 @@ const PrepopulatedEngine* const engines_
  
  // Egypt
  const PrepopulatedEngine* const engines_EG[] = {
@@ -268,7 +272,7 @@
      &duckduckgo,
      &google,
      &yahoo,
-@@ -278,6 +306,7 @@ const PrepopulatedEngine* const engines_
+@@ -308,6 +338,7 @@ const PrepopulatedEngine* const engines_
  
  // Spain
  const PrepopulatedEngine* const engines_ES[] = {
@@ -276,7 +280,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -286,6 +315,7 @@ const PrepopulatedEngine* const engines_
+@@ -317,6 +348,7 @@ const PrepopulatedEngine* const engines_
  
  // Finland
  const PrepopulatedEngine* const engines_FI[] = {
@@ -284,7 +288,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -294,6 +324,7 @@ const PrepopulatedEngine* const engines_
+@@ -326,6 +358,7 @@ const PrepopulatedEngine* const engines_
  
  // Faroe Islands
  const PrepopulatedEngine* const engines_FO[] = {
@@ -292,7 +296,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -302,6 +333,7 @@ const PrepopulatedEngine* const engines_
+@@ -335,6 +368,7 @@ const PrepopulatedEngine* const engines_
  
  // France
  const PrepopulatedEngine* const engines_FR[] = {
@@ -300,7 +304,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -311,6 +343,7 @@ const PrepopulatedEngine* const engines_
+@@ -345,6 +379,7 @@ const PrepopulatedEngine* const engines_
  
  // United Kingdom
  const PrepopulatedEngine* const engines_GB[] = {
@@ -308,7 +312,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -319,6 +352,7 @@ const PrepopulatedEngine* const engines_
+@@ -354,6 +389,7 @@ const PrepopulatedEngine* const engines_
  
  // Greece
  const PrepopulatedEngine* const engines_GR[] = {
@@ -316,7 +320,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -327,6 +361,7 @@ const PrepopulatedEngine* const engines_
+@@ -363,6 +399,7 @@ const PrepopulatedEngine* const engines_
  
  // Guatemala
  const PrepopulatedEngine* const engines_GT[] = {
@@ -324,7 +328,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -335,6 +370,7 @@ const PrepopulatedEngine* const engines_
+@@ -372,6 +409,7 @@ const PrepopulatedEngine* const engines_
  
  // Hong Kong
  const PrepopulatedEngine* const engines_HK[] = {
@@ -332,7 +336,7 @@
      &duckduckgo,
      &google,
      &yahoo_hk,
-@@ -344,6 +380,7 @@ const PrepopulatedEngine* const engines_
+@@ -382,6 +420,7 @@ const PrepopulatedEngine* const engines_
  
  // Honduras
  const PrepopulatedEngine* const engines_HN[] = {
@@ -340,7 +344,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -352,6 +389,7 @@ const PrepopulatedEngine* const engines_
+@@ -391,6 +430,7 @@ const PrepopulatedEngine* const engines_
  
  // Croatia
  const PrepopulatedEngine* const engines_HR[] = {
@@ -348,15 +352,15 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -360,6 +398,7 @@ const PrepopulatedEngine* const engines_
+@@ -400,6 +440,7 @@ const PrepopulatedEngine* const engines_
  
  // Hungary
  const PrepopulatedEngine* const engines_HU[] = {
 +    &searx,
      &duckduckgo,
      &google,
-     &yahoo,
-@@ -368,6 +407,7 @@ const PrepopulatedEngine* const engines_
+     &bing,
+@@ -409,6 +450,7 @@ const PrepopulatedEngine* const engines_
  
  // Indonesia
  const PrepopulatedEngine* const engines_ID[] = {
@@ -364,7 +368,7 @@
      &duckduckgo,
      &google,
      &yahoo_id,
-@@ -376,6 +416,7 @@ const PrepopulatedEngine* const engines_
+@@ -418,6 +460,7 @@ const PrepopulatedEngine* const engines_
  
  // Ireland
  const PrepopulatedEngine* const engines_IE[] = {
@@ -372,7 +376,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -384,6 +425,7 @@ const PrepopulatedEngine* const engines_
+@@ -427,6 +470,7 @@ const PrepopulatedEngine* const engines_
  
  // Israel
  const PrepopulatedEngine* const engines_IL[] = {
@@ -380,7 +384,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -393,6 +435,7 @@ const PrepopulatedEngine* const engines_
+@@ -436,6 +480,7 @@ const PrepopulatedEngine* const engines_
  
  // India
  const PrepopulatedEngine* const engines_IN[] = {
@@ -388,7 +392,7 @@
      &duckduckgo,
      &google,
      &yahoo_in,
-@@ -401,6 +444,7 @@ const PrepopulatedEngine* const engines_
+@@ -445,6 +490,7 @@ const PrepopulatedEngine* const engines_
  
  // Iraq
  const PrepopulatedEngine* const engines_IQ[] = {
@@ -396,7 +400,7 @@
      &duckduckgo,
      &google,
      &yahoo,
-@@ -410,6 +454,7 @@ const PrepopulatedEngine* const engines_
+@@ -454,6 +500,7 @@ const PrepopulatedEngine* const engines_
  
  // Iran
  const PrepopulatedEngine* const engines_IR[] = {
@@ -404,7 +408,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -418,6 +463,7 @@ const PrepopulatedEngine* const engines_
+@@ -464,6 +511,7 @@ const PrepopulatedEngine* const engines_
  
  // Iceland
  const PrepopulatedEngine* const engines_IS[] = {
@@ -412,7 +416,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -426,6 +472,7 @@ const PrepopulatedEngine* const engines_
+@@ -473,6 +521,7 @@ const PrepopulatedEngine* const engines_
  
  // Italy
  const PrepopulatedEngine* const engines_IT[] = {
@@ -420,7 +424,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -434,6 +481,7 @@ const PrepopulatedEngine* const engines_
+@@ -482,6 +531,7 @@ const PrepopulatedEngine* const engines_
  
  // Jamaica
  const PrepopulatedEngine* const engines_JM[] = {
@@ -428,15 +432,15 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -442,6 +490,7 @@ const PrepopulatedEngine* const engines_
+@@ -491,6 +541,7 @@ const PrepopulatedEngine* const engines_
  
  // Jordan
  const PrepopulatedEngine* const engines_JO[] = {
 +    &searx,
      &duckduckgo,
      &google,
-     &yahoo,
-@@ -451,6 +500,7 @@ const PrepopulatedEngine* const engines_
+     &bing,
+@@ -500,6 +551,7 @@ const PrepopulatedEngine* const engines_
  
  // Japan
  const PrepopulatedEngine* const engines_JP[] = {
@@ -444,15 +448,15 @@
      &duckduckgo,
      &google,
      &yahoo_jp,
-@@ -460,6 +510,7 @@ const PrepopulatedEngine* const engines_
+@@ -510,6 +562,7 @@ const PrepopulatedEngine* const engines_
  
  // Kenya
  const PrepopulatedEngine* const engines_KE[] = {
 +    &searx,
      &duckduckgo,
      &google,
-     &yahoo,
-@@ -468,6 +519,7 @@ const PrepopulatedEngine* const engines_
+     &bing,
+@@ -519,6 +572,7 @@ const PrepopulatedEngine* const engines_
  
  // South Korea
  const PrepopulatedEngine* const engines_KR[] = {
@@ -460,7 +464,7 @@
      &duckduckgo,
      &google,
      &naver,
-@@ -477,6 +529,7 @@ const PrepopulatedEngine* const engines_
+@@ -529,6 +583,7 @@ const PrepopulatedEngine* const engines_
  
  // Kuwait
  const PrepopulatedEngine* const engines_KW[] = {
@@ -468,7 +472,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -486,6 +539,7 @@ const PrepopulatedEngine* const engines_
+@@ -538,6 +593,7 @@ const PrepopulatedEngine* const engines_
  
  // Kazakhstan
  const PrepopulatedEngine* const engines_KZ[] = {
@@ -476,7 +480,7 @@
      &duckduckgo,
      &google,
      &yandex_kz,
-@@ -495,6 +549,7 @@ const PrepopulatedEngine* const engines_
+@@ -548,6 +604,7 @@ const PrepopulatedEngine* const engines_
  
  // Lebanon
  const PrepopulatedEngine* const engines_LB[] = {
@@ -484,7 +488,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -503,6 +558,7 @@ const PrepopulatedEngine* const engines_
+@@ -557,6 +614,7 @@ const PrepopulatedEngine* const engines_
  
  // Liechtenstein
  const PrepopulatedEngine* const engines_LI[] = {
@@ -492,7 +496,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -511,6 +567,7 @@ const PrepopulatedEngine* const engines_
+@@ -566,6 +624,7 @@ const PrepopulatedEngine* const engines_
  
  // Lithuania
  const PrepopulatedEngine* const engines_LT[] = {
@@ -500,7 +504,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -520,6 +577,7 @@ const PrepopulatedEngine* const engines_
+@@ -575,6 +634,7 @@ const PrepopulatedEngine* const engines_
  
  // Luxembourg
  const PrepopulatedEngine* const engines_LU[] = {
@@ -508,15 +512,15 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -528,6 +586,7 @@ const PrepopulatedEngine* const engines_
+@@ -584,6 +644,7 @@ const PrepopulatedEngine* const engines_
  
  // Latvia
  const PrepopulatedEngine* const engines_LV[] = {
 +    &searx,
      &duckduckgo,
      &google,
-     &bing,
-@@ -537,6 +596,7 @@ const PrepopulatedEngine* const engines_
+     &yandex_ru,
+@@ -593,6 +654,7 @@ const PrepopulatedEngine* const engines_
  
  // Libya
  const PrepopulatedEngine* const engines_LY[] = {
@@ -524,7 +528,7 @@
      &duckduckgo,
      &google,
      &yahoo,
-@@ -546,6 +606,7 @@ const PrepopulatedEngine* const engines_
+@@ -602,6 +664,7 @@ const PrepopulatedEngine* const engines_
  
  // Morocco
  const PrepopulatedEngine* const engines_MA[] = {
@@ -532,7 +536,7 @@
      &duckduckgo,
      &google,
      &yahoo,
-@@ -555,6 +616,7 @@ const PrepopulatedEngine* const engines_
+@@ -611,6 +674,7 @@ const PrepopulatedEngine* const engines_
  
  // Monaco
  const PrepopulatedEngine* const engines_MC[] = {
@@ -540,7 +544,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -563,6 +625,7 @@ const PrepopulatedEngine* const engines_
+@@ -620,6 +684,7 @@ const PrepopulatedEngine* const engines_
  
  // Moldova
  const PrepopulatedEngine* const engines_MD[] = {
@@ -548,23 +552,23 @@
      &duckduckgo,
      &google,
      &yandex_ru,
-@@ -571,6 +634,7 @@ const PrepopulatedEngine* const engines_
+@@ -629,6 +694,7 @@ const PrepopulatedEngine* const engines_
  
  // Montenegro
  const PrepopulatedEngine* const engines_ME[] = {
 +    &searx,
      &duckduckgo,
      &google,
-     &yahoo,
-@@ -580,6 +644,7 @@ const PrepopulatedEngine* const engines_
+     &bing,
+@@ -638,6 +704,7 @@ const PrepopulatedEngine* const engines_
  
  // Macedonia
  const PrepopulatedEngine* const engines_MK[] = {
 +    &searx,
      &duckduckgo,
      &google,
-     &yahoo,
-@@ -588,6 +653,7 @@ const PrepopulatedEngine* const engines_
+     &bing,
+@@ -647,6 +714,7 @@ const PrepopulatedEngine* const engines_
  
  // Mexico
  const PrepopulatedEngine* const engines_MX[] = {
@@ -572,15 +576,15 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -596,6 +662,7 @@ const PrepopulatedEngine* const engines_
+@@ -656,6 +724,7 @@ const PrepopulatedEngine* const engines_
  
  // Malaysia
  const PrepopulatedEngine* const engines_MY[] = {
 +    &searx,
      &duckduckgo,
      &google,
-     &yahoo_my,
-@@ -605,6 +672,7 @@ const PrepopulatedEngine* const engines_
+     &bing,
+@@ -665,6 +734,7 @@ const PrepopulatedEngine* const engines_
  
  // Nicaragua
  const PrepopulatedEngine* const engines_NI[] = {
@@ -588,7 +592,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -613,6 +681,7 @@ const PrepopulatedEngine* const engines_
+@@ -674,6 +744,7 @@ const PrepopulatedEngine* const engines_
  
  // Netherlands
  const PrepopulatedEngine* const engines_NL[] = {
@@ -596,7 +600,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -621,6 +690,7 @@ const PrepopulatedEngine* const engines_
+@@ -683,6 +754,7 @@ const PrepopulatedEngine* const engines_
  
  // Norway
  const PrepopulatedEngine* const engines_NO[] = {
@@ -604,7 +608,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -629,6 +699,7 @@ const PrepopulatedEngine* const engines_
+@@ -692,6 +764,7 @@ const PrepopulatedEngine* const engines_
  
  // New Zealand
  const PrepopulatedEngine* const engines_NZ[] = {
@@ -612,7 +616,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -637,6 +708,7 @@ const PrepopulatedEngine* const engines_
+@@ -701,6 +774,7 @@ const PrepopulatedEngine* const engines_
  
  // Oman
  const PrepopulatedEngine* const engines_OM[] = {
@@ -620,7 +624,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -646,6 +718,7 @@ const PrepopulatedEngine* const engines_
+@@ -710,6 +784,7 @@ const PrepopulatedEngine* const engines_
  
  // Panama
  const PrepopulatedEngine* const engines_PA[] = {
@@ -628,15 +632,15 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -654,6 +727,7 @@ const PrepopulatedEngine* const engines_
+@@ -719,6 +794,7 @@ const PrepopulatedEngine* const engines_
  
  // Peru
  const PrepopulatedEngine* const engines_PE[] = {
 +    &searx,
      &duckduckgo,
      &google,
-     &yahoo_pe,
-@@ -662,6 +736,7 @@ const PrepopulatedEngine* const engines_
+     &bing,
+@@ -728,6 +804,7 @@ const PrepopulatedEngine* const engines_
  
  // Philippines
  const PrepopulatedEngine* const engines_PH[] = {
@@ -644,7 +648,7 @@
      &duckduckgo,
      &google,
      &yahoo_ph,
-@@ -670,6 +745,7 @@ const PrepopulatedEngine* const engines_
+@@ -737,6 +814,7 @@ const PrepopulatedEngine* const engines_
  
  // Pakistan
  const PrepopulatedEngine* const engines_PK[] = {
@@ -652,7 +656,7 @@
      &duckduckgo,
      &google,
      &yahoo,
-@@ -679,6 +755,7 @@ const PrepopulatedEngine* const engines_
+@@ -746,6 +824,7 @@ const PrepopulatedEngine* const engines_
  
  // Poland
  const PrepopulatedEngine* const engines_PL[] = {
@@ -660,7 +664,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -687,6 +764,7 @@ const PrepopulatedEngine* const engines_
+@@ -755,6 +834,7 @@ const PrepopulatedEngine* const engines_
  
  // Puerto Rico
  const PrepopulatedEngine* const engines_PR[] = {
@@ -668,7 +672,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -695,6 +773,7 @@ const PrepopulatedEngine* const engines_
+@@ -764,6 +844,7 @@ const PrepopulatedEngine* const engines_
  
  // Portugal
  const PrepopulatedEngine* const engines_PT[] = {
@@ -676,7 +680,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -703,6 +782,7 @@ const PrepopulatedEngine* const engines_
+@@ -773,6 +854,7 @@ const PrepopulatedEngine* const engines_
  
  // Paraguay
  const PrepopulatedEngine* const engines_PY[] = {
@@ -684,7 +688,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -711,6 +791,7 @@ const PrepopulatedEngine* const engines_
+@@ -782,6 +864,7 @@ const PrepopulatedEngine* const engines_
  
  // Qatar
  const PrepopulatedEngine* const engines_QA[] = {
@@ -692,7 +696,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -720,6 +801,7 @@ const PrepopulatedEngine* const engines_
+@@ -791,6 +874,7 @@ const PrepopulatedEngine* const engines_
  
  // Romania
  const PrepopulatedEngine* const engines_RO[] = {
@@ -700,7 +704,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -728,6 +810,7 @@ const PrepopulatedEngine* const engines_
+@@ -800,6 +884,7 @@ const PrepopulatedEngine* const engines_
  
  // Serbia
  const PrepopulatedEngine* const engines_RS[] = {
@@ -708,15 +712,15 @@
      &duckduckgo,
      &google,
      &yahoo,
-@@ -736,6 +819,7 @@ const PrepopulatedEngine* const engines_
+@@ -809,6 +894,7 @@ const PrepopulatedEngine* const engines_
  
  // Russia
  const PrepopulatedEngine* const engines_RU[] = {
 +    &searx,
      &duckduckgo,
-     &yandex_ru,
      &google,
-@@ -745,6 +829,7 @@ const PrepopulatedEngine* const engines_
+     &yandex_ru,
+@@ -819,6 +905,7 @@ const PrepopulatedEngine* const engines_
  
  // Rwanda
  const PrepopulatedEngine* const engines_RW[] = {
@@ -724,7 +728,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -754,6 +839,7 @@ const PrepopulatedEngine* const engines_
+@@ -828,6 +915,7 @@ const PrepopulatedEngine* const engines_
  
  // Saudi Arabia
  const PrepopulatedEngine* const engines_SA[] = {
@@ -732,7 +736,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -763,6 +849,7 @@ const PrepopulatedEngine* const engines_
+@@ -837,6 +925,7 @@ const PrepopulatedEngine* const engines_
  
  // Sweden
  const PrepopulatedEngine* const engines_SE[] = {
@@ -740,7 +744,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -771,6 +858,7 @@ const PrepopulatedEngine* const engines_
+@@ -846,6 +935,7 @@ const PrepopulatedEngine* const engines_
  
  // Singapore
  const PrepopulatedEngine* const engines_SG[] = {
@@ -748,7 +752,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -780,6 +868,7 @@ const PrepopulatedEngine* const engines_
+@@ -856,6 +946,7 @@ const PrepopulatedEngine* const engines_
  
  // Slovenia
  const PrepopulatedEngine* const engines_SI[] = {
@@ -756,7 +760,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -788,6 +877,7 @@ const PrepopulatedEngine* const engines_
+@@ -865,6 +956,7 @@ const PrepopulatedEngine* const engines_
  
  // Slovakia
  const PrepopulatedEngine* const engines_SK[] = {
@@ -764,7 +768,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -796,6 +886,7 @@ const PrepopulatedEngine* const engines_
+@@ -874,6 +966,7 @@ const PrepopulatedEngine* const engines_
  
  // El Salvador
  const PrepopulatedEngine* const engines_SV[] = {
@@ -772,7 +776,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -804,6 +895,7 @@ const PrepopulatedEngine* const engines_
+@@ -883,6 +976,7 @@ const PrepopulatedEngine* const engines_
  
  // Syria
  const PrepopulatedEngine* const engines_SY[] = {
@@ -780,7 +784,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -813,6 +905,7 @@ const PrepopulatedEngine* const engines_
+@@ -892,6 +986,7 @@ const PrepopulatedEngine* const engines_
  
  // Thailand
  const PrepopulatedEngine* const engines_TH[] = {
@@ -788,7 +792,7 @@
      &duckduckgo,
      &google,
      &yahoo_th,
-@@ -822,6 +915,7 @@ const PrepopulatedEngine* const engines_
+@@ -901,6 +996,7 @@ const PrepopulatedEngine* const engines_
  
  // Tunisia
  const PrepopulatedEngine* const engines_TN[] = {
@@ -796,7 +800,7 @@
      &duckduckgo,
      &google,
      &yahoo,
-@@ -831,6 +925,7 @@ const PrepopulatedEngine* const engines_
+@@ -910,6 +1006,7 @@ const PrepopulatedEngine* const engines_
  
  // Turkey
  const PrepopulatedEngine* const engines_TR[] = {
@@ -804,7 +808,7 @@
      &duckduckgo,
      &google,
      &yandex_tr,
-@@ -840,6 +935,7 @@ const PrepopulatedEngine* const engines_
+@@ -919,6 +1016,7 @@ const PrepopulatedEngine* const engines_
  
  // Trinidad and Tobago
  const PrepopulatedEngine* const engines_TT[] = {
@@ -812,7 +816,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -848,6 +944,7 @@ const PrepopulatedEngine* const engines_
+@@ -928,6 +1026,7 @@ const PrepopulatedEngine* const engines_
  
  // Taiwan
  const PrepopulatedEngine* const engines_TW[] = {
@@ -820,7 +824,7 @@
      &duckduckgo,
      &google,
      &yahoo_tw,
-@@ -857,6 +954,7 @@ const PrepopulatedEngine* const engines_
+@@ -938,6 +1037,7 @@ const PrepopulatedEngine* const engines_
  
  // Tanzania
  const PrepopulatedEngine* const engines_TZ[] = {
@@ -828,7 +832,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -866,6 +964,7 @@ const PrepopulatedEngine* const engines_
+@@ -947,6 +1047,7 @@ const PrepopulatedEngine* const engines_
  
  // Ukraine
  const PrepopulatedEngine* const engines_UA[] = {
@@ -836,7 +840,7 @@
      &duckduckgo,
      &google,
      &yandex_ua,
-@@ -875,6 +974,7 @@ const PrepopulatedEngine* const engines_
+@@ -957,6 +1058,7 @@ const PrepopulatedEngine* const engines_
  
  // United States
  const PrepopulatedEngine* const engines_US[] = {
@@ -844,7 +848,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -883,6 +983,7 @@ const PrepopulatedEngine* const engines_
+@@ -966,6 +1068,7 @@ const PrepopulatedEngine* const engines_
  
  // Uruguay
  const PrepopulatedEngine* const engines_UY[] = {
@@ -852,7 +856,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -891,6 +992,7 @@ const PrepopulatedEngine* const engines_
+@@ -975,6 +1078,7 @@ const PrepopulatedEngine* const engines_
  
  // Venezuela
  const PrepopulatedEngine* const engines_VE[] = {
@@ -860,7 +864,7 @@
      &duckduckgo,
      &google,
      &yahoo_ve,
-@@ -899,6 +1001,7 @@ const PrepopulatedEngine* const engines_
+@@ -984,6 +1088,7 @@ const PrepopulatedEngine* const engines_
  
  // Vietnam
  const PrepopulatedEngine* const engines_VN[] = {
@@ -868,7 +872,7 @@
      &duckduckgo,
      &google,
      &coccoc,
-@@ -908,6 +1011,7 @@ const PrepopulatedEngine* const engines_
+@@ -994,6 +1099,7 @@ const PrepopulatedEngine* const engines_
  
  // Yemen
  const PrepopulatedEngine* const engines_YE[] = {
@@ -876,7 +880,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -917,6 +1021,7 @@ const PrepopulatedEngine* const engines_
+@@ -1003,6 +1109,7 @@ const PrepopulatedEngine* const engines_
  
  // South Africa
  const PrepopulatedEngine* const engines_ZA[] = {
@@ -884,7 +888,7 @@
      &duckduckgo,
      &google,
      &bing,
-@@ -925,6 +1030,7 @@ const PrepopulatedEngine* const engines_
+@@ -1012,6 +1119,7 @@ const PrepopulatedEngine* const engines_
  
  // Zimbabwe
  const PrepopulatedEngine* const engines_ZW[] = {

patches/series

@@ -1,10 +1,8 @@
-core/inox-patchset/chromium-exclude_unwind_tables.patch
 core/inox-patchset/0001-fix-building-without-safebrowsing.patch
 core/inox-patchset/0003-disable-autofill-download-manager.patch
 core/inox-patchset/0005-disable-default-extensions.patch
 core/inox-patchset/0007-disable-web-resource-service.patch
 core/inox-patchset/0009-disable-google-ipv6-probes.patch
-core/inox-patchset/0010-disable-gcm-status-check.patch
 core/inox-patchset/0014-disable-translation-lang-fetch.patch
 core/inox-patchset/0015-disable-update-pings.patch
 core/inox-patchset/0017-disable-new-avatar-menu.patch
@@ -44,7 +42,6 @@ extra/inox-patchset/0016-chromium-sandbox-pie.patch
 extra/inox-patchset/0018-disable-first-run-behaviour.patch
 extra/inox-patchset/0019-disable-battery-status-service.patch
 extra/debian/gn/parallel.patch
-extra/debian/fixes/ps-print.patch
 extra/debian/fixes/connection-message.patch
 extra/debian/disable/android.patch
 extra/debian/disable/fuzzers.patch

pruning.list

@@ -13,6 +13,9 @@ base/test/data/file_version_info_unittest/no_version_info.dll
 base/test/data/pe_image/pe_image_test_32.dll
 base/test/data/pe_image/pe_image_test_64.dll
 base/test/data/pe_image/pe_image_test_arm64.dll
+base/test/data/tzdata/2019a/44/le/metaZones.res
+base/test/data/tzdata/2019a/44/le/timezoneTypes.res
+base/test/data/tzdata/2019a/44/le/zoneinfo64.res
 build/android/CheckInstallApk-debug.apk
 build/android/chromium-debug.keystore
 build/android/tests/symbolize/liba.so
@@ -79,6 +82,7 @@ chrome/credential_provider/eventlog/gcp_eventlog_messages.mc
 chrome/installer/linux/debian/repo_signing_keys.gpg
 chrome/installer/test/data/SETUP.EX_
 chrome/services/cups_proxy/test/data/basic_handshake.bin
+chrome/updater/test/data/signed.exe.gz
 cloud_print/virtual_driver/win/install/inf/gcp_driver.inf
 components/cast_channel/fuzz_corpus/cast_message0
 components/cast_channel/fuzz_corpus/cast_message1
@@ -155,12 +159,11 @@ components/domain_reliability/baked_in_configs/gvt2_com.json
 components/domain_reliability/baked_in_configs/gvt6_com.json
 components/domain_reliability/baked_in_configs/ssl_gstatic_com.json
 components/domain_reliability/baked_in_configs/www_google_com.json
-components/safe_browsing/common/safe_browsing_prefs.cc
-components/safe_browsing/common/safe_browsing_prefs.h
+components/safe_browsing/core/common/safe_browsing_prefs.cc
+components/safe_browsing/core/common/safe_browsing_prefs.h
 components/services/storage/test_data/legacy_dom_storage_database.localstorage
 components/signin/public/base/signin_pref_names.cc
 components/signin/public/base/signin_pref_names.h
-components/subresource_filter/core/common/perftests/data/UnindexedRules_8.0
 components/test/data/autofill/automated_integration/testdata/Default/Web Data
 components/test/data/cast_certificate/testsuite/testsuite1.pb
 components/test/data/crx_file/sample.zip
@@ -191,6 +194,29 @@ components/test/data/update_client/jebgalgnebhfojomionfpkfelancnnkf.crx
 components/test/data/update_client/jebgalgnebhfojomionfpkfelancnnkf/component1.dll
 components/test/data/update_client/runaction_test_win.crx3
 components/test/data/webp_transcode/test_small.tiff
+components/viz/test/data/render_pass_data/top_real_world_desktop/accu_weather_2018/accu_weather_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/amazon_2018/amazon_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/blogspot_2018/blogspot_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/booking.com_2018/booking.com_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/cnn_2018/cnn_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/ebay_2018/ebay_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/espn_2018/espn_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/facebook_2018/facebook_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/gmail_2018/gmail_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/google_calendar_2018/google_calendar_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/google_docs_2018/google_docs_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/google_image_search_2018/google_image_search_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/google_plus_2018/google_plus_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/google_web_search_2018/google_web_search_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/linkedin_2018/linkedin_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/pinterest_2018/pinterest_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/techcrunch_2018/techcrunch_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/twitch_2018/twitch_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/twitter_2018/twitter_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/wikipedia_2018/wikipedia_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/wordpress_2018/wordpress_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/yahoo_answers_2018/yahoo_answers_2018.zip
+components/viz/test/data/render_pass_data/top_real_world_desktop/yahoo_sports_2018/yahoo_sports_2018.zip
 components/zucchini/fuzzers/testdata/imposed_ensemble_matcher_fuzzer/seed.asciipb
 components/zucchini/fuzzers/testdata/patch_fuzzer/empty.zuc
 components/zucchini/fuzzers/testdata/raw_or_ztf_gen_fuzzer/seed_proto.bin
@@ -249,6 +275,7 @@ media/midi/fuzz/usb_midi_descriptor_corpus/b
 media/midi/fuzz/usb_midi_descriptor_corpus/c
 media/midi/fuzz/usb_midi_descriptor_corpus/d
 media/midi/fuzz/usb_midi_descriptor_corpus/e
+mojo/public/tools/fuzzers/message_corpus/array_bool.mojomsg
 mojo/public/tools/fuzzers/message_corpus/message_0.mojomsg
 mojo/public/tools/fuzzers/message_corpus/message_1.mojomsg
 mojo/public/tools/fuzzers/message_corpus/message_10.mojomsg
@@ -9414,6 +9441,7 @@ third_party/catapult/third_party/google-endpoints/setuptools/cli.exe
 third_party/catapult/third_party/google-endpoints/setuptools/gui-32.exe
 third_party/catapult/third_party/google-endpoints/setuptools/gui-64.exe
 third_party/catapult/third_party/google-endpoints/setuptools/gui.exe
+third_party/catapult/third_party/gsutil/gslib/tests/test_data/favicon.ico.gz
 third_party/catapult/third_party/gsutil/gslib/tests/test_data/test.p12
 third_party/catapult/third_party/gsutil/third_party/crcmod_osx/crcmod/_crcfunext.so
 third_party/catapult/third_party/gsutil/third_party/httplib2/ref/img1.old
@@ -14092,6 +14120,8 @@ third_party/grpc/src/test/core/transport/chttp2/hpack_parser_corpus/fdf548cde981
 third_party/grpc/src/test/core/transport/chttp2/hpack_parser_corpus/ff2097734bd7bb8451aece13c9336c4624735170
 third_party/grpc/src/test/core/transport/chttp2/hpack_parser_corpus/ff2c949863eb4e14d9e835c51591304403d91b6c
 third_party/grpc/src/test/core/transport/chttp2/hpack_parser_corpus/ff7d6ff060e63355701b2e655c802902338497de
+third_party/harfbuzz-ng/src/test/api/fonts/AdobeVFPrototype.WA.gpos.otf
+third_party/harfbuzz-ng/src/test/api/fonts/AdobeVFPrototype.WAV.gpos.otf
 third_party/harfbuzz-ng/src/test/api/fonts/AdobeVFPrototype.abc.otf
 third_party/harfbuzz-ng/src/test/api/fonts/AdobeVFPrototype.ac.nohints.otf
 third_party/harfbuzz-ng/src/test/api/fonts/AdobeVFPrototype.ac.nosubrs.nohints.otf
@@ -14106,6 +14136,7 @@ third_party/harfbuzz-ng/src/test/api/fonts/MathTestFontPartial1.otf
 third_party/harfbuzz-ng/src/test/api/fonts/MathTestFontPartial2.otf
 third_party/harfbuzz-ng/src/test/api/fonts/MathTestFontPartial3.otf
 third_party/harfbuzz-ng/src/test/api/fonts/MathTestFontPartial4.otf
+third_party/harfbuzz-ng/src/test/api/fonts/RanaKufi-Regular.subset.otf
 third_party/harfbuzz-ng/src/test/api/fonts/SourceHanSans-Regular.41,3041,4C2E.otf
 third_party/harfbuzz-ng/src/test/api/fonts/SourceHanSans-Regular.41,4C2E.nohints.otf
 third_party/harfbuzz-ng/src/test/api/fonts/SourceHanSans-Regular.41,4C2E.nosubrs.nohints.otf
@@ -14156,6 +14187,7 @@ third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuz
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5728971283496960
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5746142327865344
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-shape-fuzzer-5750379279548416
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5641053680173056
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5643036478930944
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5686186874503168
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5717414645334016
@@ -14264,13 +14296,19 @@ third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5768601332613120
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5067936541179904
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5077547978588160
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5148388450631680
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5167653459329024
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5169035432165376
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5206191479455744
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5359635656605696
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5521982557782016
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5542653037903872
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5609911946838016
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5629878397829120
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5634197349203968
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5642531954229248
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5643107869917184
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5650879734874112
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5651059347816448
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5659903036751872
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5660711141769216
@@ -14285,10 +14323,13 @@ third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5680398559870976
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5690658895953920
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5695279609675776
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5695925913911296
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5696607199166464
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5696825891225600
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5708764082864128
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5710107829075968
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5711951464759296
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5715299773186048
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5716947896893440
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5718215406125056
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5721073428987904
@@ -14296,10 +14337,14 @@ third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5728664968232960
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5738978499624960
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5739000398086144
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5741295280848896
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5743250149736448
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5747028458209280
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5747265633779712
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5747280156295168
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5750092395970560
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5750420593442816
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5753173985984512
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5754526379802624
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5758598970343424
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5760768497156096
@@ -14658,39 +14703,59 @@ third_party/harfbuzz-ng/src/test/subset/data/expected/cmap14/cmap14_font1.retain
 third_party/harfbuzz-ng/src/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.retain-all-codepoint.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.41,43.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.41,46.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.41.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.42,44.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.43,46.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.retain-all-codepoint.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.41,43.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.41,46.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.41.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.42,44.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.43,46.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.retain-all-codepoint.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.21,23,25.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.21,23.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.41,42,43.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.retain-all-codepoint.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.21,23,25.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.21,23.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.41,42,43.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.retain-all-codepoint.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.21,23,25.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.21,23.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.41,42,43.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.retain-all-codepoint.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.21,23,25.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.21,23.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.41,42,43.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.retain-all-codepoint.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.28,29.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.28,2B.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.29,2B.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.41,42,43.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.retain-all-codepoint.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.28,29.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.28,2B.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.29,2B.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.41,42,43.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.retain-all-codepoint.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout-retain-gids.30,31,32,33.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout-retain-gids.41,42,43.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout-retain-gids.retain-all-codepoint.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout.30,31,32,33.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout.41,42,43.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout.retain-all-codepoint.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout-retain-gids.30,31,32,33.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout-retain-gids.41,42,43.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout-retain-gids.retain-all-codepoint.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout.30,31,32,33.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout.41,42,43.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout.retain-all-codepoint.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout-retain-gids.30,31,32,33.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout-retain-gids.41,42,43.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout-retain-gids.retain-all-codepoint.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout.30,31,32,33.otf
+third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout.41,42,43.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout.retain-all-codepoint.otf
 third_party/harfbuzz-ng/src/test/subset/data/fonts/SourceHanSans-Regular_subset.otf
 third_party/harfbuzz-ng/src/test/subset/data/fonts/SourceSansPro-Regular.otf
@@ -14750,6 +14815,7 @@ third_party/icu/source/data/in/uts46.nrm
 third_party/icu/tzres/metaZones.res
 third_party/icu/tzres/timezoneTypes.res
 third_party/icu/tzres/zoneinfo64.res
+third_party/jetifier_standalone/lib/jetifier-standalone.jar
 third_party/libdrm/src/intel/tests/gen4-3d.batch
 third_party/libdrm/src/intel/tests/gen5-3d.batch
 third_party/libdrm/src/intel/tests/gen6-3d.batch
@@ -17092,6 +17158,7 @@ third_party/llvm/llvm/test/Bitcode/Inputs/thinlto-function-summary-callgraph-com
 third_party/llvm/llvm/test/Bitcode/Inputs/thinlto-function-summary-callgraph-pgo-combined.1.bc
 third_party/llvm/llvm/test/Bitcode/Inputs/thinlto-function-summary-callgraph-pgo.1.bc
 third_party/llvm/llvm/test/Bitcode/Inputs/thinlto-function-summary-callgraph.1.bc
+third_party/llvm/llvm/test/Bitcode/aarch64-addp-upgrade.bc
 third_party/llvm/llvm/test/Bitcode/aggregateInstructions.3.2.ll.bc
 third_party/llvm/llvm/test/Bitcode/atomic-no-syncscope.ll.bc
 third_party/llvm/llvm/test/Bitcode/attributes-3.3.ll.bc
@@ -17162,6 +17229,7 @@ third_party/llvm/llvm/test/Bitcode/vectorInstructions.3.2.ll.bc
 third_party/llvm/llvm/test/Bitcode/visibility-styles.3.2.ll.bc
 third_party/llvm/llvm/test/Bitcode/weak-cmpxchg-upgrade.ll.bc
 third_party/llvm/llvm/test/Bitcode/weak-macho-3.5.ll.bc
+third_party/llvm/llvm/test/DebugInfo/Inputs/.build-id/ab/b50d82b6bdc861.debug
 third_party/llvm/llvm/test/DebugInfo/Inputs/arange-overlap.elf-x86_64
 third_party/llvm/llvm/test/DebugInfo/Inputs/arm-relocs.elf-arm
 third_party/llvm/llvm/test/DebugInfo/Inputs/cross-cu-inlining.x86_64-macho.o
@@ -17172,6 +17240,7 @@ third_party/llvm/llvm/test/DebugInfo/Inputs/dwarfdump-gdbindex-v7.elf-x86-64
 third_party/llvm/llvm/test/DebugInfo/Inputs/dwarfdump-inl-test.elf-x86-64
 third_party/llvm/llvm/test/DebugInfo/Inputs/dwarfdump-inl-test.high_pc.elf-x86-64
 third_party/llvm/llvm/test/DebugInfo/Inputs/dwarfdump-macho-relocs.macho.x86_64.o
+third_party/llvm/llvm/test/DebugInfo/Inputs/dwarfdump-macro.dwo
 third_party/llvm/llvm/test/DebugInfo/Inputs/dwarfdump-macro.o
 third_party/llvm/llvm/test/DebugInfo/Inputs/dwarfdump-objc.x86_64.o
 third_party/llvm/llvm/test/DebugInfo/Inputs/dwarfdump-pubnames.elf-x86-64
@@ -17254,8 +17323,6 @@ third_party/llvm/llvm/test/Object/Inputs/dext-test.elf-mips64r2
 third_party/llvm/llvm/test/Object/Inputs/dyn-rel.so.elf-mips
 third_party/llvm/llvm/test/Object/Inputs/dynamic-reloc.so
 third_party/llvm/llvm/test/Object/Inputs/elf-mip64-reloc.o
-third_party/llvm/llvm/test/Object/Inputs/elf-versioning-test.i386
-third_party/llvm/llvm/test/Object/Inputs/elf-versioning-test.x86_64
 third_party/llvm/llvm/test/Object/Inputs/hello-world.elf-x86-64
 third_party/llvm/llvm/test/Object/Inputs/hello-world.macho-x86_64
 third_party/llvm/llvm/test/Object/Inputs/invalid-bad-section-address.coff
@@ -17444,8 +17511,6 @@ third_party/llvm/llvm/test/Object/Inputs/macho64-invalid-too-small-segment-load-
 third_party/llvm/llvm/test/Object/Inputs/main-ret-zero-pe-i386.dll
 third_party/llvm/llvm/test/Object/Inputs/main-ret-zero-pe-i386.exe
 third_party/llvm/llvm/test/Object/Inputs/micro-mips.elf-mipsel
-third_party/llvm/llvm/test/Object/Inputs/no-section-header-string-table.elf-x86-64
-third_party/llvm/llvm/test/Object/Inputs/no-section-table.so
 third_party/llvm/llvm/test/Object/Inputs/no-sections.elf-x86-64
 third_party/llvm/llvm/test/Object/Inputs/phdr-note.elf-x86-64
 third_party/llvm/llvm/test/Object/Inputs/phdrs.elf-x86-64
@@ -17575,6 +17640,7 @@ third_party/llvm/llvm/test/tools/dsymutil/Inputs/private/tmp/baseaddr/loc1.x86_6
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/private/tmp/common/common.x86_64
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/private/tmp/common/common1.o
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/private/tmp/common/common2.o
+third_party/llvm/llvm/test/tools/dsymutil/Inputs/remarks/basic.macho.remarks.archive.x86_64
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/remarks/basic.macho.remarks.empty.x86_64
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/remarks/basic.macho.remarks.x86_64
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/remarks/basic1.macho.remarks.empty.x86_64.o
@@ -17592,6 +17658,7 @@ third_party/llvm/llvm/test/tools/dsymutil/Inputs/remarks/fat.macho.remarks.x86.o
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/remarks/fat.macho.remarks.x86.opt.bitstream
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/remarks/fat.macho.remarks.x86_64.opt.bitstream
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/remarks/fat.macho.remarks.x86_64h.opt.bitstream
+third_party/llvm/llvm/test/tools/dsymutil/Inputs/remarks/libbasic.a
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/scattered-reloc/1.o
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/sibling.o
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/submodules/1.o
@@ -17601,6 +17668,8 @@ third_party/llvm/llvm/test/tools/dsymutil/Inputs/swift-dwarf-loc.macho.x86_64
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/swift-dwarf-loc.macho.x86_64.o
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/thumb.armv7m
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/thumb.o
+third_party/llvm/llvm/test/tools/dsymutil/X86/Inputs/call-site-entry.macho.x86_64
+third_party/llvm/llvm/test/tools/dsymutil/X86/Inputs/call-site-entry.macho.x86_64.o
 third_party/llvm/llvm/test/tools/gold/X86/Inputs/drop-debug.bc
 third_party/llvm/llvm/test/tools/gold/X86/Inputs/invalid.bc
 third_party/llvm/llvm/test/tools/llvm-ar/Inputs/absolute-paths.lib
@@ -17822,6 +17891,7 @@ third_party/llvm/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-set-type-imm
 third_party/llvm/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-uleb-malformed-uleb128
 third_party/llvm/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-uleb-times
 third_party/llvm/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-uleb-times-skipping-uleb
+third_party/llvm/llvm/test/tools/llvm-objdump/Inputs/macho-stabs-x86_64
 third_party/llvm/llvm/test/tools/llvm-objdump/Inputs/macho-trie-bad-export-info-malformed-uleb128
 third_party/llvm/llvm/test/tools/llvm-objdump/Inputs/macho-trie-bad-export-info-malformed-uleb128_too_big
 third_party/llvm/llvm/test/tools/llvm-objdump/Inputs/macho-trie-bad-kind
@@ -17952,105 +18022,92 @@ third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/compressed.profraw
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/gcc-sample-profile.gcov
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/weight-instr-bar.profdata
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/weight-instr-foo.profdata
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/abiflags.obj.elf-mips
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/abiflags.obj.elf-mipsel
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/aix_xcoff_xlc_test8.o
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/arm64-win1.obj
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/arm64-win2.obj
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/bad-relocs.obj.coff-i386
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/basereloc.obj.coff-i386
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/bigobj.coff-x86-64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-cycle.obj
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-inlinees.obj
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-inlining.obj.coff
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-label.obj
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-merging-1.obj
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-merging-2.obj
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-merging-anon.obj
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-types.obj
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-unsorted.obj
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/codeview-vftable.obj.coff
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/coff-load-config-data-end.exe
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/coff-load-config-x64.dll
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/coff-load-config-x86.dll
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/coff-no-load-config.exe
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/comdat-function-linetables.obj.coff-2012-i386
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/comdat-function-linetables.obj.coff-2013-i386
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/compression.zlib.style.elf-x86-64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/const-import.lib
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/cxx-cli-aux.obj.coff-i386
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/directives.obj.coff-x86_64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/dynamic-table-exe.mips
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/dynamic-table-so.mips
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/dynamic-table-so.x86
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/export-arm.dll
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/export-x64.dll
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/export-x86.dll
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-i386
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-ppc
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-ppc64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/gnuhash.so.elf-x86_64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/got-empty.exe.mipsel
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/got-over.exe.elf-mips
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/got-plt.exe.elf-mipsel
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/got-static.exe.mips
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/got-tls.so.elf-mips64el
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/has_pdb.exe
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/imports.exe.coff-i386
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/imports.exe.coff-x86-64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/library.lib
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/macho-universal-archive.x86_64.i386
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/macho-universal.x86_64.i386
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/magic.coff-importlib
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/mips-options.elf-mips64el
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/mips-rld-map-rel.elf-mipsel
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/multifile-linetables.obj.coff-2012-i368
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/multifile-linetables.obj.coff-2012-x86_64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/multifile-linetables.obj.coff-2013-i368
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/multifile-linetables.obj.coff-2013-x86_64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/multifunction-linetables.obj.coff-2012-i368
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/multifunction-linetables.obj.coff-2012-x86_64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/multifunction-linetables.obj.coff-2013-i368
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/multifunction-linetables.obj.coff-2013-x86_64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/needed-libs.obj.coff-am64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/nop.exe.coff-x86-64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/options.obj.elf-mipsel
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/phdrs-elf.exe-i386
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/phdrs-elf.exe-x86_64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/ppc64.exe
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/reginfo.obj.elf-mipsel
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/relocs-no-symtab.obj.coff-i386
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/relocs.obj.elf-mips
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/relocs.obj.elf-x86_64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/relocs.obj.macho-arm
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/relocs.obj.macho-i386
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/relocs.obj.macho-x86_64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/resources/test_resource.obj.coff
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/resources/test_resource.res
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/rpath.exe.elf-x86_64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/st-other.obj.elf-mips
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/st-other.obj.elf-mips16
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/symbols-proc-specific.elf-hexagon
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.exe.coff-arm
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.coff-arm
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.coff-i386
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.coff-x86-64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.elf-amdhsa-gfx803
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.elf-i386
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.elf-mipsel
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.elf-x86-64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.macho-arm
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.macho-i386
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.macho-ppc
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.macho-ppc64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.macho-x86-64
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.wasm
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/xcoff-basic-64.o
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/xcoff-basic-neg-sym-count.o
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/xcoff-basic-neg-time.o
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/xcoff-basic.o
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/xcoff-reloc-overflow.o
-third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/zero-string-table.obj.coff-i386
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/aix_xcoff_xlc_test8.o
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/arm64-win1.obj
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/arm64-win2.obj
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/bad-relocs.obj.coff-i386
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/basereloc.obj.coff-i386
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/bigobj.coff-x86-64
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-cycle.obj
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-inlinees.obj
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-inlining.obj.coff
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-label.obj
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-merging-1.obj
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-merging-2.obj
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-merging-anon.obj
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-types.obj
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-unsorted.obj
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/codeview-vftable.obj.coff
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/coff-load-config-data-end.exe
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/coff-load-config-x64.dll
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/coff-load-config-x86.dll
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/coff-no-load-config.exe
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/comdat-function-linetables.obj.coff-2012-i386
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/comdat-function-linetables.obj.coff-2013-i386
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/const-import.lib
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/cxx-cli-aux.obj.coff-i386
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/directives.obj.coff-x86_64
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/export-arm.dll
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/export-x64.dll
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/export-x86.dll
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/has_pdb.exe
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/imports.exe.coff-i386
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/imports.exe.coff-x86-64
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/library.lib
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/magic.coff-importlib
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/multifile-linetables.obj.coff-2012-i368
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/multifile-linetables.obj.coff-2012-x86_64
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/multifile-linetables.obj.coff-2013-i368
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/multifile-linetables.obj.coff-2013-x86_64
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/multifunction-linetables.obj.coff-2012-i368
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/multifunction-linetables.obj.coff-2012-x86_64
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/multifunction-linetables.obj.coff-2013-i368
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/multifunction-linetables.obj.coff-2013-x86_64
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/needed-libs.obj.coff-am64
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/nop.exe.coff-x86-64
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/relocs-no-symtab.obj.coff-i386
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/resources/test_resource.obj.coff
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/resources/test_resource.res
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/trivial.exe.coff-arm
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/trivial.obj.coff-arm
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/trivial.obj.coff-i386
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/trivial.obj.coff-x86-64
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/xcoff-basic-64.o
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/xcoff-basic-neg-sym-count.o
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/xcoff-basic-neg-time.o
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/xcoff-basic.o
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/xcoff-reloc-overflow.o
+third_party/llvm/llvm/test/tools/llvm-readobj/COFF/Inputs/zero-string-table.obj.coff-i386
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/abiflags.obj.elf-mips
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/abiflags.obj.elf-mipsel
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/dynamic-table-exe.mips
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/dynamic-table-so.mips
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/got-empty.exe.mipsel
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/got-over.exe.elf-mips
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/got-plt.exe.elf-mipsel
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/got-static.exe.mips
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/got-tls.so.elf-mips64el
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/mips-options.elf-mips64el
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/mips-rld-map-rel.elf-mipsel
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/options.obj.elf-mipsel
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/phdrs-elf.exe-i386
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/phdrs-elf.exe-x86_64
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/ppc64.exe
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/reginfo.obj.elf-mipsel
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/trivial.obj.elf-amdhsa-gfx803
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/trivial.obj.elf-i386
+third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/trivial.obj.elf-mipsel
+third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/macho-universal-archive.x86_64.i386
+third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/macho-universal.x86_64.i386
+third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/relocs.obj.macho-arm
+third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/relocs.obj.macho-i386
+third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/relocs.obj.macho-x86_64
+third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/trivial.obj.macho-arm
+third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/trivial.obj.macho-i386
+third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/trivial.obj.macho-ppc
+third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/trivial.obj.macho-ppc64
+third_party/llvm/llvm/test/tools/llvm-readobj/MachO/Inputs/trivial.obj.macho-x86-64
+third_party/llvm/llvm/test/tools/llvm-readobj/wasm/Inputs/trivial.obj.wasm
 third_party/llvm/llvm/test/tools/llvm-symbolizer/Inputs/addr.exe
 third_party/llvm/llvm/test/tools/llvm-symbolizer/Inputs/coff-dwarf.exe
 third_party/llvm/llvm/test/tools/llvm-symbolizer/Inputs/coff-exports.exe
@@ -18236,6 +18293,16 @@ third_party/openscreen/src/cast/streaming/sender_report_parser_fuzzer_seeds/rtcp
 third_party/openscreen/src/cast/streaming/sender_report_parser_fuzzer_seeds/sender_report_with_report_block.bin
 third_party/openscreen/src/cast/streaming/sender_report_parser_fuzzer_seeds/sender_report_without_report_block.bin
 third_party/openscreen/src/test/data/cast/common/certificate/testsuite/testsuite1.pb
+third_party/openscreen/src/test/data/cast/receiver/channel/auth_challenge.pb
+third_party/openscreen/src/test/data/cast/receiver/channel/auth_response.pb
+third_party/openscreen/src/test/data/cast/receiver/channel/bad_signature_crl.pb
+third_party/openscreen/src/test/data/cast/receiver/channel/bad_signer_cert_crl.pb
+third_party/openscreen/src/test/data/cast/receiver/channel/device_revoked_crl.pb
+third_party/openscreen/src/test/data/cast/receiver/channel/device_serial_revoked_crl.pb
+third_party/openscreen/src/test/data/cast/receiver/channel/good_crl.pb
+third_party/openscreen/src/test/data/cast/receiver/channel/invalid_time_crl.pb
+third_party/openscreen/src/test/data/cast/receiver/channel/issuer_revoked_crl.pb
+third_party/openscreen/src/test/data/cast/receiver/channel/issuer_serial_revoked_crl.pb
 third_party/pdfium/testing/resources/bug_552046.in
 third_party/pdfium/testing/resources/bug_861842.in
 third_party/pdfium/testing/resources/hint_table_102p.bin
@@ -18251,6 +18318,7 @@ third_party/perfetto/src/profiling/memory/shared_ring_buffer_fuzzer_corpus/empty
 third_party/perfetto/src/profiling/memory/shared_ring_buffer_fuzzer_corpus/overflow
 third_party/perfetto/src/profiling/memory/shared_ring_buffer_fuzzer_corpus/read
 third_party/perfetto/src/traced/probes/ftrace/cpu_reader_fuzzer_corpus/one_page_sched_switch
+third_party/perfetto/test/trace_processor/track_event_typed_args.pb
 third_party/protobuf/benchmarks/datasets/google_message1/proto2/dataset.google_message1_proto2.pb
 third_party/protobuf/benchmarks/datasets/google_message1/proto3/dataset.google_message1_proto3.pb
 third_party/protobuf/benchmarks/datasets/google_message2/dataset.google_message2.pb
@@ -18297,15 +18365,12 @@ third_party/pyelftools/test/testfiles_for_unittests/simple_gcc.elf.arm
 third_party/pywebsocket/src/test/cert/client_cert.p12
 third_party/quic_trace/src/examples/example.json.gz
 third_party/quic_trace/src/examples/example.qtr
-third_party/sfntly/src/cpp/ext/redist/cmake-2.8.5-win32-x86.zip
-third_party/sfntly/src/cpp/ext/redist/gtest-1.6.0.zip
-third_party/sfntly/src/cpp/ext/redist/icu4c-4_6_1-Win32-msvc10.zip
-third_party/sfntly/src/java/lib/icu4j-4_8_1_1.jar
-third_party/sfntly/src/java/lib/icu4j-charset-4_8_1_1.jar
-third_party/sfntly/src/java/lib/jcommander-1.27.jar
-third_party/sfntly/src/java/lib/junit-4.10.jar
 third_party/skia/experimental/wasm-skp-debugger/debugger/anim.mskp
 third_party/skia/experimental/wasm-skp-debugger/debugger/sample.skp
+third_party/skia/modules/canvaskit/canvaskit/red_line.skp
+third_party/skia/modules/canvaskit/tests/assets/Roboto-Regular.otf
+third_party/skia/modules/canvaskit/tests/assets/red_line.skp
+third_party/skia/modules/canvaskit/tests/assets/test.ttc
 third_party/skia/platform_tools/android/apps/gradle/wrapper/gradle-wrapper.jar
 third_party/skia/platform_tools/android/bin/linux/perfhost
 third_party/skia/platform_tools/android/bin/mac/perfhost
@@ -18341,6 +18406,7 @@ third_party/skia/site/dev/design/conical/lemma3.1.ggb
 third_party/skia/site/dev/design/conical/lemma3.2.ggb
 third_party/skia/site/dev/design/conical/lemma3.ggb
 third_party/skia/site/dev/design/conical/lemma4.ggb
+third_party/skia/site/dev/tools/calendar.mskp
 third_party/snappy/src/testdata/baddata1.snappy
 third_party/snappy/src/testdata/baddata2.snappy
 third_party/snappy/src/testdata/baddata3.snappy
@@ -18348,6 +18414,7 @@ third_party/snappy/src/testdata/fireworks.jpeg
 third_party/snappy/src/testdata/geo.protodata
 third_party/snappy/src/testdata/kppkn.gtb
 third_party/spirv-cross/spirv-cross/tests-other/c_api_test.spv
+third_party/spirv-cross/spirv-cross/tests-other/hlsl_resource_binding.spv
 third_party/spirv-cross/spirv-cross/tests-other/msl_constexpr_test.spv
 third_party/spirv-cross/spirv-cross/tests-other/msl_resource_binding.spv
 third_party/spirv-cross/spirv-cross/tests-other/msl_ycbcr_conversion_test.spv
@@ -18382,18 +18449,18 @@ third_party/sqlite/fuzz/lpm_fuzzer_seed_corpus/corpus_queries8
 third_party/sqlite/fuzz/lpm_fuzzer_seed_corpus/corpus_queries9
 third_party/sqlite/patched/tool/win/sqlite.vsix
 third_party/sqlite/patched/vsixtest/vsixtest_TemporaryKey.pfx
-third_party/sqlite/sqlite-src-3300100/test/dbfuzz2-seed1.db
-third_party/sqlite/sqlite-src-3300100/test/fuzzdata1.db
-third_party/sqlite/sqlite-src-3300100/test/fuzzdata2.db
-third_party/sqlite/sqlite-src-3300100/test/fuzzdata3.db
-third_party/sqlite/sqlite-src-3300100/test/fuzzdata4.db
-third_party/sqlite/sqlite-src-3300100/test/fuzzdata5.db
-third_party/sqlite/sqlite-src-3300100/test/fuzzdata6.db
-third_party/sqlite/sqlite-src-3300100/test/fuzzdata7.db
-third_party/sqlite/sqlite-src-3300100/test/fuzzdata8.db
-third_party/sqlite/sqlite-src-3300100/test/sessionfuzz-data1.db
-third_party/sqlite/sqlite-src-3300100/tool/win/sqlite.vsix
-third_party/sqlite/sqlite-src-3300100/vsixtest/vsixtest_TemporaryKey.pfx
+third_party/sqlite/sqlite-src-3310100/test/dbfuzz2-seed1.db
+third_party/sqlite/sqlite-src-3310100/test/fuzzdata1.db
+third_party/sqlite/sqlite-src-3310100/test/fuzzdata2.db
+third_party/sqlite/sqlite-src-3310100/test/fuzzdata3.db
+third_party/sqlite/sqlite-src-3310100/test/fuzzdata4.db
+third_party/sqlite/sqlite-src-3310100/test/fuzzdata5.db
+third_party/sqlite/sqlite-src-3310100/test/fuzzdata6.db
+third_party/sqlite/sqlite-src-3310100/test/fuzzdata7.db
+third_party/sqlite/sqlite-src-3310100/test/fuzzdata8.db
+third_party/sqlite/sqlite-src-3310100/test/sessionfuzz-data1.db
+third_party/sqlite/sqlite-src-3310100/tool/win/sqlite.vsix
+third_party/sqlite/sqlite-src-3310100/vsixtest/vsixtest_TemporaryKey.pfx
 third_party/swiftshader/third_party/PowerVR_SDK/Builds/Windows/x86_32/Lib/libEGL.lib
 third_party/swiftshader/third_party/PowerVR_SDK/Builds/Windows/x86_32/Lib/libGLES_CM.lib
 third_party/swiftshader/third_party/PowerVR_SDK/Builds/Windows/x86_32/Lib/libGLESv2.lib
@@ -19525,6 +19592,7 @@ third_party/webgl/src/sdk/tests/resources/red-green.mp4
 third_party/webgl/src/sdk/tests/resources/red-green.theora.ogv
 third_party/webgl/src/sdk/tests/resources/red-green.webmvp8.webm
 third_party/webgl/src/sdk/tests/resources/transparent-2frames.webm
+third_party/webgpu-cts/src/deploy_key.enc
 third_party/webrtc/data/audio_processing/android/output_data_fixed.pb
 third_party/webrtc/data/audio_processing/android/output_data_float.pb
 third_party/webrtc/data/voice_engine/audio_long16big_endian.pcm
@@ -19844,6 +19912,7 @@ tools/clang/scripts/update.pyc
 tools/grit/grit/testdata/klonk-alternate-skeleton.rc
 tools/grit/grit/testdata/klonk.rc
 tools/origin_trials/eftest.key
+tools/origin_trials/eftest2.key
 tools/perf/contrib/media_router_benchmarks/test_site/bear-vp9-opus.webm
 tools/skia_goldctl/linux/goldctl
 tools/swarming_client/tests/archive.tar