Upgrade to Chromium 84.0.4147.89

`enable-checkbox-external-protocol.patch` is no longer needed
2026-04-14 00:14:20 +09:00 · 2020-07-15 01:25:09 -04:00
parent d089bbc9b6
commit 70032a229e
57 changed files with 1164 additions and 1024 deletions
--- a/chromium_version.txt
+++ b/chromium_version.txt
@@ -1 +1 @@
-83.0.4103.116
+84.0.4147.89
--- 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
@@ -10,47 +10,47 @@ Subject: Disable fetching of all field trials

 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -138,9 +138,7 @@ public abstract class ChromeFeatureList
+@@ -122,9 +122,7 @@ public abstract class ChromeFeatureList
      *   the specified parameter does not exist.
      */
     public static String getFieldTrialParamByFeature(String featureName, String paramName) {
 -        if (FeatureList.hasTestFeatures()) return "";
-        assert isInitialized();
+-        assert FeatureList.isInitialized();
 -        return ChromeFeatureListJni.get().getFieldTrialParamByFeature(featureName, paramName);
 +        return "";
     }
 
     /**
-@@ -157,10 +155,7 @@ public abstract class ChromeFeatureList
+@@ -141,10 +139,7 @@ public abstract class ChromeFeatureList
      */
     public static int getFieldTrialParamByFeatureAsInt(
             String featureName, String paramName, int defaultValue) {
 -        if (FeatureList.hasTestFeatures()) return defaultValue;
-        assert isInitialized();
+-        assert FeatureList.isInitialized();
 -        return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsInt(
 -                featureName, paramName, defaultValue);
 +        return defaultValue;
     }
 
     /**
-@@ -177,10 +172,7 @@ public abstract class ChromeFeatureList
+@@ -161,10 +156,7 @@ public abstract class ChromeFeatureList
      */
     public static double getFieldTrialParamByFeatureAsDouble(
             String featureName, String paramName, double defaultValue) {
 -        if (FeatureList.hasTestFeatures()) return defaultValue;
-        assert isInitialized();
+-        assert FeatureList.isInitialized();
 -        return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsDouble(
 -                featureName, paramName, defaultValue);
 +        return defaultValue;
     }
 
     /**
-@@ -197,10 +189,7 @@ public abstract class ChromeFeatureList
+@@ -181,10 +173,7 @@ public abstract class ChromeFeatureList
      */
     public static boolean getFieldTrialParamByFeatureAsBoolean(
             String featureName, String paramName, boolean defaultValue) {
 -        if (FeatureList.hasTestFeatures()) return defaultValue;
-        assert isInitialized();
+-        assert FeatureList.isInitialized();
 -        return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsBoolean(
 -                featureName, paramName, defaultValue);
 +        return defaultValue;
--- a/patches/core/debian/disable/unrar.patch
+++ b/patches/core/debian/disable/unrar.patch
@@ -4,7 +4,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
-@@ -93,7 +93,7 @@ void FileAnalyzer::Start(const base::Fil
+@@ -87,7 +87,7 @@ void FileAnalyzer::Start(const base::Fil
   if (inspection_type == DownloadFileType::ZIP) {
     StartExtractZipFeatures();
   } else if (inspection_type == DownloadFileType::RAR) {
@@ -15,7 +15,7 @@ bug: http://bugs.debian.org/914487
     StartExtractDmgFeatures();
 --- a/chrome/common/safe_browsing/BUILD.gn
 +++ b/chrome/common/safe_browsing/BUILD.gn
-@@ -57,39 +57,6 @@ if (safe_browsing_mode == 1) {
+@@ -54,39 +54,6 @@ if (safe_browsing_mode == 1) {
     public_deps = [ "//components/safe_browsing/core:csd_proto" ]
   }
 
@@ -55,7 +55,7 @@ bug: http://bugs.debian.org/914487
   source_set("disk_image_type_sniffer_mac") {
     sources = [
       "disk_image_type_sniffer_mac.cc",
-@@ -156,7 +123,6 @@ source_set("safe_browsing") {
+@@ -153,7 +120,6 @@ source_set("safe_browsing") {
       ":archive_analyzer_results",
       ":binary_feature_extractor",
       ":download_type_util",
--- 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/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -3180,8 +3180,6 @@ jumbo_static_library("browser") {
+@@ -3187,8 +3187,6 @@ static_library("browser") {
       "download/download_commands.h",
       "download/download_crx_util.cc",
       "download/download_crx_util.h",
@@ -22,28 +22,12 @@
 namespace subresource_filter {
 class RulesetService;
 }
-@@ -107,10 +103,6 @@ class ResourceCoordinatorParts;
- class TabManager;
- }
- 
-namespace safe_browsing {
-class ClientSideDetectionService;
-}
-
- // NOT THREAD SAFE, call only from the main thread.
- // These functions shouldn't return NULL unless otherwise noted.
- class BrowserProcess {
-@@ -211,14 +203,6 @@ class BrowserProcess {
+@@ -207,9 +203,6 @@ class BrowserProcess {
   // on this platform (or this is a unit test).
   virtual StatusTray* status_tray() = 0;
 
 -  // Returns the SafeBrowsing service.
 -  virtual safe_browsing::SafeBrowsingService* safe_browsing_service() = 0;
-
-  // Returns an object which handles communication with the SafeBrowsing
-  // client-side detection servers.
-  virtual safe_browsing::ClientSideDetectionService*
-      safe_browsing_detection_service() = 0;
 -
   // Returns the service providing versioned storage for rules used by the Safe
   // Browsing subresource filter.
@@ -58,7 +42,7 @@
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/site_isolation/prefs_observer.h"
 #include "chrome/browser/ssl/secure_origin_prefs_observer.h"
-@@ -373,8 +372,6 @@ void BrowserProcessImpl::StartTearDown()
+@@ -374,8 +373,6 @@ void BrowserProcessImpl::StartTearDown()
 
   metrics_services_manager_.reset();
   intranet_redirect_detector_.reset();
@@ -67,7 +51,7 @@
   network_time_tracker_.reset();
 #if BUILDFLAG(ENABLE_PLUGINS)
   plugins_resource_service_.reset();
-@@ -988,22 +985,6 @@ StatusTray* BrowserProcessImpl::status_t
+@@ -989,14 +986,6 @@ StatusTray* BrowserProcessImpl::status_t
   return status_tray_.get();
 }
 
@@ -78,19 +62,11 @@
 -    CreateSafeBrowsingService();
 -  return safe_browsing_service_.get();
 -}
-
-safe_browsing::ClientSideDetectionService*
-    BrowserProcessImpl::safe_browsing_detection_service() {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  if (safe_browsing_service())
-    return safe_browsing_service()->safe_browsing_detection_service();
-  return NULL;
-}
 -
 subresource_filter::RulesetService*
 BrowserProcessImpl::subresource_filter_ruleset_service() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -1256,26 +1237,6 @@ void BrowserProcessImpl::CreateBackgroun
+@@ -1255,26 +1244,6 @@ void BrowserProcessImpl::CreateBackgroun
 #endif
 }
 
@@ -119,17 +95,15 @@
   created_subresource_filter_ruleset_service_ = true;
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
-@@ -169,9 +169,6 @@ class BrowserProcessImpl : public Browse
+@@ -168,7 +168,6 @@ class BrowserProcessImpl : public Browse
   void set_background_mode_manager_for_test(
       std::unique_ptr<BackgroundModeManager> manager) override;
   StatusTray* status_tray() override;
 -  safe_browsing::SafeBrowsingService* safe_browsing_service() override;
-  safe_browsing::ClientSideDetectionService* safe_browsing_detection_service()
-      override;
   subresource_filter::RulesetService* subresource_filter_ruleset_service()
       override;
   optimization_guide::OptimizationGuideService* optimization_guide_service()
-@@ -315,9 +312,6 @@ class BrowserProcessImpl : public Browse
+@@ -312,9 +311,6 @@ class BrowserProcessImpl : public Browse
   std::unique_ptr<BackgroundModeManager> background_mode_manager_;
 #endif
 
@@ -141,7 +115,7 @@
       subresource_filter_ruleset_service_;
 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-@@ -62,7 +62,6 @@
+@@ -63,7 +63,6 @@
 #include "chrome/browser/previews/previews_service.h"
 #include "chrome/browser/previews/previews_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ -149,7 +123,7 @@
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/find_bar/find_bar_state.h"
 #include "chrome/browser/ui/find_bar/find_bar_state_factory.h"
-@@ -649,36 +648,6 @@ void ChromeBrowsingDataRemoverDelegate::
+@@ -653,36 +652,6 @@ void ChromeBrowsingDataRemoverDelegate::
         ContentSettingsType::CLIENT_HINTS, base::Time(), base::Time::Max(),
         website_settings_filter);
 
@@ -188,7 +162,7 @@
 
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -843,30 +843,6 @@ void SetApplicationLocaleOnIOThread(cons
+@@ -855,30 +855,6 @@ void SetApplicationLocaleOnIOThread(cons
   GetIOThreadApplicationLocale() = locale;
 }
 
@@ -216,10 +190,10 @@
 -  DISALLOW_COPY_AND_ASSIGN(CertificateReportingServiceCertReporter);
 -};
 -
- #if defined(OS_ANDROID)
- float GetDeviceScaleAdjustment() {
-   static const float kMinFSM = 1.05f;
-@@ -1296,7 +1272,6 @@ void ChromeContentBrowserClient::PostAft
+ #if BUILDFLAG(ENABLE_EXTENSIONS)
+ 
+ AppLoadedInTabSource ClassifyAppLoadedInTabSource(
+@@ -1377,7 +1353,6 @@ void ChromeContentBrowserClient::PostAft
   InitNetworkContextsParentDirectory();
 
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -227,16 +201,17 @@
 }
 
 bool ChromeContentBrowserClient::IsBrowserStartupComplete() {
-@@ -2089,7 +2064,7 @@ void ChromeContentBrowserClient::AppendE
+@@ -2193,8 +2168,7 @@ void ChromeContentBrowserClient::AppendE
       // Disable client-side phishing detection in the renderer if it is
-       // disabled in the Profile preferences or the browser process.
+       // disabled in the Profile preferences, or by command line flag.
       if (!safe_browsing::IsSafeBrowsingEnabled(*prefs) ||
-          !g_browser_process->safe_browsing_detection_service()) {
+-          !safe_browsing::ClientSideDetectionServiceFactory::GetForProfile(
+-              profile)) {
 +          true) {
         command_line->AppendSwitch(
             switches::kDisableClientSidePhishingDetection);
       }
-@@ -3956,7 +3931,7 @@ ChromeContentBrowserClient::CreateThrott
+@@ -4012,7 +3986,7 @@ ChromeContentBrowserClient::CreateThrott
       base::BindRepeating(&MaybeTriggerSecurityInterstitialShownEvent));
   throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
       handle,
@@ -245,19 +220,16 @@
       base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp)));
 
   throttles.push_back(std::make_unique<LoginNavigationThrottle>(handle));
-@@ -3977,12 +3952,6 @@ ChromeContentBrowserClient::CreateThrott
-       GooglePasswordManagerNavigationThrottle::MaybeCreateThrottleFor(handle));
+@@ -4033,9 +4007,6 @@ ChromeContentBrowserClient::CreateThrott
+       &throttles);
 #endif
 
-  if (base::FeatureList::IsEnabled(safe_browsing::kCommittedSBInterstitials)) {
-    throttles.push_back(
-        std::make_unique<safe_browsing::SafeBrowsingNavigationThrottle>(
-            handle));
-  }
+-  throttles.push_back(
+-      std::make_unique<safe_browsing::SafeBrowsingNavigationThrottle>(handle));
 -
- #if defined(OS_WIN) || defined(OS_MACOSX) || \
-     (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-   MaybeAddThrottle(&throttles,
+   if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) {
+     throttles.push_back(
+         std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
 --- a/chrome/browser/component_updater/file_type_policies_component_installer.cc
 +++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc
@@ -39,20 +39,6 @@ const uint8_t kFileTypePoliciesPublicKey
@@ -297,7 +269,7 @@
 }
 
 #if defined(OS_ANDROID)
-@@ -639,16 +632,6 @@ void ChromeDownloadManagerDelegate::Choo
+@@ -656,16 +649,6 @@ void ChromeDownloadManagerDelegate::Choo
 
 void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
     base::FilePath* filename) {
@@ -351,7 +323,7 @@
   DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
   data->danger_level_ = danger_level;
 }
-@@ -563,9 +563,6 @@ bool DownloadItemModel::IsCommandEnabled
+@@ -567,9 +567,6 @@ bool DownloadItemModel::IsCommandEnabled
       // filename. Don't base an "Always open" decision based on it. Also
       // exclude extensions.
       return download_->CanOpenDownload() &&
@@ -363,7 +335,7 @@
       return !download_->IsSavePackageDownload() &&
 --- a/chrome/browser/download/download_prefs.cc
 +++ b/chrome/browser/download/download_prefs.cc
-@@ -228,14 +228,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
+@@ -256,14 +256,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
         base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) +
         extension);
 
@@ -373,14 +345,14 @@
 -    // permanently as a result.
 -    if (FileTypePolicies::GetInstance()->IsAllowedToOpenAutomatically(
 -            filename_with_extension)) {
-      auto_open_.insert(extension);
+-      auto_open_by_user_.insert(extension);
 -    }
-+    auto_open_.insert(extension);
+    auto_open_by_user_.insert(extension);
   }
 }
 
-@@ -387,10 +380,6 @@ bool DownloadPrefs::IsAutoOpenEnabledBas
- bool DownloadPrefs::EnableAutoOpenBasedOnExtension(
+@@ -431,10 +424,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
+ bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension(
     const base::FilePath& file_name) {
   base::FilePath::StringType extension = file_name.Extension();
 -  if (!FileTypePolicies::GetInstance()->IsAllowedToOpenAutomatically(
@@ -447,7 +419,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"
-@@ -1330,9 +1329,6 @@ DownloadsAcceptDangerFunction::Downloads
+@@ -1332,9 +1331,6 @@ DownloadsAcceptDangerFunction::Downloads
 
 DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
 
@@ -457,7 +429,7 @@
 ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
   std::unique_ptr<downloads::AcceptDanger::Params> params(
       downloads::AcceptDanger::Params::Create(*args_));
-@@ -1370,43 +1366,7 @@ void DownloadsAcceptDangerFunction::Prom
+@@ -1372,43 +1368,7 @@ void DownloadsAcceptDangerFunction::Prom
     return;
   }
   RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -484,7 +456,7 @@
 -  if (InvalidId(download_item, &error) ||
 -      Fault(download_item->GetState() != DownloadItem::IN_PROGRESS,
 -            download_extension_errors::kNotInProgress, &error)) {
-    Respond(Error(error));
+-    Respond(Error(std::move(error)));
 -    return;
 -  }
 -  switch (action) {
@@ -580,7 +552,7 @@
           referrer_entries)));
 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
-@@ -998,51 +998,9 @@ WebstorePrivateGetReferrerChainFunction:
+@@ -1028,51 +1028,9 @@ WebstorePrivateGetReferrerChainFunction:
 
 ExtensionFunction::ResponseAction
 WebstorePrivateGetReferrerChainFunction::Run() {
@@ -710,7 +682,7 @@
   // SimpleURLLoader -> (owned loader, extension id).
 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc
 +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -737,9 +737,6 @@ void ChromeMetricsServiceClient::Registe
+@@ -738,9 +738,6 @@ void ChromeMetricsServiceClient::Registe
   metrics_service_->RegisterMetricsProvider(
       std::make_unique<HttpsEngagementMetricsProvider>());
 
@@ -734,7 +706,7 @@
 // static
 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -226,7 +226,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -236,7 +236,6 @@ void ChromeBrowserMainExtraPartsProfiles
 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
   CaptivePortalServiceFactory::GetInstance();
 #endif
@@ -744,7 +716,7 @@
   ClientHintsFactory::GetInstance();
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -91,7 +91,6 @@
+@@ -92,7 +92,6 @@
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/push_messaging/push_messaging_service_factory.h"
 #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
@@ -752,7 +724,7 @@
 #include "chrome/browser/sharing/sharing_service_factory.h"
 #include "chrome/browser/signin/identity_manager_factory.h"
 #include "chrome/browser/signin/signin_ui_util.h"
-@@ -585,17 +584,6 @@ void ProfileImpl::LoadPrefsForNormalStar
+@@ -589,17 +588,6 @@ void ProfileImpl::LoadPrefsForNormalStar
 
   mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
       pref_validation_delegate;
@@ -784,15 +756,15 @@
   if (!profile)
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
-@@ -7,6 +7,7 @@ import("//components/safe_browsing/build
+@@ -6,6 +6,7 @@ import("//components/safe_browsing/build
 import("//extensions/buildflags/buildflags.gni")
 
- jumbo_static_library("safe_browsing") {
+ static_library("safe_browsing") {
 +  if (false) {
   sources = [
     "chrome_controller_client.cc",
     "chrome_controller_client.h",
-@@ -62,6 +63,7 @@ jumbo_static_library("safe_browsing") {
+@@ -61,6 +62,7 @@ static_library("safe_browsing") {
     ]
     deps += [ "//extensions/browser" ]
   }
@@ -802,7 +774,7 @@
     # "Safe Browsing Basic" files used for safe browsing in full mode
 --- a/chrome/browser/ssl/security_state_tab_helper.cc
 +++ b/chrome/browser/ssl/security_state_tab_helper.cc
-@@ -250,92 +250,6 @@ bool SecurityStateTabHelper::UsedPolicyI
+@@ -266,92 +266,6 @@ bool SecurityStateTabHelper::UsedPolicyI
 
 security_state::MaliciousContentStatus
 SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -919,7 +891,7 @@
 void ChromeSubresourceFilterClient::OnReloadRequested() {
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -2903,7 +2903,6 @@ jumbo_static_library("ui") {
+@@ -2960,7 +2960,6 @@ static_library("ui") {
       "views/device_chooser_content_view.h",
       "views/devtools_process_observer.cc",
       "views/devtools_process_observer.h",
@@ -929,7 +901,7 @@
       "views/download/download_item_view.cc",
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -290,10 +290,6 @@ void TabHelpers::AttachTabHelpers(WebCon
+@@ -300,10 +300,6 @@ void TabHelpers::AttachTabHelpers(WebCon
   resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
       web_contents);
   ResourceLoadingHintsWebContentsObserver::CreateForWebContents(web_contents);
@@ -940,7 +912,7 @@
   ReputationWebContentsObserver::CreateForWebContents(web_contents);
   SearchEngineTabHelper::CreateForWebContents(web_contents);
   SecurityStateTabHelper::CreateForWebContents(web_contents);
-@@ -356,7 +352,6 @@ void TabHelpers::AttachTabHelpers(WebCon
+@@ -371,7 +367,6 @@ void TabHelpers::AttachTabHelpers(WebCon
   pdf::PDFWebContentsHelper::CreateForWebContentsWithClient(
       web_contents, std::make_unique<ChromePDFWebContentsHelperClient>());
   SadTabHelper::CreateForWebContents(web_contents);
@@ -1171,7 +1143,7 @@
 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
 std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
     content::WebContents* web_contents) {
-@@ -493,8 +386,6 @@ void InterstitialHTMLSource::StartDataRe
+@@ -494,8 +387,6 @@ void InterstitialHTMLSource::StartDataRe
     interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
   } else if (path_without_query == "/legacy-tls") {
     interstitial_delegate = CreateLegacyTLSBlockingPage(web_contents);
@@ -1180,7 +1152,7 @@
   } else if (path_without_query == "/clock") {
     interstitial_delegate = CreateBadClockBlockingPage(web_contents);
   } else if (path_without_query == "/lookalike") {
-@@ -507,16 +398,12 @@ void InterstitialHTMLSource::StartDataRe
+@@ -508,16 +399,12 @@ void InterstitialHTMLSource::StartDataRe
     interstitial_delegate = CreateOriginPolicyInterstitialPage(web_contents);
   }
 
@@ -1202,7 +1174,7 @@
     html = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
-@@ -87,7 +87,6 @@
+@@ -88,7 +88,6 @@
 #include "components/paint_preview/buildflags/buildflags.h"
 #include "components/pdf/renderer/pepper_pdf_host.h"
 #include "components/safe_browsing/buildflags.h"
--- 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
-@@ -830,95 +830,6 @@ AutofillDownloadManager::GetRequestURLAn
+@@ -833,94 +833,6 @@ AutofillDownloadManager::GetRequestURLAn
 }
 
 bool AutofillDownloadManager::StartRequest(FormRequestData request_data) {
@@ -33,8 +33,7 @@
 -  // to the network request.
 -#if !defined(OS_IOS)
 -  resource_request->trusted_params = network::ResourceRequest::TrustedParams();
-  resource_request->trusted_params->network_isolation_key =
-      driver_->NetworkIsolationKey();
+-  resource_request->trusted_params->isolation_info = driver_->IsolationInfo();
 -#endif
 -
 -  // Add Chrome experiment state to the request headers.
--- a/patches/core/inox-patchset/0005-disable-default-extensions.patch
+++ b/patches/core/inox-patchset/0005-disable-default-extensions.patch
@@ -22,7 +22,7 @@
 }
 
 #if defined(OS_CHROMEOS)
-@@ -455,11 +450,6 @@ void ComponentLoader::AddDefaultComponen
+@@ -449,11 +444,6 @@ void ComponentLoader::AddDefaultComponen
   AddKeyboardApp();
 #else  // defined(OS_CHROMEOS)
   DCHECK(!skip_session_components);
@@ -34,7 +34,7 @@
 #endif  // defined(OS_CHROMEOS)
 
   if (!skip_session_components) {
-@@ -533,13 +523,6 @@ void ComponentLoader::AddDefaultComponen
+@@ -527,13 +517,6 @@ void ComponentLoader::AddDefaultComponen
     AddHangoutServicesExtension();
 #endif  // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
 
--- a/patches/core/inox-patchset/0014-disable-translation-lang-fetch.patch
+++ b/patches/core/inox-patchset/0014-disable-translation-lang-fetch.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
 +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
-@@ -161,7 +161,6 @@ void SpellcheckHunspellDictionary::Retry
+@@ -162,7 +162,6 @@ void SpellcheckHunspellDictionary::Retry
     return;
   }
   browser_context_ = browser_context;
@@ -8,7 +8,7 @@
 }
 
 bool SpellcheckHunspellDictionary::IsReady() const {
-@@ -399,9 +398,6 @@ void SpellcheckHunspellDictionary::Initi
+@@ -400,9 +399,6 @@ void SpellcheckHunspellDictionary::Initi
     }
 
     if (browser_context_) {
@@ -20,7 +20,7 @@
   }
 --- a/components/translate/core/browser/translate_language_list.cc
 +++ b/components/translate/core/browser/translate_language_list.cc
-@@ -207,6 +207,8 @@ GURL TranslateLanguageList::TranslateLan
+@@ -208,6 +208,8 @@ GURL TranslateLanguageList::TranslateLan
 }
 
 void TranslateLanguageList::RequestLanguageList() {
--- a/patches/core/inox-patchset/0015-disable-update-pings.patch
+++ b/patches/core/inox-patchset/0015-disable-update-pings.patch
@@ -1,10 +1,10 @@
 --- a/chrome/updater/configurator.cc
 +++ b/chrome/updater/configurator.cc
-@@ -60,7 +60,7 @@ int Configurator::UpdateDelay() const {
+@@ -61,7 +61,7 @@ int Configurator::UpdateDelay() const {
 }
 
 std::vector<GURL> Configurator::UpdateUrl() const {
-  return std::vector<GURL>{GURL(kUpdaterJSONDefaultUrl)};
+-  return external_constants_->UpdateURL();
 +  return std::vector<GURL>;
 }
 
--- 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
@@ -106,7 +106,7 @@ by default.
       content::BrowserContext::GetDefaultStoragePartition(
 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
 +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
-@@ -83,7 +83,7 @@ namespace {
+@@ -84,7 +84,7 @@ namespace {
 
 using api::file_manager_private::ProfileInfo;
 
@@ -159,7 +159,7 @@ by default.
 // elements of |list| equals |hash|.
 --- a/chrome/browser/extensions/install_signer.cc
 +++ b/chrome/browser/extensions/install_signer.cc
-@@ -66,7 +66,7 @@ const int kSignatureFormatVersion = 2;
+@@ -65,7 +65,7 @@ const int kSignatureFormatVersion = 2;
 const size_t kSaltBytes = 32;
 
 const char kBackendUrl[] =
@@ -190,20 +190,6 @@ by default.
 }
 
 ProfileAvatarDownloader::ProfileAvatarDownloader(size_t icon_index,
--- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/prefs.js
-+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/prefs.js
-@@ -218,9 +218,9 @@ ChromeVoxPrefs.DEFAULT_PREFS = {
-   'position': '{}',
-   'siteSpecificEnhancements': true,
-   'siteSpecificScriptBase':
-      'https://ssl.gstatic.com/accessibility/javascript/ext/',
-+      'trk:152:https://ssl.gstatic.com/accessibility/javascript/ext/',
-   'siteSpecificScriptLoader':
-      'https://ssl.gstatic.com/accessibility/javascript/ext/loader.js',
-+      'trk:153:https://ssl.gstatic.com/accessibility/javascript/ext/loader.js',
-   'speakTextUnderMouse': false,
-   'sticky': false,
-   'typingEcho': 0,
 --- a/chrome/browser/resources/default_apps/external_extensions.json
 +++ b/chrome/browser/resources/default_apps/external_extensions.json
@@ -24,15 +24,15 @@
@@ -227,7 +213,7 @@ by default.
 
 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc
 +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
-@@ -56,7 +56,7 @@ const int ClientSideDetectionService::kN
+@@ -57,7 +57,7 @@ const int ClientSideDetectionService::kN
 const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30;
 
 const char ClientSideDetectionService::kClientReportPhishingUrl[] =
@@ -249,7 +235,7 @@ by default.
 DownloadFeedbackFactory* DownloadFeedback::factory_ = nullptr;
 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
 +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
-@@ -254,7 +254,7 @@ GURL SpellcheckHunspellDictionary::GetDi
+@@ -255,7 +255,7 @@ GURL SpellcheckHunspellDictionary::GetDi
   DCHECK(!bdict_file.empty());
 
   static const char kDownloadServerUrl[] =
@@ -260,7 +246,7 @@ by default.
               base::ToLowerASCII(bdict_file));
 --- a/chrome/browser/supervised_user/supervised_user_service.cc
 +++ b/chrome/browser/supervised_user/supervised_user_service.cc
-@@ -86,7 +86,7 @@ namespace {
+@@ -85,7 +85,7 @@ namespace {
 
 // The URL from which to download a host blacklist if no local one exists yet.
 const char kBlacklistURL[] =
@@ -293,7 +279,7 @@ by default.
 // The maximum number of ignored bubble we track in the NumLaterPerReinstall
 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
 +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
-@@ -79,17 +79,17 @@ namespace {
+@@ -80,17 +80,17 @@ namespace {
 // The URL for the the Learn More page shown on incognito new tab.
 const char kLearnMoreIncognitoUrl[] =
 #if defined(OS_CHROMEOS)
@@ -420,17 +406,6 @@ by default.
 
 }
 
--- a/components/crash/core/app/breakpad_linux.cc
-+++ b/components/crash/core/app/breakpad_linux.cc
-@@ -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
-const char kUploadURL[] = "https://clients2.google.com/cr/report";
-+const char kUploadURL[] = "trk:06:https://clients2.google.com/cr/report";
- #endif
- 
- bool g_is_crash_reporter_enabled = false;
 --- a/components/drive/service/drive_api_service.cc
 +++ b/components/drive/service/drive_api_service.cc
@@ -74,10 +74,10 @@ namespace drive {
@@ -511,7 +486,7 @@ by default.
 
 --- a/components/password_manager/core/browser/password_store.cc
 +++ b/components/password_manager/core/browser/password_store.cc
-@@ -258,10 +258,10 @@ void PasswordStore::GetLogins(const Form
+@@ -254,10 +254,10 @@ void PasswordStore::GetLogins(const Form
   // TODO(mdm): actually delete them at some point, say M24 or so.
   base::Time cutoff;  // the null time
   if (form.scheme == PasswordForm::Scheme::kHtml &&
@@ -539,7 +514,7 @@ by default.
 
 --- a/components/policy/resources/policy_templates.json
 +++ b/components/policy/resources/policy_templates.json
-@@ -4042,7 +4042,7 @@
+@@ -4281,7 +4281,7 @@
         'dynamic_refresh': True,
         'per_profile': True,
       },
@@ -548,7 +523,7 @@ by default.
       'id': 34,
       'caption': '''Configure the list of force-installed apps and extensions''',
       'tags': ['full-admin-access'],
-@@ -8495,7 +8495,7 @@
+@@ -8807,7 +8807,7 @@
       'features': {
         'dynamic_refresh': True,
       },
@@ -609,8 +584,8 @@ by default.
 -const char kSecurityOrigin[] = "https://translate.googleapis.com/";
 +const char kSecurityOrigin[] = "trk:220:https://translate.googleapis.com/";
 
- GURL GetTranslateSecurityOrigin() {
-   std::string security_origin(kSecurityOrigin);
+ const base::Feature kTranslateSubFrames{"TranslateSubFrames",
+                                         base::FEATURE_DISABLED_BY_DEFAULT};
 --- a/components/variations/variations_url_constants.cc
 +++ b/components/variations/variations_url_constants.cc
@@ -8,7 +8,7 @@ namespace variations {
@@ -635,7 +610,7 @@ by default.
 
 --- a/content/shell/browser/shell_browser_main_parts.cc
 +++ b/content/shell/browser/shell_browser_main_parts.cc
-@@ -71,7 +71,7 @@ GURL GetStartupURL() {
+@@ -81,7 +81,7 @@ GURL GetStartupURL() {
 #else
   const base::CommandLine::StringVector& args = command_line->GetArgs();
   if (args.empty())
@@ -654,10 +629,10 @@ by default.
 +    "trk:182:http://www.google.com/update2/response";
 
 void ReportError(ParseUpdateManifestCallback callback,
-                  const std::string& error) {
+                  const ManifestParseFailure& failure) {
 --- a/extensions/common/extension_urls.cc
 +++ b/extensions/common/extension_urls.cc
-@@ -32,7 +32,7 @@ namespace extension_urls {
+@@ -28,7 +28,7 @@ namespace extension_urls {
 
 const char kChromeWebstoreBaseURL[] = "https://chrome.google.com/webstore";
 const char kChromeWebstoreUpdateURL[] =
@@ -737,8 +712,8 @@ by default.
 -const char kClearCutOAuth2Scope[] = "https://www.googleapis.com/auth/cclog";
 +const char kClearCutOAuth2Scope[] = "trk:280:https://www.googleapis.com/auth/cclog";
 
- // Used to mint uber auth tokens when needed.
- const char kGaiaSid[] = "sid";
+ // OAuth scope for FCM, the Firebase Cloud Messaging service.
+ const char kFCMOAuthScope[] =
 --- a/google_apis/gcm/engine/gservices_settings.cc
 +++ b/google_apis/gcm/engine/gservices_settings.cc
@@ -29,18 +29,18 @@ const char kRegistrationURLKey[] = "gcm_
@@ -796,9 +771,37 @@ by default.
 
 const char kWebrtcTransportNamespace[] = "google:remoting:webrtc";
 
+--- a/ui/accessibility/extensions/chromevoxclassic/chromevox/background/prefs.js
+++ b/ui/accessibility/extensions/chromevoxclassic/chromevox/background/prefs.js
+@@ -72,9 +72,9 @@ cvox.ChromeVoxPrefs.DEFAULT_PREFS = {
+   'outputContextFirst': false,
+   'position': '{}',
+   'siteSpecificScriptBase':
+-      'https://ssl.gstatic.com/accessibility/javascript/ext/',
+      'trk:152:https://ssl.gstatic.com/accessibility/javascript/ext/',
+   'siteSpecificScriptLoader':
+-      'https://ssl.gstatic.com/accessibility/javascript/ext/loader.js',
+      'trk:153:https://ssl.gstatic.com/accessibility/javascript/ext/loader.js',
+   'sticky': false,
+   'typingEcho': 0,
+   'useIBeamCursor': cvox.ChromeVox.isMac,
+--- a/ui/accessibility/extensions/chromevoxclassic/host/chrome/host.js
+++ b/ui/accessibility/extensions/chromevoxclassic/host/chrome/host.js
+@@ -96,9 +96,9 @@ cvox.ChromeHost.prototype.init = functio
+           (!cvox.ApiImplementation.siteSpecificScriptLoader ||
+            !cvox.ApiImplementation.siteSpecificScriptBase);
+       cvox.ApiImplementation.siteSpecificScriptLoader =
+-          'https://ssl.gstatic.com/accessibility/javascript/ext/loader.js';
+          'trk:154:https://ssl.gstatic.com/accessibility/javascript/ext/loader.js';
+       cvox.ApiImplementation.siteSpecificScriptBase =
+-          'https://ssl.gstatic.com/accessibility/javascript/ext/';
+          'trk:155:https://ssl.gstatic.com/accessibility/javascript/ext/';
+       if (apiPrefsChanged) {
+         var searchInit = prefs['siteSpecificEnhancements'] === 'true' ?
+             cvox.SearchLoader.init :
 --- a/ui/views/examples/webview_example.cc
 +++ b/ui/views/examples/webview_example.cc
-@@ -27,7 +27,7 @@ void WebViewExample::CreateExampleView(V
+@@ -29,7 +29,7 @@ void WebViewExample::CreateExampleView(V
   container->SetLayoutManager(std::make_unique<FillLayout>());
   container->AddChildView(webview_);
 
--- a/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch
+++ b/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch
@@ -42,7 +42,7 @@ the URL so we get notified if this happens again in the future).
 IncidentReportingService::IncidentReportingService(
 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
 +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
-@@ -64,8 +64,7 @@ class SafeBrowsingBlockingPageFactoryImp
+@@ -63,8 +63,7 @@ class SafeBrowsingBlockingPageFactoryImp
     PrefService* prefs =
         Profile::FromBrowserContext(web_contents->GetBrowserContext())
             ->GetPrefs();
@@ -54,7 +54,7 @@ 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
-@@ -249,7 +249,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
+@@ -248,7 +248,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
 }
 
 void SafeBrowsingService::RegisterAllDelayedAnalysis() {
--- 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
-@@ -221,99 +221,8 @@ void ClientSideDetectionService::StartCl
+@@ -239,99 +239,8 @@ void ClientSideDetectionService::StartCl
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   std::unique_ptr<ClientPhishingRequest> request(verdict);
 
--- a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
+++ b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
@@ -13,14 +13,14 @@
     return metrics::OmniboxInputType::URL;
 --- a/chrome/browser/history/history_utils.cc
 +++ b/chrome/browser/history/history_utils.cc
-@@ -22,6 +22,7 @@ bool CanAddURLToHistory(const GURL& url)
+@@ -21,6 +21,7 @@ bool CanAddURLToHistory(const GURL& url)
       url.SchemeIs(content::kChromeDevToolsScheme) ||
       url.SchemeIs(content::kChromeUIScheme) ||
       url.SchemeIs(content::kViewSourceScheme) ||
 +      url.SchemeIs(url::kTraceScheme) ||
       url.SchemeIs(chrome::kChromeNativeScheme) ||
       url.SchemeIs(chrome::kChromeSearchScheme) ||
-       url.SchemeIs(dom_distiller::kDomDistillerScheme) ||
+       url.SchemeIs(dom_distiller::kDomDistillerScheme))
 --- a/chrome/browser/ui/singleton_tabs.cc
 +++ b/chrome/browser/ui/singleton_tabs.cc
@@ -99,7 +99,8 @@ int GetIndexOfExistingTab(Browser* brows
@@ -71,7 +71,7 @@
     return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
 --- a/content/browser/child_process_security_policy_impl.cc
 +++ b/content/browser/child_process_security_policy_impl.cc
-@@ -625,6 +625,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
+@@ -632,6 +632,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
 #endif  // BUILDFLAG(ENABLE_WEBSOCKETS)
   RegisterWebSafeScheme(url::kFtpScheme);
   RegisterWebSafeScheme(url::kDataScheme);
@@ -81,7 +81,7 @@
   // TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1084,6 +1084,8 @@ component("net") {
+@@ -1081,6 +1081,8 @@ component("net") {
       "url_request/report_sender.h",
       "url_request/static_http_user_agent_settings.cc",
       "url_request/static_http_user_agent_settings.h",
@@ -173,7 +173,7 @@
 
 using base::Time;
 using std::string;
-@@ -579,6 +581,12 @@ URLRequest::URLRequest(const GURL& url,
+@@ -562,6 +564,12 @@ URLRequest::URLRequest(const GURL& url,
   // Sanity check out environment.
   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
 
@@ -188,7 +188,7 @@
     return NetLogURLRequestConstructorParams(url, priority_,
 --- a/net/url_request/url_request_context_builder.cc
 +++ b/net/url_request/url_request_context_builder.cc
-@@ -42,6 +42,7 @@
+@@ -43,6 +43,7 @@
 #include "net/quic/quic_stream_factory.h"
 #include "net/ssl/ssl_config_service_defaults.h"
 #include "net/url_request/static_http_user_agent_settings.h"
@@ -196,7 +196,7 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_storage.h"
 #include "net/url_request/url_request_job_factory_impl.h"
-@@ -614,6 +615,9 @@ std::unique_ptr<URLRequestContext> URLRe
+@@ -605,6 +606,9 @@ std::unique_ptr<URLRequestContext> URLRe
   }
   protocol_handlers_.clear();
 
--- a/patches/core/ungoogled-chromium/disable-domain-reliability.patch
+++ b/patches/core/ungoogled-chromium/disable-domain-reliability.patch
@@ -71,7 +71,7 @@
 def quote_and_wrap_text(text, width=79, prefix='  "', suffix='"'):
 --- a/components/domain_reliability/google_configs.cc
 +++ b/components/domain_reliability/google_configs.cc
-@@ -10,564 +10,6 @@
+@@ -11,564 +11,6 @@
 
 namespace domain_reliability {
 
@@ -636,7 +636,7 @@
 std::unique_ptr<const DomainReliabilityConfig> MaybeGetGoogleConfig(
     const std::string& hostname) {
   bool is_www_subdomain =
-@@ -577,23 +19,6 @@ std::unique_ptr<const DomainReliabilityC
+@@ -578,23 +20,6 @@ std::unique_ptr<const DomainReliabilityC
   std::unique_ptr<const DomainReliabilityConfig> config = nullptr;
   std::unique_ptr<const DomainReliabilityConfig> superdomain_config = nullptr;
 
@@ -660,7 +660,7 @@
   if (config) {
     DCHECK(config->origin.host() == hostname);
     return config;
-@@ -612,11 +37,6 @@ std::vector<std::unique_ptr<const Domain
+@@ -613,11 +38,6 @@ std::vector<std::unique_ptr<const Domain
 GetAllGoogleConfigsForTesting() {
   std::vector<std::unique_ptr<const DomainReliabilityConfig>> configs_out;
 
@@ -674,7 +674,7 @@
 
 --- a/components/domain_reliability/uploader.cc
 +++ b/components/domain_reliability/uploader.cc
-@@ -82,7 +82,7 @@ class DomainReliabilityUploaderImpl
+@@ -77,7 +77,7 @@ class DomainReliabilityUploaderImpl : pu
     if (discard_uploads_)
       discarded_upload_count_++;
 
--- a/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch
+++ b/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch
@@ -2,7 +2,7 @@

 --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
 +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
-@@ -294,7 +294,7 @@ bool DomDistillerViewerSource::ShouldSer
+@@ -303,7 +303,7 @@ bool DomDistillerViewerSource::ShouldSer
 }
 
 std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc() {
--- a/patches/core/ungoogled-chromium/disable-gaia.patch
+++ b/patches/core/ungoogled-chromium/disable-gaia.patch
@@ -3,7 +3,7 @@

 --- a/chrome/browser/browser_resources.grd
 +++ b/chrome/browser/browser_resources.grd
-@@ -140,7 +140,6 @@
+@@ -141,7 +141,6 @@
       <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_login.html" compress="gzip" flattenhtml="true" allowexternalscript="true" type="BINDATA" preprocess="true" />
       <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_login.css" compress="gzip" flattenhtml="true" type="BINDATA" preprocess="true" />
       <include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_login.js" compress="gzip" flattenhtml="true" type="BINDATA" />
@@ -13,17 +13,17 @@
       <include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" compress="gzip" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
 --- a/chrome/browser/ui/webui/signin/inline_login_ui.cc
 +++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc
-@@ -120,7 +120,6 @@ content::WebUIDataSource* CreateWebUIDat
- 
-   source->AddResourcePath("inline_login.css", IDR_INLINE_LOGIN_CSS);
-   source->AddResourcePath("inline_login.js", IDR_INLINE_LOGIN_JS);
-  source->AddResourcePath("gaia_auth_host.js", IDR_GAIA_AUTH_AUTHENTICATOR_JS);
- 
+@@ -116,7 +116,6 @@ content::WebUIDataSource* CreateWebUIDat
+   static constexpr webui::ResourcePath kResources[] = {
+     {"inline_login.css", IDR_INLINE_LOGIN_CSS},
+     {"inline_login.js", IDR_INLINE_LOGIN_JS},
+-    {"gaia_auth_host.js", IDR_GAIA_AUTH_AUTHENTICATOR_JS},
 #if defined(OS_CHROMEOS)
-   source->OverrideContentSecurityPolicyScriptSrc(
+     {"edu", IDR_EDU_LOGIN_EDU_LOGIN_HTML},
+     {"app.js", IDR_EDU_LOGIN_EDU_LOGIN_JS},
 --- a/google_apis/gaia/gaia_auth_fetcher.cc
 +++ b/google_apis/gaia/gaia_auth_fetcher.cc
-@@ -293,65 +293,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
+@@ -294,65 +294,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
     network::mojom::CredentialsMode credentials_mode,
     const net::NetworkTrafficAnnotationTag& traffic_annotation) {
   DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
@@ -41,8 +41,8 @@
 -        net::SiteForCookies::FromOrigin(origin);
 -    resource_request->trusted_params =
 -        network::ResourceRequest::TrustedParams();
-    resource_request->trusted_params->network_isolation_key =
-        net::NetworkIsolationKey(origin, origin);
+-    resource_request->trusted_params->isolation_info =
+-        net::IsolationInfo::CreateForInternalRequest(origin);
 -  }
 -
 -  if (!body.empty())
--- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch
+++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch
@@ -13,7 +13,7 @@
 namespace {
 
 #if defined(OS_ANDROID)
-@@ -40,37 +36,6 @@ void GoogleURLLoaderThrottle::DetachFrom
+@@ -50,39 +46,6 @@ void GoogleURLLoaderThrottle::DetachFrom
 void GoogleURLLoaderThrottle::WillStartRequest(
     network::ResourceRequest* request,
     bool* defer) {
@@ -38,23 +38,25 @@
 -
 -  if (!dynamic_params_.allowed_domains_for_apps.empty() &&
 -      request->url.DomainIs("google.com")) {
-    request->headers.SetHeader(safe_search_util::kGoogleAppsAllowedDomains,
-                               dynamic_params_.allowed_domains_for_apps);
+-    request->cors_exempt_headers.SetHeader(
+-        safe_search_util::kGoogleAppsAllowedDomains,
+-        dynamic_params_.allowed_domains_for_apps);
 -  }
 -
 -#if defined(OS_ANDROID)
 -  if (!client_data_header_.empty() &&
 -      google_util::IsGoogleAssociatedDomainUrl(request->url)) {
-    request->headers.SetHeader(kClientDataHeader, client_data_header_);
+-    request->cors_exempt_headers.SetHeader(kCCTClientDataHeader,
+-                                           client_data_header_);
 -  }
 -#endif
 }
 
 void GoogleURLLoaderThrottle::WillRedirectRequest(
-@@ -79,36 +44,6 @@ void GoogleURLLoaderThrottle::WillRedire
-     bool* /* defer */,
+@@ -92,37 +55,6 @@ void GoogleURLLoaderThrottle::WillRedire
     std::vector<std::string>* to_be_removed_headers,
-     net::HttpRequestHeaders* modified_headers) {
+     net::HttpRequestHeaders* modified_headers,
+     net::HttpRequestHeaders* modified_cors_exempt_headers) {
 -  // URLLoaderThrottles can only change the redirect URL when the network
 -  // service is enabled. The non-network service path handles this in
 -  // ChromeNetworkDelegate.
@@ -75,20 +77,21 @@
 -
 -  if (!dynamic_params_.allowed_domains_for_apps.empty() &&
 -      redirect_info->new_url.DomainIs("google.com")) {
-    modified_headers->SetHeader(safe_search_util::kGoogleAppsAllowedDomains,
-                                dynamic_params_.allowed_domains_for_apps);
+-    modified_cors_exempt_headers->SetHeader(
+-        safe_search_util::kGoogleAppsAllowedDomains,
+-        dynamic_params_.allowed_domains_for_apps);
 -  }
 -
 -#if defined(OS_ANDROID)
 -  if (!client_data_header_.empty() &&
 -      !google_util::IsGoogleAssociatedDomainUrl(redirect_info->new_url)) {
-    to_be_removed_headers->push_back(kClientDataHeader);
+-    to_be_removed_headers->push_back(kCCTClientDataHeader);
 -  }
 -#endif
 }
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-@@ -116,17 +51,5 @@ void GoogleURLLoaderThrottle::WillProces
+@@ -130,16 +62,5 @@ void GoogleURLLoaderThrottle::WillProces
     const GURL& response_url,
     network::mojom::URLResponseHead* response_head,
     bool* defer) {
@@ -100,8 +103,7 @@
 -        !response_head->headers->HasHeaderValue("x-frame-options", "deny") &&
 -        !response_head->headers->HasHeaderValue("x-frame-options",
 -                                                "sameorigin")) {
-      response_head->headers->RemoveHeader("x-frame-options");
-      response_head->headers->AddHeader("x-frame-options: sameorigin");
+-      response_head->headers->AddHeader("x-frame-options", "sameorigin");
 -    }
 -  }
 }
@@ -466,7 +468,7 @@
 bool IsGoogleHostname(const GURL& url) {
 --- a/components/search_engines/template_url.cc
 +++ b/components/search_engines/template_url.cc
-@@ -507,11 +507,7 @@ base::string16 TemplateURLRef::SearchTer
+@@ -508,11 +508,7 @@ base::string16 TemplateURLRef::SearchTer
 bool TemplateURLRef::HasGoogleBaseURLs(
     const SearchTermsData& search_terms_data) const {
   ParseIfNecessary(search_terms_data);
@@ -481,17 +483,17 @@
 bool TemplateURLRef::ExtractSearchTermsFromURL(
 --- a/components/variations/net/variations_http_headers.cc
 +++ b/components/variations/net/variations_http_headers.cc
-@@ -29,10 +29,6 @@ namespace variations {
+@@ -27,10 +27,6 @@
 
- namespace {
+ namespace variations {
 
 -// The name string for the header for variations information.
 -// Note that prior to M33 this header was named X-Chrome-Variations.
 -const char kClientDataHeader[] = "X-Client-Data";
 -
+ namespace {
+ 
 // The result of checking if a URL should have variations headers appended.
- // This enum is used to record UMA histogram values, and should not be
- // reordered.
@@ -89,28 +85,7 @@ class VariationsHeaderHelper {
   }
 
@@ -563,7 +565,7 @@
 }  // namespace variations
 --- a/net/base/url_util.cc
 +++ b/net/base/url_util.cc
-@@ -401,27 +401,6 @@ bool HasGoogleHost(const GURL& url) {
+@@ -415,27 +415,6 @@ bool HasGoogleHost(const GURL& url) {
 }
 
 bool IsGoogleHost(base::StringPiece host) {
--- a/patches/core/ungoogled-chromium/disable-mei-preload.patch
+++ b/patches/core/ungoogled-chromium/disable-mei-preload.patch
@@ -7,15 +7,15 @@

 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -321,7 +321,6 @@ if (!is_android && !is_mac) {
+@@ -291,7 +291,6 @@ if (!is_android && !is_mac) {
     }
 
     data_deps += [
 -      "//chrome/browser/resources/media/mei_preload:component",
       "//third_party/widevine/cdm",
     ]
- 
-@@ -1092,7 +1091,6 @@ if (is_win) {
+   }
+@@ -984,7 +983,6 @@ if (is_win) {
       ":keystone_registration_framework",
       ":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
-@@ -494,22 +494,6 @@ GURL GetOSSettingsUrl(const std::string&
+@@ -518,22 +518,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
@@ -2,7 +2,7 @@

 --- a/components/translate/content/renderer/translate_agent.cc
 +++ b/components/translate/content/renderer/translate_agent.cc
-@@ -73,8 +73,7 @@ TranslateAgent::TranslateAgent(content::
+@@ -74,8 +74,7 @@ TranslateAgent::TranslateAgent(content::
     : content::RenderFrameObserver(render_frame),
       world_id_(world_id),
       extension_scheme_(extension_scheme) {
--- a/patches/core/ungoogled-chromium/disable-webstore-urls.patch
+++ b/patches/core/ungoogled-chromium/disable-webstore-urls.patch
@@ -142,7 +142,7 @@
   } else {
     url_stats_.other_url_count++;
   }
-@@ -708,20 +686,6 @@ void ExtensionDownloader::HandleManifest
+@@ -718,20 +696,6 @@ void ExtensionDownloader::HandleManifest
         fetch_data->request_ids()));
   }
 
@@ -163,7 +163,7 @@
   NotifyExtensionsDownloadStageChanged(
       no_updates, ExtensionDownloaderDelegate::Stage::FINISHED);
   NotifyExtensionsDownloadFailed(
-@@ -1217,11 +1181,7 @@ bool ExtensionDownloader::IterateFetchCr
+@@ -1281,11 +1245,7 @@ bool ExtensionDownloader::IterateFetchCr
   // fetch.
   switch (fetch->credentials) {
     case ExtensionFetch::CREDENTIALS_NONE:
@@ -178,7 +178,7 @@
       fetch->oauth2_attempt_count++;
 --- a/extensions/common/extension_urls.cc
 +++ b/extensions/common/extension_urls.cc
-@@ -30,7 +30,7 @@ bool IsSourceFromAnExtension(const base:
+@@ -26,7 +26,7 @@ bool IsSourceFromAnExtension(const base:
 
 namespace extension_urls {
 
--- a/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch
+++ b/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch
@@ -1,6 +1,6 @@
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -1261,6 +1261,8 @@ jumbo_source_set("browser") {
+@@ -1277,6 +1277,8 @@ jumbo_source_set("browser") {
     "net/browser_online_state_observer.cc",
     "net/browser_online_state_observer.h",
     "net/cookie_store_factory.cc",
@@ -9,7 +9,7 @@
     "net/network_errors_listing_ui.cc",
     "net/network_errors_listing_ui.h",
     "net/network_quality_observer_impl.cc",
-@@ -2653,8 +2655,6 @@ jumbo_source_set("browser") {
+@@ -2694,8 +2696,6 @@ jumbo_source_set("browser") {
 
   if (enable_reporting) {
     sources += [
--- a/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch
+++ b/patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch
@@ -2,7 +2,7 @@

 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -3622,8 +3622,6 @@ jumbo_static_library("ui") {
+@@ -3681,8 +3681,6 @@ 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,21 @@

 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -4916,18 +4916,7 @@ ChromeContentBrowserClient::GetSafeBrows
+@@ -4007,11 +4007,13 @@ ChromeContentBrowserClient::CreateThrott
+       &throttles);
+ #endif
+ 
+#if BUILDFLAG(FULL_SAFE_BROWSING)
+   if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) {
+     throttles.push_back(
+         std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
+             handle));
+   }
+#endif
+ 
+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
+     (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+@@ -5020,18 +5022,7 @@ ChromeContentBrowserClient::GetSafeBrows
     bool safe_browsing_enabled_for_profile) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
@@ -32,7 +46,7 @@
 using safe_browsing::DownloadProtectionService;
 
 namespace {
-@@ -1236,8 +1235,6 @@ void ChromeDownloadManagerDelegate::OnDo
+@@ -1253,8 +1252,6 @@ void ChromeDownloadManagerDelegate::OnDo
     if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
       DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
 #endif
@@ -354,7 +368,7 @@
 -  }
 -
 -  // Anything the user has marked auto-open is OK if it's user-initiated.
-  if (download_prefs_->IsAutoOpenEnabledBasedOnExtension(virtual_path_) &&
+-  if (download_prefs_->IsAutoOpenEnabled(download_->GetURL(), virtual_path_) &&
 -      download_->HasUserGesture())
 -    return DownloadFileType::NOT_DANGEROUS;
 -
@@ -625,7 +639,7 @@
   ContentSetting GetReadGuardContentSetting(const url::Origin& origin);
 --- a/chrome/browser/password_manager/chrome_password_manager_client.cc
 +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -26,7 +26,6 @@
+@@ -28,7 +28,6 @@
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/profiles/profile.h"
@@ -633,12 +647,11 @@
 #include "chrome/browser/signin/identity_manager_factory.h"
 #include "chrome/browser/site_isolation/site_isolation_policy.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
-@@ -94,11 +93,11 @@
+@@ -98,10 +97,10 @@
 #if BUILDFLAG(FULL_SAFE_BROWSING)
 #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h"
 #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h"
 +#endif
- #include "services/service_manager/public/cpp/connector.h"
 #include "third_party/blink/public/mojom/clipboard/clipboard.mojom.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ -646,15 +659,15 @@
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/tab_android.h"
-@@ -606,6 +605,7 @@ bool ChromePasswordManagerClient::IsIsol
-   return SiteIsolationPolicy::IsIsolationForPasswordSitesEnabled();
+@@ -755,6 +754,7 @@ std::string ChromePasswordManagerClient:
+   return std::string();
 }
 
 +#if BUILDFLAG(FULL_SAFE_BROWSING)
 #if defined(ON_FOCUS_PING_ENABLED) || \
     defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
 safe_browsing::PasswordProtectionService*
-@@ -628,6 +628,7 @@ void ChromePasswordManagerClient::CheckS
+@@ -777,6 +777,7 @@ void ChromePasswordManagerClient::CheckS
   }
 }
 #endif  // defined(ON_FOCUS_PING_ENABLED)
@@ -662,7 +675,7 @@
 
 #if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
 void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
-@@ -636,24 +637,11 @@ void ChromePasswordManagerClient::CheckP
+@@ -785,24 +786,11 @@ void ChromePasswordManagerClient::CheckP
     const std::vector<password_manager::MatchingReusedCredential>&
         matching_reused_credentials,
     bool password_field_exists) {
@@ -687,17 +700,7 @@
 }
 #endif  // defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
 
-@@ -781,7 +769,9 @@ void ChromePasswordManagerClient::OnInpu
-   if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
-     OnPaste();
-   } else {
-+#if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
-     password_reuse_detection_manager_.OnKeyPressedCommitted(key_event.text);
-+#endif  // defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
-   }
- #endif  // defined(OS_ANDROID)
- }
-@@ -907,9 +897,11 @@ void ChromePasswordManagerClient::OnPast
+@@ -1197,9 +1185,11 @@ void ChromePasswordManagerClient::OnPast
   base::string16 text;
   clipboard->ReadText(ui::ClipboardBuffer::kCopyPaste, &text);
   was_on_paste_called_ = true;
@@ -708,22 +711,41 @@
 -#endif
 +#endif  // !defined(OS_ANDROID)
 
- gfx::RectF ChromePasswordManagerClient::GetBoundsInScreenSpace(
-     const gfx::RectF& bounds) {
+ void ChromePasswordManagerClient::RenderFrameCreated(
+     content::RenderFrameHost* render_frame_host) {
+@@ -1236,7 +1226,9 @@ void ChromePasswordManagerClient::OnInpu
+   if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
+     OnPaste();
+   } else {
+#if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
+     password_reuse_detection_manager_.OnKeyPressedCommitted(key_event.text);
+#endif  // defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
+   }
+ #endif  // defined(OS_ANDROID)
+ }
 --- a/chrome/browser/password_manager/chrome_password_manager_client.h
 +++ b/chrome/browser/password_manager/chrome_password_manager_client.h
-@@ -200,7 +200,7 @@ class ChromePasswordManagerClient
-   void OnImeFinishComposingTextEvent() override;
- #endif  // defined(OS_ANDROID)
+@@ -174,13 +174,14 @@ class ChromePasswordManagerClient
+   void AnnotateNavigationEntry(bool has_password_field) override;
+   std::string GetPageLanguage() const override;
+ 
+-#if defined(ON_FOCUS_PING_ENABLED) || \
+-    defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
+#if (defined(ON_FOCUS_PING_ENABLED) || \
+    defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)) && \
+    BUILDFLAG(FULL_SAFE_BROWSING)
+   safe_browsing::PasswordProtectionService* GetPasswordProtectionService()
+       const override;
+ #endif
 
 -#if defined(ON_FOCUS_PING_ENABLED)
 +#if defined(ON_FOCUS_PING_ENABLED) && BUILDFLAG(FULL_SAFE_BROWSING)
   void CheckSafeBrowsingReputation(const GURL& form_action,
                                    const GURL& frame_url) override;
-   safe_browsing::PasswordProtectionService* GetPasswordProtectionService()
+ #endif
 --- a/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
 +++ b/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
-@@ -18,12 +18,10 @@
+@@ -19,12 +19,10 @@
 #include "chrome/browser/permissions/quiet_notification_permission_ui_config.h"
 #include "chrome/browser/permissions/quiet_notification_permission_ui_state.h"
 #include "chrome/browser/profiles/profile.h"
@@ -736,15 +758,7 @@
 
 namespace {
 
-@@ -114,50 +112,14 @@ void ContextualNotificationPermissionUiS
-     Notify(UiToUse::kNormalUi, base::nullopt);
-     return;
-   }
-
-  // Even if the quiet UI is enabled on all sites, the crowd deny trigger
-  // condition must be evaluated, so that the less prominent UI and the correct
-  // strings are shown on origins with crowd deny activated.
-  EvaluateCrowdDenyTrigger(url::Origin::Create(request->GetOrigin()));
+@@ -143,9 +141,6 @@ void ContextualNotificationPermissionUiS
 }
 
 void ContextualNotificationPermissionUiSelector::Cancel() {
@@ -754,23 +768,22 @@
 }
 
 ContextualNotificationPermissionUiSelector::
-     ~ContextualNotificationPermissionUiSelector() = default;
+@@ -156,24 +151,14 @@ void ContextualNotificationPermissionUiS
+   base::Optional<Decision> decision = GetDecisionBasedOnSiteReputation(
+       CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite(origin));
 
-void ContextualNotificationPermissionUiSelector::EvaluateCrowdDenyTrigger(
-    url::Origin origin) {
-  if (!QuietNotificationPermissionUiConfig::IsCrowdDenyTriggeringEnabled()) {
-    OnCrowdDenyTriggerEvaluated(UiToUse::kNormalUi);
+-  // If the PreloadData suggests this is an unacceptable site, ping Safe
+-  // Browsing to verify; but do not ping if it is not warranted.
+  // If the PreloadData suggests this is an unacceptable site, assume it is
+  // correct, since we can't access safe browsing.
+   if (!decision || (!decision->quiet_ui_reason && !decision->warning_reason)) {
+     OnPerSiteTriggersEvaluated(Decision::UseNormalUiAndShowNoWarning());
 -    return;
-  }
+  } else {
+    // decision has a value, unwrap with .value()
+    OnPerSiteTriggersEvaluated(decision.value());
+   }
 -
-  base::Optional<UiToUse> ui_to_use = GetUiToUseBasedOnSiteReputation(
-      CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite(origin));
-  if (!ui_to_use || *ui_to_use == UiToUse::kNormalUi) {
-    OnCrowdDenyTriggerEvaluated(UiToUse::kNormalUi);
-    return;
-  }
-
-  // PreloadData suggests a spammy site, ping safe browsing to verify.
 -  DCHECK(!safe_browsing_request_);
 -  DCHECK(g_browser_process->safe_browsing_service());
 -
@@ -781,23 +794,25 @@
 -      base::DefaultClock::GetInstance(), origin,
 -      base::BindOnce(&ContextualNotificationPermissionUiSelector::
 -                         OnSafeBrowsingVerdictReceived,
-                     base::Unretained(this)));
-}
-
+-                     base::Unretained(this), *decision));
+ }
+ 
 void ContextualNotificationPermissionUiSelector::OnSafeBrowsingVerdictReceived(
-     CrowdDenySafeBrowsingRequest::Verdict verdict) {
-   DCHECK(safe_browsing_request_);
 --- a/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc
 +++ b/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc
-@@ -78,33 +78,8 @@ void HandleOnPerformDrop(
+@@ -78,37 +78,8 @@ void HandleOnPerformDrop(
     content::WebContents* web_contents,
     const content::DropData& drop_data,
     content::WebContentsViewDelegate::DropCompletionCallback callback) {
 -  safe_browsing::DeepScanningDialogDelegate::Data data;
 -  Profile* profile =
 -      Profile::FromBrowserContext(web_contents->GetBrowserContext());
+-  auto connector =
+-      drop_data.filenames.empty()
+-          ? enterprise_connectors::AnalysisConnector::BULK_DATA_ENTRY
+-          : enterprise_connectors::AnalysisConnector::FILE_ATTACHED;
 -  if (!safe_browsing::DeepScanningDialogDelegate::IsEnabled(
-          profile, web_contents->GetLastCommittedURL(), &data)) {
+-          profile, web_contents->GetLastCommittedURL(), &data, connector)) {
 -    std::move(callback).Run(
 -        content::WebContentsViewDelegate::DropCompletionResult::kContinue);
 -    return;
@@ -829,25 +844,28 @@
 }
 --- a/chrome/browser/ui/views/download/download_item_view.cc
 +++ b/chrome/browser/ui/views/download/download_item_view.cc
-@@ -1306,6 +1306,7 @@ void DownloadItemView::ShowDeepScanningD
+@@ -1308,16 +1308,20 @@ void DownloadItemView::ShowDeepScanningD
           },
           base::Unretained(this))));
 
 +#if BUILDFLAG(FULL_SAFE_BROWSING)
-   int delay_delivery = g_browser_process->local_state()->GetInteger(
-       prefs::kDelayDeliveryUntilVerdict);
-   if (delay_delivery != safe_browsing::DELAY_DOWNLOADS &&
-@@ -1317,6 +1318,9 @@ void DownloadItemView::ShowDeepScanningD
-   } else {
+   if (enterprise_connectors::ConnectorsManager::GetInstance()
+           ->DelayUntilVerdict(
+               enterprise_connectors::AnalysisConnector::FILE_DOWNLOADED)) {
     open_button_->SetEnabled(false);
+   } else {
+#endif  // BUILDFLAG(FULL_SAFE_BROWSING)
+     auto open_now_button = views::MdTextButton::Create(
+         this, l10n_util::GetStringUTF16(IDS_OPEN_DOWNLOAD_NOW));
+     open_now_button_ = AddChildView(std::move(open_now_button));
+     open_button_->SetEnabled(true);
+#if BUILDFLAG(FULL_SAFE_BROWSING)
   }
-+#else
-+  open_button_->SetEnabled(false);
 +#endif  // BUILDFLAG(FULL_SAFE_BROWSING)
 
   file_name_label_->SetVisible(false);
   status_label_->SetVisible(false);
-@@ -1627,7 +1631,9 @@ base::string16 DownloadItemView::ElidedF
+@@ -1628,7 +1632,9 @@ base::string16 DownloadItemView::ElidedF
 }
 
 void DownloadItemView::OpenDownloadDuringAsyncScanning() {
@@ -859,7 +877,7 @@
 
 --- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
 +++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
-@@ -184,10 +184,7 @@ PasswordReuseModalWarningDialog::Passwor
+@@ -178,10 +178,7 @@ PasswordReuseModalWarningDialog::Passwor
         placeholder_offsets);
   } else {
     views::Label* message_body_label = CreateMessageBodyLabel(
@@ -882,7 +900,7 @@
 #include "components/security_interstitials/content/connection_help_ui.h"
 #include "components/security_interstitials/content/known_interception_disclosure_ui.h"
 #include "components/security_interstitials/content/urls.h"
-@@ -444,8 +442,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc
+@@ -466,8 +464,6 @@ WebUIFactoryFunction GetWebUIFactoryFunc
     return &NewWebUI<PredictorsUI>;
   if (url.host_piece() == chrome::kChromeUIQuotaInternalsHost)
     return &NewWebUI<QuotaInternalsUI>;
@@ -903,10 +921,10 @@
 
 --- a/components/password_manager/content/browser/content_password_manager_driver.cc
 +++ b/components/password_manager/content/browser/content_password_manager_driver.cc
-@@ -310,7 +310,7 @@ void ContentPasswordManagerDriver::ShowT
- void ContentPasswordManagerDriver::CheckSafeBrowsingReputation(
-     const GURL& form_action,
-     const GURL& frame_url) {
+@@ -316,7 +316,7 @@ void ContentPasswordManagerDriver::Check
+   if (client_->GetMetricsRecorder()) {
+     client_->GetMetricsRecorder()->RecordUserFocusedPasswordField();
+   }
 -#if defined(ON_FOCUS_PING_ENABLED)
 +#if defined(ON_FOCUS_PING_ENABLED) && BUILDFLAG(FULL_SAFE_BROWSING)
   client_->CheckSafeBrowsingReputation(form_action, frame_url);
@@ -914,15 +932,25 @@
 }
 --- a/components/password_manager/core/browser/password_manager_client.h
 +++ b/components/password_manager/core/browser/password_manager_client.h
-@@ -310,7 +310,7 @@ class PasswordManagerClient {
+@@ -318,14 +318,15 @@ class PasswordManagerClient {
   // Returns the current best guess as to the page's display language.
   virtual std::string GetPageLanguage() const;
 
-#if defined(ON_FOCUS_PING_ENABLED)
-+#if defined(ON_FOCUS_PING_ENABLED) && BUILDFLAG(FULL_SAFE_BROWSING)
+-#if defined(ON_FOCUS_PING_ENABLED) || \
+-    defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
+#if (defined(ON_FOCUS_PING_ENABLED) || \
+    defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)) && \
+    BUILDFLAG(FULL_SAFE_BROWSING)
   // Return the PasswordProtectionService associated with this instance.
   virtual safe_browsing::PasswordProtectionService*
   GetPasswordProtectionService() const = 0;
+ #endif
+ 
+-#if defined(ON_FOCUS_PING_ENABLED)
+#if defined(ON_FOCUS_PING_ENABLED) && BUILDFLAG(FULL_SAFE_BROWSING)
+   // Checks the safe browsing reputation of the webpage when the
+   // user focuses on a username/password field. This is used for reporting
+   // only, and won't trigger a warning.
 --- a/components/safe_browsing/content/common/safe_browsing.mojom
 +++ b/components/safe_browsing/content/common/safe_browsing.mojom
@@ -117,7 +117,6 @@ enum PhishingDetectorResult {
--- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
+++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
--- 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/devtools-frontend/src/BUILD.gn
 +++ b/third_party/devtools-frontend/src/BUILD.gn
-@@ -840,14 +840,13 @@ generated_non_autostart_non_remote_modul
+@@ -842,14 +842,13 @@ generated_non_autostart_non_remote_modul
   "$resources_out_dir/timeline/timeline_module.js",
   "$resources_out_dir/web_audio/web_audio_module.js",
   "$resources_out_dir/workspace_diff/workspace_diff_module.js",
@@ -22,16 +22,16 @@
 generated_test_modules = [
   "$resources_out_dir/accessibility_test_runner/accessibility_test_runner_module.js",
   "$resources_out_dir/application_test_runner/application_test_runner_module.js",
-@@ -939,7 +938,6 @@ devtools_frontend_resources_deps = devto
+@@ -946,7 +945,6 @@ devtools_frontend_resources_deps = devto
                                      ":copy_htaccess",
                                      ":copy_inspector_images",
                                      ":copy_lighthouse_locale_files",
 -                                     ":copy_wasm_deps",
                                      ":devtools_extension_api",
+                                      "front_end",
                                    ]
- 
-@@ -1650,7 +1648,6 @@ action("generate_devtools_grd") {
-       devtools_embedder_scripts + generated_worker_bundles +
+@@ -1674,7 +1672,6 @@ action("generate_devtools_grd") {
+       generated_worker_bundles +
       [
         "$resources_out_dir/devtools_extension_api.js",
 -        "$resources_out_dir/sdk/wasm_source_map/pkg/wasm_source_map_bg.wasm",
--- a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
+++ b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
@@ -9,7 +9,7 @@

 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2272,6 +2272,7 @@ jumbo_static_library("browser") {
+@@ -2253,6 +2253,7 @@ static_library("browser") {
     "//third_party/libyuv",
     "//third_party/metrics_proto",
     "//third_party/re2",
@@ -19,7 +19,7 @@
     "//third_party/zlib",
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -157,6 +157,7 @@
+@@ -165,6 +165,7 @@
 #include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/common/forcedark/forcedark_switches.h"
 #include "third_party/leveldatabase/leveldb_features.h"
@@ -27,7 +27,7 @@
 #include "ui/accessibility/accessibility_features.h"
 #include "ui/accessibility/accessibility_switches.h"
 #include "ui/base/ui_base_features.h"
-@@ -1818,6 +1819,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2025,6 +2026,14 @@ const FeatureEntry kFeatureEntries[] = {
      "Set internal PDF plugin name",
      "Sets the internal PDF viewer plugin name. Useful for sites that probe JS API navigator.plugins",
      kOsDesktop, MULTI_VALUE_TYPE(kPDFPluginNameChoices)},
@@ -44,7 +44,7 @@
      SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -208,6 +208,7 @@ jumbo_source_set("browser") {
+@@ -210,6 +210,7 @@ jumbo_source_set("browser") {
     "//third_party/libyuv",
     "//third_party/re2",
     "//third_party/sqlite",
@@ -54,23 +54,23 @@
     "//third_party/zlib/google:zip",
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -225,6 +225,7 @@
- #include "third_party/blink/public/common/page/launching_process_state.h"
+@@ -226,6 +226,7 @@
 #include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
+ #include "third_party/blink/public/mojom/disk_allocator.mojom.h"
 #include "third_party/blink/public/public_buildflags.h"
 +#include "components/ungoogled/ungoogled_switches.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/accessibility/accessibility_switches.h"
 #include "ui/base/ui_base_switches.h"
-@@ -3279,6 +3280,8 @@ void RenderProcessHostImpl::PropagateBro
+@@ -3316,6 +3317,8 @@ void RenderProcessHostImpl::PropagateBro
     switches::kEnableWebGLDraftExtensions,
     switches::kEnableWebGLImageChromium,
     switches::kFileUrlPathAlias,
 +    switches::kFingerprintingClientRectsNoise,
 +    switches::kFingerprintingCanvasMeasureTextNoise,
     switches::kForceDeviceScaleFactor,
-     switches::kForceDisableWebRtcApmInAudioService,
     switches::kForceDisplayColorProfile,
+     switches::kForceGpuMemAvailableMb,
 --- a/content/child/BUILD.gn
 +++ b/content/child/BUILD.gn
@@ -123,6 +123,7 @@ target(link_target_type, "child") {
@@ -83,7 +83,7 @@
     "//ui/events/blink",
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -26,6 +26,7 @@
+@@ -27,6 +27,7 @@
 #include "services/network/public/cpp/network_switches.h"
 #include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/platform/web_runtime_features.h"
@@ -91,7 +91,7 @@
 #include "ui/accessibility/accessibility_features.h"
 #include "ui/base/ui_base_features.h"
 #include "ui/events/blink/blink_features.h"
-@@ -450,6 +451,10 @@ void SetRuntimeFeaturesFromCommandLine(c
+@@ -449,6 +450,10 @@ void SetRuntimeFeaturesFromCommandLine(c
        switches::kEnableAccessibilityObjectModel, true},
       {wrf::EnableAllowSyncXHRInPageDismissal,
        switches::kAllowSyncXHRInPageDismissal, true},
@@ -104,7 +104,7 @@
       {wrf::EnableHTMLImports, switches::kWebComponentsV0Enabled, true},
 --- a/third_party/blink/public/platform/web_runtime_features.h
 +++ b/third_party/blink/public/platform/web_runtime_features.h
-@@ -220,6 +220,8 @@ class WebRuntimeFeatures {
+@@ -217,6 +217,8 @@ class WebRuntimeFeatures {
   BLINK_PLATFORM_EXPORT static void EnableTranslateService(bool);
   BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
   BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
@@ -123,7 +123,7 @@
 #include "base/time/time.h"
 #include "cc/input/overscroll_behavior.h"
 #include "cc/input/scroll_snap_data.h"
-@@ -883,6 +884,14 @@ Range* Document::CreateRangeAdjustedToTr
+@@ -892,6 +893,14 @@ Range* Document::CreateRangeAdjustedToTr
                                      Position::BeforeNode(*shadow_host));
 }
 
@@ -138,7 +138,7 @@
 SelectorQueryCache& Document::GetSelectorQueryCache() {
   if (!selector_query_cache_)
     selector_query_cache_ = std::make_unique<SelectorQueryCache>();
-@@ -2628,6 +2637,15 @@ void Document::UpdateStyleAndLayoutTree(
+@@ -2620,6 +2629,15 @@ void Document::UpdateStyleAndLayoutTree(
 #if DCHECK_IS_ON()
   AssertLayoutTreeUpdated(*this);
 #endif
@@ -156,7 +156,7 @@
 void Document::UpdateActiveStyle() {
 --- a/third_party/blink/renderer/core/dom/document.h
 +++ b/third_party/blink/renderer/core/dom/document.h
-@@ -533,6 +533,10 @@ class CORE_EXPORT Document : public Cont
+@@ -476,6 +476,10 @@ class CORE_EXPORT Document : public Cont
     has_xml_declaration_ = has_xml_declaration ? 1 : 0;
   }
 
@@ -167,7 +167,7 @@
   String visibilityState() const;
   bool IsPageVisible() const;
   bool hidden() const;
-@@ -2101,6 +2105,9 @@ class CORE_EXPORT Document : public Cont
+@@ -1998,6 +2002,9 @@ class CORE_EXPORT Document : public Cont
 
   base::ElapsedTimer start_time_;
 
@@ -179,7 +179,7 @@
   HeapVector<Member<ScriptElementBase>> current_script_stack_;
 --- a/third_party/blink/renderer/core/dom/element.cc
 +++ b/third_party/blink/renderer/core/dom/element.cc
-@@ -1985,6 +1985,11 @@ DOMRectList* Element::getClientRects() {
+@@ -2022,6 +2022,11 @@ DOMRectList* Element::getClientRects() {
   DCHECK(element_layout_object);
   GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
       quads, *element_layout_object);
@@ -191,7 +191,7 @@
   return MakeGarbageCollected<DOMRectList>(quads);
 }
 
-@@ -2002,6 +2007,9 @@ DOMRect* Element::getBoundingClientRect(
+@@ -2039,6 +2044,9 @@ DOMRect* Element::getBoundingClientRect(
   DCHECK(element_layout_object);
   GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
                                                         *element_layout_object);
@@ -285,18 +285,18 @@
 void CanvasRenderingContext2D::DrawTextInternal(
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1543,6 +1543,7 @@ jumbo_component("platform") {
-     "//third_party/harfbuzz-ng:hb_scoped_util",
-     "//third_party/icu",
-     "//third_party/libyuv",
+@@ -1564,6 +1564,7 @@ jumbo_component("platform") {
+     "//base/allocator:buildflags",
+     "//cc/ipc",
+     "//components/paint_preview/common",
 +    "//components/ungoogled:switches",
-     "//third_party/webrtc_overrides:webrtc_component",
-     "//third_party/zlib/google:compression_utils",
-     "//ui/base/cursor",
+     "//components/viz/client",
+     "//components/viz/common",
+     "//crypto",
 --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -671,4 +671,12 @@ void WebRuntimeFeatures::EnableInstalled
-   RuntimeEnabledFeatures::SetInstalledAppEnabled(enable);
+@@ -675,4 +675,12 @@ void WebRuntimeFeatures::EnableVideoWake
+       enable);
 }
 
 +void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool enable) {
@@ -310,16 +310,16 @@
 }  // namespace blink
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -747,6 +747,12 @@
-       name: "FileSystem",
+@@ -777,6 +777,12 @@
       status: "stable",
     },
-+    {
+     {
 +      name: "FingerprintingClientRectsNoise",
 +    },
 +    {
 +      name: "FingerprintingCanvasMeasureTextNoise",
 +    },
-     // Perform style recalc traversal in the flat tree order, including marking
-     // flat-tree instead of shadow-including ancestors for child dirtiness.
-     {
+    {
+       name: "FlexGaps",
+       status: "stable",
+     },
--- a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch
+++ b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch
@@ -23,7 +23,7 @@ approach to change color components.

 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1832,6 +1832,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2039,6 +2039,10 @@ const FeatureEntry kFeatureEntries[] = {
      "Enable Canvas::measureText() fingerprint deception",
      "Scale the output values of Canvas::measureText() with a randomly selected factor in the range -0.0003% to 0.0003%, which are recomputed on every document initialization.",
      kOsAll, SINGLE_VALUE_TYPE(switches::kFingerprintingCanvasMeasureTextNoise)},
@@ -36,17 +36,17 @@ approach to change color components.
      SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -3282,6 +3282,7 @@ void RenderProcessHostImpl::PropagateBro
+@@ -3319,6 +3319,7 @@ void RenderProcessHostImpl::PropagateBro
     switches::kFileUrlPathAlias,
     switches::kFingerprintingClientRectsNoise,
     switches::kFingerprintingCanvasMeasureTextNoise,
 +    switches::kFingerprintingCanvasImageDataNoise,
     switches::kForceDeviceScaleFactor,
-     switches::kForceDisableWebRtcApmInAudioService,
     switches::kForceDisplayColorProfile,
+     switches::kForceGpuMemAvailableMb,
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -455,6 +455,8 @@ void SetRuntimeFeaturesFromCommandLine(c
+@@ -454,6 +454,8 @@ void SetRuntimeFeaturesFromCommandLine(c
        switches::kFingerprintingClientRectsNoise, true},
       {wrf::EnableFingerprintingCanvasMeasureTextNoise,
        switches::kFingerprintingCanvasMeasureTextNoise, true},
@@ -57,7 +57,7 @@ approach to change color components.
       {wrf::EnableHTMLImports, switches::kWebComponentsV0Enabled, true},
 --- a/third_party/blink/public/platform/web_runtime_features.h
 +++ b/third_party/blink/public/platform/web_runtime_features.h
-@@ -222,6 +222,7 @@ class WebRuntimeFeatures {
+@@ -219,6 +219,7 @@ class WebRuntimeFeatures {
   BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
   BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
   BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
@@ -67,7 +67,7 @@ approach to change color components.
   BLINK_PLATFORM_EXPORT static void EnableHTMLImports(bool);
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1498,7 +1498,9 @@ jumbo_component("platform") {
+@@ -1547,7 +1547,9 @@ jumbo_component("platform") {
     "//third_party/blink/renderer:non_test_config",
   ]
 
@@ -80,7 +80,7 @@ approach to change color components.
     ":blink_platform_public_deps",
 --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -679,4 +679,8 @@ void WebRuntimeFeatures::EnableFingerpri
+@@ -683,4 +683,8 @@ void WebRuntimeFeatures::EnableFingerpri
   RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable);
 }
 
@@ -100,7 +100,7 @@ approach to change color components.
 #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
 #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
 #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
-@@ -130,6 +132,11 @@ bool ImageDataBuffer::EncodeImageInterna
+@@ -137,6 +139,11 @@ bool ImageDataBuffer::EncodeImageInterna
                                           const SkPixmap& pixmap) const {
   DCHECK(is_valid_);
 
@@ -313,13 +313,13 @@ approach to change color components.
   // Methods overridden by all sub-classes
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -753,6 +753,9 @@
-     {
+@@ -783,6 +783,9 @@
       name: "FingerprintingCanvasMeasureTextNoise",
     },
-+    {
+     {
 +      name: "FingerprintingCanvasImageDataNoise",
 +    },
-     // Perform style recalc traversal in the flat tree order, including marking
-     // flat-tree instead of shadow-including ancestors for child dirtiness.
-     {
+    {
+       name: "FlexGaps",
+       status: "stable",
+     },
--- 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/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2104,6 +2104,7 @@ jumbo_static_library("browser") {
+@@ -2081,6 +2081,7 @@ static_library("browser") {
     "//components/net_log",
     "//components/network_hints/common:mojo_bindings",
     "//components/network_session_configurator/browser",
@@ -27,7 +27,7 @@ with limited CPU/memory resources and it is disabled by default.
     "//components/offline_items_collection/core",
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -780,6 +780,11 @@ const FeatureEntry::Choice kForceEffecti
+@@ -786,6 +786,11 @@ const FeatureEntry::Choice kForceEffecti
      net::kEffectiveConnectionType4G},
 };
 
@@ -39,7 +39,7 @@ with limited CPU/memory resources and it is disabled by default.
 // Ensure that all effective connection types returned by Network Quality
 // Estimator (NQE) are also exposed via flags.
 static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 ==
-@@ -2783,6 +2788,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3014,6 +3019,9 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kAutofillCreditCardUploadDescription, kOsAll,
      FEATURE_VALUE_TYPE(autofill::features::kAutofillUpstream)},
 #endif  // TOOLKIT_VIEWS || OS_ANDROID
@@ -74,7 +74,7 @@ with limited CPU/memory resources and it is disabled by default.
 #include "components/network_time/network_time_tracker.h"
 #include "components/optimization_guide/optimization_guide_features.h"
 #include "components/optimization_guide/optimization_guide_service.h"
-@@ -136,6 +139,7 @@
+@@ -135,6 +138,7 @@
 #include "media/media_buildflags.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "net/log/net_log.h"
@@ -82,7 +82,7 @@ with limited CPU/memory resources and it is disabled by default.
 #include "ppapi/buildflags/buildflags.h"
 #include "printing/buildflags/buildflags.h"
 #include "services/network/public/cpp/features.h"
-@@ -325,6 +329,18 @@ void BrowserProcessImpl::Init() {
+@@ -326,6 +330,18 @@ void BrowserProcessImpl::Init() {
                              base::Bind(&ApplyMetricsReportingPolicy));
 #endif
 
@@ -103,9 +103,9 @@ with limited CPU/memory resources and it is disabled by default.
 
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1137,6 +1137,10 @@ const char kMediaInspectorLoggingDescrip
-     "Move media logging from chrome://media-internals into the developer tools "
-     "project.";
+@@ -1214,6 +1214,10 @@ const char kMediaHistoryDescription[] =
+     "Enables Media History which records data around media playbacks on "
+     "websites.";
 
 +const char kMaxConnectionsPerHostName[] = "Maximum connections per host";
 +const char kMaxConnectionsPerHostDescription[] =
@@ -116,9 +116,9 @@ 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
-@@ -678,6 +678,9 @@ extern const char kMediaHistoryDescripti
- extern const char kMediaInspectorLoggingName[];
- extern const char kMediaInspectorLoggingDescription[];
+@@ -729,6 +729,9 @@ extern const char kMarkHttpAsWarningAndD
+ extern const char kMediaHistoryName[];
+ extern const char kMediaHistoryDescription[];
 
 +extern const char kMaxConnectionsPerHostName[];
 +extern const char kMaxConnectionsPerHostDescription[];
--- a/patches/extra/debian/disable/android.patch
+++ b/patches/extra/debian/disable/android.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>

 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -404,7 +404,7 @@ group("gn_all") {
+@@ -403,7 +403,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/disable/fuzzers.patch
+++ b/patches/extra/debian/disable/fuzzers.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>

 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -754,8 +754,7 @@ group("gn_all") {
+@@ -753,8 +753,7 @@ group("gn_all") {
     }
   }
 
@@ -15,7 +15,7 @@ author: Michael Gilbert <mgilbert@debian.org>
       "//testing/libfuzzer/fuzzers",
 --- a/content/test/BUILD.gn
 +++ b/content/test/BUILD.gn
-@@ -2383,10 +2383,6 @@ test("content_perftests") {
+@@ -2389,10 +2389,6 @@ test("content_perftests") {
   }
 }
 
--- a/patches/extra/debian/disable/welcome-page.patch
+++ b/patches/extra/debian/disable/welcome-page.patch
@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/857767

 --- a/chrome/browser/profiles/profile_manager.cc
 +++ b/chrome/browser/profiles/profile_manager.cc
-@@ -1076,7 +1076,7 @@ void ProfileManager::InitProfileUserPref
+@@ -1091,7 +1091,7 @@ void ProfileManager::InitProfileUserPref
     profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
                                    supervised_user_id);
   }
--- a/patches/extra/inox-patchset/0006-modify-default-prefs.patch
+++ b/patches/extra/inox-patchset/0006-modify-default-prefs.patch
@@ -1,7 +1,7 @@

 --- a/chrome/browser/background/background_mode_manager.cc
 +++ b/chrome/browser/background/background_mode_manager.cc
-@@ -310,7 +310,7 @@ void BackgroundModeManager::RegisterPref
+@@ -339,7 +339,7 @@ void BackgroundModeManager::RegisterPref
   registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
   registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
 #endif
@@ -12,7 +12,7 @@
 void BackgroundModeManager::RegisterProfile(Profile* profile) {
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1152,7 +1152,7 @@ void ChromeContentBrowserClient::Registe
+@@ -1233,7 +1233,7 @@ void ChromeContentBrowserClient::Registe
 void ChromeContentBrowserClient::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -45,7 +45,7 @@
 enum class NetworkPredictionStatus {
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
-@@ -183,7 +183,7 @@ const char Profile::kProfileKey[] = "__P
+@@ -246,7 +246,7 @@ const char Profile::kProfileKey[] = "__P
 void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kSearchSuggestEnabled,
@@ -56,7 +56,7 @@
   registry->RegisterStringPref(
 --- a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
 +++ b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
-@@ -51,7 +51,7 @@
+@@ -34,7 +34,7 @@
         </cr-button>
       </div>
       <div slot="footer">
@@ -67,9 +67,9 @@
     </cr-dialog>
 --- a/chrome/browser/signin/account_consistency_mode_manager.cc
 +++ b/chrome/browser/signin/account_consistency_mode_manager.cc
-@@ -99,7 +99,7 @@ void AccountConsistencyModeManager::Regi
-   registry->RegisterBooleanPref(prefs::kAccountConsistencyMirrorRequired,
-                                 false);
+@@ -95,7 +95,7 @@ void AccountConsistencyModeManager::Regi
+ #if BUILDFLAG(ENABLE_DICE_SUPPORT)
+   registry->RegisterBooleanPref(kDiceMigrationCompletePref, false);
 #endif
 -  registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, true);
 +  registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, false);
@@ -129,7 +129,7 @@
       prefs::kCloudPrintXmppPingEnabled, false);
 --- a/components/autofill/core/common/autofill_prefs.cc
 +++ b/components/autofill/core/common/autofill_prefs.cc
-@@ -131,10 +131,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(
@@ -142,7 +142,7 @@
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterIntegerPref(
       prefs::kAutofillLastVersionDeduped, 0,
-@@ -147,7 +147,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(
@@ -170,7 +170,7 @@
       prefs::kShowManagedBookmarksInBookmarkBar,
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -59,7 +59,7 @@ void CookieSettings::GetCookieSettings(
+@@ -63,7 +63,7 @@ void CookieSettings::GetCookieSettings(
 void CookieSettings::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
@@ -181,7 +181,7 @@
       prefs::kCookieControlsMode,
 --- a/components/password_manager/core/browser/password_manager.cc
 +++ b/components/password_manager/core/browser/password_manager.cc
-@@ -196,10 +196,10 @@ void AddLocallySavedPredictions(FieldInf
+@@ -200,10 +200,10 @@ FormData SimplifiedFormDataFromFormStruc
 void PasswordManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
--- a/patches/extra/inox-patchset/0008-restore-classic-ntp.patch
+++ b/patches/extra/inox-patchset/0008-restore-classic-ntp.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/search/search.cc
 +++ b/chrome/browser/search/search.cc
-@@ -183,26 +183,7 @@ struct NewTabURLDetails {
+@@ -184,26 +184,7 @@ struct NewTabURLDetails {
                              : chrome::kChromeSearchLocalNtpUrl);
 #endif
 
--- 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
-@@ -1414,8 +1414,6 @@ int ChromeBrowserMainParts::PreMainMessa
+@@ -1406,8 +1406,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/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
+++ b/patches/extra/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
@@ -11,7 +11,7 @@ very interesting in themselves. Force them to be stored.

 --- a/third_party/blink/common/mime_util/mime_util.cc
 +++ b/third_party/blink/common/mime_util/mime_util.cc
-@@ -76,6 +76,7 @@ static const char* const kUnsupportedTex
+@@ -77,6 +77,7 @@ static const char* const kUnsupportedTex
     "text/x-csv",
     "text/x-vcf",
     "text/rtf",
--- a/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch
+++ b/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch
@@ -12,7 +12,7 @@ it as hidden as it was before?

 --- a/net/cert/x509_util.cc
 +++ b/net/cert/x509_util.cc
-@@ -238,7 +238,7 @@ bool GetTLSServerEndPointChannelBinding(
+@@ -239,7 +239,7 @@ bool GetTLSServerEndPointChannelBinding(
 }
 
 // RSA keys created by CreateKeyAndSelfSignedCert will be of this length.
--- a/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch
+++ b/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch
@@ -29,7 +29,7 @@ TLDR: Do not let files sneak onto the disk too easily.

 --- a/chrome/browser/download/download_prefs.cc
 +++ b/chrome/browser/download/download_prefs.cc
-@@ -239,7 +239,7 @@ void DownloadPrefs::RegisterProfilePrefs
+@@ -267,7 +267,7 @@ void DownloadPrefs::RegisterProfilePrefs
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kPromptForDownload,
@@ -37,4 +37,4 @@ TLDR: Do not let files sneak onto the disk too easily.
 +      true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterStringPref(prefs::kDownloadExtensionsToOpen, std::string());
-   registry->RegisterBooleanPref(prefs::kDownloadDirUpgraded, false);
+   registry->RegisterListPref(prefs::kDownloadExtensionsToOpenByPolicy, {});
--- 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
-@@ -155,7 +155,7 @@ void ContentSettingsRegistry::Init() {
+@@ -140,7 +140,7 @@ void ContentSettingsRegistry::Init() {
   // WARNING: The string names of the permissions passed in below are used to
   // generate preference names and should never be changed!
 
@@ -18,4 +18,4 @@ Out with all those tracking cookies!
 +  Register(ContentSettingsType::COOKIES, "cookies", CONTENT_SETTING_SESSION_ONLY,
            WebsiteSettingsInfo::SYNCABLE,
            WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
-            ForceAllowedOrigins(),
+            ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
--- 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
-@@ -670,7 +670,7 @@ static base::mac::ScopedObjCClassSwizzle
+@@ -668,7 +668,7 @@ static base::mac::ScopedObjCClassSwizzle
   CFStringRef checkInterval = CFSTR("checkInterval");
   CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
   if (!plist) {
--- a/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -288,6 +288,13 @@ const FeatureEntry::Choice kPDFPluginNam
+@@ -293,6 +293,13 @@ const FeatureEntry::Choice kPDFPluginNam
     {"Microsoft Edge", switches::kPDFPluginName, "edge"},
 };
 
@@ -14,7 +14,7 @@
 const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
     {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
     {flags_ui::kGenericExperimentChoiceEnabled,
-@@ -2072,6 +2079,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2276,6 +2283,12 @@ const FeatureEntry kFeatureEntries[] = {
     {"focus-mode", flag_descriptions::kFocusMode,
      flag_descriptions::kFocusModeDescription, kOsDesktop,
      FEATURE_VALUE_TYPE(features::kFocusMode)},
--- a/patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -282,6 +282,12 @@ const FeatureEntry::Choice kScrollEventC
+@@ -287,6 +287,12 @@ const FeatureEntry::Choice kScrollEventC
      "never"}
 };
 
@@ -13,7 +13,7 @@
 const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
     {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
     {flags_ui::kGenericExperimentChoiceEnabled,
-@@ -1801,6 +1807,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2008,6 +2014,10 @@ 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")},
@@ -26,7 +26,7 @@
      SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -5490,7 +5490,7 @@ bool ChromeContentBrowserClient::ShouldA
+@@ -5598,7 +5598,7 @@ bool ChromeContentBrowserClient::ShouldA
     const url::Origin& embedder_origin,
     const content::PepperPluginInfo& plugin_info) {
 #if BUILDFLAG(ENABLE_PDF)
@@ -283,7 +283,7 @@
     ],
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -271,6 +271,7 @@ static_library("common") {
+@@ -267,6 +267,7 @@ static_library("common") {
     "//components/google/core/common",
     "//components/metrics:call_stack_profile_builder",
     "//components/page_load_metrics/common:common",
@@ -293,7 +293,7 @@
   if (enable_plugins) {
 --- a/chrome/common/chrome_content_client.cc
 +++ b/chrome/common/chrome_content_client.cc
-@@ -146,7 +146,7 @@ void ComputeBuiltInPlugins(std::vector<c
+@@ -147,7 +147,7 @@ void ComputeBuiltInPlugins(std::vector<c
   content::PepperPluginInfo pdf_info;
   pdf_info.is_internal = true;
   pdf_info.is_out_of_process = true;
@@ -304,7 +304,7 @@
   content::WebPluginMimeType pdf_mime_type(
 --- a/chrome/common/chrome_content_client.h
 +++ b/chrome/common/chrome_content_client.h
-@@ -38,8 +38,8 @@ class ChromeContentClient : public conte
+@@ -41,8 +41,8 @@ class ChromeContentClient : public conte
   static const base::FilePath::CharType kNaClPluginFileName[];
 #endif
 
@@ -391,7 +391,7 @@
     FILE_PATH_LITERAL("internal-pdf-viewer");
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
-@@ -909,7 +909,7 @@ WebPlugin* ChromeContentRendererClient::
+@@ -928,7 +928,7 @@ WebPlugin* ChromeContentRendererClient::
             }
           }
         } else if (info.name ==
@@ -400,7 +400,7 @@
           // Report PDF load metrics. Since the PDF plugin is comprised of an
           // extension that loads a second plugin, avoid double counting by
           // ignoring the creation of the second plugin.
-@@ -963,7 +963,7 @@ WebPlugin* ChromeContentRendererClient::
+@@ -982,7 +982,7 @@ WebPlugin* ChromeContentRendererClient::
         PluginUMAReporter::GetInstance()->ReportPluginDisabled(orig_mime_type,
                                                                url);
         if (info.name ==
--- 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
-@@ -1770,6 +1770,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1977,6 +1977,10 @@ const FeatureEntry kFeatureEntries[] = {
      "Enable stacking in tab strip",
      "Forces tabs to be stacked in the tab strip. Otherwise, they follow default behavior.",
      kOsAll, SINGLE_VALUE_TYPE("enable-stacked-tab-strip")},
@@ -15,7 +15,7 @@
      SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
 --- a/chrome/renderer/chrome_render_frame_observer.cc
 +++ b/chrome/renderer/chrome_render_frame_observer.cc
-@@ -129,9 +129,10 @@ ChromeRenderFrameObserver::ChromeRenderF
+@@ -130,9 +130,10 @@ ChromeRenderFrameObserver::ChromeRenderF
   if (!render_frame->IsMainFrame())
     return;
 
@@ -27,7 +27,7 @@
   if (!command_line.HasSwitch(switches::kDisableClientSidePhishingDetection))
     SetClientSidePhishingDetection(true);
 #endif
-@@ -365,14 +366,16 @@ void ChromeRenderFrameObserver::DidFinis
+@@ -369,14 +370,16 @@ void ChromeRenderFrameObserver::DidFinis
   if (frame->Parent())
     return;
 
@@ -79,7 +79,7 @@
 #include "base/debug/crash_logging.h"
 #include "base/format_macros.h"
 #include "base/metrics/histogram_macros.h"
-@@ -199,6 +200,12 @@ bool IsCreatedByExtension(const Template
+@@ -201,6 +202,12 @@ bool IsCreatedByExtension(const Template
          template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION;
 }
 
@@ -92,7 +92,7 @@
 }  // namespace
 
 // TemplateURLService::LessWithPrefix -----------------------------------------
-@@ -283,6 +290,7 @@ TemplateURLService::TemplateURLService(
+@@ -285,6 +292,7 @@ TemplateURLService::TemplateURLService(
     std::unique_ptr<TemplateURLServiceClient> client,
     const base::Closure& dsp_change_callback)
     : prefs_(prefs),
@@ -100,7 +100,7 @@
       search_terms_data_(std::move(search_terms_data)),
       web_data_service_(web_data_service),
       client_(std::move(client)),
-@@ -346,7 +354,7 @@ bool TemplateURLService::CanAddAutogener
+@@ -348,7 +356,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.
@@ -109,7 +109,7 @@
   }
 
   // We don't have a TemplateURL with keyword.  We still may not allow this
-@@ -355,8 +363,8 @@ bool TemplateURLService::CanAddAutogener
+@@ -357,8 +365,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.
@@ -120,7 +120,7 @@
 }
 
 bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
-@@ -1396,6 +1404,8 @@ SyncDataMap TemplateURLService::CreateGU
+@@ -1392,6 +1400,8 @@ SyncDataMap TemplateURLService::CreateGU
 
 void TemplateURLService::Init(const Initializer* initializers,
                               int num_initializers) {
@@ -129,7 +129,7 @@
   if (client_)
     client_->SetOwner(this);
 
-@@ -1617,6 +1627,9 @@ void TemplateURLService::ChangeToLoadedS
+@@ -1613,6 +1623,9 @@ void TemplateURLService::ChangeToLoadedS
 
 bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
     const std::string& host) const {
@@ -139,7 +139,7 @@
   const TemplateURLSet* urls = provider_map_->GetURLsForHost(host);
   if (!urls)
     return true;
-@@ -1627,7 +1640,8 @@ bool TemplateURLService::CanAddAutogener
+@@ -1623,7 +1636,8 @@ bool TemplateURLService::CanAddAutogener
 }
 
 bool TemplateURLService::CanReplace(const TemplateURL* t_url) const {
@@ -151,7 +151,7 @@
 TemplateURL* TemplateURLService::FindNonExtensionTemplateURLForKeyword(
 --- a/components/search_engines/template_url_service.h
 +++ b/components/search_engines/template_url_service.h
-@@ -728,6 +728,8 @@ class TemplateURLService : public WebDat
+@@ -731,6 +731,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
-@@ -249,6 +249,16 @@ const unsigned kOsDesktop = kOsMac | kOs
+@@ -254,6 +254,16 @@ const unsigned kOsDesktop = kOsMac | kOs
 const unsigned kOsAura = kOsWin | kOsLinux | kOsCrOS;
 #endif  // USE_AURA || OS_ANDROID
 
@@ -20,10 +20,10 @@
 const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
     {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
     {flags_ui::kGenericExperimentChoiceEnabled,
-@@ -1752,6 +1762,10 @@ const FeatureEntry::Choice kWebOtpBacken
- //
- // When adding a new choice, add it to the end of the list.
- const FeatureEntry kFeatureEntries[] = {
+@@ -1959,6 +1969,10 @@ const FeatureEntry kFeatureEntries[] = {
+ // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
+ // //tools/flags/generate_unexpire_flags.py.
+ #include "chrome/browser/unexpire_flags_gen.inc"
 +    {"extension-mime-request-handling",
 +     "Handling of extension MIME type requests",
 +     "Used when deciding how to handle a request for a CRX or User Script MIME type",
@@ -107,7 +107,7 @@
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/stl_util.h"
-@@ -203,6 +204,13 @@ bool ExtensionManagement::IsInstallation
+@@ -191,6 +192,13 @@ bool ExtensionManagement::IsInstallation
 bool ExtensionManagement::IsOffstoreInstallAllowed(
     const GURL& url,
     const GURL& referrer_url) const {
--- 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
-@@ -1774,6 +1774,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1981,6 +1981,10 @@ const FeatureEntry kFeatureEntries[] = {
      "Disable search engine collection",
      "Prevents search engines from being added automatically.",
      kOsAll, SINGLE_VALUE_TYPE("disable-search-engine-collection")},
--- 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
-@@ -272,6 +272,16 @@ const FeatureEntry::Choice kShowAvatarBu
+@@ -277,6 +277,16 @@ const FeatureEntry::Choice kShowAvatarBu
      "never"}
 };
 
@@ -17,7 +17,7 @@
 const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
     {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
     {flags_ui::kGenericExperimentChoiceEnabled,
-@@ -3922,6 +3932,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4209,6 +4219,11 @@ const FeatureEntry kFeatureEntries[] = {
      FEATURE_VALUE_TYPE(
          autofill::features::kAutofillEnableAccountWalletStorage)},
 
@@ -39,7 +39,7 @@
 #include "base/metrics/user_metrics.h"
 #include "base/task/post_task.h"
 #include "base/task/thread_pool.h"
-@@ -100,6 +101,18 @@ int GetDropEffect(const ui::DropTargetEv
+@@ -99,6 +100,18 @@ int GetDropEffect(const ui::DropTargetEv
   return ui::DragDropTypes::DRAG_MOVE;
 }
 
@@ -58,7 +58,7 @@
 }  // namespace
 
 BrowserRootView::DropInfo::DropInfo() = default;
-@@ -114,7 +127,9 @@ const char BrowserRootView::kViewClassNa
+@@ -113,7 +126,9 @@ const char BrowserRootView::kViewClassNa
 
 BrowserRootView::BrowserRootView(BrowserView* browser_view,
                                  views::Widget* widget)
@@ -69,7 +69,7 @@
 
 BrowserRootView::~BrowserRootView() {
   // It's possible to destroy the browser while a drop is active.  In this case,
-@@ -259,7 +274,7 @@ const char* BrowserRootView::GetClassNam
+@@ -258,7 +273,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
-@@ -259,6 +259,19 @@ const FeatureEntry::Choice kExtensionHan
+@@ -264,6 +264,19 @@ const FeatureEntry::Choice kExtensionHan
      "always-prompt-for-install"},
 };
 
@@ -20,7 +20,7 @@
 const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
     {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
     {flags_ui::kGenericExperimentChoiceEnabled,
-@@ -4023,6 +4036,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4327,6 +4340,11 @@ const FeatureEntry kFeatureEntries[] = {
      FEATURE_VALUE_TYPE(arc::kEnableUnifiedAudioFocusFeature)},
 #endif  // defined(OS_CHROMEOS)
 
--- a/patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch
+++ b/patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch
@@ -2,10 +2,10 @@

 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1752,6 +1752,10 @@ const FeatureEntry::Choice kWebOtpBacken
- //
- // When adding a new choice, add it to the end of the list.
- const FeatureEntry kFeatureEntries[] = {
+@@ -1959,6 +1959,10 @@ const FeatureEntry kFeatureEntries[] = {
+ // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
+ // //tools/flags/generate_unexpire_flags.py.
+ #include "chrome/browser/unexpire_flags_gen.inc"
 +    {"enable-stacked-tab-strip",
 +     "Enable stacking in tab strip",
 +     "Forces tabs to be stacked in the tab strip. Otherwise, they follow default behavior.",
--- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch
+++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch
@@ -23,7 +23,7 @@
 enum DnsResolveStatus {
   RESOLVE_STATUS_DNS_SUCCESS = 0,
   RESOLVE_STATUS_PROC_SUCCESS,
-@@ -3565,7 +3561,7 @@ bool HostResolverManager::IsIPv6Reachabl
+@@ -3586,7 +3582,7 @@ bool HostResolverManager::IsIPv6Reachabl
       (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
           kIPv6ProbePeriodMs) {
     SetLastIPv6ProbeResult(
--- a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
+++ b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
@@ -3,7 +3,7 @@

 --- a/chrome/browser/resources/settings/search_engines_page/search_engine_dialog.html
 +++ b/chrome/browser/resources/settings/search_engines_page/search_engine_dialog.html
-@@ -31,6 +31,13 @@
+@@ -20,6 +20,13 @@
             value="{{queryUrl_}}" on-focus="validate_" on-input="validate_"
             disabled$="[[model.urlLocked]]">
         </cr-input>
@@ -19,7 +19,7 @@
         <cr-button class="cancel-button" on-click="cancel_" id="cancel">
 --- a/chrome/browser/resources/settings/search_engines_page/search_engine_dialog.js
 +++ b/chrome/browser/resources/settings/search_engines_page/search_engine_dialog.js
-@@ -29,6 +29,9 @@ Polymer({
+@@ -42,6 +42,9 @@ Polymer({
     queryUrl_: String,
 
     /** @private {string} */
@@ -29,7 +29,7 @@
     dialogTitle_: String,
 
     /** @private {string} */
-@@ -62,6 +65,7 @@ Polymer({
+@@ -75,6 +78,7 @@ Polymer({
       this.searchEngine_ = this.model.name;
       this.keyword_ = this.model.keyword;
       this.queryUrl_ = this.model.url;
@@ -37,7 +37,7 @@
     } else {
       this.dialogTitle_ =
           loadTimeData.getString('searchEnginesAddSearchEngine');
-@@ -99,8 +103,12 @@ Polymer({
+@@ -112,8 +116,12 @@ Polymer({
       }
     }
 
@@ -52,7 +52,7 @@
   },
 
   /** @private */
-@@ -111,7 +119,8 @@ Polymer({
+@@ -124,7 +132,8 @@ Polymer({
   /** @private */
   onActionButtonTap_() {
     this.browserProxy_.searchEngineEditCompleted(
@@ -62,7 +62,7 @@
     this.$.dialog.close();
   },
 
-@@ -148,9 +157,11 @@ Polymer({
+@@ -161,9 +170,11 @@ Polymer({
   /** @private */
   updateActionButtonState_() {
     const allValid = [
@@ -417,7 +417,7 @@
 
 --- a/components/search_engines/template_url_service.cc
 +++ b/components/search_engines/template_url_service.cc
-@@ -605,7 +605,8 @@ void TemplateURLService::IncrementUsageC
+@@ -607,7 +607,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());
-@@ -619,6 +620,7 @@ void TemplateURLService::ResetTemplateUR
+@@ -621,6 +622,7 @@ void TemplateURLService::ResetTemplateUR
   }
   data.safe_for_autoreplace = false;
   data.last_modified = clock_->Now();
@@ -435,7 +435,7 @@
   Update(url, TemplateURL(data));
 }
 
-@@ -1978,7 +1980,7 @@ TemplateURL* TemplateURLService::Add(std
+@@ -1974,7 +1976,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(),
--- a/patches/extra/ungoogled-chromium/default-to-https-scheme.patch
+++ b/patches/extra/ungoogled-chromium/default-to-https-scheme.patch
@@ -57,7 +57,7 @@
 void AutocompleteInput::UpdateText(const base::string16& text,
 --- a/components/omnibox/browser/autocomplete_provider.cc
 +++ b/components/omnibox/browser/autocomplete_provider.cc
-@@ -239,11 +239,11 @@ size_t AutocompleteProvider::TrimHttpPre
+@@ -243,11 +243,11 @@ size_t AutocompleteProvider::TrimHttpPre
   if (!AutocompleteInput::HasHTTPScheme(*url))
     return 0;
   size_t scheme_pos =
--- a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch
+++ b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch
@@ -175,7 +175,7 @@
 }  // namespace download
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -55,7 +55,6 @@ jumbo_source_set("browser") {
+@@ -56,7 +56,6 @@ jumbo_source_set("browser") {
     "//components/discardable_memory/service",
     "//components/download/database",
     "//components/download/public/common:public",
--- a/patches/extra/ungoogled-chromium/enable-checkbox-external-protocol.patch
+++ b/patches/extra/ungoogled-chromium/enable-checkbox-external-protocol.patch
@@ -1,12 +0,0 @@
-# Return "Always open links of this type in the associated app" checkbox.
-
--- a/chrome/browser/ui/browser_ui_prefs.cc
-+++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -135,6 +135,6 @@ void RegisterBrowserUserPrefs(user_prefs
-   registry->RegisterBooleanPref(prefs::kUserFeedbackAllowed, true);
-   registry->RegisterBooleanPref(prefs::kAllowSyncXHRInPageDismissal, false);
-   registry->RegisterBooleanPref(
-      prefs::kExternalProtocolDialogShowAlwaysOpenCheckbox, false);
-+      prefs::kExternalProtocolDialogShowAlwaysOpenCheckbox, true);
-   registry->RegisterBooleanPref(prefs::kScreenCaptureAllowed, true);
- }
--- a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch
+++ b/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch
@@ -2,7 +2,7 @@

 --- a/chrome/browser/ui/browser_commands.cc
 +++ b/chrome/browser/ui/browser_commands.cc
-@@ -387,12 +387,6 @@ int GetContentRestrictions(const Browser
+@@ -390,12 +390,6 @@ int GetContentRestrictions(const Browser
     CoreTabHelper* core_tab_helper =
         CoreTabHelper::FromWebContents(current_tab);
     content_restrictions = core_tab_helper->content_restrictions();
@@ -15,7 +15,7 @@
     if (current_tab->ShowingInterstitialPage())
       content_restrictions |= CONTENT_RESTRICTION_PRINT;
   }
-@@ -1119,8 +1113,7 @@ bool CanSavePage(const Browser* browser)
+@@ -1139,8 +1133,7 @@ bool CanSavePage(const Browser* browser)
           prefs::kAllowFileSelectionDialogs)) {
     return false;
   }
--- 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
@@ -13,7 +13,7 @@
       AddChildView(std::make_unique<views::InkDropContainerView>());
 --- a/chrome/browser/ui/views/tabs/tab_strip.cc
 +++ b/chrome/browser/ui/views/tabs/tab_strip.cc
-@@ -3410,15 +3410,12 @@ void TabStrip::ButtonPressed(views::Butt
+@@ -3364,15 +3364,12 @@ void TabStrip::ButtonPressed(views::Butt
 
       const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
       if (mouse.IsOnlyMiddleMouseButton()) {
--- a/patches/series
+++ b/patches/series
@@ -79,7 +79,6 @@ extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch
 extra/ungoogled-chromium/default-to-https-scheme.patch
 extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch
 extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch
-extra/ungoogled-chromium/enable-checkbox-external-protocol.patch
 extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch
 extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch
 extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
--- a/pruning.list
+++ b/pruning.list
@@ -1,5 +1,4 @@
 android_webview/test/shell/assets/star.svgz
-android_webview/test/shell/assets/video.3gp
 android_webview/test/shell/assets/video.webm
 android_webview/tools/webview_log_verbosifier/gradle/wrapper/gradle-wrapper.jar
 ash/display/test_data/06af5c10.icc
@@ -56,6 +55,7 @@ chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/ski
 chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/wrap.ogg
 chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/wrap_edge.ogg
 chrome/browser/resources/chromeos/accessibility/select_to_speak/earcons/null_selection.ogg
+chrome/browser/resources/chromeos/camera/src/js/lib/ffmpeg.wasm
 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
@@ -250,7 +250,8 @@ device/fido/response_data_fuzzer_corpus/make_credential_response_corpus
 device/fido/response_data_fuzzer_corpus/register1
 device/fido/response_data_fuzzer_corpus/sign0
 device/fido/response_data_fuzzer_corpus/sign1
-fuchsia/engine/test/data/bear-opus.webm
+fuchsia/engine/test/data/bear-44.1kHz.webm
+fuchsia/engine/test/data/bear-48kHz.webm
 fuchsia/engine/test/data/bear-vp8a.webm
 headless/test/data/protocol/emulation/resources/video.webm
 ios/chrome/test/data/sessions/corrupted.plist
@@ -4265,6 +4266,7 @@ third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Noronha
 third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/North_Dakota/Beulah
 third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/North_Dakota/Center
 third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/North_Dakota/New_Salem
+third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Nuuk
 third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Ojinaga
 third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Panama
 third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Pangnirtung
@@ -9735,20 +9737,27 @@ third_party/depot_tools/ninja-linux32
 third_party/depot_tools/ninja-linux64
 third_party/depot_tools/ninja-mac
 third_party/depot_tools/ninja.exe
+third_party/devtools-frontend/src/back_end/CXXDWARFSymbols/unittests/Inputs/array.wasm
+third_party/devtools-frontend/src/back_end/CXXDWARFSymbols/unittests/Inputs/classstatic.wasm
+third_party/devtools-frontend/src/back_end/CXXDWARFSymbols/unittests/Inputs/compound.wasm
+third_party/devtools-frontend/src/back_end/CXXDWARFSymbols/unittests/Inputs/global.wasm
+third_party/devtools-frontend/src/back_end/CXXDWARFSymbols/unittests/Inputs/hello.wasm
+third_party/devtools-frontend/src/back_end/CXXDWARFSymbols/unittests/Inputs/inline.wasm
+third_party/devtools-frontend/src/back_end/CXXDWARFSymbols/unittests/Inputs/namespaces.wasm
+third_party/devtools-frontend/src/back_end/CXXDWARFSymbols/unittests/Inputs/params.wasm
+third_party/devtools-frontend/src/back_end/CXXDWARFSymbols/unittests/Inputs/string.wasm
 third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/pkg/wasm_source_map_bg.wasm
+third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/fsevents.node
 third_party/devtools-frontend/src/node_modules/fsevents/fsevents.node
-third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/lib/mappings.wasm
-third_party/devtools-frontend/src/node_modules/querystring/.History.md.un~
-third_party/devtools-frontend/src/node_modules/querystring/.Readme.md.un~
-third_party/devtools-frontend/src/node_modules/querystring/.package.json.un~
-third_party/devtools-frontend/src/node_modules/querystring/test/.index.js.un~
-third_party/devtools-frontend/src/node_modules/timers-browserify/.DS_Store
+third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/fsevents.node
+third_party/devtools-frontend/src/node_modules/tar-fs/test/fixtures/invalid.tar
 third_party/devtools-frontend/src/node_modules/ws/lib/.DS_Store
 third_party/devtools-frontend/src/scripts/closure/closure_runner/closure_runner.jar
 third_party/devtools-frontend/src/scripts/closure/compiler.jar
 third_party/devtools-frontend/src/scripts/jsdoc_validator/jsdoc_validator.jar
 third_party/devtools-frontend/src/test/e2e/resources/media/fisch.webm
-third_party/devtools-frontend/src/test/e2e/resources/pages/callstack-wasm-to-js.wasm
+third_party/devtools-frontend/src/test/e2e/resources/sources/wasm/add.wasm
+third_party/devtools-frontend/src/test/e2e/resources/sources/wasm/callstack-wasm-to-js.wasm
 third_party/devtools-frontend/src/test/e2e/resources/sources/wasm/global_variable.wasm
 third_party/devtools-frontend/src/test/e2e/resources/sources/wasm/global_variable_with_dwarf.wasm
 third_party/devtools-frontend/src/test/e2e/resources/sources/wasm/unreachable.wasm
@@ -14513,6 +14522,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-shape-fuzzer-5764636557705216
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5768046065483776
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5768601332613120
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-5769590820044800
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-shape-fuzzer-6306977171374080
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5067936541179904
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5077547978588160
@@ -14550,6 +14560,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-5677906231033856
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5678476148867072
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5680398559870976
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5684014636859392
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5685097303375872
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5690658895953920
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5695279609675776
@@ -14558,6 +14569,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-5696607199166464
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5696825891225600
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5697351339999232
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5704307501694976
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5708063625969664
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5708764082864128
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5710107829075968
@@ -14588,6 +14600,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-5756658848890880
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5758358618898432
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5758598970343424
+third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5759725666041856
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5759783999635456
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5760768497156096
 third_party/harfbuzz-ng/src/test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5761434614497280
@@ -15179,6 +15192,12 @@ third_party/icu/tzres/metaZones.res
 third_party/icu/tzres/timezoneTypes.res
 third_party/icu/tzres/zoneinfo64.res
 third_party/jetifier_standalone/lib/jetifier-standalone.jar
+third_party/libavif/src/tests/data/cosmos1650_yuv444_10bpc_p3pq.y4m
+third_party/libavif/src/tests/data/kodim03_yuv420_8bpc.y4m
+third_party/libavif/src/tests/data/kodim23_yuv420_8bpc.y4m
+third_party/libavif/src/tests/data/originals/cosmos1650_yuv444_10bpc_p3pq.avif
+third_party/libavif/src/tests/data/originals/kodim03_yuv420_8bpc.avif
+third_party/libavif/src/tests/data/originals/kodim23_yuv420_8bpc.avif
 third_party/libdrm/src/intel/tests/gen4-3d.batch
 third_party/libdrm/src/intel/tests/gen5-3d.batch
 third_party/libdrm/src/intel/tests/gen6-3d.batch
@@ -17215,6 +17234,7 @@ 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/flang/test/Evaluate/folding05.f90
 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
@@ -17290,6 +17310,9 @@ third_party/llvm/lldb/test/API/functionalities/postmortem/elf-core/altmain.core
 third_party/llvm/lldb/test/API/functionalities/postmortem/elf-core/altmain.out
 third_party/llvm/lldb/test/API/functionalities/postmortem/elf-core/gcore/linux-i386.core
 third_party/llvm/lldb/test/API/functionalities/postmortem/elf-core/gcore/linux-x86_64.core
+third_party/llvm/lldb/test/API/functionalities/postmortem/elf-core/linux-aarch64-neon.core
+third_party/llvm/lldb/test/API/functionalities/postmortem/elf-core/linux-aarch64.core
+third_party/llvm/lldb/test/API/functionalities/postmortem/elf-core/linux-aarch64.out
 third_party/llvm/lldb/test/API/functionalities/postmortem/elf-core/linux-arm.core
 third_party/llvm/lldb/test/API/functionalities/postmortem/elf-core/linux-fpr_sse_i386.core
 third_party/llvm/lldb/test/API/functionalities/postmortem/elf-core/linux-fpr_sse_x86_64.core
@@ -17329,6 +17352,8 @@ third_party/llvm/lldb/test/API/functionalities/postmortem/netbsd-core/2lwp_t2_SI
 third_party/llvm/lldb/test/API/functionalities/postmortem/wow64_minidump/fizzbuzz_wow64.dmp
 third_party/llvm/lldb/test/API/functionalities/unwind/noreturn/module-end/test.core
 third_party/llvm/lldb/test/API/functionalities/unwind/noreturn/module-end/test.out
+third_party/llvm/lldb/test/API/tools/lldb-vscode/coreFile/linux-x86_64.core
+third_party/llvm/lldb/test/API/tools/lldb-vscode/coreFile/linux-x86_64.out
 third_party/llvm/lldb/test/Shell/Minidump/Windows/Sigsegv/Inputs/sigsegv.dmp
 third_party/llvm/lldb/test/Shell/Minidump/Windows/Sigsegv/Inputs/sigsegv.pdb
 third_party/llvm/lldb/test/Shell/ObjectFile/ELF/Inputs/PT_LOAD-overlap-section.elf
@@ -17353,6 +17378,7 @@ third_party/llvm/llvm/test/Assembler/invalid-name.ll
 third_party/llvm/llvm/test/Assembler/invalid-name2.ll
 third_party/llvm/llvm/test/Bindings/llvm-c/Inputs/invalid.ll.bc
 third_party/llvm/llvm/test/Bitcode/DICompileUnit-no-DWOId.ll.bc
+third_party/llvm/llvm/test/Bitcode/DIEnumerator-10.0.ll.bc
 third_party/llvm/llvm/test/Bitcode/DIExpression-4.0.ll.bc
 third_party/llvm/llvm/test/Bitcode/DIExpression-aggresult.ll.bc
 third_party/llvm/llvm/test/Bitcode/DIExpression-deref.ll.bc
@@ -17837,6 +17863,7 @@ 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/Transforms/SampleProfile/Inputs/inline.md5extbinary.afdo
 third_party/llvm/llvm/test/Transforms/SampleProfile/Inputs/profsampleacc.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
@@ -17913,6 +17940,8 @@ third_party/llvm/llvm/test/tools/dsymutil/Inputs/odr-uniquing/2.o
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/op-convert.macho.x86_64
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/private/tmp/baseaddr/loc1.o
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/private/tmp/baseaddr/loc1.x86_64
+third_party/llvm/llvm/test/tools/dsymutil/Inputs/private/tmp/call_pc/main.arm64
+third_party/llvm/llvm/test/tools/dsymutil/Inputs/private/tmp/call_pc/main.arm64.o
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/private/tmp/call_return_pc/call
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/private/tmp/call_return_pc/call.o
 third_party/llvm/llvm/test/tools/dsymutil/Inputs/private/tmp/common/common.x86_64
@@ -18373,8 +18402,6 @@ third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/got-tls.so.elf-mips64el
 third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/mips-options.elf-mips64el
 third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/mips-rld-map-rel.elf-mipsel
 third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/options.obj.elf-mipsel
-third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/phdrs-elf.exe-i386
-third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/phdrs-elf.exe-x86_64
 third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/ppc64.exe
 third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/reginfo.obj.elf-mipsel
 third_party/llvm/llvm/test/tools/llvm-readobj/ELF/Inputs/trivial.obj.elf-amdhsa-gfx803
@@ -18432,19 +18459,21 @@ third_party/llvm/llvm/test/tools/llvm-xray/X86/Inputs/fdr-log-version-3.xray
 third_party/llvm/llvm/test/tools/llvm-xray/X86/Inputs/instr-map-mach.o
 third_party/llvm/llvm/test/tools/llvm-xray/X86/Inputs/naive-log-simple.xray
 third_party/llvm/llvm/test/tools/llvm-xray/X86/Inputs/naive-with-arg1-entries.xray
-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/XCOFF/Inputs/aix_xcoff.o
+third_party/llvm/llvm/test/tools/obj2yaml/XCOFF/Inputs/aix_xcoff_truncated_file_header.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
 third_party/llvm/llvm/test/tools/sancov/Inputs/test-linux_x86_64.0.sancov
 third_party/llvm/llvm/test/tools/sancov/Inputs/test-linux_x86_64.1.sancov
 third_party/llvm/llvm/test/tools/sancov/Inputs/test-windows_x86_64
+third_party/llvm/llvm/unittests/DebugInfo/PDB/Inputs/SimpleTest.exe
+third_party/llvm/llvm/unittests/DebugInfo/PDB/Inputs/SimpleTest.pdb
 third_party/llvm/llvm/unittests/DebugInfo/PDB/Inputs/empty.pdb
 third_party/llvm/llvm/utils/lit/tests/Inputs/shtest-shell/cat_nonprinting.bin
 third_party/llvm/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.bin
 third_party/llvm/llvm/utils/lit/tests/Inputs/shtest-shell/diff-in.utf16
-third_party/llvm/mlir/test/IR/parser.mlir
+third_party/llvm/mlir/test/IR/zero_whitespace.mlir
 third_party/lzma_sdk/7zr.exe
 third_party/lzma_sdk/Executable/7za.exe
 third_party/minizip/minizip_uncompress_corpus/As.zip
@@ -18505,6 +18534,7 @@ third_party/openh264/src/res/CVPCMNL1_SVA_C.264
 third_party/openh264/src/res/CiscoVT2people_160x96_6fps.yuv
 third_party/openh264/src/res/CiscoVT2people_320x192_12fps.yuv
 third_party/openh264/src/res/Cisco_Absolute_Power_1280x720_30fps.yuv
+third_party/openh264/src/res/Cisco_Adobe_PDF_sample_a_1024x768_CAVLC_Bframe_9.264
 third_party/openh264/src/res/Cisco_Men_whisper_640x320_CABAC_Bframe_9.264
 third_party/openh264/src/res/Cisco_Men_whisper_640x320_CAVLC_Bframe_9.264
 third_party/openh264/src/res/Error_I_P.264
@@ -18530,6 +18560,12 @@ third_party/openh264/src/res/SVA_NL2_E.264
 third_party/openh264/src/res/SarVui.264
 third_party/openh264/src/res/Static.264
 third_party/openh264/src/res/Static_152_100.yuv
+third_party/openh264/src/res/VID_1280x544_cabac_temporal_direct.264
+third_party/openh264/src/res/VID_1280x544_cavlc_temporal_direct.264
+third_party/openh264/src/res/VID_1280x720_cabac_temporal_direct.264
+third_party/openh264/src/res/VID_1280x720_cavlc_temporal_direct.264
+third_party/openh264/src/res/VID_1920x1080_cabac_temporal_direct.264
+third_party/openh264/src/res/VID_1920x1080_cavlc_temporal_direct.264
 third_party/openh264/src/res/Zhling_1280x720.264
 third_party/openh264/src/res/jm_1080p_allslice.264
 third_party/openh264/src/res/sps_subsetsps_bothVUI.264
@@ -19923,6 +19959,12 @@ third_party/usrsctp/usrsctplib/fuzzer/CORPUS_CONNECT/tsctp-000056
 third_party/usrsctp/usrsctplib/fuzzer/CORPUS_CONNECT/tsctp-000057
 third_party/usrsctp/usrsctplib/fuzzer/CORPUS_CONNECT/tsctp-000058
 third_party/usrsctp/usrsctplib/fuzzer/CORPUS_LISTEN/init-1.bin
+third_party/vulkan_memory_allocator/bin/Shader.frag.spv
+third_party/vulkan_memory_allocator/bin/Shader.vert.spv
+third_party/vulkan_memory_allocator/bin/SparseBindingTest.comp.spv
+third_party/vulkan_memory_allocator/bin/VmaReplay_Release_vs2017.exe
+third_party/vulkan_memory_allocator/bin/VulkanSample_Release_vs2017.exe
+third_party/vulkan_memory_allocator/premake/premake5.exe
 third_party/wayland/src/cursor/cursor.pcf
 third_party/wds/src/datadumps/information-elements.pcapng
 third_party/webgl/src/conformance-suites/1.0.0/conformance/resources/red-green.mp4
@@ -20280,7 +20322,6 @@ third_party/wuffs/src/test/data/romeo.txt.fixed-huff.deflate
 third_party/wuffs/src/test/data/romeo.txt.gz
 third_party/wuffs/src/test/data/romeo.txt.zlib
 third_party/wuffs/src/test/data/sheep-more.rac
-third_party/yasm/source/patched-yasm/tools/re2c/doc/loplas.ps.gz
 third_party/zlib/google/test/data/evil.zip
 third_party/zlib/google/test/data/evil_via_absolute_file_name.zip
 third_party/zlib/google/test/data/evil_via_invalid_utf8.zip