Update to Chromium 78.0.3904.44

2026-04-15 00:44:06 +09:00 · 2019-10-07 17:58:01 -05:00
parent 99b98c530f
commit 5931f25336
65 changed files with 941 additions and 1002 deletions
--- a/chromium_version.txt
+++ b/chromium_version.txt
@@ -1 +1 @@
-77.0.3865.120
+78.0.3904.44
--- a/domain_substitution.list
+++ b/domain_substitution.list
--- a/patches/core/bromite/disable-fetching-field-trials.patch
+++ b/patches/core/bromite/disable-fetching-field-trials.patch
@@ -45,11 +45,11 @@ Subject: Disable fetching of all field trials
     // Alphabetical:
 --- a/components/variations/service/variations_service.cc
 +++ b/components/variations/service/variations_service.cc
-@@ -239,17 +239,7 @@ bool GetInstanceManipulations(const net:
+@@ -240,17 +240,7 @@ bool GetInstanceManipulations(const net:
 // Variations seed fetching is only enabled in official Chrome builds, if a URL
 // is specified on the command line, and for testing.
 bool IsFetchingEnabled() {
-#if !defined(GOOGLE_CHROME_BUILD)
+-#if !BUILDFLAG(GOOGLE_CHROME_BRANDING)
 -  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
 -          switches::kVariationsServerURL) &&
 -      !g_should_fetch_for_testing) {
--- a/patches/core/debian_buster/disable/perfetto.patch
+++ b/patches/core/debian_buster/disable/perfetto.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>

 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -678,7 +678,7 @@ group("gn_all") {
+@@ -685,7 +685,7 @@ group("gn_all") {
     }
   }
 
--- a/patches/core/debian_buster/disable/unrar.patch
+++ b/patches/core/debian_buster/disable/unrar.patch
@@ -4,7 +4,7 @@ bug: http://bugs.debian.org/914487

 --- a/chrome/common/safe_browsing/BUILD.gn
 +++ b/chrome/common/safe_browsing/BUILD.gn
-@@ -64,41 +64,6 @@ if (safe_browsing_mode == 1) {
+@@ -65,41 +65,6 @@ if (safe_browsing_mode == 1) {
     ]
   }
 
@@ -46,7 +46,7 @@ bug: http://bugs.debian.org/914487
   source_set("disk_image_type_sniffer_mac") {
     sources = [
       "disk_image_type_sniffer_mac.cc",
-@@ -167,7 +132,6 @@ source_set("safe_browsing") {
+@@ -168,7 +133,6 @@ source_set("safe_browsing") {
       ":archive_analyzer_results",
       ":binary_feature_extractor",
       ":download_type_util",
@@ -64,7 +64,7 @@ bug: http://bugs.debian.org/914487
 #include "chrome/common/safe_browsing/zip_analyzer.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
-@@ -50,8 +49,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile
+@@ -48,8 +47,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile
                                          AnalyzeRarFileCallback callback) {
   DCHECK(rar_file.IsValid());
 
@@ -76,7 +76,7 @@ bug: http://bugs.debian.org/914487
 }
 --- a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
 +++ b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
-@@ -97,7 +97,7 @@ void FileAnalyzer::Start(const base::Fil
+@@ -92,7 +92,7 @@ void FileAnalyzer::Start(const base::Fil
   if (inspection_type == DownloadFileType::ZIP) {
     StartExtractZipFeatures();
   } else if (inspection_type == DownloadFileType::RAR) {
--- a/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch
+++ b/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -909,30 +909,6 @@ void SetApplicationLocaleOnIOThread(cons
+@@ -861,30 +861,6 @@ void SetApplicationLocaleOnIOThread(cons
   GetIOThreadApplicationLocale() = locale;
 }
 
@@ -31,7 +31,15 @@
 #if defined(OS_ANDROID)
 float GetDeviceScaleAdjustment() {
   static const float kMinFSM = 1.05f;
-@@ -2154,7 +2130,7 @@ void ChromeContentBrowserClient::AppendE
+@@ -1263,7 +1239,6 @@ void ChromeContentBrowserClient::PostAft
+   InitNetworkContextsParentDirectory();
+ 
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+-  safe_browsing_service_ = g_browser_process->safe_browsing_service();
+ }
+ 
+ bool ChromeContentBrowserClient::IsBrowserStartupComplete() {
+@@ -2121,7 +2096,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) ||
@@ -40,17 +48,7 @@
         command_line->AppendSwitch(
             switches::kDisableClientSidePhishingDetection);
       }
-@@ -3013,9 +2989,6 @@ bool ChromeContentBrowserClient::CanCrea
- 
- void ChromeContentBrowserClient::ResourceDispatcherHostCreated() {
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  // TODO(jam): move this creation elsewhere so we can remove this method.
-  safe_browsing_service_ = g_browser_process->safe_browsing_service();
- }
- 
- content::SpeechRecognitionManagerDelegate*
-@@ -4253,7 +4226,7 @@ ChromeContentBrowserClient::CreateThrott
+@@ -4204,7 +4179,7 @@ ChromeContentBrowserClient::CreateThrott
 
   throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
       handle,
@@ -58,8 +56,8 @@
 +      nullptr,
       base::Bind(&SSLErrorHandler::HandleSSLError)));
 
-   std::unique_ptr<content::NavigationThrottle> https_upgrade_timing_throttle =
-@@ -4284,11 +4257,6 @@ ChromeContentBrowserClient::CreateThrott
+   throttles.push_back(std::make_unique<LoginNavigationThrottle>(handle));
+@@ -4237,11 +4212,6 @@ ChromeContentBrowserClient::CreateThrott
       PreviewsLitePageDecider::MaybeCreateThrottleFor(handle);
   if (previews_lite_page_throttle)
     throttles.push_back(std::move(previews_lite_page_throttle));
@@ -73,7 +71,7 @@
     (defined(OS_LINUX) && !defined(OS_CHROMEOS))
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -606,23 +606,11 @@ void ProfileImpl::LoadPrefsForNormalStar
+@@ -622,23 +622,11 @@ void ProfileImpl::LoadPrefsForNormalStar
                          g_browser_process->GetApplicationLocale(),
                          pref_registry_.get());
 
@@ -100,7 +98,7 @@
 }
 --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
 +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
-@@ -265,117 +265,6 @@ LookalikeUrlInterstitialPage* CreateLook
+@@ -271,117 +271,6 @@ LookalikeUrlInterstitialPage* CreateLook
                                                      safe_url));
 }
 
@@ -218,7 +216,7 @@
 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
 CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage(
     content::WebContents* web_contents) {
-@@ -481,8 +370,6 @@ void InterstitialHTMLSource::StartDataRe
+@@ -487,8 +376,6 @@ void InterstitialHTMLSource::StartDataRe
     interstitial_delegate.reset(CreateSSLBlockingPage(web_contents));
   } else if (path_without_query == "/mitm-software-ssl") {
     interstitial_delegate.reset(CreateMITMSoftwareBlockingPage(web_contents));
@@ -227,18 +225,26 @@
   } else if (path_without_query == "/clock") {
     interstitial_delegate.reset(CreateBadClockBlockingPage(web_contents));
   } else if (path_without_query == "/lookalike") {
-@@ -498,11 +385,6 @@ void InterstitialHTMLSource::StartDataRe
+@@ -502,16 +389,12 @@ void InterstitialHTMLSource::StartDataRe
+         CreateOriginPolicyInterstitialPage(web_contents));
+   }
 
-   if (path_without_query == "/supervised_user") {
-     html = GetSupervisedUserInterstitialHTML(path);
-  } else if (path_without_query == "/quietsafebrowsing") {
+-  if (path_without_query == "/quietsafebrowsing") {
 -    TestSafeBrowsingBlockingPageQuiet* blocking_page =
 -        CreateSafeBrowsingQuietBlockingPage(web_contents);
 -    interstitial_delegate.reset(blocking_page);
 -    html = blocking_page->GetHTML();
-   } else if (interstitial_delegate.get()) {
+ #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+-  } else if (path_without_query == "/supervised_user") {
+  if (path_without_query == "/supervised_user") {
+     html = GetSupervisedUserInterstitialHTML(path);
+  }
+ #endif
+-  } else if (interstitial_delegate.get()) {
+  if (interstitial_delegate.get()) {
     html = interstitial_delegate.get()->GetHTMLContents();
   } else {
+     html = ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
 --- a/chrome/browser/extensions/blacklist_state_fetcher.cc
 +++ b/chrome/browser/extensions/blacklist_state_fetcher.cc
@@ -32,28 +32,8 @@ BlacklistStateFetcher::~BlacklistStateFe
@@ -316,7 +322,7 @@
   // SimpleURLLoader -> (owned loader, extension id).
 --- a/chrome/browser/download/chrome_download_manager_delegate.cc
 +++ b/chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -325,13 +325,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
+@@ -345,13 +345,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
 
 void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
   download_manager_ = dm;
@@ -330,7 +336,7 @@
 }
 
 #if defined(OS_ANDROID)
-@@ -636,16 +629,6 @@ void ChromeDownloadManagerDelegate::Choo
+@@ -654,16 +647,6 @@ void ChromeDownloadManagerDelegate::Choo
 
 void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
     base::FilePath* filename) {
@@ -357,7 +363,7 @@
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/site_isolation/prefs_observer.h"
 #include "chrome/browser/ssl/secure_origin_prefs_observer.h"
-@@ -363,8 +362,6 @@ void BrowserProcessImpl::StartTearDown()
+@@ -361,8 +360,6 @@ void BrowserProcessImpl::StartTearDown()
 
   metrics_services_manager_.reset();
   intranet_redirect_detector_.reset();
@@ -366,7 +372,7 @@
   network_time_tracker_.reset();
 #if BUILDFLAG(ENABLE_PLUGINS)
   plugins_resource_service_.reset();
-@@ -962,22 +959,6 @@ StatusTray* BrowserProcessImpl::status_t
+@@ -954,22 +951,6 @@ StatusTray* BrowserProcessImpl::status_t
   return status_tray_.get();
 }
 
@@ -389,7 +395,7 @@
 subresource_filter::RulesetService*
 BrowserProcessImpl::subresource_filter_ruleset_service() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -1235,26 +1216,6 @@ void BrowserProcessImpl::CreateBackgroun
+@@ -1227,26 +1208,6 @@ void BrowserProcessImpl::CreateBackgroun
 #endif
 }
 
@@ -428,7 +434,7 @@
   subresource_filter::RulesetService* subresource_filter_ruleset_service()
       override;
   optimization_guide::OptimizationGuideService* optimization_guide_service()
-@@ -313,9 +310,6 @@ class BrowserProcessImpl : public Browse
+@@ -312,9 +309,6 @@ class BrowserProcessImpl : public Browse
   std::unique_ptr<BackgroundModeManager> background_mode_manager_;
 #endif
 
@@ -451,7 +457,7 @@
 namespace subresource_filter {
 class RulesetService;
 }
-@@ -110,10 +106,6 @@ class ResourceCoordinatorParts;
+@@ -106,10 +102,6 @@ class ResourceCoordinatorParts;
 class TabManager;
 }
 
@@ -462,7 +468,7 @@
 // NOT THREAD SAFE, call only from the main thread.
 // These functions shouldn't return NULL unless otherwise noted.
 class BrowserProcess {
-@@ -214,14 +206,6 @@ class BrowserProcess {
+@@ -210,14 +202,6 @@ class BrowserProcess {
   // on this platform (or this is a unit test).
   virtual StatusTray* status_tray() = 0;
 
@@ -582,7 +588,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"
-@@ -1310,9 +1309,6 @@ DownloadsAcceptDangerFunction::Downloads
+@@ -1311,9 +1310,6 @@ DownloadsAcceptDangerFunction::Downloads
 
 DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
 
@@ -592,7 +598,7 @@
 bool DownloadsAcceptDangerFunction::RunAsync() {
   std::unique_ptr<downloads::AcceptDanger::Params> params(
       downloads::AcceptDanger::Params::Create(*args_));
-@@ -1350,40 +1346,7 @@ void DownloadsAcceptDangerFunction::Prom
+@@ -1351,40 +1347,7 @@ void DownloadsAcceptDangerFunction::Prom
     return;
   }
   RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -724,7 +730,7 @@
 }  // namespace
 --- a/chrome/browser/download/download_target_determiner.cc
 +++ b/chrome/browser/download/download_target_determiner.cc
-@@ -257,9 +257,7 @@ DownloadTargetDeterminer::Result
+@@ -258,9 +258,7 @@ DownloadTargetDeterminer::Result
     // considered safe by safe browsing. Noticed that when generating file name,
     // |suggested_filename| and Content-Disposition header have higher priority
     // than the URL.
@@ -735,7 +741,7 @@
     net::HttpContentDisposition content_disposition_header(
         download_->GetContentDisposition(), referrer_charset);
     bool should_replace_extension =
-@@ -1056,29 +1054,7 @@ DownloadFileType::DangerLevel DownloadTa
+@@ -1063,29 +1061,7 @@ DownloadFileType::DangerLevel DownloadTa
       download_->HasUserGesture())
     return DownloadFileType::NOT_DANGEROUS;
 
@@ -768,7 +774,7 @@
 void DownloadTargetDeterminer::OnDownloadDestroyed(
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2954,8 +2954,6 @@ jumbo_split_static_library("browser") {
+@@ -3038,8 +3038,6 @@ jumbo_split_static_library("browser") {
       "download/download_commands.h",
       "download/download_crx_util.cc",
       "download/download_crx_util.h",
@@ -779,17 +785,17 @@
       "download/download_dir_util.cc",
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -2631,7 +2631,6 @@ jumbo_split_static_library("ui") {
-       "views/desktop_capture/desktop_media_tab_list.h",
-       "views/device_chooser_content_view.cc",
+@@ -2662,7 +2662,6 @@ jumbo_split_static_library("ui") {
       "views/device_chooser_content_view.h",
+       "views/devtools_process_observer.cc",
+       "views/devtools_process_observer.h",
 -      "views/download/download_danger_prompt_views.cc",
       "views/download/download_in_progress_dialog_view.cc",
       "views/download/download_in_progress_dialog_view.h",
       "views/download/download_item_view.cc",
 --- a/chrome/browser/ssl/security_state_tab_helper.cc
 +++ b/chrome/browser/ssl/security_state_tab_helper.cc
-@@ -149,76 +149,6 @@ bool SecurityStateTabHelper::UsedPolicyI
+@@ -160,88 +160,6 @@ bool SecurityStateTabHelper::UsedPolicyI
 
 security_state::MaliciousContentStatus
 SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -816,20 +822,32 @@
 -        return security_state::MALICIOUS_CONTENT_STATUS_MALWARE;
 -      case safe_browsing::SB_THREAT_TYPE_URL_UNWANTED:
 -        return security_state::MALICIOUS_CONTENT_STATUS_UNWANTED_SOFTWARE;
-      case safe_browsing::SB_THREAT_TYPE_SIGN_IN_PASSWORD_REUSE:
-#if defined(FULL_SAFE_BROWSING)
+-      case safe_browsing::SB_THREAT_TYPE_SIGNED_IN_SYNC_PASSWORD_REUSE:
+-#if BUILDFLAG(FULL_SAFE_BROWSING)
 -        if (safe_browsing::ChromePasswordProtectionService::
 -                ShouldShowPasswordReusePageInfoBubble(
 -                    web_contents(), PasswordType::PRIMARY_ACCOUNT_PASSWORD)) {
 -          return security_state::
-              MALICIOUS_CONTENT_STATUS_SIGN_IN_PASSWORD_REUSE;
+-              MALICIOUS_CONTENT_STATUS_SIGNED_IN_SYNC_PASSWORD_REUSE;
+-        }
+-        // If user has already changed Gaia password, returns the regular
+-        // social engineering content status.
+-        return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
+-#endif
+-      case safe_browsing::SB_THREAT_TYPE_SIGNED_IN_NON_SYNC_PASSWORD_REUSE:
+-#if BUILDFLAG(FULL_SAFE_BROWSING)
+-        if (safe_browsing::ChromePasswordProtectionService::
+-                ShouldShowPasswordReusePageInfoBubble(
+-                    web_contents(), PasswordType::OTHER_GAIA_PASSWORD)) {
+-          return security_state::
+-              MALICIOUS_CONTENT_STATUS_SIGNED_IN_NON_SYNC_PASSWORD_REUSE;
 -        }
 -        // If user has already changed Gaia password, returns the regular
 -        // social engineering content status.
 -        return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
 -#endif
 -      case safe_browsing::SB_THREAT_TYPE_ENTERPRISE_PASSWORD_REUSE:
-#if defined(FULL_SAFE_BROWSING)
+-#if BUILDFLAG(FULL_SAFE_BROWSING)
 -        if (safe_browsing::ChromePasswordProtectionService::
 -                ShouldShowPasswordReusePageInfoBubble(
 -                    web_contents(), PasswordType::ENTERPRISE_PASSWORD)) {
@@ -866,48 +884,9 @@
   return security_state::MALICIOUS_CONTENT_STATUS_NONE;
 }
 
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-@@ -637,36 +637,6 @@ void ChromeBrowsingDataRemoverDelegate::
-         CONTENT_SETTINGS_TYPE_CLIENT_HINTS, base::Time(), base::Time::Max(),
-         website_settings_filter);
- 
-    // Clear the safebrowsing cookies only if time period is for "all time".  It
-    // doesn't make sense to apply the time period of deleting in the last X
-    // hours/days to the safebrowsing cookies since they aren't the result of
-    // any user action.
-    if (IsForAllTime()) {
-      safe_browsing::SafeBrowsingService* sb_service =
-          g_browser_process->safe_browsing_service();
-      if (sb_service) {
-        network::mojom::CookieManagerPtr cookie_manager;
-        sb_service->GetNetworkContext()->GetCookieManager(
-            mojo::MakeRequest(&cookie_manager));
-
-        network::mojom::CookieManager* manager_ptr = cookie_manager.get();
-
-        network::mojom::CookieDeletionFilterPtr deletion_filter =
-            filter_builder->BuildCookieDeletionFilter();
-        if (!delete_begin_.is_null())
-          deletion_filter->created_after_time = delete_begin_;
-        if (!delete_end_.is_null())
-          deletion_filter->created_before_time = delete_end_;
-
-        manager_ptr->DeleteCookies(
-            std::move(deletion_filter),
-            base::BindOnce(
-                &OnClearedCookies,
-                CreateTaskCompletionClosure(TracingDataType::kCookies),
-                std::move(cookie_manager)));
-      }
-    }
-
-     MediaDeviceIDSalt::Reset(profile_->GetPrefs());
-   }
- 
 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc
 +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -772,9 +772,6 @@ void ChromeMetricsServiceClient::Registe
+@@ -773,9 +773,6 @@ void ChromeMetricsServiceClient::Registe
   metrics_service_->RegisterMetricsProvider(
       std::make_unique<HttpsEngagementMetricsProvider>());
 
@@ -919,7 +898,7 @@
       std::make_unique<UpgradeMetricsProvider>());
 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -238,7 +238,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -244,7 +244,6 @@ void ChromeBrowserMainExtraPartsProfiles
 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
   CaptivePortalServiceFactory::GetInstance();
 #endif
@@ -952,7 +931,7 @@
       captive_portal::CaptivePortalMetrics::LogCaptivePortalBlockingPageEvent(
 --- a/chrome/browser/ssl/cert_report_helper.cc
 +++ b/chrome/browser/ssl/cert_report_helper.cc
-@@ -179,8 +179,6 @@ void CertReportHelper::FinishCertCollect
+@@ -180,8 +180,6 @@ void CertReportHelper::FinishCertCollect
     LOG(ERROR) << "Failed to serialize certificate report.";
     return;
   }
@@ -963,7 +942,7 @@
 bool CertReportHelper::ShouldShowCertificateReporterCheckbox() {
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -244,10 +244,6 @@ void TabHelpers::AttachTabHelpers(WebCon
+@@ -247,10 +247,6 @@ void TabHelpers::AttachTabHelpers(WebCon
   PreviewsUITabHelper::CreateForWebContents(web_contents);
   RecentlyAudibleHelper::CreateForWebContents(web_contents);
   ResourceLoadingHintsWebContentsObserver::CreateForWebContents(web_contents);
@@ -971,20 +950,20 @@
 -      web_contents);
 -  safe_browsing::TriggerCreator::MaybeCreateTriggersForWebContents(
 -      profile, web_contents);
+   safety_tips::ReputationWebContentsObserver::CreateForWebContents(
+       web_contents);
   SearchEngineTabHelper::CreateForWebContents(web_contents);
-   SecurityStateTabHelper::CreateForWebContents(web_contents);
-   if (SiteEngagementService::IsEnabled())
-@@ -299,7 +295,6 @@ void TabHelpers::AttachTabHelpers(WebCon
+@@ -303,7 +299,6 @@ void TabHelpers::AttachTabHelpers(WebCon
       web_contents, std::make_unique<ChromePDFWebContentsHelperClient>());
   PluginObserver::CreateForWebContents(web_contents);
   SadTabHelper::CreateForWebContents(web_contents);
 -  safe_browsing::SafeBrowsingTabObserver::CreateForWebContents(web_contents);
   SearchTabHelper::CreateForWebContents(web_contents);
   TabDialogs::CreateForWebContents(web_contents);
-   if (base::FeatureList::IsEnabled(features::kTabHoverCardImages))
+   if (base::FeatureList::IsEnabled(features::kTabHoverCardImages) ||
 --- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
 +++ b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
-@@ -70,20 +70,6 @@ void ChromeSubresourceFilterClient::DidS
+@@ -70,19 +70,6 @@ void ChromeSubresourceFilterClient::DidS
 void ChromeSubresourceFilterClient::MaybeAppendNavigationThrottles(
     content::NavigationHandle* navigation_handle,
     std::vector<std::unique_ptr<content::NavigationThrottle>>* throttles) {
@@ -995,8 +974,7 @@
 -        std::make_unique<subresource_filter::
 -                             SubresourceFilterSafeBrowsingActivationThrottle>(
 -            navigation_handle, this,
-            base::CreateSingleThreadTaskRunnerWithTraits(
-                {content::BrowserThread::IO}),
+-            base::CreateSingleThreadTaskRunner({content::BrowserThread::IO}),
 -            safe_browsing_service->database_manager()));
 -  }
 -
@@ -1007,7 +985,7 @@
 void ChromeSubresourceFilterClient::OnReloadRequested() {
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
-@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
+@@ -7,6 +7,7 @@ import("//components/safe_browsing/build
 import("//extensions/buildflags/buildflags.gni")
 
 jumbo_static_library("safe_browsing") {
@@ -1015,7 +993,7 @@
   sources = [
     "safe_browsing_controller_client.cc",
     "safe_browsing_controller_client.h",
-@@ -60,6 +61,7 @@ jumbo_static_library("safe_browsing") {
+@@ -62,6 +63,7 @@ jumbo_static_library("safe_browsing") {
     ]
     deps += [ "//extensions/browser" ]
   }
@@ -1026,16 +1004,16 @@
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -85,7 +85,6 @@
- #include "components/error_page/common/localized_error.h"
- #include "components/network_hints/renderer/prescient_networking_dispatcher.h"
+ #include "components/page_load_metrics/renderer/metrics_render_frame_observer.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/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/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
 +++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
-@@ -122,9 +122,6 @@ void TrialComparisonCertVerifierControll
+@@ -125,9 +125,6 @@ void TrialComparisonCertVerifierControll
   std::string serialized_report;
   if (!report.Serialize(&serialized_report))
     return;
@@ -1047,7 +1025,7 @@
 // static
 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
-@@ -681,51 +681,9 @@ WebstorePrivateGetReferrerChainFunction:
+@@ -682,51 +682,9 @@ WebstorePrivateGetReferrerChainFunction:
 
 ExtensionFunction::ResponseAction
 WebstorePrivateGetReferrerChainFunction::Run() {
@@ -1102,7 +1080,7 @@
 }  // namespace extensions
 --- a/chrome/browser/download/download_item_model.cc
 +++ b/chrome/browser/download/download_item_model.cc
-@@ -74,7 +74,7 @@ class DownloadItemModelData : public bas
+@@ -75,7 +75,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.
@@ -1111,7 +1089,7 @@
 
   // Whether the download is currently being revived.
   bool is_being_revived_;
-@@ -111,7 +111,7 @@ DownloadItemModelData::DownloadItemModel
+@@ -112,7 +112,7 @@ DownloadItemModelData::DownloadItemModel
     : should_show_in_shelf_(true),
       was_ui_notified_(false),
       should_prefer_opening_in_browser_(false),
@@ -1120,7 +1098,7 @@
       is_being_revived_(false) {}
 
 } // namespace
-@@ -377,13 +377,13 @@ void DownloadItemModel::SetShouldPreferO
+@@ -378,13 +378,13 @@ void DownloadItemModel::SetShouldPreferO
   data->should_prefer_opening_in_browser_ = preference;
 }
 
@@ -1137,7 +1115,7 @@
   DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
   data->danger_level_ = danger_level;
 }
-@@ -535,9 +535,6 @@ bool DownloadItemModel::IsCommandEnabled
+@@ -536,9 +536,6 @@ bool DownloadItemModel::IsCommandEnabled
       // filename. Don't base an "Always open" decision based on it. Also
       // exclude extensions.
       return download_->CanOpenDownload() &&
@@ -1149,8 +1127,8 @@
       return !download_->IsSavePackageDownload() &&
 --- a/components/safe_browsing/features.cc
 +++ b/components/safe_browsing/features.cc
-@@ -62,7 +62,7 @@ const base::Feature kRealTimeUrlLookupFe
-     base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -63,7 +63,7 @@ const base::Feature kSendOnFocusPing {
+ #endif
 
 const base::Feature kSuspiciousSiteTriggerQuotaFeature{
 -    "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_ENABLED_BY_DEFAULT};
--- a/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch
+++ b/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch
@@ -1,6 +1,6 @@
 --- a/components/autofill/core/browser/autofill_download_manager.cc
 +++ b/components/autofill/core/browser/autofill_download_manager.cc
-@@ -736,87 +736,6 @@ AutofillDownloadManager::GetRequestURLAn
+@@ -827,86 +827,6 @@ AutofillDownloadManager::GetRequestURLAn
 }
 
 bool AutofillDownloadManager::StartRequest(FormRequestData request_data) {
@@ -25,8 +25,7 @@
 -
 -  auto resource_request = std::make_unique<network::ResourceRequest>();
 -  resource_request->url = request_url;
-  resource_request->load_flags =
-      net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES;
+-  resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
 -  resource_request->method = method;
 -
 -  // Add Chrome experiment state to the request headers.
--- a/patches/core/inox-patchset/0004-disable-google-url-tracker.patch
+++ b/patches/core/inox-patchset/0004-disable-google-url-tracker.patch
@@ -1,98 +0,0 @@
--- a/components/google/core/browser/google_url_tracker.cc
-+++ b/components/google/core/browser/google_url_tracker.cc
-@@ -24,9 +24,9 @@
- #include "services/network/public/cpp/simple_url_loader.h"
- 
- const char GoogleURLTracker::kDefaultGoogleHomepage[] =
-    "https://www.google.com/";
-+    "";
- const char GoogleURLTracker::kSearchDomainCheckURL[] =
-    "https://www.google.com/searchdomaincheck?format=domain&type=chrome";
-+    "";
- 
- GoogleURLTracker::GoogleURLTracker(
-     std::unique_ptr<GoogleURLTrackerClient> client,
-@@ -144,83 +144,4 @@ void GoogleURLTracker::FinishSleep() {
- }
- 
- void GoogleURLTracker::StartLoadIfDesirable() {
-  // Bail if a load isn't appropriate right now.  This function will be called
-  // again each time one of the preconditions changes, so we'll load
-  // immediately once all of them are met.
-  //
-  // See comments in header on the class, on RequestServerCheck(), and on the
-  // various members here for more detail on exactly what the conditions are.
-  if (in_startup_sleep_ || already_loaded_ || !need_to_load_)
-    return;
-
-  // Some switches should disable the Google URL tracker entirely.  If we can't
-  // do background networking, we can't do the necessary load, and if the user
-  // specified a Google base URL manually, we shouldn't bother to look up any
-  // alternatives or offer to switch to them.
-  if (!client_->IsBackgroundNetworkingEnabled() ||
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kGoogleBaseURL))
-    return;
-
-  already_loaded_ = true;
-  net::NetworkTrafficAnnotationTag traffic_annotation =
-      net::DefineNetworkTrafficAnnotation("google_url_tracker", R"(
-        semantics {
-          sender: "Google URL Tracker"
-          description:
-            "When the user's default search engine is Google, or Google "
-            "services are used to resolve navigation errors, the browser needs "
-            "to know the ideal origin for requests to Google services. In "
-            "these cases the browser makes a request to a global Google "
-            "service that returns this origin, potentially taking into account "
-            "the user's cookies or IP address."
-          trigger: "Browser startup or network change."
-          data: "None."
-          destination: GOOGLE_OWNED_SERVICE
-        }
-        policy {
-          cookies_allowed: YES
-          cookies_store: "user"
-          setting:
-            "To disable this check, users can change the default search engine "
-            "to something other than Google, and disable 'Use a web service to "
-            "help resolve navigation errors' in Chromium's settings under "
-            "Privacy.\nAlternately, running Chromium with "
-            "--google-base-url=\"https://www.google.com/\" will disable this, "
-            "and force Chromium to use the specified URL for Google service "
-            "requests.\nFinally, running Chromium with "
-            "--disable-background-networking will disable this, as well as "
-            "various other features that make network requests automatically."
-           policy_exception_justification:
-            "Setting DefaultSearchProviderEnabled Chrome settings policy to "
-            "false suffices as a way of setting the default search engine to "
-            "not be Google. But there is no policy that controls navigation "
-            "error resolution."
-        })");
-  auto resource_request = std::make_unique<network::ResourceRequest>();
-  resource_request->url = GURL(kSearchDomainCheckURL);
-  // We don't want this load to set new entries in the cache or cookies, lest
-  // we alarm the user.
-  resource_request->load_flags =
-      (net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SAVE_COOKIES);
-  simple_loader_ = network::SimpleURLLoader::Create(std::move(resource_request),
-                                                    traffic_annotation);
-  // Configure to retry at most kMaxRetries times for 5xx errors and network
-  // changes.
-  // A network change can propagate through Chrome in various stages, so it's
-  // possible for this code to be reached via OnNetworkChanged(), and then have
-  // the load we kick off be canceled due to e.g. the DNS server changing at a
-  // later time. In general it's not possible to ensure that by the time we
-  // reach here any requests we start won't be canceled in this fashion, so
-  // retrying is the best we can do.
-  static const int kMaxRetries = 5;
-  simple_loader_->SetRetryOptions(
-      kMaxRetries,
-      network::SimpleURLLoader::RetryMode::RETRY_ON_5XX |
-          network::SimpleURLLoader::RetryMode::RETRY_ON_NETWORK_CHANGE);
-  simple_loader_->DownloadToString(
-      client_->GetURLLoaderFactory(),
-      base::BindOnce(&GoogleURLTracker::OnURLLoaderComplete,
-                     base::Unretained(this)),
-      2 * 1024 /* max_body_size */);
- }
--- a/patches/core/inox-patchset/0005-disable-default-extensions.patch
+++ b/patches/core/inox-patchset/0005-disable-default-extensions.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/extensions/component_loader.cc
 +++ b/chrome/browser/extensions/component_loader.cc
-@@ -342,11 +342,6 @@ void ComponentLoader::AddWebStoreApp() {
+@@ -343,11 +343,6 @@ void ComponentLoader::AddWebStoreApp() {
   if (!IsNormalSession())
     return;
 #endif
@@ -12,7 +12,7 @@
 }
 
 #if defined(OS_CHROMEOS)
-@@ -444,11 +439,6 @@ void ComponentLoader::AddDefaultComponen
+@@ -445,11 +440,6 @@ void ComponentLoader::AddDefaultComponen
   AddKeyboardApp();
 #else  // defined(OS_CHROMEOS)
   DCHECK(!skip_session_components);
@@ -24,14 +24,14 @@
 #endif  // defined(OS_CHROMEOS)
 
   if (!skip_session_components) {
-@@ -521,13 +511,6 @@ void ComponentLoader::AddDefaultComponen
+@@ -522,13 +512,6 @@ void ComponentLoader::AddDefaultComponen
     AddHangoutServicesExtension();
 #endif  // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
 
 -    bool install_feedback = enable_background_extensions_during_testing;
-#if defined(GOOGLE_CHROME_BUILD)
+-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
 -    install_feedback = true;
-#endif  // defined(GOOGLE_CHROME_BUILD)
+-#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
 -    if (install_feedback)
 -      Add(IDR_FEEDBACK_MANIFEST, base::FilePath(FILE_PATH_LITERAL("feedback")));
 -
@@ -40,13 +40,13 @@
     AddVideoPlayerExtension();
 --- a/chrome/browser/extensions/external_component_loader.cc
 +++ b/chrome/browser/extensions/external_component_loader.cc
-@@ -29,9 +29,6 @@ ExternalComponentLoader::~ExternalCompon
+@@ -30,9 +30,6 @@ ExternalComponentLoader::~ExternalCompon
 
 void ExternalComponentLoader::StartLoading() {
   auto prefs = std::make_unique<base::DictionaryValue>();
-#if defined(GOOGLE_CHROME_BUILD)
+-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
 -  AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId, prefs.get());
-#endif  // defined(GOOGLE_CHROME_BUILD)
+-#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
 
 #if defined(OS_CHROMEOS)
   {
@@ -105,7 +105,7 @@
 void WebstoreInstaller::ReportFailure(const std::string& error,
 --- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
 +++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
-@@ -25,7 +25,6 @@ namespace extensions {
+@@ -26,7 +26,6 @@ namespace extensions {
 
 bool IsComponentExtensionWhitelisted(const std::string& extension_id) {
   const char* const kAllowed[] = {
--- a/patches/core/inox-patchset/0007-disable-web-resource-service.patch
+++ b/patches/core/inox-patchset/0007-disable-web-resource-service.patch
@@ -1,6 +1,6 @@
 --- a/components/web_resource/web_resource_service.cc
 +++ b/components/web_resource/web_resource_service.cc
-@@ -124,45 +124,7 @@ bool WebResourceService::GetFetchSchedul
+@@ -124,44 +124,7 @@ bool WebResourceService::GetFetchSchedul
 // Initializes the fetching of data from the resource server.  Data
 // load calls OnSimpleLoaderComplete.
 void WebResourceService::StartFetch() {
@@ -34,9 +34,8 @@
 -  resource_request->url = web_resource_server;
 -  // Do not let url fetcher affect existing state in system context
 -  // (by setting cookies, for example).
-  resource_request->load_flags = net::LOAD_DISABLE_CACHE |
-                                 net::LOAD_DO_NOT_SEND_COOKIES |
-                                 net::LOAD_DO_NOT_SAVE_COOKIES;
+-  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
+-  resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
 -  simple_url_loader_ = network::SimpleURLLoader::Create(
 -      std::move(resource_request), traffic_annotation_);
 -  simple_url_loader_->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
--- a/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch
+++ b/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch
@@ -1,6 +1,6 @@
 --- a/net/dns/host_resolver_manager.cc
 +++ b/net/dns/host_resolver_manager.cc
-@@ -122,10 +122,10 @@ const unsigned kMinimumTTLSeconds = kCac
+@@ -123,10 +123,10 @@ const unsigned kMinimumTTLSeconds = kCac
 // cached.
 const int kIPv6ProbePeriodMs = 1000;
 
--- a/patches/core/inox-patchset/0010-disable-gcm-status-check.patch
+++ b/patches/core/inox-patchset/0010-disable-gcm-status-check.patch
@@ -65,7 +65,7 @@
 -  auto resource_request = std::make_unique<network::ResourceRequest>();
 -
 -  resource_request->url = request_url;
-  resource_request->allow_credentials = false;
+-  resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
 -  resource_request->method = "POST";
 -  resource_request->headers.SetHeader(net::HttpRequestHeaders::kUserAgent,
 -                                      user_agent_);
--- a/patches/core/inox-patchset/0014-disable-translation-lang-fetch.patch
+++ b/patches/core/inox-patchset/0014-disable-translation-lang-fetch.patch
@@ -19,7 +19,7 @@
 }
 
 bool SpellcheckHunspellDictionary::IsReady() const {
-@@ -409,9 +408,6 @@ void SpellcheckHunspellDictionary::Initi
+@@ -408,9 +407,6 @@ void SpellcheckHunspellDictionary::Initi
     }
 
     if (browser_context_) {
--- a/patches/core/inox-patchset/chromium-exclude_unwind_tables.patch
+++ b/patches/core/inox-patchset/chromium-exclude_unwind_tables.patch
@@ -1,6 +1,6 @@
 --- a/build/config/compiler/compiler.gni
 +++ b/build/config/compiler/compiler.gni
-@@ -79,19 +79,19 @@ declare_args() {
+@@ -83,19 +83,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
--- a/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
+++ b/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
@@ -95,7 +95,7 @@ by default.
 // creates and uses to publish OEM default apps to the extensions system.
 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
 +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
-@@ -1819,7 +1819,7 @@ void FileManagerPrivateInternalGetDownlo
+@@ -1817,7 +1817,7 @@ void FileManagerPrivateInternalGetDownlo
       IdentityManagerFactory::GetForProfile(chrome_details.GetProfile());
   const std::string& account_id = identity_manager->GetPrimaryAccountId();
   std::vector<std::string> scopes;
@@ -225,7 +225,7 @@ by default.
 
 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc
 +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
-@@ -72,9 +72,9 @@ const int ClientSideDetectionService::kN
+@@ -70,9 +70,9 @@ const int ClientSideDetectionService::kN
 const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30;
 
 const char ClientSideDetectionService::kClientReportPhishingUrl[] =
@@ -294,7 +294,7 @@ by default.
     "----**--yradnuoBgoLtrapitluMklaTelgooG--**----";
 --- a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
 +++ b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
-@@ -32,7 +32,7 @@ namespace {
+@@ -34,7 +34,7 @@ namespace {
 
 // The URL to be used to re-install Chrome when auto-update failed for too long.
 constexpr char kDownloadChromeUrl[] =
@@ -343,7 +343,7 @@ by default.
 
 --- a/chrome/common/url_constants.cc
 +++ b/chrome/common/url_constants.cc
-@@ -245,7 +245,7 @@ const char kSyncErrorsHelpURL[] =
+@@ -254,7 +254,7 @@ const char kSyncErrorsHelpURL[] =
     "https://support.google.com/chrome/?p=settings_sync_error";
 
 const char kSyncGoogleDashboardURL[] =
@@ -352,7 +352,7 @@ by default.
 
 const char kSyncLearnMoreURL[] =
     "https://support.google.com/chrome/?p=settings_sign_in";
-@@ -343,7 +343,7 @@ const char kArcTermsURLPath[] = "arc/ter
+@@ -355,7 +355,7 @@ const char kArcTermsURLPath[] = "arc/ter
 const char kArcPrivacyPolicyURLPath[] = "arc/privacy_policy";
 
 const char kOnlineEulaURLPath[] =
@@ -423,7 +423,7 @@ by default.
 
 --- a/components/crash/content/app/breakpad_linux.cc
 +++ b/components/crash/content/app/breakpad_linux.cc
-@@ -100,7 +100,7 @@ namespace {
+@@ -103,7 +103,7 @@ namespace {
 // while we do have functions to deal with uint64_t's.
 uint64_t g_crash_loop_before_time = 0;
 #else
@@ -551,7 +551,7 @@ by default.
 
 --- a/components/policy/resources/policy_templates.json
 +++ b/components/policy/resources/policy_templates.json
-@@ -3527,7 +3527,7 @@
+@@ -3666,7 +3666,7 @@
         'dynamic_refresh': True,
         'per_profile': True,
       },
@@ -560,7 +560,7 @@ by default.
       'id': 34,
       'caption': '''Configure the list of force-installed apps and extensions''',
       'tags': ['full-admin-access'],
-@@ -7501,7 +7501,7 @@
+@@ -7767,7 +7767,7 @@
       'features': {
         'dynamic_refresh': True,
       },
@@ -582,7 +582,7 @@ by default.
 
 --- a/components/search_engines/prepopulated_engines.json
 +++ b/components/search_engines/prepopulated_engines.json
-@@ -109,7 +109,7 @@
+@@ -105,7 +105,7 @@
     "google": {
       "name": "Google",
       "keyword": "google.com",
@@ -593,7 +593,7 @@ by default.
       "image_url": "{google:baseURL}searchbyimage/upload",
 --- a/components/translate/core/browser/translate_url_fetcher.cc
 +++ b/components/translate/core/browser/translate_url_fetcher.cc
-@@ -114,6 +114,7 @@ bool TranslateURLFetcher::Request(const
+@@ -113,6 +113,7 @@ bool TranslateURLFetcher::Request(const
         max_retry_on_5xx_, network::SimpleURLLoader::RetryMode::RETRY_ON_5XX);
   }
 
--- a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch
+++ b/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:
+@@ -312,11 +312,7 @@ IncidentReportingService::UploadContext:
 
 // static
 bool IncidentReportingService::IsEnabledForProfile(Profile* profile) {
@@ -54,11 +54,11 @@ the URL so we get notified if this happens again in the future).
 
 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc
 +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
-@@ -256,7 +256,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
+@@ -228,7 +228,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
 }
 
 void SafeBrowsingService::RegisterAllDelayedAnalysis() {
-#if defined(FULL_SAFE_BROWSING)
+-#if BUILDFLAG(FULL_SAFE_BROWSING)
 +#if 0
   RegisterBinaryIntegrityAnalysis();
 #endif
--- a/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch
+++ b/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch
@@ -13,7 +13,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).

 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc
 +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
-@@ -63,12 +63,6 @@ enum MalwareReportTypes {
+@@ -61,12 +61,6 @@ enum MalwareReportTypes {
   REPORT_RESULT_MAX
 };
 
@@ -26,7 +26,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
 }  // namespace
 
 const int ClientSideDetectionService::kInitialClientModelFetchDelayMs = 10000;
-@@ -281,94 +275,8 @@ void ClientSideDetectionService::StartCl
+@@ -271,94 +265,8 @@ void ClientSideDetectionService::StartCl
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   std::unique_ptr<ClientPhishingRequest> request(verdict);
 
@@ -123,7 +123,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
 }
 
 void ClientSideDetectionService::StartClientReportMalwareRequest(
-@@ -377,81 +285,8 @@ void ClientSideDetectionService::StartCl
+@@ -367,81 +275,8 @@ void ClientSideDetectionService::StartCl
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   std::unique_ptr<ClientMalwareRequest> request(verdict);
 
--- a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
+++ b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
@@ -59,7 +59,7 @@
   return url::FindAndCompareScheme(utf8_input, url::kHttpScheme, nullptr);
 --- a/content/browser/child_process_security_policy_impl.cc
 +++ b/content/browser/child_process_security_policy_impl.cc
-@@ -494,6 +494,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
+@@ -507,6 +507,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
   RegisterWebSafeScheme(url::kHttpsScheme);
   RegisterWebSafeScheme(url::kFtpScheme);
   RegisterWebSafeScheme(url::kDataScheme);
@@ -85,7 +85,7 @@
 
 using base::Time;
 using std::string;
-@@ -619,6 +621,12 @@ URLRequest::URLRequest(const GURL& url,
+@@ -612,6 +614,12 @@ URLRequest::URLRequest(const GURL& url,
   // Sanity check out environment.
   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
 
@@ -133,7 +133,7 @@
     return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1776,6 +1776,8 @@ component("net") {
+@@ -1787,6 +1787,8 @@ component("net") {
       "url_request/report_sender.h",
       "url_request/static_http_user_agent_settings.cc",
       "url_request/static_http_user_agent_settings.h",
@@ -142,46 +142,6 @@
       "url_request/url_fetcher.cc",
       "url_request/url_fetcher.h",
       "url_request/url_fetcher_core.cc",
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
-+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
-@@ -62,6 +62,7 @@
- #include "net/ssl/ssl_config_service.h"
- #include "net/url_request/data_protocol_handler.h"
- #include "net/url_request/file_protocol_handler.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_intercepting_job_factory.h"
-@@ -132,6 +133,9 @@ std::unique_ptr<net::URLRequestJobFactor
-       url::kDataScheme, std::make_unique<net::DataProtocolHandler>());
-   DCHECK(set_protocol);
-   set_protocol = aw_job_factory->SetProtocolHandler(
-+      url::kTraceScheme, std::make_unique<net::TrkProtocolHandler>());
-+  DCHECK(set_protocol);
-+  set_protocol = aw_job_factory->SetProtocolHandler(
-       url::kBlobScheme,
-       base::WrapUnique((*protocol_handlers)[url::kBlobScheme].release()));
-   DCHECK(set_protocol);
--- a/chromecast/browser/url_request_context_factory.cc
-+++ b/chromecast/browser/url_request_context_factory.cc
-@@ -40,6 +40,7 @@
- #include "net/ssl/ssl_config_service_defaults.h"
- #include "net/url_request/data_protocol_handler.h"
- #include "net/url_request/file_protocol_handler.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"
-@@ -258,6 +259,9 @@ void URLRequestContextFactory::Initializ
-   set_protocol = job_factory->SetProtocolHandler(
-       url::kDataScheme, std::make_unique<net::DataProtocolHandler>());
-   DCHECK(set_protocol);
-+  set_protocol = job_factory->SetProtocolHandler(
-+      url::kTraceScheme, base::WrapUnique(new net::TrkProtocolHandler));
-+  DCHECK(set_protocol);
- 
-   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-       switches::kEnableLocalFileAccesses)) {
 --- /dev/null
 +++ b/net/url_request/trk_protocol_handler.cc
@@ -0,0 +1,26 @@
@@ -257,7 +217,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"
-@@ -650,6 +651,9 @@ std::unique_ptr<URLRequestContext> URLRe
+@@ -641,6 +642,9 @@ std::unique_ptr<URLRequestContext> URLRe
     job_factory->SetProtocolHandler(url::kDataScheme,
                                     std::make_unique<DataProtocolHandler>());
 
--- a/patches/core/ungoogled-chromium/disable-crash-reporter.patch
+++ b/patches/core/ungoogled-chromium/disable-crash-reporter.patch
@@ -12,41 +12,29 @@
   if (!CheckForRequiredFlagsOrDie()) {
 --- a/chrome/browser/tracing/crash_service_uploader.cc
 +++ b/chrome/browser/tracing/crash_service_uploader.cc
-@@ -131,11 +131,16 @@ void TraceCrashServiceUploader::DoUpload
+@@ -130,11 +130,16 @@ void TraceCrashServiceUploader::DoUpload
   progress_callback_ = progress_callback;
   done_callback_ = std::move(done_callback);
 
-  base::PostTaskWithTraits(
-      FROM_HERE, {base::TaskPriority::BEST_EFFORT},
+-  base::PostTask(
+-      FROM_HERE, {base::ThreadPool(), base::TaskPriority::BEST_EFFORT},
 -      base::BindOnce(&TraceCrashServiceUploader::DoCompressOnBackgroundThread,
 -                     base::Unretained(this), file_contents, upload_mode,
 -                     upload_url_, std::move(metadata)));
 +  if (!progress_callback_.is_null()) {
-+    base::PostTaskWithTraits(
+    base::PostTask(
 +      FROM_HERE, {content::BrowserThread::UI},
 +      base::Bind(progress_callback_, 1, 1));
 +  }
 +  if (!done_callback_.is_null()) {
-+    base::PostTaskWithTraits(
+    base::PostTask(
 +      FROM_HERE, {content::BrowserThread::UI},
 +      base::BindOnce(std::move(done_callback_), true, "Upload skipped."));
 +  }
 }
 
 void TraceCrashServiceUploader::DoCompressOnBackgroundThread(
-@@ -206,11 +211,6 @@ void TraceCrashServiceUploader::DoCompre
-   std::string post_data;
-   SetupMultipart(product, version, std::move(metadata), "trace.json.gz",
-                  compressed_contents, &post_data);
-
-  base::PostTaskWithTraits(
-      FROM_HERE, {content::BrowserThread::UI},
-      base::BindOnce(&TraceCrashServiceUploader::CreateAndStartURLLoader,
-                     base::Unretained(this), upload_url, post_data));
- }
- 
- void TraceCrashServiceUploader::OnUploadError(
-@@ -308,6 +308,7 @@ bool TraceCrashServiceUploader::Compress
+@@ -307,6 +312,7 @@ bool TraceCrashServiceUploader::Compress
 void TraceCrashServiceUploader::CreateAndStartURLLoader(
     const std::string& upload_url,
     const std::string& post_data) {
--- a/patches/core/ungoogled-chromium/disable-gaia.patch
+++ b/patches/core/ungoogled-chromium/disable-gaia.patch
@@ -3,7 +3,7 @@

 --- a/google_apis/gaia/gaia_auth_fetcher.cc
 +++ b/google_apis/gaia/gaia_auth_fetcher.cc
-@@ -260,57 +260,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
+@@ -259,63 +259,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
     int load_flags,
     const net::NetworkTrafficAnnotationTag& traffic_annotation) {
   DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
@@ -16,6 +16,12 @@
 -    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->trusted_params =
+-        network::ResourceRequest::TrustedParams();
+-    resource_request->trusted_params->network_isolation_key =
+-        net::NetworkIsolationKey(origin, origin);
 -  }
 -
 -  if (!body.empty())
@@ -73,9 +79,9 @@
   source->AddLocalizedString(
 --- a/chrome/browser/browser_resources.grd
 +++ b/chrome/browser/browser_resources.grd
-@@ -337,7 +337,6 @@
-       <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
-       <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_login.css" flattenhtml="true" type="BINDATA" />
+@@ -270,7 +270,6 @@
+       <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" preprocess="true" />
+       <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_login.css" flattenhtml="true" type="BINDATA" preprocess="true" />
       <include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_login.js" flattenhtml="true" type="BINDATA" />
 -      <include name="IDR_GAIA_AUTH_AUTHENTICATOR_JS" file="resources\gaia_auth_host\authenticator.js" flattenhtml="true" type="BINDATA" />
       <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flattenhtml="true" type="BINDATA" />
--- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch
+++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch
@@ -2,7 +2,7 @@

 --- a/net/base/url_util.cc
 +++ b/net/base/url_util.cc
-@@ -411,27 +411,6 @@ bool HasGoogleHost(const GURL& url) {
+@@ -394,27 +394,6 @@ bool HasGoogleHost(const GURL& url) {
 }
 
 bool IsGoogleHost(base::StringPiece host) {
@@ -112,7 +112,7 @@
 }  // namespace variations
 --- a/chrome/browser/page_load_metrics/page_load_metrics_util.cc
 +++ b/chrome/browser/page_load_metrics/page_load_metrics_util.cc
-@@ -169,9 +169,7 @@ bool DidObserveLoadingBehaviorInAnyFrame
+@@ -171,9 +171,7 @@ bool DidObserveLoadingBehaviorInAnyFrame
 }
 
 bool IsGoogleSearchHostname(const GURL& url) {
@@ -140,10 +140,11 @@
 bool TemplateURLRef::ExtractSearchTermsFromURL(
 --- a/components/google/core/common/google_util.cc
 +++ b/components/google/core/common/google_util.cc
-@@ -45,120 +45,16 @@ bool gUseMockLinkDoctorBaseURLForTesting
+@@ -45,103 +45,6 @@ namespace {
+ bool gUseMockLinkDoctorBaseURLForTesting = false;
 
 bool g_ignore_port_numbers = false;
- 
+-
 -bool IsPathHomePageBase(base::StringPiece path) {
 -  return (path == "/") || (path == "/webhp");
 -}
@@ -243,6 +244,8 @@
 }  // namespace
 
 // Global functions -----------------------------------------------------------
+@@ -149,19 +52,11 @@ bool IsGoogleSearchSubdomainUrl(const GU
+ const char kGoogleHomepageURL[] = "https://www.google.com/";
 
 bool HasGoogleSearchQueryParam(base::StringPiece str) {
 -  url::Component query(0, static_cast<int>(str.length())), key, value;
@@ -262,7 +265,7 @@
 }
 
 void SetMockLinkDoctorBaseURLForTesting() {
-@@ -172,162 +68,53 @@ std::string GetGoogleLocale(const std::s
+@@ -175,162 +70,53 @@ std::string GetGoogleLocale(const std::s
 
 GURL AppendGoogleLocaleParam(const GURL& url,
                              const std::string& application_locale) {
@@ -435,53 +438,11 @@
   return false;
 }
 
--- a/chrome/common/page_load_metrics/page_load_metrics_util.cc
-+++ b/chrome/common/page_load_metrics/page_load_metrics_util.cc
-@@ -12,38 +12,7 @@
- namespace page_load_metrics {
- 
- base::Optional<std::string> GetGoogleHostnamePrefix(const GURL& url) {
-  const size_t registry_length =
-      net::registry_controlled_domains::GetRegistryLength(
-          url,
-
-          // Do not include unknown registries (registries that don't have any
-          // matches in effective TLD names).
-          net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
-
-          // Do not include private registries, such as appspot.com. We don't
-          // want to match URLs like www.google.appspot.com.
-          net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
-
-  const base::StringPiece hostname = url.host_piece();
-  if (registry_length == 0 || registry_length == std::string::npos ||
-      registry_length >= hostname.length()) {
-    return base::Optional<std::string>();
-  }
-
-  // Removes the tld and the preceding dot.
-  const base::StringPiece hostname_minus_registry =
-      hostname.substr(0, hostname.length() - (registry_length + 1));
-
-  if (hostname_minus_registry == "google")
-    return std::string("");
-
-  if (!base::EndsWith(hostname_minus_registry, ".google",
-                      base::CompareCase::INSENSITIVE_ASCII)) {
-    return base::Optional<std::string>();
-  }
-
-  return std::string(hostname_minus_registry.substr(
-      0, hostname_minus_registry.length() - strlen(".google")));
-+  return base::Optional<std::string>();
- }
- 
- bool IsGoogleHostname(const GURL& url) {
 --- a/chrome/common/google_url_loader_throttle.cc
 +++ b/chrome/common/google_url_loader_throttle.cc
-@@ -7,10 +7,6 @@
- #include "chrome/common/net/safe_search_util.h"
+@@ -8,10 +8,6 @@
 #include "components/variations/net/variations_http_headers.h"
+ #include "services/network/public/cpp/resource_response.h"
 
 -#if BUILDFLAG(ENABLE_EXTENSIONS)
 -#include "extensions/common/extension_urls.h"
@@ -490,7 +451,7 @@
 GoogleURLLoaderThrottle::GoogleURLLoaderThrottle(
     bool is_off_the_record,
     chrome::mojom::DynamicParams dynamic_params)
-@@ -24,36 +20,6 @@ void GoogleURLLoaderThrottle::DetachFrom
+@@ -25,36 +21,6 @@ void GoogleURLLoaderThrottle::DetachFrom
 void GoogleURLLoaderThrottle::WillStartRequest(
     network::ResourceRequest* request,
     bool* defer) {
@@ -527,7 +488,7 @@
 }
 
 void GoogleURLLoaderThrottle::WillRedirectRequest(
-@@ -62,32 +28,6 @@ void GoogleURLLoaderThrottle::WillRedire
+@@ -63,32 +29,6 @@ void GoogleURLLoaderThrottle::WillRedire
     bool* /* defer */,
     std::vector<std::string>* to_be_removed_headers,
     net::HttpRequestHeaders* modified_headers) {
@@ -560,7 +521,7 @@
 }
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-@@ -95,17 +35,5 @@ void GoogleURLLoaderThrottle::WillProces
+@@ -96,17 +36,5 @@ void GoogleURLLoaderThrottle::WillProces
     const GURL& response_url,
     network::ResourceResponseHead* response_head,
     bool* defer) {
@@ -578,3 +539,14 @@
 -  }
 }
 #endif
+--- a/components/page_load_metrics/common/page_load_metrics_util.cc
+++ b/components/page_load_metrics/common/page_load_metrics_util.cc
+@@ -47,7 +47,7 @@ base::Optional<std::string> GetGoogleHos
+ }
+ 
+ bool IsGoogleHostname(const GURL& url) {
+-  return GetGoogleHostnamePrefix(url).has_value();
+  return false;
+ }
+ 
+ base::Optional<base::TimeDelta> OptionalMin(
--- a/patches/core/ungoogled-chromium/disable-mei-preload.patch
+++ b/patches/core/ungoogled-chromium/disable-mei-preload.patch
@@ -7,7 +7,7 @@

 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -355,7 +355,6 @@ if (!is_android && !is_mac) {
+@@ -335,7 +335,6 @@ if (!is_android && !is_mac) {
       }
 
       data_deps += [
@@ -15,7 +15,7 @@
         "//third_party/widevine/cdm",
       ]
 
-@@ -1305,7 +1304,6 @@ if (is_win) {
+@@ -1207,7 +1206,6 @@ if (is_win) {
       ":packed_resources",
       ":swiftshader_library",
       ":widevine_cdm_library",
--- a/patches/core/ungoogled-chromium/disable-signin.patch
+++ b/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
-@@ -524,23 +524,6 @@ GURL GetOSSettingsUrl(const std::string&
+@@ -515,23 +515,6 @@ GURL GetOSSettingsUrl(const std::string&
 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
 void ShowBrowserSignin(Browser* browser,
                        signin_metrics::AccessPoint access_point) {
--- a/patches/core/ungoogled-chromium/disable-translate.patch
+++ b/patches/core/ungoogled-chromium/disable-translate.patch
@@ -14,7 +14,7 @@
     // that settings syncs and we don't want to turn off translate everywhere
 --- a/components/translate/content/renderer/translate_helper.cc
 +++ b/components/translate/content/renderer/translate_helper.cc
-@@ -77,8 +77,7 @@ TranslateHelper::TranslateHelper(content
+@@ -76,8 +76,7 @@ TranslateHelper::TranslateHelper(content
       world_id_(world_id),
       extension_scheme_(extension_scheme),
       binding_(this) {
--- a/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch
+++ b/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch
@@ -2,30 +2,30 @@

 --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
 +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -127,29 +127,11 @@ void WebRtcLogUploader::LoggingStoppedDo
+@@ -125,29 +125,11 @@ void WebRtcLogUploader::LoggingStoppedDo
   DCHECK(meta_data.get());
-   DCHECK(!upload_done_data.log_path.empty());
+   DCHECK(!upload_done_data.paths.directory.empty());
 
 -  std::string compressed_log = CompressLog(log_buffer.get());
 -
 -  std::string local_log_id;
 -
-   if (base::PathExists(upload_done_data.log_path)) {
-     webrtc_logging::DeleteOldWebRtcLogFiles(upload_done_data.log_path);
+   if (base::PathExists(upload_done_data.paths.directory)) {
+     webrtc_logging::DeleteOldWebRtcLogFiles(upload_done_data.paths.directory);
 -
 -    local_log_id = base::NumberToString(base::Time::Now().ToDoubleT());
 -    base::FilePath log_file_path =
-        upload_done_data.log_path.AppendASCII(local_log_id)
+-        upload_done_data.paths.directory.AppendASCII(local_log_id)
 -            .AddExtension(FILE_PATH_LITERAL(".gz"));
 -    WriteCompressedLogToFile(compressed_log, log_file_path);
 -
 -    base::FilePath log_list_path =
 -        webrtc_logging::TextLogList::GetWebRtcLogListFileForDirectory(
-            upload_done_data.log_path);
+-            upload_done_data.paths.directory);
 -    AddLocallyStoredLogInfoToUploadListFile(log_list_path, local_log_id);
   }
 
-  WebRtcLogUploadDoneData upload_done_data_with_log_id = upload_done_data;
+-  UploadDoneData upload_done_data_with_log_id = upload_done_data;
 -  upload_done_data_with_log_id.local_log_id = local_log_id;
 -  PrepareMultipartPostData(compressed_log, std::move(meta_data),
 -                           upload_done_data_with_log_id);
@@ -33,14 +33,14 @@
 }
 
 void WebRtcLogUploader::PrepareMultipartPostData(
-@@ -160,26 +142,7 @@ void WebRtcLogUploader::PrepareMultipart
+@@ -158,26 +140,7 @@ void WebRtcLogUploader::PrepareMultipart
   DCHECK(!compressed_log.empty());
   DCHECK(meta_data.get());
 
 -  std::unique_ptr<std::string> post_data(new std::string());
 -  SetupMultipart(post_data.get(), compressed_log,
-                 upload_done_data.incoming_rtp_dump,
-                 upload_done_data.outgoing_rtp_dump, *meta_data.get());
+-                 upload_done_data.paths.incoming_rtp_dump,
+-                 upload_done_data.paths.outgoing_rtp_dump, *meta_data.get());
 -
 -  // If a test has set the test string pointer, write to it and skip uploading.
 -  // Still fire the upload callback so that we can run an extension API test
@@ -61,20 +61,20 @@
 }
 
 void WebRtcLogUploader::UploadStoredLog(
-@@ -248,49 +211,6 @@ void WebRtcLogUploader::LoggingStoppedDo
+@@ -245,49 +208,6 @@ void WebRtcLogUploader::LoggingStoppedDo
   DCHECK(log_buffer.get());
-   DCHECK(!log_paths.log_path.empty());
+   DCHECK(!log_paths.directory.empty());
 
-  webrtc_logging::DeleteOldWebRtcLogFiles(log_paths.log_path);
+-  webrtc_logging::DeleteOldWebRtcLogFiles(log_paths.directory);
 -
 -  base::FilePath log_list_path =
 -      webrtc_logging::TextLogList::GetWebRtcLogListFileForDirectory(
-          log_paths.log_path);
+-          log_paths.directory);
 -
 -  // Store the native log with a ".gz" extension.
 -  std::string compressed_log = CompressLog(log_buffer.get());
 -  base::FilePath native_log_path =
-      log_paths.log_path.AppendASCII(log_id).AddExtension(
+-      log_paths.directory.AppendASCII(log_id).AddExtension(
 -          FILE_PATH_LITERAL(".gz"));
 -  WriteCompressedLogToFile(compressed_log, native_log_path);
 -  AddLocallyStoredLogInfoToUploadListFile(log_list_path, log_id);
@@ -83,14 +83,14 @@
 -  // <log id>.rtp_[in|out].
 -  if (!log_paths.incoming_rtp_dump.empty()) {
 -    base::FilePath rtp_path =
-        log_paths.log_path.AppendASCII(log_id).AddExtension(
+-        log_paths.directory.AppendASCII(log_id).AddExtension(
 -            FILE_PATH_LITERAL(".rtp_in"));
 -    base::Move(log_paths.incoming_rtp_dump, rtp_path);
 -  }
 -
 -  if (!log_paths.outgoing_rtp_dump.empty()) {
 -    base::FilePath rtp_path =
-        log_paths.log_path.AppendASCII(log_id).AddExtension(
+-        log_paths.directory.AppendASCII(log_id).AddExtension(
 -            FILE_PATH_LITERAL(".rtp_out"));
 -    base::Move(log_paths.outgoing_rtp_dump, rtp_path);
 -  }
@@ -102,7 +102,7 @@
 -      pickle.WriteString(it.second);
 -    }
 -    base::FilePath meta_path =
-        log_paths.log_path.AppendASCII(log_id).AddExtension(
+-        log_paths.directory.AppendASCII(log_id).AddExtension(
 -            FILE_PATH_LITERAL(".meta"));
 -    base::WriteFile(meta_path, static_cast<const char*>(pickle.data()),
 -                    pickle.size());
--- a/patches/core/ungoogled-chromium/disable-webstore-urls.patch
+++ b/patches/core/ungoogled-chromium/disable-webstore-urls.patch
@@ -2,7 +2,7 @@

 --- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc
 +++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc
-@@ -248,13 +248,7 @@ ChromeContentVerifierDelegate::GetVerify
+@@ -256,13 +256,7 @@ ChromeContentVerifierDelegate::GetVerify
   // between which extensions are considered in-store.
   // See https://crbug.com/766806 for details.
   if (!InstallVerifier::IsFromStore(extension)) {
@@ -100,7 +100,7 @@
   } else {
     url_stats_.other_url_count++;
   }
-@@ -649,13 +627,9 @@ void ExtensionDownloader::OnManifestLoad
+@@ -648,13 +626,9 @@ void ExtensionDownloader::OnManifestLoad
       const int error =
           response_code == -1 ? loader->NetError() : response_code;
       const std::string uma_histogram_name =
@@ -117,7 +117,7 @@
       const auto& extension_ids =
           manifests_queue_.active_request()->extension_ids();
       for (auto it = extension_ids.begin(); it != extension_ids.end(); ++it) {
-@@ -725,20 +699,6 @@ void ExtensionDownloader::HandleManifest
+@@ -724,20 +698,6 @@ void ExtensionDownloader::HandleManifest
         fetch_data->request_ids()));
   }
 
--- a/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch
+++ b/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch
@@ -32,7 +32,7 @@
 }
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -3271,8 +3271,6 @@ jumbo_split_static_library("ui") {
+@@ -3330,8 +3330,6 @@ jumbo_split_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",
--- a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
+++ b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
@@ -2,7 +2,7 @@

 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -5394,19 +5394,7 @@ ChromeContentBrowserClient::GetSafeBrows
+@@ -5219,19 +5219,7 @@ ChromeContentBrowserClient::GetSafeBrows
     content::ResourceContext* resource_context) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
@@ -35,7 +35,7 @@
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/download/public/common/download_danger_type.h"
-@@ -42,7 +39,6 @@
+@@ -43,7 +40,6 @@
 
 using base::TimeDelta;
 using download::DownloadItem;
@@ -43,11 +43,11 @@
 
 namespace {
 
-@@ -273,14 +269,7 @@ bool DownloadItemModel::IsMalicious() co
+@@ -274,14 +270,7 @@ bool DownloadItemModel::IsMalicious() co
 }
 
 bool DownloadItemModel::ShouldAllowDownloadFeedback() const {
-#if defined(FULL_SAFE_BROWSING)
+-#if BUILDFLAG(FULL_SAFE_BROWSING)
 -  if (!IsDangerous())
 -    return false;
 -  return safe_browsing::DownloadFeedbackService::IsEnabledForDownload(
@@ -73,10 +73,10 @@
   message_body_label->SetHandlesTooltips(false);
 --- a/chrome/browser/password_manager/chrome_password_manager_client.cc
 +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -87,9 +87,9 @@
- #if defined(FULL_SAFE_BROWSING)
+@@ -90,9 +90,9 @@
+ #if BUILDFLAG(FULL_SAFE_BROWSING)
 #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h"
- #include "chrome/browser/safe_browsing/chrome_password_protection_service.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"
@@ -84,34 +84,15 @@
 
 #if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
 #include "services/service_manager/public/cpp/connector.h"
-@@ -479,7 +479,7 @@ bool ChromePasswordManagerClient::IsIsol
-   return SiteIsolationPolicy::IsIsolationForPasswordSitesEnabled();
+@@ -547,7 +547,7 @@ ChromePasswordManagerClient::GetPassword
 }
+ #endif
 
-#if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
-+#if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED) && defined(FULL_SAFE_BROWSING)
+-#if defined(ON_FOCUS_PING_ENABLED)
+#if defined(ON_FOCUS_PING_ENABLED) && BUILDFLAG(FULL_SAFE_BROWSING)
 void ChromePasswordManagerClient::CheckSafeBrowsingReputation(
     const GURL& form_action,
     const GURL& frame_url) {
--- a/chrome/browser/ui/views/frame/browser_view.cc
-+++ b/chrome/browser/ui/views/frame/browser_view.cc
-@@ -2291,7 +2291,6 @@ void BrowserView::OnWindowBeginUserBound
- void BrowserView::OnWindowEndUserBoundsChange() {
-   if (!interactive_resize_)
-     return;
-  safe_browsing::LogContentsSize(GetContentsSize());
-   auto now = base::TimeTicks::Now();
-   DCHECK(!interactive_resize_->begin_timestamp.is_null());
-   UMA_HISTOGRAM_TIMES("BrowserWindow.Resize.Duration",
--- a/chrome/browser/ui/views/frame/browser_window_factory.cc
-+++ b/chrome/browser/ui/views/frame/browser_window_factory.cc
-@@ -33,6 +33,5 @@ BrowserWindow* BrowserWindow::CreateBrow
-   view->GetWidget()->GetNativeWindow()->SetProperty(
-       aura::client::kCreatedByUserGesture, user_gesture);
- #endif
-  safe_browsing::LogContentsSize(view->GetContentsSize());
-   return view;
- }
 --- a/components/safe_browsing/common/safe_browsing.mojom
 +++ b/components/safe_browsing/common/safe_browsing.mojom
@@ -106,7 +106,6 @@ interface ThreatReporter {
--- a/patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch
+++ b/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
-@@ -107,21 +107,11 @@
+@@ -103,21 +103,11 @@
     },
 
     "google": {
--- a/patches/core/ungoogled-chromium/use-local-devtools-files.patch
+++ b/patches/core/ungoogled-chromium/use-local-devtools-files.patch
@@ -5,7 +5,7 @@

 --- a/third_party/blink/renderer/devtools/BUILD.gn
 +++ b/third_party/blink/renderer/devtools/BUILD.gn
-@@ -1281,10 +1281,8 @@ action("generate_devtools_grd") {
+@@ -1290,10 +1290,8 @@ action("generate_devtools_grd") {
       devtools_embedder_scripts +
       [ "$resources_out_dir/devtools_extension_api.js" ]
 
--- a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
+++ b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
@@ -9,15 +9,15 @@

 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -137,6 +137,7 @@
- #include "third_party/blink/public/common/experiments/memory_ablation_experiment.h"
+@@ -147,6 +147,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"
 +#include "third_party/ungoogled/ungoogled_switches.h"
 #include "ui/accessibility/accessibility_switches.h"
 #include "ui/base/ui_base_features.h"
 #include "ui/base/ui_base_switches.h"
-@@ -1242,6 +1243,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1400,6 +1401,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")},
@@ -34,7 +34,7 @@
      SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -22,6 +22,7 @@
+@@ -23,6 +23,7 @@
 #include "services/network/public/cpp/features.h"
 #include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/platform/web_runtime_features.h"
@@ -42,8 +42,8 @@
 #include "ui/base/ui_base_features.h"
 #include "ui/events/blink/blink_features.h"
 #include "ui/gfx/switches.h"
-@@ -462,6 +463,11 @@ void SetIndividualRuntimeFeatures(
-     WebRuntimeFeatures::EnableForbidSyncXHRInPageDismissal(true);
+@@ -461,6 +462,11 @@ void SetIndividualRuntimeFeatures(
+     WebRuntimeFeatures::EnableAllowSyncXHRInPageDismissal(true);
   }
 
 +  WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(
@@ -61,10 +61,10 @@
 #include "base/macros.h"
 #include "base/optional.h"
 +#include "base/rand_util.h"
+ #include "base/time/time.h"
 #include "cc/input/overscroll_behavior.h"
 #include "cc/input/scroll_snap_data.h"
- #include "services/metrics/public/cpp/mojo_ukm_recorder.h"
-@@ -1131,6 +1132,15 @@ Document::Document(const DocumentInit& i
+@@ -1196,6 +1197,15 @@ Document::Document(const DocumentInit& i
 #ifndef NDEBUG
   liveDocumentSet().insert(this);
 #endif
@@ -80,7 +80,7 @@
 }
 
 Document::~Document() {
-@@ -1159,6 +1169,14 @@ Range* Document::CreateRangeAdjustedToTr
+@@ -1224,6 +1234,14 @@ Range* Document::CreateRangeAdjustedToTr
                                      Position::BeforeNode(*shadow_host));
 }
 
@@ -97,7 +97,7 @@
     selector_query_cache_ = std::make_unique<SelectorQueryCache>();
 --- a/third_party/blink/renderer/core/dom/document.h
 +++ b/third_party/blink/renderer/core/dom/document.h
-@@ -398,6 +398,10 @@ class CORE_EXPORT Document : public Cont
+@@ -408,6 +408,10 @@ class CORE_EXPORT Document : public Cont
     has_xml_declaration_ = has_xml_declaration ? 1 : 0;
   }
 
@@ -108,7 +108,7 @@
   String visibilityState() const;
   bool IsPageVisible() const;
   bool hidden() const;
-@@ -1884,6 +1888,9 @@ class CORE_EXPORT Document : public Cont
+@@ -1900,6 +1904,9 @@ class CORE_EXPORT Document : public Cont
 
   base::ElapsedTimer start_time_;
 
@@ -120,7 +120,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
-@@ -1370,6 +1370,11 @@ DOMRectList* Element::getClientRects() {
+@@ -1630,6 +1630,11 @@ DOMRectList* Element::getClientRects() {
   DCHECK(element_layout_object);
   GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
       quads, *element_layout_object);
@@ -132,7 +132,7 @@
   return DOMRectList::Create(quads);
 }
 
-@@ -1387,6 +1392,9 @@ DOMRect* Element::getBoundingClientRect(
+@@ -1647,6 +1652,9 @@ DOMRect* Element::getBoundingClientRect(
   DCHECK(element_layout_object);
   GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
                                                         *element_layout_object);
@@ -169,7 +169,7 @@
 // TODO(editing-dev): We should make
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -637,6 +637,12 @@
+@@ -677,6 +677,12 @@
       name: "FileSystem",
       status: "stable",
     },
@@ -184,8 +184,8 @@
     // metric. See also: http://bit.ly/fcp_plus_plus
 --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -699,4 +699,12 @@ void WebRuntimeFeatures::EnableMouseSubf
-   RuntimeEnabledFeatures::SetMouseSubframeNoImplicitCaptureEnabled(enable);
+@@ -722,4 +722,12 @@ void WebRuntimeFeatures::EnableAccelerat
+   RuntimeEnabledFeatures::SetAcceleratedSmallCanvasesEnabled(enable);
 }
 
 +void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool enable) {
@@ -202,7 +202,7 @@
@@ -228,6 +228,8 @@ class WebRuntimeFeatures {
   BLINK_PLATFORM_EXPORT static void EnableMergeBlockingNonBlockingPools(bool);
   BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
-   BLINK_PLATFORM_EXPORT static void EnableForbidSyncXHRInPageDismissal(bool);
+   BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
 +  BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
 +  BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
   BLINK_PLATFORM_EXPORT static void EnableShadowDOMV0(bool);
@@ -210,7 +210,7 @@
   BLINK_PLATFORM_EXPORT static void EnableHTMLImports(bool);
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2156,6 +2156,7 @@ jumbo_split_static_library("browser") {
+@@ -2202,6 +2202,7 @@ jumbo_split_static_library("browser") {
     "//third_party/metrics_proto",
     "//third_party/re2",
     "//third_party/smhasher:cityhash",
@@ -220,7 +220,7 @@
     "//third_party/widevine/cdm:buildflags",
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -207,6 +207,7 @@ jumbo_source_set("browser") {
+@@ -205,6 +205,7 @@ jumbo_source_set("browser") {
     "//third_party/libyuv",
     "//third_party/re2",
     "//third_party/sqlite",
@@ -230,7 +230,7 @@
     "//third_party/zlib",
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -214,6 +214,7 @@
+@@ -213,6 +213,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"
@@ -238,7 +238,7 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/accessibility/accessibility_switches.h"
 #include "ui/base/ui_base_switches.h"
-@@ -3001,6 +3002,8 @@ void RenderProcessHostImpl::PropagateBro
+@@ -2969,6 +2970,8 @@ void RenderProcessHostImpl::PropagateBro
     switches::kEnableWebGLSwapChain,
     switches::kEnableWebVR,
     switches::kFileUrlPathAlias,
@@ -249,7 +249,7 @@
     switches::kForceGpuMemAvailableMb,
 --- a/content/child/BUILD.gn
 +++ b/content/child/BUILD.gn
-@@ -117,6 +117,7 @@ target(link_target_type, "child") {
+@@ -120,6 +120,7 @@ target(link_target_type, "child") {
     "//third_party/blink/public:scaled_resources",
     "//third_party/blink/public/common",
     "//third_party/ced",
@@ -259,29 +259,33 @@
     "//ui/events/blink",
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1426,6 +1426,7 @@ jumbo_component("platform") {
+@@ -1450,6 +1450,7 @@ jumbo_component("platform") {
     "//third_party/ced",
     "//third_party/emoji-segmenter",
     "//third_party/icu",
 +    "//third_party/ungoogled:switches",
-     "//third_party/webrtc/p2p:rtc_p2p",
-     "//third_party/webrtc_overrides:init_webrtc",
-     "//third_party/zlib/google:compression_utils",
+     "//third_party/webrtc/api:libjingle_logging_api",
+     "//third_party/webrtc/api/audio_codecs/L16:audio_decoder_L16",
+     "//third_party/webrtc/api/audio_codecs/L16:audio_encoder_L16",
 --- 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
-@@ -811,6 +811,12 @@ TextMetrics* CanvasRenderingContext2D::m
-   TextMetrics* text_metrics = MakeGarbageCollected<TextMetrics>(
-       font, direction, GetState().GetTextBaseline(), GetState().GetTextAlign(),
-       text);
+@@ -811,9 +811,15 @@ TextMetrics* CanvasRenderingContext2D::m
+   else
+     direction = ToTextDirection(GetState().GetDirection(), canvas());
+ 
+-  return MakeGarbageCollected<TextMetrics>(font, direction,
+  TextMetrics* text_metrics = MakeGarbageCollected<TextMetrics>(font, direction,
+                                            GetState().GetTextBaseline(),
+                                            GetState().GetTextAlign(), text);
 +
 +  // Scale text metrics if enabled
 +  if (RuntimeEnabledFeatures::FingerprintingCanvasMeasureTextNoiseEnabled()) {
 +    text_metrics->Shuffle(canvas()->GetDocument().GetNoiseFactorX());
 +  }
-+
-   base::TimeDelta elapsed = base::TimeTicks::Now() - start_time;
-   base::UmaHistogramMicrosecondsTimesUnderTenMilliseconds(
-       "Canvas.TextMetrics.MeasureText", elapsed);
+  return text_metrics;
+ }
+ 
+ void CanvasRenderingContext2D::DrawTextInternal(
 --- a/third_party/blink/renderer/core/html/canvas/text_metrics.h
 +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h
@@ -64,6 +64,8 @@ class CORE_EXPORT TextMetrics final : pu
--- a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch
+++ b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch
@@ -249,7 +249,7 @@ approach to change color components.
   // Methods overridden by all sub-classes
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1256,6 +1256,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1414,6 +1414,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)},
@@ -262,7 +262,7 @@ approach to change color components.
      SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -467,6 +467,8 @@ void SetIndividualRuntimeFeatures(
+@@ -466,6 +466,8 @@ void SetIndividualRuntimeFeatures(
       command_line.HasSwitch(switches::kFingerprintingClientRectsNoise));
   WebRuntimeFeatures::EnableFingerprintingCanvasMeasureTextNoise(
       command_line.HasSwitch(switches::kFingerprintingCanvasMeasureTextNoise));
@@ -273,7 +273,7 @@ approach to change color components.
       base::FeatureList::IsEnabled(media::kAutoplayIgnoreWebAudio));
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -643,6 +643,9 @@
+@@ -683,6 +683,9 @@
     {
       name: "FingerprintingCanvasMeasureTextNoise",
     },
@@ -285,7 +285,7 @@ approach to change color components.
     // metric. See also: http://bit.ly/fcp_plus_plus
 --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -707,4 +707,8 @@ void WebRuntimeFeatures::EnableFingerpri
+@@ -730,4 +730,8 @@ void WebRuntimeFeatures::EnableFingerpri
   RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable);
 }
 
@@ -297,7 +297,7 @@ approach to change color components.
 --- a/third_party/blink/public/platform/web_runtime_features.h
 +++ b/third_party/blink/public/platform/web_runtime_features.h
@@ -230,6 +230,7 @@ class WebRuntimeFeatures {
-   BLINK_PLATFORM_EXPORT static void EnableForbidSyncXHRInPageDismissal(bool);
+   BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
   BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
   BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
 +  BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasImageDataNoise(bool);
@@ -306,7 +306,7 @@ approach to change color components.
   BLINK_PLATFORM_EXPORT static void EnableHTMLImports(bool);
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -3004,6 +3004,7 @@ void RenderProcessHostImpl::PropagateBro
+@@ -2972,6 +2972,7 @@ void RenderProcessHostImpl::PropagateBro
     switches::kFileUrlPathAlias,
     switches::kFingerprintingClientRectsNoise,
     switches::kFingerprintingCanvasMeasureTextNoise,
@@ -316,7 +316,7 @@ approach to change color components.
     switches::kForceGpuMemAvailableMb,
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1394,7 +1394,9 @@ jumbo_component("platform") {
+@@ -1417,7 +1417,9 @@ jumbo_component("platform") {
     "//third_party/blink/renderer:non_test_config",
   ]
 
--- a/patches/extra/bromite/flag-max-connections-per-host.patch
+++ b/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/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -619,6 +619,11 @@ const FeatureEntry::Choice kForceEffecti
+@@ -702,6 +702,11 @@ const FeatureEntry::Choice kForceEffecti
      net::kEffectiveConnectionType4G},
 };
 
@@ -29,7 +29,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 ==
-@@ -2217,6 +2222,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2384,6 +2389,9 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kAutofillCreditCardUploadDescription, kOsAll,
      FEATURE_VALUE_TYPE(autofill::features::kAutofillUpstream)},
 #endif  // TOOLKIT_VIEWS || OS_ANDROID
@@ -41,7 +41,7 @@ with limited CPU/memory resources and it is disabled by default.
      MULTI_VALUE_TYPE(kForceUIDirectionChoices)},
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1206,6 +1206,10 @@ const char kLookalikeUrlNavigationSugges
+@@ -1227,6 +1227,10 @@ const char kLookalikeUrlNavigationSugges
 const char kMarkHttpAsName[] = "Mark non-secure origins as non-secure";
 const char kMarkHttpAsDescription[] = "Change the UI treatment for HTTP pages";
 
@@ -54,7 +54,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
-@@ -733,6 +733,9 @@ extern const char kMarkHttpAsWarning[];
+@@ -752,6 +752,9 @@ extern const char kMarkHttpAsWarning[];
 extern const char kMarkHttpAsWarningAndDangerousOnFormEdits[];
 extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[];
 
@@ -66,16 +66,14 @@ with limited CPU/memory resources and it is disabled by default.
 
 --- a/components/network_session_configurator/common/network_features.cc
 +++ b/components/network_session_configurator/common/network_features.cc
-@@ -8,6 +8,9 @@
+@@ -8,4 +8,7 @@
 
 namespace features {
 
 +const char kMaxConnectionsPerHostChoiceDefault[] = "6",
 +                 kMaxConnectionsPerHostChoice15[] = "15";
 +
- const base::Feature kDnsOverHttps{"dns-over-https",
-                                   base::FEATURE_DISABLED_BY_DEFAULT};
- 
+ }  // namespace features
 --- a/components/network_session_configurator/common/network_features.h
 +++ b/components/network_session_configurator/common/network_features.h
@@ -10,6 +10,10 @@
@@ -86,9 +84,9 @@ with limited CPU/memory resources and it is disabled by default.
 +                 kMaxConnectionsPerHostChoice6[],
 +                 kMaxConnectionsPerHostChoice15[];
 +
- // Enabled DNS over HTTPS
- // (https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-12.txt).
- NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kDnsOverHttps;
+ }  // namespace features
+ 
+ #endif  // COMPONENTS_NETWORK_SESSION_CONFIGURATOR_COMMON_NETWORK_FEATURES_H_
 --- a/components/network_session_configurator/common/network_switch_list.h
 +++ b/components/network_session_configurator/common/network_switch_list.h
@@ -22,6 +22,10 @@ NETWORK_SWITCH(kEnableUserAlternateProto
@@ -135,7 +133,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"
-@@ -315,6 +319,18 @@ void BrowserProcessImpl::Init() {
+@@ -313,6 +317,18 @@ void BrowserProcessImpl::Init() {
                              base::Bind(&ApplyMetricsReportingPolicy));
 #endif
 
@@ -156,7 +154,7 @@ with limited CPU/memory resources and it is disabled by default.
 
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -1991,6 +1991,7 @@ jumbo_split_static_library("browser") {
+@@ -2038,6 +2038,7 @@ jumbo_split_static_library("browser") {
     "//components/net_log",
     "//components/network_hints/common",
     "//components/network_session_configurator/browser",
--- a/patches/extra/debian_buster/disable/android.patch
+++ b/patches/extra/debian_buster/disable/android.patch
@@ -13,7 +13,7 @@ author: Michael Gilbert <mgilbert@debian.org>
   enable_gvr_services = is_android && !is_chromecast &&
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -384,7 +384,7 @@ group("gn_all") {
+@@ -390,7 +390,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.
--- a/patches/extra/debian_buster/disable/fuzzers.patch
+++ b/patches/extra/debian_buster/disable/fuzzers.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>

 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -734,8 +734,7 @@ group("gn_all") {
+@@ -741,8 +741,7 @@ group("gn_all") {
     }
   }
 
@@ -11,11 +11,11 @@ author: Michael Gilbert <mgilbert@debian.org>
 -      (use_libfuzzer && is_mac)) {
 +  if (false) {
     deps += [
-       "//chrome/services/cups_ipp_parser/public/cpp:fuzzers",
+       "//chrome/services/ipp_parser/public/cpp:fuzzers",
       "//testing/libfuzzer/fuzzers",
 --- a/content/test/BUILD.gn
 +++ b/content/test/BUILD.gn
-@@ -2402,12 +2402,6 @@ test("content_perftests") {
+@@ -2406,12 +2406,6 @@ test("content_perftests") {
   }
 }
 
@@ -30,9 +30,9 @@ author: Michael Gilbert <mgilbert@debian.org>
 # when the tests should be re-run - when one of the dependent files changes.
 --- a/v8/tools/BUILD.gn
 +++ b/v8/tools/BUILD.gn
-@@ -11,7 +11,6 @@ group("gn_all") {
-   data_deps = [
+@@ -12,7 +12,6 @@ group("gn_all") {
     ":v8_check_static_initializers",
+     "debug_helper:v8_debug_helper",
     "gcmole:v8_run_gcmole",
 -    "jsfunfuzz:v8_jsfunfuzz",
   ]
--- a/patches/extra/debian_buster/disable/google-api-warning.patch
+++ b/patches/extra/debian_buster/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
-@@ -857,10 +857,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -847,10 +847,6 @@ void StartupBrowserCreatorImpl::AddInfoB
 
     InfoBarService* infobar_service =
         InfoBarService::FromWebContents(web_contents);
--- a/patches/extra/debian_buster/disable/welcome-page.patch
+++ b/patches/extra/debian_buster/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
-@@ -1062,7 +1062,7 @@ void ProfileManager::InitProfileUserPref
+@@ -1053,7 +1053,7 @@ void ProfileManager::InitProfileUserPref
     profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
                                    supervised_user_id);
   }
--- a/patches/extra/debian_buster/fixes/ps-print.patch
+++ b/patches/extra/debian_buster/fixes/ps-print.patch
@@ -3,7 +3,7 @@ author: Salvatore Bonaccorso

 --- a/chrome/browser/ui/libgtkui/print_dialog_gtk.cc
 +++ b/chrome/browser/ui/libgtkui/print_dialog_gtk.cc
-@@ -333,6 +333,7 @@ void PrintDialogGtk::ShowDialog(
+@@ -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>(
--- a/patches/extra/inox-patchset/0006-modify-default-prefs.patch
+++ b/patches/extra/inox-patchset/0006-modify-default-prefs.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1153,7 +1153,7 @@ void ChromeContentBrowserClient::Registe
+@@ -1125,7 +1125,7 @@ void ChromeContentBrowserClient::Registe
 void ChromeContentBrowserClient::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -67,11 +67,11 @@
 -      prefs::kBlockThirdPartyCookies, false,
 +      prefs::kBlockThirdPartyCookies, true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterBooleanPref(
-       prefs::kCookieControlsEnabled, false,
+   registry->RegisterIntegerPref(
+       prefs::kCookieControlsMode,
 --- a/chrome/browser/ui/navigation_correction_tab_observer.cc
 +++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
-@@ -55,7 +55,7 @@ NavigationCorrectionTabObserver::~Naviga
+@@ -42,7 +42,7 @@ NavigationCorrectionTabObserver::~Naviga
 // static
 void NavigationCorrectionTabObserver::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* prefs) {
@@ -82,7 +82,7 @@
 
 --- a/components/autofill/core/common/autofill_prefs.cc
 +++ b/components/autofill/core/common/autofill_prefs.cc
-@@ -130,10 +130,10 @@ const char kAutocompleteLastVersionReten
+@@ -134,10 +134,10 @@ const char kAutocompleteLastVersionReten
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   // Synced prefs. Used for cross-device choices, e.g., credit card Autofill.
   registry->RegisterBooleanPref(
@@ -95,7 +95,7 @@
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterIntegerPref(
       prefs::kAutofillLastVersionDeduped, 0,
-@@ -146,7 +146,7 @@ void RegisterProfilePrefs(user_prefs::Pr
+@@ -150,7 +150,7 @@ void RegisterProfilePrefs(user_prefs::Pr
       prefs::kAutofillLastVersionDisusedAddressesDeleted, 0,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
@@ -117,7 +117,7 @@
     </cr-dialog>
 --- a/components/bookmarks/browser/bookmark_utils.cc
 +++ b/components/bookmarks/browser/bookmark_utils.cc
-@@ -433,12 +433,12 @@ void GetBookmarksMatchingProperties(Book
+@@ -443,12 +443,12 @@ bool DoesBookmarkContainWords(const base
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kShowBookmarkBar,
@@ -186,7 +186,7 @@
   // functionality that are only available in chrome://extensions/ but which
 --- a/components/safe_browsing/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/common/safe_browsing_prefs.cc
-@@ -153,9 +153,9 @@ void RegisterProfilePrefs(PrefRegistrySi
+@@ -167,9 +167,9 @@ void RegisterProfilePrefs(PrefRegistrySi
   registry->RegisterBooleanPref(
       prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
   registry->RegisterBooleanPref(
@@ -200,7 +200,7 @@
                                 false);
 --- a/components/password_manager/core/browser/password_manager.cc
 +++ b/components/password_manager/core/browser/password_manager.cc
-@@ -359,10 +359,10 @@ void PasswordManager::RegisterProfilePre
+@@ -202,10 +202,10 @@ void PasswordManager::RegisterProfilePre
   registry->RegisterBooleanPref(prefs::kBlacklistedCredentialsNormalized,
                                 false);
   registry->RegisterBooleanPref(
@@ -226,7 +226,7 @@
 
 --- a/chrome/browser/signin/account_consistency_mode_manager.cc
 +++ b/chrome/browser/signin/account_consistency_mode_manager.cc
-@@ -145,7 +145,7 @@ void AccountConsistencyModeManager::Regi
+@@ -152,7 +152,7 @@ void AccountConsistencyModeManager::Regi
   registry->RegisterBooleanPref(prefs::kAccountConsistencyMirrorRequired,
                                 false);
 #endif
--- a/patches/extra/inox-patchset/0008-restore-classic-ntp.patch
+++ b/patches/extra/inox-patchset/0008-restore-classic-ntp.patch
@@ -14,7 +14,7 @@
 -
 -    GURL search_provider_url(template_url->new_tab_url_ref().ReplaceSearchTerms(
 -        TemplateURLRef::SearchTermsArgs(base::string16()),
-        UIThreadSearchTermsData(profile)));
+-        UIThreadSearchTermsData()));
 -
 -    if (!search_provider_url.is_valid())
 -      return NewTabURLDetails(local_url, NEW_TAB_URL_NOT_SET);
@@ -47,4 +47,4 @@
 +    "KeepPrefetchedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
 
 const base::Feature kOptionalImagesEnabledFeature{
-     "NTPRemoteSuggestionsOptionalImages", base::FEATURE_DISABLED_BY_DEFAULT};
+     "NTPRemoteSuggestionsOptionalImages", base::FEATURE_ENABLED_BY_DEFAULT};
--- a/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch
+++ b/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch
@@ -1,9 +1,9 @@
 --- a/chrome/browser/ui/startup/startup_tab_provider.cc
 +++ b/chrome/browser/ui/startup/startup_tab_provider.cc
-@@ -49,7 +49,7 @@ bool ProfileHasOtherTabbedBrowser(Profil
+@@ -45,7 +45,7 @@ bool ProfileHasOtherTabbedBrowser(Profil
 
 StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const {
- // Onboarding content has not been launched on Chrome OS.
+ // Chrome OS has its own welcome flow provided by OOBE.
 -#if defined(OS_CHROMEOS)
 +#if 1
   return StartupTabs();
--- a/patches/extra/inox-patchset/chromium-widevine.patch
+++ b/patches/extra/inox-patchset/chromium-widevine.patch
@@ -1,6 +1,6 @@
 --- a/chrome/common/chrome_content_client.cc
 +++ b/chrome/common/chrome_content_client.cc
-@@ -92,7 +92,7 @@
+@@ -93,7 +93,7 @@
 // Registers Widevine CDM if Widevine is enabled, the Widevine CDM is
 // bundled and not a component. When the Widevine CDM is a component, it is
 // registered in widevine_cdm_component_installer.cc.
--- a/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch
+++ b/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
-@@ -1583,8 +1583,6 @@ int ChromeBrowserMainParts::PreMainMessa
+@@ -1574,8 +1574,6 @@ int ChromeBrowserMainParts::PreMainMessa
   // and preferences have been registered since some of the import code depends
   // on preferences.
   if (first_run::IsChromeFirstRun()) {
--- a/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch
+++ b/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
-@@ -134,7 +134,7 @@ void ContentSettingsRegistry::Init() {
+@@ -135,7 +135,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!
 
--- a/patches/extra/iridium-browser/updater-disable-auto-update.patch
+++ b/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
-@@ -666,7 +666,7 @@ static base::mac::ScopedObjCClassSwizzle
+@@ -660,7 +660,7 @@ static base::mac::ScopedObjCClassSwizzle
   CFStringRef checkInterval = CFSTR("checkInterval");
   CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
   if (!plist) {
--- a/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
+++ b/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
-@@ -1211,6 +1211,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1369,6 +1369,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,19 +15,19 @@
      SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
 --- a/chrome/renderer/chrome_render_frame_observer.cc
 +++ b/chrome/renderer/chrome_render_frame_observer.cc
-@@ -151,9 +151,10 @@ ChromeRenderFrameObserver::ChromeRenderF
+@@ -153,9 +153,10 @@ ChromeRenderFrameObserver::ChromeRenderF
   if (!render_frame->IsMainFrame())
     return;
 
-#if defined(SAFE_BROWSING_CSD)
+-#if BUILDFLAG(SAFE_BROWSING_CSD)
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 +  should_autocollect_ = !command_line.HasSwitch("disable-search-engine-collection");
-+#if defined(SAFE_BROWSING_CSD)
+#if BUILDFLAG(SAFE_BROWSING_CSD)
   if (!command_line.HasSwitch(switches::kDisableClientSidePhishingDetection))
     SetClientSidePhishingDetection(true);
 #endif
-@@ -340,14 +341,16 @@ void ChromeRenderFrameObserver::DidFinis
+@@ -342,14 +343,16 @@ void ChromeRenderFrameObserver::DidFinis
   if (frame->Parent())
     return;
 
@@ -85,7 +85,7 @@
 }  // namespace
 
 // TemplateURLService::LessWithPrefix -----------------------------------------
-@@ -286,6 +293,7 @@ TemplateURLService::TemplateURLService(
+@@ -285,6 +292,7 @@ TemplateURLService::TemplateURLService(
     rappor::RapporServiceImpl* rappor_service,
     const base::Closure& dsp_change_callback)
     : prefs_(prefs),
@@ -93,7 +93,7 @@
       search_terms_data_(std::move(search_terms_data)),
       web_data_service_(web_data_service),
       client_(std::move(client)),
-@@ -351,7 +359,7 @@ bool TemplateURLService::CanAddAutogener
+@@ -349,7 +357,7 @@ bool TemplateURLService::CanAddAutogener
   if (existing_url) {
     // We already have a TemplateURL for this keyword. Only allow it to be
     // replaced if the TemplateURL can be replaced.
@@ -102,7 +102,7 @@
   }
 
   // We don't have a TemplateURL with keyword.  We still may not allow this
-@@ -360,8 +368,8 @@ bool TemplateURLService::CanAddAutogener
+@@ -358,8 +366,8 @@ bool TemplateURLService::CanAddAutogener
   // that may interfere with search queries).  An easy heuristic for this is
   // whether the user has a TemplateURL that has been manually modified (e.g.,
   // renamed) connected to the same host.
@@ -113,7 +113,7 @@
 }
 
 bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
-@@ -1383,6 +1391,8 @@ SyncDataMap TemplateURLService::CreateGU
+@@ -1381,6 +1389,8 @@ SyncDataMap TemplateURLService::CreateGU
 
 void TemplateURLService::Init(const Initializer* initializers,
                               int num_initializers) {
@@ -122,7 +122,7 @@
   if (client_)
     client_->SetOwner(this);
 
-@@ -1618,6 +1628,9 @@ void TemplateURLService::ChangeToLoadedS
+@@ -1605,6 +1615,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;
-@@ -1628,7 +1641,8 @@ bool TemplateURLService::CanAddAutogener
+@@ -1615,7 +1628,8 @@ bool TemplateURLService::CanAddAutogener
 }
 
 bool TemplateURLService::CanReplace(const TemplateURL* t_url) const {
@@ -144,7 +144,7 @@
 TemplateURL* TemplateURLService::FindNonExtensionTemplateURLForKeyword(
 --- a/components/search_engines/template_url_service.h
 +++ b/components/search_engines/template_url_service.h
-@@ -733,6 +733,8 @@ class TemplateURLService : public WebDat
+@@ -723,6 +723,8 @@ class TemplateURLService : public WebDat
   // ---------- Browser state related members ---------------------------------
   PrefService* prefs_ = nullptr;
 
--- a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch
+++ b/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
-@@ -225,6 +225,16 @@ const unsigned kOsDesktop = kOsMac | kOs
+@@ -239,6 +239,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,
-@@ -1193,6 +1203,10 @@ const FeatureEntry::Choice kNotification
+@@ -1351,6 +1361,10 @@ const FeatureEntry::FeatureVariation kQu
 //
 // 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"
-@@ -120,6 +121,14 @@ scoped_refptr<extensions::CrxInstaller>
+@@ -126,6 +127,14 @@ scoped_refptr<extensions::CrxInstaller>
   return installer;
 }
 
@@ -56,7 +56,7 @@
 bool IsExtensionDownload(const DownloadItem& download_item) {
   if (download_item.GetTargetDisposition() ==
       DownloadItem::TARGET_DISPOSITION_PROMPT)
-@@ -128,7 +137,7 @@ bool IsExtensionDownload(const DownloadI
+@@ -134,7 +143,7 @@ bool IsExtensionDownload(const DownloadI
   if (download_item.GetMimeType() == extensions::Extension::kMimeType ||
       extensions::UserScript::IsURLUserScript(download_item.GetURL(),
                                               download_item.GetMimeType())) {
@@ -104,13 +104,13 @@
 bool IsExtensionDownload(const download::DownloadItem& download_item);
 --- a/chrome/browser/download/download_target_determiner.cc
 +++ b/chrome/browser/download/download_target_determiner.cc
-@@ -1001,10 +1001,12 @@ DownloadConfirmationReason DownloadTarge
+@@ -1013,10 +1013,12 @@ DownloadConfirmationReason DownloadTarge
     return DownloadConfirmationReason::SAVE_AS;
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-  // Don't prompt for extension downloads.
-  if (download_crx_util::IsExtensionDownload(*download_) ||
-      filename.MatchesExtension(extensions::kExtensionFileExtension))
+-  // Don't prompt for extension downloads if the installation site is white
+-  // listed.
+-  if (download_crx_util::IsTrustedExtensionDownload(GetProfile(), *download_))
 -    return DownloadConfirmationReason::NONE;
 +  if (!download_crx_util::ShouldDownloadAsRegularFile()) {
 +    // Don't prompt for extension downloads.
--- a/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch
+++ b/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
-@@ -1215,6 +1215,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1373,6 +1373,10 @@ const FeatureEntry kFeatureEntries[] = {
      "Disable search engine collection",
      "Prevents search engines from being added automatically.",
      kOsAll, SINGLE_VALUE_TYPE("disable-search-engine-collection")},
@@ -23,7 +23,7 @@
 #include "base/lazy_instance.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/stl_util.h"
-@@ -245,6 +246,13 @@ IDNConversionResult IDNToUnicodeWithAdju
+@@ -244,6 +245,13 @@ IDNConversionResult IDNToUnicodeWithAdju
   input16.reserve(host.length());
   input16.insert(input16.end(), host.begin(), host.end());
 
--- a/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch
+++ b/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
-@@ -828,7 +828,8 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -818,7 +818,8 @@ void StartupBrowserCreatorImpl::AddInfoB
   if (!browser || !profile_ || browser->tab_strip_model()->count() == 0)
     return;
 
--- a/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch
+++ b/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
-@@ -248,6 +248,16 @@ const FeatureEntry::Choice kShowAvatarBu
+@@ -262,6 +262,16 @@ const FeatureEntry::Choice kShowAvatarBu
      "never"}
 };
 
@@ -17,9 +17,9 @@
 const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
     {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
     {flags_ui::kGenericExperimentChoiceEnabled,
-@@ -3601,6 +3611,11 @@ const FeatureEntry kFeatureEntries[] = {
-      kOsAndroid, FEATURE_VALUE_TYPE(safe_browsing::kUseLocalBlacklistsV2)},
- #endif  // defined(OS_ANDROID)
+@@ -3595,6 +3605,11 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(
+          autofill::features::kAutofillEnableAccountWalletStorage)},
 
 +    {"scroll-tabs",
 +     "Scroll switches tab",
@@ -27,8 +27,8 @@
 +     MULTI_VALUE_TYPE(kScrollEventChangesTab)},
 +
 #if defined(OS_CHROMEOS)
-     {"enable-native-google-assistant",
-      flag_descriptions::kEnableGoogleAssistantName,
+     {"enable-zero-state-suggestions",
+      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 @@
@@ -39,7 +39,7 @@
 #include "base/metrics/user_metrics.h"
 #include "base/task/post_task.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
-@@ -91,6 +92,18 @@ int GetDropEffect(const ui::DropTargetEv
+@@ -90,6 +91,18 @@ int GetDropEffect(const ui::DropTargetEv
   return ui::DragDropTypes::DRAG_MOVE;
 }
 
@@ -58,7 +58,7 @@
 }  // namespace
 
 BrowserRootView::DropInfo::DropInfo() = default;
-@@ -105,7 +118,9 @@ const char BrowserRootView::kViewClassNa
+@@ -104,7 +117,9 @@ const char BrowserRootView::kViewClassNa
 
 BrowserRootView::BrowserRootView(BrowserView* browser_view,
                                  views::Widget* widget)
@@ -69,7 +69,7 @@
 
 BrowserRootView::~BrowserRootView() = default;
 
-@@ -238,7 +253,7 @@ const char* BrowserRootView::GetClassNam
+@@ -244,7 +259,7 @@ const char* BrowserRootView::GetClassNam
 }
 
 bool BrowserRootView::OnMouseWheel(const ui::MouseWheelEvent& event) {
--- a/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch
+++ b/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
-@@ -235,6 +235,19 @@ const FeatureEntry::Choice kExtensionHan
+@@ -249,6 +249,19 @@ const FeatureEntry::Choice kExtensionHan
      "always-prompt-for-install"},
 };
 
@@ -20,7 +20,7 @@
 const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
     {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
     {flags_ui::kGenericExperimentChoiceEnabled,
-@@ -3548,6 +3561,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3694,6 +3707,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
-@@ -248,6 +248,15 @@ void ToolbarView::Init() {
+@@ -256,6 +256,15 @@ void ToolbarView::Init() {
 
   std::unique_ptr<ToolbarPageActionIconContainerView>
       toolbar_page_action_container;
@@ -50,7 +50,7 @@
   bool show_avatar_toolbar_button = true;
   if (base::FeatureList::IsEnabled(
           autofill::features::kAutofillEnableToolbarStatusChip)) {
-@@ -259,11 +268,17 @@ void ToolbarView::Init() {
+@@ -267,11 +276,17 @@ void ToolbarView::Init() {
   } else {
 #if defined(OS_CHROMEOS)
     // ChromeOS only badges Incognito and Guest icons in the browser window.
--- a/patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch
@@ -22,7 +22,7 @@
 
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1193,6 +1193,10 @@ const FeatureEntry::Choice kNotification
+@@ -1351,6 +1351,10 @@ const FeatureEntry::FeatureVariation kQu
 //
 // When adding a new choice, add it to the end of the list.
 const FeatureEntry kFeatureEntries[] = {
--- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch
+++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch
@@ -11,7 +11,7 @@
 #include "base/compiler_specific.h"
 #include "base/containers/linked_list.h"
 #include "base/debug/debugger.h"
-@@ -122,11 +123,6 @@ const unsigned kMinimumTTLSeconds = kCac
+@@ -123,11 +124,6 @@ const unsigned kMinimumTTLSeconds = kCac
 // cached.
 const int kIPv6ProbePeriodMs = 1000;
 
@@ -23,7 +23,7 @@
 enum DnsResolveStatus {
   RESOLVE_STATUS_DNS_SUCCESS = 0,
   RESOLVE_STATUS_PROC_SUCCESS,
-@@ -3179,7 +3175,7 @@ bool HostResolverManager::IsIPv6Reachabl
+@@ -3210,7 +3206,7 @@ bool HostResolverManager::IsIPv6Reachabl
   if ((tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
       kIPv6ProbePeriodMs) {
     last_ipv6_probe_result_ =
--- a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
+++ b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
@@ -88,8 +88,8 @@
 const int kNewSearchEngineIndex = -1;
@@ -197,6 +198,9 @@ SearchEnginesHandler::CreateDictionaryFo
   Profile* profile = Profile::FromWebUI(web_ui());
-   dict->SetString("url", template_url->url_ref().DisplayURL(
-                              UIThreadSearchTermsData(profile)));
+   dict->SetString(
+       "url", template_url->url_ref().DisplayURL(UIThreadSearchTermsData()));
 +  dict->SetString("suggestionsUrl",
 +                  template_url->suggestions_url_ref().DisplayURL(
 +                      UIThreadSearchTermsData(profile)));
@@ -417,7 +417,7 @@
   void ReloadIcon(int index);
 --- a/components/search_engines/template_url_service.cc
 +++ b/components/search_engines/template_url_service.cc
-@@ -609,7 +609,8 @@ void TemplateURLService::IncrementUsageC
+@@ -608,7 +608,8 @@ void TemplateURLService::IncrementUsageC
 void TemplateURLService::ResetTemplateURL(TemplateURL* url,
                                           const base::string16& title,
                                           const base::string16& keyword,
@@ -427,7 +427,7 @@
   DCHECK(!IsCreatedByExtension(url));
   DCHECK(!keyword.empty());
   DCHECK(!search_url.empty());
-@@ -623,6 +624,7 @@ void TemplateURLService::ResetTemplateUR
+@@ -622,6 +623,7 @@ void TemplateURLService::ResetTemplateUR
   }
   data.safe_for_autoreplace = false;
   data.last_modified = clock_->Now();
@@ -435,7 +435,7 @@
   Update(url, TemplateURL(data));
 }
 
-@@ -2044,7 +2046,7 @@ TemplateURL* TemplateURLService::Add(std
+@@ -1965,7 +1967,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(),
@@ -446,7 +446,7 @@
     }
 --- a/components/search_engines/template_url_service.h
 +++ b/components/search_engines/template_url_service.h
-@@ -254,7 +254,8 @@ class TemplateURLService : public WebDat
+@@ -252,7 +252,8 @@ class TemplateURLService : public WebDat
   void ResetTemplateURL(TemplateURL* url,
                         const base::string16& title,
                         const base::string16& keyword,
--- a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch
+++ b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch
@@ -2,7 +2,7 @@

 --- a/content/browser/renderer_host/pepper/pepper_file_io_host.cc
 +++ b/content/browser/renderer_host/pepper/pepper_file_io_host.cc
-@@ -432,7 +432,7 @@ void PepperFileIOHost::OnLocalFileOpened
+@@ -433,7 +433,7 @@ void PepperFileIOHost::OnLocalFileOpened
     ppapi::host::ReplyMessageContext reply_context,
     const base::FilePath& path,
     base::File::Error error_code) {
@@ -11,7 +11,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) {
-@@ -452,7 +452,7 @@ void PepperFileIOHost::OnLocalFileOpened
+@@ -453,7 +453,7 @@ void PepperFileIOHost::OnLocalFileOpened
 #endif
 }
 
@@ -43,7 +43,7 @@
 
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -52,7 +52,6 @@ jumbo_source_set("browser") {
+@@ -54,7 +54,6 @@ jumbo_source_set("browser") {
     "//components/discardable_memory/service",
     "//components/download/database",
     "//components/download/public/common:public",
@@ -59,9 +59,9 @@
 #include "components/download/public/common/download_stats.h"
 -#include "components/download/quarantine/quarantine.h"
 #include "crypto/secure_hash.h"
- #include "services/service_manager/public/cpp/connector.h"
 
-@@ -523,129 +522,12 @@ DownloadInterruptReason BaseFile::Publis
+ #if defined(OS_WIN)
+@@ -522,129 +521,12 @@ DownloadInterruptReason BaseFile::Publis
 }
 #endif  // defined(OS_ANDROID)
 
@@ -191,12 +191,12 @@
 
 void BaseFile::AnnotateWithSourceInformation(
     const std::string& client_guid,
-@@ -653,31 +535,8 @@ void BaseFile::AnnotateWithSourceInforma
+@@ -652,30 +534,8 @@ void BaseFile::AnnotateWithSourceInforma
     const GURL& referrer_url,
-     std::unique_ptr<service_manager::Connector> connector,
+     mojo::PendingRemote<quarantine::mojom::Quarantine> remote_quarantine,
     OnAnnotationDoneCallback on_annotation_done_callback) {
 -  GURL authority_url = GetEffectiveAuthorityURL(source_url, referrer_url);
-  if (!connector) {
+-  if (!remote_quarantine) {
 -#if defined(OS_WIN)
 -    QuarantineFileResult result = quarantine::SetInternetZoneIdentifierDirectly(
 -        full_path_, authority_url, referrer_url);
@@ -206,12 +206,11 @@
 -    std::move(on_annotation_done_callback)
 -        .Run(QuarantineFileResultToReason(result));
 -  } else {
-    connector->BindInterface(quarantine::mojom::kServiceName,
-                             mojo::MakeRequest(&quarantine_service_));
+-    quarantine_service_.Bind(std::move(remote_quarantine));
 -
 -    on_annotation_done_callback_ = std::move(on_annotation_done_callback);
 -
-    quarantine_service_.set_connection_error_handler(base::BindOnce(
+-    quarantine_service_.set_disconnect_handler(base::BindOnce(
 -        &BaseFile::OnQuarantineServiceError, weak_factory_.GetWeakPtr(),
 -        authority_url, referrer_url));
 -
--- a/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch
+++ b/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch
@@ -2,7 +2,7 @@

 --- a/components/url_formatter/url_formatter.cc
 +++ b/components/url_formatter/url_formatter.cc
-@@ -434,14 +434,14 @@ bool IDNToUnicodeOneComponent(const base
+@@ -433,14 +433,14 @@ bool IDNToUnicodeOneComponent(const base
 }  // namespace
 
 const FormatUrlType kFormatUrlOmitNothing = 0;
--- a/patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch
+++ b/patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch
@@ -3,7 +3,7 @@

 --- a/chrome/browser/intranet_redirect_detector.cc
 +++ b/chrome/browser/intranet_redirect_detector.cc
-@@ -75,9 +75,7 @@ void IntranetRedirectDetector::FinishSle
+@@ -96,9 +96,7 @@ void IntranetRedirectDetector::FinishSle
   simple_loaders_.clear();
   resulting_origins_.clear();
 
--- a/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch
+++ b/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
-@@ -3330,16 +3330,14 @@ ScriptValue WebGLRenderingContextBase::g
+@@ -3339,16 +3339,14 @@ ScriptValue WebGLRenderingContextBase::g
       return ScriptValue::CreateNull(script_state);
     case WebGLDebugRendererInfo::kUnmaskedRendererWebgl:
       if (ExtensionEnabled(kWebGLDebugRendererInfoName))
--- a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch
+++ b/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch
@@ -17,7 +17,7 @@
 bool IsURLHandledByNetworkStack(const GURL& url) {
 --- a/chrome/browser/ui/browser_commands.cc
 +++ b/chrome/browser/ui/browser_commands.cc
-@@ -381,12 +381,6 @@ int GetContentRestrictions(const Browser
+@@ -376,12 +376,6 @@ int GetContentRestrictions(const Browser
     CoreTabHelper* core_tab_helper =
         CoreTabHelper::FromWebContents(current_tab);
     content_restrictions = core_tab_helper->content_restrictions();
@@ -30,16 +30,16 @@
     if (current_tab->ShowingInterstitialPage())
       content_restrictions |= CONTENT_RESTRICTION_PRINT;
   }
-@@ -979,8 +973,7 @@ bool CanSavePage(const Browser* browser)
+@@ -963,8 +957,7 @@ bool CanSavePage(const Browser* browser)
           prefs::kAllowFileSelectionDialogs)) {
     return false;
   }
-  return !browser->is_devtools() &&
+-  return !browser->is_type_devtools() &&
 -         !(GetContentRestrictions(browser) & CONTENT_RESTRICTION_SAVE);
 +  return true;
 }
 
- void ShowFindBar(Browser* browser) {
+ void Print(Browser* browser) {
 --- a/components/offline_pages/core/offline_page_model.cc
 +++ b/components/offline_pages/core/offline_page_model.cc
@@ -22,7 +22,7 @@ OfflinePageModel::SavePageParams::~SaveP
--- a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch
+++ b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/views/tabs/new_tab_button.cc
 +++ b/chrome/browser/ui/views/tabs/new_tab_button.cc
-@@ -68,10 +68,8 @@ const gfx::Size NewTabButton::kButtonSiz
+@@ -69,10 +69,8 @@ const gfx::Size NewTabButton::kButtonSiz
 NewTabButton::NewTabButton(TabStrip* tab_strip, views::ButtonListener* listener)
     : views::ImageButton(listener), tab_strip_(tab_strip) {
   set_animate_on_state_change(true);
@@ -13,16 +13,16 @@
       AddChildView(std::make_unique<views::InkDropContainerView>());
 --- a/chrome/browser/ui/views/tabs/tab_strip.cc
 +++ b/chrome/browser/ui/views/tabs/tab_strip.cc
-@@ -2906,15 +2906,12 @@ void TabStrip::ButtonPressed(views::Butt
-     if (event.IsMouseEvent()) {
+@@ -2934,15 +2934,12 @@ void TabStrip::ButtonPressed(views::Butt
+ 
       const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
       if (mouse.IsOnlyMiddleMouseButton()) {
-        if (ui::Clipboard::IsSupportedClipboardType(
-                ui::ClipboardType::kSelection)) {
+-        if (ui::Clipboard::IsSupportedClipboardBuffer(
+-                ui::ClipboardBuffer::kSelection)) {
           ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
           CHECK(clipboard);
           base::string16 clipboard_text;
-           clipboard->ReadText(ui::ClipboardType::kSelection, &clipboard_text);
+           clipboard->ReadText(ui::ClipboardBuffer::kSelection, &clipboard_text);
           if (!clipboard_text.empty())
             controller_->CreateNewTabWithLocation(clipboard_text);
 -        }
--- a/patches/extra/ungoogled-chromium/popups-to-tabs.patch
+++ b/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
-@@ -283,7 +283,7 @@ WindowOpenDisposition RenderViewImpl::Na
+@@ -281,7 +281,7 @@ WindowOpenDisposition RenderViewImpl::Na
     case blink::kWebNavigationPolicyNewWindow:
       return WindowOpenDisposition::NEW_WINDOW;
     case blink::kWebNavigationPolicyNewPopup:
--- a/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch
+++ b/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch
@@ -2,7 +2,7 @@

 --- a/chrome/browser/ui/startup/bad_flags_prompt.cc
 +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -59,7 +59,6 @@ static const char* kBadFlags[] = {
+@@ -60,7 +60,6 @@ static const char* kBadFlags[] = {
     // These flags disable sandbox-related security.
     service_manager::switches::kDisableGpuSandbox,
     service_manager::switches::kDisableSeccompFilterSandbox,
--- a/patches/extra/ungoogled-chromium/searx.patch
+++ b/patches/extra/ungoogled-chromium/searx.patch
@@ -17,9 +17,9 @@
 +      "id": 12
 +    },
 +
-     // Ask and Ask UK have suggestion URLs reachable over HTTPS, but they
-     // throw a certificate error, so those will remain as HTTP for now.
     "ask": {
+       "name": "Ask",
+       "keyword": "ask.com",
 --- a/components/search_engines/search_engine_type.h
 +++ b/components/search_engines/search_engine_type.h
@@ -47,6 +47,7 @@ enum SearchEngineType {
--- a/patches/series
+++ b/patches/series
@@ -1,7 +1,6 @@
 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/0004-disable-google-url-tracker.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
--- a/pruning.list
+++ b/pruning.list
@@ -9,7 +9,6 @@ base/test/data/file_util/binary_file.bin
 base/test/data/file_util/binary_file_diff.bin
 base/test/data/file_util/binary_file_same.bin
 base/test/data/file_version_info_unittest/FileVersionInfoTest1.dll
-base/test/data/file_version_info_unittest/FileVersionInfoTest2.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
@@ -23,8 +22,8 @@ buildtools/linux64/gn
 buildtools/third_party/eu-strip/bin/eu-strip
 chrome/browser/chromeos/power/ml/smart_dim/20181115_example_preprocessor_config.pb
 chrome/browser/chromeos/power/ml/smart_dim/20190221_example_preprocessor_config.pb
+chrome/browser/resource_coordinator/tab_ranker/pairwise_preprocessor_config.pb
 chrome/browser/resources/chromeos/assistant_optin/voice_already_setup.webm
-chrome/browser/resources/chromeos/assistant_optin/voice_laptop_1x.webm
 chrome/browser/resources/chromeos/camera/src/sounds/record_end.ogg
 chrome/browser/resources/chromeos/camera/src/sounds/record_start.ogg
 chrome/browser/resources/chromeos/camera/src/sounds/shutter.ogg
@@ -64,6 +63,7 @@ chrome/browser/resources/default_apps/drive.crx
 chrome/browser/resources/default_apps/gmail.crx
 chrome/browser/resources/default_apps/youtube.crx
 chrome/browser/resources/media/mei_preload/preloaded_data.pb
+chrome/browser/ui/app_list/search/search_result_ranker/20190722_example_preprocessor_config.pb
 chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/Network Share Test.lnk
 chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/New folder - Shortcut.lnk
 chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/long_name.lnk
@@ -74,7 +74,6 @@ chrome/chrome_cleaner/test/resources/signed_dll/signed_empty_dll.dll
 chrome/credential_provider/eventlog/gcp_eventlog_messages.mc
 chrome/installer/linux/debian/repo_signing_keys.gpg
 chrome/installer/test/data/SETUP.EX_
-chrome/test/media_router/telemetry/benchmarks/pagesets/bear-vp9-opus.webm
 cloud_print/virtual_driver/win/install/inf/gcp_driver.inf
 components/cast_channel/fuzz_corpus/cast_message0
 components/cast_channel/fuzz_corpus/cast_message1
@@ -159,6 +158,7 @@ components/test/data/crx_file/unsigned.crx3
 components/test/data/crx_file/valid.crx2
 components/test/data/crx_file/valid_no_publisher.crx3
 components/test/data/crx_file/valid_publisher.crx3
+components/test/data/crx_file/valid_test_publisher.crx3
 components/test/data/history/HistoryNoDuration
 components/test/data/history/HistoryNoSource
 components/test/data/history/History_with_starred
@@ -1081,6 +1081,7 @@ net/data/ssl/certificates/crlset_by_intermediate_serial.raw
 net/data/ssl/certificates/crlset_by_leaf_spki.raw
 net/data/ssl/certificates/crlset_by_leaf_subject_no_spki.raw
 net/data/ssl/certificates/crlset_by_root_serial.raw
+net/data/ssl/certificates/crlset_by_root_spki.raw
 net/data/ssl/certificates/crlset_by_root_subject.raw
 net/data/ssl/certificates/crlset_by_root_subject_no_spki.raw
 net/data/ssl/certificates/duplicate_cn_1.p12
@@ -2773,6 +2774,7 @@ services/device/usb/fuzz_corpus/descriptor7
 services/device/usb/fuzz_corpus/usb_string_descriptors_example
 services/device/usb/fuzz_corpus/webusb_descriptors_unittest_example
 services/test/data/bundled_exchanges/hello.wbn
+services/test/data/bundled_exchanges/hello_signed.wbn
 sql/test/data/recovery_387868
 testing/libfuzzer/fuzzers/flatbuffers_corpus/monsterdata_test.mon
 third_party/SPIRV-Tools/src/test/fuzzers/corpora/spv/simple.spv
@@ -12825,6 +12827,7 @@ third_party/harfbuzz-ng/src/test/api/fonts/SourceSansPro-Regular.ac.nosubrs.nohi
 third_party/harfbuzz-ng/src/test/api/fonts/SourceSansPro-Regular.ac.nosubrs.otf
 third_party/harfbuzz-ng/src/test/api/fonts/SourceSansPro-Regular.ac.otf
 third_party/harfbuzz-ng/src/test/api/fonts/SourceSansPro-Regular.ac.retaingids.otf
+third_party/harfbuzz-ng/src/test/api/fonts/TestCFF2VF.otf
 third_party/harfbuzz-ng/src/test/api/fonts/cff1_dotsect.nohints.otf
 third_party/harfbuzz-ng/src/test/api/fonts/cff1_dotsect.otf
 third_party/harfbuzz-ng/src/test/api/fonts/cff1_expert.2D,F6E9,FB00.otf
@@ -12990,6 +12993,7 @@ 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-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-5725847365877760
+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-5743250149736448
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5747265633779712
@@ -13299,8 +13303,13 @@ third_party/harfbuzz-ng/src/test/subset/data/expected/cff-japanese/SourceHanSans
 third_party/harfbuzz-ng/src/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.61,63,65,6B.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf
 third_party/harfbuzz-ng/src/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.660E.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.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/fonts/SourceHanSans-Regular_subset.otf
 third_party/harfbuzz-ng/src/test/subset/data/fonts/SourceSansPro-Regular.otf
+third_party/harfbuzz-ng/src/test/subset/data/fonts/gpos1_2_font.otf
 third_party/hunspell/fuzz/bdict_corpus/02a25363e79f11115132055fb880773b325f6aef
 third_party/hunspell/fuzz/bdict_corpus/0883e336027e9e21911a277a9d8fa4c1b9490edd
 third_party/hunspell/fuzz/bdict_corpus/0c70b309d63d09ac033b8c80abff19457c93772a
@@ -13328,6 +13337,7 @@ third_party/hunspell/fuzz/bdict_corpus/f95048cdc0fc231dd712bad106578a9eeecd869b
 third_party/hunspell/fuzz/bdict_corpus/fda69541054125551c41ab3e591e0482405ca2dc
 third_party/icu/android/icudtl.dat
 third_party/icu/android_small/icudtl.dat
+third_party/icu/android_small/icudtl_extra.dat
 third_party/icu/cast/icudtl.dat
 third_party/icu/chromeos/icudtl.dat
 third_party/icu/common/icudtb.dat
@@ -13363,9 +13373,13 @@ third_party/liblouis/wasm/liblouis_wasm.wasm
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1242_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1264_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1268_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1284_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1345_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1441_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1473_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1649_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1658_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1671_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1684_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1758_en
@@ -13421,10 +13435,13 @@ third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/ca
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/258_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/260_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/261_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/263_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/264_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/265_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/267_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/268_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/269_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/297_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/298_en
@@ -13433,6 +13450,7 @@ third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/ca
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/31_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/33_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/351_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/352_en
@@ -13448,12 +13466,16 @@ third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/ca
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/372_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/374_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/374_ru
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/375_be
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/375_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/375_ru
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/376_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_uk
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/381_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/382_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/383_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/387_en
@@ -13463,26 +13485,33 @@ third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/ca
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/423_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/43_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/45_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/47_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/48_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en
-third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/501_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/502_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/503_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/505_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/506_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/507_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/508_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/509_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/51_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/53_en
-third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/54_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/55_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/57_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/58_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/590_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/591_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/593_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/594_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/595_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/596_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/597_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/598_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/599_en
@@ -13495,31 +13524,41 @@ third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/ca
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/66_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/670_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/673_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/674_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/675_en
-third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/676_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/677_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/678_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/679_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/680_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/685_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/686_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/688_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/689_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_ru
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/84_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh_Hant
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/856_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh_Hant
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/880_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/886_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/92_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/93_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/93_fa
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/94_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/95_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/961_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/962_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/964_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/965_ar
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/965_en
@@ -13535,6 +13574,7 @@ third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/ca
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/977_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en
+third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en
 third_party/libphonenumber/dist/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/994_en
@@ -13569,6 +13609,7 @@ third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/g
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1218_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1219_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1220_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1223_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1224_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1225_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1226_en
@@ -13581,6 +13622,7 @@ third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/g
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1240_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1242_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1248_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1249_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1250_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1251_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1252_en
@@ -13594,7 +13636,9 @@ third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/g
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1270_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1272_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1276_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1279_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1281_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1283_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1289_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1301_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1302_en
@@ -13620,10 +13664,12 @@ third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/g
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1325_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1330_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1331_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1332_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1334_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1336_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1337_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1339_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1343_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1345_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1346_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1347_en
@@ -13666,9 +13712,15 @@ third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/g
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1438_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1440_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1441_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1442_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1443_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1445_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1450_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1458_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1463_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1469_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1470_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1475_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1478_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1479_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1480_en
@@ -13693,20 +13745,27 @@ third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/g
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1519_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1520_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1530_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1531_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1534_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1539_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1540_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1541_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1548_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1551_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1559_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1561_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1562_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1563_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1564_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1567_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1570_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1571_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1573_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1574_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1575_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1579_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1580_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1581_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1585_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1586_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1587_en
@@ -13737,6 +13796,7 @@ third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/g
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1631_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1636_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1639_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1640_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1641_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1646_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1647_en
@@ -13751,6 +13811,8 @@ third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/g
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1669_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1671_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1678_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1680_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1681_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1682_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1701_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1702_en
@@ -13772,15 +13834,19 @@ third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/g
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1720_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1724_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1725_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1726_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1727_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1731_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1732_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1734_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1737_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1740_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1743_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1747_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1754_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1757_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1760_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1762_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1763_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1765_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1769_en
@@ -13814,11 +13880,13 @@ third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/g
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1817_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1818_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1819_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1820_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1825_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1828_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1830_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1831_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1832_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1838_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1843_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1845_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1847_en
@@ -13864,6 +13932,7 @@ third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/g
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1929_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1930_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1931_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1934_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1936_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1937_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1938_en
@@ -13885,19 +13954,23 @@ third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/g
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1980_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1984_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1985_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1986_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1989_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/20_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_fr
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/213_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/216_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/218_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/220_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/221_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/222_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/222_fr
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/223_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/224_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/226_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/227_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/228_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/228_es
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/228_fr
@@ -13913,6 +13986,7 @@ third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/g
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/238_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/239_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/239_pt
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/240_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/241_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/242_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/243_en
@@ -13926,6 +14000,7 @@ third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/g
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/252_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/254_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/255_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/256_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/257_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/258_en
@@ -13964,7 +14039,7 @@ third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/g
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/355_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_fi
-third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_se
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_sv
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/359_bg
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/359_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/36_en
@@ -13975,14 +14050,25 @@ third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/g
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/373_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/373_ro
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/373_ru
-third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_am
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_hy
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_ru
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/375_be
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/375_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/375_ru
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/380_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/380_uk
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/381_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/381_sr
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/382_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/383_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/383_sq
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/383_sr
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/385_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/387_bs
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/387_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/387_hr
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/387_sr
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/389_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/39_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/39_it
@@ -14004,11 +14090,16 @@ third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/g
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/48_pl
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_de
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/501_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/51_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_es
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/53_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_es
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_pt
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/57_en
@@ -14016,44 +14107,53 @@ third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/g
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_es
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/592_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/599_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/60_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/61_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/62_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/62_id
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/64_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_th
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/675_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/676_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/680_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/686_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/688_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_ru
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_ja
-third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ar
-third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_cs
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_en
-third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_fr
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ko
-third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_zh
-third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_zh_Hant
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_vi
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/880_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_zh
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_zh_Hant
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/90_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/90_tr
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/93_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/93_fa
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/94_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/95_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/960_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/962_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/966_ar
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/966_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/968_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/972_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/972_iw
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/975_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/976_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_fa
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/992_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/994_en
+third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/996_en
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
 third_party/libphonenumber/dist/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
 third_party/libphonenumber/dist/java/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_de
@@ -14068,7 +14168,6 @@ third_party/libphonenumber/dist/java/geocoder/test/com/google/i18n/phonenumbers/
 third_party/libphonenumber/dist/java/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_ko
 third_party/libphonenumber/dist/java/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/config
 third_party/libphonenumber/dist/java/geocoder/test/com/google/i18n/phonenumbers/timezones/testing_data/map_data
-third_party/libphonenumber/dist/java/lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar
 third_party/libphonenumber/dist/java/lib/junit-4.8.1.jar
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_255
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_27
@@ -14087,11 +14186,13 @@ third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenum
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_380
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_381
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_385
+third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_39
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_43
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_44
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_49
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_505
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_506
+third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_52
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_54
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_55
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_58
@@ -14099,6 +14200,7 @@ third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenum
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_61
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_62
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_63
+third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_64
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_66
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_675
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676
@@ -14107,6 +14209,7 @@ third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenum
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_81
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_84
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_855
+third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_856
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_90
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_94
@@ -14362,6 +14465,7 @@ third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenum
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS
+third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
@@ -14543,6 +14647,7 @@ third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenum
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PM
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR
+third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PS
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PW
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY
@@ -14600,16 +14705,18 @@ third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenum
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VU
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WF
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS
+third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_XK
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YE
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YT
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZM
 third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW
-third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto
 third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_800
+third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_882
 third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_979
 third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD
 third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE
+third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AM
 third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO
 third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR
 third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU
@@ -14633,11 +14740,13 @@ third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenu
 third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ
 third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL
 third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE
+third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RU
 third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE
 third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG
+third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_TA
 third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US
+third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_UZ
 third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT
-third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProtoForTesting
 third_party/libphonenumber/dist/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar
 third_party/libphonenumber/dist/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar
 third_party/libwebm/source/testing/testdata/accurate_cluster_duration.webm
@@ -15279,13 +15388,13 @@ third_party/libxml/fuzz/seed_corpus/fbd91b3106732ac8dbbb4e004059863e5f52c13c
 third_party/libyuv/tools_libyuv/autoroller/unittests/.DS_Store
 third_party/llvm/clang/test/CodeGen/Inputs/thinlto-distributed-backend-skip.bc
 third_party/llvm/clang/test/Driver/at_file.c.args.utf16le
-third_party/llvm/clang/test/Driver/clang-offload-bundler.c.o
 third_party/llvm/clang/test/Misc/Inputs/serialized-diags-stable.dia
 third_party/llvm/clang/test/Modules/modules.idx
 third_party/llvm/clang/test/Profile/Inputs/c-general.profdata.v1
 third_party/llvm/clang/test/Profile/Inputs/c-general.profdata.v3
 third_party/llvm/clang/test/Profile/Inputs/cxx-hash-v2.profdata.v5
 third_party/llvm/clang/tools/scan-view/share/FileRadar.scpt
+third_party/llvm/lld/test/COFF/Inputs/alias-implib.lib
 third_party/llvm/lld/test/COFF/Inputs/bad-block-size.pdb
 third_party/llvm/lld/test/COFF/Inputs/cl-gl.obj
 third_party/llvm/lld/test/COFF/Inputs/combined-resources-2.res
@@ -15306,6 +15415,9 @@ third_party/llvm/lld/test/COFF/Inputs/inline-weak2.o
 third_party/llvm/lld/test/COFF/Inputs/library-arm64.lib
 third_party/llvm/lld/test/COFF/Inputs/library.lib
 third_party/llvm/lld/test/COFF/Inputs/library2-arm64.lib
+third_party/llvm/lld/test/COFF/Inputs/manifest-lang0.res
+third_party/llvm/lld/test/COFF/Inputs/manifest-lang1.res
+third_party/llvm/lld/test/COFF/Inputs/manifest-lang2.res
 third_party/llvm/lld/test/COFF/Inputs/pdb-diff-cl.pdb
 third_party/llvm/lld/test/COFF/Inputs/pdb-diff.obj
 third_party/llvm/lld/test/COFF/Inputs/pdb-import-gc.lib
@@ -15543,6 +15655,7 @@ third_party/llvm/llvm/test/Bitcode/Inputs/invalid-extract-0-indices.bc
 third_party/llvm/llvm/test/Bitcode/Inputs/invalid-extractval-array-idx.bc
 third_party/llvm/llvm/test/Bitcode/Inputs/invalid-extractval-struct-idx.bc
 third_party/llvm/llvm/test/Bitcode/Inputs/invalid-extractval-too-many-idxs.bc
+third_party/llvm/llvm/test/Bitcode/Inputs/invalid-fcmp-opnum.bc
 third_party/llvm/llvm/test/Bitcode/Inputs/invalid-fp-shift.bc
 third_party/llvm/llvm/test/Bitcode/Inputs/invalid-function-argument-type.bc
 third_party/llvm/llvm/test/Bitcode/Inputs/invalid-function-comdat-id.bc
@@ -15616,6 +15729,8 @@ third_party/llvm/llvm/test/Bitcode/drop-debug-info.3.5.ll.bc
 third_party/llvm/llvm/test/Bitcode/function-local-metadata.3.5.ll.bc
 third_party/llvm/llvm/test/Bitcode/global-variables.3.2.ll.bc
 third_party/llvm/llvm/test/Bitcode/highLevelStructure.3.2.ll.bc
+third_party/llvm/llvm/test/Bitcode/invalid-functionptr-align.ll.bc
+third_party/llvm/llvm/test/Bitcode/invalid-type-for-null-constant.ll.bc
 third_party/llvm/llvm/test/Bitcode/invalid.ll.bc
 third_party/llvm/llvm/test/Bitcode/linkage-types-3.2.ll.bc
 third_party/llvm/llvm/test/Bitcode/local-linkage-default-visibility.3.4.ll.bc
@@ -15628,8 +15743,11 @@ third_party/llvm/llvm/test/Bitcode/objectsize-upgrade-7.0.ll.bc
 third_party/llvm/llvm/test/Bitcode/old-aliases.ll.bc
 third_party/llvm/llvm/test/Bitcode/pr18704.ll.bc
 third_party/llvm/llvm/test/Bitcode/standardCIntrinsic.3.2.ll.bc
+third_party/llvm/llvm/test/Bitcode/stream-types.c.opt.bitstream
 third_party/llvm/llvm/test/Bitcode/terminatorInstructions.3.2.ll.bc
 third_party/llvm/llvm/test/Bitcode/thinlto-summary-local-5.0.ll.bc
+third_party/llvm/llvm/test/Bitcode/upgrade-arc-runtime-calls-new.bc
+third_party/llvm/llvm/test/Bitcode/upgrade-arc-runtime-calls.bc
 third_party/llvm/llvm/test/Bitcode/upgrade-clang-arc-use.ll.bc
 third_party/llvm/llvm/test/Bitcode/upgrade-dbg-checksum.ll.bc
 third_party/llvm/llvm/test/Bitcode/upgrade-dbg-value.ll.bc
@@ -15638,6 +15756,7 @@ third_party/llvm/llvm/test/Bitcode/upgrade-global-ctors.ll.bc
 third_party/llvm/llvm/test/Bitcode/upgrade-global-dtors.ll.bc
 third_party/llvm/llvm/test/Bitcode/upgrade-importedentity.ll.bc
 third_party/llvm/llvm/test/Bitcode/upgrade-loop-metadata.ll.bc
+third_party/llvm/llvm/test/Bitcode/upgrade-mrr-runtime-calls.bc
 third_party/llvm/llvm/test/Bitcode/upgrade-objcretainrelease-asm.ll.bc
 third_party/llvm/llvm/test/Bitcode/upgrade-objcretainrelease.ll.bc
 third_party/llvm/llvm/test/Bitcode/upgrade-pointer-address-space.ll.bc
@@ -15722,7 +15841,6 @@ third_party/llvm/llvm/test/Object/Inputs/SVR4.a
 third_party/llvm/llvm/test/Object/Inputs/WASM/invalid-section-order.wasm
 third_party/llvm/llvm/test/Object/Inputs/WASM/missing-version.wasm
 third_party/llvm/llvm/test/Object/Inputs/WASM/string-outside-section.wasm
-third_party/llvm/llvm/test/Object/Inputs/absolute.elf-x86-64
 third_party/llvm/llvm/test/Object/Inputs/archive-test.a-coff-i386
 third_party/llvm/llvm/test/Object/Inputs/archive-test.a-corrupt-symbol-table
 third_party/llvm/llvm/test/Object/Inputs/archive-test.a-irix6-mips64el
@@ -15741,7 +15859,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-reloc-no-sym.x86_64
 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
@@ -15751,7 +15868,6 @@ third_party/llvm/llvm/test/Object/Inputs/invalid-coff-header-too-small
 third_party/llvm/llvm/test/Object/Inputs/invalid-e_shnum.elf
 third_party/llvm/llvm/test/Object/Inputs/invalid-ext-symtab-index.elf-x86-64
 third_party/llvm/llvm/test/Object/Inputs/invalid-phdr.elf
-third_party/llvm/llvm/test/Object/Inputs/invalid-reloc.elf-x86-64
 third_party/llvm/llvm/test/Object/Inputs/invalid-strtab-size.elf
 third_party/llvm/llvm/test/Object/Inputs/liblong_filenames.a
 third_party/llvm/llvm/test/Object/Inputs/libsimple_archive.a
@@ -15937,8 +16053,6 @@ 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/no-start-symbol.elf-x86_64
-third_party/llvm/llvm/test/Object/Inputs/openbsd-phdrs.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
 third_party/llvm/llvm/test/Object/Inputs/pr25877.lib
@@ -15947,19 +16061,16 @@ third_party/llvm/llvm/test/Object/Inputs/program-headers.elf-x86-64
 third_party/llvm/llvm/test/Object/Inputs/program-headers.mips
 third_party/llvm/llvm/test/Object/Inputs/program-headers.mips64
 third_party/llvm/llvm/test/Object/Inputs/rel-no-sec-table.elf-x86-64
-third_party/llvm/llvm/test/Object/Inputs/relocatable-with-section-address.elf-x86-64
 third_party/llvm/llvm/test/Object/Inputs/relocation-dynamic.elf-i386
 third_party/llvm/llvm/test/Object/Inputs/relocation-relocatable.elf-i386
 third_party/llvm/llvm/test/Object/Inputs/relocations.elf-x86-64
 third_party/llvm/llvm/test/Object/Inputs/sectionGroup.elf.x86-64
 third_party/llvm/llvm/test/Object/Inputs/shared-object-test.elf-i386
 third_party/llvm/llvm/test/Object/Inputs/shared-object-test.elf-x86-64
-third_party/llvm/llvm/test/Object/Inputs/shndx.elf
 third_party/llvm/llvm/test/Object/Inputs/stackmap-test.macho-x86-64
 third_party/llvm/llvm/test/Object/Inputs/symtab-only.a
 third_party/llvm/llvm/test/Object/Inputs/thin-path.a
 third_party/llvm/llvm/test/Object/Inputs/thin.a
-third_party/llvm/llvm/test/Object/Inputs/thumb-symbols.elf.arm
 third_party/llvm/llvm/test/Object/Inputs/trivial-executable-test.macho-x86-64
 third_party/llvm/llvm/test/Object/Inputs/trivial-label-test.elf-x86-64
 third_party/llvm/llvm/test/Object/Inputs/trivial-object-test.coff-arm64
@@ -15968,20 +16079,15 @@ third_party/llvm/llvm/test/Object/Inputs/trivial-object-test.coff-i386
 third_party/llvm/llvm/test/Object/Inputs/trivial-object-test.coff-x86-64
 third_party/llvm/llvm/test/Object/Inputs/trivial-object-test.elf-avr
 third_party/llvm/llvm/test/Object/Inputs/trivial-object-test.elf-hexagon
-third_party/llvm/llvm/test/Object/Inputs/trivial-object-test.elf-i386
 third_party/llvm/llvm/test/Object/Inputs/trivial-object-test.elf-mips64el
 third_party/llvm/llvm/test/Object/Inputs/trivial-object-test.elf-mipsel
-third_party/llvm/llvm/test/Object/Inputs/trivial-object-test.elf-x86-64
 third_party/llvm/llvm/test/Object/Inputs/trivial-object-test.macho-arm64_32
 third_party/llvm/llvm/test/Object/Inputs/trivial-object-test.macho-i386
 third_party/llvm/llvm/test/Object/Inputs/trivial-object-test.macho-x86-64
 third_party/llvm/llvm/test/Object/Inputs/trivial-object-test.wasm
-third_party/llvm/llvm/test/Object/Inputs/trivial-object-test2.elf-x86-64
 third_party/llvm/llvm/test/Object/Inputs/trivial-object-test2.macho-x86-64
-third_party/llvm/llvm/test/Object/Inputs/unwind-section.elf-x86-64
 third_party/llvm/llvm/test/Object/Inputs/very_long_bytecode_file_name.bc
 third_party/llvm/llvm/test/Object/Inputs/weak-global-symbol.macho-i386
-third_party/llvm/llvm/test/Object/Inputs/weak.elf-x86-64
 third_party/llvm/llvm/test/Object/Inputs/xpg4.a
 third_party/llvm/llvm/test/Other/Inputs/block-info-only.bc
 third_party/llvm/llvm/test/Other/Inputs/has-block-info.bc
@@ -15995,6 +16101,7 @@ third_party/llvm/llvm/test/Transforms/SampleProfile/Inputs/gcc-simple.afdo
 third_party/llvm/llvm/test/Transforms/SampleProfile/Inputs/indirect-call.afdo
 third_party/llvm/llvm/test/Transforms/SampleProfile/Inputs/indirect-call.compact.afdo
 third_party/llvm/llvm/test/Transforms/SampleProfile/Inputs/inline.compactbinary.afdo
+third_party/llvm/llvm/test/Transforms/SampleProfile/Inputs/inline.extbinary.afdo
 third_party/llvm/llvm/test/Verifier/non-integer-gep-index.ll.bc
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/absolute_sym.macho.i386
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/absolute_sym.macho.i386.o
@@ -16109,6 +16216,10 @@ third_party/llvm/llvm/test/tools/llvm-cov/Inputs/multiple-files2.covmapping
 third_party/llvm/llvm/test/tools/llvm-cov/Inputs/multiple_objects/merged.profdata
 third_party/llvm/llvm/test/tools/llvm-cov/Inputs/multiple_objects/use_1.covmapping
 third_party/llvm/llvm/test/tools/llvm-cov/Inputs/multiple_objects/use_2.covmapping
+third_party/llvm/llvm/test/tools/llvm-cov/Inputs/multiple_objects_not_all_instrumented/instrumented
+third_party/llvm/llvm/test/tools/llvm-cov/Inputs/multiple_objects_not_all_instrumented/instrumented.profdata
+third_party/llvm/llvm/test/tools/llvm-cov/Inputs/multiple_objects_not_all_instrumented/instrumented.raw
+third_party/llvm/llvm/test/tools/llvm-cov/Inputs/multiple_objects_not_all_instrumented/not_instrumented
 third_party/llvm/llvm/test/tools/llvm-cov/Inputs/multithreaded_report/main.covmapping
 third_party/llvm/llvm/test/tools/llvm-cov/Inputs/multithreaded_report/main.profdata
 third_party/llvm/llvm/test/tools/llvm-cov/Inputs/name_whitelist.covmapping
@@ -16210,11 +16321,9 @@ third_party/llvm/llvm/test/tools/llvm-nm/X86/Inputs/macho-bad-zero-nsect-for-N_S
 third_party/llvm/llvm/test/tools/llvm-nm/X86/Inputs/macho-dwarf-x86_64
 third_party/llvm/llvm/test/tools/llvm-nm/X86/Inputs/test.IRobj-x86_64
 third_party/llvm/llvm/test/tools/llvm-objcopy/COFF/Inputs/bigobj.o.gz
-third_party/llvm/llvm/test/tools/llvm-objcopy/ELF/Inputs/alloc-symtab.o
 third_party/llvm/llvm/test/tools/llvm-objcopy/ELF/Inputs/dwarf.dwo
 third_party/llvm/llvm/test/tools/llvm-objcopy/ELF/Inputs/dynamic.so
 third_party/llvm/llvm/test/tools/llvm-objcopy/ELF/Inputs/dynsym.so
-third_party/llvm/llvm/test/tools/llvm-objcopy/ELF/Inputs/groups.o
 third_party/llvm/llvm/test/tools/llvm-objcopy/ELF/Inputs/many-sections.o.gz
 third_party/llvm/llvm/test/tools/llvm-objcopy/ELF/Inputs/partitions.elf
 third_party/llvm/llvm/test/tools/llvm-objcopy/ELF/Inputs/pt-phdr.elf
@@ -16391,7 +16500,6 @@ third_party/llvm/llvm/test/tools/llvm-objdump/X86/Inputs/malformed-machos/mem-cr
 third_party/llvm/llvm/test/tools/llvm-objdump/X86/Inputs/nofirst-symbol.macho-x86_64
 third_party/llvm/llvm/test/tools/llvm-objdump/X86/Inputs/note.macho-x86
 third_party/llvm/llvm/test/tools/llvm-objdump/X86/Inputs/objModInit.macho-x86_64
-third_party/llvm/llvm/test/tools/llvm-objdump/X86/Inputs/openbsd-phdrs.elf-x86-64
 third_party/llvm/llvm/test/tools/llvm-objdump/X86/Inputs/out-of-section-sym.elf-i386
 third_party/llvm/llvm/test/tools/llvm-objdump/X86/Inputs/phdr-note.elf-x86-64
 third_party/llvm/llvm/test/tools/llvm-objdump/X86/Inputs/phdrs.elf-x86-64
@@ -16401,29 +16509,35 @@ third_party/llvm/llvm/test/tools/llvm-objdump/X86/Inputs/stubbed.dylib.macho-x86
 third_party/llvm/llvm/test/tools/llvm-objdump/X86/Inputs/thread.macho-i386
 third_party/llvm/llvm/test/tools/llvm-objdump/X86/Inputs/trivial.obj.elf-i386
 third_party/llvm/llvm/test/tools/llvm-objdump/X86/Inputs/truncated-section.dylib.macho-x86_64
-third_party/llvm/llvm/test/tools/llvm-pdbdump/Inputs/ClassLayoutTest.pdb
-third_party/llvm/llvm/test/tools/llvm-pdbdump/Inputs/ComplexPaddingTest.pdb
-third_party/llvm/llvm/test/tools/llvm-pdbdump/Inputs/FPOTest.pdb
-third_party/llvm/llvm/test/tools/llvm-pdbdump/Inputs/FilterTest.pdb
-third_party/llvm/llvm/test/tools/llvm-pdbdump/Inputs/InjectedSource.pdb
-third_party/llvm/llvm/test/tools/llvm-pdbdump/Inputs/LoadAddressTest.pdb
-third_party/llvm/llvm/test/tools/llvm-pdbdump/Inputs/PrettyFuncDumperTest.pdb
-third_party/llvm/llvm/test/tools/llvm-pdbdump/Inputs/SimplePaddingTest.pdb
-third_party/llvm/llvm/test/tools/llvm-pdbdump/Inputs/Stripped.pdb
-third_party/llvm/llvm/test/tools/llvm-pdbdump/Inputs/TypeQualifiersTest.pdb
-third_party/llvm/llvm/test/tools/llvm-pdbdump/Inputs/TypeServerTest.pdb
-third_party/llvm/llvm/test/tools/llvm-pdbdump/Inputs/UsingNamespaceTest.pdb
-third_party/llvm/llvm/test/tools/llvm-pdbdump/Inputs/tpi.bin
+third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/ClassLayoutTest.pdb
+third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/ComplexPaddingTest.pdb
+third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/FPOTest.pdb
+third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/FilterTest.pdb
+third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/InjectedSource.pdb
+third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/LoadAddressTest.pdb
+third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/PrettyFuncDumperTest.pdb
+third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/SimplePaddingTest.pdb
+third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/Stripped.pdb
+third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/TypeQualifiersTest.pdb
+third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/TypeServerTest.pdb
+third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/UsingNamespaceTest.pdb
+third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/dotnet_contents_compressed.pdb
+third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/dotnet_contents_uncompressed.pdb
+third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/dotnet_hashonly.pdb
+third_party/llvm/llvm/test/tools/llvm-pdbutil/Inputs/tpi.bin
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/c-general.profraw
+third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/compat-sample.profdata
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/compat.profdata.v1
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/compat.profdata.v2
 third_party/llvm/llvm/test/tools/llvm-profdata/Inputs/compat.profdata.v4
 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/malformed-ptr-to-counter-array.profraw
 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
@@ -16449,9 +16563,7 @@ third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/compression.zlib.style.elf-
 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/dtflags.elf-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-exe.x86
 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
@@ -16473,7 +16585,6 @@ 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/magic.coff-unknown
 third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/many-sections-stripped.elf-x86_64
 third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/many-sections.elf-x86_64
 third_party/llvm/llvm/test/tools/llvm-readobj/Inputs/mips-options.elf-mips64el
@@ -16507,14 +16618,11 @@ 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.exe.coff-i386
 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-arm64
 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-lanai
 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
@@ -16523,12 +16631,11 @@ 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/zero-string-table.obj.coff-i386
-third_party/llvm/llvm/test/tools/llvm-size/Inputs/darwin-m.o
-third_party/llvm/llvm/test/tools/llvm-size/Inputs/darwin-m1.o
 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
@@ -16574,7 +16681,6 @@ third_party/llvm/llvm/test/tools/llvm-xray/X86/Inputs/naive-with-arg1-entries.xr
 third_party/llvm/llvm/test/tools/obj2yaml/Inputs/aix_xcoff.o
 third_party/llvm/llvm/test/tools/obj2yaml/Inputs/aix_xcoff_truncated_file_header.o
 third_party/llvm/llvm/test/tools/obj2yaml/Inputs/crt1.o
-third_party/llvm/llvm/test/tools/obj2yaml/Inputs/shn_xindex.o
 third_party/llvm/llvm/test/tools/sancov/Inputs/test-darwin_x86_64
 third_party/llvm/llvm/test/tools/sancov/Inputs/test-linux_android_aarch64
 third_party/llvm/llvm/test/tools/sancov/Inputs/test-linux_x86_64
@@ -16735,6 +16841,7 @@ third_party/protobuf/benchmarks/datasets/google_message1/proto3/dataset.google_m
 third_party/protobuf/benchmarks/datasets/google_message2/dataset.google_message2.pb
 third_party/protobuf/csharp/keys/Google.Protobuf.public.snk
 third_party/protobuf/csharp/keys/Google.Protobuf.snk
+third_party/protobuf/csharp/src/Google.Protobuf.Test/testprotos.pb
 third_party/protobuf/objectivec/Tests/golden_message
 third_party/protobuf/objectivec/Tests/golden_packed_fields_message
 third_party/protobuf/python/compatibility_tests/v2.5.0/tests/google/protobuf/internal/golden_message
@@ -16825,6 +16932,8 @@ 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/msl_constexpr_test.spv
+third_party/spirv-cross/spirv-cross/tests-other/msl_resource_binding.spv
 third_party/sqlite/fuzz/db_corpus/dbfuzz2-seed1.db
 third_party/sqlite/fuzz/db_corpus/fuzzdata1.db
 third_party/sqlite/fuzz/db_corpus/fuzzdata2.db
@@ -18242,6 +18351,31 @@ tools/skia_goldctl/goldctl
 tools/swarming_client/tests/archive.tar
 tools/win/ChromeDebug/ChromeDebug/Key.snk
 tools/win/ChromeDebug/LowLevel/Key.snk
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/alert_modal.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/alert_nonmodal.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/button.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/check_off.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/check_on.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/editable_text.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/invalid_keypress.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/link.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/list_item.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/listbox.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/long_desc.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/math.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/object_close.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/object_enter.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/object_exit.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/object_open.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/object_select.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/page_finish_loading.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/page_start_loading.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/recover_focus.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/selection.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/selection_reverse.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/skip.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/wrap.ogg
+ui/accessibility/extensions/chromevoxclassic/chromevox/background/earcons/wrap_edge.ogg
 ui/accessibility/fuzz_corpus/ax_table_fuzzer_seed.bin
 ui/display/util/fuzz_corpus/eve
 ui/display/util/fuzz_corpus/hpz32x
@@ -18256,9 +18390,12 @@ v8/third_party/wasm-api/example/callback.wasm
 v8/third_party/wasm-api/example/finalize.wasm
 v8/third_party/wasm-api/example/global.wasm
 v8/third_party/wasm-api/example/hello.wasm
+v8/third_party/wasm-api/example/hostref.wasm
 v8/third_party/wasm-api/example/memory.wasm
+v8/third_party/wasm-api/example/multi.wasm
 v8/third_party/wasm-api/example/reflect.wasm
 v8/third_party/wasm-api/example/serialize.wasm
+v8/third_party/wasm-api/example/start.wasm
 v8/third_party/wasm-api/example/table.wasm
 v8/third_party/wasm-api/example/threads.wasm
 v8/third_party/wasm-api/example/trap.wasm