diff --git a/DEPS b/DEPS
index 26416479ba34f5..cf7a1c985a9b02 100644
--- a/DEPS
+++ b/DEPS
@@ -239,15 +239,15 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
-  'skia_revision': 'd26057a2c0e1e35a2f3a498769a27d8f8b6b1e62',
+  'skia_revision': 'f74c7893fc17685e34089af7c81446e23cfab4ad',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
-  'v8_revision': '8a05d7add33e40e73aac9fc43b4d9cce04adeaca',
+  'v8_revision': 'b5bf62dafe52d10d65bfd2e378d658b5b3b04a5e',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ANGLE
   # and whatever else without interference from each other.
-  'angle_revision': '42bd4fc29aea6c0c1722d3604b0eadf7fb1e9aca',
+  'angle_revision': 'fefd7ae66ad94d8fcb16ef9f5f7304c1b4b9fbf8',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
@@ -306,7 +306,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling catapult
   # and whatever else without interference from each other.
-  'catapult_revision': 'e3f9ae73db5135ad998108113af7ef82a47efc51',
+  'catapult_revision': '563885e399ba18672cd7d009a0c0f0a996d71f6b',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libFuzzer
   # and whatever else without interference from each other.
@@ -314,7 +314,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling devtools-frontend
   # and whatever else without interference from each other.
-  'devtools_frontend_revision': 'a1121f966ce5590b46706befdf60e3350a5cf2d1',
+  'devtools_frontend_revision': '5fec567a800a98035a5c7aa02eebf93d3690e484',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libprotobuf-mutator
   # and whatever else without interference from each other.
@@ -354,7 +354,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
-  'dawn_revision': '4682ae0034e7929dbea9b064ff39f6953eec406b',
+  'dawn_revision': 'f296710f64b6625d204262c09463401def70cea6',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
@@ -716,7 +716,7 @@ deps = {
       'packages': [
         {
           'package': 'chromium/rts/model/linux-amd64',
-          'version': 'vdD8aHXAya55_zVdy0rcmEfQix9y1GLancfERg2yKc8C',
+          'version': 'h4OErwvGMzWmTzk59jLdAUp9o00HkQ6vKZlwtDCstocC',
         },
       ],
       'dep_type': 'cipd',
@@ -727,7 +727,7 @@ deps = {
       'packages': [
         {
           'package': 'chromium/rts/model/mac-amd64',
-          'version': 'yVc-vTWsYEzs3l22SOOsPdO_AWBNR3HP71lX3Q4VQQYC',
+          'version': 'ST_XL0WVEj5Xxvj-kAcMuyZsvgGw_VNlvbupF6-aFXUC',
         },
       ],
       'dep_type': 'cipd',
@@ -738,7 +738,7 @@ deps = {
       'packages': [
         {
           'package': 'chromium/rts/model/windows-amd64',
-          'version': 'tI4WdYbciNIAG3pe4wvAouTF40XTOBKIAMEZ0h_TQT8C',
+          'version': 'K9BP5YhVbtP-iXTbJU0dbwRi9gaMI_w2x0OtulD3R_oC',
         },
       ],
       'dep_type': 'cipd',
@@ -799,7 +799,7 @@ deps = {
     'packages': [
       {
           'package': 'chromium/third_party/androidx',
-          'version': 'juajBfBlqvumlCoLLOxvOPlX6cPvfNhDi8XyKP4yjTEC',
+          'version': 'Cd5XvW44KjLwajSIYoTsODMnpNKBR--BNLPfpIDKGeAC',
       },
     ],
     'condition': 'checkout_android',
@@ -1018,7 +1018,7 @@ deps = {
   # Tools used when building Chrome for Chrome OS. This affects both the Simple
   # Chrome workflow, as well as the chromeos-chrome ebuild.
   'src/third_party/chromite': {
-      'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + 'fff14ebdcbb0fd75801af82d2765758efa1ec579',
+      'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '7f13e5c5ff2def048f60931a4f09bdcc0c7c3965',
       'condition': 'checkout_chromeos',
   },
 
@@ -1033,7 +1033,7 @@ deps = {
 
   # For Linux and Chromium OS.
   'src/third_party/cros_system_api': {
-      'url': Var('chromium_git') + '/chromiumos/platform2/system_api.git' + '@' + '738cc02fc3beb133d085f871e2534416baf5afc7',
+      'url': Var('chromium_git') + '/chromiumos/platform2/system_api.git' + '@' + '188fb4eba05af428a48c7ce173a3026215241850',
       'condition': 'checkout_linux',
   },
 
@@ -1421,7 +1421,7 @@ deps = {
   },
 
   'src/third_party/perfetto':
-    Var('android_git') + '/platform/external/perfetto.git' + '@' + '1357bd132733ccc23a295739e4bc432d7a53d120',
+    Var('android_git') + '/platform/external/perfetto.git' + '@' + 'f9abf9948a180a56a3595ec54ff9f2f5c2c9947c',
 
   'src/third_party/perl': {
       'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3',
@@ -1642,7 +1642,7 @@ deps = {
     Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '216e2ff413d3ed5e7695626bb55ae41575818352',
 
   'src/third_party/webrtc':
-    Var('webrtc_git') + '/src.git' + '@' + '699d1a242ecd3ca819293cfa96f5dcf8f5e1b91a',
+    Var('webrtc_git') + '/src.git' + '@' + '63b97de330fe3d4775b9b4df8ad15c7593d58fc0',
 
   'src/third_party/libgifcodec':
      Var('skia_git') + '/libgifcodec' + '@'+  Var('libgifcodec_revision'),
@@ -1700,7 +1700,7 @@ deps = {
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@d49909553bd8838195664ca9df5b36229c2582da',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@c258c12674403e7c685e3462d136b29560e6b4d8',
     'condition': 'checkout_src_internal',
   },
 
@@ -1719,7 +1719,7 @@ deps = {
     'packages': [
       {
         'package': 'chromeos_internal/apps/help_app/app',
-        'version': 'uwAu1UD0oDj17zqx0Af0wZnVecasHn1pBC4V6A3JBRwC',
+        'version': 'RcDM8Mq_LrCGiuxfQto-gkDVFbqCRy6FE8lzPeHsNEwC',
       },
     ],
     'condition': 'checkout_chromeos and checkout_src_internal',
@@ -1730,7 +1730,7 @@ deps = {
     'packages': [
       {
         'package': 'chromeos_internal/apps/media_app/app',
-        'version': 'Hm4ipUPiXd-gzWDEbyraNGipQikDIbxi1Xc70s6BwWQC',
+        'version': 'OEszP2fR0fctn9Qr3fnIElqnNLPxHyhTUfWfaiiLVckC',
       },
     ],
     'condition': 'checkout_chromeos and checkout_src_internal',
diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw_contents.cc
index 0cb2f1c607daf0..d824169e051486 100644
--- a/android_webview/browser/aw_contents.cc
+++ b/android_webview/browser/aw_contents.cc
@@ -79,6 +79,7 @@
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/navigation_handle.h"
+#include "content/public/browser/page.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ -1512,21 +1513,20 @@ void AwContents::RenderViewHostChanged(content::RenderViewHost* old_host,
       new_host->GetWidget()->GetFrameSinkId());
 }
 
-void AwContents::DidFinishNavigation(
-    content::NavigationHandle* navigation_handle) {
-  // If this request was blocked in any way, broadcast an error.
-  net::Error error_code = navigation_handle->GetNetErrorCode();
-
-  bool navigation_successful_and_scheme_http_or_https =
-      ((error_code == net::OK) &&
-       navigation_handle->GetURL().SchemeIsHTTPOrHTTPS());
-  if (navigation_successful_and_scheme_http_or_https != scheme_http_or_https_) {
-    scheme_http_or_https_ = navigation_successful_and_scheme_http_or_https;
+void AwContents::PrimaryPageChanged(content::Page& page) {
+  std::string scheme = page.GetMainDocument().GetLastCommittedURL().scheme();
+  if (scheme_ != scheme) {
+    scheme_ = scheme;
     AwBrowserProcess::GetInstance()
         ->visibility_metrics_logger()
         ->ClientVisibilityChanged(this);
   }
+}
 
+void AwContents::DidFinishNavigation(
+    content::NavigationHandle* navigation_handle) {
+  // If this request was blocked in any way, broadcast an error.
+  net::Error error_code = navigation_handle->GetNetErrorCode();
   if (!net::IsRequestBlockedError(error_code) &&
       error_code != net::ERR_ABORTED) {
     return;
@@ -1582,7 +1582,8 @@ VisibilityMetricsLogger::VisibilityInfo AwContents::GetVisibilityInfo() {
   return VisibilityMetricsLogger::VisibilityInfo{
       browser_view_renderer_.attached_to_window(),
       browser_view_renderer_.view_visible(),
-      browser_view_renderer_.window_visible(), scheme_http_or_https_};
+      browser_view_renderer_.window_visible(),
+      VisibilityMetricsLogger::SchemeStringToEnum(scheme_)};
 }
 
 void AwContents::RendererUnresponsive(
diff --git a/android_webview/browser/aw_contents.h b/android_webview/browser/aw_contents.h
index 2c8885fe9c8978..7e19b9e14e491d 100644
--- a/android_webview/browser/aw_contents.h
+++ b/android_webview/browser/aw_contents.h
@@ -389,6 +389,7 @@ class AwContents : public FindHelper::Listener,
   // content::WebContentsObserver overrides
   void RenderViewHostChanged(content::RenderViewHost* old_host,
                              content::RenderViewHost* new_host) override;
+  void PrimaryPageChanged(content::Page& page) override;
   void DidFinishNavigation(
       content::NavigationHandle* navigation_handle) override;
 
@@ -428,7 +429,7 @@ class AwContents : public FindHelper::Listener,
   std::unique_ptr<js_injection::JsCommunicationHost> js_communication_host_;
 
   bool view_tree_force_dark_state_ = false;
-  bool scheme_http_or_https_ = false;
+  std::string scheme_;
 
   // GURL is supplied by the content layer as requesting frame.
   // Callback is supplied by the content layer, and is invoked with the result
diff --git a/android_webview/browser/metrics/visibility_metrics_logger.cc b/android_webview/browser/metrics/visibility_metrics_logger.cc
index 417bdbebb9204a..8784c5abdb92ba 100644
--- a/android_webview/browser/metrics/visibility_metrics_logger.cc
+++ b/android_webview/browser/metrics/visibility_metrics_logger.cc
@@ -11,6 +11,7 @@
 #include "base/metrics/histogram_base.h"
 #include "base/time/time.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/common/url_constants.h"
 
 using content::BrowserThread;
 
@@ -41,20 +42,20 @@ base::HistogramBase* GetPerWebViewVisibilityHistogram() {
   return histogram;
 }
 
-base::HistogramBase* GetGlobalOpenWebVisibilityHistogram() {
+void LogGlobalVisibleScheme(VisibilityMetricsLogger::Scheme scheme,
+                            int32_t seconds) {
   static base::HistogramBase* histogram(CreateHistogramForDurationTracking(
-      "Android.WebView.WebViewOpenWebVisible.Global",
-      static_cast<int>(
-          VisibilityMetricsLogger::WebViewOpenWebVisibility::kMaxValue)));
-  return histogram;
+      "Android.WebView.VisibleScheme.Global",
+      static_cast<int>(VisibilityMetricsLogger::Scheme::kMaxValue)));
+  histogram->AddCount(static_cast<int32_t>(scheme), seconds);
 }
 
-base::HistogramBase* GetPerWebViewOpenWebVisibilityHistogram() {
+void LogPerWebViewVisibleScheme(VisibilityMetricsLogger::Scheme scheme,
+                                int32_t seconds) {
   static base::HistogramBase* histogram(CreateHistogramForDurationTracking(
-      "Android.WebView.WebViewOpenWebVisible.PerWebView",
-      static_cast<int>(
-          VisibilityMetricsLogger::WebViewOpenWebVisibility::kMaxValue)));
-  return histogram;
+      "Android.WebView.VisibleScheme.PerWebView",
+      static_cast<int>(VisibilityMetricsLogger::Scheme::kMaxValue)));
+  histogram->AddCount(static_cast<int32_t>(scheme), seconds);
 }
 
 base::HistogramBase* GetOpenWebVisibileScreenPortionHistogram() {
@@ -67,6 +68,36 @@ base::HistogramBase* GetOpenWebVisibileScreenPortionHistogram() {
 
 }  // anonymous namespace
 
+// static
+VisibilityMetricsLogger::Scheme VisibilityMetricsLogger::SchemeStringToEnum(
+    const std::string& scheme) {
+  if (scheme.empty())
+    return Scheme::kEmpty;
+  if (scheme == url::kHttpScheme)
+    return Scheme::kHttp;
+  if (scheme == url::kHttpsScheme)
+    return Scheme::kHttps;
+  if (scheme == url::kFileScheme)
+    return Scheme::kFile;
+  if (scheme == url::kFtpScheme)
+    return Scheme::kFtp;
+  if (scheme == url::kDataScheme)
+    return Scheme::kData;
+  if (scheme == url::kJavaScriptScheme)
+    return Scheme::kJavaScript;
+  if (scheme == url::kAboutScheme)
+    return Scheme::kAbout;
+  if (scheme == content::kChromeUIScheme)
+    return Scheme::kChrome;
+  if (scheme == url::kBlobScheme)
+    return Scheme::kBlob;
+  if (scheme == url::kContentScheme)
+    return Scheme::kContent;
+  if (scheme == "intent")
+    return Scheme::kIntent;
+  return Scheme::kUnknown;
+}
+
 VisibilityMetricsLogger::VisibilityMetricsLogger() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   last_update_time_ = base::TimeTicks::Now();
@@ -125,29 +156,26 @@ void VisibilityMetricsLogger::UpdateOpenWebScreenArea(int pixels,
 void VisibilityMetricsLogger::UpdateDurations() {
   base::TimeTicks update_time = base::TimeTicks::Now();
   base::TimeDelta delta = update_time - last_update_time_;
-  if (visible_client_count_ > 0) {
-    visible_duration_tracker_.any_webview_tracked_duration_ += delta;
+  if (all_clients_visible_count_ > 0) {
+    all_clients_tracker_.any_webview_tracked_duration_ += delta;
   } else {
-    visible_duration_tracker_.no_webview_tracked_duration_ += delta;
+    all_clients_tracker_.no_webview_tracked_duration_ += delta;
   }
+  all_clients_tracker_.per_webview_duration_ +=
+      delta * all_clients_visible_count_;
+  all_clients_tracker_.per_webview_untracked_duration_ +=
+      delta * (client_visibility_.size() - all_clients_visible_count_);
 
-  if (visible_webcontent_client_count_ > 0) {
-    webcontent_visible_tracker_.any_webview_tracked_duration_ += delta;
-  } else {
-    webcontent_visible_tracker_.no_webview_tracked_duration_ += delta;
+  for (size_t i = 0; i < base::size(per_scheme_visible_counts_); i++) {
+    if (!per_scheme_visible_counts_[i])
+      continue;
+    per_scheme_trackers_[i].any_webview_tracked_duration_ += delta;
+    per_scheme_trackers_[i].per_webview_duration_ +=
+        delta * per_scheme_visible_counts_[i];
   }
 
-  visible_duration_tracker_.per_webview_duration_ +=
-      delta * visible_client_count_;
-  visible_duration_tracker_.per_webview_untracked_duration_ +=
-      delta * (client_visibility_.size() - visible_client_count_);
-
-  webcontent_visible_tracker_.per_webview_duration_ +=
-      delta * visible_webcontent_client_count_;
-  webcontent_visible_tracker_.per_webview_untracked_duration_ +=
-      delta * (client_visibility_.size() - visible_webcontent_client_count_);
-
-  if (visible_webcontent_client_count_ > 0) {
+  if (per_scheme_visible_counts_[static_cast<size_t>(Scheme::kHttp)] > 0 ||
+      per_scheme_visible_counts_[static_cast<size_t>(Scheme::kHttps)] > 0) {
     open_web_screen_portion_tracked_duration_[static_cast<int>(
         current_open_web_screen_portion_)] += delta;
   }
@@ -159,13 +187,9 @@ bool VisibilityMetricsLogger::VisibilityInfo::IsVisible() const {
   return view_attached && view_visible && window_visible;
 }
 
-bool VisibilityMetricsLogger::VisibilityInfo::ContainsOpenWebContent() const {
-  return scheme_http_or_https;
-}
-
 bool VisibilityMetricsLogger::VisibilityInfo::IsDisplayingOpenWebContent()
     const {
-  return IsVisible() && ContainsOpenWebContent();
+  return IsVisible() && (scheme == Scheme::kHttp || scheme == Scheme::kHttps);
 }
 
 void VisibilityMetricsLogger::ProcessClientUpdate(Client* client,
@@ -173,26 +197,25 @@ void VisibilityMetricsLogger::ProcessClientUpdate(Client* client,
   VisibilityInfo curr_info = client_visibility_[client];
   bool was_visible = curr_info.IsVisible();
   bool is_visible = info.IsVisible();
-  bool was_visible_web = curr_info.IsDisplayingOpenWebContent();
-  bool is_visible_web = info.IsDisplayingOpenWebContent();
+  Scheme old_scheme = curr_info.scheme;
+  Scheme new_scheme = info.scheme;
   client_visibility_[client] = info;
-  DCHECK(!was_visible || visible_client_count_ > 0);
+  DCHECK(!was_visible || all_clients_visible_count_ > 0);
 
-  bool any_client_was_visible = visible_client_count_ > 0;
+  bool any_client_was_visible = all_clients_visible_count_ > 0;
 
   if (!was_visible && is_visible) {
-    ++visible_client_count_;
+    ++all_clients_visible_count_;
   } else if (was_visible && !is_visible) {
-    --visible_client_count_;
+    --all_clients_visible_count_;
   }
 
-  if (!was_visible_web && is_visible_web) {
-    ++visible_webcontent_client_count_;
-  } else if (was_visible_web && !is_visible_web) {
-    --visible_webcontent_client_count_;
-  }
+  if (was_visible)
+    per_scheme_visible_counts_[static_cast<size_t>(old_scheme)]--;
+  if (is_visible)
+    per_scheme_visible_counts_[static_cast<size_t>(new_scheme)]++;
 
-  bool any_client_is_visible = visible_client_count_ > 0;
+  bool any_client_is_visible = all_clients_visible_count_ > 0;
   if (on_visibility_changed_callback_ &&
       any_client_was_visible != any_client_is_visible) {
     on_visibility_changed_callback_.Run(any_client_is_visible);
@@ -209,7 +232,7 @@ void VisibilityMetricsLogger::RecordMetrics() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   UpdateDurations();
   RecordVisibilityMetrics();
-  RecordOpenWebDisplayMetrics();
+  RecordVisibleSchemeMetrics();
   RecordScreenPortionMetrics();
 }
 
@@ -220,21 +243,21 @@ void VisibilityMetricsLogger::RecordVisibilityMetrics() {
   int32_t total_no_webview_visible_seconds;
 
   any_webview_visible_seconds =
-      visible_duration_tracker_.any_webview_tracked_duration_.InSeconds();
-  visible_duration_tracker_.any_webview_tracked_duration_ -=
+      all_clients_tracker_.any_webview_tracked_duration_.InSeconds();
+  all_clients_tracker_.any_webview_tracked_duration_ -=
       base::Seconds(any_webview_visible_seconds);
   no_webview_visible_seconds =
-      visible_duration_tracker_.no_webview_tracked_duration_.InSeconds();
-  visible_duration_tracker_.no_webview_tracked_duration_ -=
+      all_clients_tracker_.no_webview_tracked_duration_.InSeconds();
+  all_clients_tracker_.no_webview_tracked_duration_ -=
       base::Seconds(no_webview_visible_seconds);
 
   total_webview_visible_seconds =
-      visible_duration_tracker_.per_webview_duration_.InSeconds();
-  visible_duration_tracker_.per_webview_duration_ -=
+      all_clients_tracker_.per_webview_duration_.InSeconds();
+  all_clients_tracker_.per_webview_duration_ -=
       base::Seconds(total_webview_visible_seconds);
   total_no_webview_visible_seconds =
-      visible_duration_tracker_.per_webview_untracked_duration_.InSeconds();
-  visible_duration_tracker_.per_webview_untracked_duration_ -=
+      all_clients_tracker_.per_webview_untracked_duration_.InSeconds();
+  all_clients_tracker_.per_webview_untracked_duration_ -=
       base::Seconds(total_no_webview_visible_seconds);
 
   if (any_webview_visible_seconds) {
@@ -257,50 +280,24 @@ void VisibilityMetricsLogger::RecordVisibilityMetrics() {
   }
 }
 
-void VisibilityMetricsLogger::RecordOpenWebDisplayMetrics() {
-  int32_t any_webcontent_visible_seconds;
-  int32_t no_webcontent_visible_seconds;
-  int32_t total_webcontent_visible_seconds;
-  int32_t total_not_webcontent_or_not_visible_seconds;
-
-  any_webcontent_visible_seconds =
-      webcontent_visible_tracker_.any_webview_tracked_duration_.InSeconds();
-  webcontent_visible_tracker_.any_webview_tracked_duration_ -=
-      base::Seconds(any_webcontent_visible_seconds);
-  no_webcontent_visible_seconds =
-      webcontent_visible_tracker_.no_webview_tracked_duration_.InSeconds();
-  webcontent_visible_tracker_.no_webview_tracked_duration_ -=
-      base::Seconds(no_webcontent_visible_seconds);
-
-  total_webcontent_visible_seconds =
-      webcontent_visible_tracker_.per_webview_duration_.InSeconds();
-  webcontent_visible_tracker_.per_webview_duration_ -=
-      base::Seconds(total_webcontent_visible_seconds);
-  total_not_webcontent_or_not_visible_seconds =
-      webcontent_visible_tracker_.per_webview_untracked_duration_.InSeconds();
-  webcontent_visible_tracker_.per_webview_untracked_duration_ -=
-      base::Seconds(total_not_webcontent_or_not_visible_seconds);
-
-  if (any_webcontent_visible_seconds) {
-    GetGlobalOpenWebVisibilityHistogram()->AddCount(
-        static_cast<int>(WebViewOpenWebVisibility::kDisplayOpenWebContent),
-        any_webcontent_visible_seconds);
-  }
-  if (no_webcontent_visible_seconds) {
-    GetGlobalOpenWebVisibilityHistogram()->AddCount(
-        static_cast<int>(WebViewOpenWebVisibility::kNotDisplayOpenWebContent),
-        no_webcontent_visible_seconds);
-  }
-
-  if (total_webcontent_visible_seconds) {
-    GetPerWebViewOpenWebVisibilityHistogram()->AddCount(
-        static_cast<int>(WebViewOpenWebVisibility::kDisplayOpenWebContent),
-        total_webcontent_visible_seconds);
-  }
-  if (total_not_webcontent_or_not_visible_seconds) {
-    GetPerWebViewOpenWebVisibilityHistogram()->AddCount(
-        static_cast<int>(WebViewOpenWebVisibility::kNotDisplayOpenWebContent),
-        total_not_webcontent_or_not_visible_seconds);
+void VisibilityMetricsLogger::RecordVisibleSchemeMetrics() {
+  for (size_t i = 0; i < base::size(per_scheme_trackers_); i++) {
+    Scheme scheme = static_cast<Scheme>(i);
+    auto& tracker = per_scheme_trackers_[i];
+
+    int32_t any_webview_seconds =
+        tracker.any_webview_tracked_duration_.InSeconds();
+    if (any_webview_seconds) {
+      tracker.any_webview_tracked_duration_ -=
+          base::Seconds(any_webview_seconds);
+      LogGlobalVisibleScheme(scheme, any_webview_seconds);
+    }
+
+    int32_t per_webview_seconds = tracker.per_webview_duration_.InSeconds();
+    if (per_webview_seconds) {
+      tracker.per_webview_duration_ -= base::Seconds(per_webview_seconds);
+      LogPerWebViewVisibleScheme(scheme, per_webview_seconds);
+    }
   }
 }
 
diff --git a/android_webview/browser/metrics/visibility_metrics_logger.h b/android_webview/browser/metrics/visibility_metrics_logger.h
index 925e23739f6dbe..c0b9936157e9d2 100644
--- a/android_webview/browser/metrics/visibility_metrics_logger.h
+++ b/android_webview/browser/metrics/visibility_metrics_logger.h
@@ -6,6 +6,7 @@
 #define ANDROID_WEBVIEW_BROWSER_METRICS_VISIBILITY_METRICS_LOGGER_H_
 
 #include <map>
+#include <string>
 
 #include "base/callback.h"
 #include "base/time/time.h"
@@ -14,14 +15,35 @@ namespace android_webview {
 
 class VisibilityMetricsLogger {
  public:
+  // These values are persisted to logs and must match the WebViewUrlScheme enum
+  // defined in enums.xml. Entries should not be renumbered and numeric values
+  // should never be reused.
+  enum class Scheme {
+    kEmpty = 0,
+    kUnknown = 1,
+    kHttp = 2,
+    kHttps = 3,
+    kFile = 4,
+    kFtp = 5,
+    kData = 6,
+    kJavaScript = 7,
+    kAbout = 8,
+    kChrome = 9,
+    kBlob = 10,
+    kContent = 11,
+    kIntent = 12,
+    kMaxValue = kIntent,
+  };
+
+  static Scheme SchemeStringToEnum(const std::string& scheme);
+
   struct VisibilityInfo {
     bool view_attached = false;
     bool view_visible = false;
     bool window_visible = false;
-    bool scheme_http_or_https = false;
+    Scheme scheme = Scheme::kEmpty;
 
     bool IsVisible() const;
-    bool ContainsOpenWebContent() const;
     bool IsDisplayingOpenWebContent() const;
   };
 
@@ -51,14 +73,6 @@ class VisibilityMetricsLogger {
     kMaxValue = kExactlyZeroPercent,
   };
 
-  // These values are persisted to logs. Entries should not be renumbered and
-  // numeric values should never be reused.
-  enum class WebViewOpenWebVisibility {
-    kDisplayOpenWebContent = 0,
-    kNotDisplayOpenWebContent = 1,
-    kMaxValue = kNotDisplayOpenWebContent
-  };
-
   class Client {
    public:
     virtual VisibilityInfo GetVisibilityInfo() = 0;
@@ -88,13 +102,14 @@ class VisibilityMetricsLogger {
   void UpdateDurations();
   void ProcessClientUpdate(Client* client, const VisibilityInfo& info);
   void RecordVisibilityMetrics();
-  void RecordOpenWebDisplayMetrics();
+  void RecordVisibleSchemeMetrics();
   void RecordScreenPortionMetrics();
 
-  // Counter for visible clients
-  size_t visible_client_count_ = 0;
-  // Counter for visible web clients
-  size_t visible_webcontent_client_count_ = 0;
+  // Counts the number of visible clients.
+  size_t all_clients_visible_count_ = 0;
+  // Counts the number of visible clients per scheme.
+  size_t per_scheme_visible_counts_[static_cast<size_t>(Scheme::kMaxValue) +
+                                    1] = {};
 
   struct WebViewDurationTracker {
     // Duration any WebView meets the tracking criteria
@@ -108,8 +123,9 @@ class VisibilityMetricsLogger {
     base::TimeDelta per_webview_untracked_duration_ = base::Seconds(0);
   };
 
-  WebViewDurationTracker visible_duration_tracker_;
-  WebViewDurationTracker webcontent_visible_tracker_;
+  WebViewDurationTracker all_clients_tracker_;
+  WebViewDurationTracker
+      per_scheme_trackers_[static_cast<size_t>(Scheme::kMaxValue) + 1] = {};
 
   base::TimeTicks last_update_time_;
   std::map<Client*, VisibilityInfo> client_visibility_;
diff --git a/android_webview/browser/metrics/visibility_metrics_logger_unittest.cc b/android_webview/browser/metrics/visibility_metrics_logger_unittest.cc
index b8f6c98215f876..259d37c8739e0b 100644
--- a/android_webview/browser/metrics/visibility_metrics_logger_unittest.cc
+++ b/android_webview/browser/metrics/visibility_metrics_logger_unittest.cc
@@ -40,8 +40,8 @@ class TestClient : public VisibilityMetricsLogger::Client {
     logger_->ClientVisibilityChanged(this);
   }
 
-  void SetSchemeHttpOrHttps(bool scheme_http_or_https) {
-    visibility_info_.scheme_http_or_https = scheme_http_or_https;
+  void SetScheme(VisibilityMetricsLogger::Scheme scheme) {
+    visibility_info_.scheme = scheme;
     logger_->ClientVisibilityChanged(this);
   }
 
@@ -119,7 +119,7 @@ TEST_F(VisibilityMetricsLoggerTest, TestSingleVisibleClient) {
   client->SetViewVisible(true);
   client->SetViewAttached(true);
   client->SetWindowVisible(true);
-  client->SetSchemeHttpOrHttps(true);
+  client->SetScheme(VisibilityMetricsLogger::Scheme::kHttp);
 
   task_environment().FastForwardBy(base::Seconds(10));
   client->SetWindowVisible(false);
@@ -131,21 +131,16 @@ TEST_F(VisibilityMetricsLoggerTest, TestSingleVisibleClient) {
   histogram_tester.ExpectBucketCount(
       "Android.WebView.Visibility.Global",
       VisibilityMetricsLogger::Visibility::kNotVisible, 40);
-
-  histogram_tester.ExpectBucketCount(
-      "Android.WebView.WebViewOpenWebVisible.Global",
-      VisibilityMetricsLogger::WebViewOpenWebVisibility::kDisplayOpenWebContent,
-      10);
-  histogram_tester.ExpectBucketCount(
-      "Android.WebView.WebViewOpenWebVisible.Global",
-      VisibilityMetricsLogger::WebViewOpenWebVisibility::
-          kNotDisplayOpenWebContent,
-      40);
+  histogram_tester.ExpectBucketCount("Android.WebView.VisibleScheme.Global",
+                                     VisibilityMetricsLogger::Scheme::kHttp,
+                                     10);
+  histogram_tester.ExpectBucketCount("Android.WebView.VisibleScheme.Global",
+                                     VisibilityMetricsLogger::Scheme::kData, 0);
 
   client->SetViewVisible(true);
   client->SetViewAttached(true);
   client->SetWindowVisible(true);
-  client->SetSchemeHttpOrHttps(false);
+  client->SetScheme(VisibilityMetricsLogger::Scheme::kData);
   task_environment().FastForwardBy(base::Seconds(90));
 
   logger()->RecordMetrics();
@@ -155,15 +150,12 @@ TEST_F(VisibilityMetricsLoggerTest, TestSingleVisibleClient) {
   histogram_tester.ExpectBucketCount(
       "Android.WebView.Visibility.Global",
       VisibilityMetricsLogger::Visibility::kNotVisible, 40);
-  histogram_tester.ExpectBucketCount(
-      "Android.WebView.WebViewOpenWebVisible.Global",
-      VisibilityMetricsLogger::WebViewOpenWebVisibility::kDisplayOpenWebContent,
-      10);
-  histogram_tester.ExpectBucketCount(
-      "Android.WebView.WebViewOpenWebVisible.Global",
-      VisibilityMetricsLogger::WebViewOpenWebVisibility::
-          kNotDisplayOpenWebContent,
-      130);
+  histogram_tester.ExpectBucketCount("Android.WebView.VisibleScheme.Global",
+                                     VisibilityMetricsLogger::Scheme::kHttp,
+                                     10);
+  histogram_tester.ExpectBucketCount("Android.WebView.VisibleScheme.Global",
+                                     VisibilityMetricsLogger::Scheme::kData,
+                                     90);
 
   client.reset();
 }
@@ -267,22 +259,22 @@ TEST_F(VisibilityMetricsLoggerTest, TestTwoVisibleClients) {
 TEST_F(VisibilityMetricsLoggerTest, TestTwoVisibleWebContentClients) {
   // t=0: client1 created
   // t=10: client2 created
-  // t=40: client1 visible, recording scheduled for t+60s
-  // t=50: client1 navigates to open web content
-  // t=60: client2 visible
-  // t=70: client1 invisible
-  // t=80: client2 invisible
-  // t=100: clients deleted.
+  // t=40: client1 visible with empty scheme
+  // t=50: client1 navigates to http scheme
+  // t=60: client2 visible and navigates to http scheme
+  // t=70: client2 invisible
+  // t=80: client1 invisible
+  // t=100: clients deleted
 
-  // Time with any client visible: 80 - 40 = 40
-  // Time with no visible client: 100 - 40 = 60
-  // Time x visible clients: (60-40) * 1 + (70-60) * 2 + (80-70) * 1 = 50
-  // Time x hidden clients: 100 + 90 - 50 = 140
+  // Any client visible: 40
+  // No client visible: 60
+  // Per client visible: 40 (client1) + 10 (client2) = 50
+  // Per client existing but invisible: 100 (client1) + 90 (client2) - 50 = 140
 
-  // Time with any client displaying open web content: 70 - 50 = 20
-  // Time with no client displaying open web content: 100 - 20 = 80
-  // Time x clients displaying open web content: (70-50) * 1  = 50
-  // Time x clients not displaying open web content: 100 + 90 - 20 = 170
+  // Any client visible with empty scheme: 10
+  // Any client visible with http scheme: 30
+  // Per client visible with empty scheme: 10
+  // Per client visible with http scheme: 30 (client1) + 10 (client2) = 40
 
   base::HistogramTester histogram_tester;
   std::unique_ptr<TestClient> client1 = std::make_unique<TestClient>(logger());
@@ -291,29 +283,23 @@ TEST_F(VisibilityMetricsLoggerTest, TestTwoVisibleWebContentClients) {
   std::unique_ptr<TestClient> client2 = std::make_unique<TestClient>(logger());
 
   task_environment().FastForwardBy(base::Seconds(30));
-  // This queues delayed recording after 60 seconds (test-defined)
   client1->SetViewVisible(true);
   client1->SetViewAttached(true);
   client1->SetWindowVisible(true);
 
   task_environment().FastForwardBy(base::Seconds(10));
-  // No additional task is queued
-  client1->SetSchemeHttpOrHttps(true);
+  client1->SetScheme(VisibilityMetricsLogger::Scheme::kHttp);
 
   task_environment().FastForwardBy(base::Seconds(10));
-  // No additional task is queued
   client2->SetViewVisible(true);
   client2->SetViewAttached(true);
   client2->SetWindowVisible(true);
+  client2->SetScheme(VisibilityMetricsLogger::Scheme::kHttp);
 
   task_environment().FastForwardBy(base::Seconds(10));
-  // This does not cause metrics to be recorded because one client remains
-  // visible.
   client1->SetWindowVisible(false);
 
   task_environment().FastForwardBy(base::Seconds(10));
-  // The last client becoming invisible triggers immediate recording and the
-  // cancellation of the queued task.
   client2->SetWindowVisible(false);
 
   task_environment().FastForwardBy(base::Seconds(20));
@@ -334,24 +320,18 @@ TEST_F(VisibilityMetricsLoggerTest, TestTwoVisibleWebContentClients) {
       "Android.WebView.Visibility.PerWebView",
       VisibilityMetricsLogger::Visibility::kNotVisible, 140);
 
-  histogram_tester.ExpectBucketCount(
-      "Android.WebView.WebViewOpenWebVisible.Global",
-      VisibilityMetricsLogger::WebViewOpenWebVisibility::kDisplayOpenWebContent,
-      20);
-  histogram_tester.ExpectBucketCount(
-      "Android.WebView.WebViewOpenWebVisible.Global",
-      VisibilityMetricsLogger::WebViewOpenWebVisibility::
-          kNotDisplayOpenWebContent,
-      80);
-  histogram_tester.ExpectBucketCount(
-      "Android.WebView.WebViewOpenWebVisible.PerWebView",
-      VisibilityMetricsLogger::WebViewOpenWebVisibility::kDisplayOpenWebContent,
-      20);
-  histogram_tester.ExpectBucketCount(
-      "Android.WebView.WebViewOpenWebVisible.PerWebView",
-      VisibilityMetricsLogger::WebViewOpenWebVisibility::
-          kNotDisplayOpenWebContent,
-      170);
+  histogram_tester.ExpectBucketCount("Android.WebView.VisibleScheme.Global",
+                                     VisibilityMetricsLogger::Scheme::kEmpty,
+                                     10);
+  histogram_tester.ExpectBucketCount("Android.WebView.VisibleScheme.Global",
+                                     VisibilityMetricsLogger::Scheme::kHttp,
+                                     30);
+  histogram_tester.ExpectBucketCount("Android.WebView.VisibleScheme.PerWebView",
+                                     VisibilityMetricsLogger::Scheme::kEmpty,
+                                     10);
+  histogram_tester.ExpectBucketCount("Android.WebView.VisibleScheme.PerWebView",
+                                     VisibilityMetricsLogger::Scheme::kHttp,
+                                     40);
 }
 
 TEST_F(VisibilityMetricsLoggerTest, TestScreenPortion) {
@@ -383,7 +363,7 @@ TEST_F(VisibilityMetricsLoggerTest, TestScreenPortion) {
   client->SetViewVisible(true);
   client->SetViewAttached(true);
   client->SetWindowVisible(true);
-  client->SetSchemeHttpOrHttps(true);
+  client->SetScheme(VisibilityMetricsLogger::Scheme::kHttp);
   // If pixels is 0 then time spent is logged under kExactlyZeroPercent,
   // otherwise the screen portion is calculated as percentage / 10.
   logger()->UpdateOpenWebScreenArea(/*pixels=*/0, /*percentage=*/0);
@@ -404,7 +384,7 @@ TEST_F(VisibilityMetricsLoggerTest, TestScreenPortion) {
   client->SetViewVisible(true);
 
   task_environment().FastForwardBy(base::Seconds(25));
-  client->SetSchemeHttpOrHttps(false);
+  client->SetScheme(VisibilityMetricsLogger::Scheme::kData);
 
   task_environment().FastForwardBy(base::Seconds(5));
   logger()->RecordMetrics();
@@ -416,10 +396,9 @@ TEST_F(VisibilityMetricsLoggerTest, TestScreenPortion) {
   histogram_tester.ExpectBucketCount(
       "Android.WebView.Visibility.Global",
       VisibilityMetricsLogger::Visibility::kVisible, 80);
-  histogram_tester.ExpectBucketCount(
-      "Android.WebView.WebViewOpenWebVisible.Global",
-      VisibilityMetricsLogger::WebViewOpenWebVisibility::kDisplayOpenWebContent,
-      75);
+  histogram_tester.ExpectBucketCount("Android.WebView.VisibleScheme.Global",
+                                     VisibilityMetricsLogger::Scheme::kHttp,
+                                     75);
   histogram_tester.ExpectBucketCount(
       "Android.WebView.WebViewOpenWebVisible.ScreenPortion2",
       VisibilityMetricsLogger::WebViewOpenWebScreenPortion::kExactlyZeroPercent,
diff --git a/ash/app_list/views/apps_container_view.cc b/ash/app_list/views/apps_container_view.cc
index 52e1102686bbda..8a65e8f1d3f50a 100644
--- a/ash/app_list/views/apps_container_view.cc
+++ b/ash/app_list/views/apps_container_view.cc
@@ -54,6 +54,7 @@
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/flex_layout.h"
+#include "ui/views/view_class_properties.h"
 #include "ui/views/view_utils.h"
 
 namespace ash {
@@ -131,6 +132,9 @@ constexpr int kSortUiControlPreferredSize = 20;
 // The number of columns available for the ContinueSectionView.
 constexpr int kContinueColumnCount = 4;
 
+// The vertical spacing between recent apps and continue section view.
+constexpr int kRecentAppsTopMargin = 16;
+
 // The vertical spacing above and below the separator.
 constexpr int kSeparatorVerticalInset = 16;
 
@@ -261,6 +265,7 @@ class AppsContainerView::ContinueContainer : public views::View {
   ContinueContainer(AppsContainerView* apps_container,
                     AppListViewDelegate* view_delegate) {
     SetPaintToLayer(ui::LAYER_NOT_DRAWN);
+
     SetLayoutManager(std::make_unique<views::FlexLayout>())
         ->SetOrientation(views::LayoutOrientation::kVertical);
 
@@ -278,16 +283,16 @@ class AppsContainerView::ContinueContainer : public views::View {
     separator_ = AddChildView(std::make_unique<views::Separator>());
     separator_->SetColor(ColorProvider::Get()->GetContentLayerColor(
         ColorProvider::ContentLayerType::kSeparatorColor));
-    separator_->SetBorder(
-        views::CreateEmptyBorder(gfx::Insets(kSeparatorVerticalInset, 0)));
     separator_->SetPreferredSize(
-        gfx::Size(kSeparatorWidth,
-                  kSeparatorVerticalInset * 2 + views::Separator::kThickness));
+        gfx::Size(kSeparatorWidth, views::Separator::kThickness));
+    separator_->SetProperty(views::kMarginsKey,
+                            gfx::Insets(kSeparatorVerticalInset, 0));
     separator_->SetPaintToLayer();
     separator_->layer()->SetFillsBoundsOpaquely(false);
     separator_->SetProperty(views::kCrossAxisAlignmentKey,
                             views::LayoutAlignment::kCenter);
 
+    UpdateRecentAppsMargins();
     UpdateSeparatorVisibility();
   }
 
@@ -295,6 +300,9 @@ class AppsContainerView::ContinueContainer : public views::View {
   void ChildVisibilityChanged(views::View* child) override {
     if (child == recent_apps_ || child == continue_section_)
       UpdateSeparatorVisibility();
+
+    if (child == continue_section_)
+      UpdateRecentAppsMargins();
   }
 
   void OnThemeChanged() override {
@@ -308,6 +316,16 @@ class AppsContainerView::ContinueContainer : public views::View {
   views::View* separator() { return separator_; }
 
  private:
+  void UpdateRecentAppsMargins() {
+    if (!recent_apps_ || !continue_section_)
+      return;
+    // Remove recent apps top margin if continue section is hidden.
+    recent_apps_->SetProperty(
+        views::kMarginsKey,
+        gfx::Insets(continue_section_->GetVisible() ? kRecentAppsTopMargin : 0,
+                    0, 0, 0));
+  }
+
   void UpdateSeparatorVisibility() {
     if (!separator_ || !recent_apps_ || !continue_section_)
       return;
@@ -809,22 +827,24 @@ void AppsContainerView::Layout() {
       GetContentsBounds(),
       contents_view_->GetSearchBoxSize(AppListState::kStateApps));
   gfx::Rect grid_rect = rect;
-  grid_rect.Inset(margins.left(), kGridFadeoutZoneHeight - grid_insets.top(),
-                  margins.right(), margins.bottom());
+  grid_rect.Inset(margins.left(), kGridFadeoutZoneHeight, margins.right(),
+                  margins.bottom());
   // The grid rect insets are added to calculated margins. Given that the
   // grid bounds rect should include insets, they have to be removed from
   // added margins.
-  grid_rect.Inset(-grid_insets.left(), 0, -grid_insets.right(),
-                  -grid_insets.bottom());
+  grid_rect.Inset(-grid_insets);
   scrollable_container_->SetBoundsRect(grid_rect);
+  bool first_page_offset_changed = false;
   if (features::IsProductivityLauncherEnabled()) {
+    const int continue_container_height =
+        continue_container_->GetPreferredSize().height();
     continue_container_->SetBoundsRect(
-        gfx::Rect(0, 0, grid_rect.width(),
-                  continue_container_->GetPreferredSize().height()));
+        gfx::Rect(0, 0, grid_rect.width(), continue_container_height));
     // Setting this offset prevents the app items in the grid from overlapping
     // with the continue section.
-    apps_grid_view_->set_first_page_offset(
-        continue_container_->bounds().height());
+    first_page_offset_changed =
+        continue_container_height != apps_grid_view_->first_page_offset();
+    apps_grid_view_->set_first_page_offset(continue_container_height);
   }
 
   // Make sure that UpdateTopLevelGridDimensions() happens after setting the
@@ -832,8 +852,15 @@ void AppsContainerView::Layout() {
   // shown in the grid.
   UpdateTopLevelGridDimensions();
 
-  apps_grid_view_->SetBoundsRect(
-      gfx::Rect(0, 0, grid_rect.width(), grid_rect.height()));
+  const gfx::Rect apps_grid_bounds(grid_rect.size());
+  if (apps_grid_view_->bounds() != apps_grid_bounds) {
+    apps_grid_view_->SetBoundsRect(apps_grid_bounds);
+  } else if (first_page_offset_changed) {
+    // Apps grid layout depends on the continue container bounds, so explicitly
+    // call layout to ensure apps grid view gets laid out even if its bounds do
+    // not change.
+    apps_grid_view_->Layout();
+  }
 
   // Record the distance of y position between suggestion chip container
   // and apps grid view to avoid duplicate calculation of apps grid view's
@@ -1036,11 +1063,12 @@ int AppsContainerView::GetMinTopMarginForAppsGrid(
   const int suggestion_chip_container_size =
       features::IsProductivityLauncherEnabled()
           ? 0
-          : kSuggestionChipContainerHeight;
+          : kSuggestionChipContainerHeight + kSuggestionChipContainerTopMargin;
+
   // NOTE: Use the fadeout zone height as min top margin to match the apps grid
   // view's bottom margin.
   return search_box_size.height() + kGridFadeoutZoneHeight +
-         kSuggestionChipContainerTopMargin + suggestion_chip_container_size;
+         suggestion_chip_container_size;
 }
 
 int AppsContainerView::GetIdealHorizontalMargin() const {
diff --git a/ash/app_list/views/continue_section_view.cc b/ash/app_list/views/continue_section_view.cc
index a4dcf4f272938e..478e65aa24c32e 100644
--- a/ash/app_list/views/continue_section_view.cc
+++ b/ash/app_list/views/continue_section_view.cc
@@ -31,11 +31,6 @@
 namespace ash {
 namespace {
 
-// Continue File Section view paddings. This view encloses the header and the
-// suggested tasks container.
-constexpr int kSectionVerticalPadding = 16;
-constexpr int kSectionHorizontalPadding = 20;
-
 // Header paddings in dips.
 constexpr int kHeaderVerticalSpacing = 4;
 constexpr int kHeaderHorizontalPadding = 12;
@@ -61,8 +56,7 @@ ContinueSectionView::ContinueSectionView(AppListViewDelegate* view_delegate,
   AppListModelProvider::Get()->AddObserver(this);
 
   auto* layout = SetLayoutManager(std::make_unique<views::BoxLayout>(
-      views::BoxLayout::Orientation::kVertical,
-      gfx::Insets(kSectionVerticalPadding, kSectionHorizontalPadding),
+      views::BoxLayout::Orientation::kVertical, gfx::Insets(),
       kHeaderVerticalSpacing));
   layout->set_main_axis_alignment(
       tablet_mode ? views::BoxLayout::MainAxisAlignment::kCenter
diff --git a/ash/app_list/views/continue_section_view_unittest.cc b/ash/app_list/views/continue_section_view_unittest.cc
index 0d4381f3466150..ff50472ae3ffbe 100644
--- a/ash/app_list/views/continue_section_view_unittest.cc
+++ b/ash/app_list/views/continue_section_view_unittest.cc
@@ -652,7 +652,7 @@ TEST_F(ContinueSectionViewTabletModeTest,
 
   // Set the display width so only 2 continue section tasks fit into available
   // space.
-  UpdateDisplay("800x600");
+  UpdateDisplay("600x800");
 
   EnsureLauncherShown();
   VerifyResultViewsUpdated();
diff --git a/ash/app_list/views/paged_apps_grid_view.cc b/ash/app_list/views/paged_apps_grid_view.cc
index c8ddb6ec491da1..5c59683d5e8a84 100644
--- a/ash/app_list/views/paged_apps_grid_view.cc
+++ b/ash/app_list/views/paged_apps_grid_view.cc
@@ -589,7 +589,8 @@ void PagedAppsGridView::UpdateBorder() {
   if (IsInFolder())
     return;
 
-  SetBorder(views::CreateEmptyBorder(gfx::Insets(GetFadeoutMaskHeight(), 0)));
+  if (!features::IsProductivityLauncherEnabled())
+    SetBorder(views::CreateEmptyBorder(gfx::Insets(GetFadeoutMaskHeight(), 0)));
 }
 
 void PagedAppsGridView::MaybeStartCardifiedView() {
@@ -1221,8 +1222,9 @@ gfx::Rect PagedAppsGridView::BackgroundCardBounds(int new_page_index) {
                                         ? first_page_vertical_tile_padding_
                                         : vertical_tile_padding_;
   const gfx::Size background_card_size =
-      grid_size +
-      gfx::Size(2 * horizontal_tile_padding_, 2 * vertical_tile_padding);
+      grid_size + gfx::Size(2 * horizontal_tile_padding_,
+                            2 * std::max(kMinVerticalPaddingBetweenTiles,
+                                         vertical_tile_padding));
 
   // Add a padding on the sides to make space for pagination preview, but make
   // sure the padding doesn't exceed the tile padding (otherwise the background
@@ -1233,13 +1235,13 @@ gfx::Rect PagedAppsGridView::BackgroundCardBounds(int new_page_index) {
       (GetContentsBounds().width() - background_card_size.width()) / 2 +
       extra_padding_for_cardified_state;
 
-  const int y_offset = (new_page_index == 0 ? first_page_offset_ : 0);
+  int y_offset = std::max(new_page_index == 0 ? first_page_offset_ : 0,
+                          GetFadeoutMaskHeight());
   // The vertical padding should account for the fadeout mask.
-  const int vertical_padding = y_offset +
-                               (GetContentsBounds().height() - y_offset -
-                                background_card_size.height()) /
-                                   2 +
-                               GetFadeoutMaskHeight();
+  const int vertical_padding =
+      y_offset + (GetContentsBounds().height() - y_offset -
+                  background_card_size.height()) /
+                     2;
   const int padding_between_pages = GetPaddingBetweenPages();
   // The space that each page occupies in the items container. This is the size
   // of the grid without outer padding plus the padding between pages.
@@ -1314,6 +1316,10 @@ void PagedAppsGridView::UpdateTilePadding() {
   if (cardified_state_) {
     content_size = gfx::ScaleToRoundedSize(content_size, kCardifiedScale) -
                    gfx::Size(2 * kCardifiedHorizontalPadding, 0);
+    content_size.set_width(
+        std::max(content_size.width(), cols() * tile_size.width()));
+    content_size.set_height(
+        std::max(content_size.height(), max_rows_ * tile_size.height()));
   }
 
   const auto calculate_tile_padding = [](int content_size, int num_tiles,
diff --git a/ash/app_list/views/paged_apps_grid_view.h b/ash/app_list/views/paged_apps_grid_view.h
index 8796b500e117ed..bd9c03093e2dbc 100644
--- a/ash/app_list/views/paged_apps_grid_view.h
+++ b/ash/app_list/views/paged_apps_grid_view.h
@@ -150,6 +150,7 @@ class ASH_EXPORT PagedAppsGridView : public AppsGridView,
   // Gets the PaginationModel used for the grid view.
   PaginationModel* pagination_model() { return &pagination_model_; }
 
+  int first_page_offset() const { return first_page_offset_; }
   void set_first_page_offset(int offset) { first_page_offset_ = offset; }
 
   // Calculates the maximum number of rows on the first page. Relies on tile
diff --git a/ash/login/ui/fingerprint_auth_factor_model.cc b/ash/login/ui/fingerprint_auth_factor_model.cc
index f668717185f312..b31ecb858695e2 100644
--- a/ash/login/ui/fingerprint_auth_factor_model.cc
+++ b/ash/login/ui/fingerprint_auth_factor_model.cc
@@ -93,9 +93,7 @@ int FingerprintAuthFactorModel::GetLabelId() const {
     case FingerprintState::AVAILABLE_WITH_TOUCH_SENSOR_WARNING:
       return IDS_ASH_LOGIN_FINGERPRINT_UNLOCK_TOUCH_SENSOR;
     case FingerprintState::DISABLED_FROM_ATTEMPTS:
-      // TODO(crbug.com/1233614): Update this string: "Too many attempts" ->
-      // "Too many fingerprint attempts".
-      return IDS_ASH_LOGIN_FINGERPRINT_UNLOCK_DISABLED_FROM_ATTEMPTS;
+      return IDS_FINGERPRINT_LABEL_NOT_AUTHENTICATED;
     case FingerprintState::DISABLED_FROM_TIMEOUT:
       return can_use_pin_ ? IDS_AUTH_FACTOR_LABEL_PASSWORD_OR_PIN_REQUIRED
                           : IDS_AUTH_FACTOR_LABEL_PASSWORD_REQUIRED;
diff --git a/ash/quick_pair/common/fast_pair/fast_pair_metrics.cc b/ash/quick_pair/common/fast_pair/fast_pair_metrics.cc
index e45a0e57463fe9..5d67876eeeec24 100644
--- a/ash/quick_pair/common/fast_pair/fast_pair_metrics.cc
+++ b/ash/quick_pair/common/fast_pair/fast_pair_metrics.cc
@@ -8,6 +8,7 @@
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
+
 namespace {
 
 const char kEngagementFlowInitialMetric[] =
@@ -19,6 +20,11 @@ const char kTotalUxPairTimeInitialMetric[] =
     "Bluetooth.ChromeOS.FastPair.TotalUxPairTime.InitialPairingProtocol";
 const char kTotalUxPairTimeSubsequentMetric[] =
     "Bluetooth.ChromeOS.FastPair.TotalUxPairTime.SubsequentPairingProtocol";
+const char kRetroactiveEngagementFlowMetric[] =
+    "Bluetooth.ChromeOS.FastPair.RetroactiveEngagementFunnel.Steps";
+const char kPairingMethodMetric[] = "Bluetooth.ChromeOS.FastPair.PairingMethod";
+const char kRetroactivePairingResultMetric[] =
+    "Bluetooth.ChromeOS.FastPair.RetroactivePairing.Result";
 
 }  // namespace
 
@@ -56,5 +62,27 @@ void AttemptRecordingTotalUxPairTime(const Device& device,
   }
 }
 
+void AttemptRecordingFastPairRetroactiveEngagementFlow(
+    const Device& device,
+    FastPairRetroactiveEngagementFlowEvent event) {
+  switch (device.protocol) {
+    case Protocol::kFastPairInitial:
+    case Protocol::kFastPairSubsequent:
+      break;
+    case Protocol::kFastPairRetroactive:
+      base::UmaHistogramSparse(kRetroactiveEngagementFlowMetric,
+                               static_cast<int>(event));
+      break;
+  }
+}
+
+void RecordPairingMethod(PairingMethod method) {
+  base::UmaHistogramEnumeration(kPairingMethodMetric, method);
+}
+
+void RecordRetroactivePairingResult(bool success) {
+  base::UmaHistogramBoolean(kRetroactivePairingResultMetric, success);
+}
+
 }  // namespace quick_pair
 }  // namespace ash
diff --git a/ash/quick_pair/common/fast_pair/fast_pair_metrics.h b/ash/quick_pair/common/fast_pair/fast_pair_metrics.h
index b0ead28a5742c6..f59ab1ce612594 100644
--- a/ash/quick_pair/common/fast_pair/fast_pair_metrics.h
+++ b/ash/quick_pair/common/fast_pair/fast_pair_metrics.h
@@ -27,6 +27,33 @@ enum COMPONENT_EXPORT(QUICK_PAIR_COMMON) FastPairEngagementFlowEvent {
   kErrorUiSettingsPressed = 1212,
 };
 
+// These values are persisted to logs. Entries should not be renumbered and
+// numeric values should never be reused. The numbers here correspond to the
+// ordering of the flow. This enum should be kept in sync with the
+// FastPairRetroactiveEngagementFlowEvent enum in
+// src/tools/metrics/histograms/enums.xml.
+enum COMPONENT_EXPORT(QUICK_PAIR_COMMON)
+    FastPairRetroactiveEngagementFlowEvent {
+      kAssociateAccountUiShown = 1,
+      kAssociateAccountUiDismissedByUser = 11,
+      kAssociateAccountUiDismissed = 12,
+      kAssociateAccountLearnMorePressed = 13,
+      kAssociateAccountSavePressed = 14,
+      kAssociateAccountSavePressedAfterLearnMorePressed = 131,
+      kAssociateAccountDismissedByUserAfterLearnMorePressed = 132,
+      kAssociateAccountDismissedAfterLearnMorePressed = 133,
+    };
+
+// These values are persisted to logs. Entries should not be renumbered and
+// numeric values should never be reused. This enum should be kept in sync
+// with the FastPairPairingMethod enum in
+// src/tools/metrics/histograms/enums.xml.
+enum class COMPONENT_EXPORT(QUICK_PAIR_COMMON) PairingMethod {
+  kFastPair = 0,
+  kSystemPairingUi = 1,
+  kMaxValue = kSystemPairingUi,
+};
+
 COMPONENT_EXPORT(QUICK_PAIR_COMMON)
 void AttemptRecordingFastPairEngagementFlow(const Device& device,
                                             FastPairEngagementFlowEvent event);
@@ -35,6 +62,17 @@ COMPONENT_EXPORT(QUICK_PAIR_COMMON)
 void AttemptRecordingTotalUxPairTime(const Device& device,
                                      base::TimeDelta total_pair_time);
 
+COMPONENT_EXPORT(QUICK_PAIR_COMMON)
+void AttemptRecordingFastPairRetroactiveEngagementFlow(
+    const Device& device,
+    FastPairRetroactiveEngagementFlowEvent event);
+
+COMPONENT_EXPORT(QUICK_PAIR_COMMON)
+void RecordPairingMethod(PairingMethod method);
+
+COMPONENT_EXPORT(QUICK_PAIR_COMMON)
+void RecordRetroactivePairingResult(bool success);
+
 }  // namespace quick_pair
 }  // namespace ash
 
diff --git a/ash/quick_pair/keyed_service/quick_pair_mediator.cc b/ash/quick_pair/keyed_service/quick_pair_mediator.cc
index 519f3136e63ea8..f6cf807569b1b3 100644
--- a/ash/quick_pair/keyed_service/quick_pair_mediator.cc
+++ b/ash/quick_pair/keyed_service/quick_pair_mediator.cc
@@ -84,7 +84,8 @@ Mediator::Mediator(
       fast_pair_bluetooth_config_delegate_(
           std::make_unique<FastPairBluetoothConfigDelegate>()) {
   metrics_logger_ = std::make_unique<QuickPairMetricsLogger>(
-      scanner_broker_.get(), pairer_broker_.get(), ui_broker_.get());
+      scanner_broker_.get(), pairer_broker_.get(), ui_broker_.get(),
+      retroactive_pairing_detector_.get());
   battery_update_message_handler_ =
       std::make_unique<BatteryUpdateMessageHandler>(
           message_stream_lookup_.get());
diff --git a/ash/quick_pair/keyed_service/quick_pair_metrics_logger.cc b/ash/quick_pair/keyed_service/quick_pair_metrics_logger.cc
index 736742ee3a550c..8eb0540ea23637 100644
--- a/ash/quick_pair/keyed_service/quick_pair_metrics_logger.cc
+++ b/ash/quick_pair/keyed_service/quick_pair_metrics_logger.cc
@@ -7,29 +7,77 @@
 #include "ash/quick_pair/common/device.h"
 #include "ash/quick_pair/common/fast_pair/fast_pair_feature_usage_metrics_logger.h"
 #include "ash/quick_pair/common/fast_pair/fast_pair_metrics.h"
+#include "base/containers/contains.h"
+#include "device/bluetooth/bluetooth_adapter_factory.h"
 
 namespace ash {
 namespace quick_pair {
 
-QuickPairMetricsLogger::QuickPairMetricsLogger(ScannerBroker* scanner_broker,
-                                               PairerBroker* pairer_broker,
-                                               UIBroker* ui_broker)
+QuickPairMetricsLogger::QuickPairMetricsLogger(
+    ScannerBroker* scanner_broker,
+    PairerBroker* pairer_broker,
+    UIBroker* ui_broker,
+    RetroactivePairingDetector* retroactive_pairing_detector)
     : feature_usage_metrics_logger_(
           std::make_unique<FastPairFeatureUsageMetricsLogger>()) {
+  device::BluetoothAdapterFactory::Get()->GetAdapter(base::BindOnce(
+      &QuickPairMetricsLogger::OnGetAdapter, weak_ptr_factory_.GetWeakPtr()));
+
   scanner_broker_observation_.Observe(scanner_broker);
+  retroactive_pairing_detector_observation_.Observe(
+      retroactive_pairing_detector);
   pairer_broker_observation_.Observe(pairer_broker);
   ui_broker_observation_.Observe(ui_broker);
 }
 
 QuickPairMetricsLogger::~QuickPairMetricsLogger() = default;
 
+void QuickPairMetricsLogger::OnGetAdapter(
+    scoped_refptr<device::BluetoothAdapter> adapter) {
+  adapter_ = adapter;
+  adapter_observation_.Observe(adapter_.get());
+}
+
+void QuickPairMetricsLogger::DevicePairedChanged(
+    device::BluetoothAdapter* adapter,
+    device::BluetoothDevice* device,
+    bool new_paired_status) {
+  // This event fires whenever a device pairing has changed with the adapter.
+  // If the |new_paired_status| is false, it means a device was unpaired with
+  // the adapter, so we early return since it would not be a device that has
+  // been paired alternatively. If the device that was paired to that fires this
+  // event is a device we just paired to with Fast Pair, then we early return
+  // since it also wouldn't be one that was alternatively pair to. We want to
+  // only continue our check here if we have a newly paired device that was
+  // paired with classic Bluetooth pairing.
+  const std::string& classic_address = device->GetAddress();
+  if (!new_paired_status ||
+      base::Contains(fast_pair_addresses_, classic_address)) {
+    return;
+  }
+
+  RecordPairingMethod(PairingMethod::kSystemPairingUi);
+}
+
 void QuickPairMetricsLogger::OnDevicePaired(scoped_refptr<Device> device) {
   AttemptRecordingFastPairEngagementFlow(
       *device, FastPairEngagementFlowEvent::kPairingSucceeded);
   feature_usage_metrics_logger_->RecordUsage(/*success=*/true);
+
   base::TimeDelta total_pair_time =
       base::TimeTicks::Now() - device_pairing_start_timestamps_[device];
   AttemptRecordingTotalUxPairTime(*device, total_pair_time);
+
+  RecordPairingMethod(PairingMethod::kFastPair);
+
+  // The classic address is assigned to the Device during the
+  // initial Fast Pair pairing protocol during the key exchange, and if it
+  // doesn't exist, then it wasn't properly paired during initial Fast Pair
+  // pairing. We want to save the addresses here in the event that the
+  // Bluetooth adapter pairing event fires, so we can detect when a device
+  // was paired solely via classic bluetooth, instead of Fast Pair.
+  if (device->classic_address())
+    fast_pair_addresses_.insert(device->classic_address().value());
 }
 
 void QuickPairMetricsLogger::OnPairFailure(scoped_refptr<Device> device,
@@ -82,17 +130,85 @@ void QuickPairMetricsLogger::OnDeviceFound(scoped_refptr<Device> device) {
       *device, FastPairEngagementFlowEvent::kDiscoveryUiShown);
 }
 
+void QuickPairMetricsLogger::OnRetroactivePairFound(
+    scoped_refptr<Device> device) {
+  AttemptRecordingFastPairRetroactiveEngagementFlow(
+      *device,
+      FastPairRetroactiveEngagementFlowEvent::kAssociateAccountUiShown);
+}
+
+void QuickPairMetricsLogger::OnAssociateAccountAction(
+    scoped_refptr<Device> device,
+    AssociateAccountAction action) {
+  switch (action) {
+    case AssociateAccountAction::kAssoicateAccount:
+      if (base::Contains(learn_more_devices_, device)) {
+        AttemptRecordingFastPairRetroactiveEngagementFlow(
+            *device, FastPairRetroactiveEngagementFlowEvent::
+                         kAssociateAccountSavePressedAfterLearnMorePressed);
+        learn_more_devices_.erase(device);
+        break;
+      }
+
+      AttemptRecordingFastPairRetroactiveEngagementFlow(
+          *device,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountSavePressed);
+      break;
+    case AssociateAccountAction::kLearnMore:
+      // We need to record whether or not the Associate Account UI for this
+      // device has had the Learn More button pressed because since the
+      // Learn More button is not a terminal state, we need to record
+      // if the subsequent terminal states were reached after the user
+      // has learned more about saving their accounts. So we will check
+      // this map when the user dismisses or saves their account in order
+      // to capture whether or not the user elected to learn more beforehand.
+      learn_more_devices_.insert(device);
+
+      AttemptRecordingFastPairRetroactiveEngagementFlow(
+          *device, FastPairRetroactiveEngagementFlowEvent::
+                       kAssociateAccountLearnMorePressed);
+      break;
+    case AssociateAccountAction::kDismissedByUser:
+      if (base::Contains(learn_more_devices_, device)) {
+        AttemptRecordingFastPairRetroactiveEngagementFlow(
+            *device, FastPairRetroactiveEngagementFlowEvent::
+                         kAssociateAccountDismissedByUserAfterLearnMorePressed);
+        learn_more_devices_.erase(device);
+        break;
+      }
+
+      AttemptRecordingFastPairRetroactiveEngagementFlow(
+          *device, FastPairRetroactiveEngagementFlowEvent::
+                       kAssociateAccountUiDismissedByUser);
+      break;
+    case AssociateAccountAction::kDismissed:
+      if (base::Contains(learn_more_devices_, device)) {
+        AttemptRecordingFastPairRetroactiveEngagementFlow(
+            *device, FastPairRetroactiveEngagementFlowEvent::
+                         kAssociateAccountDismissedAfterLearnMorePressed);
+        learn_more_devices_.erase(device);
+        break;
+      }
+
+      AttemptRecordingFastPairRetroactiveEngagementFlow(
+          *device,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountUiDismissed);
+      break;
+  }
+}
+
 void QuickPairMetricsLogger::OnAccountKeyWrite(
     scoped_refptr<Device> device,
-    absl::optional<AccountKeyFailure> error) {}
+    absl::optional<AccountKeyFailure> error) {
+  if (device->protocol != Protocol::kFastPairRetroactive)
+    return;
+
+  RecordRetroactivePairingResult(/*success=*/!error.has_value());
+}
 
 void QuickPairMetricsLogger::OnCompanionAppAction(scoped_refptr<Device> device,
                                                   CompanionAppAction action) {}
 
-void QuickPairMetricsLogger::OnAssociateAccountAction(
-    scoped_refptr<Device> device,
-    AssociateAccountAction action) {}
-
 void QuickPairMetricsLogger::OnDeviceLost(scoped_refptr<Device> device) {}
 
 }  // namespace quick_pair
diff --git a/ash/quick_pair/keyed_service/quick_pair_metrics_logger.h b/ash/quick_pair/keyed_service/quick_pair_metrics_logger.h
index c7f28954668e42..e0f6ea588db80a 100644
--- a/ash/quick_pair/keyed_service/quick_pair_metrics_logger.h
+++ b/ash/quick_pair/keyed_service/quick_pair_metrics_logger.h
@@ -6,12 +6,16 @@
 #define ASH_QUICK_PAIR_KEYED_SERVICE_QUICK_PAIR_METRICS_LOGGER_H_
 
 #include "ash/quick_pair/pairing/pairer_broker.h"
+#include "ash/quick_pair/pairing/retroactive_pairing_detector.h"
 #include "ash/quick_pair/scanning/scanner_broker.h"
 #include "ash/quick_pair/ui/ui_broker.h"
 #include "base/containers/flat_map.h"
+#include "base/containers/flat_set.h"
 #include "base/memory/scoped_refptr.h"
+#include "base/memory/weak_ptr.h"
 #include "base/scoped_observation.h"
 #include "base/time/time.h"
+#include "device/bluetooth/bluetooth_adapter.h"
 
 namespace ash {
 namespace quick_pair {
@@ -22,11 +26,15 @@ class FastPairFeatureUsageMetricsLogger;
 // Observes pairing, scanning and UI events and logs corresponding metrics.
 class QuickPairMetricsLogger : public PairerBroker::Observer,
                                public ScannerBroker::Observer,
-                               public UIBroker::Observer {
+                               public UIBroker::Observer,
+                               public RetroactivePairingDetector::Observer,
+                               public device::BluetoothAdapter::Observer {
  public:
-  QuickPairMetricsLogger(ScannerBroker* scanner_broker,
-                         PairerBroker* pairer_broker,
-                         UIBroker* ui_broker);
+  QuickPairMetricsLogger(
+      ScannerBroker* scanner_broker,
+      PairerBroker* pairer_broker,
+      UIBroker* ui_broker,
+      RetroactivePairingDetector* retroactive_pairing_detector);
   QuickPairMetricsLogger(const QuickPairMetricsLogger&) = delete;
   QuickPairMetricsLogger& operator=(const QuickPairMetricsLogger&) = delete;
   ~QuickPairMetricsLogger() override;
@@ -53,20 +61,52 @@ class QuickPairMetricsLogger : public PairerBroker::Observer,
   void OnDeviceFound(scoped_refptr<Device> device) override;
   void OnDeviceLost(scoped_refptr<Device> device) override;
 
+  // RetroactivePairingDetector::Observer
+  void OnRetroactivePairFound(scoped_refptr<Device> device) override;
+
+  // device::BluetoothAdapter::Observer
+  void DevicePairedChanged(device::BluetoothAdapter* adapter,
+                           device::BluetoothDevice* device,
+                           bool new_paired_status) override;
+
+  // Internal method called by BluetoothAdapterFactory to provide the adapter
+  // object.
+  void OnGetAdapter(scoped_refptr<device::BluetoothAdapter> adapter);
+
   // Map of devices to the time at which a pairing was initiated. This is used
   // to calculate the time between the user electing to pair the device and
   // the pairing entering a terminal state (success or failure).
   base::flat_map<scoped_refptr<Device>, base::TimeTicks>
       device_pairing_start_timestamps_;
 
+  // Set of devices of which on the Associate Account UI shown, the Learn More
+  // button was pressed. We need this map to know which
+  // |FastPairRetroactiveEngagementFlowEvent| event to log at the subsequent
+  // AssociateAccount action events that will follow, since the LearnMore
+  // event is not a terminal state.
+  base::flat_set<scoped_refptr<Device>> learn_more_devices_;
+
+  // The classic pairing addresses of Fast Pair devices that we have already
+  // paired to.
+  base::flat_set<std::string> fast_pair_addresses_;
+
+  scoped_refptr<device::BluetoothAdapter> adapter_;
   std::unique_ptr<FastPairFeatureUsageMetricsLogger>
       feature_usage_metrics_logger_;
+
+  base::ScopedObservation<device::BluetoothAdapter,
+                          device::BluetoothAdapter::Observer>
+      adapter_observation_{this};
   base::ScopedObservation<ScannerBroker, ScannerBroker::Observer>
       scanner_broker_observation_{this};
   base::ScopedObservation<PairerBroker, PairerBroker::Observer>
       pairer_broker_observation_{this};
+  base::ScopedObservation<RetroactivePairingDetector,
+                          RetroactivePairingDetector::Observer>
+      retroactive_pairing_detector_observation_{this};
   base::ScopedObservation<UIBroker, UIBroker::Observer> ui_broker_observation_{
       this};
+  base::WeakPtrFactory<QuickPairMetricsLogger> weak_ptr_factory_{this};
 };
 
 }  // namespace quick_pair
diff --git a/ash/quick_pair/keyed_service/quick_pair_metrics_logger_unittest.cc b/ash/quick_pair/keyed_service/quick_pair_metrics_logger_unittest.cc
index 9c4735a6bda6ea..57cf0e2b05b278 100644
--- a/ash/quick_pair/keyed_service/quick_pair_metrics_logger_unittest.cc
+++ b/ash/quick_pair/keyed_service/quick_pair_metrics_logger_unittest.cc
@@ -6,13 +6,17 @@
 
 #include <memory>
 
+#include "ash/quick_pair/common/account_key_failure.h"
+#include "ash/quick_pair/common/constants.h"
 #include "ash/quick_pair/common/device.h"
 #include "ash/quick_pair/common/fast_pair/fast_pair_metrics.h"
 #include "ash/quick_pair/common/logging.h"
 #include "ash/quick_pair/common/pair_failure.h"
 #include "ash/quick_pair/common/protocol.h"
+#include "ash/quick_pair/pairing/fake_retroactive_pairing_detector.h"
 #include "ash/quick_pair/pairing/mock_pairer_broker.h"
 #include "ash/quick_pair/pairing/pairer_broker.h"
+#include "ash/quick_pair/pairing/retroactive_pairing_detector.h"
 #include "ash/quick_pair/scanning/mock_scanner_broker.h"
 #include "ash/quick_pair/scanning/scanner_broker.h"
 #include "ash/quick_pair/ui/mock_ui_broker.h"
@@ -22,6 +26,9 @@
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/task_environment.h"
 #include "base/time/time.h"
+#include "device/bluetooth/bluetooth_adapter_factory.h"
+#include "device/bluetooth/test/mock_bluetooth_adapter.h"
+#include "device/bluetooth/test/mock_bluetooth_device.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
@@ -34,10 +41,48 @@ constexpr char kFastPairEngagementFlowMetricInitial[] =
 constexpr char kFastPairEngagementFlowMetricSubsequent[] =
     "Bluetooth.ChromeOS.FastPair.EngagementFunnel.Steps."
     "SubsequentPairingProtocol";
+const char kFastPairRetroactiveEngagementFlowMetric[] =
+    "Bluetooth.ChromeOS.FastPair.RetroactiveEngagementFunnel.Steps";
 constexpr char kFastPairPairTimeMetricInitial[] =
     "Bluetooth.ChromeOS.FastPair.TotalUxPairTime.InitialPairingProtocol";
 constexpr char kFastPairPairTimeMetricSubsequent[] =
     "Bluetooth.ChromeOS.FastPair.TotalUxPairTime.SubsequentPairingProtocol";
+const char kPairingMethodMetric[] = "Bluetooth.ChromeOS.FastPair.PairingMethod";
+const char kRetroactivePairingResultMetric[] =
+    "Bluetooth.ChromeOS.FastPair.RetroactivePairing.Result";
+
+constexpr char kTestDeviceAddress[] = "11:12:13:14:15:16";
+constexpr char kTestBleDeviceName[] = "Test Device Name";
+constexpr char kValidModelId[] = "718c17";
+
+std::unique_ptr<testing::NiceMock<device::MockBluetoothDevice>>
+CreateTestBluetoothDevice(std::string address) {
+  return std::make_unique<testing::NiceMock<device::MockBluetoothDevice>>(
+      /*adapter=*/nullptr, /*bluetooth_class=*/0, kTestBleDeviceName, address,
+      /*paired=*/true, /*connected=*/false);
+}
+
+class FakeMetricBluetoothAdapter
+    : public testing::NiceMock<device::MockBluetoothAdapter> {
+ public:
+  device::BluetoothDevice* GetDevice(const std::string& address) override {
+    for (const auto& it : mock_devices_) {
+      if (it->GetAddress() == address)
+        return it.get();
+    }
+
+    return nullptr;
+  }
+
+  void NotifyDevicePairedChanged(device::BluetoothDevice* device,
+                                 bool new_paired_status) {
+    device::BluetoothAdapter::NotifyDevicePairedChanged(device,
+                                                        new_paired_status);
+  }
+
+ private:
+  ~FakeMetricBluetoothAdapter() = default;
+};
 
 }  // namespace
 
@@ -47,10 +92,19 @@ namespace quick_pair {
 class QuickPairMetricsLoggerTest : public testing::Test {
  public:
   void SetUp() override {
+    adapter_ = base::MakeRefCounted<FakeMetricBluetoothAdapter>();
+    device::BluetoothAdapterFactory::SetAdapterForTesting(adapter_);
+
     scanner_broker_ = std::make_unique<MockScannerBroker>();
     mock_scanner_broker_ =
         static_cast<MockScannerBroker*>(scanner_broker_.get());
 
+    retroactive_pairing_detector_ =
+        std::make_unique<FakeRetroactivePairingDetector>();
+    fake_retroactive_pairing_detector_ =
+        static_cast<FakeRetroactivePairingDetector*>(
+            retroactive_pairing_detector_.get());
+
     pairer_broker_ = std::make_unique<MockPairerBroker>();
     mock_pairer_broker_ = static_cast<MockPairerBroker*>(pairer_broker_.get());
 
@@ -61,9 +115,12 @@ class QuickPairMetricsLoggerTest : public testing::Test {
         kTestMetadataId, kTestAddress, Protocol::kFastPairInitial);
     subsequent_device_ = base::MakeRefCounted<Device>(
         kTestMetadataId, kTestAddress, Protocol::kFastPairSubsequent);
+    retroactive_device_ = base::MakeRefCounted<Device>(
+        kTestMetadataId, kTestAddress, Protocol::kFastPairRetroactive);
 
     metrics_logger_ = std::make_unique<QuickPairMetricsLogger>(
-        scanner_broker_.get(), pairer_broker_.get(), ui_broker_.get());
+        scanner_broker_.get(), pairer_broker_.get(), ui_broker_.get(),
+        retroactive_pairing_detector_.get());
   }
 
   void SimulateDiscoveryUiShown(Protocol protocol) {
@@ -129,9 +186,11 @@ class QuickPairMetricsLoggerTest : public testing::Test {
   void SimulatePairingSucceeded(Protocol protocol) {
     switch (protocol) {
       case Protocol::kFastPairInitial:
+        initial_device_->set_classic_address(kTestAddress);
         mock_pairer_broker_->NotifyDevicePaired(initial_device_);
         break;
       case Protocol::kFastPairSubsequent:
+        subsequent_device_->set_classic_address(kTestAddress);
         mock_pairer_broker_->NotifyDevicePaired(subsequent_device_);
         break;
       case Protocol::kFastPairRetroactive:
@@ -169,19 +228,96 @@ class QuickPairMetricsLoggerTest : public testing::Test {
     }
   }
 
+  void SimulateAssociateAccountUiShown() {
+    fake_retroactive_pairing_detector_->NotifyRetroactivePairFound(
+        retroactive_device_);
+  }
+
+  void SimulateAssociateAccountUiDismissed() {
+    mock_ui_broker_->NotifyAssociateAccountAction(
+        retroactive_device_, AssociateAccountAction::kDismissed);
+  }
+
+  void SimulateAssociateAccountUiDismissedByUser() {
+    mock_ui_broker_->NotifyAssociateAccountAction(
+        retroactive_device_, AssociateAccountAction::kDismissedByUser);
+  }
+
+  void SimulateAssociateAccountUiSavePressed() {
+    mock_ui_broker_->NotifyAssociateAccountAction(
+        retroactive_device_, AssociateAccountAction::kAssoicateAccount);
+  }
+
+  void SimulateAssociateAccountUiLearnMorePressed() {
+    mock_ui_broker_->NotifyAssociateAccountAction(
+        retroactive_device_, AssociateAccountAction::kLearnMore);
+  }
+
+  void SimulateAccountKeyWritten(Protocol protocol) {
+    switch (protocol) {
+      case Protocol::kFastPairInitial:
+        mock_pairer_broker_->NotifyAccountKeyWrite(initial_device_,
+                                                   absl::nullopt);
+        break;
+      case Protocol::kFastPairSubsequent:
+        break;
+      case Protocol::kFastPairRetroactive:
+        mock_pairer_broker_->NotifyAccountKeyWrite(retroactive_device_,
+                                                   absl::nullopt);
+        break;
+    }
+  }
+
+  void SimulateAccountKeyFailure(Protocol protocol) {
+    switch (protocol) {
+      case Protocol::kFastPairInitial:
+        mock_pairer_broker_->NotifyAccountKeyWrite(
+            initial_device_, AccountKeyFailure::kAccountKeyCharacteristicWrite);
+        break;
+      case Protocol::kFastPairSubsequent:
+        break;
+      case Protocol::kFastPairRetroactive:
+        mock_pairer_broker_->NotifyAccountKeyWrite(
+            retroactive_device_,
+            AccountKeyFailure::kAccountKeyCharacteristicWrite);
+        break;
+    }
+  }
+
+  void PairFastPairDeviceWithFastPair(std::string address) {
+    auto fp_device = base::MakeRefCounted<Device>(kValidModelId, address,
+                                                  Protocol::kFastPairInitial);
+    fp_device->set_classic_address(address);
+    mock_pairer_broker_->NotifyDevicePaired(fp_device);
+  }
+
+  void PairFastPairDeviceWithClassicBluetooth(bool new_paired_status,
+                                              std::string classic_address) {
+    std::unique_ptr<testing::NiceMock<device::MockBluetoothDevice>>
+        bluetooth_device = CreateTestBluetoothDevice(classic_address);
+    bluetooth_device->AddUUID(ash::quick_pair::kFastPairBluetoothUuid);
+    auto* bt_device_ptr = bluetooth_device.get();
+    adapter_->AddMockDevice(std::move(bluetooth_device));
+    adapter_->NotifyDevicePairedChanged(bt_device_ptr, new_paired_status);
+  }
+
   base::HistogramTester& histogram_tester() { return histogram_tester_; }
 
  protected:
   base::HistogramTester histogram_tester_;
   base::test::SingleThreadTaskEnvironment task_environment_;
+  scoped_refptr<FakeMetricBluetoothAdapter> adapter_;
   scoped_refptr<Device> initial_device_;
   scoped_refptr<Device> subsequent_device_;
+  scoped_refptr<Device> retroactive_device_;
 
   MockScannerBroker* mock_scanner_broker_ = nullptr;
   MockPairerBroker* mock_pairer_broker_ = nullptr;
   MockUIBroker* mock_ui_broker_ = nullptr;
+  FakeRetroactivePairingDetector* fake_retroactive_pairing_detector_ = nullptr;
 
   std::unique_ptr<ScannerBroker> scanner_broker_;
+  std::unique_ptr<RetroactivePairingDetector> retroactive_pairing_detector_;
   std::unique_ptr<PairerBroker> pairer_broker_;
   std::unique_ptr<UIBroker> ui_broker_;
   std::unique_ptr<QuickPairMetricsLogger> metrics_logger_;
@@ -669,5 +805,444 @@ TEST_F(QuickPairMetricsLoggerTest, LogPairTime_Subsequent) {
   histogram_tester().ExpectTotalCount(kFastPairPairTimeMetricSubsequent, 1);
 }
 
+TEST_F(QuickPairMetricsLoggerTest, LogAssociateAccountShown) {
+  SimulateAssociateAccountUiShown();
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountUiShown),
+      1);
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountUiDismissed),
+      0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountUiDismissedByUser),
+            0);
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountSavePressed),
+      0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountLearnMorePressed),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountSavePressedAfterLearnMorePressed),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountDismissedByUserAfterLearnMorePressed),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountDismissedAfterLearnMorePressed),
+            0);
+}
+
+TEST_F(QuickPairMetricsLoggerTest, LogAssociateAccountDismissed) {
+  SimulateAssociateAccountUiDismissed();
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountUiShown),
+      0);
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountUiDismissed),
+      1);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountUiDismissedByUser),
+            0);
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountSavePressed),
+      0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountLearnMorePressed),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountSavePressedAfterLearnMorePressed),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountDismissedByUserAfterLearnMorePressed),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountDismissedAfterLearnMorePressed),
+            0);
+}
+
+TEST_F(QuickPairMetricsLoggerTest, LogAssociateAccountDismissedByUser) {
+  SimulateAssociateAccountUiDismissedByUser();
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountUiShown),
+      0);
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountUiDismissed),
+      0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountUiDismissedByUser),
+            1);
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountSavePressed),
+      0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountLearnMorePressed),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountSavePressedAfterLearnMorePressed),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountDismissedByUserAfterLearnMorePressed),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountDismissedAfterLearnMorePressed),
+            0);
+}
+
+TEST_F(QuickPairMetricsLoggerTest, LogAssociateAccountSavePressed) {
+  SimulateAssociateAccountUiSavePressed();
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountUiShown),
+      0);
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountUiDismissed),
+      0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountUiDismissedByUser),
+            0);
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountSavePressed),
+      1);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountLearnMorePressed),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountSavePressedAfterLearnMorePressed),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountDismissedByUserAfterLearnMorePressed),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountDismissedAfterLearnMorePressed),
+            0);
+}
+
+TEST_F(QuickPairMetricsLoggerTest, LogAssociateAccountLearnMorePressed) {
+  SimulateAssociateAccountUiLearnMorePressed();
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountUiShown),
+      0);
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountUiDismissed),
+      0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountUiDismissedByUser),
+            0);
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountSavePressed),
+      0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountLearnMorePressed),
+            1);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountSavePressedAfterLearnMorePressed),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountDismissedByUserAfterLearnMorePressed),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountDismissedAfterLearnMorePressed),
+            0);
+}
+
+TEST_F(QuickPairMetricsLoggerTest,
+       LogAssociateAccountLearnMorePressed_SavePressed) {
+  SimulateAssociateAccountUiLearnMorePressed();
+  base::RunLoop().RunUntilIdle();
+  SimulateAssociateAccountUiSavePressed();
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountUiShown),
+      0);
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountUiDismissed),
+      0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountUiDismissedByUser),
+            0);
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountSavePressed),
+      0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountLearnMorePressed),
+            1);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountSavePressedAfterLearnMorePressed),
+            1);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountDismissedByUserAfterLearnMorePressed),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountDismissedAfterLearnMorePressed),
+            0);
+}
+
+TEST_F(QuickPairMetricsLoggerTest,
+       LogAssociateAccountLearnMorePressed_Dismissed) {
+  SimulateAssociateAccountUiLearnMorePressed();
+  base::RunLoop().RunUntilIdle();
+  SimulateAssociateAccountUiDismissed();
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountUiShown),
+      0);
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountUiDismissed),
+      0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountUiDismissedByUser),
+            0);
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountSavePressed),
+      0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountLearnMorePressed),
+            1);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountSavePressedAfterLearnMorePressed),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountDismissedByUserAfterLearnMorePressed),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountDismissedAfterLearnMorePressed),
+            1);
+}
+
+TEST_F(QuickPairMetricsLoggerTest,
+       LogAssociateAccountLearnMorePressed_DismissedByUser) {
+  SimulateAssociateAccountUiLearnMorePressed();
+  base::RunLoop().RunUntilIdle();
+  SimulateAssociateAccountUiDismissedByUser();
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountUiShown),
+      0);
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountUiDismissed),
+      0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountUiDismissedByUser),
+            0);
+  EXPECT_EQ(
+      histogram_tester().GetBucketCount(
+          kFastPairRetroactiveEngagementFlowMetric,
+          FastPairRetroactiveEngagementFlowEvent::kAssociateAccountSavePressed),
+      0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountLearnMorePressed),
+            1);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountSavePressedAfterLearnMorePressed),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountDismissedByUserAfterLearnMorePressed),
+            1);
+  EXPECT_EQ(histogram_tester().GetBucketCount(
+                kFastPairRetroactiveEngagementFlowMetric,
+                FastPairRetroactiveEngagementFlowEvent::
+                    kAssociateAccountDismissedAfterLearnMorePressed),
+            0);
+}
+
+TEST_F(QuickPairMetricsLoggerTest, DevicedPaired_FastPair) {
+  EXPECT_EQ(histogram_tester().GetBucketCount(kPairingMethodMetric,
+                                              PairingMethod::kFastPair),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(kPairingMethodMetric,
+                                              PairingMethod::kSystemPairingUi),
+            0);
+  PairFastPairDeviceWithFastPair(kTestDeviceAddress);
+  PairFastPairDeviceWithClassicBluetooth(
+      /*new_paired_status=*/true, kTestDeviceAddress);
+  EXPECT_EQ(histogram_tester().GetBucketCount(kPairingMethodMetric,
+                                              PairingMethod::kFastPair),
+            1);
+  EXPECT_EQ(histogram_tester().GetBucketCount(kPairingMethodMetric,
+                                              PairingMethod::kSystemPairingUi),
+            0);
+}
+
+TEST_F(QuickPairMetricsLoggerTest, DeviceUnpaired) {
+  EXPECT_EQ(histogram_tester().GetBucketCount(kPairingMethodMetric,
+                                              PairingMethod::kFastPair),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(kPairingMethodMetric,
+                                              PairingMethod::kSystemPairingUi),
+            0);
+  PairFastPairDeviceWithClassicBluetooth(
+      /*new_paired_status=*/false, kTestDeviceAddress);
+  EXPECT_EQ(histogram_tester().GetBucketCount(kPairingMethodMetric,
+                                              PairingMethod::kFastPair),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(kPairingMethodMetric,
+                                              PairingMethod::kSystemPairingUi),
+            0);
+}
+
+TEST_F(QuickPairMetricsLoggerTest, DevicePaired) {
+  EXPECT_EQ(histogram_tester().GetBucketCount(kPairingMethodMetric,
+                                              PairingMethod::kFastPair),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(kPairingMethodMetric,
+                                              PairingMethod::kSystemPairingUi),
+            0);
+  PairFastPairDeviceWithClassicBluetooth(
+      /*new_paired_status=*/true, kTestDeviceAddress);
+  EXPECT_EQ(histogram_tester().GetBucketCount(kPairingMethodMetric,
+                                              PairingMethod::kFastPair),
+            0);
+  EXPECT_EQ(histogram_tester().GetBucketCount(kPairingMethodMetric,
+                                              PairingMethod::kSystemPairingUi),
+            1);
+}
+
+TEST_F(QuickPairMetricsLoggerTest, WriteAccountKey_Initial) {
+  histogram_tester().ExpectTotalCount(kRetroactivePairingResultMetric, 0);
+  SimulateAccountKeyWritten(Protocol::kFastPairInitial);
+  histogram_tester().ExpectTotalCount(kRetroactivePairingResultMetric, 0);
+}
+
+TEST_F(QuickPairMetricsLoggerTest, WriteAccountKey_Retroactive) {
+  histogram_tester().ExpectTotalCount(kRetroactivePairingResultMetric, 0);
+  SimulateAccountKeyWritten(Protocol::kFastPairRetroactive);
+  histogram_tester().ExpectTotalCount(kRetroactivePairingResultMetric, 1);
+}
+
+TEST_F(QuickPairMetricsLoggerTest, WriteAccountKeyFailure_Retroactive) {
+  histogram_tester().ExpectTotalCount(kRetroactivePairingResultMetric, 0);
+  SimulateAccountKeyFailure(Protocol::kFastPairRetroactive);
+  histogram_tester().ExpectTotalCount(kRetroactivePairingResultMetric, 1);
+}
+
 }  // namespace quick_pair
 }  // namespace ash
diff --git a/ash/system/message_center/unified_message_center_bubble.cc b/ash/system/message_center/unified_message_center_bubble.cc
index 5a6b32c1d384e6..5224e313ccacfd 100644
--- a/ash/system/message_center/unified_message_center_bubble.cc
+++ b/ash/system/message_center/unified_message_center_bubble.cc
@@ -127,6 +127,11 @@ UnifiedMessageCenterBubble::~UnifiedMessageCenterBubble() {
   CHECK(!views::WidgetObserver::IsInObserverList());
 }
 
+gfx::Rect UnifiedMessageCenterBubble::GetBoundsInScreen() const {
+  DCHECK(bubble_view_);
+  return bubble_view_->GetBoundsInScreen();
+}
+
 void UnifiedMessageCenterBubble::CollapseMessageCenter() {
   if (message_center_view_->collapsed())
     return;
diff --git a/ash/system/message_center/unified_message_center_bubble.h b/ash/system/message_center/unified_message_center_bubble.h
index 14da351c2a2287..f50660219287b5 100644
--- a/ash/system/message_center/unified_message_center_bubble.h
+++ b/ash/system/message_center/unified_message_center_bubble.h
@@ -39,6 +39,9 @@ class ASH_EXPORT UnifiedMessageCenterBubble
 
   ~UnifiedMessageCenterBubble() override;
 
+  // Return the bounds of the bubble in the screen.
+  gfx::Rect GetBoundsInScreen() const;
+
   // We need the code to show the bubble explicitly separated from the
   // contructor. This is to prevent trigerring the TrayEventFilter from within
   // the constructor. Doing so can cause a crash when the TrayEventFilter tries
diff --git a/ash/system/message_center/unified_message_center_bubble_unittest.cc b/ash/system/message_center/unified_message_center_bubble_unittest.cc
index 51fc252d5fe56c..d11a129373f1a3 100644
--- a/ash/system/message_center/unified_message_center_bubble_unittest.cc
+++ b/ash/system/message_center/unified_message_center_bubble_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <memory>
 
+#include "ash/constants/ash_features.h"
 #include "ash/constants/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
@@ -16,7 +17,9 @@
 #include "ash/system/unified/unified_system_tray_controller.h"
 #include "ash/system/unified/unified_system_tray_view.h"
 #include "ash/test/ash_test_base.h"
+#include "ash/wm/tablet_mode/tablet_mode_controller.h"
 #include "base/strings/stringprintf.h"
+#include "base/test/scoped_feature_list.h"
 #include "components/prefs/pref_service.h"
 #include "ui/events/keycodes/keyboard_codes_posix.h"
 #include "ui/message_center/message_center.h"
@@ -396,4 +399,79 @@ TEST_F(UnifiedMessageCenterBubbleTest, FocusCycleWithNoNotifications) {
             GetFirstQuickSettingsFocusable());
 }
 
+// Tests with NotificationsRefresh enabled and disabled.
+class ParameterizedMessageCenterBubbleTest
+    : public UnifiedMessageCenterBubbleTest,
+      public testing::WithParamInterface<bool> {
+ public:
+  ParameterizedMessageCenterBubbleTest() = default;
+
+  ParameterizedMessageCenterBubbleTest(
+      const ParameterizedMessageCenterBubbleTest&) = delete;
+  ParameterizedMessageCenterBubbleTest& operator=(
+      const ParameterizedMessageCenterBubbleTest&) = delete;
+
+  ~ParameterizedMessageCenterBubbleTest() override = default;
+
+  // AshTestBase:
+  void SetUp() override {
+    scoped_feature_list_ = std::make_unique<base::test::ScopedFeatureList>();
+    scoped_feature_list_->InitWithFeatureState(features::kNotificationsRefresh,
+                                               IsNotificationsRefreshEnabled());
+
+    UnifiedMessageCenterBubbleTest::SetUp();
+  }
+
+  bool IsNotificationsRefreshEnabled() const { return GetParam(); }
+
+ private:
+  std::unique_ptr<base::test::ScopedFeatureList> scoped_feature_list_;
+};
+
+INSTANTIATE_TEST_SUITE_P(All,
+                         ParameterizedMessageCenterBubbleTest,
+                         testing::Bool() /* IsNotificationsRefreshEnabled() */);
+
+TEST_P(ParameterizedMessageCenterBubbleTest, BubbleBounds) {
+  // Set display size where the message center is not collapsed.
+  UpdateDisplay("0+0-1280×1024");
+
+  // Ensure message center is not collapsed.
+  GetPrimaryUnifiedSystemTray()->ShowBubble();
+  ASSERT_FALSE(GetMessageCenterBubble()->IsMessageCenterCollapsed());
+
+  // Add enough notifications so that the scroll bar is visible.
+  while (!GetMessageCenterBubble()->message_center_view()->IsScrollBarVisible())
+    AddNotification();
+
+  // The message center bubble should be positioned above the system tray
+  // bubble.
+  GetPrimaryUnifiedSystemTray()->ShowBubble();
+  EXPECT_LT(GetMessageCenterBubble()->GetBoundsInScreen().bottom(),
+            GetSystemTrayBubble()->GetBoundsInScreen().y());
+  GetPrimaryUnifiedSystemTray()->CloseBubble();
+
+  // Go into overview mode, check bounds again.
+  EnterOverview();
+  GetPrimaryUnifiedSystemTray()->ShowBubble();
+  EXPECT_LT(GetMessageCenterBubble()->GetBoundsInScreen().bottom(),
+            GetSystemTrayBubble()->GetBoundsInScreen().y());
+  GetPrimaryUnifiedSystemTray()->CloseBubble();
+  ExitOverview();
+
+  // Go into tablet mode, check bounds again.
+  Shell::Get()->tablet_mode_controller()->SetEnabledForTest(true);
+  GetPrimaryUnifiedSystemTray()->ShowBubble();
+  EXPECT_LT(GetMessageCenterBubble()->GetBoundsInScreen().bottom(),
+            GetSystemTrayBubble()->GetBoundsInScreen().y());
+  GetPrimaryUnifiedSystemTray()->CloseBubble();
+
+  // Go into overview mode inside tablet mode, check bounds again.
+  EnterOverview();
+  GetPrimaryUnifiedSystemTray()->ShowBubble();
+  EXPECT_LT(GetMessageCenterBubble()->GetBoundsInScreen().bottom(),
+            GetSystemTrayBubble()->GetBoundsInScreen().y());
+  GetPrimaryUnifiedSystemTray()->CloseBubble();
+}
+
 }  // namespace ash
diff --git a/ash/system/message_center/unified_message_center_view.cc b/ash/system/message_center/unified_message_center_view.cc
index 72db4a46e40b75..23dac8d1c901e3 100644
--- a/ash/system/message_center/unified_message_center_view.cc
+++ b/ash/system/message_center/unified_message_center_view.cc
@@ -129,8 +129,12 @@ void UnifiedMessageCenterView::Init() {
 
 void UnifiedMessageCenterView::SetMaxHeight(int max_height) {
   int max_scroller_height = max_height;
-  if (notification_bar_->GetVisible())
+  if (notification_bar_->GetVisible()) {
     max_scroller_height -= kStackedNotificationBarHeight;
+    if (is_notifications_refresh_enabled_)
+      max_scroller_height -=
+          2 * kNotificationBarVerticalPadding + kMessageCenterBottomPadding;
+  }
   scroller_->ClipHeightTo(0, max_scroller_height);
 }
 
@@ -183,6 +187,10 @@ bool UnifiedMessageCenterView::IsNotificationBarVisible() const {
   return notification_bar_->GetVisible();
 }
 
+bool UnifiedMessageCenterView::IsScrollBarVisible() const {
+  return scroll_bar_->GetVisible();
+}
+
 void UnifiedMessageCenterView::OnNotificationSlidOut() {
   if (notification_bar_->GetVisible()) {
     notification_bar_->Update(
diff --git a/ash/system/message_center/unified_message_center_view.h b/ash/system/message_center/unified_message_center_view.h
index 52d330149e94d9..4729718645fdd7 100644
--- a/ash/system/message_center/unified_message_center_view.h
+++ b/ash/system/message_center/unified_message_center_view.h
@@ -130,6 +130,9 @@ class ASH_EXPORT UnifiedMessageCenterView
   // Returns true if the notification bar is visible.
   bool IsNotificationBarVisible() const;
 
+  // Returns true if the scroll bar is visible.
+  bool IsScrollBarVisible() const;
+
   // views::View:
   void AddedToWidget() override;
   void RemovedFromWidget() override;
diff --git a/ash/system/message_center/unified_message_list_view.cc b/ash/system/message_center/unified_message_list_view.cc
index bb5674f9ed4107..0f5f737463a2a3 100644
--- a/ash/system/message_center/unified_message_list_view.cc
+++ b/ash/system/message_center/unified_message_list_view.cc
@@ -946,7 +946,10 @@ void UnifiedMessageListView::StartAnimation() {
           kExpandOrCollapseAnimationSmoothnessHistogramName);
       DCHECK(expand_or_collapsing_container_);
       animation_duration =
-          expand_or_collapsing_container_->GetBoundsAnimationDuration();
+          expand_or_collapsing_container_
+              ? expand_or_collapsing_container_->GetBoundsAnimationDuration()
+              : base::Milliseconds(
+                    kLargeImageExpandAndCollapseAnimationDuration);
       break;
   }
 
diff --git a/ash/webui/resources/BUILD.gn b/ash/webui/resources/BUILD.gn
index 60aff1464f5682..427f9cc608f81a 100644
--- a/ash/webui/resources/BUILD.gn
+++ b/ash/webui/resources/BUILD.gn
@@ -76,6 +76,11 @@ ash_generated_grit("firmware_update_app_resources") {
   deps = [ "//ash/webui/firmware_update_ui/resources:build_grd" ]
 }
 
+ash_generated_grit("system_extensions_internals_resources") {
+  source = "$root_gen_dir/ash/webui/system_extensions_internals_ui/ash_system_extensions_internals_resources.grd"
+  deps = [ "//ash/webui/system_extensions_internals_ui:build_grd" ]
+}
+
 if (!is_official_build) {
   # Resources used by chrome://demo-mode-app
   ash_generated_grit("demo_mode_app_resources") {
diff --git a/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.html b/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.html
index b373475a9719ff..ef85af925265e5 100644
--- a/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.html
+++ b/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.html
@@ -2,6 +2,26 @@
   #dialogBody {
     overflow-wrap: anywhere;
   }
+
+  cr-input {
+    --cr-input-error-display: none;
+  }
+
+  #inputValidationLabel {
+    color: var(--google-grey-600);
+  }
+
+  :host([rsu-code-invalid_]) #inputValidationLabel {
+    color: red;
+  }
+
+  #rsuCodeLengthLabel {
+    float: right;
+  }
+
+  #inputContainer {
+    width: 275px;
+  }
 </style>
 
 <base-page orientation="column">
@@ -10,13 +30,20 @@ <h1>[[i18n('rsuCodePageTitleText')]]</h1>
     <div>
       <span inner-h-t-m-l="[[rsuInstructionsText_]]"></span>
     </div>
-    <cr-input
-        on-change="onRsuCodeChanged_"
-        label="[[i18n('rsuCodeLabelText')]]"
-        placeholder="[[i18n('rsuCodePlaceHolderText')]]"
-        id="rsuCode"
-        value="{{rsuCode_}}">
-    </cr-input>
+    <div id="inputContainer">
+      <cr-input
+          on-change="onRsuCodeChanged_"
+          id="rsuCode"
+          value="{{rsuCode_}}"
+          pattern="[[rsuCodeValidationRegex_]]"
+          invalid="{{rsuCodeInvalid_}}"
+          auto-validate>
+      </cr-input>
+      <div id="inputValidationLabel">
+        [[i18n('rsuCodeLabelText')]]
+        <span id="rsuCodeLengthLabel">[[rsuCodeLengthLabel_]]</span>
+      </div>
+    </div>
   </div>
   <div slot="body">
     <canvas id="qrCodeCanvas" width="[[canvasSize_]]" height="[[canvasSize_]]">
diff --git a/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.js b/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.js
index ec917166574227..d1d57ae8487ff1 100644
--- a/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.js
+++ b/ash/webui/shimless_rma/resources/onboarding_enter_rsu_wp_disable_code_page.js
@@ -83,6 +83,26 @@ export class OnboardingEnterRsuWpDisableCodePage extends
         value: '',
         computed: 'computeRsuChallengeLinkText_(rsuHwid_, rsuChallenge_)',
       },
+
+      /** @protected */
+      rsuCodeValidationRegex_: {
+        type: String,
+        value: '.{1,8}',
+        readOnly: true,
+      },
+
+      /** @protected {boolean} */
+      rsuCodeInvalid_: {
+        type: Boolean,
+        value: false,
+        reflectToAttribute: true,
+      },
+
+      /** @protected */
+      rsuCodeLengthLabel_: {
+        type: String,
+        computed: 'computeRsuCodeLengthLabel_(rsuCode_)',
+      },
     };
   }
 
@@ -202,6 +222,14 @@ export class OnboardingEnterRsuWpDisableCodePage extends
   closeDialog_() {
     this.shadowRoot.querySelector('#rsuChallengeDialog').close();
   }
+
+  /**
+   * @return {string}
+   * @private
+   */
+  computeRsuCodeLengthLabel_() {
+    return this.rsuCode_.length + '/8';
+  }
 }
 
 customElements.define(
diff --git a/ash/webui/shimless_rma/shimless_rma.cc b/ash/webui/shimless_rma/shimless_rma.cc
index c42fe40ead3336..2ac3c051d3a1cc 100644
--- a/ash/webui/shimless_rma/shimless_rma.cc
+++ b/ash/webui/shimless_rma/shimless_rma.cc
@@ -140,7 +140,6 @@ void AddShimlessRmaStrings(content::WebUIDataSource* html_source) {
       {"rsuChallengeDialogTitleText",
        IDS_SHIMLESS_RMA_RSU_CHALLENGE_DIALOG_TITLE},
       {"rsuCodeLabelText", IDS_SHIMLESS_RMA_RSU_CODE_LABEL},
-      {"rsuCodePlaceHolderText", IDS_SHIMLESS_RMA_RSU_CODE_PLACEHOLDER},
       {"rsuChallengeDialogDoneButtonLabel",
        IDS_SHIMLESS_RMA_RSU_CHALLENGE_DIALOG_DONE_BUTTON},
       // Manual WP disable complete
diff --git a/ash/webui/system_extensions_internals_ui/BUILD.gn b/ash/webui/system_extensions_internals_ui/BUILD.gn
new file mode 100644
index 00000000000000..d260625ad12671
--- /dev/null
+++ b/ash/webui/system_extensions_internals_ui/BUILD.gn
@@ -0,0 +1,55 @@
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/chromeos/ui_mode.gni")
+import("//chrome/test/base/js2gtest.gni")
+import("//third_party/closure_compiler/compile_js.gni")
+import("//ui/webui/resources/tools/generate_grd.gni")
+
+assert(is_chromeos_ash, "System Extensions Internals is ash-chrome only")
+
+static_library("system_extensions_internals_ui") {
+  sources = [
+    "system_extensions_internals_ui.cc",
+    "system_extensions_internals_ui.h",
+    "url_constants.cc",
+    "url_constants.h",
+  ]
+
+  deps = [
+    "//ash/webui/resources:system_extensions_internals_resources",
+    "//content/public/browser",
+    "//ui/webui",
+  ]
+}
+
+js_type_check("closure_compile") {
+  deps = [ ":system_extensions_internals" ]
+  closure_flags = default_closure_args + mojom_js_args
+}
+
+js_library("system_extensions_internals") {
+  sources = [ "resources/index.js" ]
+}
+
+js2gtest("browser_tests_js") {
+  test_type = "mojo_lite_webui"
+
+  sources = [ "test/system_extensions_internals_ui_browsertest.js" ]
+
+  defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+}
+
+grd_prefix = "ash_system_extensions_internals"
+
+generate_grd("build_grd") {
+  input_files_base_dir = rebase_path("resources", "//")
+  input_files = [
+    "index.html",
+    "index.js",
+  ]
+
+  grd_prefix = grd_prefix
+  out_grd = "$target_gen_dir/${grd_prefix}_resources.grd"
+}
diff --git a/ash/webui/system_extensions_internals_ui/DEPS b/ash/webui/system_extensions_internals_ui/DEPS
new file mode 100644
index 00000000000000..e1a02eff17a9d9
--- /dev/null
+++ b/ash/webui/system_extensions_internals_ui/DEPS
@@ -0,0 +1,5 @@
+include_rules = [
+  # Do not add chrome here. Use a delegate instead.
+  "+ash/grit/ash_system_extensions_internals_resources.h",
+  "+ui/webui",
+]
diff --git a/ash/webui/system_extensions_internals_ui/OWNERS b/ash/webui/system_extensions_internals_ui/OWNERS
new file mode 100644
index 00000000000000..47d56c8504b5a8
--- /dev/null
+++ b/ash/webui/system_extensions_internals_ui/OWNERS
@@ -0,0 +1 @@
+file://ash/webui/system_apps/PLATFORM_OWNERS
diff --git a/ash/webui/system_extensions_internals_ui/resources/index.html b/ash/webui/system_extensions_internals_ui/resources/index.html
new file mode 100644
index 00000000000000..1268eca5b3da04
--- /dev/null
+++ b/ash/webui/system_extensions_internals_ui/resources/index.html
@@ -0,0 +1,16 @@
+<!-- Copyright 2021 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+<!DOCTYPE html>
+<head>
+  <meta charset="utf-8">
+  <title>System Extensions Internals</title>
+</head>
+<p>Choose a directory with a System Extension to sideload it. The System Extension directory must be in Downloads for Chrome OS to be able to find it.</p>
+<button id="choose-directory">Choose directory</button>
+<dialog id="result-dialog">
+  <p>System Extension installed</p>
+</dialog>
+<!-- Needed for js browser tests -->
+<script src="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js"></script>
+<script type="module" src="index.js"></script>
diff --git a/ash/webui/system_extensions_internals_ui/resources/index.js b/ash/webui/system_extensions_internals_ui/resources/index.js
new file mode 100644
index 00000000000000..1441a844b3899f
--- /dev/null
+++ b/ash/webui/system_extensions_internals_ui/resources/index.js
@@ -0,0 +1,10 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+const chooseDirButton = document.querySelector('#choose-directory');
+const resultDialog = document.querySelector('#result-dialog');
+
+chooseDirButton.addEventListener('click', async event => {
+  resultDialog.showModal();
+});
diff --git a/ash/webui/system_extensions_internals_ui/system_extensions_internals_ui.cc b/ash/webui/system_extensions_internals_ui/system_extensions_internals_ui.cc
new file mode 100644
index 00000000000000..69458872940086
--- /dev/null
+++ b/ash/webui/system_extensions_internals_ui/system_extensions_internals_ui.cc
@@ -0,0 +1,38 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ash/webui/system_extensions_internals_ui/system_extensions_internals_ui.h"
+
+#include "ash/grit/ash_system_extensions_internals_resources.h"
+#include "ash/grit/ash_system_extensions_internals_resources_map.h"
+#include "ash/webui/system_extensions_internals_ui/url_constants.h"
+#include "base/memory/ptr_util.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_ui.h"
+#include "content/public/browser/web_ui_data_source.h"
+#include "services/network/public/mojom/content_security_policy.mojom.h"
+#include "ui/webui/webui_allowlist.h"
+
+namespace ash {
+
+SystemExtensionsInternalsUI::SystemExtensionsInternalsUI(content::WebUI* web_ui)
+    : ui::MojoWebUIController(web_ui) {
+  auto data_source = base::WrapUnique(
+      content::WebUIDataSource::Create(kChromeUISystemExtensionsInternalsHost));
+
+  data_source->AddResourcePath("",
+                               IDR_ASH_SYSTEM_EXTENSIONS_INTERNALS_INDEX_HTML);
+  data_source->AddResourcePaths(
+      base::make_span(kAshSystemExtensionsInternalsResources,
+                      kAshSystemExtensionsInternalsResourcesSize));
+
+  auto* browser_context = web_ui->GetWebContents()->GetBrowserContext();
+  content::WebUIDataSource::Add(browser_context, data_source.release());
+}
+
+SystemExtensionsInternalsUI::~SystemExtensionsInternalsUI() = default;
+
+WEB_UI_CONTROLLER_TYPE_IMPL(SystemExtensionsInternalsUI)
+
+}  // namespace ash
diff --git a/ash/webui/system_extensions_internals_ui/system_extensions_internals_ui.h b/ash/webui/system_extensions_internals_ui/system_extensions_internals_ui.h
new file mode 100644
index 00000000000000..c1dcb1c2514ff0
--- /dev/null
+++ b/ash/webui/system_extensions_internals_ui/system_extensions_internals_ui.h
@@ -0,0 +1,27 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ASH_WEBUI_SYSTEM_EXTENSIONS_INTERNALS_UI_SYSTEM_EXTENSIONS_INTERNALS_UI_H_
+#define ASH_WEBUI_SYSTEM_EXTENSIONS_INTERNALS_UI_SYSTEM_EXTENSIONS_INTERNALS_UI_H_
+
+#include "ui/webui/mojo_web_ui_controller.h"
+
+namespace ash {
+
+// WebUIController for chrome://system-extensions-internals/.
+class SystemExtensionsInternalsUI : public ui::MojoWebUIController {
+ public:
+  explicit SystemExtensionsInternalsUI(content::WebUI* web_ui);
+  SystemExtensionsInternalsUI(const SystemExtensionsInternalsUI&) = delete;
+  SystemExtensionsInternalsUI& operator=(const SystemExtensionsInternalsUI&) =
+      delete;
+  ~SystemExtensionsInternalsUI() override;
+
+ private:
+  WEB_UI_CONTROLLER_TYPE_DECL();
+};
+
+}  // namespace ash
+
+#endif  // ASH_WEBUI_SYSTEM_EXTENSIONS_INTERNALS_UI_SYSTEM_EXTENSIONS_INTERNALS_UI_H_
diff --git a/ash/webui/system_extensions_internals_ui/test/system_extensions_internals_ui_browsertest.js b/ash/webui/system_extensions_internals_ui/test/system_extensions_internals_ui_browsertest.js
new file mode 100644
index 00000000000000..e9f06587d0bef8
--- /dev/null
+++ b/ash/webui/system_extensions_internals_ui/test/system_extensions_internals_ui_browsertest.js
@@ -0,0 +1,52 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/**
+ * @fileoverview Test suite for chrome://system-extensions-internals/
+ */
+
+GEN('#include "ash/constants/ash_features.h"');
+GEN('#include "content/public/test/browser_test.h"');
+
+const HOST_ORIGIN = 'chrome://system-extensions-internals';
+
+// TODO:(crbug.com/1262025): We should avoid using `var`.
+//
+// js2gtest fixtures require var here (https://crbug.com/1033337).
+// eslint-disable-next-line no-var
+var SystemExtensionsInternalsUIBrowserTest = class extends testing.Test {
+  /** @override */
+  get browsePreload() {
+    return HOST_ORIGIN;
+  }
+
+  /** @override */
+  get featureList() {
+    return {
+      enabled: [
+        'ash::features::kSystemExtensions',
+      ]
+    };
+  }
+
+  /** @override */
+  get runAccessibilityChecks() {
+    return false;
+  }
+
+  /** @override */
+  get isAsync() {
+    return true;
+  }
+};
+
+// Tests that chrome://system-extensions-internals loads successfully.
+TEST_F(
+    'SystemExtensionsInternalsUIBrowserTest', 'HasChromeSchemeURL',
+    async () => {
+      const header = document.querySelector('title');
+      assertEquals(header.innerText, 'System Extensions Internals');
+      assertEquals(document.location.origin, HOST_ORIGIN);
+      testDone();
+    });
diff --git a/ash/webui/system_extensions_internals_ui/url_constants.cc b/ash/webui/system_extensions_internals_ui/url_constants.cc
new file mode 100644
index 00000000000000..4838257065b27a
--- /dev/null
+++ b/ash/webui/system_extensions_internals_ui/url_constants.cc
@@ -0,0 +1,10 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ash/webui/system_extensions_internals_ui/url_constants.h"
+
+namespace ash {
+const char kChromeUISystemExtensionsInternalsHost[] =
+    "system-extensions-internals";
+}  // namespace ash
diff --git a/ash/webui/system_extensions_internals_ui/url_constants.h b/ash/webui/system_extensions_internals_ui/url_constants.h
new file mode 100644
index 00000000000000..bf293e97b5afc9
--- /dev/null
+++ b/ash/webui/system_extensions_internals_ui/url_constants.h
@@ -0,0 +1,12 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ASH_WEBUI_SYSTEM_EXTENSIONS_INTERNALS_UI_URL_CONSTANTS_H_
+#define ASH_WEBUI_SYSTEM_EXTENSIONS_INTERNALS_UI_URL_CONSTANTS_H_
+
+namespace ash {
+extern const char kChromeUISystemExtensionsInternalsHost[];
+}  // namespace ash
+
+#endif  // ASH_WEBUI_SYSTEM_EXTENSIONS_INTERNALS_UI_URL_CONSTANTS_H_
diff --git a/ash/wm/desks/desk.cc b/ash/wm/desks/desk.cc
index ae04b632404e4d..06ea15fc673e92 100644
--- a/ash/wm/desks/desk.cc
+++ b/ash/wm/desks/desk.cc
@@ -498,9 +498,6 @@ void Desk::MoveWindowToDesk(aura::Window* window,
   DCHECK(target_root);
   DCHECK(base::Contains(windows_, window));
   DCHECK(this != target_desk);
-  // The desks bar should not be allowed to move individually to another desk.
-  // Only as part of `MoveWindowsToDesk()` when the desk is removed.
-  DCHECK_NE(window->GetId(), kShellWindowId_DesksBarWindow);
 
   {
     ScopedWindowPositionerDisabler window_positioner_disabler;
diff --git a/ash/wm/desks/desk_animation_impl.cc b/ash/wm/desks/desk_animation_impl.cc
index 73a507cced057e..ca8bace7c85a82 100644
--- a/ash/wm/desks/desk_animation_impl.cc
+++ b/ash/wm/desks/desk_animation_impl.cc
@@ -11,11 +11,13 @@
 #include "ash/wm/desks/desks_controller.h"
 #include "ash/wm/desks/desks_histogram_enums.h"
 #include "ash/wm/desks/desks_util.h"
+#include "ash/wm/haptics_util.h"
 #include "ash/wm/overview/overview_controller.h"
 #include "ash/wm/splitview/split_view_utils.h"
 #include "ash/wm/window_util.h"
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
+#include "ui/events/devices/haptic_touchpad_effects.h"
 
 namespace ash {
 
@@ -156,6 +158,10 @@ bool DeskActivationAnimation::UpdateSwipeAnimation(float scroll_delta_x) {
 
   presentation_time_recorder_->RequestNext();
 
+  auto* first_animator = desk_switch_animators_.front().get();
+  DCHECK(first_animator);
+  const bool old_reached_edge = first_animator->reached_edge();
+
   // If any of the displays need a new screenshot while scrolling, take the
   // ending desk screenshot for all of them to keep them in sync.
   absl::optional<int> ending_desk_index;
@@ -167,15 +173,25 @@ bool DeskActivationAnimation::UpdateSwipeAnimation(float scroll_delta_x) {
   }
 
   // See if the animator of the first display has visibly changed desks. If so,
-  // update |visible_desk_changes_| for metrics collection purposes.
-  auto* first_animator = desk_switch_animators_.front().get();
-  DCHECK(first_animator);
+  // update `visible_desk_changes_` for metrics collection purposes. Also fire a
+  // haptic event if we have reached the edge, or the visible desk has changed.
   if (first_animator->starting_desk_screenshot_taken() &&
       first_animator->ending_desk_screenshot_taken()) {
     const int old_visible_desk_index = visible_desk_index_;
     visible_desk_index_ = first_animator->GetIndexOfMostVisibleDeskScreenshot();
-    if (visible_desk_index_ != old_visible_desk_index)
+    if (visible_desk_index_ != old_visible_desk_index) {
       ++visible_desk_changes_;
+      haptics_util::PlayHapticTouchpadEffect(
+          ui::HapticTouchpadEffect::kTick,
+          ui::HapticTouchpadEffectStrength::kMedium);
+    }
+
+    const bool reached_edge = first_animator->reached_edge();
+    if (reached_edge && !old_reached_edge) {
+      haptics_util::PlayHapticTouchpadEffect(
+          ui::HapticTouchpadEffect::kKnock,
+          ui::HapticTouchpadEffectStrength::kMedium);
+    }
   }
 
   // No screenshot needed.
diff --git a/ash/wm/desks/desk_animation_impl_unittest.cc b/ash/wm/desks/desk_animation_impl_unittest.cc
index 901c6e40ed0cb9..0c288edb605373 100644
--- a/ash/wm/desks/desk_animation_impl_unittest.cc
+++ b/ash/wm/desks/desk_animation_impl_unittest.cc
@@ -9,6 +9,7 @@
 #include "ash/wm/desks/desks_constants.h"
 #include "ash/wm/desks/desks_controller.h"
 #include "ash/wm/desks/desks_histogram_enums.h"
+#include "ash/wm/desks/desks_test_util.h"
 #include "ash/wm/desks/root_window_desk_switch_animator_test_api.h"
 #include "base/barrier_closure.h"
 #include "base/test/scoped_feature_list.h"
@@ -18,19 +19,6 @@
 
 namespace ash {
 
-namespace {
-
-void WaitEndingScreenshotTaken(DeskActivationAnimation* animation) {
-  base::RunLoop run_loop;
-  auto* desk_switch_animator =
-      animation->GetDeskSwitchAnimatorAtIndexForTesting(0);
-  RootWindowDeskSwitchAnimatorTestApi(desk_switch_animator)
-      .SetOnEndingScreenshotTakenCallback(run_loop.QuitClosure());
-  run_loop.Run();
-}
-
-}  // namespace
-
 using DeskActivationAnimationTest = AshTestBase;
 
 // Tests that there is no crash when ending a swipe animation before the
@@ -102,17 +90,17 @@ TEST_F(DeskActivationAnimationTest, VisibleDeskChangeCount) {
   animation.set_skip_notify_controller_on_animation_finished_for_testing(true);
   animation.Launch();
 
-  WaitEndingScreenshotTaken(&animation);
+  WaitUntilEndingScreenshotTaken(&animation);
   EXPECT_EQ(0, animation.visible_desk_changes());
 
   // Swipe enough so that our third and fourth desk screenshots are taken, and
   // then swipe so that the fourth desk is fully shown. There should be 3
   // visible desk changes in total.
   animation.UpdateSwipeAnimation(-kTouchpadSwipeLengthForDeskChange);
-  WaitEndingScreenshotTaken(&animation);
+  WaitUntilEndingScreenshotTaken(&animation);
 
   animation.UpdateSwipeAnimation(-kTouchpadSwipeLengthForDeskChange);
-  WaitEndingScreenshotTaken(&animation);
+  WaitUntilEndingScreenshotTaken(&animation);
 
   animation.UpdateSwipeAnimation(-3 * kTouchpadSwipeLengthForDeskChange);
   EXPECT_EQ(3, animation.visible_desk_changes());
@@ -146,7 +134,7 @@ TEST_F(DeskActivationAnimationTest, CloseWindowDuringAnimation) {
   animation.Launch();
 
   window.reset();
-  WaitEndingScreenshotTaken(&animation);
+  WaitUntilEndingScreenshotTaken(&animation);
 }
 
 // Tests that if a fast swipe is detected, we will still wait for the ending
@@ -185,7 +173,7 @@ TEST_F(DeskActivationAnimationTest, AnimatingAfterFastSwipe) {
   animation.EndSwipeAnimation();
 
   ASSERT_FALSE(desk_switch_animator->ending_desk_screenshot_taken());
-  WaitEndingScreenshotTaken(&animation);
+  WaitUntilEndingScreenshotTaken(&animation);
 
   // Tests that there is an animation after the ending screenshots have been
   // taken.
diff --git a/ash/wm/desks/desks_bar_view.cc b/ash/wm/desks/desks_bar_view.cc
index b5c475225734ef..5923d3636f2ac3 100644
--- a/ash/wm/desks/desks_bar_view.cc
+++ b/ash/wm/desks/desks_bar_view.cc
@@ -31,6 +31,7 @@
 #include "ash/wm/desks/templates/desks_templates_presenter.h"
 #include "ash/wm/desks/templates/desks_templates_util.h"
 #include "ash/wm/desks/zero_state_button.h"
+#include "ash/wm/haptics_util.h"
 #include "ash/wm/overview/overview_controller.h"
 #include "ash/wm/overview/overview_grid.h"
 #include "ash/wm/overview/overview_highlight_controller.h"
@@ -43,6 +44,7 @@
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/devices/device_data_manager.h"
+#include "ui/events/devices/haptic_touchpad_effects.h"
 #include "ui/events/devices/input_device.h"
 #include "ui/events/event_observer.h"
 #include "ui/events/types/event_type.h"
@@ -537,7 +539,7 @@ void DesksBarView::HandleLongPressEvent(DeskMiniView* mini_view,
   // Initialize and start drag.
   gfx::PointF location = event.target()->GetScreenLocationF(event);
   InitDragDesk(mini_view, location);
-  StartDragDesk(mini_view, location);
+  StartDragDesk(mini_view, location, event.IsMouseEvent());
 }
 
 void DesksBarView::HandleDragEvent(DeskMiniView* mini_view,
@@ -553,7 +555,7 @@ void DesksBarView::HandleDragEvent(DeskMiniView* mini_view,
   // continue drag.
   switch (drag_proxy_->state()) {
     case DeskDragProxy::State::kInitialized:
-      StartDragDesk(mini_view, location);
+      StartDragDesk(mini_view, location, event.IsMouseEvent());
       break;
     case DeskDragProxy::State::kStarted:
       ContinueDragDesk(mini_view, location);
@@ -606,7 +608,8 @@ void DesksBarView::InitDragDesk(DeskMiniView* mini_view,
 }
 
 void DesksBarView::StartDragDesk(DeskMiniView* mini_view,
-                                 const gfx::PointF& location_in_screen) {
+                                 const gfx::PointF& location_in_screen,
+                                 bool is_mouse_dragging) {
   DCHECK(drag_view_);
   DCHECK(drag_proxy_);
   DCHECK_EQ(mini_view, drag_view_);
@@ -620,6 +623,13 @@ void DesksBarView::StartDragDesk(DeskMiniView* mini_view,
   drag_proxy_->InitAndScaleAndMoveToX(location_in_screen.x());
 
   Shell::Get()->cursor_manager()->SetCursor(ui::mojom::CursorType::kGrabbing);
+
+  // Fire a haptic event if necessary.
+  if (is_mouse_dragging) {
+    haptics_util::PlayHapticTouchpadEffect(
+        ui::HapticTouchpadEffect::kTick,
+        ui::HapticTouchpadEffectStrength::kMedium);
+  }
 }
 
 void DesksBarView::ContinueDragDesk(DeskMiniView* mini_view,
diff --git a/ash/wm/desks/desks_bar_view.h b/ash/wm/desks/desks_bar_view.h
index a2e34f9e1d9b17..7a892de9eed883 100644
--- a/ash/wm/desks/desks_bar_view.h
+++ b/ash/wm/desks/desks_bar_view.h
@@ -136,9 +136,11 @@ class ASH_EXPORT DesksBarView : public views::View,
   // Finalize any unfinished drag & drop. Initialize a new drag proxy.
   void InitDragDesk(DeskMiniView* mini_view,
                     const gfx::PointF& location_in_screen);
-  // Start to drag. Scale up the drag proxy.
+  // Start to drag. Scale up the drag proxy. `is_mouse_dragging` is true when
+  // triggered by mouse/trackpad, false when triggered by touch.
   void StartDragDesk(DeskMiniView* mini_view,
-                     const gfx::PointF& location_in_screen);
+                     const gfx::PointF& location_in_screen,
+                     bool is_mouse_dragging);
   // Reorder desks according to the drag proxy's location.
   void ContinueDragDesk(DeskMiniView* mini_view,
                         const gfx::PointF& location_in_screen);
diff --git a/ash/wm/desks/desks_controller.cc b/ash/wm/desks/desks_controller.cc
index 6413733f5c801b..70aae8b307e780 100644
--- a/ash/wm/desks/desks_controller.cc
+++ b/ash/wm/desks/desks_controller.cc
@@ -118,8 +118,11 @@ constexpr int kDeskDefaultNameIds[] = {
 void AppendWindowsToOverview(const std::vector<aura::Window*>& windows) {
   DCHECK(Shell::Get()->overview_controller()->InOverviewSession());
 
+  // TODO(dandersson): See if we can remove this code and just let
+  // OverviewSession do its thing when the windows are moved to the new desk.
   auto* overview_session =
       Shell::Get()->overview_controller()->overview_session();
+  overview_session->set_auto_add_windows_enabled(false);
   for (auto* window :
        Shell::Get()->mru_window_tracker()->BuildMruWindowList(kActiveDesk)) {
     if (!base::Contains(windows, window) ||
@@ -129,6 +132,7 @@ void AppendWindowsToOverview(const std::vector<aura::Window*>& windows) {
 
     overview_session->AppendItem(window, /*reposition=*/true, /*animate=*/true);
   }
+  overview_session->set_auto_add_windows_enabled(true);
 }
 
 // Removes all the items that currently exist in overview.
@@ -560,6 +564,13 @@ void DesksController::ActivateDesk(const Desk* desk, DesksSwitchSource source) {
     return;
   }
 
+  if (source == DesksSwitchSource::kLaunchTemplate) {
+    // Desk switch due to launching a template will immediately activate the new
+    // desk without animation.
+    ActivateDeskInternal(desk, /*update_window_activation=*/true);
+    return;
+  }
+
   // When switching desks we want to update window activation when leaving
   // overview or if nothing was active prior to switching desks. This will
   // ensure that after switching desks, we will try to focus a candidate window.
@@ -973,13 +984,35 @@ void DesksController::CreateAndActivateNewDeskForTemplate(
   desk->SetName(desk_name, /*set_by_user=*/true);
   // Force update user prefs because `SetName()` does not trigger it.
   desks_restore_util::UpdatePrimaryUserDeskNamesPrefs();
+
+  // We're staying in overview mode, so move desks bar window and the save
+  // template button to the new desk. They would otherwise disappear when the
+  // new desk is activated.
+  DCHECK(active_desk_);
+
+  // Since we're going to move certain windows from the currently active desk,
+  // this is going to implicitly modify that list. We therefore grab a copy of
+  // it to avoid issues with concurrent iteration and modification of the list.
+  auto active_desk_windows = active_desk_->windows();
+  for (aura::Window* window : active_desk_windows) {
+    if (window->GetId() == kShellWindowId_DesksBarWindow ||
+        window->GetId() == kShellWindowId_SaveDeskAsTemplateWindow) {
+      aura::Window* destination_container =
+          desk->GetDeskContainerForRoot(window->GetRootWindow());
+      destination_container->AddChild(window);
+    }
+  }
+
+  if (auto* session = Shell::Get()->overview_controller()->overview_session()) {
+    session->HideDesksTemplatesGrids();
+    for (auto& grid : session->grid_list())
+      grid->RemoveAllItemsForDesksTemplatesLaunch();
+  }
+
   ActivateDesk(desk, DesksSwitchSource::kLaunchTemplate);
-  DCHECK(animation_);
-  animation_->set_finished_callback(base::BindOnce(
-      [](base::OnceCallback<void(bool)> passed_callback) {
-        std::move(passed_callback).Run(/*success=*/true);
-      },
-      std::move(callback)));
+  DCHECK(!animation_);
+
+  std::move(callback).Run(/*success=*/true);
 }
 
 bool DesksController::OnSingleInstanceAppLaunchingFromTemplate(
@@ -1018,7 +1051,7 @@ bool DesksController::OnSingleInstanceAppLaunchingFromTemplate(
           existing_app_instance_window)) {
     DCHECK(src_desk);
     DCHECK_NE(src_desk, active_desk_);
-    DCHECK(!Shell::Get()->overview_controller()->InOverviewSession());
+
     base::AutoReset<bool> in_progress(&are_desks_being_modified_, true);
     src_desk->MoveWindowToDesk(existing_app_instance_window, active_desk_,
                                existing_app_instance_window->GetRootWindow(),
diff --git a/ash/wm/desks/desks_test_util.cc b/ash/wm/desks/desks_test_util.cc
index 65737921485cf6..1be77386b66a6d 100644
--- a/ash/wm/desks/desks_test_util.cc
+++ b/ash/wm/desks/desks_test_util.cc
@@ -7,6 +7,7 @@
 #include "ash/shell.h"
 #include "ash/wm/desks/desk.h"
 #include "ash/wm/desks/desk_animation_base.h"
+#include "ash/wm/desks/desk_animation_impl.h"
 #include "ash/wm/desks/desks_histogram_enums.h"
 #include "ash/wm/desks/root_window_desk_switch_animator_test_api.h"
 #include "ash/wm/gestures/wm_gesture_handler.h"
@@ -148,4 +149,13 @@ void ScrollToSwitchDesks(bool scroll_left,
   }
 }
 
+void WaitUntilEndingScreenshotTaken(DeskActivationAnimation* animation) {
+  base::RunLoop run_loop;
+  auto* desk_switch_animator =
+      animation->GetDeskSwitchAnimatorAtIndexForTesting(0);
+  RootWindowDeskSwitchAnimatorTestApi(desk_switch_animator)
+      .SetOnEndingScreenshotTakenCallback(run_loop.QuitClosure());
+  run_loop.Run();
+}
+
 }  // namespace ash
diff --git a/ash/wm/desks/desks_test_util.h b/ash/wm/desks/desks_test_util.h
index fc0dead2e5829d..e50e6ef42a98a1 100644
--- a/ash/wm/desks/desks_test_util.h
+++ b/ash/wm/desks/desks_test_util.h
@@ -16,6 +16,8 @@ class EventGenerator;
 
 namespace ash {
 
+class DeskActivationAnimation;
+
 constexpr int kNumFingersForHighlight = 3;
 constexpr int kNumFingersForDesksSwitch = 4;
 
@@ -69,6 +71,9 @@ const Desk* GetNextDesk();
 void ScrollToSwitchDesks(bool scroll_left,
                          ui::test::EventGenerator* event_generator);
 
+// Wait until `animation`'s ending screenshot has been taken.
+void WaitUntilEndingScreenshotTaken(DeskActivationAnimation* animation);
+
 }  // namespace ash
 
 #endif  // ASH_WM_DESKS_DESKS_TEST_UTIL_H_
diff --git a/ash/wm/desks/root_window_desk_switch_animator.cc b/ash/wm/desks/root_window_desk_switch_animator.cc
index d65c2b154bbb71..5279b145fe8142 100644
--- a/ash/wm/desks/root_window_desk_switch_animator.cc
+++ b/ash/wm/desks/root_window_desk_switch_animator.cc
@@ -271,6 +271,13 @@ absl::optional<int> RootWindowDeskSwitchAnimator::UpdateSwipeAnimation(
   //  edge padding (i.e. translation of (-190, 0)).
   gfx::RectF transformed_animation_layer_bounds(animation_layer->bounds());
   transform.TransformRect(&transformed_animation_layer_bounds);
+
+  // `reached_edge_` becomes true if the user has scrolled `animation_layer` to
+  // its limits.
+  reached_edge_ =
+      transformed_animation_layer_bounds.x() == 0 ||
+      transformed_animation_layer_bounds.right() == root_window_size_.width();
+
   transformed_animation_layer_bounds.Inset(edge_padding_width_dp_, 0);
 
   const bool moving_left = scroll_delta_x < 0.f;
diff --git a/ash/wm/desks/root_window_desk_switch_animator.h b/ash/wm/desks/root_window_desk_switch_animator.h
index ac5f566b0bdaf3..8f292eef5e2c8e 100644
--- a/ash/wm/desks/root_window_desk_switch_animator.h
+++ b/ash/wm/desks/root_window_desk_switch_animator.h
@@ -220,6 +220,7 @@ class ASH_EXPORT RootWindowDeskSwitchAnimator
     return ending_desk_screenshot_taken_;
   }
   bool animation_finished() const { return animation_finished_; }
+  bool reached_edge() const { return reached_edge_; }
 
   // Begins phase (1) of the animation by taking a screenshot of the starting
   // desk content. Delegate::OnStartingDeskScreenshotTaken() will be called once
@@ -362,6 +363,10 @@ class ASH_EXPORT RootWindowDeskSwitchAnimator
   // True when phase (3) finishes.
   bool animation_finished_ = false;
 
+  // True if during a continuous swipe, the user went all the way left or right
+  // and swiping in that direction will no longer update the UI.
+  bool reached_edge_ = false;
+
   // True while setting a new transform for chaining. If a animation is active,
   // calling SetTransform will trigger OnImplicitAnimationsCompleted. In these
   // cases we do not want to notify our delegate that the animation is finished.
diff --git a/ash/wm/desks/templates/desks_templates_unittest.cc b/ash/wm/desks/templates/desks_templates_unittest.cc
index 9382eeab44fd27..cb4c752126d013 100644
--- a/ash/wm/desks/templates/desks_templates_unittest.cc
+++ b/ash/wm/desks/templates/desks_templates_unittest.cc
@@ -726,36 +726,29 @@ TEST_F(DesksTemplatesTest, LaunchTemplate) {
   ASSERT_EQ(1ul, GetAllEntries().size());
 
   // Click on the grid item to launch the template.
-  {
-    DeskSwitchAnimationWaiter waiter;
-    ClickOnView(GetItemViewFromTemplatesGrid(/*grid_item_index=*/0));
-    WaitForDesksTemplatesUI();
-    waiter.Wait();
-  }
+  ClickOnView(GetItemViewFromTemplatesGrid(/*grid_item_index=*/0));
+  WaitForDesksTemplatesUI();
 
   // Verify that we have created and activated a new desk.
   EXPECT_EQ(2ul, desks_controller->desks().size());
   EXPECT_EQ(1, desks_controller->GetActiveDeskIndex());
 
-  // Launching a template creates and activates a new desk, which also results
-  // in exiting overview mode, so we check to make sure overview is closed.
-  EXPECT_FALSE(InOverviewSession());
+  // Launching a template creates and activates a new desk without exiting
+  // overview mode, so we check that we're still in overview.
+  EXPECT_TRUE(InOverviewSession());
 
   // This section tests clicking on the "Use template" button to launch the
   // template.
+  ToggleOverview();
   OpenOverviewAndShowTemplatesGrid();
-  {
-    DeskSwitchAnimationWaiter waiter;
-    DesksTemplatesItemView* item_view = GetItemViewFromTemplatesGrid(
-        /*grid_item_index=*/0);
-    ClickOnView(DesksTemplatesItemViewTestApi(item_view).launch_button());
-    WaitForDesksTemplatesUI();
-    waiter.Wait();
-  }
+  DesksTemplatesItemView* item_view = GetItemViewFromTemplatesGrid(
+      /*grid_item_index=*/0);
+  ClickOnView(DesksTemplatesItemViewTestApi(item_view).launch_button());
+  WaitForDesksTemplatesUI();
 
   EXPECT_EQ(3ul, desks_controller->desks().size());
   EXPECT_EQ(2, desks_controller->GetActiveDeskIndex());
-  EXPECT_FALSE(InOverviewSession());
+  EXPECT_TRUE(InOverviewSession());
 }
 
 // Tests that the order of DesksTemplatesItemView is in order.
@@ -1308,16 +1301,13 @@ TEST_F(DesksTemplatesTest, LaunchTemplateWithMinimizedOverviewWindow) {
   OpenOverviewAndSaveTemplate(Shell::Get()->GetPrimaryRootWindow());
   ASSERT_EQ(1ul, GetAllEntries().size());
 
-  // Click on the grid item to launch the template. We should exit overview and
-  // there should be no crash.
-  DeskSwitchAnimationWaiter waiter;
+  // Click on the grid item to launch the template. We should remain in overview
+  // and there should be no crash.
   ClickOnView(GetItemViewFromTemplatesGrid(/*grid_item_index=*/0));
-  // Launching a template fetches it from the desk model asynchronously. Make
-  // sure the async call is done before waiting.
+  // Launching a template fetches it from the desk model asynchronously.
   WaitForDesksTemplatesUI();
-  waiter.Wait();
 
-  EXPECT_FALSE(InOverviewSession());
+  EXPECT_TRUE(InOverviewSession());
 }
 
 // Tests that there is no crash if we launch a template after deleting the
@@ -1339,16 +1329,12 @@ TEST_F(DesksTemplatesTest, LaunchTemplateAfterClosingActiveDesk) {
   // a template" button was not moved when the active desk was removed.
   RemoveDesk(desks_controller->active_desk());
 
-  // Click on the grid item to launch the template. We should exit overview and
-  // there should be no crash.
-  DeskSwitchAnimationWaiter waiter;
+  // Click on the grid item to launch the template. There should be no crash.
   ClickOnView(GetItemViewFromTemplatesGrid(/*grid_item_index=*/0));
-  // Launching a template fetches it from the desk model asynchronously. Make
-  // sure the async call is done before waiting.
+  // Launching a template fetches it from the desk model asynchronously.
   WaitForDesksTemplatesUI();
-  waiter.Wait();
 
-  EXPECT_FALSE(InOverviewSession());
+  EXPECT_TRUE(InOverviewSession());
 }
 
 // Tests that if we open the desks templates grid a second time during an
@@ -1717,10 +1703,8 @@ TEST_F(DesksTemplatesTest, LaunchTemplateRecordsMetric) {
   ASSERT_EQ(1ul, GetAllEntries().size());
 
   // Click on the grid item to launch the template.
-  DeskSwitchAnimationWaiter waiter;
   ClickOnView(GetItemViewFromTemplatesGrid(/*grid_item_index=*/0));
   WaitForDesksTemplatesUI();
-  waiter.Wait();
 
   // Verify that we have created and activated a new desk.
   EXPECT_EQ(2ul, desks_controller->desks().size());
diff --git a/ash/wm/haptics_util_unittest.cc b/ash/wm/haptics_util_unittest.cc
index aae53843f4f49a..3ae71b515fbf05 100644
--- a/ash/wm/haptics_util_unittest.cc
+++ b/ash/wm/haptics_util_unittest.cc
@@ -8,8 +8,12 @@
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
+#include "ash/wm/desks/desk_animation_impl.h"
+#include "ash/wm/desks/desks_constants.h"
 #include "ash/wm/desks/desks_controller.h"
+#include "ash/wm/desks/desks_histogram_enums.h"
 #include "ash/wm/desks/desks_test_util.h"
+#include "ash/wm/desks/root_window_desk_switch_animator_test_api.h"
 #include "ash/wm/gestures/wm_gesture_handler.h"
 #include "ash/wm/overview/overview_controller.h"
 #include "ash/wm/overview/overview_item.h"
@@ -305,4 +309,75 @@ TEST_F(HapticsUtilTest, HapticFeedbackForDeskSwitchingOffLimits) {
                    HapticTouchpadEffectStrength::kMedium));
 }
 
+// Tests that haptics are sent when doing a continuous touchpad gesture to
+// switch desks. They are expected to be sent if we hit the edge, or when the
+// visible desk changes.
+TEST_F(HapticsUtilTest, HapticFeedbackForContinuousDesksSwitching) {
+  auto input_controller = std::make_unique<InputControllerForTesting>();
+  haptics_util::SetInputControllerForTesting(input_controller.get());
+
+  // Add three desks for a total of four.
+  auto* desks_controller = DesksController::Get();
+  desks_controller->NewDesk(DesksCreationRemovalSource::kButton);
+  desks_controller->NewDesk(DesksCreationRemovalSource::kButton);
+  desks_controller->NewDesk(DesksCreationRemovalSource::kButton);
+
+  // Create a standalone animation object. This is the same object that gets
+  // created when swiping with 4 fingers, but mocking 4 fingers swipes is harder
+  // to control in a test with all the async operations and touchpad unit
+  // conversions.
+  DeskActivationAnimation animation(desks_controller, 0, 1,
+                                    DesksSwitchSource::kDeskSwitchTouchpad,
+                                    /*update_window_activation=*/false);
+  animation.set_skip_notify_controller_on_animation_finished_for_testing(true);
+  animation.Launch();
+
+  // Wait for the ending screenshot to be taken.
+  WaitUntilEndingScreenshotTaken(&animation);
+
+  EXPECT_EQ(0, input_controller->GetSendHapticCount(
+                   HapticTouchpadEffect::kKnock,
+                   HapticTouchpadEffectStrength::kMedium));
+  EXPECT_EQ(0, input_controller->GetSendHapticCount(
+                   HapticTouchpadEffect::kTick,
+                   HapticTouchpadEffectStrength::kMedium));
+
+  // Swipe enough so that our third and fourth desk screenshots are taken, and
+  // then swipe so that the fourth desk is fully shown. There should be 3
+  // visible desk changes in total, which means 3 tick haptic events sent.
+  animation.UpdateSwipeAnimation(-kTouchpadSwipeLengthForDeskChange);
+  WaitUntilEndingScreenshotTaken(&animation);
+
+  animation.UpdateSwipeAnimation(-kTouchpadSwipeLengthForDeskChange);
+  WaitUntilEndingScreenshotTaken(&animation);
+
+  animation.UpdateSwipeAnimation(-kTouchpadSwipeLengthForDeskChange);
+  EXPECT_EQ(3, input_controller->GetSendHapticCount(
+                   HapticTouchpadEffect::kTick,
+                   HapticTouchpadEffectStrength::kMedium));
+
+  // Try doing a full swipe to the right. Test that a knock haptic event is sent
+  // because we are at the edge.
+  animation.UpdateSwipeAnimation(-kTouchpadSwipeLengthForDeskChange);
+  EXPECT_EQ(1, input_controller->GetSendHapticCount(
+                   HapticTouchpadEffect::kKnock,
+                   HapticTouchpadEffectStrength::kMedium));
+
+  // Swipe 3 times to the left. We move from the fourth desk as the visible desk
+  // to the first desk, so there should be three more tick haptic events.
+  animation.UpdateSwipeAnimation(kTouchpadSwipeLengthForDeskChange);
+  animation.UpdateSwipeAnimation(kTouchpadSwipeLengthForDeskChange);
+  animation.UpdateSwipeAnimation(kTouchpadSwipeLengthForDeskChange);
+  EXPECT_EQ(6, input_controller->GetSendHapticCount(
+                   HapticTouchpadEffect::kTick,
+                   HapticTouchpadEffectStrength::kMedium));
+
+  // Swipe to the left while at the first desk. Tests that another haptic event
+  // is sent because we are at the edge.
+  animation.UpdateSwipeAnimation(kTouchpadSwipeLengthForDeskChange);
+  EXPECT_EQ(2, input_controller->GetSendHapticCount(
+                   HapticTouchpadEffect::kKnock,
+                   HapticTouchpadEffectStrength::kMedium));
+}
+
 }  // namespace ash
diff --git a/ash/wm/overview/overview_grid.cc b/ash/wm/overview/overview_grid.cc
index c28ecac9eb17c1..55833a94bed543 100644
--- a/ash/wm/overview/overview_grid.cc
+++ b/ash/wm/overview/overview_grid.cc
@@ -766,6 +766,12 @@ void OverviewGrid::RemoveItem(OverviewItem* overview_item,
   }
 }
 
+void OverviewGrid::RemoveAllItemsForDesksTemplatesLaunch() {
+  for (auto& item : window_list_)
+    item->RestoreWindow(/*reset_tranform=*/true);
+  window_list_.clear();
+}
+
 void OverviewGrid::AddDropTargetForDraggingFromThisGrid(
     OverviewItem* dragged_item) {
   DCHECK(!drop_target_widget_);
@@ -1416,6 +1422,16 @@ bool OverviewGrid::IntersectsWithDesksBar(const gfx::Point& screen_location,
   return dragged_item_over_bar;
 }
 
+int OverviewGrid::GetDeskIndexFromScreenLocation(
+    const gfx::Point& screen_location) {
+  auto* desks_controller = DesksController::Get();
+  for (auto* mini_view : desks_bar_view_->mini_views()) {
+    if (mini_view->IsPointOnMiniView(screen_location))
+      return desks_controller->GetDeskIndex(mini_view->desk());
+  }
+  return -1;
+}
+
 bool OverviewGrid::MaybeDropItemOnDeskMiniViewOrNewDeskButton(
     const gfx::Point& screen_location,
     OverviewItem* drag_item) {
diff --git a/ash/wm/overview/overview_grid.h b/ash/wm/overview/overview_grid.h
index 491673f0165d1a..b3ca253200ec0f 100644
--- a/ash/wm/overview/overview_grid.h
+++ b/ash/wm/overview/overview_grid.h
@@ -141,6 +141,12 @@ class ASH_EXPORT OverviewGrid : public SplitViewObserver,
                   bool item_destroying,
                   bool reposition);
 
+  // Removes all overview items and restores the respective windows. This is
+  // used when launching a desks template. While this will empty the grid, it
+  // will *not* invoke `OverviewSession::OnGridEmpty()` since the grid is about
+  // to get filled with new windows.
+  void RemoveAllItemsForDesksTemplatesLaunch();
+
   // Adds a drop target for |dragged_item|, at the index immediately following
   // |dragged_item|. Repositions all items except |dragged_item|, so that the
   // drop target takes the place of |dragged_item|. Does not animate the
@@ -286,6 +292,10 @@ class ASH_EXPORT OverviewGrid : public SplitViewObserver,
                               bool update_desks_bar_drag_details,
                               bool for_drop);
 
+  // Returns the desk index of the provided screen location if it belongs to
+  // any, otherwise `-1` will be returned.
+  int GetDeskIndexFromScreenLocation(const gfx::Point& screen_location);
+
   // Updates the drag details for DesksBarView to end the drag and move the
   // window of |drag_item| to another desk if it was dropped on a mini_view of
   // a desk that is different than that of the active desk or if dropped on the
diff --git a/ash/wm/overview/overview_item.cc b/ash/wm/overview/overview_item.cc
index fff7468a24a5a3..e6bb04b4c53388 100644
--- a/ash/wm/overview/overview_item.cc
+++ b/ash/wm/overview/overview_item.cc
@@ -187,7 +187,8 @@ OverviewItem::OverviewItem(aura::Window* window,
     : root_window_(window->GetRootWindow()),
       transform_window_(this, window),
       overview_session_(overview_session),
-      overview_grid_(overview_grid) {
+      overview_grid_(overview_grid),
+      animation_disabler_(window) {
   CreateItemWidget();
   window->AddObserver(this);
   WindowState::Get(window)->AddObserver(this);
diff --git a/ash/wm/overview/overview_item.h b/ash/wm/overview/overview_item.h
index 88028bfdf8cfb2..a24e2b9598c662 100644
--- a/ash/wm/overview/overview_item.h
+++ b/ash/wm/overview/overview_item.h
@@ -8,6 +8,7 @@
 #include <memory>
 
 #include "ash/ash_export.h"
+#include "ash/scoped_animation_disabler.h"
 #include "ash/wm/overview/overview_session.h"
 #include "ash/wm/overview/scoped_overview_transform_window.h"
 #include "ash/wm/window_state_observer.h"
@@ -445,6 +446,10 @@ class ASH_EXPORT OverviewItem : public aura::WindowObserver,
   std::unique_ptr<aura::ScopedWindowEventTargetingBlocker>
       item_widget_event_blocker_;
 
+  // Disable animations on the contained window while it is being managed by the
+  // overview item.
+  ScopedAnimationDisabler animation_disabler_;
+
   base::WeakPtrFactory<OverviewItem> weak_ptr_factory_{this};
 };
 
diff --git a/ash/wm/overview/overview_session.cc b/ash/wm/overview/overview_session.cc
index f98e745578354b..60cc7052100c93 100644
--- a/ash/wm/overview/overview_session.cc
+++ b/ash/wm/overview/overview_session.cc
@@ -32,6 +32,7 @@
 #include "ash/wm/desks/templates/desks_templates_dialog_controller.h"
 #include "ash/wm/desks/templates/desks_templates_presenter.h"
 #include "ash/wm/desks/templates/desks_templates_util.h"
+#include "ash/wm/haptics_util.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/overview/overview_controller.h"
 #include "ash/wm/overview/overview_delegate.h"
@@ -56,10 +57,12 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
+#include "ui/events/devices/haptic_touchpad_effects.h"
 #include "ui/events/event.h"
 #include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/coordinate_conversion.h"
+#include "ui/wm/core/window_util.h"
 
 namespace ash {
 
@@ -257,6 +260,8 @@ void OverviewSession::Init(const WindowList& windows,
   Shell::Get()->accessibility_controller()->TriggerAccessibilityAlert(
       AccessibilityAlert::WINDOW_OVERVIEW_MODE_ENTERED);
 
+  desks_controller_observation_.Observe(DesksController::Get());
+
   ignore_activations_ = false;
 }
 
@@ -268,6 +273,12 @@ void OverviewSession::Shutdown() {
   // began. See OverviewController::OnSelectionEnded().
   DCHECK(is_shutting_down_);
 
+  desks_controller_observation_.Reset();
+  if (observing_desk_) {
+    for (auto* root : Shell::GetAllRootWindows())
+      observing_desk_->GetDeskContainerForRoot(root)->RemoveObserver(this);
+  }
+
   Shell::Get()->RemovePreTargetHandler(this);
   Shell::Get()->RemoveShellObserver(this);
 
@@ -549,6 +560,7 @@ void OverviewSession::InitiateDrag(OverviewItem* item,
           ->IsDividerAnimating()) {
     return;
   }
+
   highlight_controller_->SetFocusHighlightVisibility(false);
   window_drag_controller_ = std::make_unique<OverviewWindowDragController>(
       this, item, is_touch_dragging);
@@ -558,6 +570,13 @@ void OverviewSession::InitiateDrag(OverviewItem* item,
     grid->OnSelectorItemDragStarted(item);
     grid->UpdateSaveDeskAsTemplateButton();
   }
+
+  // Fire a haptic event if necessary.
+  if (!is_touch_dragging) {
+    haptics_util::PlayHapticTouchpadEffect(
+        ui::HapticTouchpadEffect::kTick,
+        ui::HapticTouchpadEffectStrength::kMedium);
+  }
 }
 
 void OverviewSession::Drag(OverviewItem* item,
@@ -964,6 +983,35 @@ void OverviewSession::ShowDesksTemplatesGrids(bool was_zero_state) {
   UpdateNoWindowsWidgetOnEachGrid();
 }
 
+void OverviewSession::HideDesksTemplatesGrids() {
+  // Before hiding the templates grid, we need to explicitly activate the focus
+  // window. Otherwise, some other window may get activated as the templates
+  // grid is hidden, and this could in turn lead to exiting overview mode.
+  wm::ActivateWindow(GetOverviewFocusWindow());
+
+  for (auto& grid : grid_list_)
+    grid->HideDesksTemplatesGrid(/*exit_overview=*/false);
+}
+
+void OverviewSession::OnDeskAdded(const Desk* desk) {}
+void OverviewSession::OnDeskRemoved(const Desk* desk) {}
+void OverviewSession::OnDeskReordered(int old_index, int new_index) {}
+
+void OverviewSession::OnDeskActivationChanged(const Desk* activated,
+                                              const Desk* deactivated) {
+  observing_desk_ = activated;
+
+  for (auto* root : Shell::GetAllRootWindows()) {
+    activated->GetDeskContainerForRoot(root)->AddObserver(this);
+    deactivated->GetDeskContainerForRoot(root)->RemoveObserver(this);
+  }
+}
+
+void OverviewSession::OnDeskSwitchAnimationLaunching() {}
+void OverviewSession::OnDeskSwitchAnimationFinished() {}
+void OverviewSession::OnDeskNameChanged(const Desk* desk,
+                                        const std::u16string& new_name) {}
+
 void OverviewSession::OnDisplayAdded(const display::Display& display) {
   if (EndOverview(OverviewEndAction::kDisplayAdded))
     return;
@@ -994,6 +1042,25 @@ void OverviewSession::OnWindowDestroying(aura::Window* window) {
   active_window_before_overview_ = nullptr;
 }
 
+void OverviewSession::OnWindowAdded(aura::Window* new_window) {
+  if (!auto_add_windows_enabled_)
+    return;
+
+  // We track if we are in the process of adding an item to avoid recursively
+  // adding items.
+  if (is_adding_new_item_)
+    return;
+  base::AutoReset<bool> adding_new_item_resetter(&is_adding_new_item_, true);
+
+  // Avoid adding overview items for certain windows.
+  if (!WindowState::Get(new_window) ||
+      window_util::ShouldExcludeForOverview(new_window)) {
+    return;
+  }
+
+  AppendItem(new_window, /*reposition=*/true, /*animate*/ true);
+}
+
 void OverviewSession::OnKeyEvent(ui::KeyEvent* event) {
   // If app list is open when overview is active (it can happen in clamshell
   // mode, when we snap an overview window to one side of the screen and then
diff --git a/ash/wm/overview/overview_session.h b/ash/wm/overview/overview_session.h
index 9f3e7fe70e7c63..30512b7cab6c9c 100644
--- a/ash/wm/overview/overview_session.h
+++ b/ash/wm/overview/overview_session.h
@@ -15,6 +15,7 @@
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/cpp/tablet_mode_observer.h"
 #include "ash/shell_observer.h"
+#include "ash/wm/desks/desks_controller.h"
 #include "ash/wm/overview/overview_types.h"
 #include "ash/wm/overview/scoped_overview_hide_windows.h"
 #include "ash/wm/splitview/split_view_controller.h"
@@ -57,7 +58,8 @@ class ASH_EXPORT OverviewSession : public display::DisplayObserver,
                                    public ui::EventHandler,
                                    public ShellObserver,
                                    public SplitViewObserver,
-                                   public TabletModeObserver {
+                                   public TabletModeObserver,
+                                   public DesksController::Observer {
  public:
   using WindowList = std::vector<aura::Window*>;
 
@@ -279,6 +281,18 @@ class ASH_EXPORT OverviewSession : public display::DisplayObserver,
   // Shows the desks templates grids on all displays. If `was_zero_state` is
   // true then we will expand the desks bars.
   void ShowDesksTemplatesGrids(bool was_zero_state);
+  void HideDesksTemplatesGrids();
+
+  // DesksController::Observer:
+  void OnDeskAdded(const Desk* desk) override;
+  void OnDeskRemoved(const Desk* desk) override;
+  void OnDeskReordered(int old_index, int new_index) override;
+  void OnDeskActivationChanged(const Desk* activated,
+                               const Desk* deactivated) override;
+  void OnDeskSwitchAnimationLaunching() override;
+  void OnDeskSwitchAnimationFinished() override;
+  void OnDeskNameChanged(const Desk* desk,
+                         const std::u16string& new_name) override;
 
   // display::DisplayObserver:
   void OnDisplayAdded(const display::Display& display) override;
@@ -287,6 +301,7 @@ class ASH_EXPORT OverviewSession : public display::DisplayObserver,
 
   // aura::WindowObserver:
   void OnWindowDestroying(aura::Window* window) override;
+  void OnWindowAdded(aura::Window* new_window) override;
 
   // ui::EventHandler:
   void OnKeyEvent(ui::KeyEvent* event) override;
@@ -338,6 +353,10 @@ class ASH_EXPORT OverviewSession : public display::DisplayObserver,
     return desks_templates_presenter_.get();
   }
 
+  void set_auto_add_windows_enabled(bool enabled) {
+    auto_add_windows_enabled_ = enabled;
+  }
+
  private:
   friend class DesksAcceleratorsTest;
   friend class OverviewTestBase;
@@ -448,8 +467,22 @@ class ASH_EXPORT OverviewSession : public display::DisplayObserver,
   // Boolean to indicate whether chromeVox is enabled or not.
   bool chromevox_enabled_;
 
+  // When non-null, windows changes on this desk are observed.
+  const Desk* observing_desk_ = nullptr;
+
+  // This is true *while* an overview item is being dynamically added. It is
+  // used to avoid recursively adding overview items.
+  bool is_adding_new_item_ = false;
+
+  // When true, windows added to the observed desk are automatically added to
+  // the overview session.
+  bool auto_add_windows_enabled_ = true;
+
   base::ScopedObservation<TabletModeController, TabletModeObserver>
       tablet_mode_observation_{this};
+
+  base::ScopedObservation<DesksController, DesksController::Observer>
+      desks_controller_observation_{this};
 };
 
 }  // namespace ash
diff --git a/ash/wm/overview/overview_session_unittest.cc b/ash/wm/overview/overview_session_unittest.cc
index 622c2dae5e0178..ad65fbb761d886 100644
--- a/ash/wm/overview/overview_session_unittest.cc
+++ b/ash/wm/overview/overview_session_unittest.cc
@@ -438,7 +438,6 @@ TEST_P(OverviewSessionTest, MinimizeDuringOverview) {
   WMEvent minimize_event(WM_EVENT_MINIMIZE);
   window_state->OnWMEvent(&minimize_event);
   EXPECT_FALSE(window->IsVisible());
-  EXPECT_EQ(0.f, window->layer()->GetTargetOpacity());
   EXPECT_EQ(WindowStateType::kMinimized,
             WindowState::Get(window.get())->GetStateType());
   ToggleOverview();
diff --git a/ash/wm/overview/overview_window_drag_controller.cc b/ash/wm/overview/overview_window_drag_controller.cc
index 92397209970fcc..bd5b892fdf62c8 100644
--- a/ash/wm/overview/overview_window_drag_controller.cc
+++ b/ash/wm/overview/overview_window_drag_controller.cc
@@ -16,6 +16,7 @@
 #include "ash/wm/desks/desk_preview_view.h"
 #include "ash/wm/desks/desks_bar_view.h"
 #include "ash/wm/desks/desks_util.h"
+#include "ash/wm/haptics_util.h"
 #include "ash/wm/overview/overview_constants.h"
 #include "ash/wm/overview/overview_controller.h"
 #include "ash/wm/overview/overview_grid.h"
@@ -37,6 +38,7 @@
 #include "ui/aura/window_observer.h"
 #include "ui/compositor/layer.h"
 #include "ui/display/display.h"
+#include "ui/events/devices/haptic_touchpad_effects.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
@@ -552,11 +554,27 @@ void OverviewWindowDragController::ContinueNormalDrag(
       // Update the mini views borders by checking if |location_in_screen|
       // intersects. Only update the borders if the dragged item is not visible
       // on all desks.
-      overview_grid->IntersectsWithDesksBar(
+      bool intersects_with_desks_bar = overview_grid->IntersectsWithDesksBar(
           gfx::ToRoundedPoint(location_in_screen),
           /*update_desks_bar_drag_details=*/
           !DraggedItemIsVisibleOnAllDesks(item_), /*for_drop=*/false);
 
+      // Fire a haptic event if necessary.
+      if (intersects_with_desks_bar && !is_touch_dragging_) {
+        const int desk_index = overview_grid->GetDeskIndexFromScreenLocation(
+            gfx::ToRoundedPoint(location_in_screen));
+        if (last_desk_index_ != desk_index) {
+          last_desk_index_ = desk_index;
+          if (desk_index != -1) {
+            haptics_util::PlayHapticTouchpadEffect(
+                ui::HapticTouchpadEffect::kTick,
+                ui::HapticTouchpadEffectStrength::kMedium);
+          }
+        }
+      } else {
+        last_desk_index_ = -1;
+      }
+
       float value = 0.f;
       if (centerpoint.y() < desks_bar_data.desks_bar_bounds.y() ||
           centerpoint.y() > desks_bar_data.desks_bar_bounds.bottom()) {
diff --git a/ash/wm/overview/overview_window_drag_controller.h b/ash/wm/overview/overview_window_drag_controller.h
index 6f72f3ac4e0963..ecd2bfcf16c800 100644
--- a/ash/wm/overview/overview_window_drag_controller.h
+++ b/ash/wm/overview/overview_window_drag_controller.h
@@ -232,6 +232,12 @@ class ASH_EXPORT OverviewWindowDragController {
   // Set to true once the bounds of |item_| change.
   bool did_move_ = false;
 
+  // The last desk index that the screen location points to during drag. Please
+  // note that this would be set to `-1` when it does not intersect with desks
+  // bar. It is used to keep track of haptic feedback since we do not want
+  // duplicate event for the same desk during drag.
+  int last_desk_index_ = -1;
+
   // Records the presentation time of window drag operation in overview mode.
   std::unique_ptr<PresentationTimeRecorder> presentation_time_recorder_;
 
diff --git a/base/android/build_info.cc b/base/android/build_info.cc
index be9143007a9354..6bc369571d389b 100644
--- a/base/android/build_info.cc
+++ b/base/android/build_info.cc
@@ -79,7 +79,8 @@ BuildInfo::BuildInfo(const std::vector<std::string>& params)
       target_sdk_version_(GetIntParam(params, 21)),
       is_debug_android_(GetIntParam(params, 22)),
       is_tv_(GetIntParam(params, 23)),
-      version_incremental_(StrDupParam(params, 24)) {}
+      version_incremental_(StrDupParam(params, 24)),
+      hardware_(StrDupParam(params, 25)) {}
 
 // static
 BuildInfo* BuildInfo::GetInstance() {
diff --git a/base/android/build_info.h b/base/android/build_info.h
index f8e2c73cb60ca5..6717e8010047fd 100644
--- a/base/android/build_info.h
+++ b/base/android/build_info.h
@@ -138,6 +138,8 @@ class BASE_EXPORT BuildInfo {
 
   const char* version_incremental() const { return version_incremental_; }
 
+  const char* hardware() const { return hardware_; }
+
  private:
   friend struct BuildInfoSingletonTraits;
 
@@ -173,6 +175,7 @@ class BASE_EXPORT BuildInfo {
   const bool is_debug_android_;
   const bool is_tv_;
   const char* const version_incremental_;
+  const char* const hardware_;
 };
 
 }  // namespace android
diff --git a/base/android/java/src/org/chromium/base/BuildInfo.java b/base/android/java/src/org/chromium/base/BuildInfo.java
index 198c970fd347b4..4d286ce4706085 100644
--- a/base/android/java/src/org/chromium/base/BuildInfo.java
+++ b/base/android/java/src/org/chromium/base/BuildInfo.java
@@ -91,6 +91,7 @@ private static String[] getAll() {
                 isDebugAndroid() ? "1" : "0",
                 buildInfo.isTV ? "1" : "0",
                 Build.VERSION.INCREMENTAL,
+                Build.HARDWARE,
         };
     }
 
diff --git a/base/json/json_file_value_serializer.h b/base/json/json_file_value_serializer.h
index 1e1910b0a4420b..e2479aa401e428 100644
--- a/base/json/json_file_value_serializer.h
+++ b/base/json/json_file_value_serializer.h
@@ -12,6 +12,7 @@
 
 #include "base/base_export.h"
 #include "base/files/file_path.h"
+#include "base/json/json_reader.h"
 #include "base/values.h"
 
 class BASE_EXPORT JSONFileValueSerializer : public base::ValueSerializer {
@@ -54,8 +55,9 @@ class BASE_EXPORT JSONFileValueDeserializer : public base::ValueDeserializer {
 
   // |json_file_path_| is the path of a file that will be source of the
   // deserialization. |options| is a bitmask of JSONParserOptions.
-  explicit JSONFileValueDeserializer(const base::FilePath& json_file_path,
-                                     int options = 0);
+  explicit JSONFileValueDeserializer(
+      const base::FilePath& json_file_path,
+      int options = base::JSON_PARSE_CHROMIUM_EXTENSIONS);
 
   JSONFileValueDeserializer(const JSONFileValueDeserializer&) = delete;
   JSONFileValueDeserializer& operator=(const JSONFileValueDeserializer&) =
diff --git a/base/json/json_parser.cc b/base/json/json_parser.cc
index d5c84aad76f050..fdff416aae652d 100644
--- a/base/json/json_parser.cc
+++ b/base/json/json_parser.cc
@@ -10,6 +10,7 @@
 
 #include "base/check_op.h"
 #include "base/json/json_reader.h"
+#include "base/metrics/histogram_functions.h"
 #include "base/notreached.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/ranges/algorithm.h"
@@ -77,6 +78,20 @@ bool UnprefixedHexStringToInt(StringPiece input, int* output) {
   return HexStringToInt(input, output);
 }
 
+// These values are persisted to logs. Entries should not be renumbered and
+// numeric values should never be reused.
+enum class ChromiumJsonExtension {
+  kCComment,
+  kCppComment,
+  kXEscape,
+  kVerticalTabEscape,
+  kControlCharacter,
+  kMaxValue = kControlCharacter,
+};
+
+const char kExtensionHistogramName[] =
+    "Security.JSONParser.ChromiumExtensionUsage";
+
 }  // namespace
 
 // This is U+FFFD.
@@ -327,7 +342,16 @@ bool JSONParser::EatComment() {
   if (!comment_start)
     return false;
 
+  const bool comments_allowed = options_ & JSON_ALLOW_COMMENTS;
+
   if (comment_start == "//") {
+    UmaHistogramEnumeration(kExtensionHistogramName,
+                            ChromiumJsonExtension::kCppComment);
+    if (!comments_allowed) {
+      ReportError(JSON_UNEXPECTED_TOKEN, 0);
+      return false;
+    }
+
     ConsumeChars(2);
     // Single line comment, read to newline.
     while (absl::optional<char> c = PeekChar()) {
@@ -336,6 +360,13 @@ bool JSONParser::EatComment() {
       ConsumeChar();
     }
   } else if (comment_start == "/*") {
+    UmaHistogramEnumeration(kExtensionHistogramName,
+                            ChromiumJsonExtension::kCComment);
+    if (!comments_allowed) {
+      ReportError(JSON_UNEXPECTED_TOKEN, 0);
+      return false;
+    }
+
     ConsumeChars(2);
     char previous_char = '\0';
     // Block comment, read until end marker.
@@ -527,6 +558,19 @@ bool JSONParser::ConsumeStringRaw(StringBuilder* out) {
       return true;
     }
     if (next_char != '\\') {
+      // Per Section 7, "All Unicode characters may be placed within the
+      // quotation marks, except for the characters that MUST be escaped:
+      // quotation mark, reverse solidus, and the control characters (U+0000
+      // through U+001F)".
+      if (next_char <= 0x1F) {
+        UmaHistogramEnumeration(kExtensionHistogramName,
+                                ChromiumJsonExtension::kControlCharacter);
+        if (!(options_ & JSON_ALLOW_CONTROL_CHARS)) {
+          ReportError(JSON_UNSUPPORTED_ENCODING, -1);
+          return false;
+        }
+      }
+
       // If this character is not an escape sequence, track any line breaks and
       // copy next_char to the StringBuilder. The JSON spec forbids unescaped
       // ASCII control characters within a string, including '\r' and '\n', but
@@ -561,6 +605,13 @@ bool JSONParser::ConsumeStringRaw(StringBuilder* out) {
         case 'x': {  // UTF-8 sequence.
           // UTF-8 \x escape sequences are not allowed in the spec, but they
           // are supported here for backwards-compatiblity with the old parser.
+          UmaHistogramEnumeration(kExtensionHistogramName,
+                                  ChromiumJsonExtension::kXEscape);
+          if (!(options_ & JSON_ALLOW_X_ESCAPES)) {
+            ReportError(JSON_INVALID_ESCAPE, -1);
+            return false;
+          }
+
           escape_sequence = ConsumeChars(2);
           if (!escape_sequence) {
             ReportError(JSON_INVALID_ESCAPE, -3);
@@ -612,6 +663,12 @@ bool JSONParser::ConsumeStringRaw(StringBuilder* out) {
           string.Append('\t');
           break;
         case 'v':  // Not listed as valid escape sequence in the RFC.
+          UmaHistogramEnumeration(kExtensionHistogramName,
+                                  ChromiumJsonExtension::kVerticalTabEscape);
+          if (!(options_ & JSON_ALLOW_VERT_TAB)) {
+            ReportError(JSON_INVALID_ESCAPE, -1);
+            return false;
+          }
           string.Append('\v');
           break;
         // All other escape squences are illegal.
diff --git a/base/json/json_parser_unittest.cc b/base/json/json_parser_unittest.cc
index 9c1ea22d3aa981..8fbf0a098a719c 100644
--- a/base/json/json_parser_unittest.cc
+++ b/base/json/json_parser_unittest.cc
@@ -277,7 +277,7 @@ TEST_F(JSONParserTest, ErrorMessages) {
   }
 
   {
-    JSONParser parser(JSON_PARSE_RFC);
+    JSONParser parser(JSON_PARSE_RFC | JSON_ALLOW_X_ESCAPES);
     absl::optional<Value> value = parser.Parse("[\"xxx\\xq\"]");
     EXPECT_FALSE(value);
     EXPECT_EQ(JSONParser::FormatErrorMessage(1, 7, JSONParser::kInvalidEscape),
diff --git a/base/json/json_reader.h b/base/json/json_reader.h
index b2821805fb4a4f..0e33c3b971eaf9 100644
--- a/base/json/json_reader.h
+++ b/base/json/json_reader.h
@@ -23,8 +23,6 @@
 // Configurable (see the JSONParserOptions type) deviations from the RFC:
 // - Allow trailing commas: "[1,2,]".
 // - Replace invalid Unicode with U+FFFD REPLACEMENT CHARACTER.
-//
-// Non-configurable deviations from the RFC:
 // - Allow "// etc\n" and "/* etc */" C-style comments.
 // - Allow ASCII control characters, including literal (not escaped) NUL bytes
 //   and new lines, within a JSON string.
@@ -50,8 +48,7 @@
 namespace base {
 
 enum JSONParserOptions {
-  // Parses the input strictly according to RFC 8259, except for where noted
-  // above.
+  // Parses the input strictly according to RFC 8259.
   JSON_PARSE_RFC = 0,
 
   // Allows commas to exist after the last element in structures.
@@ -62,6 +59,26 @@ enum JSONParserOptions {
   // not set, invalid code points trigger a hard error and parsing
   // fails.
   JSON_REPLACE_INVALID_CHARACTERS = 1 << 1,
+
+  // Allows both C (/* */) and C++ (//) style comments.
+  JSON_ALLOW_COMMENTS = 1 << 2,
+
+  // Permits unescaped ASCII control characters (such as unescaped \r and \n)
+  // in the range [0x00,0x1F].
+  JSON_ALLOW_CONTROL_CHARS = 1 << 3,
+
+  // Permits \\v vertical tab escapes.
+  JSON_ALLOW_VERT_TAB = 1 << 4,
+
+  // Permits \\xNN escapes as described above.
+  JSON_ALLOW_X_ESCAPES = 1 << 5,
+
+  // This parser historically accepted, without configuration flags,
+  // non-standard JSON extensions. This flag enables that traditional parsing
+  // behavior.
+  JSON_PARSE_CHROMIUM_EXTENSIONS = JSON_ALLOW_COMMENTS |
+                                   JSON_ALLOW_CONTROL_CHARS |
+                                   JSON_ALLOW_VERT_TAB | JSON_ALLOW_X_ESCAPES,
 };
 
 class BASE_EXPORT JSONReader {
@@ -94,7 +111,7 @@ class BASE_EXPORT JSONReader {
   // If |json| is not a properly formed JSON string, returns absl::nullopt.
   static absl::optional<Value> Read(
       StringPiece json,
-      int options = JSON_PARSE_RFC,
+      int options = JSON_PARSE_CHROMIUM_EXTENSIONS,
       size_t max_depth = internal::kAbsoluteMaxDepth);
 
   // Deprecated. Use the Read() method above.
@@ -104,7 +121,7 @@ class BASE_EXPORT JSONReader {
   // convert to a FooValue at the same time.
   static std::unique_ptr<Value> ReadDeprecated(
       StringPiece json,
-      int options = JSON_PARSE_RFC,
+      int options = JSON_PARSE_CHROMIUM_EXTENSIONS,
       size_t max_depth = internal::kAbsoluteMaxDepth);
 
   // Reads and parses |json| like Read(). Returns a ValueWithError, which on
@@ -112,7 +129,7 @@ class BASE_EXPORT JSONReader {
   // the error location if appropriate.
   static ValueWithError ReadAndReturnValueWithError(
       StringPiece json,
-      int options = JSON_PARSE_RFC);
+      int options = JSON_PARSE_CHROMIUM_EXTENSIONS);
 };
 
 }  // namespace base
diff --git a/base/json/json_reader_unittest.cc b/base/json/json_reader_unittest.cc
index 816c8d3a6639dc..9dbe3b6e1daddb 100644
--- a/base/json/json_reader_unittest.cc
+++ b/base/json/json_reader_unittest.cc
@@ -377,7 +377,7 @@ TEST(JSONReaderTest, CompleteDictionary) {
 
   absl::optional<Value> root2 = JSONReader::Read(
       "{\"number\":9.87654321, \"null\":null , \"\\x53\" : \"str\", }",
-      JSON_ALLOW_TRAILING_COMMAS);
+      JSON_PARSE_CHROMIUM_EXTENSIONS | JSON_ALLOW_TRAILING_COMMAS);
   ASSERT_TRUE(root2);
   ASSERT_TRUE(root2->is_dict());
   EXPECT_EQ(*dict_val, *root2);
@@ -389,7 +389,7 @@ TEST(JSONReaderTest, CompleteDictionary) {
       "  \"null\":null,\n"
       "  \"\\x53\":\"str\",\n"
       "}\n",
-      JSON_ALLOW_TRAILING_COMMAS);
+      JSON_PARSE_CHROMIUM_EXTENSIONS | JSON_ALLOW_TRAILING_COMMAS);
   ASSERT_TRUE(root2);
   ASSERT_TRUE(root2->is_dict());
   EXPECT_EQ(*dict_val, *root2);
@@ -400,7 +400,7 @@ TEST(JSONReaderTest, CompleteDictionary) {
       "  \"null\":null,\r\n"
       "  \"\\x53\":\"str\",\r\n"
       "}\r\n",
-      JSON_ALLOW_TRAILING_COMMAS);
+      JSON_PARSE_CHROMIUM_EXTENSIONS | JSON_ALLOW_TRAILING_COMMAS);
   ASSERT_TRUE(root2);
   ASSERT_TRUE(root2->is_dict());
   EXPECT_EQ(*dict_val, *root2);
@@ -1014,11 +1014,54 @@ TEST(JSONReaderTest, LineColumnCounting) {
     SCOPED_TRACE(StringPrintf("case %u: \"%s\"", i, test_case.input));
 
     JSONReader::ValueWithError root = JSONReader::ReadAndReturnValueWithError(
-        test_case.input, JSON_PARSE_RFC);
+        test_case.input, JSON_PARSE_RFC | JSON_ALLOW_CONTROL_CHARS);
     EXPECT_FALSE(root.value);
     EXPECT_EQ(test_case.error_line, root.error_line);
     EXPECT_EQ(test_case.error_column, root.error_column);
   }
 }
 
+TEST(JSONReaderTest, ChromiumExtensions) {
+  // All of these cases should parse with JSON_PARSE_CHROMIUM_EXTENSIONS but
+  // fail with JSON_PARSE_RFC.
+  const struct {
+    // The JSON input.
+    const char* input;
+    // What JSON_* option permits this extension.
+    int option;
+  } kCases[] = {
+      {"{ /* comment */ \"foo\": 3 }", JSON_ALLOW_COMMENTS},
+      {"{ // comment\n \"foo\": 3 }", JSON_ALLOW_COMMENTS},
+      {"[\"\\xAB\"]", JSON_ALLOW_X_ESCAPES},
+      {"[\"\b\"]", JSON_ALLOW_CONTROL_CHARS},
+      {"[\"\f\"]", JSON_ALLOW_CONTROL_CHARS},
+      {"[\"\n\"]", JSON_ALLOW_CONTROL_CHARS},
+      {"[\"\r\"]", JSON_ALLOW_CONTROL_CHARS},
+      {"[\"\t\"]", JSON_ALLOW_CONTROL_CHARS},
+      {"[\"\v\"]", JSON_ALLOW_CONTROL_CHARS},
+      {"[\"\\v\"]", JSON_ALLOW_VERT_TAB},
+  };
+
+  for (size_t i = 0; i < base::size(kCases); ++i) {
+    SCOPED_TRACE(testing::Message() << "case " << i);
+    const auto& test_case = kCases[i];
+
+    JSONReader::ValueWithError result = JSONReader::ReadAndReturnValueWithError(
+        test_case.input, JSON_PARSE_RFC);
+    EXPECT_FALSE(result.value);
+
+    result = JSONReader::ReadAndReturnValueWithError(
+        test_case.input, JSON_PARSE_RFC | test_case.option);
+    EXPECT_TRUE(result.value);
+
+    result = JSONReader::ReadAndReturnValueWithError(
+        test_case.input, JSON_PARSE_CHROMIUM_EXTENSIONS);
+    EXPECT_TRUE(result.value);
+
+    result = JSONReader::ReadAndReturnValueWithError(
+        test_case.input, JSON_PARSE_CHROMIUM_EXTENSIONS & ~test_case.option);
+    EXPECT_FALSE(result.value);
+  }
+}
+
 }  // namespace base
diff --git a/base/json/json_string_value_serializer.h b/base/json/json_string_value_serializer.h
index 9faa0aed81ac11..27be85279c55a5 100644
--- a/base/json/json_string_value_serializer.h
+++ b/base/json/json_string_value_serializer.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/base_export.h"
+#include "base/json/json_reader.h"
 #include "base/memory/raw_ptr.h"
 #include "base/strings/string_piece.h"
 #include "base/values.h"
@@ -51,8 +52,9 @@ class BASE_EXPORT JSONStringValueDeserializer : public base::ValueDeserializer {
   // This retains a reference to the contents of |json_string|, so the data
   // must outlive the JSONStringValueDeserializer. |options| is a bitmask of
   // JSONParserOptions.
-  explicit JSONStringValueDeserializer(const base::StringPiece& json_string,
-                                       int options = 0);
+  explicit JSONStringValueDeserializer(
+      const base::StringPiece& json_string,
+      int options = base::JSON_PARSE_CHROMIUM_EXTENSIONS);
 
   JSONStringValueDeserializer(const JSONStringValueDeserializer&) = delete;
   JSONStringValueDeserializer& operator=(const JSONStringValueDeserializer&) =
diff --git a/base/test/values_test_util.cc b/base/test/values_test_util.cc
index cd8be33e0e17d0..8f82229f4dde3b 100644
--- a/base/test/values_test_util.cc
+++ b/base/test/values_test_util.cc
@@ -219,8 +219,8 @@ void IsJsonMatcher::DescribeNegationTo(std::ostream* os) const {
 }
 
 Value ParseJson(StringPiece json) {
-  JSONReader::ValueWithError result =
-      JSONReader::ReadAndReturnValueWithError(json, JSON_ALLOW_TRAILING_COMMAS);
+  JSONReader::ValueWithError result = JSONReader::ReadAndReturnValueWithError(
+      json, JSON_PARSE_CHROMIUM_EXTENSIONS | JSON_ALLOW_TRAILING_COMMAS);
   if (!result.value) {
     ADD_FAILURE() << "Failed to parse \"" << json
                   << "\": " << result.error_message;
diff --git a/base/trace_event/trace_event_unittest.cc b/base/trace_event/trace_event_unittest.cc
index 9b6bb44ba1dd7b..3712c086751405 100644
--- a/base/trace_event/trace_event_unittest.cc
+++ b/base/trace_event/trace_event_unittest.cc
@@ -208,8 +208,8 @@ void TraceEventTestFixture::OnTraceDataCollected(
   trace_buffer_.AddFragment(events_str->data());
   trace_buffer_.Finish();
 
-  absl::optional<Value> root =
-      base::JSONReader::Read(json_output_.json_output, JSON_PARSE_RFC);
+  absl::optional<Value> root = base::JSONReader::Read(
+      json_output_.json_output, JSON_PARSE_RFC | JSON_ALLOW_CONTROL_CHARS);
 
   if (!root.has_value()) {
     LOG(ERROR) << json_output_.json_output;
diff --git a/build/config/chromeos/ui_mode.gni b/build/config/chromeos/ui_mode.gni
index aff59afa6664cd..12d18e83b9b19d 100644
--- a/build/config/chromeos/ui_mode.gni
+++ b/build/config/chromeos/ui_mode.gni
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/chromeos/args.gni")
+
 declare_args() {
   # Deprecated, use is_lacros.
   #
@@ -16,15 +18,21 @@ declare_args() {
   # is_ash = chromeos_product == "ash"
   chromeos_is_browser_only = false
 
-  # Setting this to true when building LaCrOS-chrome will cause it to
-  # *also* build ash-chrome in a subdirectory using an alternate toolchain.
+  # Setting this to true when building linux Lacros-chrome will cause it to
+  # *also* build linux ash-chrome in a subdirectory using an alternate
+  # toolchain.
   # Don't set this unless you're sure you want it, because it'll double
   # your build time.
   also_build_ash_chrome = false
 
-  # Setting this to true when building ash-chrome will cause it to
-  # *also* build lacros-chrome in a subdirectory using an alternate toolchain.
+  # Setting this to true when building linux ash-chrome will cause it to
+  # *also* build linux Lacros-chrome in a subdirectory using an alternate toolchain.
   also_build_lacros_chrome = false
+
+  # Setting this when building ash-chrome will cause it to
+  # *also* build Lacros-chrome in a subdirectory using an alternate toolchain.
+  # You can set this to either "amd64" or "arm".
+  also_build_lacros_chrome_for_architecture = ""
 }
 
 # is_chromeos_{ash,lacros} is used to specify that it is specific to either
@@ -38,3 +46,15 @@ is_chromeos_lacros = is_chromeos && chromeos_is_browser_only
 
 # also_build_ash_chrome and also_build_lacros_chrome cannot be both true.
 assert(!(also_build_ash_chrome && also_build_lacros_chrome))
+
+# Can't set both also_build_lacros_chrome and
+# also_build_lacros_chrome_for_architecture.
+assert(!(also_build_lacros_chrome == true &&
+             also_build_lacros_chrome_for_architecture != ""))
+
+# also_build_lacros_chrome_for_architecture is for device only.
+assert(is_chromeos_device || also_build_lacros_chrome_for_architecture == "")
+
+# also_build_lacros_chrome_for_architecture is for ash build only.
+assert(!chromeos_is_browser_only ||
+       also_build_lacros_chrome_for_architecture == "")
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 7a1825e1db1db4..e45fa2c80b97c1 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -129,8 +129,8 @@ declare_args() {
   # TODO(gbiv): We disable optimizations by default on most platforms because
   # the space overhead is too great. We should use some mixture of profiles and
   # optimization settings to better tune the size increase.
-  thin_lto_enable_optimizations =
-      (is_chromeos_ash || is_android || is_win || is_linux) && is_official_build
+  thin_lto_enable_optimizations = (is_chromeos_ash || is_android || is_win ||
+                                   is_linux || is_mac) && is_official_build
 
   # Initialize all local variables with a pattern. This flag will fill
   # uninitialized floating-point types (and 32-bit pointers) with 0xFF and the
@@ -654,10 +654,11 @@ config("compiler") {
   if (!is_debug && use_thin_lto && is_a_target_toolchain) {
     assert(use_lld, "LTO is only supported with lld")
 
-    cflags += [
-      "-flto=thin",
-      "-fsplit-lto-unit",
-    ]
+    cflags += [ "-flto=thin" ]
+    if (!is_mac) {
+      # TODO(lgrey): Enable unit splitting for Mac when supported.
+      cflags += [ "-fsplit-lto-unit" ]
+    }
 
     # Limit the size of the ThinLTO cache to the lesser of 10% of
     # available disk space, 40GB and 100000 files.
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
index a41df193c6a2c4..3520e4288b40d3 100644
--- a/build/config/compiler/compiler.gni
+++ b/build/config/compiler/compiler.gni
@@ -74,7 +74,8 @@ declare_args() {
   use_thin_lto =
       is_cfi ||
       (is_clang && is_official_build && chrome_pgo_phase != 1 &&
-       (is_linux || is_win || (is_android && target_os != "chromeos") ||
+       (is_linux || is_win || is_mac ||
+        (is_android && target_os != "chromeos") ||
         ((is_chromeos_ash || is_chromeos_lacros) && is_chromeos_device)))
 
   # If true, use Goma for ThinLTO code generation where applicable.
diff --git a/build/toolchain/cros/BUILD.gn b/build/toolchain/cros/BUILD.gn
index 4cff006a05e599..15bdd9c13cdbca 100644
--- a/build/toolchain/cros/BUILD.gn
+++ b/build/toolchain/cros/BUILD.gn
@@ -174,3 +174,60 @@ cros_toolchain("v8_snapshot") {
     sysroot = cros_v8_snapshot_sysroot
   }
 }
+
+# This toolchain is used when we want to build Lacros using alternate toolchain.
+# To use this, you need to set gn arg 'also_build_lacros_chrome_for_architecture'.
+# See build/config/chromeos/ui_mode.gni
+if (also_build_lacros_chrome_for_architecture != "") {
+  cros_toolchain("lacros_clang") {
+    # These are args for the template.
+    ar = cros_target_ar
+    cc = cros_target_cc
+    cxx = cros_target_cxx
+    ld = cros_target_ld
+
+    if (cros_target_nm != "") {
+      nm = cros_target_nm
+    }
+    if (cros_target_readelf != "") {
+      readelf = cros_target_readelf
+    }
+    extra_cflags = cros_target_extra_cflags
+    extra_cppflags = cros_target_extra_cppflags
+    extra_cxxflags = cros_target_extra_cxxflags
+    extra_ldflags = cros_target_extra_ldflags
+
+    toolchain_args = {
+      if (also_build_lacros_chrome_for_architecture == "amd64") {
+        forward_variables_from(
+            read_file("//build/args/chromeos/amd64-generic-crostoolchain.gni",
+                      "scope"),
+            "*")
+        cros_v8_snapshot_sysroot = "//build/linux/debian_sid_amd64-sysroot"
+      } else if (also_build_lacros_chrome_for_architecture == "arm") {
+        forward_variables_from(
+            read_file("//build/args/chromeos/arm-generic-crostoolchain.gni",
+                      "scope"),
+            "*")
+        cros_v8_snapshot_sysroot = "//build/linux/debian_sid_i386-sysroot"
+      } else {
+        assert(false,
+               "also_build_lacros_chrome_for_architecture is not " +
+                   "one of the supported architecture.")
+      }
+      current_os = "chromeos"
+      target_os = "chromeos"
+      current_cpu = current_cpu
+      also_build_lacros_chrome_for_architecture = ""
+      chromeos_is_browser_only = true
+      use_clang_coverage = false
+      cros_host_sysroot = "//build/linux/debian_sid_amd64-sysroot"
+      cc_wrapper = ""
+      needs_gomacc_path_arg = true
+      clang_use_chrome_plugins = false
+      is_clang = is_clang
+      use_debug_fission = use_debug_fission
+      use_gold = use_gold
+    }
+  }
+}
diff --git a/cc/test/test_options_provider.cc b/cc/test/test_options_provider.cc
index d9f07cd41bcd9a..82d5a8c29b44e1 100644
--- a/cc/test/test_options_provider.cc
+++ b/cc/test/test_options_provider.cc
@@ -22,12 +22,19 @@ class TestOptionsProvider::DiscardableManager
     return true;
   }
 
+  // SkStrikeServer::DiscardableHandleManager::isHandleDeleted implementation.
+  bool isHandleDeleted(SkDiscardableHandleId) override { return false; }
+
   // SkStrikeClient::DiscardableHandleManager implementation.
   bool deleteHandle(SkDiscardableHandleId handle_id) override {
     CHECK_LT(handle_id, next_handle_id_);
     return false;
   }
 
+  // SkStrikeClient::DiscardableHandleManager implementation.
+  void notifyCacheMiss(SkStrikeClient::CacheMissType type,
+                       int fontSize) override {}
+
  private:
   SkDiscardableHandleId next_handle_id_ = 1u;
 };
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 9e2c48f5bc7337..3a50c88e6cb48f 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -161,6 +161,10 @@ if (!is_android && !is_mac) {
       data_deps += [ "//sandbox/linux:chrome_sandbox" ]
     }
 
+    if (also_build_lacros_chrome_for_architecture != "") {
+      data_deps += [ "//chrome:chrome(//build/toolchain/cros:lacros_clang)" ]
+    }
+
     if (is_win) {
       sources += [
         "app/chrome_exe.rc",
diff --git a/chrome/VERSION b/chrome/VERSION
index cf17d4421570c2..aaa50afa9765e2 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
 MAJOR=99
 MINOR=0
-BUILD=4766
+BUILD=4767
 PATCH=0
diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
index 5cb50a7a62ca02..220effcbfb9eee 100644
--- a/chrome/android/chrome_java_resources.gni
+++ b/chrome/android/chrome_java_resources.gni
@@ -449,7 +449,6 @@ chrome_java_resources = [
   "java/res/drawable-xxxhdpi/unionpay_card.png",
   "java/res/drawable-xxxhdpi/verify_checkmark.png",
   "java/res/drawable/accessibility_tab_switcher_divider.xml",
-  "java/res/drawable/account_picker_background.xml",
   "java/res/drawable/adaptive_toolbar_preference_header.xml",
   "java/res/drawable/arrow_down.xml",
   "java/res/drawable/arrow_up.xml",
diff --git a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java
index ff79bb2fe03784..a33674d0bfabda 100644
--- a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java
+++ b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java
@@ -280,7 +280,7 @@ public StartSurfaceCoordinator(@NonNull Activity activity,
                 new StartSurfaceMediator(controller, mTabModelSelector, mPropertyModel,
                         mIsStartSurfaceEnabled ? this::initializeSecondaryTasksSurface : null,
                         mIsStartSurfaceEnabled, mActivity, mBrowserControlsManager,
-                        this::isActivityFinishingOrDestroyed, excludeMVTiles,
+                        this::isActivityFinishingOrDestroyed, excludeMVTiles, excludeQueryTiles,
                         startSurfaceOneshotSupplier, hadWarmStart, jankTracker);
 
         // Show feed loading image.
diff --git a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
index df97897535acc1..c5a97e2e171a2b 100644
--- a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
+++ b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
@@ -15,6 +15,7 @@
 import static org.chromium.chrome.browser.tasks.TasksSurfaceProperties.MORE_TABS_CLICK_LISTENER;
 import static org.chromium.chrome.browser.tasks.TasksSurfaceProperties.MV_TILES_CONTAINER_TOP_MARGIN;
 import static org.chromium.chrome.browser.tasks.TasksSurfaceProperties.MV_TILES_VISIBLE;
+import static org.chromium.chrome.browser.tasks.TasksSurfaceProperties.QUERY_TILES_VISIBLE;
 import static org.chromium.chrome.browser.tasks.TasksSurfaceProperties.RESET_TASK_SURFACE_HEADER_SCROLL_POSITION;
 import static org.chromium.chrome.browser.tasks.TasksSurfaceProperties.TAB_SWITCHER_TITLE_TOP_MARGIN;
 import static org.chromium.chrome.browser.tasks.TasksSurfaceProperties.TASKS_SURFACE_BODY_TOP_MARGIN;
@@ -98,6 +99,7 @@ interface ActivityStateChecker {
     private final boolean mIsStartSurfaceEnabled;
     private final ObserverList<StartSurface.StateObserver> mStateObservers = new ObserverList<>();
     private final boolean mHadWarmStart;
+    private final boolean mExcludeQueryTiles;
 
     // Boolean histogram used to record whether cached
     // ChromePreferenceKeys.FEED_ARTICLES_LIST_VISIBLE is consistent with
@@ -164,8 +166,8 @@ interface ActivityStateChecker {
             boolean isStartSurfaceEnabled, Context context,
             BrowserControlsStateProvider browserControlsStateProvider,
             ActivityStateChecker activityStateChecker, boolean excludeMVTiles,
-            OneshotSupplier<StartSurface> startSurfaceSupplier, boolean hadWarmStart,
-            JankTracker jankTracker) {
+            boolean excludeQueryTiles, OneshotSupplier<StartSurface> startSurfaceSupplier,
+            boolean hadWarmStart, JankTracker jankTracker) {
         mController = controller;
         mTabModelSelector = tabModelSelector;
         mPropertyModel = propertyModel;
@@ -175,6 +177,7 @@ interface ActivityStateChecker {
         mBrowserControlsStateProvider = browserControlsStateProvider;
         mActivityStateChecker = activityStateChecker;
         mExcludeMVTiles = excludeMVTiles;
+        mExcludeQueryTiles = excludeQueryTiles;
         mStartSurfaceSupplier = startSurfaceSupplier;
         mHadWarmStart = hadWarmStart;
         mJankTracker = jankTracker;
@@ -346,6 +349,7 @@ void setSecondaryTasksSurfacePropertyModel(PropertyModel propertyModel) {
         // Secondary tasks surface is used for more Tabs or incognito mode single pane, where MV
         // tiles and voice recognition button should be invisible.
         mSecondaryTasksSurfacePropertyModel.set(MV_TILES_VISIBLE, false);
+        mSecondaryTasksSurfacePropertyModel.set(QUERY_TILES_VISIBLE, false);
         mSecondaryTasksSurfacePropertyModel.set(IS_VOICE_RECOGNITION_BUTTON_VISIBLE, false);
         mSecondaryTasksSurfacePropertyModel.set(IS_LENS_BUTTON_VISIBLE, false);
     }
@@ -491,6 +495,8 @@ private void setOverviewStateInternal() {
             setTabCarouselVisibility(
                     hasNormalTab && !mIsIncognito && !mHideTabCarouselForNewSurface);
             setMVTilesVisibility(!mIsIncognito && !mHideMVForNewSurface);
+            // TODO(qinmin): show query tiles when flag is enabled.
+            setQueryTilesVisibility(false);
             setFakeBoxVisibility(!mIsIncognito);
             setSecondaryTasksSurfaceVisibility(mIsIncognito, /* skipUpdateController = */ false);
 
@@ -506,6 +512,7 @@ private void setOverviewStateInternal() {
         } else if (mStartSurfaceState == StartSurfaceState.SHOWN_TABSWITCHER) {
             setTabCarouselVisibility(false);
             setMVTilesVisibility(false);
+            setQueryTilesVisibility(false);
             setFakeBoxVisibility(false);
             setSecondaryTasksSurfaceVisibility(
                     /* isVisible= */ true, /* skipUpdateController = */ false);
@@ -875,6 +882,11 @@ private void setMVTilesVisibility(boolean isVisible) {
         mPropertyModel.set(MV_TILES_VISIBLE, isVisible);
     }
 
+    private void setQueryTilesVisibility(boolean isVisible) {
+        if (mExcludeQueryTiles || isVisible == mPropertyModel.get(QUERY_TILES_VISIBLE)) return;
+        mPropertyModel.set(QUERY_TILES_VISIBLE, isVisible);
+    }
+
     private void setFakeBoxVisibility(boolean isVisible) {
         if (mPropertyModel == null) return;
         mPropertyModel.set(IS_FAKE_SEARCH_BOX_VISIBLE, isVisible);
diff --git a/chrome/android/features/start_surface/internal/junit/src/org/chromium/chrome/features/start_surface/StartSurfaceMediatorUnitTest.java b/chrome/android/features/start_surface/internal/junit/src/org/chromium/chrome/features/start_surface/StartSurfaceMediatorUnitTest.java
index daf212db051473..f4f373029fbebc 100644
--- a/chrome/android/features/start_surface/internal/junit/src/org/chromium/chrome/features/start_surface/StartSurfaceMediatorUnitTest.java
+++ b/chrome/android/features/start_surface/internal/junit/src/org/chromium/chrome/features/start_surface/StartSurfaceMediatorUnitTest.java
@@ -1200,7 +1200,8 @@ private StartSurfaceMediator createStartSurfaceMediatorWithoutInit(
                 isStartSurfaceEnabled ? mSecondaryTasksSurfaceInitializer : null,
                 isStartSurfaceEnabled, ContextUtils.getApplicationContext(),
                 mBrowserControlsStateProvider, mActivityStateChecker, excludeMVTiles,
-                mStartSurfaceSupplier, hadWarmStart, new DummyJankTracker());
+                true /* excludeQueryTiles */, mStartSurfaceSupplier, hadWarmStart,
+                new DummyJankTracker());
         return mediator;
     }
 }
diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn
index 314a3fe3cfae96..2c70d093f21e38 100644
--- a/chrome/android/features/tab_ui/BUILD.gn
+++ b/chrome/android/features/tab_ui/BUILD.gn
@@ -68,6 +68,7 @@ android_resources("java_resources") {
     "java/res/layout/new_tab_tile_card_item.xml",
     "java/res/layout/price_card.xml",
     "java/res/layout/price_tracking_dialog_layout.xml",
+    "java/res/layout/query_tiles_layout.xml",
     "java/res/layout/selectable_tab_grid_card_item.xml",
     "java/res/layout/selectable_tab_list_card_item.xml",
     "java/res/layout/single_tab_view_layout.xml",
diff --git a/chrome/android/features/tab_ui/java/res/layout/query_tiles_layout.xml b/chrome/android/features/tab_ui/java/res/layout/query_tiles_layout.xml
new file mode 100644
index 00000000000000..f07d489d6adc09
--- /dev/null
+++ b/chrome/android/features/tab_ui/java/res/layout/query_tiles_layout.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2021 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+
+<!-- Query suggestion tiles. -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/query_tiles_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:paddingBottom="@dimen/tasks_view_items_vertical_spacing">
+</FrameLayout>
diff --git a/chrome/android/features/tab_ui/java/res/layout/tasks_view_layout.xml b/chrome/android/features/tab_ui/java/res/layout/tasks_view_layout.xml
index fa62d8070497e0..3a40bb6e7f2c85 100644
--- a/chrome/android/features/tab_ui/java/res/layout/tasks_view_layout.xml
+++ b/chrome/android/features/tab_ui/java/res/layout/tasks_view_layout.xml
@@ -33,6 +33,16 @@
             app:layout_scrollFlags="scroll">
             <include layout="@layout/fake_search_box_layout"/>
         </LinearLayout>
+        <FrameLayout android:id="@+id/query_tiles_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="6dp"
+            android:paddingStart="6dp"
+            android:paddingEnd="6dp"
+            android:visibility="gone"
+            app:layout_scrollFlags="scroll">
+            <include layout="@layout/query_tiles_layout" />
+        </FrameLayout>
         <HorizontalScrollView android:id="@+id/mv_tiles_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurfaceCoordinator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurfaceCoordinator.java
index 2fcf9552b1c1df..158393ff7836a8 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurfaceCoordinator.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurfaceCoordinator.java
@@ -26,6 +26,8 @@
 import org.chromium.chrome.browser.ntp.IncognitoCookieControlsManager;
 import org.chromium.chrome.browser.omnibox.OmniboxStub;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.query_tiles.QueryTileSection;
+import org.chromium.chrome.browser.query_tiles.QueryTileSection.QueryInfo;
 import org.chromium.chrome.browser.share.ShareDelegate;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
@@ -53,6 +55,7 @@ public class TasksSurfaceCoordinator implements TasksSurface {
     private final PropertyModelChangeProcessor mPropertyModelChangeProcessor;
     private final TasksSurfaceMediator mMediator;
     private MostVisitedListCoordinator mMostVisitedList;
+    private QueryTileSection mQueryTileSection;
     private final PropertyModel mPropertyModel;
     private final @TabSwitcherType int mTabSwitcherType;
     private final SnackbarManager mSnackbarManager;
@@ -132,10 +135,16 @@ public TasksSurfaceCoordinator(@NonNull Activity activity,
             mMostVisitedList.initialize();
         }
         if (hasQueryTiles) {
-            // TODO(qinmin): show QueryTiles.
+            QueryTileSection queryTileSection =
+                    new QueryTileSection(mView.findViewById(R.id.query_tiles_layout),
+                            Profile.getLastUsedRegularProfile(), this::performSearchQuery);
         }
     }
 
+    private void performSearchQuery(QueryInfo queryInfo) {
+        // TODO(qinmin): load the search result page.
+    }
+
     /**
      * TasksSurface implementation.
      */
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurfaceProperties.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurfaceProperties.java
index 3c6a371476ad96..2b4a4860fbe3c0 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurfaceProperties.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurfaceProperties.java
@@ -66,6 +66,8 @@ private TasksSurfaceProperties() {}
             .WritableObjectPropertyKey<View.OnClickListener> MORE_TABS_CLICK_LISTENER =
             new PropertyModel.WritableObjectPropertyKey<>();
     public static final PropertyModel.WritableBooleanPropertyKey MV_TILES_VISIBLE = IS_VISIBLE;
+    public static final PropertyModel.WritableBooleanPropertyKey QUERY_TILES_VISIBLE =
+            new PropertyModel.WritableBooleanPropertyKey();
     public static final PropertyModel
             .WritableObjectPropertyKey<View.OnClickListener> VOICE_SEARCH_BUTTON_CLICK_LISTENER =
             new PropertyModel.WritableObjectPropertyKey<>();
@@ -87,7 +89,7 @@ private TasksSurfaceProperties() {}
             INCOGNITO_COOKIE_CONTROLS_TOGGLE_ENFORCEMENT, INCOGNITO_COOKIE_CONTROLS_MANAGER,
             INCOGNITO_LEARN_MORE_CLICK_LISTENER, FAKE_SEARCH_BOX_CLICK_LISTENER,
             FAKE_SEARCH_BOX_TEXT_WATCHER, LENS_BUTTON_CLICK_LISTENER, MORE_TABS_CLICK_LISTENER,
-            MV_TILES_VISIBLE, VOICE_SEARCH_BUTTON_CLICK_LISTENER, TASKS_SURFACE_BODY_TOP_MARGIN,
-            MV_TILES_CONTAINER_TOP_MARGIN, TAB_SWITCHER_TITLE_TOP_MARGIN,
-            RESET_TASK_SURFACE_HEADER_SCROLL_POSITION};
+            MV_TILES_VISIBLE, QUERY_TILES_VISIBLE, VOICE_SEARCH_BUTTON_CLICK_LISTENER,
+            TASKS_SURFACE_BODY_TOP_MARGIN, MV_TILES_CONTAINER_TOP_MARGIN,
+            TAB_SWITCHER_TITLE_TOP_MARGIN, RESET_TASK_SURFACE_HEADER_SCROLL_POSITION};
 }
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksView.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksView.java
index 75874030ff05c3..3b17beb4730a63 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksView.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksView.java
@@ -164,6 +164,13 @@ void setMostVisitedVisibility(int visibility) {
         findViewById(R.id.mv_tiles_container).setVisibility(visibility);
     }
 
+    /**
+     * Set the visibility of the Most Visited Tiles.
+     */
+    void setQueryTilesVisibility(int visibility) {
+        findViewById(R.id.query_tiles_container).setVisibility(visibility);
+    }
+
     /**
      * Set the {@link android.view.View.OnClickListener} for More Tabs.
      */
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksViewBinder.java
index 857d0a40e7a58d..0f75b7aa68ef94 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksViewBinder.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksViewBinder.java
@@ -24,6 +24,7 @@
 import static org.chromium.chrome.browser.tasks.TasksSurfaceProperties.MORE_TABS_CLICK_LISTENER;
 import static org.chromium.chrome.browser.tasks.TasksSurfaceProperties.MV_TILES_CONTAINER_TOP_MARGIN;
 import static org.chromium.chrome.browser.tasks.TasksSurfaceProperties.MV_TILES_VISIBLE;
+import static org.chromium.chrome.browser.tasks.TasksSurfaceProperties.QUERY_TILES_VISIBLE;
 import static org.chromium.chrome.browser.tasks.TasksSurfaceProperties.RESET_TASK_SURFACE_HEADER_SCROLL_POSITION;
 import static org.chromium.chrome.browser.tasks.TasksSurfaceProperties.TAB_SWITCHER_TITLE_TOP_MARGIN;
 import static org.chromium.chrome.browser.tasks.TasksSurfaceProperties.TASKS_SURFACE_BODY_TOP_MARGIN;
@@ -91,6 +92,8 @@ public static void bind(PropertyModel model, TasksView view, PropertyKey propert
             view.setMoreTabsOnClickListener(model.get(MORE_TABS_CLICK_LISTENER));
         } else if (propertyKey == MV_TILES_VISIBLE) {
             view.setMostVisitedVisibility(model.get(MV_TILES_VISIBLE) ? View.VISIBLE : View.GONE);
+        } else if (propertyKey == QUERY_TILES_VISIBLE) {
+            view.setQueryTilesVisibility(model.get(QUERY_TILES_VISIBLE) ? View.VISIBLE : View.GONE);
         } else if (propertyKey == VOICE_SEARCH_BUTTON_CLICK_LISTENER) {
             view.getSearchBoxCoordinator().addVoiceSearchButtonClickListener(
                     model.get(VOICE_SEARCH_BUTTON_CLICK_LISTENER));
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
index 38f5764c02cb59..ba9546db965c9c 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
@@ -159,14 +159,10 @@ private void maybeUpdateSignInPromo() {
             // blocking the UI thread for several seconds if the accounts cache is not populated
             // yet.
             if (isVisible()) {
-                SigninPromoController.OnDismissListener dismissListener = null;
-                if (ChromeFeatureList.isEnabled(ChromeFeatureList.FEED_SIGNIN_PROMO_DISMISS)) {
-                    dismissListener = this::onDismissPromo;
-                }
                 mSigninPromoController.setUpSyncPromoView(mProfileDataCache,
                         mCoordinator.getSigninPromoView().findViewById(
                                 R.id.signin_promo_view_container),
-                        dismissListener);
+                        this::onDismissPromo);
             }
         }
 
diff --git a/chrome/android/java/res/values/drawables.xml b/chrome/android/java/res/values/drawables.xml
index 90764a09511211..8569b73d402aa6 100644
--- a/chrome/android/java/res/values/drawables.xml
+++ b/chrome/android/java/res/values/drawables.xml
@@ -4,6 +4,7 @@
      found in the LICENSE file. -->
 
 <resources>
+    <drawable name="account_picker_background">@drawable/rounded_rectangle_surface_1</drawable>
     <drawable name="ntp_search_box">@drawable/modern_toolbar_text_box_background</drawable>
     <drawable name="badge_update">@drawable/badge_update_dark</drawable>
     <drawable name="ic_error_24dp_filled">@drawable/ic_error_grey800_24dp_filled</drawable>
diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res/values/styles.xml
index 247fa6fb0f22d1..48045abbdf5da6 100644
--- a/chrome/android/java/res/values/styles.xml
+++ b/chrome/android/java/res/values/styles.xml
@@ -119,7 +119,7 @@
         TODO(https://crbug.com/819142): Remove textAppearance when all TextViews have text style
         explicitly specified. -->
     <style name="Base.V17.Theme.Chromium.DialogWhenLarge"
-        parent="Theme.MaterialComponents.DayNight.DialogWhenLarge">
+        parent="Theme.BrowserUI.DialogWhenLarge">
         <item name="android:windowBackground">@drawable/bg_white_dialog</item>
         <item name="android:textAppearance">@style/TextAppearance.TextMedium.Primary</item>
         <item name="android:textColorLink">@color/default_text_color_link</item>
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java
index c4df7d55d2793a..6e5f34745b3e98 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java
@@ -49,6 +49,8 @@
 import org.chromium.components.offline_items_collection.LegacyHelpers;
 import org.chromium.components.offline_items_collection.OfflineItem;
 import org.chromium.components.offline_items_collection.OfflineItemState;
+import org.chromium.net.ChromiumNetworkAdapter;
+import org.chromium.net.NetworkTrafficAnnotationTag;
 
 import java.io.DataOutputStream;
 import java.io.File;
@@ -942,7 +944,8 @@ protected Boolean doInBackground() {
             boolean success = false;
             try {
                 URL url = new URL(mOMAInfo.getValue(OMA_INSTALL_NOTIFY_URI));
-                urlConnection = (HttpURLConnection) url.openConnection();
+                urlConnection = (HttpURLConnection) ChromiumNetworkAdapter.openConnection(
+                        url, NetworkTrafficAnnotationTag.MISSING_TRAFFIC_ANNOTATION);
                 urlConnection.setDoOutput(true);
                 urlConnection.setUseCaches(false);
                 urlConnection.setRequestMethod("POST");
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java
index ec92eeed206f17..106371d1d34e4b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java
@@ -15,6 +15,8 @@
 import org.chromium.base.task.PostTask;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
+import org.chromium.net.ChromiumNetworkAdapter;
+import org.chromium.net.NetworkTrafficAnnotationTag;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
@@ -103,7 +105,9 @@ static void checkConnectivitySystemNetworkStack(
             @Override
             protected Integer doInBackground() {
                 try {
-                    HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+                    HttpURLConnection conn =
+                            (HttpURLConnection) ChromiumNetworkAdapter.openConnection(
+                                    url, NetworkTrafficAnnotationTag.MISSING_TRAFFIC_ANNOTATION);
                     conn.setInstanceFollowRedirects(false);
                     conn.setRequestMethod("GET");
                     conn.setDoInput(false);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetector.java b/chrome/android/java/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetector.java
index df3c554d108de1..c77eed5d197b01 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetector.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetector.java
@@ -23,8 +23,10 @@
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.task.AsyncTask;
 import org.chromium.chrome.browser.content.ContentUtils;
+import org.chromium.net.ChromiumNetworkAdapter;
 import org.chromium.net.ConnectionType;
 import org.chromium.net.NetworkChangeNotifier;
+import org.chromium.net.NetworkTrafficAnnotationTag;
 
 import java.io.IOException;
 import java.lang.annotation.Retention;
@@ -399,7 +401,8 @@ protected Integer doInBackground() {
                     Log.i(TAG, "Sending HTTP Probe now to url:" + urlString);
 
                     URL url = new URL(urlString);
-                    urlConnection = (HttpURLConnection) url.openConnection();
+                    urlConnection = (HttpURLConnection) ChromiumNetworkAdapter.openConnection(
+                            url, NetworkTrafficAnnotationTag.MISSING_TRAFFIC_ANNOTATION);
                     urlConnection.setInstanceFollowRedirects(false);
                     urlConnection.setRequestMethod(sProbeMethod);
                     urlConnection.setConnectTimeout(timeoutMs);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/measurements/OfflineMeasurementsBackgroundTask.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/measurements/OfflineMeasurementsBackgroundTask.java
index 4ec054b1f4dccd..bec07ff4135f91 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/measurements/OfflineMeasurementsBackgroundTask.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/measurements/OfflineMeasurementsBackgroundTask.java
@@ -34,6 +34,8 @@
 import org.chromium.components.background_task_scheduler.TaskIds;
 import org.chromium.components.background_task_scheduler.TaskInfo;
 import org.chromium.components.background_task_scheduler.TaskParameters;
+import org.chromium.net.ChromiumNetworkAdapter;
+import org.chromium.net.NetworkTrafficAnnotationTag;
 
 import java.io.IOException;
 import java.lang.annotation.Retention;
@@ -504,7 +506,8 @@ protected Integer doInBackground() {
                 HttpURLConnection urlConnection = null;
                 try {
                     URL url = new URL(httpProbeUrl);
-                    urlConnection = (HttpURLConnection) url.openConnection();
+                    urlConnection = (HttpURLConnection) ChromiumNetworkAdapter.openConnection(
+                            url, NetworkTrafficAnnotationTag.MISSING_TRAFFIC_ANNOTATION);
                     urlConnection.setInstanceFollowRedirects(false);
                     urlConnection.setRequestMethod(httpProbeMethod);
                     urlConnection.setConnectTimeout(httpProbeTimeoutMs);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
index cfbdecb8799ea9..80b9fcfc3c842f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
@@ -18,6 +18,8 @@
 import org.chromium.base.StreamUtil;
 import org.chromium.base.ThreadUtils;
 import org.chromium.components.version_info.VersionInfo;
+import org.chromium.net.ChromiumNetworkAdapter;
+import org.chromium.net.NetworkTrafficAnnotationTag;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
@@ -445,7 +447,9 @@ private String postRequest(long timestamp, String xml) throws RequestFailureExce
     protected HttpURLConnection createConnection() throws RequestFailureException {
         try {
             URL url = new URL(getRequestGenerator().getServerUrl());
-            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            HttpURLConnection connection =
+                    (HttpURLConnection) ChromiumNetworkAdapter.openConnection(
+                            url, NetworkTrafficAnnotationTag.MISSING_TRAFFIC_ANNOTATION);
             connection.setConnectTimeout(MS_CONNECTION_TIMEOUT);
             connection.setReadTimeout(MS_CONNECTION_TIMEOUT);
             return connection;
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index cd9b3030c6f3af..8a8c3b82e5d304 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -279,8 +279,7 @@ void AdjustLinuxOOMScore(const std::string& process_type) {
              process_type == switches::kCloudPrintServiceProcess) {
     score = content::kMiscOomScore;
 #if BUILDFLAG(ENABLE_NACL)
-  } else if (process_type == switches::kNaClLoaderProcess ||
-             process_type == switches::kNaClLoaderNonSfiProcess) {
+  } else if (process_type == switches::kNaClLoaderProcess) {
     score = content::kPluginOomScore;
 #endif
   } else if (process_type == switches::kZygoteProcess || process_type.empty()) {
diff --git a/chrome/app/vector_icons/BUILD.gn b/chrome/app/vector_icons/BUILD.gn
index 0d72d57292b864..78f8949bc9625e 100644
--- a/chrome/app/vector_icons/BUILD.gn
+++ b/chrome/app/vector_icons/BUILD.gn
@@ -251,6 +251,7 @@ aggregate_vector_icons("chrome_vector_icons") {
       "google_chrome/google_g_logo_monochrome.icon",
       "google_chrome/google_keep_note.icon",
       "google_chrome/google_lens_full_logo.icon",
+      "google_chrome/google_lens_full_logo_dark.icon",
       "google_chrome/google_pay_logo.icon",
       "google_chrome/google_sites.icon",
       "google_chrome/google_super_g.icon",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 3a537f2b69f83b..118f0209f6d74e 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3994,6 +3994,8 @@ static_library("browser") {
       "metrics/desktop_session_duration/touch_mode_stats_tracker.h",
       "metrics/first_web_contents_profiler.cc",
       "metrics/first_web_contents_profiler.h",
+      "metrics/first_web_contents_profiler_base.cc",
+      "metrics/first_web_contents_profiler_base.h",
       "metrics/incognito_observer_desktop.cc",
       "metrics/power/power_metrics_reporter.cc",
       "metrics/power/power_metrics_reporter.h",
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 4b7237ee72bf79..8332885c974b86 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -6375,6 +6375,13 @@ const FeatureEntry kFeatureEntries[] = {
      FEATURE_VALUE_TYPE(page_info::kPageInfoStoreInfo)},
 #endif  // !defined(OS_ANDROID)
 
+#if !defined(OS_ANDROID)
+    {"page-info-history-desktop",
+     flag_descriptions::kPageInfoHistoryDesktopName,
+     flag_descriptions::kPageInfoHistoryDesktopDescription, kOsDesktop,
+     FEATURE_VALUE_TYPE(page_info::kPageInfoHistoryDesktop)},
+#endif  // !defined(OS_ANDROID)
+
     {"page-info-about-this-site", flag_descriptions::kPageInfoAboutThisSiteName,
      flag_descriptions::kPageInfoAboutThisSiteDescription,
      kOsDesktop | kOsAndroid,
diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
index 235efe9288b4e8..24a0ab0f141b0f 100644
--- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc
+++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
@@ -449,7 +449,7 @@ void AutocompleteControllerAndroid::NotifySuggestionsReceived(
     const AutocompleteResult& autocomplete_result) {
   JNIEnv* env = AttachCurrentThread();
 
-  autocomplete_controller_->InlineTailPrefixes();
+  autocomplete_controller_->SetTailSuggestContentPrefixes();
 
   // Get the inline-autocomplete text.
   std::u16string inline_autocompletion;
diff --git a/chrome/browser/ash/account_manager/account_apps_availability.cc b/chrome/browser/ash/account_manager/account_apps_availability.cc
index 7ed124e7e2bf67..7c2eb94a2a124a 100644
--- a/chrome/browser/ash/account_manager/account_apps_availability.cc
+++ b/chrome/browser/ash/account_manager/account_apps_availability.cc
@@ -146,6 +146,15 @@ absl::optional<bool> IsAccountAvailableInArc(PrefService* prefs,
   return is_available_in_arc.value_or(true);
 }
 
+void RemoveAccountFromPrefs(PrefService* prefs, const std::string& gaia_id) {
+  DCHECK(!IsPrimaryGaiaAccount(gaia_id));
+
+  DictionaryPrefUpdate update(prefs,
+                              account_manager::prefs::kAccountAppsAvailability);
+  const bool success = update->RemoveKey(gaia_id);
+  DCHECK(success);
+}
+
 void AddAccountToPrefs(PrefService* prefs,
                        const std::string& gaia_id,
                        bool is_available_in_arc) {
@@ -333,7 +342,13 @@ void AccountAppsAvailability::OnAccountRemoved(
     return;
   }
 
-  NOTIMPLEMENTED();
+  absl::optional<bool> current_status =
+      IsAccountAvailableInArc(prefs_, account.key.id());
+  RemoveAccountFromPrefs(prefs_, account.key.id());
+  if (!current_status.has_value() || !current_status.value())
+    return;
+
+  NotifyObservers(account, /*is_available_in_arc=*/false);
 }
 
 bool AccountAppsAvailability::IsInitialized() const {
diff --git a/chrome/browser/ash/account_manager/account_apps_availability_unittest.cc b/chrome/browser/ash/account_manager/account_apps_availability_unittest.cc
index 6b8ac71f1025e4..9986d2c651e0e0 100644
--- a/chrome/browser/ash/account_manager/account_apps_availability_unittest.cc
+++ b/chrome/browser/ash/account_manager/account_apps_availability_unittest.cc
@@ -396,14 +396,32 @@ TEST_F(AccountAppsAvailabilityTest,
       observation{&mock_observer};
   observation.Observe(account_apps_availability.get());
 
-  EXPECT_CALL(mock_observer,
-              OnAccountAvailableInArc(AccountEqual(secondary_account_1)))
-      .Times(1);
+  Checkpoint checkpoint;
+  {
+    InSequence s;
+
+    EXPECT_CALL(mock_observer,
+                OnAccountAvailableInArc(AccountEqual(secondary_account_1)))
+        .Times(1);
+    EXPECT_CALL(checkpoint, Call(1));
+    EXPECT_CALL(mock_observer,
+                OnAccountUnavailableInArc(AccountEqual(secondary_account_1)))
+        .Times(1);
+  }
+
   // [Account is available in ARC] Account is upserted - observer is called.
   identity_test_env()->SetRefreshTokenForAccount(
       secondary_account_1_info.account_id);
   // Wait for async calls to finish.
   base::RunLoop().RunUntilIdle();
+  checkpoint.Call(1);
+
+  // [Account is available in ARC] Account is removed - observer is
+  // called.
+  identity_test_env()->RemoveRefreshTokenForAccount(
+      secondary_account_1_info.account_id);
+  // Wait for async calls to finish.
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(AccountAppsAvailabilityTest,
@@ -436,6 +454,9 @@ TEST_F(AccountAppsAvailabilityTest,
     EXPECT_CALL(checkpoint, Call(1));
     EXPECT_CALL(mock_observer, OnAccountAvailableInArc(_)).Times(0);
     EXPECT_CALL(mock_observer, OnAccountUnavailableInArc(_)).Times(0);
+    EXPECT_CALL(checkpoint, Call(2));
+    EXPECT_CALL(mock_observer, OnAccountAvailableInArc(_)).Times(0);
+    EXPECT_CALL(mock_observer, OnAccountUnavailableInArc(_)).Times(0);
   }
 
   // Remove an account from ARC.
@@ -449,6 +470,14 @@ TEST_F(AccountAppsAvailabilityTest,
       secondary_account_1_info.account_id);
   // Wait for async calls to finish.
   base::RunLoop().RunUntilIdle();
+  checkpoint.Call(2);
+
+  // [Account is NOT available in ARC] Account is removed - observer is not
+  // called.
+  identity_test_env()->RemoveRefreshTokenForAccount(
+      secondary_account_1_info.account_id);
+  // Wait for async calls to finish.
+  base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace ash
diff --git a/chrome/browser/ash/login/oobe_configuration.cc b/chrome/browser/ash/login/oobe_configuration.cc
index 5f277df8d469ad..483dbb1bee9c0b 100644
--- a/chrome/browser/ash/login/oobe_configuration.cc
+++ b/chrome/browser/ash/login/oobe_configuration.cc
@@ -84,7 +84,8 @@ void OobeConfiguration::OnConfigurationCheck(bool has_configuration,
 
   base::JSONReader::ValueWithError parsed_json =
       base::JSONReader::ReadAndReturnValueWithError(
-          configuration, base::JSON_ALLOW_TRAILING_COMMAS);
+          configuration, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                             base::JSON_ALLOW_TRAILING_COMMAS);
   if (!parsed_json.value) {
     LOG(ERROR) << "Error parsing OOBE configuration: "
                << parsed_json.error_message;
diff --git a/chrome/browser/ash/login/session/user_session_manager.cc b/chrome/browser/ash/login/session/user_session_manager.cc
index 5fdc031bd8b22e..07b58b21bce48c 100644
--- a/chrome/browser/ash/login/session/user_session_manager.cc
+++ b/chrome/browser/ash/login/session/user_session_manager.cc
@@ -1724,7 +1724,8 @@ void UserSessionManager::InitializeBrowser(Profile* profile) {
   if (delegate_)
     delegate_->OnProfilePrepared(profile, browser_launched);
 
-  if (OnboardingUserActivityCounter::ShouldStart(profile->GetPrefs())) {
+  if (ProfileHelper::IsPrimaryProfile(profile) &&
+      OnboardingUserActivityCounter::ShouldStart(profile->GetPrefs())) {
     onboarding_user_activity_counter_ =
         std::make_unique<OnboardingUserActivityCounter>(
             profile->GetPrefs(), GetActivityTimeBeforeOnboardingSurvey(),
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index a9e30d6da02b58..dfd710b8435c8b 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -84,6 +84,7 @@
 #include "chrome/browser/prefetch/no_state_prefetch/chrome_no_state_prefetch_contents_delegate.h"
 #include "chrome/browser/prefetch/no_state_prefetch/no_state_prefetch_manager_factory.h"
 #include "chrome/browser/prefetch/no_state_prefetch/no_state_prefetch_navigation_throttle.h"
+#include "chrome/browser/prefetch/prefetch_prefs.h"
 #include "chrome/browser/prefetch/prefetch_proxy/chrome_speculation_host_delegate.h"
 #include "chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_features.h"
 #include "chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_service.h"
@@ -2404,7 +2405,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
       switches::kEnableNaCl,
 #if BUILDFLAG(ENABLE_NACL)
       switches::kEnableNaClDebug,
-      switches::kEnableNaClNonSfiMode,
 #endif
       switches::kEnableNetBenchmarking,
 #if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -2445,9 +2445,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
 #if BUILDFLAG(ENABLE_NACL)
     static const char* const kSwitchNames[] = {
         switches::kEnableNaClDebug,
-        switches::kEnableNaClNonSfiMode,
         switches::kForcePNaClSubzero,
-        switches::kNaClDangerousNoSandboxNonSfi,
     };
 
     command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
@@ -6351,6 +6349,12 @@ void ChromeContentBrowserClient::FlushBackgroundAttributions(
 #endif
 }
 
+bool ChromeContentBrowserClient::ShouldPreconnectNavigation(
+    content::BrowserContext* browser_context) {
+  return prefetch::IsSomePreloadingEnabled(
+      *Profile::FromBrowserContext(browser_context)->GetPrefs());
+}
+
 ChromeContentBrowserClient::UserAgentReductionEnterprisePolicyState
 ChromeContentBrowserClient::GetUserAgentReductionEnterprisePolicyState(
     content::BrowserContext* context) {
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index a76209e9c07cba..ee247be43bca02 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -768,6 +768,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
   bool IsFindInPageDisabledForOrigin(const url::Origin& origin) override;
 
   void FlushBackgroundAttributions(base::OnceClosure callback) override;
+  bool ShouldPreconnectNavigation(
+      content::BrowserContext* browser_context) override;
 
   enum UserAgentReductionEnterprisePolicyState {
     kDefault = 0,
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index 21d897ac3f11e5..bdec672ca5db28 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn
@@ -152,6 +152,7 @@ source_set("chromeos") {
     "//ash/webui/resources:scanning_app_resources_grit",
     "//ash/webui/resources:shimless_rma_resources_grit",
     "//ash/webui/resources:shortcut_customization_app_resources_grit",
+    "//ash/webui/resources:system_extensions_internals_resources_grit",
     "//ash/webui/scanning",
     "//ash/webui/scanning/mojom",
     "//ash/webui/shimless_rma",
diff --git a/chrome/browser/devtools/protocol/cast_handler.cc b/chrome/browser/devtools/protocol/cast_handler.cc
index 35cc831cac764d..1f8c9104165c10 100644
--- a/chrome/browser/devtools/protocol/cast_handler.cc
+++ b/chrome/browser/devtools/protocol/cast_handler.cc
@@ -49,9 +49,7 @@ class CastHandler::MediaRoutesObserver
   const std::vector<MediaRoute>& routes() const { return routes_; }
 
  private:
-  void OnRoutesUpdated(
-      const std::vector<MediaRoute>& routes,
-      const std::vector<MediaRoute::Id>& joinable_route_ids) override {
+  void OnRoutesUpdated(const std::vector<MediaRoute>& routes) override {
     routes_ = routes;
     update_callback_.Run();
   }
diff --git a/chrome/browser/devtools/protocol/cast_handler_unittest.cc b/chrome/browser/devtools/protocol/cast_handler_unittest.cc
index 67f8c1ee5f2886..0cff2824e52a9f 100644
--- a/chrome/browser/devtools/protocol/cast_handler_unittest.cc
+++ b/chrome/browser/devtools/protocol/cast_handler_unittest.cc
@@ -201,14 +201,14 @@ TEST_F(CastHandlerTest, StartTabMirroringWithInvalidName) {
 
 TEST_F(CastHandlerTest, StopCasting) {
   sinks_observer_->OnSinksUpdated({sink1, sink2}, {});
-  routes_observer_->OnRoutesUpdated({Route1()}, {});
+  routes_observer_->OnRoutesUpdated({Route1()});
   EXPECT_CALL(*router_, TerminateRoute(kRouteId1));
   EXPECT_TRUE(handler_->StopCasting(kSinkName1).IsSuccess());
 }
 
 TEST_F(CastHandlerTest, StopCastingWithInvalidName) {
   sinks_observer_->OnSinksUpdated({sink1, sink2}, {});
-  routes_observer_->OnRoutesUpdated({Route1()}, {});
+  routes_observer_->OnRoutesUpdated({Route1()});
   // Attempting to stop casting to a sink without a route should fail.
   EXPECT_TRUE(handler_->StopCasting(kSinkName2).IsError());
 }
diff --git a/chrome/browser/enterprise/reporting/report_generator_desktop.cc b/chrome/browser/enterprise/reporting/report_generator_desktop.cc
index cdd312efdad8d4..04bf1fd9c2e654 100644
--- a/chrome/browser/enterprise/reporting/report_generator_desktop.cc
+++ b/chrome/browser/enterprise/reporting/report_generator_desktop.cc
@@ -26,11 +26,10 @@ namespace enterprise_reporting {
 
 // TODO(crbug.com/1102047): Split up Chrome OS reporting code into its own
 // delegates, then move this method's implementation to ReportGeneratorChromeOS.
-void ReportGeneratorDesktop::SetAndroidAppInfos(
-    ReportGenerator::ReportRequest* basic_request) {
+void ReportGeneratorDesktop::SetAndroidAppInfos(ReportRequest* basic_request) {
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   DCHECK(basic_request);
-  basic_request->clear_android_app_infos();
+  basic_request->GetDeviceReportRequest().clear_android_app_infos();
 
   // Android application is only supported for primary profile.
   Profile* primary_profile =
@@ -51,8 +50,9 @@ void ReportGeneratorDesktop::SetAndroidAppInfos(
 
   AndroidAppInfoGenerator generator;
   for (std::string app_id : prefs->GetAppIds()) {
-    basic_request->mutable_android_app_infos()->AddAllocated(
-        generator.Generate(prefs, app_id).release());
+    basic_request->GetDeviceReportRequest()
+        .mutable_android_app_infos()
+        ->AddAllocated(generator.Generate(prefs, app_id).release());
   }
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 }
diff --git a/chrome/browser/enterprise/reporting/report_generator_desktop.h b/chrome/browser/enterprise/reporting/report_generator_desktop.h
index a27e09593d73fc..877e16058ce644 100644
--- a/chrome/browser/enterprise/reporting/report_generator_desktop.h
+++ b/chrome/browser/enterprise/reporting/report_generator_desktop.h
@@ -20,8 +20,7 @@ class ReportGeneratorDesktop : public ReportGenerator::Delegate {
   ~ReportGeneratorDesktop() override = default;
 
   // ReportGenerator::Delegate implementation.
-  void SetAndroidAppInfos(
-      ReportGenerator::ReportRequest* basic_request) override;
+  void SetAndroidAppInfos(ReportRequest* basic_request) override;
 };
 
 }  // namespace enterprise_reporting
diff --git a/chrome/browser/enterprise/reporting/report_generator_unittest.cc b/chrome/browser/enterprise/reporting/report_generator_unittest.cc
index 27170caf398bbc..7a002a8f2fde7a 100644
--- a/chrome/browser/enterprise/reporting/report_generator_unittest.cc
+++ b/chrome/browser/enterprise/reporting/report_generator_unittest.cc
@@ -20,7 +20,7 @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/account_id/account_id.h"
-#include "components/enterprise/browser/reporting/report_request_definition.h"
+#include "components/enterprise/browser/reporting/report_request.h"
 #include "components/enterprise/browser/reporting/report_type.h"
 #include "components/policy/core/common/cloud/cloud_policy_util.h"
 #include "content/public/common/webplugininfo.h"
@@ -155,8 +155,6 @@ void AddArcPackageAndApp(ArcAppTest* arc_app_test,
 
 class ReportGeneratorTest : public ::testing::Test {
  public:
-  using ReportRequest = definition::ReportRequest;
-
   ReportGeneratorTest()
       : generator_(&delegate_factory_),
         profile_manager_(TestingBrowserProcess::GetGlobal()) {}
@@ -233,16 +231,15 @@ class ReportGeneratorTest : public ::testing::Test {
     histogram_tester_ = std::make_unique<base::HistogramTester>();
     base::RunLoop run_loop;
     std::vector<std::unique_ptr<ReportRequest>> rets;
-    generator_.Generate(
-        report_type,
-        base::BindLambdaForTesting(
-            [&run_loop, &rets](ReportGenerator::ReportRequests requests) {
-              while (!requests.empty()) {
-                rets.push_back(std::move(requests.front()));
-                requests.pop();
-              }
-              run_loop.Quit();
-            }));
+    generator_.Generate(report_type,
+                        base::BindLambdaForTesting(
+                            [&run_loop, &rets](ReportRequestQueue requests) {
+                              while (!requests.empty()) {
+                                rets.push_back(std::move(requests.front()));
+                                requests.pop();
+                              }
+                              run_loop.Quit();
+                            }));
     run_loop.Run();
     if (report_type == ReportType::kFull)
       VerifyMetrics(rets);  // Only generated for reports with profiles.
@@ -331,27 +328,32 @@ TEST_F(ReportGeneratorTest, GenerateBasicReport) {
   // Verify the basic request
   auto* basic_request = requests[0].get();
 
-  EXPECT_NE(std::string(), basic_request->brand_name());
-  EXPECT_NE(std::string(), basic_request->device_model());
-  VerifySerialNumber(basic_request->serial_number());
+  EXPECT_NE(std::string(),
+            basic_request->GetDeviceReportRequest().brand_name());
+  EXPECT_NE(std::string(),
+            basic_request->GetDeviceReportRequest().device_model());
+  VerifySerialNumber(basic_request->GetDeviceReportRequest().serial_number());
 
-  EXPECT_EQ(
-      policy::GetBrowserDeviceIdentifier()->SerializePartialAsString(),
-      basic_request->browser_device_identifier().SerializePartialAsString());
+  EXPECT_EQ(policy::GetBrowserDeviceIdentifier()->SerializePartialAsString(),
+            basic_request->GetDeviceReportRequest()
+                .browser_device_identifier()
+                .SerializePartialAsString());
 
   // Verify the OS report
-  EXPECT_TRUE(basic_request->has_os_report());
-  auto& os_report = basic_request->os_report();
+  EXPECT_TRUE(basic_request->GetDeviceReportRequest().has_os_report());
+  auto& os_report = basic_request->GetDeviceReportRequest().os_report();
   EXPECT_NE(std::string(), os_report.name());
   EXPECT_NE(std::string(), os_report.arch());
   EXPECT_NE(std::string(), os_report.version());
 
   // Ensure there are no partial reports
-  EXPECT_EQ(0, basic_request->partial_report_types_size());
+  EXPECT_EQ(
+      0, basic_request->GetDeviceReportRequest().partial_report_types_size());
 
   // Verify the browser report
-  EXPECT_TRUE(basic_request->has_browser_report());
-  auto& browser_report = basic_request->browser_report();
+  EXPECT_TRUE(basic_request->GetDeviceReportRequest().has_browser_report());
+  auto& browser_report =
+      basic_request->GetDeviceReportRequest().browser_report();
   EXPECT_NE(std::string(), browser_report.browser_version());
   EXPECT_TRUE(browser_report.has_channel());
   EXPECT_NE(std::string(), browser_report.executable_path());
@@ -371,24 +373,29 @@ TEST_F(ReportGeneratorTest, GenerateBasicReport) {
   // In the ChromeOsUserReportRequest for Chrome OS, these fields are not
   // existing. Therefore, they are skipped according to current environment.
 #if !BUILDFLAG(IS_CHROMEOS_ASH)
-  EXPECT_NE(std::string(), basic_request->computer_name());
-  EXPECT_NE(std::string(), basic_request->os_user_name());
-  VerifySerialNumber(basic_request->serial_number());
-  EXPECT_EQ(
-      policy::GetBrowserDeviceIdentifier()->SerializePartialAsString(),
-      basic_request->browser_device_identifier().SerializePartialAsString());
-
-  EXPECT_TRUE(basic_request->has_os_report());
-  auto& os_report = basic_request->os_report();
+  EXPECT_NE(std::string(),
+            basic_request->GetDeviceReportRequest().computer_name());
+  EXPECT_NE(std::string(),
+            basic_request->GetDeviceReportRequest().os_user_name());
+  VerifySerialNumber(basic_request->GetDeviceReportRequest().serial_number());
+  EXPECT_EQ(policy::GetBrowserDeviceIdentifier()->SerializePartialAsString(),
+            basic_request->GetDeviceReportRequest()
+                .browser_device_identifier()
+                .SerializePartialAsString());
+
+  EXPECT_TRUE(basic_request->GetDeviceReportRequest().has_os_report());
+  auto& os_report = basic_request->GetDeviceReportRequest().os_report();
   EXPECT_NE(std::string(), os_report.name());
   EXPECT_NE(std::string(), os_report.arch());
   EXPECT_NE(std::string(), os_report.version());
 #endif
 
-  EXPECT_EQ(0, basic_request->partial_report_types_size());
+  EXPECT_EQ(
+      0, basic_request->GetDeviceReportRequest().partial_report_types_size());
 
-  EXPECT_TRUE(basic_request->has_browser_report());
-  auto& browser_report = basic_request->browser_report();
+  EXPECT_TRUE(basic_request->GetDeviceReportRequest().has_browser_report());
+  auto& browser_report =
+      basic_request->GetDeviceReportRequest().browser_report();
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   EXPECT_FALSE(browser_report.has_browser_version());
   EXPECT_FALSE(browser_report.has_channel());
@@ -426,19 +433,22 @@ TEST_F(ReportGeneratorTest, GenerateWithoutProfiles) {
   // In the ChromeOsUserReportRequest for Chrome OS, these fields are not
   // existing. Therefore, they are skipped according to current environment.
 #if !BUILDFLAG(IS_CHROMEOS_ASH)
-  EXPECT_NE(std::string(), basic_request->computer_name());
-  EXPECT_NE(std::string(), basic_request->os_user_name());
-  VerifySerialNumber(basic_request->serial_number());
-
-  EXPECT_TRUE(basic_request->has_os_report());
-  auto& os_report = basic_request->os_report();
+  EXPECT_NE(std::string(),
+            basic_request->GetDeviceReportRequest().computer_name());
+  EXPECT_NE(std::string(),
+            basic_request->GetDeviceReportRequest().os_user_name());
+  VerifySerialNumber(basic_request->GetDeviceReportRequest().serial_number());
+
+  EXPECT_TRUE(basic_request->GetDeviceReportRequest().has_os_report());
+  auto& os_report = basic_request->GetDeviceReportRequest().os_report();
   EXPECT_NE(std::string(), os_report.name());
   EXPECT_NE(std::string(), os_report.arch());
   EXPECT_NE(std::string(), os_report.version());
 #endif
 
-  EXPECT_TRUE(basic_request->has_browser_report());
-  auto& browser_report = basic_request->browser_report();
+  EXPECT_TRUE(basic_request->GetDeviceReportRequest().has_browser_report());
+  auto& browser_report =
+      basic_request->GetDeviceReportRequest().browser_report();
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   EXPECT_FALSE(browser_report.has_browser_version());
   EXPECT_FALSE(browser_report.has_channel());
@@ -487,10 +497,12 @@ TEST_F(ReportGeneratorTest, ReportArcAppInChromeOS) {
   EXPECT_EQ(1u, requests.size());
 
   ReportRequest* request = requests.front().get();
-  EXPECT_EQ(2, request->android_app_infos_size());
-  em::AndroidAppInfo app_info1 = request->android_app_infos(1);
+  EXPECT_EQ(2, request->GetDeviceReportRequest().android_app_infos_size());
+  em::AndroidAppInfo app_info1 =
+      request->GetDeviceReportRequest().android_app_infos(1);
   EXPECT_EQ(kArcAppName1, app_info1.app_name());
-  em::AndroidAppInfo app_info2 = request->android_app_infos(0);
+  em::AndroidAppInfo app_info2 =
+      request->GetDeviceReportRequest().android_app_infos(0);
   EXPECT_EQ(kArcAppName2, app_info2.app_name());
 
   // Generate the Arc application information again and make sure the report
@@ -499,10 +511,10 @@ TEST_F(ReportGeneratorTest, ReportArcAppInChromeOS) {
   EXPECT_EQ(1u, requests.size());
 
   request = requests.front().get();
-  EXPECT_EQ(2, request->android_app_infos_size());
-  app_info1 = request->android_app_infos(1);
+  EXPECT_EQ(2, request->GetDeviceReportRequest().android_app_infos_size());
+  app_info1 = request->GetDeviceReportRequest().android_app_infos(1);
   EXPECT_EQ(kArcAppName1, app_info1.app_name());
-  app_info2 = request->android_app_infos(0);
+  app_info2 = request->GetDeviceReportRequest().android_app_infos(0);
   EXPECT_EQ(kArcAppName2, app_info2.app_name());
 
   arc_app_test.TearDown();
@@ -528,7 +540,7 @@ TEST_F(ReportGeneratorTest, ArcPlayStoreDisabled) {
   EXPECT_EQ(1u, requests.size());
 
   ReportRequest* request = requests.front().get();
-  EXPECT_EQ(0, request->android_app_infos_size());
+  EXPECT_EQ(0, request->GetDeviceReportRequest().android_app_infos_size());
 
   arc_app_test.TearDown();
 }
diff --git a/chrome/browser/enterprise/reporting/report_request_queue_generator_unittest.cc b/chrome/browser/enterprise/reporting/report_request_queue_generator_unittest.cc
index 673bf2dc8680f6..801dd9639adf03 100644
--- a/chrome/browser/enterprise/reporting/report_request_queue_generator_unittest.cc
+++ b/chrome/browser/enterprise/reporting/report_request_queue_generator_unittest.cc
@@ -19,7 +19,7 @@
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/account_id/account_id.h"
 #include "components/enterprise/browser/reporting/browser_report_generator.h"
-#include "components/enterprise/browser/reporting/report_request_definition.h"
+#include "components/enterprise/browser/reporting/report_request.h"
 #include "components/policy/core/common/mock_policy_service.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/sync_preferences/pref_service_syncable.h"
@@ -54,8 +54,6 @@ const char kActiveProfileName2[] = "active_profile2";
 // move this file to components/enterprise/browser.
 class ReportRequestQueueGeneratorTest : public ::testing::Test {
  public:
-  using ReportRequest = definition::ReportRequest;
-
   ReportRequestQueueGeneratorTest()
       : profile_manager_(TestingBrowserProcess::GetGlobal()),
         browser_report_generator_(&reporting_delegate_factory_),
@@ -138,14 +136,15 @@ class ReportRequestQueueGeneratorTest : public ::testing::Test {
 #endif  // !defined(OS_ANDROID)
 
   std::unique_ptr<ReportRequest> GenerateBasicRequest() {
-    auto request = std::make_unique<ReportRequest>();
+    auto request = std::make_unique<ReportRequest>(ReportType::kFull);
     base::RunLoop run_loop;
 
     browser_report_generator_.Generate(
         ReportType::kFull,
         base::BindLambdaForTesting(
             [&run_loop, &request](std::unique_ptr<em::BrowserReport> report) {
-              request->set_allocated_browser_report(report.release()),
+              request->GetDeviceReportRequest().set_allocated_browser_report(
+                  report.release()),
                   run_loop.Quit();
             }));
 
@@ -244,7 +243,8 @@ TEST_F(ReportRequestQueueGeneratorTest, GenerateSingleReport) {
   auto requests = GenerateRequests(*basic_request);
   EXPECT_EQ(1u, requests.size());
 
-  VerifyProfiles(requests[0]->browser_report(), /*idle profiles*/ {},
+  VerifyProfiles(requests[0]->GetDeviceReportRequest().browser_report(),
+                 /*idle profiles*/ {},
                  /*active profiles*/ {kActiveProfileName1});
   histogram_tester()->ExpectBucketCount("Enterprise.CloudReportingRequestSize",
                                         /*report size floor to KB*/ 0, 1);
@@ -287,7 +287,7 @@ TEST_F(ReportRequestQueueGeneratorTest, ChromePoliciesCollection) {
   auto requests = GenerateRequests(*basic_request);
   EXPECT_EQ(1u, requests.size());
 
-  auto browser_report = requests[0]->browser_report();
+  auto browser_report = requests[0]->GetDeviceReportRequest().browser_report();
   EXPECT_EQ(1, browser_report.chrome_user_profile_infos_size());
 
   auto profile_info = browser_report.chrome_user_profile_infos(0);
@@ -312,7 +312,8 @@ TEST_F(ReportRequestQueueGeneratorTest, GenerateReport) {
   auto requests = GenerateRequests(*basic_request);
   EXPECT_EQ(1u, requests.size());
 
-  VerifyProfiles(requests[0]->browser_report(), idle_profile_names, {});
+  VerifyProfiles(requests[0]->GetDeviceReportRequest().browser_report(),
+                 idle_profile_names, {});
   histogram_tester()->ExpectBucketCount("Enterprise.CloudReportingRequestSize",
                                         /*report size floor to KB*/ 0, 1);
 }
@@ -324,8 +325,8 @@ TEST_F(ReportRequestQueueGeneratorTest, GenerateActiveProfiles) {
   auto requests = GenerateRequests(*basic_request);
   EXPECT_EQ(1u, requests.size());
 
-  VerifyProfiles(requests[0]->browser_report(), idle_profile_names,
-                 active_profile_names);
+  VerifyProfiles(requests[0]->GetDeviceReportRequest().browser_report(),
+                 idle_profile_names, active_profile_names);
   histogram_tester()->ExpectBucketCount("Enterprise.CloudReportingRequestSize",
                                         /*report size floor to KB*/ 0, 1);
 }
@@ -338,7 +339,8 @@ TEST_F(ReportRequestQueueGeneratorTest, ReportSeparation) {
 
   // Set the limitation just below the size of the report so that it needs to be
   // separated into two requests later.
-  SetAndVerifyMaximumRequestSize(requests[0]->ByteSizeLong() - 30);
+  SetAndVerifyMaximumRequestSize(
+      requests[0]->GetDeviceReportRequest().ByteSizeLong() - 30);
   requests = GenerateRequests(*basic_request);
   EXPECT_EQ(2u, requests.size());
 
@@ -356,11 +358,11 @@ TEST_F(ReportRequestQueueGeneratorTest, ReportSeparation) {
   // The first profile is activated in the first request only while the second
   // profile is activated in the second request.
   VerifyProfiles(
-      requests[0]->browser_report(),
+      requests[0]->GetDeviceReportRequest().browser_report(),
       {/* idle_profile_names */ expected_active_profiles_in_requests[1]},
       {/* active_profile_names */ expected_active_profiles_in_requests[0]});
   VerifyProfiles(
-      requests[1]->browser_report(),
+      requests[1]->GetDeviceReportRequest().browser_report(),
       {/* idle_profile_names */ expected_active_profiles_in_requests[0]},
       {/* active_profile_names */ expected_active_profiles_in_requests[1]});
   histogram_tester()->ExpectBucketCount("Enterprise.CloudReportingRequestSize",
@@ -374,7 +376,8 @@ TEST_F(ReportRequestQueueGeneratorTest, ProfileReportIsTooBig) {
   EXPECT_EQ(1u, requests.size());
 
   // Set the limitation just below the size of the report.
-  SetAndVerifyMaximumRequestSize(requests[0]->ByteSizeLong() - 30);
+  SetAndVerifyMaximumRequestSize(
+      requests[0]->GetDeviceReportRequest().ByteSizeLong() - 30);
 
   // Add a smaller Profile.
   CreateActiveProfile(kActiveProfileName2);
@@ -384,8 +387,8 @@ TEST_F(ReportRequestQueueGeneratorTest, ProfileReportIsTooBig) {
 
   // Only the second Profile is activated while the first one is too big to be
   // reported.
-  VerifyProfiles(requests[0]->browser_report(), {kActiveProfileName1},
-                 {kActiveProfileName2});
+  VerifyProfiles(requests[0]->GetDeviceReportRequest().browser_report(),
+                 {kActiveProfileName1}, {kActiveProfileName2});
   histogram_tester()->ExpectBucketCount("Enterprise.CloudReportingRequestSize",
                                         /*report size floor to KB*/ 0, 2);
 }
diff --git a/chrome/browser/enterprise/reporting/report_scheduler_unittest.cc b/chrome/browser/enterprise/reporting/report_scheduler_unittest.cc
index 455a04d34ec384..e8725802e16731 100644
--- a/chrome/browser/enterprise/reporting/report_scheduler_unittest.cc
+++ b/chrome/browser/enterprise/reporting/report_scheduler_unittest.cc
@@ -27,6 +27,7 @@
 #include "components/enterprise/browser/reporting/real_time_report_generator.h"
 #include "components/enterprise/browser/reporting/real_time_uploader.h"
 #include "components/enterprise/browser/reporting/report_generator.h"
+#include "components/enterprise/browser/reporting/report_request.h"
 #include "components/enterprise/common/proto/extensions_workflow_events.pb.h"
 #include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
 #include "components/reporting/client/report_queue_provider.h"
@@ -69,9 +70,9 @@ constexpr char kUploadTriggerMetricName[] =
 }  // namespace
 
 ACTION_P(ScheduleGeneratorCallback, request_number) {
-  ReportGenerator::ReportRequests requests;
+  ReportRequestQueue requests;
   for (int i = 0; i < request_number; i++)
-    requests.push(std::make_unique<ReportGenerator::ReportRequest>());
+    requests.push(std::make_unique<ReportRequest>(ReportType::kFull));
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::BindOnce(std::move(arg0), std::move(requests)));
 }
@@ -92,7 +93,7 @@ class MockReportGenerator : public ReportGenerator {
   }
   MOCK_METHOD2(OnGenerate,
                void(ReportType report_type, ReportCallback& callback));
-  MOCK_METHOD0(GenerateBasic, ReportRequests());
+  MOCK_METHOD0(GenerateBasic, ReportRequestQueue());
 };
 
 class MockReportUploader : public ReportUploader {
@@ -103,7 +104,7 @@ class MockReportUploader : public ReportUploader {
   MockReportUploader& operator=(const MockReportUploader&) = delete;
 
   ~MockReportUploader() override = default;
-  MOCK_METHOD2(SetRequestAndUpload, void(ReportRequests, ReportCallback));
+  MOCK_METHOD2(SetRequestAndUpload, void(ReportRequestQueue, ReportCallback));
 };
 
 class MockRealTimeReportGenerator : public RealTimeReportGenerator {
@@ -225,10 +226,10 @@ class ReportSchedulerTest : public ::testing::Test {
     }
   }
 
-  ReportGenerator::ReportRequests CreateRequests(int number) {
-    ReportGenerator::ReportRequests requests;
+  ReportRequestQueue CreateRequests(int number) {
+    ReportRequestQueue requests;
     for (int i = 0; i < number; i++)
-      requests.push(std::make_unique<ReportGenerator::ReportRequest>());
+      requests.push(std::make_unique<ReportRequest>(ReportType::kFull));
     return requests;
   }
 
@@ -559,7 +560,7 @@ TEST_F(ReportSchedulerTest, DeferredTimer) {
   // Hang on to the uploader's ReportCallback.
   ReportUploader::ReportCallback saved_callback;
   EXPECT_CALL(*uploader_, SetRequestAndUpload(_, _))
-      .WillOnce([&saved_callback](ReportUploader::ReportRequests requests,
+      .WillOnce([&saved_callback](ReportRequestQueue requests,
                                   ReportUploader::ReportCallback callback) {
         saved_callback = std::move(callback);
       });
diff --git a/chrome/browser/extensions/policy_handlers_unittest.cc b/chrome/browser/extensions/policy_handlers_unittest.cc
index a542285e790c89..970c4d22278e41 100644
--- a/chrome/browser/extensions/policy_handlers_unittest.cc
+++ b/chrome/browser/extensions/policy_handlers_unittest.cc
@@ -101,6 +101,9 @@ const char kSanitizedTestManagementPolicy5[] =
     "  },"
     "}";
 
+constexpr int kJsonParseOptions =
+    base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSON_ALLOW_TRAILING_COMMAS;
+
 TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) {
   base::ListValue list;
   policy::PolicyMap policy_map;
@@ -156,8 +159,8 @@ TEST(ExtensionSettingsPolicyHandlerTest, CheckPolicySettingsURL) {
   auto url_parses_successfully = [](const char* policy_template,
                                     const std::string& url) {
     std::string policy = base::StringPrintf(policy_template, url.c_str());
-    absl::optional<base::Value> policy_value = base::JSONReader::Read(
-        policy, base::JSONParserOptions::JSON_ALLOW_TRAILING_COMMAS);
+    absl::optional<base::Value> policy_value =
+        base::JSONReader::Read(policy, kJsonParseOptions);
     if (!policy_value)
       return false;
 
@@ -395,9 +398,8 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, ApplyPolicySettings) {
 
 TEST(ExtensionSettingsPolicyHandlerTest, CheckPolicySettings) {
   base::JSONReader::ValueWithError policy_result =
-      base::JSONReader::ReadAndReturnValueWithError(
-          kTestManagementPolicy1,
-          base::JSONParserOptions::JSON_ALLOW_TRAILING_COMMAS);
+      base::JSONReader::ReadAndReturnValueWithError(kTestManagementPolicy1,
+                                                    kJsonParseOptions);
   ASSERT_TRUE(policy_result.value) << policy_result.error_message;
 
   policy::Schema chrome_schema =
@@ -441,8 +443,8 @@ TEST(ExtensionSettingsPolicyHandlerTest, CheckPolicySettingsTooManyHosts) {
       base::StringPrintf(policy_template, urls.c_str(), urls.c_str());
 
   std::string error;
-  auto policy_value = base::JSONReader::ReadAndReturnValueWithError(
-      policy, base::JSONParserOptions::JSON_ALLOW_TRAILING_COMMAS);
+  auto policy_value =
+      base::JSONReader::ReadAndReturnValueWithError(policy, kJsonParseOptions);
   policy::Schema chrome_schema =
       policy::Schema::Wrap(policy::GetChromeSchemaData());
   policy::PolicyMap policy_map;
@@ -471,9 +473,8 @@ TEST(ExtensionSettingsPolicyHandlerTest, CheckPolicySettingsTooManyHosts) {
 TEST(ExtensionSettingsPolicyHandlerTest, ApplyPolicySettings) {
   // Mark as enterprise managed.
   base::JSONReader::ValueWithError policy_result =
-      base::JSONReader::ReadAndReturnValueWithError(
-          kTestManagementPolicy2,
-          base::JSONParserOptions::JSON_ALLOW_TRAILING_COMMAS);
+      base::JSONReader::ReadAndReturnValueWithError(kTestManagementPolicy2,
+                                                    kJsonParseOptions);
   ASSERT_TRUE(policy_result.value) << policy_result.error_message;
 
   policy::Schema chrome_schema =
@@ -499,15 +500,13 @@ TEST(ExtensionSettingsPolicyHandlerTest, DropInvalidKeys) {
   // the settings apply correctly.
 
   base::JSONReader::ValueWithError policy_result =
-      base::JSONReader::ReadAndReturnValueWithError(
-          kTestManagementPolicy5,
-          base::JSONParserOptions::JSON_ALLOW_TRAILING_COMMAS);
+      base::JSONReader::ReadAndReturnValueWithError(kTestManagementPolicy5,
+                                                    kJsonParseOptions);
   ASSERT_TRUE(policy_result.value) << policy_result.error_message;
 
   base::JSONReader::ValueWithError stripped_policy_result =
       base::JSONReader::ReadAndReturnValueWithError(
-          kSanitizedTestManagementPolicy5,
-          base::JSONParserOptions::JSON_ALLOW_TRAILING_COMMAS);
+          kSanitizedTestManagementPolicy5, kJsonParseOptions);
   ASSERT_TRUE(stripped_policy_result.value)
       << stripped_policy_result.error_message;
 
@@ -539,13 +538,11 @@ TEST(ExtensionSettingsPolicyHandlerTest, DropInvalidKeys) {
 TEST(ExtensionSettingsPolicyHandlerTest, NonManagedOffWebstoreExtension) {
   // Mark as not enterprise managed.
   auto policy_result = base::JSONReader::ReadAndReturnValueWithError(
-      kSensitiveTestManagementPolicy,
-      base::JSONParserOptions::JSON_ALLOW_TRAILING_COMMAS);
+      kSensitiveTestManagementPolicy, kJsonParseOptions);
   ASSERT_TRUE(policy_result.value) << policy_result.error_message;
 
   auto sanitized_policy_result = base::JSONReader::ReadAndReturnValueWithError(
-      kSanitizedTestManagementPolicy,
-      base::JSONParserOptions::JSON_ALLOW_TRAILING_COMMAS);
+      kSanitizedTestManagementPolicy, kJsonParseOptions);
   ASSERT_TRUE(sanitized_policy_result.value)
       << sanitized_policy_result.error_message;
 
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index d1a2524ac00b42..6c834ecdf42bb4 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -4351,6 +4351,15 @@
     "owners": [ "eokoyomon", "dullweber" ],
     "expiry_milestone": 97
   },
+  {
+    "name": "page-info-history-desktop",
+    "owners": [
+      "eokoyomon",
+      "dullweber",
+      "olesiamarukhno@google.com"
+    ],
+    "expiry_milestone": 102
+  },
   {
     "name": "page-info-store-info",
     "owners": [ "chrome-shopping@google.com" ],
@@ -5133,7 +5142,7 @@
   {
     "name": "smart-lock-ui-revamp",
     "owners": [ "cclem", "better-together-dev@google.com" ],
-    "expiry_milestone": 98
+    "expiry_milestone": 101
   },
   {
     "name": "smart-suggestion-for-large-downloads",
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 29431d34cd48b9..27e102df251d13 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -1928,6 +1928,10 @@ const char kPageInfoAboutThisSiteName[] =
 const char kPageInfoAboutThisSiteDescription[] =
     "Enable the 'About this site' section in the page info.";
 
+const char kPageInfoHistoryDesktopName[] = "Page info history";
+const char kPageInfoHistoryDesktopDescription[] =
+    "Enable a history section in the page info.";
+
 const char kParallelDownloadingName[] = "Parallel downloading";
 const char kParallelDownloadingDescription[] =
     "Enable parallel downloading to accelerate download speed.";
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 8fee41823a7965..5e7289a879eb55 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1103,6 +1103,9 @@ extern const char kPageContentAnnotationsDescription[];
 extern const char kPageInfoAboutThisSiteName[];
 extern const char kPageInfoAboutThisSiteDescription[];
 
+extern const char kPageInfoHistoryDesktopName[];
+extern const char kPageInfoHistoryDesktopDescription[];
+
 extern const char kParallelDownloadingName[];
 extern const char kParallelDownloadingDescription[];
 
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
index cf6b27d8cbc0f4..0b6cacb313cc5a 100644
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -139,7 +139,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
     &feed::kFeedImageMemoryCacheSizePercentage,
     &feed::kFeedInteractiveRefresh,
     &feed::kFeedLoadingPlaceholder,
-    &feed::kFeedSignInPromoDismiss,
     &feed::kInterestFeedContentSuggestions,
     &feed::kInterestFeedSpinnerAlwaysAnimate,
     &feed::kInterestFeedV1ClicksAndViewsConditionalUpload,
diff --git 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
index 417bb188b35932..15ba65d395cd9a 100644
--- 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
@@ -336,7 +336,6 @@ public static boolean getFieldTrialParamByFeatureAsBoolean(
     public static final String FEED_INTERACTIVE_REFRESH = "FeedInteractiveRefresh";
     public static final String FEED_LOADING_PLACEHOLDER = "FeedLoadingPlaceholder";
     public static final String FEED_RELIABILITY_LOGGING = "FeedReliabilityLogging";
-    public static final String FEED_SIGNIN_PROMO_DISMISS = "FeedSignInPromoDismiss";
     public static final String FILLING_PASSWORDS_FROM_ANY_ORIGIN = "FillingPasswordsFromAnyOrigin";
     public static final String FIXED_UMA_SESSION_RESUME_ORDER = "FixedUmaSessionResumeOrder";
     public static final String FOCUS_OMNIBOX_IN_INCOGNITO_TAB_INTENTS =
diff --git a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
index 70ec75c089423f..c9d9912d2a1b7c 100644
--- a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
+++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
@@ -166,18 +166,10 @@ void MediaRouterMojoImpl::OnSinksReceived(
 
 void MediaRouterMojoImpl::OnRoutesUpdated(
     mojom::MediaRouteProviderId provider_id,
-    const std::vector<MediaRoute>& routes,
-    const std::string& media_source,
-    const std::vector<std::string>& joinable_route_ids) {
+    const std::vector<MediaRoute>& routes) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  auto it = routes_queries_.find(media_source);
-  if (it == routes_queries_.end() || !it->second->HasObservers()) {
-    return;
-  }
-
-  auto* routes_query = it->second.get();
-  routes_query->SetRoutesForProvider(provider_id, routes, joinable_route_ids);
-  routes_query->NotifyObservers();
+  routes_query_.SetRoutesForProvider(provider_id, routes);
+  routes_query_.NotifyObservers();
 }
 
 void MediaRouterMojoImpl::RouteResponseReceived(
@@ -449,19 +441,9 @@ bool MediaRouterMojoImpl::MediaSinksQuery::HasObservers() const {
 
 void MediaRouterMojoImpl::MediaRoutesQuery::SetRoutesForProvider(
     mojom::MediaRouteProviderId provider_id,
-    const std::vector<MediaRoute>& routes,
-    const std::vector<MediaRoute::Id>& joinable_route_ids) {
+    const std::vector<MediaRoute>& routes) {
   providers_to_routes_[provider_id] = routes;
   UpdateCachedRouteList();
-
-  providers_to_joinable_routes_[provider_id] = joinable_route_ids;
-  joinable_route_ids_.clear();
-  for (const auto& provider_to_joinable_routes :
-       providers_to_joinable_routes_) {
-    joinable_route_ids_.insert(joinable_route_ids_.end(),
-                               provider_to_joinable_routes.second.begin(),
-                               provider_to_joinable_routes.second.end());
-  }
 }
 
 bool MediaRouterMojoImpl::MediaRoutesQuery::AddRouteForProvider(
@@ -493,8 +475,7 @@ void MediaRouterMojoImpl::MediaRoutesQuery::AddObserver(
     MediaRoutesObserver* observer) {
   observers_.AddObserver(observer);
   observer->OnRoutesUpdated(
-      cached_route_list_.value_or(std::vector<MediaRoute>()),
-      joinable_route_ids_);
+      cached_route_list_.value_or(std::vector<MediaRoute>()));
 }
 
 void MediaRouterMojoImpl::MediaRoutesQuery::RemoveObserver(
@@ -505,8 +486,7 @@ void MediaRouterMojoImpl::MediaRoutesQuery::RemoveObserver(
 void MediaRouterMojoImpl::MediaRoutesQuery::NotifyObservers() {
   for (auto& observer : observers_) {
     observer.OnRoutesUpdated(
-        cached_route_list_.value_or(std::vector<MediaRoute>()),
-        joinable_route_ids_);
+        cached_route_list_.value_or(std::vector<MediaRoute>()));
   }
 }
 
@@ -576,77 +556,40 @@ void MediaRouterMojoImpl::UnregisterMediaSinksObserver(
 void MediaRouterMojoImpl::RegisterMediaRoutesObserver(
     MediaRoutesObserver* observer) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  const MediaSource::Id source_id = observer->source_id();
-  auto& routes_query = routes_queries_[source_id];
-  bool is_new_query = false;
-  if (!routes_query) {
-    is_new_query = true;
-    routes_query = std::make_unique<MediaRoutesQuery>();
-  } else {
-    DCHECK(!routes_query->HasObserver(observer));
-  }
+  bool is_first_observer = !routes_query_.HasObservers();
+  if (!is_first_observer)
+    DCHECK(!routes_query_.HasObserver(observer));
 
-  routes_query->AddObserver(observer);
-  if (is_new_query) {
-    for (const auto& provider : media_route_providers_)
-      provider.second->StartObservingMediaRoutes(source_id);
-    // The MRPs will call MediaRouterMojoImpl::OnRoutesUpdated() soon, if there
-    // are any existing routes the new observer should be aware of.
-  } else if (routes_query->cached_route_list()) {
+  routes_query_.AddObserver(observer);
+  if (is_first_observer) {
+    for (const auto& provider : media_route_providers_) {
+      provider.second->StartObservingMediaRoutes();
+      // The MRPs will call MediaRouterMojoImpl::OnRoutesUpdated() soon, if
+      // there are any existing routes the new observer should be aware of.
+    }
+  } else {
     // Return to the event loop before notifying of a cached route list because
     // MediaRoutesObserver is calling this method from its constructor, and that
     // must complete before invoking its virtual OnRoutesUpdated() method.
     content::GetUIThreadTaskRunner({})->PostTask(
         FROM_HERE,
         base::BindOnce(&MediaRouterMojoImpl::NotifyOfExistingRoutesIfRegistered,
-                       weak_factory_.GetWeakPtr(), source_id, observer));
+                       weak_factory_.GetWeakPtr(), observer));
   }
 }
 
 void MediaRouterMojoImpl::NotifyOfExistingRoutesIfRegistered(
-    const MediaSource::Id& source_id,
     MediaRoutesObserver* observer) const {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
-  // Check that the route query still exists with a cached result, and that the
-  // observer is still registered. Otherwise, there is nothing to report to the
-  // observer.
-  const auto it = routes_queries_.find(source_id);
-  if (it == routes_queries_.end() || !it->second->cached_route_list() ||
-      !it->second->HasObserver(observer)) {
-    return;
+  if (routes_query_.HasObserver(observer)) {
+    observer->OnRoutesUpdated(
+        routes_query_.cached_route_list().value_or(std::vector<MediaRoute>{}));
   }
-
-  observer->OnRoutesUpdated(*it->second->cached_route_list(),
-                            it->second->joinable_route_ids());
 }
 
 void MediaRouterMojoImpl::UnregisterMediaRoutesObserver(
     MediaRoutesObserver* observer) {
-  const MediaSource::Id source_id = observer->source_id();
-  auto it = routes_queries_.find(source_id);
-  if (it == routes_queries_.end() || !it->second->HasObserver(observer)) {
-    return;
-  }
-
-  // If we are removing the final observer for the source, then stop
-  // observing routes for it.
-  // HasObservers() is reliable here on the assumption that this call
-  // is not inside the ObserverList iteration.
-  it->second->RemoveObserver(observer);
-  if (!it->second->HasObservers()) {
-    for (const auto& provider : media_route_providers_) {
-      if (!provider.second) {
-        // The provider somehow not existing may be the cause of the crash at
-        // crbug.com/1200786.
-        NOTREACHED() << "Provider is null: "
-                     << ProviderIdToString(provider.first);
-        continue;
-      }
-      provider.second->StopObservingMediaRoutes(source_id);
-    }
-    routes_queries_.erase(source_id);
-  }
+  routes_query_.RemoveObserver(observer);
 }
 
 void MediaRouterMojoImpl::RegisterRouteMessageObserver(
@@ -741,16 +684,8 @@ void MediaRouterMojoImpl::OnTerminateRouteResult(
 
 void MediaRouterMojoImpl::OnRouteAdded(mojom::MediaRouteProviderId provider_id,
                                        const MediaRoute& route) {
-  // |routes_queries_| might be added during the iteration. Making a
-  // copy here to avoid the iterator from being invalidated.
-  std::vector<MediaRoutesQuery*> queries;
-  for (auto& routes_query : routes_queries_) {
-    if (routes_query.second->AddRouteForProvider(provider_id, route))
-      queries.push_back(routes_query.second.get());
-  }
-  for (auto* query : queries) {
-    query->NotifyObservers();
-  }
+  routes_query_.AddRouteForProvider(provider_id, route);
+  routes_query_.NotifyObservers();
 }
 
 void MediaRouterMojoImpl::SyncStateToMediaRouteProvider(
@@ -763,9 +698,9 @@ void MediaRouterMojoImpl::SyncStateToMediaRouteProvider(
     provider->StartObservingMediaSinks(it.first);
   }
 
-  // Route queries.
-  for (const auto& it : routes_queries_)
-    provider->StartObservingMediaRoutes(it.first);
+  // Route updates.
+  if (routes_query_.HasObservers())
+    provider->StartObservingMediaRoutes();
 
   // Route messages.
   for (const auto& it : message_observers_)
@@ -856,17 +791,14 @@ void MediaRouterMojoImpl::BindToMojoReceiver(
 
 absl::optional<mojom::MediaRouteProviderId>
 MediaRouterMojoImpl::GetProviderIdForRoute(const MediaRoute::Id& route_id) {
-  for (const auto& routes_query : routes_queries_) {
-    MediaRoutesQuery* query = routes_query.second.get();
-    for (const auto& provider_to_routes : query->providers_to_routes()) {
-      const mojom::MediaRouteProviderId provider_id = provider_to_routes.first;
-      const std::vector<MediaRoute>& routes = provider_to_routes.second;
-      if (std::find_if(routes.begin(), routes.end(),
-                       [&route_id](const MediaRoute& route) {
-                         return route.media_route_id() == route_id;
-                       }) != routes.end()) {
-        return provider_id;
-      }
+  for (const auto& provider_to_routes : routes_query_.providers_to_routes()) {
+    const mojom::MediaRouteProviderId provider_id = provider_to_routes.first;
+    const std::vector<MediaRoute>& routes = provider_to_routes.second;
+    if (std::find_if(routes.begin(), routes.end(),
+                     [&route_id](const MediaRoute& route) {
+                       return route.media_route_id() == route_id;
+                     }) != routes.end()) {
+      return provider_id;
     }
   }
   return absl::nullopt;
@@ -883,18 +815,15 @@ MediaRouterMojoImpl::GetProviderIdForSink(const MediaSink::Id& sink_id) {
 absl::optional<mojom::MediaRouteProviderId>
 MediaRouterMojoImpl::GetProviderIdForPresentation(
     const std::string& presentation_id) {
-  for (const auto& routes_query : routes_queries_) {
-    MediaRoutesQuery* query = routes_query.second.get();
-    for (const auto& provider_to_routes : query->providers_to_routes()) {
-      const mojom::MediaRouteProviderId provider_id = provider_to_routes.first;
-      const std::vector<MediaRoute>& routes = provider_to_routes.second;
-      auto pred = [&presentation_id](const MediaRoute& route) {
-        return route.presentation_id() == presentation_id;
-      };
-      DCHECK_LE(std::count_if(routes.begin(), routes.end(), pred), 1);
-      if (std::find_if(routes.begin(), routes.end(), pred) != routes.end()) {
-        return provider_id;
-      }
+  for (const auto& provider_to_routes : routes_query_.providers_to_routes()) {
+    const mojom::MediaRouteProviderId provider_id = provider_to_routes.first;
+    const std::vector<MediaRoute>& routes = provider_to_routes.second;
+    auto pred = [&presentation_id](const MediaRoute& route) {
+      return route.presentation_id() == presentation_id;
+    };
+    DCHECK_LE(std::count_if(routes.begin(), routes.end(), pred), 1);
+    if (std::find_if(routes.begin(), routes.end(), pred) != routes.end()) {
+      return provider_id;
     }
   }
   return absl::nullopt;
diff --git a/chrome/browser/media/router/mojo/media_router_mojo_impl.h b/chrome/browser/media/router/mojo/media_router_mojo_impl.h
index 43d4b705fba1a0..01cfffd91fef5d 100644
--- a/chrome/browser/media/router/mojo/media_router_mojo_impl.h
+++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.h
@@ -205,6 +205,10 @@ class MediaRouterMojoImpl : public MediaRouterBase, public mojom::MediaRouter {
 
   // Represents a query to the MediaRouteProviders for media routes and caches
   // media routes returned by MRPs. Holds observers for the query.
+  //
+  // NOTE: If the to-do below for providers_for_routes_ is fixed, then this
+  // entire class can be replaced with a std::vector<MediaRoute> and a
+  // base::ObserverList of observers.
   class MediaRoutesQuery {
    public:
     MediaRoutesQuery();
@@ -214,12 +218,9 @@ class MediaRouterMojoImpl : public MediaRouterBase, public mojom::MediaRouter {
 
     ~MediaRoutesQuery();
 
-    // Caches the list of routes and joinable route IDs for the provider
-    // returned from the query.
-    void SetRoutesForProvider(
-        mojom::MediaRouteProviderId provider_id,
-        const std::vector<MediaRoute>& routes,
-        const std::vector<MediaRoute::Id>& joinable_route_ids);
+    // Caches the list of routes for the provider returned from the query.
+    void SetRoutesForProvider(mojom::MediaRouteProviderId provider_id,
+                              const std::vector<MediaRoute>& routes);
 
     // Adds |route| to the list of routes managed by the provider and returns
     // true, if it hasn't been added already. Returns false otherwise.
@@ -239,26 +240,20 @@ class MediaRouterMojoImpl : public MediaRouterBase, public mojom::MediaRouter {
     const absl::optional<std::vector<MediaRoute>>& cached_route_list() const {
       return cached_route_list_;
     }
-    const std::vector<MediaRoute::Id>& joinable_route_ids() const {
-      return joinable_route_ids_;
-    }
     const base::flat_map<mojom::MediaRouteProviderId, std::vector<MediaRoute>>&
     providers_to_routes() const {
       return providers_to_routes_;
     }
 
    private:
-    // Cached list of routes and joinable route IDs for the query.
+    // Cached list of routes for the query.
     absl::optional<std::vector<MediaRoute>> cached_route_list_;
-    std::vector<MediaRoute::Id> joinable_route_ids_;
 
-    // Per-MRP lists of routes and joinable route IDs for the query.
-    // TODO(crbug.com/761493): Consider making MRP ID an attribute
-    // of MediaRoute, so that we can simplify these into vectors.
+    // Per-MRP lists of routes for the query.
+    // TODO(crbug.com/761493): Consider making MRP ID an attribute of
+    // MediaRoute, so that we can simplify these into vectors.
     base::flat_map<mojom::MediaRouteProviderId, std::vector<MediaRoute>>
         providers_to_routes_;
-    base::flat_map<mojom::MediaRouteProviderId, std::vector<MediaRoute::Id>>
-        providers_to_joinable_routes_;
 
     base::ObserverList<MediaRoutesObserver>::Unchecked observers_;
   };
@@ -281,16 +276,12 @@ class MediaRouterMojoImpl : public MediaRouterBase, public mojom::MediaRouter {
 
   // Notifies |observer| of any existing cached routes, if it is still
   // registered.
-  void NotifyOfExistingRoutesIfRegistered(const MediaSource::Id& source_id,
-                                          MediaRoutesObserver* observer) const;
+  void NotifyOfExistingRoutesIfRegistered(MediaRoutesObserver* observer) const;
 
   // mojom::MediaRouter implementation.
   void OnIssue(const IssueInfo& issue) override;
-  void OnRoutesUpdated(
-      mojom::MediaRouteProviderId provider_id,
-      const std::vector<MediaRoute>& routes,
-      const std::string& media_source,
-      const std::vector<std::string>& joinable_route_ids) override;
+  void OnRoutesUpdated(mojom::MediaRouteProviderId provider_id,
+                       const std::vector<MediaRoute>& routes) override;
   void OnPresentationConnectionStateChanged(
       const std::string& route_id,
       blink::mojom::PresentationConnectionState state) override;
@@ -385,8 +376,9 @@ class MediaRouterMojoImpl : public MediaRouterBase, public mojom::MediaRouter {
   base::flat_map<MediaSource::Id, std::unique_ptr<MediaSinksQuery>>
       sinks_queries_;
 
-  base::flat_map<MediaSource::Id, std::unique_ptr<MediaRoutesQuery>>
-      routes_queries_;
+  // Holds observers for media route updates and a map of providers to route
+  // ids..
+  MediaRoutesQuery routes_query_;
 
   using RouteMessageObserverList =
       base::ObserverList<RouteMessageObserver>::Unchecked;
diff --git a/chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc b/chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc
index 0ab267f47b6c3a..3fbafdf3a3771f 100644
--- a/chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc
+++ b/chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc
@@ -61,6 +61,7 @@ using testing::ReturnRef;
 using testing::SaveArg;
 using testing::Sequence;
 using testing::SizeIs;
+using testing::StrictMock;
 using testing::UnorderedElementsAre;
 using testing::Unused;
 using testing::WithArg;
@@ -77,8 +78,6 @@ const char kTabSourceOne[] = "urn:x-org.chromium.media:source:tab:1";
 const char kTabSourceTwo[] = "urn:x-org.chromium.media:source:tab:2";
 const char kRouteId[] = "routeId";
 const char kRouteId2[] = "routeId2";
-const char kJoinableRouteId[] = "joinableRouteId";
-const char kJoinableRouteId2[] = "joinableRouteId2";
 const char kSinkId[] = "sink";
 const char kSinkId2[] = "sink2";
 const char kSinkName[] = "sinkName";
@@ -191,11 +190,8 @@ class MediaRouterMojoImplTest : public MediaRouterMojoTest {
   }
 
   void UpdateRoutes(mojom::MediaRouteProviderId provider_id,
-                    const std::vector<MediaRoute>& routes,
-                    const std::string& media_source,
-                    const std::vector<std::string>& joinable_route_ids) {
-    router()->OnRoutesUpdated(provider_id, routes, media_source,
-                              joinable_route_ids);
+                    const std::vector<MediaRoute>& routes) {
+    router()->OnRoutesUpdated(provider_id, routes);
   }
 
   void RecordPresentationRequestUrlBySink(
@@ -229,7 +225,9 @@ TEST_F(MediaRouterMojoImplTest, CreateRoute) {
 TEST_F(MediaRouterMojoImplTest, RouteRecognizedAfterCreation) {
   MockMediaRoutesObserver routes_observer(router());
 
-  EXPECT_CALL(routes_observer, OnRoutesUpdated(SizeIs(1), _));
+  EXPECT_CALL(routes_observer, OnRoutesUpdated(SizeIs(0)));
+  EXPECT_CALL(routes_observer, OnRoutesUpdated(SizeIs(1)));
+
   // TestCreateRoute() does not explicitly call OnRoutesUpdated() on the router.
   TestCreateRoute();
   base::RunLoop().RunUntilIdle();
@@ -356,8 +354,7 @@ TEST_F(MediaRouterMojoImplTest, IncognitoRoutesTerminatedOnProfileShutdown) {
                         nullptr, base::DoNothing(),
                         base::Milliseconds(kTimeoutMillis), true);
   const std::vector<MediaRoute> routes{route};
-  UpdateRoutes(mojom::MediaRouteProviderId::CAST, routes, std::string(),
-               std::vector<std::string>());
+  UpdateRoutes(mojom::MediaRouteProviderId::CAST, routes);
 
   // TODO(mfoltz): Where possible, convert other tests to use RunUntilIdle
   // instead of manually calling Run/Quit on the run loop.
@@ -399,8 +396,7 @@ TEST_F(MediaRouterMojoImplTest, JoinRouteTimedOutFails) {
   // Make sure the MR has received an update with the route, so it knows there
   // is a route to join.
   const std::vector<MediaRoute> routes{CreateMediaRoute()};
-  UpdateRoutes(mojom::MediaRouteProviderId::CAST, routes, std::string(),
-               std::vector<std::string>());
+  UpdateRoutes(mojom::MediaRouteProviderId::CAST, routes);
   EXPECT_TRUE(router()->HasJoinableRoute());
 
   EXPECT_CALL(mock_cast_provider_,
@@ -436,8 +432,7 @@ TEST_F(MediaRouterMojoImplTest, JoinRouteIncognitoMismatchFails) {
   // Make sure the MR has received an update with the route, so it knows there
   // is a route to join.
   const std::vector<MediaRoute> routes{route};
-  UpdateRoutes(mojom::MediaRouteProviderId::CAST, routes, std::string(),
-               std::vector<std::string>());
+  UpdateRoutes(mojom::MediaRouteProviderId::CAST, routes);
   EXPECT_TRUE(router()->HasJoinableRoute());
 
   // Use a lambda function as an invocation target here to work around
@@ -646,51 +641,19 @@ TEST_F(MediaRouterMojoImplTest, TabSinksObserverIsShared) {
 
 TEST_F(MediaRouterMojoImplTest, RegisterAndUnregisterMediaRoutesObserver) {
   MockMediaRouter mock_router;
-  MediaSource media_source(kSource);
-  MediaSource different_media_source(kSource2);
-  EXPECT_CALL(mock_cast_provider_, StartObservingMediaRoutes(media_source.id()))
-      .Times(1);
-  EXPECT_CALL(mock_cast_provider_,
-              StartObservingMediaRoutes(different_media_source.id()))
-      .Times(1);
 
   MediaRoutesObserver* observer_captured;
   EXPECT_CALL(mock_router, RegisterMediaRoutesObserver(_))
       .Times(3)
       .WillRepeatedly(SaveArg<0>(&observer_captured));
-  NiceMock<MockMediaRoutesObserver> routes_observer(&mock_router,
-                                                    media_source.id());
+  MockMediaRoutesObserver routes_observer(&mock_router);
   EXPECT_EQ(observer_captured, &routes_observer);
-  NiceMock<MockMediaRoutesObserver> extra_routes_observer(&mock_router,
-                                                          media_source.id());
-  EXPECT_EQ(observer_captured, &extra_routes_observer);
-  NiceMock<MockMediaRoutesObserver> different_routes_observer(
-      &mock_router, different_media_source.id());
-  EXPECT_EQ(observer_captured, &different_routes_observer);
-  RegisterMediaRoutesObserver(&routes_observer);
-  RegisterMediaRoutesObserver(&extra_routes_observer);
-  RegisterMediaRoutesObserver(&different_routes_observer);
 
-  std::vector<MediaRoute> expected_routes{
-      MediaRoute(kRouteId, media_source, kSinkId, kDescription, false, false)};
+  MockMediaRoutesObserver extra_routes_observer(&mock_router);
+  EXPECT_EQ(observer_captured, &extra_routes_observer);
 
-  MediaRoute incognito_expected_route(kRouteId2, media_source, kSinkId,
-                                      kDescription, false, false);
-  incognito_expected_route.set_off_the_record(true);
-  expected_routes.emplace_back(incognito_expected_route);
-
-  const std::vector<MediaRoute::Id> kExpectedJoinableRouteIds{
-      kJoinableRouteId, kJoinableRouteId2};
-  EXPECT_CALL(routes_observer,
-              OnRoutesUpdated(expected_routes, kExpectedJoinableRouteIds));
-  EXPECT_CALL(extra_routes_observer,
-              OnRoutesUpdated(expected_routes, kExpectedJoinableRouteIds));
-  EXPECT_CALL(different_routes_observer,
-              OnRoutesUpdated(expected_routes, kExpectedJoinableRouteIds))
-      .Times(0);
-  UpdateRoutes(mojom::MediaRouteProviderId::CAST, expected_routes,
-               media_source.id(), kExpectedJoinableRouteIds);
-  base::RunLoop().RunUntilIdle();
+  MockMediaRoutesObserver different_routes_observer(&mock_router);
+  EXPECT_EQ(observer_captured, &different_routes_observer);
 
   EXPECT_CALL(mock_router, UnregisterMediaRoutesObserver(&routes_observer));
   EXPECT_CALL(mock_router,
@@ -700,62 +663,35 @@ TEST_F(MediaRouterMojoImplTest, RegisterAndUnregisterMediaRoutesObserver) {
   UnregisterMediaRoutesObserver(&routes_observer);
   UnregisterMediaRoutesObserver(&extra_routes_observer);
   UnregisterMediaRoutesObserver(&different_routes_observer);
-  EXPECT_CALL(mock_cast_provider_, StopObservingMediaRoutes(media_source.id()))
-      .Times(1);
-  EXPECT_CALL(mock_cast_provider_,
-              StopObservingMediaRoutes(different_media_source.id()));
-  base::RunLoop().RunUntilIdle();
 }
 
-// Tests that multiple MediaRoutesObservers having the same query do not cause
-// extra calls to providers because the OnRoutesUpdated() results are cached.
-TEST_F(MediaRouterMojoImplTest, RegisterMediaRoutesObserver_DedupingWithCache) {
-  const MediaSource media_source = MediaSource(kSource);
-  const std::vector<MediaRoute> kExpectedRoutes{
+TEST_F(MediaRouterMojoImplTest, RegisteredObserversGetMediaRouteUpdates) {
+  StrictMock<MockMediaRoutesObserver> routes_observer(router());
+  StrictMock<MockMediaRoutesObserver> extra_routes_observer(router());
+  StrictMock<MockMediaRoutesObserver> different_routes_observer(router());
+
+  MediaSource media_source(kSource);
+  std::vector<MediaRoute> expected_routes{
       MediaRoute(kRouteId, media_source, kSinkId, kDescription, false, false)};
-  const std::vector<MediaRoute::Id> kExpectedJoinableRouteIds{kJoinableRouteId};
 
-  Sequence sequence;
+  MediaRoute incognito_expected_route(kRouteId2, media_source, kSinkId,
+                                      kDescription, false, false);
+  incognito_expected_route.set_off_the_record(true);
+  expected_routes.push_back(incognito_expected_route);
 
-  // Creating the first observer will ask the provider to start observing routes
-  // having source |kSource|. The provider will respond with the existing route.
-  EXPECT_CALL(mock_cast_provider_, StartObservingMediaRoutes(media_source.id()))
+  EXPECT_CALL(routes_observer, OnRoutesUpdated(expected_routes)).Times(1);
+  EXPECT_CALL(extra_routes_observer, OnRoutesUpdated(expected_routes)).Times(1);
+  EXPECT_CALL(different_routes_observer, OnRoutesUpdated(expected_routes))
       .Times(1);
-  auto observer1 =
-      std::make_unique<MockMediaRoutesObserver>(router(), media_source.id());
-  base::RunLoop().RunUntilIdle();
-  EXPECT_CALL(*observer1,
-              OnRoutesUpdated(kExpectedRoutes, kExpectedJoinableRouteIds))
-      .Times(1);
-  UpdateRoutes(mojom::MediaRouteProviderId::CAST, kExpectedRoutes,
-               media_source.id(), kExpectedJoinableRouteIds);
-  base::RunLoop().RunUntilIdle();
 
-  // Creating two more observers will not make calls to the provider. Instead,
-  // the cached route list will be returned.
-  auto observer2 =
-      std::make_unique<MockMediaRoutesObserver>(router(), media_source.id());
-  auto observer3 =
-      std::make_unique<MockMediaRoutesObserver>(router(), media_source.id());
-  EXPECT_CALL(*observer2,
-              OnRoutesUpdated(kExpectedRoutes, kExpectedJoinableRouteIds))
-      .Times(1);
-  EXPECT_CALL(*observer3,
-              OnRoutesUpdated(kExpectedRoutes, kExpectedJoinableRouteIds))
-      .Times(1);
-  base::RunLoop().RunUntilIdle();
+  UpdateRoutes(mojom::MediaRouteProviderId::CAST, expected_routes);
 
-  // Kill 2 of three observers, and expect nothing happens at the provider.
-  observer1.reset();
-  observer2.reset();
-  base::RunLoop().RunUntilIdle();
+  UnregisterMediaRoutesObserver(&routes_observer);
+  UnregisterMediaRoutesObserver(&extra_routes_observer);
+  UnregisterMediaRoutesObserver(&different_routes_observer);
 
-  // Kill the final observer, and expect the provider to be told to stop
-  // observing.
-  EXPECT_CALL(mock_cast_provider_, StopObservingMediaRoutes(media_source.id()))
-      .Times(1);
-  observer3.reset();
-  base::RunLoop().RunUntilIdle();
+  // No route observers should be notified.
+  UpdateRoutes(mojom::MediaRouteProviderId::CAST, expected_routes);
 }
 
 TEST_F(MediaRouterMojoImplTest, SendRouteMessage) {
@@ -947,7 +883,7 @@ TEST_F(MediaRouterMojoImplTest, GetMediaController) {
   MockMediaStatusObserver mock_observer(
       observer_remote.InitWithNewPipeAndPassReceiver());
   mojo::Remote<mojom::MediaStatusObserver> observer_remote_held_by_controller;
-  UpdateRoutes(mojom::MediaRouteProviderId::CAST, {CreateMediaRoute()}, "", {});
+  UpdateRoutes(mojom::MediaRouteProviderId::CAST, {CreateMediaRoute()});
 
   EXPECT_CALL(mock_cast_provider_,
               CreateMediaRouteControllerInternal(kRouteId, _, _, _))
@@ -1096,33 +1032,26 @@ TEST_F(MediaRouterMojoImplTest, ObserveRoutesFromMultipleProviders) {
   const MediaRoute route2a("route2a", source, "sink 2a", "", true, true);
   const MediaRoute route2b("route2b", source, "sink 2b", "", true, true);
   RegisterWiredDisplayProvider();
-  MockMediaRoutesObserver observer(router(), kSource);
+  MockMediaRoutesObserver observer(router());
 
   // Have the Cast MRP report routes.
   EXPECT_CALL(observer,
-              OnRoutesUpdated(UnorderedElementsAre(route1a, route1b),
-                              UnorderedElementsAre(route1a.media_route_id())));
-  UpdateRoutes(mojom::MediaRouteProviderId::CAST, {route1a, route1b}, kSource,
-               {route1a.media_route_id()});
+              OnRoutesUpdated(UnorderedElementsAre(route1a, route1b)));
+  UpdateRoutes(mojom::MediaRouteProviderId::CAST, {route1a, route1b});
 
   // Have the wired display MRP report routes.
-  EXPECT_CALL(
-      observer,
-      OnRoutesUpdated(UnorderedElementsAre(route1a, route1b, route2a, route2b),
-                      UnorderedElementsAre(route1a.media_route_id(),
-                                           route2a.media_route_id())));
-  UpdateRoutes(mojom::MediaRouteProviderId::WIRED_DISPLAY, {route2a, route2b},
-               kSource, {route2a.media_route_id()});
+  EXPECT_CALL(observer, OnRoutesUpdated(UnorderedElementsAre(
+                            route1a, route1b, route2a, route2b)));
+  UpdateRoutes(mojom::MediaRouteProviderId::WIRED_DISPLAY, {route2a, route2b});
 
   // Have the Cast MRP report an empty list of routes.
   EXPECT_CALL(observer,
-              OnRoutesUpdated(UnorderedElementsAre(route2a, route2b),
-                              UnorderedElementsAre(route2a.media_route_id())));
-  UpdateRoutes(mojom::MediaRouteProviderId::CAST, {}, kSource, {});
+              OnRoutesUpdated(UnorderedElementsAre(route2a, route2b)));
+  UpdateRoutes(mojom::MediaRouteProviderId::CAST, {});
 
   // Have the wired display MRP report an empty list of routes.
-  EXPECT_CALL(observer, OnRoutesUpdated(IsEmpty(), IsEmpty()));
-  UpdateRoutes(mojom::MediaRouteProviderId::WIRED_DISPLAY, {}, kSource, {});
+  EXPECT_CALL(observer, OnRoutesUpdated(IsEmpty()));
+  UpdateRoutes(mojom::MediaRouteProviderId::WIRED_DISPLAY, {});
 }
 
 TEST_F(MediaRouterMojoImplTest, TestRecordPresentationRequestUrlBySink) {
diff --git a/chrome/browser/media/router/providers/cast/cast_activity_manager.cc b/chrome/browser/media/router/providers/cast/cast_activity_manager.cc
index e79e281bd03034..2e6f6c031222dc 100644
--- a/chrome/browser/media/router/providers/cast/cast_activity_manager.cc
+++ b/chrome/browser/media/router/providers/cast/cast_activity_manager.cc
@@ -82,19 +82,6 @@ CastActivityManager::~CastActivityManager() {
   session_tracker_->RemoveObserver(this);
 }
 
-void CastActivityManager::AddRouteQuery(const MediaSource::Id& source) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  route_queries_.insert(source);
-  std::vector<MediaRoute> routes = GetRoutes();
-  if (!routes.empty())
-    NotifyOnRoutesUpdated(source, routes);
-}
-
-void CastActivityManager::RemoveRouteQuery(const MediaSource::Id& source) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  route_queries_.erase(source);
-}
-
 void CastActivityManager::LaunchSession(
     const CastMediaSource& cast_source,
     const MediaSinkInternal& sink,
@@ -762,17 +749,7 @@ std::vector<MediaRoute> CastActivityManager::GetRoutes() const {
 
 void CastActivityManager::NotifyAllOnRoutesUpdated() {
   std::vector<MediaRoute> routes = GetRoutes();
-  for (const auto& source_id : route_queries_)
-    NotifyOnRoutesUpdated(source_id, routes);
-}
-
-void CastActivityManager::NotifyOnRoutesUpdated(
-    const MediaSource::Id& source_id,
-    const std::vector<MediaRoute>& routes) {
-  // Note: joinable_route_ids is empty as we are deprecating the join feature
-  // in the Harmony UI.
-  media_router_->OnRoutesUpdated(mojom::MediaRouteProviderId::CAST, routes,
-                                 source_id, std::vector<MediaRoute::Id>());
+  media_router_->OnRoutesUpdated(mojom::MediaRouteProviderId::CAST, routes);
 }
 
 void CastActivityManager::HandleLaunchSessionResponse(
diff --git a/chrome/browser/media/router/providers/cast/cast_activity_manager.h b/chrome/browser/media/router/providers/cast/cast_activity_manager.h
index 003f05763c980a..444b748178d978 100644
--- a/chrome/browser/media/router/providers/cast/cast_activity_manager.h
+++ b/chrome/browser/media/router/providers/cast/cast_activity_manager.h
@@ -74,13 +74,6 @@ class CastActivityManager : public CastActivityManagerBase,
                       const std::string& hash_token);
   ~CastActivityManager() override;
 
-  // Adds or removes a route query with |source|. When adding a route query, if
-  // the current list of routes is non-empty, the query will be immediately
-  // updated with the current list.
-  // TODO(https://crbug.com/882481): Simplify the route query API.
-  void AddRouteQuery(const MediaSource::Id& source);
-  void RemoveRouteQuery(const MediaSource::Id& source);
-
   // Launches a Cast session with parameters given by |cast_source| to |sink|.
   // Returns the created MediaRoute and notifies existing route queries.
   void LaunchSession(const CastMediaSource& cast_source,
@@ -110,6 +103,7 @@ class CastActivityManager : public CastActivityManagerBase,
 
   const MediaRoute* GetRoute(const MediaRoute::Id& route_id) const;
   std::vector<MediaRoute> GetRoutes() const;
+  void NotifyAllOnRoutesUpdated();
   CastSessionTracker* GetCastSessionTracker() const { return session_tracker_; }
 
   // cast_channel::CastMessageHandler::Observer overrides.
@@ -226,10 +220,6 @@ class CastActivityManager : public CastActivityManagerBase,
       blink::mojom::PresentationConnectionState state,
       blink::mojom::PresentationConnectionCloseReason close_reason);
 
-  void NotifyAllOnRoutesUpdated();
-  void NotifyOnRoutesUpdated(const MediaSource::Id& source_id,
-                             const std::vector<MediaRoute>& routes);
-
   void HandleLaunchSessionResponse(
       DoLaunchSessionParams params,
       cast_channel::LaunchSessionResponse response);
@@ -286,8 +276,6 @@ class CastActivityManager : public CastActivityManagerBase,
 
   static CastActivityFactoryForTest* cast_activity_factory_for_test_;
 
-  base::flat_set<MediaSource::Id> route_queries_;
-
   // This map contains all activities--both presentation activities and
   // mirroring activities.
   ActivityMap activities_;
diff --git a/chrome/browser/media/router/providers/cast/cast_activity_manager_unittest.cc b/chrome/browser/media/router/providers/cast/cast_activity_manager_unittest.cc
index 1988ca8901db08..123a52a9a3901b 100644
--- a/chrome/browser/media/router/providers/cast/cast_activity_manager_unittest.cc
+++ b/chrome/browser/media/router/providers/cast/cast_activity_manager_unittest.cc
@@ -179,9 +179,6 @@ class CastActivityManagerTest : public testing::Test,
         }));
 
     RunUntilIdle();
-
-    // Make sure we get route updates.
-    manager_->AddRouteQuery(route_query_);
   }
 
   void TearDown() override {
@@ -445,9 +442,8 @@ class CastActivityManagerTest : public testing::Test,
   // optionally be saved in the variable pointed to by |route_ptr|.
   void ExpectSingleRouteUpdate() {
     updated_route_ = absl::nullopt;
-    EXPECT_CALL(mock_router_,
-                OnRoutesUpdated(mojom::MediaRouteProviderId::CAST,
-                                ElementsAre(_), route_query_, IsEmpty()))
+    EXPECT_CALL(mock_router_, OnRoutesUpdated(mojom::MediaRouteProviderId::CAST,
+                                              ElementsAre(_)))
         .WillOnce(WithArg<1>(
             [this](const auto& routes) { updated_route_ = routes[0]; }));
   }
@@ -456,8 +452,7 @@ class CastActivityManagerTest : public testing::Test,
   void ExpectEmptyRouteUpdate() {
     updated_route_ = absl::nullopt;
     EXPECT_CALL(mock_router_,
-                OnRoutesUpdated(mojom::MediaRouteProviderId::CAST, IsEmpty(),
-                                route_query_, IsEmpty()))
+                OnRoutesUpdated(mojom::MediaRouteProviderId::CAST, IsEmpty()))
         .Times(1);
   }
 
diff --git a/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc b/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc
index 7db822020cc70a..341c1cd6777b82 100644
--- a/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc
+++ b/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc
@@ -231,16 +231,9 @@ void CastMediaRouteProvider::StopObservingMediaSinks(
   sink_queries_.erase(media_source);
 }
 
-void CastMediaRouteProvider::StartObservingMediaRoutes(
-    const std::string& media_source) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  activity_manager_->AddRouteQuery(media_source);
-}
-
-void CastMediaRouteProvider::StopObservingMediaRoutes(
-    const std::string& media_source) {
+void CastMediaRouteProvider::StartObservingMediaRoutes() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  activity_manager_->RemoveRouteQuery(media_source);
+  activity_manager_->NotifyAllOnRoutesUpdated();
 }
 
 void CastMediaRouteProvider::StartListeningForRouteMessages(
diff --git a/chrome/browser/media/router/providers/cast/cast_media_route_provider.h b/chrome/browser/media/router/providers/cast/cast_media_route_provider.h
index db0d40cf1155a2..76d69532be7903 100644
--- a/chrome/browser/media/router/providers/cast/cast_media_route_provider.h
+++ b/chrome/browser/media/router/providers/cast/cast_media_route_provider.h
@@ -76,8 +76,7 @@ class CastMediaRouteProvider : public mojom::MediaRouteProvider {
                               const std::vector<uint8_t>& data) override;
   void StartObservingMediaSinks(const std::string& media_source) override;
   void StopObservingMediaSinks(const std::string& media_source) override;
-  void StartObservingMediaRoutes(const std::string& media_source) override;
-  void StopObservingMediaRoutes(const std::string& media_source) override;
+  void StartObservingMediaRoutes() override;
   void StartListeningForRouteMessages(const std::string& route_id) override;
   void StopListeningForRouteMessages(const std::string& route_id) override;
   void DetachRoute(const std::string& route_id) override;
diff --git a/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc b/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc
index 206a21fd81ed33..31c9da07b9222f 100644
--- a/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc
+++ b/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc
@@ -507,16 +507,12 @@ void DialMediaRouteProvider::HandleStopAppResult(
 
 void DialMediaRouteProvider::NotifyAllOnRoutesUpdated() {
   auto routes = activity_manager_->GetRoutes();
-  for (const auto& query : media_route_queries_)
-    NotifyOnRoutesUpdated(query, routes);
+  NotifyOnRoutesUpdated(routes);
 }
 
 void DialMediaRouteProvider::NotifyOnRoutesUpdated(
-    const MediaSource::Id& source_id,
     const std::vector<MediaRoute>& routes) {
-  media_router_->OnRoutesUpdated(mojom::MediaRouteProviderId::DIAL, routes,
-                                 source_id,
-                                 /* joinable_route_ids */ {});
+  media_router_->OnRoutesUpdated(mojom::MediaRouteProviderId::DIAL, routes);
 }
 
 void DialMediaRouteProvider::SendRouteBinaryMessage(
@@ -580,19 +576,11 @@ void DialMediaRouteProvider::StopObservingMediaSinks(
     media_sink_queries_.erase(sink_query_it);
 }
 
-void DialMediaRouteProvider::StartObservingMediaRoutes(
-    const std::string& media_source) {
-  media_route_queries_.insert(media_source);
-
+void DialMediaRouteProvider::StartObservingMediaRoutes() {
   // Return current set of routes.
   auto routes = activity_manager_->GetRoutes();
   if (!routes.empty())
-    NotifyOnRoutesUpdated(media_source, routes);
-}
-
-void DialMediaRouteProvider::StopObservingMediaRoutes(
-    const std::string& media_source) {
-  media_route_queries_.erase(media_source);
+    NotifyOnRoutesUpdated(routes);
 }
 
 void DialMediaRouteProvider::StartListeningForRouteMessages(
diff --git a/chrome/browser/media/router/providers/dial/dial_media_route_provider.h b/chrome/browser/media/router/providers/dial/dial_media_route_provider.h
index d055cf24a17859..88ef3f95413003 100644
--- a/chrome/browser/media/router/providers/dial/dial_media_route_provider.h
+++ b/chrome/browser/media/router/providers/dial/dial_media_route_provider.h
@@ -91,8 +91,7 @@ class DialMediaRouteProvider : public mojom::MediaRouteProvider,
                               const std::vector<uint8_t>& data) override;
   void StartObservingMediaSinks(const std::string& media_source) override;
   void StopObservingMediaSinks(const std::string& media_source) override;
-  void StartObservingMediaRoutes(const std::string& media_source) override;
-  void StopObservingMediaRoutes(const std::string& media_source) override;
+  void StartObservingMediaRoutes() override;
   void StartListeningForRouteMessages(const std::string& route_id) override;
   void StopListeningForRouteMessages(const std::string& route_id) override;
   void DetachRoute(const std::string& route_id) override;
@@ -171,8 +170,7 @@ class DialMediaRouteProvider : public mojom::MediaRouteProvider,
                            const absl::optional<std::string>& message,
                            RouteRequestResult::ResultCode result_code);
   void NotifyAllOnRoutesUpdated();
-  void NotifyOnRoutesUpdated(const MediaSource::Id& source_id,
-                             const std::vector<MediaRoute>& routes);
+  void NotifyOnRoutesUpdated(const std::vector<MediaRoute>& routes);
 
   // Returns a list of valid origins for |app_name|. Returns an empty list if
   // all origins are valid.
diff --git a/chrome/browser/media/router/providers/dial/dial_media_route_provider_unittest.cc b/chrome/browser/media/router/providers/dial/dial_media_route_provider_unittest.cc
index 7b7b22da0cc916..d2b045ac7fb2d6 100644
--- a/chrome/browser/media/router/providers/dial/dial_media_route_provider_unittest.cc
+++ b/chrome/browser/media/router/providers/dial/dial_media_route_provider_unittest.cc
@@ -112,7 +112,7 @@ class DialMediaRouteProviderTest : public ::testing::Test {
 
     // Observe media routes in order for DialMediaRouteProvider to send back
     // route updates.
-    provider_->StartObservingMediaRoutes(MediaSource::Id());
+    provider_->StartObservingMediaRoutes();
   }
 
   void TearDown() override { provider_.reset(); }
@@ -148,7 +148,7 @@ class DialMediaRouteProviderTest : public ::testing::Test {
 
     // DialMediaRouteProvider doesn't send route list update following
     // CreateRoute, but MR will add the route returned in the response.
-    EXPECT_CALL(mock_router_, OnRoutesUpdated(_, _, _, _)).Times(0);
+    EXPECT_CALL(mock_router_, OnRoutesUpdated(_, _)).Times(0);
     provider_->CreateRoute(
         source_id, sink_id, presentation_id, origin_, 1, base::TimeDelta(),
         /* off_the_record */ false,
@@ -287,7 +287,7 @@ class DialMediaRouteProviderTest : public ::testing::Test {
     loader_factory_.AddResponse(app_launch_url_, std::move(response_head), "",
                                 network::URLLoaderCompletionStatus());
     std::vector<MediaRoute> routes;
-    EXPECT_CALL(mock_router_, OnRoutesUpdated(_, Not(IsEmpty()), _, IsEmpty()))
+    EXPECT_CALL(mock_router_, OnRoutesUpdated(_, Not(IsEmpty())))
         .WillOnce(SaveArg<1>(&routes));
     base::RunLoop().RunUntilIdle();
 
@@ -363,7 +363,7 @@ class DialMediaRouteProviderTest : public ::testing::Test {
         mock_router_,
         OnPresentationConnectionStateChanged(
             route_id, blink::mojom::PresentationConnectionState::TERMINATED));
-    EXPECT_CALL(mock_router_, OnRoutesUpdated(_, IsEmpty(), _, IsEmpty()));
+    EXPECT_CALL(mock_router_, OnRoutesUpdated(_, IsEmpty()));
     base::RunLoop().RunUntilIdle();
 
     ASSERT_EQ(1u, received_messages.size());
@@ -386,7 +386,7 @@ class DialMediaRouteProviderTest : public ::testing::Test {
     EXPECT_CALL(*this,
                 OnTerminateRoute(_, testing::Ne(RouteRequestResult::OK)));
     EXPECT_CALL(mock_router_, OnRouteMessagesReceived(_, _));
-    EXPECT_CALL(mock_router_, OnRoutesUpdated(_, _, _, _)).Times(1);
+    EXPECT_CALL(mock_router_, OnRoutesUpdated(_, _)).Times(1);
     EXPECT_CALL(*mock_sink_service_.app_discovery_service(),
                 DoFetchDialAppInfo(_, _));
     provider_->TerminateRoute(
diff --git a/chrome/browser/media/router/providers/test/test_media_route_provider.cc b/chrome/browser/media/router/providers/test/test_media_route_provider.cc
index 7754a825244794..365419956cc3ca 100644
--- a/chrome/browser/media/router/providers/test/test_media_route_provider.cc
+++ b/chrome/browser/media/router/providers/test/test_media_route_provider.cc
@@ -101,8 +101,7 @@ void TestMediaRouteProvider::CreateRoute(const std::string& media_source,
 
     media_router_->OnPresentationConnectionStateChanged(
         route_id, blink::mojom::PresentationConnectionState::CONNECTED);
-    media_router_->OnRoutesUpdated(kProviderId, GetMediaRoutes(), media_source,
-                                   {});
+    media_router_->OnRoutesUpdated(kProviderId, GetMediaRoutes());
     std::move(callback).Run(routes_[route_id], nullptr, absl::nullopt,
                             RouteRequestResult::ResultCode::OK);
   }
@@ -160,9 +159,7 @@ void TestMediaRouteProvider::TerminateRoute(const std::string& route_id,
   routes_.erase(it);
   media_router_->OnPresentationConnectionStateChanged(
       route_id, blink::mojom::PresentationConnectionState::TERMINATED);
-  media_router_->OnRoutesUpdated(
-      kProviderId, GetMediaRoutes(),
-      MediaRoute::GetMediaSourceIdFromMediaRouteId(route_id), {});
+  media_router_->OnRoutesUpdated(kProviderId, GetMediaRoutes());
   std::move(callback).Run(absl::nullopt, RouteRequestResult::OK);
 }
 
@@ -176,9 +173,7 @@ void TestMediaRouteProvider::SendRouteMessage(const std::string& media_route_id,
         media_route_id,
         blink::mojom::PresentationConnectionCloseReason::CONNECTION_ERROR,
         "Send error. Closing connection.");
-    media_router_->OnRoutesUpdated(
-        kProviderId, GetMediaRoutes(),
-        MediaRoute::GetMediaSourceIdFromMediaRouteId(media_route_id), {});
+    media_router_->OnRoutesUpdated(kProviderId, GetMediaRoutes());
   } else {
     std::string response = "Pong: " + message;
     std::vector<mojom::RouteMessagePtr> messages;
@@ -205,11 +200,7 @@ void TestMediaRouteProvider::StartObservingMediaSinks(
 void TestMediaRouteProvider::StopObservingMediaSinks(
     const std::string& media_source) {}
 
-void TestMediaRouteProvider::StartObservingMediaRoutes(
-    const std::string& media_source) {}
-
-void TestMediaRouteProvider::StopObservingMediaRoutes(
-    const std::string& media_source) {}
+void TestMediaRouteProvider::StartObservingMediaRoutes() {}
 
 void TestMediaRouteProvider::StartListeningForRouteMessages(
     const std::string& route_id) {}
@@ -257,6 +248,10 @@ void TestMediaRouteProvider::CaptureOffScreenTab(
   offscreen_tab_->Start(source_urn, gfx::Size(180, 180), presentation_id);
 }
 
+bool TestMediaRouteProvider::HasRoutes() const {
+  return !routes_.empty();
+}
+
 void TestMediaRouteProvider::TearDown() {
   // An OffscreenTab observes its Profile*, and must be destroyed before
   // Profiles.
diff --git a/chrome/browser/media/router/providers/test/test_media_route_provider.h b/chrome/browser/media/router/providers/test/test_media_route_provider.h
index d9acb9e61ff5d7..c33644d83397f4 100644
--- a/chrome/browser/media/router/providers/test/test_media_route_provider.h
+++ b/chrome/browser/media/router/providers/test/test_media_route_provider.h
@@ -56,8 +56,7 @@ class TestMediaRouteProvider : public mojom::MediaRouteProvider,
                               const std::vector<uint8_t>& data) override;
   void StartObservingMediaSinks(const std::string& media_source) override;
   void StopObservingMediaSinks(const std::string& media_source) override;
-  void StartObservingMediaRoutes(const std::string& media_source) override;
-  void StopObservingMediaRoutes(const std::string& media_source) override;
+  void StartObservingMediaRoutes() override;
   void StartListeningForRouteMessages(const std::string& route_id) override;
   void StopListeningForRouteMessages(const std::string& route_id) override;
   void DetachRoute(const std::string& route_id) override;
@@ -99,6 +98,9 @@ class TestMediaRouteProvider : public mojom::MediaRouteProvider,
   void CaptureOffScreenTab(content::WebContents* web_contents,
                            GURL source_urn,
                            std::string& presentation_id);
+
+  bool HasRoutes() const;
+
   void TearDown();
 
  private:
diff --git a/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc b/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc
index a168be87649bbd..fae1a369a8b766 100644
--- a/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc
+++ b/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc
@@ -188,18 +188,12 @@ void WiredDisplayMediaRouteProvider::StopObservingMediaSinks(
   sink_queries_.erase(media_source);
 }
 
-void WiredDisplayMediaRouteProvider::StartObservingMediaRoutes(
-    const std::string& media_source) {
-  route_queries_.insert(media_source);
+void WiredDisplayMediaRouteProvider::StartObservingMediaRoutes() {
   std::vector<MediaRoute> route_list;
   for (const auto& presentation : presentations_)
     route_list.push_back(presentation.second.route());
-  media_router_->OnRoutesUpdated(kProviderId, route_list, media_source, {});
-}
 
-void WiredDisplayMediaRouteProvider::StopObservingMediaRoutes(
-    const std::string& media_source) {
-  route_queries_.erase(media_source);
+  media_router_->OnRoutesUpdated(kProviderId, route_list);
 }
 
 void WiredDisplayMediaRouteProvider::StartListeningForRouteMessages(
@@ -327,8 +321,8 @@ void WiredDisplayMediaRouteProvider::NotifyRouteObservers() const {
   std::vector<MediaRoute> route_list;
   for (const auto& presentation : presentations_)
     route_list.push_back(presentation.second.route());
-  for (const auto& route_query : route_queries_)
-    media_router_->OnRoutesUpdated(kProviderId, route_list, route_query, {});
+
+  media_router_->OnRoutesUpdated(kProviderId, route_list);
 }
 
 void WiredDisplayMediaRouteProvider::NotifySinkObservers() {
diff --git a/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.h b/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.h
index b86cdf4be56fae..3e05bf49456d65 100644
--- a/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.h
+++ b/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.h
@@ -80,8 +80,7 @@ class WiredDisplayMediaRouteProvider : public mojom::MediaRouteProvider,
                               const std::vector<uint8_t>& data) override;
   void StartObservingMediaSinks(const std::string& media_source) override;
   void StopObservingMediaSinks(const std::string& media_source) override;
-  void StartObservingMediaRoutes(const std::string& media_source) override;
-  void StopObservingMediaRoutes(const std::string& media_source) override;
+  void StartObservingMediaRoutes() override;
   void StartListeningForRouteMessages(const std::string& route_id) override;
   void StopListeningForRouteMessages(const std::string& route_id) override;
   void DetachRoute(const std::string& route_id) override;
@@ -196,9 +195,6 @@ class WiredDisplayMediaRouteProvider : public mojom::MediaRouteProvider,
   // Map from presentation IDs to active presentations managed by this provider.
   std::map<std::string, Presentation> presentations_;
 
-  // A set of MediaSource IDs associated with queries for MediaRoute updates.
-  base::flat_set<std::string> route_queries_;
-
   // A set of MediaSource IDs associated with queries for MediaSink updates.
   base::flat_set<std::string> sink_queries_;
 
diff --git a/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider_unittest.cc b/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider_unittest.cc
index a27c939785b5b8..e1d875e798a8ec 100644
--- a/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider_unittest.cc
+++ b/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider_unittest.cc
@@ -308,7 +308,7 @@ TEST_F(WiredDisplayMediaRouteProviderTest, CreateAndTerminateRoute) {
   MockCallback callback;
 
   provider_->set_all_displays({secondary_display1_, primary_display_});
-  provider_remote_->StartObservingMediaRoutes(kPresentationSource);
+  provider_remote_->StartObservingMediaRoutes();
   base::RunLoop().RunUntilIdle();
 
   // Create a route for |presentation_id|.
@@ -320,8 +320,7 @@ TEST_F(WiredDisplayMediaRouteProviderTest, CreateAndTerminateRoute) {
             EXPECT_EQ(route->media_route_id(), presentation_id);
             EXPECT_EQ(route->description(), "Presenting (www.example.com)");
           })));
-  EXPECT_CALL(router_,
-              OnRoutesUpdated(kProviderId, _, kPresentationSource, IsEmpty()))
+  EXPECT_CALL(router_, OnRoutesUpdated(kProviderId, _))
       .WillOnce(WithArg<1>(
           Invoke([&presentation_id](const std::vector<MediaRoute>& routes) {
             EXPECT_EQ(routes.size(), 1u);
@@ -352,8 +351,7 @@ TEST_F(WiredDisplayMediaRouteProviderTest, CreateAndTerminateRoute) {
 
   // The presentation should not be removed until the receiver's termination
   // callback is called.
-  EXPECT_CALL(router_, OnRoutesUpdated(kProviderId, IsEmpty(),
-                                       kPresentationSource, IsEmpty()));
+  EXPECT_CALL(router_, OnRoutesUpdated(kProviderId, IsEmpty()));
   receiver_creator_.receiver()->RunTerminationCallback();
 }
 
@@ -363,7 +361,7 @@ TEST_F(WiredDisplayMediaRouteProviderTest, SendMediaStatusUpdate) {
   NiceMock<MockCallback> callback;
 
   provider_->set_all_displays({secondary_display1_, primary_display_});
-  provider_remote_->StartObservingMediaRoutes(kPresentationSource);
+  provider_remote_->StartObservingMediaRoutes();
   base::RunLoop().RunUntilIdle();
 
   // Create a route for |presentation_id|.
@@ -393,7 +391,7 @@ TEST_F(WiredDisplayMediaRouteProviderTest, SendMediaStatusUpdate) {
 TEST_F(WiredDisplayMediaRouteProviderTest, ExitFullscreenOnDisplayRemoved) {
   NiceMock<MockCallback> callback;
   provider_->set_all_displays({secondary_display1_, primary_display_});
-  provider_remote_->StartObservingMediaRoutes(kPresentationSource);
+  provider_remote_->StartObservingMediaRoutes();
   base::RunLoop().RunUntilIdle();
 
   provider_remote_->CreateRoute(
diff --git a/chrome/browser/media/router/test/media_router_mojo_test.cc b/chrome/browser/media/router/test/media_router_mojo_test.cc
index 14f8dec48a4139..8a22726186dc74 100644
--- a/chrome/browser/media/router/test/media_router_mojo_test.cc
+++ b/chrome/browser/media/router/test/media_router_mojo_test.cc
@@ -142,10 +142,10 @@ void MediaRouterMojoTest::ProvideTestRoute(
     mojom::MediaRouteProviderId provider_id,
     const MediaRoute::Id& route_id) {
   if (!routes_observer_)
-    routes_observer_ = std::make_unique<MediaRoutesObserver>(router(), kSource);
+    routes_observer_ = std::make_unique<MediaRoutesObserver>(router());
   MediaRoute route = CreateMediaRoute();
   route.set_media_route_id(route_id);
-  router()->OnRoutesUpdated(provider_id, {route}, kSource, {});
+  router()->OnRoutesUpdated(provider_id, {route});
 }
 
 void MediaRouterMojoTest::ProvideTestSink(
@@ -211,8 +211,7 @@ void MediaRouterMojoTest::TestJoinRoute(const std::string& presentation_id) {
   // is a route to join.
   std::vector<MediaRoute> routes;
   routes.push_back(route);
-  router()->OnRoutesUpdated(mojom::MediaRouteProviderId::CAST, routes,
-                            std::string(), std::vector<std::string>());
+  router()->OnRoutesUpdated(mojom::MediaRouteProviderId::CAST, routes);
   EXPECT_TRUE(router()->HasJoinableRoute());
 
   // Use a lambda function as an invocation target here to work around
diff --git a/chrome/browser/media/router/test/media_router_mojo_test.h b/chrome/browser/media/router/test/media_router_mojo_test.h
index 0bdc2bf97f3d7a..0dca0dc5a5d374 100644
--- a/chrome/browser/media/router/test/media_router_mojo_test.h
+++ b/chrome/browser/media/router/test/media_router_mojo_test.h
@@ -103,8 +103,7 @@ class MockMediaRouteProvider : public mojom::MediaRouteProvider {
                void(const std::string& route_id));
   MOCK_METHOD1(OnPresentationSessionDetached,
                void(const std::string& route_id));
-  MOCK_METHOD1(StartObservingMediaRoutes, void(const std::string& source));
-  MOCK_METHOD1(StopObservingMediaRoutes, void(const std::string& source));
+  MOCK_METHOD0(StartObservingMediaRoutes, void());
   MOCK_METHOD0(EnableMdnsDiscovery, void());
   MOCK_METHOD1(UpdateMediaSinks, void(const std::string& source));
   void CreateMediaRouteController(
diff --git a/chrome/browser/media/router/test/mock_mojo_media_router.h b/chrome/browser/media/router/test/mock_mojo_media_router.h
index b03932fd35975c..dc08246a73bbc3 100644
--- a/chrome/browser/media/router/test/mock_mojo_media_router.h
+++ b/chrome/browser/media/router/test/mock_mojo_media_router.h
@@ -36,11 +36,9 @@ class MockMojoMediaRouter : public MockMediaRouter, public mojom::MediaRouter {
                     const std::string& media_source,
                     const std::vector<MediaSinkInternal>& internal_sinks,
                     const std::vector<url::Origin>& origins));
-  MOCK_METHOD4(OnRoutesUpdated,
+  MOCK_METHOD2(OnRoutesUpdated,
                void(mojom::MediaRouteProviderId provider_id,
-                    const std::vector<MediaRoute>& routes,
-                    const std::string& media_source,
-                    const std::vector<std::string>& joinable_route_ids));
+                    const std::vector<MediaRoute>& routes));
   MOCK_METHOD2(OnPresentationConnectionStateChanged,
                void(const std::string& route_id,
                     blink::mojom::PresentationConnectionState state));
diff --git a/chrome/browser/metrics/first_web_contents_profiler.cc b/chrome/browser/metrics/first_web_contents_profiler.cc
index e7066db2804440..50bfe5afaa128c 100644
--- a/chrome/browser/metrics/first_web_contents_profiler.cc
+++ b/chrome/browser/metrics/first_web_contents_profiler.cc
@@ -14,78 +14,40 @@
 #include "base/memory/memory_pressure_monitor.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/time/time.h"
-#include "build/build_config.h"
-#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/metrics/first_web_contents_profiler_base.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "components/startup_metric_utils/browser/startup_metric_utils.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
-#include "content/public/browser/navigation_handle.h"
-#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_observer.h"
 
+namespace metrics {
 namespace {
 
-// Reasons for which profiling is deemed complete. Logged in UMA (do not re-
-// order or re-assign).
-enum class FinishReason {
-  // All metrics were successfully gathered.
-  kDone = 0,
-  // Abandon if blocking UI was shown during startup.
-  kAbandonBlockingUI = 1,
-  // Abandon if the WebContents is hidden (lowers scheduling priority).
-  kAbandonContentHidden = 2,
-  // Abandon if the WebContents is destroyed.
-  kAbandonContentDestroyed = 3,
-  // Abandon if the WebContents navigates away from its initial page, as it:
-  //   (1) is no longer a fair timing; and
-  //   (2) can cause http://crbug.com/525209 where the first paint didn't fire
-  //       for the initial content but fires after a lot of idle time when the
-  //       user finally navigates to another page that does trigger it.
-  kAbandonNewNavigation = 4,
-  // Abandon if the WebContents fails to load (e.g. network error, etc.).
-  kAbandonNavigationError = 5,
-  // Abandon if no WebContents was visible at the beginning of startup
-  kAbandonNoInitiallyVisibleContent = 6,
-  kMaxValue = kAbandonNoInitiallyVisibleContent
-};
-
-void RecordFinishReason(FinishReason finish_reason) {
+void RecordFirstWebContentsFinishReason(
+    StartupProfilingFinishReason finish_reason) {
   base::UmaHistogramEnumeration("Startup.FirstWebContents.FinishReason",
                                 finish_reason);
 }
 
-// Note: Instances of this class self destroy when the first non-empty paint
-// happens, or when an event prevents it from being recorded.
-class FirstWebContentsProfiler : public content::WebContentsObserver {
+class FirstWebContentsProfiler : public FirstWebContentsProfilerBase {
  public:
   explicit FirstWebContentsProfiler(content::WebContents* web_contents);
 
   FirstWebContentsProfiler(const FirstWebContentsProfiler&) = delete;
   FirstWebContentsProfiler& operator=(const FirstWebContentsProfiler&) = delete;
 
+ protected:
+  // FirstWebContentsProfilerBase:
+  void RecordFinishReason(StartupProfilingFinishReason finish_reason) override;
+  void RecordNavigationFinished(base::TimeTicks navigation_start) override;
+  void RecordFirstNonEmptyPaint() override;
+  bool WasStartupInterrupted() override;
+
  private:
   ~FirstWebContentsProfiler() override = default;
 
-  // content::WebContentsObserver:
-  void DidStartNavigation(
-      content::NavigationHandle* navigation_handle) override;
-  void DidFinishNavigation(
-      content::NavigationHandle* navigation_handle) override;
-  void DidFirstVisuallyNonEmptyPaint() override;
-  void OnVisibilityChanged(content::Visibility visibility) override;
-  void WebContentsDestroyed() override;
-
-  // Logs |finish_reason| to UMA and deletes this FirstWebContentsProfiler.
-  void FinishedCollectingMetrics(FinishReason finish_reason);
-
-  // Whether a main frame navigation finished since this was created.
-  bool did_finish_first_navigation_ = false;
-
   // Memory pressure listener that will be used to check if memory pressure has
   // an impact on startup.
   base::MemoryPressureListener memory_pressure_listener_;
@@ -93,7 +55,7 @@ class FirstWebContentsProfiler : public content::WebContentsObserver {
 
 FirstWebContentsProfiler::FirstWebContentsProfiler(
     content::WebContents* web_contents)
-    : content::WebContentsObserver(web_contents),
+    : FirstWebContentsProfilerBase(web_contents),
       memory_pressure_listener_(
           FROM_HERE,
           base::BindRepeating(&startup_metric_utils::
@@ -105,119 +67,44 @@ FirstWebContentsProfiler::FirstWebContentsProfiler(
   DCHECK(web_contents->GetController().GetPendingEntry());
 }
 
-void FirstWebContentsProfiler::DidStartNavigation(
-    content::NavigationHandle* navigation_handle) {
-  // The profiler is concerned with the primary main frame navigation only.
-  if (!navigation_handle->IsInPrimaryMainFrame() ||
-      navigation_handle->IsSameDocument()) {
-    return;
-  }
-
-  // FirstWebContentsProfiler is created after DidStartNavigation() has been
-  // dispatched for the first top-level navigation. If another
-  // DidStartNavigation() is received, it means that a new navigation was
-  // initiated.
-  FinishedCollectingMetrics(FinishReason::kAbandonNewNavigation);
+void FirstWebContentsProfiler::RecordFinishReason(
+    StartupProfilingFinishReason finish_reason) {
+  RecordFirstWebContentsFinishReason(finish_reason);
 }
 
-void FirstWebContentsProfiler::DidFinishNavigation(
-    content::NavigationHandle* navigation_handle) {
-  if (startup_metric_utils::WasMainWindowStartupInterrupted()) {
-    FinishedCollectingMetrics(FinishReason::kAbandonBlockingUI);
-    return;
-  }
-
-  // Ignore subframe navigations, pre-rendering, and same-document navigations.
-  if (!navigation_handle->IsInPrimaryMainFrame() ||
-      navigation_handle->IsSameDocument()) {
-    return;
-  }
-
-  if (!navigation_handle->HasCommitted() ||
-      navigation_handle->IsErrorPage()) {
-    FinishedCollectingMetrics(FinishReason::kAbandonNavigationError);
-    return;
-  }
-
-  // It is not possible to get a second top-level DidFinishNavigation() without
-  // first having a DidStartNavigation(), which would have deleted |this|.
-  DCHECK(!did_finish_first_navigation_);
-
-  did_finish_first_navigation_ = true;
-
+void FirstWebContentsProfiler::RecordNavigationFinished(
+    base::TimeTicks navigation_start) {
   startup_metric_utils::RecordFirstWebContentsMainNavigationStart(
-      navigation_handle->NavigationStart());
+      navigation_start);
   startup_metric_utils::RecordFirstWebContentsMainNavigationFinished(
       base::TimeTicks::Now());
 }
 
-void FirstWebContentsProfiler::DidFirstVisuallyNonEmptyPaint() {
-  DCHECK(did_finish_first_navigation_);
-
-  if (startup_metric_utils::WasMainWindowStartupInterrupted()) {
-    FinishedCollectingMetrics(FinishReason::kAbandonBlockingUI);
-    return;
-  }
-
+void FirstWebContentsProfiler::RecordFirstNonEmptyPaint() {
   startup_metric_utils::RecordFirstWebContentsNonEmptyPaint(
       base::TimeTicks::Now(),
       web_contents()->GetMainFrame()->GetProcess()->GetLastInitTime());
-
-  FinishedCollectingMetrics(FinishReason::kDone);
-}
-
-void FirstWebContentsProfiler::OnVisibilityChanged(
-    content::Visibility visibility) {
-  if (visibility != content::Visibility::VISIBLE) {
-    // Stop profiling if the content gets hidden as its load may be
-    // deprioritized and timing it becomes meaningless.
-    FinishedCollectingMetrics(FinishReason::kAbandonContentHidden);
-  }
 }
 
-void FirstWebContentsProfiler::WebContentsDestroyed() {
-  FinishedCollectingMetrics(FinishReason::kAbandonContentDestroyed);
-}
-
-void FirstWebContentsProfiler::FinishedCollectingMetrics(
-    FinishReason finish_reason) {
-  RecordFinishReason(finish_reason);
-  delete this;
+bool FirstWebContentsProfiler::WasStartupInterrupted() {
+  return startup_metric_utils::WasMainWindowStartupInterrupted();
 }
 
 }  // namespace
 
-namespace metrics {
-
 void BeginFirstWebContentsProfiling() {
-  const BrowserList* browser_list = BrowserList::GetInstance();
-
   content::WebContents* visible_contents = nullptr;
+  const BrowserList* browser_list = BrowserList::GetInstance();
   for (Browser* browser : *browser_list) {
-    if (!browser->window()->IsVisible())
-      continue;
-
-    // The active WebContents may be hidden when the window height is small.
-    content::WebContents* contents =
-        browser->tab_strip_model()->GetActiveWebContents();
-
-#if defined(OS_MAC)
-    // TODO(https://crbug.com/1032348): It is incorrect to have a visible
-    // browser window with no active WebContents, but reports on Mac show that
-    // it happens.
-    if (!contents)
-      continue;
-#endif  // defined(OS_MAC)
-
-    if (contents->GetVisibility() != content::Visibility::VISIBLE)
-      continue;
-
-    visible_contents = contents;
-    break;
+    visible_contents =
+        FirstWebContentsProfilerBase::GetVisibleContents(browser);
+    if (visible_contents)
+      break;
   }
 
   if (!visible_contents) {
-    RecordFinishReason(FinishReason::kAbandonNoInitiallyVisibleContent);
+    RecordFirstWebContentsFinishReason(
+        StartupProfilingFinishReason::kAbandonNoInitiallyVisibleContent);
     return;
   }
 
diff --git a/chrome/browser/metrics/first_web_contents_profiler_base.cc b/chrome/browser/metrics/first_web_contents_profiler_base.cc
new file mode 100644
index 00000000000000..3f2d06b4702003
--- /dev/null
+++ b/chrome/browser/metrics/first_web_contents_profiler_base.cc
@@ -0,0 +1,123 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/metrics/first_web_contents_profiler_base.h"
+
+#include "build/build_config.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/navigation_handle.h"
+#include "content/public/browser/web_contents_observer.h"
+
+namespace metrics {
+
+FirstWebContentsProfilerBase::FirstWebContentsProfilerBase(
+    content::WebContents* web_contents)
+    : content::WebContentsObserver(web_contents) {}
+
+FirstWebContentsProfilerBase::~FirstWebContentsProfilerBase() = default;
+
+// static
+content::WebContents* FirstWebContentsProfilerBase::GetVisibleContents(
+    Browser* browser) {
+  if (!browser->window()->IsVisible())
+    return nullptr;
+
+  // The active WebContents may be hidden when the window height is small.
+  content::WebContents* contents =
+      browser->tab_strip_model()->GetActiveWebContents();
+
+#if defined(OS_MAC)
+  // TODO(https://crbug.com/1032348): It is incorrect to have a visible
+  // browser window with no active WebContents, but reports on Mac show that
+  // it happens.
+  if (!contents)
+    return nullptr;
+#endif  // defined(OS_MAC)
+
+  if (contents->GetVisibility() != content::Visibility::VISIBLE)
+    return nullptr;
+
+  return contents;
+}
+
+void FirstWebContentsProfilerBase::DidStartNavigation(
+    content::NavigationHandle* navigation_handle) {
+  // The profiler is concerned with the primary main frame navigation only.
+  if (!navigation_handle->IsInPrimaryMainFrame() ||
+      navigation_handle->IsSameDocument()) {
+    return;
+  }
+
+  // The profiler is created after DidStartNavigation() has been dispatched for
+  // the first top-level navigation. If another DidStartNavigation() is
+  // received, it means that a new navigation was initiated.
+  FinishedCollectingMetrics(
+      StartupProfilingFinishReason::kAbandonNewNavigation);
+}
+
+void FirstWebContentsProfilerBase::DidFinishNavigation(
+    content::NavigationHandle* navigation_handle) {
+  if (WasStartupInterrupted()) {
+    FinishedCollectingMetrics(StartupProfilingFinishReason::kAbandonBlockingUI);
+    return;
+  }
+
+  // Ignore subframe navigations, pre-rendering, and same-document navigations.
+  if (!navigation_handle->IsInPrimaryMainFrame() ||
+      navigation_handle->IsSameDocument()) {
+    return;
+  }
+
+  if (!navigation_handle->HasCommitted() || navigation_handle->IsErrorPage()) {
+    FinishedCollectingMetrics(
+        StartupProfilingFinishReason::kAbandonNavigationError);
+    return;
+  }
+
+  // It is not possible to get a second top-level DidFinishNavigation() without
+  // first having a DidStartNavigation(), which would have deleted |this|.
+  DCHECK(!did_finish_first_navigation_);
+
+  did_finish_first_navigation_ = true;
+
+  RecordNavigationFinished(navigation_handle->NavigationStart());
+}
+
+void FirstWebContentsProfilerBase::DidFirstVisuallyNonEmptyPaint() {
+  DCHECK(did_finish_first_navigation_);
+
+  if (WasStartupInterrupted()) {
+    FinishedCollectingMetrics(StartupProfilingFinishReason::kAbandonBlockingUI);
+    return;
+  }
+
+  RecordFirstNonEmptyPaint();
+  FinishedCollectingMetrics(StartupProfilingFinishReason::kDone);
+}
+
+void FirstWebContentsProfilerBase::OnVisibilityChanged(
+    content::Visibility visibility) {
+  if (visibility != content::Visibility::VISIBLE) {
+    // Stop profiling if the content gets hidden as its load may be
+    // deprioritized and timing it becomes meaningless.
+    FinishedCollectingMetrics(
+        StartupProfilingFinishReason::kAbandonContentHidden);
+  }
+}
+
+void FirstWebContentsProfilerBase::WebContentsDestroyed() {
+  FinishedCollectingMetrics(
+      StartupProfilingFinishReason::kAbandonContentDestroyed);
+}
+
+void FirstWebContentsProfilerBase::FinishedCollectingMetrics(
+    StartupProfilingFinishReason finish_reason) {
+  RecordFinishReason(finish_reason);
+  delete this;
+}
+
+}  // namespace metrics
diff --git a/chrome/browser/metrics/first_web_contents_profiler_base.h b/chrome/browser/metrics/first_web_contents_profiler_base.h
new file mode 100644
index 00000000000000..92fbd79411f187
--- /dev/null
+++ b/chrome/browser/metrics/first_web_contents_profiler_base.h
@@ -0,0 +1,94 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_METRICS_FIRST_WEB_CONTENTS_PROFILER_BASE_H_
+#define CHROME_BROWSER_METRICS_FIRST_WEB_CONTENTS_PROFILER_BASE_H_
+
+#include "base/time/time.h"
+#include "content/public/browser/web_contents_observer.h"
+
+namespace content {
+class WebContents;
+}
+
+class Browser;
+
+namespace metrics {
+
+// Reasons for which profiling is deemed complete. Logged in UMA (do not re-
+// order or re-assign).
+enum class StartupProfilingFinishReason {
+  // All metrics were successfully gathered.
+  kDone = 0,
+  // Abandon if blocking UI was shown during startup.
+  kAbandonBlockingUI = 1,
+  // Abandon if the WebContents is hidden (lowers scheduling priority).
+  kAbandonContentHidden = 2,
+  // Abandon if the WebContents is destroyed.
+  kAbandonContentDestroyed = 3,
+  // Abandon if the WebContents navigates away from its initial page, as it:
+  //   (1) is no longer a fair timing; and
+  //   (2) can cause http://crbug.com/525209 where the first paint didn't fire
+  //       for the initial content but fires after a lot of idle time when the
+  //       user finally navigates to another page that does trigger it.
+  kAbandonNewNavigation = 4,
+  // Abandon if the WebContents fails to load (e.g. network error, etc.).
+  kAbandonNavigationError = 5,
+  // Abandon if no WebContents was visible at the beginning of startup
+  kAbandonNoInitiallyVisibleContent = 6,
+  // Abandon if the WebContents was already painted. We set up the profiler too
+  // late and it missed the first non empty paint event.
+  kAbandonAlreadyPaintedContent = 7,
+  kMaxValue = kAbandonAlreadyPaintedContent
+};
+
+// Note: Instances of this class self destroy when the first non-empty paint
+// happens, or when an event prevents it from being recorded.
+class FirstWebContentsProfilerBase : public content::WebContentsObserver {
+ public:
+  FirstWebContentsProfilerBase(const FirstWebContentsProfilerBase&) = delete;
+  FirstWebContentsProfilerBase& operator=(const FirstWebContentsProfilerBase&) =
+      delete;
+
+  // Returns a visible webcontents from `browser` that can be observed for
+  // startup profiling, or `nullptr` if no compatible one was obtained.
+  static content::WebContents* GetVisibleContents(Browser* browser);
+
+ protected:
+  explicit FirstWebContentsProfilerBase(content::WebContents* web_contents);
+
+  // Protected destructor as `FirstWebContentsProfilerBase` deletes itself.
+  ~FirstWebContentsProfilerBase() override;
+
+  // Whether to abort recording metrics if the main window startup was
+  // interrupted. Recording metrics for startups with interruptions pollutes the
+  // collected data, however some flows (e.g. startup on ProfilePicker)
+  // specifically define their metrics to work around the interruptions.
+  virtual bool WasStartupInterrupted() = 0;
+
+  virtual void RecordFinishReason(
+      StartupProfilingFinishReason finish_reason) = 0;
+  virtual void RecordNavigationFinished(base::TimeTicks navigation_start) = 0;
+  virtual void RecordFirstNonEmptyPaint() = 0;
+
+ private:
+  // content::WebContentsObserver:
+  void DidStartNavigation(
+      content::NavigationHandle* navigation_handle) override;
+  void DidFinishNavigation(
+      content::NavigationHandle* navigation_handle) override;
+  void DidFirstVisuallyNonEmptyPaint() override;
+  void OnVisibilityChanged(content::Visibility visibility) override;
+  void WebContentsDestroyed() override;
+
+  // Logs |finish_reason| to UMA and deletes this profiler.
+  void FinishedCollectingMetrics(StartupProfilingFinishReason finish_reason);
+
+  // Whether a main frame navigation finished since this was created.
+  bool did_finish_first_navigation_ = false;
+};
+
+}  // namespace metrics
+
+#endif  // CHROME_BROWSER_METRICS_FIRST_WEB_CONTENTS_PROFILER_BASE_H_
diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
index 1fb2c2cb72cb20..310b9a9bd9f2d0 100644
--- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
+++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
@@ -20,6 +20,7 @@
 #include "chrome/browser/optimization_guide/optimization_guide_keyed_service_factory.h"
 #include "chrome/browser/optimization_guide/prediction/prediction_manager.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "components/leveldb_proto/public/proto_database_provider.h"
 #include "components/optimization_guide/core/command_line_top_host_provider.h"
 #include "components/optimization_guide/core/hints_processing_util.h"
@@ -69,6 +70,28 @@ void DeleteOldStorePaths(const base::FilePath& profile_path) {
                   kOptimizationGuidePredictionModelAndFeaturesStore)));
 }
 
+// Returns the profile to use for when setting up the keyed service when the
+// profile is Off-The-Record. For guest profiles, returns a loaded profile if
+// one exists, otherwise just the original profile of the OTR profile. Note:
+// guest profiles are off-the-record and "original" profiles.
+Profile* GetProfileForOTROptimizationGuide(Profile* profile) {
+  DCHECK(profile);
+  DCHECK(profile->IsOffTheRecord());
+
+  if (profile->IsGuestSession()) {
+    // Guest sessions need to rely on the stores from real profiles
+    // as guest profiles cannot fetch or store new models. Note: only
+    // loaded profiles should be used as we do not want to force load
+    // another profile as that can lead to start up regressions.
+    std::vector<Profile*> profiles =
+        g_browser_process->profile_manager()->GetLoadedProfiles();
+    if (!profiles.empty()) {
+      return profiles[0];
+    }
+  }
+  return profile->GetOriginalProfile();
+}
+
 }  // namespace
 
 // static
@@ -122,7 +145,7 @@ void OptimizationGuideKeyedService::Initialize() {
   if (profile->IsOffTheRecord()) {
     OptimizationGuideKeyedService* original_ogks =
         OptimizationGuideKeyedServiceFactory::GetForProfile(
-            profile->GetOriginalProfile());
+            GetProfileForOTROptimizationGuide(profile));
     DCHECK(original_ogks);
     hint_store = original_ogks->GetHintsManager()->hint_store();
     prediction_model_and_features_store =
diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service_browsertest.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service_browsertest.cc
index 6e1716580124bf..e4bf84990b5fae 100644
--- a/chrome/browser/optimization_guide/optimization_guide_keyed_service_browsertest.cc
+++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service_browsertest.cc
@@ -619,6 +619,23 @@ IN_PROC_BROWSER_TEST_F(OptimizationGuideKeyedServiceBrowserTest,
   run_loop->Run();
 }
 
+#if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
+// CreateGuestBrowser() is not supported for Android or ChromeOS out of the box.
+IN_PROC_BROWSER_TEST_F(OptimizationGuideKeyedServiceBrowserTest,
+                       GuestProfileUniqueKeyedService) {
+  Browser* guest_browser = CreateGuestBrowser();
+  OptimizationGuideKeyedService* guest_ogks =
+      OptimizationGuideKeyedServiceFactory::GetForProfile(
+          guest_browser->profile());
+  OptimizationGuideKeyedService* ogks =
+      OptimizationGuideKeyedServiceFactory::GetForProfile(browser()->profile());
+
+  EXPECT_TRUE(guest_ogks);
+  EXPECT_TRUE(ogks);
+  EXPECT_NE(guest_ogks, ogks);
+}
+#endif
+
 class OptimizationGuideKeyedServiceDataSaverUserWithInfobarShownTest
     : public OptimizationGuideKeyedServiceBrowserTest {
  public:
diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service_factory.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service_factory.cc
index 56ffdea7b83ade..7b9425771a6c7a 100644
--- a/chrome/browser/optimization_guide/optimization_guide_keyed_service_factory.cc
+++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service_factory.cc
@@ -55,7 +55,6 @@ KeyedService* OptimizationGuideKeyedServiceFactory::BuildServiceInstanceFor(
   if (chromeos::ProfileHelper::IsSigninProfile(profile))
     return nullptr;
 #endif
-
   return new OptimizationGuideKeyedService(context);
 }
 
diff --git a/chrome/browser/optimization_guide/prediction/prediction_manager.cc b/chrome/browser/optimization_guide/prediction/prediction_manager.cc
index 919e2afa2fe577..9c80c0c7fdcc5b 100644
--- a/chrome/browser/optimization_guide/prediction/prediction_manager.cc
+++ b/chrome/browser/optimization_guide/prediction/prediction_manager.cc
@@ -682,6 +682,8 @@ void PredictionManager::OnHostModelFeaturesStored() {
 void PredictionManager::OnStoreInitialized() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   store_is_ready_ = true;
+  LOCAL_HISTOGRAM_BOOLEAN(
+      "OptimizationGuide.PredictionManager.StoreInitialized", true);
 
   // Create the download manager here if we are allowed to.
   if (features::IsModelDownloadingEnabled() && !profile_->IsOffTheRecord() &&
diff --git a/chrome/browser/optimization_guide/prediction/prediction_manager_browsertest.cc b/chrome/browser/optimization_guide/prediction/prediction_manager_browsertest.cc
index 50e37cfae1fa9f..83c5ea7651d527 100644
--- a/chrome/browser/optimization_guide/prediction/prediction_manager_browsertest.cc
+++ b/chrome/browser/optimization_guide/prediction/prediction_manager_browsertest.cc
@@ -814,4 +814,71 @@ IN_PROC_BROWSER_TEST_F(PredictionManagerModelDownloadingBrowserTest,
   CreateBrowser(profile);
 }
 
+#if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
+// CreateGuestBrowser() is not supported for Android or ChromeOS out of the box.
+IN_PROC_BROWSER_TEST_F(PredictionManagerModelDownloadingBrowserTest,
+                       GuestProfileReceivesModel) {
+  SetResponseType(
+      PredictionModelsFetcherRemoteResponseType::kSuccessfulWithValidModelFile);
+
+  {
+    base::HistogramTester histogram_tester;
+    // Register in the primary profile and ensure the model returns.
+    RegisterModelFileObserverWithKeyedService(browser()->profile());
+
+    std::unique_ptr<base::RunLoop> run_loop = std::make_unique<base::RunLoop>();
+    model_file_observer()->set_model_file_received_callback(base::BindOnce(
+        [](base::RunLoop* run_loop,
+           proto::OptimizationTarget optimization_target,
+           const ModelInfo& model_info) {
+          EXPECT_EQ(optimization_target,
+                    proto::OPTIMIZATION_TARGET_PAINFUL_PAGE_LOAD);
+          run_loop->Quit();
+        },
+        run_loop.get()));
+    run_loop->Run();
+    histogram_tester.ExpectUniqueSample(
+        "OptimizationGuide.PredictionModelDownloadManager.DownloadStatus",
+        PredictionModelDownloadStatus::kSuccess, 1);
+  }
+
+  {
+    base::HistogramTester histogram_tester;
+    // Now hook everything up in the guest profile and we should still get the
+    // model back but no additional fetches should be made.
+    Browser* guest_browser = CreateGuestBrowser();
+
+    // To prevent any race, ensure the store has be initialized.
+    RetryForHistogramUntilCountReached(
+        &histogram_tester,
+        "OptimizationGuide.PredictionManager.StoreInitialized", 1);
+    std::unique_ptr<base::RunLoop> run_loop = std::make_unique<base::RunLoop>();
+    ModelFileObserver model_file_observer;
+    model_file_observer.set_model_file_received_callback(base::BindOnce(
+        [](base::RunLoop* run_loop,
+           proto::OptimizationTarget optimization_target,
+           const ModelInfo& model_info) {
+          EXPECT_EQ(optimization_target,
+                    proto::OPTIMIZATION_TARGET_PAINFUL_PAGE_LOAD);
+          run_loop->Quit();
+        },
+        run_loop.get()));
+    OptimizationGuideKeyedServiceFactory::GetForProfile(
+        guest_browser->profile())
+        ->AddObserverForOptimizationTargetModel(
+            proto::OPTIMIZATION_TARGET_PAINFUL_PAGE_LOAD,
+            /*model_metadata=*/absl::nullopt, &model_file_observer);
+    // Wait until the opt guide is up and the model is loaded as its shared
+    // between profiles.
+    RetryForHistogramUntilCountReached(
+        &histogram_tester,
+        "OptimizationGuide.PredictionModelLoadedVersion.PainfulPageLoad", 1);
+
+    run_loop->Run();
+    histogram_tester.ExpectTotalCount(
+        "OptimizationGuide.PredictionModelDownloadManager.DownloadStatus", 0);
+  }
+}
+#endif
+
 }  // namespace optimization_guide
diff --git a/chrome/browser/password_manager/android/password_store_android_backend.cc b/chrome/browser/password_manager/android/password_store_android_backend.cc
index 903a3c52b0fdf1..5e3221a6cfb6cd 100644
--- a/chrome/browser/password_manager/android/password_store_android_backend.cc
+++ b/chrome/browser/password_manager/android/password_store_android_backend.cc
@@ -137,12 +137,6 @@ PasswordStoreAndroidBackend::JobReturnHandler::JobReturnHandler(
     : success_callback_(std::move(callback)),
       metric_infix_(std::move(metric_infix)) {}
 
-PasswordStoreAndroidBackend::JobReturnHandler::JobReturnHandler(
-    LoginsReply callback,
-    MetricInfix metric_infix)
-    : success_callback_(std::move(callback)),
-      metric_infix_(std::move(metric_infix)) {}
-
 PasswordStoreAndroidBackend::JobReturnHandler::JobReturnHandler(
     PasswordStoreChangeListReply callback,
     MetricInfix metric_infix)
@@ -317,13 +311,26 @@ void PasswordStoreAndroidBackend::FillMatchingLoginsAsync(
     return;
   }
 
+  LoginsOrErrorReply invoke_noerror_callback = base::BindOnce(
+      [](LoginsReply no_error_callback, LoginsResultOrError result) {
+        // `result` is the LoginsResult returned by `JoinRetrievedLogins`.
+        DCHECK(absl::holds_alternative<LoginsResult>(result));
+        std::move(no_error_callback)
+            .Run(std::move(absl::get<LoginsResult>(result)));
+      },
+      std::move(callback));
+
+  // TODO(https://crbug.com/1229655): Don't use the JobHandler just because it
+  // contains a metrics recorder. Generalize the metrics recording instead!
   LoginsReply record_metrics_and_reply = base::BindOnce(
       [](JobReturnHandler handler, LoginsResult logins) {
+        DCHECK(handler.Holds<LoginsOrErrorReply>());
         handler.RecordMetrics(/*error=*/absl::nullopt);
-        std::move(handler).Get<LoginsReply>().Run(std::move(logins));
+        std::move(handler).Get<LoginsOrErrorReply>().Run(std::move(logins));
       },
-      JobReturnHandler(std::move(callback), JobReturnHandler::MetricInfix(
-                                                "FillMatchingLoginsAsync")));
+      JobReturnHandler(
+          std::move(invoke_noerror_callback),
+          JobReturnHandler::MetricInfix("FillMatchingLoginsAsync")));
 
   auto barrier_callback = base::BarrierCallback<LoginsResult>(
       forms.size(), base::BindOnce(&JoinRetrievedLogins)
diff --git a/chrome/browser/password_manager/android/password_store_android_backend.h b/chrome/browser/password_manager/android/password_store_android_backend.h
index e23d32d0d354bc..83af430adf1caa 100644
--- a/chrome/browser/password_manager/android/password_store_android_backend.h
+++ b/chrome/browser/password_manager/android/password_store_android_backend.h
@@ -91,7 +91,6 @@ class PasswordStoreAndroidBackend
 
     JobReturnHandler();
     JobReturnHandler(LoginsOrErrorReply callback, MetricInfix metric_name);
-    JobReturnHandler(LoginsReply callback, MetricInfix metric_name);
     JobReturnHandler(PasswordStoreChangeListReply callback,
                      MetricInfix metric_infix);
     JobReturnHandler(JobReturnHandler&&);
@@ -119,7 +118,7 @@ class PasswordStoreAndroidBackend
     void RecordMetrics(absl::optional<AndroidBackendError> error) const;
 
    private:
-    absl::variant<LoginsReply, LoginsOrErrorReply, PasswordStoreChangeListReply>
+    absl::variant<LoginsOrErrorReply, PasswordStoreChangeListReply>
         success_callback_;
     MetricInfix metric_infix_;
     base::Time start_ = base::Time::Now();
diff --git a/chrome/browser/profiles/profile_window.cc b/chrome/browser/profiles/profile_window.cc
index 58a47365168bbd..1bfe7100e042d8 100644
--- a/chrome/browser/profiles/profile_window.cc
+++ b/chrome/browser/profiles/profile_window.cc
@@ -18,6 +18,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
 #include "chrome/browser/about_flags.h"
@@ -119,6 +120,8 @@ void FindOrCreateNewWindowForProfile(
     chrome::startup::IsFirstRun is_first_run,
     bool always_create) {
   DCHECK(profile);
+  TRACE_EVENT1("browser", "FindOrCreateNewWindowForProfile", "profile_path",
+               profile->GetPath());
 
   if (!always_create) {
     Browser* browser = chrome::FindTabbedBrowser(profile, false);
@@ -144,6 +147,8 @@ void OpenBrowserWindowForProfile(CreateOnceCallback callback,
                                  Profile* profile,
                                  Profile::CreateStatus status) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  TRACE_EVENT2("browser", "OpenBrowserWindowForProfile", "profile_path",
+               profile->GetPath().AsUTF8Unsafe(), "status", status);
 
   if (status != Profile::CREATE_STATUS_INITIALIZED)
     return;
diff --git a/chrome/browser/resources/new_tab_page/realbox/realbox_icon.html b/chrome/browser/resources/new_tab_page/realbox/realbox_icon.html
index f800b04994cc19..7226592cc30b8a 100644
--- a/chrome/browser/resources/new_tab_page/realbox/realbox_icon.html
+++ b/chrome/browser/resources/new_tab_page/realbox/realbox_icon.html
@@ -4,7 +4,6 @@
     display: flex;
     flex-shrink: 0;
     justify-content: center;
-    padding-inline-start: 8px;
     width: 32px;
   }
 
diff --git a/chrome/browser/resources/new_tab_page/realbox/realbox_match.html b/chrome/browser/resources/new_tab_page/realbox/realbox_match.html
index 01a431564f27d1..f84e2ceed0b796 100644
--- a/chrome/browser/resources/new_tab_page/realbox/realbox_match.html
+++ b/chrome/browser/resources/new_tab_page/realbox/realbox_match.html
@@ -30,6 +30,11 @@
     text-overflow: ellipsis;
   }
 
+  #ellipsis {
+    inset-inline-end: 0;
+    position: absolute;
+  }
+
   #focus-indicator {
     background-color: var(--google-blue-600);
     border-radius: 3px;
@@ -44,10 +49,18 @@
     display: block;
   }
 
+  #prefix {
+    opacity: 0;
+  }
+
   #separator {
     white-space: pre;
   }
 
+  #tail-suggest-prefix {
+     position: relative;
+  }
+
   #text-container {
     align-items: center;
     display: flex;
@@ -125,6 +138,12 @@
   <div id="focus-indicator"></div>
   <ntp-realbox-icon id="icon" match="[[match]]"></ntp-realbox-icon>
   <div id="text-container">
+    <span id="tail-suggest-prefix" hidden$="[[!tailSuggestPrefix_]]">
+      <span id="prefix">[[tailSuggestPrefix_]]</span>
+      <!-- This is equivalent to AutocompleteMatch::kEllipsis which is
+           prepended to the match content in other surfaces-->
+      <span id="ellipsis">...&nbsp</span>
+    </span>
     <span id="contents" inner-h-t-m-l="[[contentsHtml_]]"></span>
     <span id="separator" class="dim">[[separatorText_]]</span>
     <span id="description" inner-h-t-m-l="[[descriptionHtml_]]"></span>
diff --git a/chrome/browser/resources/new_tab_page/realbox/realbox_match.js b/chrome/browser/resources/new_tab_page/realbox/realbox_match.js
index a47e6f1b9a04b8..201ed6b4c0e01a 100644
--- a/chrome/browser/resources/new_tab_page/realbox/realbox_match.js
+++ b/chrome/browser/resources/new_tab_page/realbox/realbox_match.js
@@ -86,6 +86,15 @@ class RealboxMatchElement extends PolymerElement {
       // Private properties
       //========================================================================
 
+      /**
+       * @type {boolean}
+       * @private
+       */
+      actionIsVisible_: {
+        type: Boolean,
+        computed: `computeActionIsVisible_(match)`,
+      },
+
       /**
        * Rendered match contents based on autocomplete provided styling.
        * @type {string}
@@ -106,15 +115,6 @@ class RealboxMatchElement extends PolymerElement {
         computed: `computeDescriptionHtml_(match)`,
       },
 
-      /**
-       * @type {boolean}
-       * @private
-       */
-      actionIsVisible_: {
-        type: Boolean,
-        computed: `computeActionIsVisible_(match)`,
-      },
-
       /**
        * Remove button's 'aria-label' attribute.
        * @type {string}
@@ -143,6 +143,16 @@ class RealboxMatchElement extends PolymerElement {
         type: String,
         computed: `computeSeparatorText_(match)`,
       },
+
+      /**
+       * Rendered tail suggest common prefix.
+       * @type {string}
+       * @private
+       */
+      tailSuggestPrefix_: {
+        type: String,
+        computed: `computeTailSuggestPrefix_(match)`,
+      },
     };
   }
 
@@ -318,6 +328,23 @@ class RealboxMatchElement extends PolymerElement {
             .innerHTML;
   }
 
+  /**
+   * @return {string}
+   * @private
+   */
+  computeTailSuggestPrefix_() {
+    if (!this.match || !this.match.tailSuggestCommonPrefix) {
+      return '';
+    }
+    const prefix = decodeString16(this.match.tailSuggestCommonPrefix);
+    // Replace last space with non breaking space since spans collapse
+    // trailing white spaces and the prefix always ends with a white space.
+    if (prefix.slice(-1) === ' ') {
+      return prefix.slice(0, -1) + '\u00A0';
+    }
+    return prefix;
+  }
+
   /**
    * @return {boolean}
    * @private
diff --git a/chrome/browser/resources/tab_search/tab_search_item.ts b/chrome/browser/resources/tab_search/tab_search_item.ts
index 5a30139d3a0756..e0e3cde3ad3172 100644
--- a/chrome/browser/resources/tab_search/tab_search_item.ts
+++ b/chrome/browser/resources/tab_search/tab_search_item.ts
@@ -87,21 +87,9 @@ export class TabSearchItem extends TabSearchItemBase {
   }
 
   private isOpenTabAndHasMediaAlert_(tabData: TabData): boolean {
-    if (tabData.type != TabItemType.OPEN_TAB ||
-        !(tabData.tab as Tab).alertStates ||
-        (tabData.tab as Tab).alertStates.length == 0) {
-      return false;
-    }
-
-    /* Current UI mocks only have specs for the following media related alert
-     * states. */
-    function validAlertState(alert: TabAlertState): boolean {
-      return alert == TabAlertState.kMediaRecording ||
-          alert == TabAlertState.kAudioPlaying ||
-          alert == TabAlertState.kAudioMuting;
-    }
-
-    return (tabData.tab as Tab).alertStates.some(validAlertState);
+    return tabData.type == TabItemType.OPEN_TAB &&
+        (tabData.tab as Tab).alertStates &&
+        (tabData.tab as Tab).alertStates.length > 0;
   }
 
   /**
diff --git a/chrome/browser/resources/welcome/BUILD.gn b/chrome/browser/resources/welcome/BUILD.gn
index f0311f6d519caf..d0b1758b92a528 100644
--- a/chrome/browser/resources/welcome/BUILD.gn
+++ b/chrome/browser/resources/welcome/BUILD.gn
@@ -34,7 +34,7 @@ generate_grd("build_grd") {
   ]
   input_files_base_dir = rebase_path(".", "//")
 
-  deps = [ ":build" ]
+  deps = [ ":build_ts" ]
   manifest_files = [ "$target_gen_dir/tsconfig.manifest" ]
 
   if (is_chrome_branded) {
@@ -142,9 +142,9 @@ html_to_js("web_components_local") {
   ]
 }
 
-ts_library("build") {
+ts_library("build_ts") {
   root_dir = "$target_gen_dir/$preprocess_folder"
-  out_dir = "$target_gen_dir/$preprocess_folder"
+  out_dir = "$target_gen_dir/tsc"
   composite = true
   tsconfig_base = "tsconfig_base.json"
   in_files = [
diff --git a/chrome/browser/safe_browsing/tailored_security/unconsented_message_android.cc b/chrome/browser/safe_browsing/tailored_security/unconsented_message_android.cc
index e6ba35f623035d..133d509b87abc6 100644
--- a/chrome/browser/safe_browsing/tailored_security/unconsented_message_android.cc
+++ b/chrome/browser/safe_browsing/tailored_security/unconsented_message_android.cc
@@ -146,6 +146,7 @@ TailoredSecurityUnconsentedMessageAndroid::
         ResourceMapper::MapToJavaDrawableId(IDR_ANDROID_MESSAGE_SAFETY_CHECK));
   }
 
+  LogMessageOutcome(TailoredSecurityOutcome::kShown, is_in_flow_);
   messages::MessageDispatcherBridge::Get()->EnqueueMessage(
       message_.get(), web_contents_, messages::MessageScopeType::NAVIGATION,
       messages::MessagePriority::kNormal);
diff --git a/chrome/browser/signin/chrome_signin_client_unittest.cc b/chrome/browser/signin/chrome_signin_client_unittest.cc
index 6286985de999de..ed2ac0db98891b 100644
--- a/chrome/browser/signin/chrome_signin_client_unittest.cc
+++ b/chrome/browser/signin/chrome_signin_client_unittest.cc
@@ -265,6 +265,8 @@ bool IsSignoutDisallowedByPolicy(
     case signin_metrics::ProfileSignout::USER_TUNED_OFF_SYNC_FROM_DICE_UI:
       return true;
     case signin_metrics::ProfileSignout::ACCOUNT_REMOVED_FROM_DEVICE:
+    case signin_metrics::ProfileSignout::
+        IOS_ACCOUNT_REMOVED_FROM_DEVICE_AFTER_RESTORE:
       // TODO(msarda): Add more of the above cases to this "false" branch.
       // For now only ACCOUNT_REMOVED_FROM_DEVICE is here to preserve the status
       // quo. Additional internal sources of sign-out will be moved here in a
@@ -421,6 +423,8 @@ const signin_metrics::ProfileSignout kSignoutSources[] = {
     signin_metrics::ProfileSignout::USER_DELETED_ACCOUNT_COOKIES,
     signin_metrics::ProfileSignout::MOBILE_IDENTITY_CONSISTENCY_ROLLBACK,
     signin_metrics::ProfileSignout::ACCOUNT_ID_MIGRATION,
+    signin_metrics::ProfileSignout::
+        IOS_ACCOUNT_REMOVED_FROM_DEVICE_AFTER_RESTORE,
 };
 static_assert(base::size(kSignoutSources) ==
                   signin_metrics::ProfileSignout::NUM_PROFILE_SIGNOUT_METRICS,
diff --git a/chrome/browser/ssl/ssl_browsertest.cc b/chrome/browser/ssl/ssl_browsertest.cc
index 2909052292ffa8..47d5810fc75147 100644
--- a/chrome/browser/ssl/ssl_browsertest.cc
+++ b/chrome/browser/ssl/ssl_browsertest.cc
@@ -1991,7 +1991,10 @@ class SSLUITestWithClientCert : public SSLUITestBase {
 
 // Visit a HTTPS page which requires client cert authentication. The client
 // cert will be selected automatically, then a test which uses WebSocket runs.
-IN_PROC_BROWSER_TEST_F(SSLUITestWithClientCert, TestWSSClientCert) {
+//
+// TODO(https://crbug.com/1279930): disabled because of race in when certs
+// are incorporated.
+IN_PROC_BROWSER_TEST_F(SSLUITestWithClientCert, DISABLED_TestWSSClientCert) {
   // Import a client cert for test.
   crypto::ScopedPK11Slot public_slot = cert_db_->GetPublicSlot();
   std::string pkcs12_data;
@@ -2213,7 +2216,10 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestClientAuthContinueWithoutCert) {
   EXPECT_EQ("", tab->GetLastCommittedURL().ref());
 }
 
-IN_PROC_BROWSER_TEST_F(SSLUITest, TestCertDBChangedFlushesClientAuthCache) {
+// TODO(https://crbug.com/1279930): disabled because of race in when certs
+// are incorporated.
+IN_PROC_BROWSER_TEST_F(SSLUITest,
+                       DISABLED_TestCertDBChangedFlushesClientAuthCache) {
   // Make the browser use the ClientCertStoreStub instead of the regular one.
   ProfileNetworkContextServiceFactory::GetForContext(browser()->profile())
       ->set_client_cert_store_factory_for_testing(
diff --git a/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc b/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc
index 6cbc77c7b97986..9e1ac38e7d5e2f 100644
--- a/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc
+++ b/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc
@@ -18,10 +18,17 @@ namespace {
 using TwoClientWebAppsIntegrationTestMacWinLinux =
     TwoClientWebAppsIntegrationTestBase;
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_NavSiteA_InstIconNotShown_LaunchIconShown \
+  DISABLED_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_NavSiteA_InstIconNotShown_LaunchIconShown
+#else
+#define MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_NavSiteA_InstIconNotShown_LaunchIconShown \
+  WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_NavSiteA_InstIconNotShown_LaunchIconShown
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_NavSiteA_InstIconNotShown_LaunchIconShown) {
+    MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_NavSiteA_InstIconNotShown_LaunchIconShown) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -37,10 +44,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckLaunchIconShown();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromListSiteA_WindowCreated \
+  DISABLED_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromListSiteA_WindowCreated
+#else
+#define MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromListSiteA_WindowCreated \
+  WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromListSiteA_WindowCreated
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromListSiteA_WindowCreated) {
+    MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromListSiteA_WindowCreated) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -55,10 +69,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckWindowCreated();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated \
+  DISABLED_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated
+#else
+#define MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated \
+  WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated) {
+    MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -71,10 +92,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckTabCreated();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_NavSiteA_InstIconShown_LaunchIconNotShown \
+  DISABLED_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_NavSiteA_InstIconShown_LaunchIconNotShown
+#else
+#define MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_NavSiteA_InstIconShown_LaunchIconNotShown \
+  WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_NavSiteA_InstIconShown_LaunchIconNotShown
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_NavSiteA_InstIconShown_LaunchIconNotShown) {
+    MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_NavSiteA_InstIconShown_LaunchIconNotShown) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -88,10 +116,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckLaunchIconNotShown();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_NavSiteA_InstIconNotShown_LaunchIconShown \
+  DISABLED_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_NavSiteA_InstIconNotShown_LaunchIconShown
+#else
+#define MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_NavSiteA_InstIconNotShown_LaunchIconShown \
+  WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_NavSiteA_InstIconNotShown_LaunchIconShown
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_NavSiteA_InstIconNotShown_LaunchIconShown) {
+    MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_NavSiteA_InstIconNotShown_LaunchIconShown) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -107,10 +142,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckLaunchIconShown();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromListSiteA_WindowCreated \
+  DISABLED_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromListSiteA_WindowCreated
+#else
+#define MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromListSiteA_WindowCreated \
+  WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromListSiteA_WindowCreated
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromListSiteA_WindowCreated) {
+    MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromListSiteA_WindowCreated) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -125,10 +167,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckWindowCreated();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated \
+  DISABLED_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated
+#else
+#define MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated \
+  WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated) {
+    MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -141,10 +190,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckTabCreated();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_NavSiteA_InstIconShown_LaunchIconNotShown \
+  DISABLED_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_NavSiteA_InstIconShown_LaunchIconNotShown
+#else
+#define MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_NavSiteA_InstIconShown_LaunchIconNotShown \
+  WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_NavSiteA_InstIconShown_LaunchIconNotShown
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_NavSiteA_InstIconShown_LaunchIconNotShown) {
+    MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_NavSiteA_InstIconShown_LaunchIconNotShown) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -158,10 +214,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckLaunchIconNotShown();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_NavSiteA_InstIconNotShown_LaunchIconShown \
+  DISABLED_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_NavSiteA_InstIconNotShown_LaunchIconShown
+#else
+#define MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_NavSiteA_InstIconNotShown_LaunchIconShown \
+  WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_NavSiteA_InstIconNotShown_LaunchIconShown
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_NavSiteA_InstIconNotShown_LaunchIconShown) {
+    MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_NavSiteA_InstIconNotShown_LaunchIconShown) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -177,10 +240,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckLaunchIconShown();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromListSiteA_WindowCreated \
+  DISABLED_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromListSiteA_WindowCreated
+#else
+#define MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromListSiteA_WindowCreated \
+  WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromListSiteA_WindowCreated
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromListSiteA_WindowCreated) {
+    MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromListSiteA_WindowCreated) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -195,10 +265,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckWindowCreated();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated \
+  DISABLED_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated
+#else
+#define MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated \
+  WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated) {
+    MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -211,10 +288,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckTabCreated();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_NavSiteA_InstIconShown_LaunchIconNotShown \
+  DISABLED_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_NavSiteA_InstIconShown_LaunchIconNotShown
+#else
+#define MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_NavSiteA_InstIconShown_LaunchIconNotShown \
+  WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_NavSiteA_InstIconShown_LaunchIconNotShown
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_NavSiteA_InstIconShown_LaunchIconNotShown) {
+    MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_NavSiteA_InstIconShown_LaunchIconNotShown) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -228,10 +312,9 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckLaunchIconNotShown();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstCrtShctTabbedSiteA_InListTabbedSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListTabbedSiteA_NavSiteA_InstIconShown_LaunchIconNotShown) {
+    WebAppIntegration_InstCrtShctTabbedSiteA_InListTabbedSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListTabbedSiteA_NavSiteA_InstIconShown_LaunchIconNotShown) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -246,10 +329,9 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckLaunchIconNotShown();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstCrtShctTabbedSiteA_InListTabbedSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListTabbedSiteA_LaunchFromListSiteA_TabCreated) {
+    WebAppIntegration_InstCrtShctTabbedSiteA_InListTabbedSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListTabbedSiteA_LaunchFromListSiteA_TabCreated) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -263,10 +345,9 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckTabCreated();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstCrtShctTabbedSiteA_InListTabbedSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated) {
+    WebAppIntegration_InstCrtShctTabbedSiteA_InListTabbedSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_LaunchFromListSiteA_TabCreated) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -278,10 +359,9 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckTabCreated();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstCrtShctWindowedSiteC_InListWinSiteC_SwitchProfileClientClient2_InListNotLclyInstSiteC_InstLocallySiteC_InListWinSiteC_NavSiteC_InstIconNotShown_LaunchIconShown) {
+    WebAppIntegration_InstCrtShctWindowedSiteC_InListWinSiteC_SwitchProfileClientClient2_InListNotLclyInstSiteC_InstLocallySiteC_InListWinSiteC_NavSiteC_InstIconNotShown_LaunchIconShown) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -296,10 +376,9 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckLaunchIconShown();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstCrtShctTabbedSiteC_InListTabbedSiteC_SwitchProfileClientClient2_InListNotLclyInstSiteC_InstLocallySiteC_InListTabbedSiteC_NavSiteC_LaunchIconNotShown) {
+    WebAppIntegration_InstCrtShctTabbedSiteC_InListTabbedSiteC_SwitchProfileClientClient2_InListNotLclyInstSiteC_InstLocallySiteC_InListTabbedSiteC_NavSiteC_LaunchIconNotShown) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -313,10 +392,9 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckLaunchIconNotShown();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_TurnSyncOff_InstCrtShctWindowedSiteA_TurnSyncOn_SwitchProfileClientClient2_InListNotLclyInstSiteA) {
+    WebAppIntegration_TurnSyncOff_InstCrtShctWindowedSiteA_TurnSyncOn_SwitchProfileClientClient2_InListNotLclyInstSiteA) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -327,10 +405,9 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckAppInListNotLocallyInstalled("SiteA");
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_TurnSyncOff_InstOmniboxSiteA_TurnSyncOn_SwitchProfileClientClient2_InListNotLclyInstSiteA) {
+    WebAppIntegration_TurnSyncOff_InstOmniboxSiteA_TurnSyncOn_SwitchProfileClientClient2_InListNotLclyInstSiteA) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -341,10 +418,9 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckAppInListNotLocallyInstalled("SiteA");
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_TurnSyncOff_InstMenuOptionSiteA_TurnSyncOn_SwitchProfileClientClient2_InListNotLclyInstSiteA) {
+    WebAppIntegration_TurnSyncOff_InstMenuOptionSiteA_TurnSyncOn_SwitchProfileClientClient2_InListNotLclyInstSiteA) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -355,10 +431,9 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckAppInListNotLocallyInstalled("SiteA");
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_TurnSyncOff_InstCrtShctTabbedSiteA_TurnSyncOn_SwitchProfileClientClient2_InListNotLclyInstSiteA) {
+    WebAppIntegration_TurnSyncOff_InstCrtShctTabbedSiteA_TurnSyncOn_SwitchProfileClientClient2_InListNotLclyInstSiteA) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -369,10 +444,9 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckAppInListNotLocallyInstalled("SiteA");
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_TurnSyncOff_InstCrtShctWindowedSiteC_TurnSyncOn_SwitchProfileClientClient2_InListNotLclyInstSiteC) {
+    WebAppIntegration_TurnSyncOff_InstCrtShctWindowedSiteC_TurnSyncOn_SwitchProfileClientClient2_InListNotLclyInstSiteC) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -383,10 +457,9 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckAppInListNotLocallyInstalled("SiteC");
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_TurnSyncOff_InstCrtShctTabbedSiteC_TurnSyncOn_SwitchProfileClientClient2_InListNotLclyInstSiteC) {
+    WebAppIntegration_TurnSyncOff_InstCrtShctTabbedSiteC_TurnSyncOn_SwitchProfileClientClient2_InListNotLclyInstSiteC) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -397,10 +470,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckAppInListNotLocallyInstalled("SiteC");
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated \
+  DISABLED_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated
+#else
+#define MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated \
+  WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated) {
+    MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -415,10 +495,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckWindowCreated();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated \
+  DISABLED_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated
+#else
+#define MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated \
+  WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated) {
+    MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -433,10 +520,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckWindowCreated();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated \
+  DISABLED_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated
+#else
+#define MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated \
+  WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated) {
+    MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_InstLocallySiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -451,10 +545,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckWindowCreated();
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA \
+  DISABLED_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA
+#else
+#define MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA \
+  WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA) {
+    MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -469,10 +570,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckAppNotInList("SiteA");
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA \
+  DISABLED_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA
+#else
+#define MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA \
+  WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA) {
+    MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -487,10 +595,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckAppNotInList("SiteA");
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA \
+  DISABLED_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA
+#else
+#define MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA \
+  WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA) {
+    MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -505,10 +620,9 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckAppNotInList("SiteA");
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstCrtShctTabbedSiteA_InListTabbedSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA) {
+    WebAppIntegration_InstCrtShctTabbedSiteA_InListTabbedSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_UninstallFromListSiteA_NotInListSiteA_SwitchProfileClientClient1_NotInListSiteA) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -522,10 +636,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckAppNotInList("SiteA");
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA \
+  DISABLED_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA
+#else
+#define MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA \
+  WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA) {
+    MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -540,10 +661,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckAppInListNotLocallyInstalled("SiteA");
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA \
+  DISABLED_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA
+#else
+#define MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA \
+  WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA) {
+    MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -558,10 +686,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckAppInListNotLocallyInstalled("SiteA");
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA \
+  DISABLED_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA
+#else
+#define MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA \
+  WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA) {
+    MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -576,10 +711,9 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckAppInListNotLocallyInstalled("SiteA");
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstCrtShctTabbedSiteA_InListTabbedSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA) {
+    WebAppIntegration_InstCrtShctTabbedSiteA_InListTabbedSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromListSiteA_TurnSyncOn_InListNotLclyInstSiteA) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -593,10 +727,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckAppInListNotLocallyInstalled("SiteA");
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA \
+  DISABLED_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA
+#else
+#define MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA \
+  WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA) {
+    MAYBE_WebAppIntegration_InstCrtShctWindowedSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -611,10 +752,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckAppInListNotLocallyInstalled("SiteA");
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA \
+  DISABLED_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA
+#else
+#define MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA \
+  WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA) {
+    MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -629,10 +777,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckAppInListNotLocallyInstalled("SiteA");
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA \
+  DISABLED_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA
+#else
+#define MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA \
+  WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA) {
+    MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -647,10 +802,17 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckAppInListNotLocallyInstalled("SiteA");
 }
 
-// TODO(crbug.com/1273666): Tests are flaky.
+// TODO(crbug.com/1273666): Test failed on Mac ASAN.
+#if defined(OS_MAC) && defined(ADDRESS_SANITIZER)
+#define MAYBE_WebAppIntegration_InstCrtShctTabbedSiteA_InListTabbedSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA \
+  DISABLED_WebAppIntegration_InstCrtShctTabbedSiteA_InListTabbedSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA
+#else
+#define MAYBE_WebAppIntegration_InstCrtShctTabbedSiteA_InListTabbedSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA \
+  WebAppIntegration_InstCrtShctTabbedSiteA_InListTabbedSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA
+#endif
 IN_PROC_BROWSER_TEST_F(
     TwoClientWebAppsIntegrationTestMacWinLinux,
-    DISABLED_WebAppIntegration_InstCrtShctTabbedSiteA_InListTabbedSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA) {
+    MAYBE_WebAppIntegration_InstCrtShctTabbedSiteA_InListTabbedSiteA_SwitchProfileClientClient2_InListNotLclyInstSiteA_TurnSyncOff_UninstallFromMenuSiteA_TurnSyncOn_InListNotLclyInstSiteA) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 188d4a0cab874b..dd4a0d5e737cd6 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -2937,6 +2937,7 @@ static_library("ui") {
       "//ash/webui/scanning",
       "//ash/webui/shimless_rma",
       "//ash/webui/shortcut_customization_ui",
+      "//ash/webui/system_extensions_internals_ui",
       "//ash/webui/web_applications",
       "//build:chromeos_buildflags",
       "//chrome/app:generated_resources",
diff --git a/chrome/browser/ui/ash/cast_config_controller_media_router.cc b/chrome/browser/ui/ash/cast_config_controller_media_router.cc
index b173d1344e9393..3b947aaa9b1516 100644
--- a/chrome/browser/ui/ash/cast_config_controller_media_router.cc
+++ b/chrome/browser/ui/ash/cast_config_controller_media_router.cc
@@ -92,8 +92,7 @@ class CastDeviceCache : public media_router::MediaRoutesObserver,
   void OnSinksReceived(const MediaSinks& sinks) override;
 
   // media_router::MediaRoutesObserver:
-  void OnRoutesUpdated(const MediaRoutes& routes,
-                       const MediaRouteIds& unused_joinable_route_ids) override;
+  void OnRoutesUpdated(const MediaRoutes& routes) override;
 
   MediaSinks sinks_;
   MediaRoutes routes_;
@@ -138,9 +137,7 @@ void CastDeviceCache::OnSinksReceived(const MediaSinks& sinks) {
   update_devices_callback_.Run();
 }
 
-void CastDeviceCache::OnRoutesUpdated(
-    const MediaRoutes& routes,
-    const MediaRouteIds& unused_joinable_route_ids) {
+void CastDeviceCache::OnRoutesUpdated(const MediaRoutes& routes) {
   routes_ = routes;
   update_devices_callback_.Run();
 }
diff --git a/chrome/browser/ui/ash/desks_templates/desks_templates_client_browsertest.cc b/chrome/browser/ui/ash/desks_templates/desks_templates_client_browsertest.cc
index a60b5e4b26de44..91d991900cb848 100644
--- a/chrome/browser/ui/ash/desks_templates/desks_templates_client_browsertest.cc
+++ b/chrome/browser/ui/ash/desks_templates/desks_templates_client_browsertest.cc
@@ -249,10 +249,8 @@ class DesksTemplatesClientTest : public extensions::PlatformAppBrowserTest {
   }
 
   void LaunchTemplate(const base::GUID& uuid) {
-    ash::DeskSwitchAnimationWaiter waiter;
     DesksTemplatesClient::Get()->LaunchDeskTemplate(uuid.AsLowercaseString(),
                                                     base::DoNothing());
-    waiter.Wait();
   }
 
   void SetAndLaunchTemplate(std::unique_ptr<ash::DeskTemplate> desk_template) {
@@ -1043,14 +1041,8 @@ IN_PROC_BROWSER_TEST_F(DesksTemplatesClientTest, NativeUILaunchBrowser) {
   ASSERT_TRUE(template_item);
   ClickButton(template_item);
 
-  // Clicking the button is a two part, both async process. We need to wait for
-  // the template to be fetched from the model, and then wait for the desk
-  // animation to be launched.
-  // TODO(dandersson): Remove this when the desk is no longer activated on
-  // template launch.
+  // We need to wait for the template to be fetched from the model.
   ash::WaitForDesksTemplatesUI();
-  ash::DeskSwitchAnimationWaiter waiter;
-  waiter.Wait();
 
   // Wait for the tabs to load.
   content::RunAllTasksUntilIdle();
@@ -1118,14 +1110,8 @@ IN_PROC_BROWSER_TEST_F(DesksTemplatesClientTest,
   ASSERT_TRUE(template_item);
   ClickButton(template_item);
 
-  // Clicking the button is a two part, both async process. We need to wait for
-  // the template to be fetched from the model, and then wait for the desk
-  // animation to be launched.
-  // TODO(dandersson): Remove this when the desk is no longer activated on
-  // template launch.
+  // We need to wait for the template to be fetched from the model.
   ash::WaitForDesksTemplatesUI();
-  ash::DeskSwitchAnimationWaiter waiter;
-  waiter.Wait();
 
   for (auto* browser : *BrowserList::GetInstance()) {
     aura::Window* window = browser->window()->GetNativeWindow();
diff --git a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.cc b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.cc
index 4316dea1da7710..163828034891ce 100644
--- a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.cc
+++ b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_shelf_controller.cc
@@ -309,9 +309,6 @@ void AppServiceAppWindowShelfController::OnWindowDestroying(
     aura::Window* window) {
   DCHECK(observed_windows_.IsObservingSource(window));
   observed_windows_.RemoveObservation(window);
-  if (IgnoreWindow(window)) {
-    return;
-  }
 
   if (arc_tracker_)
     arc_tracker_->RemoveCandidateWindow(window);
diff --git a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
index 3f6e34e65d739a..5b70ebb3310390 100644
--- a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
@@ -200,23 +200,20 @@ IN_PROC_BROWSER_TEST_F(SystemTrayTrayCastMediaRouterChromeOSTest,
                                                               local_route};
 
   // We do not show the cast view for non-local routes.
-  media_routes_observer()->OnRoutesUpdated(
-      non_local_routes, std::vector<media_router::MediaRoute::Id>());
+  media_routes_observer()->OnRoutesUpdated(non_local_routes);
   content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsCastingNotificationVisible());
 
   // If there are multiple routes active at the same time, then we need to
   // display the local route over a non-local route. This also verifies that we
   // display the cast view when we're casting.
-  media_routes_observer()->OnRoutesUpdated(
-      multiple_routes, std::vector<media_router::MediaRoute::Id>());
+  media_routes_observer()->OnRoutesUpdated(multiple_routes);
   content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsCastingNotificationVisible());
   EXPECT_NE(std::u16string::npos, GetNotificationString().find(u"Local Sink"));
 
   // When a casting session stops, we shouldn't display the cast view.
-  media_routes_observer()->OnRoutesUpdated(
-      no_routes, std::vector<media_router::MediaRoute::Id>());
+  media_routes_observer()->OnRoutesUpdated(no_routes);
   content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsCastingNotificationVisible());
 }
diff --git a/chrome/browser/ui/global_media_controls/cast_media_notification_producer.cc b/chrome/browser/ui/global_media_controls/cast_media_notification_producer.cc
index 8ce97de6cd4887..e1013bf56d405b 100644
--- a/chrome/browser/ui/global_media_controls/cast_media_notification_producer.cc
+++ b/chrome/browser/ui/global_media_controls/cast_media_notification_producer.cc
@@ -128,8 +128,7 @@ void CastMediaNotificationProducer::OnMediaItemUIDismissed(
 }
 
 void CastMediaNotificationProducer::OnRoutesUpdated(
-    const std::vector<media_router::MediaRoute>& routes,
-    const std::vector<media_router::MediaRoute::Id>& joinable_route_ids) {
+    const std::vector<media_router::MediaRoute>& routes) {
   const bool had_items = HasActiveItems();
 
   base::EraseIf(items_, [&routes](const auto& item) {
diff --git a/chrome/browser/ui/global_media_controls/cast_media_notification_producer.h b/chrome/browser/ui/global_media_controls/cast_media_notification_producer.h
index 79f0963ba19177..fb57b5c4800bbd 100644
--- a/chrome/browser/ui/global_media_controls/cast_media_notification_producer.h
+++ b/chrome/browser/ui/global_media_controls/cast_media_notification_producer.h
@@ -59,9 +59,8 @@ class CastMediaNotificationProducer
   void OnMediaItemUIDismissed(const std::string& id) override;
 
   // media_router::MediaRoutesObserver:
-  void OnRoutesUpdated(const std::vector<media_router::MediaRoute>& routes,
-                       const std::vector<media_router::MediaRoute::Id>&
-                           joinable_route_ids) override;
+  void OnRoutesUpdated(
+      const std::vector<media_router::MediaRoute>& routes) override;
 
   size_t GetActiveItemCount() const;
   bool HasLocalMediaRoute() const;
diff --git a/chrome/browser/ui/global_media_controls/cast_media_notification_producer_unittest.cc b/chrome/browser/ui/global_media_controls/cast_media_notification_producer_unittest.cc
index 190b00b64d6d1a..8c7842dafde229 100644
--- a/chrome/browser/ui/global_media_controls/cast_media_notification_producer_unittest.cc
+++ b/chrome/browser/ui/global_media_controls/cast_media_notification_producer_unittest.cc
@@ -80,13 +80,13 @@ TEST_F(CastMediaNotificationProducerTest, AddAndRemoveRoute) {
   MediaRoute route = CreateRoute(route_id);
 
   EXPECT_CALL(items_changed_callback_, Run());
-  notification_producer_->OnRoutesUpdated({route}, {});
+  notification_producer_->OnRoutesUpdated({route});
   testing::Mock::VerifyAndClearExpectations(&items_changed_callback_);
   EXPECT_EQ(1u, notification_producer_->GetActiveItemCount());
   EXPECT_NE(nullptr, notification_producer_->GetMediaItem(route_id));
 
   EXPECT_CALL(items_changed_callback_, Run());
-  notification_producer_->OnRoutesUpdated({}, {});
+  notification_producer_->OnRoutesUpdated({});
   testing::Mock::VerifyAndClearExpectations(&items_changed_callback_);
   EXPECT_EQ(0u, notification_producer_->GetActiveItemCount());
 }
@@ -95,7 +95,7 @@ TEST_F(CastMediaNotificationProducerTest, UpdateRoute) {
   const std::string route_id = "route-id-1";
   MediaRoute route = CreateRoute(route_id);
 
-  notification_producer_->OnRoutesUpdated({route}, {});
+  notification_producer_->OnRoutesUpdated({route});
   auto* item = static_cast<CastMediaNotificationItem*>(
       notification_producer_->GetMediaItem(route_id).get());
   NiceMock<media_message_center::test::MockMediaNotificationView> view;
@@ -112,7 +112,7 @@ TEST_F(CastMediaNotificationProducerTest, UpdateRoute) {
         EXPECT_EQ(base::UTF8ToUTF16(new_description + separator + new_sink),
                   metadata.source_title);
       });
-  notification_producer_->OnRoutesUpdated({route}, {});
+  notification_producer_->OnRoutesUpdated({route});
 }
 
 TEST_F(CastMediaNotificationProducerTest, RoutesWithoutNotifications) {
@@ -124,7 +124,7 @@ TEST_F(CastMediaNotificationProducerTest, RoutesWithoutNotifications) {
   MediaRoute multizone_member_route = CreateRoute("route-3", "cast:705D30C6");
 
   notification_producer_->OnRoutesUpdated(
-      {non_display_route, no_controller_route, multizone_member_route}, {});
+      {non_display_route, no_controller_route, multizone_member_route});
   EXPECT_EQ(0u, notification_producer_->GetActiveItemCount());
 }
 
@@ -133,14 +133,14 @@ TEST_F(CastMediaNotificationProducerTest, DismissNotification) {
   const std::string route_id2 = "route-id-2";
   MediaRoute route1 = CreateRoute(route_id1);
   MediaRoute route2 = CreateRoute(route_id2);
-  notification_producer_->OnRoutesUpdated({route1}, {});
+  notification_producer_->OnRoutesUpdated({route1});
   EXPECT_EQ(1u, notification_producer_->GetActiveItemCount());
 
   notification_producer_->OnMediaItemUIDismissed(route_id1);
   EXPECT_EQ(0u, notification_producer_->GetActiveItemCount());
 
   // Adding another route should not bring back the dismissed notification.
-  notification_producer_->OnRoutesUpdated({route1, route2}, {});
+  notification_producer_->OnRoutesUpdated({route1, route2});
   EXPECT_EQ(1u, notification_producer_->GetActiveItemCount());
 }
 
@@ -155,9 +155,8 @@ TEST_F(CastMediaNotificationProducerCastStartStopTest,
   MediaRoute connecting_route = CreateRoute("route-4");
   connecting_route.set_is_connecting(true);
 
-  notification_producer_->OnRoutesUpdated(
-      {non_display_route, mirroring_route, multizone_member_route,
-       connecting_route},
-      {});
+  notification_producer_->OnRoutesUpdated({non_display_route, mirroring_route,
+                                           multizone_member_route,
+                                           connecting_route});
   EXPECT_EQ(0u, notification_producer_->GetActiveItemCount());
 }
diff --git a/chrome/browser/ui/global_media_controls/media_notification_service_unittest.cc b/chrome/browser/ui/global_media_controls/media_notification_service_unittest.cc
index 025ded71afae50..d99e7b3c20b1ca 100644
--- a/chrome/browser/ui/global_media_controls/media_notification_service_unittest.cc
+++ b/chrome/browser/ui/global_media_controls/media_notification_service_unittest.cc
@@ -157,7 +157,7 @@ class MediaNotificationServiceTest : public ChromeRenderViewHostTestHarness {
 
   void SimulateMediaRoutesUpdate(
       const std::vector<media_router::MediaRoute>& routes) {
-    service_->cast_notification_producer_->OnRoutesUpdated(routes, {});
+    service_->cast_notification_producer_->OnRoutesUpdated(routes);
   }
 
   MediaNotificationService::PresentationManagerObservation*
diff --git a/chrome/browser/ui/media_router/media_router_ui.cc b/chrome/browser/ui/media_router/media_router_ui.cc
index 173eea9b07a661..a0bd208e7d3105 100644
--- a/chrome/browser/ui/media_router/media_router_ui.cc
+++ b/chrome/browser/ui/media_router/media_router_ui.cc
@@ -84,16 +84,6 @@ std::u16string GetSinkFriendlyName(const MediaSink& sink) {
                                               : sink.name());
 }
 
-// Returns the first source in |sources| that can be connected to, or an empty
-// source if there is none.  This is used by the Media Router to find such a
-// matching route if it exists.
-MediaSource GetSourceForRouteObserver(const std::vector<MediaSource>& sources) {
-  auto source_it = std::find_if(
-      sources.begin(), sources.end(),
-      [](const auto& source) { return source.IsCastPresentationUrl(); });
-  return source_it != sources.end() ? *source_it : MediaSource(std::string());
-}
-
 void MaybeReportCastingSource(MediaCastMode cast_mode,
                               const RouteRequestResult& result) {
   if (result.result_code() == RouteRequestResult::OK)
@@ -345,9 +335,8 @@ void MediaRouterUI::InitWithDefaultMediaSource() {
   } else {
     // Register for MediaRoute updates without a media source.
     routes_observer_ = std::make_unique<UIMediaRoutesObserver>(
-        GetMediaRouter(), MediaSource::Id(),
-        base::BindRepeating(&MediaRouterUI::OnRoutesUpdated,
-                            base::Unretained(this)));
+        GetMediaRouter(), base::BindRepeating(&MediaRouterUI::OnRoutesUpdated,
+                                              base::Unretained(this)));
   }
 }
 
@@ -565,18 +554,16 @@ void MediaRouterUI::UiIssuesObserver::OnIssuesCleared() {
 
 MediaRouterUI::UIMediaRoutesObserver::UIMediaRoutesObserver(
     MediaRouter* router,
-    const MediaSource::Id& source_id,
     const RoutesUpdatedCallback& callback)
-    : MediaRoutesObserver(router, source_id), callback_(callback) {
+    : MediaRoutesObserver(router), callback_(callback) {
   DCHECK(!callback_.is_null());
 }
 
 MediaRouterUI::UIMediaRoutesObserver::~UIMediaRoutesObserver() = default;
 
 void MediaRouterUI::UIMediaRoutesObserver::OnRoutesUpdated(
-    const std::vector<MediaRoute>& routes,
-    const std::vector<MediaRoute::Id>& joinable_route_ids) {
-  callback_.Run(routes, joinable_route_ids);
+    const std::vector<MediaRoute>& routes) {
+  callback_.Run(routes);
 }
 
 std::vector<MediaSource> MediaRouterUI::GetSourcesForCastMode(
@@ -609,8 +596,7 @@ void MediaRouterUI::InitCommon() {
 
   // Get the current list of media routes, so that the WebUI will have routes
   // information at initialization.
-  OnRoutesUpdated(GetMediaRouter()->GetCurrentRoutes(),
-                  std::vector<MediaRoute::Id>());
+  OnRoutesUpdated(GetMediaRouter()->GetCurrentRoutes());
   display_observer_ = WebContentsDisplayObserver::Create(
       initiator_,
       base::BindRepeating(&MediaRouterUI::UpdateSinks, base::Unretained(this)));
@@ -655,17 +641,10 @@ void MediaRouterUI::OnDefaultPresentationChanged(
   query_result_manager_->SetSourcesForCastMode(
       MediaCastMode::PRESENTATION, sources,
       presentation_request_->frame_origin);
-  // Register for MediaRoute updates.  NOTE(mfoltz): If there are multiple
-  // sources that can be connected to via the dialog, this will break.  We will
-  // need to observe multiple sources (keyed by sinks) in that case.  As this is
-  // Cast-specific for the foreseeable future, it may be simpler to plumb a new
-  // observer API for this case.
-  const MediaSource source_for_route_observer =
-      GetSourceForRouteObserver(sources);
+  // Register for MediaRoute updates.
   routes_observer_ = std::make_unique<UIMediaRoutesObserver>(
-      GetMediaRouter(), source_for_route_observer.id(),
-      base::BindRepeating(&MediaRouterUI::OnRoutesUpdated,
-                          base::Unretained(this)));
+      GetMediaRouter(), base::BindRepeating(&MediaRouterUI::OnRoutesUpdated,
+                                            base::Unretained(this)));
   UpdateModelHeader();
 }
 
@@ -673,11 +652,10 @@ void MediaRouterUI::OnDefaultPresentationRemoved() {
   presentation_request_.reset();
   query_result_manager_->RemoveSourcesForCastMode(MediaCastMode::PRESENTATION);
 
-  // Register for MediaRoute updates without a media source.
+  // Register for MediaRoute updates.
   routes_observer_ = std::make_unique<UIMediaRoutesObserver>(
-      GetMediaRouter(), MediaSource::Id(),
-      base::BindRepeating(&MediaRouterUI::OnRoutesUpdated,
-                          base::Unretained(this)));
+      GetMediaRouter(), base::BindRepeating(&MediaRouterUI::OnRoutesUpdated,
+                                            base::Unretained(this)));
 
   UpdateModelHeader();
 }
@@ -873,9 +851,7 @@ void MediaRouterUI::OnIssueCleared() {
   UpdateSinks();
 }
 
-void MediaRouterUI::OnRoutesUpdated(
-    const std::vector<MediaRoute>& routes,
-    const std::vector<MediaRoute::Id>& joinable_route_ids) {
+void MediaRouterUI::OnRoutesUpdated(const std::vector<MediaRoute>& routes) {
   routes_.clear();
 
   for (const MediaRoute& route : routes) {
diff --git a/chrome/browser/ui/media_router/media_router_ui.h b/chrome/browser/ui/media_router/media_router_ui.h
index 9296a4c37a50ed..b99ba485b71274 100644
--- a/chrome/browser/ui/media_router/media_router_ui.h
+++ b/chrome/browser/ui/media_router/media_router_ui.h
@@ -201,10 +201,8 @@ class MediaRouterUI
   class UIMediaRoutesObserver : public MediaRoutesObserver {
    public:
     using RoutesUpdatedCallback =
-        base::RepeatingCallback<void(const std::vector<MediaRoute>&,
-                                     const std::vector<MediaRoute::Id>&)>;
+        base::RepeatingCallback<void(const std::vector<MediaRoute>&)>;
     UIMediaRoutesObserver(MediaRouter* router,
-                          const MediaSource::Id& source_id,
                           const RoutesUpdatedCallback& callback);
 
     UIMediaRoutesObserver(const UIMediaRoutesObserver&) = delete;
@@ -213,9 +211,7 @@ class MediaRouterUI
     ~UIMediaRoutesObserver() override;
 
     // MediaRoutesObserver:
-    void OnRoutesUpdated(
-        const std::vector<MediaRoute>& routes,
-        const std::vector<MediaRoute::Id>& joinable_route_ids) override;
+    void OnRoutesUpdated(const std::vector<MediaRoute>& routes) override;
 
    private:
     // Callback to the owning MediaRouterUI instance.
@@ -283,8 +279,7 @@ class MediaRouterUI
   void OnIssueCleared();
 
   // Called by |routes_observer_| when the set of active routes has changed.
-  void OnRoutesUpdated(const std::vector<MediaRoute>& routes,
-                       const std::vector<MediaRoute::Id>& joinable_route_ids);
+  void OnRoutesUpdated(const std::vector<MediaRoute>& routes);
 
   // QueryResultManager::Observer:
   void OnResultsUpdated(
diff --git a/chrome/browser/ui/media_router/media_router_ui_unittest.cc b/chrome/browser/ui/media_router/media_router_ui_unittest.cc
index 91356e62ecaad6..b6e4b6638aec27 100644
--- a/chrome/browser/ui/media_router/media_router_ui_unittest.cc
+++ b/chrome/browser/ui/media_router/media_router_ui_unittest.cc
@@ -189,10 +189,8 @@ class MediaRouterViewsUITest : public ChromeRenderViewHostTestHarness {
       const std::vector<MediaSinkWithCastModes>& sinks) {
     ui_->OnResultsUpdated(sinks);
   }
-  void NotifyUiOnRoutesUpdated(
-      const std::vector<MediaRoute>& routes,
-      const std::vector<MediaRoute::Id>& joinable_route_ids) {
-    ui_->OnRoutesUpdated(routes, joinable_route_ids);
+  void NotifyUiOnRoutesUpdated(const std::vector<MediaRoute>& routes) {
+    ui_->OnRoutesUpdated(routes);
   }
 
   void StartTabCasting(bool is_incognito) {
@@ -302,7 +300,7 @@ TEST_F(MediaRouterViewsUITest, NotifyObserver) {
             EXPECT_EQ(UIMediaSinkState::CONNECTED, ui_sink.state);
             EXPECT_EQ(route.media_route_id(), ui_sink.route->media_route_id());
           })));
-  NotifyUiOnRoutesUpdated({route}, {});
+  NotifyUiOnRoutesUpdated({route});
 
   EXPECT_CALL(observer, OnControllerInvalidatedInternal());
   ui_.reset();
@@ -418,7 +416,7 @@ TEST_F(MediaRouterViewsUITest, ConnectingState) {
         EXPECT_EQ(UIMediaSinkState::CONNECTED, model.media_sinks()[0].state);
       })));
   MediaRoute route(kRouteId, MediaSource(kSourceId), kSinkId, "", true, true);
-  NotifyUiOnRoutesUpdated({route}, {});
+  NotifyUiOnRoutesUpdated({route});
 }
 
 TEST_F(MediaRouterViewsUITest, DisconnectingState) {
@@ -428,7 +426,7 @@ TEST_F(MediaRouterViewsUITest, DisconnectingState) {
   MediaRoute route(kRouteId, MediaSource(kSourceId), kSinkId, "", true, true);
   for (MediaSinksObserver* sinks_observer : media_sinks_observers_)
     sinks_observer->OnSinksUpdated({sink}, std::vector<url::Origin>());
-  NotifyUiOnRoutesUpdated({route}, {});
+  NotifyUiOnRoutesUpdated({route});
 
   // When a request to stop casting to a sink is made, its state should become
   // DISCONNECTING.
@@ -446,7 +444,7 @@ TEST_F(MediaRouterViewsUITest, DisconnectingState) {
         ASSERT_EQ(1u, model.media_sinks().size());
         EXPECT_EQ(UIMediaSinkState::AVAILABLE, model.media_sinks()[0].state);
       })));
-  NotifyUiOnRoutesUpdated({}, {});
+  NotifyUiOnRoutesUpdated({});
 }
 
 TEST_F(MediaRouterViewsUITest, AddAndRemoveIssue) {
@@ -617,7 +615,7 @@ TEST_F(MediaRouterViewsUITest, FilterNonDisplayRoutes) {
                              true, true);
 
   NotifyUiOnRoutesUpdated(
-      {display_route_1, non_display_route_1, display_route_2}, {});
+      {display_route_1, non_display_route_1, display_route_2});
   ASSERT_EQ(2u, ui_->routes().size());
   EXPECT_EQ(display_route_1, ui_->routes()[0]);
   EXPECT_TRUE(ui_->routes()[0].for_display());
diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc
index 3844fb496ba7bc..91d46a7374dc64 100644
--- a/chrome/browser/ui/startup/bad_flags_prompt.cc
+++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
@@ -25,8 +25,6 @@
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
 #include "components/infobars/content/content_infobar_manager.h"
 #include "components/infobars/core/infobar_delegate.h"
-#include "components/nacl/common/buildflags.h"
-#include "components/nacl/common/nacl_switches.h"
 #include "components/network_session_configurator/common/network_switches.h"
 #include "components/startup_metric_utils/browser/startup_metric_utils.h"
 #include "components/translate/core/common/translate_switches.h"
@@ -68,9 +66,6 @@ static const char* kBadFlags[] = {
 #endif
     switches::kDisableSiteIsolation,
     switches::kDisableWebSecurity,
-#if BUILDFLAG(ENABLE_NACL)
-    switches::kNaClDangerousNoSandboxNonSfi,
-#endif
     switches::kSingleProcess,
 
     // These flags disable or undermine the Same Origin Policy.
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index c8421f4528b25e..bfd2cf06cca7ac 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -513,10 +513,6 @@ StartupBrowserCreatorImpl::DetermineStartupTabs(
         StartupTabs new_features_tabs;
         new_features_tabs = provider.GetNewFeaturesTabs(whats_new_enabled);
         AppendTabs(new_features_tabs, &tabs);
-      } else {
-        // Record the current version so that What's New will not be shown until
-        // after the next major version update.
-        whats_new::SetLastVersion(g_browser_process->local_state());
       }
     }
 
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc
index 5cfd41b51a5dd1..73182166e6b552 100644
--- a/chrome/browser/ui/toolbar/back_forward_menu_model.cc
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc
@@ -292,6 +292,8 @@ void BackForwardMenuModel::OnFavIconDataAvailable(
 
 int BackForwardMenuModel::GetHistoryItemCount() const {
   WebContents* contents = GetWebContents();
+  if (!contents)
+    return 0;
 
   int items = contents->GetController().GetCurrentEntryIndex();
   if (model_type_ == ModelType::kForward) {
diff --git a/chrome/browser/ui/toolbar/media_router_action_controller.cc b/chrome/browser/ui/toolbar/media_router_action_controller.cc
index 2bb7c1dcfa81b0..10a57f32ff3565 100644
--- a/chrome/browser/ui/toolbar/media_router_action_controller.cc
+++ b/chrome/browser/ui/toolbar/media_router_action_controller.cc
@@ -61,8 +61,7 @@ void MediaRouterActionController::OnIssuesCleared() {
 }
 
 void MediaRouterActionController::OnRoutesUpdated(
-    const std::vector<media_router::MediaRoute>& routes,
-    const std::vector<media_router::MediaRoute::Id>& joinable_route_ids) {
+    const std::vector<media_router::MediaRoute>& routes) {
   has_local_display_route_ =
       std::find_if(routes.begin(), routes.end(),
                    [this](const media_router::MediaRoute& route) {
diff --git a/chrome/browser/ui/toolbar/media_router_action_controller.h b/chrome/browser/ui/toolbar/media_router_action_controller.h
index 08b0c53f901dd4..863e5c9b468be5 100644
--- a/chrome/browser/ui/toolbar/media_router_action_controller.h
+++ b/chrome/browser/ui/toolbar/media_router_action_controller.h
@@ -66,9 +66,8 @@ class MediaRouterActionController : public media_router::IssuesObserver,
   void OnIssuesCleared() override;
 
   // media_router::MediaRoutesObserver:
-  void OnRoutesUpdated(const std::vector<media_router::MediaRoute>& routes,
-                       const std::vector<media_router::MediaRoute::Id>&
-                           joinable_route_ids) override;
+  void OnRoutesUpdated(
+      const std::vector<media_router::MediaRoute>& routes) override;
 
   // Called when a Media Router dialog is shown or hidden, and updates the
   // visibility of the action icon. Overridden in tests.
diff --git a/chrome/browser/ui/toolbar/media_router_action_controller_unittest.cc b/chrome/browser/ui/toolbar/media_router_action_controller_unittest.cc
index 77dfe5ac129f40..d89bb51b4e416b 100644
--- a/chrome/browser/ui/toolbar/media_router_action_controller_unittest.cc
+++ b/chrome/browser/ui/toolbar/media_router_action_controller_unittest.cc
@@ -96,7 +96,6 @@ class MediaRouterActionControllerUnitTest : public BrowserWithTestWindowTest {
 
   std::vector<media_router::MediaRoute> local_display_route_list_;
   std::vector<media_router::MediaRoute> non_local_display_route_list_;
-  std::vector<media_router::MediaRoute::Id> empty_route_id_list_;
 };
 
 // TODO(b/185139027): Remove this class once
@@ -130,12 +129,11 @@ TEST_F(MediaRouterActionControllerUnitTest, EphemeralIconForRoutesAndIssues) {
   EXPECT_FALSE(IsIconShown());
 
   // Creating a local route should show the action icon.
-  controller_->OnRoutesUpdated(local_display_route_list_, empty_route_id_list_);
+  controller_->OnRoutesUpdated(local_display_route_list_);
   EXPECT_TRUE(controller_->has_local_display_route_);
   EXPECT_TRUE(IsIconShown());
   // Removing the local route should hide the icon.
-  controller_->OnRoutesUpdated(non_local_display_route_list_,
-                               empty_route_id_list_);
+  controller_->OnRoutesUpdated(non_local_display_route_list_);
   EXPECT_FALSE(controller_->has_local_display_route_);
   EXPECT_FALSE(IsIconShown());
 
@@ -149,13 +147,12 @@ TEST_F(MediaRouterActionControllerUnitTest, EphemeralIconForRoutesAndIssues) {
   EXPECT_FALSE(IsIconShown());
 
   controller_->OnIssue(issue_);
-  controller_->OnRoutesUpdated(local_display_route_list_, empty_route_id_list_);
+  controller_->OnRoutesUpdated(local_display_route_list_);
   controller_->OnIssuesCleared();
   // When the issue disappears, the icon should remain visible if there's
   // a local route.
   EXPECT_TRUE(IsIconShown());
-  controller_->OnRoutesUpdated(std::vector<media_router::MediaRoute>(),
-                               empty_route_id_list_);
+  controller_->OnRoutesUpdated(std::vector<media_router::MediaRoute>());
   EXPECT_FALSE(IsIconShown());
 }
 
@@ -177,12 +174,11 @@ TEST_F(MediaRouterActionControllerUnitTest, EphemeralIconForDialog) {
 
   controller_->OnDialogShown();
   EXPECT_TRUE(IsIconShown());
-  controller_->OnRoutesUpdated(local_display_route_list_, empty_route_id_list_);
+  controller_->OnRoutesUpdated(local_display_route_list_);
   // Hiding the dialog while there are local routes shouldn't hide the icon.
   controller_->OnDialogHidden();
   EXPECT_TRUE(IsIconShown());
-  controller_->OnRoutesUpdated(non_local_display_route_list_,
-                               empty_route_id_list_);
+  controller_->OnRoutesUpdated(non_local_display_route_list_);
   EXPECT_FALSE(IsIconShown());
 
   controller_->OnDialogShown();
@@ -217,14 +213,13 @@ TEST_F(MediaRouterActionControllerUnitTest, ObserveAlwaysShowPrefChange) {
   SetAlwaysShowActionPref(true);
   EXPECT_TRUE(IsIconShown());
 
-  controller_->OnRoutesUpdated(local_display_route_list_, empty_route_id_list_);
+  controller_->OnRoutesUpdated(local_display_route_list_);
   SetAlwaysShowActionPref(false);
   // Unchecking the option while having a local route shouldn't hide the icon.
   EXPECT_TRUE(IsIconShown());
 
   SetAlwaysShowActionPref(true);
-  controller_->OnRoutesUpdated(non_local_display_route_list_,
-                               empty_route_id_list_);
+  controller_->OnRoutesUpdated(non_local_display_route_list_);
   // Removing the local route should not hide the icon.
   EXPECT_TRUE(IsIconShown());
 
@@ -236,12 +231,10 @@ TEST_F(MediaRouterActionControllerGMCUnitTest,
        EphemeralIconForMirroringSessions) {
   EXPECT_FALSE(IsIconShown());
   // Creating a cast route should not show the action icon.
-  controller_->OnRoutesUpdated({local_display_cast_route_list_},
-                               empty_route_id_list_);
+  controller_->OnRoutesUpdated({local_display_cast_route_list_});
   EXPECT_FALSE(IsIconShown());
 
   // Creating a local mirroring route should show the action icon.
-  controller_->OnRoutesUpdated(local_display_mirroring_route_list_,
-                               empty_route_id_list_);
+  controller_->OnRoutesUpdated(local_display_mirroring_route_list_);
   EXPECT_TRUE(IsIconShown());
 }
diff --git a/chrome/browser/ui/toolbar/mock_media_router_action_controller.h b/chrome/browser/ui/toolbar/mock_media_router_action_controller.h
index fddacf788d36d4..cd3189d76a849e 100644
--- a/chrome/browser/ui/toolbar/mock_media_router_action_controller.h
+++ b/chrome/browser/ui/toolbar/mock_media_router_action_controller.h
@@ -20,10 +20,8 @@ class MockMediaRouterActionController : public MediaRouterActionController {
   ~MockMediaRouterActionController() override;
 
   MOCK_METHOD1(OnIssueUpdated, void(const media_router::Issue* issue));
-  MOCK_METHOD2(OnRoutesUpdated,
-               void(const std::vector<media_router::MediaRoute>& routes,
-                    const std::vector<media_router::MediaRoute::Id>&
-                        joinable_route_ids));
+  MOCK_METHOD1(OnRoutesUpdated,
+               void(const std::vector<media_router::MediaRoute>& routes));
   MOCK_METHOD0(OnDialogShown, void());
   MOCK_METHOD0(OnDialogHidden, void());
   MOCK_METHOD0(OnContextMenuShown, void());
diff --git a/chrome/browser/ui/views/global_media_controls/media_dialog_view_interactive_browsertest.cc b/chrome/browser/ui/views/global_media_controls/media_dialog_view_interactive_browsertest.cc
index 844a811755de39..abfd72538cba13 100644
--- a/chrome/browser/ui/views/global_media_controls/media_dialog_view_interactive_browsertest.cc
+++ b/chrome/browser/ui/views/global_media_controls/media_dialog_view_interactive_browsertest.cc
@@ -325,7 +325,7 @@ class TestMediaRouter : public media_router::MockMediaRouter {
   void NotifyMediaRoutesChanged(
       const std::vector<media_router::MediaRoute>& routes) {
     for (auto* observer : routes_observers_)
-      observer->OnRoutesUpdated(routes, {});
+      observer->OnRoutesUpdated(routes);
   }
 
  private:
diff --git a/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.cc b/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.cc
index 6bac676d2d89dd..875a4f77b86232 100644
--- a/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.cc
+++ b/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.cc
@@ -52,7 +52,7 @@ constexpr gfx::Insets kExpandButtonBorderInsets{4, 8};
 
 // Constant for DropdownButton
 const int kDropdownButtonIconSize = 15;
-const int kDropdownButtonBackgroundRadius = 15;
+const int kDropdownButtonBackgroundRadius = 10;
 constexpr gfx::Insets kDropdownButtonBorderInsets{4};
 
 // The maximum number of audio devices to count when recording the
@@ -168,7 +168,6 @@ void ExpandDeviceSelectorButton::OnColorsChanged(SkColor foreground_color) {
       vector_icons::kCaretUpIcon, kDropdownButtonIconSize, foreground_color);
   SetToggledImage(views::Button::STATE_NORMAL, &caret_down_image);
   views::InkDrop::Get(this)->SetBaseColor(foreground_color);
-  SetHighlighted(true);
 }
 
 MediaItemUIDeviceSelectorView::MediaItemUIDeviceSelectorView(
@@ -508,12 +507,6 @@ bool MediaItemUIDeviceSelectorView::IsDeviceSelectorExpanded() {
   return is_expanded_;
 }
 
-bool MediaItemUIDeviceSelectorView::OnMousePressed(
-    const ui::MouseEvent& event) {
-  // Stop the mouse click event from bubbling to parent views.
-  return true;
-}
-
 void MediaItemUIDeviceSelectorView::AddObserver(
     MediaItemUIDeviceSelectorObserver* observer) {
   observers_.AddObserver(observer);
diff --git a/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.h b/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.h
index b6b609ab376da7..384ed0e4c286e1 100644
--- a/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.h
+++ b/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.h
@@ -87,9 +87,6 @@ class MediaItemUIDeviceSelectorView
   void OnDropdownButtonClicked() override;
   bool IsDeviceSelectorExpanded() override;
 
-  // views::View
-  bool OnMousePressed(const ui::MouseEvent& event) override;
-
   void AddObserver(MediaItemUIDeviceSelectorObserver* observer);
 
   views::Label* GetExpandDeviceSelectorLabelForTesting();
diff --git a/chrome/browser/ui/views/lens/lens_side_panel_controller.cc b/chrome/browser/ui/views/lens/lens_side_panel_controller.cc
index ca028a1c0662bf..2f2473de368715 100644
--- a/chrome/browser/ui/views/lens/lens_side_panel_controller.cc
+++ b/chrome/browser/ui/views/lens/lens_side_panel_controller.cc
@@ -72,6 +72,7 @@ void LensSidePanelController::OpenWithURL(
         base::UserMetricsAction("LensSidePanel.HideChromeSidePanel"));
     browser_view_->toolbar()->side_panel_button()->HideSidePanel();
   }
+
   side_panel_view_->GetWebContents()->GetController().LoadURLWithParams(
       content::NavigationController::LoadURLParams(params));
   if (side_panel_->GetVisible()) {
@@ -150,4 +151,12 @@ void LensSidePanelController::CloseButtonClicked() {
   Close();
 }
 
+void LensSidePanelController::LoadProgressChanged(double progress) {
+  if(progress == 1.0) {
+    side_panel_view_->SetContentVisible(true);
+  } else {
+    side_panel_view_->SetContentVisible(false);
+  }
+}
+
 }  // namespace lens
diff --git a/chrome/browser/ui/views/lens/lens_side_panel_controller.h b/chrome/browser/ui/views/lens/lens_side_panel_controller.h
index 9fa3f76402ed65..07e97af42233a7 100644
--- a/chrome/browser/ui/views/lens/lens_side_panel_controller.h
+++ b/chrome/browser/ui/views/lens/lens_side_panel_controller.h
@@ -31,6 +31,8 @@ class LensSidePanelController : public content::WebContentsObserver,
   LensSidePanelController& operator=(const LensSidePanelController&) = delete;
   ~LensSidePanelController() override;
 
+  void LoadProgressChanged(double progress) override;
+
   // Opens the Lens side panel with the given Lens results URL.
   void OpenWithURL(const content::OpenURLParams& params);
 
diff --git a/chrome/browser/ui/views/lens/lens_side_panel_view.cc b/chrome/browser/ui/views/lens/lens_side_panel_view.cc
index 44fe73caa9567a..ef25663b0ef17c 100644
--- a/chrome/browser/ui/views/lens/lens_side_panel_view.cc
+++ b/chrome/browser/ui/views/lens/lens_side_panel_view.cc
@@ -76,6 +76,13 @@ namespace lens {
 constexpr int kDefaultSidePanelHeaderHeight = 40;
 constexpr int kGoogleLensLogoWidth = 87;
 constexpr int kGoogleLensLogoHeight = 16;
+const char kStaticGhostCardDataURL[] =
+    "data:text/html;charset=utf-8,"
+    "<!DOCTYPE html>"
+    "<style>"
+    "html, body {"
+    "background-image: url('https://www.gstatic.com/lens/web/ui/side_panel_loading.gif');"
+    "}</style>";
 
 LensSidePanelView::LensSidePanelView(content::BrowserContext* browser_context,
                                      base::RepeatingClosure close_callback,
@@ -87,7 +94,12 @@ LensSidePanelView::LensSidePanelView(content::BrowserContext* browser_context,
   SetCrossAxisAlignment(views::LayoutAlignment::kStretch);
   CreateAndInstallHeader(close_callback, launch_callback);
   separator_ = AddChildView(std::make_unique<views::Separator>());
+  loading_indicator_web_view_ = AddChildView(CreateWebView(this, browser_context));
+  loading_indicator_web_view_->GetWebContents()->GetController().LoadURL(
+        GURL(kStaticGhostCardDataURL), content::Referrer(), ui::PAGE_TRANSITION_FROM_API,
+        std::string());
   web_view_ = AddChildView(CreateWebView(this, browser_context));
+  web_view_->SetVisible(false);
 }
 
 content::WebContents* LensSidePanelView::GetWebContents() {
@@ -99,13 +111,16 @@ void LensSidePanelView::OnThemeChanged() {
   const auto* color_provider = GetColorProvider();
   separator_->SetColor(color_provider->GetColor(ui::kColorMenuSeparator));
 
-  const SkColor color = color_provider->GetColor(ui::kColorIcon);
   // kGoogleLensFullLogoIcon is rectangular. We should create a tiled image so
   // that the coordinates and scale are correct. The vector icon should have its
-  // own fill color.
-  gfx::ImageSkia image = gfx::ImageSkiaOperations::CreateTiledImage(
-      gfx::CreateVectorIcon(kGoogleLensFullLogoIcon, color), 0, 0,
-      kGoogleLensLogoWidth, kGoogleLensLogoHeight);
+  // own fill color. The same applies to the dark mode icon.
+  const SkColor color = color_provider->GetColor(ui::kColorIcon);
+  const gfx::VectorIcon& icon = GetNativeTheme()->ShouldUseDarkColors()
+                                    ? kGoogleLensFullLogoDarkIcon
+                                    : kGoogleLensFullLogoIcon;
+  const gfx::ImageSkia image = gfx::ImageSkiaOperations::CreateTiledImage(
+      gfx::CreateVectorIcon(icon, color), 0, 0, kGoogleLensLogoWidth,
+      kGoogleLensLogoHeight);
   branding_->SetImage(image);
 }
 
@@ -162,6 +177,11 @@ void LensSidePanelView::CreateAndInstallHeader(
   AddChildView(std::move(header));
 }
 
+void LensSidePanelView::SetContentVisible(bool visible) {
+  web_view_->SetVisible(visible);
+  loading_indicator_web_view_->SetVisible(!visible);
+}
+
 LensSidePanelView::~LensSidePanelView() = default;
 
 }  // namespace lens
diff --git a/chrome/browser/ui/views/lens/lens_side_panel_view.h b/chrome/browser/ui/views/lens/lens_side_panel_view.h
index 501669e0687516..8f3e42de158687 100644
--- a/chrome/browser/ui/views/lens/lens_side_panel_view.h
+++ b/chrome/browser/ui/views/lens/lens_side_panel_view.h
@@ -36,12 +36,15 @@ class LensSidePanelView : public views::FlexLayoutView {
   // views::FlexLayoutView:
   void OnThemeChanged() override;
 
+  void SetContentVisible(bool visible);
+
  private:
   void CreateAndInstallHeader(base::RepeatingClosure close_callback,
                               base::RepeatingClosure launch_callback);
 
   raw_ptr<views::ImageView> branding_;
   raw_ptr<views::Separator> separator_;
+  raw_ptr<views::WebView> loading_indicator_web_view_;
   raw_ptr<views::WebView> web_view_;
   raw_ptr<views::ImageButton> close_button_;
   raw_ptr<views::ImageButton> launch_button_;
diff --git a/chrome/browser/ui/views/media_router/cast_toolbar_button.cc b/chrome/browser/ui/views/media_router/cast_toolbar_button.cc
index 84b41b4d0abcd0..18990a8f7ff7e2 100644
--- a/chrome/browser/ui/views/media_router/cast_toolbar_button.cc
+++ b/chrome/browser/ui/views/media_router/cast_toolbar_button.cc
@@ -117,8 +117,7 @@ void CastToolbarButton::OnIssuesCleared() {
 }
 
 void CastToolbarButton::OnRoutesUpdated(
-    const std::vector<media_router::MediaRoute>& routes,
-    const std::vector<media_router::MediaRoute::Id>& joinable_route_ids) {
+    const std::vector<media_router::MediaRoute>& routes) {
   has_local_display_route_ =
       std::find_if(routes.begin(), routes.end(),
                    [](const media_router::MediaRoute& route) {
diff --git a/chrome/browser/ui/views/media_router/cast_toolbar_button.h b/chrome/browser/ui/views/media_router/cast_toolbar_button.h
index 74b19e06c3ed24..be2bef2a0be03b 100644
--- a/chrome/browser/ui/views/media_router/cast_toolbar_button.h
+++ b/chrome/browser/ui/views/media_router/cast_toolbar_button.h
@@ -53,9 +53,8 @@ class CastToolbarButton : public ToolbarButton,
   void OnIssuesCleared() override;
 
   // media_router::MediaRoutesObserver:
-  void OnRoutesUpdated(const std::vector<media_router::MediaRoute>& routes,
-                       const std::vector<media_router::MediaRoute::Id>&
-                           joinable_route_ids) override;
+  void OnRoutesUpdated(
+      const std::vector<media_router::MediaRoute>& routes) override;
 
   // ToolbarButton:
   bool OnMousePressed(const ui::MouseEvent& event) override;
diff --git a/chrome/browser/ui/views/media_router/cast_toolbar_button_unittest.cc b/chrome/browser/ui/views/media_router/cast_toolbar_button_unittest.cc
index 2aa7a5217f8e19..5629287123a495 100644
--- a/chrome/browser/ui/views/media_router/cast_toolbar_button_unittest.cc
+++ b/chrome/browser/ui/views/media_router/cast_toolbar_button_unittest.cc
@@ -187,15 +187,15 @@ TEST_F(CastToolbarButtonTest, UpdateRoutes) {
   button_->UpdateIcon();
   EXPECT_TRUE(gfx::test::AreImagesEqual(idle_icon_, GetIcon()));
 
-  button_->OnRoutesUpdated(local_display_route_list_, {});
+  button_->OnRoutesUpdated(local_display_route_list_);
   EXPECT_TRUE(gfx::test::AreImagesEqual(active_icon_, GetIcon()));
 
   // The idle icon should be shown when we only have non-local and/or
   // non-display routes.
-  button_->OnRoutesUpdated(non_local_display_route_list_, {});
+  button_->OnRoutesUpdated(non_local_display_route_list_);
   EXPECT_TRUE(gfx::test::AreImagesEqual(idle_icon_, GetIcon()));
 
-  button_->OnRoutesUpdated({}, {});
+  button_->OnRoutesUpdated({});
   EXPECT_TRUE(gfx::test::AreImagesEqual(idle_icon_, GetIcon()));
 }
 
diff --git a/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc b/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
index b41fd0f75bc1ab..02c1a38ea83a02 100644
--- a/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
+++ b/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
@@ -200,10 +200,9 @@ IN_PROC_BROWSER_TEST_F(MediaRouterUIBrowserTest,
   action_controller_->OnIssuesCleared();
   EXPECT_FALSE(ToolbarIconExists());
 
-  action_controller_->OnRoutesUpdated(routes_, std::vector<MediaRoute::Id>());
+  action_controller_->OnRoutesUpdated(routes_);
   EXPECT_TRUE(ToolbarIconExists());
-  action_controller_->OnRoutesUpdated(std::vector<MediaRoute>(),
-                                      std::vector<MediaRoute::Id>());
+  action_controller_->OnRoutesUpdated(std::vector<MediaRoute>());
   EXPECT_FALSE(ToolbarIconExists());
 
   SetAlwaysShowActionPref(true);
@@ -214,7 +213,7 @@ IN_PROC_BROWSER_TEST_F(MediaRouterUIBrowserTest,
 
 IN_PROC_BROWSER_TEST_F(MediaRouterUIBrowserTest,
                        EphemeralToolbarIconWithMultipleWindows) {
-  action_controller_->OnRoutesUpdated(routes_, std::vector<MediaRoute::Id>());
+  action_controller_->OnRoutesUpdated(routes_);
   EXPECT_TRUE(ToolbarIconExists());
 
   // Opening and closing a window shouldn't affect the state of the ephemeral
@@ -222,10 +221,9 @@ IN_PROC_BROWSER_TEST_F(MediaRouterUIBrowserTest,
   // also work.
   Browser* browser2 = CreateBrowser(browser()->profile());
   EXPECT_TRUE(ToolbarIconExists());
-  action_controller_->OnRoutesUpdated(std::vector<MediaRoute>(),
-                                      std::vector<MediaRoute::Id>());
+  action_controller_->OnRoutesUpdated(std::vector<MediaRoute>());
   EXPECT_FALSE(ToolbarIconExists());
-  action_controller_->OnRoutesUpdated(routes_, std::vector<MediaRoute::Id>());
+  action_controller_->OnRoutesUpdated(routes_);
   EXPECT_TRUE(ToolbarIconExists());
   browser2->window()->Close();
   EXPECT_TRUE(ToolbarIconExists());
diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
index 5205716ee2d62c..104c5239e25fb4 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
@@ -358,7 +358,7 @@ void OmniboxPopupContentsView::UpdatePopupAppearance() {
   }
 
   // Fix-up any matches due to tail suggestions, before display below.
-  edit_model_->autocomplete_controller()->InlineTailPrefixes();
+  edit_model_->autocomplete_controller()->SetTailSuggestContentPrefixes();
 
   // Update the match cached by each row, in the process of doing so make sure
   // we have enough row views.
diff --git a/chrome/browser/ui/views/page_info/page_info_history_controller.cc b/chrome/browser/ui/views/page_info/page_info_history_controller.cc
index bdc20d1ba03a35..acd2b193dce033 100644
--- a/chrome/browser/ui/views/page_info/page_info_history_controller.cc
+++ b/chrome/browser/ui/views/page_info/page_info_history_controller.cc
@@ -50,17 +50,14 @@ void PageInfoHistoryController::UpdateRow(base::Time last_visit) {
 
 std::unique_ptr<views::View> PageInfoHistoryController::CreateHistoryButton(
     std::u16string last_visit) {
-  // TODO(crbug.com/1275042): Use correct icons and strings (title, tooltip).
-  // TODO(crbug.com/1275042): Add on click handler to open the history webpage.
-  auto history_button = std::make_unique<PageInfoHoverButton>(
+  // TODO(crbug.com/1275042): Use correct icons and strings (tooltip).
+  return std::make_unique<PageInfoHoverButton>(
       base::BindRepeating(&PageInfoHistoryController::OpenHistoryPage,
                           weak_factory_.GetWeakPtr()),
-      PageInfoViewFactory::GetSiteSettingsIcon(), IDS_PAGE_INFO_COOKIES,
-      last_visit, 0,
+      PageInfoViewFactory::GetSiteSettingsIcon(), IDS_PAGE_INFO_HISTORY,
+      last_visit, PageInfoViewFactory::VIEW_ID_PAGE_INFO_HISTORY_BUTTON,
       /*tooltip_text=*/std::u16string(), std::u16string(),
       PageInfoViewFactory::GetLaunchIcon());
-  history_button->SetTitleText(u"History");
-  return history_button;
 }
 
 void PageInfoHistoryController::OpenHistoryPage() {
diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.h b/chrome/browser/ui/views/page_info/page_info_view_factory.h
index dfc2362c4477b5..da2d5152e3f205 100644
--- a/chrome/browser/ui/views/page_info/page_info_view_factory.h
+++ b/chrome/browser/ui/views/page_info/page_info_view_factory.h
@@ -55,6 +55,7 @@ class PageInfoViewFactory {
     VIEW_ID_PAGE_INFO_CURRENT_VIEW,
     VIEW_ID_PAGE_INFO_RESET_PERMISSIONS_BUTTON,
     VIEW_ID_PAGE_INFO_ABOUT_THIS_SITE_BUTTON,
+    VIEW_ID_PAGE_INFO_HISTORY_BUTTON
   };
 
   // Creates a separator view with padding on top and bottom. Use with flex
diff --git a/chrome/browser/ui/views/payments/payment_request_row_view.cc b/chrome/browser/ui/views/payments/payment_request_row_view.cc
index 0ff097247d1142..84d9c78093e49c 100644
--- a/chrome/browser/ui/views/payments/payment_request_row_view.cc
+++ b/chrome/browser/ui/views/payments/payment_request_row_view.cc
@@ -14,7 +14,10 @@
 #include "ui/color/color_provider.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
+#include "ui/views/controls/focus_ring.h"
 #include "ui/views/controls/label.h"
+#include "ui/views/layout/table_layout.h"
+#include "ui/views/view_class_properties.h"
 #include "ui/views/view_utils.h"
 #include "ui/views/widget/widget.h"
 
@@ -168,6 +171,11 @@ void PaymentRequestRowView::OnFocus() {
     SchedulePaint();
   }
   View::OnFocus();
+  views::FocusRing* focus_ring = views::FocusRing::Get(this);
+  views::TableLayout* layout =
+      static_cast<views::TableLayout*>(GetLayoutManager());
+  if (focus_ring && layout)
+    layout->SetChildViewIgnoredByLayout(focus_ring, true);
 }
 
 void PaymentRequestRowView::OnBlur() {
diff --git a/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc b/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
index 688f330c8448e3..f49e84de237b43 100644
--- a/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
+++ b/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
@@ -59,8 +59,9 @@
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/layout/box_layout.h"
-#include "ui/views/layout/fill_layout.h"
-#include "ui/views/layout/grid_layout.h"
+#include "ui/views/layout/box_layout_view.h"
+#include "ui/views/layout/table_layout.h"
+#include "ui/views/layout/table_layout_view.h"
 #include "ui/views/view.h"
 
 namespace payments {
@@ -132,8 +133,33 @@ std::unique_ptr<PaymentRequestRowView> CreatePaymentSheetRow(
     std::unique_ptr<views::View> trailing_button,
     bool clickable,
     bool extra_trailing_inset,
-    views::GridLayout::Alignment vertical_alignment =
-        views::GridLayout::LEADING) {
+    views::LayoutAlignment vertical_alignment =
+        views::LayoutAlignment::kStart) {
+  constexpr int kNameColumnWidth = 112;
+  constexpr int kPaddingAfterName = 32;
+  constexpr int kPaddingColumnsWidth = 25;
+
+  auto table_layout = std::make_unique<views::TableLayout>();
+  table_layout
+      // A column for the section name.
+      ->AddColumn(views::LayoutAlignment::kStart, vertical_alignment,
+                  views::TableLayout::kFixedSize,
+                  views::TableLayout::ColumnSize::kFixed, kNameColumnWidth, 0)
+      .AddPaddingColumn(views::TableLayout::kFixedSize, kPaddingAfterName)
+      // A column for the content.
+      .AddColumn(views::LayoutAlignment::kStretch, vertical_alignment, 1.0,
+                 views::TableLayout::ColumnSize::kUsePreferred, 0, 0)
+      // A column for the extra content.
+      .AddColumn(views::LayoutAlignment::kEnd, views::LayoutAlignment::kCenter,
+                 views::TableLayout::kFixedSize,
+                 views::TableLayout::ColumnSize::kUsePreferred, 0, 0)
+      .AddPaddingColumn(views::TableLayout::kFixedSize, kPaddingColumnsWidth)
+      // A column for the trailing_button.
+      .AddColumn(views::LayoutAlignment::kEnd, views::LayoutAlignment::kCenter,
+                 views::TableLayout::kFixedSize,
+                 views::TableLayout::ColumnSize::kUsePreferred, 0, 0)
+      .AddRows(1, views::TableLayout::kFixedSize);
+
   const int trailing_inset = extra_trailing_inset
                                  ? kPaymentRequestRowHorizontalInsets +
                                        kPaymentRequestRowExtraRightInset
@@ -141,66 +167,28 @@ std::unique_ptr<PaymentRequestRowView> CreatePaymentSheetRow(
   const gfx::Insets row_insets(
       kPaymentRequestRowVerticalInsets, kPaymentRequestRowHorizontalInsets,
       kPaymentRequestRowVerticalInsets, trailing_inset);
-  std::unique_ptr<PaymentRequestRowView> row =
-      std::make_unique<PaymentRequestRowView>(std::move(callback), clickable,
-                                              row_insets);
-  views::GridLayout* layout =
-      row->SetLayoutManager(std::make_unique<views::GridLayout>());
-
-  views::ColumnSet* columns = layout->AddColumnSet(0);
-  // A column for the section name.
-  constexpr int kNameColumnWidth = 112;
-  columns->AddColumn(views::GridLayout::LEADING, vertical_alignment,
-                     views::GridLayout::kFixedSize,
-                     views::GridLayout::ColumnSize::kFixed, kNameColumnWidth,
-                     0);
-
-  constexpr int kPaddingAfterName = 32;
-  columns->AddPaddingColumn(views::GridLayout::kFixedSize, kPaddingAfterName);
-
-  // A column for the content.
-  columns->AddColumn(views::GridLayout::FILL, vertical_alignment, 1.0,
-                     views::GridLayout::ColumnSize::kUsePreferred, 0, 0);
-  // A column for the extra content.
-  columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER,
-                     views::GridLayout::kFixedSize,
-                     views::GridLayout::ColumnSize::kUsePreferred, 0, 0);
-
-  constexpr int kPaddingColumnsWidth = 25;
-  columns->AddPaddingColumn(views::GridLayout::kFixedSize,
-                            kPaddingColumnsWidth);
-  // A column for the trailing_button.
-  columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER,
-                     views::GridLayout::kFixedSize,
-                     views::GridLayout::ColumnSize::kUsePreferred, 0, 0);
-
-  layout->StartRow(views::GridLayout::kFixedSize, 0);
-  std::unique_ptr<views::Label> name_label = CreateMediumLabel(section_name);
-  name_label->SetMultiLine(true);
-  name_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  layout->AddView(std::move(name_label));
-
-  if (content_view) {
-    content_view->SetCanProcessEventsWithinSubtree(false);
-    layout->AddView(std::move(content_view));
-  } else {
-    layout->SkipColumns(1);
-  }
-
-  if (extra_content_view) {
-    extra_content_view->SetCanProcessEventsWithinSubtree(false);
-    layout->AddView(std::move(extra_content_view));
-  } else {
-    layout->SkipColumns(1);
-  }
 
-  layout->AddView(std::move(trailing_button));
-
-  row->SetAccessibleName(
-      l10n_util::GetStringFUTF16(IDS_PAYMENTS_ROW_ACCESSIBLE_NAME_FORMAT,
-                                 section_name, accessible_content));
-
-  return row;
+  return views::Builder<PaymentRequestRowView>()
+      .SetLayoutManager(std::move(table_layout))
+      .SetCallback(std::move(callback))
+      .SetClickable(clickable)
+      .SetRowInsets(row_insets)
+      .SetAccessibleName(
+          l10n_util::GetStringFUTF16(IDS_PAYMENTS_ROW_ACCESSIBLE_NAME_FORMAT,
+                                     section_name, accessible_content))
+      .AddChildren(
+          views::Builder<views::Label>(CreateMediumLabel(section_name))
+              .SetMultiLine(true)
+              .SetHorizontalAlignment(gfx::ALIGN_LEFT),
+          content_view ? views::Builder<views::View>(std::move(content_view))
+                             .SetCanProcessEventsWithinSubtree(false)
+                       : views::Builder<views::View>(),
+          extra_content_view
+              ? views::Builder<views::View>(std::move(extra_content_view))
+                    .SetCanProcessEventsWithinSubtree(false)
+              : views::Builder<views::View>(),
+          views::Builder<views::View>(std::move(trailing_button)))
+      .Build();
 }
 
 std::unique_ptr<views::View> CreateInlineCurrencyAmountItem(
@@ -208,39 +196,26 @@ std::unique_ptr<views::View> CreateInlineCurrencyAmountItem(
     const std::u16string& amount,
     bool hint_color,
     bool bold) {
-  std::unique_ptr<views::View> item_amount_line =
-      std::make_unique<views::View>();
-  views::GridLayout* item_amount_layout =
-      item_amount_line->SetLayoutManager(std::make_unique<views::GridLayout>());
-  views::ColumnSet* item_amount_columns = item_amount_layout->AddColumnSet(0);
-  item_amount_columns->AddColumn(
-      views::GridLayout::LEADING, views::GridLayout::LEADING,
-      views::GridLayout::kFixedSize,
-      views::GridLayout::ColumnSize::kUsePreferred, 0, 0);
-  item_amount_columns->AddColumn(
-      views::GridLayout::TRAILING, views::GridLayout::LEADING, 1.0,
-      views::GridLayout::ColumnSize::kUsePreferred, 0, 0);
-
   DCHECK(!bold || !hint_color);
-  std::unique_ptr<views::Label> currency_label;
-  if (bold)
-    currency_label = CreateBoldLabel(currency);
-  else if (hint_color)
-    currency_label = CreateHintLabel(currency);
-  else
-    currency_label = std::make_unique<views::Label>(currency);
-
-  std::unique_ptr<views::Label> amount_label =
-      bold ? CreateBoldLabel(amount) : std::make_unique<views::Label>(amount);
-  amount_label->SetMultiLine(true);
-  amount_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  amount_label->SetAllowCharacterBreak(true);
-
-  item_amount_layout->StartRow(views::GridLayout::kFixedSize, 0);
-  item_amount_layout->AddView(std::move(currency_label));
-  item_amount_layout->AddView(std::move(amount_label));
-
-  return item_amount_line;
+  return views::Builder<views::TableLayoutView>()
+      .AddColumn(views::LayoutAlignment::kStart, views::LayoutAlignment::kStart,
+                 views::TableLayout::kFixedSize,
+                 views::TableLayout::ColumnSize::kUsePreferred, 0, 0)
+      .AddColumn(views::LayoutAlignment::kEnd, views::LayoutAlignment::kStart,
+                 1.0, views::TableLayout::ColumnSize::kUsePreferred, 0, 0)
+      .AddRows(1, views::TableLayout::kFixedSize, 0)
+      .AddChildren((bold ? views::Builder<views::Label>(CreateBoldLabel(u""))
+                         : (hint_color ? views::Builder<views::Label>(
+                                             CreateHintLabel(u""))
+                                       : views::Builder<views::Label>()))
+                       .SetText(currency),
+                   (bold ? views::Builder<views::Label>(CreateBoldLabel(u""))
+                         : views::Builder<views::Label>())
+                       .SetText(amount)
+                       .SetMultiLine(true)
+                       .SetHorizontalAlignment(gfx::ALIGN_LEFT)
+                       .SetAllowCharacterBreak(true))
+      .Build();
 }
 
 // A class used to build Payment Sheet Rows. Construct an instance of it, chain
@@ -351,7 +326,7 @@ class PaymentSheetRowBuilder {
         views::Button::PressedCallback(), section_name_, accessible_content_,
         std::move(content_view), nullptr, std::move(button),
         /*clickable=*/false,
-        /*extra_trailing_inset=*/false, views::GridLayout::CENTER);
+        /*extra_trailing_inset=*/false, views::LayoutAlignment::kCenter);
   }
 
   views::Button::PressedCallback GetPressedCallback() const {
@@ -424,38 +399,32 @@ void PaymentSheetViewController::FillContentView(views::View* content_view) {
   if (!spec())
     return;
 
-  views::GridLayout* layout =
-      content_view->SetLayoutManager(std::make_unique<views::GridLayout>());
-  views::ColumnSet* columns = layout->AddColumnSet(0);
-  columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 1.0,
-                     views::GridLayout::ColumnSize::kUsePreferred, 0, 0);
+  auto builder = views::Builder<views::View>(content_view)
+                     .SetLayoutManager(std::make_unique<views::BoxLayout>(
+                         views::BoxLayout::Orientation::kVertical));
 
   if (!spec()->retry_error_message().empty()) {
-    std::unique_ptr<views::View> warning_view =
-        CreateWarningView(spec()->retry_error_message(), true /* show_icon */);
-    layout->StartRow(views::GridLayout::kFixedSize, 0);
-    layout->AddView(std::move(warning_view));
+    builder.AddChild(views::Builder<views::View>(CreateWarningView(
+        spec()->retry_error_message(), true /* show_icon */)));
   }
 
   // The shipping address and contact info rows are optional.
   std::unique_ptr<PaymentRequestRowView> summary_row =
       CreatePaymentSheetSummaryRow();
   if (!summary_row)
-    return;
+    return std::move(builder).BuildChildren();
 
   PaymentRequestRowView* previous_row = summary_row.get();
-  layout->StartRow(views::GridLayout::kFixedSize, 0);
-  layout->AddView(std::move(summary_row));
+  builder.AddChild(views::Builder<views::View>(std::move(summary_row)));
 
   if (state()->ShouldShowShippingSection()) {
     std::unique_ptr<PaymentRequestRowView> shipping_row = CreateShippingRow();
     if (!shipping_row)
-      return;
+      return std::move(builder).BuildChildren();
 
     shipping_row->set_previous_row(previous_row->AsWeakPtr());
     previous_row = shipping_row.get();
-    layout->StartRow(views::GridLayout::kFixedSize, 0);
-    layout->AddView(std::move(shipping_row));
+    builder.AddChild(views::Builder<views::View>(std::move(shipping_row)));
     // It's possible for requestShipping to be true and for there to be no
     // shipping options yet (they will come in updateWith).
     // TODO(crbug.com/707353): Put a better placeholder row, instead of no row.
@@ -464,26 +433,25 @@ void PaymentSheetViewController::FillContentView(views::View* content_view) {
     if (shipping_option_row) {
       shipping_option_row->set_previous_row(previous_row->AsWeakPtr());
       previous_row = shipping_option_row.get();
-      layout->StartRow(views::GridLayout::kFixedSize, 0);
-      layout->AddView(std::move(shipping_option_row));
+      builder.AddChild(
+          views::Builder<views::View>(std::move(shipping_option_row)));
     }
   }
   std::unique_ptr<PaymentRequestRowView> payment_method_row =
       CreatePaymentMethodRow();
   payment_method_row->set_previous_row(previous_row->AsWeakPtr());
   previous_row = payment_method_row.get();
-  layout->StartRow(views::GridLayout::kFixedSize, 0);
-  layout->AddView(std::move(payment_method_row));
+  builder.AddChild(views::Builder<views::View>(std::move(payment_method_row)));
   if (state()->ShouldShowContactSection()) {
     std::unique_ptr<PaymentRequestRowView> contact_info_row =
         CreateContactInfoRow();
     contact_info_row->set_previous_row(previous_row->AsWeakPtr());
     previous_row = contact_info_row.get();
-    layout->StartRow(views::GridLayout::kFixedSize, 0);
-    layout->AddView(std::move(contact_info_row));
+    builder.AddChild(views::Builder<views::View>(std::move(contact_info_row)));
   }
-  layout->StartRow(views::GridLayout::kFixedSize, 0);
-  layout->AddView(CreateDataSourceRow());
+  builder.AddChild(views::Builder<views::View>(CreateDataSourceRow()));
+
+  std::move(builder).BuildChildren();
 }
 
 // Adds the product logo to the footer.
@@ -509,16 +477,16 @@ PaymentSheetViewController::CreatePaymentSheetSummaryRow() {
   if (!spec())
     return nullptr;
 
-  std::unique_ptr<views::View> inline_summary = std::make_unique<views::View>();
-  views::GridLayout* layout =
-      inline_summary->SetLayoutManager(std::make_unique<views::GridLayout>());
-  views::ColumnSet* columns = layout->AddColumnSet(0);
-  columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING,
-                     1.0, views::GridLayout::ColumnSize::kUsePreferred, 0, 0);
   constexpr int kItemSummaryPriceFixedWidth = 96;
-  columns->AddColumn(views::GridLayout::FILL, views::GridLayout::LEADING,
-                     views::GridLayout::kFixedSize,
-                     views::GridLayout::ColumnSize::kFixed,
+  auto view_builder =
+      views::Builder<views::TableLayoutView>()
+          .AddColumn(views::LayoutAlignment::kStart,
+                     views::LayoutAlignment::kStart, 1.0,
+                     views::TableLayout::ColumnSize::kUsePreferred, 0, 0)
+          .AddColumn(views::LayoutAlignment::kStretch,
+                     views::LayoutAlignment::kStart,
+                     views::TableLayout::kFixedSize,
+                     views::TableLayout::ColumnSize::kFixed,
                      kItemSummaryPriceFixedWidth, kItemSummaryPriceFixedWidth);
 
   const std::vector<const mojom::PaymentItemPtr*>& items =
@@ -536,48 +504,49 @@ PaymentSheetViewController::CreatePaymentSheetSummaryRow() {
                                ? items.size()
                                : kMaxNumberOfItemsShown;
   for (size_t i = 0; i < items.size() && i < displayed_items; ++i) {
-    layout->StartRow(views::GridLayout::kFixedSize, 0);
-    std::unique_ptr<views::Label> summary =
-        std::make_unique<views::Label>(base::UTF8ToUTF16((*items[i])->label));
-    summary->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    layout->AddView(std::move(summary));
-
-    layout->AddView(CreateInlineCurrencyAmountItem(
-        is_mixed_currency ? base::UTF8ToUTF16(spec()->GetFormattedCurrencyCode(
-                                (*items[i])->amount))
-                          : std::u16string(),
-        spec()->GetFormattedCurrencyAmount((*items[i])->amount), true, false));
+    view_builder.AddRows(1, views::TableLayout::kFixedSize, 0)
+        .AddChildren(
+            views::Builder<views::Label>()
+                .SetText(base::UTF8ToUTF16((*items[i])->label))
+                .SetHorizontalAlignment(gfx::ALIGN_LEFT),
+            views::Builder<views::View>(CreateInlineCurrencyAmountItem(
+                is_mixed_currency
+                    ? base::UTF8ToUTF16(
+                          spec()->GetFormattedCurrencyCode((*items[i])->amount))
+                    : std::u16string(),
+                spec()->GetFormattedCurrencyAmount((*items[i])->amount), true,
+                false)));
   }
 
   size_t hidden_item_count = items.size() - displayed_items;
   if (hidden_item_count > 0) {
-    layout->StartRow(views::GridLayout::kFixedSize, 0);
-    std::unique_ptr<views::Label> label =
-        CreateHintLabel(l10n_util::GetPluralStringFUTF16(
-            IDS_PAYMENT_REQUEST_ORDER_SUMMARY_MORE_ITEMS, hidden_item_count));
-    layout->AddView(std::move(label));
-    if (is_mixed_currency) {
-      std::unique_ptr<views::Label> multiple_currency_label =
-          CreateHintLabel(l10n_util::GetStringUTF16(
-              IDS_PAYMENT_REQUEST_ORDER_SUMMARY_MULTIPLE_CURRENCY_INDICATOR));
-      layout->AddView(std::move(multiple_currency_label));
-    }
+    view_builder.AddRows(1, views::TableLayout::kFixedSize, 0)
+        .AddChildren(
+            views::Builder<views::Label>(
+                CreateHintLabel(l10n_util::GetPluralStringFUTF16(
+                    IDS_PAYMENT_REQUEST_ORDER_SUMMARY_MORE_ITEMS,
+                    hidden_item_count))),
+            is_mixed_currency
+                ? views::Builder<
+                      views::View>(CreateHintLabel(l10n_util::GetStringUTF16(
+                      IDS_PAYMENT_REQUEST_ORDER_SUMMARY_MULTIPLE_CURRENCY_INDICATOR)))
+                : views::Builder<views::View>());
   }
 
-  layout->StartRow(views::GridLayout::kFixedSize, 0);
   PaymentApp* selected_app = state()->selected_app();
   const mojom::PaymentItemPtr& total = spec()->GetTotal(selected_app);
   std::u16string total_label_text = base::UTF8ToUTF16(total->label);
-  std::unique_ptr<views::Label> total_label = CreateBoldLabel(total_label_text);
-  layout->AddView(std::move(total_label));
-
   std::u16string total_currency_code =
       base::UTF8ToUTF16(spec()->GetFormattedCurrencyCode(
           spec()->GetTotal(state()->selected_app())->amount));
   std::u16string total_amount = spec()->GetFormattedCurrencyAmount(
       spec()->GetTotal(state()->selected_app())->amount);
-  layout->AddView(CreateInlineCurrencyAmountItem(total_currency_code,
-                                                 total_amount, false, true));
+
+  view_builder.AddRows(1, views::TableLayout::kFixedSize, 0)
+      .AddChildren(
+          views::Builder<views::Label>(CreateBoldLabel(total_label_text)),
+          views::Builder<views::View>(CreateInlineCurrencyAmountItem(
+              total_currency_code, total_amount, false, true)));
 
   PaymentSheetRowBuilder builder(
       this, l10n_util::GetStringUTF16(IDS_PAYMENTS_ORDER_SUMMARY_LABEL));
@@ -591,7 +560,7 @@ PaymentSheetViewController::CreatePaymentSheetSummaryRow() {
               IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SECTION_TOTAL_FORMAT,
               total_label_text, total_currency_code, total_amount)));
 
-  return builder.CreateWithChevron(std::move(inline_summary), nullptr);
+  return builder.CreateWithChevron(std::move(view_builder).Build(), nullptr);
 }
 
 std::unique_ptr<views::View>
@@ -690,29 +659,27 @@ PaymentSheetViewController::CreatePaymentMethodRow() {
               : base::BindRepeating(
                     &PaymentRequestDialogView::ShowPaymentMethodSheet,
                     dialog()));
-  if (selected_app) {
-    auto content_view = std::make_unique<views::View>();
-
-    views::GridLayout* layout =
-        content_view->SetLayoutManager(std::make_unique<views::GridLayout>());
-    views::ColumnSet* columns = layout->AddColumnSet(0);
-    columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
-                       1.0, views::GridLayout::ColumnSize::kUsePreferred, 0, 0);
 
-    layout->StartRow(views::GridLayout::kFixedSize, 0);
-    layout->AddView(std::make_unique<views::Label>(selected_app->GetLabel()))
-        ->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-
-    layout->StartRow(views::GridLayout::kFixedSize, 0);
-    layout->AddView(std::make_unique<views::Label>(selected_app->GetSublabel()))
-        ->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  if (selected_app) {
+    auto content_view =
+        views::Builder<views::BoxLayoutView>()
+            .SetOrientation(views::BoxLayout::Orientation::kVertical)
+            .SetCrossAxisAlignment(views::BoxLayout::CrossAxisAlignment::kStart)
+            .SetMainAxisAlignment(views::BoxLayout::MainAxisAlignment::kCenter)
+            .AddChildren(views::Builder<views::Label>()
+                             .SetText(selected_app->GetLabel())
+                             .SetHorizontalAlignment(gfx::ALIGN_LEFT),
+                         views::Builder<views::Label>()
+                             .SetText(selected_app->GetSublabel())
+                             .SetHorizontalAlignment(gfx::ALIGN_LEFT));
 
     std::unique_ptr<views::ImageView> icon_view = CreateAppIconView(
         selected_app->icon_resource_id(), selected_app->icon_bitmap(),
         selected_app->GetLabel());
 
     return builder.AccessibleContent(selected_app->GetLabel())
-        .CreateWithChevron(std::move(content_view), std::move(icon_view));
+        .CreateWithChevron(std::move(content_view).Build(),
+                           std::move(icon_view));
   }
   if (state()->available_apps().empty()) {
     return builder.CreateWithButton(std::u16string(),
@@ -858,15 +825,6 @@ PaymentSheetViewController::CreateShippingOptionRow() {
 }
 
 std::unique_ptr<views::View> PaymentSheetViewController::CreateDataSourceRow() {
-  std::unique_ptr<views::View> content_view = std::make_unique<views::View>();
-  auto layout = std::make_unique<views::BoxLayout>(
-      views::BoxLayout::Orientation::kVertical,
-      gfx::Insets(0, kPaymentRequestRowHorizontalInsets));
-  layout->set_main_axis_alignment(views::BoxLayout::MainAxisAlignment::kStart);
-  layout->set_cross_axis_alignment(
-      views::BoxLayout::CrossAxisAlignment::kStart);
-  content_view->SetLayoutManager(std::move(layout));
-
   std::u16string data_source;
   // If no transaction has been completed so far, choose which string to display
   // as a function of the profile's signed in state. Otherwise, always show the
@@ -909,13 +867,6 @@ std::unique_ptr<views::View> PaymentSheetViewController::CreateDataSourceRow() {
   data_source.erase(link_end, end_tag.size());
   data_source.erase(link_begin, begin_tag.size());
 
-  auto data_source_label = std::make_unique<views::StyledLabel>();
-  data_source_label->SetText(data_source);
-
-  data_source_label->SetBorder(views::CreateEmptyBorder(22, 0, 0, 0));
-  data_source_label->SetID(static_cast<int>(DialogViewID::DATA_SOURCE_LABEL));
-  data_source_label->SetDefaultTextStyle(views::style::STYLE_DISABLED);
-
   views::StyledLabel::RangeStyleInfo link_style =
       views::StyledLabel::RangeStyleInfo::CreateForLink(base::BindRepeating(
           [](base::WeakPtr<PaymentRequestDialogView> dialog) {
@@ -929,11 +880,21 @@ std::unique_ptr<views::View> PaymentSheetViewController::CreateDataSourceRow() {
   // TODO(pbos): Investigate whether this override is necessary.
   link_style.override_color = gfx::kGoogleBlue700;
 
-  data_source_label->AddStyleRange(
-      gfx::Range(link_begin, link_begin + link_length), link_style);
-  data_source_label->SizeToFit(0);
-  content_view->AddChildView(data_source_label.release());
-  return content_view;
+  return views::Builder<views::BoxLayoutView>()
+      .SetOrientation(views::BoxLayout::Orientation::kVertical)
+      .SetInsideBorderInsets(gfx::Insets(0, kPaymentRequestRowHorizontalInsets))
+      .SetMainAxisAlignment(views::BoxLayout::MainAxisAlignment::kStart)
+      .SetCrossAxisAlignment(views::BoxLayout::CrossAxisAlignment::kStart)
+      .AddChild(
+          views::Builder<views::StyledLabel>()
+              .SetText(data_source)
+              .SetBorder(views::CreateEmptyBorder(22, 0, 0, 0))
+              .SetID(static_cast<int>(DialogViewID::DATA_SOURCE_LABEL))
+              .SetDefaultTextStyle(views::style::STYLE_DISABLED)
+              .AddStyleRange(gfx::Range(link_begin, link_begin + link_length),
+                             link_style)
+              .SizeToFit(0))
+      .Build();
 }
 
 void PaymentSheetViewController::AddShippingButtonPressed() {
diff --git a/chrome/browser/ui/views/profiles/profile_picker_view.cc b/chrome/browser/ui/views/profiles/profile_picker_view.cc
index c273cce58c93e5..693b4bf8816a3d 100644
--- a/chrome/browser/ui/views/profiles/profile_picker_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_picker_view.cc
@@ -11,6 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/raw_ptr.h"
 #include "base/metrics/histogram_functions.h"
+#include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
 #include "chrome/app/chrome_command_ids.h"
@@ -440,6 +441,7 @@ void ProfilePickerView::ShowScreenInPickerContents(
 }
 
 void ProfilePickerView::Clear() {
+  TRACE_EVENT1("browser,startup", "ProfilePickerView::Clear", "state", state_);
   if (state_ == kClosing)
     return;
 
@@ -530,6 +532,8 @@ bool ProfilePickerView::ShouldReopen(
 
 void ProfilePickerView::Display(ProfilePicker::EntryPoint entry_point) {
   DCHECK_NE(state_, kClosing);
+  TRACE_EVENT2("browser,startup", "ProfilePickerView::Display", "entry_point",
+               entry_point, "state", state_);
   // Record creation metrics.
   base::UmaHistogramEnumeration("ProfilePicker.Shown", entry_point);
   if (entry_point == ProfilePicker::EntryPoint::kOnStartup) {
@@ -564,6 +568,10 @@ void ProfilePickerView::Display(ProfilePicker::EntryPoint entry_point) {
 
 void ProfilePickerView::OnPickerProfileCreated(Profile* picker_profile,
                                                Profile::CreateStatus status) {
+  TRACE_EVENT2("browser,startup", "ProfilePickerView::OnPickerProfileCreated",
+               "profile_path",
+               (picker_profile ? picker_profile->GetPath().AsUTF8Unsafe() : ""),
+               "status", status);
   DCHECK_NE(status, Profile::CREATE_STATUS_LOCAL_FAIL);
   if (status != Profile::CREATE_STATUS_INITIALIZED)
     return;
@@ -573,6 +581,9 @@ void ProfilePickerView::OnPickerProfileCreated(Profile* picker_profile,
 
 void ProfilePickerView::Init(Profile* picker_profile) {
   DCHECK_EQ(state_, kInitializing);
+  TRACE_EVENT1(
+      "browser,startup", "ProfilePickerView::Init", "profile_path",
+      (picker_profile ? picker_profile->GetPath().AsUTF8Unsafe() : ""));
   contents_ = content::WebContents::Create(
       content::WebContents::CreateParams(picker_profile));
   contents_->SetDelegate(this);
diff --git a/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc
index c0a88a0d08c4a5..205472b5dda3ce 100644
--- a/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc
+++ b/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc
@@ -4,12 +4,14 @@
 
 #include "chrome/browser/ui/views/profiles/profile_picker_view.h"
 
+#include "base/barrier_closure.h"
 #include "base/callback_helpers.h"
 #include "base/json/values_util.h"
 #include "base/memory/raw_ptr.h"
 #include "base/scoped_observation.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/bind.h"
+#include "base/test/metrics/histogram_tester.h"
 #include "base/test/mock_callback.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/time/time.h"
@@ -18,6 +20,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/feature_engagement/tracker_factory.h"
 #include "chrome/browser/interstitials/chrome_settings_page_helper.h"
+#include "chrome/browser/metrics/first_web_contents_profiler_base.h"
 #include "chrome/browser/policy/cloud/user_policy_signin_service.h"
 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h"
 #include "chrome/browser/profiles/profile_attributes_entry.h"
@@ -65,6 +68,7 @@
 #include "components/signin/public/identity_manager/identity_manager.h"
 #include "components/signin/public/identity_manager/identity_test_utils.h"
 #include "components/signin/public/identity_manager/primary_account_mutator.h"
+#include "components/startup_metric_utils/browser/startup_metric_utils.h"
 #include "components/sync/base/sync_prefs.h"
 #include "components/sync/driver/sync_driver_switches.h"
 #include "components/sync/driver/sync_service.h"
@@ -292,6 +296,67 @@ std::unique_ptr<KeyedService> CreateTestTracker(content::BrowserContext*) {
   return feature_engagement::CreateTestTracker();
 }
 
+class PageNonEmptyPaintObserver : public content::WebContentsObserver {
+ public:
+  explicit PageNonEmptyPaintObserver(const GURL& url,
+                                     content::WebContents* web_contents)
+      : WebContentsObserver(web_contents),
+        barrier_closure_(base::BarrierClosure(2, run_loop_.QuitClosure())),
+        url_(url) {}
+
+  void Wait() {
+    // Check if the right page has already been painted or loaded.
+    if (web_contents()->GetLastCommittedURL() == url_) {
+      if (web_contents()->CompletedFirstVisuallyNonEmptyPaint())
+        DidFirstVisuallyNonEmptyPaint();
+      if (!web_contents()->IsLoading())
+        DidStopLoading();
+    }
+
+    run_loop_.Run();
+  }
+
+ private:
+  // WebContentsObserver:
+  void DidFirstVisuallyNonEmptyPaint() override {
+    // Making sure that the same event does not trigger the barrier twice.
+    if (did_paint_)
+      return;
+
+    did_paint_ = true;
+    barrier_closure_.Run();
+  }
+
+  void DidStopLoading() override {
+    ASSERT_EQ(web_contents()->GetLastCommittedURL(), url_);
+
+    // Making sure that the same event does not trigger the barrier twice.
+    if (did_load_)
+      return;
+
+    // It shouldn't technically be necessary to wait for load stop here, we do
+    // this to be consistent with the other tests relying on `WaitForLoadStop()`
+    did_load_ = true;
+    barrier_closure_.Run();
+  }
+
+  base::RunLoop run_loop_;
+  base::RepeatingClosure barrier_closure_;
+  GURL url_;
+
+  bool did_paint_ = false;
+  bool did_load_ = false;
+};
+
+// Waits for a first non empty paint for `target` and expects that it will load
+// the given `url`.
+void WaitForFirstNonEmptyPaint(const GURL& url, content::WebContents* target) {
+  ASSERT_NE(target, nullptr);
+
+  PageNonEmptyPaintObserver observer(url, target);
+  observer.Wait();
+}
+
 }  // namespace
 
 class ProfilePickerCreationFlowBrowserTest : public ProfilePickerTestBase {
@@ -1007,6 +1072,8 @@ IN_PROC_BROWSER_TEST_F(ProfilePickerCreationFlowBrowserTest,
 }
 
 IN_PROC_BROWSER_TEST_F(ProfilePickerCreationFlowBrowserTest, OpenProfile) {
+  base::HistogramTester histogram_tester;
+
   AvatarToolbarButton::SetIPHMinDelayAfterCreationForTesting(base::Seconds(0));
   FeaturePromoControllerViews::BlockActiveWindowCheckForTesting();
   ASSERT_EQ(1u, BrowserList::GetInstance()->size());
@@ -1019,12 +1086,52 @@ IN_PROC_BROWSER_TEST_F(ProfilePickerCreationFlowBrowserTest, OpenProfile) {
   OpenProfileFromPicker(other_path, /*open_settings=*/false);
   // Browser for the profile is displayed.
   Browser* new_browser = BrowserAddedWaiter(2u).Wait();
-  WaitForLoadStop(GURL("chrome://newtab/"),
-                  new_browser->tab_strip_model()->GetActiveWebContents());
+  WaitForFirstNonEmptyPaint(
+      GURL("chrome://newtab/"),
+      new_browser->tab_strip_model()->GetActiveWebContents());
   EXPECT_EQ(new_browser->profile()->GetPath(), other_path);
   WaitForPickerClosed();
   // IPH is shown.
   EXPECT_TRUE(ProfileSwitchPromoHasBeenShown(new_browser));
+
+  // FirstProfileTime.* histograms aren't recorded because the picker
+  // is opened from the menu.
+  EXPECT_THAT(histogram_tester.GetTotalCountsForPrefix(
+                  "ProfilePicker.FirstProfileTime."),
+              testing::IsEmpty());
+}
+
+IN_PROC_BROWSER_TEST_F(ProfilePickerCreationFlowBrowserTest,
+                       OpenProfileFromStartup) {
+  base::HistogramTester histogram_tester;
+  ASSERT_FALSE(ProfilePicker::IsOpen());
+
+  // Create a second profile.
+  base::FilePath other_path = CreateNewProfileWithoutBrowser();
+
+  // Open the picker.
+  ProfilePicker::Show(ProfilePicker::EntryPoint::kOnStartup);
+  EXPECT_TRUE(ProfilePicker::IsOpen());
+  WaitForLoadStop(GURL("chrome://profile-picker"));
+
+  // Open the new profile.
+  OpenProfileFromPicker(other_path, /*open_settings=*/false);
+
+  // Measurement of startup performance started.
+
+  // Browser for the profile is displayed.
+  Browser* new_browser = BrowserAddedWaiter(2u).Wait();
+  WaitForFirstNonEmptyPaint(
+      GURL("chrome://newtab/"),
+      new_browser->tab_strip_model()->GetActiveWebContents());
+  EXPECT_EQ(new_browser->profile()->GetPath(), other_path);
+  WaitForPickerClosed();
+
+  histogram_tester.ExpectTotalCount(
+      "ProfilePicker.FirstProfileTime.FirstWebContentsNonEmptyPaint", 1);
+  histogram_tester.ExpectUniqueSample(
+      "ProfilePicker.FirstProfileTime.FirstWebContentsFinishReason",
+      metrics::StartupProfilingFinishReason::kDone, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(ProfilePickerCreationFlowBrowserTest,
diff --git a/chrome/browser/ui/views/safe_browsing/tailored_security_unconsented_modal.cc b/chrome/browser/ui/views/safe_browsing/tailored_security_unconsented_modal.cc
index 904ea33a834623..51d0fc1e9e5119 100644
--- a/chrome/browser/ui/views/safe_browsing/tailored_security_unconsented_modal.cc
+++ b/chrome/browser/ui/views/safe_browsing/tailored_security_unconsented_modal.cc
@@ -61,6 +61,9 @@ TailoredSecurityUnconsentedModal::TailoredSecurityUnconsentedModal(
                  l10n_util::GetStringUTF16(
                      IDS_TAILORED_SECURITY_UNCONSENTED_CANCEL_BUTTON));
 
+  RecordModalOutcomeAndRunCallback(TailoredSecurityOutcome::kShown,
+                                   base::DoNothing());
+
   SetAcceptCallback(base::BindOnce(
       RecordModalOutcomeAndRunCallback, TailoredSecurityOutcome::kAccepted,
       base::BindOnce(&EnableEsbAndShowSettings, web_contents_)));
diff --git a/chrome/browser/ui/views/tabs/tab_style_views.cc b/chrome/browser/ui/views/tabs/tab_style_views.cc
index 94524e89b12f3a..ee5ab2331b9392 100644
--- a/chrome/browser/ui/views/tabs/tab_style_views.cc
+++ b/chrome/browser/ui/views/tabs/tab_style_views.cc
@@ -302,6 +302,11 @@ SkPath GM2TabStyle::GetPath(PathType path_type,
         radius - inset, radius - inset);
     path.addRRect(rrect);
   } else {
+    // Avoid mallocs at every new path verb by preallocating an
+    // empirically-determined amount of space in the verb and point buffers.
+    const int kMaxPathPoints = 20;
+    path.incReserve(kMaxPathPoints);
+
     // We will go clockwise from the lower left. We start in the overlap region,
     // preventing a gap between toolbar and tabstrip.
     // TODO(dfried): verify that the we actually want to start the stroke for
diff --git a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest.cc b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest.cc
index 11c00ea6db54be..0b661053defac6 100644
--- a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest.cc
+++ b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest.cc
@@ -1575,17 +1575,9 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckWindowCreated();
 }
 
-// TODO(https://crbug.com/1277870): Flaky on Linux builders.
-#if defined(OS_LINUX)
-#define MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_InstPlcyTabShctSiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated \
-  DISABLED_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_InstPlcyTabShctSiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated
-#else
-#define MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_InstPlcyTabShctSiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated \
-  WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_InstPlcyTabShctSiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated
-#endif
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegrationBrowserTest,
-    MAYBE_WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_InstPlcyTabShctSiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated) {
+    WebAppIntegration_InstOmniboxSiteA_WindowCreated_InListWinSiteA_InstPlcyTabShctSiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
@@ -1642,17 +1634,9 @@ IN_PROC_BROWSER_TEST_F(
   helper_.CheckWindowCreated();
 }
 
-// TODO(https://crbug.com/1277870): Flaky on Linux builders.
-#if defined(OS_LINUX)
-#define MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_InstPlcyTabShctSiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated \
-  DISABLED_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_InstPlcyTabShctSiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated
-#else
-#define MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_InstPlcyTabShctSiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated \
-  WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_InstPlcyTabShctSiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated
-#endif
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegrationBrowserTest,
-    MAYBE_WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_InstPlcyTabShctSiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated) {
+    WebAppIntegration_InstMenuOptionSiteA_WindowCreated_InListWinSiteA_InstPlcyTabShctSiteA_InListWinSiteA_LaunchFromIconSiteA_WindowCreated) {
   // Test contents are generated by script. Please do not modify!
   // See `chrome/test/webapps/README.md` for more info.
   // Sheriffs: Disabling this test is supported.
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 63602eeff18af9..916ae159d4a040 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -185,6 +185,8 @@
 #include "ash/webui/shimless_rma/url_constants.h"
 #include "ash/webui/shortcut_customization_ui/shortcut_customization_app_ui.h"
 #include "ash/webui/shortcut_customization_ui/url_constants.h"
+#include "ash/webui/system_extensions_internals_ui/system_extensions_internals_ui.h"
+#include "ash/webui/system_extensions_internals_ui/url_constants.h"
 #include "base/system/sys_info.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/ash/arc/arc_util.h"
@@ -961,6 +963,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
     return &NewComponentUI<ash::PersonalizationAppUI,
                            ChromePersonalizationAppUiDelegate>;
   }
+  if (url.host_piece() == ash::kChromeUISystemExtensionsInternalsHost &&
+      base::FeatureList::IsEnabled(ash::features::kSystemExtensions)) {
+    return &NewWebUI<ash::SystemExtensionsInternalsUI>;
+  }
 
 #if !defined(OFFICIAL_BUILD)
 #if !defined(USE_REAL_DBUS_CLIENTS)
diff --git a/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc b/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
index 97f16a13150f5e..397171e1236c55 100644
--- a/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
+++ b/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
@@ -440,12 +440,11 @@ class ManagementUIHandlerTests : public TestingBaseClass {
     GetTestConfig().override_policy_connector_is_managed = true;
     GetTestConfig().managed_device = true;
     SetUpProfileAndHandler();
-    const TestDeviceStatusCollector* status_collector =
-        new TestDeviceStatusCollector(
-            &local_state_, GetTestConfig().report_activity_times,
-            GetTestConfig().report_nics, GetTestConfig().report_hardware_data,
-            GetTestConfig().report_users, GetTestConfig().report_crash_info,
-            GetTestConfig().report_app_info_and_activity);
+    const TestDeviceStatusCollector status_collector(
+        &local_state_, GetTestConfig().report_activity_times,
+        GetTestConfig().report_nics, GetTestConfig().report_hardware_data,
+        GetTestConfig().report_users, GetTestConfig().report_crash_info,
+        GetTestConfig().report_app_info_and_activity);
     settings_.device_settings()->SetTrustedStatus(
         ash::CrosSettingsProvider::TRUSTED);
     settings_.device_settings()->SetBoolean(ash::kSystemLogUploadEnabled,
@@ -464,17 +463,17 @@ class ManagementUIHandlerTests : public TestingBaseClass {
         GetTestConfig().crostini_ansible_playbook_filepath);
     crostini_features()->set_is_allowed_now(true);
 
-    const policy::SystemLogUploader* system_uploader =
-        new policy::SystemLogUploader(/*syslog_delegate=*/nullptr,
-                                      /*task_runner=*/task_runner_);
+    const policy::SystemLogUploader system_log_uploader(
+        /*syslog_delegate=*/nullptr,
+        /*task_runner=*/task_runner_);
     ON_CALL(testing::Const(handler_), GetDeviceCloudPolicyManager())
         .WillByDefault(Return(manager_.get()));
     EXPECT_CALL(*static_cast<const policy::MockDlpRulesManager*>(
                     handler_.GetDlpRulesManager()),
                 IsReportingEnabled)
         .WillRepeatedly(testing::Return(GetTestConfig().report_dlp_events));
-    return handler_.GetDeviceReportingInfo(manager_.get(), status_collector,
-                                           system_uploader, GetProfile());
+    return handler_.GetDeviceReportingInfo(manager_.get(), &status_collector,
+                                           &system_log_uploader, GetProfile());
   }
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
diff --git a/chrome/browser/ui/webui/realbox/realbox.mojom b/chrome/browser/ui/webui/realbox/realbox.mojom
index c5aa16a3083d43..16ceea42772bc7 100644
--- a/chrome/browser/ui/webui/realbox/realbox.mojom
+++ b/chrome/browser/ui/webui/realbox/realbox.mojom
@@ -69,6 +69,11 @@ struct AutocompleteMatch {
   // ID of the group the suggestion belongs to. 0 if it does not belong to any.
   int32 suggestion_group_id;
   bool supports_deletion;
+  // Holds the common part of tail suggestion. Not every match has a tail
+  // suggestion prefix. For example, the tail suggestion prefix for "hobbit
+  // holes for sale in" is "hobbit holes for sale" and the match contents
+  // would be the text following "sale".
+  mojo_base.mojom.String16? tail_suggest_common_prefix;
 };
 
 struct SuggestionGroup {
diff --git a/chrome/browser/ui/webui/realbox/realbox_handler.cc b/chrome/browser/ui/webui/realbox/realbox_handler.cc
index fed518482fffa4..05adedd646472f 100644
--- a/chrome/browser/ui/webui/realbox/realbox_handler.cc
+++ b/chrome/browser/ui/webui/realbox/realbox_handler.cc
@@ -253,6 +253,8 @@ std::vector<realbox::mojom::AutocompleteMatchPtr> CreateAutocompleteMatches(
                 match,
                 RealboxHandler::FocusState::kFocusedButtonRemoveSuggestion));
 
+    mojom_match->tail_suggest_common_prefix = match.tail_suggest_common_prefix;
+
     matches.push_back(std::move(mojom_match));
     line++;
   }
@@ -683,6 +685,11 @@ void RealboxHandler::OnResultChanged(AutocompleteController* controller,
                                      bool default_match_changed) {
   DCHECK(controller == autocomplete_controller_.get());
 
+  // Prepend missing tail suggestion prefixes in results, if present.
+  if (base::FeatureList::IsEnabled(omnibox::kNtpRealboxTailSuggest)) {
+    autocomplete_controller_->SetTailSuggestCommonPrefixes();
+  }
+
   page_->AutocompleteResultChanged(CreateAutocompleteResult(
       autocomplete_controller_->input().text(),
       autocomplete_controller_->result(),
diff --git a/chrome/browser/ui/webui/signin/profile_picker_handler.cc b/chrome/browser/ui/webui/signin/profile_picker_handler.cc
index 3e21ece974e06b..26d60334c4236c 100644
--- a/chrome/browser/ui/webui/signin/profile_picker_handler.cc
+++ b/chrome/browser/ui/webui/signin/profile_picker_handler.cc
@@ -13,8 +13,10 @@
 #include "base/metrics/histogram_functions.h"
 #include "base/notreached.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/trace_event/trace_event.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/metrics/first_web_contents_profiler_base.h"
 #include "chrome/browser/new_tab_page/chrome_colors/chrome_colors_service.h"
 #include "chrome/browser/new_tab_page/chrome_colors/generated_colors_info.h"
 #include "chrome/browser/profiles/profile.h"
@@ -242,6 +244,99 @@ SkBitmap GetAvailableAccountBitmap(const gfx::Image& gaia_image,
 }
 #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
 
+void RecordProfilingFinishReason(
+    metrics::StartupProfilingFinishReason finish_reason) {
+  base::UmaHistogramEnumeration(
+      "ProfilePicker.FirstProfileTime.FirstWebContentsFinishReason",
+      finish_reason);
+}
+
+class FirstWebContentsProfilerForProfilePicker
+    : public metrics::FirstWebContentsProfilerBase {
+ public:
+  explicit FirstWebContentsProfilerForProfilePicker(
+      content::WebContents* web_contents,
+      base::TimeTicks pick_time);
+
+  FirstWebContentsProfilerForProfilePicker(
+      const FirstWebContentsProfilerForProfilePicker&) = delete;
+  FirstWebContentsProfilerForProfilePicker& operator=(
+      const FirstWebContentsProfilerForProfilePicker&) = delete;
+
+ protected:
+  // FirstWebContentsProfilerBase:
+  void RecordFinishReason(
+      metrics::StartupProfilingFinishReason finish_reason) override;
+  void RecordNavigationFinished(base::TimeTicks navigation_start) override;
+  void RecordFirstNonEmptyPaint() override;
+  bool WasStartupInterrupted() override;
+
+ private:
+  ~FirstWebContentsProfilerForProfilePicker() override;
+
+  const base::TimeTicks pick_time_;
+};
+
+FirstWebContentsProfilerForProfilePicker::
+    FirstWebContentsProfilerForProfilePicker(content::WebContents* web_contents,
+                                             base::TimeTicks pick_time)
+    : FirstWebContentsProfilerBase(web_contents), pick_time_(pick_time) {
+  DCHECK(!pick_time_.is_null());
+}
+
+FirstWebContentsProfilerForProfilePicker::
+    ~FirstWebContentsProfilerForProfilePicker() = default;
+
+void FirstWebContentsProfilerForProfilePicker::RecordFinishReason(
+    metrics::StartupProfilingFinishReason finish_reason) {
+  RecordProfilingFinishReason(finish_reason);
+}
+
+void FirstWebContentsProfilerForProfilePicker::RecordNavigationFinished(
+    base::TimeTicks navigation_start) {
+  // Nothing to record here for Profile Picker startups.
+}
+
+void FirstWebContentsProfilerForProfilePicker::RecordFirstNonEmptyPaint() {
+  const char histogram_name[] =
+      "ProfilePicker.FirstProfileTime.FirstWebContentsNonEmptyPaint";
+  base::TimeTicks paint_time = base::TimeTicks::Now();
+  base::UmaHistogramLongTimes100(histogram_name, paint_time - pick_time_);
+  TRACE_EVENT_NESTABLE_ASYNC_BEGIN_WITH_TIMESTAMP0("startup", histogram_name,
+                                                   this, pick_time_);
+  TRACE_EVENT_NESTABLE_ASYNC_END_WITH_TIMESTAMP0("startup", histogram_name,
+                                                 this, paint_time);
+}
+
+bool FirstWebContentsProfilerForProfilePicker::WasStartupInterrupted() {
+  // We're assuming that no interruptions block opening an existing profile
+  // from the profile picker. We would detect this by observing really high
+  // latency on the tracked metric, and can start tracking interruptions if we
+  // find that such cases occur.
+  return false;
+}
+
+void BeginFirstWebContentsProfiling(Browser* browser,
+                                    base::TimeTicks pick_time) {
+  content::WebContents* visible_contents =
+      metrics::FirstWebContentsProfilerBase::GetVisibleContents(browser);
+  if (!visible_contents) {
+    RecordProfilingFinishReason(metrics::StartupProfilingFinishReason::
+                                    kAbandonNoInitiallyVisibleContent);
+    return;
+  }
+
+  if (visible_contents->CompletedFirstVisuallyNonEmptyPaint()) {
+    RecordProfilingFinishReason(
+        metrics::StartupProfilingFinishReason::kAbandonAlreadyPaintedContent);
+    return;
+  }
+
+  // FirstWebContentsProfilerForProfilePicker owns itself and is also bound to
+  // |visible_contents|'s lifetime by observing WebContentsDestroyed().
+  new FirstWebContentsProfilerForProfilePicker(visible_contents, pick_time);
+}
+
 }  // namespace
 
 ProfilePickerHandler::ProfilePickerHandler() = default;
@@ -383,6 +478,8 @@ void ProfilePickerHandler::HandleMainViewInitialize(
 void ProfilePickerHandler::HandleLaunchSelectedProfile(
     bool open_settings,
     const base::ListValue* args) {
+  TRACE_EVENT1("browser", "ProfilePickerHandler::HandleLaunchSelectedProfile",
+               "args", args->DebugString());
   if (args->GetList().empty())
     return;
   const base::Value& profile_path_value = args->GetList()[0];
@@ -441,6 +538,12 @@ void ProfilePickerHandler::HandleLaunchSelectedProfile(
   }
 #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
 
+  if (!creation_time_on_startup_.is_null() &&
+      // Avoid overriding the picked time if already recorded. This can happen
+      // for example if multiple profiles are picked: https://crbug.com/1277466.
+      profile_picked_time_on_startup_.is_null()) {
+    profile_picked_time_on_startup_ = base::TimeTicks::Now();
+  }
   profiles::SwitchToProfile(
       *profile_path, /*always_create=*/false,
       base::BindRepeating(&ProfilePickerHandler::OnSwitchToProfileComplete,
@@ -833,10 +936,20 @@ void ProfilePickerHandler::OnSwitchToProfileComplete(
     bool open_settings,
     Profile* profile,
     Profile::CreateStatus profile_create_status) {
+  TRACE_EVENT2("browser", "ProfilePickerHandler::OnSwitchToProfileComplete",
+               "profile_path", profile->GetPath().AsUTF8Unsafe(),
+               "create_status", profile_create_status);
   Browser* browser = chrome::FindAnyBrowser(profile, false);
   DCHECK(browser);
   DCHECK(browser->window());
 
+  // Measure startup time to display first web contents if the profile picker
+  // was displayed on startup and if the initiating action is instrumented. For
+  // example we don't record pick time for profile creations.
+  if (!profile_picked_time_on_startup_.is_null()) {
+    BeginFirstWebContentsProfiling(browser, profile_picked_time_on_startup_);
+  }
+
   // Only show the profile switch IPH when the user clicked the card, and there
   // are multiple profiles.
   std::vector<ProfileAttributesEntry*> entries =
diff --git a/chrome/browser/ui/webui/signin/profile_picker_handler.h b/chrome/browser/ui/webui/signin/profile_picker_handler.h
index 026c3b3b04f99f..ab92d9ba5b628f 100644
--- a/chrome/browser/ui/webui/signin/profile_picker_handler.h
+++ b/chrome/browser/ui/webui/signin/profile_picker_handler.h
@@ -182,6 +182,11 @@ class ProfilePickerHandler : public content::WebUIMessageHandler,
   // Creation time of the handler, to measure performance on startup. Only set
   // when the picker is shown on startup.
   base::TimeTicks creation_time_on_startup_;
+
+  // Time when the user picked a profile to open, to measure browser startup
+  // performance. Only set when the picker is shown on startup.
+  base::TimeTicks profile_picked_time_on_startup_;
+
   bool main_view_initialized_ = false;
 
 #if BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/chrome/browser/ui/webui/tab_search/tab_search_page_handler.cc b/chrome/browser/ui/webui/tab_search/tab_search_page_handler.cc
index e457ca8be6f445..496005d3299b6f 100644
--- a/chrome/browser/ui/webui/tab_search/tab_search_page_handler.cc
+++ b/chrome/browser/ui/webui/tab_search/tab_search_page_handler.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/webui/tab_search/tab_search_page_handler.h"
 
+#include <iterator>
 #include <memory>
 #include <set>
 #include <string>
@@ -12,6 +13,7 @@
 
 #include "base/base64.h"
 #include "base/metrics/histogram_functions.h"
+#include "base/ranges/algorithm.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
@@ -27,6 +29,7 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_live_tab_context.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/tabs/tab_enums.h"
 #include "chrome/browser/ui/tabs/tab_renderer_data.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/tabs/tab_utils.h"
@@ -432,8 +435,18 @@ tab_search::mojom::TabPtr TabSearchPageHandler::GetTab(
   tab_data->last_active_elapsed_text =
       GetLastActiveElapsedText(last_active_time_ticks);
 
-  if (base::FeatureList::IsEnabled(features::kTabSearchMediaTabs))
-    tab_data->alert_states = chrome::GetTabAlertStatesForContents(contents);
+  if (base::FeatureList::IsEnabled(features::kTabSearchMediaTabs)) {
+    std::vector<TabAlertState> alert_states =
+        chrome::GetTabAlertStatesForContents(contents);
+    // Currently, we only report media alert states.
+    base::ranges::copy_if(alert_states.begin(), alert_states.end(),
+                          std::back_inserter(tab_data->alert_states),
+                          [](TabAlertState alert) {
+                            return alert == TabAlertState::MEDIA_RECORDING ||
+                                   alert == TabAlertState::AUDIO_PLAYING ||
+                                   alert == TabAlertState::AUDIO_MUTING;
+                          });
+  }
 
   return tab_data;
 }
diff --git a/chrome/browser/ui/webui/whats_new/whats_new_util.cc b/chrome/browser/ui/webui/whats_new/whats_new_util.cc
index 73cee59b1595ee..322cddcf2441ff 100644
--- a/chrome/browser/ui/webui/whats_new/whats_new_util.cc
+++ b/chrome/browser/ui/webui/whats_new/whats_new_util.cc
@@ -59,19 +59,19 @@ bool ShouldShowForState(PrefService* local_state) {
   if (!base::FeatureList::IsEnabled(features::kChromeWhatsNewUI))
     return false;
 
-  // Show What's New if the page hasn't yet been shown for the current
-  // milestone.
   int last_version = local_state->GetInteger(prefs::kLastWhatsNewVersion);
 
-  return CHROME_VERSION_MAJOR > last_version;
-}
-
-void SetLastVersion(PrefService* local_state) {
-  if (!local_state) {
-    return;
-  }
+  // Don't show What's New if it's already been shown for the current major
+  // milestone.
+  if (CHROME_VERSION_MAJOR <= last_version)
+    return false;
 
+  // Set the last version here to indicate that What's New should not attempt
+  // to display again for this milestone. This prevents the page from
+  // potentially displaying multiple times in a given milestone, e.g. for
+  // multiple profile relaunches (see https://crbug.com/1274313).
   local_state->SetInteger(prefs::kLastWhatsNewVersion, CHROME_VERSION_MAJOR);
+  return true;
 }
 
 GURL GetServerURL(bool may_redirect) {
@@ -191,11 +191,6 @@ class WhatsNewFetcher : public BrowserListObserver {
 
     DCHECK(browser_);
 
-    // Update pref if shown automatically. Do this even if the load failed - we
-    // only want to try once, so that the network request only occurs once per
-    // version and not every time the browser opens.
-    SetLastVersion(g_browser_process->local_state());
-
     LogLoadEvent(success ? LoadEvent::kLoadSuccess
                          : LoadEvent::kLoadFailAndDoNotShow);
     if (success)
diff --git a/chrome/browser/ui/webui/whats_new/whats_new_util.h b/chrome/browser/ui/webui/whats_new/whats_new_util.h
index 4c341af4700afd..05f8e7eff3b5a5 100644
--- a/chrome/browser/ui/webui/whats_new/whats_new_util.h
+++ b/chrome/browser/ui/webui/whats_new/whats_new_util.h
@@ -35,12 +35,20 @@ void DisableRemoteContentForTests();
 // DisableRemoteContentForTests().
 bool IsRemoteContentDisabled();
 
-// Whether the What's New page should be shown, based on |local_state|.
+// Returns true if the user has not yet seen the What's New page for the
+// current major milestone. When returning true, sets the pref in |local_state|
+// to indicate that What's New should not try to display again for the current
+// major milestone.
+// Note that this does not guarantee that the page will always show (for
+// example, onboarding tabs override What's New, or remote content can fail to
+// load, which will result in the tab not opening). However, What's New should
+// only display automatically on the first relaunch after updating to a new
+// major milestone, and it is preferable to only attempt to show the page once
+// and possibly miss some users instead of repeatedly triggering a network
+// request at startup and/or showing the same What's New page many times for a
+// given user.
 bool ShouldShowForState(PrefService* local_state);
 
-// Sets the last What's New version in |local_state| to the current version.
-void SetLastVersion(PrefService* local_state);
-
 // Gets the server side URL for the What's New page for the current version of
 // Chrome. If |may_redirect| is true, return a server URL that will redirect to
 // the closest milestone page. Otherwise, return the direct URL of the current
diff --git a/chrome/build/linux.pgo.txt b/chrome/build/linux.pgo.txt
index 5607ed5338dade..5fc9bc8ecdef1a 100644
--- a/chrome/build/linux.pgo.txt
+++ b/chrome/build/linux.pgo.txt
@@ -1 +1 @@
-chrome-linux-main-1639483122-20e6b9acc183f41a276a93022da6f201498b4d81.profdata
+chrome-linux-main-1639504726-00818556d27ae6f0ca222d22829579a009d0b826.profdata
diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt
index c1d4c58849f2dc..892f302a8699a9 100644
--- a/chrome/build/win32.pgo.txt
+++ b/chrome/build/win32.pgo.txt
@@ -1 +1 @@
-chrome-win32-main-1639483122-6c64e4735696edd79f94e428f8b51a0056079d88.profdata
+chrome-win32-main-1639493922-9a45d06329fbed3e310b5994955083e355361eb8.profdata
diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt
index 4ad085a6601fd2..48ccf98e16857e 100644
--- a/chrome/build/win64.pgo.txt
+++ b/chrome/build/win64.pgo.txt
@@ -1 +1 @@
-chrome-win64-main-1639483122-b852875a95ce2ee39f0bd733dae39836e0f19b13.profdata
+chrome-win64-main-1639504726-a5cec93f623091d76267247a1ff888db818a2b02.profdata
diff --git a/chrome/chrome_cleaner/parsers/json_parser/test_json_parser.cc b/chrome/chrome_cleaner/parsers/json_parser/test_json_parser.cc
index 9b846fcdda02bd..d289305c6db6f1 100644
--- a/chrome/chrome_cleaner/parsers/json_parser/test_json_parser.cc
+++ b/chrome/chrome_cleaner/parsers/json_parser/test_json_parser.cc
@@ -14,7 +14,8 @@ void TestJsonParser::Parse(const std::string& json,
                            ParseDoneCallback callback) {
   base::JSONReader::ValueWithError value_with_error =
       base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_ALLOW_TRAILING_COMMAS |
+          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                    base::JSON_ALLOW_TRAILING_COMMAS |
                     base::JSON_REPLACE_INVALID_CHARACTERS);
   if (value_with_error.value) {
     std::move(callback).Run(std::move(value_with_error.value), absl::nullopt);
diff --git a/chrome/chrome_cleaner/parsers/target/parser_impl.cc b/chrome/chrome_cleaner/parsers/target/parser_impl.cc
index 7db38ae8eb01a4..69b2baf07b5611 100644
--- a/chrome/chrome_cleaner/parsers/target/parser_impl.cc
+++ b/chrome/chrome_cleaner/parsers/target/parser_impl.cc
@@ -25,7 +25,8 @@ void ParserImpl::ParseJson(const std::string& json,
                            ParseJsonCallback callback) {
   base::JSONReader::ValueWithError parsed_json =
       base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_ALLOW_TRAILING_COMMAS |
+          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                    base::JSON_ALLOW_TRAILING_COMMAS |
                     base::JSON_REPLACE_INVALID_CHARACTERS);
   if (parsed_json.value) {
     std::move(callback).Run(std::move(parsed_json.value), absl::nullopt);
diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni
index 88286bc85c49c9..b676c7bc87f46f 100644
--- a/chrome/chrome_paks.gni
+++ b/chrome/chrome_paks.gni
@@ -214,6 +214,7 @@ template("chrome_extra_paks") {
         "$root_gen_dir/ash/ash_scanning_app_resources.pak",
         "$root_gen_dir/ash/ash_shimless_rma_resources.pak",
         "$root_gen_dir/ash/ash_shortcut_customization_app_resources.pak",
+        "$root_gen_dir/ash/ash_system_extensions_internals_resources.pak",
         "$root_gen_dir/ash/connectivity_diagnostics_resources.pak",
         "$root_gen_dir/ash/public/cpp/resources/ash_public_unscaled_resources.pak",
         "$root_gen_dir/ash/webui/file_manager/resources/file_manager_swa_resources.pak",
@@ -268,6 +269,7 @@ template("chrome_extra_paks") {
         "//ash/webui/resources:scanning_app_resources",
         "//ash/webui/resources:shimless_rma_resources",
         "//ash/webui/resources:shortcut_customization_app_resources",
+        "//ash/webui/resources:system_extensions_internals_resources",
         "//chrome/browser/resources:bluetooth_pairing_dialog_resources",
         "//chrome/browser/resources:internet_config_dialog_resources",
         "//chrome/browser/resources:internet_detail_dialog_resources",
diff --git a/chrome/common/extensions/api/extension.json b/chrome/common/extensions/api/extension.json
index 86c407fda26270..ac9f029aa306bb 100644
--- a/chrome/common/extensions/api/extension.json
+++ b/chrome/common/extensions/api/extension.json
@@ -156,38 +156,34 @@
         "type": "function",
         "description": "Retrieves the state of the extension's access to Incognito-mode. This corresponds to the user-controlled per-extension 'Allowed in Incognito' setting accessible via the chrome://extensions page.",
         "min_version": "12.0.706.0",
-        "parameters": [
-          {
-            "type": "function",
-            "name": "callback",
-            "parameters": [
-              {
-                "name": "isAllowedAccess",
-                "type": "boolean",
-                "description": "True if the extension has access to Incognito mode, false otherwise."
-              }
-            ]
-          }
-        ]
+        "parameters": [],
+        "returns_async": {
+          "name": "callback",
+          "parameters": [
+            {
+              "name": "isAllowedAccess",
+              "type": "boolean",
+              "description": "True if the extension has access to Incognito mode, false otherwise."
+            }
+          ]
+        }
       },
       {
         "name": "isAllowedFileSchemeAccess",
         "type": "function",
         "description": "Retrieves the state of the extension's access to the 'file://' scheme. This corresponds to the user-controlled per-extension 'Allow access to File URLs' setting accessible via the chrome://extensions page.",
         "min_version": "12.0.706.0",
-        "parameters": [
-          {
-            "type": "function",
-            "name": "callback",
-            "parameters": [
-              {
-                "name": "isAllowedAccess",
-                "type": "boolean",
-                "description": "True if the extension can access the 'file://' scheme, false otherwise."
-              }
-            ]
-          }
-        ]
+        "parameters": [],
+        "returns_async": {
+          "name": "callback",
+          "parameters": [
+            {
+              "name": "isAllowedAccess",
+              "type": "boolean",
+              "description": "True if the extension can access the 'file://' scheme, false otherwise."
+            }
+          ]
+        }
       },
       {
         "name": "setUpdateUrlData",
diff --git a/chrome/credential_provider/gaiacp/win_http_url_fetcher.cc b/chrome/credential_provider/gaiacp/win_http_url_fetcher.cc
index 2310f8d2dacf97..60806a74b61839 100644
--- a/chrome/credential_provider/gaiacp/win_http_url_fetcher.cc
+++ b/chrome/credential_provider/gaiacp/win_http_url_fetcher.cc
@@ -109,7 +109,8 @@ class HttpServiceRequest {
 
     result = base::JSONReader::Read(
         base::StringPiece(response_.data(), response_.size()),
-        base::JSON_ALLOW_TRAILING_COMMAS);
+        base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+            base::JSON_ALLOW_TRAILING_COMMAS);
     if (!result || !result->is_dict()) {
       LOGFN(ERROR) << "Failed to read json result from server response";
       result.reset();
diff --git a/chrome/installer/mac/BUILD.gn b/chrome/installer/mac/BUILD.gn
index a2d2713e1961ec..9bd016f514421c 100644
--- a/chrome/installer/mac/BUILD.gn
+++ b/chrome/installer/mac/BUILD.gn
@@ -166,7 +166,7 @@ config("fat_binary_config") {
       # Help the compiler find lipo for creating fat binaries.
       "-B",
       mac_bin_path,
-
+      "-fno-lto",
       "-arch",
       "x86_64",
       "-arch",
diff --git a/chrome/renderer/extensions/app_hooks_delegate.cc b/chrome/renderer/extensions/app_hooks_delegate.cc
index 14dec951973e24..35fb7832c2c44f 100644
--- a/chrome/renderer/extensions/app_hooks_delegate.cc
+++ b/chrome/renderer/extensions/app_hooks_delegate.cc
@@ -35,7 +35,7 @@ void AppHooksDelegate::IsInstalledGetterCallback(
     v8::Local<v8::String> property,
     const v8::PropertyCallbackInfo<v8::Value>& info) {
   v8::HandleScope handle_scope(info.GetIsolate());
-  v8::Local<v8::Context> context = info.Holder()->CreationContext();
+  v8::Local<v8::Context> context = info.Holder()->GetCreationContextChecked();
   ScriptContext* script_context =
       ScriptContextSet::GetContextByV8Context(context);
 
diff --git a/chrome/renderer/extensions/extension_hooks_delegate.cc b/chrome/renderer/extensions/extension_hooks_delegate.cc
index 520d6435547147..4a1d642b455865 100644
--- a/chrome/renderer/extensions/extension_hooks_delegate.cc
+++ b/chrome/renderer/extensions/extension_hooks_delegate.cc
@@ -54,7 +54,7 @@ void GetAliasedFeature(v8::Local<v8::Name> property_name,
                        const v8::PropertyCallbackInfo<v8::Value>& info) {
   v8::Isolate* isolate = info.GetIsolate();
   v8::HandleScope handle_scope(isolate);
-  v8::Local<v8::Context> context = info.Holder()->CreationContext();
+  v8::Local<v8::Context> context = info.Holder()->GetCreationContextChecked();
 
   v8::TryCatch try_catch(isolate);
   v8::Local<v8::Value> chrome;
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index da7a68bb5daa9b..9f957902bd87cd 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1691,7 +1691,6 @@ if (!is_android && !is_fuchsia) {
       "../browser/optimization_guide/browser_test_util.h",
       "../browser/optimization_guide/hints_fetcher_browsertest.cc",
       "../browser/optimization_guide/optimization_guide_keyed_service_browsertest.cc",
-      "../browser/optimization_guide/page_content_annotations_service_browsertest.cc",
       "../browser/optimization_guide/page_text_observer_browsertest.cc",
       "../browser/optimization_guide/prediction/prediction_manager_browsertest.cc",
       "../browser/page_load_metrics/observers/ad_metrics/ad_density_intervention_browsertest.cc",
@@ -2120,6 +2119,13 @@ if (!is_android && !is_fuchsia) {
       "v8/wasm_trap_handler_browsertest.cc",
     ]
 
+    # crbug.com/1279884 Flaky on CrOS
+    if (!is_chromeos) {
+      sources += [
+          "../browser/optimization_guide/page_content_annotations_service_browsertest.cc"
+      ]
+    }
+
     if (enable_reporting) {
       sources += [ "../browser/net/reporting_browsertest.cc" ]
     }
@@ -2404,6 +2410,7 @@ if (!is_android && !is_fuchsia) {
           "//ash/webui/media_app_ui:browser_tests_js",
           "//ash/webui/personalization_app:browser_tests_js",
           "//ash/webui/system_apps:browser_tests",
+          "//ash/webui/system_extensions_internals_ui:browser_tests_js",
           "//chrome/browser/resources/gaia_auth_host:browser_tests",
         ]
 
diff --git a/chrome/test/data/extensions/api_test/declarative_net_request/fenced_frames/rules.json b/chrome/test/data/extensions/api_test/declarative_net_request/fenced_frames/rules.json
index c8ab892ab7e094..712e74d8f9d7c6 100644
--- a/chrome/test/data/extensions/api_test/declarative_net_request/fenced_frames/rules.json
+++ b/chrome/test/data/extensions/api_test/declarative_net_request/fenced_frames/rules.json
@@ -4,19 +4,23 @@
   "action": { "type" : "block" },
   "condition" : { "urlFilter" : "blocked", "resourceTypes" : [ "sub_frame" ] }
 },
-// Add a rule to block any *main* frames with "allowed". Since the only
-// frame matching "allowed" is a fenced frame, it shouldn't match this
-// rule.
 {
+  "_comment": [
+    "Add a rule to block any *main* frames with 'allowed'. Since the only",
+    "frame matching 'allowed' is a fenced frame, it shouldn't match this",
+    "rule."
+  ],
   "id" : 2,
   "priority": 1,
   "action": { "type" : "block" },
   "condition" : { "urlFilter" : "allowed", "resourceTypes" : [ "main_frame" ] }
 },
-// Add a rule to block any thirdParty frames with "allowed". Since the only
-// frame matching "allowed" is a fenced frame and is considered firstParty
-// it shouldn't match this rule.
 {
+  "_comment": [
+    "Add a rule to block any thirdParty frames with 'allowed'. Since the only",
+    "frame matching 'allowed' is a fenced frame and is considered firstParty",
+    "it shouldn't match this rule."
+  ],
   "id" : 3,
   "priority": 2,
   "action": { "type" : "block" },
diff --git a/chrome/test/data/policy/policy_test_cases.json b/chrome/test/data/policy/policy_test_cases.json
index 2254eadc616cc9..75d6773f94b7b8 100644
--- a/chrome/test/data/policy/policy_test_cases.json
+++ b/chrome/test/data/policy/policy_test_cases.json
@@ -12095,9 +12095,6 @@
   "SystemTimezoneAutomaticDetection": {
     "reason_for_missing_test": "Maps into CrosSettings"
   },
-  "WebRestrictionsAuthority": {
-    "reason_for_missing_test": "TODO(crbug.com/1213429) add test case"
-  },
   "TaskManagerEndProcessEnabled": {
     "os": [
       "win",
diff --git a/chrome/test/data/webui/new_tab_page/realbox/realbox_test.js b/chrome/test/data/webui/new_tab_page/realbox/realbox_test.js
index 58992a937e6171..55437c2b603625 100644
--- a/chrome/test/data/webui/new_tab_page/realbox/realbox_test.js
+++ b/chrome/test/data/webui/new_tab_page/realbox/realbox_test.js
@@ -214,11 +214,15 @@ function verifyMatch(match, matchEl) {
       match.answer ? match.answer.secondLine : match.description);
   const separatorText =
       matchDescription ? loadTimeData.getString('realboxSeparator') : '';
+  const contents = matchEl.$['contents'].textContent.trim();
+  const separator = matchEl.$['separator'].textContent.trim();
+  const description = matchEl.$['description'].textContent.trim();
+  const text = (contents + ' ' + separator + ' ' + description).trim();
   assertEquals(
       match.swapContentsAndDescription ?
           matchDescription + separatorText + matchContents :
           matchContents + separatorText + matchDescription,
-      matchEl.$['text-container'].textContent.trim());
+      text);
 }
 
 suite('NewTabPageRealboxTest', () => {
diff --git a/chrome/test/data/webui/welcome/BUILD.gn b/chrome/test/data/webui/welcome/BUILD.gn
index 39eeb0d10ed063..d1729650c6cec6 100644
--- a/chrome/test/data/webui/welcome/BUILD.gn
+++ b/chrome/test/data/webui/welcome/BUILD.gn
@@ -22,9 +22,9 @@ ts_library("build_ts") {
   out_dir = "$target_gen_dir/tsc"
   tsconfig_base = "tsconfig_base.json"
   path_mappings = [
-    "chrome://welcome/*|" + rebase_path(
-            "$root_gen_dir/chrome/browser/resources/welcome/preprocessed/*",
-            target_gen_dir),
+    "chrome://welcome/*|" +
+        rebase_path("$root_gen_dir/chrome/browser/resources/welcome/tsc/*",
+                    target_gen_dir),
     "chrome://webui-test/*|" +
         rebase_path("$root_gen_dir/chrome/test/data/webui/tsc/*",
                     target_gen_dir),
@@ -47,6 +47,6 @@ ts_library("build_ts") {
     "welcome_app_test.ts",
   ]
   definitions = [ "//tools/typescript/definitions/bookmarks.d.ts" ]
-  deps = [ "//chrome/browser/resources/welcome:build" ]
+  deps = [ "//chrome/browser/resources/welcome:build_ts" ]
   extra_deps = [ "..:generate_definitions" ]
 }
diff --git a/chrome/test/media_router/media_router_e2e_ui_browsertest.cc b/chrome/test/media_router/media_router_e2e_ui_browsertest.cc
index 12219d0ead6745..eaf0e0ec99e554 100644
--- a/chrome/test/media_router/media_router_e2e_ui_browsertest.cc
+++ b/chrome/test/media_router/media_router_e2e_ui_browsertest.cc
@@ -105,7 +105,7 @@ IN_PROC_BROWSER_TEST_P(MediaRouterE2EBrowserTest, MANUAL_MirrorHTML5Video) {
     test_ui_->ShowDialog();
   test_ui_->WaitForSink(receiver_);
   test_ui_->StopCasting(receiver_);
-  test_ui_->WaitUntilNoRoutes();
+  WaitUntilNoRoutes(web_contents);
   test_ui_->HideDialog();
 }
 
diff --git a/chrome/test/media_router/media_router_integration_browsertest.cc b/chrome/test/media_router/media_router_integration_browsertest.cc
index 0ef4b5d1afece7..2423140ab09d92 100644
--- a/chrome/test/media_router/media_router_integration_browsertest.cc
+++ b/chrome/test/media_router/media_router_integration_browsertest.cc
@@ -91,6 +91,23 @@ std::string GetDefaultRequestSessionId(WebContents* web_contents) {
   return session_id;
 }
 
+// Routes observer that calls a callback once there are no routes.
+class NoRoutesObserver : public MediaRoutesObserver {
+ public:
+  NoRoutesObserver(MediaRouter* router, base::OnceClosure callback)
+      : MediaRoutesObserver(router), callback_(std::move(callback)) {}
+
+  ~NoRoutesObserver() override = default;
+
+  void OnRoutesUpdated(const std::vector<MediaRoute>& routes) override {
+    if (callback_ && routes.empty())
+      std::move(callback_).Run();
+  }
+
+ private:
+  base::OnceClosure callback_;
+};
+
 }  // namespace
 
 MediaRouterIntegrationBrowserTest::MediaRouterIntegrationBrowserTest() {
@@ -180,6 +197,23 @@ void MediaRouterIntegrationBrowserTest::Wait(base::TimeDelta timeout) {
   run_loop.Run();
 }
 
+void MediaRouterIntegrationBrowserTest::WaitUntilNoRoutes(
+    WebContents* web_contents) {
+  if (!test_provider_->HasRoutes())
+    return;
+
+  // FIXME: There can't be a good reason to use the observer API to check for
+  // routes asynchronously, which is fragile.  However, some browser tests rely
+  // on this behavior.  Either add a callback parameter to TerminateRoute, or
+  // add pass callback to the TestProvider to run when all routes are gone.
+  base::RunLoop run_loop;
+  NoRoutesObserver no_routes_observer(
+      MediaRouterFactory::GetApiForBrowserContext(
+          web_contents->GetBrowserContext()),
+      run_loop.QuitClosure());
+  run_loop.Run();
+}
+
 void MediaRouterIntegrationBrowserTest::ExecuteJavaScriptAPI(
     WebContents* web_contents,
     const std::string& script) {
@@ -385,7 +419,7 @@ void MediaRouterIntegrationBrowserTest::RunBasicTest() {
   WebContents* web_contents = StartSessionWithTestPageAndChooseSink();
   CheckSessionValidity(web_contents);
   ExecuteJavaScriptAPI(web_contents, kTerminateSessionScript);
-  test_ui_->WaitUntilNoRoutes();
+  WaitUntilNoRoutes(web_contents);
 }
 
 void MediaRouterIntegrationBrowserTest::RunSendMessageTest(
@@ -425,7 +459,7 @@ void MediaRouterIntegrationBrowserTest::RunReconnectSessionTest() {
   ASSERT_EQ(session_id, reconnected_session_id);
 
   ExecuteJavaScriptAPI(web_contents, kTerminateSessionScript);
-  test_ui_->WaitUntilNoRoutes();
+  WaitUntilNoRoutes(web_contents);
 }
 
 void MediaRouterIntegrationBrowserTest::RunFailedReconnectSessionTest() {
@@ -442,7 +476,7 @@ void MediaRouterIntegrationBrowserTest::RunFailedReconnectSessionTest() {
                        base::StringPrintf(kCheckReconnectSessionFailsScript,
                                           session_id.c_str()));
   ExecuteJavaScriptAPI(web_contents, kTerminateSessionScript);
-  test_ui_->WaitUntilNoRoutes();
+  WaitUntilNoRoutes(web_contents);
 }
 
 void MediaRouterIntegrationBrowserTest::SetEnableMediaRouter(bool enable) {
@@ -693,7 +727,7 @@ IN_PROC_BROWSER_TEST_P(MediaRouterIntegrationIncognitoBrowserTest, Basic) {
   // If we tear down before route observers are notified of route termination,
   // MediaRouter will create another TerminateRoute() request which will have a
   // dangling Mojo callback at shutdown. So we must wait for the update.
-  test_ui_->WaitUntilNoRoutes();
+  WaitUntilNoRoutes(GetActiveWebContents());
 }
 
 IN_PROC_BROWSER_TEST_P(MediaRouterIntegrationIncognitoBrowserTest,
@@ -703,7 +737,7 @@ IN_PROC_BROWSER_TEST_P(MediaRouterIntegrationIncognitoBrowserTest,
   // If we tear down before route observers are notified of route termination,
   // MediaRouter will create another TerminateRoute() request which will have a
   // dangling Mojo callback at shutdown. So we must wait for the update.
-  test_ui_->WaitUntilNoRoutes();
+  WaitUntilNoRoutes(GetActiveWebContents());
 }
 
 INSTANTIATE_MEDIA_ROUTER_INTEGRATION_BROWER_TEST_SUITE(
diff --git a/chrome/test/media_router/media_router_integration_browsertest.h b/chrome/test/media_router/media_router_integration_browsertest.h
index bb57ceea2083d2..7d2314cf90afc8 100644
--- a/chrome/test/media_router/media_router_integration_browsertest.h
+++ b/chrome/test/media_router/media_router_integration_browsertest.h
@@ -186,6 +186,8 @@ class MediaRouterIntegrationBrowserTest
   // Wait for a specific time.
   void Wait(base::TimeDelta timeout);
 
+  void WaitUntilNoRoutes(content::WebContents* web_contents);
+
   // Test API for manipulating the UI.
   raw_ptr<MediaRouterUiForTestBase> test_ui_ = nullptr;
 
diff --git a/chrome/test/media_router/media_router_integration_ui_browsertest.cc b/chrome/test/media_router/media_router_integration_ui_browsertest.cc
index 45a6aa0732a5b5..d79670e8aca730 100644
--- a/chrome/test/media_router/media_router_integration_ui_browsertest.cc
+++ b/chrome/test/media_router/media_router_integration_ui_browsertest.cc
@@ -31,7 +31,7 @@ IN_PROC_BROWSER_TEST_P(MediaRouterIntegrationBrowserTest, MANUAL_Dialog_Basic) {
   ASSERT_EQ("Test Route", test_ui_->GetStatusTextForSink(receiver_));
 
   test_ui_->StopCasting(receiver_);
-  test_ui_->WaitUntilNoRoutes();
+  WaitUntilNoRoutes(GetActiveWebContents());
   // TODO(takumif): Remove the HideCastDialog() call once the dialog can close
   // on its own.
   test_ui_->HideDialog();
diff --git a/chrome/test/media_router/media_router_ui_for_test_base.cc b/chrome/test/media_router/media_router_ui_for_test_base.cc
index 005b8224d3db03..bec76a12d05c13 100644
--- a/chrome/test/media_router/media_router_ui_for_test_base.cc
+++ b/chrome/test/media_router/media_router_ui_for_test_base.cc
@@ -26,24 +26,6 @@ ui::MouseEvent CreateMouseReleasedEvent() {
   return CreateMouseEvent(ui::ET_MOUSE_RELEASED);
 }
 
-// Routes observer that calls a callback once there are no routes.
-class NoRoutesObserver : public MediaRoutesObserver {
- public:
-  NoRoutesObserver(MediaRouter* router, base::OnceClosure callback)
-      : MediaRoutesObserver(router), callback_(std::move(callback)) {}
-  ~NoRoutesObserver() override = default;
-
-  void OnRoutesUpdated(
-      const std::vector<MediaRoute>& routes,
-      const std::vector<MediaRoute::Id>& joinable_route_ids) override {
-    if (callback_ && routes.empty())
-      std::move(callback_).Run();
-  }
-
- private:
-  base::OnceClosure callback_;
-};
-
 }  // namespace
 
 void MediaRouterUiForTestBase::TearDown() {
@@ -59,15 +41,6 @@ void MediaRouterUiForTestBase::StopCasting(const std::string& sink_name) {
   StopCasting(GetSinkButton(sink_name));
 }
 
-void MediaRouterUiForTestBase::WaitUntilNoRoutes() {
-  base::RunLoop run_loop;
-  NoRoutesObserver no_routes_observer(
-      MediaRouterFactory::GetApiForBrowserContext(
-          web_contents_->GetBrowserContext()),
-      run_loop.QuitClosure());
-  run_loop.Run();
-}
-
 MediaRoute::Id MediaRouterUiForTestBase::GetRouteIdForSink(
     const std::string& sink_name) const {
   CastDialogSinkButton* sink_button = GetSinkButton(sink_name);
diff --git a/chrome/test/media_router/media_router_ui_for_test_base.h b/chrome/test/media_router/media_router_ui_for_test_base.h
index 59f704c566e114..76d7521a6e3a24 100644
--- a/chrome/test/media_router/media_router_ui_for_test_base.h
+++ b/chrome/test/media_router/media_router_ui_for_test_base.h
@@ -49,7 +49,6 @@ class MediaRouterUiForTestBase {
   virtual void WaitForAnyRoute() = 0;
   virtual void WaitForDialogShown() = 0;
   virtual void WaitForDialogHidden() = 0;
-  void WaitUntilNoRoutes();
 
   // These methods require that the dialog is shown, and the sink specified by
   // |sink_name| is in the dialog.
diff --git a/chrome/test/ppapi/ppapi_test.h b/chrome/test/ppapi/ppapi_test.h
index 8f0bc4f82e1bac..65019b98f1149b 100644
--- a/chrome/test/ppapi/ppapi_test.h
+++ b/chrome/test/ppapi/ppapi_test.h
@@ -187,21 +187,6 @@ class PPAPIPrivateNaClPNaClTest : public PPAPINaClPNaClTest {
   void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
-// Test Non-SFI Mode, using PNaCl toolchain to produce nexes.
-class PPAPINaClPNaClNonSfiTest : public PPAPINaClTest {
- public:
-  void SetUpCommandLine(base::CommandLine* command_line) override;
-
-  std::string BuildQuery(const std::string& base,
-                         const std::string& test_case) override;
-};
-
-class PPAPIPrivateNaClPNaClNonSfiTest : public PPAPINaClPNaClNonSfiTest {
- protected:
-  void SetUpCommandLine(base::CommandLine* command_line) override;
-};
-
-
 class PPAPINaClTestDisallowedSockets : public PPAPITestBase {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override;
diff --git a/chrome/updater/app/app_update.cc b/chrome/updater/app/app_update.cc
index 0da2c894ff078c..6dca67cfadcc0c 100644
--- a/chrome/updater/app/app_update.cc
+++ b/chrome/updater/app/app_update.cc
@@ -30,17 +30,12 @@ class AppUpdate : public App {
   void FirstTaskRun() override;
 
   void SetupDone(int result);
-
-  scoped_refptr<Configurator> config_;
 };
 
 void AppUpdate::Initialize() {
-  config_ = base::MakeRefCounted<Configurator>(
-      CreateGlobalPrefs(updater_scope()), CreateExternalConstants());
 }
 
 void AppUpdate::Uninitialize() {
-  PrefsCommitPendingWrites(config_->GetPrefService());
 }
 
 void AppUpdate::FirstTaskRun() {
diff --git a/chrome/updater/test/integration_test_commands.h b/chrome/updater/test/integration_test_commands.h
index 8a9464dab05f6d..29090b63ab8620 100644
--- a/chrome/updater/test/integration_test_commands.h
+++ b/chrome/updater/test/integration_test_commands.h
@@ -60,7 +60,7 @@ class IntegrationTestCommands
   virtual void UpdateAll() const = 0;
   virtual void PrintLog() const = 0;
   virtual base::FilePath GetDifferentUserPath() const = 0;
-  virtual void WaitForUpdaterExit() const = 0;
+  virtual void WaitForServerExit() const = 0;
 #if defined(OS_WIN)
   virtual void ExpectInterfacesRegistered() const = 0;
   virtual void ExpectLegacyUpdate3WebSucceeds(
diff --git a/chrome/updater/test/integration_test_commands_system.cc b/chrome/updater/test/integration_test_commands_system.cc
index b016a44ed60d19..16ebb5fe6b7eef 100644
--- a/chrome/updater/test/integration_test_commands_system.cc
+++ b/chrome/updater/test/integration_test_commands_system.cc
@@ -146,8 +146,8 @@ class IntegrationTestCommandsSystem : public IntegrationTestCommands {
     RunCommand("register_app", {Param("app_id", app_id)});
   }
 
-  void WaitForUpdaterExit() const override {
-    updater::test::WaitForUpdaterExit(updater_scope_);
+  void WaitForServerExit() const override {
+    updater::test::WaitForServerExit(updater_scope_);
   }
 
 #if defined(OS_WIN)
diff --git a/chrome/updater/test/integration_test_commands_user.cc b/chrome/updater/test/integration_test_commands_user.cc
index c70a01d53c992a..cc1997a6888b6d 100644
--- a/chrome/updater/test/integration_test_commands_user.cc
+++ b/chrome/updater/test/integration_test_commands_user.cc
@@ -135,8 +135,8 @@ class IntegrationTestCommandsUser : public IntegrationTestCommands {
     updater::test::RegisterApp(updater_scope_, app_id);
   }
 
-  void WaitForUpdaterExit() const override {
-    updater::test::WaitForUpdaterExit(updater_scope_);
+  void WaitForServerExit() const override {
+    updater::test::WaitForServerExit(updater_scope_);
   }
 
 #if defined(OS_WIN)
diff --git a/chrome/updater/test/integration_tests.cc b/chrome/updater/test/integration_tests.cc
index be20f5ca4d1570..f9fbc75b9373fb 100644
--- a/chrome/updater/test/integration_tests.cc
+++ b/chrome/updater/test/integration_tests.cc
@@ -120,7 +120,6 @@ class IntegrationTest : public ::testing::Test {
     PrintLog();
     CopyLog();
     test_commands_->Uninstall();
-    WaitForUpdaterExit();
   }
 
   void ExpectCandidateUninstalled() {
@@ -212,7 +211,7 @@ class IntegrationTest : public ::testing::Test {
     return test_commands_->GetDifferentUserPath();
   }
 
-  void WaitForUpdaterExit() { test_commands_->WaitForUpdaterExit(); }
+  void WaitForServerExit() { test_commands_->WaitForServerExit(); }
 
   void SetUpTestService() {
 #if defined(OS_WIN)
@@ -266,7 +265,7 @@ class IntegrationTest : public ::testing::Test {
 
 TEST_F(IntegrationTest, InstallUninstall) {
   Install();
-  WaitForUpdaterExit();
+  WaitForServerExit();
   ExpectInstalled();
   ExpectVersionActive(kUpdaterVersion);
   ExpectActiveUpdater();
@@ -282,12 +281,16 @@ TEST_F(IntegrationTest, InstallUninstall) {
 TEST_F(IntegrationTest, SelfUninstallOutdatedUpdater) {
   Install();
   ExpectInstalled();
-  WaitForUpdaterExit();
+  SleepFor(2);
   SetupFakeUpdaterHigherVersion();
   ExpectVersionNotActive(kUpdaterVersion);
 
   RunWake(0);
-  WaitForUpdaterExit();
+
+  // The mac server will remain active for 10 seconds after it replies to the
+  // wake client, then shut down and uninstall itself. Sleep to wait for this
+  // to happen.
+  SleepFor(11);
 
   ExpectCandidateUninstalled();
   // The candidate uninstall should not have altered global prefs.
@@ -303,7 +306,7 @@ TEST_F(IntegrationTest, QualifyUpdater) {
   ExpectRegistrationEvent(&test_server, kUpdaterAppId);
   Install();
   ExpectInstalled();
-  WaitForUpdaterExit();
+  WaitForServerExit();
   SetupFakeUpdaterLowerVersion();
   ExpectVersionNotActive(kUpdaterVersion);
 
@@ -312,7 +315,7 @@ TEST_F(IntegrationTest, QualifyUpdater) {
                        base::Version("0.2"));
 
   RunWake(0);
-  WaitForUpdaterExit();
+  WaitForServerExit();
 
   // This instance is now qualified and should activate itself and check itself
   // for updates on the next check.
@@ -321,7 +324,7 @@ TEST_F(IntegrationTest, QualifyUpdater) {
                            base::StringPrintf(".*%s.*", kUpdaterAppId))},
       ")]}'\n");
   RunWake(0);
-  WaitForUpdaterExit();
+  WaitForServerExit();
   ExpectVersionActive(kUpdaterVersion);
 
   Uninstall();
@@ -338,7 +341,7 @@ TEST_F(IntegrationTest, SelfUpdate) {
                        base::Version(kUpdaterVersion), next_version);
 
   RunWake(0);
-  WaitForUpdaterExit();
+  WaitForServerExit();
   ExpectAppVersion(kUpdaterAppId, next_version);
 
   Uninstall();
@@ -401,7 +404,7 @@ TEST_F(IntegrationTest, UpdateApp) {
   base::Version v2("2");
   ExpectUpdateSequence(&test_server, kAppId, v1, v2);
   Update(kAppId);
-  WaitForUpdaterExit();
+  WaitForServerExit();
   ExpectAppVersion(kAppId, v2);
 
   Uninstall();
@@ -499,7 +502,8 @@ TEST_F(IntegrationTest, UninstallCmdLine) {
   ExpectActiveUpdater();
 
   RunUninstallCmdLine();
-  WaitForUpdaterExit();
+  WaitForServerExit();
+  SleepFor(2);
   ExpectClean();
 }
 #endif  // defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
@@ -510,14 +514,14 @@ TEST_F(IntegrationTest, UnregisterUninstalledApp) {
   RegisterApp("test1");
   RegisterApp("test2");
 
-  WaitForUpdaterExit();
+  WaitForServerExit();
   ExpectVersionActive(kUpdaterVersion);
   ExpectActiveUpdater();
   SetExistenceCheckerPath("test1", base::FilePath(FILE_PATH_LITERAL("NONE")));
 
   RunWake(0);
 
-  WaitForUpdaterExit();
+  WaitForServerExit();
   ExpectInstalled();
   ExpectAppUnregisteredExistenceCheckerPath("test1");
 
@@ -526,11 +530,12 @@ TEST_F(IntegrationTest, UnregisterUninstalledApp) {
 
 TEST_F(IntegrationTest, UninstallIfMaxServerWakesBeforeRegistrationExceeded) {
   Install();
-  WaitForUpdaterExit();
+  WaitForServerExit();
   ExpectInstalled();
   SetServerStarts(24);
   RunWake(0);
-  WaitForUpdaterExit();
+  WaitForServerExit();
+  SleepFor(2);
   ExpectClean();
 }
 
@@ -538,16 +543,17 @@ TEST_F(IntegrationTest, UninstallUpdaterWhenAllAppsUninstalled) {
   Install();
   RegisterApp("test1");
   ExpectInstalled();
-  WaitForUpdaterExit();
+  WaitForServerExit();
   SetServerStarts(24);
   RunWake(0);
-  WaitForUpdaterExit();
+  WaitForServerExit();
   ExpectInstalled();
   ExpectVersionActive(kUpdaterVersion);
   ExpectActiveUpdater();
   SetExistenceCheckerPath("test1", base::FilePath(FILE_PATH_LITERAL("NONE")));
   RunWake(0);
-  WaitForUpdaterExit();
+  WaitForServerExit();
+  SleepFor(2);
   ExpectClean();
 }
 
@@ -566,7 +572,7 @@ TEST_F(IntegrationTest, UnregisterUnownedApp) {
   SetExistenceCheckerPath("test1", GetDifferentUserPath());
 
   RunWake(0);
-  WaitForUpdaterExit();
+  WaitForServerExit();
 
   ExpectAppUnregisteredExistenceCheckerPath("test1");
 
diff --git a/chrome/updater/test/integration_tests_impl.cc b/chrome/updater/test/integration_tests_impl.cc
index 06e90b0abee0c1..9ca520761f83a8 100644
--- a/chrome/updater/test/integration_tests_impl.cc
+++ b/chrome/updater/test/integration_tests_impl.cc
@@ -313,6 +313,18 @@ bool Run(UpdaterScope scope, base::CommandLine command_line, int* exit_code) {
   return process.WaitForExitWithTimeout(base::Seconds(45), exit_code);
 }
 
+void SleepFor(int seconds) {
+  VLOG(2) << "Sleeping " << seconds << " seconds...";
+  base::WaitableEvent sleep(base::WaitableEvent::ResetPolicy::MANUAL,
+                            base::WaitableEvent::InitialState::NOT_SIGNALED);
+  base::ThreadPool::PostDelayedTask(
+      FROM_HERE, {base::MayBlock()},
+      base::BindOnce(&base::WaitableEvent::Signal, base::Unretained(&sleep)),
+      base::Seconds(seconds));
+  sleep.Wait();
+  VLOG(2) << "Sleep complete.";
+}
+
 bool WaitFor(base::RepeatingCallback<bool()> predicate) {
   base::TimeTicks deadline =
       base::TimeTicks::Now() + TestTimeouts::action_max_timeout();
diff --git a/chrome/updater/test/integration_tests_impl.h b/chrome/updater/test/integration_tests_impl.h
index 7e5937895a53ac..dc8c38b043309a 100644
--- a/chrome/updater/test/integration_tests_impl.h
+++ b/chrome/updater/test/integration_tests_impl.h
@@ -51,6 +51,11 @@ void EnterTestMode(const GURL& url);
 // Copies the logs to a location where they can be retrieved by ResultDB.
 void CopyLog(const base::FilePath& src_dir);
 
+// Sleeps for the given number of seconds. This should be avoided, but in some
+// cases surrounding uninstall it is necessary since the processes can exit
+// prior to completing the actual uninstallation.
+void SleepFor(int seconds);
+
 // Waits for a given predicate to become true, testing it by polling. Returns
 // true if the predicate becomes true before a timeout, otherwise returns false.
 bool WaitFor(base::RepeatingCallback<bool()> predicate);
@@ -138,7 +143,7 @@ void ExpectAppVersion(UpdaterScope scope,
 
 void RegisterApp(UpdaterScope scope, const std::string& app_id);
 
-void WaitForUpdaterExit(UpdaterScope scope);
+void WaitForServerExit(UpdaterScope scope);
 
 #if defined(OS_WIN)
 void ExpectInterfacesRegistered(UpdaterScope scope);
diff --git a/chrome/updater/test/integration_tests_linux.cc b/chrome/updater/test/integration_tests_linux.cc
index 6850c64921d38f..d4fb5b6795dc86 100644
--- a/chrome/updater/test/integration_tests_linux.cc
+++ b/chrome/updater/test/integration_tests_linux.cc
@@ -27,7 +27,7 @@ absl::optional<base::FilePath> GetInstalledExecutablePath(UpdaterScope scope) {
   return absl::nullopt;
 }
 
-void WaitForUpdaterExit(UpdaterScope scope) {
+void WaitForServerExit(UpdaterScope scope) {
   NOTREACHED();
 }
 
diff --git a/chrome/updater/test/integration_tests_mac.mm b/chrome/updater/test/integration_tests_mac.mm
index 4ff231403eab88..89aa572bfc6612 100644
--- a/chrome/updater/test/integration_tests_mac.mm
+++ b/chrome/updater/test/integration_tests_mac.mm
@@ -300,7 +300,7 @@ void ExpectNotActive(UpdaterScope scope, const std::string& app_id) {
   EXPECT_FALSE(base::PathIsWritable(*path));
 }
 
-void WaitForUpdaterExit(UpdaterScope /*scope*/) {
+void WaitForServerExit(UpdaterScope /*scope*/) {
   ASSERT_TRUE(WaitFor(base::BindRepeating([]() {
     std::string ps_stdout;
     EXPECT_TRUE(base::GetAppOutput({"ps", "ax", "-o", "command"}, &ps_stdout));
diff --git a/chrome/updater/test/integration_tests_win.cc b/chrome/updater/test/integration_tests_win.cc
index 1a29f59ffefe53..e7bbeacb6319ae 100644
--- a/chrome/updater/test/integration_tests_win.cc
+++ b/chrome/updater/test/integration_tests_win.cc
@@ -290,8 +290,8 @@ void CheckInstallation(UpdaterScope scope,
 // Returns true is any updater process is found running in any session in the
 // system, regardless of its path.
 bool IsUpdaterRunning() {
-  return IsProcessRunning(kUpdaterProcessName) ||
-         IsProcessRunning(base::UTF8ToWide(kUninstallScript).c_str());
+  ProcessFilterName filter(kUpdaterProcessName);
+  return base::ProcessIterator(&filter).NextProcessEntry();
 }
 
 }  // namespace
@@ -411,6 +411,10 @@ void Uninstall(UpdaterScope scope) {
   int exit_code = -1;
   ASSERT_TRUE(Run(scope, command_line, &exit_code));
   EXPECT_EQ(0, exit_code);
+
+  // Uninstallation involves a race with the uninstall.cmd script and the
+  // process exit. Sleep to allow the script to complete its work.
+  SleepFor(5);
 }
 
 void SetActive(UpdaterScope /*scope*/, const std::string& id) {
@@ -446,7 +450,7 @@ void ExpectNotActive(UpdaterScope /*scope*/, const std::string& id) {
 
 // Waits for all updater processes to end, including the server process holding
 // the prefs lock.
-void WaitForUpdaterExit(UpdaterScope /*scope*/) {
+void WaitForServerExit(UpdaterScope /*scope*/) {
   WaitFor(base::BindRepeating([]() { return !IsUpdaterRunning(); }));
 }
 
diff --git a/chromecast/app/BUILD.gn b/chromecast/app/BUILD.gn
index aa703d36f9438b..0b84bbd35ae9f8 100644
--- a/chromecast/app/BUILD.gn
+++ b/chromecast/app/BUILD.gn
@@ -52,6 +52,7 @@ if (enable_cast_media_runtime) {
       "//chromecast:chromecast_buildflags",
       "//chromecast/base",
       "//chromecast/browser",
+      "//chromecast/browser/migration",
       "//chromecast/cast_core:cast_runtime_content_client_factories",
       "//chromecast/common",
       "//chromecast/common:resource_delegate",
diff --git a/chromecast/browser/cast_display_configurator.cc b/chromecast/browser/cast_display_configurator.cc
index f0c789dcead5d7..6349cf4aba80b2 100644
--- a/chromecast/browser/cast_display_configurator.cc
+++ b/chromecast/browser/cast_display_configurator.cc
@@ -246,7 +246,15 @@ void CastDisplayConfigurator::OnDisplayConfigured(
     bool config_success) {
   DCHECK(display);
   DCHECK(mode);
-  DCHECK_EQ(display, display_);
+
+  // Discard events for previous configurations. It is safe to discard since a
+  // new configuration round was initiated and we're waiting for another
+  // OnDisplayConfigured() event with the up-to-date display to arrive.
+  //
+  // This typically only happens when there's crashes and the state updates at
+  // the same time old notifications are received.
+  if (display != display_)
+    return;
 
   const gfx::Rect bounds(origin, mode->size());
   DVLOG(1) << __func__ << " success=" << config_success
diff --git a/chromecast/renderer/extensions/extension_hooks_delegate.cc b/chromecast/renderer/extensions/extension_hooks_delegate.cc
index 3e7b878e692a54..51726cb49c46ed 100644
--- a/chromecast/renderer/extensions/extension_hooks_delegate.cc
+++ b/chromecast/renderer/extensions/extension_hooks_delegate.cc
@@ -58,7 +58,7 @@ void GetAliasedFeature(v8::Local<v8::Name> property_name,
                        const v8::PropertyCallbackInfo<v8::Value>& info) {
   v8::Isolate* isolate = info.GetIsolate();
   v8::HandleScope handle_scope(isolate);
-  v8::Local<v8::Context> context = info.Holder()->CreationContext();
+  v8::Local<v8::Context> context = info.Holder()->GetCreationContextChecked();
 
   v8::TryCatch try_catch(isolate);
   v8::Local<v8::Value> chrome;
diff --git a/chromeos/chromeos_strings.grd b/chromeos/chromeos_strings.grd
index b4241327732b82..76b227d30d56c7 100644
--- a/chromeos/chromeos_strings.grd
+++ b/chromeos/chromeos_strings.grd
@@ -2191,10 +2191,7 @@ Try tapping the mic to ask me anything.
         Use the QR code or <ph name="LINK_BEGIN">&lt;a id="rsuCodeDialogLink"&gt;</ph>this link<ph name="LINK_END">&lt;/a&gt;</ph> to retrieve an 8 character unlock code to perform RMA Server Unlock
       </message>
       <message name="IDS_SHIMLESS_RMA_RSU_CODE_LABEL" desc="Label for the RSU code input box.">
-        Enter the unlock code:
-      </message>
-      <message name="IDS_SHIMLESS_RMA_RSU_CODE_PLACEHOLDER" translateable="false" desc="Placeholder text for empty RSU code input box.">
-        Enter RSU Code
+        Enter the 8-character unlock code
       </message>
       <message name="IDS_SHIMLESS_RMA_RSU_CHALLENGE_DIALOG_TITLE" translateable="false" desc="Title for the dialog that shows the RSU challenge code link.">
         Go to this link for your RSU unlock code
diff --git a/chromeos/chromeos_strings_grd/IDS_SHIMLESS_RMA_RSU_CODE_LABEL.png.sha1 b/chromeos/chromeos_strings_grd/IDS_SHIMLESS_RMA_RSU_CODE_LABEL.png.sha1
index 740709fbfe81a3..3aaba881206460 100644
--- a/chromeos/chromeos_strings_grd/IDS_SHIMLESS_RMA_RSU_CODE_LABEL.png.sha1
+++ b/chromeos/chromeos_strings_grd/IDS_SHIMLESS_RMA_RSU_CODE_LABEL.png.sha1
@@ -1 +1 @@
-c1105993eb549b25da9b7b1b790cc6817f7c1b23
\ No newline at end of file
+32e93e3a03f8c7fbb1126237f873a0041b7542aa
\ No newline at end of file
diff --git a/chromeos/components/onc/onc_test_utils.cc b/chromeos/components/onc/onc_test_utils.cc
index 3be625da6091f6..6832634f6efa20 100644
--- a/chromeos/components/onc/onc_test_utils.cc
+++ b/chromeos/components/onc/onc_test_utils.cc
@@ -65,8 +65,9 @@ std::unique_ptr<base::Value> ReadTestJson(const std::string& filename) {
     LOG(FATAL) << "Unable to get test file path for: " << filename;
     return result;
   }
-  JSONFileValueDeserializer deserializer(path,
-                                         base::JSON_ALLOW_TRAILING_COMMAS);
+  JSONFileValueDeserializer deserializer(
+      path,
+      base::JSON_PARSE_CHROMIUM_EXTENSIONS | base::JSON_ALLOW_TRAILING_COMMAS);
   std::string error_message;
   result = deserializer.Deserialize(nullptr, &error_message);
   CHECK(result != nullptr) << "Couldn't json-deserialize file: " << filename
diff --git a/chromeos/components/onc/onc_utils.cc b/chromeos/components/onc/onc_utils.cc
index 8a298fc366c59c..4fa47c7847811c 100644
--- a/chromeos/components/onc/onc_utils.cc
+++ b/chromeos/components/onc/onc_utils.cc
@@ -332,7 +332,8 @@ base::Value ReadDictionaryFromJson(const std::string& json) {
   }
   base::JSONReader::ValueWithError parsed_json =
       base::JSONReader::ReadAndReturnValueWithError(
-          json, base::JSON_ALLOW_TRAILING_COMMAS);
+          json, base::JSON_PARSE_CHROMIUM_EXTENSIONS |
+                    base::JSON_ALLOW_TRAILING_COMMAS);
   if (!parsed_json.value || !parsed_json.value->is_dict()) {
     NET_LOG(ERROR) << "Invalid JSON Dictionary: " << parsed_json.error_message;
     return base::Value();
diff --git a/chromeos/network/client_cert_resolver_unittest.cc b/chromeos/network/client_cert_resolver_unittest.cc
index 5086535328dec1..aa07f021d25aa2 100644
--- a/chromeos/network/client_cert_resolver_unittest.cc
+++ b/chromeos/network/client_cert_resolver_unittest.cc
@@ -376,7 +376,8 @@ class ClientCertResolverTest : public testing::Test,
                                base::StringPiece policy_json) {
     base::JSONReader::ValueWithError parsed_json =
         base::JSONReader::ReadAndReturnValueWithError(
-            policy_json, base::JSON_ALLOW_TRAILING_COMMAS);
+            policy_json,
+            base::JSON_ALLOW_TRAILING_COMMAS | base::JSON_ALLOW_CONTROL_CHARS);
     ASSERT_TRUE(parsed_json.value) << parsed_json.error_message;
 
     base::ListValue* policy = nullptr;
diff --git a/chromeos/network/network_sms_handler.cc b/chromeos/network/network_sms_handler.cc
index e65eba4a81415d..a0636db45f2ba7 100644
--- a/chromeos/network/network_sms_handler.cc
+++ b/chromeos/network/network_sms_handler.cc
@@ -336,8 +336,9 @@ void NetworkSmsHandler::DevicePropertiesCallback(
 
   const std::string* object_path_string =
       properties->FindStringKey(shill::kDBusObjectProperty);
-  if (!object_path_string) {
-    NET_LOG(ERROR) << "Device has no DBusObject Property: " << device_path;
+  if (!object_path_string || object_path_string->empty()) {
+    NET_LOG(ERROR) << "Device has no or empty DBusObject Property: "
+                   << device_path;
     return;
   }
   dbus::ObjectPath object_path(*object_path_string);
diff --git a/chromeos/network/network_sms_handler_unittest.cc b/chromeos/network/network_sms_handler_unittest.cc
index 5b99bb25009608..1a03d5e7bd285f 100644
--- a/chromeos/network/network_sms_handler_unittest.cc
+++ b/chromeos/network/network_sms_handler_unittest.cc
@@ -130,6 +130,19 @@ TEST_F(NetworkSmsHandlerTest, SmsHandlerDbusStub) {
   EXPECT_NE(messages.find(kMessage1), messages.end());
 }
 
+TEST_F(NetworkSmsHandlerTest, SmsHandlerEmptyDbusObjectPath) {
+  // This test verifies no crash should occur when the device dbus object path
+  // is an empty value.
+  device_test_->SetDeviceProperty(kCellularDevicePath,
+                                  shill::kDBusObjectProperty, base::Value(""),
+                                  /*notify_changed=*/true);
+  base::RunLoop().RunUntilIdle();
+  network_sms_handler_->RequestUpdate();
+  base::RunLoop().RunUntilIdle();
+
+  EXPECT_EQ(test_observer_->message_count(), 0);
+}
+
 TEST_F(NetworkSmsHandlerTest, SmsHandlerDeviceObjectPathChange) {
   // Fake the SIM being switched to a different SIM.
   device_test_->SetDeviceProperty(
diff --git a/chromeos/profiles/orderfile.newest.txt b/chromeos/profiles/orderfile.newest.txt
index bd0dbb3045b3f1..d5652da902d1a6 100644
--- a/chromeos/profiles/orderfile.newest.txt
+++ b/chromeos/profiles/orderfile.newest.txt
@@ -1 +1 @@
-chromeos-chrome-orderfile-field-98-4729.0-1638787322-benchmark-98.0.4758.3-r1.orderfile.xz
+chromeos-chrome-orderfile-field-98-4729.0-1638787322-benchmark-98.0.4758.5-r1.orderfile.xz
diff --git a/chromeos/services/bluetooth_config/device_cache_impl.cc b/chromeos/services/bluetooth_config/device_cache_impl.cc
index 0e96712874af31..7e689b1a08be41 100644
--- a/chromeos/services/bluetooth_config/device_cache_impl.cc
+++ b/chromeos/services/bluetooth_config/device_cache_impl.cc
@@ -8,6 +8,7 @@
 
 #include "base/containers/contains.h"
 #include "chromeos/services/bluetooth_config/device_conversion_util.h"
+#include "device/bluetooth/chromeos/bluetooth_utils.h"
 
 namespace chromeos {
 namespace bluetooth_config {
@@ -156,8 +157,10 @@ void DeviceCacheImpl::OnDeviceNicknameChanged(const std::string& device_id,
 }
 
 void DeviceCacheImpl::FetchInitialDeviceLists() {
-  for (const device::BluetoothDevice* device :
-       bluetooth_adapter_->GetDevices()) {
+  device::BluetoothAdapter::DeviceList devices = FilterBluetoothDeviceList(
+      bluetooth_adapter_->GetDevices(), device::BluetoothFilterType::KNOWN,
+      /*max_devices=*/0);
+  for (const device::BluetoothDevice* device : devices) {
     if (device->IsPaired()) {
       paired_devices_.push_back(
           GeneratePairedBluetoothDeviceProperties(device));
@@ -204,7 +207,12 @@ bool DeviceCacheImpl::AttemptUpdatePairedDeviceMetadata(
         return paired_device->device_properties->id;
       });
 
-  // If device is not found in |paired_devices|, don't update.
+  // If device is not found in |paired_devices|, don't update. This is done
+  // because when a paired device is forgotten, it is removed from
+  // |paired_devices|, but then OnDeviceChanged() is called with
+  // device->IsPaired() == true. If we don't have this check here, the device
+  // will be incorrectly added back into |paired_devices|. See
+  // crrev.com/c/3287422.
   if (!device_found)
     return false;
 
@@ -230,6 +238,10 @@ bool DeviceCacheImpl::AttemptSetDeviceInUnpairedDeviceList(
   if (device->IsPaired())
     return false;
 
+  // Check if the device should be added to the unpaired device list.
+  if (device::IsUnsupportedDevice(device))
+    return false;
+
   // Remove the old (stale) properties, if they exist.
   RemoveFromUnpairedDeviceList(device);
 
@@ -254,16 +266,6 @@ bool DeviceCacheImpl::RemoveFromUnpairedDeviceList(
 
 bool DeviceCacheImpl::AttemptUpdateUnpairedDeviceMetadata(
     device::BluetoothDevice* device) {
-  bool device_found =
-      base::Contains(unpaired_devices_, device->GetIdentifier(),
-                     [](const auto& unpaired_device) {
-                       return unpaired_device->device_properties->id;
-                     });
-
-  // If device is not found in |unpaired_devices|, don't update.
-  if (!device_found)
-    return false;
-
   // Remove existing metadata about |device|.
   bool updated = RemoveFromUnpairedDeviceList(device);
 
diff --git a/chromeos/services/bluetooth_config/device_cache_impl.h b/chromeos/services/bluetooth_config/device_cache_impl.h
index 0492b934dc7625..13e05ff877259b 100644
--- a/chromeos/services/bluetooth_config/device_cache_impl.h
+++ b/chromeos/services/bluetooth_config/device_cache_impl.h
@@ -119,8 +119,8 @@ class DeviceCacheImpl : public DeviceCache,
   bool RemoveFromUnpairedDeviceList(device::BluetoothDevice* device);
 
   // Attempts to add updated metadata about |device| to |paired_devices_|. If
-  // |device| is not found in |unpaired_devices_|, no update is performed.
-  // Returns true if the device was updated in the list.
+  // |device| is not found in |unpaired_devices_|, it is added. Returns true if
+  // the device was updated in the list.
   bool AttemptUpdateUnpairedDeviceMetadata(device::BluetoothDevice* device);
 
   // Sorts |unpaired_devices_| based on signal strength. This function is called
diff --git a/chromeos/services/bluetooth_config/device_cache_impl_unittest.cc b/chromeos/services/bluetooth_config/device_cache_impl_unittest.cc
index 4f8235607170fe..6ef722f109b6b8 100644
--- a/chromeos/services/bluetooth_config/device_cache_impl_unittest.cc
+++ b/chromeos/services/bluetooth_config/device_cache_impl_unittest.cc
@@ -94,7 +94,9 @@ class DeviceCacheImplTest : public testing::Test {
   void AddDevice(bool paired,
                  bool connected,
                  std::string* id_out,
-                 const absl::optional<int8_t> inquiry_rssi = absl::nullopt) {
+                 const absl::optional<int8_t> inquiry_rssi = absl::nullopt,
+                 const device::BluetoothDeviceType device_type =
+                     device::BluetoothDeviceType::AUDIO) {
     // We use the number of devices created in this test as the address.
     std::string address = base::NumberToString(num_devices_created_);
     ++num_devices_created_;
@@ -106,8 +108,12 @@ class DeviceCacheImplTest : public testing::Test {
         std::make_unique<testing::NiceMock<device::MockBluetoothDevice>>(
             mock_adapter_.get(), kTestBluetoothClass, kTestBluetoothName,
             address, paired, connected);
+    ON_CALL(*mock_device, GetType())
+        .WillByDefault(testing::Return(device::BLUETOOTH_TRANSPORT_DUAL));
     ON_CALL(*mock_device, GetInquiryRSSI())
         .WillByDefault(testing::Return(inquiry_rssi));
+    ON_CALL(*mock_device, GetDeviceType())
+        .WillByDefault(testing::Return(device_type));
 
     device::BluetoothDevice* device = mock_device.get();
     mock_devices_.push_back(std::move(mock_device));
@@ -473,7 +479,7 @@ TEST_F(DeviceCacheImplTest, PairedDeviceBluetoothClassChanges) {
   PairedDeviceList list = GetPairedDevices();
   EXPECT_EQ(1u, list.size());
   EXPECT_EQ(paired_device_id, list[0]->device_properties->id);
-  EXPECT_EQ(mojom::DeviceType::kUnknown,
+  EXPECT_EQ(mojom::DeviceType::kHeadset,
             list[0]->device_properties->device_type);
 
   // Change its device type.
@@ -496,8 +502,6 @@ TEST_F(DeviceCacheImplTest, PairedDeviceForgotten) {
   PairedDeviceList list = GetPairedDevices();
   EXPECT_EQ(1u, list.size());
   EXPECT_EQ(paired_device_id, list[0]->device_properties->id);
-  EXPECT_EQ(mojom::DeviceType::kUnknown,
-            list[0]->device_properties->device_type);
 
   ForgetDevice(paired_device_id);
   EXPECT_EQ(2u, GetNumPairedDeviceListObserverEvents());
@@ -515,15 +519,15 @@ TEST_F(DeviceCacheImplTest, UnpairedDeviceBluetoothClassChanges) {
   UnpairedDeviceList list = GetUnpairedDevices();
   EXPECT_EQ(1u, list.size());
   EXPECT_EQ(unpaired_device_id, list[0]->id);
-  EXPECT_EQ(mojom::DeviceType::kUnknown, list[0]->device_type);
+  EXPECT_EQ(mojom::DeviceType::kHeadset, list[0]->device_type);
 
   // Change its device type.
-  ChangeDeviceType(unpaired_device_id, device::BluetoothDeviceType::PHONE);
+  ChangeDeviceType(unpaired_device_id, device::BluetoothDeviceType::VIDEO);
   EXPECT_EQ(2u, GetNumUnpairedDeviceListObserverEvents());
   list = GetUnpairedDevices();
   EXPECT_EQ(1u, list.size());
   EXPECT_EQ(unpaired_device_id, list[0]->id);
-  EXPECT_EQ(mojom::DeviceType::kPhone, list[0]->device_type);
+  EXPECT_EQ(mojom::DeviceType::kVideoCamera, list[0]->device_type);
 }
 
 TEST_F(DeviceCacheImplTest, UnpairedDeviceSignalStrengthChanges) {
@@ -593,5 +597,140 @@ TEST_F(DeviceCacheImplTest, BluetoothTurnsOff) {
   EXPECT_TRUE(GetUnpairedDevices().empty());
 }
 
+TEST_F(DeviceCacheImplTest, UnknownUnpairedDeviceNotReturned) {
+  Init();
+  EXPECT_TRUE(GetUnpairedDevices().empty());
+
+  // Add an unknown device. This should not be added to the unpaired list and no
+  // observers notified.
+  std::string unpaired_device_id;
+  AddDevice(/*paired=*/false, /*connected=*/false, &unpaired_device_id,
+            /*inquiry_rssi=*/1,
+            /*device_type=*/device::BluetoothDeviceType::UNKNOWN);
+  EXPECT_EQ(0u, GetNumUnpairedDeviceListObserverEvents());
+  EXPECT_TRUE(GetUnpairedDevices().empty());
+
+  // Update a property in the device. This should not cause any observable
+  // actions.
+  ChangeInquiryRssi(unpaired_device_id, 3);
+  EXPECT_EQ(0u, GetNumUnpairedDeviceListObserverEvents());
+  EXPECT_TRUE(GetUnpairedDevices().empty());
+
+  // Remove the device. This should not cause any observable actions.
+  RemoveDevice(unpaired_device_id);
+  EXPECT_EQ(0u, GetNumUnpairedDeviceListObserverEvents());
+  EXPECT_TRUE(GetUnpairedDevices().empty());
+}
+
+TEST_F(DeviceCacheImplTest, UnsupportedUnpairedDeviceNotReturned) {
+  Init();
+  EXPECT_TRUE(GetUnpairedDevices().empty());
+
+  // Add a device of type PHONE. This should not be added to the unpaired list
+  // and no observers notified because this device type is unsupported.
+  std::string unpaired_device_id;
+  AddDevice(/*paired=*/false, /*connected=*/false, &unpaired_device_id,
+            /*inquiry_rssi=*/1,
+            /*device_type=*/device::BluetoothDeviceType::PHONE);
+  EXPECT_EQ(0u, GetNumUnpairedDeviceListObserverEvents());
+  EXPECT_TRUE(GetUnpairedDevices().empty());
+
+  // Update a property in the device. This should not cause any observable
+  // actions.
+  ChangeInquiryRssi(unpaired_device_id, 3);
+  EXPECT_EQ(0u, GetNumUnpairedDeviceListObserverEvents());
+  EXPECT_TRUE(GetUnpairedDevices().empty());
+
+  // Remove the device. This should not cause any observable actions.
+  RemoveDevice(unpaired_device_id);
+  EXPECT_EQ(0u, GetNumUnpairedDeviceListObserverEvents());
+  EXPECT_TRUE(GetUnpairedDevices().empty());
+}
+
+TEST_F(DeviceCacheImplTest, UnknownUnpairedDeviceChangesToKnown) {
+  Init();
+  EXPECT_TRUE(GetUnpairedDevices().empty());
+
+  // Add an unknown device. This should not be added to the unpaired list and no
+  // observers notified.
+  std::string unpaired_device_id;
+  AddDevice(/*paired=*/false, /*connected=*/false, &unpaired_device_id,
+            /*inquiry_rssi=*/1,
+            /*device_type=*/device::BluetoothDeviceType::UNKNOWN);
+  EXPECT_EQ(0u, GetNumUnpairedDeviceListObserverEvents());
+  EXPECT_TRUE(GetUnpairedDevices().empty());
+
+  // Update the device type to a known type. This should add the device to the
+  // unpaired list.
+  ChangeDeviceType(unpaired_device_id, device::BluetoothDeviceType::VIDEO);
+  UnpairedDeviceList unpaired_list = GetUnpairedDevices();
+  EXPECT_EQ(1u, GetNumUnpairedDeviceListObserverEvents());
+  EXPECT_EQ(1u, unpaired_list.size());
+  EXPECT_EQ(unpaired_device_id, unpaired_list[0]->id);
+
+  // Remove the device. This should notify observers.
+  RemoveDevice(unpaired_device_id);
+  EXPECT_EQ(2u, GetNumUnpairedDeviceListObserverEvents());
+  EXPECT_TRUE(GetUnpairedDevices().empty());
+}
+
+TEST_F(DeviceCacheImplTest, KnownUnpairedDeviceChangesToUnknown) {
+  Init();
+  EXPECT_TRUE(GetUnpairedDevices().empty());
+
+  // Add a known device. This should notify observers.
+  std::string unpaired_device_id;
+  AddDevice(/*paired=*/false, /*connected=*/false, &unpaired_device_id,
+            /*inquiry_rssi=*/1,
+            /*device_type=*/device::BluetoothDeviceType::VIDEO);
+  UnpairedDeviceList unpaired_list = GetUnpairedDevices();
+  EXPECT_EQ(1u, GetNumUnpairedDeviceListObserverEvents());
+  EXPECT_EQ(1u, unpaired_list.size());
+  EXPECT_EQ(unpaired_device_id, unpaired_list[0]->id);
+
+  // Update the device type to unknown type. This should remove the device from
+  // the unpaired list and notify observers.
+  ChangeDeviceType(unpaired_device_id, device::BluetoothDeviceType::UNKNOWN);
+  EXPECT_EQ(2u, GetNumUnpairedDeviceListObserverEvents());
+  EXPECT_TRUE(GetUnpairedDevices().empty());
+
+  // Remove the device. This should not cause any observable actions.
+  RemoveDevice(unpaired_device_id);
+  EXPECT_EQ(2u, GetNumUnpairedDeviceListObserverEvents());
+  EXPECT_TRUE(GetUnpairedDevices().empty());
+}
+
+TEST_F(DeviceCacheImplTest, UnknownPairedDeviceReturned) {
+  Init();
+  EXPECT_TRUE(GetPairedDevices().empty());
+  EXPECT_TRUE(GetUnpairedDevices().empty());
+
+  // Add an unknown paired device. This should notify observers.
+  std::string paired_device_id;
+  AddDevice(/*paired=*/true, /*connected=*/false, &paired_device_id,
+            /*inquiry_rssi=*/1,
+            /*device_type=*/device::BluetoothDeviceType::UNKNOWN);
+  EXPECT_EQ(1u, GetNumPairedDeviceListObserverEvents());
+  PairedDeviceList paired_list = GetPairedDevices();
+  EXPECT_EQ(1u, paired_list.size());
+  EXPECT_EQ(paired_device_id, paired_list[0]->device_properties->id);
+
+  // Update a property in the device. This should notify observers.
+  ChangeDeviceIsBlockedByPolicy(paired_device_id,
+                                /*is_blocked_by_policy=*/true);
+  EXPECT_EQ(2u, GetNumPairedDeviceListObserverEvents());
+  paired_list = GetPairedDevices();
+  EXPECT_EQ(1u, paired_list.size());
+  EXPECT_TRUE(paired_list[0]->device_properties->is_blocked_by_policy);
+
+  // Change the device to unpaired. This should update the paired device list
+  // but not the unpaired device list.
+  ChangePairingState(paired_device_id, /*is_now_paired=*/false);
+  EXPECT_EQ(3u, GetNumPairedDeviceListObserverEvents());
+  EXPECT_TRUE(GetPairedDevices().empty());
+  EXPECT_EQ(0u, GetNumUnpairedDeviceListObserverEvents());
+  EXPECT_TRUE(GetUnpairedDevices().empty());
+}
+
 }  // namespace bluetooth_config
 }  // namespace chromeos
diff --git a/components/autofill/ios/form_util/unique_id_data_tab_helper_unittest.mm b/components/autofill/ios/form_util/unique_id_data_tab_helper_unittest.mm
index d8f2ef397c07f9..b7d59003c1d804 100644
--- a/components/autofill/ios/form_util/unique_id_data_tab_helper_unittest.mm
+++ b/components/autofill/ios/form_util/unique_id_data_tab_helper_unittest.mm
@@ -13,15 +13,15 @@
 #error "This file requires ARC support."
 #endif
 
-// Test fixture for TabIdTabHelper class.
+// Test fixture for UniqueIDDataTabHelper class.
 class UniqueIDDataTabHelperTest : public PlatformTest {
  protected:
   web::FakeWebState first_web_state_;
   web::FakeWebState second_web_state_;
 };
 
-// Tests that a tab ID is returned for a WebState, and tab ID's are different
-// for different WebStates if they were once set differently.
+// Tests that a renderer ID is returned for a WebState, and rendered ID's are
+// different for different WebStates if they were once set differently.
 TEST_F(UniqueIDDataTabHelperTest, UniqueIdentifiers) {
   UniqueIDDataTabHelper::CreateForWebState(&first_web_state_);
   UniqueIDDataTabHelper::CreateForWebState(&second_web_state_);
@@ -51,7 +51,7 @@
   EXPECT_NE(first_available_unique_id, second_available_unique_id);
 }
 
-// Tests that a tab ID is stable across successive calls.
+// Tests that a renderer ID is stable across successive calls.
 TEST_F(UniqueIDDataTabHelperTest, StableAcrossCalls) {
   UniqueIDDataTabHelper::CreateForWebState(&first_web_state_);
   UniqueIDDataTabHelper* tab_helper =
diff --git a/components/autofill_assistant/browser/BUILD.gn b/components/autofill_assistant/browser/BUILD.gn
index e9ddc6e326ee82..f6311158258235 100644
--- a/components/autofill_assistant/browser/BUILD.gn
+++ b/components/autofill_assistant/browser/BUILD.gn
@@ -198,6 +198,10 @@ static_library("browser") {
     "service/access_token_fetcher.h",
     "service/api_key_fetcher.cc",
     "service/api_key_fetcher.h",
+    "service/cup.cc",
+    "service/cup.h",
+    "service/cup_factory.cc",
+    "service/cup_factory.h",
     "service/cup_impl.cc",
     "service/cup_impl.h",
     "service/rpc_type.h",
@@ -434,9 +438,13 @@ source_set("unit_tests") {
     "script_tracker_unittest.cc",
     "selector_unittest.cc",
     "service/api_key_fetcher_unittest.cc",
+    "service/cup_factory_unittest.cc",
     "service/cup_impl_unittest.cc",
+    "service/cup_unittest.cc",
     "service/mock_access_token_fetcher.cc",
     "service/mock_access_token_fetcher.h",
+    "service/mock_cup.cc",
+    "service/mock_cup.h",
     "service/mock_service_request_sender.cc",
     "service/mock_service_request_sender.h",
     "service/mock_simple_url_loader_factory.cc",
diff --git a/components/autofill_assistant/browser/service/cup.cc b/components/autofill_assistant/browser/service/cup.cc
new file mode 100644
index 00000000000000..53508a2f6769ff
--- /dev/null
+++ b/components/autofill_assistant/browser/service/cup.cc
@@ -0,0 +1,40 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "cup.h"
+
+#include "base/feature_list.h"
+#include "components/autofill_assistant/browser/features.h"
+
+namespace {
+
+bool ShouldSignGetActionsRequests() {
+  return base::FeatureList::IsEnabled(
+      autofill_assistant::features::kAutofillAssistantSignGetActionsRequests);
+}
+
+bool ShouldVerifyGetActionsResponses() {
+  return ShouldSignGetActionsRequests() &&
+         base::FeatureList::IsEnabled(
+             autofill_assistant::features::
+                 kAutofillAssistantVerifyGetActionsResponses);
+}
+
+}  // namespace
+
+namespace autofill_assistant {
+
+namespace cup {
+
+bool ShouldSignRequests(RpcType rpc_type) {
+  return ShouldSignGetActionsRequests() && rpc_type == RpcType::GET_ACTIONS;
+}
+
+bool ShouldVerifyResponses(RpcType rpc_type) {
+  return ShouldVerifyGetActionsResponses() && rpc_type == RpcType::GET_ACTIONS;
+}
+
+}  // namespace cup
+
+}  // namespace autofill_assistant
diff --git a/components/autofill_assistant/browser/service/cup.h b/components/autofill_assistant/browser/service/cup.h
new file mode 100644
index 00000000000000..eb4d4a82312950
--- /dev/null
+++ b/components/autofill_assistant/browser/service/cup.h
@@ -0,0 +1,47 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_SERVICE_CUP_H_
+#define COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_SERVICE_CUP_H_
+
+#include "components/autofill_assistant/browser/service/rpc_type.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
+
+namespace autofill_assistant {
+
+namespace cup {
+
+// Whether |PackAndSignRequest| should be called before the request is
+// submitted. Can be |false| because signing is disabled via feature flag,
+// or given message type doesn't support CUP signing.
+bool ShouldSignRequests(RpcType rpc_type);
+
+// Whether |UnpackResponse| should be called on the response from the service
+// call. Can be false because verification is disabled via feature flag or
+// |ShouldSignRequest| returns |false|.
+bool ShouldVerifyResponses(RpcType rpc_type);
+
+class CUP {
+ public:
+  virtual ~CUP() = default;
+
+  // Generates a new |request| where |original_request| is packed and signed in
+  // its |cup_data| field.
+  virtual std::string PackAndSignRequest(
+      const std::string& original_request) = 0;
+
+  // Generates a new |response| where |original_response| is unpacked from
+  // the |cup_data| field.
+  virtual absl::optional<std::string> UnpackResponse(
+      const std::string& original_response) = 0;
+
+ protected:
+  CUP() = default;
+};
+
+}  // namespace cup
+
+}  // namespace autofill_assistant
+
+#endif  // COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_SERVICE_CUP_H_
diff --git a/components/autofill_assistant/browser/service/cup_factory.cc b/components/autofill_assistant/browser/service/cup_factory.cc
new file mode 100644
index 00000000000000..ee916792752df4
--- /dev/null
+++ b/components/autofill_assistant/browser/service/cup_factory.cc
@@ -0,0 +1,18 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "components/autofill_assistant/browser/service/cup_factory.h"
+#include "components/autofill_assistant/browser/service/cup_impl.h"
+
+namespace autofill_assistant {
+
+namespace cup {
+
+std::unique_ptr<CUP> CUPImplFactory::CreateInstance(RpcType rpc_type) const {
+  return std::make_unique<CUPImpl>(CUPImpl::CreateQuerySigner(), rpc_type);
+}
+
+}  // namespace cup
+
+}  // namespace autofill_assistant
diff --git a/components/autofill_assistant/browser/service/cup_factory.h b/components/autofill_assistant/browser/service/cup_factory.h
new file mode 100644
index 00000000000000..aab3b010786ded
--- /dev/null
+++ b/components/autofill_assistant/browser/service/cup_factory.h
@@ -0,0 +1,41 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_SERVICE_CUP_FACTORY_H_
+#define COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_SERVICE_CUP_FACTORY_H_
+
+#include "components/autofill_assistant/browser/service/cup.h"
+
+namespace autofill_assistant {
+
+namespace cup {
+
+// Base interface for creators of CUP (Client Update Protocol) instances.
+class CUPFactory {
+ public:
+  virtual ~CUPFactory() = default;
+
+  // Creates an instance of CUP for a call of given |rpc_type|.
+  virtual std::unique_ptr<CUP> CreateInstance(RpcType rpc_type) const = 0;
+
+ protected:
+  CUPFactory() = default;
+};
+
+// Implementation of |CUPFactory| for |CUPImpl| instances.
+class CUPImplFactory : public CUPFactory {
+ public:
+  CUPImplFactory() = default;
+  ~CUPImplFactory() override = default;
+  CUPImplFactory(const CUPImplFactory&) = delete;
+  CUPImplFactory& operator=(const CUPImplFactory&) = delete;
+
+  std::unique_ptr<CUP> CreateInstance(RpcType rpc_type) const override;
+};
+
+}  // namespace cup
+
+}  // namespace autofill_assistant
+
+#endif  // COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_SERVICE_CUP_FACTORY_H_
diff --git a/components/autofill_assistant/browser/service/cup_factory_unittest.cc b/components/autofill_assistant/browser/service/cup_factory_unittest.cc
new file mode 100644
index 00000000000000..f7b99556e7fe83
--- /dev/null
+++ b/components/autofill_assistant/browser/service/cup_factory_unittest.cc
@@ -0,0 +1,31 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "components/autofill_assistant/browser/service/cup_factory.h"
+#include "components/autofill_assistant/browser/service/cup_impl.h"
+#include "testing/gmock/include/gmock/gmock.h"
+
+namespace {
+
+class CUPFactoryTest : public testing::Test {
+ public:
+  CUPFactoryTest()
+      : cup_factory_{
+            std::make_unique<autofill_assistant::cup::CUPImplFactory>()} {}
+  ~CUPFactoryTest() override = default;
+
+ protected:
+  std::unique_ptr<autofill_assistant::cup::CUPFactory> cup_factory_;
+};
+
+TEST_F(CUPFactoryTest, ShouldCreateCupImplInstance) {
+  std::unique_ptr<autofill_assistant::cup::CUP> cup =
+      cup_factory_->CreateInstance(autofill_assistant::RpcType::GET_ACTIONS);
+  EXPECT_NE(cup, nullptr);
+
+  std::string packed_request = cup->PackAndSignRequest("request");
+  EXPECT_FALSE(packed_request.empty());
+}
+
+}  // namespace
diff --git a/components/autofill_assistant/browser/service/cup_impl.cc b/components/autofill_assistant/browser/service/cup_impl.cc
index e7c2f1cd96ec36..569f521e65700b 100644
--- a/components/autofill_assistant/browser/service/cup_impl.cc
+++ b/components/autofill_assistant/browser/service/cup_impl.cc
@@ -5,10 +5,9 @@
 #include "cup_impl.h"
 
 #include "base/base64.h"
-#include "base/feature_list.h"
+#include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
-#include "components/autofill_assistant/browser/features.h"
 #include "components/autofill_assistant/browser/service.pb.h"
 #include "components/client_update_protocol/ecdsa.h"
 
@@ -27,38 +26,24 @@ std::string GetKey(const char* key_bytes_base64) {
              : std::string();
 }
 
-bool ShouldSignGetActionsRequests() {
-  return base::FeatureList::IsEnabled(
-      autofill_assistant::features::kAutofillAssistantSignGetActionsRequests);
-}
-
-bool ShouldVerifyGetActionsResponses() {
-  return ShouldSignGetActionsRequests() &&
-         base::FeatureList::IsEnabled(
-             autofill_assistant::features::
-                 kAutofillAssistantVerifyGetActionsResponses);
-}
-
 }  // namespace
 
 namespace autofill_assistant {
 
+namespace cup {
+
 std::unique_ptr<client_update_protocol::Ecdsa> CUPImpl::CreateQuerySigner() {
   return client_update_protocol::Ecdsa::Create(kKeyVersion,
                                                GetKey(kKeyPubBytesBase64));
 }
 
-bool CUPImpl::ShouldSignRequests(RpcType rpc_type) {
-  return ShouldSignGetActionsRequests() && rpc_type == RpcType::GET_ACTIONS;
-}
-
-bool CUPImpl::ShouldVerifyResponses(RpcType rpc_type) {
-  return ShouldVerifyGetActionsResponses() && rpc_type == RpcType::GET_ACTIONS;
-}
-
-CUPImpl::CUPImpl(std::unique_ptr<client_update_protocol::Ecdsa> query_signer)
+CUPImpl::CUPImpl(std::unique_ptr<client_update_protocol::Ecdsa> query_signer,
+                 RpcType rpc_type)
     : query_signer_{std::move(query_signer)} {
   DCHECK(query_signer_);
+
+  // Only GET_ACTIONS calls have support for CUP at this moment.
+  DCHECK(rpc_type == RpcType::GET_ACTIONS);
 }
 
 CUPImpl::~CUPImpl() = default;
@@ -110,4 +95,6 @@ client_update_protocol::Ecdsa& CUPImpl::GetQuerySigner() {
   return *query_signer_.get();
 }
 
+}  // namespace cup
+
 }  // namespace autofill_assistant
diff --git a/components/autofill_assistant/browser/service/cup_impl.h b/components/autofill_assistant/browser/service/cup_impl.h
index 106ec7361ffd11..e1ecca1ff1931e 100644
--- a/components/autofill_assistant/browser/service/cup_impl.h
+++ b/components/autofill_assistant/browser/service/cup_impl.h
@@ -5,12 +5,13 @@
 #ifndef COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_SERVICE_CUP_IMPL_H_
 #define COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_SERVICE_CUP_IMPL_H_
 
-#include "components/autofill_assistant/browser/service/rpc_type.h"
+#include "components/autofill_assistant/browser/service/cup.h"
 #include "components/client_update_protocol/ecdsa.h"
-#include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace autofill_assistant {
 
+namespace cup {
+
 // Implementation of the Client Update Protocol (CUP) for the service calls in
 // |autofill_assistant|.
 // https://source.chromium.org/chromium/chromium/src/+/main:docs/updater/cup.md
@@ -19,37 +20,28 @@ namespace autofill_assistant {
 // HTTP headers, and is sent as part of the request and response body instead.
 //
 // This class can only be used once per service call.
-class CUPImpl {
+class CUPImpl : public CUP {
  public:
   static std::unique_ptr<client_update_protocol::Ecdsa> CreateQuerySigner();
 
-  // Whether |PackAndSignRequest| should be called before the request is
-  // submitted. Can be |false| because signing is disabled via feature flag,
-  // or given message type doesn't support CUP signing.
-  static bool ShouldSignRequests(RpcType rpc_type);
-
-  // Whether |UnpackResponse| should be called on the response from the service
-  // call. Can be false because verification is disabled via feature flag or
-  // |ShouldSignRequest| returns |false|.
-  static bool ShouldVerifyResponses(RpcType rpc_type);
-
-  CUPImpl(std::unique_ptr<client_update_protocol::Ecdsa> query_signer);
+  CUPImpl(std::unique_ptr<client_update_protocol::Ecdsa> query_signer,
+          RpcType rpc_type);
   CUPImpl(const CUPImpl&) = delete;
   CUPImpl& operator=(const CUPImpl&) = delete;
-  ~CUPImpl();
+  ~CUPImpl() override;
 
   // Generates a new |request| where |original_request| is packed and signed in
   // its |cup_data| field.
   //
   // Should only be called if |ShouldSignRequest| returns true.
-  std::string PackAndSignRequest(const std::string& original_request);
+  std::string PackAndSignRequest(const std::string& original_request) override;
 
   // Generates a new |response| where |original_response| is unpacked from
   // the |cup_data| field.
   //
   // Should only be called if |ShouldVerifyResponse| returns true.
   absl::optional<std::string> UnpackResponse(
-      const std::string& original_response);
+      const std::string& original_response) override;
 
   // Gets the query signer object being used by this CUP instance. Needed for
   // testing.
@@ -64,6 +56,8 @@ class CUPImpl {
   std::unique_ptr<client_update_protocol::Ecdsa> query_signer_;
 };
 
+}  // namespace cup
+
 }  // namespace autofill_assistant
 
 #endif  // COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_SERVICE_CUP_IMPL_H_
diff --git a/components/autofill_assistant/browser/service/cup_impl_unittest.cc b/components/autofill_assistant/browser/service/cup_impl_unittest.cc
index e5e6e32095a8fd..1272e9af41db90 100644
--- a/components/autofill_assistant/browser/service/cup_impl_unittest.cc
+++ b/components/autofill_assistant/browser/service/cup_impl_unittest.cc
@@ -13,92 +13,16 @@ namespace {
 
 class CUPImplTest : public testing::Test {
  public:
-  CUPImplTest() : cup_{autofill_assistant::CUPImpl::CreateQuerySigner()} {}
+  CUPImplTest()
+      : cup_{autofill_assistant::cup::CUPImpl::CreateQuerySigner(),
+             autofill_assistant::RpcType::GET_ACTIONS} {}
   ~CUPImplTest() override = default;
 
  protected:
-  autofill_assistant::CUPImpl cup_;
-  base::test::ScopedFeatureList scoped_feature_list_;
-
-  void InitCupFeatures(bool enableSigning, bool enableVerifying) {
-    std::vector<base::Feature> enabled_features;
-    std::vector<base::Feature> disabled_features;
-
-    if (enableSigning) {
-      enabled_features.push_back(autofill_assistant::features::
-                                     kAutofillAssistantSignGetActionsRequests);
-    } else {
-      disabled_features.push_back(autofill_assistant::features::
-                                      kAutofillAssistantSignGetActionsRequests);
-    }
-
-    if (enableVerifying) {
-      enabled_features.push_back(
-          autofill_assistant::features::
-              kAutofillAssistantVerifyGetActionsResponses);
-    } else {
-      disabled_features.push_back(
-          autofill_assistant::features::
-              kAutofillAssistantVerifyGetActionsResponses);
-    }
-
-    scoped_feature_list_.Reset();
-    scoped_feature_list_.InitWithFeatures(enabled_features, disabled_features);
-  }
+  autofill_assistant::cup::CUPImpl cup_;
 };
 
-TEST_F(CUPImplTest, ShouldSignGetActionsRequestWhenFeatureActivated) {
-  InitCupFeatures(true, false);
-
-  EXPECT_TRUE(autofill_assistant::CUPImpl::ShouldSignRequests(
-      autofill_assistant::RpcType::GET_ACTIONS));
-}
-
-TEST_F(CUPImplTest, ShouldNotSignGetActionsRequestWhenFeatureNotActivated) {
-  InitCupFeatures(false, false);
-
-  EXPECT_FALSE(autofill_assistant::CUPImpl::ShouldSignRequests(
-      autofill_assistant::RpcType::GET_ACTIONS));
-}
-
-TEST_F(CUPImplTest, ShouldNotSignNotGetActionsRequest) {
-  InitCupFeatures(true, false);
-
-  EXPECT_FALSE(autofill_assistant::CUPImpl::ShouldSignRequests(
-      autofill_assistant::RpcType::GET_TRIGGER_SCRIPTS));
-}
-
-TEST_F(CUPImplTest, ShouldVerifyGetActionsResponseWhenFeatureActivated) {
-  InitCupFeatures(true, true);
-
-  EXPECT_TRUE(autofill_assistant::CUPImpl::ShouldVerifyResponses(
-      autofill_assistant::RpcType::GET_ACTIONS));
-}
-
-TEST_F(CUPImplTest, ShouldNotVerifyGetActionsResponseWhenFeatureNotActivated) {
-  InitCupFeatures(true, false);
-
-  EXPECT_FALSE(autofill_assistant::CUPImpl::ShouldVerifyResponses(
-      autofill_assistant::RpcType::GET_ACTIONS));
-}
-
-TEST_F(CUPImplTest, ShouldNotVerifyGetActionsResponseWhenSigningNotActivated) {
-  InitCupFeatures(false, true);
-
-  EXPECT_FALSE(autofill_assistant::CUPImpl::ShouldVerifyResponses(
-      autofill_assistant::RpcType::GET_ACTIONS));
-}
-
-TEST_F(CUPImplTest, ShouldNotVerifyNotGetActionsResponse) {
-  InitCupFeatures(true, true);
-
-  EXPECT_FALSE(autofill_assistant::CUPImpl::ShouldVerifyResponses(
-      autofill_assistant::RpcType::GET_TRIGGER_SCRIPTS));
-}
-
 TEST_F(CUPImplTest, PacksAndSignsGetActionsRequest) {
-  InitCupFeatures(true, false);
-
   autofill_assistant::ScriptActionRequestProto user_request;
   user_request.mutable_client_context()->set_experiment_ids("test");
   std::string user_request_str;
@@ -125,8 +49,6 @@ TEST_F(CUPImplTest, UnpacksTrustedGetActionsResponse) {
 }
 
 TEST_F(CUPImplTest, FailsToUnpackNonTrustedGetActionsResponse) {
-  InitCupFeatures(true, true);
-
   autofill_assistant::ScriptActionRequestProto user_request;
   user_request.mutable_client_context()->set_experiment_ids("123");
   std::string user_request_str;
diff --git a/components/autofill_assistant/browser/service/cup_unittest.cc b/components/autofill_assistant/browser/service/cup_unittest.cc
new file mode 100644
index 00000000000000..45aaf8d30eee83
--- /dev/null
+++ b/components/autofill_assistant/browser/service/cup_unittest.cc
@@ -0,0 +1,98 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "cup.h"
+
+#include "base/test/scoped_feature_list.h"
+#include "components/autofill_assistant/browser/features.h"
+#include "components/autofill_assistant/browser/service.pb.h"
+#include "testing/gmock/include/gmock/gmock.h"
+
+namespace {
+
+class CUPTest : public testing::Test {
+ public:
+  CUPTest() = default;
+  ~CUPTest() override = default;
+
+ protected:
+  base::test::ScopedFeatureList scoped_feature_list_;
+
+  void InitCupFeatures(bool enableSigning, bool enableVerifying) {
+    std::vector<base::Feature> enabled_features;
+    std::vector<base::Feature> disabled_features;
+
+    if (enableSigning) {
+      enabled_features.push_back(autofill_assistant::features::
+                                     kAutofillAssistantSignGetActionsRequests);
+    } else {
+      disabled_features.push_back(autofill_assistant::features::
+                                      kAutofillAssistantSignGetActionsRequests);
+    }
+
+    if (enableVerifying) {
+      enabled_features.push_back(
+          autofill_assistant::features::
+              kAutofillAssistantVerifyGetActionsResponses);
+    } else {
+      disabled_features.push_back(
+          autofill_assistant::features::
+              kAutofillAssistantVerifyGetActionsResponses);
+    }
+
+    scoped_feature_list_.Reset();
+    scoped_feature_list_.InitWithFeatures(enabled_features, disabled_features);
+  }
+};
+
+TEST_F(CUPTest, ShouldSignGetActionsRequestWhenFeatureActivated) {
+  InitCupFeatures(true, false);
+
+  EXPECT_TRUE(autofill_assistant::cup::ShouldSignRequests(
+      autofill_assistant::RpcType::GET_ACTIONS));
+}
+
+TEST_F(CUPTest, ShouldNotSignGetActionsRequestWhenFeatureNotActivated) {
+  InitCupFeatures(false, false);
+
+  EXPECT_FALSE(autofill_assistant::cup::ShouldSignRequests(
+      autofill_assistant::RpcType::GET_ACTIONS));
+}
+
+TEST_F(CUPTest, ShouldNotSignNotGetActionsRequest) {
+  InitCupFeatures(true, false);
+
+  EXPECT_FALSE(autofill_assistant::cup::ShouldSignRequests(
+      autofill_assistant::RpcType::GET_TRIGGER_SCRIPTS));
+}
+
+TEST_F(CUPTest, ShouldVerifyGetActionsResponseWhenFeatureActivated) {
+  InitCupFeatures(true, true);
+
+  EXPECT_TRUE(autofill_assistant::cup::ShouldVerifyResponses(
+      autofill_assistant::RpcType::GET_ACTIONS));
+}
+
+TEST_F(CUPTest, ShouldNotVerifyGetActionsResponseWhenFeatureNotActivated) {
+  InitCupFeatures(true, false);
+
+  EXPECT_FALSE(autofill_assistant::cup::ShouldVerifyResponses(
+      autofill_assistant::RpcType::GET_ACTIONS));
+}
+
+TEST_F(CUPTest, ShouldNotVerifyGetActionsResponseWhenSigningNotActivated) {
+  InitCupFeatures(false, true);
+
+  EXPECT_FALSE(autofill_assistant::cup::ShouldVerifyResponses(
+      autofill_assistant::RpcType::GET_ACTIONS));
+}
+
+TEST_F(CUPTest, ShouldNotVerifyNotGetActionsResponse) {
+  InitCupFeatures(true, true);
+
+  EXPECT_FALSE(autofill_assistant::cup::ShouldVerifyResponses(
+      autofill_assistant::RpcType::GET_TRIGGER_SCRIPTS));
+}
+
+}  // namespace
diff --git a/components/autofill_assistant/browser/service/java_service_request_sender.cc b/components/autofill_assistant/browser/service/java_service_request_sender.cc
index 7fa568dea8b607..2d601550c6b648 100644
--- a/components/autofill_assistant/browser/service/java_service_request_sender.cc
+++ b/components/autofill_assistant/browser/service/java_service_request_sender.cc
@@ -24,7 +24,8 @@ JavaServiceRequestSender::~JavaServiceRequestSender() = default;
 
 void JavaServiceRequestSender::SendRequest(const GURL& url,
                                            const std::string& request_body,
-                                           ResponseCallback callback) {
+                                           ResponseCallback callback,
+                                           RpcType rpc_type) {
   DCHECK(!callback_)
       << __func__
       << " invoked while still waiting for response to previous request";
diff --git a/components/autofill_assistant/browser/service/java_service_request_sender.h b/components/autofill_assistant/browser/service/java_service_request_sender.h
index 200d17a007baab..f1e32626867d63 100644
--- a/components/autofill_assistant/browser/service/java_service_request_sender.h
+++ b/components/autofill_assistant/browser/service/java_service_request_sender.h
@@ -30,7 +30,8 @@ class JavaServiceRequestSender : public ServiceRequestSender {
 
   void SendRequest(const GURL& url,
                    const std::string& request_body,
-                   ResponseCallback callback) override;
+                   ResponseCallback callback,
+                   RpcType rpc_type) override;
 
   void OnResponse(JNIEnv* env,
                   const base::android::JavaParamRef<jobject>& jcaller,
diff --git a/components/autofill_assistant/browser/service/mock_cup.cc b/components/autofill_assistant/browser/service/mock_cup.cc
new file mode 100644
index 00000000000000..713a7b0ff32899
--- /dev/null
+++ b/components/autofill_assistant/browser/service/mock_cup.cc
@@ -0,0 +1,21 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <string>
+
+#include "components/autofill_assistant/browser/service/mock_cup.h"
+
+namespace autofill_assistant {
+
+namespace cup {
+
+MockCUP::MockCUP() = default;
+MockCUP::~MockCUP() = default;
+
+MockCUPFactory::MockCUPFactory() = default;
+MockCUPFactory::~MockCUPFactory() = default;
+
+}  // namespace cup
+
+}  // namespace autofill_assistant
diff --git a/components/autofill_assistant/browser/service/mock_cup.h b/components/autofill_assistant/browser/service/mock_cup.h
new file mode 100644
index 00000000000000..3621736164734f
--- /dev/null
+++ b/components/autofill_assistant/browser/service/mock_cup.h
@@ -0,0 +1,41 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_SERVICE_MOCK_CUP_H_
+#define COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_SERVICE_MOCK_CUP_H_
+
+#include "components/autofill_assistant/browser/service/cup.h"
+#include "components/autofill_assistant/browser/service/cup_factory.h"
+#include "testing/gmock/include/gmock/gmock.h"
+
+namespace autofill_assistant {
+
+namespace cup {
+
+class MockCUP : public CUP {
+ public:
+  MockCUP();
+  ~MockCUP() override;
+
+  MOCK_METHOD1(PackAndSignRequest,
+               std::string(const std::string& original_request));
+
+  MOCK_METHOD1(
+      UnpackResponse,
+      absl::optional<std::string>(const std::string& original_response));
+};
+
+class MockCUPFactory : public CUPFactory {
+ public:
+  MockCUPFactory();
+  ~MockCUPFactory() override;
+
+  MOCK_CONST_METHOD1(CreateInstance, std::unique_ptr<CUP>(RpcType rpc_type));
+};
+
+}  // namespace cup
+
+}  // namespace autofill_assistant
+
+#endif  // COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_SERVICE_MOCK_CUP_H_
diff --git a/components/autofill_assistant/browser/service/mock_service_request_sender.h b/components/autofill_assistant/browser/service/mock_service_request_sender.h
index 2911f6f92b686d..0f7d44d1a498b8 100644
--- a/components/autofill_assistant/browser/service/mock_service_request_sender.h
+++ b/components/autofill_assistant/browser/service/mock_service_request_sender.h
@@ -20,14 +20,16 @@ class MockServiceRequestSender : public ServiceRequestSender {
 
   void SendRequest(const GURL& url,
                    const std::string& request_body,
-                   ResponseCallback callback) override {
-    OnSendRequest(url, request_body, callback);
+                   ResponseCallback callback,
+                   RpcType rpc_type) override {
+    OnSendRequest(url, request_body, callback, rpc_type);
   }
 
-  MOCK_METHOD3(OnSendRequest,
+  MOCK_METHOD4(OnSendRequest,
                void(const GURL& url,
                     const std::string& request_body,
-                    ResponseCallback& callback));
+                    ResponseCallback& callback,
+                    RpcType rpc_type));
 };
 
 }  // namespace autofill_assistant
diff --git a/components/autofill_assistant/browser/service/service_impl.cc b/components/autofill_assistant/browser/service/service_impl.cc
index a9b7c5313415da..633a953c630ffa 100644
--- a/components/autofill_assistant/browser/service/service_impl.cc
+++ b/components/autofill_assistant/browser/service/service_impl.cc
@@ -16,6 +16,7 @@
 #include "components/autofill_assistant/browser/features.h"
 #include "components/autofill_assistant/browser/protocol_utils.h"
 #include "components/autofill_assistant/browser/service/api_key_fetcher.h"
+#include "components/autofill_assistant/browser/service/cup_factory.h"
 #include "components/autofill_assistant/browser/service/service_request_sender_impl.h"
 #include "components/autofill_assistant/browser/switches.h"
 #include "components/autofill_assistant/browser/trigger_context.h"
@@ -44,6 +45,7 @@ std::unique_ptr<ServiceImpl> ServiceImpl::Create(
     const ServerUrlFetcher& url_fetcher) {
   auto request_sender = std::make_unique<ServiceRequestSenderImpl>(
       context, client->GetAccessTokenFetcher(),
+      std::make_unique<cup::CUPImplFactory>(),
       std::make_unique<NativeURLLoaderFactory>(),
       ApiKeyFetcher().GetAPIKey(client->GetChannel()),
       /* auth_enabled = */ "false" !=
@@ -88,7 +90,7 @@ void ServiceImpl::GetScriptsForUrl(const GURL& url,
                                ProtocolUtils::CreateGetScriptsRequest(
                                    url, client_context_->AsProto(),
                                    trigger_context.GetScriptParameters()),
-                               std::move(callback));
+                               std::move(callback), RpcType::SUPPORTS_SCRIPT);
 }
 
 void ServiceImpl::GetActions(const std::string& script_path,
@@ -139,7 +141,7 @@ void ServiceImpl::SendGetActions(const std::string& script_path,
           script_path, url, global_payload, script_payload,
           client_context_->AsProto(), trigger_context.GetScriptParameters(),
           script_store_config_),
-      std::move(callback));
+      std::move(callback), RpcType::GET_ACTIONS);
 }
 
 void ServiceImpl::GetNextActions(
@@ -155,7 +157,7 @@ void ServiceImpl::GetNextActions(
       ProtocolUtils::CreateNextScriptActionsRequest(
           previous_global_payload, previous_script_payload, processed_actions,
           timing_stats, client_context_->AsProto()),
-      std::move(callback));
+      std::move(callback), RpcType::GET_ACTIONS);
 }
 
 }  // namespace autofill_assistant
diff --git a/components/autofill_assistant/browser/service/service_impl_unittest.cc b/components/autofill_assistant/browser/service/service_impl_unittest.cc
index 267f85d9e0677e..314d6ce4289209 100644
--- a/components/autofill_assistant/browser/service/service_impl_unittest.cc
+++ b/components/autofill_assistant/browser/service/service_impl_unittest.cc
@@ -58,8 +58,8 @@ class ServiceImplTest : public testing::Test {
 
 TEST_F(ServiceImplTest, GetScriptsForUrl) {
   EXPECT_CALL(*mock_client_context_, Update);
-  EXPECT_CALL(*mock_request_sender_,
-              OnSendRequest(GURL(kScriptServerUrl), _, _))
+  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kScriptServerUrl), _, _,
+                                                   RpcType::SUPPORTS_SCRIPT))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, std::string("response")));
   EXPECT_CALL(mock_response_callback_,
               Run(net::HTTP_OK, std::string("response")));
@@ -74,7 +74,7 @@ TEST_F(ServiceImplTest, GetActions) {
       .WillOnce(RunOnceCallback<0>("token"));
   EXPECT_CALL(*mock_client_context_, SetPaymentsClientToken("token"));
   EXPECT_CALL(*mock_request_sender_,
-              OnSendRequest(GURL(kActionServerUrl), _, _))
+              OnSendRequest(GURL(kActionServerUrl), _, _, RpcType::GET_ACTIONS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, std::string("response")));
   EXPECT_CALL(mock_response_callback_,
               Run(net::HTTP_OK, std::string("response")));
@@ -99,7 +99,7 @@ TEST_F(ServiceImplTest, GetActionsForwardsScriptStoreConfig) {
 
   std::string get_actions_request;
   EXPECT_CALL(*mock_request_sender_,
-              OnSendRequest(GURL(kActionServerUrl), _, _))
+              OnSendRequest(GURL(kActionServerUrl), _, _, RpcType::GET_ACTIONS))
       .WillOnce(SaveArg<1>(&get_actions_request));
 
   ScriptStoreConfig set_config;
@@ -131,7 +131,7 @@ TEST_F(ServiceImplTest, GetActionsWithoutClientToken) {
   EXPECT_CALL(mock_client_, FetchPaymentsClientToken).Times(0);
   EXPECT_CALL(*mock_client_context_, SetPaymentsClientToken).Times(0);
   EXPECT_CALL(*mock_request_sender_,
-              OnSendRequest(GURL(kActionServerUrl), _, _))
+              OnSendRequest(GURL(kActionServerUrl), _, _, RpcType::GET_ACTIONS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, std::string("response")));
   EXPECT_CALL(mock_response_callback_,
               Run(net::HTTP_OK, std::string("response")));
@@ -152,7 +152,7 @@ TEST_F(ServiceImplTest, GetActionsDoesNotReloadClientToken) {
   EXPECT_CALL(mock_client_, FetchPaymentsClientToken).Times(0);
   EXPECT_CALL(*mock_client_context_, SetPaymentsClientToken).Times(0);
   EXPECT_CALL(*mock_request_sender_,
-              OnSendRequest(GURL(kActionServerUrl), _, _))
+              OnSendRequest(GURL(kActionServerUrl), _, _, RpcType::GET_ACTIONS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, std::string("response")));
   EXPECT_CALL(mock_response_callback_,
               Run(net::HTTP_OK, std::string("response")));
@@ -166,7 +166,7 @@ TEST_F(ServiceImplTest, GetActionsDoesNotReloadClientToken) {
 TEST_F(ServiceImplTest, GetNextActions) {
   EXPECT_CALL(*mock_client_context_, Update);
   EXPECT_CALL(*mock_request_sender_,
-              OnSendRequest(GURL(kActionServerUrl), _, _))
+              OnSendRequest(GURL(kActionServerUrl), _, _, RpcType::GET_ACTIONS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, std::string("response")));
   EXPECT_CALL(mock_response_callback_,
               Run(net::HTTP_OK, std::string("response")));
diff --git a/components/autofill_assistant/browser/service/service_request_sender.h b/components/autofill_assistant/browser/service/service_request_sender.h
index 865e9ddd2fdc4e..f50790d2fe6b32 100644
--- a/components/autofill_assistant/browser/service/service_request_sender.h
+++ b/components/autofill_assistant/browser/service/service_request_sender.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/callback.h"
+#include "components/autofill_assistant/browser/service/rpc_type.h"
 #include "url/gurl.h"
 
 namespace autofill_assistant {
@@ -24,7 +25,8 @@ class ServiceRequestSender {
   // response itself.
   virtual void SendRequest(const GURL& url,
                            const std::string& request_body,
-                           ResponseCallback callback) = 0;
+                           ResponseCallback response_callback,
+                           RpcType rpc_type) = 0;
 };
 
 }  // namespace autofill_assistant
diff --git a/components/autofill_assistant/browser/service/service_request_sender_impl.cc b/components/autofill_assistant/browser/service/service_request_sender_impl.cc
index 7bde65e77004ca..b3d19e2c1100d0 100644
--- a/components/autofill_assistant/browser/service/service_request_sender_impl.cc
+++ b/components/autofill_assistant/browser/service/service_request_sender_impl.cc
@@ -4,7 +4,12 @@
 
 #include "components/autofill_assistant/browser/service/service_request_sender_impl.h"
 
+#include "base/feature_list.h"
 #include "base/strings/strcat.h"
+#include "components/autofill_assistant/browser/features.h"
+#include "components/autofill_assistant/browser/service.pb.h"
+#include "components/autofill_assistant/browser/service/cup.h"
+#include "components/autofill_assistant/browser/service/cup_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/storage_partition.h"
 #include "net/base/load_flags.h"
@@ -115,6 +120,20 @@ void SendRequestNoAuth(
                   loader_factory, std::move(callback));
 }
 
+void VerifyCupResponse(
+    std::unique_ptr<autofill_assistant::cup::CUP> cup,
+    autofill_assistant::ServiceRequestSender::ResponseCallback callback,
+    int http_status,
+    const std::string& response) {
+  absl::optional<std::string> unpacked_response = cup->UnpackResponse(response);
+  if (!unpacked_response) {
+    LOG(ERROR) << "Failed to unpack or verify a response.";
+    return std::move(callback).Run(net::HTTP_UNAUTHORIZED, std::string());
+  }
+
+  return std::move(callback).Run(http_status, *unpacked_response);
+}
+
 }  // namespace
 
 namespace autofill_assistant {
@@ -122,12 +141,14 @@ namespace autofill_assistant {
 ServiceRequestSenderImpl::ServiceRequestSenderImpl(
     content::BrowserContext* context,
     AccessTokenFetcher* access_token_fetcher,
+    std::unique_ptr<cup::CUPFactory> cup_factory,
     std::unique_ptr<SimpleURLLoaderFactory> loader_factory,
     const std::string& api_key,
     bool auth_enabled,
     bool disable_auth_if_no_access_token)
     : context_(context),
       access_token_fetcher_(access_token_fetcher),
+      cup_factory_(std::move(cup_factory)),
       loader_factory_(std::move(loader_factory)),
       api_key_(api_key),
       auth_enabled_(auth_enabled),
@@ -139,7 +160,30 @@ ServiceRequestSenderImpl::~ServiceRequestSenderImpl() = default;
 
 void ServiceRequestSenderImpl::SendRequest(const GURL& url,
                                            const std::string& request_body,
-                                           ResponseCallback callback) {
+                                           ResponseCallback callback,
+                                           RpcType rpc_type) {
+  if (!cup::ShouldSignRequests(rpc_type)) {
+    InternalSendRequest(url, request_body, std::move(callback));
+    return;
+  }
+
+  std::unique_ptr<cup::CUP> cup =
+      cup_factory_->CreateInstance(RpcType::GET_ACTIONS);
+  std::string signed_request = cup->PackAndSignRequest(request_body);
+
+  auto maybe_wrapped_callback = std::move(callback);
+  if (cup::ShouldVerifyResponses(rpc_type)) {
+    maybe_wrapped_callback = base::BindOnce(&VerifyCupResponse, std::move(cup),
+                                            std::move(maybe_wrapped_callback));
+  }
+
+  InternalSendRequest(url, signed_request, std::move(maybe_wrapped_callback));
+}
+
+void ServiceRequestSenderImpl::InternalSendRequest(
+    const GURL& url,
+    const std::string& request_body,
+    ResponseCallback callback) {
   if (auth_enabled_ && access_token_fetcher_ == nullptr) {
     LOG(ERROR) << "auth requested, but no access token fetcher provided";
     std::move(callback).Run(net::HTTP_UNAUTHORIZED, std::string());
@@ -220,7 +264,7 @@ void ServiceRequestSenderImpl::RetryIfUnauthorized(
     DCHECK(!retried_with_fresh_access_token_);
     retried_with_fresh_access_token_ = true;
     access_token_fetcher_->InvalidateAccessToken(access_token);
-    SendRequest(url, request_body, std::move(callback));
+    InternalSendRequest(url, request_body, std::move(callback));
     return;
   }
   std::move(callback).Run(http_status, response);
diff --git a/components/autofill_assistant/browser/service/service_request_sender_impl.h b/components/autofill_assistant/browser/service/service_request_sender_impl.h
index 4d2b305fe5f57c..3fd743d9c355d4 100644
--- a/components/autofill_assistant/browser/service/service_request_sender_impl.h
+++ b/components/autofill_assistant/browser/service/service_request_sender_impl.h
@@ -12,6 +12,7 @@
 #include "base/memory/raw_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "components/autofill_assistant/browser/service/access_token_fetcher.h"
+#include "components/autofill_assistant/browser/service/cup_factory.h"
 #include "components/autofill_assistant/browser/service/service_request_sender.h"
 #include "components/autofill_assistant/browser/service/simple_url_loader_factory.h"
 #include "content/public/browser/browser_context.h"
@@ -33,6 +34,7 @@ class ServiceRequestSenderImpl : public ServiceRequestSender {
   ServiceRequestSenderImpl(
       content::BrowserContext* context,
       AccessTokenFetcher* access_token_fetcher,
+      std::unique_ptr<cup::CUPFactory> cup_factory,
       std::unique_ptr<SimpleURLLoaderFactory> loader_factory,
       const std::string& api_key,
       bool auth_enabled,
@@ -42,18 +44,27 @@ class ServiceRequestSenderImpl : public ServiceRequestSender {
   ServiceRequestSenderImpl& operator=(const ServiceRequestSenderImpl&) = delete;
 
   // Sends |request_body| to |url|. Depending on configuration, the request
-  // will be authenticated either with an Oauth access token or the api key.
-  // Returns the http status code and the response itself. If the returned http
-  // headers could not be parsed, the http code will be 0.
+  // will be authenticated either with an Oauth access token or the api key. The
+  // |rpc_type| will be used to decide whether to use CUP verification. Returns
+  // the http status code and the response itself. If the returned http headers
+  // could not be parsed, the http code will be 0.
   //
   // When an auth-request first fails with a 401, the access token is
   // invalidated and fetched again. If the request fails again, the request
   // is considered failed and the callback is invoked.
   void SendRequest(const GURL& url,
                    const std::string& request_body,
-                   ResponseCallback callback) override;
+                   ResponseCallback callback,
+                   RpcType rpc_type) override;
 
  private:
+  // Unlike |ServiceRequestSenderImpl::SendRequest|, assumes that any necessary
+  // CUP signing and validation is already done or accounted for in the
+  // |callback|.
+  void InternalSendRequest(const GURL& url,
+                           const std::string& request_body,
+                           ResponseCallback callback);
+
   void SendRequestAuth(const GURL& url,
                        const std::string& request_body,
                        const std::string& access_token,
@@ -74,6 +85,7 @@ class ServiceRequestSenderImpl : public ServiceRequestSender {
 
   raw_ptr<content::BrowserContext> context_ = nullptr;
   raw_ptr<AccessTokenFetcher> access_token_fetcher_ = nullptr;
+  std::unique_ptr<cup::CUPFactory> cup_factory_;
   std::unique_ptr<SimpleURLLoaderFactory> loader_factory_;
 
   // API key to add to the URL of unauthenticated requests.
diff --git a/components/autofill_assistant/browser/service/service_request_sender_impl_unittest.cc b/components/autofill_assistant/browser/service/service_request_sender_impl_unittest.cc
index f2586ecf8b8ad5..896e175abb96ff 100644
--- a/components/autofill_assistant/browser/service/service_request_sender_impl_unittest.cc
+++ b/components/autofill_assistant/browser/service/service_request_sender_impl_unittest.cc
@@ -11,8 +11,12 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/test/gmock_callback_support.h"
 #include "base/test/mock_callback.h"
+#include "base/test/scoped_feature_list.h"
+#include "components/autofill_assistant/browser/features.h"
+#include "components/autofill_assistant/browser/service.pb.h"
 #include "components/autofill_assistant/browser/service/access_token_fetcher.h"
 #include "components/autofill_assistant/browser/service/mock_access_token_fetcher.h"
+#include "components/autofill_assistant/browser/service/mock_cup.h"
 #include "components/autofill_assistant/browser/service/mock_simple_url_loader_factory.h"
 #include "components/autofill_assistant/browser/service/mock_url_loader.h"
 #include "content/public/test/browser_task_environment.h"
@@ -51,6 +55,7 @@ class ServiceRequestSenderImplTest : public testing::Test {
   ~ServiceRequestSenderImplTest() override = default;
 
  protected:
+  base::test::ScopedFeatureList scoped_feature_list_;
   base::MockCallback<base::OnceCallback<void(int, const std::string&)>>
       mock_response_callback_;
   // Note: |task_environment_| must be created before |context_|, else creation
@@ -58,9 +63,37 @@ class ServiceRequestSenderImplTest : public testing::Test {
   content::BrowserTaskEnvironment task_environment_;
   content::TestBrowserContext context_;
   NiceMock<MockAccessTokenFetcher> mock_access_token_fetcher_;
+
+  void InitCupFeatures(bool enableSigning, bool enableVerifying) {
+    std::vector<base::Feature> enabled_features;
+    std::vector<base::Feature> disabled_features;
+
+    if (enableSigning) {
+      enabled_features.push_back(autofill_assistant::features::
+                                     kAutofillAssistantSignGetActionsRequests);
+    } else {
+      disabled_features.push_back(autofill_assistant::features::
+                                      kAutofillAssistantSignGetActionsRequests);
+    }
+
+    if (enableVerifying) {
+      enabled_features.push_back(
+          autofill_assistant::features::
+              kAutofillAssistantVerifyGetActionsResponses);
+    } else {
+      disabled_features.push_back(
+          autofill_assistant::features::
+              kAutofillAssistantVerifyGetActionsResponses);
+    }
+
+    scoped_feature_list_.Reset();
+    scoped_feature_list_.InitWithFeatures(enabled_features, disabled_features);
+  }
 };
 
 TEST_F(ServiceRequestSenderImplTest, SendUnauthenticatedRequest) {
+  auto cup_factory =
+      std::make_unique<NiceMock<autofill_assistant::cup::MockCUPFactory>>();
   auto loader_factory =
       std::make_unique<NiceMock<MockSimpleURLLoaderFactory>>();
   auto loader = std::make_unique<NiceMock<MockURLLoader>>();
@@ -88,16 +121,19 @@ TEST_F(ServiceRequestSenderImplTest, SendUnauthenticatedRequest) {
   ServiceRequestSenderImpl request_sender{
       &context_,
       /* access_token_fetcher = */ nullptr,
+      std::move(cup_factory),
       std::move(loader_factory),
       std::string("fake_api_key"),
       /* auth_enabled = */ false,
       /* disable_auth_if_no_access_token = */ true};
-  request_sender.SendRequest(GURL("https://www.example.com"),
-                             std::string("request"),
-                             mock_response_callback_.Get());
+  request_sender.SendRequest(
+      GURL("https://www.example.com"), std::string("request"),
+      mock_response_callback_.Get(), RpcType::GET_TRIGGER_SCRIPTS);
 }
 
 TEST_F(ServiceRequestSenderImplTest, SendAuthenticatedRequest) {
+  auto cup_factory =
+      std::make_unique<NiceMock<autofill_assistant::cup::MockCUPFactory>>();
   auto loader_factory =
       std::make_unique<NiceMock<MockSimpleURLLoaderFactory>>();
   auto loader = std::make_unique<NiceMock<MockURLLoader>>();
@@ -131,13 +167,15 @@ TEST_F(ServiceRequestSenderImplTest, SendAuthenticatedRequest) {
   ServiceRequestSenderImpl request_sender{
       &context_,
       /* access_token_fetcher = */ &mock_access_token_fetcher_,
+      std::move(cup_factory),
       std::move(loader_factory),
       /* api_key = */ std::string(""),
       /* auth_enabled = */ true,
       /* disable_auth_if_no_access_token = */ true};
   request_sender.SendRequest(GURL("https://www.example.com"),
                              std::string("request"),
-                             mock_response_callback_.Get());
+                             mock_response_callback_.Get(),
+                             autofill_assistant::RpcType::GET_TRIGGER_SCRIPTS);
 }
 
 TEST_F(ServiceRequestSenderImplTest,
@@ -146,6 +184,8 @@ TEST_F(ServiceRequestSenderImplTest,
       .Times(1)
       .WillOnce(RunOnceCallback<0>(true, /*access_token = */ ""));
 
+  auto cup_factory =
+      std::make_unique<NiceMock<autofill_assistant::cup::MockCUPFactory>>();
   auto loader_factory =
       std::make_unique<NiceMock<MockSimpleURLLoaderFactory>>();
   auto loader = std::make_unique<NiceMock<MockURLLoader>>();
@@ -173,13 +213,15 @@ TEST_F(ServiceRequestSenderImplTest,
   ServiceRequestSenderImpl request_sender{
       &context_,
       /* access_token_fetcher = */ &mock_access_token_fetcher_,
+      std::move(cup_factory),
       std::move(loader_factory),
       /* api_key = */ std::string("fake_api_key"),
       /* auth_enabled = */ true,
       /* disable_auth_if_no_access_token = */ true};
   request_sender.SendRequest(GURL("https://www.example.com"),
                              std::string("request"),
-                             mock_response_callback_.Get());
+                             mock_response_callback_.Get(),
+                             autofill_assistant::RpcType::GET_TRIGGER_SCRIPTS);
 }
 
 TEST_F(ServiceRequestSenderImplTest,
@@ -189,6 +231,8 @@ TEST_F(ServiceRequestSenderImplTest,
       .WillOnce(
           RunOnceCallback<0>(/*success = */ false, /*access_token = */ ""));
 
+  auto cup_factory =
+      std::make_unique<NiceMock<autofill_assistant::cup::MockCUPFactory>>();
   auto loader_factory =
       std::make_unique<NiceMock<MockSimpleURLLoaderFactory>>();
   auto loader = std::make_unique<NiceMock<MockURLLoader>>();
@@ -216,13 +260,159 @@ TEST_F(ServiceRequestSenderImplTest,
   ServiceRequestSenderImpl request_sender{
       &context_,
       /* access_token_fetcher = */ &mock_access_token_fetcher_,
+      std::move(cup_factory),
       std::move(loader_factory),
       /* api_key = */ std::string("fake_api_key"),
       /* auth_enabled = */ true,
       /* disable_auth_if_no_access_token = */ true};
   request_sender.SendRequest(GURL("https://www.example.com"),
                              std::string("request"),
-                             mock_response_callback_.Get());
+                             mock_response_callback_.Get(),
+                             autofill_assistant::RpcType::GET_TRIGGER_SCRIPTS);
+}
+
+TEST_F(ServiceRequestSenderImplTest,
+       DoesNotCreateInstanceWhenFeatureNotEnabled) {
+  InitCupFeatures(false, false);
+  auto cup_factory =
+      std::make_unique<NiceMock<autofill_assistant::cup::MockCUPFactory>>();
+  auto loader_factory =
+      std::make_unique<NiceMock<MockSimpleURLLoaderFactory>>();
+  auto loader = std::make_unique<NiceMock<MockURLLoader>>();
+  auto response_info = CreateResponseInfo(net::HTTP_OK, "OK");
+  EXPECT_CALL(*loader_factory, OnCreateLoader(_, _))
+      .WillOnce([&](::network::ResourceRequest* resource_request,
+                    const ::net::NetworkTrafficAnnotationTag& annotation_tag) {
+        EXPECT_FALSE(resource_request->headers.HasHeader("Authorization"));
+        EXPECT_EQ(resource_request->url,
+                  GURL("https://www.example.com/?key=fake_api_key"));
+        return std::move(loader);
+      });
+  EXPECT_CALL(*loader,
+              AttachStringForUpload(std::string("request"),
+                                    std::string("application/x-protobuffer")))
+      .Times(1);
+  EXPECT_CALL(*loader, DownloadToStringOfUnboundedSizeUntilCrashAndDie(_, _))
+      .WillOnce(WithArgs<1>([&](auto&& callback) {
+        std::move(callback).Run(std::make_unique<std::string>("response"));
+      }));
+  EXPECT_CALL(*loader, ResponseInfo)
+      .WillRepeatedly(Return(response_info.get()));
+  EXPECT_CALL(mock_response_callback_, Run(net::HTTP_OK, "response"));
+
+  EXPECT_CALL(*cup_factory, CreateInstance(_)).Times(0);
+  ServiceRequestSenderImpl request_sender{
+      &context_,
+      /* access_token_fetcher = */ nullptr,
+      std::move(cup_factory),
+      std::move(loader_factory),
+      std::string("fake_api_key"),
+      /* auth_enabled = */ false,
+      /* disable_auth_if_no_access_token = */ true};
+  request_sender.SendRequest(
+      GURL("https://www.example.com"), std::string("request"),
+      mock_response_callback_.Get(), RpcType::GET_ACTIONS);
+}
+
+TEST_F(ServiceRequestSenderImplTest, SignsGetActionsRequestWhenFeatureEnabled) {
+  InitCupFeatures(true, false);
+  auto cup_factory =
+      std::make_unique<NiceMock<autofill_assistant::cup::MockCUPFactory>>();
+  auto cup = std::make_unique<NiceMock<autofill_assistant::cup::MockCUP>>();
+  auto loader_factory =
+      std::make_unique<NiceMock<MockSimpleURLLoaderFactory>>();
+  auto loader = std::make_unique<NiceMock<MockURLLoader>>();
+  auto response_info = CreateResponseInfo(net::HTTP_OK, "OK");
+  EXPECT_CALL(*loader_factory, OnCreateLoader(_, _))
+      .WillOnce([&](::network::ResourceRequest* resource_request,
+                    const ::net::NetworkTrafficAnnotationTag& annotation_tag) {
+        EXPECT_FALSE(resource_request->headers.HasHeader("Authorization"));
+        EXPECT_EQ(resource_request->url,
+                  GURL("https://www.example.com/?key=fake_api_key"));
+        return std::move(loader);
+      });
+  EXPECT_CALL(*loader,
+              AttachStringForUpload(std::string("signed_request"),
+                                    std::string("application/x-protobuffer")))
+      .Times(1);
+  EXPECT_CALL(*loader, DownloadToStringOfUnboundedSizeUntilCrashAndDie(_, _))
+      .WillOnce(WithArgs<1>([&](auto&& callback) {
+        std::move(callback).Run(std::make_unique<std::string>("response"));
+      }));
+  EXPECT_CALL(*loader, ResponseInfo)
+      .WillRepeatedly(Return(response_info.get()));
+  EXPECT_CALL(mock_response_callback_, Run(net::HTTP_OK, "response"));
+
+  EXPECT_CALL(*cup_factory,
+              CreateInstance(autofill_assistant::RpcType::GET_ACTIONS))
+      .WillOnce([&]() { return std::move(cup); });
+  EXPECT_CALL(*cup, PackAndSignRequest("request")).WillOnce([&]() {
+    return "signed_request";
+  });
+  EXPECT_CALL(*cup, UnpackResponse(_)).Times(0);
+  ServiceRequestSenderImpl request_sender{
+      &context_,
+      /* access_token_fetcher = */ nullptr,
+      std::move(cup_factory),
+      std::move(loader_factory),
+      std::string("fake_api_key"),
+      /* auth_enabled = */ false,
+      /* disable_auth_if_no_access_token = */ true};
+  request_sender.SendRequest(
+      GURL("https://www.example.com"), std::string("request"),
+      mock_response_callback_.Get(), RpcType::GET_ACTIONS);
+}
+
+TEST_F(ServiceRequestSenderImplTest, ValidatesGetActionsResponsesWhenEnabled) {
+  InitCupFeatures(true, true);
+  auto cup_factory =
+      std::make_unique<NiceMock<autofill_assistant::cup::MockCUPFactory>>();
+  auto cup = std::make_unique<NiceMock<autofill_assistant::cup::MockCUP>>();
+  auto loader_factory =
+      std::make_unique<NiceMock<MockSimpleURLLoaderFactory>>();
+  auto loader = std::make_unique<NiceMock<MockURLLoader>>();
+  auto response_info = CreateResponseInfo(net::HTTP_OK, "OK");
+  EXPECT_CALL(*loader_factory, OnCreateLoader(_, _))
+      .WillOnce([&](::network::ResourceRequest* resource_request,
+                    const ::net::NetworkTrafficAnnotationTag& annotation_tag) {
+        EXPECT_FALSE(resource_request->headers.HasHeader("Authorization"));
+        EXPECT_EQ(resource_request->url,
+                  GURL("https://www.example.com/?key=fake_api_key"));
+        return std::move(loader);
+      });
+  EXPECT_CALL(*loader,
+              AttachStringForUpload(std::string("signed_request"),
+                                    std::string("application/x-protobuffer")))
+      .Times(1);
+  EXPECT_CALL(*loader, DownloadToStringOfUnboundedSizeUntilCrashAndDie(_, _))
+      .WillOnce(WithArgs<1>([&](auto&& callback) {
+        std::move(callback).Run(
+            std::make_unique<std::string>("packed_response"));
+      }));
+  EXPECT_CALL(*loader, ResponseInfo)
+      .WillRepeatedly(Return(response_info.get()));
+  EXPECT_CALL(mock_response_callback_, Run(net::HTTP_OK, "response"));
+
+  EXPECT_CALL(*cup_factory,
+              CreateInstance(autofill_assistant::RpcType::GET_ACTIONS))
+      .WillOnce([&]() { return std::move(cup); });
+  EXPECT_CALL(*cup, PackAndSignRequest("request")).WillOnce([&]() {
+    return "signed_request";
+  });
+  EXPECT_CALL(*cup, UnpackResponse("packed_response")).WillOnce([&]() {
+    return "response";
+  });
+  ServiceRequestSenderImpl request_sender{
+      &context_,
+      /* access_token_fetcher = */ nullptr,
+      std::move(cup_factory),
+      std::move(loader_factory),
+      std::string("fake_api_key"),
+      /* auth_enabled = */ false,
+      /* disable_auth_if_no_access_token = */ true};
+  request_sender.SendRequest(
+      GURL("https://www.example.com"), std::string("request"),
+      mock_response_callback_.Get(), autofill_assistant::RpcType::GET_ACTIONS);
 }
 
 // TODO(b/170934170): Add tests for full unit test coverage of
diff --git a/components/autofill_assistant/browser/service/service_request_sender_local_impl.cc b/components/autofill_assistant/browser/service/service_request_sender_local_impl.cc
index 8c4b7a18b84553..707ea7b82d44b5 100644
--- a/components/autofill_assistant/browser/service/service_request_sender_local_impl.cc
+++ b/components/autofill_assistant/browser/service/service_request_sender_local_impl.cc
@@ -15,7 +15,8 @@ ServiceRequestSenderLocalImpl::~ServiceRequestSenderLocalImpl() = default;
 
 void ServiceRequestSenderLocalImpl::SendRequest(const GURL& url,
                                                 const std::string& request_body,
-                                                ResponseCallback callback) {
+                                                ResponseCallback callback,
+                                                RpcType rpc_type) {
   std::move(callback).Run(net::HTTP_OK, response_);
 }
 
diff --git a/components/autofill_assistant/browser/service/service_request_sender_local_impl.h b/components/autofill_assistant/browser/service/service_request_sender_local_impl.h
index a7cd8fd47d1232..ff360395462040 100644
--- a/components/autofill_assistant/browser/service/service_request_sender_local_impl.h
+++ b/components/autofill_assistant/browser/service/service_request_sender_local_impl.h
@@ -22,7 +22,8 @@ class ServiceRequestSenderLocalImpl : public ServiceRequestSender {
   // TODO(arbesser): Make this more flexible.
   void SendRequest(const GURL& url,
                    const std::string& request_body,
-                   ResponseCallback callback) override;
+                   ResponseCallback callback,
+                   RpcType rpc_type) override;
 
  private:
   std::string response_;
diff --git a/components/autofill_assistant/browser/service/service_request_sender_local_impl_unittest.cc b/components/autofill_assistant/browser/service/service_request_sender_local_impl_unittest.cc
index 3f36931dee3aec..ba85aafb79fdfb 100644
--- a/components/autofill_assistant/browser/service/service_request_sender_local_impl_unittest.cc
+++ b/components/autofill_assistant/browser/service/service_request_sender_local_impl_unittest.cc
@@ -28,10 +28,10 @@ class ServiceRequestSenderLocalImplTest : public testing::Test {
 TEST_F(ServiceRequestSenderLocalImplTest, SendRequestAlwaysReturnsResponse) {
   ServiceRequestSenderLocalImpl service_request_sender = {"response"};
   EXPECT_CALL(mock_response_callback_, Run(net::HTTP_OK, "response")).Times(2);
-  service_request_sender.SendRequest(GURL(), "request_1",
-                                     mock_response_callback_.Get());
-  service_request_sender.SendRequest(GURL(), "request_2",
-                                     mock_response_callback_.Get());
+  service_request_sender.SendRequest(
+      GURL(), "request_1", mock_response_callback_.Get(), RpcType::UNKNOWN);
+  service_request_sender.SendRequest(
+      GURL(), "request_2", mock_response_callback_.Get(), RpcType::UNKNOWN);
 }
 
 }  // namespace
diff --git a/components/autofill_assistant/browser/starter.cc b/components/autofill_assistant/browser/starter.cc
index d573cc686cea81..2bb1c9aab8c061 100644
--- a/components/autofill_assistant/browser/starter.cc
+++ b/components/autofill_assistant/browser/starter.cc
@@ -19,6 +19,7 @@
 #include "components/autofill_assistant/browser/features.h"
 #include "components/autofill_assistant/browser/intent_strings.h"
 #include "components/autofill_assistant/browser/service/api_key_fetcher.h"
+#include "components/autofill_assistant/browser/service/cup_impl.h"
 #include "components/autofill_assistant/browser/service/server_url_fetcher.h"
 #include "components/autofill_assistant/browser/service/service_request_sender.h"
 #include "components/autofill_assistant/browser/service/service_request_sender_impl.h"
@@ -78,6 +79,7 @@ std::unique_ptr<ServiceRequestSender> CreateRpcTriggerScriptRequestSender(
   return std::make_unique<ServiceRequestSenderImpl>(
       browser_context,
       /* access_token_fetcher = */ nullptr,
+      std::make_unique<cup::CUPImplFactory>(),
       std::make_unique<NativeURLLoaderFactory>(),
       ApiKeyFetcher().GetAPIKey(delegate->GetChannel()),
       /* auth_enabled = */ false,
diff --git a/components/autofill_assistant/browser/starter_unittest.cc b/components/autofill_assistant/browser/starter_unittest.cc
index 95051d5b794d7c..b1c2dc8075157f 100644
--- a/components/autofill_assistant/browser/starter_unittest.cc
+++ b/components/autofill_assistant/browser/starter_unittest.cc
@@ -657,9 +657,10 @@ TEST_F(StarterTest, RpcTriggerScriptSucceeds) {
         trigger_script_coordinator_->PerformTriggerScriptAction(
             TriggerScriptProto::ACCEPT);
       });
-  EXPECT_CALL(*mock_trigger_script_service_request_sender_,
-              OnSendRequest(
-                  GURL("https://automate-pa.googleapis.com/v1/triggers"), _, _))
+  EXPECT_CALL(
+      *mock_trigger_script_service_request_sender_,
+      OnSendRequest(GURL("https://automate-pa.googleapis.com/v1/triggers"), _,
+                    _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(
           WithArgs<1, 2>([&](const std::string& request_body,
                              ServiceRequestSender::ResponseCallback& callback) {
@@ -1076,9 +1077,10 @@ TEST_F(StarterTest, ImplicitStartupOnSupportedDomain) {
       features::kAutofillAssistantInCCTTriggering);
   starter_->CheckSettings();
 
-  EXPECT_CALL(*mock_trigger_script_service_request_sender_,
-              OnSendRequest(
-                  GURL("https://automate-pa.googleapis.com/v1/triggers"), _, _))
+  EXPECT_CALL(
+      *mock_trigger_script_service_request_sender_,
+      OnSendRequest(GURL("https://automate-pa.googleapis.com/v1/triggers"), _,
+                    _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(
           WithArgs<1, 2>([&](const std::string& request_body,
                              ServiceRequestSender::ResponseCallback& callback) {
@@ -1183,9 +1185,10 @@ TEST_F(StarterTest, ImplicitStartupOnCurrentUrlAfterSettingEnabled) {
       .Times(0);
   SimulateNavigateToUrl(GURL("https://www.some-website.com/cart"));
 
-  EXPECT_CALL(*mock_trigger_script_service_request_sender_,
-              OnSendRequest(
-                  GURL("https://automate-pa.googleapis.com/v1/triggers"), _, _))
+  EXPECT_CALL(
+      *mock_trigger_script_service_request_sender_,
+      OnSendRequest(GURL("https://automate-pa.googleapis.com/v1/triggers"), _,
+                    _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK,
                                    CreateTriggerScriptResponseForTest()));
   EXPECT_CALL(*mock_trigger_script_ui_delegate_, ShowTriggerScript).Times(1);
@@ -1422,9 +1425,10 @@ TEST_F(StarterTest, FailedTriggerScriptFetchesForImplicitStartupAreCached) {
       features::kAutofillAssistantInCCTTriggering);
   starter_->CheckSettings();
 
-  EXPECT_CALL(*mock_trigger_script_service_request_sender_,
-              OnSendRequest(
-                  GURL("https://automate-pa.googleapis.com/v1/triggers"), _, _))
+  EXPECT_CALL(
+      *mock_trigger_script_service_request_sender_,
+      OnSendRequest(GURL("https://automate-pa.googleapis.com/v1/triggers"), _,
+                    _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_FORBIDDEN, std::string()));
   EXPECT_CALL(*mock_trigger_script_ui_delegate_, ShowTriggerScript).Times(0);
   EXPECT_CALL(mock_start_regular_script_callback_, Run).Times(0);
@@ -1479,9 +1483,10 @@ TEST_F(StarterTest,
       features::kAutofillAssistantInCCTTriggering);
   starter_->CheckSettings();
 
-  EXPECT_CALL(*mock_trigger_script_service_request_sender_,
-              OnSendRequest(
-                  GURL("https://automate-pa.googleapis.com/v1/triggers"), _, _))
+  EXPECT_CALL(
+      *mock_trigger_script_service_request_sender_,
+      OnSendRequest(GURL("https://automate-pa.googleapis.com/v1/triggers"), _,
+                    _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK,
                                    CreateTriggerScriptResponseForTest()));
   EXPECT_CALL(*mock_trigger_script_ui_delegate_, ShowTriggerScript)
@@ -1540,9 +1545,10 @@ TEST_F(StarterTest, EmptyTriggerScriptFetchesForImplicitStartupAreCached) {
       features::kAutofillAssistantInCCTTriggering);
   starter_->CheckSettings();
 
-  EXPECT_CALL(*mock_trigger_script_service_request_sender_,
-              OnSendRequest(
-                  GURL("https://automate-pa.googleapis.com/v1/triggers"), _, _))
+  EXPECT_CALL(
+      *mock_trigger_script_service_request_sender_,
+      OnSendRequest(GURL("https://automate-pa.googleapis.com/v1/triggers"), _,
+                    _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(
           WithArg<2>([&](ServiceRequestSender::ResponseCallback& callback) {
             // Empty response == no trigger scripts available.
@@ -2017,9 +2023,10 @@ TEST_F(StarterTest, CommandLineScriptParametersAreAddedToImplicitTriggers) {
                                        mock_runtime_manager_.GetWeakPtr(),
                                        task_environment()->GetMockTickClock());
 
-  EXPECT_CALL(*mock_trigger_script_service_request_sender_,
-              OnSendRequest(
-                  GURL("https://automate-pa.googleapis.com/v1/triggers"), _, _))
+  EXPECT_CALL(
+      *mock_trigger_script_service_request_sender_,
+      OnSendRequest(GURL("https://automate-pa.googleapis.com/v1/triggers"), _,
+                    _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(WithArg<1>([&](const std::string& request_body) {
         GetTriggerScriptsRequestProto request;
         ASSERT_TRUE(request.ParseFromString(request_body));
@@ -2086,9 +2093,10 @@ TEST(MultipleIntentStarterTest, ImplicitTriggeringSendsAllMatchingIntents) {
   fake_platform_delegate.trigger_script_request_sender_for_test_ =
       std::move(service_request_sender);
 
-  EXPECT_CALL(*service_request_sender_ptr,
-              OnSendRequest(
-                  GURL("https://automate-pa.googleapis.com/v1/triggers"), _, _))
+  EXPECT_CALL(
+      *service_request_sender_ptr,
+      OnSendRequest(GURL("https://automate-pa.googleapis.com/v1/triggers"), _,
+                    _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(WithArg<1>([&](const std::string& request_body) {
         GetTriggerScriptsRequestProto request;
         ASSERT_TRUE(request.ParseFromString(request_body));
diff --git a/components/autofill_assistant/browser/trigger_scripts/trigger_script_coordinator.cc b/components/autofill_assistant/browser/trigger_scripts/trigger_script_coordinator.cc
index 72444229ba88c8..d32c05eac0026b 100644
--- a/components/autofill_assistant/browser/trigger_scripts/trigger_script_coordinator.cc
+++ b/components/autofill_assistant/browser/trigger_scripts/trigger_script_coordinator.cc
@@ -78,7 +78,8 @@ void TriggerScriptCoordinator::Start(
           deeplink_url_, client_context,
           trigger_context_->GetScriptParameters()),
       base::BindOnce(&TriggerScriptCoordinator::OnGetTriggerScripts,
-                     weak_ptr_factory_.GetWeakPtr()));
+                     weak_ptr_factory_.GetWeakPtr()),
+      autofill_assistant::RpcType::GET_TRIGGER_SCRIPTS);
 }
 
 void TriggerScriptCoordinator::OnGetTriggerScripts(
diff --git a/components/autofill_assistant/browser/trigger_scripts/trigger_script_coordinator_unittest.cc b/components/autofill_assistant/browser/trigger_scripts/trigger_script_coordinator_unittest.cc
index fd89a25dedf9f8..25a9dcde34efe6 100644
--- a/components/autofill_assistant/browser/trigger_scripts/trigger_script_coordinator_unittest.cc
+++ b/components/autofill_assistant/browser/trigger_scripts/trigger_script_coordinator_unittest.cc
@@ -175,9 +175,12 @@ TEST_F(TriggerScriptCoordinatorTest, StartSendsOnlyApprovedFields) {
       {"FALLBACK_BUNDLE_ID", "fallback_id"},
       {"FALLBACK_BUNDLE_VERSION", "fallback_version"}};
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce([&](const GURL& url, const std::string& request_body,
-                    ServiceRequestSender::ResponseCallback& callback) {
+                    ServiceRequestSender::ResponseCallback& callback,
+                    RpcType rpc_type) {
         GetTriggerScriptsRequestProto request;
         ASSERT_TRUE(request.ParseFromString(request_body));
         EXPECT_THAT(request.url(), Eq(kFakeDeepLink));
@@ -210,7 +213,9 @@ TEST_F(TriggerScriptCoordinatorTest, StartSendsOnlyApprovedFields) {
 }
 
 TEST_F(TriggerScriptCoordinatorTest, StopOnBackendRequestFailed) {
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_FORBIDDEN, ""));
   EXPECT_CALL(
       mock_callback_,
@@ -225,7 +230,9 @@ TEST_F(TriggerScriptCoordinatorTest, StopOnBackendRequestFailed) {
 }
 
 TEST_F(TriggerScriptCoordinatorTest, StopOnParsingError) {
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, "invalid"));
   EXPECT_CALL(
       mock_callback_,
@@ -241,7 +248,9 @@ TEST_F(TriggerScriptCoordinatorTest, StopOnParsingError) {
 }
 
 TEST_F(TriggerScriptCoordinatorTest, StopOnNoTriggerScriptsAvailable) {
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, ""));
   EXPECT_CALL(
       mock_callback_,
@@ -268,7 +277,9 @@ TEST_F(TriggerScriptCoordinatorTest, StartChecksStaticAndDynamicConditions) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   EXPECT_CALL(*mock_dynamic_trigger_conditions_, ClearConditions).Times(1);
   EXPECT_CALL(*mock_dynamic_trigger_conditions_,
@@ -296,7 +307,9 @@ TEST_F(TriggerScriptCoordinatorTest, ShowAndHideTriggerScript) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
 
   ON_CALL(*mock_dynamic_trigger_conditions_,
@@ -332,7 +345,9 @@ TEST_F(TriggerScriptCoordinatorTest, PauseAndResumeOnTabVisibilityChange) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
 
   EXPECT_CALL(*mock_dynamic_trigger_conditions_,
@@ -354,7 +369,9 @@ TEST_F(TriggerScriptCoordinatorTest, PauseAndResumeOnTabVisibilityChange) {
 
   // When a hidden tab becomes visible again, the trigger scripts must be
   // fetched again.
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   EXPECT_CALL(*mock_dynamic_trigger_conditions_,
               OnUpdate(mock_web_controller_.get(), _))
@@ -373,7 +390,9 @@ TEST_F(TriggerScriptCoordinatorTest, PerformTriggerScriptActionNotNow) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   ON_CALL(*mock_dynamic_trigger_conditions_,
           OnUpdate(mock_web_controller_.get(), _))
@@ -413,7 +432,9 @@ TEST_F(TriggerScriptCoordinatorTest, PerformTriggerScriptActionCancelSession) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   ON_CALL(*mock_dynamic_trigger_conditions_,
           OnUpdate(mock_web_controller_.get(), _))
@@ -447,7 +468,9 @@ TEST_F(TriggerScriptCoordinatorTest, PerformTriggerScriptActionCancelForever) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   ON_CALL(*mock_dynamic_trigger_conditions_,
           OnUpdate(mock_web_controller_.get(), _))
@@ -482,7 +505,9 @@ TEST_F(TriggerScriptCoordinatorTest, PerformTriggerScriptActionAccept) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   ON_CALL(*mock_dynamic_trigger_conditions_,
           OnUpdate(mock_web_controller_.get(), _))
@@ -506,7 +531,9 @@ TEST_F(TriggerScriptCoordinatorTest, CancelOnNavigateAway) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   ON_CALL(*mock_dynamic_trigger_conditions_,
           OnUpdate(mock_web_controller_.get(), _))
@@ -553,7 +580,9 @@ TEST_F(TriggerScriptCoordinatorTest, IgnoreNavigationEventsWhileNotStarted) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   EXPECT_CALL(*mock_dynamic_trigger_conditions_,
               OnUpdate(mock_web_controller_.get(), _))
@@ -575,7 +604,9 @@ TEST_F(TriggerScriptCoordinatorTest, IgnoreNavigationEventsWhileNotStarted) {
   SimulateNavigateToUrl(GURL("https://example.different.com"));
   SimulateNavigateToUrl(GURL("https://also-not-supported.com"));
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, /* response = */ ""));
   // However, when the tab becomes visible again, the trigger script is
   // restarted and thus fails if the tab is still on an unsupported domain.
@@ -600,7 +631,9 @@ TEST_F(TriggerScriptCoordinatorTest, BottomSheetClosedWithSwipe) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   ON_CALL(*mock_dynamic_trigger_conditions_,
           OnUpdate(mock_web_controller_.get(), _))
@@ -639,7 +672,9 @@ TEST_F(TriggerScriptCoordinatorTest, TimeoutAfterInvisibleForTooLong) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
 
   // Note: expect 4 calls: 1 initial plus 3 until timeout.
@@ -679,7 +714,9 @@ TEST_F(TriggerScriptCoordinatorTest, TimeoutResetsAfterTriggerScriptShown) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   EXPECT_CALL(*mock_dynamic_trigger_conditions_,
               OnUpdate(mock_web_controller_.get(), _))
@@ -725,7 +762,9 @@ TEST_F(TriggerScriptCoordinatorTest, NoTimeoutByDefault) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   EXPECT_CALL(*mock_dynamic_trigger_conditions_,
               OnUpdate(mock_web_controller_.get(), _))
@@ -751,7 +790,9 @@ TEST_F(TriggerScriptCoordinatorTest, KeyboardEventTriggersOutOfScheduleCheck) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   EXPECT_CALL(*mock_dynamic_trigger_conditions_,
               OnUpdate(mock_web_controller_.get(), _))
@@ -801,7 +842,9 @@ TEST_F(TriggerScriptCoordinatorTest, UrlChangeOutOfScheduleCheckPathMatch) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   EXPECT_CALL(*mock_dynamic_trigger_conditions_,
               OnUpdate(mock_web_controller_.get(), _))
@@ -830,7 +873,9 @@ TEST_F(TriggerScriptCoordinatorTest, UrlChangeOutOfScheduleCheckDomainMatch) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   EXPECT_CALL(*mock_dynamic_trigger_conditions_,
               OnUpdate(mock_web_controller_.get(), _))
@@ -859,7 +904,9 @@ TEST_F(TriggerScriptCoordinatorTest,
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   EXPECT_CALL(*mock_dynamic_trigger_conditions_,
               OnUpdate(mock_web_controller_.get(), _))
@@ -887,7 +934,9 @@ TEST_F(TriggerScriptCoordinatorTest, OnTriggerScriptFailedToShow) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   EXPECT_CALL(*mock_dynamic_trigger_conditions_,
               OnUpdate(mock_web_controller_.get(), _))
@@ -913,7 +962,9 @@ TEST_F(TriggerScriptCoordinatorTest, OnProactiveHelpSettingDisabled) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   EXPECT_CALL(*mock_dynamic_trigger_conditions_,
               OnUpdate(mock_web_controller_.get(), _))
@@ -946,7 +997,9 @@ TEST_F(TriggerScriptCoordinatorTest, PauseAndResumeOnTabSwitch) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   EXPECT_CALL(*mock_dynamic_trigger_conditions_,
               OnUpdate(mock_web_controller_.get(), _))
@@ -968,7 +1021,9 @@ TEST_F(TriggerScriptCoordinatorTest, PauseAndResumeOnTabSwitch) {
 
   // When a non-interactable tab becomes interactable again, the trigger scripts
   // must be fetched again.
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   EXPECT_CALL(*mock_dynamic_trigger_conditions_,
               OnUpdate(mock_web_controller_.get(), _))
@@ -987,7 +1042,9 @@ TEST_F(TriggerScriptCoordinatorTest, OnboardingShownAndAccepted) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   EXPECT_CALL(*mock_dynamic_trigger_conditions_,
               OnUpdate(mock_web_controller_.get(), _))
@@ -1028,7 +1085,9 @@ TEST_F(TriggerScriptCoordinatorTest,
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   EXPECT_CALL(*mock_dynamic_trigger_conditions_,
               OnUpdate(mock_web_controller_.get(), _))
@@ -1094,7 +1153,9 @@ TEST_F(TriggerScriptCoordinatorTest,
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   EXPECT_CALL(*mock_dynamic_trigger_conditions_,
               OnUpdate(mock_web_controller_.get(), _))
@@ -1135,7 +1196,9 @@ TEST_F(TriggerScriptCoordinatorTest, OnboardingNotShown) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   EXPECT_CALL(*mock_dynamic_trigger_conditions_,
               OnUpdate(mock_web_controller_.get(), _))
@@ -1173,7 +1236,9 @@ TEST_F(TriggerScriptCoordinatorTest, RecordUkmsForCurrentUrlIfPossible) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
   ON_CALL(*mock_dynamic_trigger_conditions_,
           OnUpdate(mock_web_controller_.get(), _))
@@ -1213,7 +1278,9 @@ TEST_F(TriggerScriptCoordinatorTest, BackendCanOverrideScriptParameters) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
 
   coordinator_->Start(
@@ -1238,7 +1305,9 @@ TEST_F(TriggerScriptCoordinatorTest, UiTimeoutWhileShown) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
 
   ON_CALL(*mock_dynamic_trigger_conditions_,
@@ -1292,7 +1361,9 @@ TEST_F(TriggerScriptCoordinatorTest, UiTimeoutInterruptedByCancelPopup) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
 
   ON_CALL(*mock_dynamic_trigger_conditions_,
@@ -1331,7 +1402,9 @@ TEST_F(TriggerScriptCoordinatorTest, UiTimeoutInterruptedByOnboarding) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
 
   ON_CALL(*mock_dynamic_trigger_conditions_,
@@ -1357,7 +1430,9 @@ TEST_F(TriggerScriptCoordinatorTest, UiTimeoutInterruptedBySkipSession) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
 
   ON_CALL(*mock_dynamic_trigger_conditions_,
@@ -1389,7 +1464,9 @@ TEST_F(TriggerScriptCoordinatorTest, UiTimeoutInterruptedByNotNow) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
 
   ON_CALL(*mock_dynamic_trigger_conditions_,
@@ -1418,7 +1495,9 @@ TEST_F(TriggerScriptCoordinatorTest, UiTimeoutInterruptedByNotNow) {
 }
 
 TEST_F(TriggerScriptCoordinatorTest, StoppingTwiceDoesNotCrash) {
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_FORBIDDEN, ""));
   EXPECT_CALL(*mock_ui_delegate_, Detach).Times(2);
   EXPECT_CALL(*mock_ui_delegate_, HideTriggerScript).Times(0);
@@ -1444,7 +1523,9 @@ TEST_F(TriggerScriptCoordinatorTest, RecordTriggerConditionEvaluationTime) {
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
 
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
 
   EXPECT_CALL(*mock_dynamic_trigger_conditions_, OnUpdate)
@@ -1479,7 +1560,9 @@ TEST_F(TriggerScriptCoordinatorTest, RecordIfPrimaryPageFailed) {
   response.add_trigger_scripts();
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
 
   coordinator_->Start(GURL(kFakeDeepLink), std::make_unique<TriggerContext>(),
@@ -1524,7 +1607,9 @@ TEST_F(TriggerScriptCoordinatorPrerenderTest, DoNotRecordIfPrerenderingFailed) {
   response.add_trigger_scripts();
   std::string serialized_response;
   response.SerializeToString(&serialized_response);
-  EXPECT_CALL(*mock_request_sender_, OnSendRequest(GURL(kFakeServerUrl), _, _))
+  EXPECT_CALL(
+      *mock_request_sender_,
+      OnSendRequest(GURL(kFakeServerUrl), _, _, RpcType::GET_TRIGGER_SCRIPTS))
       .WillOnce(RunOnceCallback<2>(net::HTTP_OK, serialized_response));
 
   EXPECT_CALL(mock_callback_, Run).Times(0);
diff --git a/components/browser_ui/styles/android/java/res/values/themes.xml b/components/browser_ui/styles/android/java/res/values/themes.xml
index 53b0292c2e5bf8..f3c3995c5019f7 100644
--- a/components/browser_ui/styles/android/java/res/values/themes.xml
+++ b/components/browser_ui/styles/android/java/res/values/themes.xml
@@ -4,6 +4,7 @@
      found in the LICENSE file. -->
 
 <resources>
+    <!-- Colors should be mirrored by Base.Theme.BrowserUI.DialogWhenLarge. -->
     <style name="Base.V21.Theme.BrowserUI" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Color palettes -->
         <item name="colorPrimary">@color/baseline_primary_600</item>
@@ -61,10 +62,69 @@
         <item name="default_icon_color_disabled">@color/default_icon_color_disabled_dark</item>
         <item name="default_icon_color_disabled_inverse">@color/default_icon_color_disabled_light</item>
     </style>
-
     <style name="Base.V31.Theme.BrowserUI" parent="Base.V21.Theme.BrowserUI" />
     <style name="Base.Theme.BrowserUI" parent="Base.V31.Theme.BrowserUI" />
 
+    <!-- Colors should be mirrored by Base.V21.Theme.BrowserUI. -->
+    <style name="Base.Theme.BrowserUI.DialogWhenLarge" parent="Theme.MaterialComponents.DayNight.DialogWhenLarge">
+         <!-- Color palettes -->
+        <item name="colorPrimary">@color/baseline_primary_600</item>
+        <item name="colorPrimaryDark">@android:color/black</item>
+        <item name="colorOnPrimary">@color/baseline_primary_0</item>
+        <item name="colorPrimaryContainer">@color/baseline_primary_100</item>
+        <item name="colorOnPrimaryContainer">@color/baseline_primary_900</item>
+        <item name="colorAccent">@macro/default_control_color_active</item>
+        <item name="android:colorBackground">@color/baseline_neutral_0</item>
+        <item name="colorOnBackground">@color/baseline_neutral_900</item>
+        <item name="colorSurface">@color/baseline_neutral_0</item>
+        <item name="colorOnSurface">@color/baseline_neutral_900</item>
+        <item name="colorSurfaceVariant">@color/baseline_neutral_variant_100</item>
+        <item name="colorOnSurfaceVariant">@color/baseline_neutral_variant_700</item>
+        <item name="colorOnSurfaceInverse">@color/baseline_neutral_50</item>
+        <item name="colorOutline">@color/baseline_neutral_variant_500</item>
+        <item name="colorError">@color/baseline_error_600</item>
+
+        <!-- Text colors-->
+        <item name="android:textColorPrimary">@color/default_text_color_list</item>
+        <item name="android:textColorSecondary">@color/default_text_color_secondary_list</item>
+        <item name="android:textColorLink">@color/default_text_color_link</item>
+        <item name="android:textColorHighlight">@color/text_highlight_color</item>
+        <item name="android:textColorHint">@color/default_text_color_hint_list</item>
+
+        <!-- Widget colors: checkboxes, switches, buttons, etc. -->
+        <item name="colorControlNormal">@macro/default_control_color_normal</item>
+        <item name="colorControlActivated">@macro/default_control_color_active</item>
+        <item name="colorControlHighlight">@color/control_highlight_color</item>
+
+        <!-- Elevation overlays -->
+        <item name="elevationOverlayEnabled">true</item>
+        <item name="elevationOverlayColor">@color/baseline_neutral_600</item>
+        <item name="elevationOverlayAccentColor">?attr/colorPrimary</item>
+
+        <!-- Custom roles -->
+        <!-- Dynamic roles -->
+        <item name="colorSwitchThumbNormal">?attr/colorSurface</item>
+        <item name="colorSwitchThumbDisabled">?attr/colorSurface</item>
+        <item name="colorSwitchTrackNormal">?attr/colorSurfaceVariant</item>
+        <!-- Non-dynamic roles for switches -->
+        <item name="colorPrimaryNonDynamic">@color/baseline_primary_600</item>
+        <item name="colorPrimaryContainerNonDynamic">@color/baseline_primary_100</item>
+        <item name="colorSwitchThumbDisabledNonDynamic">@color/baseline_neutral_0</item>
+        <item name="colorSwitchThumbNormalNonDynamic">@color/baseline_neutral_0</item>
+        <item name="colorSwitchTrackNormalNonDynamic">@color/baseline_neutral_variant_100</item>
+
+        <!-- Custom semantic names -->
+        <!-- Supports dynamic colors now. -->
+        <item name="default_bg_color_dynamic">?attr/colorSurface</item>
+        <item name="divider_line_bg_color_dynamic">?attr/colorSurfaceVariant</item>
+        <!-- Common icon colors for drawables. -->
+        <item name="default_icon_color_inverse">@color/default_icon_color_light</item>
+        <item name="default_icon_color_secondary">@color/default_icon_color_secondary_dark</item>
+        <item name="default_icon_color_disabled">@color/default_icon_color_disabled_dark</item>
+        <item name="default_icon_color_disabled_inverse">@color/default_icon_color_disabled_light</item>
+    </style>
+    <style name="Theme.BrowserUI.DialogWhenLarge" parent="Base.Theme.BrowserUI.DialogWhenLarge"/>
+
     <!-- Unlike |Theme.Chromium.AlertDialog|, this is a complete theme that can be used as an
          activity theme on its own. This should be kept in sync with |Theme.Chromium.AlertDialog|.
          -->
diff --git a/components/browser_ui/widget/android/BUILD.gn b/components/browser_ui/widget/android/BUILD.gn
index be973f568ec1c6..15e553f4ca9d37 100644
--- a/components/browser_ui/widget/android/BUILD.gn
+++ b/components/browser_ui/widget/android/BUILD.gn
@@ -159,6 +159,7 @@ android_resources("java_resources") {
     "java/res/drawable-mdpi/ic_drag_handle_grey600_24dp.png",
     "java/res/drawable-mdpi/ic_more_vert_24dp_on_dark_bg.png",
     "java/res/drawable-mdpi/ic_more_vert_24dp_on_light_bg.png",
+    "java/res/drawable-v24/rounded_rectangle_surface_1.xml",
     "java/res/drawable-v24/tile_view_icon_background_modern.xml",
     "java/res/drawable-xhdpi/btn_delete_24dp.png",
     "java/res/drawable-xhdpi/btn_info.png",
@@ -196,6 +197,7 @@ android_resources("java_resources") {
     "java/res/drawable/list_item_icon_modern_bg_rect.xml",
     "java/res/drawable/modern_toolbar_text_box_background.xml",
     "java/res/drawable/query_tile_overlay.xml",
+    "java/res/drawable/rounded_rectangle_surface_1.xml",
     "java/res/drawable/search_toolbar_modern_bg.xml",
     "java/res/drawable/tile_view_highlight.xml",
     "java/res/drawable/tile_view_highlight_mask.xml",
diff --git a/components/browser_ui/widget/android/java/res/drawable-v24/rounded_rectangle_surface_1.xml b/components/browser_ui/widget/android/java/res/drawable-v24/rounded_rectangle_surface_1.xml
new file mode 100644
index 00000000000000..dcec66b1c84ae4
--- /dev/null
+++ b/components/browser_ui/widget/android/java/res/drawable-v24/rounded_rectangle_surface_1.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2021 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+<org.chromium.components.browser_ui.widget.SurfaceColorDrawable
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:shape="rectangle"
+    app:surfaceElevation="@dimen/default_elevation_1">
+    <corners android:radius="@dimen/default_rounded_corner_radius"/>
+</org.chromium.components.browser_ui.widget.SurfaceColorDrawable>
diff --git a/chrome/android/java/res/drawable/account_picker_background.xml b/components/browser_ui/widget/android/java/res/drawable/rounded_rectangle_surface_1.xml
similarity index 56%
rename from chrome/android/java/res/drawable/account_picker_background.xml
rename to components/browser_ui/widget/android/java/res/drawable/rounded_rectangle_surface_1.xml
index 306316af0f4646..afe60c5016fcc8 100644
--- a/chrome/android/java/res/drawable/account_picker_background.xml
+++ b/components/browser_ui/widget/android/java/res/drawable/rounded_rectangle_surface_1.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2018 The Chromium Authors. All rights reserved.
+<!-- Copyright 2021 The Chromium Authors. All rights reserved.
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file. -->
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-
-    <solid android:color="@color/default_bg_color_secondary"/>
-    <corners android:radius="8dp"/>
+    <solid android:color="@color/default_bg_color_elev_1_baseline"/>
+    <corners android:radius="@dimen/default_rounded_corner_radius"/>
 </shape>
diff --git a/components/enterprise/BUILD.gn b/components/enterprise/BUILD.gn
index 50faae4df520ff..cc23d5705f710b 100644
--- a/components/enterprise/BUILD.gn
+++ b/components/enterprise/BUILD.gn
@@ -22,7 +22,8 @@ static_library("enterprise") {
     "browser/reporting/real_time_uploader.h",
     "browser/reporting/report_generator.cc",
     "browser/reporting/report_generator.h",
-    "browser/reporting/report_request_definition.h",
+    "browser/reporting/report_request.cc",
+    "browser/reporting/report_request.h",
     "browser/reporting/report_request_queue_generator.cc",
     "browser/reporting/report_request_queue_generator.h",
     "browser/reporting/report_scheduler.cc",
diff --git a/components/enterprise/browser/reporting/report_generator.cc b/components/enterprise/browser/reporting/report_generator.cc
index cc79d7245b7ec8..8b789a1535d387 100644
--- a/components/enterprise/browser/reporting/report_generator.cc
+++ b/components/enterprise/browser/reporting/report_generator.cc
@@ -32,14 +32,10 @@ ReportGenerator::~ReportGenerator() = default;
 
 void ReportGenerator::Generate(ReportType report_type,
                                ReportCallback callback) {
-  CreateBasicRequest(std::make_unique<ReportRequest>(), report_type,
+  CreateBasicRequest(std::make_unique<ReportRequest>(report_type), report_type,
                      std::move(callback));
 }
 
-void ReportGenerator::SetMaximumReportSizeForTesting(size_t size) {
-  report_request_queue_generator_.SetMaximumReportSizeForTesting(size);
-}
-
 void ReportGenerator::CreateBasicRequest(
     std::unique_ptr<ReportRequest> basic_request,
     ReportType report_type,
@@ -47,12 +43,15 @@ void ReportGenerator::CreateBasicRequest(
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   delegate_->SetAndroidAppInfos(basic_request.get());
 #else
-  basic_request->set_computer_name(this->GetMachineName());
-  basic_request->set_os_user_name(GetOSUserName());
-  basic_request->set_serial_number(GetSerialNumber());
-  basic_request->set_allocated_os_report(GetOSReport().release());
-  basic_request->set_allocated_browser_device_identifier(
-      policy::GetBrowserDeviceIdentifier().release());
+  basic_request->GetDeviceReportRequest().set_computer_name(
+      this->GetMachineName());
+  basic_request->GetDeviceReportRequest().set_os_user_name(GetOSUserName());
+  basic_request->GetDeviceReportRequest().set_serial_number(GetSerialNumber());
+  basic_request->GetDeviceReportRequest().set_allocated_os_report(
+      GetOSReport().release());
+  basic_request->GetDeviceReportRequest()
+      .set_allocated_browser_device_identifier(
+          policy::GetBrowserDeviceIdentifier().release());
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
 #if defined(OS_ANDROID) || defined(OS_IOS)
@@ -112,7 +111,8 @@ void ReportGenerator::OnBrowserReportReady(
     ReportType report_type,
     ReportCallback callback,
     std::unique_ptr<em::BrowserReport> browser_report) {
-  basic_request->set_allocated_browser_report(browser_report.release());
+  basic_request->GetDeviceReportRequest().set_allocated_browser_report(
+      browser_report.release());
 
   if (report_type != ReportType::kBrowserVersion) {
     // Generate a queue of requests containing detailed profile information.
@@ -123,7 +123,7 @@ void ReportGenerator::OnBrowserReportReady(
 
   // Return a queue containing only the basic request and browser report without
   // detailed profile information.
-  ReportRequests requests;
+  ReportRequestQueue requests;
   requests.push(std::move(basic_request));
   std::move(callback).Run(std::move(requests));
 }
@@ -133,8 +133,9 @@ void ReportGenerator::SetHardwareInfo(
     base::OnceCallback<void(std::unique_ptr<ReportRequest>)> callback,
     base::SysInfo::HardwareInfo hardware_info) {
 #if defined(OS_ANDROID) || defined(OS_IOS)
-  basic_request->set_brand_name(hardware_info.manufacturer);
-  basic_request->set_device_model(hardware_info.model);
+  basic_request->GetDeviceReportRequest().set_brand_name(
+      hardware_info.manufacturer);
+  basic_request->GetDeviceReportRequest().set_device_model(hardware_info.model);
 #endif  // defined(OS_ANDROID) || defined(OS_IOS)
 
   std::move(callback).Run(std::move(basic_request));
diff --git a/components/enterprise/browser/reporting/report_generator.h b/components/enterprise/browser/reporting/report_generator.h
index d95a005e19a8a0..71cbb182e3a888 100644
--- a/components/enterprise/browser/reporting/report_generator.h
+++ b/components/enterprise/browser/reporting/report_generator.h
@@ -6,14 +6,13 @@
 #define COMPONENTS_ENTERPRISE_BROWSER_REPORTING_REPORT_GENERATOR_H_
 
 #include <memory>
-#include <queue>
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/system/sys_info.h"
 #include "components/enterprise/browser/reporting/browser_report_generator.h"
-#include "components/enterprise/browser/reporting/report_request_definition.h"
+#include "components/enterprise/browser/reporting/report_request.h"
 #include "components/enterprise/browser/reporting/report_request_queue_generator.h"
 #include "components/enterprise/browser/reporting/report_type.h"
 #include "components/policy/proto/device_management_backend.pb.h"
@@ -24,9 +23,7 @@ class ReportingDelegateFactory;
 
 class ReportGenerator {
  public:
-  using ReportRequest = definition::ReportRequest;
-  using ReportRequests = std::queue<std::unique_ptr<ReportRequest>>;
-  using ReportCallback = base::OnceCallback<void(ReportRequests)>;
+  using ReportCallback = base::OnceCallback<void(ReportRequestQueue)>;
 
   class Delegate {
    public:
@@ -54,8 +51,6 @@ class ReportGenerator {
   // information that are needed by that particular type.
   virtual void Generate(ReportType report_type, ReportCallback callback);
 
-  void SetMaximumReportSizeForTesting(size_t size);
-
  protected:
   // Creates a basic request that will be used by all Profiles.
   void CreateBasicRequest(std::unique_ptr<ReportRequest> basic_request,
diff --git a/components/enterprise/browser/reporting/report_request.cc b/components/enterprise/browser/reporting/report_request.cc
new file mode 100644
index 00000000000000..28400974289d74
--- /dev/null
+++ b/components/enterprise/browser/reporting/report_request.cc
@@ -0,0 +1,61 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "components/enterprise/browser/reporting/report_request.h"
+
+#include "components/enterprise/browser/reporting/report_type.h"
+
+namespace enterprise_reporting {
+
+namespace em = enterprise_management;
+
+ReportRequest::ReportRequest(ReportType type) {
+  switch (type) {
+    case ReportType::kFull:
+    case ReportType::kBrowserVersion:
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+      proto_.emplace<em::ChromeOsUserReportRequest>();
+#else
+      proto_.emplace<em::ChromeDesktopReportRequest>();
+#endif
+      return;
+    case ReportType::kProfileReport:
+      proto_.emplace<em::ChromeProfileReportRequest>();
+      return;
+  }
+}
+
+ReportRequest::ReportRequest(const em::ChromeDesktopReportRequest& proto)
+    : proto_(proto) {}
+ReportRequest::ReportRequest(const em::ChromeOsUserReportRequest& proto)
+    : proto_(proto) {}
+ReportRequest::ReportRequest(const em::ChromeProfileReportRequest& proto)
+    : proto_(proto) {}
+
+ReportRequest::~ReportRequest() = default;
+
+const ReportRequest::DeviceReportRequestProto&
+ReportRequest::GetDeviceReportRequest() const {
+  return absl::get<ReportRequest::DeviceReportRequestProto>(proto_);
+}
+ReportRequest::DeviceReportRequestProto&
+ReportRequest::GetDeviceReportRequest() {
+  return absl::get<ReportRequest::DeviceReportRequestProto>(proto_);
+}
+
+const em::ChromeProfileReportRequest&
+ReportRequest::GetChromeProfileReportRequest() const {
+  return absl::get<em::ChromeProfileReportRequest>(proto_);
+}
+em::ChromeProfileReportRequest& ReportRequest::GetChromeProfileReportRequest() {
+  return absl::get<em::ChromeProfileReportRequest>(proto_);
+}
+
+std::unique_ptr<ReportRequest> ReportRequest::Clone() const {
+  return absl::visit(
+      [](const auto& proto) { return std::make_unique<ReportRequest>(proto); },
+      proto_);
+}
+
+}  // namespace enterprise_reporting
diff --git a/components/enterprise/browser/reporting/report_request.h b/components/enterprise/browser/reporting/report_request.h
new file mode 100644
index 00000000000000..92b0486332a502
--- /dev/null
+++ b/components/enterprise/browser/reporting/report_request.h
@@ -0,0 +1,69 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef COMPONENTS_ENTERPRISE_BROWSER_REPORTING_REPORT_REQUEST_H_
+#define COMPONENTS_ENTERPRISE_BROWSER_REPORTING_REPORT_REQUEST_H_
+
+#include <memory>
+#include <queue>
+
+#include "build/chromeos_buildflags.h"
+#include "device_management_backend.pb.h"
+#include "third_party/abseil-cpp/absl/types/variant.h"
+
+namespace enterprise_reporting {
+
+enum class ReportType;
+
+// A class is used to allow reports of multiple types to be stored in a single
+// queue for the uploader.
+class ReportRequest {
+ public:
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+  using DeviceReportRequestProto =
+      enterprise_management::ChromeOsUserReportRequest;
+#else
+  using DeviceReportRequestProto =
+      enterprise_management::ChromeDesktopReportRequest;
+#endif
+
+  explicit ReportRequest(ReportType type);
+  explicit ReportRequest(
+      const enterprise_management::ChromeDesktopReportRequest& proto);
+  explicit ReportRequest(
+      const enterprise_management::ChromeOsUserReportRequest& proto);
+  explicit ReportRequest(
+      const enterprise_management::ChromeProfileReportRequest& proto);
+
+  ReportRequest(const ReportRequest&) = delete;
+  ReportRequest& operator=(const ReportRequest&) = delete;
+  ~ReportRequest();
+
+  const DeviceReportRequestProto& GetDeviceReportRequest() const;
+  DeviceReportRequestProto& GetDeviceReportRequest();
+
+  const enterprise_management::ChromeProfileReportRequest&
+  GetChromeProfileReportRequest() const;
+  enterprise_management::ChromeProfileReportRequest&
+  GetChromeProfileReportRequest();
+
+  // Clone the request proto.
+  // This is required when a report is splitted into multiple requests.
+  // As all requests need to contain shared information like browser version or
+  // machine name. Long term, we can improves the splitting algorithm so Clone
+  // is no longer necessary.
+  std::unique_ptr<ReportRequest> Clone() const;
+
+ private:
+  absl::variant<enterprise_management::ChromeDesktopReportRequest,
+                enterprise_management::ChromeOsUserReportRequest,
+                enterprise_management::ChromeProfileReportRequest>
+      proto_;
+};
+
+using ReportRequestQueue = std::queue<std::unique_ptr<ReportRequest>>;
+
+}  // namespace enterprise_reporting
+
+#endif  // COMPONENTS_ENTERPRISE_BROWSER_REPORTING_REPORT_REQUEST_H_
diff --git a/components/enterprise/browser/reporting/report_request_definition.h b/components/enterprise/browser/reporting/report_request_definition.h
deleted file mode 100644
index 077510421b7246..00000000000000
--- a/components/enterprise/browser/reporting/report_request_definition.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef COMPONENTS_ENTERPRISE_BROWSER_REPORTING_REPORT_REQUEST_DEFINITION_H_
-#define COMPONENTS_ENTERPRISE_BROWSER_REPORTING_REPORT_REQUEST_DEFINITION_H_
-
-#include "build/build_config.h"
-#include "build/chromeos_buildflags.h"
-#include "components/policy/proto/device_management_backend.pb.h"
-
-namespace enterprise_reporting {
-
-namespace definition {
-
-// Both ChromeOsUserReportRequest and ChromeDesktopReportRequest are used to
-// upload usage data to DM Server. By the reference to this macro, most classes
-// in enterprise_reporting namespace can share the same logic for various
-// operation systems.
-#if BUILDFLAG(IS_CHROMEOS_ASH)
-using ReportRequest = enterprise_management::ChromeOsUserReportRequest;
-#else
-using ReportRequest = enterprise_management::ChromeDesktopReportRequest;
-#endif
-
-}  // namespace definition
-
-}  // namespace enterprise_reporting
-
-#endif  // COMPONENTS_ENTERPRISE_BROWSER_REPORTING_REPORT_REQUEST_DEFINITION_H_
diff --git a/components/enterprise/browser/reporting/report_request_queue_generator.cc b/components/enterprise/browser/reporting/report_request_queue_generator.cc
index 555725053901d1..9caa827f0479c5 100644
--- a/components/enterprise/browser/reporting/report_request_queue_generator.cc
+++ b/components/enterprise/browser/reporting/report_request_queue_generator.cc
@@ -54,23 +54,26 @@ void ReportRequestQueueGenerator::SetMaximumReportSizeForTesting(
   maximum_report_size_ = maximum_report_size;
 }
 
-ReportRequestQueueGenerator::ReportRequests
-ReportRequestQueueGenerator::Generate(const ReportRequest& basic_request) {
-  ReportRequests requests;
-  size_t basic_request_size = basic_request.ByteSizeLong();
+ReportRequestQueue ReportRequestQueueGenerator::Generate(
+    const ReportRequest& basic_request) {
+  ReportRequestQueue requests;
+  size_t basic_request_size =
+      basic_request.GetDeviceReportRequest().ByteSizeLong();
   base::UmaHistogramMemoryKB(kBasicRequestSizeMetricsName,
                              basic_request_size / 1024);
 
   if (basic_request_size <= maximum_report_size_) {
-    requests.push(std::make_unique<ReportRequest>(basic_request));
-    int profile_infos_size =
-        basic_request.browser_report().chrome_user_profile_infos_size();
+    requests.push(basic_request.Clone());
+    int profile_infos_size = basic_request.GetDeviceReportRequest()
+                                 .browser_report()
+                                 .chrome_user_profile_infos_size();
     for (int index = 0; index < profile_infos_size; index++) {
       GenerateProfileReportWithIndex(index, basic_request, &requests);
     }
 
-    base::UmaHistogramMemoryKB(kRequestSizeMetricsName,
-                               requests.back()->ByteSizeLong() / 1024);
+    base::UmaHistogramMemoryKB(
+        kRequestSizeMetricsName,
+        requests.back()->GetDeviceReportRequest().ByteSizeLong() / 1024);
   }
 
   base::UmaHistogramExactLinear(kRequestCountMetricsName, requests.size(),
@@ -81,13 +84,16 @@ ReportRequestQueueGenerator::Generate(const ReportRequest& basic_request) {
 void ReportRequestQueueGenerator::GenerateProfileReportWithIndex(
     int profile_index,
     const ReportRequest& basic_request,
-    ReportRequests* requests) {
-  DCHECK_LT(profile_index,
-            basic_request.browser_report().chrome_user_profile_infos_size());
-
-  size_t basic_request_size = basic_request.ByteSizeLong();
-  auto basic_profile =
-      basic_request.browser_report().chrome_user_profile_infos(profile_index);
+    ReportRequestQueue* requests) {
+  DCHECK_LT(profile_index, basic_request.GetDeviceReportRequest()
+                               .browser_report()
+                               .chrome_user_profile_infos_size());
+
+  size_t basic_request_size =
+      basic_request.GetDeviceReportRequest().ByteSizeLong();
+  auto basic_profile = basic_request.GetDeviceReportRequest()
+                           .browser_report()
+                           .chrome_user_profile_infos(profile_index);
   auto profile_report = profile_report_generator_.MaybeGenerate(
       base::FilePath::FromUTF8Unsafe(basic_profile.id()), basic_profile.name(),
       ReportType::kFull);
@@ -100,13 +106,15 @@ void ReportRequestQueueGenerator::GenerateProfileReportWithIndex(
   // is added. There are still few bytes difference but close enough.
   size_t profile_report_incremental_size =
       profile_report->ByteSizeLong() - basic_profile.ByteSizeLong();
-  size_t current_request_size = requests->back()->ByteSizeLong();
+  size_t current_request_size =
+      requests->back()->GetDeviceReportRequest().ByteSizeLong();
 
   if (current_request_size + profile_report_incremental_size <=
       maximum_report_size_) {
     // The new full Profile report can be appended into the current request.
     requests->back()
-        ->mutable_browser_report()
+        ->GetDeviceReportRequest()
+        .mutable_browser_report()
         ->mutable_chrome_user_profile_infos(profile_index)
         ->Swap(profile_report.get());
   } else if (basic_request_size + profile_report_incremental_size <=
@@ -114,11 +122,13 @@ void ReportRequestQueueGenerator::GenerateProfileReportWithIndex(
     // The new full Profile report is too big to be appended into the current
     // request, move it to the next request if possible. Record metrics for the
     // current request's size.
-    base::UmaHistogramMemoryKB(kRequestSizeMetricsName,
-                               requests->back()->ByteSizeLong() / 1024);
-    requests->push(std::make_unique<ReportRequest>(basic_request));
+    base::UmaHistogramMemoryKB(
+        kRequestSizeMetricsName,
+        requests->back()->GetDeviceReportRequest().ByteSizeLong() / 1024);
+    requests->push(basic_request.Clone());
     requests->back()
-        ->mutable_browser_report()
+        ->GetDeviceReportRequest()
+        .mutable_browser_report()
         ->mutable_chrome_user_profile_infos(profile_index)
         ->Swap(profile_report.get());
   } else {
diff --git a/components/enterprise/browser/reporting/report_request_queue_generator.h b/components/enterprise/browser/reporting/report_request_queue_generator.h
index 47a172d6ce1da8..2092234e66346c 100644
--- a/components/enterprise/browser/reporting/report_request_queue_generator.h
+++ b/components/enterprise/browser/reporting/report_request_queue_generator.h
@@ -5,12 +5,9 @@
 #ifndef COMPONENTS_ENTERPRISE_BROWSER_REPORTING_REPORT_REQUEST_QUEUE_GENERATOR_H_
 #define COMPONENTS_ENTERPRISE_BROWSER_REPORTING_REPORT_REQUEST_QUEUE_GENERATOR_H_
 
-#include <memory>
-#include <queue>
-
 #include "build/build_config.h"
 #include "components/enterprise/browser/reporting/profile_report_generator.h"
-#include "components/enterprise/browser/reporting/report_request_definition.h"
+#include "components/enterprise/browser/reporting/report_request.h"
 #include "components/policy/proto/device_management_backend.pb.h"
 
 namespace enterprise_reporting {
@@ -22,9 +19,6 @@ class ReportingDelegateFactory;
 // TODO(crbug.com/1103732): Unit tests for this class are still in
 // chrome/browser/enterprise/reporting.
 class ReportRequestQueueGenerator {
-  using ReportRequest = definition::ReportRequest;
-  using ReportRequests = std::queue<std::unique_ptr<ReportRequest>>;
-
  public:
   explicit ReportRequestQueueGenerator(
       ReportingDelegateFactory* delegate_factory);
@@ -42,14 +36,14 @@ class ReportRequestQueueGenerator {
 
   // Generate a queue of requests including full profile info based on given
   // basic request.
-  ReportRequests Generate(const ReportRequest& basic_request);
+  ReportRequestQueue Generate(const ReportRequest& basic_request);
 
  private:
   // Generate request with full profile info at |profile_index| according to
   // |basic_request|, then store it into |requests|.
   void GenerateProfileReportWithIndex(int profile_index,
                                       const ReportRequest& basic_request,
-                                      ReportRequests* requests);
+                                      ReportRequestQueue* requests);
 
  private:
   size_t maximum_report_size_;
diff --git a/components/enterprise/browser/reporting/report_scheduler.cc b/components/enterprise/browser/reporting/report_scheduler.cc
index 6a8096c84a376f..842c3e21dc2d91 100644
--- a/components/enterprise/browser/reporting/report_scheduler.cc
+++ b/components/enterprise/browser/reporting/report_scheduler.cc
@@ -261,8 +261,7 @@ void ReportScheduler::GenerateAndUploadRealtimeReport(
   }
 }
 
-void ReportScheduler::OnReportGenerated(
-    ReportGenerator::ReportRequests requests) {
+void ReportScheduler::OnReportGenerated(ReportRequestQueue requests) {
   DCHECK_NE(active_trigger_, kTriggerNone);
   if (requests.empty()) {
     SYSLOG(ERROR)
diff --git a/components/enterprise/browser/reporting/report_scheduler.h b/components/enterprise/browser/reporting/report_scheduler.h
index aadb7e381e2323..a4e3b602d0f884 100644
--- a/components/enterprise/browser/reporting/report_scheduler.h
+++ b/components/enterprise/browser/reporting/report_scheduler.h
@@ -140,7 +140,7 @@ class ReportScheduler {
 
   // Continues processing a report (contained in the |requests| collection) by
   // sending it to the uploader.
-  void OnReportGenerated(ReportGenerator::ReportRequests requests);
+  void OnReportGenerated(ReportRequestQueue requests);
 
   // Finishes processing following report upload. |status| indicates the result
   // of the attempted upload.
diff --git a/components/enterprise/browser/reporting/report_uploader.cc b/components/enterprise/browser/reporting/report_uploader.cc
index 1f0e0fb31658e9..73c6e4efe4bfee 100644
--- a/components/enterprise/browser/reporting/report_uploader.cc
+++ b/components/enterprise/browser/reporting/report_uploader.cc
@@ -10,6 +10,7 @@
 #include "base/time/time.h"
 #include "build/chromeos_buildflags.h"
 #include "components/policy/core/common/cloud/cloud_policy_client.h"
+#include "device_management_backend.pb.h"
 
 namespace em = enterprise_management;
 
@@ -40,7 +41,7 @@ ReportUploader::ReportUploader(policy::CloudPolicyClient* client,
       maximum_number_of_retries_(maximum_number_of_retries) {}
 ReportUploader::~ReportUploader() = default;
 
-void ReportUploader::SetRequestAndUpload(ReportRequests requests,
+void ReportUploader::SetRequestAndUpload(ReportRequestQueue requests,
                                          ReportCallback callback) {
   requests_ = std::move(requests);
   callback_ = std::move(callback);
@@ -48,16 +49,21 @@ void ReportUploader::SetRequestAndUpload(ReportRequests requests,
 }
 
 void ReportUploader::Upload() {
-  auto request = std::make_unique<ReportRequest>(*requests_.front());
   auto callback = base::BindRepeating(&ReportUploader::OnRequestFinished,
                                       weak_ptr_factory_.GetWeakPtr());
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
+  auto request =
+      std::make_unique<enterprise_management::ChromeOsUserReportRequest>(
+          requests_.front()->GetDeviceReportRequest());
   client_->UploadChromeOsUserReport(std::move(request), std::move(callback));
 #else
+  auto request =
+      std::make_unique<enterprise_management::ChromeDesktopReportRequest>(
+          requests_.front()->GetDeviceReportRequest());
   client_->UploadChromeDesktopReport(std::move(request), std::move(callback));
 #endif
-}
+}  // BUILDFLAG(IS_CHROMEOS_ASH)
 
 void ReportUploader::OnRequestFinished(bool status) {
   if (status) {
diff --git a/components/enterprise/browser/reporting/report_uploader.h b/components/enterprise/browser/reporting/report_uploader.h
index 4882ac9a6cfbf1..7fb17e50fe1f7e 100644
--- a/components/enterprise/browser/reporting/report_uploader.h
+++ b/components/enterprise/browser/reporting/report_uploader.h
@@ -5,13 +5,10 @@
 #ifndef COMPONENTS_ENTERPRISE_BROWSER_REPORTING_REPORT_UPLOADER_H_
 #define COMPONENTS_ENTERPRISE_BROWSER_REPORTING_REPORT_UPLOADER_H_
 
-#include <memory>
-#include <queue>
-
 #include "base/callback.h"
 #include "base/memory/raw_ptr.h"
 #include "base/timer/timer.h"
-#include "components/enterprise/browser/reporting/report_request_definition.h"
+#include "components/enterprise/browser/reporting/report_request.h"
 #include "net/base/backoff_entry.h"
 
 namespace base {
@@ -43,8 +40,6 @@ class ReportUploader {
                        // invalid dm token.
   };
 
-  using ReportRequest = definition::ReportRequest;
-  using ReportRequests = std::queue<std::unique_ptr<ReportRequest>>;
   // A callback to notify the upload result.
   using ReportCallback = base::OnceCallback<void(ReportStatus status)>;
 
@@ -58,7 +53,7 @@ class ReportUploader {
 
   // Sets a list of requests and upload it. Request will be uploaded one after
   // another.
-  virtual void SetRequestAndUpload(ReportRequests requests,
+  virtual void SetRequestAndUpload(ReportRequestQueue requests,
                                    ReportCallback callback);
 
  private:
@@ -81,7 +76,7 @@ class ReportUploader {
 
   raw_ptr<policy::CloudPolicyClient> client_;
   ReportCallback callback_;
-  ReportRequests requests_;
+  ReportRequestQueue requests_;
 
   net::BackoffEntry backoff_entry_;
   base::OneShotTimer backoff_request_timer_;
diff --git a/components/enterprise/browser/reporting/report_uploader_unittest.cc b/components/enterprise/browser/reporting/report_uploader_unittest.cc
index 1d68e4b2905ce3..d71d4814bda9bb 100644
--- a/components/enterprise/browser/reporting/report_uploader_unittest.cc
+++ b/components/enterprise/browser/reporting/report_uploader_unittest.cc
@@ -10,6 +10,8 @@
 #include "base/test/task_environment.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
+#include "components/enterprise/browser/reporting/report_request.h"
+#include "components/enterprise/browser/reporting/report_type.h"
 #include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -55,11 +57,12 @@ class ReportUploaderTest : public ::testing::Test {
       ReportUploader::ReportStatus expected_status) {
     DCHECK_LE(number_of_request, 2)
         << "Please update kBrowserVersionNames above.";
-    ReportUploader::ReportRequests requests;
+    ReportRequestQueue requests;
     for (int i = 0; i < number_of_request; i++) {
-      auto request = std::make_unique<ReportUploader::ReportRequest>();
-      request->mutable_browser_report()->set_browser_version(
-          kBrowserVersionNames[i]);
+      auto request = std::make_unique<ReportRequest>(ReportType::kFull);
+      request->GetDeviceReportRequest()
+          .mutable_browser_report()
+          ->set_browser_version(kBrowserVersionNames[i]);
       requests.push(std::move(request));
     }
     has_responded_ = false;
@@ -231,23 +234,25 @@ TEST_F(ReportUploaderTest, MultipleReports) {
   {
     InSequence s;
     // First report
-    EXPECT_CALL(client_,
-                UploadReportProxy(
-                    Property(&ReportUploader::ReportRequest::browser_report,
-                             Property(&em::BrowserReport::browser_version,
-                                      Eq(kBrowserVersionNames[0]))),
-                    _))
+    EXPECT_CALL(
+        client_,
+        UploadReportProxy(
+            Property(&ReportRequest::DeviceReportRequestProto::browser_report,
+                     Property(&em::BrowserReport::browser_version,
+                              Eq(kBrowserVersionNames[0]))),
+            _))
         .Times(3)
         .WillOnce(WithArgs<1>(policy::ScheduleStatusCallback(false)))
         .WillOnce(WithArgs<1>(policy::ScheduleStatusCallback(false)))
         .WillOnce(WithArgs<1>(policy::ScheduleStatusCallback(true)));
     // Second report
-    EXPECT_CALL(client_,
-                UploadReportProxy(
-                    Property(&ReportUploader::ReportRequest::browser_report,
-                             Property(&em::BrowserReport::browser_version,
-                                      Eq(kBrowserVersionNames[1]))),
-                    _))
+    EXPECT_CALL(
+        client_,
+        UploadReportProxy(
+            Property(&ReportRequest::DeviceReportRequestProto::browser_report,
+                     Property(&em::BrowserReport::browser_version,
+                              Eq(kBrowserVersionNames[1]))),
+            _))
         .Times(2)
         .WillOnce(WithArgs<1>(policy::ScheduleStatusCallback(false)))
         .WillOnce(WithArgs<1>(policy::ScheduleStatusCallback(false)));
diff --git a/components/exo/surface.cc b/components/exo/surface.cc
index fb32fd0478eb31..a02c7e184d0ce4 100644
--- a/components/exo/surface.cc
+++ b/components/exo/surface.cc
@@ -47,6 +47,7 @@
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/gfx/buffer_format_util.h"
+#include "ui/gfx/buffer_types.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/point_conversions.h"
@@ -798,6 +799,11 @@ bool Surface::UpdateDisplay(int64_t old_display, int64_t new_display) {
     if (!sub_surface->UpdateDisplay(old_display, new_display))
       return false;
   }
+
+  for (auto& observer : observers_) {
+    observer.OnDisplayChanged(this, old_display, new_display);
+  }
+
   return true;
 }
 
@@ -1193,15 +1199,10 @@ void Surface::UpdateResource(FrameSinkResourceManager* resource_manager) {
             std::move(state_.per_commit_explicit_release_callback_))) {
       current_resource_has_alpha_ =
           FormatHasAlpha(state_.buffer.buffer()->GetFormat());
-      // Planar buffers are sampled as RGB. Technically, the driver is supposed
-      // to preserve the colorspace, so we could still pass the primaries and
-      // transfer function.  However, we don't actually pass the colorspace
-      // to the driver, and it's unclear what drivers would actually do if we
-      // did. So in effect, the colorspace is undefined.
-      if (NumberOfPlanesForLinearBufferFormat(
-              state_.buffer.buffer()->GetFormat()) > 1) {
+      // Setting colors for YUV buffers has been problematic in the past. See
+      // crrev.com/c/2331769
+      if (state_.buffer.buffer()->GetFormat() != gfx::BufferFormat::YVU_420)
         current_resource_.color_space = state_.basic_state.color_space;
-      }
     } else {
       current_resource_.id = viz::kInvalidResourceId;
       // Use the buffer's size, so the AppendContentsToFrame() will append
diff --git a/components/exo/surface_observer.h b/components/exo/surface_observer.h
index f329dc7aa16e3a..34181ac3a7ad78 100644
--- a/components/exo/surface_observer.h
+++ b/components/exo/surface_observer.h
@@ -5,6 +5,8 @@
 #ifndef COMPONENTS_EXO_SURFACE_OBSERVER_H_
 #define COMPONENTS_EXO_SURFACE_OBSERVER_H_
 
+#include <cstdint>
+
 namespace exo {
 class Surface;
 
@@ -34,6 +36,12 @@ class SurfaceObserver {
   // or -1 for a window assigned to all desks.
   virtual void OnDeskChanged(Surface* surface, int state) {}
 
+  // Called when the display of this surface has changed. Only called after
+  // successfully updating sub-surfaces.
+  virtual void OnDisplayChanged(Surface* surface,
+                                int64_t old_display,
+                                int64_t new_display) {}
+
  protected:
   virtual ~SurfaceObserver() {}
 };
diff --git a/components/exo/wayland/server.cc b/components/exo/wayland/server.cc
index 5f97d158ad3945..1461f8ab19a41b 100644
--- a/components/exo/wayland/server.cc
+++ b/components/exo/wayland/server.cc
@@ -375,8 +375,8 @@ void Server::Initialize() {
                    &zwp_relative_pointer_manager_v1_interface, 1, display_,
                    bind_relative_pointer_manager);
 #if BUILDFLAG(ENABLE_COLOR_MANAGER)
-  wl_global_create(wl_display_.get(), &zcr_color_manager_v1_interface, 1,
-                   display_, bind_zcr_color_manager);
+  wl_global_create(wl_display_.get(), &zcr_color_manager_v1_interface, 1, this,
+                   bind_zcr_color_manager);
 #endif
   wl_global_create(wl_display_.get(), &zxdg_decoration_manager_v1_interface, 1,
                    display_, bind_zxdg_decoration_manager);
diff --git a/components/exo/wayland/zcr_color_manager.cc b/components/exo/wayland/zcr_color_manager.cc
index 9a96f6e56b0b91..82fa9e1fadf2d4 100644
--- a/components/exo/wayland/zcr_color_manager.cc
+++ b/components/exo/wayland/zcr_color_manager.cc
@@ -6,14 +6,22 @@
 
 #include <chrome-color-management-server-protocol.h>
 #include <wayland-server-core.h>
+#include <cstdint>
+#include <memory>
 
 #include "base/containers/fixed_flat_map.h"
 #include "base/notreached.h"
 #include "base/strings/stringprintf.h"
+#include "components/exo/surface.h"
+#include "components/exo/surface_observer.h"
+#include "components/exo/wayland/server.h"
 #include "components/exo/wayland/server_util.h"
+#include "components/exo/wm_helper_chromeos.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/skia/include/core/SkColorSpace.h"
 #include "third_party/skia/include/third_party/skcms/skcms.h"
 #include "ui/gfx/color_space.h"
+#include "ui/gfx/display_color_spaces.h"
 #include "ui/gfx/geometry/triangle_f.h"
 
 namespace exo {
@@ -23,6 +31,8 @@ namespace {
 
 #define PARAM_TO_FLOAT(x) (x / 10000.f)
 
+constexpr auto kDefaultColorSpace = gfx::ColorSpace::CreateSRGB();
+
 constexpr auto kChromaticityMap =
     base::MakeFixedFlatMap<zcr_color_manager_v1_chromaticity_names,
                            gfx::ColorSpace::PrimaryID>(
@@ -64,7 +74,6 @@ class ColorManagerColorSpace {
  public:
   explicit ColorManagerColorSpace(gfx::ColorSpace color_space)
       : color_space(color_space) {}
-
   virtual ~ColorManagerColorSpace() = default;
 
   const gfx::ColorSpace color_space;
@@ -98,6 +107,63 @@ class NameBasedColorSpace final : public ColorManagerColorSpace {
   }
 };
 
+// Wrap a surface pointer and handle relevant events.
+// TODO(b/207031122): This class should also watch for display color space
+// changes and update clients.
+class ColorManagerSurface final : public SurfaceObserver {
+ public:
+  explicit ColorManagerSurface(Server* server,
+                               wl_resource* color_manager_surface_resource,
+                               Surface* surface)
+      : server_(server),
+        color_manager_surface_resource_(color_manager_surface_resource),
+        scoped_surface_(std::make_unique<ScopedSurface>(surface, this)) {}
+  ColorManagerSurface(ColorManagerSurface&) = delete;
+  ColorManagerSurface(ColorManagerSurface&&) = delete;
+  ~ColorManagerSurface() override = default;
+
+  // Safely set the color space (doing nothing if the surface was destroyed).
+  void SetColorSpace(gfx::ColorSpace color_space) {
+    Surface* surface = scoped_surface_->get();
+    if (!surface)
+      return;
+
+    surface->SetColorSpace(color_space);
+  }
+
+ private:
+  // SurfaceObserver:
+  void OnDisplayChanged(Surface* surface,
+                        int64_t old_display,
+                        int64_t new_display) override {
+    wl_client* client = wl_resource_get_client(color_manager_surface_resource_);
+    wl_resource* display_resource =
+        server_->GetOutputResource(client, new_display);
+
+    if (!display_resource)
+      return;
+
+    const auto* wm_helper = WMHelperChromeOS::GetInstance();
+    const auto& old_display_info = wm_helper->GetDisplayInfo(old_display);
+    const auto& new_display_info = wm_helper->GetDisplayInfo(new_display);
+
+    if (old_display_info.display_color_spaces() ==
+        new_display_info.display_color_spaces())
+      return;
+
+    zcr_color_management_surface_v1_send_preferred_color_space(
+        color_manager_surface_resource_, display_resource);
+  }
+
+  void OnSurfaceDestroying(Surface* surface) override {
+    scoped_surface_.reset();
+  }
+
+  Server* server_;
+  wl_resource* color_manager_surface_resource_;
+  std::unique_ptr<ScopedSurface> scoped_surface_;
+};
+
 ////////////////////////////////////////////////////////////////////////////////
 // zcr_color_management_color_space_v1_interface:
 
@@ -157,21 +223,31 @@ void color_management_surface_set_extended_dynamic_range(
     uint32_t value) {
   NOTIMPLEMENTED();
 }
+
 void color_management_surface_set_color_space(
     struct wl_client* client,
     struct wl_resource* color_management_surface_resource,
-    struct wl_resource* color_space,
+    struct wl_resource* color_space_resource,
     uint32_t render_intent) {
-  NOTIMPLEMENTED();
+  auto* color_manager_color_space =
+      GetUserDataAs<ColorManagerColorSpace>(color_space_resource);
+  GetUserDataAs<ColorManagerSurface>(color_management_surface_resource)
+      ->SetColorSpace(color_manager_color_space->color_space);
 }
+
 void color_management_surface_set_default_color_space(
     struct wl_client* client,
     struct wl_resource* color_management_surface_resource) {
-  NOTIMPLEMENTED();
+  GetUserDataAs<ColorManagerSurface>(color_management_surface_resource)
+      ->SetColorSpace(kDefaultColorSpace);
 }
+
 void color_management_surface_destroy(
     struct wl_client* client,
     struct wl_resource* color_management_surface_resource) {
+  GetUserDataAs<ColorManagerSurface>(color_management_surface_resource)
+      ->SetColorSpace(kDefaultColorSpace);
+
   wl_resource_destroy(color_management_surface_resource);
 }
 
@@ -348,13 +424,16 @@ void color_manager_get_color_management_surface(
     struct wl_client* client,
     struct wl_resource* color_manager_resource,
     uint32_t id,
-    struct wl_resource* surface) {
+    struct wl_resource* surface_resource) {
   wl_resource* color_management_surface_resource = wl_resource_create(
       client, &zcr_color_management_surface_v1_interface, 1, id);
 
-  wl_resource_set_implementation(color_management_surface_resource,
-                                 &color_management_surface_v1_implementation,
-                                 /*data=*/nullptr, /*destroy=*/nullptr);
+  SetImplementation(color_management_surface_resource,
+                    &color_management_surface_v1_implementation,
+                    std::make_unique<ColorManagerSurface>(
+                        GetUserDataAs<Server>(color_manager_resource),
+                        color_management_surface_resource,
+                        GetUserDataAs<Surface>(surface_resource)));
 }
 
 void color_manager_destroy(struct wl_client* client,
diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
index f837b47c089506..1e870d3ec5d2ad 100644
--- a/components/feed/feed_feature_list.cc
+++ b/components/feed/feed_feature_list.cc
@@ -75,8 +75,6 @@ const base::Feature kFeedClearImageMemoryCache{
     "FeedClearImageMemoryCache", base::FEATURE_DISABLED_BY_DEFAULT};
 const base::Feature kFeedBackToTop{"FeedBackToTop",
                                    base::FEATURE_DISABLED_BY_DEFAULT};
-const base::Feature kFeedSignInPromoDismiss{"FeedSignInPromoDismiss",
-                                            base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kFeedStamp{"FeedStamp", base::FEATURE_DISABLED_BY_DEFAULT};
 
 const char kDefaultReferrerUrl[] = "https://www.google.com/";
diff --git a/components/feed/feed_feature_list.h b/components/feed/feed_feature_list.h
index 5c8b037d07a57a..913df4f6ecdc43 100644
--- a/components/feed/feed_feature_list.h
+++ b/components/feed/feed_feature_list.h
@@ -80,10 +80,6 @@ extern const base::Feature kFeedClearImageMemoryCache;
 // feeds quickly.
 extern const base::Feature kFeedBackToTop;
 
-// Feature that enables the 'X' in the signin promo in the Feed. Without the 'X'
-// the signin promo is not dismissible without opting to sign in.
-extern const base::Feature kFeedSignInPromoDismiss;
-
 // Feature that enables StAMP cards in the feed.
 extern const base::Feature kFeedStamp;
 
diff --git a/components/guest_view/renderer/guest_view_container.cc b/components/guest_view/renderer/guest_view_container.cc
index 4aece41201b1d0..5edefda6848571 100644
--- a/components/guest_view/renderer/guest_view_container.cc
+++ b/components/guest_view/renderer/guest_view_container.cc
@@ -178,8 +178,8 @@ void GuestViewContainer::RunDestructionCallback(bool embedder_frame_destroyed) {
     v8::HandleScope handle_scope(destruction_isolate_);
     v8::Local<v8::Function> callback = v8::Local<v8::Function>::New(
         destruction_isolate_, destruction_callback_);
-    v8::Local<v8::Context> context = callback->CreationContext();
-    if (context.IsEmpty())
+    v8::Local<v8::Context> context;
+    if (!callback->GetCreationContext().ToLocal(&context))
       return;
 
     v8::Context::Scope context_scope(context);
@@ -249,8 +249,8 @@ void GuestViewContainer::CallElementResizeCallback(
   v8::HandleScope handle_scope(element_resize_isolate_);
   v8::Local<v8::Function> callback = v8::Local<v8::Function>::New(
       element_resize_isolate_, element_resize_callback_);
-  v8::Local<v8::Context> context = callback->CreationContext();
-  if (context.IsEmpty())
+  v8::Local<v8::Context> context;
+  if (!callback->GetCreationContext().ToLocal(&context))
     return;
 
   const int argc = 2;
diff --git a/components/guest_view/renderer/guest_view_request.cc b/components/guest_view/renderer/guest_view_request.cc
index 118e070249e38b..428aa02259fe14 100644
--- a/components/guest_view/renderer/guest_view_request.cc
+++ b/components/guest_view/renderer/guest_view_request.cc
@@ -40,8 +40,8 @@ void GuestViewRequest::ExecuteCallbackIfAvailable(
   v8::HandleScope handle_scope(isolate());
   v8::Local<v8::Function> callback =
       v8::Local<v8::Function>::New(isolate_, callback_);
-  v8::Local<v8::Context> context = callback->CreationContext();
-  if (context.IsEmpty())
+  v8::Local<v8::Context> context;
+  if (!callback->GetCreationContext().ToLocal(&context))
     return;
 
   v8::Context::Scope context_scope(context);
diff --git a/components/lens/lens_features.cc b/components/lens/lens_features.cc
index 82b1d47da9dc67..485403bab34a99 100644
--- a/components/lens/lens_features.cc
+++ b/components/lens/lens_features.cc
@@ -11,10 +11,10 @@ namespace lens {
 namespace features {
 
 const base::Feature kLensStandalone{"LensStandalone",
-                                    base::FEATURE_ENABLED_BY_DEFAULT};
+                                    base::FEATURE_DISABLED_BY_DEFAULT};
 
 const base::Feature kLensRegionSearch{"LensRegionSearch",
-                                      base::FEATURE_ENABLED_BY_DEFAULT};
+                                      base::FEATURE_DISABLED_BY_DEFAULT};
 
 const base::FeatureParam<bool> kRegionSearchMacCursorFix{
     &kLensRegionSearch, "region-search-mac-cursor-fix", true};
@@ -32,13 +32,13 @@ const base::FeatureParam<bool> kRegionSearchUseMenuItemAltText4{
     &kLensRegionSearch, "use-menu-item-alt-text-4", true};
 
 const base::FeatureParam<bool> kEnableUKMLoggingForRegionSearch{
-    &kLensRegionSearch, "region-search-enable-ukm-logging", true};
+    &kLensRegionSearch, "region-search-enable-ukm-logging", false};
 
 const base::FeatureParam<bool> kEnableUKMLoggingForImageSearch{
-    &kLensStandalone, "enable-ukm-logging", true};
+    &kLensStandalone, "enable-ukm-logging", false};
 
 const base::FeatureParam<bool> kEnableSidePanelForLensRegionSearch{
-    &kLensRegionSearch, "region-search-enable-side-panel", false};
+    &kLensRegionSearch, "region-search-enable-side-panel", true};
 
 const base::FeatureParam<bool> kEnableSidePanelForLensImageSearch{
     &kLensStandalone, "enable-side-panel", false};
diff --git a/components/media_router/browser/android/media_router_android.cc b/components/media_router/browser/android/media_router_android.cc
index e3cb4ead682151..f9779680d59c4f 100644
--- a/components/media_router/browser/android/media_router_android.cc
+++ b/components/media_router/browser/android/media_router_android.cc
@@ -198,9 +198,6 @@ void MediaRouterAndroid::UnregisterMediaSinksObserver(
 void MediaRouterAndroid::RegisterMediaRoutesObserver(
     MediaRoutesObserver* observer) {
   DVLOG(2) << "Added MediaRoutesObserver: " << observer;
-  if (!observer->source_id().empty())
-    NOTIMPLEMENTED() << "Joinable routes query not implemented.";
-
   routes_observers_.AddObserver(observer);
 }
 
@@ -254,7 +251,7 @@ void MediaRouterAndroid::OnRouteCreated(const MediaRoute::Id& route_id,
 
   active_routes_.push_back(route);
   for (auto& observer : routes_observers_)
-    observer.OnRoutesUpdated(active_routes_, std::vector<MediaRoute::Id>());
+    observer.OnRoutesUpdated(active_routes_);
   if (is_local) {
     MediaRouterMetrics::RecordCreateRouteResultCode(
         result->result_code(), mojom::MediaRouteProviderId::ANDROID_CAF);
@@ -341,7 +338,7 @@ void MediaRouterAndroid::RemoveRoute(const MediaRoute::Id& route_id) {
     }
 
   for (auto& observer : routes_observers_)
-    observer.OnRoutesUpdated(active_routes_, std::vector<MediaRoute::Id>());
+    observer.OnRoutesUpdated(active_routes_);
 }
 
 std::unique_ptr<media::FlingingController>
diff --git a/components/media_router/browser/media_router_base.cc b/components/media_router/browser/media_router_base.cc
index a96dc1f107c78b..a7788b41621997 100644
--- a/components/media_router/browser/media_router_base.cc
+++ b/components/media_router/browser/media_router_base.cc
@@ -29,13 +29,9 @@ class MediaRouterBase::InternalMediaRoutesObserver
   ~InternalMediaRoutesObserver() override {}
 
   // MediaRoutesObserver
-  void OnRoutesUpdated(
-      const std::vector<MediaRoute>& routes,
-      const std::vector<MediaRoute::Id>& joinable_route_ids) override {
+  void OnRoutesUpdated(const std::vector<MediaRoute>& routes) override {
     current_routes = routes;
     off_the_record_route_ids.clear();
-    // TODO(crbug.com/611486): Have the MRPM pass a list of joinable route ids
-    // via |joinable_route_ids|, and check here if it is non-empty.
     has_route = !routes.empty();
     for (const auto& route : routes) {
       if (route.is_off_the_record())
diff --git a/components/media_router/browser/media_router_base_unittest.cc b/components/media_router/browser/media_router_base_unittest.cc
index a6c860d3844a9e..5910b368e80582 100644
--- a/components/media_router/browser/media_router_base_unittest.cc
+++ b/components/media_router/browser/media_router_base_unittest.cc
@@ -123,17 +123,15 @@ TEST_F(MediaRouterBaseTest, GetCurrentRoutes) {
   MediaRoute route1("route_1", source1, "sink_1", "", false, false);
   MediaRoute route2("route_2", source2, "sink_2", "", true, false);
   std::vector<MediaRoute> routes = {route1, route2};
-  std::vector<MediaRoute::Id> joinable_route_ids = {"route_1"};
 
   EXPECT_TRUE(router_.GetCurrentRoutes().empty());
-  routes_observer_->OnRoutesUpdated(routes, joinable_route_ids);
+  routes_observer_->OnRoutesUpdated(routes);
   std::vector<MediaRoute> current_routes = router_.GetCurrentRoutes();
   ASSERT_EQ(current_routes.size(), 2u);
   EXPECT_EQ(current_routes[0], route1);
   EXPECT_EQ(current_routes[1], route2);
 
-  routes_observer_->OnRoutesUpdated(std::vector<MediaRoute>(),
-                                    std::vector<MediaRoute::Id>());
+  routes_observer_->OnRoutesUpdated(std::vector<MediaRoute>());
   EXPECT_TRUE(router_.GetCurrentRoutes().empty());
 }
 
diff --git a/components/media_router/browser/media_routes_observer.cc b/components/media_router/browser/media_routes_observer.cc
index 74a0999aec671c..384649174286a1 100644
--- a/components/media_router/browser/media_routes_observer.cc
+++ b/components/media_router/browser/media_routes_observer.cc
@@ -9,9 +9,8 @@
 
 namespace media_router {
 
-MediaRoutesObserver::MediaRoutesObserver(MediaRouter* router,
-                                         const MediaSource::Id& source_id)
-    : router_(router), source_id_(source_id) {
+MediaRoutesObserver::MediaRoutesObserver(MediaRouter* router)
+    : router_(router) {
   DCHECK(router_);
   router_->RegisterMediaRoutesObserver(this);
 }
diff --git a/components/media_router/browser/media_routes_observer.h b/components/media_router/browser/media_routes_observer.h
index 8c10005c2268e7..426cc674096af0 100644
--- a/components/media_router/browser/media_routes_observer.h
+++ b/components/media_router/browser/media_routes_observer.h
@@ -22,9 +22,7 @@ class MediaRouter;
 // |source_id| is supplied, then the idea of joinable routes no longer applies.
 class MediaRoutesObserver {
  public:
-  explicit MediaRoutesObserver(MediaRouter* router)
-      : MediaRoutesObserver(router, MediaSource::Id()) {}
-  MediaRoutesObserver(MediaRouter* router, const MediaSource::Id& source_id);
+  explicit MediaRoutesObserver(MediaRouter* router);
 
   MediaRoutesObserver(const MediaRoutesObserver&) = delete;
   MediaRoutesObserver& operator=(const MediaRoutesObserver&) = delete;
@@ -32,22 +30,17 @@ class MediaRoutesObserver {
   virtual ~MediaRoutesObserver();
 
   // Invoked when the list of routes and their associated sinks have been
-  // updated with the context of the |source_id|.  This will return a list of
-  // |routes| and a list of |joinable_route_ids|.  A route is joinable only if
-  // it is joinable in the context of the |source_id|.
+  // updated.
+  //
   // Implementations may not perform operations that modify the Media Router's
   // observer list. In particular, invoking this observer's destructor within
   // OnRoutesUpdated will result in undefined behavior.
-  virtual void OnRoutesUpdated(
-      const std::vector<MediaRoute>& routes,
-      const std::vector<MediaRoute::Id>& joinable_route_ids) {}
+  virtual void OnRoutesUpdated(const std::vector<MediaRoute>& routes) {}
 
   MediaRouter* router() const { return router_; }
-  const MediaSource::Id source_id() const { return source_id_; }
 
  private:
   const raw_ptr<MediaRouter> router_;
-  const MediaSource::Id source_id_;
 };
 
 }  // namespace media_router
diff --git a/components/media_router/browser/test/test_helper.cc b/components/media_router/browser/test/test_helper.cc
index f8a80945498fd0..12243d814d1320 100644
--- a/components/media_router/browser/test/test_helper.cc
+++ b/components/media_router/browser/test/test_helper.cc
@@ -21,10 +21,8 @@ MockMediaSinksObserver::MockMediaSinksObserver(MediaRouter* router,
     : MediaSinksObserver(router, source, origin) {}
 MockMediaSinksObserver::~MockMediaSinksObserver() = default;
 
-MockMediaRoutesObserver::MockMediaRoutesObserver(
-    MediaRouter* router,
-    const MediaSource::Id source_id)
-    : MediaRoutesObserver(router, source_id) {}
+MockMediaRoutesObserver::MockMediaRoutesObserver(MediaRouter* router)
+    : MediaRoutesObserver(router) {}
 MockMediaRoutesObserver::~MockMediaRoutesObserver() = default;
 
 MockPresentationConnectionProxy::MockPresentationConnectionProxy() = default;
diff --git a/components/media_router/browser/test/test_helper.h b/components/media_router/browser/test/test_helper.h
index b325e37fde5372..519c0f348610d3 100644
--- a/components/media_router/browser/test/test_helper.h
+++ b/components/media_router/browser/test/test_helper.h
@@ -51,14 +51,10 @@ class MockMediaSinksObserver : public MediaSinksObserver {
 
 class MockMediaRoutesObserver : public MediaRoutesObserver {
  public:
-  explicit MockMediaRoutesObserver(
-      MediaRouter* router,
-      const MediaSource::Id source_id = std::string());
+  explicit MockMediaRoutesObserver(MediaRouter* router);
   ~MockMediaRoutesObserver() override;
 
-  MOCK_METHOD2(OnRoutesUpdated,
-               void(const std::vector<MediaRoute>& routes,
-                    const std::vector<MediaRoute::Id>& joinable_route_ids));
+  MOCK_METHOD1(OnRoutesUpdated, void(const std::vector<MediaRoute>& routes));
 };
 
 class MockPresentationConnectionProxy
diff --git a/components/media_router/common/mojom/media_router.mojom b/components/media_router/common/mojom/media_router.mojom
index 075e3eb1a18108..704e1c54ee7dab 100644
--- a/components/media_router/common/mojom/media_router.mojom
+++ b/components/media_router/common/mojom/media_router.mojom
@@ -337,30 +337,8 @@ interface MediaRouteProvider {
   // Stops querying sinks for |media_source|.
   StopObservingMediaSinks(string media_source);
 
-  // Starts reporting the state of active media routes via
-  // OnRoutesUpdated() in the context of the |media_source|.  The
-  // |media_source| represents the application interested in the media
-  // routes (usually the web page from which the content originates).
-  // If no |media_source| is given, this should be considered an
-  // observer that is not associated with a media source, and thus
-  // cannot connect to a remote route without showing a source.  The
-  // |media_source| should be considered when returning joinable routes in the
-  // OnRoutesUpdated() call. If an empty |media_source| is given, there is no
-  // context in which a joinable route makes sense and therefore, there should
-  // not be any joinable routes returned in OnRoutesUpdated().
-  // Querying will continue until StopObservingMediaRoutes() is called with
-  // the same |media_source| (even if it's an empty string).
-  StartObservingMediaRoutes(string media_source);
-
-  // Stops querying the state of all media routes in the context of
-  // the |media_source|.  StartObservingMediaRoutes() has
-  // to be called with the same |media_source| for this to have any effect even
-  // if it's empty.  Thus, StartObservingMediaRoutes(media_source) must be
-  // matched with StopObservingMediaRoutes(media_source).
-  // Calling StopObservingMediaRoutes() without a media_source will stop
-  // any media routes queries associated with emtpy strings (queries
-  // that being with StartObservingMediaRoutes()).
-  StopObservingMediaRoutes(string media_source);
+  // Starts reporting the state of active media routes.
+  StartObservingMediaRoutes();
 
   // Starts listening for messages from the media sink for the route given by
   // |route_id|.
@@ -435,13 +413,9 @@ interface MediaRouter {
   // Called when issues are reported for media routes.
   OnIssue(Issue issue);
 
-  // Called when list of routes for a MediaRouteProvider has been updated in the
-  // context of the calling |media_source|.  The array |joinable_route_ids|
-  // should contain route IDs of joinable routes found in the |routes| array.
+  // Called when list of routes for a MediaRouteProvider has been updated.
   OnRoutesUpdated(MediaRouteProviderId provider_id,
-                  array<MediaRoute> routes,
-                  string media_source,
-                  array<string> joinable_route_ids);
+                  array<MediaRoute> routes);
 
   // Called when the state of presentation connected to route |route_id| has
   // changed to |state|.
diff --git a/components/minidump_uploader/BUILD.gn b/components/minidump_uploader/BUILD.gn
index c6ae7a3993927b..6ce34e80b7defc 100644
--- a/components/minidump_uploader/BUILD.gn
+++ b/components/minidump_uploader/BUILD.gn
@@ -28,6 +28,7 @@ static_library("minidump_uploader") {
 android_library("minidump_uploader_java") {
   deps = [
     "//base:base_java",
+    "//net/android:net_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
   ]
 
diff --git a/components/minidump_uploader/DEPS b/components/minidump_uploader/DEPS
index b164637815e8af..ded5e25178e97d 100644
--- a/components/minidump_uploader/DEPS
+++ b/components/minidump_uploader/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
   "+components/minidump_uploader/minidump_uploader_jni_headers",
+  "+net",
   "+third_party/crashpad",
 ]
diff --git a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/util/HttpURLConnectionFactoryImpl.java b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/util/HttpURLConnectionFactoryImpl.java
index 9ea0b09e8e96a5..d371afbb7febba 100644
--- a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/util/HttpURLConnectionFactoryImpl.java
+++ b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/util/HttpURLConnectionFactoryImpl.java
@@ -4,6 +4,9 @@
 
 package org.chromium.components.minidump_uploader.util;
 
+import org.chromium.net.ChromiumNetworkAdapter;
+import org.chromium.net.NetworkTrafficAnnotationTag;
+
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -12,10 +15,31 @@
  * Default implementation of HttpURLConnectionFactory.
  */
 public class HttpURLConnectionFactoryImpl implements HttpURLConnectionFactory {
+    private static final NetworkTrafficAnnotationTag TRAFFIC_ANNOTATION =
+            NetworkTrafficAnnotationTag.createComplete("minidump_uploader_android",
+                    "semantics {"
+                            + "  sender: 'Minidump Uploader (Android)'"
+                            + "  description: 'Uploads crash reports to Google servers. This data '"
+                            + "               'is used by the Chrome team to track down and fix '"
+                            + "               'critical bugs.'"
+                            + "  trigger: 'During startup, if a crash occurred recently.'"
+                            + "  data: 'Crash report, including a trace and device info.'"
+                            + "  destination: GOOGLE_OWNED_SERVICE"
+                            + "}"
+                            + "policy {"
+                            + "  cookies_allowed: NO"
+                            + "  setting: 'Settings > Google Services > Help improve Chrome\'s '"
+                            + "           'features and performance.'"
+                            + "  policy_exception_justification:"
+                            + "      'MetricsReportingEnabled is only implemented on desktop and '"
+                            + "      'ChromeOS.'"
+                            + "}");
+
     @Override
     public HttpURLConnection createHttpURLConnection(String url) {
         try {
-            return (HttpURLConnection) new URL(url).openConnection();
+            return (HttpURLConnection) ChromiumNetworkAdapter.openConnection(
+                    new URL(url), TRAFFIC_ANNOTATION);
         } catch (IOException e) {
             return null;
         }
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
index 2ff1e419a8d578..950fa6aa182ecf 100644
--- a/components/omnibox/browser/autocomplete_controller.cc
+++ b/components/omnibox/browser/autocomplete_controller.cc
@@ -682,8 +682,12 @@ void AutocompleteController::SetMatchDestinationURL(
 #endif
 }
 
-void AutocompleteController::InlineTailPrefixes() {
-  result_.InlineTailPrefixes();
+void AutocompleteController::SetTailSuggestContentPrefixes() {
+  result_.SetTailSuggestContentPrefixes();
+}
+
+void AutocompleteController::SetTailSuggestCommonPrefixes() {
+  result_.SetTailSuggestCommonPrefixes();
 }
 
 void AutocompleteController::UpdateResult(
diff --git a/components/omnibox/browser/autocomplete_controller.h b/components/omnibox/browser/autocomplete_controller.h
index d0bfa8b8279108..4ca205e6324af0 100644
--- a/components/omnibox/browser/autocomplete_controller.h
+++ b/components/omnibox/browser/autocomplete_controller.h
@@ -167,8 +167,12 @@ class AutocompleteController : public AutocompleteProviderListener,
   // Constructs and sets the final destination URL on the given match.
   void SetMatchDestinationURL(AutocompleteMatch* match) const;
 
-  // Prepend missing tail suggestion prefixes in results, if present.
-  void InlineTailPrefixes();
+  // Populates tail_suggest_common_prefix on the matches as well as prepends
+  // ellipses.
+  void SetTailSuggestContentPrefixes();
+
+  // Populates tail_suggest_common_prefix on the matches.
+  void SetTailSuggestCommonPrefixes();
 
   HistoryURLProvider* history_url_provider() const {
     return history_url_provider_;
diff --git a/components/omnibox/browser/autocomplete_match.cc b/components/omnibox/browser/autocomplete_match.cc
index 0475ad1d2be88c..3e19e1b2561dcf 100644
--- a/components/omnibox/browser/autocomplete_match.cc
+++ b/components/omnibox/browser/autocomplete_match.cc
@@ -1140,11 +1140,21 @@ void AutocompleteMatch::SetAllowedToBeDefault(const AutocompleteInput& input) {
   }
 }
 
-void AutocompleteMatch::InlineTailPrefix(const std::u16string& common_prefix) {
+void AutocompleteMatch::SetTailSuggestCommonPrefix(
+    const std::u16string& common_prefix) {
   // Prevent re-addition of prefix.
   if (type == AutocompleteMatchType::SEARCH_SUGGEST_TAIL &&
       tail_suggest_common_prefix.empty()) {
     tail_suggest_common_prefix = common_prefix;
+  }
+}
+
+void AutocompleteMatch::SetTailSuggestContentPrefix(
+    const std::u16string& common_prefix) {
+  // Prevent re-addition of prefix.
+  if (type == AutocompleteMatchType::SEARCH_SUGGEST_TAIL &&
+      tail_suggest_common_prefix.empty()) {
+    SetTailSuggestCommonPrefix(common_prefix);
     // Insert an ellipsis before uncommon part.
     const std::u16string ellipsis = kEllipsis;
     contents = ellipsis + contents;
diff --git a/components/omnibox/browser/autocomplete_match.h b/components/omnibox/browser/autocomplete_match.h
index 4114cde6cc7e3f..7663b18c66315a 100644
--- a/components/omnibox/browser/autocomplete_match.h
+++ b/components/omnibox/browser/autocomplete_match.h
@@ -514,9 +514,11 @@ struct AutocompleteMatch {
   void SetAllowedToBeDefault(const AutocompleteInput& input);
 
   // If this match is a tail suggestion, prepends the passed |common_prefix|.
-  // If not, but the prefix matches the beginning of the suggestion, dims that
-  // portion in the classification.
-  void InlineTailPrefix(const std::u16string& common_prefix);
+  void SetTailSuggestCommonPrefix(const std::u16string& common_prefix);
+
+  // If this match is a tail suggestion, prepends the passed |common_prefix|
+  // and adds ellipses to contents.
+  void SetTailSuggestContentPrefix(const std::u16string& common_prefix);
 
   // Estimates dynamic memory usage.
   // See base/trace_event/memory_usage_estimator.h for more info.
diff --git a/components/omnibox/browser/autocomplete_match_unittest.cc b/components/omnibox/browser/autocomplete_match_unittest.cc
index 3a82e1edc5135e..45e9ad16dbfe39 100644
--- a/components/omnibox/browser/autocomplete_match_unittest.cc
+++ b/components/omnibox/browser/autocomplete_match_unittest.cc
@@ -175,7 +175,7 @@ TEST(AutocompleteMatchTest, InlineTailPrefix) {
     match.type = AutocompleteMatchType::SEARCH_SUGGEST_TAIL;
     match.contents = base::UTF8ToUTF16(test_case.before_contents);
     match.contents_class = test_case.before_contents_class;
-    match.InlineTailPrefix(u"12345678");
+    match.SetTailSuggestContentPrefix(u"12345678");
     EXPECT_EQ(match.contents, base::UTF8ToUTF16(test_case.after_contents));
     EXPECT_TRUE(EqualClassifications(match.contents_class,
                                      test_case.after_contents_class));
diff --git a/components/omnibox/browser/autocomplete_result.cc b/components/omnibox/browser/autocomplete_result.cc
index 1ff3b86d380c1b..392cae98c467e7 100644
--- a/components/omnibox/browser/autocomplete_result.cc
+++ b/components/omnibox/browser/autocomplete_result.cc
@@ -822,7 +822,7 @@ void AutocompleteResult::DeduplicateMatches(ACMatches* matches) {
   });
 }
 
-void AutocompleteResult::InlineTailPrefixes() {
+std::u16string AutocompleteResult::GetCommonPrefix() {
   std::u16string common_prefix;
 
   for (const auto& match : matches_) {
@@ -837,9 +837,25 @@ void AutocompleteResult::InlineTailPrefixes() {
       break;
     }
   }
-  if (common_prefix.size()) {
+  return common_prefix;
+}
+
+void AutocompleteResult::SetTailSuggestCommonPrefixes() {
+  std::u16string common_prefix = GetCommonPrefix();
+
+  if (!common_prefix.empty()) {
     for (auto& match : matches_)
-      match.InlineTailPrefix(common_prefix);
+      match.SetTailSuggestCommonPrefix(common_prefix);
+  }
+}
+
+void AutocompleteResult::SetTailSuggestContentPrefixes() {
+  std::u16string common_prefix = GetCommonPrefix();
+
+  if (!common_prefix.empty()) {
+    for (auto& match : matches_) {
+      match.SetTailSuggestContentPrefix(common_prefix);
+    }
   }
 }
 
diff --git a/components/omnibox/browser/autocomplete_result.h b/components/omnibox/browser/autocomplete_result.h
index 2f15380f5fa39d..489ca28b2f8c5c 100644
--- a/components/omnibox/browser/autocomplete_result.h
+++ b/components/omnibox/browser/autocomplete_result.h
@@ -214,8 +214,15 @@ class AutocompleteResult {
       const AutocompleteMatch& match,
       AutocompleteProviderClient* provider_client);
 
-  // Prepend missing tail suggestion prefixes in results, if present.
-  void InlineTailPrefixes();
+  // Gets common prefix from SEARCH_SUGGEST_TAIL matches
+  std::u16string GetCommonPrefix();
+
+  // Populates tail_suggest_common_prefix on the matches as well as prepends
+  // ellipses.
+  void SetTailSuggestContentPrefixes();
+
+  // Populates tail_suggest_common_prefix on the matches.
+  void SetTailSuggestCommonPrefixes();
 
   // Estimates dynamic memory usage.
   // See base/trace_event/memory_usage_estimator.h for more info.
diff --git a/components/omnibox/browser/autocomplete_result_unittest.cc b/components/omnibox/browser/autocomplete_result_unittest.cc
index 12eaf5bd8a48d3..db51a296191dae 100644
--- a/components/omnibox/browser/autocomplete_result_unittest.cc
+++ b/components/omnibox/browser/autocomplete_result_unittest.cc
@@ -1941,7 +1941,7 @@ TEST_F(AutocompleteResultTest, InlineTailPrefixes) {
                                   "this is a test");
   AutocompleteResult result;
   result.AppendMatches(AutocompleteInput(), matches);
-  result.InlineTailPrefixes();
+  result.SetTailSuggestContentPrefixes();
   for (size_t i = 0; i < base::size(cases); ++i) {
     EXPECT_EQ(result.match_at(i)->contents,
               base::UTF8ToUTF16(cases[i].after_contents));
@@ -1949,7 +1949,7 @@ TEST_F(AutocompleteResultTest, InlineTailPrefixes) {
                                      cases[i].after_contents_class));
   }
   // Run twice and make sure that it doesn't re-prepend ellipsis.
-  result.InlineTailPrefixes();
+  result.SetTailSuggestContentPrefixes();
   for (size_t i = 0; i < base::size(cases); ++i) {
     EXPECT_EQ(result.match_at(i)->contents,
               base::UTF8ToUTF16(cases[i].after_contents));
diff --git a/components/optimization_guide/content/browser/BUILD.gn b/components/optimization_guide/content/browser/BUILD.gn
index 0d26cc4b4555db..d7138cea7367ec 100644
--- a/components/optimization_guide/content/browser/BUILD.gn
+++ b/components/optimization_guide/content/browser/BUILD.gn
@@ -83,7 +83,8 @@ source_set("unit_tests") {
     "page_text_dump_result_unittest.cc",
     "page_text_observer_unittest.cc",
   ]
-  if (build_with_tflite_lib) {
+  # crbug.com/1279884 Flaky on CrOS
+  if (!is_chromeos && build_with_tflite_lib) {
     sources += [ "page_content_annotations_model_manager_unittest.cc" ]
   }
   deps = [
diff --git a/components/page_info/core/BUILD.gn b/components/page_info/core/BUILD.gn
index fbfe8a8a99ef26..4166610a951da1 100644
--- a/components/page_info/core/BUILD.gn
+++ b/components/page_info/core/BUILD.gn
@@ -40,8 +40,10 @@ static_library("core") {
     "//components/keyed_service/core",
     "//components/optimization_guide/core",
     "//components/page_info/core:proto",
+    "//components/strings:components_strings_grit",
     "//services/metrics/public/cpp:metrics_cpp",
     "//services/metrics/public/cpp:ukm_builders",
+    "//ui/base:base",
   ]
 }
 
diff --git a/components/page_info/core/page_info_history_data_source.cc b/components/page_info/core/page_info_history_data_source.cc
index 5ad26f2386329a..2d57fc26622969 100644
--- a/components/page_info/core/page_info_history_data_source.cc
+++ b/components/page_info/core/page_info_history_data_source.cc
@@ -10,6 +10,8 @@
 #include "base/i18n/time_formatting.h"
 #include "base/strings/string_util.h"
 #include "components/history/core/browser/history_service.h"
+#include "components/strings/grit/components_strings.h"
+#include "ui/base/l10n/l10n_util.h"
 
 namespace page_info {
 
@@ -32,20 +34,19 @@ std::u16string PageInfoHistoryDataSource::FormatLastVisitedTimestamp(
   const base::Time mightnight_last_visited = last_visit.LocalMidnight();
   const base::TimeDelta delta = midnight_today - mightnight_last_visited;
 
-  // TODO(crbug.com/1275042): Use actual strings.
   if (delta == base::Milliseconds(0))
-    return u"Last visited today";
+    return l10n_util::GetStringUTF16(IDS_PAGE_INFO_HISTORY_LAST_VISIT_TODAY);
 
   if (delta == kDay)
-    return u"Last visited yesterday";
+    return l10n_util::GetStringUTF16(
+        IDS_PAGE_INFO_HISTORY_LAST_VISIT_YESTERDAY);
 
   if (delta > kDay && delta <= kDay * 7)
-    return base::ReplaceStringPlaceholders(u"Last visited $1 days ago",
-                                           {base::FormatNumber(delta.InDays())},
-                                           nullptr);
+    return l10n_util::GetStringFUTF16Int(IDS_PAGE_INFO_HISTORY_LAST_VISIT_DAYS,
+                                         delta.InDays());
 
-  return base::ReplaceStringPlaceholders(
-      u"Last visited $1", {base::TimeFormatShortDate(last_visit)}, nullptr);
+  return l10n_util::GetStringFUTF16(IDS_PAGE_INFO_HISTORY_LAST_VISIT_DATE,
+                                    base::TimeFormatShortDate(last_visit));
 }
 
 void PageInfoHistoryDataSource::GetLastVisitedTimestamp(
diff --git a/components/page_info_strings.grdp b/components/page_info_strings.grdp
index 929185b11a3017..7e7be274c4dfa0 100644
--- a/components/page_info_strings.grdp
+++ b/components/page_info_strings.grdp
@@ -701,4 +701,21 @@
   <message name="IDS_PAGE_INFO_ABOUT_THIS_SITE_SUBPAGE_FROM_LABEL" desc="The label containing the source of the description in the 'About this site' subpage in Page Info bubble.">
     From <ph name="SOURCE_NAME">$1<ex>Wikipedia</ex></ph>
   </message>
+
+  <!-- History strings -->
+  <message name="IDS_PAGE_INFO_HISTORY" desc="The button label of the 'History' row in Page Info bubble. The button opens history page for the site.">
+    History
+  </message>
+  <message name="IDS_PAGE_INFO_HISTORY_LAST_VISIT_TODAY" desc="Summary string for page info history row. The site was last visited today.">
+    Last visited today
+  </message>
+  <message name="IDS_PAGE_INFO_HISTORY_LAST_VISIT_YESTERDAY" desc="Summary string for page info history row. The site was last visited yesterday.">
+    Last visited yesterday
+  </message>
+  <message name="IDS_PAGE_INFO_HISTORY_LAST_VISIT_DAYS" desc="Summary string for page info history row. The site was last visited NUM_DAYS days ago.">
+    Last visited <ph name="NUM_DAYS">$1<ex>2</ex></ph> days ago
+  </message>
+  <message name="IDS_PAGE_INFO_HISTORY_LAST_VISIT_DATE" desc="Summary string for page info history row. The site was last visited on a particular date.">
+    Last visited <ph name="DATE">$1<ex>Apr 4, 2021</ex></ph>
+  </message>
 </grit-part>
diff --git a/components/page_info_strings_grdp/IDS_PAGE_INFO_HISTORY.png.sha1 b/components/page_info_strings_grdp/IDS_PAGE_INFO_HISTORY.png.sha1
new file mode 100644
index 00000000000000..ec116557bf1f9c
--- /dev/null
+++ b/components/page_info_strings_grdp/IDS_PAGE_INFO_HISTORY.png.sha1
@@ -0,0 +1 @@
+d927fd0497c9ae6a817e524517c925604b325b01
\ No newline at end of file
diff --git a/components/page_info_strings_grdp/IDS_PAGE_INFO_HISTORY_LAST_VISIT_DATE.png.sha1 b/components/page_info_strings_grdp/IDS_PAGE_INFO_HISTORY_LAST_VISIT_DATE.png.sha1
new file mode 100644
index 00000000000000..4730ee6a1e287d
--- /dev/null
+++ b/components/page_info_strings_grdp/IDS_PAGE_INFO_HISTORY_LAST_VISIT_DATE.png.sha1
@@ -0,0 +1 @@
+c26a020f4ebb431a012f5669901dc5ee849c9bc8
\ No newline at end of file
diff --git a/components/page_info_strings_grdp/IDS_PAGE_INFO_HISTORY_LAST_VISIT_DAYS.png.sha1 b/components/page_info_strings_grdp/IDS_PAGE_INFO_HISTORY_LAST_VISIT_DAYS.png.sha1
new file mode 100644
index 00000000000000..e2110ab3ceaf8b
--- /dev/null
+++ b/components/page_info_strings_grdp/IDS_PAGE_INFO_HISTORY_LAST_VISIT_DAYS.png.sha1
@@ -0,0 +1 @@
+4d4e2d8b2d6f260963b8665c6718c3bd06c18b46
\ No newline at end of file
diff --git a/components/page_info_strings_grdp/IDS_PAGE_INFO_HISTORY_LAST_VISIT_TODAY.png.sha1 b/components/page_info_strings_grdp/IDS_PAGE_INFO_HISTORY_LAST_VISIT_TODAY.png.sha1
new file mode 100644
index 00000000000000..ec116557bf1f9c
--- /dev/null
+++ b/components/page_info_strings_grdp/IDS_PAGE_INFO_HISTORY_LAST_VISIT_TODAY.png.sha1
@@ -0,0 +1 @@
+d927fd0497c9ae6a817e524517c925604b325b01
\ No newline at end of file
diff --git a/components/page_info_strings_grdp/IDS_PAGE_INFO_HISTORY_LAST_VISIT_YESTERDAY.png.sha1 b/components/page_info_strings_grdp/IDS_PAGE_INFO_HISTORY_LAST_VISIT_YESTERDAY.png.sha1
new file mode 100644
index 00000000000000..116c98c9efbdd0
--- /dev/null
+++ b/components/page_info_strings_grdp/IDS_PAGE_INFO_HISTORY_LAST_VISIT_YESTERDAY.png.sha1
@@ -0,0 +1 @@
+8827e0588e5397a18d6dd782daf67ed28ed61d89
\ No newline at end of file
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json
index eaeca49ab15fb6..d2800611b836d6 100644
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -17384,22 +17384,6 @@
       Otherwise, local IP addresses are concealed with mDNS hostnames.
       Please note that this policy weakens the protection of local IPs if needed by administrators.''',
     },
-    {
-      'name': 'WebRestrictionsAuthority',
-      'owners': ['file://components/policy/resources/OWNERS', 'hendrich@chromium.org'],
-      'id': 341,
-      'type': 'string',
-      'schema' : { 'type': 'string' },
-      'tags': ['filtering', 'admin-sharing'],
-      'future_on': ['webview_android'],
-      'caption': '''Set an external source of URL restrictions''',
-      'desc' : '''When this policy is set to a non-empty string the WebView will read URL restrictions from the content provider with the given authority name.''',
-      'features': {
-        'dynamic_refresh': True,
-        'per_profile': False,
-      },
-      'example_value': 'com.android.chrome.SupervisedUserProvider'
-    },
     {
       'name': 'ComponentUpdatesEnabled',
       'owners': ['file://components/update_client/OWNERS', 'sorin@chromium.org'],
@@ -30102,7 +30086,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio
     },
   ],
   'placeholders': [],
-  'deleted_policy_ids': [114, 115, 204, 205, 206, 412, 476, 544, 546, 562, 569, 578, 583, 585, 586, 587, 588, 589, 590, 591, 600, 668, 669, 872],
+  'deleted_policy_ids': [114, 115, 204, 205, 206, 341, 412, 476, 544, 546, 562, 569, 578, 583, 585, 586, 587, 588, 589, 590, 591, 600, 668, 669, 872],
   'deleted_atomic_policy_group_ids': [19],
   'highest_id_currently_used': 934,
   'highest_atomic_group_id_currently_used': 41
diff --git a/components/reporting/util/status.h b/components/reporting/util/status.h
index d432941d1b566f..30b182f5354306 100644
--- a/components/reporting/util/status.h
+++ b/components/reporting/util/status.h
@@ -9,7 +9,6 @@
 #include <iosfwd>
 #include <string>
 
-#include "base/compiler_specific.h"
 #include "base/strings/string_piece.h"
 #include "components/reporting/util/status.pb.h"
 
@@ -44,7 +43,7 @@ enum Code : int32_t {
 };
 }  // namespace error
 
-class WARN_UNUSED_RESULT Status {
+class Status {
  public:
   // Creates a "successful" status.
   Status();
diff --git a/components/reporting/util/statusor.h b/components/reporting/util/statusor.h
index 2c0806178fc897..0f065acfea8f06 100644
--- a/components/reporting/util/statusor.h
+++ b/components/reporting/util/statusor.h
@@ -81,7 +81,7 @@ class StatusOrHelper {
 }  // namespace internal
 
 template <typename T>
-class WARN_UNUSED_RESULT StatusOr {
+class StatusOr {
   template <typename U>
   friend class StatusOr;
 
diff --git a/components/safe_browsing/content/browser/safe_browsing_navigation_observer_unittest.cc b/components/safe_browsing/content/browser/safe_browsing_navigation_observer_unittest.cc
index 0cca03e98df5a3..7af7b7ff66aed7 100644
--- a/components/safe_browsing/content/browser/safe_browsing_navigation_observer_unittest.cc
+++ b/components/safe_browsing/content/browser/safe_browsing_navigation_observer_unittest.cc
@@ -188,7 +188,8 @@ class SBNavigationObserverTest : public content::RenderViewHostTestHarness {
   base::test::ScopedFeatureList scoped_feature_list_;
 };
 
-TEST_F(SBNavigationObserverTest, TestNavigationEventList) {
+// TODO(crbug.com/1279844): Fix test on Linux TSan bot.
+TEST_F(SBNavigationObserverTest, DISABLED_TestNavigationEventList) {
   NavigationEventList events(3);
 
   EXPECT_EQ(-1, static_cast<int>(events.FindNavigationEvent(
diff --git a/components/search_engines/search_terms_data.cc b/components/search_engines/search_terms_data.cc
index cd86498aa8a029..52eca7441d866f 100644
--- a/components/search_engines/search_terms_data.cc
+++ b/components/search_engines/search_terms_data.cc
@@ -5,7 +5,6 @@
 #include "components/search_engines/search_terms_data.h"
 
 #include "base/check.h"
-#include "build/build_config.h"
 #include "components/google/core/common/google_util.h"
 #include "components/lens/lens_features.h"
 #include "url/gurl.h"
@@ -21,7 +20,6 @@ std::string SearchTermsData::GoogleBaseURLValue() const {
 std::string SearchTermsData::GoogleBaseSearchByImageURLValue() const {
   const std::string kGoogleHomepageURLPath = std::string("searchbyimage/");
 
-#if !defined(OS_IOS) && !defined(OS_ANDROID)
   // If both LensStandalone and LensRegionSearch features are enabled,
   // LensStandalone parameters will take precedence even if the values differ.
   if (base::FeatureList::IsEnabled(lens::features::kLensStandalone)) {
@@ -29,8 +27,6 @@ std::string SearchTermsData::GoogleBaseSearchByImageURLValue() const {
   } else if (base::FeatureList::IsEnabled(lens::features::kLensRegionSearch)) {
     return lens::features::GetHomepageURLForRegionSearch();
   }
-#endif  // !defined(OS_IOS) && !defined(OS_ANDROID)
-
   return google_util::kGoogleHomepageURL + kGoogleHomepageURLPath;
 }
 
diff --git a/components/signin/public/base/signin_metrics.h b/components/signin/public/base/signin_metrics.h
index f99bfd86f91b22..43ae503263224d 100644
--- a/components/signin/public/base/signin_metrics.h
+++ b/components/signin/public/base/signin_metrics.h
@@ -15,6 +15,7 @@
 namespace signin_metrics {
 
 // Track all the ways a profile can become signed out as a histogram.
+// Enum SigninSignoutProfile.
 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.signin.metrics
 // GENERATED_JAVA_CLASS_NAME_OVERRIDE: SignoutReason
 // These values are persisted to logs. Entries should not be renumbered and
@@ -43,8 +44,7 @@ enum ProfileSignout : int {
   AUTHENTICATION_FAILED_WITH_FORCE_SIGNIN = 7,
   // The user disables sync from the DICE UI.
   USER_TUNED_OFF_SYNC_FROM_DICE_UI = 8,
-  // Android specific. Signout forced because the account was removed from the
-  // device.
+  // Signout forced because the account was removed from the device.
   ACCOUNT_REMOVED_FROM_DEVICE = 9,
   // Signin is no longer allowed when the profile is initialized.
   SIGNIN_NOT_ALLOWED_ON_PROFILE_INIT = 10,
@@ -57,6 +57,9 @@ enum ProfileSignout : int {
   MOBILE_IDENTITY_CONSISTENCY_ROLLBACK = 13,
   // Sign-out when the account id migration to Gaia ID did not finish,
   ACCOUNT_ID_MIGRATION = 14,
+  // iOS Specific. Sign-out forced because the account was removed from the
+  // device after a device restore.
+  IOS_ACCOUNT_REMOVED_FROM_DEVICE_AFTER_RESTORE = 15,
   // Keep this as the last enum.
   NUM_PROFILE_SIGNOUT_METRICS,
 };
diff --git a/components/sync/driver/sync_service_crypto.cc b/components/sync/driver/sync_service_crypto.cc
index 310a51fd47935a..b90b4b69a0b8a1 100644
--- a/components/sync/driver/sync_service_crypto.cc
+++ b/components/sync/driver/sync_service_crypto.cc
@@ -122,14 +122,6 @@ class SyncEncryptionObserverProxy : public SyncEncryptionHandler::Observer {
             observer_));
   }
 
-  void OnBootstrapTokenUpdated(const std::string& bootstrap_token) override {
-    task_runner_->PostTask(
-        FROM_HERE,
-        base::BindOnce(
-            &SyncEncryptionHandler::Observer::OnBootstrapTokenUpdated,
-            observer_, bootstrap_token));
-  }
-
   void OnEncryptedTypesChanged(ModelTypeSet encrypted_types,
                                bool encrypt_everything) override {
     task_runner_->PostTask(
@@ -212,6 +204,28 @@ std::unique_ptr<Nigori> ReadNigoriFromBootstrapToken(
                                 key.mac_key());
 }
 
+// Serializes |nigori| as bootstrap token. Returns empty string in case of
+// crypto/serialization failures.
+std::string SerializeNigoriAsBootstrapToken(const Nigori& nigori) {
+  sync_pb::NigoriKey proto;
+  nigori.ExportKeys(proto.mutable_deprecated_user_key(),
+                    proto.mutable_encryption_key(), proto.mutable_mac_key());
+
+  const std::string serialized_key = proto.SerializeAsString();
+  if (serialized_key.empty()) {
+    return std::string();
+  }
+
+  std::string encrypted_key;
+  if (!OSCrypt::EncryptString(serialized_key, &encrypted_key)) {
+    return std::string();
+  }
+
+  std::string encoded_key;
+  base::Base64Encode(encrypted_key, &encoded_key);
+  return encoded_key;
+}
+
 }  // namespace
 
 SyncServiceCrypto::State::State()
@@ -345,7 +359,16 @@ bool SyncServiceCrypto::SetDecryptionPassphrase(const std::string& passphrase) {
       state_.passphrase_key_derivation_params, passphrase);
   DCHECK(nigori);
 
-  return SetDecryptionNigoriKey(std::move(nigori));
+  std::string bootstrap_token = SerializeNigoriAsBootstrapToken(*nigori);
+  if (SetDecryptionNigoriKey(std::move(nigori))) {
+    // Update the bootstrap token immediately, even if engine has new pending
+    // keys, which aren't decryptable with |nigori|, this is harmless as
+    // bootstrap token is ignored if it doesn't contain the right key.
+    delegate_->SetEncryptionBootstrapToken(bootstrap_token);
+    return true;
+  }
+
+  return false;
 }
 
 bool SyncServiceCrypto::IsTrustedVaultKeyRequiredStateKnown() const {
@@ -522,13 +545,6 @@ void SyncServiceCrypto::OnTrustedVaultKeyAccepted() {
   delegate_->ReconfigureDataTypesDueToCrypto();
 }
 
-void SyncServiceCrypto::OnBootstrapTokenUpdated(
-    const std::string& bootstrap_token) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  DCHECK(state_.engine);
-  delegate_->EncryptionBootstrapTokenChanged(bootstrap_token);
-}
-
 void SyncServiceCrypto::OnEncryptedTypesChanged(ModelTypeSet encrypted_types,
                                                 bool encrypt_everything) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
diff --git a/components/sync/driver/sync_service_crypto.h b/components/sync/driver/sync_service_crypto.h
index 6a5ea0bf6f7550..84fb7d03008f3b 100644
--- a/components/sync/driver/sync_service_crypto.h
+++ b/components/sync/driver/sync_service_crypto.h
@@ -35,7 +35,7 @@ class SyncServiceCrypto : public SyncEncryptionHandler::Observer,
     virtual void CryptoStateChanged() = 0;
     virtual void CryptoRequiredUserActionChanged() = 0;
     virtual void ReconfigureDataTypesDueToCrypto() = 0;
-    virtual void EncryptionBootstrapTokenChanged(
+    virtual void SetEncryptionBootstrapToken(
         const std::string& bootstrap_token) = 0;
     virtual std::string GetEncryptionBootstrapToken() = 0;
   };
@@ -84,7 +84,6 @@ class SyncServiceCrypto : public SyncEncryptionHandler::Observer,
   void OnPassphraseAccepted() override;
   void OnTrustedVaultKeyRequired() override;
   void OnTrustedVaultKeyAccepted() override;
-  void OnBootstrapTokenUpdated(const std::string& bootstrap_token) override;
   void OnEncryptedTypesChanged(ModelTypeSet encrypted_types,
                                bool encrypt_everything) override;
   void OnCryptographerStateChanged(Cryptographer* cryptographer,
diff --git a/components/sync/driver/sync_service_crypto_unittest.cc b/components/sync/driver/sync_service_crypto_unittest.cc
index 4015c638538859..d148adb5e44d6c 100644
--- a/components/sync/driver/sync_service_crypto_unittest.cc
+++ b/components/sync/driver/sync_service_crypto_unittest.cc
@@ -82,6 +82,36 @@ std::string CreateBootstrapToken(const std::string& passphrase,
   return encoded_key;
 }
 
+MATCHER_P2(BootstrapTokenDerivedFrom,
+           expected_passphrase,
+           expected_derivation_params,
+           "") {
+  const std::string& given_bootstrap_token = arg;
+  std::string decoded_key;
+  if (!base::Base64Decode(given_bootstrap_token, &decoded_key)) {
+    return false;
+  }
+
+  std::string decrypted_key;
+  if (!OSCrypt::DecryptString(decoded_key, &decrypted_key)) {
+    return false;
+  }
+
+  sync_pb::NigoriKey given_key;
+  if (!given_key.ParseFromString(decrypted_key)) {
+    return false;
+  }
+
+  std::unique_ptr<Nigori> expected_nigori = Nigori::CreateByDerivation(
+      expected_derivation_params, expected_passphrase);
+  sync_pb::NigoriKey expected_key;
+  expected_nigori->ExportKeys(expected_key.mutable_deprecated_user_key(),
+                              expected_key.mutable_encryption_key(),
+                              expected_key.mutable_mac_key());
+  return given_key.encryption_key() == expected_key.encryption_key() &&
+         given_key.mac_key() == expected_key.mac_key();
+}
+
 class MockDelegate : public SyncServiceCrypto::Delegate {
  public:
   MockDelegate() = default;
@@ -91,7 +121,7 @@ class MockDelegate : public SyncServiceCrypto::Delegate {
   MOCK_METHOD(void, CryptoRequiredUserActionChanged, (), (override));
   MOCK_METHOD(void, ReconfigureDataTypesDueToCrypto, (), (override));
   MOCK_METHOD(void,
-              EncryptionBootstrapTokenChanged,
+              SetEncryptionBootstrapToken,
               (const std::string&),
               (override));
   MOCK_METHOD(std::string, GetEncryptionBootstrapToken, (), (override));
@@ -415,6 +445,9 @@ TEST_F(SyncServiceCryptoTest, ShouldExposePassphraseRequired) {
   // after checking the passphrase in the UI thread and a second time later when
   // the engine confirms with OnPassphraseAccepted().
   EXPECT_CALL(delegate_, ReconfigureDataTypesDueToCrypto()).Times(2);
+  EXPECT_CALL(delegate_,
+              SetEncryptionBootstrapToken(BootstrapTokenDerivedFrom(
+                  kTestPassphrase, KeyDerivationParams::CreateForPbkdf2())));
   EXPECT_TRUE(crypto_.SetDecryptionPassphrase(kTestPassphrase));
   EXPECT_FALSE(crypto_.IsPassphraseRequired());
 }
diff --git a/components/sync/driver/sync_service_impl.cc b/components/sync/driver/sync_service_impl.cc
index 87df937eb3d26f..f47e2b7699f8fd 100644
--- a/components/sync/driver/sync_service_impl.cc
+++ b/components/sync/driver/sync_service_impl.cc
@@ -982,7 +982,7 @@ void SyncServiceImpl::ReconfigureDataTypesDueToCrypto() {
   NotifyObservers();
 }
 
-void SyncServiceImpl::EncryptionBootstrapTokenChanged(
+void SyncServiceImpl::SetEncryptionBootstrapToken(
     const std::string& bootstrap_token) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   sync_prefs_.SetEncryptionBootstrapToken(bootstrap_token);
diff --git a/components/sync/driver/sync_service_impl.h b/components/sync/driver/sync_service_impl.h
index 02234e5c725075..b06599a3fc2c5b 100644
--- a/components/sync/driver/sync_service_impl.h
+++ b/components/sync/driver/sync_service_impl.h
@@ -181,8 +181,7 @@ class SyncServiceImpl : public SyncService,
   void CryptoStateChanged() override;
   void CryptoRequiredUserActionChanged() override;
   void ReconfigureDataTypesDueToCrypto() override;
-  void EncryptionBootstrapTokenChanged(
-      const std::string& bootstrap_token) override;
+  void SetEncryptionBootstrapToken(const std::string& bootstrap_token) override;
   std::string GetEncryptionBootstrapToken() override;
 
   // IdentityManager::Observer implementation.
diff --git a/components/sync/driver/sync_user_settings_impl_unittest.cc b/components/sync/driver/sync_user_settings_impl_unittest.cc
index 67713bc8ee236c..e06e7ac300f80e 100644
--- a/components/sync/driver/sync_user_settings_impl_unittest.cc
+++ b/components/sync/driver/sync_user_settings_impl_unittest.cc
@@ -60,7 +60,7 @@ class MockSyncServiceCryptoDelegate : public SyncServiceCrypto::Delegate {
   MOCK_METHOD(void, CryptoRequiredUserActionChanged, (), (override));
   MOCK_METHOD(void, ReconfigureDataTypesDueToCrypto, (), (override));
   MOCK_METHOD(void,
-              EncryptionBootstrapTokenChanged,
+              SetEncryptionBootstrapToken,
               (const std::string&),
               (override));
   MOCK_METHOD(std::string, GetEncryptionBootstrapToken, (), (override));
diff --git a/components/sync/engine/debug_info_event_listener.cc b/components/sync/engine/debug_info_event_listener.cc
index ec242f986e35f5..8568d1cbb4fde7 100644
--- a/components/sync/engine/debug_info_event_listener.cc
+++ b/components/sync/engine/debug_info_event_listener.cc
@@ -82,12 +82,6 @@ void DebugInfoEventListener::OnTrustedVaultKeyAccepted() {
   CreateAndAddEvent(sync_pb::SyncEnums::TRUSTED_VAULT_KEY_ACCEPTED);
 }
 
-void DebugInfoEventListener::OnBootstrapTokenUpdated(
-    const std::string& bootstrap_token) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  CreateAndAddEvent(sync_pb::SyncEnums::BOOTSTRAP_TOKEN_UPDATED);
-}
-
 void DebugInfoEventListener::OnEncryptedTypesChanged(
     ModelTypeSet encrypted_types,
     bool encrypt_everything) {
diff --git a/components/sync/engine/debug_info_event_listener.h b/components/sync/engine/debug_info_event_listener.h
index df5c5b86acaf5f..02442326ebf119 100644
--- a/components/sync/engine/debug_info_event_listener.h
+++ b/components/sync/engine/debug_info_event_listener.h
@@ -64,7 +64,6 @@ class DebugInfoEventListener : public SyncManager::Observer,
   void OnPassphraseAccepted() override;
   void OnTrustedVaultKeyRequired() override;
   void OnTrustedVaultKeyAccepted() override;
-  void OnBootstrapTokenUpdated(const std::string& bootstrap_token) override;
   void OnEncryptedTypesChanged(ModelTypeSet encrypted_types,
                                bool encrypt_everything) override;
   void OnCryptographerStateChanged(Cryptographer* cryptographer,
diff --git a/components/sync/engine/model_type_registry.cc b/components/sync/engine/model_type_registry.cc
index ef0b6a0774d143..edfbf1393d7ef1 100644
--- a/components/sync/engine/model_type_registry.cc
+++ b/components/sync/engine/model_type_registry.cc
@@ -157,9 +157,6 @@ void ModelTypeRegistry::OnTrustedVaultKeyRequired() {}
 
 void ModelTypeRegistry::OnTrustedVaultKeyAccepted() {}
 
-void ModelTypeRegistry::OnBootstrapTokenUpdated(
-    const std::string& bootstrap_token) {}
-
 void ModelTypeRegistry::OnEncryptedTypesChanged(ModelTypeSet encrypted_types,
                                                 bool encrypt_everything) {
   // This does NOT support disabling encryption without reconnecting the
diff --git a/components/sync/engine/model_type_registry.h b/components/sync/engine/model_type_registry.h
index 99e48b934ba151..b6916582ae00aa 100644
--- a/components/sync/engine/model_type_registry.h
+++ b/components/sync/engine/model_type_registry.h
@@ -59,7 +59,6 @@ class ModelTypeRegistry : public ModelTypeConnector,
   void OnPassphraseAccepted() override;
   void OnTrustedVaultKeyRequired() override;
   void OnTrustedVaultKeyAccepted() override;
-  void OnBootstrapTokenUpdated(const std::string& bootstrap_token) override;
   void OnEncryptedTypesChanged(ModelTypeSet encrypted_types,
                                bool encrypt_everything) override;
   void OnCryptographerStateChanged(Cryptographer* cryptographer,
diff --git a/components/sync/engine/model_type_worker.cc b/components/sync/engine/model_type_worker.cc
index 4ac20212012db8..fed782cd889643 100644
--- a/components/sync/engine/model_type_worker.cc
+++ b/components/sync/engine/model_type_worker.cc
@@ -45,10 +45,10 @@ namespace syncer {
 
 namespace {
 
-const char kTimeUntilEncryptionKeyFoundHistogramPrefix[] =
-    "Sync.ModelTypeTimeUntilEncryptionKeyFound2.";
-const char kUndecryptablePendingUpdatesDroppedHistogramPrefix[] =
-    "Sync.ModelTypeUndecryptablePendingUpdatesDropped.";
+const char kTimeUntilEncryptionKeyFoundHistogramName[] =
+    "Sync.ModelTypeTimeUntilEncryptionKeyFound2";
+const char kUndecryptablePendingUpdatesDroppedHistogramName[] =
+    "Sync.ModelTypeUndecryptablePendingUpdatesDropped";
 const char kBlockedByUndecryptableUpdateHistogramName[] =
     "Sync.ModelTypeBlockedDueToUndecryptableUpdate";
 
@@ -716,7 +716,10 @@ void ModelTypeWorker::DecryptStoredEntities() {
     // while the cryptographer was pending external interaction.
     if (newly_found_key.get_updates_while_should_have_been_known > 0) {
       base::UmaHistogramCounts1000(
-          base::StrCat({kTimeUntilEncryptionKeyFoundHistogramPrefix,
+          kTimeUntilEncryptionKeyFoundHistogramName,
+          newly_found_key.get_updates_while_should_have_been_known);
+      base::UmaHistogramCounts1000(
+          base::StrCat({kTimeUntilEncryptionKeyFoundHistogramName, ".",
                         ModelTypeToHistogramSuffix(type_)}),
           newly_found_key.get_updates_while_should_have_been_known);
     }
@@ -850,11 +853,15 @@ void ModelTypeWorker::MaybeDropPendingUpdatesEncryptedWith(
   });
 
   // If updates were dropped, record how many.
-  if (entries_pending_decryption_.size() < updates_before_dropping) {
+  const size_t dropped_updates =
+      updates_before_dropping - entries_pending_decryption_.size();
+  if (dropped_updates > 0) {
+    base::UmaHistogramCounts1000(
+        kUndecryptablePendingUpdatesDroppedHistogramName, dropped_updates);
     base::UmaHistogramCounts1000(
-        base::StrCat({kUndecryptablePendingUpdatesDroppedHistogramPrefix,
+        base::StrCat({kUndecryptablePendingUpdatesDroppedHistogramName, ".",
                       ModelTypeToHistogramSuffix(type_)}),
-        updates_before_dropping - entries_pending_decryption_.size());
+        dropped_updates);
   }
 }
 
diff --git a/components/sync/engine/model_type_worker_unittest.cc b/components/sync/engine/model_type_worker_unittest.cc
index 888c746f904719..66977e4ec3e793 100644
--- a/components/sync/engine/model_type_worker_unittest.cc
+++ b/components/sync/engine/model_type_worker_unittest.cc
@@ -1359,7 +1359,7 @@ TEST_F(ModelTypeWorkerTest, TimeUntilEncryptionKeyFoundMetric) {
   // The fact that the data type is now blocked should have been recorded.
   histogram_tester.ExpectUniqueSample(
       "Sync.ModelTypeBlockedDueToUndecryptableUpdate",
-      ModelTypeHistogramValue(worker()->GetModelType()), 1);
+      ModelTypeForHistograms::kPreferences, 1);
 
   // Send empty GetUpdatesResponse. The counter shouldn't change.
   worker()->ProcessGetUpdatesResponse(
@@ -1386,17 +1386,24 @@ TEST_F(ModelTypeWorkerTest, TimeUntilEncryptionKeyFoundMetric) {
   ApplyUpdates();
 
   // Double check the histogram hasn't been recorded so far.
-  const std::string histogram_name =
-      std::string("Sync.ModelTypeTimeUntilEncryptionKeyFound2.") +
-      ModelTypeToHistogramSuffix(worker()->GetModelType());
-  EXPECT_TRUE(histogram_tester.GetAllSamples(histogram_name).empty());
+  EXPECT_TRUE(histogram_tester
+                  .GetAllSamples("Sync.ModelTypeTimeUntilEncryptionKeyFound2")
+                  .empty());
+  EXPECT_TRUE(histogram_tester
+                  .GetAllSamples(
+                      "Sync.ModelTypeTimeUntilEncryptionKeyFound2.PREFERENCE")
+                  .empty());
 
   // Make the key available. The correct number of GetUpdates cycles should
   // have been recorded.
   DecryptPendingKey();
   ASSERT_EQ(2, get_updates_while_should_have_been_known);
   histogram_tester.ExpectUniqueSample(
-      histogram_name, get_updates_while_should_have_been_known, 1);
+      "Sync.ModelTypeTimeUntilEncryptionKeyFound2",
+      get_updates_while_should_have_been_known, 1);
+  histogram_tester.ExpectUniqueSample(
+      "Sync.ModelTypeTimeUntilEncryptionKeyFound2.PREFERENCE",
+      get_updates_while_should_have_been_known, 1);
 }
 
 TEST_F(ModelTypeWorkerTest, IgnoreUpdatesEncryptedWithKeysMissingForTooLong) {
@@ -1427,9 +1434,9 @@ TEST_F(ModelTypeWorkerTest, IgnoreUpdatesEncryptedWithKeysMissingForTooLong) {
 
   // Should have recorded that 1 entity was dropped.
   histogram_tester.ExpectUniqueSample(
-      base::StrCat({"Sync.ModelTypeUndecryptablePendingUpdatesDropped.",
-                    ModelTypeToHistogramSuffix(worker()->GetModelType())}),
-      1, 1);
+      "Sync.ModelTypeUndecryptablePendingUpdatesDropped", 1, 1);
+  histogram_tester.ExpectUniqueSample(
+      "Sync.ModelTypeUndecryptablePendingUpdatesDropped.PREFERENCE", 1, 1);
 
   // From now on, incoming updates encrypted with the missing key don't block
   // the worker.
@@ -1439,7 +1446,7 @@ TEST_F(ModelTypeWorkerTest, IgnoreUpdatesEncryptedWithKeysMissingForTooLong) {
   // Should have recorded that 1 incoming update was ignored.
   histogram_tester.ExpectUniqueSample(
       "Sync.ModelTypeUpdateDrop.DecryptionPendingForTooLong",
-      ModelTypeHistogramValue(worker()->GetModelType()), 1);
+      ModelTypeForHistograms::kPreferences, 1);
 }
 
 // Test that processor has been disconnected from Sync when worker got
diff --git a/components/sync/engine/sync_encryption_handler.h b/components/sync/engine/sync_encryption_handler.h
index 5416301413e46a..85de6cc73db157 100644
--- a/components/sync/engine/sync_encryption_handler.h
+++ b/components/sync/engine/sync_encryption_handler.h
@@ -67,17 +67,6 @@ class SyncEncryptionHandler {
     // accepted and there are no longer pending keys.
     virtual void OnTrustedVaultKeyAccepted() = 0;
 
-    // |bootstrap_token| is an opaque base64 encoded representation of the key
-    // generated by the current passphrase, and is provided to the observer for
-    // persistence purposes and use in a future initialization of sync (e.g.
-    // after restart). The boostrap token will always be derived from the most
-    // recent GAIA password (for accounts with implicit passphrases), even if
-    // the data is still encrypted with an older GAIA password. For accounts
-    // with explicit passphrases, it will be the most recently seen custom
-    // passphrase.
-    virtual void OnBootstrapTokenUpdated(
-        const std::string& bootstrap_token) = 0;
-
     // Called when the set of encrypted types or the encrypt
     // everything flag has been changed. Note that this doesn't imply the
     // encryption is complete.
diff --git a/components/sync/engine/sync_manager_impl.cc b/components/sync/engine/sync_manager_impl.cc
index 130d71e00f6432..cd27f1cc579a9e 100644
--- a/components/sync/engine/sync_manager_impl.cc
+++ b/components/sync/engine/sync_manager_impl.cc
@@ -222,11 +222,6 @@ void SyncManagerImpl::OnTrustedVaultKeyAccepted() {
   // Does nothing.
 }
 
-void SyncManagerImpl::OnBootstrapTokenUpdated(
-    const std::string& bootstrap_token) {
-  // Does nothing.
-}
-
 void SyncManagerImpl::OnEncryptedTypesChanged(ModelTypeSet encrypted_types,
                                               bool encrypt_everything) {
   sync_status_tracker_->SetEncryptedTypes(encrypted_types);
diff --git a/components/sync/engine/sync_manager_impl.h b/components/sync/engine/sync_manager_impl.h
index c846539e9989c7..4fbcf794c69bdc 100644
--- a/components/sync/engine/sync_manager_impl.h
+++ b/components/sync/engine/sync_manager_impl.h
@@ -95,7 +95,6 @@ class SyncManagerImpl
   void OnPassphraseAccepted() override;
   void OnTrustedVaultKeyRequired() override;
   void OnTrustedVaultKeyAccepted() override;
-  void OnBootstrapTokenUpdated(const std::string& bootstrap_token) override;
   void OnEncryptedTypesChanged(ModelTypeSet encrypted_types,
                                bool encrypt_everything) override;
   void OnCryptographerStateChanged(Cryptographer* cryptographer,
diff --git a/components/sync/engine/sync_manager_impl_unittest.cc b/components/sync/engine/sync_manager_impl_unittest.cc
index 9c5b039376f88b..d7d2513f24268e 100644
--- a/components/sync/engine/sync_manager_impl_unittest.cc
+++ b/components/sync/engine/sync_manager_impl_unittest.cc
@@ -108,7 +108,6 @@ class SyncEncryptionHandlerObserverMock
   MOCK_METHOD(void, OnPassphraseAccepted, (), (override));
   MOCK_METHOD(void, OnTrustedVaultKeyRequired, (), (override));
   MOCK_METHOD(void, OnTrustedVaultKeyAccepted, (), (override));
-  MOCK_METHOD(void, OnBootstrapTokenUpdated, (const std::string&), (override));
   MOCK_METHOD(void, OnEncryptedTypesChanged, (ModelTypeSet, bool), (override));
   MOCK_METHOD(void,
               OnCryptographerStateChanged,
diff --git a/components/sync/nigori/nigori_sync_bridge_impl.cc b/components/sync/nigori/nigori_sync_bridge_impl.cc
index e58e1da99e05d9..102901a354743e 100644
--- a/components/sync/nigori/nigori_sync_bridge_impl.cc
+++ b/components/sync/nigori/nigori_sync_bridge_impl.cc
@@ -221,39 +221,12 @@ bool IsValidEncryptedTypesTransition(bool old_encrypt_everything,
   return specifics.encrypt_everything() || !old_encrypt_everything;
 }
 
-// Packs explicit passphrase key in order to persist it. Returns empty string in
-// case of errors.
-std::string PackExplicitPassphraseKey(const CryptographerImpl& cryptographer) {
-  DCHECK(cryptographer.CanEncrypt());
-
-  // Explicit passphrase key should always be default one.
-  std::string serialized_key =
-      cryptographer.ExportDefaultKey().SerializeAsString();
-
-  if (serialized_key.empty()) {
-    DLOG(ERROR) << "Failed to serialize explicit passphrase key.";
-    return std::string();
-  }
-
-  std::string encrypted_key;
-  if (!OSCrypt::EncryptString(serialized_key, &encrypted_key)) {
-    DLOG(ERROR) << "Failed to encrypt explicit passphrase key.";
-    return std::string();
-  }
-
-  std::string encoded_key;
-  base::Base64Encode(encrypted_key, &encoded_key);
-  return encoded_key;
-}
-
 }  // namespace
 
 class NigoriSyncBridgeImpl::BroadcastingObserver
     : public SyncEncryptionHandler::Observer {
  public:
-  explicit BroadcastingObserver(
-      const base::RepeatingClosure& post_passphrase_accepted_cb)
-      : post_passphrase_accepted_cb_(post_passphrase_accepted_cb) {}
+  BroadcastingObserver() = default;
 
   BroadcastingObserver(const BroadcastingObserver&) = delete;
   BroadcastingObserver& operator=(const BroadcastingObserver&) = delete;
@@ -281,7 +254,6 @@ class NigoriSyncBridgeImpl::BroadcastingObserver
     for (auto& observer : observers_) {
       observer.OnPassphraseAccepted();
     }
-    post_passphrase_accepted_cb_.Run();
   }
 
   void OnTrustedVaultKeyRequired() override {
@@ -296,12 +268,6 @@ class NigoriSyncBridgeImpl::BroadcastingObserver
     }
   }
 
-  void OnBootstrapTokenUpdated(const std::string& bootstrap_token) override {
-    for (auto& observer : observers_) {
-      observer.OnBootstrapTokenUpdated(bootstrap_token);
-    }
-  }
-
   void OnEncryptedTypesChanged(ModelTypeSet encrypted_types,
                                bool encrypt_everything) override {
     for (auto& observer : observers_) {
@@ -328,8 +294,6 @@ class NigoriSyncBridgeImpl::BroadcastingObserver
   // SyncEncryptionHandlerImpl is no longer needed or consider refactoring old
   // implementation to use checked ObserverList as well.
   base::ObserverList<SyncEncryptionHandler::Observer>::Unchecked observers_;
-
-  const base::RepeatingClosure post_passphrase_accepted_cb_;
 };
 
 NigoriSyncBridgeImpl::NigoriSyncBridgeImpl(
@@ -337,12 +301,7 @@ NigoriSyncBridgeImpl::NigoriSyncBridgeImpl(
     std::unique_ptr<NigoriStorage> storage)
     : processor_(std::move(processor)),
       storage_(std::move(storage)),
-      broadcasting_observer_(std::make_unique<BroadcastingObserver>(
-          // base::Unretained() legit because the observer gets destroyed
-          // together with |this|.
-          base::BindRepeating(
-              &NigoriSyncBridgeImpl::MaybeNotifyBootstrapTokenUpdated,
-              base::Unretained(this)))) {
+      broadcasting_observer_(std::make_unique<BroadcastingObserver>()) {
   // TODO(crbug.com/922900): we currently don't verify |deserialized_data|.
   // It's quite unlikely we get a corrupted data, since it was successfully
   // deserialized and decrypted. But we may want to consider some
@@ -542,7 +501,6 @@ void NigoriSyncBridgeImpl::AddTrustedVaultDecryptionKeys(
   broadcasting_observer_->OnCryptographerStateChanged(
       state_.cryptographer.get(), state_.pending_keys.has_value());
   broadcasting_observer_->OnTrustedVaultKeyAccepted();
-  MaybeNotifyBootstrapTokenUpdated();
 }
 
 base::Time NigoriSyncBridgeImpl::GetKeystoreMigrationTime() {
@@ -935,11 +893,6 @@ NigoriSyncBridgeImpl::GetCustomPassphraseKeyDerivationParamsForTesting() const {
   return *state_.custom_passphrase_key_derivation_params;
 }
 
-std::string NigoriSyncBridgeImpl::PackExplicitPassphraseKeyForTesting(
-    const CryptographerImpl& cryptographer) {
-  return PackExplicitPassphraseKey(cryptographer);
-}
-
 base::Time NigoriSyncBridgeImpl::GetExplicitPassphraseTime() const {
   switch (state_.passphrase_type) {
     case NigoriSpecifics::IMPLICIT_PASSPHRASE:
@@ -994,28 +947,6 @@ void NigoriSyncBridgeImpl::MaybeNotifyOfPendingKeys() const {
   }
 }
 
-void NigoriSyncBridgeImpl::MaybeNotifyBootstrapTokenUpdated() const {
-  switch (state_.passphrase_type) {
-    case NigoriSpecifics::UNKNOWN:
-      NOTREACHED();
-      return;
-    case NigoriSpecifics::KEYSTORE_PASSPHRASE:
-    case NigoriSpecifics::TRUSTED_VAULT_PASSPHRASE:
-      return;
-    case NigoriSpecifics::IMPLICIT_PASSPHRASE:
-    case NigoriSpecifics::FROZEN_IMPLICIT_PASSPHRASE:
-    case NigoriSpecifics::CUSTOM_PASSPHRASE:
-      // |packed_custom_passphrase_key| will be empty in case serialization or
-      // encryption error occurs.
-      std::string packed_custom_passphrase_key =
-          PackExplicitPassphraseKey(*state_.cryptographer);
-      if (!packed_custom_passphrase_key.empty()) {
-        broadcasting_observer_->OnBootstrapTokenUpdated(
-            packed_custom_passphrase_key);
-      }
-  }
-}
-
 sync_pb::NigoriLocalData NigoriSyncBridgeImpl::SerializeAsNigoriLocalData()
     const {
   sync_pb::NigoriLocalData output;
diff --git a/components/sync/nigori/nigori_sync_bridge_impl.h b/components/sync/nigori/nigori_sync_bridge_impl.h
index b961af637a45fe..162ef1e9b026be 100644
--- a/components/sync/nigori/nigori_sync_bridge_impl.h
+++ b/components/sync/nigori/nigori_sync_bridge_impl.h
@@ -87,9 +87,6 @@ class NigoriSyncBridgeImpl : public KeystoreKeysHandler,
   bool HasPendingKeysForTesting() const;
   KeyDerivationParams GetCustomPassphraseKeyDerivationParamsForTesting() const;
 
-  static std::string PackExplicitPassphraseKeyForTesting(
-      const CryptographerImpl& cryptographer);
-
  private:
   absl::optional<ModelError> UpdateLocalState(
       const sync_pb::NigoriSpecifics& specifics);
@@ -132,11 +129,6 @@ class NigoriSyncBridgeImpl : public KeystoreKeysHandler,
   // the appropriate observer methods (if any).
   void MaybeNotifyOfPendingKeys() const;
 
-  // Persists Nigori derived from explicit passphrase into preferences, in case
-  // error occurs during serialization/encryption, corresponding preference
-  // just won't be updated.
-  void MaybeNotifyBootstrapTokenUpdated() const;
-
   // Queues keystore rotation or full keystore migration if current state
   // assumes it should happen.
   void MaybeTriggerKeystoreReencryption();
diff --git a/components/sync/nigori/nigori_sync_bridge_impl_unittest.cc b/components/sync/nigori/nigori_sync_bridge_impl_unittest.cc
index a4e2f1b97c5274..6b322bceecaf30 100644
--- a/components/sync/nigori/nigori_sync_bridge_impl_unittest.cc
+++ b/components/sync/nigori/nigori_sync_bridge_impl_unittest.cc
@@ -194,7 +194,6 @@ class MockObserver : public SyncEncryptionHandler::Observer {
   MOCK_METHOD(void, OnPassphraseAccepted, (), (override));
   MOCK_METHOD(void, OnTrustedVaultKeyRequired, (), (override));
   MOCK_METHOD(void, OnTrustedVaultKeyAccepted, (), (override));
-  MOCK_METHOD(void, OnBootstrapTokenUpdated, (const std::string&), (override));
   MOCK_METHOD(void, OnEncryptedTypesChanged, (ModelTypeSet, bool), (override));
   MOCK_METHOD(void,
               OnCryptographerStateChanged,
@@ -870,7 +869,6 @@ TEST_P(NigoriSyncBridgeImplTestWithOptionalScryptDerivation,
   EXPECT_CALL(*observer(), OnCryptographerStateChanged(
                                NotNull(), /*has_pending_keys=*/false));
   EXPECT_CALL(*observer(), OnPassphraseAccepted());
-  EXPECT_CALL(*observer(), OnBootstrapTokenUpdated(Ne(std::string())));
   bridge()->SetExplicitPassphraseDecryptionKey(
       MakeNigoriKey(passphrase_key_params));
 
@@ -921,7 +919,6 @@ TEST_F(NigoriSyncBridgeImplTest,
                                /*encrypted_types=*/EncryptableUserTypes(),
                                /*encrypt_everything=*/true));
   EXPECT_CALL(*observer(), OnPassphraseAccepted());
-  EXPECT_CALL(*observer(), OnBootstrapTokenUpdated(Ne(std::string())));
   EXPECT_THAT(bridge()->ApplySyncChanges(absl::nullopt), Eq(absl::nullopt));
   EXPECT_THAT(bridge()->GetData(), HasCustomPassphraseNigori());
 
@@ -986,7 +983,6 @@ TEST_F(NigoriSyncBridgeImplTest,
                                /*encrypted_types=*/EncryptableUserTypes(),
                                /*encrypt_everything=*/true));
   EXPECT_CALL(*observer(), OnPassphraseAccepted());
-  EXPECT_CALL(*observer(), OnBootstrapTokenUpdated(Ne(std::string())));
   EXPECT_THAT(bridge()->ApplySyncChanges(absl::nullopt), Eq(absl::nullopt));
   EXPECT_THAT(bridge()->GetData(), HasCustomPassphraseNigori());
 
@@ -1154,7 +1150,6 @@ TEST_F(NigoriSyncBridgeImplTest,
   EXPECT_CALL(*observer(), OnTrustedVaultKeyAccepted());
   EXPECT_CALL(*observer(), OnCryptographerStateChanged(
                                NotNull(), /*has_pending_keys=*/false));
-  EXPECT_CALL(*observer(), OnBootstrapTokenUpdated).Times(0);
   bridge()->AddTrustedVaultDecryptionKeys({kTrustedVaultKey});
   EXPECT_FALSE(bridge()->HasPendingKeysForTesting());
 }
@@ -1184,7 +1179,6 @@ TEST_F(NigoriSyncBridgeImplTest,
       BuildTrustedVaultNigoriSpecifics({kTrustedVaultKey});
 
   EXPECT_CALL(*observer(), OnEncryptedTypesChanged).Times(0);
-  EXPECT_CALL(*observer(), OnBootstrapTokenUpdated).Times(0);
   EXPECT_CALL(*observer(), OnCryptographerStateChanged(
                                NotNull(), /*has_pending_keys=*/true));
   EXPECT_CALL(*observer(),
@@ -1201,7 +1195,6 @@ TEST_F(NigoriSyncBridgeImplTest,
   EXPECT_CALL(*observer(), OnTrustedVaultKeyAccepted());
   EXPECT_CALL(*observer(), OnCryptographerStateChanged(
                                NotNull(), /*has_pending_keys=*/false));
-  EXPECT_CALL(*observer(), OnBootstrapTokenUpdated).Times(0);
   bridge()->AddTrustedVaultDecryptionKeys({kTrustedVaultKey});
   EXPECT_FALSE(bridge()->HasPendingKeysForTesting());
   EXPECT_TRUE(bridge()->GetTrustedVaultDebugInfo().has_migration_time());
@@ -1235,7 +1228,6 @@ TEST_F(NigoriSyncBridgeImplTest,
       BuildTrustedVaultNigoriSpecifics(
           {kTrustedVaultKey, kRotatedTrustedVaultKey});
   EXPECT_CALL(*observer(), OnEncryptedTypesChanged).Times(0);
-  EXPECT_CALL(*observer(), OnBootstrapTokenUpdated).Times(0);
   EXPECT_CALL(*observer(), OnPassphraseTypeChanged).Times(0);
   EXPECT_CALL(*observer(), OnCryptographerStateChanged(
                                NotNull(), /*has_pending_keys=*/true));
@@ -1290,7 +1282,6 @@ TEST_F(NigoriSyncBridgeImplTest,
                                /*encrypted_types=*/EncryptableUserTypes(),
                                /*encrypt_everything=*/true));
   EXPECT_CALL(*observer(), OnPassphraseAccepted());
-  EXPECT_CALL(*observer(), OnBootstrapTokenUpdated(Ne(std::string())));
   EXPECT_THAT(bridge()->ApplySyncChanges(absl::nullopt), Eq(absl::nullopt));
   EXPECT_THAT(bridge()->GetData(), HasCustomPassphraseNigori());
 }
@@ -1325,7 +1316,6 @@ TEST_F(NigoriSyncBridgeImplTest,
       /*keystore_key_params=*/kKeystoreKeyParams);
 
   EXPECT_CALL(*observer(), OnEncryptedTypesChanged).Times(0);
-  EXPECT_CALL(*observer(), OnBootstrapTokenUpdated).Times(0);
   EXPECT_CALL(*observer(), OnCryptographerStateChanged(
                                NotNull(), /*has_pending_keys=*/false));
   EXPECT_CALL(
@@ -1388,7 +1378,6 @@ TEST_F(NigoriSyncBridgeImplTest,
   EXPECT_CALL(*observer(), OnCryptographerStateChanged(
                                NotNull(), /*has_pending_keys=*/false));
   EXPECT_CALL(*observer(), OnPassphraseAccepted());
-  EXPECT_CALL(*observer(), OnBootstrapTokenUpdated(Ne(std::string())));
   bridge()->SetExplicitPassphraseDecryptionKey(
       MakeNigoriKey(kCustomPassphraseKeyParams));
 
diff --git a/components/sync/protocol/proto_enum_conversions.cc b/components/sync/protocol/proto_enum_conversions.cc
index acc1a1973a6cf8..71f77eec137489 100644
--- a/components/sync/protocol/proto_enum_conversions.cc
+++ b/components/sync/protocol/proto_enum_conversions.cc
@@ -303,7 +303,7 @@ const char* ProtoEnumToString(
     ENUM_CASE(sync_pb::SyncEnums, PASSPHRASE_TYPE_CHANGED);
     ENUM_CASE(sync_pb::SyncEnums, DEPRECATED_KEYSTORE_TOKEN_UPDATED);
     ENUM_CASE(sync_pb::SyncEnums, CONFIGURE_COMPLETE);
-    ENUM_CASE(sync_pb::SyncEnums, BOOTSTRAP_TOKEN_UPDATED);
+    ENUM_CASE(sync_pb::SyncEnums, DEPRECATED_BOOTSTRAP_TOKEN_UPDATED);
     ENUM_CASE(sync_pb::SyncEnums, TRUSTED_VAULT_KEY_REQUIRED);
     ENUM_CASE(sync_pb::SyncEnums, TRUSTED_VAULT_KEY_ACCEPTED);
   }
diff --git a/components/sync/protocol/sync_enums.proto b/components/sync/protocol/sync_enums.proto
index f4f965b5d12a3e..127ab735bb68a3 100644
--- a/components/sync/protocol/sync_enums.proto
+++ b/components/sync/protocol/sync_enums.proto
@@ -49,7 +49,7 @@ message SyncEnums {
     // configuration and is once again syncing with the server.
     CONFIGURE_COMPLETE = 12;
     // A new cryptographer bootstrap token was generated.
-    BOOTSTRAP_TOKEN_UPDATED = 13;
+    DEPRECATED_BOOTSTRAP_TOKEN_UPDATED = 13;
     // Cryptographer needs trusted vault decryption keys.
     TRUSTED_VAULT_KEY_REQUIRED = 14;
     // Cryptographer no longer needs trusted vault decryption keys.
diff --git a/components/variations/DEPS b/components/variations/DEPS
index aacb6bfa9f9be6..ebe4ffd97478f3 100644
--- a/components/variations/DEPS
+++ b/components/variations/DEPS
@@ -11,6 +11,7 @@ include_rules = [
   "+components/version_info",
   "+crypto",
   "-net",
+  "+net/android",
   "+third_party/protobuf",
   "+third_party/smhasher",
   "+third_party/zlib/google",
diff --git a/components/variations/android/BUILD.gn b/components/variations/android/BUILD.gn
index 1a45b0367082ef..c740c321c064f7 100644
--- a/components/variations/android/BUILD.gn
+++ b/components/variations/android/BUILD.gn
@@ -8,6 +8,7 @@ android_library("variations_java") {
   deps = [
     "//base:base_java",
     "//components/variations:variations_java",
+    "//net/android:net_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java b/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java
index 964283c1b2285d..d6f0a2555d9cb5 100644
--- a/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java
+++ b/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java
@@ -18,6 +18,8 @@
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.build.BuildConfig;
 import org.chromium.components.variations.VariationsSwitches;
+import org.chromium.net.ChromiumNetworkAdapter;
+import org.chromium.net.NetworkTrafficAnnotationTag;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -37,6 +39,29 @@
 public class VariationsSeedFetcher {
     private static final String TAG = "VariationsSeedFetch";
 
+    private static final NetworkTrafficAnnotationTag TRAFFIC_ANNOTATION =
+            NetworkTrafficAnnotationTag.createComplete("chrome_variations_android",
+                    "semantics {"
+                            + "  sender: 'Chrome Variations Service (Android)'"
+                            + "  description:"
+                            + "      'The variations service is responsible for determining the '"
+                            + "      'state of field trials in Chrome. These field trials '"
+                            + "      'typically configure either A/B experiments, or launched '"
+                            + "      'features – oftentimes, critical security features.'"
+                            + "  trigger: 'This request is made once, on Chrome\'s first run, to '"
+                            + "           'determine the initial state Chrome should be in.'"
+                            + "  data: 'None.'"
+                            + "  destination: GOOGLE_OWNED_SERVICE"
+                            + "}"
+                            + "policy {"
+                            + "  cookies_allowed: NO"
+                            + "  setting: 'Cannot be disabled in Settings. Chrome Variations are '"
+                            + "           'an essential part of Chrome releases.'"
+                            + "  policy_exception_justification:"
+                            + "      'The ChromeVariations policy is only implemented on desktop '"
+                            + "      'and ChromeOS.'"
+                            + "}");
+
     @IntDef({VariationsPlatform.ANDROID, VariationsPlatform.ANDROID_WEBVIEW})
     @Retention(RetentionPolicy.SOURCE)
     public @interface VariationsPlatform {
@@ -100,7 +125,7 @@ protected HttpURLConnection getServerConnection(
             throws MalformedURLException, IOException {
         String urlString = getConnectionString(platform, restrictMode, milestone, channel);
         URL url = new URL(urlString);
-        return (HttpURLConnection) url.openConnection();
+        return (HttpURLConnection) ChromiumNetworkAdapter.openConnection(url, TRAFFIC_ANNOTATION);
     }
 
     @VisibleForTesting
diff --git a/components/viz/host/gpu_host_impl.cc b/components/viz/host/gpu_host_impl.cc
index 8c27165ff61b69..c91136d564545d 100644
--- a/components/viz/host/gpu_host_impl.cc
+++ b/components/viz/host/gpu_host_impl.cc
@@ -108,7 +108,7 @@ GpuHostImpl::GpuHostImpl(Delegate* delegate,
   // Create a special GPU info collection service if the GPU process is used for
   // info collection only.
 #if defined(OS_WIN)
-  if (params.info_collection_gpu_process) {
+  if (params_.info_collection_gpu_process) {
     viz_main_->CreateInfoCollectionGpuService(
         info_collection_gpu_service_remote_.BindNewPipeAndPassReceiver());
     return;
diff --git a/components/viz/service/surfaces/referenced_surface_tracker.cc b/components/viz/service/surfaces/referenced_surface_tracker.cc
index e9498de7319e9e..b451cca8bcac6b 100644
--- a/components/viz/service/surfaces/referenced_surface_tracker.cc
+++ b/components/viz/service/surfaces/referenced_surface_tracker.cc
@@ -16,21 +16,29 @@ void GetSurfaceReferenceDifference(
     std::vector<SurfaceReference>* references_to_remove) {
   DCHECK(parent_surface_id.is_valid());
 
-  // Find SurfaceIds in |old_referenced_surfaces| that aren't referenced
-  // anymore.
-  for (const SurfaceId& surface_id : old_referenced_surfaces) {
-    if (new_referenced_surfaces.count(surface_id) == 0) {
-      references_to_remove->push_back(
-          SurfaceReference(parent_surface_id, surface_id));
-    }
-  }
+  auto old_it = old_referenced_surfaces.begin();
+  auto old_end = old_referenced_surfaces.end();
+  auto new_it = new_referenced_surfaces.begin();
+  auto new_end = new_referenced_surfaces.end();
 
-  // Find SurfaceIds in |new_referenced_surfaces| that aren't already
-  // referenced.
-  for (const SurfaceId& surface_id : new_referenced_surfaces) {
-    if (old_referenced_surfaces.count(surface_id) == 0) {
+  // Do a linear walk through both old and new references to compute added and
+  // removed entries.
+  while (old_it != old_end || new_it != new_end) {
+    if (old_it == old_end) {
+      references_to_add->push_back(
+          SurfaceReference(parent_surface_id, *new_it++));
+    } else if (new_it == new_end) {
+      references_to_remove->push_back(
+          SurfaceReference(parent_surface_id, *old_it++));
+    } else if (*old_it < *new_it) {
+      references_to_remove->push_back(
+          SurfaceReference(parent_surface_id, *old_it++));
+    } else if (*new_it < *old_it) {
       references_to_add->push_back(
-          SurfaceReference(parent_surface_id, surface_id));
+          SurfaceReference(parent_surface_id, *new_it++));
+    } else {
+      ++new_it;
+      ++old_it;
     }
   }
 }
diff --git a/components/viz/service/surfaces/surface.cc b/components/viz/service/surfaces/surface.cc
index 96437239ca012f..547e500baeefd1 100644
--- a/components/viz/service/surfaces/surface.cc
+++ b/components/viz/service/surfaces/surface.cc
@@ -151,60 +151,14 @@ void Surface::UpdateSurfaceReferences() {
 void Surface::OnChildActivatedForActiveFrame(const SurfaceId& activated_id) {
   DCHECK(HasActiveFrame());
 
-  for (size_t i = 0;
-       i < active_frame_data_->frame.metadata.referenced_surfaces.size(); i++) {
-    const SurfaceRange& surface_range =
-        active_frame_data_->frame.metadata.referenced_surfaces[i];
-    if (!surface_range.IsInRangeInclusive(activated_id))
-      continue;
-
-    const SurfaceId& last_id = last_surface_id_for_range_[i];
-    // If we already have a reference to a surface in the primary's allocation
-    // group, we should already be unregistered from the allocation group of the
-    // fallback so we shouldn't receive SurfaceIds from that group.
-    // TODO(crbug.com/1264657): This DCHECK is failing frequently on Chrome OS
-    // for valid use cases where there are multiple references in
-    // |referenced_surfaces| that contain |activated_id|. Temporary disable to
-    // avoid flake while investigating solutions.
-    // DCHECK(!surface_range.HasDifferentEmbedTokens() || !last_id.is_valid() ||
-    //       !last_id.HasSameEmbedTokenAs(surface_range.end()) ||
-    //       activated_id.HasSameEmbedTokenAs(last_id));
-
-    // Remove the old reference.
-    if (last_id.is_valid()) {
-      auto old_it = active_referenced_surfaces_.find(last_id);
-      if (old_it != active_referenced_surfaces_.end())
-        active_referenced_surfaces_.erase(old_it);
-      surface_manager_->RemoveSurfaceReferences(
-          {SurfaceReference(surface_info_.id(), last_id)});
-    }
-
-    // Add a new reference.
-    active_referenced_surfaces_.insert(activated_id);
-    surface_manager_->AddSurfaceReferences(
-        {SurfaceReference(surface_info_.id(), activated_id)});
-
-    // If we were referencing a surface in the allocation group of the
-    // fallback, but now there is a surface available in the allocation group
-    // of the primary, unregister this surface from the allocation group of
-    // the fallback.
-    if (activated_id.HasSameEmbedTokenAs(surface_range.end()) &&
-        surface_range.HasDifferentEmbedTokens() &&
-        (!last_id.is_valid() || !last_id.HasSameEmbedTokenAs(activated_id))) {
-      DCHECK(surface_range.start());
-      DCHECK(!last_id.is_valid() ||
-             last_id.HasSameEmbedTokenAs(*surface_range.start()));
-      SurfaceAllocationGroup* group =
-          surface_manager_->GetAllocationGroupForSurfaceId(
-              *surface_range.start());
-      if (group && referenced_allocation_groups_.count(group)) {
-        group->UnregisterActiveEmbedder(this);
-        referenced_allocation_groups_.erase(group);
-      }
+  for (auto& surface_range : GetActiveFrame().metadata.referenced_surfaces) {
+    if (surface_range.IsInRangeInclusive(activated_id)) {
+      // If |activated_id| is included in any of the surface reference then
+      // recompute the active surface references. This must handle the case
+      // where a SurfaceId is included in multiple surface ranges.
+      RecomputeActiveReferencedSurfaces();
+      return;
     }
-
-    // Update the referenced surface for this range.
-    last_surface_id_for_range_[i] = activated_id;
   }
 }
 
diff --git a/components/viz/service/surfaces/surface_unittest.cc b/components/viz/service/surfaces/surface_unittest.cc
index 91a237fd9452af..09acc0fefe2533 100644
--- a/components/viz/service/surfaces/surface_unittest.cc
+++ b/components/viz/service/surfaces/surface_unittest.cc
@@ -19,6 +19,8 @@
 #include "components/viz/test/compositor_frame_helpers.h"
 #include "components/viz/test/fake_external_begin_frame_source.h"
 #include "components/viz/test/mock_compositor_frame_sink_client.h"
+#include "components/viz/test/test_surface_id_allocator.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -28,17 +30,25 @@ namespace {
 constexpr FrameSinkId kArbitraryFrameSinkId(1, 1);
 constexpr bool kIsRoot = true;
 
-TEST(SurfaceTest, PresentationCallback) {
+class SurfaceTest : public testing::Test {
+ public:
+  SurfaceTest()
+      : frame_sink_manager_(
+            FrameSinkManagerImpl::InitParams(&shared_bitmap_manager_)) {}
+
+ protected:
+  ServerSharedBitmapManager shared_bitmap_manager_;
+  FrameSinkManagerImpl frame_sink_manager_;
+};
+
+TEST_F(SurfaceTest, PresentationCallback) {
   constexpr gfx::Size kSurfaceSize(300, 300);
   constexpr gfx::Rect kDamageRect(0, 0);
   const LocalSurfaceId local_surface_id(6, base::UnguessableToken::Create());
 
-  ServerSharedBitmapManager shared_bitmap_manager;
-  FrameSinkManagerImpl frame_sink_manager{
-      FrameSinkManagerImpl::InitParams(&shared_bitmap_manager)};
   MockCompositorFrameSinkClient client;
   auto support = std::make_unique<CompositorFrameSinkSupport>(
-      &client, &frame_sink_manager, kArbitraryFrameSinkId, kIsRoot);
+      &client, &frame_sink_manager_, kArbitraryFrameSinkId, kIsRoot);
   uint32_t frame_token = 0;
   {
     CompositorFrame frame =
@@ -67,7 +77,7 @@ TEST(SurfaceTest, PresentationCallback) {
   }
 }
 
-TEST(SurfaceTest, SurfaceIds) {
+TEST_F(SurfaceTest, SurfaceIds) {
   for (size_t i = 0; i < 3; ++i) {
     ParentLocalSurfaceIdAllocator allocator;
     allocator.GenerateId();
@@ -87,13 +97,10 @@ void TestCopyResultCallback(bool* called,
 
 // Test that CopyOutputRequests can outlive the current frame and be
 // aggregated on the next frame.
-TEST(SurfaceTest, CopyRequestLifetime) {
-  ServerSharedBitmapManager shared_bitmap_manager;
-  FrameSinkManagerImpl frame_sink_manager{
-      FrameSinkManagerImpl::InitParams(&shared_bitmap_manager)};
-  SurfaceManager* surface_manager = frame_sink_manager.surface_manager();
+TEST_F(SurfaceTest, CopyRequestLifetime) {
+  SurfaceManager* surface_manager = frame_sink_manager_.surface_manager();
   auto support = std::make_unique<CompositorFrameSinkSupport>(
-      nullptr, &frame_sink_manager, kArbitraryFrameSinkId, kIsRoot);
+      nullptr, &frame_sink_manager_, kArbitraryFrameSinkId, kIsRoot);
 
   LocalSurfaceId local_surface_id(6, base::UnguessableToken::Create());
   SurfaceId surface_id(kArbitraryFrameSinkId, local_surface_id);
@@ -150,5 +157,103 @@ TEST(SurfaceTest, CopyRequestLifetime) {
   EXPECT_TRUE(copy_called);
 }
 
+// Verify activate referenced surfaces is correct when there are two surface
+// references to overlapping surface ranges. In particular the two surface
+// ranges are (S1, S1) and (S1, S2). When both S1 and S2 activate active
+// referenced surfaces should include both S1 and S2. See
+// https://crbug.com/1275605 for more context.
+TEST_F(SurfaceTest, ActiveSurfaceReferencesWithOverlappingReferences) {
+  constexpr gfx::Rect output_rect(100, 100);
+  SurfaceManager* surface_manager = frame_sink_manager_.surface_manager();
+
+  auto root_support = std::make_unique<CompositorFrameSinkSupport>(
+      nullptr, &frame_sink_manager_, kArbitraryFrameSinkId,
+      /*is_root=*/true);
+  TestSurfaceIdAllocator root_surface_id(kArbitraryFrameSinkId);
+
+  auto child_support1 = std::make_unique<CompositorFrameSinkSupport>(
+      nullptr, &frame_sink_manager_, FrameSinkId(2, 1), /*is_root=*/false);
+  TestSurfaceIdAllocator child_surface_id1(child_support1->frame_sink_id());
+
+  auto child_support2 = std::make_unique<CompositorFrameSinkSupport>(
+      nullptr, &frame_sink_manager_, FrameSinkId(3, 1), /*is_root=*/false);
+  TestSurfaceIdAllocator child_surface_id2(child_support2->frame_sink_id());
+
+  // Submit a root frame with two SurfaceDrawQuads. The first SurfaceDrawQuad
+  // embeds |child_support1|. The second SurfaceDrawQuad embeds |child_support2|
+  // but has |child_support1| as a fallback which mimics a navigating renderer.
+  // Note that |old_surface_range| and |navigation_surface_range| overlap.
+  SurfaceRange old_surface_range(child_surface_id1, child_surface_id1);
+  SurfaceRange navigation_surface_range(child_surface_id1, child_surface_id2);
+  auto root_render_pass =
+      RenderPassBuilder(CompositorRenderPassId{1}, output_rect)
+          .AddSurfaceQuad(output_rect, old_surface_range)
+          .AddSurfaceQuad(output_rect, navigation_surface_range)
+          .Build();
+
+  {
+    CompositorFrame frame = MakeCompositorFrame(root_render_pass->DeepCopy());
+    EXPECT_THAT(
+        frame.metadata.referenced_surfaces,
+        testing::ElementsAre(old_surface_range, navigation_surface_range));
+
+    root_support->SubmitCompositorFrame(root_surface_id.local_surface_id(),
+                                        std::move(frame));
+  }
+
+  Surface* root_surface = surface_manager->GetSurfaceForId(root_surface_id);
+  ASSERT_TRUE(root_surface);
+
+  // No active references yet because no child surfaces have been submitted yet.
+  EXPECT_THAT(root_surface->active_referenced_surfaces(), testing::IsEmpty());
+
+  // Submit something to the second child surface and verify it's now included
+  // in active referenced surfaces.
+  child_support2->SubmitCompositorFrame(child_surface_id2.local_surface_id(),
+                                        MakeDefaultCompositorFrame());
+  EXPECT_TRUE(surface_manager->GetSurfaceForId(child_surface_id2));
+  EXPECT_THAT(root_surface->active_referenced_surfaces(),
+              testing::ElementsAre(child_surface_id2));
+
+  // Submit something to the first child surface and verify both are in active
+  // surface references. Note this order of activation is "backwards" as
+  // normally the |child_surface_id1| would have activated first if the browser
+  // is navigating away from it but if the first renderer is slow to produce
+  // content the order can be reversed.
+  child_support1->SubmitCompositorFrame(child_surface_id1.local_surface_id(),
+                                        MakeDefaultCompositorFrame());
+  EXPECT_TRUE(surface_manager->GetSurfaceForId(child_surface_id1));
+  EXPECT_THAT(root_surface->active_referenced_surfaces(),
+              testing::ElementsAre(child_surface_id1, child_surface_id2));
+
+  // Resubmit root frame with the same SurfaceDrawQuads and verify active
+  // surface references are unchanged.
+  root_support->SubmitCompositorFrame(
+      root_surface_id.local_surface_id(),
+      MakeCompositorFrame(std::move(root_render_pass)));
+  EXPECT_THAT(root_surface->active_referenced_surfaces(),
+              testing::ElementsAre(child_surface_id1, child_surface_id2));
+
+  // Submit a new root frame without the reference to the first child surface
+  // and verify |child_surface_id1| is no longer part of active referenced
+  // surfaces.
+  {
+    SurfaceRange post_navigation_surface_range(child_surface_id2,
+                                               child_surface_id2);
+    CompositorFrame frame =
+        CompositorFrameBuilder()
+            .AddRenderPass(
+                RenderPassBuilder(CompositorRenderPassId{1}, output_rect)
+                    .AddSurfaceQuad(output_rect, post_navigation_surface_range))
+            .Build();
+
+    root_support->SubmitCompositorFrame(root_surface_id.local_surface_id(),
+                                        std::move(frame));
+  }
+
+  EXPECT_THAT(root_surface->active_referenced_surfaces(),
+              testing::ElementsAre(child_surface_id2));
+}
+
 }  // namespace
 }  // namespace viz
diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
index 5b849f96bc59c4..a1a2ea05844419 100644
--- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
+++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
@@ -526,6 +526,11 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
   RunHtmlTest(FILE_PATH_LITERAL("combobox-optgroup.html"));
 }
 
+IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
+                       AccessibilitySlotDisplayContents) {
+  RunHtmlTest(FILE_PATH_LITERAL("slot-display-contents.html"));
+}
+
 IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest,
                        AccessibilitySvgStyleElement) {
   RunHtmlTest(FILE_PATH_LITERAL("svg-style-element.html"));
diff --git a/content/browser/android/date_time_chooser_android.cc b/content/browser/android/date_time_chooser_android.cc
index dcf1f2c51bc1b8..4e927211dcba4c 100644
--- a/content/browser/android/date_time_chooser_android.cc
+++ b/content/browser/android/date_time_chooser_android.cc
@@ -48,6 +48,7 @@ DateTimeChooserAndroid::DateTimeChooserAndroid(WebContents* web_contents)
       date_time_chooser_receiver_(this) {}
 
 DateTimeChooserAndroid::~DateTimeChooserAndroid() {
+  DismissAndDestroyJavaObject();
 }
 
 void DateTimeChooserAndroid::OnDateTimeChooserReceiver(
@@ -99,6 +100,18 @@ void DateTimeChooserAndroid::OpenDateTimeDialog(
     std::move(open_date_time_response_callback_).Run(true, value->dialog_value);
 }
 
+void DateTimeChooserAndroid::CloseDateTimeDialog() {
+  DismissAndDestroyJavaObject();
+}
+
+void DateTimeChooserAndroid::DismissAndDestroyJavaObject() {
+  if (j_date_time_chooser_) {
+    JNIEnv* env = AttachCurrentThread();
+    Java_DateTimeChooserAndroid_dismissAndDestroy(env, j_date_time_chooser_);
+    j_date_time_chooser_.Reset();
+  }
+}
+
 void DateTimeChooserAndroid::ReplaceDateTime(JNIEnv* env,
                                              const JavaRef<jobject>&,
                                              jdouble value) {
diff --git a/content/browser/android/date_time_chooser_android.h b/content/browser/android/date_time_chooser_android.h
index 92a2ada866524d..b8bec02c10af2a 100644
--- a/content/browser/android/date_time_chooser_android.h
+++ b/content/browser/android/date_time_chooser_android.h
@@ -35,6 +35,8 @@ class DateTimeChooserAndroid
   void OpenDateTimeDialog(blink::mojom::DateTimeDialogValuePtr value,
                           OpenDateTimeDialogCallback callback) override;
 
+  void CloseDateTimeDialog() override;
+
   // Replaces the current value.
   void ReplaceDateTime(JNIEnv* env,
                        const base::android::JavaRef<jobject>&,
@@ -44,6 +46,8 @@ class DateTimeChooserAndroid
   void CancelDialog(JNIEnv* env, const base::android::JavaRef<jobject>&);
 
  private:
+  void DismissAndDestroyJavaObject();
+
   friend class content::WebContentsUserData<DateTimeChooserAndroid>;
 
   OpenDateTimeDialogCallback open_date_time_response_callback_;
diff --git a/content/browser/fenced_frame/fenced_frame_unittest.cc b/content/browser/fenced_frame/fenced_frame_unittest.cc
new file mode 100644
index 00000000000000..303a5f0ebbbe07
--- /dev/null
+++ b/content/browser/fenced_frame/fenced_frame_unittest.cc
@@ -0,0 +1,46 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/test/scoped_feature_list.h"
+#include "content/public/test/navigation_simulator.h"
+#include "content/test/test_render_frame_host.h"
+#include "content/test/test_render_view_host.h"
+
+namespace content {
+
+class FencedFrameTest : public RenderViewHostImplTestHarness {
+ public:
+  FencedFrameTest() {
+    scoped_feature_list_.InitAndEnableFeatureWithParameters(
+        blink::features::kFencedFrames, {{"implementation_type", "mparch"}});
+  }
+  ~FencedFrameTest() override = default;
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
+};
+
+TEST_F(FencedFrameTest, FencedFrameSanityTest) {
+  NavigateAndCommit(GURL("https://google.com"));
+  RenderFrameHostImpl* fenced_frame_root = main_test_rfh()->AppendFencedFrame();
+  EXPECT_TRUE(fenced_frame_root->IsFencedFrameRoot());
+  EXPECT_FALSE(fenced_frame_root->GetPage().IsPrimary());
+  EXPECT_EQ(fenced_frame_root->GetParentOrOuterDocument(), main_rfh());
+  EXPECT_TRUE(fenced_frame_root->GetRenderWidgetHost()
+                  ->GetView()
+                  ->IsRenderWidgetHostViewChildFrame());
+
+  // Navigate fenced frame.
+  GURL fenced_frame_url = GURL("https://fencedframe.com");
+  std::unique_ptr<NavigationSimulator> navigation_simulator =
+      NavigationSimulator::CreateForFencedFrame(fenced_frame_url,
+                                                fenced_frame_root);
+  navigation_simulator->Commit();
+  fenced_frame_root = static_cast<RenderFrameHostImpl*>(
+      navigation_simulator->GetFinalRenderFrameHost());
+  EXPECT_TRUE(fenced_frame_root->IsFencedFrameRoot());
+  EXPECT_EQ(fenced_frame_root->GetLastCommittedURL(), fenced_frame_url);
+}
+
+}  // namespace content
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index 9111a8a54cc0f7..5db6c333be1e43 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -1639,6 +1639,22 @@ NavigationRequest::NavigationRequest(
     }
   }
 #endif
+
+  static constexpr base::Feature kNavigationRequestPreconnect{
+      "NavigationRequestPreconnect", base::FEATURE_DISABLED_BY_DEFAULT};
+  if (base::FeatureList::IsEnabled(kNavigationRequestPreconnect) &&
+      NeedsUrlLoader() && common_params_->url.SchemeIsHTTPOrHTTPS()) {
+    BrowserContext* browser_context =
+        frame_tree_node_->navigator().controller().GetBrowserContext();
+    if (GetContentClient()->browser()->ShouldPreconnectNavigation(
+            browser_context)) {
+      auto* storage_partition =
+          frame_tree_node_->current_frame_host()->GetStoragePartition();
+      storage_partition->GetNetworkContext()->PreconnectSockets(
+          1, common_params_->url, true,
+          GetIsolationInfo().network_isolation_key());
+    }
+  }
 }
 
 NavigationRequest::~NavigationRequest() {
diff --git a/content/browser/renderer_host/render_widget_host_input_event_router_unittest.cc b/content/browser/renderer_host/render_widget_host_input_event_router_unittest.cc
index b99f81a49a3f55..477e911270ce8d 100644
--- a/content/browser/renderer_host/render_widget_host_input_event_router_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_input_event_router_unittest.cc
@@ -81,45 +81,6 @@ class MockFrameConnector : public CrossProcessFrameConnector {
   raw_ptr<RenderWidgetHostViewBase> root_view_;
 };
 
-// Used as a target for the RenderWidgetHostInputEventRouter. We record what
-// events were forwarded to us in order to verify that the events are being
-// routed correctly.
-class TestRenderWidgetHostViewChildFrame
-    : public RenderWidgetHostViewChildFrame {
- public:
-  explicit TestRenderWidgetHostViewChildFrame(RenderWidgetHost* widget)
-      : RenderWidgetHostViewChildFrame(widget, display::ScreenInfos()) {
-    Init();
-  }
-  ~TestRenderWidgetHostViewChildFrame() override = default;
-
-  void ProcessGestureEvent(const blink::WebGestureEvent& event,
-                           const ui::LatencyInfo&) override {
-    last_gesture_seen_ = event.GetType();
-  }
-
-  void ProcessAckedTouchEvent(
-      const TouchEventWithLatencyInfo& touch,
-      blink::mojom::InputEventResultState ack_result) override {
-    unique_id_for_last_touch_ack_ = touch.event.unique_touch_event_id;
-  }
-
-  blink::WebInputEvent::Type last_gesture_seen() { return last_gesture_seen_; }
-  uint32_t last_id_for_touch_ack() { return unique_id_for_last_touch_ack_; }
-
-  void Reset() { last_gesture_seen_ = blink::WebInputEvent::Type::kUndefined; }
-
-  void SetCompositor(ui::Compositor* compositor) { compositor_ = compositor; }
-  ui::Compositor* GetCompositor() override { return compositor_; }
-
- private:
-  blink::WebInputEvent::Type last_gesture_seen_ =
-      blink::WebInputEvent::Type::kUndefined;
-  uint32_t unique_id_for_last_touch_ack_ = 0;
-
-  raw_ptr<ui::Compositor> compositor_;
-};
-
 class StubHitTestQuery : public viz::HitTestQuery {
  public:
   StubHitTestQuery(RenderWidgetHostViewBase* hittest_result,
diff --git a/content/browser/renderer_host/render_widget_host_view_child_frame.h b/content/browser/renderer_host/render_widget_host_view_child_frame.h
index e563196178eec4..ee75c29c04408e 100644
--- a/content/browser/renderer_host/render_widget_host_view_child_frame.h
+++ b/content/browser/renderer_host/render_widget_host_view_child_frame.h
@@ -112,7 +112,7 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
   void SendInitialPropertiesIfNeeded() override;
   void SetIsLoading(bool is_loading) override;
   void RenderProcessGone() override;
-  void ShowWithVisibility(PageVisibilityState page_visibility) final;
+  void ShowWithVisibility(PageVisibilityState page_visibility) override;
   void Destroy() override;
   void UpdateTooltipUnderCursor(const std::u16string& tooltip_text) override;
   void UpdateTooltipFromKeyboard(const std::u16string& tooltip_text,
diff --git a/content/browser/webrtc/resources/peer_connection_update_table.js b/content/browser/webrtc/resources/peer_connection_update_table.js
index efafbe90c68421..292825d6be3993 100644
--- a/content/browser/webrtc/resources/peer_connection_update_table.js
+++ b/content/browser/webrtc/resources/peer_connection_update_table.js
@@ -5,6 +5,7 @@
 import {$} from 'chrome://resources/js/util.m.js';
 
 const MAX_NUMBER_OF_STATE_CHANGES_DISPLAYED = 10;
+const MAX_NUMBER_OF_EXPANDED_MEDIASECTIONS = 10;
 /**
  * The data of a peer connection update.
  * @param {number} pid The id of the renderer.
@@ -165,13 +166,21 @@ export class PeerConnectionUpdateTable {
         ' (type: "' + type + '", ' + sections.length + ' sections)';
       sections.forEach(section => {
         const lines = section.trim().split('\n');
+        // Extract the mid attribute.
+        const mid = lines
+            .filter(line => line.startsWith('a=mid:'))
+            .map(line => line.substr(6))[0];
         const sectionDetails = document.createElement('details');
-        sectionDetails.open = true;
+        // Fold by default for large SDP.
+        sectionDetails.open =
+          sections.length <= MAX_NUMBER_OF_EXPANDED_MEDIASECTIONS;
         sectionDetails.textContent = lines.slice(1).join('\n');
 
         const sectionSummary = document.createElement('summary');
         sectionSummary.textContent =
-          lines[0].trim() + ' (' + (lines.length - 1) + ' more lines)';
+          lines[0].trim() +
+          ' (' + (lines.length - 1) + ' more lines)' +
+          (mid ? ' mid=' + mid : '');
         sectionDetails.appendChild(sectionSummary);
 
         valueContainer.appendChild(sectionDetails);
diff --git a/content/common/media/cdm_info.cc b/content/common/media/cdm_info.cc
index 59f46495b989e8..4f2c0a520f61b6 100644
--- a/content/common/media/cdm_info.cc
+++ b/content/common/media/cdm_info.cc
@@ -26,7 +26,7 @@ CdmInfo::CdmInfo(const std::string& key_system,
       version(version),
       path(path),
       file_system_id(file_system_id) {
-  DCHECK(!capability || !capability->encryption_schemes.empty());
+  DCHECK(!this->capability || !this->capability->encryption_schemes.empty());
 }
 
 CdmInfo::CdmInfo(const std::string& key_system,
@@ -37,7 +37,7 @@ CdmInfo::CdmInfo(const std::string& key_system,
       robustness(robustness),
       capability(std::move(capability)),
       type(type) {
-  DCHECK(!capability || !capability->encryption_schemes.empty());
+  DCHECK(!this->capability || !this->capability->encryption_schemes.empty());
 }
 
 CdmInfo::CdmInfo(const CdmInfo& other) = default;
diff --git a/content/public/android/java/src/org/chromium/content/browser/UiThreadTaskTraitsImpl.java b/content/public/android/java/src/org/chromium/content/browser/UiThreadTaskTraitsImpl.java
index a86be0e3da797a..d4422a025e2d91 100644
--- a/content/public/android/java/src/org/chromium/content/browser/UiThreadTaskTraitsImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/UiThreadTaskTraitsImpl.java
@@ -60,7 +60,10 @@ public byte[] toSerializedData(UiThreadTaskTraitsImpl extension) {
     // queues. While in the former case the priority of individual bootstrap tasks is ignored, in
     // the latter case it is used. It is thus important that these tasks have USER_BLOCKING priority
     // so that they are ordered correctly with C++ tasks of type kBootstrap in this latter case.
-    public static final TaskTraits BOOTSTRAP = TaskTraits.USER_BLOCKING.withExtension(
+    // UPDATE: We have reverted Java bootstrap task traits back to having USER_VISIBLE priority
+    // to determine whether changing them to have USER_BLOCKING priority caused a performance
+    // regression.
+    public static final TaskTraits BOOTSTRAP = TaskTraits.USER_VISIBLE.withExtension(
             DESCRIPTOR, new UiThreadTaskTraitsImpl().setTaskType(BrowserTaskType.BOOTSTRAP));
     public static final TaskTraits BEST_EFFORT = DEFAULT.taskPriority(TaskPriority.BEST_EFFORT);
     public static final TaskTraits USER_VISIBLE = DEFAULT.taskPriority(TaskPriority.USER_VISIBLE);
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java b/content/public/android/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java
index ac7841de86785f..79f05cc570971f 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java
@@ -19,24 +19,27 @@
  */
 @JNINamespace("content")
 class DateTimeChooserAndroid {
-
-    private final long mNativeDateTimeChooserAndroid;
+    private long mNativeDateTimeChooserAndroid;
     private final InputDialogContainer mInputDialogContainer;
 
-    private DateTimeChooserAndroid(Context context,
-            long nativeDateTimeChooserAndroid) {
+    private DateTimeChooserAndroid(Context context, long nativeDateTimeChooserAndroid) {
         mNativeDateTimeChooserAndroid = nativeDateTimeChooserAndroid;
-        mInputDialogContainer = new InputDialogContainer(context,
-                new InputDialogContainer.InputActionDelegate() {
-
+        mInputDialogContainer =
+                new InputDialogContainer(context, new InputDialogContainer.InputActionDelegate() {
                     @Override
                     public void replaceDateTime(double value) {
+                        if (mNativeDateTimeChooserAndroid == 0) {
+                            return;
+                        }
                         DateTimeChooserAndroidJni.get().replaceDateTime(
                                 mNativeDateTimeChooserAndroid, DateTimeChooserAndroid.this, value);
                     }
 
                     @Override
                     public void cancelDateTimeDialog() {
+                        if (mNativeDateTimeChooserAndroid == 0) {
+                            return;
+                        }
                         DateTimeChooserAndroidJni.get().cancelDialog(
                                 mNativeDateTimeChooserAndroid, DateTimeChooserAndroid.this);
                     }
@@ -49,6 +52,12 @@ private void showDialog(int dialogType, double dialogValue,
         mInputDialogContainer.showDialog(dialogType, dialogValue, min, max, step, suggestions);
     }
 
+    @CalledByNative
+    private void dismissAndDestroy() {
+        mNativeDateTimeChooserAndroid = 0;
+        mInputDialogContainer.dismissDialog();
+    }
+
     @CalledByNative
     private static DateTimeChooserAndroid createDateTimeChooser(
             WindowAndroid windowAndroid,
diff --git a/content/public/android/java/src/org/chromium/content/browser/picker/InputDialogContainer.java b/content/public/android/java/src/org/chromium/content/browser/picker/InputDialogContainer.java
index 480f8af5554467..d6af665de3b9a1 100644
--- a/content/public/android/java/src/org/chromium/content/browser/picker/InputDialogContainer.java
+++ b/content/public/android/java/src/org/chromium/content/browser/picker/InputDialogContainer.java
@@ -274,7 +274,7 @@ private boolean isDialogShowing() {
         return mDialog != null && mDialog.isShowing();
     }
 
-    private void dismissDialog() {
+    public void dismissDialog() {
         if (isDialogShowing()) mDialog.dismiss();
     }
 
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index eacca789441715..f26ff2199c9f72 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -1300,4 +1300,10 @@ bool ContentBrowserClient::ShouldDisableOriginAgentClusterDefault(
     BrowserContext* browser_context) {
   return false;
 }
+
+bool ContentBrowserClient::ShouldPreconnectNavigation(
+    BrowserContext* browser_context) {
+  return false;
+}
+
 }  // namespace content
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 3a57b6408a2ac3..d50c7e0c618b82 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -2184,6 +2184,9 @@ class CONTENT_EXPORT ContentBrowserClient {
   // blink::features::kOriginAgentClusterDefaultEnabled instead.
   virtual bool ShouldDisableOriginAgentClusterDefault(
       BrowserContext* browser_context);
+
+  // Whether a navigation in |browser_context| should preconnect early.
+  virtual bool ShouldPreconnectNavigation(BrowserContext* browser_context);
 };
 
 }  // namespace content
diff --git a/content/public/test/navigation_simulator.h b/content/public/test/navigation_simulator.h
index 6ed671b6199e66..1e1056888e142b 100644
--- a/content/public/test/navigation_simulator.h
+++ b/content/public/test/navigation_simulator.h
@@ -141,7 +141,14 @@ class NavigationSimulator {
   static std::unique_ptr<NavigationSimulator> CreateFromPending(
       NavigationController& controller);
 
-  virtual ~NavigationSimulator() {}
+  // Creates a NavigationSimulator that will be used to simulate a
+  // renderer-initiated navigation of a fenced frame root (|render_frame_host|)
+  // to |original_url|.
+  static std::unique_ptr<NavigationSimulator> CreateForFencedFrame(
+      const GURL& original_url,
+      RenderFrameHost* fenced_frame_root);
+
+  virtual ~NavigationSimulator() = default;
 
   // --------------------------------------------------------------------------
 
diff --git a/content/public/test/test_renderer_host.h b/content/public/test/test_renderer_host.h
index 1d17380f5b70b6..e8eabe3ae1c96a 100644
--- a/content/public/test/test_renderer_host.h
+++ b/content/public/test/test_renderer_host.h
@@ -135,6 +135,9 @@ class RenderFrameHostTester {
 
   // Simulates the receipt of a manifest URL.
   virtual void SimulateManifestURLUpdate(const GURL& manifest_url) = 0;
+
+  // Creates and appends a fenced frame.
+  virtual RenderFrameHost* AppendFencedFrame() = 0;
 };
 
 // An interface and utility for driving tests of RenderViewHost.
diff --git a/content/renderer/v8_value_converter_impl.cc b/content/renderer/v8_value_converter_impl.cc
index 8b361b1975c013..8236f4785d66f4 100644
--- a/content/renderer/v8_value_converter_impl.cc
+++ b/content/renderer/v8_value_converter_impl.cc
@@ -341,7 +341,8 @@ v8::Local<v8::Value> V8ValueConverterImpl::ToArrayBuffer(
     v8::Isolate* isolate,
     v8::Local<v8::Object> creation_context,
     const base::Value* value) const {
-  DCHECK(creation_context->CreationContext() == isolate->GetCurrentContext());
+  DCHECK(creation_context->GetCreationContextChecked() ==
+         isolate->GetCurrentContext());
   v8::Local<v8::ArrayBuffer> buffer =
       v8::ArrayBuffer::New(isolate, value->GetBlob().size());
   memcpy(buffer->GetBackingStore()->Data(), value->GetBlob().data(),
@@ -449,9 +450,10 @@ std::unique_ptr<base::Value> V8ValueConverterImpl::FromV8Array(
   std::unique_ptr<v8::Context::Scope> scope;
   // If val was created in a different context than our current one, change to
   // that context, but change back after val is converted.
-  if (!val->CreationContext().IsEmpty() &&
-      val->CreationContext() != isolate->GetCurrentContext())
-    scope = std::make_unique<v8::Context::Scope>(val->CreationContext());
+  v8::Local<v8::Context> creation_context;
+  if (val->GetCreationContext().ToLocal(&creation_context) &&
+      creation_context != isolate->GetCurrentContext())
+    scope = std::make_unique<v8::Context::Scope>(creation_context);
 
   if (strategy_) {
     std::unique_ptr<base::Value> out;
@@ -528,9 +530,10 @@ std::unique_ptr<base::Value> V8ValueConverterImpl::FromV8Object(
   std::unique_ptr<v8::Context::Scope> scope;
   // If val was created in a different context than our current one, change to
   // that context, but change back after val is converted.
-  if (!val->CreationContext().IsEmpty() &&
-      val->CreationContext() != isolate->GetCurrentContext())
-    scope = std::make_unique<v8::Context::Scope>(val->CreationContext());
+  v8::Local<v8::Context> creation_context;
+  if (val->GetCreationContext().ToLocal(&creation_context) &&
+      creation_context != isolate->GetCurrentContext())
+    scope = std::make_unique<v8::Context::Scope>(creation_context);
 
   if (strategy_) {
     std::unique_ptr<base::Value> out;
diff --git a/content/services/shared_storage_worklet/shared_storage.cc b/content/services/shared_storage_worklet/shared_storage.cc
index c57769bc1d0223..cbee729ca433cd 100644
--- a/content/services/shared_storage_worklet/shared_storage.cc
+++ b/content/services/shared_storage_worklet/shared_storage.cc
@@ -247,7 +247,7 @@ void SharedStorage::OnVoidOperationFinished(
     const std::string& error_message) {
   WorkletV8Helper::HandleScope scope(isolate);
   v8::Local<v8::Promise::Resolver> resolver = global_resolver.Get(isolate);
-  v8::Local<v8::Context> context = resolver->CreationContext();
+  v8::Local<v8::Context> context = resolver->GetCreationContextChecked();
 
   if (success) {
     resolver->Resolve(context, v8::Undefined(isolate)).ToChecked();
@@ -266,7 +266,7 @@ void SharedStorage::OnStringRetrievalOperationFinished(
     const std::string& result) {
   WorkletV8Helper::HandleScope scope(isolate);
   v8::Local<v8::Promise::Resolver> resolver = global_resolver.Get(isolate);
-  v8::Local<v8::Context> context = resolver->CreationContext();
+  v8::Local<v8::Context> context = resolver->GetCreationContextChecked();
 
   if (success) {
     resolver->Resolve(context, gin::StringToV8(isolate, result)).ToChecked();
@@ -285,7 +285,7 @@ void SharedStorage::OnLengthOperationFinished(
     uint32_t length) {
   WorkletV8Helper::HandleScope scope(isolate);
   v8::Local<v8::Promise::Resolver> resolver = global_resolver.Get(isolate);
-  v8::Local<v8::Context> context = resolver->CreationContext();
+  v8::Local<v8::Context> context = resolver->GetCreationContextChecked();
 
   if (success) {
     resolver->Resolve(context, gin::Converter<uint32_t>::ToV8(isolate, length))
diff --git a/content/services/shared_storage_worklet/shared_storage_iterator.cc b/content/services/shared_storage_worklet/shared_storage_iterator.cc
index 803f8289661eb9..7abf65ec32f131 100644
--- a/content/services/shared_storage_worklet/shared_storage_iterator.cc
+++ b/content/services/shared_storage_worklet/shared_storage_iterator.cc
@@ -64,7 +64,7 @@ v8::Local<v8::Promise> SharedStorageIterator::Next(gin::Arguments* args) {
 v8::Local<v8::Promise> SharedStorageIterator::NextHelper(
     v8::Isolate* isolate,
     v8::Local<v8::Promise::Resolver> resolver) {
-  v8::Local<v8::Context> context = resolver->CreationContext();
+  v8::Local<v8::Context> context = resolver->GetCreationContextChecked();
   v8::Local<v8::Promise> promise = resolver->GetPromise();
 
   if (has_error_) {
@@ -132,7 +132,7 @@ void SharedStorageIterator::DidReadEntries(
         global_resolver.Get(isolate);
     global_resolver.Reset();
 
-    v8::Local<v8::Context> context = next_resolver->CreationContext();
+    v8::Local<v8::Context> context = next_resolver->GetCreationContextChecked();
     v8::Context::Scope context_scope(context);
 
     NextHelper(isolate, next_resolver);
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index aa15d5aec01f3e..be410d78e9e408 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -1988,6 +1988,7 @@ test("content_unittests") {
     "../browser/dom_storage/dom_storage_context_wrapper_unittest.cc",
     "../browser/download/download_manager_impl_unittest.cc",
     "../browser/download/save_package_unittest.cc",
+    "../browser/fenced_frame/fenced_frame_unittest.cc",
     "../browser/fenced_frame/fenced_frame_url_mapping_unittest.cc",
     "../browser/file_system/browser_file_system_helper_unittest.cc",
     "../browser/file_system/file_system_operation_runner_unittest.cc",
diff --git a/content/test/data/accessibility/html/slot-display-contents-expected-auralinux.txt b/content/test/data/accessibility/html/slot-display-contents-expected-auralinux.txt
new file mode 100644
index 00000000000000..4d264490e176ac
--- /dev/null
+++ b/content/test/data/accessibility/html/slot-display-contents-expected-auralinux.txt
@@ -0,0 +1,3 @@
+[document web] tag:#document
+++[section] tag:div
+++++[push button] name='Test' tag:button
diff --git a/content/test/data/accessibility/html/slot-display-contents-expected-blink.txt b/content/test/data/accessibility/html/slot-display-contents-expected-blink.txt
new file mode 100644
index 00000000000000..15817c5996f6bb
--- /dev/null
+++ b/content/test/data/accessibility/html/slot-display-contents-expected-blink.txt
@@ -0,0 +1,8 @@
+rootWebArea htmlTag='#document'
+++genericContainer ignored htmlTag='html'
+++++genericContainer ignored htmlTag='body'
+++++++genericContainer htmlTag='div'
+++++++++genericContainer ignored htmlTag='slot'
+++++++++++button htmlTag='button' name='Test'
+++++++++++++staticText name='Test'
+++++++++++++++inlineTextBox name='Test'
diff --git a/content/test/data/accessibility/html/slot-display-contents.html b/content/test/data/accessibility/html/slot-display-contents.html
new file mode 100644
index 00000000000000..18f2a624badd44
--- /dev/null
+++ b/content/test/data/accessibility/html/slot-display-contents.html
@@ -0,0 +1,17 @@
+<!--
+@AURALINUX-ALLOW:tag:*
+@BLINK-ALLOW:htmlTag*
+-->
+<!DOCTYPE html>
+<html>
+<body>
+<div>
+  <template shadowroot="open">
+    <div style="display: contents">
+      <slot></slot>
+    </div>
+  </template>
+  <button>Test</button>
+</div>
+</body>
+</html>
diff --git a/content/test/navigation_simulator_impl.cc b/content/test/navigation_simulator_impl.cc
index d76e154b9f6683..6257e29df0e5b3 100644
--- a/content/test/navigation_simulator_impl.cc
+++ b/content/test/navigation_simulator_impl.cc
@@ -322,6 +322,20 @@ NavigationSimulatorImpl::CreateFromPendingInFrame(
   return simulator;
 }
 
+// static
+std::unique_ptr<NavigationSimulator> NavigationSimulator::CreateForFencedFrame(
+    const GURL& original_url,
+    RenderFrameHost* fenced_frame_root) {
+  DCHECK(fenced_frame_root->IsFencedFrameRoot());
+  std::unique_ptr<NavigationSimulatorImpl> simulator =
+      NavigationSimulatorImpl::CreateRendererInitiated(original_url,
+                                                       fenced_frame_root);
+  simulator->set_supports_loading_mode_header("fenced-frame");
+  simulator->SetTransition(ui::PAGE_TRANSITION_AUTO_SUBFRAME);
+  simulator->set_should_replace_current_entry(true);
+  return simulator;
+}
+
 NavigationSimulatorImpl::NavigationSimulatorImpl(
     const GURL& original_url,
     bool browser_initiated,
@@ -571,6 +585,9 @@ void NavigationSimulatorImpl::ReadyToCommit() {
   }
 
   response_headers_->SetHeader("Content-Type", contents_mime_type_);
+  if (!supports_loading_mode_header_.empty())
+    response_headers_->SetHeader("Supports-Loading-Mode",
+                                 supports_loading_mode_header_);
   PrepareCompleteCallbackOnRequest();
   request_->set_ready_to_commit_callback_for_testing(
       base::BindOnce(&NavigationSimulatorImpl::ReadyToCommitComplete,
diff --git a/content/test/navigation_simulator_impl.h b/content/test/navigation_simulator_impl.h
index d856f55a2f2a27..46d6b43c392ad8 100644
--- a/content/test/navigation_simulator_impl.h
+++ b/content/test/navigation_simulator_impl.h
@@ -221,6 +221,10 @@ class NavigationSimulatorImpl : public NavigationSimulator,
         has_potentially_trustworthy_unique_origin;
   }
 
+  void set_supports_loading_mode_header(std::string value) {
+    supports_loading_mode_header_ = value;
+  }
+
  private:
   NavigationSimulatorImpl(const GURL& original_url,
                           bool browser_initiated,
@@ -414,6 +418,8 @@ class NavigationSimulatorImpl : public NavigationSimulator,
 
   bool early_hints_preload_link_header_received_ = false;
 
+  std::string supports_loading_mode_header_;
+
   absl::optional<bool> was_prerendered_page_activation_;
 
   // These are used to sanity check the content/public/ API calls emitted as
diff --git a/content/test/test_render_frame_host.cc b/content/test/test_render_frame_host.cc
index 3c48bfda8f45ae..e49b1d5821c143 100644
--- a/content/test/test_render_frame_host.cc
+++ b/content/test/test_render_frame_host.cc
@@ -10,6 +10,7 @@
 
 #include "base/guid.h"
 #include "base/run_loop.h"
+#include "content/browser/fenced_frame/fenced_frame.h"
 #include "content/browser/renderer_host/frame_tree.h"
 #include "content/browser/renderer_host/navigation_request.h"
 #include "content/browser/renderer_host/navigator.h"
@@ -240,6 +241,13 @@ void TestRenderFrameHost::SimulateManifestURLUpdate(const GURL& manifest_url) {
   GetPage().UpdateManifestUrl(manifest_url);
 }
 
+TestRenderFrameHost* TestRenderFrameHost::AppendFencedFrame() {
+  fenced_frames_.push_back(
+      std::make_unique<FencedFrame>(weak_ptr_factory_.GetSafeRef()));
+  return static_cast<TestRenderFrameHost*>(
+      fenced_frames_.back().get()->GetInnerRoot());
+}
+
 void TestRenderFrameHost::SendNavigate(int nav_entry_id,
                                        bool did_create_new_entry,
                                        const GURL& url) {
diff --git a/content/test/test_render_frame_host.h b/content/test/test_render_frame_host.h
index 154c432870ba95..d86768d3be04f5 100644
--- a/content/test/test_render_frame_host.h
+++ b/content/test/test_render_frame_host.h
@@ -102,6 +102,7 @@ class TestRenderFrameHost : public RenderFrameHostImpl,
   const std::vector<std::string>& GetConsoleMessages() override;
   int GetHeavyAdIssueCount(HeavyAdIssueType type) override;
   void SimulateManifestURLUpdate(const GURL& manifest_url) override;
+  TestRenderFrameHost* AppendFencedFrame() override;
 
   void SendNavigate(int nav_entry_id,
                     bool did_create_new_entry,
diff --git a/content/test/test_render_view_host.cc b/content/test/test_render_view_host.cc
index fda9f84240b726..0b12d1ffc692bc 100644
--- a/content/test/test_render_view_host.cc
+++ b/content/test/test_render_view_host.cc
@@ -288,6 +288,31 @@ ui::Compositor* TestRenderWidgetHostView::GetCompositor() {
   return compositor_;
 }
 
+TestRenderWidgetHostViewChildFrame::TestRenderWidgetHostViewChildFrame(
+    RenderWidgetHost* rwh)
+    : RenderWidgetHostViewChildFrame(rwh, display::ScreenInfos()) {
+  Init();
+}
+
+void TestRenderWidgetHostViewChildFrame::Reset() {
+  last_gesture_seen_ = blink::WebInputEvent::Type::kUndefined;
+}
+
+void TestRenderWidgetHostViewChildFrame::SetCompositor(
+    ui::Compositor* compositor) {
+  compositor_ = compositor;
+}
+
+ui::Compositor* TestRenderWidgetHostViewChildFrame::GetCompositor() {
+  return compositor_;
+}
+
+void TestRenderWidgetHostViewChildFrame::ProcessGestureEvent(
+    const blink::WebGestureEvent& event,
+    const ui::LatencyInfo&) {
+  last_gesture_seen_ = event.GetType();
+}
+
 TestRenderViewHost::TestRenderViewHost(
     FrameTree* frame_tree,
     SiteInstance* instance,
@@ -305,10 +330,16 @@ TestRenderViewHost::TestRenderViewHost(
                          swapped_out,
                          false /* has_initialized_audio_host */),
       delete_counter_(nullptr) {
-  // TestRenderWidgetHostView installs itself into this->view_ in its
-  // constructor, and deletes itself when TestRenderWidgetHostView::Destroy() is
-  // called.
-  new TestRenderWidgetHostView(GetWidget());
+  if (frame_tree->type() == FrameTree::Type::kFencedFrame) {
+    // TestRenderWidgetHostViewChildFrame deletes itself in
+    // RenderWidgetHostViewChildFrame::Destroy.
+    new TestRenderWidgetHostViewChildFrame(GetWidget());
+  } else {
+    // TestRenderWidgetHostView installs itself into this->view_ in
+    // its constructor, and deletes itself when
+    // TestRenderWidgetHostView::Destroy() is called.
+    new TestRenderWidgetHostView(GetWidget());
+  }
 }
 
 TestRenderViewHost::~TestRenderViewHost() {
diff --git a/content/test/test_render_view_host.h b/content/test/test_render_view_host.h
index 4d42bb85dcac41..a35ab16cfefa51 100644
--- a/content/test/test_render_view_host.h
+++ b/content/test/test_render_view_host.h
@@ -18,6 +18,7 @@
 #include "components/viz/host/host_frame_sink_client.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
+#include "content/browser/renderer_host/render_widget_host_view_child_frame.h"
 #include "content/public/common/page_visibility_state.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_renderer_host.h"
@@ -171,6 +172,38 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase,
   raw_ptr<ui::Compositor> compositor_ = nullptr;
 };
 
+// TestRenderWidgetHostViewChildFrame -----------------------------------------
+
+// Test version of RenderWidgetHostViewChildFrame to use in unit tests.
+class TestRenderWidgetHostViewChildFrame
+    : public RenderWidgetHostViewChildFrame {
+ public:
+  explicit TestRenderWidgetHostViewChildFrame(RenderWidgetHost* rwh);
+  ~TestRenderWidgetHostViewChildFrame() override = default;
+
+  blink::WebInputEvent::Type last_gesture_seen() { return last_gesture_seen_; }
+
+  void Reset();
+  void SetCompositor(ui::Compositor* compositor);
+  ui::Compositor* GetCompositor() override;
+
+ private:
+  void SetBounds(const gfx::Rect& rect) override {}
+  void Hide() override {}
+  void SetInsets(const gfx::Insets& insets) override {}
+
+  void SendInitialPropertiesIfNeeded() override {}
+  void ShowWithVisibility(PageVisibilityState) override {}
+  void DidNavigate() override {}
+
+  void ProcessGestureEvent(const blink::WebGestureEvent& event,
+                           const ui::LatencyInfo&) override;
+
+  blink::WebInputEvent::Type last_gesture_seen_ =
+      blink::WebInputEvent::Type::kUndefined;
+  raw_ptr<ui::Compositor> compositor_;
+};
+
 // TestRenderViewHost ----------------------------------------------------------
 
 // TODO(brettw) this should use a TestWebContents which should be generalized
@@ -206,9 +239,8 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase,
 // similar to (b) above, essentially it gets very tricky.  By using
 // the split interface we avoid complexity within content and maintain
 // reasonable utility for embedders.
-class TestRenderViewHost
-    : public RenderViewHostImpl,
-      public RenderViewHostTester {
+class TestRenderViewHost : public RenderViewHostImpl,
+                           public RenderViewHostTester {
  public:
   TestRenderViewHost(FrameTree* frame_tree,
                      SiteInstance* instance,
diff --git a/content/web_test/renderer/gc_controller.cc b/content/web_test/renderer/gc_controller.cc
index 811a85df59afba..a343bbf01c42f1 100644
--- a/content/web_test/renderer/gc_controller.cc
+++ b/content/web_test/renderer/gc_controller.cc
@@ -96,7 +96,7 @@ void GCController::AsyncCollectAllWithEmptyStack(
 
   v8::HandleScope scope(isolate);
   v8::Local<v8::Function> func = callback.Get(isolate);
-  v8::Local<v8::Context> context = func->CreationContext();
+  v8::Local<v8::Context> context = func->GetCreationContextChecked();
   v8::Context::Scope context_scope(context);
   v8::TryCatch try_catch(isolate);
   v8::MicrotasksScope microtasks_scope(
diff --git a/device/bluetooth/bluetooth_classic_device_mac.mm b/device/bluetooth/bluetooth_classic_device_mac.mm
index 3794ce8d808fe6..210802eec42080 100644
--- a/device/bluetooth/bluetooth_classic_device_mac.mm
+++ b/device/bluetooth/bluetooth_classic_device_mac.mm
@@ -31,20 +31,8 @@ @interface IOBluetoothHostController (UndocumentedAPI)
 
 const char kApiUnavailable[] = "This API is not implemented on this platform.";
 
-// Returns the first (should be, only) UUID contained within the
-// |service_class_data|. Returns an invalid (empty) UUID if none is found.
-BluetoothUUID ExtractUuid(IOBluetoothSDPDataElement* service_class_data) {
-  NSArray* inner_elements = [service_class_data getArrayValue];
-  IOBluetoothSDPUUID* sdp_uuid = nil;
-  for (IOBluetoothSDPDataElement* inner_element in inner_elements) {
-    if ([inner_element getTypeDescriptor] == kBluetoothSDPDataElementTypeUUID) {
-      sdp_uuid = [[inner_element getUUIDValue] getUUIDWithLength:16];
-      break;
-    }
-  }
-
-  if (!sdp_uuid)
-    return BluetoothUUID();
+BluetoothUUID GetUuid(IOBluetoothSDPUUID* sdp_uuid) {
+  DCHECK(sdp_uuid);
 
   const uint8_t* uuid_bytes =
       reinterpret_cast<const uint8_t*>([sdp_uuid bytes]);
@@ -54,9 +42,23 @@ BluetoothUUID ExtractUuid(IOBluetoothSDPDataElement* service_class_data) {
   uuid_str.insert(13, "-");
   uuid_str.insert(18, "-");
   uuid_str.insert(23, "-");
+
   return BluetoothUUID(uuid_str);
 }
 
+// Returns the first (should be, only) UUID contained within the
+// |service_class_data|. Returns an invalid (empty) UUID if none is found.
+BluetoothUUID ExtractUuid(IOBluetoothSDPDataElement* service_class_data) {
+  NSArray* inner_elements = [service_class_data getArrayValue];
+  for (IOBluetoothSDPDataElement* inner_element in inner_elements) {
+    if ([inner_element getTypeDescriptor] == kBluetoothSDPDataElementTypeUUID) {
+      return GetUuid([[inner_element getUUIDValue] getUUIDWithLength:16]);
+    }
+  }
+
+  return BluetoothUUID();
+}
+
 }  // namespace
 
 BluetoothClassicDeviceMac::BluetoothClassicDeviceMac(
@@ -146,8 +148,15 @@ BluetoothUUID ExtractUuid(IOBluetoothSDPDataElement* service_class_data) {
     IOBluetoothSDPDataElement* service_class_data =
         [service_record getAttributeDataElement:
                             kBluetoothSDPAttributeIdentifierServiceClassIDList];
-    if ([service_class_data getTypeDescriptor] ==
-        kBluetoothSDPDataElementTypeDataElementSequence) {
+    auto type_descriptor = [service_class_data getTypeDescriptor];
+    if (type_descriptor == kBluetoothSDPDataElementTypeUUID) {
+      IOBluetoothSDPUUID* sdp_uuid =
+          [[service_class_data getUUIDValue] getUUIDWithLength:16];
+      BluetoothUUID uuid = GetUuid(sdp_uuid);
+      if (uuid.IsValid())
+        uuids.insert(uuid);
+    } else if (type_descriptor ==
+               kBluetoothSDPDataElementTypeDataElementSequence) {
       BluetoothUUID uuid = ExtractUuid(service_class_data);
       if (uuid.IsValid())
         uuids.insert(uuid);
diff --git a/device/bluetooth/chromeos/bluetooth_utils.cc b/device/bluetooth/chromeos/bluetooth_utils.cc
index a1f5cc31f63ac9..c9e90073eb124e 100644
--- a/device/bluetooth/chromeos/bluetooth_utils.cc
+++ b/device/bluetooth/chromeos/bluetooth_utils.cc
@@ -98,63 +98,10 @@ BluetoothAdapter::DeviceList FilterUnknownDevices(
 
   BluetoothAdapter::DeviceList result;
   for (BluetoothDevice* device : devices) {
-    // Always filter out laptops, etc. There is no intended use case or
-    // Bluetooth profile in this context.
-    if (device->GetDeviceType() == BluetoothDeviceType::COMPUTER) {
+    if (device::IsUnsupportedDevice(device))
       continue;
-    }
 
-    // Always filter out phones. There is no intended use case or Bluetooth
-    // profile in this context.
-    if (base::FeatureList::IsEnabled(
-            chromeos::features::kBluetoothPhoneFilter) &&
-        device->GetDeviceType() == BluetoothDeviceType::PHONE) {
-      continue;
-    }
-
-    // Allow paired devices which are not filtered above to appear in the UI.
-    if (device->IsPaired()) {
-      result.push_back(device);
-      continue;
-    }
-
-    switch (device->GetType()) {
-      // Device with invalid bluetooth transport is filtered out.
-      case BLUETOOTH_TRANSPORT_INVALID:
-        break;
-      // For LE devices, check the service UUID to determine if it supports HID
-      // or second factor authenticator (security key).
-      case BLUETOOTH_TRANSPORT_LE:
-        if (base::Contains(device->GetUUIDs(),
-                           device::BluetoothUUID(kHIDServiceUUID)) ||
-            base::Contains(device->GetUUIDs(),
-                           device::BluetoothUUID(kSecurityKeyServiceUUID))) {
-          result.push_back(device);
-        }
-        break;
-      // For classic mode devices, only filter out if the name is empty because
-      // the device could have an unknown or even known type and still also
-      // provide audio/HID functionality.
-      case BLUETOOTH_TRANSPORT_CLASSIC:
-        if (device->GetName())
-          result.push_back(device);
-        break;
-      // For dual mode devices, a device::BluetoothDevice object without a name
-      // and type/appearance most likely signals that it is truly only a LE
-      // advertisement for a peripheral which is active, but not pairable. Many
-      // popular headphones behave in this exact way. Filter them out until they
-      // provide a type/appearance; this means they've become pairable. See
-      // https://crbug.com/1656971 for more.
-      case BLUETOOTH_TRANSPORT_DUAL:
-        if (device->GetName()) {
-          if (device->GetDeviceType() == BluetoothDeviceType::UNKNOWN) {
-            continue;
-          }
-
-          result.push_back(device);
-        }
-        break;
-    }
+    result.push_back(device);
   }
   return result;
 }
@@ -224,6 +171,72 @@ device::BluetoothAdapter::DeviceList FilterBluetoothDeviceList(
   return GetLimitedNumDevices(max_devices, filtered_devices);
 }
 
+bool IsUnsupportedDevice(const device::BluetoothDevice* device) {
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+  if (chromeos::switches::IsUnfilteredBluetoothDevicesEnabled())
+    return false;
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+
+#if BUILDFLAG(IS_CHROMEOS_LACROS)
+  if (chromeos::LacrosService::Get()
+          ->init_params()
+          ->is_unfiltered_bluetooth_device_enabled) {
+    return false;
+  }
+#endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
+
+  // Always filter out laptops, etc. There is no intended use case or
+  // Bluetooth profile in this context.
+  if (device->GetDeviceType() == BluetoothDeviceType::COMPUTER)
+    return true;
+
+  // Always filter out phones. There is no intended use case or Bluetooth
+  // profile in this context.
+  if (base::FeatureList::IsEnabled(chromeos::features::kBluetoothPhoneFilter) &&
+      device->GetDeviceType() == BluetoothDeviceType::PHONE) {
+    return true;
+  }
+
+  // Allow paired devices which are not filtered above to appear in the UI.
+  if (device->IsPaired())
+    return false;
+
+  switch (device->GetType()) {
+    // Device with invalid bluetooth transport is filtered out.
+    case BLUETOOTH_TRANSPORT_INVALID:
+      break;
+    // For LE devices, check the service UUID to determine if it supports HID
+    // or second factor authenticator (security key).
+    case BLUETOOTH_TRANSPORT_LE:
+      if (base::Contains(device->GetUUIDs(),
+                         device::BluetoothUUID(kHIDServiceUUID)) ||
+          base::Contains(device->GetUUIDs(),
+                         device::BluetoothUUID(kSecurityKeyServiceUUID))) {
+        return false;
+      }
+      break;
+    // For classic mode devices, only filter out if the name is empty because
+    // the device could have an unknown or even known type and still also
+    // provide audio/HID functionality.
+    case BLUETOOTH_TRANSPORT_CLASSIC:
+      if (device->GetName())
+        return false;
+      break;
+    // For dual mode devices, a device::BluetoothDevice object without a name
+    // and type/appearance most likely signals that it is truly only a LE
+    // advertisement for a peripheral which is active, but not pairable. Many
+    // popular headphones behave in this exact way. Filter them out until they
+    // provide a type/appearance; this means they've become pairable. See
+    // https://crbug.com/1656971 for more.
+    case BLUETOOTH_TRANSPORT_DUAL:
+      if (device->GetName())
+        return device->GetDeviceType() == BluetoothDeviceType::UNKNOWN;
+      break;
+  }
+
+  return true;
+}
+
 void RecordPairingResult(absl::optional<ConnectionFailureReason> failure_reason,
                          BluetoothTransport transport,
                          base::TimeDelta duration) {
diff --git a/device/bluetooth/chromeos/bluetooth_utils.h b/device/bluetooth/chromeos/bluetooth_utils.h
index d86c33e4ec20e4..4ae192a2fb905f 100644
--- a/device/bluetooth/chromeos/bluetooth_utils.h
+++ b/device/bluetooth/chromeos/bluetooth_utils.h
@@ -6,6 +6,7 @@
 #define DEVICE_BLUETOOTH_CHROMEOS_BLUETOOTH_UTILS_H_
 
 #include "device/bluetooth/bluetooth_adapter.h"
+#include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_export.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
@@ -93,6 +94,11 @@ FilterBluetoothDeviceList(const BluetoothAdapter::DeviceList& devices,
                           BluetoothFilterType filter_type,
                           int max_devices);
 
+// Returns |true| if the device is unsupported and should not be known by the
+// UI.
+DEVICE_BLUETOOTH_EXPORT bool IsUnsupportedDevice(
+    const device::BluetoothDevice* device);
+
 // Record outcome of user attempting to pair to a device.
 DEVICE_BLUETOOTH_EXPORT void RecordPairingResult(
     absl::optional<ConnectionFailureReason> failure_reason,
diff --git a/extensions/browser/api/web_request/web_request_info.cc b/extensions/browser/api/web_request/web_request_info.cc
index 542e23cf9cb680..c96658b145ca47 100644
--- a/extensions/browser/api/web_request/web_request_info.cc
+++ b/extensions/browser/api/web_request/web_request_info.cc
@@ -181,7 +181,7 @@ WebRequestInfoInitParams::WebRequestInfoInitParams(
       ukm_source_id(ukm_source_id) {
   web_request_type = ToWebRequestResourceType(request, is_download);
 
-  DCHECK_EQ(is_navigation_request, navigation_id.has_value());
+  DCHECK_EQ(is_navigation_request, this->navigation_id.has_value());
 
   InitializeWebViewAndFrameData(navigation_ui_data.get());
 
diff --git a/extensions/renderer/bindings/api_binding.cc b/extensions/renderer/bindings/api_binding.cc
index 39015817f35582..348531eacee5c1 100644
--- a/extensions/renderer/bindings/api_binding.cc
+++ b/extensions/renderer/bindings/api_binding.cc
@@ -524,8 +524,9 @@ void APIBinding::GetEventObject(
     const v8::PropertyCallbackInfo<v8::Value>& info) {
   v8::Isolate* isolate = info.GetIsolate();
   v8::HandleScope handle_scope(isolate);
-  v8::Local<v8::Context> context = info.Holder()->CreationContext();
-  if (!binding::IsContextValidOrThrowError(context))
+  v8::Local<v8::Context> context;
+  if (!info.Holder()->GetCreationContext().ToLocal(&context) ||
+      !binding::IsContextValidOrThrowError(context))
     return;
 
   CHECK(info.Data()->IsExternal());
@@ -556,8 +557,9 @@ void APIBinding::GetCustomPropertyObject(
     const v8::PropertyCallbackInfo<v8::Value>& info) {
   v8::Isolate* isolate = info.GetIsolate();
   v8::HandleScope handle_scope(isolate);
-  v8::Local<v8::Context> context = info.Holder()->CreationContext();
-  if (!binding::IsContextValid(context))
+  v8::Local<v8::Context> context;
+  if (!info.Holder()->GetCreationContext().ToLocal(&context) ||
+      !binding::IsContextValid(context))
     return;
 
   v8::Context::Scope context_scope(context);
diff --git a/extensions/renderer/bindings/api_last_error.cc b/extensions/renderer/bindings/api_last_error.cc
index 8acaa6f07d85bf..8e4b001c63660a 100644
--- a/extensions/renderer/bindings/api_last_error.cc
+++ b/extensions/renderer/bindings/api_last_error.cc
@@ -63,7 +63,7 @@ void LastErrorGetter(v8::Local<v8::Name> property,
   v8::Isolate* isolate = info.GetIsolate();
   v8::HandleScope handle_scope(isolate);
   v8::Local<v8::Object> holder = info.Holder();
-  v8::Local<v8::Context> context = holder->CreationContext();
+  v8::Local<v8::Context> context = holder->GetCreationContextChecked();
 
   v8::Local<v8::Value> last_error;
   v8::Local<v8::Private> last_error_key = v8::Private::ForApi(
@@ -103,7 +103,7 @@ void LastErrorSetter(v8::Local<v8::Name> property,
   v8::Isolate* isolate = info.GetIsolate();
   v8::HandleScope handle_scope(isolate);
   v8::Local<v8::Object> holder = info.Holder();
-  v8::Local<v8::Context> context = holder->CreationContext();
+  v8::Local<v8::Context> context = holder->GetCreationContextChecked();
 
   v8::Local<v8::Private> script_value_key = v8::Private::ForApi(
       isolate, gin::StringToSymbol(isolate, kScriptSuppliedValueKey));
diff --git a/extensions/renderer/bindings/argument_spec_unittest.cc b/extensions/renderer/bindings/argument_spec_unittest.cc
index 0956835bf06bb2..15eeb339eca0d5 100644
--- a/extensions/renderer/bindings/argument_spec_unittest.cc
+++ b/extensions/renderer/bindings/argument_spec_unittest.cc
@@ -895,7 +895,8 @@ TEST_F(ArgumentSpecUnitTest, V8Conversion) {
                   base::BindOnce([](v8::Local<v8::Value> value) {
                     ASSERT_TRUE(value->IsObject());
                     v8::Local<v8::Object> object = value.As<v8::Object>();
-                    v8::Local<v8::Context> context = object->CreationContext();
+                    v8::Local<v8::Context> context =
+                        object->GetCreationContextChecked();
                     gin::Dictionary dict(context->GetIsolate(), object);
                     std::string result;
                     ASSERT_TRUE(dict.Get("str", &result));
@@ -933,7 +934,7 @@ TEST_F(ArgumentSpecUnitTest, V8Conversion) {
     ExpectSuccess(*spec, "({})", base::BindOnce([](v8::Local<v8::Value> value) {
       ASSERT_TRUE(value->IsObject());
       v8::Local<v8::Object> object = value.As<v8::Object>();
-      v8::Local<v8::Context> context = object->CreationContext();
+      v8::Local<v8::Context> context = object->GetCreationContextChecked();
       // We expect a null prototype to ensure we avoid tricky getters/setters on
       // the Object prototype.
       EXPECT_TRUE(object->GetPrototype()->IsNull());
@@ -959,7 +960,7 @@ TEST_F(ArgumentSpecUnitTest, V8Conversion) {
         base::BindOnce([](v8::Local<v8::Value> value) {
           ASSERT_TRUE(value->IsObject());
           v8::Local<v8::Object> object = value.As<v8::Object>();
-          v8::Local<v8::Context> context = object->CreationContext();
+          v8::Local<v8::Context> context = object->GetCreationContextChecked();
           v8::Local<v8::Value> prop =
               object
                   ->Get(context, gin::StringToV8(context->GetIsolate(), "prop"))
diff --git a/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc b/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc
index 2fc5ee83acfadc..eba223aa241990 100644
--- a/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc
+++ b/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc
@@ -49,10 +49,11 @@ namespace extensions {
 namespace {
 
 content::RenderFrame* GetRenderFrame(v8::Local<v8::Value> value) {
-  v8::Local<v8::Context> context =
-      v8::Local<v8::Object>::Cast(value)->CreationContext();
-  if (context.IsEmpty())
-    return nullptr;
+  v8::Local<v8::Context> context;
+  if (!v8::Local<v8::Object>::Cast(value)->GetCreationContext().ToLocal(
+          &context))
+    if (context.IsEmpty())
+      return nullptr;
   blink::WebLocalFrame* frame = blink::WebLocalFrame::FrameForContext(context);
   if (!frame)
     return nullptr;
diff --git a/extensions/renderer/module_system.cc b/extensions/renderer/module_system.cc
index 5e0aa6b9a6d434..28f70a17258cc3 100644
--- a/extensions/renderer/module_system.cc
+++ b/extensions/renderer/module_system.cc
@@ -400,7 +400,7 @@ void ModuleSystem::LazyFieldGetterInner(
   v8::HandleScope handle_scope(isolate);
   v8::Local<v8::Object> parameters = v8::Local<v8::Object>::Cast(info.Data());
   // This context should be the same as context()->v8_context().
-  v8::Local<v8::Context> context = parameters->CreationContext();
+  v8::Local<v8::Context> context = parameters->GetCreationContextChecked();
   v8::Local<v8::Object> global(context->Global());
   v8::Local<v8::Value> module_system_value;
   if (!GetPrivate(context, global, kModuleSystem, &module_system_value) ||
diff --git a/extensions/renderer/native_extension_bindings_system.cc b/extensions/renderer/native_extension_bindings_system.cc
index 153eda329ada50..469360fdfefa28 100644
--- a/extensions/renderer/native_extension_bindings_system.cc
+++ b/extensions/renderer/native_extension_bindings_system.cc
@@ -145,7 +145,7 @@ v8::Local<v8::Object> GetOrCreateChrome(v8::Local<v8::Context> context) {
     // chrome object we construct, and check if it's present. Unfortunately, we
     // need to a) track down each place we create the chrome object (it's not
     // just in extensions) and also see how much that would break.
-    if (obj->CreationContext() == context)
+    if (obj->GetCreationContextChecked() == context)
       chrome_object = obj;
   }
 
@@ -637,7 +637,7 @@ void NativeExtensionBindingsSystem::BindingAccessor(
     const v8::PropertyCallbackInfo<v8::Value>& info) {
   v8::Isolate* isolate = info.GetIsolate();
   v8::HandleScope handle_scope(isolate);
-  v8::Local<v8::Context> context = info.Holder()->CreationContext();
+  v8::Local<v8::Context> context = info.Holder()->GetCreationContextChecked();
 
   // Force binding creation in the owning context (even if another context is
   // calling in). This is also important to ensure that objects created through
diff --git a/extensions/renderer/native_extension_bindings_system_unittest.cc b/extensions/renderer/native_extension_bindings_system_unittest.cc
index 5ee0e151d68fd5..2d1e4f619a8493 100644
--- a/extensions/renderer/native_extension_bindings_system_unittest.cc
+++ b/extensions/renderer/native_extension_bindings_system_unittest.cc
@@ -763,7 +763,7 @@ TEST_F(NativeExtensionBindingsSystemUnittest, TestUsingOtherChromeObjects) {
   {
     v8::Context::Scope scope(context_a);
     v8::Local<v8::Object> fake_chrome = v8::Object::New(isolate());
-    EXPECT_EQ(context_a, fake_chrome->CreationContext());
+    EXPECT_EQ(context_a, fake_chrome->GetCreationContextChecked());
     context_b->Global()
         ->Set(context_b, gin::StringToSymbol(isolate(), "chrome"), fake_chrome)
         .ToChecked();
@@ -776,7 +776,7 @@ TEST_F(NativeExtensionBindingsSystemUnittest, TestUsingOtherChromeObjects) {
   {
     v8::Context::Scope scope(context_b);
     v8::Local<v8::Object> fake_chrome = v8::Object::New(isolate());
-    EXPECT_EQ(context_b, fake_chrome->CreationContext());
+    EXPECT_EQ(context_b, fake_chrome->GetCreationContextChecked());
     context_b->Global()
         ->Set(context_b, gin::StringToSymbol(isolate(), "chrome"), fake_chrome)
         .ToChecked();
@@ -1136,7 +1136,7 @@ TEST_F(NativeExtensionBindingsSystemUnittest, APIIsInitializedByOwningContext) {
           ->Get(context, gin::StringToV8(isolate(), "apiBridge"))
           .ToLocalChecked();
   ASSERT_TRUE(api_bridge->IsObject());
-  EXPECT_EQ(context, api_bridge.As<v8::Object>()->CreationContext());
+  EXPECT_EQ(context, api_bridge.As<v8::Object>()->GetCreationContextChecked());
 }
 
 class ResponseValidationNativeExtensionBindingsSystemUnittest
diff --git a/extensions/renderer/object_backed_native_handler.cc b/extensions/renderer/object_backed_native_handler.cc
index 9655d824f31fad..64e245183c227b 100644
--- a/extensions/renderer/object_backed_native_handler.cc
+++ b/extensions/renderer/object_backed_native_handler.cc
@@ -190,7 +190,7 @@ bool ObjectBackedNativeHandler::ContextCanAccessObject(
     bool allow_null_context) {
   if (object->IsNull())
     return true;
-  if (context == object->CreationContext())
+  if (context == object->GetCreationContextChecked())
     return true;
   // TODO(lazyboy): ScriptContextSet isn't available on worker threads. We
   // should probably use WorkerScriptContextSet somehow.
diff --git a/extensions/renderer/runtime_hooks_delegate.cc b/extensions/renderer/runtime_hooks_delegate.cc
index da108c669efc57..8df9c45c441e6d 100644
--- a/extensions/renderer/runtime_hooks_delegate.cc
+++ b/extensions/renderer/runtime_hooks_delegate.cc
@@ -42,7 +42,7 @@ void GetExtensionId(v8::Local<v8::Name> property_name,
                     const v8::PropertyCallbackInfo<v8::Value>& info) {
   v8::Isolate* isolate = info.GetIsolate();
   v8::HandleScope handle_scope(isolate);
-  v8::Local<v8::Context> context = info.Holder()->CreationContext();
+  v8::Local<v8::Context> context = info.Holder()->GetCreationContextChecked();
 
   ScriptContext* script_context = GetScriptContextFromV8Context(context);
   // This could potentially be invoked after the script context is removed
@@ -70,7 +70,7 @@ void GetBackgroundPageCallback(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
   v8::Isolate* isolate = info.GetIsolate();
   v8::HandleScope handle_scope(isolate);
-  v8::Local<v8::Context> context = info.Holder()->CreationContext();
+  v8::Local<v8::Context> context = info.Holder()->GetCreationContextChecked();
 
   DCHECK(!info.Data().IsEmpty());
   if (info.Data()->IsNull())
diff --git a/extensions/renderer/script_context_set.cc b/extensions/renderer/script_context_set.cc
index 631d6acae21fc0..1cd3ed8d7b0e01 100644
--- a/extensions/renderer/script_context_set.cc
+++ b/extensions/renderer/script_context_set.cc
@@ -85,7 +85,10 @@ ScriptContext* ScriptContextSet::GetByV8Context(
 
 ScriptContext* ScriptContextSet::GetContextByObject(
     const v8::Local<v8::Object>& object) {
-  return GetContextByV8Context(object->CreationContext());
+  v8::Local<v8::Context> context;
+  if (!object->GetCreationContext().ToLocal(&context))
+    return nullptr;
+  return GetContextByV8Context(context);
 }
 
 ScriptContext* ScriptContextSet::GetContextByV8Context(
diff --git a/gin/arguments.cc b/gin/arguments.cc
index 3a2ba9b160b148..fadb1d2dca490f 100644
--- a/gin/arguments.cc
+++ b/gin/arguments.cc
@@ -56,7 +56,7 @@ v8::Local<v8::Context> Arguments::GetHolderCreationContext() const {
   v8::Local<v8::Object> holder = is_for_property_
                                      ? info_for_property_->Holder()
                                      : info_for_function_->Holder();
-  return holder->CreationContext();
+  return holder->GetCreationContextChecked();
 }
 
 std::string V8TypeAsString(v8::Isolate* isolate, v8::Local<v8::Value> value) {
diff --git a/gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc b/gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc
index 328e79d130c045..b71ea13a0fce2f 100644
--- a/gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc
+++ b/gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc
@@ -13,7 +13,10 @@
 #include "gpu/command_buffer/service/shared_image_backing_gl_common.h"
 #include "gpu/command_buffer/service/shared_image_backing_gl_image.h"
 #include "gpu/command_buffer/service/shared_image_representation.h"
+#include "gpu/command_buffer/service/skia_utils.h"
 #include "gpu/vulkan/vulkan_device_queue.h"
+#include "gpu/vulkan/vulkan_fence_helper.h"
+#include "gpu/vulkan/vulkan_image.h"
 #include "gpu/vulkan/vulkan_util.h"
 #include "third_party/skia/include/core/SkPromiseImageTexture.h"
 #include "ui/gl/gl_context.h"
@@ -31,32 +34,6 @@ size_t EstimatedSize(viz::ResourceFormat format, const gfx::Size& size) {
   return estimated_size;
 }
 
-GrVkImageInfo CreateGrVkImageInfo(
-    VkImage vk_image,
-    const VkImageCreateInfo& info,
-    const raw_ptr<SharedContextState>& context_state) {
-  DCHECK_NE(vk_image, VK_NULL_HANDLE);
-
-  bool is_protected = info.flags & VK_IMAGE_CREATE_PROTECTED_BIT;
-
-  GrVkImageInfo image_info;
-  image_info.fImage = vk_image;
-  image_info.fAlloc = {};
-  image_info.fImageTiling = info.tiling;
-  image_info.fImageLayout = info.initialLayout;
-  image_info.fFormat = info.format;
-  image_info.fImageUsageFlags = info.usage;
-  image_info.fSampleCount = info.samples;
-  image_info.fLevelCount = info.mipLevels;
-  image_info.fCurrentQueueFamily = context_state->vk_context_provider()
-                                       ->GetDeviceQueue()
-                                       ->GetVulkanQueueIndex();
-  image_info.fProtected = is_protected ? GrProtected::kYes : GrProtected::kNo;
-  image_info.fYcbcrConversionInfo = {};
-
-  return image_info;
-}
-
 using ScopedResetAndRestoreUnpackState =
     SharedImageBackingGLCommon::ScopedResetAndRestoreUnpackState;
 
@@ -85,66 +62,62 @@ class AngleVulkanBacking : public ClearTrackingSharedImageBacking,
         context_state_(context_state) {}
 
   ~AngleVulkanBacking() override {
-    if (!passthrough_texture_)
-      return;
-
-    if (!gl::GLContext::GetCurrent())
-      context_state_->MakeCurrent(/*surface=*/nullptr, /*needs_gl=*/true);
+    if (passthrough_texture_) {
+      if (!gl::GLContext::GetCurrent())
+        context_state_->MakeCurrent(/*surface=*/nullptr, /*needs_gl=*/true);
 
-    if (!have_context())
-      passthrough_texture_->MarkContextLost();
+      if (!have_context())
+        passthrough_texture_->MarkContextLost();
 
-    passthrough_texture_.reset();
+      passthrough_texture_.reset();
+    }
+    auto* fence_helper = context_state_->vk_context_provider()
+                             ->GetDeviceQueue()
+                             ->GetFenceHelper();
+    fence_helper->EnqueueVulkanObjectCleanupForSubmittedWork(
+        std::move(vulkan_image_));
   }
 
   bool Initialize(
       const SharedImageBackingFactoryAngleVulkan::FormatInfo& format_info,
       const SharedImageBackingGLCommon::UnpackStateAttribs& attribs) {
-    SharedImageBackingGLCommon::MakeTextureAndSetParameters(
-        GL_TEXTURE_2D, /*service_id=*/0, /*framebuffer_attachment_angle=*/true,
-        &passthrough_texture_, nullptr);
-    passthrough_texture_->SetEstimatedSize(estimated_size());
-
-    GLuint texture = passthrough_texture_->service_id();
-
-    gl::GLApi* api = gl::g_current_gl_context;
-    ScopedRestoreTexture scoped_restore(api, GL_TEXTURE_2D);
-    api->glBindTextureFn(GL_TEXTURE_2D, texture);
-
-    if (format_info.supports_storage) {
-      {
-        gl::ScopedProgressReporter scoped_progress_reporter(
-            context_state_->progress_reporter());
-        api->glTexStorage2DEXTFn(GL_TEXTURE_2D, 1,
-                                 format_info.storage_internal_format,
-                                 size().width(), size().height());
+    auto* device_queue =
+        context_state_->vk_context_provider()->GetDeviceQueue();
+    VkFormat vk_format = ToVkFormat(format());
+
+    constexpr auto kUsageNeedsColorAttachment =
+        SHARED_IMAGE_USAGE_GLES2 | SHARED_IMAGE_USAGE_GLES2_FRAMEBUFFER_HINT |
+        SHARED_IMAGE_USAGE_RASTER | SHARED_IMAGE_USAGE_OOP_RASTERIZATION |
+        SHARED_IMAGE_USAGE_WEBGPU;
+    VkImageUsageFlags vk_usage = VK_IMAGE_USAGE_SAMPLED_BIT |
+                                 VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
+                                 VK_IMAGE_USAGE_TRANSFER_DST_BIT;
+    if (usage() & kUsageNeedsColorAttachment) {
+      vk_usage |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT |
+                  VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT;
+      if (format() == viz::ETC1) {
+        DLOG(ERROR) << "ETC1 format cannot be used as color attachment.";
+        return false;
       }
-
-    } else {
-      ScopedResetAndRestoreUnpackState scoped_unpack_state(api, attribs, false);
-      gl::ScopedProgressReporter scoped_progress_reporter(
-          context_state_->progress_reporter());
-      api->glTexImage2DFn(GL_TEXTURE_2D, 0, format_info.image_internal_format,
-                          size().width(), size().height(), 0,
-                          format_info.adjusted_format, format_info.gl_type,
-                          nullptr);
     }
 
-    if (gl::g_current_gl_driver->ext.b_GL_KHR_debug) {
-      const std::string label =
-          "SharedImage_AngleVulkan" + CreateLabelForSharedImageUsage(usage());
-      api->glObjectLabelFn(GL_TEXTURE, texture, -1, label.c_str());
-    }
+    VkImageCreateFlags vk_flags = 0;
+    auto vulkan_image =
+        VulkanImage::Create(device_queue, size(), vk_format, vk_usage, vk_flags,
+                            VK_IMAGE_TILING_OPTIMAL);
 
-    // Release the texture from ANGLE.
-    api->glReleaseTexturesANGLEFn(1, &texture, &layout_);
+    if (!vulkan_image)
+      return false;
 
-    auto image = base::MakeRefCounted<gl::GLImageEGLAngleVulkan>(size());
-    if (!image->Initialize(texture)) {
-      passthrough_texture_.reset();
+    auto egl_image = base::MakeRefCounted<gl::GLImageEGLAngleVulkan>(size());
+    if (!egl_image->Initialize(vulkan_image->image(),
+                               &vulkan_image->create_info())) {
+      vulkan_image->Destroy();
       return false;
     }
-    image_ = std::move(image);
+
+    vulkan_image_ = std::move(vulkan_image);
+    egl_image_ = std::move(egl_image);
     return true;
   }
 
@@ -167,7 +140,9 @@ class AngleVulkanBacking : public ClearTrackingSharedImageBacking,
   std::unique_ptr<SharedImageRepresentationGLTexturePassthrough>
   ProduceGLTexturePassthrough(SharedImageManager* manager,
                               MemoryTypeTracker* tracker) override {
-    DCHECK(passthrough_texture_);
+    if (!passthrough_texture_ && !InitializePassthroughTexture())
+      return nullptr;
+
     return std::make_unique<SharedImageRepresentationGLTexturePassthroughImpl>(
         manager, this, this, tracker, passthrough_texture_);
   }
@@ -199,14 +174,10 @@ class AngleVulkanBacking : public ClearTrackingSharedImageBacking,
   class SkiaRepresentation;
 
   bool BeginAccessSkia() {
-    VkImageCreateInfo info;
-    VkImage vk_image = image_->ExportVkImage(&info);
-    // Check whether VkImage is re-created in ANGLE.
-    if (vk_image != vk_image_) {
-      vk_image_ = vk_image;
-      backend_texture_ = GrBackendTexture(
-          size().width(), size().height(),
-          CreateGrVkImageInfo(vk_image_, info, context_state_));
+    if (!backend_texture_.isValid()) {
+      GrVkImageInfo info = CreateGrVkImageInfo(vulkan_image_.get());
+      backend_texture_ =
+          GrBackendTexture(size().width(), size().height(), info);
     }
     auto vk_layout = GLImageLayoutToVkImageLayout(layout_);
     backend_texture_.setVkImageLayout(vk_layout);
@@ -220,11 +191,37 @@ class AngleVulkanBacking : public ClearTrackingSharedImageBacking,
     layout_ = VkImageLayoutToGLImageLayout(info.fImageLayout);
   }
 
+  bool InitializePassthroughTexture() {
+    DCHECK(!passthrough_texture_);
+    scoped_refptr<gles2::TexturePassthrough> passthrough_texture;
+    SharedImageBackingGLCommon::MakeTextureAndSetParameters(
+        GL_TEXTURE_2D, /*service_id=*/0,
+        /*framebuffer_attachment_angle=*/true, &passthrough_texture, nullptr);
+    passthrough_texture->SetEstimatedSize(estimated_size());
+
+    GLuint texture = passthrough_texture->service_id();
+
+    gl::GLApi* api = gl::g_current_gl_context;
+    ScopedRestoreTexture scoped_restore(api, GL_TEXTURE_2D);
+    api->glBindTextureFn(GL_TEXTURE_2D, texture);
+
+    if (!egl_image_->BindTexImage(GL_TEXTURE_2D))
+      return false;
+
+    if (gl::g_current_gl_driver->ext.b_GL_KHR_debug) {
+      const std::string label =
+          "SharedImage_AngleVulkan" + CreateLabelForSharedImageUsage(usage());
+      api->glObjectLabelFn(GL_TEXTURE, texture, -1, label.c_str());
+    }
+    passthrough_texture_ = std::move(passthrough_texture);
+    return true;
+  }
+
   raw_ptr<SharedContextState> context_state_;
-  scoped_refptr<gl::GLImageEGLAngleVulkan> image_;
+  std::unique_ptr<VulkanImage> vulkan_image_;
+  scoped_refptr<gl::GLImageEGLAngleVulkan> egl_image_;
   scoped_refptr<gles2::TexturePassthrough> passthrough_texture_;
   GrBackendTexture backend_texture_{};
-  VkImage vk_image_ = VK_NULL_HANDLE;
   GLenum layout_ = GL_NONE;
 };  // namespace
 
diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
index 68b74d5eba802e..5183c00e08c9f7 100644
--- a/gpu/config/gpu_finch_features.cc
+++ b/gpu/config/gpu_finch_features.cc
@@ -213,6 +213,9 @@ const base::Feature kWebGPUService{"WebGPUService",
 
 #if defined(OS_ANDROID)
 
+const base::FeatureParam<std::string> kVulkanBlockListByHardware{
+    &kVulkan, "BlockListByHardware", "mt*"};
+
 const base::FeatureParam<std::string> kVulkanBlockListByBrand{
     &kVulkan, "BlockListByBrand", "HONOR"};
 
@@ -281,6 +284,8 @@ bool IsUsingVulkan() {
 
   // Check block list against build info.
   const auto* build_info = base::android::BuildInfo::GetInstance();
+  if (IsDeviceBlocked(build_info->hardware(), kVulkanBlockListByHardware.Get()))
+    return false;
   if (IsDeviceBlocked(build_info->brand(), kVulkanBlockListByBrand.Get()))
     return false;
   if (IsDeviceBlocked(build_info->device(), kVulkanBlockListByDevice.Get()))
diff --git a/gpu/vulkan/vulkan_image.cc b/gpu/vulkan/vulkan_image.cc
index 98fa1c1835622d..1c638c9933ced0 100644
--- a/gpu/vulkan/vulkan_image.cc
+++ b/gpu/vulkan/vulkan_image.cc
@@ -114,14 +114,15 @@ std::unique_ptr<VulkanImage> VulkanImage::Create(
   image->device_queue_ = device_queue;
   image->image_ = vk_image;
   image->device_memory_ = vk_device_memory;
-  image->size_ = size;
-  image->format_ = format;
-  image->image_tiling_ = image_tiling;
+  image->create_info_.extent = {static_cast<uint32_t>(size.width()),
+                                static_cast<uint32_t>(size.height()), 1};
+  image->create_info_.format = format;
+  image->create_info_.tiling = image_tiling;
   image->device_size_ = device_size;
   image->memory_type_index_ = memory_type_index;
   image->ycbcr_info_ = ycbcr_info;
-  image->usage_ = usage;
-  image->flags_ = flags;
+  image->create_info_.usage = usage;
+  image->create_info_.flags = flags;
   return image;
 }
 
@@ -184,33 +185,29 @@ bool VulkanImage::Initialize(VulkanDeviceQueue* device_queue,
   DCHECK(device_memory_ == VK_NULL_HANDLE);
 
   device_queue_ = device_queue;
-  size_ = size;
-  format_ = format;
-  usage_ = usage;
-  flags_ = flags;
-  image_tiling_ = image_tiling;
-
-  VkImageCreateInfo create_info = {
+  create_info_ = {
       .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
       .pNext = vk_image_create_info_next,
-      .flags = flags_,
+      .flags = flags,
       .imageType = VK_IMAGE_TYPE_2D,
-      .format = format_,
+      .format = format,
       .extent = {static_cast<uint32_t>(size.width()),
                  static_cast<uint32_t>(size.height()), 1},
       .mipLevels = 1,
       .arrayLayers = 1,
       .samples = VK_SAMPLE_COUNT_1_BIT,
-      .tiling = image_tiling_,
+      .tiling = image_tiling,
       .usage = usage,
       .sharingMode = VK_SHARING_MODE_EXCLUSIVE,
       .queueFamilyIndexCount = 0,
       .pQueueFamilyIndices = nullptr,
-      .initialLayout = image_layout_,
+      .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED,
   };
   VkDevice vk_device = device_queue->GetVulkanDevice();
-  VkResult result =
-      vkCreateImage(vk_device, &create_info, nullptr /* pAllocator */, &image_);
+  VkResult result = vkCreateImage(vk_device, &create_info_,
+                                  nullptr /* pAllocator */, &image_);
+  create_info_.pNext = nullptr;
+
   if (result != VK_SUCCESS) {
     DLOG(ERROR) << "vkCreateImage failed result:" << result;
     device_queue_ = nullptr;
@@ -276,7 +273,7 @@ bool VulkanImage::Initialize(VulkanDeviceQueue* device_queue,
   // initialized in InitializeWithExternalMemoryAndModifiers(). For
   // VK_IMAGE_TILING_OPTIMAL the layout is not usable and
   // vkGetImageSubresourceLayout() is illegal.
-  if (image_tiling_ != VK_IMAGE_TILING_LINEAR)
+  if (image_tiling != VK_IMAGE_TILING_LINEAR)
     return true;
 
   const VkImageSubresource image_subresource = {
diff --git a/gpu/vulkan/vulkan_image.h b/gpu/vulkan/vulkan_image.h
index d705b91c750015..58269f14897328 100644
--- a/gpu/vulkan/vulkan_image.h
+++ b/gpu/vulkan/vulkan_image.h
@@ -114,13 +114,16 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage {
 #endif
 
   VulkanDeviceQueue* device_queue() const { return device_queue_; }
-  const gfx::Size& size() const { return size_; }
-  VkFormat format() const { return format_; }
-  VkImageCreateFlags flags() const { return flags_; }
-  VkImageUsageFlags usage() const { return usage_; }
+  const VkImageCreateInfo& create_info() const { return create_info_; }
+  gfx::Size size() const {
+    return gfx::Size(create_info_.extent.width, create_info_.extent.height);
+  }
+  VkFormat format() const { return create_info_.format; }
+  VkImageCreateFlags flags() const { return create_info_.flags; }
+  VkImageUsageFlags usage() const { return create_info_.usage; }
   VkDeviceSize device_size() const { return device_size_; }
   uint32_t memory_type_index() const { return memory_type_index_; }
-  VkImageTiling image_tiling() const { return image_tiling_; }
+  VkImageTiling image_tiling() const { return create_info_.tiling; }
   VkImageLayout image_layout() const { return image_layout_; }
   void set_image_layout(VkImageLayout layout) { image_layout_ = layout; }
   uint32_t queue_family_index() const { return queue_family_index_; }
@@ -179,13 +182,9 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage {
 #endif
 
   raw_ptr<VulkanDeviceQueue> device_queue_ = nullptr;
-  gfx::Size size_;
-  VkFormat format_ = VK_FORMAT_UNDEFINED;
-  VkImageCreateFlags flags_ = 0;
-  VkImageUsageFlags usage_ = 0;
+  VkImageCreateInfo create_info_{VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO};
   VkDeviceSize device_size_ = 0;
   uint32_t memory_type_index_ = 0;
-  VkImageTiling image_tiling_ = VK_IMAGE_TILING_OPTIMAL;
   VkImageLayout image_layout_ = VK_IMAGE_LAYOUT_UNDEFINED;
   uint32_t queue_family_index_ = VK_QUEUE_FAMILY_IGNORED;
   absl::optional<VulkanYCbCrInfo> ycbcr_info_;
diff --git a/infra/config/generated/builders/try/ios-simulator/properties.textpb b/infra/config/generated/builders/try/ios-simulator/properties.textpb
index 58186a7d01b752..b3b23b3b296e42 100644
--- a/infra/config/generated/builders/try/ios-simulator/properties.textpb
+++ b/infra/config/generated/builders/try/ios-simulator/properties.textpb
@@ -7,6 +7,9 @@
     ],
     "use_clang_coverage": true
   },
+  "$build/flakiness": {
+    "check_for_flakiness": true
+  },
   "$build/goma": {
     "rpc_extra_params": "?prod",
     "server_host": "goma.chromium.org",
diff --git a/infra/config/generated/cq-builders.md b/infra/config/generated/cq-builders.md
index 4a3de488c6417f..c0f51df126de42 100644
--- a/infra/config/generated/cq-builders.md
+++ b/infra/config/generated/cq-builders.md
@@ -489,5 +489,5 @@ as required builders.
   * Experiment percentage: 1.0
 
 * [mac11-arm64-rel](https://ci.chromium.org/p/chromium/builders/try/mac11-arm64-rel) ([definition](https://cs.chromium.org/search?q=+file:/try.star$+""mac11-arm64-rel"")) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+""mac11-arm64-rel""))
-  * Experiment percentage: 100.0
+  * Experiment percentage: 50.0
 
diff --git a/infra/config/generated/luci/commit-queue.cfg b/infra/config/generated/luci/commit-queue.cfg
index 5c9320599670ba..3435ffc0723955 100644
--- a/infra/config/generated/luci/commit-queue.cfg
+++ b/infra/config/generated/luci/commit-queue.cfg
@@ -1684,7 +1684,7 @@ config_groups {
       }
       builders {
         name: "chromium/try/mac11-arm64-rel"
-        experiment_percentage: 100
+        experiment_percentage: 50
         location_regexp: ".*"
         location_regexp_exclude: ".+/[+]/docs/.+"
         location_regexp_exclude: ".+/[+]/infra/config/.+"
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index d8160714666e2e..1efbc58cd71dd5 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -47783,7 +47783,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -47870,7 +47870,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -47957,7 +47957,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -48044,7 +48044,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -48297,7 +48297,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -48384,7 +48384,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -48573,7 +48573,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -48660,7 +48660,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -48747,7 +48747,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -48834,7 +48834,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -48921,7 +48921,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -49008,7 +49008,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -49095,7 +49095,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -49182,7 +49182,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -49269,7 +49269,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -49356,7 +49356,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -49443,7 +49443,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -49530,7 +49530,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -49617,7 +49617,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -49878,7 +49878,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -50171,7 +50171,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -50456,7 +50456,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -50544,7 +50544,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -50631,7 +50631,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -50718,7 +50718,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -50805,7 +50805,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -50892,7 +50892,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -50983,7 +50983,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -51074,7 +51074,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -51161,7 +51161,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -51433,7 +51433,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -51520,7 +51520,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -51608,7 +51608,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -51695,7 +51695,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -51782,7 +51782,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -51869,7 +51869,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -51956,7 +51956,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -52043,7 +52043,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -52130,7 +52130,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -52217,7 +52217,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -52304,7 +52304,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -52391,7 +52391,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -52478,7 +52478,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -52565,7 +52565,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -52652,7 +52652,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -52739,7 +52739,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -52826,7 +52826,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -52913,7 +52913,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -53001,7 +53001,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -53088,7 +53088,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -53175,7 +53175,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -53263,7 +53263,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -53350,7 +53350,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -53437,7 +53437,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -53524,7 +53524,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -53610,7 +53610,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -53697,7 +53697,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -53784,7 +53784,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -53871,7 +53871,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -53958,7 +53958,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -54248,7 +54248,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -54335,7 +54335,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -54421,7 +54421,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -54508,7 +54508,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -54595,7 +54595,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -54682,7 +54682,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -54769,7 +54769,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -55038,7 +55038,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -55125,7 +55125,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -55218,7 +55218,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -55305,7 +55305,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -55392,7 +55392,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -55559,7 +55559,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -55643,7 +55643,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -55727,7 +55727,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -55811,7 +55811,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -55896,7 +55896,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -55981,7 +55981,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -56066,7 +56066,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -56151,7 +56151,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -56238,7 +56238,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -56408,7 +56408,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -56586,7 +56586,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -56760,7 +56760,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -56847,7 +56847,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -56934,7 +56934,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -57021,7 +57021,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -57108,7 +57108,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -57195,7 +57195,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -57281,7 +57281,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -57367,7 +57367,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -57453,7 +57453,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -57539,7 +57539,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -57622,7 +57622,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -57705,7 +57705,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -57788,7 +57788,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -57871,7 +57871,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -57954,7 +57954,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -58037,7 +58037,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -58120,7 +58120,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -58203,7 +58203,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -58286,7 +58286,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -58369,7 +58369,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -58452,7 +58452,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -58535,7 +58535,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -58618,7 +58618,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -58701,7 +58701,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -58784,7 +58784,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -58867,7 +58867,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -58950,7 +58950,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -59033,7 +59033,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -59116,7 +59116,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -59199,7 +59199,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -59282,7 +59282,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -59365,7 +59365,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -59446,7 +59446,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -59527,7 +59527,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -59608,7 +59608,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -59689,7 +59689,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -59770,7 +59770,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -59851,7 +59851,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -59932,7 +59932,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -60013,7 +60013,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -60094,7 +60094,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -60175,7 +60175,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -60256,7 +60256,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -60337,7 +60337,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -60418,7 +60418,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -60501,7 +60501,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -60584,7 +60584,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -60667,7 +60667,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -60750,7 +60750,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -60833,7 +60833,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -60916,7 +60916,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -60999,7 +60999,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -61082,7 +61082,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -61165,7 +61165,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -61248,7 +61248,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -61331,7 +61331,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -61414,7 +61414,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -61497,7 +61497,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -61580,7 +61580,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -61663,7 +61663,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -61746,7 +61746,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -61827,7 +61827,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -61908,7 +61908,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -61991,7 +61991,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -62162,7 +62162,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -62251,7 +62251,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -62312,6 +62312,9 @@ buckets {
         '    ],'
         '    "use_clang_coverage": true'
         '  },'
+        '  "$build/flakiness": {'
+        '    "check_for_flakiness": true'
+        '  },'
         '  "$build/goma": {'
         '    "rpc_extra_params": "?prod",'
         '    "server_host": "goma.chromium.org",'
@@ -62348,7 +62351,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -62440,7 +62443,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -62540,7 +62543,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -62629,7 +62632,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -62718,7 +62721,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -62807,7 +62810,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -62903,7 +62906,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -62992,7 +62995,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -63081,7 +63084,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -63170,7 +63173,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -63259,7 +63262,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -63345,7 +63348,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -63431,7 +63434,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -63518,7 +63521,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -63605,7 +63608,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -63695,7 +63698,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -63865,7 +63868,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -64035,7 +64038,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -64122,7 +64125,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -64209,7 +64212,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -64297,7 +64300,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -64384,7 +64387,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -64471,7 +64474,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -64558,7 +64561,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -64645,7 +64648,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -64732,7 +64735,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -64819,7 +64822,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -64913,7 +64916,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -65000,7 +65003,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -65087,7 +65090,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -65173,7 +65176,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -65260,7 +65263,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -65347,7 +65350,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -65438,7 +65441,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -65897,7 +65900,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -65984,7 +65987,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -66071,7 +66074,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -66158,7 +66161,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -66239,7 +66242,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -66326,7 +66329,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -66413,7 +66416,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -66500,7 +66503,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -66587,7 +66590,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -66675,7 +66678,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -66770,7 +66773,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -66858,7 +66861,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -66945,7 +66948,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -67032,7 +67035,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -67205,7 +67208,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -67292,7 +67295,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -67379,7 +67382,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -67466,7 +67469,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -67745,7 +67748,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -67832,7 +67835,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -67922,7 +67925,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -68012,7 +68015,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -68096,7 +68099,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -68340,7 +68343,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -68428,7 +68431,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -68515,7 +68518,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -68601,7 +68604,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -68688,7 +68691,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -68775,7 +68778,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -68862,7 +68865,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -68949,7 +68952,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -69037,7 +69040,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -69124,7 +69127,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -69211,7 +69214,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -69298,7 +69301,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -69570,7 +69573,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -69657,7 +69660,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -69745,7 +69748,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -69833,7 +69836,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -70007,7 +70010,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -70094,7 +70097,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -70185,7 +70188,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -70272,7 +70275,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -70363,7 +70366,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -70451,7 +70454,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -70722,7 +70725,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -70809,7 +70812,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -70896,7 +70899,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -70983,7 +70986,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -71070,7 +71073,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -71156,7 +71159,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -71324,7 +71327,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -71489,7 +71492,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -71574,7 +71577,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -71658,7 +71661,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -71743,7 +71746,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -71832,7 +71835,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -72109,7 +72112,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -72190,7 +72193,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -72274,7 +72277,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -72358,7 +72361,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -72443,7 +72446,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -72528,7 +72531,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -72613,7 +72616,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -72698,7 +72701,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -72965,7 +72968,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -73050,7 +73053,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -73135,7 +73138,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -73220,7 +73223,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -73305,7 +73308,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -73390,7 +73393,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -73475,7 +73478,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -73560,7 +73563,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -73645,7 +73648,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -73731,7 +73734,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -73817,7 +73820,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -73902,7 +73905,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -73987,7 +73990,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -74071,7 +74074,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -74318,7 +74321,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -74751,7 +74754,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -75087,7 +75090,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -75175,7 +75178,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -75269,7 +75272,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -75441,7 +75444,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -75614,7 +75617,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -75698,7 +75701,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -76102,7 +76105,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -76186,7 +76189,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -76273,7 +76276,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -76360,7 +76363,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -76447,7 +76450,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -76534,7 +76537,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -76627,7 +76630,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -76714,7 +76717,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -76998,7 +77001,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -77088,7 +77091,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -77175,7 +77178,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -77262,7 +77265,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -77350,7 +77353,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -77437,7 +77440,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -77525,7 +77528,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -77612,7 +77615,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -77699,7 +77702,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -77786,7 +77789,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -77873,7 +77876,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -77960,7 +77963,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -78127,7 +78130,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 25
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
diff --git a/infra/config/recipes.star b/infra/config/recipes.star
index fdb15995e2ab16..9651d9ab3659d3 100644
--- a/infra/config/recipes.star
+++ b/infra/config/recipes.star
@@ -188,9 +188,7 @@ build_recipe(
 build_recipe(
     name = "recipe:chromium_trybot",
     bootstrappable = True,
-    experiments = {
-        "luci.recipes.use_python3": 25,
-    },
+    use_python3 = True,
 )
 
 build_recipe(
diff --git a/infra/config/subprojects/chromium/try.star b/infra/config/subprojects/chromium/try.star
index 730dbba533df5a..815a7ff777801a 100644
--- a/infra/config/subprojects/chromium/try.star
+++ b/infra/config/subprojects/chromium/try.star
@@ -1647,7 +1647,7 @@ try_.chromium_mac_orchestrator_pair(
     main_list_view = "try",
     orchestrator_cores = 2,
     orchestrator_tryjob = try_.job(
-        experiment_percentage = 100,
+        experiment_percentage = 50,
     ),
     compilator_goma_jobs = goma.jobs.J150,
     compilator_os = os.MAC_11,
@@ -1737,6 +1737,7 @@ try_.chromium_mac_ios_builder(
 try_.chromium_mac_ios_builder(
     name = "ios-simulator",
     branch_selector = branches.STANDARD_MILESTONE,
+    check_for_flakiness = True,
     main_list_view = "try",
     use_clang_coverage = True,
     coverage_exclude_sources = "ios_test_files_and_test_utils",
diff --git a/ios/chrome/app/BUILD.gn b/ios/chrome/app/BUILD.gn
index 21adee9e8b3e05..d7547c89049a43 100644
--- a/ios/chrome/app/BUILD.gn
+++ b/ios/chrome/app/BUILD.gn
@@ -381,7 +381,6 @@ source_set("app_internal") {
     "//ios/chrome/browser/variations:ios_chrome_ui_string_overrider_factory",
     "//ios/chrome/browser/voice",
     "//ios/chrome/browser/web",
-    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web:web_internal",
     "//ios/chrome/browser/web/session_state",
     "//ios/chrome/browser/web_state_list",
diff --git a/ios/chrome/app/application_delegate/BUILD.gn b/ios/chrome/app/application_delegate/BUILD.gn
index 4701c7295d64f6..2dff6846f43ca0 100644
--- a/ios/chrome/app/application_delegate/BUILD.gn
+++ b/ios/chrome/app/application_delegate/BUILD.gn
@@ -73,7 +73,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/settings",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/url_loading",
-    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/chrome/common/app_group",
@@ -236,7 +235,6 @@ source_set("application_delegate_internal") {
     "//ios/chrome/browser/ui/ntp:util",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/url_loading",
-    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:agents",
     "//ios/chrome/browser/web_state_list:session_metrics",
diff --git a/ios/chrome/app/application_delegate/metrics_mediator.mm b/ios/chrome/app/application_delegate/metrics_mediator.mm
index da8b6dbf552453..7323dc781709bf 100644
--- a/ios/chrome/app/application_delegate/metrics_mediator.mm
+++ b/ios/chrome/app/application_delegate/metrics_mediator.mm
@@ -19,6 +19,7 @@
 #include "components/metrics/metrics_service.h"
 #include "components/prefs/pref_service.h"
 #import "components/previous_session_info/previous_session_info.h"
+#import "components/signin/public/identity_manager/tribool.h"
 #include "components/ukm/ios/ukm_reporting_ios_util.h"
 #import "ios/chrome/app/application_delegate/metric_kit_subscriber.h"
 #import "ios/chrome/app/application_delegate/startup_information.h"
@@ -29,6 +30,7 @@
 #include "ios/chrome/browser/main/browser.h"
 #include "ios/chrome/browser/metrics/first_user_action_recorder.h"
 #include "ios/chrome/browser/pref_names.h"
+#import "ios/chrome/browser/signin/signin_util.h"
 #include "ios/chrome/browser/system_flags.h"
 #import "ios/chrome/browser/ui/browser_view/browser_view_controller.h"
 #import "ios/chrome/browser/ui/default_promo/default_browser_utils.h"
@@ -77,6 +79,26 @@
         static_cast<int>(CPENewCredentialUsername::kMaxValue) + 1,
     }};
 
+// Enum values for Startup.IOSColdStartType histogram.
+// Entries should not be renumbered and numeric values should never be reused.
+enum class ColdStartType : int {
+  // Regular cold start.
+  kRegular = 0,
+  // Cold start with FRE.
+  kFirstRun = 1,
+  // Cold start after a device restore.
+  kAfterDeviceRestore = 2,
+  // Cold start after a Chrome upgrade.
+  kAfterChromeUpgrade = 3,
+  // Cold start after a device restore and Chrome upgrade.
+  kAfterDeviceRestoreAndChromeUpgrade = 4,
+  // Unknown device restore.
+  kUnknownDeviceRestore = 5,
+  // Unknown device restore and Chrome upgrade.
+  kUnknownDeviceRestoreAndChromeUpgrade = 6,
+  kMaxValue = kUnknownDeviceRestoreAndChromeUpgrade,
+};
+
 // Returns time delta since app launch as retrieved from kernel info about
 // the current process.
 base::TimeDelta TimeDeltaSinceAppLaunchFromProcess() {
@@ -425,6 +447,34 @@ + (void)logLaunchMetricsWithStartupInformation:
     [[NSUserDefaults standardUserDefaults]
         removeObjectForKey:kAppEnteredBackgroundDateKey];
   }
+  if (!startupInformation.isColdStart) {
+    return;
+  }
+  signin::Tribool device_restore = IsFirstSessionAfterDeviceRestore();
+  ColdStartType sessionType;
+  if (startupInformation.isFirstRun) {
+    sessionType = ColdStartType::kFirstRun;
+  } else {
+    bool afterUpgrade =
+        [PreviousSessionInfo sharedInstance].isFirstSessionAfterUpgrade;
+    switch (device_restore) {
+      case signin::Tribool::kUnknown:
+        sessionType = afterUpgrade
+                          ? ColdStartType::kUnknownDeviceRestoreAndChromeUpgrade
+                          : ColdStartType::kUnknownDeviceRestore;
+        break;
+      case signin::Tribool::kTrue:
+        sessionType = afterUpgrade
+                          ? ColdStartType::kAfterDeviceRestoreAndChromeUpgrade
+                          : ColdStartType::kAfterDeviceRestore;
+        break;
+      case signin::Tribool::kFalse:
+        sessionType = afterUpgrade ? ColdStartType::kAfterChromeUpgrade
+                                   : ColdStartType::kRegular;
+        break;
+    }
+  }
+  base::UmaHistogramEnumeration("Startup.IOSColdStartType", sessionType);
 }
 
 - (void)updateMetricsStateBasedOnPrefsUserTriggered:(BOOL)isUserTriggered {
diff --git a/ios/chrome/app/application_delegate/user_activity_handler.mm b/ios/chrome/app/application_delegate/user_activity_handler.mm
index 2381ef3241d8cf..ef15519a64b997 100644
--- a/ios/chrome/app/application_delegate/user_activity_handler.mm
+++ b/ios/chrome/app/application_delegate/user_activity_handler.mm
@@ -35,7 +35,6 @@
 #import "ios/chrome/browser/ui/main/connection_information.h"
 #import "ios/chrome/browser/url_loading/image_search_param_generator.h"
 #import "ios/chrome/browser/url_loading/url_loading_params.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/common/intents/OpenInChromeIncognitoIntent.h"
 #import "ios/chrome/common/intents/OpenInChromeIntent.h"
@@ -652,7 +651,7 @@ + (void)routeU2FURL:(const GURL&)URL
     WebStateList* webStateList = browser->GetWebStateList();
     for (int index = 0; index < webStateList->count(); ++index) {
       web::WebState* webState = webStateList->GetWebStateAt(index);
-      NSString* currentTabID = TabIdTabHelper::FromWebState(webState)->tab_id();
+      NSString* currentTabID = webState->GetStableIdentifier();
       if ([currentTabID isEqualToString:tabID]) {
         U2FTabHelper::FromWebState(webState)->EvaluateU2FResult(URL);
         return;
diff --git a/ios/chrome/app/application_delegate/user_activity_handler_unittest.mm b/ios/chrome/app/application_delegate/user_activity_handler_unittest.mm
index 6ad84e3f333a3d..2cd0817ad2c8ff 100644
--- a/ios/chrome/app/application_delegate/user_activity_handler_unittest.mm
+++ b/ios/chrome/app/application_delegate/user_activity_handler_unittest.mm
@@ -35,7 +35,6 @@
 #import "ios/chrome/browser/ui/main/test/fake_connection_information.h"
 #import "ios/chrome/browser/ui/main/test/stub_browser_interface_provider.h"
 #import "ios/chrome/browser/url_loading/url_loading_params.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/chrome/browser/web_state_list/fake_web_state_list_delegate.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/browser/web_state_list/web_state_opener.h"
@@ -126,7 +125,7 @@ void resetHandleStartupParametersHasBeenCalled() {
   }
 
   NSString* GetTabIdForWebState(web::WebState* web_state) {
-    return TabIdTabHelper::FromWebState(web_state)->tab_id();
+    return web_state->GetStableIdentifier();
   }
 
   conditionBlock getCompletionHandler() {
@@ -835,7 +834,6 @@ conditionBlock getCompletionHandler() {
       std::make_unique<WebStateList>(&_webStateListDelegate);
 
   auto web_state = std::make_unique<web::FakeWebState>();
-  TabIdTabHelper::CreateForWebState(web_state.get());
   FakeU2FTabHelper::CreateForWebState(web_state.get());
   web::WebState* web_state_ptr = web_state.get();
   web_state_list_->InsertWebState(
diff --git a/ios/chrome/browser/app_launcher/BUILD.gn b/ios/chrome/browser/app_launcher/BUILD.gn
index 04902bfffb61ac..1d71cd0ab3dd39 100644
--- a/ios/chrome/browser/app_launcher/BUILD.gn
+++ b/ios/chrome/browser/app_launcher/BUILD.gn
@@ -88,7 +88,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/prefs:browser_prefs",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/u2f",
-    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web:web_internal",
     "//ios/chrome/browser/web_state_list",
     "//ios/web/common:features",
diff --git a/ios/chrome/browser/app_launcher/app_launcher_tab_helper_unittest.mm b/ios/chrome/browser/app_launcher/app_launcher_tab_helper_unittest.mm
index d7d24877ca2d10..a6cd692288463d 100644
--- a/ios/chrome/browser/app_launcher/app_launcher_tab_helper_unittest.mm
+++ b/ios/chrome/browser/app_launcher/app_launcher_tab_helper_unittest.mm
@@ -25,7 +25,6 @@
 #include "ios/chrome/browser/policy_url_blocking/policy_url_blocking_service.h"
 #include "ios/chrome/browser/reading_list/reading_list_model_factory.h"
 #import "ios/chrome/browser/u2f/u2f_tab_helper.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/web/common/features.h"
 #import "ios/web/public/test/fakes/fake_navigation_manager.h"
 #import "ios/web/public/test/fakes/fake_web_state.h"
@@ -150,7 +149,6 @@ void InitializeReadingListModel() {
     ReadingListModelFactory::GetInstance()->SetTestingFactoryAndUse(
         chrome_browser_state_.get(),
         base::BindRepeating(&BuildReadingListModel));
-    TabIdTabHelper::CreateForWebState(&web_state_);
     is_reading_list_initialized_ = true;
   }
 
@@ -433,8 +431,6 @@ bool TestReadingListUpdate(bool is_app_blocked,
 #define MAYBE_U2FUrls DISABLED_U2FUrls
 #endif
 TEST_F(AppLauncherTabHelperTest, MAYBE_U2FUrls) {
-  // Add required tab helpers for the U2F check.
-  TabIdTabHelper::CreateForWebState(&web_state_);
   std::unique_ptr<web::NavigationItem> item = web::NavigationItem::Create();
 
   // "u2f-x-callback" scheme should only be created by the browser. External
diff --git a/ios/chrome/browser/crash_report/BUILD.gn b/ios/chrome/browser/crash_report/BUILD.gn
index 62ea9d86bc5a1c..3dd09588e504a0 100644
--- a/ios/chrome/browser/crash_report/BUILD.gn
+++ b/ios/chrome/browser/crash_report/BUILD.gn
@@ -82,7 +82,6 @@ source_set("crash_report_internal") {
     "//ios/chrome/browser/sessions:session_service",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/main:scene_state_header",
-    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/web",
     "//net",
diff --git a/ios/chrome/browser/crash_report/crash_report_helper.mm b/ios/chrome/browser/crash_report/crash_report_helper.mm
index 98dd2979a56464..534969885b39f9 100644
--- a/ios/chrome/browser/crash_report/crash_report_helper.mm
+++ b/ios/chrome/browser/crash_report/crash_report_helper.mm
@@ -23,7 +23,6 @@
 #include "ios/chrome/browser/crash_report/crash_keys_helper.h"
 #import "ios/chrome/browser/crash_report/crash_report_user_application_state.h"
 #include "ios/chrome/browser/crash_report/crash_reporter_url_observer.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/chrome/browser/web_state_list/all_web_state_observation_forwarder.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/browser/web_state_list/web_state_list_observer_bridge.h"
@@ -166,29 +165,28 @@ - (void)stopObservingWebStateList:(WebStateList*)webStateList {
 - (void)webStateList:(WebStateList*)webStateList
     didDetachWebState:(web::WebState*)webState
               atIndex:(int)atIndex {
-  [self removeTabId:TabIdTabHelper::FromWebState(webState)->tab_id()];
+  [self removeTabId:webState->GetStableIdentifier()];
 }
 
 - (void)webStateList:(WebStateList*)webStateList
     didReplaceWebState:(web::WebState*)oldWebState
           withWebState:(web::WebState*)newWebState
                atIndex:(int)atIndex {
-  [self removeTabId:TabIdTabHelper::FromWebState(oldWebState)->tab_id()];
+  [self removeTabId:oldWebState->GetStableIdentifier()];
 }
 
 #pragma mark - CRWWebStateObserver protocol
 
 - (void)webState:(web::WebState*)webState
     didStartNavigation:(web::NavigationContext*)navigation {
-  NSString* tabID = TabIdTabHelper::FromWebState(webState)->tab_id();
-  [self closingDocumentInTab:tabID];
+  [self closingDocumentInTab:webState->GetStableIdentifier()];
 }
 
 - (void)webState:(web::WebState*)webState
     didLoadPageWithSuccess:(BOOL)loadSuccess {
   if (!loadSuccess || webState->GetContentsMimeType() != "application/pdf")
     return;
-  NSString* tabID = TabIdTabHelper::FromWebState(webState)->tab_id();
+  NSString* tabID = webState->GetStableIdentifier();
   NSString* oldMime = (NSString*)[self tabInfo:@"mime" forTab:tabID];
   if ([kDocumentMimeType isEqualToString:oldMime])
     return;
diff --git a/ios/chrome/browser/drag_and_drop/BUILD.gn b/ios/chrome/browser/drag_and_drop/BUILD.gn
index 4a3f22d7c7436b..0a693f2c86dffd 100644
--- a/ios/chrome/browser/drag_and_drop/BUILD.gn
+++ b/ios/chrome/browser/drag_and_drop/BUILD.gn
@@ -14,7 +14,6 @@ source_set("drag_and_drop") {
   ]
   deps = [
     "//base",
-    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/window_activities",
     "//ios/web/public",
     "//net",
diff --git a/ios/chrome/browser/drag_and_drop/drag_item_util.mm b/ios/chrome/browser/drag_and_drop/drag_item_util.mm
index 4404c1f864cbc6..591a358cb5e571 100644
--- a/ios/chrome/browser/drag_and_drop/drag_item_util.mm
+++ b/ios/chrome/browser/drag_and_drop/drag_item_util.mm
@@ -5,7 +5,6 @@
 #import "ios/chrome/browser/drag_and_drop/drag_item_util.h"
 
 #include "base/check_op.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/chrome/browser/window_activities/window_activity_helpers.h"
 #include "ios/web/public/browser_state.h"
 #import "ios/web/public/web_state.h"
@@ -43,7 +42,7 @@ - (instancetype)initWithURL:(const GURL&)URL title:(NSString*)title {
   NSItemProvider* item_provider = [[NSItemProvider alloc] initWithObject:url];
   UIDragItem* drag_item =
       [[UIDragItem alloc] initWithItemProvider:item_provider];
-  NSString* tab_id = TabIdTabHelper::FromWebState(web_state)->tab_id();
+  NSString* tab_id = web_state->GetStableIdentifier();
   BOOL incognito = web_state->GetBrowserState()->IsOffTheRecord();
   // Visibility "all" is required to allow the OS to recognize this activity for
   // creating a new window.
diff --git a/ios/chrome/browser/main/BUILD.gn b/ios/chrome/browser/main/BUILD.gn
index 3a17e19b726057..660d0de8d708f7 100644
--- a/ios/chrome/browser/main/BUILD.gn
+++ b/ios/chrome/browser/main/BUILD.gn
@@ -65,7 +65,6 @@ source_set("main") {
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:delegate",
-    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:agents",
     "//ios/chrome/browser/web_state_list:session_metrics",
@@ -113,7 +112,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/snapshots",
     "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/web/public/test",
diff --git a/ios/chrome/browser/main/browser_util.mm b/ios/chrome/browser/main/browser_util.mm
index d90ef10a25ed67..241924eadfa38c 100644
--- a/ios/chrome/browser/main/browser_util.mm
+++ b/ios/chrome/browser/main/browser_util.mm
@@ -15,9 +15,9 @@
 #import "ios/chrome/browser/main/browser_list_factory.h"
 #import "ios/chrome/browser/snapshots/snapshot_browser_agent.h"
 #import "ios/chrome/browser/snapshots/snapshot_cache.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/browser/web_state_list/web_state_opener.h"
+#import "ios/web/public/web_state.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
@@ -34,8 +34,7 @@
     WebStateList* web_state_list = browser->GetWebStateList();
     for (int i = 0; i < web_state_list->count(); ++i) {
       web::WebState* web_state = web_state_list->GetWebStateAt(i);
-      NSString* current_tab_id =
-          TabIdTabHelper::FromWebState(web_state)->tab_id();
+      NSString* current_tab_id = web_state->GetStableIdentifier();
       if ([current_tab_id isEqualToString:tab_id]) {
         tab_index = i;
         return browser;
diff --git a/ios/chrome/browser/main/browser_util_unittest.mm b/ios/chrome/browser/main/browser_util_unittest.mm
index 1bbea7306d8d9d..e05f6b52997e86 100644
--- a/ios/chrome/browser/main/browser_util_unittest.mm
+++ b/ios/chrome/browser/main/browser_util_unittest.mm
@@ -12,7 +12,6 @@
 #include "ios/chrome/browser/main/test_browser.h"
 #import "ios/chrome/browser/snapshots/snapshot_browser_agent.h"
 #import "ios/chrome/browser/snapshots/snapshot_tab_helper.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/browser/web_state_list/web_state_opener.h"
 #import "ios/web/public/test/fakes/fake_web_state.h"
@@ -60,9 +59,7 @@
   web::FakeWebState* AppendNewWebState(Browser* browser) {
     auto fake_web_state = std::make_unique<web::FakeWebState>();
     web::FakeWebState* inserted_web_state = fake_web_state.get();
-    TabIdTabHelper::CreateForWebState(inserted_web_state);
-    NSString* tab_id =
-        TabIdTabHelper::FromWebState(inserted_web_state)->tab_id();
+    NSString* tab_id = inserted_web_state->GetStableIdentifier();
     SnapshotTabHelper::CreateForWebState(inserted_web_state, tab_id);
     browser->GetWebStateList()->InsertWebState(
         WebStateList::kInvalidIndex, std::move(fake_web_state),
@@ -73,7 +70,7 @@
   // Returns the tab ID for the web state at |index| in |browser|.
   NSString* GetTabIDForWebStateAt(int index, Browser* browser) {
     web::WebState* web_state = browser->GetWebStateList()->GetWebStateAt(index);
-    return TabIdTabHelper::FromWebState(web_state)->tab_id();
+    return web_state->GetStableIdentifier();
   }
 
   web::WebTaskEnvironment task_environment_;
diff --git a/ios/chrome/browser/open_in/BUILD.gn b/ios/chrome/browser/open_in/BUILD.gn
index 9836c27b6f74ef..dae625bbbf343a 100644
--- a/ios/chrome/browser/open_in/BUILD.gn
+++ b/ios/chrome/browser/open_in/BUILD.gn
@@ -35,7 +35,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/ui/open_in",
-    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/web/public/test/fakes",
     "//testing/gtest",
     "//ui/base:base",
diff --git a/ios/chrome/browser/passwords/password_controller.mm b/ios/chrome/browser/passwords/password_controller.mm
index c242d13f1c7989..b3f9392a360856 100644
--- a/ios/chrome/browser/passwords/password_controller.mm
+++ b/ios/chrome/browser/passwords/password_controller.mm
@@ -61,7 +61,6 @@
 #import "ios/chrome/browser/ui/commands/command_dispatcher.h"
 #import "ios/chrome/browser/ui/commands/password_breach_commands.h"
 #import "ios/chrome/browser/ui/commands/password_protection_commands.h"
-#include "ios/chrome/browser/web/tab_id_tab_helper.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ios/web/common/url_scheme_util.h"
 #include "ios/web/public/js_messaging/web_frame.h"
@@ -323,9 +322,8 @@ - (void)showAutosigninNotification:(std::unique_ptr<PasswordForm>)formSignedIn {
                    iconURL:formSignedIn->icon_url
           URLLoaderFactory:_webState->GetBrowserState()
                                ->GetSharedURLLoaderFactory()];
-  TabIdTabHelper* tabIdHelper = TabIdTabHelper::FromWebState(_webState);
   if (![_delegate displaySignInNotification:self.notifyAutoSigninViewController
-                                  fromTabId:tabIdHelper->tab_id()]) {
+                                  fromTabId:_webState->GetStableIdentifier()]) {
     // The notification was not shown. Store the password form in
     // |_pendingAutoSigninPasswordForm| to show the notification later.
     _pendingAutoSigninPasswordForm = std::move(formSignedIn);
diff --git a/ios/chrome/browser/policy/reporting/report_generator_ios_unittest.mm b/ios/chrome/browser/policy/reporting/report_generator_ios_unittest.mm
index d4a813f693c53e..d33a467b8556a2 100644
--- a/ios/chrome/browser/policy/reporting/report_generator_ios_unittest.mm
+++ b/ios/chrome/browser/policy/reporting/report_generator_ios_unittest.mm
@@ -12,6 +12,7 @@
 #include "base/run_loop.h"
 #include "base/test/bind.h"
 #include "base/test/metrics/histogram_tester.h"
+#include "components/enterprise/browser/reporting/report_request.h"
 #include "components/policy/core/common/cloud/cloud_policy_util.h"
 #include "components/policy/core/common/mock_policy_service.h"
 #include "components/policy/core/common/policy_map.h"
@@ -39,8 +40,6 @@
 
 class ReportGeneratorIOSTest : public PlatformTest {
  public:
-  using ReportRequest = definition::ReportRequest;
-
   ReportGeneratorIOSTest() : generator_(&delegate_factory_) {
     TestChromeBrowserState::Builder builder;
     builder.SetPath(kProfilePath);
@@ -88,16 +87,15 @@ void InitPolicyMap() {
     histogram_tester_ = std::make_unique<base::HistogramTester>();
     base::RunLoop run_loop;
     std::vector<std::unique_ptr<ReportRequest>> reqs;
-    generator_.Generate(
-        ReportType::kFull,
-        base::BindLambdaForTesting(
-            [&run_loop, &reqs](ReportGenerator::ReportRequests requests) {
-              while (!requests.empty()) {
-                reqs.push_back(std::move(requests.front()));
-                requests.pop();
-              }
-              run_loop.Quit();
-            }));
+    generator_.Generate(ReportType::kFull,
+                        base::BindLambdaForTesting(
+                            [&run_loop, &reqs](ReportRequestQueue requests) {
+                              while (!requests.empty()) {
+                                reqs.push_back(std::move(requests.front()));
+                                requests.pop();
+                              }
+                              run_loop.Quit();
+                            }));
     run_loop.Run();
     VerifyMetrics(reqs);
     return reqs;
@@ -134,27 +132,34 @@ void VerifyMetrics(std::vector<std::unique_ptr<ReportRequest>>& rets) {
   // Verify the basic request
   auto* basic_request = requests[0].get();
 
-  EXPECT_NE(std::string(), basic_request->computer_name());
-  EXPECT_EQ(std::string(), basic_request->serial_number());
-  EXPECT_EQ(
-      policy::GetBrowserDeviceIdentifier()->SerializePartialAsString(),
-      basic_request->browser_device_identifier().SerializePartialAsString());
-  EXPECT_NE(std::string(), basic_request->device_model());
-  EXPECT_NE(std::string(), basic_request->brand_name());
+  EXPECT_NE(std::string(),
+            basic_request->GetDeviceReportRequest().computer_name());
+  EXPECT_EQ(std::string(),
+            basic_request->GetDeviceReportRequest().serial_number());
+  EXPECT_EQ(policy::GetBrowserDeviceIdentifier()->SerializePartialAsString(),
+            basic_request->GetDeviceReportRequest()
+                .browser_device_identifier()
+                .SerializePartialAsString());
+  EXPECT_NE(std::string(),
+            basic_request->GetDeviceReportRequest().device_model());
+  EXPECT_NE(std::string(),
+            basic_request->GetDeviceReportRequest().brand_name());
 
   // Verify the OS report
-  EXPECT_TRUE(basic_request->has_os_report());
-  auto& os_report = basic_request->os_report();
+  EXPECT_TRUE(basic_request->GetDeviceReportRequest().has_os_report());
+  auto& os_report = basic_request->GetDeviceReportRequest().os_report();
   EXPECT_NE(std::string(), os_report.name());
   EXPECT_NE(std::string(), os_report.arch());
   EXPECT_NE(std::string(), os_report.version());
 
   // Ensure there are no partial reports
-  EXPECT_EQ(0, basic_request->partial_report_types_size());
+  EXPECT_EQ(
+      0, basic_request->GetDeviceReportRequest().partial_report_types_size());
 
   // Verify the browser report
-  EXPECT_TRUE(basic_request->has_browser_report());
-  auto& browser_report = basic_request->browser_report();
+  EXPECT_TRUE(basic_request->GetDeviceReportRequest().has_browser_report());
+  auto& browser_report =
+      basic_request->GetDeviceReportRequest().browser_report();
   EXPECT_NE(std::string(), browser_report.browser_version());
   EXPECT_TRUE(browser_report.has_channel());
   EXPECT_NE(std::string(), browser_report.executable_path());
diff --git a/ios/chrome/browser/policy/reporting/report_scheduler_ios_unittest.mm b/ios/chrome/browser/policy/reporting/report_scheduler_ios_unittest.mm
index a085053e996d3c..636d5d450b6ac2 100644
--- a/ios/chrome/browser/policy/reporting/report_scheduler_ios_unittest.mm
+++ b/ios/chrome/browser/policy/reporting/report_scheduler_ios_unittest.mm
@@ -16,6 +16,7 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/enterprise/browser/controller/fake_browser_dm_token_storage.h"
 #include "components/enterprise/browser/reporting/common_pref_names.h"
+#include "components/enterprise/browser/reporting/report_request.h"
 #include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
 #include "ios/chrome/browser/policy/reporting/reporting_delegate_factory_ios.h"
 #include "ios/chrome/test/ios_chrome_scoped_testing_local_state.h"
@@ -42,9 +43,9 @@
 }  // namespace
 
 ACTION_P(ScheduleGeneratorCallback, request_number) {
-  ReportGenerator::ReportRequests requests;
+  ReportRequestQueue requests;
   for (int i = 0; i < request_number; i++)
-    requests.push(std::make_unique<ReportGenerator::ReportRequest>());
+    requests.push(std::make_unique<ReportRequest>(ReportType::kFull));
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::BindOnce(std::move(arg0), std::move(requests)));
 }
@@ -61,7 +62,7 @@ void Generate(ReportType report_type, ReportCallback callback) override {
   }
   MOCK_METHOD2(OnGenerate,
                void(ReportType report_type, ReportCallback& callback));
-  MOCK_METHOD0(GenerateBasic, ReportRequests());
+  MOCK_METHOD0(GenerateBasic, ReportRequestQueue());
 };
 
 class MockReportUploader : public ReportUploader {
@@ -71,7 +72,7 @@ void Generate(ReportType report_type, ReportCallback callback) override {
   MockReportUploader& operator=(const MockReportUploader&) = delete;
   ~MockReportUploader() override = default;
 
-  MOCK_METHOD2(SetRequestAndUpload, void(ReportRequests, ReportCallback));
+  MOCK_METHOD2(SetRequestAndUpload, void(ReportRequestQueue, ReportCallback));
 };
 
 class ReportSchedulerIOSTest : public PlatformTest {
@@ -134,10 +135,10 @@ void ExpectLastUploadTimestampUpdated(bool is_updated) {
     }
   }
 
-  ReportGenerator::ReportRequests CreateRequests(int number) {
-    ReportGenerator::ReportRequests requests;
+  ReportRequestQueue CreateRequests(int number) {
+    ReportRequestQueue requests;
     for (int i = 0; i < number; i++)
-      requests.push(std::make_unique<ReportGenerator::ReportRequest>());
+      requests.push(std::make_unique<ReportRequest>(ReportType::kFull));
     return requests;
   }
 
diff --git a/ios/chrome/browser/signin/authentication_service.h b/ios/chrome/browser/signin/authentication_service.h
index d4a98c28d08716..165b2f1397ff29 100644
--- a/ios/chrome/browser/signin/authentication_service.h
+++ b/ios/chrome/browser/signin/authentication_service.h
@@ -178,8 +178,11 @@ class AuthenticationService : public KeyedService,
   //
   // |should_prompt| indicates whether the user should be prompted with the
   // resign-in infobar if the method signs out.
+  // |device_restore| should be true only when called from |Initialize()| and
+  // Chrome is started after a device restore.
   void HandleForgottenIdentity(ChromeIdentity* invalid_identity,
-                               bool should_prompt);
+                               bool should_prompt,
+                               bool device_restore);
 
   // Checks if the authenticated identity was removed by calling
   // |HandleForgottenIdentity|. Reloads the OAuth2 token service accounts if the
diff --git a/ios/chrome/browser/signin/authentication_service.mm b/ios/chrome/browser/signin/authentication_service.mm
index 6da59f6d7036e2..e20bd476af89de 100644
--- a/ios/chrome/browser/signin/authentication_service.mm
+++ b/ios/chrome/browser/signin/authentication_service.mm
@@ -7,6 +7,7 @@
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/location.h"
+#import "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/task/single_thread_task_runner.h"
@@ -24,6 +25,7 @@
 #include "ios/chrome/browser/pref_names.h"
 #import "ios/chrome/browser/signin/authentication_service_delegate.h"
 #import "ios/chrome/browser/signin/authentication_service_observer.h"
+#import "ios/chrome/browser/signin/signin_util.h"
 #include "ios/chrome/browser/sync/sync_setup_service.h"
 #include "ios/chrome/browser/system_flags.h"
 #import "ios/chrome/browser/ui/authentication/signin/signin_utils.h"
@@ -50,6 +52,18 @@
   LOGIN_METHOD_AND_SYNC_STATE_COUNT
 };
 
+// Enum for Signin.IOSDeviceRestoreSignedInState histogram.
+// Entries should not be renumbered and numeric values should never be reused.
+enum class IOSDeviceRestoreSignedinState : int {
+  // Case when the user is not signed in before the device restore.
+  kUserNotSignedInBeforeDeviceRestore = 0,
+  // Case when the user is signed in before the device restore but not after.
+  kUserSignedInBeforeDeviceRestoreAndSignedOutAfterDeviceRestore = 1,
+  // Case when the user is signed in before and after the device restore.
+  kUserSignedInBeforeAndAfterDeviceRestore = 2,
+  kMaxValue = kUserSignedInBeforeAndAfterDeviceRestore,
+};
+
 // A fake account id used in the list of last signed in accounts when migrating
 // an email for which the corresponding account was removed.
 constexpr char kFakeAccountIdForRemovedAccount[] = "0000000000000";
@@ -100,12 +114,18 @@ CoreAccountId ChromeIdentityToAccountID(
     std::unique_ptr<AuthenticationServiceDelegate> delegate) {
   CHECK(delegate);
   CHECK(!initialized());
+  bool has_primary_account_before_initialize =
+      identity_manager_->HasPrimaryAccount(signin::ConsentLevel::kSignin);
+  int account_count_before_initialize =
+      identity_manager_->GetAccountsWithRefreshTokens().size();
   delegate_ = std::move(delegate);
+  signin::Tribool device_restore_session = IsFirstSessionAfterDeviceRestore();
   initialized_ = true;
 
   MigrateAccountsStoredInPrefsIfNeeded();
 
-  HandleForgottenIdentity(nil, true /* should_prompt */);
+  HandleForgottenIdentity(nil, /*should_prompt=*/true,
+                          device_restore_session == signin::Tribool::kTrue);
 
   crash_keys::SetCurrentlySignedIn(
       HasPrimaryIdentity(signin::ConsentLevel::kSignin));
@@ -122,6 +142,33 @@ CoreAccountId ChromeIdentityToAccountID(
 
   identity_manager_observation_.Observe(identity_manager_);
   OnApplicationWillEnterForeground();
+  bool has_primary_account_after_initialize =
+      identity_manager_->HasPrimaryAccount(signin::ConsentLevel::kSignin);
+  DCHECK(!has_primary_account_after_initialize ||
+         has_primary_account_before_initialize);
+  if (device_restore_session == signin::Tribool::kTrue) {
+    // Records device restore histograms.
+    if (has_primary_account_before_initialize) {
+      base::UmaHistogramCounts100("Signin.IOSDeviceRestoreIdentityCountBefore",
+                                  account_count_before_initialize);
+      int account_count_after_initialize =
+          identity_manager_->GetAccountsWithRefreshTokens().size();
+      base::UmaHistogramCounts100("Signin.IOSDeviceRestoreIdentityCountAfter",
+                                  account_count_after_initialize);
+    }
+    IOSDeviceRestoreSignedinState signed_in_state =
+        IOSDeviceRestoreSignedinState::kUserNotSignedInBeforeDeviceRestore;
+    if (has_primary_account_before_initialize) {
+      signed_in_state =
+          has_primary_account_after_initialize
+              ? IOSDeviceRestoreSignedinState::
+                    kUserSignedInBeforeAndAfterDeviceRestore
+              : IOSDeviceRestoreSignedinState::
+                    kUserSignedInBeforeDeviceRestoreAndSignedOutAfterDeviceRestore;
+    }
+    base::UmaHistogramEnumeration("Signin.IOSDeviceRestoreSignedInState",
+                                  signed_in_state);
+  }
 }
 
 void AuthenticationService::Shutdown() {
@@ -528,8 +575,10 @@ CoreAccountId ChromeIdentityToAccountID(
   // might still be accessible in SSO, and |OnIdentityListChanged| will handle
   // this when |identity| will actually disappear from SSO.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::BindOnce(&AuthenticationService::HandleForgottenIdentity,
-                                base::Unretained(this), identity, true));
+      FROM_HERE,
+      base::BindOnce(&AuthenticationService::HandleForgottenIdentity,
+                     base::Unretained(this), identity, /*should_prompt=*/true,
+                     /*device_restore=*/false));
 }
 
 void AuthenticationService::OnChromeIdentityServiceWillBeDestroyed() {
@@ -538,7 +587,8 @@ CoreAccountId ChromeIdentityToAccountID(
 
 void AuthenticationService::HandleForgottenIdentity(
     ChromeIdentity* invalid_identity,
-    bool should_prompt) {
+    bool should_prompt,
+    bool device_restore) {
   if (!identity_manager_->HasPrimaryAccount(signin::ConsentLevel::kSignin)) {
     // User is not signed in. Nothing to do here.
     return;
@@ -563,9 +613,19 @@ CoreAccountId ChromeIdentityToAccountID(
                                        signin::ConsentLevel::kSync);
 
   // Metrics.
-  signin_metrics::ProfileSignout signout_source =
-      account_filtered_out ? signin_metrics::SIGNOUT_PREF_CHANGED
-                           : signin_metrics::ACCOUNT_REMOVED_FROM_DEVICE;
+  signin_metrics::ProfileSignout signout_source;
+  if (account_filtered_out) {
+    // Account filtered out by enterprise policy.
+    signout_source = signin_metrics::SIGNOUT_PREF_CHANGED;
+  } else if (device_restore) {
+    // Account removed from the device after a device restore.
+    signout_source =
+        signin_metrics::IOS_ACCOUNT_REMOVED_FROM_DEVICE_AFTER_RESTORE;
+  } else {
+    // Account removed from the device by another app or the token being
+    // invalid.
+    signout_source = signin_metrics::ACCOUNT_REMOVED_FROM_DEVICE;
+  }
 
   // Sign the user out.
   SignOut(signout_source, /*force_clear_browsing_data=*/false, nil);
@@ -584,7 +644,7 @@ CoreAccountId ChromeIdentityToAccountID(
 
   base::AutoReset<bool> auto_reset(&is_reloading_credentials_, true);
 
-  HandleForgottenIdentity(nil, keychain_reload);
+  HandleForgottenIdentity(nil, keychain_reload, /*device_restore=*/false);
   if (!HasPrimaryIdentity(signin::ConsentLevel::kSignin))
     return;
 
diff --git a/ios/chrome/browser/snapshots/BUILD.gn b/ios/chrome/browser/snapshots/BUILD.gn
index 8d98d232ab811b..7a2942d073ae57 100644
--- a/ios/chrome/browser/snapshots/BUILD.gn
+++ b/ios/chrome/browser/snapshots/BUILD.gn
@@ -32,7 +32,6 @@ source_set("snapshots") {
     "//ios/chrome/browser/sessions:scene_util",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/third_party/webkit",
     "//ios/web/public",
@@ -75,7 +74,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/web",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes:fakes",
diff --git a/ios/chrome/browser/snapshots/snapshot_browser_agent.mm b/ios/chrome/browser/snapshots/snapshot_browser_agent.mm
index a71e64b1ea7203..73999da2b305d2 100644
--- a/ios/chrome/browser/snapshots/snapshot_browser_agent.mm
+++ b/ios/chrome/browser/snapshots/snapshot_browser_agent.mm
@@ -13,7 +13,6 @@
 #import "ios/chrome/browser/sessions/scene_util.h"
 #import "ios/chrome/browser/snapshots/snapshot_cache.h"
 #import "ios/chrome/browser/snapshots/snapshot_tab_helper.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -129,7 +128,7 @@
       [NSMutableSet setWithCapacity:web_state_list->count()];
   for (int index = 0; index < web_state_list->count(); ++index) {
     web::WebState* web_state = web_state_list->GetWebStateAt(index);
-    [tab_ids addObject:TabIdTabHelper::FromWebState(web_state)->tab_id()];
+    [tab_ids addObject:web_state->GetStableIdentifier()];
   }
   return tab_ids;
 }
diff --git a/ios/chrome/browser/snapshots/snapshot_cache_web_state_list_observer.mm b/ios/chrome/browser/snapshots/snapshot_cache_web_state_list_observer.mm
index b6b29ad52f1b02..f2570d9d8236f4 100644
--- a/ios/chrome/browser/snapshots/snapshot_cache_web_state_list_observer.mm
+++ b/ios/chrome/browser/snapshots/snapshot_cache_web_state_list_observer.mm
@@ -6,8 +6,8 @@
 
 #include "base/check.h"
 #import "ios/chrome/browser/snapshots/snapshot_cache.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
+#import "ios/web/public/web_state.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
@@ -34,12 +34,12 @@
   NSMutableSet<NSString*>* set = [NSMutableSet set];
   if (active_index > 0) {
     web::WebState* web_state = web_state_list->GetWebStateAt(active_index - 1);
-    [set addObject:TabIdTabHelper::FromWebState(web_state)->tab_id()];
+    [set addObject:web_state->GetStableIdentifier()];
   }
 
   if (active_index + 1 < web_state_list->count()) {
     web::WebState* web_state = web_state_list->GetWebStateAt(active_index + 1);
-    [set addObject:TabIdTabHelper::FromWebState(web_state)->tab_id()];
+    [set addObject:web_state->GetStableIdentifier()];
   }
 
   snapshot_cache_.pinnedIDs = [set copy];
diff --git a/ios/chrome/browser/snapshots/snapshot_tab_helper_unittest.mm b/ios/chrome/browser/snapshots/snapshot_tab_helper_unittest.mm
index 96e974d37aef77..4178ce55579471 100644
--- a/ios/chrome/browser/snapshots/snapshot_tab_helper_unittest.mm
+++ b/ios/chrome/browser/snapshots/snapshot_tab_helper_unittest.mm
@@ -10,7 +10,6 @@
 #import "ios/chrome/browser/snapshots/snapshot_cache.h"
 #import "ios/chrome/browser/ui/image_util/image_util.h"
 #import "ios/chrome/browser/ui/util/uikit_ui_util.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/web/public/test/fakes/fake_web_state.h"
 #include "ios/web/public/test/web_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -351,9 +350,8 @@ void SetCachedSnapshot(UIImage* image) {
 TEST_F(SnapshotTabHelperTest, ClosingWebStateDoesNotRemoveSnapshot) {
   id partialMock = OCMPartialMock(snapshot_cache_);
   auto web_state = std::make_unique<web::FakeWebState>();
-  TabIdTabHelper::CreateForWebState(web_state.get());
 
-  NSString* tab_id = TabIdTabHelper::FromWebState(web_state.get())->tab_id();
+  NSString* tab_id = web_state.get()->GetStableIdentifier();
   SnapshotTabHelper::CreateForWebState(web_state.get(), tab_id);
   [[partialMock reject] removeImageWithSnapshotID:tab_id];
 
diff --git a/ios/chrome/browser/tabs/tab_helper_util.mm b/ios/chrome/browser/tabs/tab_helper_util.mm
index 7cfcf1f6d54425..dac32d99d67cf9 100644
--- a/ios/chrome/browser/tabs/tab_helper_util.mm
+++ b/ios/chrome/browser/tabs/tab_helper_util.mm
@@ -78,7 +78,6 @@
 #import "ios/chrome/browser/web/print/print_tab_helper.h"
 #import "ios/chrome/browser/web/sad_tab_tab_helper.h"
 #import "ios/chrome/browser/web/session_state/web_session_state_tab_helper.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_tab_helper.h"
 #import "ios/components/security_interstitials/ios_blocking_page_tab_helper.h"
 #import "ios/components/security_interstitials/lookalikes/lookalike_url_container.h"
@@ -89,9 +88,6 @@
 #import "ios/web/public/web_state.h"
 
 void AttachTabHelpers(web::WebState* web_state, bool for_prerender) {
-  // TabIdHelper sets up the tab ID.
-  TabIdTabHelper::CreateForWebState(web_state);
-
   ChromeBrowserState* browser_state =
       ChromeBrowserState::FromBrowserState(web_state->GetBrowserState());
 
@@ -99,7 +95,6 @@ void AttachTabHelpers(web::WebState* web_state, bool for_prerender) {
   // so it needs to be created before them.
   IOSChromeSessionTabHelper::CreateForWebState(web_state);
 
-  NSString* tab_id = TabIdTabHelper::FromWebState(web_state)->tab_id();
   VoiceSearchNavigationTabHelper::CreateForWebState(web_state);
   IOSChromeSyncedTabDelegate::CreateForWebState(web_state);
   InfoBarManagerImpl::CreateForWebState(web_state);
@@ -200,7 +195,8 @@ void AttachTabHelpers(web::WebState* web_state, bool for_prerender) {
   // condition can be removed.
   if (!for_prerender) {
     SadTabTabHelper::CreateForWebState(web_state);
-    SnapshotTabHelper::CreateForWebState(web_state, tab_id);
+    SnapshotTabHelper::CreateForWebState(web_state,
+                                         web_state->GetStableIdentifier());
     PagePlaceholderTabHelper::CreateForWebState(web_state);
     PrintTabHelper::CreateForWebState(web_state);
     InfobarBadgeTabHelper::CreateForWebState(web_state);
diff --git a/ios/chrome/browser/u2f/BUILD.gn b/ios/chrome/browser/u2f/BUILD.gn
index fd09a0e018fd66..9b0dd70c48ceb9 100644
--- a/ios/chrome/browser/u2f/BUILD.gn
+++ b/ios/chrome/browser/u2f/BUILD.gn
@@ -10,7 +10,6 @@ source_set("u2f") {
   deps = [
     ":u2f_internal",
     "//base",
-    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/web",
     "//net",
     "//url",
@@ -49,7 +48,6 @@ source_set("unit_tests") {
     ":u2f_internal",
     "//base",
     "//ios/chrome/browser",
-    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/web/public/deprecated",
     "//ios/web/public/test/fakes",
     "//net",
diff --git a/ios/chrome/browser/u2f/u2f_tab_helper.mm b/ios/chrome/browser/u2f/u2f_tab_helper.mm
index c18e200d13f8c5..cb6dabd155cbb9 100644
--- a/ios/chrome/browser/u2f/u2f_tab_helper.mm
+++ b/ios/chrome/browser/u2f/u2f_tab_helper.mm
@@ -6,7 +6,6 @@
 
 #import "base/strings/sys_string_conversions.h"
 #import "ios/chrome/browser/u2f/u2f_controller.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/web/public/web_state.h"
 #include "net/base/url_util.h"
 
@@ -47,7 +46,7 @@
   // Create U2FController object lazily.
   if (!second_factor_controller_)
     second_factor_controller_ = [[U2FController alloc] init];
-  NSString* tab_id = TabIdTabHelper::FromWebState(web_state_)->tab_id();
+  NSString* tab_id = web_state_->GetStableIdentifier();
   return [second_factor_controller_
       XCallbackFromRequestURL:request_url
                     originURL:origin_url
diff --git a/ios/chrome/browser/u2f/u2f_tab_helper_unittest.mm b/ios/chrome/browser/u2f/u2f_tab_helper_unittest.mm
index 29fedce79bdd29..c018019af46d80 100644
--- a/ios/chrome/browser/u2f/u2f_tab_helper_unittest.mm
+++ b/ios/chrome/browser/u2f/u2f_tab_helper_unittest.mm
@@ -9,7 +9,6 @@
 #import "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #import "ios/chrome/browser/chrome_url_util.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #include "ios/web/public/deprecated/url_verification_constants.h"
 #import "ios/web/public/test/fakes/fake_web_state.h"
 #include "net/base/escape.h"
@@ -27,7 +26,6 @@
  protected:
   U2FTabHelperTest() {
     U2FTabHelper::CreateForWebState(&web_state_);
-    TabIdTabHelper::CreateForWebState(&web_state_);
     url::AddStandardScheme("chromium", url::SCHEME_WITH_HOST);
     [[ChromeAppConstants sharedInstance]
         setCallbackSchemeForTesting:@"chromium"];
@@ -35,10 +33,6 @@
 
   U2FTabHelper* tab_helper() { return U2FTabHelper::FromWebState(&web_state_); }
 
-  NSString* tab_id() {
-    return TabIdTabHelper::FromWebState(&web_state_)->tab_id();
-  }
-
   // Returns the requestUUID NSString from a properly formatted U2F XCallback
   // GURL.
   NSString* GetRequestUuidFromXCallbackUrl(const GURL& xcallback_url) {
@@ -66,9 +60,9 @@
   NSString* GetRegexString(const GURL& request_url, const GURL& origin_url) {
     return [@[
       @"u2f-x-callback://x-callback-url/auth\\?x-success=.+u2f-callback",
-      @"%2F%3FtabID%3D", tab_id(),
+      @"%2F%3FtabID%3D", web_state_.GetStableIdentifier(),
       @"%26requestUUID%3.+%26isU2F%3D1&x-error=.+u2f-callback%2F%3FtabID%3D",
-      tab_id(), @"%26requestUUID%3.+%26isU2F%3D1&data=",
+      web_state_.GetStableIdentifier(), @"%26requestUUID%3.+%26isU2F%3D1&data=",
       base::SysUTF8ToNSString(
           net::EscapeQueryParamValue(request_url.query(), true)),
       @"&origin=",
@@ -184,7 +178,7 @@ GURL correct_request_uuid_url(
       "chromium://u2f-callback?requestUUID=" +
       base::SysNSStringToUTF8(request_uuid) +
       "&requestId=TestID&registrationData=TestData&tabID=" +
-      base::SysNSStringToUTF8(tab_id()));
+      base::SysNSStringToUTF8(web_state_.GetStableIdentifier()));
 
   EXPECT_TRUE(web_state_.GetLastExecutedJavascript().empty());
 
@@ -216,23 +210,24 @@ GURL correct_request_uuid_url(
   GURL no_request_uuid_url(
       "chromium://"
       "u2f-callback?requestId=TestID&registrationData=TestData&tabID=" +
-      base::SysNSStringToUTF8(tab_id()));
+      base::SysNSStringToUTF8(web_state_.GetStableIdentifier()));
   tab_helper()->EvaluateU2FResult(no_request_uuid_url);
   EXPECT_TRUE(web_state_.GetLastExecutedJavascript().empty());
 
   // Test when U2F callback has wrong requestUUID value.
-  GURL wrong_request_uuid_url("chromium://"
-                              "u2f-callback?requestId=TestID&registrationData="
-                              "TestData&requestUUID=123&tabID=" +
-                              base::SysNSStringToUTF8(tab_id()));
+  GURL wrong_request_uuid_url(
+      "chromium://"
+      "u2f-callback?requestId=TestID&registrationData="
+      "TestData&requestUUID=123&tabID=" +
+      base::SysNSStringToUTF8(web_state_.GetStableIdentifier()));
   tab_helper()->EvaluateU2FResult(wrong_request_uuid_url);
   EXPECT_TRUE(web_state_.GetLastExecutedJavascript().empty());
 
   // Test when U2F callback has no registrationData value.
   GURL no_registration_request_url(
       "chromium://u2f-callback?requestUUID=" +
-      base::SysNSStringToUTF8(request_uuid) +
-      "&requestId=TestID&tabID=" + base::SysNSStringToUTF8(tab_id()));
+      base::SysNSStringToUTF8(request_uuid) + "&requestId=TestID&tabID=" +
+      base::SysNSStringToUTF8(web_state_.GetStableIdentifier()));
 
   tab_helper()->EvaluateU2FResult(no_registration_request_url);
   EXPECT_TRUE(web_state_.GetLastExecutedJavascript().empty());
@@ -242,7 +237,7 @@ GURL wrong_host_name_url(
       "chromium://"
       "evil-callback?requestId=TestID&registrationData=TestData&requestUUID=" +
       base::SysNSStringToUTF8(request_uuid) +
-      "&tabID=" + base::SysNSStringToUTF8(tab_id()));
+      "&tabID=" + base::SysNSStringToUTF8(web_state_.GetStableIdentifier()));
   tab_helper()->EvaluateU2FResult(wrong_host_name_url);
   EXPECT_TRUE(web_state_.GetLastExecutedJavascript().empty());
 }
@@ -266,7 +261,7 @@ GURL correct_request_uuid_url(
       "chromium://"
       "u2f-callback?requestId=TestID&registrationData=TestData&requestUUID=" +
       base::SysNSStringToUTF8(request_uuid) +
-      "&tabID=" + base::SysNSStringToUTF8(tab_id()));
+      "&tabID=" + base::SysNSStringToUTF8(web_state_.GetStableIdentifier()));
 
   tab_helper()->EvaluateU2FResult(correct_request_uuid_url);
   EXPECT_TRUE(web_state_.GetLastExecutedJavascript().empty());
@@ -280,7 +275,7 @@ GURL correct_request_uuid_url(
       "chromium://"
       "u2f-callback?requestId=TestID&registrationData=TestData&requestUUID=" +
       base::SysNSStringToUTF8(request_uuid) +
-      "&tabID=" + base::SysNSStringToUTF8(tab_id()));
+      "&tabID=" + base::SysNSStringToUTF8(web_state_.GetStableIdentifier()));
 
   tab_helper()->EvaluateU2FResult(correct_request_uuid_url);
   EXPECT_TRUE(web_state_.GetLastExecutedJavascript().empty());
diff --git a/ios/chrome/browser/ui/authentication/cells/BUILD.gn b/ios/chrome/browser/ui/authentication/cells/BUILD.gn
index 4178acb228b4f3..bf231606d75737 100644
--- a/ios/chrome/browser/ui/authentication/cells/BUILD.gn
+++ b/ios/chrome/browser/ui/authentication/cells/BUILD.gn
@@ -27,6 +27,8 @@ source_set("cells") {
     "//build:branding_buildflags",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/signin:constants",
+    "//ios/chrome/browser/signin:signin_util",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/authentication/views",
     "//ios/chrome/browser/ui/collection_view/cells",
diff --git a/ios/chrome/browser/ui/authentication/cells/signin_promo_view_configurator.h b/ios/chrome/browser/ui/authentication/cells/signin_promo_view_configurator.h
index ce11c6c2a33d39..76cf3f944e0f2b 100644
--- a/ios/chrome/browser/ui/authentication/cells/signin_promo_view_configurator.h
+++ b/ios/chrome/browser/ui/authentication/cells/signin_promo_view_configurator.h
@@ -16,8 +16,10 @@
 - (instancetype)init NS_UNAVAILABLE;
 
 // Initializes the instance.
-// |userEmail| is used as a proxy to determine if accounts have
-// been added to the device.
+// If |viewMode| is SigninPromoViewModeNoAccounts, then |userEmail|,
+// |userGivenName| and |userImage| have to be nil.
+// Otherwise |userEmail| and |userImage| can't be nil. |userImage| has to be to
+// the size of IdentityAvatarSize::SmallSize.
 - (instancetype)initWithSigninPromoViewMode:(SigninPromoViewMode)viewMode
                                   userEmail:(NSString*)userEmail
                               userGivenName:(NSString*)userGivenName
diff --git a/ios/chrome/browser/ui/authentication/cells/signin_promo_view_configurator.mm b/ios/chrome/browser/ui/authentication/cells/signin_promo_view_configurator.mm
index 97fba6d58acb83..4e624a630c98c2 100644
--- a/ios/chrome/browser/ui/authentication/cells/signin_promo_view_configurator.mm
+++ b/ios/chrome/browser/ui/authentication/cells/signin_promo_view_configurator.mm
@@ -5,8 +5,11 @@
 #import "ios/chrome/browser/ui/authentication/cells/signin_promo_view_configurator.h"
 
 #include "base/strings/sys_string_conversions.h"
+#import "ios/chrome/browser/signin/constants.h"
+#import "ios/chrome/browser/signin/signin_util.h"
 #import "ios/chrome/browser/ui/authentication/cells/signin_promo_view.h"
 #import "ios/chrome/browser/ui/authentication/cells/signin_promo_view_constants.h"
+#import "ios/chrome/common/ui/util/image_util.h"
 #include "ios/chrome/grit/ios_chromium_strings.h"
 #include "ios/chrome/grit/ios_strings.h"
 #import "ios/public/provider/chrome/browser/signin/signin_resources_api.h"
@@ -68,6 +71,8 @@ - (void)configureSigninPromoView:(SigninPromoView*)signinPromoView {
   std::u16string name16 = SysNSStringToUTF16(name);
   switch (self.signinPromoViewMode) {
     case SigninPromoViewModeNoAccounts: {
+      DCHECK(!name);
+      DCHECK(!self.userImage);
       NSString* signInString = GetNSString(IDS_IOS_SYNC_PROMO_TURN_ON_SYNC);
       signinPromoView.accessibilityLabel = signInString;
       [signinPromoView.primaryButton setTitle:signInString
@@ -94,11 +99,14 @@ - (void)configureSigninPromoView:(SigninPromoView*)signinPromoView {
       break;
     }
   }
-
+  DCHECK(name);
   DCHECK_NE(self.signinPromoViewMode, SigninPromoViewModeNoAccounts);
   UIImage* image = self.userImage;
-  if (!image)
-    image = ios::provider::GetSigninDefaultAvatar();
+  DCHECK(image);
+  CGSize avatarSize =
+      GetSizeForIdentityAvatarSize(IdentityAvatarSize::SmallSize);
+  DCHECK_EQ(avatarSize.width, image.size.width);
+  DCHECK_EQ(avatarSize.height, image.size.height);
   [signinPromoView setProfileImage:image];
 }
 
diff --git a/ios/chrome/browser/ui/browser_view/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view/browser_view_controller.mm
index 0cf1e5a782aaa2..24469c75243ef0 100644
--- a/ios/chrome/browser/ui/browser_view/browser_view_controller.mm
+++ b/ios/chrome/browser/ui/browser_view/browser_view_controller.mm
@@ -151,7 +151,6 @@
 #import "ios/chrome/browser/voice/voice_search_navigations_tab_helper.h"
 #import "ios/chrome/browser/web/page_placeholder_tab_helper.h"
 #import "ios/chrome/browser/web/sad_tab_tab_helper.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/chrome/browser/web/web_navigation_browser_agent.h"
 #import "ios/chrome/browser/web/web_navigation_util.h"
 #import "ios/chrome/browser/web_state_list/all_web_state_observation_forwarder.h"
@@ -3210,8 +3209,7 @@ - (UIView*)infoBarOverlayViewForWebState:(web::WebState*)webState {
 - (BOOL)displaySignInNotification:(UIViewController*)viewController
                         fromTabId:(NSString*)tabId {
   // Check if the call comes from currently visible tab.
-  NSString* visibleTabId =
-      TabIdTabHelper::FromWebState(self.currentWebState)->tab_id();
+  NSString* visibleTabId = self.currentWebState->GetStableIdentifier();
   if ([tabId isEqual:visibleTabId]) {
     [self addChildViewController:viewController];
     [self.view addSubview:viewController.view];
@@ -4015,10 +4013,15 @@ - (void)lensControllerDidTapDismissButton {
 }
 
 - (void)lensControllerDidSelectURL:(NSURL*)URL {
+  // Dismiss the Lens view controller.
+  if (self.presentedViewController != nil) {
+    [self dismissViewControllerAnimated:YES completion:nil];
+  }
+
   // TODO(crbug.com/1234532): Integrate Lens with the browser's navigation
   // stack.
   UrlLoadParams loadParams = UrlLoadParams::InNewTab(net::GURLWithNSURL(URL));
-  loadParams.SetInBackground(YES);
+  loadParams.SetInBackground(NO);
   loadParams.in_incognito = self.isOffTheRecord;
   loadParams.append_to = kCurrentTab;
   UrlLoadingBrowserAgent* loadingAgent =
@@ -4071,8 +4074,7 @@ - (void)webStateList:(WebStateList*)webStateList
     self.browserContainerViewController.contentView = nil;
   }
 
-  [[UpgradeCenter sharedInstance]
-      tabWillClose:TabIdTabHelper::FromWebState(webState)->tab_id()];
+  [[UpgradeCenter sharedInstance] tabWillClose:webState->GetStableIdentifier()];
 }
 
 // Observer method, WebState replaced in |webStateList|.
@@ -4114,7 +4116,7 @@ - (void)webStateList:(WebStateList*)webStateList
   // infobar(s) that are just added.
   infobars::InfoBarManager* infoBarManager =
       InfoBarManagerImpl::FromWebState(webState);
-  NSString* tabID = TabIdTabHelper::FromWebState(webState)->tab_id();
+  NSString* tabID = webState->GetStableIdentifier();
   [[UpgradeCenter sharedInstance] addInfoBarToManager:infoBarManager
                                              forTabId:tabID];
   if (!ReSignInInfoBarDelegate::Create(self.browserState, webState,
diff --git a/ios/chrome/browser/ui/commerce/BUILD.gn b/ios/chrome/browser/ui/commerce/BUILD.gn
index 8e3917f48cb6bf..f11efdfd56427b 100644
--- a/ios/chrome/browser/ui/commerce/BUILD.gn
+++ b/ios/chrome/browser/ui/commerce/BUILD.gn
@@ -18,7 +18,6 @@ source_set("price_card") {
     "price_card/resources:colors",
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser/commerce:commerce",
-    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list:web_state_list",
     "//ios/chrome/common/ui/colors",
     "//ios/web",
diff --git a/ios/chrome/browser/ui/commerce/price_card/price_card_mediator.mm b/ios/chrome/browser/ui/commerce/price_card/price_card_mediator.mm
index ba6fcee8420db0..e368fcb0f63118 100644
--- a/ios/chrome/browser/ui/commerce/price_card/price_card_mediator.mm
+++ b/ios/chrome/browser/ui/commerce/price_card/price_card_mediator.mm
@@ -5,7 +5,6 @@
 #import "ios/chrome/browser/ui/commerce/price_card/price_card_mediator.h"
 
 #import "ios/chrome/browser/ui/commerce/price_card/price_card_item.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/web/public/web_state.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -29,8 +28,7 @@
 web::WebState* GetWebState(WebStateList* web_state_list, NSString* tab_id) {
   for (int i = 0; i < web_state_list->count(); i++) {
     web::WebState* web_state = web_state_list->GetWebStateAt(i);
-    TabIdTabHelper* tab_helper = TabIdTabHelper::FromWebState(web_state);
-    if ([tab_id isEqualToString:tab_helper->tab_id()])
+    if ([tab_id isEqualToString:web_state->GetStableIdentifier()])
       return web_state;
   }
   return nullptr;
diff --git a/ios/chrome/browser/ui/settings/BUILD.gn b/ios/chrome/browser/ui/settings/BUILD.gn
index 70c8feec68bae1..826cb0ce167411 100644
--- a/ios/chrome/browser/ui/settings/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/BUILD.gn
@@ -192,6 +192,7 @@ source_set("settings") {
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/favicon",
     "//ios/chrome/common/ui/util",
+    "//ios/chrome/common/ui/util:image_util",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/mailto",
     "//ios/public/provider/chrome/browser/signin",
diff --git a/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm b/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm
index a8aacaacf17e36..3792632314fa77 100644
--- a/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.mm
@@ -5,6 +5,8 @@
 #import "ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.h"
 
 #include "base/mac/foundation_util.h"
+#import "ios/chrome/browser/signin/constants.h"
+#import "ios/chrome/browser/signin/signin_util.h"
 #import "ios/chrome/browser/ui/authentication/cells/signin_promo_view_configurator.h"
 #import "ios/chrome/browser/ui/authentication/cells/table_view_account_item.h"
 #import "ios/chrome/browser/ui/authentication/cells/table_view_signin_promo_item.h"
@@ -35,6 +37,7 @@
 #include "ios/chrome/browser/ui/ui_feature_flags.h"
 #import "ios/chrome/browser/ui/util/uikit_ui_util.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
+#import "ios/chrome/common/ui/util/image_util.h"
 #import "ios/public/provider/chrome/browser/signin/signin_resources_api.h"
 #include "url/gurl.h"
 
@@ -495,17 +498,32 @@ - (void)loadModel {
       toSectionWithIdentifier:SectionIdentifierAutofill];
 
   // SectionIdentifierAccount.
+  UIImage* signinPromoAvatar = ios::provider::GetSigninDefaultAvatar();
+  CGSize avatarSize =
+      GetSizeForIdentityAvatarSize(IdentityAvatarSize::SmallSize);
+  signinPromoAvatar =
+      ResizeImage(signinPromoAvatar, avatarSize, ProjectionMode::kFill);
   TableViewSigninPromoItem* signinPromo =
       [[TableViewSigninPromoItem alloc] initWithType:ItemTypeAccount];
   signinPromo.configurator = [[SigninPromoViewConfigurator alloc]
       initWithSigninPromoViewMode:SigninPromoViewModeSigninWithAccount
                         userEmail:@"jonhdoe@example.com"
                     userGivenName:@"John Doe"
-                        userImage:nil
+                        userImage:signinPromoAvatar
                    hasCloseButton:NO];
   signinPromo.text = @"Signin promo text example";
   [model addItem:signinPromo toSectionWithIdentifier:SectionIdentifierAccount];
 
+  signinPromo = [[TableViewSigninPromoItem alloc] initWithType:ItemTypeAccount];
+  signinPromo.configurator = [[SigninPromoViewConfigurator alloc]
+      initWithSigninPromoViewMode:SigninPromoViewModeNoAccounts
+                        userEmail:nil
+                    userGivenName:nil
+                        userImage:nil
+                   hasCloseButton:YES];
+  signinPromo.text = @"Signin promo text example";
+  [model addItem:signinPromo toSectionWithIdentifier:SectionIdentifierAccount];
+
   UIImage* defaultAvatar = ios::provider::GetSigninDefaultAvatar();
 
   TableViewAccountItem* accountItemDetailWithError =
diff --git a/ios/chrome/browser/ui/side_swipe/side_swipe_controller.mm b/ios/chrome/browser/ui/side_swipe/side_swipe_controller.mm
index cadcdcc1ffa170..b4996b01fca4fb 100644
--- a/ios/chrome/browser/ui/side_swipe/side_swipe_controller.mm
+++ b/ios/chrome/browser/ui/side_swipe/side_swipe_controller.mm
@@ -26,7 +26,6 @@
 #include "ios/chrome/browser/ui/toolbar/public/side_swipe_toolbar_interacting.h"
 #import "ios/chrome/browser/ui/toolbar/public/side_swipe_toolbar_interacting.h"
 #import "ios/chrome/browser/web/page_placeholder_tab_helper.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/chrome/browser/web/web_navigation_util.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/browser/web_state_list/web_state_list_observer_bridge.h"
@@ -361,7 +360,7 @@ - (void)createGreyCache:(UISwipeGestureRecognizerDirection)direction {
     web::WebState* webState = self.webStateList->GetWebStateAt(index);
     if (webState && PagePlaceholderTabHelper::FromWebState(webState)
                         ->will_add_placeholder_for_next_navigation()) {
-      [sessionIDs addObject:TabIdTabHelper::FromWebState(webState)->tab_id()];
+      [sessionIDs addObject:webState->GetStableIdentifier()];
     }
     index = index + dx;
   }
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/OWNERS b/ios/chrome/browser/ui/tab_switcher/tab_grid/OWNERS
index b98e1d4ce00881..03a9d2cfc37bee 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/OWNERS
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/OWNERS
@@ -1,2 +1,3 @@
 edchin@chromium.org
 marq@chromium.org
+mrefaat@chromium.org
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_mediator.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_mediator.mm
index c03a3a8fa1f5b8..27320435b2f274 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_mediator.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_mediator.mm
@@ -46,7 +46,6 @@
 #import "ios/chrome/browser/ui/tab_switcher/tab_grid/grid/grid_item.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_switcher_item.h"
 #import "ios/chrome/browser/ui/util/url_with_title.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #include "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/browser/web_state_list/web_state_list_observer_bridge.h"
 #import "ios/chrome/browser/web_state_list/web_state_list_serialization.h"
@@ -64,9 +63,8 @@
 namespace {
 // Constructs a TabSwitcherItem from a |web_state|.
 TabSwitcherItem* CreateItem(web::WebState* web_state) {
-  TabIdTabHelper* tab_helper = TabIdTabHelper::FromWebState(web_state);
-  TabSwitcherItem* item =
-      [[TabSwitcherItem alloc] initWithIdentifier:tab_helper->tab_id()];
+  TabSwitcherItem* item = [[TabSwitcherItem alloc]
+      initWithIdentifier:web_state->GetStableIdentifier()];
   // chrome://newtab (NTP) tabs have no title.
   if (IsURLNtp(web_state->GetVisibleURL())) {
     item.hidesTitle = YES;
@@ -94,8 +92,7 @@
   web::WebState* web_state = web_state_list->GetActiveWebState();
   if (!web_state)
     return nil;
-  TabIdTabHelper* tab_helper = TabIdTabHelper::FromWebState(web_state);
-  return tab_helper->tab_id();
+  return web_state->GetStableIdentifier();
 }
 
 void LogPriceDropMetrics(web::WebState* web_state) {
@@ -118,8 +115,7 @@ void LogPriceDropMetrics(web::WebState* web_state) {
 int GetIndexOfTabWithId(WebStateList* web_state_list, NSString* identifier) {
   for (int i = 0; i < web_state_list->count(); i++) {
     web::WebState* web_state = web_state_list->GetWebStateAt(i);
-    TabIdTabHelper* tab_helper = TabIdTabHelper::FromWebState(web_state);
-    if ([identifier isEqualToString:tab_helper->tab_id()])
+    if ([identifier isEqualToString:web_state->GetStableIdentifier()])
       return i;
   }
   return WebStateList::kInvalidIndex;
@@ -131,8 +127,7 @@ int GetIndexOfTabWithId(WebStateList* web_state_list, NSString* identifier) {
                                  NSString* identifier) {
   for (int i = 0; i < web_state_list->count(); i++) {
     web::WebState* web_state = web_state_list->GetWebStateAt(i);
-    TabIdTabHelper* tab_helper = TabIdTabHelper::FromWebState(web_state);
-    if ([identifier isEqualToString:tab_helper->tab_id()])
+    if ([identifier isEqualToString:web_state->GetStableIdentifier()])
       return web_state;
   }
   return nullptr;
@@ -245,8 +240,8 @@ - (void)webStateList:(WebStateList*)webStateList
   DCHECK_EQ(_webStateList, webStateList);
   if (webStateList->IsBatchInProgress())
     return;
-  TabIdTabHelper* tabHelper = TabIdTabHelper::FromWebState(webState);
-  [self.consumer moveItemWithID:tabHelper->tab_id() toIndex:toIndex];
+  [self.consumer moveItemWithID:webState->GetStableIdentifier()
+                        toIndex:toIndex];
 }
 
 - (void)webStateList:(WebStateList*)webStateList
@@ -256,8 +251,7 @@ - (void)webStateList:(WebStateList*)webStateList
   DCHECK_EQ(_webStateList, webStateList);
   if (webStateList->IsBatchInProgress())
     return;
-  TabIdTabHelper* tabHelper = TabIdTabHelper::FromWebState(oldWebState);
-  [self.consumer replaceItemID:tabHelper->tab_id()
+  [self.consumer replaceItemID:oldWebState->GetStableIdentifier()
                       withItem:CreateItem(newWebState)];
   _scopedWebStateObservation->RemoveObservation(oldWebState);
   _scopedWebStateObservation->AddObservation(newWebState);
@@ -271,9 +265,7 @@ - (void)webStateList:(WebStateList*)webStateList
     return;
   if (!webStateList)
     return;
-  TabIdTabHelper* tabHelper = TabIdTabHelper::FromWebState(webState);
-  NSString* itemID = tabHelper->tab_id();
-  [self.consumer removeItemWithID:itemID
+  [self.consumer removeItemWithID:webState->GetStableIdentifier()
                    selectedItemID:GetActiveTabId(webStateList)];
   _scopedWebStateObservation->RemoveObservation(webState);
 }
@@ -293,8 +285,7 @@ - (void)webStateList:(WebStateList*)webStateList
     return;
   }
 
-  TabIdTabHelper* tabHelper = TabIdTabHelper::FromWebState(newWebState);
-  [self.consumer selectItemWithID:tabHelper->tab_id()];
+  [self.consumer selectItemWithID:newWebState->GetStableIdentifier()];
 }
 
 - (void)webStateListWillBeginBatchOperation:(WebStateList*)webStateList {
@@ -327,10 +318,8 @@ - (void)webStateDidChangeTitle:(web::WebState*)webState {
 }
 
 - (void)updateConsumerItemForWebState:(web::WebState*)webState {
-  // Assumption: the ID of the webState didn't change as a result of this load.
-  TabIdTabHelper* tabHelper = TabIdTabHelper::FromWebState(webState);
-  NSString* itemID = tabHelper->tab_id();
-  [self.consumer replaceItemID:itemID withItem:CreateItem(webState)];
+  [self.consumer replaceItemID:webState->GetStableIdentifier()
+                      withItem:CreateItem(webState)];
 }
 
 #pragma mark - SnapshotCacheObserver
@@ -698,7 +687,7 @@ - (void)preloadSnapshotsForVisibleGridSize:(int)gridSize {
                           self.webStateList->count() - 1);
   for (int i = startIndex; i <= endIndex; i++) {
     web::WebState* web_state = self.webStateList->GetWebStateAt(i);
-    NSString* identifier = TabIdTabHelper::FromWebState(web_state)->tab_id();
+    NSString* identifier = web_state->GetStableIdentifier();
     auto cacheImage = ^(UIImage* image) {
       self.appearanceCache[identifier] = image;
     };
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_mediator_unittest.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_mediator_unittest.mm
index d96ca6c7433c1a..2d10180b232bd5 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_mediator_unittest.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_mediator_unittest.mm
@@ -37,7 +37,6 @@
 #import "ios/chrome/browser/ui/ui_feature_flags.h"
 #import "ios/chrome/browser/web/page_placeholder_tab_helper.h"
 #import "ios/chrome/browser/web/session_state/web_session_state_tab_helper.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #include "ios/chrome/browser/web_state_list/fake_web_state_list_delegate.h"
 #include "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/browser/web_state_list/web_state_opener.h"
@@ -247,13 +246,12 @@ - (void)dismissModals {
 
   // WebStateListDelegate implementation.
   void WillAddWebState(web::WebState* web_state) override {
-    TabIdTabHelper::CreateForWebState(web_state);
     // Create NTPTabHelper to ensure VisibleURL is set to kChromeUINewTabURL.
     id delegate = OCMProtocolMock(@protocol(NewTabPageTabHelperDelegate));
     NewTabPageTabHelper::CreateForWebState(web_state);
     NewTabPageTabHelper::FromWebState(web_state)->SetDelegate(delegate);
     PagePlaceholderTabHelper::CreateForWebState(web_state);
-    NSString* identifier = TabIdTabHelper::FromWebState(web_state)->tab_id();
+    NSString* identifier = web_state->GetStableIdentifier();
     SnapshotTabHelper::CreateForWebState(web_state, identifier);
     WebSessionStateTabHelper::CreateForWebState(web_state);
   }
@@ -305,8 +303,7 @@ void SetUp() override {
     // Insert some web states.
     for (int i = 0; i < 3; i++) {
       auto web_state = CreateFakeWebStateWithURL(GURL("https://foo/bar"));
-      NSString* identifier =
-          TabIdTabHelper::FromWebState(web_state.get())->tab_id();
+      NSString* identifier = web_state.get()->GetStableIdentifier();
       // Tab IDs should be unique.
       ASSERT_FALSE([identifiers containsObject:identifier]);
       [identifiers addObject:identifier];
@@ -317,8 +314,7 @@ void SetUp() override {
     original_identifiers_ = [identifiers copy];
     web_state_list_->ActivateWebStateAt(1);
     original_selected_identifier_ =
-        TabIdTabHelper::FromWebState(web_state_list_->GetWebStateAt(1))
-            ->tab_id();
+        web_state_list_->GetWebStateAt(1)->GetStableIdentifier();
     consumer_ = [[FakeConsumer alloc] init];
     mediator_ = [[TabGridMediator alloc] initWithConsumer:consumer_];
     mediator_.browser = browser_.get();
@@ -337,7 +333,6 @@ void SetUp() override {
     web_state->SetNavigationManager(std::move(navigation_manager));
     web_state->SetBrowserState(browser_state_.get());
     web_state->SetCurrentURL(url);
-    TabIdTabHelper::CreateForWebState(web_state.get());
     SnapshotTabHelper::CreateForWebState(web_state.get(),
                                          [[NSUUID UUID] UUIDString]);
     return web_state;
@@ -404,9 +399,7 @@ void SetPriceDropIndicatorsFlag() {
 TEST_F(TabGridMediatorTest, ConsumerInsertItem) {
   ASSERT_EQ(3UL, consumer_.items.count);
   auto web_state = std::make_unique<web::FakeWebState>();
-  TabIdTabHelper::CreateForWebState(web_state.get());
-  NSString* item_identifier =
-      TabIdTabHelper::FromWebState(web_state.get())->tab_id();
+  NSString* item_identifier = web_state.get()->GetStableIdentifier();
   web_state_list_->InsertWebState(1, std::move(web_state),
                                   WebStateList::INSERT_FORCE_INDEX,
                                   WebStateOpener());
@@ -432,9 +425,8 @@ void SetPriceDropIndicatorsFlag() {
 TEST_F(TabGridMediatorTest, ConsumerUpdateSelectedItem) {
   EXPECT_NSEQ(original_selected_identifier_, consumer_.selectedItemID);
   web_state_list_->ActivateWebStateAt(2);
-  EXPECT_NSEQ(
-      TabIdTabHelper::FromWebState(web_state_list_->GetWebStateAt(2))->tab_id(),
-      consumer_.selectedItemID);
+  EXPECT_NSEQ(web_state_list_->GetWebStateAt(2)->GetStableIdentifier(),
+              consumer_.selectedItemID);
 }
 
 // Tests that the consumer is notified when a web state is replaced.
@@ -442,9 +434,7 @@ void SetPriceDropIndicatorsFlag() {
 // id of the new item.
 TEST_F(TabGridMediatorTest, ConsumerReplaceItem) {
   auto new_web_state = std::make_unique<web::FakeWebState>();
-  TabIdTabHelper::CreateForWebState(new_web_state.get());
-  NSString* new_item_identifier =
-      TabIdTabHelper::FromWebState(new_web_state.get())->tab_id();
+  NSString* new_item_identifier = new_web_state->GetStableIdentifier();
   @autoreleasepool {
     web_state_list_->ReplaceWebStateAt(1, std::move(new_web_state));
   }
@@ -470,7 +460,7 @@ void SetPriceDropIndicatorsFlag() {
 TEST_F(TabGridMediatorTest, SelectItemCommand) {
   // Previous selected index is 1.
   NSString* identifier =
-      TabIdTabHelper::FromWebState(web_state_list_->GetWebStateAt(2))->tab_id();
+      web_state_list_->GetWebStateAt(2)->GetStableIdentifier();
   [mediator_ selectItemWithID:identifier];
   EXPECT_EQ(2, web_state_list_->active_index());
   EXPECT_NSEQ(identifier, consumer_.selectedItemID);
@@ -482,7 +472,7 @@ void SetPriceDropIndicatorsFlag() {
 TEST_F(TabGridMediatorTest, CloseItemCommand) {
   // Previously there were 3 items.
   NSString* identifier =
-      TabIdTabHelper::FromWebState(web_state_list_->GetWebStateAt(0))->tab_id();
+      web_state_list_->GetWebStateAt(0)->GetStableIdentifier();
   [mediator_ closeItemWithID:identifier];
   EXPECT_EQ(2, web_state_list_->count());
   EXPECT_EQ(2UL, consumer_.items.count);
@@ -601,7 +591,7 @@ void SetPriceDropIndicatorsFlag() {
   // NavigationManager::GetVisibleURL requires WebState::IsLoading to be true
   // to return pending item's URL.
   EXPECT_EQ("", web_state->GetVisibleURL().spec());
-  NSString* identifier = TabIdTabHelper::FromWebState(web_state)->tab_id();
+  NSString* identifier = web_state->GetStableIdentifier();
   EXPECT_FALSE([original_identifiers_ containsObject:identifier]);
   // Consumer checks.
   EXPECT_EQ(4UL, consumer_.items.count);
@@ -627,7 +617,7 @@ void SetPriceDropIndicatorsFlag() {
   // NavigationManager::GetVisibleURL requires WebState::IsLoading to be true
   // to return pending item's URL.
   EXPECT_EQ("", web_state->GetVisibleURL().spec());
-  NSString* identifier = TabIdTabHelper::FromWebState(web_state)->tab_id();
+  NSString* identifier = web_state->GetStableIdentifier();
   EXPECT_FALSE([original_identifiers_ containsObject:identifier]);
   // Consumer checks.
   EXPECT_EQ(4UL, consumer_.items.count);
@@ -654,7 +644,7 @@ void SetPriceDropIndicatorsFlag() {
   NSMutableArray<NSString*>* pre_move_ids = [[NSMutableArray alloc] init];
   for (int i = 0; i < 3; i++) {
     web::WebState* web_state = web_state_list_->GetWebStateAt(i);
-    [pre_move_ids addObject:TabIdTabHelper::FromWebState(web_state)->tab_id()];
+    [pre_move_ids addObject:web_state->GetStableIdentifier()];
   }
   NSString* pre_move_selected_id =
       pre_move_ids[web_state_list_->active_index()];
@@ -670,7 +660,7 @@ void SetPriceDropIndicatorsFlag() {
   for (int index = 0; index < 2; index++) {
     web::WebState* web_state = web_state_list_->GetWebStateAt(index);
     ASSERT_TRUE(web_state);
-    NSString* identifier = TabIdTabHelper::FromWebState(web_state)->tab_id();
+    NSString* identifier = web_state->GetStableIdentifier();
     EXPECT_NSEQ(identifier, pre_move_ids[(index + 1) % 3]);
     EXPECT_NSEQ(identifier, consumer_.items[index]);
   }
@@ -683,8 +673,7 @@ void SetPriceDropIndicatorsFlag() {
   // No need to set a null price drop - it will be null by default. Simply
   // need to create the helper.
   ShoppingPersistedDataTabHelper::CreateForWebState(web_state_to_select);
-  [mediator_ selectItemWithID:TabIdTabHelper::FromWebState(web_state_to_select)
-                                  ->tab_id()];
+  [mediator_ selectItemWithID:web_state_to_select->GetStableIdentifier()];
   EXPECT_EQ(1, user_action_tester_.GetActionCount(kHasNoPriceDropUserAction));
   EXPECT_EQ(0, user_action_tester_.GetActionCount(kHasPriceDropUserAction));
 }
@@ -694,16 +683,14 @@ void SetPriceDropIndicatorsFlag() {
   web::WebState* web_state_to_select = web_state_list_->GetWebStateAt(2);
   ShoppingPersistedDataTabHelper::CreateForWebState(web_state_to_select);
   SetFakePriceDrop(web_state_to_select);
-  [mediator_ selectItemWithID:TabIdTabHelper::FromWebState(web_state_to_select)
-                                  ->tab_id()];
+  [mediator_ selectItemWithID:web_state_to_select->GetStableIdentifier()];
   EXPECT_EQ(1, user_action_tester_.GetActionCount(kHasPriceDropUserAction));
   EXPECT_EQ(0, user_action_tester_.GetActionCount(kHasNoPriceDropUserAction));
 }
 
 TEST_F(TabGridMediatorTest, TestSelectItemWithPriceDropExperimentOff) {
   web::WebState* web_state_to_select = web_state_list_->GetWebStateAt(2);
-  [mediator_ selectItemWithID:TabIdTabHelper::FromWebState(web_state_to_select)
-                                  ->tab_id()];
+  [mediator_ selectItemWithID:web_state_to_select->GetStableIdentifier()];
   EXPECT_EQ(0, user_action_tester_.GetActionCount(kHasNoPriceDropUserAction));
   EXPECT_EQ(0, user_action_tester_.GetActionCount(kHasPriceDropUserAction));
 }
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_strip/BUILD.gn b/ios/chrome/browser/ui/tab_switcher/tab_strip/BUILD.gn
index 2a7acb6b3e87e2..35c02ef1c89efa 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_strip/BUILD.gn
+++ b/ios/chrome/browser/ui/tab_switcher/tab_strip/BUILD.gn
@@ -42,7 +42,6 @@ source_set("tab_strip_ui") {
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/tab_switcher",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common/ui/colors",
     "//ios/web/public",
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_mediator.mm b/ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_mediator.mm
index c783d6d51c05b2..b5288359b03386 100644
--- a/ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_mediator.mm
+++ b/ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_mediator.mm
@@ -11,7 +11,6 @@
 #import "ios/chrome/browser/tabs/tab_title_util.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_strip/tab_strip_consumer.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_switcher_item.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/chrome/browser/web_state_list/all_web_state_observation_forwarder.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/browser/web_state_list/web_state_list_observer_bridge.h"
@@ -28,9 +27,8 @@
 namespace {
 // Constructs a TabSwitcherItem from a |web_state|.
 TabSwitcherItem* CreateItem(web::WebState* web_state) {
-  TabIdTabHelper* tab_helper = TabIdTabHelper::FromWebState(web_state);
-  TabSwitcherItem* item =
-      [[TabSwitcherItem alloc] initWithIdentifier:tab_helper->tab_id()];
+  TabSwitcherItem* item = [[TabSwitcherItem alloc]
+      initWithIdentifier:web_state->GetStableIdentifier()];
   // chrome://newtab (NTP) tabs have no title.
   if (IsURLNtp(web_state->GetVisibleURL())) {
     item.hidesTitle = YES;
@@ -57,8 +55,7 @@
   web::WebState* web_state = web_state_list->GetActiveWebState();
   if (!web_state)
     return nil;
-  TabIdTabHelper* tab_helper = TabIdTabHelper::FromWebState(web_state);
-  return tab_helper->tab_id();
+  return web_state->GetStableIdentifier();
 }
 
 // Returns the WebState with |identifier| in |web_state_list|. Returns |nullptr|
@@ -67,8 +64,7 @@
                                  NSString* identifier) {
   for (int i = 0; i < web_state_list->count(); i++) {
     web::WebState* web_state = web_state_list->GetWebStateAt(i);
-    TabIdTabHelper* tab_helper = TabIdTabHelper::FromWebState(web_state);
-    if ([identifier isEqualToString:tab_helper->tab_id()])
+    if ([identifier isEqualToString:web_state->GetStableIdentifier()])
       return web_state;
   }
   return nullptr;
@@ -79,8 +75,7 @@
 int GetIndexOfTabWithId(WebStateList* web_state_list, NSString* identifier) {
   for (int i = 0; i < web_state_list->count(); i++) {
     web::WebState* web_state = web_state_list->GetWebStateAt(i);
-    TabIdTabHelper* tab_helper = TabIdTabHelper::FromWebState(web_state);
-    if ([identifier isEqualToString:tab_helper->tab_id()])
+    if ([identifier isEqualToString:web_state->GetStableIdentifier()])
       return i;
   }
   return -1;
@@ -176,8 +171,7 @@ - (void)webStateList:(WebStateList*)webStateList
     return;
   }
 
-  TabIdTabHelper* tabHelper = TabIdTabHelper::FromWebState(newWebState);
-  [self.consumer selectItemWithID:tabHelper->tab_id()];
+  [self.consumer selectItemWithID:newWebState->GetStableIdentifier()];
 }
 
 #pragma mark - TabFaviconDataSource
@@ -260,10 +254,8 @@ - (void)populateConsumerItems {
 #pragma mark - CRWWebStateObserver
 
 - (void)webStateDidChangeTitle:(web::WebState*)webState {
-  // Assumption: the ID of the webState didn't change as a result of this load.
-  TabIdTabHelper* tabHelper = TabIdTabHelper::FromWebState(webState);
-  NSString* itemID = tabHelper->tab_id();
-  [self.consumer replaceItemID:itemID withItem:CreateItem(webState)];
+  [self.consumer replaceItemID:webState->GetStableIdentifier()
+                      withItem:CreateItem(webState)];
 }
 
 @end
diff --git a/ios/chrome/browser/web/BUILD.gn b/ios/chrome/browser/web/BUILD.gn
index 43e3da81011625..8cb967452cbad8 100644
--- a/ios/chrome/browser/web/BUILD.gn
+++ b/ios/chrome/browser/web/BUILD.gn
@@ -72,7 +72,6 @@ source_set("web") {
     "//ui/base",
     "//url",
   ]
-  public_deps = [ ":tab_id_tab_helper" ]
 }
 
 source_set("delegate") {
@@ -121,19 +120,6 @@ source_set("page_placeholder") {
   ]
 }
 
-source_set("tab_id_tab_helper") {
-  sources = [
-    "tab_id_tab_helper.h",
-    "tab_id_tab_helper.mm",
-  ]
-  deps = [
-    "//base",
-    "//ios/web/public",
-    "//ios/web/public/session",
-  ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
 source_set("tab_helper_delegates") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -155,7 +141,6 @@ source_set("unit_tests") {
     "page_placeholder_tab_helper_unittest.mm",
     "repost_form_tab_helper_unittest.mm",
     "sad_tab_tab_helper_unittest.mm",
-    "tab_id_tab_helper_unittest.mm",
     "web_navigation_browser_agent_unittest.mm",
     "web_navigation_util_unittest.mm",
     "web_state_delegate_browser_agent_unittest.mm",
diff --git a/ios/chrome/browser/web/session_state/BUILD.gn b/ios/chrome/browser/web/session_state/BUILD.gn
index 033d2235b5c503..b3f5ffeea0e10d 100644
--- a/ios/chrome/browser/web/session_state/BUILD.gn
+++ b/ios/chrome/browser/web/session_state/BUILD.gn
@@ -25,7 +25,6 @@ source_set("session_state") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/web:feature_flags",
-    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/public/provider/chrome/browser",
     "//ios/web/common:features",
diff --git a/ios/chrome/browser/web/session_state/web_session_state_cache.mm b/ios/chrome/browser/web/session_state/web_session_state_cache.mm
index 8b3b3457775cdf..5416e3ab0907e9 100644
--- a/ios/chrome/browser/web/session_state/web_session_state_cache.mm
+++ b/ios/chrome/browser/web/session_state/web_session_state_cache.mm
@@ -26,7 +26,6 @@
 #import "ios/chrome/browser/main/browser_list.h"
 #import "ios/chrome/browser/main/browser_list_factory.h"
 #import "ios/chrome/browser/web/session_state/web_session_state_tab_helper.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -139,7 +138,7 @@ - (void)dealloc {
 - (void)persistSessionStateData:(NSData*)data
                     forWebState:(const web::WebState*)webState {
   DCHECK_CALLED_ON_VALID_SEQUENCE(_sequenceChecker);
-  NSString* sessionID = TabIdTabHelper::FromWebState(webState)->tab_id();
+  NSString* sessionID = webState->GetStableIdentifier();
   if (!data || !sessionID || !_taskRunner)
     return;
 
@@ -153,7 +152,7 @@ - (void)persistSessionStateData:(NSData*)data
 }
 
 - (NSData*)sessionStateDataForWebState:(const web::WebState*)webState {
-  NSString* sessionID = TabIdTabHelper::FromWebState(webState)->tab_id();
+  NSString* sessionID = webState->GetStableIdentifier();
   base::FilePath filePath =
       _cacheDirectory.Append(base::SysNSStringToUTF8(sessionID));
   NSString* filePathString = base::SysUTF8ToNSString(filePath.AsUTF8Unsafe());
@@ -180,7 +179,7 @@ - (void)removeSessionStateDataForWebState:(const web::WebState*)webState {
     return;
   }
 
-  NSString* sessionID = TabIdTabHelper::FromWebState(webState)->tab_id();
+  NSString* sessionID = webState->GetStableIdentifier();
 
   base::FilePath filePath =
       _cacheDirectory.Append(base::SysNSStringToUTF8(sessionID));
@@ -211,8 +210,7 @@ - (NSSet*)liveSessionIDs {
     WebStateList* webStateList = browser->GetWebStateList();
     for (int index = 0; index < webStateList->count(); ++index) {
       web::WebState* webState = webStateList->GetWebStateAt(index);
-      [liveSessionIDs
-          addObject:TabIdTabHelper::FromWebState(webState)->tab_id()];
+      [liveSessionIDs addObject:webState->GetStableIdentifier()];
     }
   }
 
@@ -220,8 +218,7 @@ - (NSSet*)liveSessionIDs {
     WebStateList* webStateList = browser->GetWebStateList();
     for (int index = 0; index < webStateList->count(); ++index) {
       web::WebState* webState = webStateList->GetWebStateAt(index);
-      [liveSessionIDs
-          addObject:TabIdTabHelper::FromWebState(webState)->tab_id()];
+      [liveSessionIDs addObject:webState->GetStableIdentifier()];
     }
   }
   return liveSessionIDs;
diff --git a/ios/chrome/browser/web/session_state/web_session_state_cache_unittest.mm b/ios/chrome/browser/web/session_state/web_session_state_cache_unittest.mm
index 35d85e416815d5..4009d6ae762e13 100644
--- a/ios/chrome/browser/web/session_state/web_session_state_cache_unittest.mm
+++ b/ios/chrome/browser/web/session_state/web_session_state_cache_unittest.mm
@@ -12,7 +12,6 @@
 #include "base/task/thread_pool/thread_pool_instance.h"
 #import "base/test/ios/wait_util.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #include "ios/web/public/test/web_task_environment.h"
 #import "ios/web/public/web_state.h"
 #include "testing/platform_test.h"
@@ -38,15 +37,13 @@ void SetUp() override {
 
     web::WebState::CreateParams createParams(chrome_browser_state_.get());
     web_state_ = web::WebState::Create(createParams);
-    TabIdTabHelper::CreateForWebState(web_state_.get());
 
     session_cache_directory_ = chrome_browser_state_->GetStatePath().Append(
         kWebSessionCacheDirectoryName);
   }
 
   bool StorageExists() {
-    NSString* sessionID =
-        TabIdTabHelper::FromWebState(web_state_.get())->tab_id();
+    NSString* sessionID = web_state_.get()->GetStableIdentifier();
     base::FilePath filePath =
         session_cache_directory_.Append(base::SysNSStringToUTF8(sessionID));
     return base::PathExists(filePath);
diff --git a/ios/chrome/browser/web/session_state/web_session_state_tab_helper.mm b/ios/chrome/browser/web/session_state/web_session_state_tab_helper.mm
index 3cb84f34080283..80834e2fed9337 100644
--- a/ios/chrome/browser/web/session_state/web_session_state_tab_helper.mm
+++ b/ios/chrome/browser/web/session_state/web_session_state_tab_helper.mm
@@ -23,7 +23,6 @@
 #include "ios/chrome/browser/web/features.h"
 #import "ios/chrome/browser/web/session_state/web_session_state_cache.h"
 #import "ios/chrome/browser/web/session_state/web_session_state_cache_factory.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #include "ios/web/common/features.h"
 #import "ios/web/public/js_messaging/web_frame.h"
 #import "ios/web/public/navigation/navigation_manager.h"
diff --git a/ios/chrome/browser/web/session_state/web_session_state_tab_helper_unittest.mm b/ios/chrome/browser/web/session_state/web_session_state_tab_helper_unittest.mm
index 13d096dd3f00ed..ab2d77bf014b71 100644
--- a/ios/chrome/browser/web/session_state/web_session_state_tab_helper_unittest.mm
+++ b/ios/chrome/browser/web/session_state/web_session_state_tab_helper_unittest.mm
@@ -20,7 +20,6 @@
 #include "ios/chrome/browser/web/chrome_web_test.h"
 #include "ios/chrome/browser/web/features.h"
 #import "ios/chrome/browser/web/session_state/web_session_state_cache.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #include "ios/web/public/navigation/navigation_item.h"
 #include "ios/web/public/navigation/navigation_manager.h"
 #import "ios/web/public/session/serializable_user_data_manager.h"
@@ -45,7 +44,6 @@
   void SetUp() override {
     ChromeWebTest::SetUp();
 
-    TabIdTabHelper::CreateForWebState(web_state());
     WebSessionStateTabHelper::CreateForWebState(web_state());
 
     session_cache_directory_ =
@@ -86,7 +84,7 @@ void FlushRunLoops() {
   FlushRunLoops();
 
   // File should not be saved.
-  NSString* sessionID = TabIdTabHelper::FromWebState(web_state())->tab_id();
+  NSString* sessionID = web_state()->GetStableIdentifier();
   base::FilePath filePath =
       session_cache_directory_.Append(base::SysNSStringToUTF8(sessionID));
   ASSERT_FALSE(base::PathExists(filePath));
@@ -114,7 +112,7 @@ void FlushRunLoops() {
   base::test::ios::SpinRunLoopWithMinDelay(base::Seconds(2));
 
   // File should not be saved yet.
-  NSString* sessionID = TabIdTabHelper::FromWebState(web_state())->tab_id();
+  NSString* sessionID = web_state()->GetStableIdentifier();
   base::FilePath filePath =
       session_cache_directory_.Append(base::SysNSStringToUTF8(sessionID));
   ASSERT_FALSE(base::PathExists(filePath));
@@ -138,7 +136,6 @@ void FlushRunLoops() {
   std::unique_ptr<web::WebState> web_state =
       web::WebState::Create(createParams);
   WebSessionStateTabHelper::CreateForWebState(web_state.get());
-  TabIdTabHelper::CreateForWebState(web_state.get());
   web_state->GetView();
   web_state->SetKeepRenderProcessAlive(true);
   GURL urlBlank("about:blank");
@@ -146,8 +143,7 @@ void FlushRunLoops() {
   web_state->GetNavigationManager()->LoadURLWithParams(paramsBlank);
 
   // copy the tabid file over to the new tabid...
-  NSString* newSessionID =
-      TabIdTabHelper::FromWebState(web_state.get())->tab_id();
+  NSString* newSessionID = web_state.get()->GetStableIdentifier();
   base::FilePath newFilePath =
       session_cache_directory_.Append(base::SysNSStringToUTF8(newSessionID));
   EXPECT_TRUE(base::CopyFile(filePath, newFilePath));
diff --git a/ios/chrome/browser/web/tab_id_tab_helper.h b/ios/chrome/browser/web/tab_id_tab_helper.h
deleted file mode 100644
index 4c8dd73f812a01..00000000000000
--- a/ios/chrome/browser/web/tab_id_tab_helper.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef IOS_CHROME_BROWSER_WEB_TAB_ID_TAB_HELPER_H_
-#define IOS_CHROME_BROWSER_WEB_TAB_ID_TAB_HELPER_H_
-
-#import "ios/web/public/web_state_user_data.h"
-
-// Handles creating a unique identifier, which is stable across cold starts.
-//
-// TODO(crbug.com/1276776): Remove this class once all code has been converted
-// to instead use WebState::GetStableIdentifier() instead.
-class TabIdTabHelper : public web::WebStateUserData<TabIdTabHelper> {
- public:
-  TabIdTabHelper(const TabIdTabHelper&) = delete;
-  TabIdTabHelper& operator=(const TabIdTabHelper&) = delete;
-
-  ~TabIdTabHelper() override;
-
-  // Returns a unique identifier for this tab.
-  NSString* tab_id() const;
-
- private:
-  friend class web::WebStateUserData<TabIdTabHelper>;
-
-  explicit TabIdTabHelper(web::WebState* web_state);
-  web::WebState* web_state_ = nullptr;
-
-  WEB_STATE_USER_DATA_KEY_DECL();
-};
-
-#endif  // IOS_CHROME_BROWSER_WEB_TAB_ID_TAB_HELPER_H_
diff --git a/ios/chrome/browser/web/tab_id_tab_helper.mm b/ios/chrome/browser/web/tab_id_tab_helper.mm
deleted file mode 100644
index b01dc959b95d50..00000000000000
--- a/ios/chrome/browser/web/tab_id_tab_helper.mm
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
-
-#include "base/mac/foundation_util.h"
-#include "base/strings/sys_string_conversions.h"
-#import "ios/web/public/session/serializable_user_data_manager.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-TabIdTabHelper::TabIdTabHelper(web::WebState* web_state)
-    : web_state_(web_state) {
-  DCHECK(web_state_);
-}
-
-TabIdTabHelper::~TabIdTabHelper() = default;
-
-NSString* TabIdTabHelper::tab_id() const {
-  return web_state_->GetStableIdentifier();
-}
-
-WEB_STATE_USER_DATA_KEY_IMPL(TabIdTabHelper)
diff --git a/ios/chrome/browser/web/tab_id_tab_helper_unittest.mm b/ios/chrome/browser/web/tab_id_tab_helper_unittest.mm
deleted file mode 100644
index ed9e3f03284fe1..00000000000000
--- a/ios/chrome/browser/web/tab_id_tab_helper_unittest.mm
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
-
-#import "ios/web/public/test/fakes/fake_web_state.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#import "testing/gtest_mac.h"
-#include "testing/platform_test.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-// Test fixture for TabIdTabHelper class.
-class TabIdTabHelperTest : public PlatformTest {
- protected:
-  web::FakeWebState first_web_state_;
-  web::FakeWebState second_web_state_;
-};
-
-// Tests that a tab ID is returned for a WebState, and tab ID's are different
-// for different WebStates.
-TEST_F(TabIdTabHelperTest, UniqueIdentifiers) {
-  TabIdTabHelper::CreateForWebState(&first_web_state_);
-  TabIdTabHelper::CreateForWebState(&second_web_state_);
-
-  const NSString* first_tab_id =
-      TabIdTabHelper::FromWebState(&first_web_state_)->tab_id();
-  const NSString* second_tab_id =
-      TabIdTabHelper::FromWebState(&second_web_state_)->tab_id();
-
-  EXPECT_GT([first_tab_id length], 0U);
-  EXPECT_GT([second_tab_id length], 0U);
-  EXPECT_NSNE(first_tab_id, second_tab_id);
-}
-
-// Tests that a tab ID is stable across successive calls.
-TEST_F(TabIdTabHelperTest, StableAcrossCalls) {
-  TabIdTabHelper::CreateForWebState(&first_web_state_);
-  TabIdTabHelper* tab_helper = TabIdTabHelper::FromWebState(&first_web_state_);
-
-  const NSString* first_call_id = tab_helper->tab_id();
-  const NSString* second_call_id = tab_helper->tab_id();
-
-  EXPECT_NSEQ(first_call_id, second_call_id);
-}
-
-// Tests serialization of a tab ID.
-TEST_F(TabIdTabHelperTest, Serialization) {
-  TabIdTabHelper::CreateForWebState(&first_web_state_);
-  TabIdTabHelper* first_tab_helper =
-      TabIdTabHelper::FromWebState(&first_web_state_);
-  const NSString* first_call_id = first_tab_helper->tab_id();
-
-  first_tab_helper->RemoveFromWebState(&first_web_state_);
-
-  TabIdTabHelper::CreateForWebState(&first_web_state_);
-  TabIdTabHelper* second_tab_helper =
-      TabIdTabHelper::FromWebState(&first_web_state_);
-  const NSString* second_call_id = second_tab_helper->tab_id();
-
-  EXPECT_NSEQ(first_call_id, second_call_id);
-}
diff --git a/ios/chrome/browser/web_state_list/BUILD.gn b/ios/chrome/browser/web_state_list/BUILD.gn
index 8e6c961a323d8d..881853a502fa8e 100644
--- a/ios/chrome/browser/web_state_list/BUILD.gn
+++ b/ios/chrome/browser/web_state_list/BUILD.gn
@@ -108,6 +108,7 @@ source_set("unit_tests") {
     "session_metrics_unittest.cc",
     "tab_insertion_browser_agent_unittest.mm",
     "web_state_dependency_installation_observer_unittest.mm",
+    "web_state_dependency_installer_bridge_unittest.mm",
     "web_state_list_favicon_driver_observer_unittest.mm",
     "web_state_list_order_controller_unittest.mm",
     "web_state_list_serialization_unittest.mm",
diff --git a/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer.h b/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer.h
index df419c31e766ec..e96ded331a00f2 100644
--- a/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer.h
+++ b/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer.h
@@ -5,9 +5,12 @@
 #ifndef IOS_CHROME_BROWSER_WEB_STATE_LIST_WEB_STATE_DEPENDENCY_INSTALLATION_OBSERVER_H_
 #define IOS_CHROME_BROWSER_WEB_STATE_LIST_WEB_STATE_DEPENDENCY_INSTALLATION_OBSERVER_H_
 
+#import "base/scoped_multi_source_observation.h"
 #import "base/scoped_observation.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/browser/web_state_list/web_state_list_observer.h"
+#import "ios/web/public/web_state.h"
+#import "ios/web/public/web_state_observer.h"
 
 // Interface for classes wishing to install and/or uninstall dependencies
 // (delegates, etc) for each WebState using
@@ -28,7 +31,8 @@ class DependencyInstaller {
 // configured to do the installing/uninstalling work. This class acts as a
 // forwarder, listening for changes in the WebStateList and invoking the
 // installation/uninstallation methods as necessary.
-class WebStateDependencyInstallationObserver : public WebStateListObserver {
+class WebStateDependencyInstallationObserver : public WebStateListObserver,
+                                               public web::WebStateObserver {
  public:
   WebStateDependencyInstallationObserver(
       WebStateList* web_state_list,
@@ -54,6 +58,16 @@ class WebStateDependencyInstallationObserver : public WebStateListObserver {
       const WebStateDependencyInstallationObserver&) = delete;
 
  private:
+  // Helper methods that call InstallDependency/UninstallDependency on the
+  // `dependency_installer_` if the WebState is realized, or start observing
+  // the WebState for `WebStateRealized()` event.
+  void OnWebStateAdded(web::WebState* web_state);
+  void OnWebStateRemoved(web::WebState* web_state);
+
+  // web::WebStateObserver:
+  void WebStateRealized(web::WebState* web_state) override;
+  void WebStateDestroyed(web::WebState* web_state) override;
+
   // The WebStateList being observed for addition, replacement, and detachment
   // of WebStates
   WebStateList* web_state_list_;
@@ -61,8 +75,11 @@ class WebStateDependencyInstallationObserver : public WebStateListObserver {
   // the WebStateList
   DependencyInstaller* dependency_installer_;
   // Automatically detaches |this| from the WebStateList when destroyed
-  base::ScopedObservation<WebStateList, WebStateListObserver> observation_{
-      this};
+  base::ScopedObservation<WebStateList, WebStateListObserver>
+      web_state_list_observation_{this};
+  // Automatically detaches |this| from the WebStates when destroyed.
+  base::ScopedMultiSourceObservation<web::WebState, web::WebStateObserver>
+      web_state_observations_{this};
 };
 
 #endif  // IOS_CHROME_BROWSER_WEB_STATE_LIST_WEB_STATE_DEPENDENCY_INSTALLATION_OBSERVER_H_
diff --git a/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer.mm b/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer.mm
index 4f30012ddcfa3e..a7272d881c7881 100644
--- a/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer.mm
+++ b/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer.mm
@@ -2,32 +2,41 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#import "ios/chrome/browser/web_state_list/web_state_dependency_installation_observer.h"
+
+#import "base/check.h"
+
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
-#import "ios/chrome/browser/web_state_list/web_state_dependency_installation_observer.h"
-
 WebStateDependencyInstallationObserver::WebStateDependencyInstallationObserver(
     WebStateList* web_state_list,
     DependencyInstaller* dependency_installer)
     : web_state_list_(web_state_list),
       dependency_installer_(dependency_installer) {
-  observation_.Observe(web_state_list_);
+  DCHECK(web_state_list_);
+  DCHECK(dependency_installer_);
+
+  web_state_list_observation_.Observe(web_state_list_);
   for (int i = 0; i < web_state_list_->count(); i++) {
-    dependency_installer_->InstallDependency(web_state_list_->GetWebStateAt(i));
+    OnWebStateAdded(web_state_list_->GetWebStateAt(i));
   }
 }
 
 WebStateDependencyInstallationObserver::
-    ~WebStateDependencyInstallationObserver() {}
+    ~WebStateDependencyInstallationObserver() {
+  for (int i = 0; i < web_state_list_->count(); i++) {
+    OnWebStateRemoved(web_state_list_->GetWebStateAt(i));
+  }
+}
 
 void WebStateDependencyInstallationObserver::WebStateInsertedAt(
     WebStateList* web_state_list,
     web::WebState* web_state,
     int index,
     bool activating) {
-  dependency_installer_->InstallDependency(web_state);
+  OnWebStateAdded(web_state);
 }
 
 void WebStateDependencyInstallationObserver::WebStateReplacedAt(
@@ -35,13 +44,42 @@
     web::WebState* old_web_state,
     web::WebState* new_web_state,
     int index) {
-  dependency_installer_->UninstallDependency(old_web_state);
-  dependency_installer_->InstallDependency(new_web_state);
+  OnWebStateRemoved(old_web_state);
+  OnWebStateAdded(new_web_state);
 }
 
 void WebStateDependencyInstallationObserver::WebStateDetachedAt(
     WebStateList* web_state_list,
     web::WebState* web_state,
     int index) {
-  dependency_installer_->UninstallDependency(web_state);
+  OnWebStateRemoved(web_state);
+}
+
+void WebStateDependencyInstallationObserver::OnWebStateAdded(
+    web::WebState* web_state) {
+  if (web_state->IsRealized()) {
+    dependency_installer_->InstallDependency(web_state);
+  } else if (!web_state_observations_.IsObservingSource(web_state)) {
+    web_state_observations_.AddObservation(web_state);
+  }
+}
+
+void WebStateDependencyInstallationObserver::OnWebStateRemoved(
+    web::WebState* web_state) {
+  if (web_state->IsRealized()) {
+    dependency_installer_->UninstallDependency(web_state);
+  } else if (web_state_observations_.IsObservingSource(web_state)) {
+    web_state_observations_.RemoveObservation(web_state);
+  }
+}
+
+void WebStateDependencyInstallationObserver::WebStateRealized(
+    web::WebState* web_state) {
+  web_state_observations_.RemoveObservation(web_state);
+  OnWebStateAdded(web_state);
+}
+
+void WebStateDependencyInstallationObserver::WebStateDestroyed(
+    web::WebState* web_state) {
+  web_state_observations_.RemoveObservation(web_state);
 }
diff --git a/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer_unittest.mm b/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer_unittest.mm
index bae2e9ae32cab0..3e42213654ff82 100644
--- a/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer_unittest.mm
+++ b/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer_unittest.mm
@@ -30,11 +30,19 @@ void UninstallDependency(web::WebState* web_state) override {
   }
   ~FakeDependencyInstaller() override {}
 
-  bool WasInstalled(web::WebState* web_state) {
+  bool WasInstalled(web::WebState* web_state) const {
+    return installed_.count(web_state) > 0;
+  }
+
+  bool WasUninstalled(web::WebState* web_state) const {
+    return uninstalled_.count(web_state) > 0;
+  }
+
+  size_t InstallCount(web::WebState* web_state) const {
     return installed_.count(web_state);
   }
 
-  bool WasUninstalled(web::WebState* web_state) {
+  size_t UninstallCount(web::WebState* web_state) const {
     return uninstalled_.count(web_state);
   }
 
@@ -94,3 +102,61 @@ WebStateDependencyInstallationObserver observer(&web_state_list_,
                                                   &installer_);
   EXPECT_TRUE(installer_.WasInstalled(web_state_raw));
 }
+
+// Verifies that unrealized web states don't get dependencies installed.
+TEST_F(WebStateDependencyInstallationObserverTest, UnrealizedWebStates) {
+  WebStateDependencyInstallationObserver observer(&web_state_list_,
+                                                  &installer_);
+  auto web_state_1 = std::make_unique<web::FakeWebState>();
+  web::WebState* web_state_1_raw = web_state_1.get();
+  web_state_list_.InsertWebState(0, std::move(web_state_1),
+                                 WebStateList::INSERT_ACTIVATE,
+                                 WebStateOpener());
+  EXPECT_TRUE(installer_.WasInstalled(web_state_1_raw));
+
+  auto web_state_2 = std::make_unique<web::FakeWebState>();
+  web_state_2->SetIsRealized(false);
+  web::WebState* web_state_2_raw = web_state_2.get();
+
+  // Insert the unrealized webstate but don't have it activate (since that
+  // forces realization).
+  web_state_list_.InsertWebState(1, std::move(web_state_2),
+                                 WebStateList::INSERT_NO_FLAGS,
+                                 WebStateOpener());
+  // The unrealized webstate should not have dependencies installed.
+  EXPECT_FALSE(installer_.WasInstalled(web_state_2_raw));
+  // Once realized, dependencioes should be installed.
+  web_state_2_raw->ForceRealized();
+  EXPECT_TRUE(installer_.WasInstalled(web_state_2_raw));
+
+  auto web_state_3 = std::make_unique<web::FakeWebState>();
+  web_state_3->SetIsRealized(false);
+  web::WebState* web_state_3_raw = web_state_3.get();
+
+  // Insert the unrealized webstate and activate it, forcing realization.
+  web_state_list_.InsertWebState(2, std::move(web_state_3),
+                                 WebStateList::INSERT_ACTIVATE,
+                                 WebStateOpener());
+  // The formerly unrealized webstate should have dependencies installed.
+  // (The webstate should also be realized, but that's not the responsibility
+  // of the code under test).
+  EXPECT_TRUE(installer_.WasInstalled(web_state_3_raw));
+  // Dependencies should have been installed only once
+  EXPECT_EQ(1u, installer_.InstallCount(web_state_3_raw));
+}
+
+// Verifies that destroying the observer triggers uninstallation.
+TEST_F(WebStateDependencyInstallationObserverTest, Disconnect) {
+  auto observer = std::make_unique<WebStateDependencyInstallationObserver>(
+      &web_state_list_, &installer_);
+  auto web_state_1 = std::make_unique<web::FakeWebState>();
+  web::WebState* web_state_1_raw = web_state_1.get();
+
+  web_state_list_.InsertWebState(0, std::move(web_state_1),
+                                 WebStateList::INSERT_ACTIVATE,
+                                 WebStateOpener());
+  EXPECT_TRUE(installer_.WasInstalled(web_state_1_raw));
+  observer.reset();
+
+  EXPECT_TRUE(installer_.WasUninstalled(web_state_1_raw));
+}
diff --git a/ios/chrome/browser/web_state_list/web_state_dependency_installer_bridge_unittest.mm b/ios/chrome/browser/web_state_list/web_state_dependency_installer_bridge_unittest.mm
new file mode 100644
index 00000000000000..7666c9a85ee303
--- /dev/null
+++ b/ios/chrome/browser/web_state_list/web_state_dependency_installer_bridge_unittest.mm
@@ -0,0 +1,82 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "ios/chrome/browser/web_state_list/web_state_dependency_installer_bridge.h"
+
+#import <memory>
+
+#import "ios/chrome/browser/web_state_list/web_state_list.h"
+#import "ios/chrome/browser/web_state_list/web_state_list_delegate.h"
+#import "ios/chrome/browser/web_state_list/web_state_opener.h"
+#import "ios/web/public/test/fakes/fake_web_state.h"
+#import "testing/gtest_mac.h"
+#import "testing/platform_test.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+// Test object for tracking calls through the DpendencyInstalling protocol.
+@interface TestInstaller : NSObject <DependencyInstalling>
+
+@property(nonatomic) NSInteger installCount;
+@property(nonatomic) NSInteger uninstallCount;
+
+@end
+
+@implementation TestInstaller
+- (void)installDependencyForWebState:(web::WebState*)webState {
+  _installCount++;
+}
+- (void)uninstallDependencyForWebState:(web::WebState*)webState {
+  _uninstallCount++;
+}
+@end
+
+class WebStateDependencyInstallerBridgeTest : public PlatformTest,
+                                              public WebStateListDelegate {
+ public:
+  WebStateDependencyInstallerBridgeTest()
+      : web_state_list_(this), installer_([[TestInstaller alloc] init]) {}
+  // WebStateListDelegate.
+  void WillAddWebState(web::WebState* web_state) override {}
+  void WebStateDetached(web::WebState* web_state) override {}
+
+ protected:
+  WebStateList web_state_list_;
+  TestInstaller* installer_;
+};
+
+// Test that inserting and replacing web states calls the dependency installer
+// the expected number of times.
+TEST_F(WebStateDependencyInstallerBridgeTest, InsertReplaceAndRemoveWebState) {
+  WebStateDependencyInstallerBridge bridge(installer_, &web_state_list_);
+  auto web_state_1 = std::make_unique<web::FakeWebState>();
+  web_state_list_.InsertWebState(0, std::move(web_state_1),
+                                 WebStateList::INSERT_ACTIVATE,
+                                 WebStateOpener());
+  EXPECT_EQ(installer_.installCount, 1);
+  auto web_state_2 = std::make_unique<web::FakeWebState>();
+  web_state_list_.ReplaceWebStateAt(0, std::move(web_state_2));
+  EXPECT_EQ(installer_.installCount, 2);
+  EXPECT_EQ(installer_.uninstallCount, 1);
+}
+
+// Tests that deleting the installer bridge uninstalls all web states.
+TEST_F(WebStateDependencyInstallerBridgeTest, UninstallOnBridgeDestruction) {
+  auto bridge = std::make_unique<WebStateDependencyInstallerBridge>(
+      installer_, &web_state_list_);
+  auto web_state_1 = std::make_unique<web::FakeWebState>();
+  web_state_list_.InsertWebState(0, std::move(web_state_1),
+                                 WebStateList::INSERT_ACTIVATE,
+                                 WebStateOpener());
+  auto web_state_2 = std::make_unique<web::FakeWebState>();
+  web_state_list_.InsertWebState(0, std::move(web_state_2),
+                                 WebStateList::INSERT_ACTIVATE,
+                                 WebStateOpener());
+  EXPECT_EQ(installer_.installCount, 2);
+  EXPECT_EQ(installer_.uninstallCount, 0);
+  bridge.reset();
+  EXPECT_EQ(installer_.uninstallCount, 2);
+}
diff --git a/ios/chrome/test/earl_grey/BUILD.gn b/ios/chrome/test/earl_grey/BUILD.gn
index 1b81cd1c755862..e35af9375896bf 100644
--- a/ios/chrome/test/earl_grey/BUILD.gn
+++ b/ios/chrome/test/earl_grey/BUILD.gn
@@ -160,7 +160,6 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/browser/variations:eg_app_support+eg2",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:eg_app_support+eg2",
-    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/variations_smoke_test:eg_app_support+eg2",
diff --git a/ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm b/ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm
index aadcba7a628d0d..89b07681dc1204 100644
--- a/ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm
+++ b/ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm
@@ -35,7 +35,6 @@
 #import "ios/chrome/browser/ui/util/named_guide.h"
 #import "ios/chrome/browser/ui/util/rtl_geometry.h"
 #import "ios/chrome/browser/unified_consent/unified_consent_service_factory.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/chrome/browser/web/web_navigation_browser_agent.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/test/app/bookmarks_test_util.h"
@@ -320,12 +319,12 @@ + (void)startGoingForward {
 
 + (NSString*)currentTabID {
   web::WebState* web_state = chrome_test_util::GetCurrentWebState();
-  return TabIdTabHelper::FromWebState(web_state)->tab_id();
+  return web_state->GetStableIdentifier();
 }
 
 + (NSString*)nextTabID {
   web::WebState* web_state = chrome_test_util::GetNextWebState();
-  return TabIdTabHelper::FromWebState(web_state)->tab_id();
+  return web_state->GetStableIdentifier();
 }
 
 + (NSUInteger)indexOfActiveNormalTab {
diff --git a/ios/chrome/test/wpt/BUILD.gn b/ios/chrome/test/wpt/BUILD.gn
index 783b538c6ff6d8..18912a03dbb7a5 100644
--- a/ios/chrome/test/wpt/BUILD.gn
+++ b/ios/chrome/test/wpt/BUILD.gn
@@ -71,7 +71,6 @@ source_set("app_support") {
     "//ios/chrome/app:tests_hook",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/tabs:tabs",
-    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/test/app:test_support",
     "//ios/testing:nserror_support",
diff --git a/ios/chrome/test/wpt/cwt_webdriver_app_interface.mm b/ios/chrome/test/wpt/cwt_webdriver_app_interface.mm
index 77f5992cab1163..21ec43c16987aa 100644
--- a/ios/chrome/test/wpt/cwt_webdriver_app_interface.mm
+++ b/ios/chrome/test/wpt/cwt_webdriver_app_interface.mm
@@ -16,7 +16,6 @@
 #include "base/values.h"
 #import "ios/chrome/app/main_controller.h"
 #import "ios/chrome/browser/main/browser.h"
-#import "ios/chrome/browser/web/tab_id_tab_helper.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/test/app/chrome_test_util.h"
 #import "ios/chrome/test/app/settings_test_util.h"
@@ -25,6 +24,7 @@
 #import "ios/testing/nserror_util.h"
 #import "ios/web/public/test/navigation_test_util.h"
 #import "ios/web/public/ui/crw_web_view_proxy.h"
+#import "ios/web/public/web_state.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/image/image.h"
 
@@ -37,8 +37,7 @@
 namespace {
 
 NSString* GetIdForWebState(web::WebState* web_state) {
-  TabIdTabHelper::CreateForWebState(web_state);
-  return TabIdTabHelper::FromWebState(web_state)->tab_id();
+  return web_state->GetStableIdentifier();
 }
 
 WebStateList* GetCurrentWebStateList() {
diff --git a/ios/web/public/test/fakes/fake_web_state.h b/ios/web/public/test/fakes/fake_web_state.h
index cef9214e6d2405..b39d727cdefb72 100644
--- a/ios/web/public/test/fakes/fake_web_state.h
+++ b/ios/web/public/test/fakes/fake_web_state.h
@@ -102,6 +102,7 @@ class FakeWebState : public WebState {
 
   // Setters for test data.
   void SetBrowserState(BrowserState* browser_state);
+  void SetIsRealized(bool value);
   void SetJSInjectionReceiver(CRWJSInjectionReceiver* injection_receiver);
   void SetTitle(const std::u16string& title);
   void SetContentIsHTML(bool content_is_html);
@@ -159,6 +160,7 @@ class FakeWebState : public WebState {
   CRWJSInjectionReceiver* injection_receiver_ = nil;
   NSString* stable_identifier_ = nil;
   bool web_usage_enabled_ = true;
+  bool is_realized_ = true;
   bool is_loading_ = false;
   bool is_visible_ = false;
   bool is_crashed_ = false;
diff --git a/ios/web/public/test/fakes/fake_web_state.mm b/ios/web/public/test/fakes/fake_web_state.mm
index 2eb49c4d1409a4..d132d0227951ad 100644
--- a/ios/web/public/test/fakes/fake_web_state.mm
+++ b/ios/web/public/test/fakes/fake_web_state.mm
@@ -74,11 +74,15 @@
 void FakeWebState::SetDelegate(WebStateDelegate* delegate) {}
 
 bool FakeWebState::IsRealized() const {
-  // FakeWebState cannot be unrealized.
-  return true;
+  return is_realized_;
 }
 
 WebState* FakeWebState::ForceRealized() {
+  if (!is_realized_) {
+    is_realized_ = true;
+    for (auto& observer : observers_)
+      observer.WebStateRealized(this);
+  }
   return this;
 }
 
@@ -248,6 +252,10 @@
   browser_state_ = browser_state;
 }
 
+void FakeWebState::SetIsRealized(bool value) {
+  is_realized_ = value;
+}
+
 void FakeWebState::SetJSInjectionReceiver(
     CRWJSInjectionReceiver* injection_receiver) {
   injection_receiver_ = injection_receiver;
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 8bd9260a44ca9f..81e70ad96eb331 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -185,6 +185,10 @@ test("media_unittests") {
 
   data_deps = [ "//testing/buildbot/filters:media_unittests_filters" ]
 
+  if (is_android && enable_chrome_android_internal) {
+    data_deps += [ "//clank/build/bot/filters:media_unittests_filters" ]
+  }
+
   if (media_use_ffmpeg) {
     deps += [ "//media/ffmpeg:unit_tests" ]
   }
diff --git a/media/fuchsia/cdm/service/fuchsia_cdm_manager.cc b/media/fuchsia/cdm/service/fuchsia_cdm_manager.cc
index 861afb293adad7..fe8551ba0c2e08 100644
--- a/media/fuchsia/cdm/service/fuchsia_cdm_manager.cc
+++ b/media/fuchsia/cdm/service/fuchsia_cdm_manager.cc
@@ -276,8 +276,8 @@ FuchsiaCdmManager::FuchsiaCdmManager(
   // CDM data directories that are in active use, the |storage_task_runner_| is
   // sequenced, thereby ensuring cleanup completes before any CDM activities
   // start.
-  if (cdm_data_quota_bytes)
-    ApplyCdmStorageQuota(cdm_data_path_, *cdm_data_quota_bytes);
+  if (cdm_data_quota_bytes_)
+    ApplyCdmStorageQuota(cdm_data_path_, *cdm_data_quota_bytes_);
 }
 
 FuchsiaCdmManager::~FuchsiaCdmManager() = default;
diff --git a/media/mojo/clients/win/media_foundation_renderer_client.cc b/media/mojo/clients/win/media_foundation_renderer_client.cc
index 85cc9c97d97fb3..e895349f2035ac 100644
--- a/media/mojo/clients/win/media_foundation_renderer_client.cc
+++ b/media/mojo/clients/win/media_foundation_renderer_client.cc
@@ -7,10 +7,9 @@
 #include <utility>
 
 #include "base/callback_helpers.h"
-#include "base/metrics/histogram_functions.h"
-#include "base/metrics/histogram_macros.h"
 #include "media/base/media_log.h"
 #include "media/base/win/mf_helpers.h"
+#include "media/renderers/win/media_foundation_renderer.h"
 #include "mojo/public/cpp/bindings/callback_helpers.h"
 
 namespace media {
@@ -131,6 +130,8 @@ void MediaFoundationRendererClient::OnSelectedVideoTracksChanged(
 
 void MediaFoundationRendererClient::OnError(PipelineStatus status) {
   DVLOG_FUNC(1) << "status=" << status;
+  // Do not call MediaFoundationRenderer::ReportErrorReason() since it should've
+  // already been reported in MediaFoundationRenderer.
   client_->OnError(status);
 }
 
@@ -300,6 +301,8 @@ void MediaFoundationRendererClient::OnDCOMPSurfaceReceived(
     MEDIA_LOG(ERROR, media_log_)
         << "Failed to initialize DCOMP mode or failed to get or "
            "register DCOMP surface handle on remote renderer";
+    MediaFoundationRenderer::ReportErrorReason(
+        MediaFoundationRenderer::ErrorReason::kOnDCompSurfaceReceivedError);
     OnError(PIPELINE_ERROR_COULD_NOT_RENDER);
     return;
   }
@@ -317,6 +320,8 @@ void MediaFoundationRendererClient::OnDCOMPSurfaceHandleSet(bool success) {
 
   if (!success) {
     MEDIA_LOG(ERROR, media_log_) << "Failed to set DCOMP surface handle";
+    MediaFoundationRenderer::ReportErrorReason(
+        MediaFoundationRenderer::ErrorReason::kOnDCompSurfaceHandleSetError);
     OnError(PIPELINE_ERROR_COULD_NOT_RENDER);
   }
 }
@@ -348,7 +353,9 @@ void MediaFoundationRendererClient::OnConnectionError() {
   DVLOG_FUNC(1);
   DCHECK(media_task_runner_->BelongsToCurrentThread());
   MEDIA_LOG(ERROR, media_log_) << "MediaFoundationRendererClient disconnected";
-  OnError(PIPELINE_ERROR_DECODE);
+  MediaFoundationRenderer::ReportErrorReason(
+      MediaFoundationRenderer::ErrorReason::kOnConnectionError);
+  OnError(PIPELINE_ERROR_DISCONNECTED);
 }
 
 }  // namespace media
diff --git a/media/renderers/win/media_foundation_renderer.cc b/media/renderers/win/media_foundation_renderer.cc
index 310293057528bd..3180b369a7266e 100644
--- a/media/renderers/win/media_foundation_renderer.cc
+++ b/media/renderers/win/media_foundation_renderer.cc
@@ -69,6 +69,12 @@ bool InitializeVideoWindowClass() {
 
 }  // namespace
 
+// static
+void MediaFoundationRenderer::ReportErrorReason(ErrorReason reason) {
+  base::UmaHistogramEnumeration("Media.MediaFoundationRenderer.ErrorReason",
+                                reason);
+}
+
 // static
 bool MediaFoundationRenderer::IsSupported() {
   return base::win::GetVersion() >= base::win::Version::WIN10;
@@ -344,6 +350,7 @@ void MediaFoundationRenderer::OnCdmProxyReceived(
 
   if (!waiting_for_mf_cdm_ || !content_protection_manager_) {
     DLOG(ERROR) << "Failed in checking internal state.";
+    ReportErrorReason(ErrorReason::kCdmProxyReceivedInInvalidState);
     renderer_client_->OnError(PipelineStatus::PIPELINE_ERROR_INVALID_STATE);
     return;
   }
@@ -356,6 +363,7 @@ void MediaFoundationRenderer::OnCdmProxyReceived(
   HRESULT hr = SetSourceOnMediaEngine();
   if (FAILED(hr)) {
     DLOG(ERROR) << "Failed to set source on media engine: " << PrintHr(hr);
+    ReportErrorReason(ErrorReason::kFailedToSetSourceOnMediaEngine);
     renderer_client_->OnError(PipelineStatus::PIPELINE_ERROR_COULD_NOT_RENDER);
     return;
   }
@@ -390,6 +398,7 @@ void MediaFoundationRenderer::StartPlayingFrom(base::TimeDelta time) {
   HRESULT hr = mf_media_engine_->SetCurrentTime(current_time);
   if (FAILED(hr)) {
     DLOG(ERROR) << "Failed to SetCurrentTime: " << PrintHr(hr);
+    ReportErrorReason(ErrorReason::kFailedToSetCurrentTime);
     renderer_client_->OnError(PipelineStatus::PIPELINE_ERROR_COULD_NOT_RENDER);
     return;
   }
@@ -397,6 +406,7 @@ void MediaFoundationRenderer::StartPlayingFrom(base::TimeDelta time) {
   hr = mf_media_engine_->Play();
   if (FAILED(hr)) {
     DLOG(ERROR) << "Failed to start playback: " << PrintHr(hr);
+    ReportErrorReason(ErrorReason::kFailedToPlay);
     renderer_client_->OnError(PipelineStatus::PIPELINE_ERROR_COULD_NOT_RENDER);
     return;
   }
@@ -603,6 +613,7 @@ void MediaFoundationRenderer::OnPlaybackError(PipelineStatus status,
       << "MediaFoundationRenderer OnPlaybackError: " << status << ", "
       << PrintHr(hr);
 
+  ReportErrorReason(ErrorReason::kOnPlaybackError);
   renderer_client_->OnError(status);
   StopSendingStatistics();
 }
diff --git a/media/renderers/win/media_foundation_renderer.h b/media/renderers/win/media_foundation_renderer.h
index 6de4f02a2afb64..649336572bdc1a 100644
--- a/media/renderers/win/media_foundation_renderer.h
+++ b/media/renderers/win/media_foundation_renderer.h
@@ -40,6 +40,25 @@ class MEDIA_EXPORT MediaFoundationRenderer
     : public Renderer,
       public MediaFoundationRendererExtension {
  public:
+  // An enum for recording MediaFoundationRenderer playback error reason.
+  // Reported to UMA. Do not change existing values.
+  enum class ErrorReason {
+    kUnknown = 0,
+    kCdmProxyReceivedInInvalidState,
+    kFailedToSetSourceOnMediaEngine,
+    kFailedToSetCurrentTime,
+    kFailedToPlay,
+    kOnPlaybackError,
+    kOnDCompSurfaceReceivedError,
+    kOnDCompSurfaceHandleSetError,
+    kOnConnectionError,
+    // Add new values here and update `kMaxValue`. Never reuse existing values.
+    kMaxValue = kOnConnectionError,
+  };
+
+  // Report `reason` to UMA.
+  static void ReportErrorReason(ErrorReason reason);
+
   // Whether MediaFoundationRenderer() is supported on the current device.
   static bool IsSupported();
 
diff --git a/net/android/BUILD.gn b/net/android/BUILD.gn
index d8dbcb7e7242e8..fa5e7afc964f4c 100644
--- a/net/android/BUILD.gn
+++ b/net/android/BUILD.gn
@@ -11,6 +11,7 @@ android_library("net_java") {
     "java/src/org/chromium/net/AndroidKeyStore.java",
     "java/src/org/chromium/net/AndroidNetworkLibrary.java",
     "java/src/org/chromium/net/AndroidTrafficStats.java",
+    "java/src/org/chromium/net/ChromiumNetworkAdapter.java",
     "java/src/org/chromium/net/DnsStatus.java",
     "java/src/org/chromium/net/GURLUtils.java",
     "java/src/org/chromium/net/HttpNegotiateAuthenticator.java",
diff --git a/net/android/java/src/org/chromium/net/ChromiumNetworkAdapter.java b/net/android/java/src/org/chromium/net/ChromiumNetworkAdapter.java
new file mode 100644
index 00000000000000..51464497364edf
--- /dev/null
+++ b/net/android/java/src/org/chromium/net/ChromiumNetworkAdapter.java
@@ -0,0 +1,46 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.net;
+
+import java.io.IOException;
+import java.net.Proxy;
+import java.net.URL;
+import java.net.URLConnection;
+
+/**
+ * Wrapper class for network requests.
+ */
+public final class ChromiumNetworkAdapter {
+    private ChromiumNetworkAdapter() {}
+
+    /**
+     * Wrapper around URL#openConnection(), with an extra argument for static analysis/privacy
+     * auditing.
+     *
+     * @param url the URL to open connection to.
+     * @param traffic_annotation an object documenting this network request: what it's used for,
+     *     what data gets sent, what triggers it, etc.
+     * @return a URLConnection linking to the URL.
+     */
+    public static URLConnection openConnection(
+            URL url, NetworkTrafficAnnotationTag trafficAnnotation) throws IOException {
+        return url.openConnection();
+    }
+
+    /**
+     * Wrapper around URL#openConnection(Proxy), with an extra argument for static analysis/privacy
+     * auditing.
+     *
+     * @param url the URL to open connection to.
+     * @param proxy the Proxy through which this connection will be made.
+     * @param traffic_annotation an object documenting this network request: what it's used for,
+     *     what data gets sent, what triggers it, etc.
+     * @return a URLConnection linking to the URL.
+     */
+    public static URLConnection openConnection(URL url, Proxy proxy,
+            NetworkTrafficAnnotationTag trafficAnnotation) throws IOException {
+        return url.openConnection(proxy);
+    }
+}
diff --git a/net/dns/mock_host_resolver.cc b/net/dns/mock_host_resolver.cc
index 5c43594c8f7e66..3f679ccec39900 100644
--- a/net/dns/mock_host_resolver.cc
+++ b/net/dns/mock_host_resolver.cc
@@ -1112,7 +1112,7 @@ RuleBasedHostResolverProc::Rule::Rule(ResolverType resolver_type,
       replacement(replacement),
       dns_aliases(std::move(dns_aliases)),
       latency_ms(latency_ms) {
-  DCHECK(dns_aliases != std::vector<std::string>({""}));
+  DCHECK(this->dns_aliases != std::vector<std::string>({""}));
 }
 
 RuleBasedHostResolverProc::Rule::Rule(const Rule& other) = default;
diff --git a/net/reporting/reporting_endpoint.cc b/net/reporting/reporting_endpoint.cc
index fe4a1bba84dbc9..187c0c7db3d489 100644
--- a/net/reporting/reporting_endpoint.cc
+++ b/net/reporting/reporting_endpoint.cc
@@ -34,7 +34,8 @@ ReportingEndpointGroupKey::ReportingEndpointGroupKey(
       origin(origin),
       group_name(group_name) {
   // If |reporting_source| is present, it must not be empty.
-  DCHECK(!(reporting_source.has_value() && reporting_source->is_empty()));
+  DCHECK(!(this->reporting_source.has_value() &&
+           this->reporting_source->is_empty()));
 }
 
 ReportingEndpointGroupKey::ReportingEndpointGroupKey(
diff --git a/pdf/pdfium/fuzzers/BUILD.gn b/pdf/pdfium/fuzzers/BUILD.gn
index b57f6b6ae316c5..7916e221adf435 100644
--- a/pdf/pdfium/fuzzers/BUILD.gn
+++ b/pdf/pdfium/fuzzers/BUILD.gn
@@ -91,6 +91,7 @@ group("pdf_fuzzers") {
       deps += [
         ":pdf_xfa_fdp_fuzzer",
         ":pdf_xfa_raw_fuzzer",
+        ":pdf_xfa_xdp_fdp_fuzzer",
       ]
     }
   }
@@ -286,6 +287,9 @@ if (is_clang) {
     pdfium_fuzzer_test("pdf_xfa_raw_fuzzer") {
       dict = "dicts/pdf_xfa_raw_fuzzer.dict"
     }
+    pdfium_fuzzer_test("pdf_xfa_xdp_fdp_fuzzer") {
+      dict = "dicts/pdf_xfa_raw_fuzzer.dict"
+    }
   }
 }
 
diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn
index 3c288692a336f3..79727ee3f75b4c 100644
--- a/remoting/host/BUILD.gn
+++ b/remoting/host/BUILD.gn
@@ -88,7 +88,6 @@ source_set("common_headers") {
     "chromoting_param_traits.h",
     "desktop_and_cursor_conditional_composer.h",
     "desktop_environment.h",
-    "desktop_environment_options.h",
     "evaluate_capability.h",
     "input_injector.h",
     "sas_injector.h",
@@ -259,7 +258,6 @@ static_library("common") {
     "desktop_display_info.cc",
     "desktop_display_info.h",
     "desktop_display_info_loader.h",
-    "desktop_environment_options.cc",
     "desktop_process.cc",
     "desktop_process.h",
     "desktop_resizer.h",
diff --git a/remoting/host/base/BUILD.gn b/remoting/host/base/BUILD.gn
index ae9b7f845a2cee..e0d4f645382c33 100644
--- a/remoting/host/base/BUILD.gn
+++ b/remoting/host/base/BUILD.gn
@@ -13,6 +13,7 @@ source_set("base") {
   ]
 
   public = [
+    "desktop_environment_options.h",
     "host_exit_codes.h",
     "screen_controls.h",
     "screen_resolution.h",
@@ -21,6 +22,7 @@ source_set("base") {
   ]
 
   sources = [
+    "desktop_environment_options.cc",
     "host_exit_codes.cc",
     "screen_resolution.cc",
     "switches.cc",
diff --git a/remoting/host/desktop_environment_options.cc b/remoting/host/base/desktop_environment_options.cc
similarity index 78%
rename from remoting/host/desktop_environment_options.cc
rename to remoting/host/base/desktop_environment_options.cc
index 97bf946b2a2934..fe1647e4441165 100644
--- a/remoting/host/desktop_environment_options.cc
+++ b/remoting/host/base/desktop_environment_options.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/host/desktop_environment_options.h"
+#include "remoting/host/base/desktop_environment_options.h"
 
 #include <string>
 #include <utility>
@@ -10,10 +10,6 @@
 #include "build/build_config.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
-#if defined(OS_WIN)
-#include "remoting/host/win/evaluate_d3d.h"
-#endif
-
 namespace remoting {
 
 using DesktopCaptureOptions = webrtc::DesktopCaptureOptions;
@@ -35,22 +31,13 @@ DesktopEnvironmentOptions::DesktopEnvironmentOptions(
 DesktopEnvironmentOptions::DesktopEnvironmentOptions(
     const DesktopEnvironmentOptions& other) = default;
 DesktopEnvironmentOptions::~DesktopEnvironmentOptions() = default;
-DesktopEnvironmentOptions&
-DesktopEnvironmentOptions::operator=(
+DesktopEnvironmentOptions& DesktopEnvironmentOptions::operator=(
     DesktopEnvironmentOptions&& other) = default;
-DesktopEnvironmentOptions&
-DesktopEnvironmentOptions::operator=(
+DesktopEnvironmentOptions& DesktopEnvironmentOptions::operator=(
     const DesktopEnvironmentOptions& other) = default;
 
 void DesktopEnvironmentOptions::Initialize() {
   desktop_capture_options_.set_detect_updated_region(true);
-#if defined (OS_WIN)
-  // Whether DirectX capturer can be enabled depends on various factors,
-  // including how many applications are using related APIs.
-  // WebRTC/DesktopCapturer will take care of those details. This check is used
-  // to ensure D3D APIs are safe to access in the current environment.
-  desktop_capture_options_.set_allow_directx_capturer(IsD3DAvailable());
-#endif
 }
 
 const DesktopCaptureOptions*
@@ -58,8 +45,7 @@ DesktopEnvironmentOptions::desktop_capture_options() const {
   return &desktop_capture_options_;
 }
 
-DesktopCaptureOptions*
-DesktopEnvironmentOptions::desktop_capture_options() {
+DesktopCaptureOptions* DesktopEnvironmentOptions::desktop_capture_options() {
   return &desktop_capture_options_;
 }
 
@@ -131,12 +117,6 @@ void DesktopEnvironmentOptions::set_clipboard_size(
 
 void DesktopEnvironmentOptions::ApplySessionOptions(
     const SessionOptions& options) {
-#if defined(OS_WIN)
-  absl::optional<bool> directx_capturer = options.GetBool("DirectX-Capturer");
-  if (directx_capturer) {
-    desktop_capture_options_.set_allow_directx_capturer(*directx_capturer);
-  }
-#endif
   // This field is for test purpose. Usually it should not be set to false.
   absl::optional<bool> detect_updated_region =
       options.GetBool("Detect-Updated-Region");
diff --git a/remoting/host/desktop_environment_options.h b/remoting/host/base/desktop_environment_options.h
similarity index 93%
rename from remoting/host/desktop_environment_options.h
rename to remoting/host/base/desktop_environment_options.h
index fc4268cc8c275e..fb78643e2b2e56 100644
--- a/remoting/host/desktop_environment_options.h
+++ b/remoting/host/base/desktop_environment_options.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_HOST_DESKTOP_ENVIRONMENT_OPTIONS_H_
-#define REMOTING_HOST_DESKTOP_ENVIRONMENT_OPTIONS_H_
+#ifndef REMOTING_HOST_BASE_DESKTOP_ENVIRONMENT_OPTIONS_H_
+#define REMOTING_HOST_BASE_DESKTOP_ENVIRONMENT_OPTIONS_H_
 
 #include "base/memory/weak_ptr.h"
 #include "remoting/base/session_options.h"
@@ -67,7 +67,7 @@ class DesktopEnvironmentOptions final {
   // instances. Note, not all DesktopEnvironments support curtain mode.
   bool enable_curtaining_ = false;
 
-  // True if a user-interactive window is showing up in it2me scenario.
+  // True if user-interactive windows should be displayed on the desktop.
   bool enable_user_interface_ = true;
 
   // True if a notification should be shown when a remote user is connected.
@@ -98,4 +98,4 @@ class DesktopEnvironmentOptions final {
 
 }  // namespace remoting
 
-#endif  // REMOTING_HOST_DESKTOP_ENVIRONMENT_OPTIONS_H_
+#endif  // REMOTING_HOST_BASE_DESKTOP_ENVIRONMENT_OPTIONS_H_
diff --git a/remoting/host/basic_desktop_environment.cc b/remoting/host/basic_desktop_environment.cc
index ee417c5bdf9e0c..f6ca2f283a4c10 100644
--- a/remoting/host/basic_desktop_environment.cc
+++ b/remoting/host/basic_desktop_environment.cc
@@ -177,15 +177,8 @@ BasicDesktopEnvironment::BasicDesktopEnvironment(
   desktop_capture_options().x_display()->IgnoreXServerGrabs();
   watchdog.Disarm();
 #elif defined(OS_WIN)
-  // The options passed to this instance are determined by a process running in
-  // Session 0.  Access to DirectX functions in Session 0 is limited so the
-  // results are not guaranteed to be accurate in the desktop context.  Due to
-  // this problem, we need to requery the following method to make sure we are
-  // still safe to use D3D APIs.  Only overwrite the value if it isn't safe to
-  // use D3D APIs as we don't want to re-enable this setting if it was disabled
-  // via an experiment or client flag.
-  if (!IsD3DAvailable())
-    options_.desktop_capture_options()->set_allow_directx_capturer(false);
+  options_.desktop_capture_options()->set_allow_directx_capturer(
+      IsD3DAvailable());
 #endif
 }
 
diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h
index 963f69a154a72f..6987eab3b6690b 100644
--- a/remoting/host/chromoting_host.h
+++ b/remoting/host/chromoting_host.h
@@ -16,8 +16,8 @@
 #include "base/threading/thread.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "net/base/backoff_entry.h"
+#include "remoting/host/base/desktop_environment_options.h"
 #include "remoting/host/client_session.h"
-#include "remoting/host/desktop_environment_options.h"
 #include "remoting/host/host_extension.h"
 #include "remoting/host/host_status_monitor.h"
 #include "remoting/host/host_status_observer.h"
diff --git a/remoting/host/chromoting_messages.h b/remoting/host/chromoting_messages.h
index d304e3ad5c22a8..b635ef8ca0cadf 100644
--- a/remoting/host/chromoting_messages.h
+++ b/remoting/host/chromoting_messages.h
@@ -13,9 +13,9 @@
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_start.h"
 #include "ipc/ipc_platform_file.h"
+#include "remoting/host/base/desktop_environment_options.h"
 #include "remoting/host/base/screen_resolution.h"
 #include "remoting/host/chromoting_param_traits.h"
-#include "remoting/host/desktop_environment_options.h"
 #include "remoting/proto/action.pb.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/protocol/errors.h"
diff --git a/remoting/host/chromoting_param_traits.h b/remoting/host/chromoting_param_traits.h
index 87bc30be40430a..c3240d70ea37d2 100644
--- a/remoting/host/chromoting_param_traits.h
+++ b/remoting/host/chromoting_param_traits.h
@@ -10,8 +10,8 @@
 #include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
 #include "remoting/base/result.h"
+#include "remoting/host/base/desktop_environment_options.h"
 #include "remoting/host/base/screen_resolution.h"
-#include "remoting/host/desktop_environment_options.h"
 #include "remoting/proto/action.pb.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/proto/file_transfer.pb.h"
diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h
index 5c563cd41172e7..a9a4549360ad91 100644
--- a/remoting/host/client_session.h
+++ b/remoting/host/client_session.h
@@ -18,13 +18,13 @@
 #include "base/timer/timer.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
+#include "remoting/host/base/desktop_environment_options.h"
 #include "remoting/host/client_session_control.h"
 #include "remoting/host/client_session_details.h"
 #include "remoting/host/client_session_events.h"
 #include "remoting/host/desktop_and_cursor_composer_notifier.h"
 #include "remoting/host/desktop_and_cursor_conditional_composer.h"
 #include "remoting/host/desktop_display_info.h"
-#include "remoting/host/desktop_environment_options.h"
 #include "remoting/host/host_experiment_session_plugin.h"
 #include "remoting/host/host_extension_session_manager.h"
 #include "remoting/host/mojom/chromoting_host_services.mojom.h"
diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc
index b330c43ae09f31..88492223f5291d 100644
--- a/remoting/host/client_session_unittest.cc
+++ b/remoting/host/client_session_unittest.cc
@@ -809,34 +809,4 @@ TEST_F(ClientSessionTest, ForwardHostSessionOptions2) {
                    ->detect_updated_region());
 }
 
-#if defined(OS_WIN)
-TEST_F(ClientSessionTest, ForwardDirectXHostSessionOptions1) {
-  auto session = std::make_unique<protocol::FakeSession>();
-  auto configuration = std::make_unique<jingle_xmpp::XmlElement>(
-      jingle_xmpp::QName(kChromotingXmlNamespace, "host-configuration"));
-  configuration->SetBodyText("DirectX-Capturer:true");
-  session->SetAttachment(0, std::move(configuration));
-  CreateClientSession(std::move(session));
-  ConnectClientSession();
-  ASSERT_TRUE(desktop_environment_factory_->last_desktop_environment()
-                  ->options()
-                  .desktop_capture_options()
-                  ->allow_directx_capturer());
-}
-
-TEST_F(ClientSessionTest, ForwardDirectXHostSessionOptions2) {
-  auto session = std::make_unique<protocol::FakeSession>();
-  auto configuration = std::make_unique<jingle_xmpp::XmlElement>(
-      jingle_xmpp::QName(kChromotingXmlNamespace, "host-configuration"));
-  configuration->SetBodyText("DirectX-Capturer:false");
-  session->SetAttachment(0, std::move(configuration));
-  CreateClientSession(std::move(session));
-  ConnectClientSession();
-  ASSERT_FALSE(desktop_environment_factory_->last_desktop_environment()
-                   ->options()
-                   .desktop_capture_options()
-                   ->allow_directx_capturer());
-}
-#endif
-
 }  // namespace remoting
diff --git a/remoting/host/desktop_environment.h b/remoting/host/desktop_environment.h
index 11b3043ef65475..439c796258100f 100644
--- a/remoting/host/desktop_environment.h
+++ b/remoting/host/desktop_environment.h
@@ -12,8 +12,8 @@
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "remoting/host/base/desktop_environment_options.h"
 #include "remoting/host/desktop_and_cursor_conditional_composer.h"
-#include "remoting/host/desktop_environment_options.h"
 
 namespace webrtc {
 class DesktopCapturer;
diff --git a/remoting/host/desktop_session_agent.h b/remoting/host/desktop_session_agent.h
index bbf7c3537eb7d2..fe585c5c8e7f77 100644
--- a/remoting/host/desktop_session_agent.h
+++ b/remoting/host/desktop_session_agent.h
@@ -21,10 +21,10 @@
 #include "mojo/public/cpp/bindings/associated_remote.h"
 #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
 #include "mojo/public/cpp/system/message_pipe.h"
+#include "remoting/host/base/desktop_environment_options.h"
 #include "remoting/host/client_session_control.h"
 #include "remoting/host/desktop_and_cursor_conditional_composer.h"
 #include "remoting/host/desktop_display_info.h"
-#include "remoting/host/desktop_environment_options.h"
 #include "remoting/host/file_transfer/session_file_operations_handler.h"
 #include "remoting/host/mojom/desktop_session.mojom.h"
 #include "remoting/host/mojom/remoting_mojom_traits.h"
diff --git a/remoting/host/desktop_session_agent_unittest.cc b/remoting/host/desktop_session_agent_unittest.cc
index d2da93fef78a98..bdc0a7d37cf478 100644
--- a/remoting/host/desktop_session_agent_unittest.cc
+++ b/remoting/host/desktop_session_agent_unittest.cc
@@ -19,9 +19,9 @@
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_listener.h"
 #include "remoting/base/auto_thread_task_runner.h"
+#include "remoting/host/base/desktop_environment_options.h"
 #include "remoting/host/base/screen_resolution.h"
 #include "remoting/host/chromoting_messages.h"
-#include "remoting/host/desktop_environment_options.h"
 #include "remoting/host/fake_desktop_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/remoting/host/fake_desktop_environment.h b/remoting/host/fake_desktop_environment.h
index e8f5958840dd3e..c2d46cd57de33c 100644
--- a/remoting/host/fake_desktop_environment.h
+++ b/remoting/host/fake_desktop_environment.h
@@ -13,9 +13,9 @@
 #include "base/memory/raw_ptr.h"
 #include "base/task/single_thread_task_runner.h"
 #include "remoting/host/action_executor.h"
+#include "remoting/host/base/desktop_environment_options.h"
 #include "remoting/host/base/screen_controls.h"
 #include "remoting/host/desktop_environment.h"
-#include "remoting/host/desktop_environment_options.h"
 #include "remoting/host/fake_mouse_cursor_monitor.h"
 #include "remoting/host/input_injector.h"
 #include "remoting/protocol/fake_desktop_capturer.h"
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index bfb7d12066c372..0b1e23f1c8d2d0 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -52,6 +52,7 @@
 #include "remoting/base/rsa_key_pair.h"
 #include "remoting/base/service_urls.h"
 #include "remoting/base/util.h"
+#include "remoting/host/base/desktop_environment_options.h"
 #include "remoting/host/base/host_exit_codes.h"
 #include "remoting/host/base/switches.h"
 #include "remoting/host/base/username.h"
@@ -63,7 +64,6 @@
 #include "remoting/host/config_watcher.h"
 #include "remoting/host/crash_process.h"
 #include "remoting/host/desktop_environment.h"
-#include "remoting/host/desktop_environment_options.h"
 #include "remoting/host/desktop_session_connector.h"
 #include "remoting/host/ftl_echo_message_listener.h"
 #include "remoting/host/ftl_host_change_notification_listener.h"
diff --git a/services/device/fingerprint/fingerprint_chromeos.cc b/services/device/fingerprint/fingerprint_chromeos.cc
index e0c6d86130b175..04f7e34458b4c9 100644
--- a/services/device/fingerprint/fingerprint_chromeos.cc
+++ b/services/device/fingerprint/fingerprint_chromeos.cc
@@ -56,6 +56,8 @@ device::mojom::ScanResult ToMojom(biod::ScanResult type) {
       return device::mojom::ScanResult::TOO_FAST;
     case biod::SCAN_RESULT_IMMOBILE:
       return device::mojom::ScanResult::IMMOBILE;
+    case biod::SCAN_RESULT_NO_MATCH:
+      return device::mojom::ScanResult::NO_MATCH;
     case biod::SCAN_RESULT_MAX:
       return device::mojom::ScanResult::kMaxValue;
   }
@@ -244,12 +246,12 @@ void FingerprintChromeOS::BiodAuthScanDoneReceived(
     entries.emplace_back(std::move(item.first), std::move(paths));
   }
 
-  auto casted_scan_result = static_cast<device::mojom::ScanResult>(scan_result);
-  CHECK(device::mojom::IsKnownEnumValue(casted_scan_result));
+  auto mojom_scan_result = ToMojom(scan_result);
+  CHECK(device::mojom::IsKnownEnumValue(mojom_scan_result));
 
   for (auto& observer : observers_) {
     observer->OnAuthScanDone(
-        casted_scan_result,
+        mojom_scan_result,
         base::flat_map<std::string, std::vector<std::string>>(entries));
   }
 }
diff --git a/services/device/fingerprint/fingerprint_chromeos_unittest.cc b/services/device/fingerprint/fingerprint_chromeos_unittest.cc
index 85ca06a675c1cc..34152fbad1b148 100644
--- a/services/device/fingerprint/fingerprint_chromeos_unittest.cc
+++ b/services/device/fingerprint/fingerprint_chromeos_unittest.cc
@@ -41,6 +41,7 @@ class FakeFingerprintObserver : public mojom::FingerprintObserver {
       const base::flat_map<std::string, std::vector<std::string>>& matches)
       override {
     auth_scan_dones_++;
+    last_scan_result_ = scan_result;
   }
 
   void OnSessionFailed() override { session_failures_++; }
@@ -51,12 +52,18 @@ class FakeFingerprintObserver : public mojom::FingerprintObserver {
   int restarts() { return restarts_; }
   int session_failures() { return session_failures_; }
 
+  device::mojom::ScanResult last_scan_result() const {
+    return last_scan_result_;
+  }
+
  private:
   mojo::Receiver<mojom::FingerprintObserver> receiver_;
   int enroll_scan_dones_ = 0;  // Count of enroll scan done signal received.
   int auth_scan_dones_ = 0;    // Count of auth scan done signal received.
   int restarts_ = 0;           // Count of restart signal received.
   int session_failures_ = 0;   // Count of session failed signal received.
+
+  device::mojom::ScanResult last_scan_result_;  // Last received ScanResult.
 };
 
 class FingerprintChromeOSTest : public testing::Test {
@@ -89,10 +96,10 @@ class FingerprintChromeOSTest : public testing::Test {
         -1 /* percent_complete */);
   }
 
-  void GenerateAuthScanDoneSignal() {
+  void GenerateAuthScanDoneSignal(biod::ScanResult scan_result) {
     std::string fake_fingerprint_data;
-    chromeos::FakeBiodClient::Get()->SendAuthScanDone(
-        fake_fingerprint_data, biod::SCAN_RESULT_SUCCESS);
+    chromeos::FakeBiodClient::Get()->SendAuthScanDone(fake_fingerprint_data,
+                                                      scan_result);
   }
 
   void GenerateSessionFailedSignal() {
@@ -162,7 +169,7 @@ TEST_F(FingerprintChromeOSTest, FingerprintObserverTest) {
   chromeos::FakeBiodClient::Get()->StartAuthSession(base::BindOnce(
       &FingerprintChromeOSTest::onStartSession, base::Unretained(this)));
   base::RunLoop().RunUntilIdle();
-  GenerateAuthScanDoneSignal();
+  GenerateAuthScanDoneSignal(biod::SCAN_RESULT_SUCCESS);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(observer.auth_scan_dones(), 1);
 
@@ -195,4 +202,59 @@ TEST_F(FingerprintChromeOSTest, SimultaneousGetRecordsRequests) {
   EXPECT_TRUE(RequestDataIsReset());
 }
 
+TEST_F(FingerprintChromeOSTest, FingerprintScanResultConvertTest) {
+  mojo::PendingRemote<mojom::FingerprintObserver> pending_observer;
+  FakeFingerprintObserver observer(
+      pending_observer.InitWithNewPipeAndPassReceiver());
+  fingerprint()->AddFingerprintObserver(std::move(pending_observer));
+
+  chromeos::FakeBiodClient::Get()->StartAuthSession(base::BindOnce(
+      &FingerprintChromeOSTest::onStartSession, base::Unretained(this)));
+  base::RunLoop().RunUntilIdle();
+
+  GenerateAuthScanDoneSignal(biod::SCAN_RESULT_SUCCESS);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(observer.last_scan_result(), device::mojom::ScanResult::SUCCESS);
+
+  GenerateAuthScanDoneSignal(biod::SCAN_RESULT_PARTIAL);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(observer.last_scan_result(), device::mojom::ScanResult::PARTIAL);
+
+  GenerateAuthScanDoneSignal(biod::SCAN_RESULT_INSUFFICIENT);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(observer.last_scan_result(),
+            device::mojom::ScanResult::INSUFFICIENT);
+
+  GenerateAuthScanDoneSignal(biod::SCAN_RESULT_SENSOR_DIRTY);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(observer.last_scan_result(),
+            device::mojom::ScanResult::SENSOR_DIRTY);
+
+  GenerateAuthScanDoneSignal(biod::SCAN_RESULT_TOO_SLOW);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(observer.last_scan_result(), device::mojom::ScanResult::TOO_SLOW);
+
+  GenerateAuthScanDoneSignal(biod::SCAN_RESULT_TOO_FAST);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(observer.last_scan_result(), device::mojom::ScanResult::TOO_FAST);
+
+  GenerateAuthScanDoneSignal(biod::SCAN_RESULT_IMMOBILE);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(observer.last_scan_result(), device::mojom::ScanResult::IMMOBILE);
+
+  GenerateAuthScanDoneSignal(biod::SCAN_RESULT_NO_MATCH);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(observer.last_scan_result(), device::mojom::ScanResult::NO_MATCH);
+
+  GenerateAuthScanDoneSignal(biod::SCAN_RESULT_MAX);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(observer.last_scan_result(), device::mojom::ScanResult::kMaxValue);
+}
+
+// Make sure that compilation fails if a new value is added and this assert is
+// not updated. When updating this, please extend unit tests to check newly
+// added value.
+static_assert(device::mojom::ScanResult::kMaxValue ==
+              device::mojom::ScanResult::NO_MATCH);
+
 }  // namespace device
diff --git a/services/device/nfc/README.md b/services/device/nfc/README.md
index 9c0a5a1ff6e965..3c83d5461b949f 100644
--- a/services/device/nfc/README.md
+++ b/services/device/nfc/README.md
@@ -13,12 +13,16 @@ interface defined in the `services/device/public/mojom/nfc.mojom` file and
 implemented by the `services/device/nfc` module.
 
 NDEFReader is the primary interface of Web NFC. The NDEFReader interface has
-both, write and scan methods:
+write, makeReadOnly, and scan methods:
 
 - The write method is for writing data to an NFC tag. This method returns a
   promise, which will be resolved when the message is successfully written to an
   NFC tag, or rejected either when errors happened or process is aborted by
   setting the AbortSignal in the NDEFWriteOptions.
+- The makeReadOnly method is for making an NFC tag permanently read-only. This
+  method returns a promise, which will be resolved when an NFC tag has been made
+  read-only, or rejected either when errors happened or process is aborted by
+  setting the AbortSignal in the NDEFMakeReadOnlyOptions.
 - The scan method tries to read data from any NFC tag that comes within
   proximity. Once there is some data found, an NDEFReadingEvent carrying the
   data is dispatched to the NDEFReader.
diff --git a/services/device/nfc/android/java/src/org/chromium/device/nfc/NfcImpl.java b/services/device/nfc/android/java/src/org/chromium/device/nfc/NfcImpl.java
index 2e32fd760e338c..5ae5aa340d603c 100644
--- a/services/device/nfc/android/java/src/org/chromium/device/nfc/NfcImpl.java
+++ b/services/device/nfc/android/java/src/org/chromium/device/nfc/NfcImpl.java
@@ -37,7 +37,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/** Android implementation of the NFC mojo service defined in device/nfc/nfc.mojom.
+/**
+ * Android implementation of the NFC mojo service defined in
+ * services/device/public/mojom/nfc.mojom.
  */
 public class NfcImpl implements Nfc {
     private static final String TAG = "NfcImpl";
@@ -88,6 +90,13 @@ public class NfcImpl implements Nfc {
      */
     private PendingPushOperation mPendingPushOperation;
 
+    /**
+     * Object that contains the callback that was passed to method
+     * #makeReadOnly(MakeReadOnly_Response callback)
+     * @see PendingMakeReadOnlyOperation
+     */
+    private PendingMakeReadOnlyOperation mPendingMakeReadOnlyOperation;
+
     /**
      * Utility that provides I/O operations for a Tag. Created on demand when Tag is found.
      * @see NfcTagHandler
@@ -219,8 +228,43 @@ public void push(NdefMessage message, NdefWriteOptions options, Push_Response ca
      */
     @Override
     public void cancelPush() {
-        completePendingPushOperation(createError(
-                NdefErrorType.OPERATION_CANCELLED, "The push operation is already cancelled."));
+        completePendingPushOperation(
+                createError(NdefErrorType.OPERATION_CANCELLED, "The push operation is cancelled."));
+    }
+
+    /**
+     * Make NFC tag read-only whenever it is in proximity.
+     *
+     * @param callback that is used to notify when make read-only operation is completed.
+     */
+    @Override
+    public void makeReadOnly(MakeReadOnly_Response callback) {
+        if (!checkIfReady(callback)) return;
+
+        if (mOperationsSuspended) {
+            callback.call(createError(NdefErrorType.OPERATION_CANCELLED,
+                    "Cannot make read-only because NFC operations are suspended."));
+        }
+
+        // If previous pending make read-only operation is not completed, cancel it.
+        if (mPendingMakeReadOnlyOperation != null) {
+            mPendingMakeReadOnlyOperation.complete(createError(NdefErrorType.OPERATION_CANCELLED,
+                    "Make read-only is cancelled due to a new make read-only request."));
+        }
+
+        mPendingMakeReadOnlyOperation = new PendingMakeReadOnlyOperation(callback);
+
+        enableReaderModeIfNeeded();
+        processPendingMakeReadOnlyOperation();
+    }
+
+    /**
+     * Cancels pending make read-only operation.
+     */
+    @Override
+    public void cancelMakeReadOnly() {
+        completePendingMakeReadOnlyOperation(createError(
+                NdefErrorType.OPERATION_CANCELLED, "The make read-only operation is cancelled."));
     }
 
     /**
@@ -274,16 +318,17 @@ public void onConnectionError(MojoException e) {
     }
 
     /**
-     * Suspends all pending watch operations and cancel push operations.
+     * Suspends all pending watch operations and cancel push / makeReadOnly operations.
      */
     public void suspendNfcOperations() {
         mOperationsSuspended = true;
         disableReaderMode();
         cancelPush();
+        cancelMakeReadOnly();
     }
 
     /**
-     * Resumes all pending watch / push operations.
+     * Resumes all pending watch / push / makeReadOnly operations.
      */
     public void resumeNfcOperations() {
         mOperationsSuspended = false;
@@ -316,6 +361,27 @@ public void complete(NdefError error) {
         }
     }
 
+    /**
+     * Holds information about pending make read-only operation.
+     */
+    private static class PendingMakeReadOnlyOperation {
+        private final MakeReadOnly_Response mMakeReadOnlyResponseCallback;
+
+        public PendingMakeReadOnlyOperation(MakeReadOnly_Response callback) {
+            mMakeReadOnlyResponseCallback = callback;
+        }
+
+        /**
+         * Completes pending make read-only operation.
+         *
+         * @param error should be null when operation is completed successfully, otherwise,
+         * error object with corresponding NdefErrorType should be provided.
+         */
+        public void complete(NdefError error) {
+            if (mMakeReadOnlyResponseCallback != null) mMakeReadOnlyResponseCallback.call(error);
+        }
+    }
+
     /**
      * Helper method that creates NdefError object from NdefErrorType.
      */
@@ -377,14 +443,17 @@ public void onTagDiscovered(Tag tag) {
     }
 
     /**
-     * Enables reader mode, allowing NFC device to read / write NFC tags.
+     * Enables reader mode, allowing NFC device to read / write / make read-only NFC tags.
      * @see android.nfc.NfcAdapter#enableReaderMode
      */
     private void enableReaderModeIfNeeded() {
         if (mReaderCallbackHandler != null || mActivity == null || mNfcAdapter == null) return;
 
-        // Do not enable reader mode, if there are no active push / watch operations.
-        if (mPendingPushOperation == null && mWatchIds.size() == 0) return;
+        // Do not enable reader mode, if there are no active push / makeReadOnly / watch operations.
+        if (mPendingPushOperation == null && mPendingMakeReadOnlyOperation == null
+                && mWatchIds.size() == 0) {
+            return;
+        }
 
         mReaderCallbackHandler = new ReaderCallbackHandler(this);
         mNfcAdapter.enableReaderMode(mActivity, mReaderCallbackHandler,
@@ -410,11 +479,12 @@ private void disableReaderMode() {
     }
 
     /**
-     * Checks if there are pending push / watch operations and disables readre mode
+     * Checks if there are pending push / makeReadOnly / watch operations and disables reader mode
      * whenever necessary.
      */
     private void disableReaderModeIfNeeded() {
-        if (mPendingPushOperation == null && mWatchIds.size() == 0) {
+        if (mPendingPushOperation == null && mPendingMakeReadOnlyOperation == null
+                && mWatchIds.size() == 0) {
             disableReaderMode();
         }
     }
@@ -479,6 +549,58 @@ private void processPendingPushOperation() {
         }
     }
 
+    /**
+     * Handles completion of pending make read-only operation, completes make read-only operation.
+     * On error, invalidates #mTagHandler.
+     */
+    private void pendingMakeReadOnlyOperationCompleted(NdefError error) {
+        completePendingMakeReadOnlyOperation(error);
+        if (error != null) mTagHandler = null;
+    }
+
+    /**
+     * Completes pending make read-only operation and disables reader mode if needed.
+     */
+    private void completePendingMakeReadOnlyOperation(NdefError error) {
+        if (mPendingMakeReadOnlyOperation == null) return;
+
+        mPendingMakeReadOnlyOperation.complete(error);
+        mPendingMakeReadOnlyOperation = null;
+        disableReaderModeIfNeeded();
+    }
+
+    /**
+     * Checks whether there is a #mPendingMakeReadOnlyOperation and make NFC tag read-only. In case
+     * of exception calls pendingMakeReadOnlyOperationCompleted() with appropriate error object.
+     */
+    private void processPendingMakeReadOnlyOperation() {
+        if (mTagHandler == null || mPendingMakeReadOnlyOperation == null) return;
+
+        if (mTagHandler.isTagOutOfRange()) {
+            mTagHandler = null;
+            return;
+        }
+
+        try {
+            mTagHandler.connect();
+            if (mTagHandler.makeReadOnly()) {
+                pendingMakeReadOnlyOperationCompleted(null);
+            } else {
+                Log.w(TAG, "Cannot make NFC tag read-only. The tag cannot be made read-only");
+                pendingMakeReadOnlyOperationCompleted(createError(NdefErrorType.NOT_SUPPORTED,
+                        "Failed to make read-only because the tag cannot be made read-only"));
+            }
+        } catch (TagLostException e) {
+            Log.w(TAG, "Cannot make NFC tag read-only. Tag is lost: " + e.getMessage());
+            pendingMakeReadOnlyOperationCompleted(createError(NdefErrorType.IO_ERROR,
+                    "Failed to make read-only because the tag is lost: " + e.getMessage()));
+        } catch (IOException e) {
+            Log.w(TAG, "Cannot make NFC tag read-only: " + e.getMessage());
+            pendingMakeReadOnlyOperationCompleted(createError(NdefErrorType.IO_ERROR,
+                    "Failed to make read-only due to an IO error: " + e.getMessage()));
+        }
+    }
+
     /**
      * Reads NdefMessage from a tag and forwards message to matching method.
      */
@@ -564,11 +686,14 @@ protected void processPendingOperations(NfcTagHandler tagHandler) {
                     createError(NdefErrorType.NOT_SUPPORTED, "This tag is not supported."));
             pendingPushOperationCompleted(
                     createError(NdefErrorType.NOT_SUPPORTED, "This tag is not supported."));
+            pendingMakeReadOnlyOperationCompleted(
+                    createError(NdefErrorType.NOT_SUPPORTED, "This tag is not supported."));
             return;
         }
 
         processPendingWatchOperations();
         processPendingPushOperation();
+        processPendingMakeReadOnlyOperation();
         if (mTagHandler != null && mTagHandler.isConnected()) {
             try {
                 mTagHandler.close();
diff --git a/services/device/nfc/android/java/src/org/chromium/device/nfc/NfcTagHandler.java b/services/device/nfc/android/java/src/org/chromium/device/nfc/NfcTagHandler.java
index 41b839c6f5bc25..f1fe2449163f59 100644
--- a/services/device/nfc/android/java/src/org/chromium/device/nfc/NfcTagHandler.java
+++ b/services/device/nfc/android/java/src/org/chromium/device/nfc/NfcTagHandler.java
@@ -56,6 +56,7 @@ public static NfcTagHandler create(Tag tag) {
     private interface TagTechnologyHandler {
         public void write(NdefMessage message)
                 throws IOException, TagLostException, FormatException, IllegalStateException;
+        public boolean makeReadOnly() throws IOException, TagLostException;
         public NdefMessage read()
                 throws IOException, TagLostException, FormatException, IllegalStateException;
         public boolean canAlwaysOverwrite()
@@ -79,6 +80,11 @@ public void write(NdefMessage message)
             mNdef.writeNdefMessage(message);
         }
 
+        @Override
+        public boolean makeReadOnly() throws IOException, TagLostException {
+            return mNdef.makeReadOnly();
+        }
+
         @Override
         public NdefMessage read()
                 throws IOException, TagLostException, FormatException, IllegalStateException {
@@ -110,6 +116,16 @@ public void write(NdefMessage message)
             mNdefFormattable.format(message);
         }
 
+        @Override
+        public boolean makeReadOnly() throws IOException, TagLostException {
+            try {
+                mNdefFormattable.formatReadOnly(NdefMessageUtils.emptyNdefMessage());
+            } catch (FormatException e) {
+                return false;
+            }
+            return true;
+        }
+
         @Override
         public NdefMessage read() throws FormatException {
             return NdefMessageUtils.emptyNdefMessage();
@@ -182,6 +198,13 @@ public void write(NdefMessage message)
         mTechHandler.write(message);
     }
 
+    /**
+     * Make NFC tag read-only.
+     */
+    public boolean makeReadOnly() throws IOException, TagLostException {
+        return mTechHandler.makeReadOnly();
+    }
+
     public NdefMessage read()
             throws IOException, TagLostException, FormatException, IllegalStateException {
         return mTechHandler.read();
diff --git a/services/device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java b/services/device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java
index e506a6dd3d0a2c..dd3ec5e7eeb5d7 100644
--- a/services/device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java
+++ b/services/device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java
@@ -28,6 +28,7 @@
 import android.nfc.NfcAdapter.ReaderCallback;
 import android.nfc.NfcManager;
 import android.nfc.Tag;
+import android.nfc.TagLostException;
 import android.nfc.tech.TagTechnology;
 import android.os.Build;
 import android.os.Bundle;
@@ -51,6 +52,7 @@
 import org.chromium.device.mojom.NdefRecord;
 import org.chromium.device.mojom.NdefRecordTypeCategory;
 import org.chromium.device.mojom.NdefWriteOptions;
+import org.chromium.device.mojom.Nfc.MakeReadOnly_Response;
 import org.chromium.device.mojom.Nfc.Push_Response;
 import org.chromium.device.mojom.Nfc.Watch_Response;
 import org.chromium.device.mojom.NfcClient;
@@ -157,6 +159,7 @@ public void setUp() {
         try {
             doNothing().when(mNfcTagHandler).connect();
             doNothing().when(mNfcTagHandler).write(any(android.nfc.NdefMessage.class));
+            doReturn(true).when(mNfcTagHandler).makeReadOnly();
             doReturn(createNdefMessageWithRecordId(DUMMY_RECORD_ID)).when(mNfcTagHandler).read();
             doNothing().when(mNfcTagHandler).close();
         } catch (IOException | FormatException e) {
@@ -1225,6 +1228,74 @@ public void testCancelPush() {
         assertEquals(NdefErrorType.OPERATION_CANCELLED, mErrorCaptor.getValue().errorType);
     }
 
+    /**
+     * Test that Nfc.makeReadOnly() fails if NFC operations are already suspended.
+     */
+    @Test
+    @Feature({"NFCTest"})
+    public void testMakeReadOnlyWhenOperationsAreSuspended() {
+        TestNfcImpl nfc = new TestNfcImpl(mContext, mDelegate);
+        nfc.suspendNfcOperations();
+        mDelegate.invokeCallback();
+        MakeReadOnly_Response mockCallback = mock(MakeReadOnly_Response.class);
+        nfc.makeReadOnly(mockCallback);
+
+        // Check that makeReadOnly request was cancelled with OPERATION_CANCELLED.
+        verify(mockCallback).call(mErrorCaptor.capture());
+        assertNotNull(mErrorCaptor.getValue());
+        assertEquals(NdefErrorType.OPERATION_CANCELLED, mErrorCaptor.getValue().errorType);
+    }
+
+    /**
+     * Test that Nfc.suspendNfcOperations() cancels pending makeReadOnly operation.
+     */
+    @Test
+    @Feature({"NFCTest"})
+    public void testSuspendNfcOperationsCancelMakeReadOnly() {
+        TestNfcImpl nfc = new TestNfcImpl(mContext, mDelegate);
+        mDelegate.invokeCallback();
+        MakeReadOnly_Response mockMakeReadOnlyCallback = mock(MakeReadOnly_Response.class);
+        nfc.makeReadOnly(mockMakeReadOnlyCallback);
+        nfc.suspendNfcOperations();
+
+        // Check that makeReadOnly request was cancelled with OPERATION_CANCELLED.
+        verify(mockMakeReadOnlyCallback).call(mErrorCaptor.capture());
+        assertNotNull(mErrorCaptor.getValue());
+        assertEquals(NdefErrorType.OPERATION_CANCELLED, mErrorCaptor.getValue().errorType);
+    }
+
+    /**
+     * Test that Nfc.makeReadOnly() successful when NFC tag is connected.
+     */
+    @Test
+    @Feature({"NFCTest"})
+    public void testMakeReadOnly() {
+        TestNfcImpl nfc = new TestNfcImpl(mContext, mDelegate);
+        mDelegate.invokeCallback();
+        MakeReadOnly_Response mockCallback = mock(MakeReadOnly_Response.class);
+        nfc.makeReadOnly(mockCallback);
+        nfc.processPendingOperationsForTesting(mNfcTagHandler);
+        verify(mockCallback).call(mErrorCaptor.capture());
+        assertNull(mErrorCaptor.getValue());
+    }
+
+    /**
+     * Test that Nfc.cancelMakeReadOnly() cancels pending makeReadOnly operation.
+     */
+    @Test
+    @Feature({"NFCTest"})
+    public void testCancelMakeReadOnly() {
+        TestNfcImpl nfc = new TestNfcImpl(mContext, mDelegate);
+        mDelegate.invokeCallback();
+        MakeReadOnly_Response mockMakeReadOnlyCallback = mock(MakeReadOnly_Response.class);
+        nfc.makeReadOnly(mockMakeReadOnlyCallback);
+        nfc.cancelMakeReadOnly();
+
+        // Check that MakeReadOnly request was cancelled with OPERATION_CANCELLED.
+        verify(mockMakeReadOnlyCallback).call(mErrorCaptor.capture());
+        assertEquals(NdefErrorType.OPERATION_CANCELLED, mErrorCaptor.getValue().errorType);
+    }
+
     /**
      * Test that Nfc.watch() works correctly and client is notified.
      */
@@ -1309,7 +1380,8 @@ public void testCancelWatch() {
 
     /**
      * Test that when the tag in proximity is found to be not NDEF compatible, an error event will
-     * be dispatched to the client and the pending push operation will also be ended with an error.
+     * be dispatched to the client and the pending push and makeReadOnly operations will also be
+     * ended with an error.
      */
     @Test
     @Feature({"NFCTest"})
@@ -1321,8 +1393,11 @@ public void testNonNdefCompatibleTagFound() {
         Watch_Response mockWatchCallback = mock(Watch_Response.class);
         nfc.watch(mNextWatchId, mockWatchCallback);
         // Start a push.
-        Push_Response mockCallback = mock(Push_Response.class);
-        nfc.push(createMojoNdefMessage(), createNdefWriteOptions(), mockCallback);
+        Push_Response mockPushCallback = mock(Push_Response.class);
+        nfc.push(createMojoNdefMessage(), createNdefWriteOptions(), mockPushCallback);
+        // Start a makeReadOnly.
+        MakeReadOnly_Response mockMakeReadOnlyCallback = mock(MakeReadOnly_Response.class);
+        nfc.makeReadOnly(mockMakeReadOnlyCallback);
 
         // Pass null tag handler to simulate that the tag is not NDEF compatible.
         nfc.processPendingOperationsForTesting(null);
@@ -1337,14 +1412,20 @@ public void testNonNdefCompatibleTagFound() {
                         any(NdefMessage.class));
 
         // The pending push failed with the correct error.
-        verify(mockCallback).call(mErrorCaptor.capture());
+        verify(mockPushCallback).call(mErrorCaptor.capture());
+        assertNotNull(mErrorCaptor.getValue());
+        assertEquals(NdefErrorType.NOT_SUPPORTED, mErrorCaptor.getValue().errorType);
+
+        // The pending makeReadOnly failed with the correct error.
+        verify(mockMakeReadOnlyCallback).call(mErrorCaptor.capture());
         assertNotNull(mErrorCaptor.getValue());
         assertEquals(NdefErrorType.NOT_SUPPORTED, mErrorCaptor.getValue().errorType);
     }
 
     /**
      * Test that when the tag in proximity is found to be blocked, an error event will
-     * be dispatched to the client and the pending push operation will also be ended with an error.
+     * be dispatched to the client and the pending push and makeReadOnly operations will also be
+     * ended with an error.
      */
     @Test
     @Feature({"NFCTest"})
@@ -1356,8 +1437,11 @@ public void testBlockedTagFound() {
         Watch_Response mockWatchCallback = mock(Watch_Response.class);
         nfc.watch(mNextWatchId, mockWatchCallback);
         // Start a push.
-        Push_Response mockCallback = mock(Push_Response.class);
-        nfc.push(createMojoNdefMessage(), createNdefWriteOptions(), mockCallback);
+        Push_Response mockPushCallback = mock(Push_Response.class);
+        nfc.push(createMojoNdefMessage(), createNdefWriteOptions(), mockPushCallback);
+        // Start a makeReadOnly.
+        MakeReadOnly_Response mockMakeReadOnlyCallback = mock(MakeReadOnly_Response.class);
+        nfc.makeReadOnly(mockMakeReadOnlyCallback);
 
         // Mocks blocked 'NFC tag found' event.
         NfcBlocklist.getInstance().setIsTagBlockedForTesting(true);
@@ -1376,7 +1460,12 @@ public void testBlockedTagFound() {
                         any(NdefMessage.class));
 
         // The pending push failed with the correct error.
-        verify(mockCallback).call(mErrorCaptor.capture());
+        verify(mockPushCallback).call(mErrorCaptor.capture());
+        assertNotNull(mErrorCaptor.getValue());
+        assertEquals(NdefErrorType.NOT_SUPPORTED, mErrorCaptor.getValue().errorType);
+
+        // The pending makeReadOnly failed with the correct error.
+        verify(mockMakeReadOnlyCallback).call(mErrorCaptor.capture());
         assertNotNull(mErrorCaptor.getValue());
         assertEquals(NdefErrorType.NOT_SUPPORTED, mErrorCaptor.getValue().errorType);
     }
@@ -1452,6 +1541,28 @@ public void testTagDisconnectedDuringWrite() throws IOException, FormatException
         assertEquals(NdefErrorType.IO_ERROR, mErrorCaptor.getValue().errorType);
     }
 
+    /**
+     * Test that when tag is disconnected during makeReadOnly operation, TagLostException is
+     * handled.
+     */
+    @Test
+    @Feature({"NFCTest"})
+    public void testTagDisconnectedDuringMakeReadOnly() throws IOException, FormatException {
+        TestNfcImpl nfc = new TestNfcImpl(mContext, mDelegate);
+        mDelegate.invokeCallback();
+        MakeReadOnly_Response mockCallback = mock(MakeReadOnly_Response.class);
+
+        // Force makeReadOnly operation to fail
+        doThrow(TagLostException.class).when(mNfcTagHandler).makeReadOnly();
+        nfc.makeReadOnly(mockCallback);
+        nfc.processPendingOperationsForTesting(mNfcTagHandler);
+        verify(mockCallback).call(mErrorCaptor.capture());
+
+        // Test that correct error is returned.
+        assertNotNull(mErrorCaptor.getValue());
+        assertEquals(NdefErrorType.IO_ERROR, mErrorCaptor.getValue().errorType);
+    }
+
     /**
      * Test that multiple Nfc.push() invocations do not disable reader mode.
      */
@@ -1476,6 +1587,30 @@ public void testPushMultipleInvocations() {
         assertEquals(NdefErrorType.OPERATION_CANCELLED, mErrorCaptor.getValue().errorType);
     }
 
+    /**
+     * Test that multiple Nfc.makeReadOnly() invocations do not disable reader mode.
+     */
+    @Test
+    @Feature({"NFCTest"})
+    public void testMakeReadOnlyMultipleInvocations() {
+        TestNfcImpl nfc = new TestNfcImpl(mContext, mDelegate);
+        mDelegate.invokeCallback();
+
+        MakeReadOnly_Response mockCallback1 = mock(MakeReadOnly_Response.class);
+        MakeReadOnly_Response mockCallback2 = mock(MakeReadOnly_Response.class);
+        nfc.makeReadOnly(mockCallback1);
+        nfc.makeReadOnly(mockCallback2);
+
+        verify(mNfcAdapter, times(1))
+                .enableReaderMode(any(Activity.class), any(ReaderCallback.class), anyInt(),
+                        (Bundle) isNull());
+        verify(mNfcAdapter, times(0)).disableReaderMode(mActivity);
+
+        verify(mockCallback1).call(mErrorCaptor.capture());
+        assertNotNull(mErrorCaptor.getValue());
+        assertEquals(NdefErrorType.OPERATION_CANCELLED, mErrorCaptor.getValue().errorType);
+    }
+
     /**
      * Test that reader mode is disabled and push operation is cancelled with correct error code.
      */
@@ -1503,6 +1638,34 @@ public void testPushInvocationWithCancel() {
         assertEquals(NdefErrorType.OPERATION_CANCELLED, mErrorCaptor.getValue().errorType);
     }
 
+    /**
+     * Test that reader mode is disabled and makeReadOnly operation is cancelled with correct error
+     * code.
+     */
+    @Test
+    @Feature({"NFCTest"})
+    public void testMakeReadOnlyInvocationWithCancel() {
+        TestNfcImpl nfc = new TestNfcImpl(mContext, mDelegate);
+        mDelegate.invokeCallback();
+        MakeReadOnly_Response mockCallback = mock(MakeReadOnly_Response.class);
+
+        nfc.makeReadOnly(mockCallback);
+
+        verify(mNfcAdapter, times(1))
+                .enableReaderMode(any(Activity.class), any(ReaderCallback.class), anyInt(),
+                        (Bundle) isNull());
+
+        nfc.cancelMakeReadOnly();
+
+        // Reader mode is disabled.
+        verify(mNfcAdapter, times(1)).disableReaderMode(mActivity);
+
+        // Test that correct error is returned.
+        verify(mockCallback).call(mErrorCaptor.capture());
+        assertNotNull(mErrorCaptor.getValue());
+        assertEquals(NdefErrorType.OPERATION_CANCELLED, mErrorCaptor.getValue().errorType);
+    }
+
     /**
      * Test that reader mode is disabled and two push operations are cancelled with correct
      * error code.
@@ -1539,9 +1702,45 @@ public void testTwoPushInvocationsWithCancel() {
         assertEquals(NdefErrorType.OPERATION_CANCELLED, mErrorCaptor.getValue().errorType);
     }
 
+    /**
+     * Test that reader mode is disabled and two makeReadOnly operations are cancelled with correct
+     * error code.
+     */
+    @Test
+    @Feature({"NFCTest"})
+    public void testTwoMakeReadOnlyInvocationsWithCancel() {
+        TestNfcImpl nfc = new TestNfcImpl(mContext, mDelegate);
+        mDelegate.invokeCallback();
+
+        MakeReadOnly_Response mockCallback1 = mock(MakeReadOnly_Response.class);
+        MakeReadOnly_Response mockCallback2 = mock(MakeReadOnly_Response.class);
+        nfc.makeReadOnly(mockCallback1);
+        nfc.makeReadOnly(mockCallback2);
+
+        verify(mNfcAdapter, times(1))
+                .enableReaderMode(any(Activity.class), any(ReaderCallback.class), anyInt(),
+                        (Bundle) isNull());
+
+        // The second makeReadOnly should cancel the first makeReadOnly.
+        verify(mockCallback1).call(mErrorCaptor.capture());
+        assertNotNull(mErrorCaptor.getValue());
+        assertEquals(NdefErrorType.OPERATION_CANCELLED, mErrorCaptor.getValue().errorType);
+
+        // Cancel the second makeReadOnly.
+        nfc.cancelMakeReadOnly();
+
+        // Reader mode is disabled after cancelMakeReadOnly is invoked.
+        verify(mNfcAdapter, times(1)).disableReaderMode(mActivity);
+
+        // Test that correct error is returned.
+        verify(mockCallback2).call(mErrorCaptor.capture());
+        assertNotNull(mErrorCaptor.getValue());
+        assertEquals(NdefErrorType.OPERATION_CANCELLED, mErrorCaptor.getValue().errorType);
+    }
+
     /**
      * Test that reader mode is not disabled when there is an active watch operation and push
-     * operation operation is cancelled.
+     * operation is cancelled.
      */
     @Test
     @Feature({"NFCTest"})
@@ -1573,6 +1772,40 @@ public void testCancelledPushDontDisableReaderMode() {
         verify(mNfcAdapter, times(1)).disableReaderMode(mActivity);
     }
 
+    /**
+     * Test that reader mode is not disabled when there is an active watch operation and
+     * makeReadOnly operation is cancelled.
+     */
+    @Test
+    @Feature({"NFCTest"})
+    public void testCancelledMakeReadOnlyDontDisableReaderMode() {
+        TestNfcImpl nfc = new TestNfcImpl(mContext, mDelegate);
+        mDelegate.invokeCallback();
+        Watch_Response mockWatchCallback = mock(Watch_Response.class);
+        nfc.watch(mNextWatchId, mockWatchCallback);
+
+        MakeReadOnly_Response mockMakeReadOnlyCallback = mock(MakeReadOnly_Response.class);
+        nfc.makeReadOnly(mockMakeReadOnlyCallback);
+
+        verify(mNfcAdapter, times(1))
+                .enableReaderMode(any(Activity.class), any(ReaderCallback.class), anyInt(),
+                        (Bundle) isNull());
+
+        nfc.cancelMakeReadOnly();
+
+        // MakeReadOnly was cancelled with OPERATION_CANCELLED.
+        verify(mockMakeReadOnlyCallback).call(mErrorCaptor.capture());
+        assertNotNull(mErrorCaptor.getValue());
+        assertEquals(NdefErrorType.OPERATION_CANCELLED, mErrorCaptor.getValue().errorType);
+
+        verify(mNfcAdapter, times(0)).disableReaderMode(mActivity);
+
+        nfc.cancelWatch(mNextWatchId);
+
+        // Reader mode is disabled when there are no pending makeReadOnly / watch operations.
+        verify(mNfcAdapter, times(1)).disableReaderMode(mActivity);
+    }
+
     /**
      * Test that Nfc.push() succeeds for NFC messages with EMPTY records.
      */
diff --git a/services/device/public/cpp/test/scoped_nfc_overrider.cc b/services/device/public/cpp/test/scoped_nfc_overrider.cc
index 2a408fb9cd69a6..74327b46b50ac0 100644
--- a/services/device/public/cpp/test/scoped_nfc_overrider.cc
+++ b/services/device/public/cpp/test/scoped_nfc_overrider.cc
@@ -32,6 +32,10 @@ class FakeNFC : public mojom::NFC {
     std::move(callback).Run(nullptr);
   }
   void CancelPush() override {}
+  void MakeReadOnly(MakeReadOnlyCallback callback) override {
+    std::move(callback).Run(nullptr);
+  }
+  void CancelMakeReadOnly() override {}
   void Watch(uint32_t id, WatchCallback callback) override {
     std::move(callback).Run(nullptr);
   }
diff --git a/services/device/public/mojom/fingerprint.mojom b/services/device/public/mojom/fingerprint.mojom
index 699d661029cf4b..cab35a1151c75a 100644
--- a/services/device/public/mojom/fingerprint.mojom
+++ b/services/device/public/mojom/fingerprint.mojom
@@ -5,7 +5,8 @@
 module device.mojom;
 
 // Note: this needs to stay in sync with
-// src/platform2/system_api/dbus/biod/constants.proto in the ChromeOS repro.
+// src/platform2/system_api/dbus/biod/constants.proto in the ChromeOS repo.
+// Please modify tools/metrics/histograms/enums.xml when changing this.
 // These values are persisted to logs. Entries should not be renumbered and
 // numeric values should never be reused (See FingerprintScanResult metrics
 // enum).
@@ -17,6 +18,7 @@ enum ScanResult {
   TOO_SLOW = 4,
   TOO_FAST = 5,
   IMMOBILE = 6,
+  NO_MATCH = 7,
 };
 
 // Note: this needs to stay in sync with
diff --git a/services/device/public/mojom/nfc.mojom b/services/device/public/mojom/nfc.mojom
index 059b27c9c7fd4b..d80f8d3247b063 100644
--- a/services/device/public/mojom/nfc.mojom
+++ b/services/device/public/mojom/nfc.mojom
@@ -101,8 +101,8 @@ struct NDEFWriteOptions {
   bool overwrite;
 };
 
-// Interface used by Web NFC to push data to NFC devices and get notified of
-// nearby NFC devices.
+// Interface used by Web NFC to push data to NFC devices, make an NFC tag
+// read-only, and get notified of nearby NFC devices.
 interface NFC {
   // NFCClient interface is used to notify |client| when watching for nearby
   // NFC devices.
@@ -115,6 +115,12 @@ interface NFC {
   // Cancels pending push request.
   CancelPush();
 
+  // Make an NFC tag permanently read-only.
+  MakeReadOnly() => (NDEFError? error);
+
+  // Cancels pending make read-only request.
+  CancelMakeReadOnly();
+
   // Starts watching for nearby NFC devices. |id| identifies each watch request
   // on the current Mojo connection.
   Watch(uint32 id) => (NDEFError? error);
diff --git a/services/device/serial/bluetooth_serial_device_enumerator.cc b/services/device/serial/bluetooth_serial_device_enumerator.cc
index bd69301e17dd4d..481bb4d0225e0c 100644
--- a/services/device/serial/bluetooth_serial_device_enumerator.cc
+++ b/services/device/serial/bluetooth_serial_device_enumerator.cc
@@ -120,7 +120,11 @@ void BluetoothSerialDeviceEnumerator::SetClassicAdapter(
 void BluetoothSerialDeviceEnumerator::PortAdded(
     const std::string& device_address) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  DCHECK(!base::Contains(device_ports_, device_address));
+  // Ignore duplicate devices. Some ports send device notifications after
+  // requesting the classic adapter resulting in double detection of devices.
+  if (base::Contains(device_ports_, device_address))
+    return;
+
   auto port = mojom::SerialPortInfo::New();
   port->token = base::UnguessableToken::Create();
   port->path = base::FilePath::FromUTF8Unsafe(device_address);
diff --git a/services/device/serial/bluetooth_serial_port_impl.cc b/services/device/serial/bluetooth_serial_port_impl.cc
index a633d08f08a82c..330716a5786b4e 100644
--- a/services/device/serial/bluetooth_serial_port_impl.cc
+++ b/services/device/serial/bluetooth_serial_port_impl.cc
@@ -69,8 +69,7 @@ void BluetoothSerialPortImpl::OpenSocket(OpenCallback callback) {
     return;
   }
 
-  BluetoothDevice::UUIDSet device_uuids = device->GetUUIDs();
-  if (base::Contains(device_uuids, GetSerialPortProfileUUID())) {
+  if (base::Contains(device->GetUUIDs(), GetSerialPortProfileUUID())) {
     auto split_callback = base::SplitOnceCallback(std::move(callback));
     device->ConnectToService(
         GetSerialPortProfileUUID(),
diff --git a/services/viz/public/cpp/gpu/gpu.cc b/services/viz/public/cpp/gpu/gpu.cc
index 16841da415e091..78462d5402cc0c 100644
--- a/services/viz/public/cpp/gpu/gpu.cc
+++ b/services/viz/public/cpp/gpu/gpu.cc
@@ -11,6 +11,7 @@
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/raw_ptr.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_checker.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ -333,6 +334,7 @@ scoped_refptr<gpu::GpuChannelHost> Gpu::EstablishGpuChannelSync() {
   if (channel)
     return channel;
 
+  SCOPED_UMA_HISTOGRAM_TIMER("GPU.EstablishGpuChannelSyncTime");
   SendEstablishGpuChannelRequest();
   base::WaitableEvent event(base::WaitableEvent::ResetPolicy::MANUAL,
                             base::WaitableEvent::InitialState::SIGNALED);
diff --git a/testing/buildbot/chrome.json b/testing/buildbot/chrome.json
index 5f9a5d9693c6f0..3835d6af4146a8 100644
--- a/testing/buildbot/chrome.json
+++ b/testing/buildbot/chrome.json
@@ -3828,7 +3828,8 @@
   },
   "mac-chrome": {
     "additional_compile_targets": [
-      "chrome"
+      "chrome",
+      "chrome/installer/mac"
     ],
     "isolated_scripts": [
       {
diff --git a/testing/buildbot/chromium.dawn.json b/testing/buildbot/chromium.dawn.json
index 0f899a2c2f1a1f..67d2e85875a5db 100644
--- a/testing/buildbot/chromium.dawn.json
+++ b/testing/buildbot/chromium.dawn.json
@@ -194,7 +194,6 @@
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--no-xvfb",
           "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
         ],
@@ -228,7 +227,6 @@
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu-with-backend-validation",
           "--time-out-ms=30000",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--no-xvfb",
           "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
         ],
@@ -450,7 +448,6 @@
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--no-xvfb",
           "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
         ],
@@ -484,7 +481,6 @@
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu-with-backend-validation",
           "--time-out-ms=30000",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--no-xvfb",
           "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
         ],
@@ -706,7 +702,6 @@
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--no-xvfb",
           "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
         ],
@@ -740,7 +735,6 @@
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu-with-backend-validation",
           "--time-out-ms=30000",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--no-xvfb",
           "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
         ],
@@ -962,7 +956,6 @@
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--no-xvfb",
           "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
         ],
@@ -996,7 +989,6 @@
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu-with-backend-validation",
           "--time-out-ms=30000",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--no-xvfb",
           "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
         ],
@@ -1235,7 +1227,6 @@
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--platform=mac-mac11"
         ],
         "isolate_name": "webgpu_blink_web_tests",
@@ -1271,7 +1262,6 @@
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu-with-backend-validation",
           "--time-out-ms=30000",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--platform=mac-mac11"
         ],
         "isolate_name": "webgpu_blink_web_tests",
@@ -1494,7 +1484,6 @@
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--platform=mac-mac11"
         ],
         "isolate_name": "webgpu_blink_web_tests",
@@ -1528,7 +1517,6 @@
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu-with-backend-validation",
           "--time-out-ms=30000",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--platform=mac-mac11"
         ],
         "isolate_name": "webgpu_blink_web_tests",
@@ -1839,7 +1827,6 @@
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--platform=mac-mac11"
         ],
         "isolate_name": "webgpu_blink_web_tests",
@@ -1875,7 +1862,6 @@
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu-with-backend-validation",
           "--time-out-ms=30000",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--platform=mac-mac11"
         ],
         "isolate_name": "webgpu_blink_web_tests",
@@ -2098,7 +2084,6 @@
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--platform=mac-mac11"
         ],
         "isolate_name": "webgpu_blink_web_tests",
@@ -2132,7 +2117,6 @@
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu-with-backend-validation",
           "--time-out-ms=30000",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--platform=mac-mac11"
         ],
         "isolate_name": "webgpu_blink_web_tests",
@@ -2352,7 +2336,6 @@
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--target=Release_x64",
           "--time-out-ms=48000"
         ],
@@ -2575,7 +2558,6 @@
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--target=Release_x64"
         ],
         "isolate_name": "webgpu_blink_web_tests",
@@ -2608,7 +2590,6 @@
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu-with-partial-backend-validation",
           "--time-out-ms=30000",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--target=Release_x64"
         ],
         "isolate_name": "webgpu_blink_web_tests",
@@ -2823,7 +2804,6 @@
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--target=Release_x64"
         ],
         "isolate_name": "webgpu_blink_web_tests",
@@ -2856,7 +2836,6 @@
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu-with-partial-backend-validation",
           "--time-out-ms=30000",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--target=Release_x64"
         ],
         "isolate_name": "webgpu_blink_web_tests",
@@ -3071,7 +3050,6 @@
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--target=Release_x64"
         ],
         "isolate_name": "webgpu_blink_web_tests",
@@ -3104,7 +3082,6 @@
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu-with-partial-backend-validation",
           "--time-out-ms=30000",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--target=Release_x64"
         ],
         "isolate_name": "webgpu_blink_web_tests",
@@ -3319,7 +3296,6 @@
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--target=Release_x64"
         ],
         "isolate_name": "webgpu_blink_web_tests",
@@ -3352,7 +3328,6 @@
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu-with-partial-backend-validation",
           "--time-out-ms=30000",
-          "--additional-driver-flag=--disable-gpu-sandbox",
           "--target=Release_x64"
         ],
         "isolate_name": "webgpu_blink_web_tests",
@@ -3568,8 +3543,7 @@
       {
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
-          "--flag-specific=webgpu",
-          "--additional-driver-flag=--disable-gpu-sandbox"
+          "--flag-specific=webgpu"
         ],
         "isolate_name": "webgpu_blink_web_tests",
         "merge": {
@@ -3600,8 +3574,7 @@
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu-with-partial-backend-validation",
-          "--time-out-ms=30000",
-          "--additional-driver-flag=--disable-gpu-sandbox"
+          "--time-out-ms=30000"
         ],
         "isolate_name": "webgpu_blink_web_tests",
         "merge": {
@@ -3814,8 +3787,7 @@
       {
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
-          "--flag-specific=webgpu",
-          "--additional-driver-flag=--disable-gpu-sandbox"
+          "--flag-specific=webgpu"
         ],
         "isolate_name": "webgpu_blink_web_tests",
         "merge": {
@@ -3846,8 +3818,7 @@
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu-with-partial-backend-validation",
-          "--time-out-ms=30000",
-          "--additional-driver-flag=--disable-gpu-sandbox"
+          "--time-out-ms=30000"
         ],
         "isolate_name": "webgpu_blink_web_tests",
         "merge": {
@@ -4060,8 +4031,7 @@
       {
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
-          "--flag-specific=webgpu",
-          "--additional-driver-flag=--disable-gpu-sandbox"
+          "--flag-specific=webgpu"
         ],
         "isolate_name": "webgpu_blink_web_tests",
         "merge": {
@@ -4092,8 +4062,7 @@
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu-with-partial-backend-validation",
-          "--time-out-ms=30000",
-          "--additional-driver-flag=--disable-gpu-sandbox"
+          "--time-out-ms=30000"
         ],
         "isolate_name": "webgpu_blink_web_tests",
         "merge": {
@@ -4306,8 +4275,7 @@
       {
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
-          "--flag-specific=webgpu",
-          "--additional-driver-flag=--disable-gpu-sandbox"
+          "--flag-specific=webgpu"
         ],
         "isolate_name": "webgpu_blink_web_tests",
         "merge": {
@@ -4338,8 +4306,7 @@
         "args": [
           "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
           "--flag-specific=webgpu-with-partial-backend-validation",
-          "--time-out-ms=30000",
-          "--additional-driver-flag=--disable-gpu-sandbox"
+          "--time-out-ms=30000"
         ],
         "isolate_name": "webgpu_blink_web_tests",
         "merge": {
diff --git a/testing/buildbot/filters/fuchsia.content_browsertests.filter b/testing/buildbot/filters/fuchsia.content_browsertests.filter
index cf409a29c8abc8..06ca5213740546 100644
--- a/testing/buildbot/filters/fuchsia.content_browsertests.filter
+++ b/testing/buildbot/filters/fuchsia.content_browsertests.filter
@@ -14,9 +14,6 @@
 -ContentBrowserTest.BrowserCrashCallStack
 -ContentBrowserTest.RendererCrashCallStack
 -CrossPlatformAccessibilityBrowserTest.ControlsIdsForDateTimePopup
--DataDecoderBrowserTest.DecodeImage
--DataDecoderBrowserTest.DecodeImageIsolated
--DataDecoderBrowserTest.LaunchIsolated
 -DirectSocketsTcpBrowserTest.OpenTcp_MDNS
 -DnsHttpsProtocolUpgradeBrowserTest.HttpsProtocolUpgrade
 -MHTMLGenerationSitePerProcessTest/*
@@ -34,8 +31,6 @@
 -PrerenderBrowserTest.AbandonIfRendererProcessCrashes
 -ProprietaryCodec/WebRtcMediaRecorderTest.PeerConnection/*
 -SRC_ClearKey/EncryptedMediaTest.*
--SavePackageWebBundleBrowserTest.OnePageSimple
--SavePageAsWebBundleBrowserTest.GenerateOnePageSimpleWebBundle
 -SitePerProcessDelegatedInkBrowserTest.MetadataAndPointGoThroughOOPIF
 -SitePerProcessMouseWheelHitTestBrowserTest.MouseWheelEventPositionChange
 -SnapshotBrowserTest.AsyncMultiWindowTest
@@ -44,16 +39,9 @@
 -TtsSsmlBrowserTest.TestStripSSML
 -UnrestrictedSharedArrayBufferOriginTrialBrowserTest.*
 -UserMedia/WebRtcConstraintsBrowserTest.GetUserMediaConstraints/4
--WebBundleFileBrowserTest/WebBundleFileBrowserTest.*
--WebBundleNetworkBrowserTest.*
--WebBundleTrustableFileBrowserTest/WebBundleTrustableFileBrowserTest.*
 -WebContentsViewAuraTest.OverscrollNavigation
 -WebContentsViewAuraTest.OverscrollNavigationWithTouchHandler
 -WebContentsViewAuraTest.RepeatedQuickOverscrollGestures
--WebIdBrowserTest.AbsoluteURLs
--WebIdBrowserTest.FastLoginFlow
--WebIdBrowserTest.FullLoginFlow
--WebIdBrowserTest.TokenExchangePermissionDeclined
 -WebRtcCaptureFromElementBrowserTest.VerifyCanvasCaptureWebGLFrames
 -WebRtcVideoCaptureServiceBrowserTest.FramesSentThroughTextureVirtualDeviceGetDisplayedOnPage
 
@@ -70,11 +58,23 @@
 -WebRtcIPPermissionDeniedTest.GatherLocalCandidates
 -WebRtcIPPolicyPublicAndPrivateInterfacesTest.GatherLocalCandidates
 
-# crbug.com/1260245: InterestGroupBrowserTest failures
+# crbug.com/1260245: Failing due to using jitless v8 out of renderer
+-DataDecoderBrowserTest.DecodeImage
+-DataDecoderBrowserTest.DecodeImageIsolated
+-DataDecoderBrowserTest.LaunchIsolated
 -InterestGroupBrowserTest*
 -*/InterestGroupFencedFrameBrowserTest.*
 -InterestGroupPrivateNetworkBrowserTest.*
 -InterestGroupRestrictedPermissionsPolicyBrowserTest.*
+-SavePackageWebBundleBrowserTest.OnePageSimple
+-SavePageAsWebBundleBrowserTest.GenerateOnePageSimpleWebBundle
+-WebBundleFileBrowserTest/WebBundleFileBrowserTest.*
+-WebBundleNetworkBrowserTest.*
+-WebBundleTrustableFileBrowserTest/WebBundleTrustableFileBrowserTest.*
+-WebIdBrowserTest.AbsoluteURLs
+-WebIdBrowserTest.FastLoginFlow
+-WebIdBrowserTest.FullLoginFlow
+-WebIdBrowserTest.TokenExchangePermissionDeclined
 
 # crbug.com/1212491: WebSQL is being deprecated, these are low priority
 -BackForwardCacheBrowserTest.DoesNotCacheIfWebDatabase
diff --git a/testing/buildbot/filters/stable_test_filters/linux-stable-filter-combined-rel/nacl_helper_nonsfi_unittests.filter b/testing/buildbot/filters/stable_test_filters/linux-stable-filter-combined-rel/nacl_helper_nonsfi_unittests.filter
deleted file mode 100644
index cd002c938c4e11..00000000000000
--- a/testing/buildbot/filters/stable_test_filters/linux-stable-filter-combined-rel/nacl_helper_nonsfi_unittests.filter
+++ /dev/null
@@ -1,362 +0,0 @@
--NaClNonSfiSandboxSIGSYSTest._newselect
--NaClNonSfiSandboxSIGSYSTest._sysctl
--NaClNonSfiSandboxSIGSYSTest.access
--NaClNonSfiSandboxSIGSYSTest.acct
--NaClNonSfiSandboxSIGSYSTest.add_key
--NaClNonSfiSandboxSIGSYSTest.adjtimex
--NaClNonSfiSandboxSIGSYSTest.afs_syscall
--NaClNonSfiSandboxSIGSYSTest.alarm
--NaClNonSfiSandboxSIGSYSTest.bdflush
--NaClNonSfiSandboxSIGSYSTest.break
--NaClNonSfiSandboxSIGSYSTest.capget
--NaClNonSfiSandboxSIGSYSTest.capset
--NaClNonSfiSandboxSIGSYSTest.chdir
--NaClNonSfiSandboxSIGSYSTest.chmod
--NaClNonSfiSandboxSIGSYSTest.chown
--NaClNonSfiSandboxSIGSYSTest.chown32
--NaClNonSfiSandboxSIGSYSTest.chroot
--NaClNonSfiSandboxSIGSYSTest.clock_adjtime
--NaClNonSfiSandboxSIGSYSTest.clock_nanosleep
--NaClNonSfiSandboxSIGSYSTest.clock_settime
--NaClNonSfiSandboxSIGSYSTest.creat
--NaClNonSfiSandboxSIGSYSTest.create_module
--NaClNonSfiSandboxSIGSYSTest.delete_module
--NaClNonSfiSandboxSIGSYSTest.dup3
--NaClNonSfiSandboxSIGSYSTest.epoll_create1
--NaClNonSfiSandboxSIGSYSTest.epoll_ctl
--NaClNonSfiSandboxSIGSYSTest.epoll_pwait
--NaClNonSfiSandboxSIGSYSTest.epoll_wait
--NaClNonSfiSandboxSIGSYSTest.eventfd
--NaClNonSfiSandboxSIGSYSTest.eventfd2
--NaClNonSfiSandboxSIGSYSTest.execve
--NaClNonSfiSandboxSIGSYSTest.faccessat
--NaClNonSfiSandboxSIGSYSTest.fadvise64
--NaClNonSfiSandboxSIGSYSTest.fadvise64_64
--NaClNonSfiSandboxSIGSYSTest.fallocate
--NaClNonSfiSandboxSIGSYSTest.fanotify_init
--NaClNonSfiSandboxSIGSYSTest.fanotify_mark
--NaClNonSfiSandboxSIGSYSTest.fchdir
--NaClNonSfiSandboxSIGSYSTest.fchmod
--NaClNonSfiSandboxSIGSYSTest.fchmodat
--NaClNonSfiSandboxSIGSYSTest.fchown
--NaClNonSfiSandboxSIGSYSTest.fchown32
--NaClNonSfiSandboxSIGSYSTest.fchownat
--NaClNonSfiSandboxSIGSYSTest.fcntl
--NaClNonSfiSandboxSIGSYSTest.fdatasync
--NaClNonSfiSandboxSIGSYSTest.fgetxattr
--NaClNonSfiSandboxSIGSYSTest.flistxattr
--NaClNonSfiSandboxSIGSYSTest.flock
--NaClNonSfiSandboxSIGSYSTest.fork
--NaClNonSfiSandboxSIGSYSTest.fremovexattr
--NaClNonSfiSandboxSIGSYSTest.fsetxattr
--NaClNonSfiSandboxSIGSYSTest.fstat
--NaClNonSfiSandboxSIGSYSTest.fstatat64
--NaClNonSfiSandboxSIGSYSTest.fstatfs
--NaClNonSfiSandboxSIGSYSTest.fstatfs64
--NaClNonSfiSandboxSIGSYSTest.fsync
--NaClNonSfiSandboxSIGSYSTest.ftime
--NaClNonSfiSandboxSIGSYSTest.ftruncate
--NaClNonSfiSandboxSIGSYSTest.ftruncate64
--NaClNonSfiSandboxSIGSYSTest.futimesat
--NaClNonSfiSandboxSIGSYSTest.get_kernel_syms
--NaClNonSfiSandboxSIGSYSTest.get_mempolicy
--NaClNonSfiSandboxSIGSYSTest.get_robust_list
--NaClNonSfiSandboxSIGSYSTest.get_thread_area
--NaClNonSfiSandboxSIGSYSTest.getcpu
--NaClNonSfiSandboxSIGSYSTest.getcwd
--NaClNonSfiSandboxSIGSYSTest.getdents
--NaClNonSfiSandboxSIGSYSTest.getdents64
--NaClNonSfiSandboxSIGSYSTest.getgroups
--NaClNonSfiSandboxSIGSYSTest.getgroups32
--NaClNonSfiSandboxSIGSYSTest.getitimer
--NaClNonSfiSandboxSIGSYSTest.getpgid
--NaClNonSfiSandboxSIGSYSTest.getpgrp
--NaClNonSfiSandboxSIGSYSTest.getpid
--NaClNonSfiSandboxSIGSYSTest.getpmsg
--NaClNonSfiSandboxSIGSYSTest.getppid
--NaClNonSfiSandboxSIGSYSTest.getpriority
--NaClNonSfiSandboxSIGSYSTest.getresgid
--NaClNonSfiSandboxSIGSYSTest.getresgid32
--NaClNonSfiSandboxSIGSYSTest.getresuid
--NaClNonSfiSandboxSIGSYSTest.getresuid32
--NaClNonSfiSandboxSIGSYSTest.getrlimit
--NaClNonSfiSandboxSIGSYSTest.getrusage
--NaClNonSfiSandboxSIGSYSTest.getsid
--NaClNonSfiSandboxSIGSYSTest.getxattr
--NaClNonSfiSandboxSIGSYSTest.gtty
--NaClNonSfiSandboxSIGSYSTest.idle
--NaClNonSfiSandboxSIGSYSTest.init_module
--NaClNonSfiSandboxSIGSYSTest.inotify_add_watch
--NaClNonSfiSandboxSIGSYSTest.inotify_init
--NaClNonSfiSandboxSIGSYSTest.inotify_init1
--NaClNonSfiSandboxSIGSYSTest.inotify_rm_watch
--NaClNonSfiSandboxSIGSYSTest.io_cancel
--NaClNonSfiSandboxSIGSYSTest.io_destroy
--NaClNonSfiSandboxSIGSYSTest.io_getevents
--NaClNonSfiSandboxSIGSYSTest.io_setup
--NaClNonSfiSandboxSIGSYSTest.io_submit
--NaClNonSfiSandboxSIGSYSTest.ioctl
--NaClNonSfiSandboxSIGSYSTest.ioperm
--NaClNonSfiSandboxSIGSYSTest.iopl
--NaClNonSfiSandboxSIGSYSTest.ioprio_get
--NaClNonSfiSandboxSIGSYSTest.ioprio_set
--NaClNonSfiSandboxSIGSYSTest.ipc
--NaClNonSfiSandboxSIGSYSTest.kexec_load
--NaClNonSfiSandboxSIGSYSTest.keyctl
--NaClNonSfiSandboxSIGSYSTest.kill
--NaClNonSfiSandboxSIGSYSTest.lchown
--NaClNonSfiSandboxSIGSYSTest.lchown32
--NaClNonSfiSandboxSIGSYSTest.lgetxattr
--NaClNonSfiSandboxSIGSYSTest.link
--NaClNonSfiSandboxSIGSYSTest.linkat
--NaClNonSfiSandboxSIGSYSTest.listxattr
--NaClNonSfiSandboxSIGSYSTest.llistxattr
--NaClNonSfiSandboxSIGSYSTest.lock
--NaClNonSfiSandboxSIGSYSTest.lookup_dcookie
--NaClNonSfiSandboxSIGSYSTest.lremovexattr
--NaClNonSfiSandboxSIGSYSTest.lseek
--NaClNonSfiSandboxSIGSYSTest.lsetxattr
--NaClNonSfiSandboxSIGSYSTest.lstat
--NaClNonSfiSandboxSIGSYSTest.lstat64
--NaClNonSfiSandboxSIGSYSTest.mbind
--NaClNonSfiSandboxSIGSYSTest.migrate_pages
--NaClNonSfiSandboxSIGSYSTest.mincore
--NaClNonSfiSandboxSIGSYSTest.mkdir
--NaClNonSfiSandboxSIGSYSTest.mkdirat
--NaClNonSfiSandboxSIGSYSTest.mknod
--NaClNonSfiSandboxSIGSYSTest.mknodat
--NaClNonSfiSandboxSIGSYSTest.mlock
--NaClNonSfiSandboxSIGSYSTest.mlockall
--NaClNonSfiSandboxSIGSYSTest.mmap
--NaClNonSfiSandboxSIGSYSTest.modify_ldt
--NaClNonSfiSandboxSIGSYSTest.mount
--NaClNonSfiSandboxSIGSYSTest.move_pages
--NaClNonSfiSandboxSIGSYSTest.mpx
--NaClNonSfiSandboxSIGSYSTest.mq_getsetattr
--NaClNonSfiSandboxSIGSYSTest.mq_notify
--NaClNonSfiSandboxSIGSYSTest.mq_open
--NaClNonSfiSandboxSIGSYSTest.mq_timedreceive
--NaClNonSfiSandboxSIGSYSTest.mq_timedsend
--NaClNonSfiSandboxSIGSYSTest.mq_unlink
--NaClNonSfiSandboxSIGSYSTest.mremap
--NaClNonSfiSandboxSIGSYSTest.msync
--NaClNonSfiSandboxSIGSYSTest.munlock
--NaClNonSfiSandboxSIGSYSTest.munlockall
--NaClNonSfiSandboxSIGSYSTest.name_to_handle_at
--NaClNonSfiSandboxSIGSYSTest.nfsservctl
--NaClNonSfiSandboxSIGSYSTest.nice
--NaClNonSfiSandboxSIGSYSTest.oldfstat
--NaClNonSfiSandboxSIGSYSTest.oldlstat
--NaClNonSfiSandboxSIGSYSTest.oldolduname
--NaClNonSfiSandboxSIGSYSTest.oldstat
--NaClNonSfiSandboxSIGSYSTest.olduname
--NaClNonSfiSandboxSIGSYSTest.open_by_handle_at
--NaClNonSfiSandboxSIGSYSTest.pause
--NaClNonSfiSandboxSIGSYSTest.perf_event_open
--NaClNonSfiSandboxSIGSYSTest.personality
--NaClNonSfiSandboxSIGSYSTest.pipe2
--NaClNonSfiSandboxSIGSYSTest.pivot_root
--NaClNonSfiSandboxSIGSYSTest.ppoll
--NaClNonSfiSandboxSIGSYSTest.preadv
--NaClNonSfiSandboxSIGSYSTest.prlimit64
--NaClNonSfiSandboxSIGSYSTest.process_vm_readv
--NaClNonSfiSandboxSIGSYSTest.process_vm_writev
--NaClNonSfiSandboxSIGSYSTest.prof
--NaClNonSfiSandboxSIGSYSTest.profil
--NaClNonSfiSandboxSIGSYSTest.pselect6
--NaClNonSfiSandboxSIGSYSTest.putpmsg
--NaClNonSfiSandboxSIGSYSTest.pwritev
--NaClNonSfiSandboxSIGSYSTest.query_module
--NaClNonSfiSandboxSIGSYSTest.quotactl
--NaClNonSfiSandboxSIGSYSTest.readahead
--NaClNonSfiSandboxSIGSYSTest.readdir
--NaClNonSfiSandboxSIGSYSTest.readlink
--NaClNonSfiSandboxSIGSYSTest.readlinkat
--NaClNonSfiSandboxSIGSYSTest.readv
--NaClNonSfiSandboxSIGSYSTest.reboot
--NaClNonSfiSandboxSIGSYSTest.recvmmsg
--NaClNonSfiSandboxSIGSYSTest.remap_file_pages
--NaClNonSfiSandboxSIGSYSTest.removexattr
--NaClNonSfiSandboxSIGSYSTest.rename
--NaClNonSfiSandboxSIGSYSTest.renameat
--NaClNonSfiSandboxSIGSYSTest.request_key
--NaClNonSfiSandboxSIGSYSTest.rmdir
--NaClNonSfiSandboxSIGSYSTest.rt_sigaction
--NaClNonSfiSandboxSIGSYSTest.rt_sigpending
--NaClNonSfiSandboxSIGSYSTest.rt_sigprocmask
--NaClNonSfiSandboxSIGSYSTest.rt_sigqueueinfo
--NaClNonSfiSandboxSIGSYSTest.rt_sigreturn
--NaClNonSfiSandboxSIGSYSTest.rt_sigsuspend
--NaClNonSfiSandboxSIGSYSTest.rt_sigtimedwait
--NaClNonSfiSandboxSIGSYSTest.rt_tgsigqueueinfo
--NaClNonSfiSandboxSIGSYSTest.sched_get_priority_max
--NaClNonSfiSandboxSIGSYSTest.sched_get_priority_min
--NaClNonSfiSandboxSIGSYSTest.sched_getaffinity
--NaClNonSfiSandboxSIGSYSTest.sched_getparam
--NaClNonSfiSandboxSIGSYSTest.sched_getscheduler
--NaClNonSfiSandboxSIGSYSTest.sched_rr_get_interval
--NaClNonSfiSandboxSIGSYSTest.sched_setaffinity
--NaClNonSfiSandboxSIGSYSTest.sched_setparam
--NaClNonSfiSandboxSIGSYSTest.sched_setscheduler
--NaClNonSfiSandboxSIGSYSTest.select
--NaClNonSfiSandboxSIGSYSTest.sendfile
--NaClNonSfiSandboxSIGSYSTest.sendfile64
--NaClNonSfiSandboxSIGSYSTest.sendmmsg
--NaClNonSfiSandboxSIGSYSTest.set_mempolicy
--NaClNonSfiSandboxSIGSYSTest.set_thread_area
--NaClNonSfiSandboxSIGSYSTest.set_tid_address
--NaClNonSfiSandboxSIGSYSTest.setdomainname
--NaClNonSfiSandboxSIGSYSTest.setfsgid
--NaClNonSfiSandboxSIGSYSTest.setfsgid32
--NaClNonSfiSandboxSIGSYSTest.setfsuid
--NaClNonSfiSandboxSIGSYSTest.setfsuid32
--NaClNonSfiSandboxSIGSYSTest.setgid
--NaClNonSfiSandboxSIGSYSTest.setgid32
--NaClNonSfiSandboxSIGSYSTest.setgroups
--NaClNonSfiSandboxSIGSYSTest.setgroups32
--NaClNonSfiSandboxSIGSYSTest.sethostname
--NaClNonSfiSandboxSIGSYSTest.setitimer
--NaClNonSfiSandboxSIGSYSTest.setns
--NaClNonSfiSandboxSIGSYSTest.setpgid
--NaClNonSfiSandboxSIGSYSTest.setpriority
--NaClNonSfiSandboxSIGSYSTest.setregid
--NaClNonSfiSandboxSIGSYSTest.setregid32
--NaClNonSfiSandboxSIGSYSTest.setresgid
--NaClNonSfiSandboxSIGSYSTest.setresgid32
--NaClNonSfiSandboxSIGSYSTest.setresuid
--NaClNonSfiSandboxSIGSYSTest.setresuid32
--NaClNonSfiSandboxSIGSYSTest.setreuid
--NaClNonSfiSandboxSIGSYSTest.setreuid32
--NaClNonSfiSandboxSIGSYSTest.setrlimit
--NaClNonSfiSandboxSIGSYSTest.setsid
--NaClNonSfiSandboxSIGSYSTest.settimeofday
--NaClNonSfiSandboxSIGSYSTest.setuid
--NaClNonSfiSandboxSIGSYSTest.setuid32
--NaClNonSfiSandboxSIGSYSTest.setxattr
--NaClNonSfiSandboxSIGSYSTest.sgetmask
--NaClNonSfiSandboxSIGSYSTest.sigaction
--NaClNonSfiSandboxSIGSYSTest.signal
--NaClNonSfiSandboxSIGSYSTest.signalfd
--NaClNonSfiSandboxSIGSYSTest.signalfd4
--NaClNonSfiSandboxSIGSYSTest.sigpending
--NaClNonSfiSandboxSIGSYSTest.sigprocmask
--NaClNonSfiSandboxSIGSYSTest.sigreturn
--NaClNonSfiSandboxSIGSYSTest.sigsuspend
--NaClNonSfiSandboxSIGSYSTest.splice
--NaClNonSfiSandboxSIGSYSTest.ssetmask
--NaClNonSfiSandboxSIGSYSTest.stat
--NaClNonSfiSandboxSIGSYSTest.stat64
--NaClNonSfiSandboxSIGSYSTest.statfs
--NaClNonSfiSandboxSIGSYSTest.statfs64
--NaClNonSfiSandboxSIGSYSTest.stime
--NaClNonSfiSandboxSIGSYSTest.stty
--NaClNonSfiSandboxSIGSYSTest.swapoff
--NaClNonSfiSandboxSIGSYSTest.swapon
--NaClNonSfiSandboxSIGSYSTest.symlink
--NaClNonSfiSandboxSIGSYSTest.symlinkat
--NaClNonSfiSandboxSIGSYSTest.sync
--NaClNonSfiSandboxSIGSYSTest.sync_file_range
--NaClNonSfiSandboxSIGSYSTest.syncfs
--NaClNonSfiSandboxSIGSYSTest.sysfs
--NaClNonSfiSandboxSIGSYSTest.sysinfo
--NaClNonSfiSandboxSIGSYSTest.syslog
--NaClNonSfiSandboxSIGSYSTest.tee
--NaClNonSfiSandboxSIGSYSTest.tgkill
--NaClNonSfiSandboxSIGSYSTest.timer_create
--NaClNonSfiSandboxSIGSYSTest.timer_delete
--NaClNonSfiSandboxSIGSYSTest.timer_getoverrun
--NaClNonSfiSandboxSIGSYSTest.timer_gettime
--NaClNonSfiSandboxSIGSYSTest.timer_settime
--NaClNonSfiSandboxSIGSYSTest.timerfd_create
--NaClNonSfiSandboxSIGSYSTest.timerfd_gettime
--NaClNonSfiSandboxSIGSYSTest.timerfd_settime
--NaClNonSfiSandboxSIGSYSTest.tkill
--NaClNonSfiSandboxSIGSYSTest.truncate
--NaClNonSfiSandboxSIGSYSTest.truncate64
--NaClNonSfiSandboxSIGSYSTest.ugetrlimit
--NaClNonSfiSandboxSIGSYSTest.ulimit
--NaClNonSfiSandboxSIGSYSTest.umask
--NaClNonSfiSandboxSIGSYSTest.umount
--NaClNonSfiSandboxSIGSYSTest.umount2
--NaClNonSfiSandboxSIGSYSTest.uname
--NaClNonSfiSandboxSIGSYSTest.unlink
--NaClNonSfiSandboxSIGSYSTest.unlinkat
--NaClNonSfiSandboxSIGSYSTest.unshare
--NaClNonSfiSandboxSIGSYSTest.uselib
--NaClNonSfiSandboxSIGSYSTest.ustat
--NaClNonSfiSandboxSIGSYSTest.utime
--NaClNonSfiSandboxSIGSYSTest.utimensat
--NaClNonSfiSandboxSIGSYSTest.utimes
--NaClNonSfiSandboxSIGSYSTest.vfork
--NaClNonSfiSandboxSIGSYSTest.vhangup
--NaClNonSfiSandboxSIGSYSTest.vm86
--NaClNonSfiSandboxSIGSYSTest.vm86old
--NaClNonSfiSandboxSIGSYSTest.vmsplice
--NaClNonSfiSandboxSIGSYSTest.vserver
--NaClNonSfiSandboxSIGSYSTest.wait4
--NaClNonSfiSandboxSIGSYSTest.waitid
--NaClNonSfiSandboxSIGSYSTest.waitpid
--NaClNonSfiSandboxSIGSYSTest.writev
--NaClNonSfiSandboxTest.BPFIsSupported
--NaClNonSfiSandboxTest.DoFork
--NaClNonSfiSandboxTest.FutexWithRequeuePriorityInheritence
--NaClNonSfiSandboxTest.FutexWithRequeuePriorityInheritencePrivate
--NaClNonSfiSandboxTest.FutexWithUnlockPIPrivate
--NaClNonSfiSandboxTest.accept
--NaClNonSfiSandboxTest.bind
--NaClNonSfiSandboxTest.brk
--NaClNonSfiSandboxTest.clock_gettime_allowed
--NaClNonSfiSandboxTest.clock_gettime_crash_clock_fd
--NaClNonSfiSandboxTest.clone_by_pthread_create
--NaClNonSfiSandboxTest.clone_for_fork
--NaClNonSfiSandboxTest.connect
--NaClNonSfiSandboxTest.epoll_create_EPERM
--NaClNonSfiSandboxTest.fcntl_DUPFD
--NaClNonSfiSandboxTest.fcntl_DUPFD_CLOEXEC
--NaClNonSfiSandboxTest.fcntl_GETFL_SETFL
--NaClNonSfiSandboxTest.fcntl_GETFL_SETFL_allowed
--NaClNonSfiSandboxTest.fcntl_SETFD
--NaClNonSfiSandboxTest.fcntl_SETFD_allowed
--NaClNonSfiSandboxTest.getegid32_EPERM
--NaClNonSfiSandboxTest.getegid_EPERM
--NaClNonSfiSandboxTest.geteuid32_EPERM
--NaClNonSfiSandboxTest.geteuid_EPERM
--NaClNonSfiSandboxTest.getgid32_EPERM
--NaClNonSfiSandboxTest.getgid_EPERM
--NaClNonSfiSandboxTest.getpeername
--NaClNonSfiSandboxTest.getsockname
--NaClNonSfiSandboxTest.getsockopt
--NaClNonSfiSandboxTest.getuid32_EPERM
--NaClNonSfiSandboxTest.getuid_EPERM
--NaClNonSfiSandboxTest.invalid_syscall_crash
--NaClNonSfiSandboxTest.invalid_sysno
--NaClNonSfiSandboxTest.listen
--NaClNonSfiSandboxTest.madvise_EPERM
--NaClNonSfiSandboxTest.mmap_allowed
--NaClNonSfiSandboxTest.mmap_exec
--NaClNonSfiSandboxTest.mmap_read_exec
--NaClNonSfiSandboxTest.mmap_read_write_exec
--NaClNonSfiSandboxTest.mmap_unallowed_flag
--NaClNonSfiSandboxTest.mmap_unallowed_prot
--NaClNonSfiSandboxTest.mmap_write_exec
--NaClNonSfiSandboxTest.mprotect_allowed
--NaClNonSfiSandboxTest.mprotect_unallowed_prot
--NaClNonSfiSandboxTest.open_EPERM
--NaClNonSfiSandboxTest.openat_EPERM
--NaClNonSfiSandboxTest.prctl_SET_DUMPABLE
--NaClNonSfiSandboxTest.prctl_SET_NAME
--NaClNonSfiSandboxTest.ptrace_EPERM
--NaClNonSfiSandboxTest.random
--NaClNonSfiSandboxTest.recv
--NaClNonSfiSandboxTest.recvfrom
--NaClNonSfiSandboxTest.send
--NaClNonSfiSandboxTest.sendto
--NaClNonSfiSandboxTest.set_robust_list_EPERM
--NaClNonSfiSandboxTest.setsockopt
--NaClNonSfiSandboxTest.socket
--NaClNonSfiSandboxTest.tgkill_with_invalid_signal
--NaClNonSfiSandboxTest.tgkill_with_invalid_tgid
--NaClNonSfiSandboxTest.tgkill_with_invalid_tid
--NaClNonSfiSandboxTest.tgkill_with_negative_tgid
--NaClNonSfiSandboxTest.time_EPERM
--NaClNonsfiSandboxTest.socketpair_af_unix_disallowed
diff --git a/testing/buildbot/filters/stable_test_filters/linux-stable-filter-rel/nacl_helper_nonsfi_unittests.filter b/testing/buildbot/filters/stable_test_filters/linux-stable-filter-rel/nacl_helper_nonsfi_unittests.filter
deleted file mode 100644
index cd002c938c4e11..00000000000000
--- a/testing/buildbot/filters/stable_test_filters/linux-stable-filter-rel/nacl_helper_nonsfi_unittests.filter
+++ /dev/null
@@ -1,362 +0,0 @@
--NaClNonSfiSandboxSIGSYSTest._newselect
--NaClNonSfiSandboxSIGSYSTest._sysctl
--NaClNonSfiSandboxSIGSYSTest.access
--NaClNonSfiSandboxSIGSYSTest.acct
--NaClNonSfiSandboxSIGSYSTest.add_key
--NaClNonSfiSandboxSIGSYSTest.adjtimex
--NaClNonSfiSandboxSIGSYSTest.afs_syscall
--NaClNonSfiSandboxSIGSYSTest.alarm
--NaClNonSfiSandboxSIGSYSTest.bdflush
--NaClNonSfiSandboxSIGSYSTest.break
--NaClNonSfiSandboxSIGSYSTest.capget
--NaClNonSfiSandboxSIGSYSTest.capset
--NaClNonSfiSandboxSIGSYSTest.chdir
--NaClNonSfiSandboxSIGSYSTest.chmod
--NaClNonSfiSandboxSIGSYSTest.chown
--NaClNonSfiSandboxSIGSYSTest.chown32
--NaClNonSfiSandboxSIGSYSTest.chroot
--NaClNonSfiSandboxSIGSYSTest.clock_adjtime
--NaClNonSfiSandboxSIGSYSTest.clock_nanosleep
--NaClNonSfiSandboxSIGSYSTest.clock_settime
--NaClNonSfiSandboxSIGSYSTest.creat
--NaClNonSfiSandboxSIGSYSTest.create_module
--NaClNonSfiSandboxSIGSYSTest.delete_module
--NaClNonSfiSandboxSIGSYSTest.dup3
--NaClNonSfiSandboxSIGSYSTest.epoll_create1
--NaClNonSfiSandboxSIGSYSTest.epoll_ctl
--NaClNonSfiSandboxSIGSYSTest.epoll_pwait
--NaClNonSfiSandboxSIGSYSTest.epoll_wait
--NaClNonSfiSandboxSIGSYSTest.eventfd
--NaClNonSfiSandboxSIGSYSTest.eventfd2
--NaClNonSfiSandboxSIGSYSTest.execve
--NaClNonSfiSandboxSIGSYSTest.faccessat
--NaClNonSfiSandboxSIGSYSTest.fadvise64
--NaClNonSfiSandboxSIGSYSTest.fadvise64_64
--NaClNonSfiSandboxSIGSYSTest.fallocate
--NaClNonSfiSandboxSIGSYSTest.fanotify_init
--NaClNonSfiSandboxSIGSYSTest.fanotify_mark
--NaClNonSfiSandboxSIGSYSTest.fchdir
--NaClNonSfiSandboxSIGSYSTest.fchmod
--NaClNonSfiSandboxSIGSYSTest.fchmodat
--NaClNonSfiSandboxSIGSYSTest.fchown
--NaClNonSfiSandboxSIGSYSTest.fchown32
--NaClNonSfiSandboxSIGSYSTest.fchownat
--NaClNonSfiSandboxSIGSYSTest.fcntl
--NaClNonSfiSandboxSIGSYSTest.fdatasync
--NaClNonSfiSandboxSIGSYSTest.fgetxattr
--NaClNonSfiSandboxSIGSYSTest.flistxattr
--NaClNonSfiSandboxSIGSYSTest.flock
--NaClNonSfiSandboxSIGSYSTest.fork
--NaClNonSfiSandboxSIGSYSTest.fremovexattr
--NaClNonSfiSandboxSIGSYSTest.fsetxattr
--NaClNonSfiSandboxSIGSYSTest.fstat
--NaClNonSfiSandboxSIGSYSTest.fstatat64
--NaClNonSfiSandboxSIGSYSTest.fstatfs
--NaClNonSfiSandboxSIGSYSTest.fstatfs64
--NaClNonSfiSandboxSIGSYSTest.fsync
--NaClNonSfiSandboxSIGSYSTest.ftime
--NaClNonSfiSandboxSIGSYSTest.ftruncate
--NaClNonSfiSandboxSIGSYSTest.ftruncate64
--NaClNonSfiSandboxSIGSYSTest.futimesat
--NaClNonSfiSandboxSIGSYSTest.get_kernel_syms
--NaClNonSfiSandboxSIGSYSTest.get_mempolicy
--NaClNonSfiSandboxSIGSYSTest.get_robust_list
--NaClNonSfiSandboxSIGSYSTest.get_thread_area
--NaClNonSfiSandboxSIGSYSTest.getcpu
--NaClNonSfiSandboxSIGSYSTest.getcwd
--NaClNonSfiSandboxSIGSYSTest.getdents
--NaClNonSfiSandboxSIGSYSTest.getdents64
--NaClNonSfiSandboxSIGSYSTest.getgroups
--NaClNonSfiSandboxSIGSYSTest.getgroups32
--NaClNonSfiSandboxSIGSYSTest.getitimer
--NaClNonSfiSandboxSIGSYSTest.getpgid
--NaClNonSfiSandboxSIGSYSTest.getpgrp
--NaClNonSfiSandboxSIGSYSTest.getpid
--NaClNonSfiSandboxSIGSYSTest.getpmsg
--NaClNonSfiSandboxSIGSYSTest.getppid
--NaClNonSfiSandboxSIGSYSTest.getpriority
--NaClNonSfiSandboxSIGSYSTest.getresgid
--NaClNonSfiSandboxSIGSYSTest.getresgid32
--NaClNonSfiSandboxSIGSYSTest.getresuid
--NaClNonSfiSandboxSIGSYSTest.getresuid32
--NaClNonSfiSandboxSIGSYSTest.getrlimit
--NaClNonSfiSandboxSIGSYSTest.getrusage
--NaClNonSfiSandboxSIGSYSTest.getsid
--NaClNonSfiSandboxSIGSYSTest.getxattr
--NaClNonSfiSandboxSIGSYSTest.gtty
--NaClNonSfiSandboxSIGSYSTest.idle
--NaClNonSfiSandboxSIGSYSTest.init_module
--NaClNonSfiSandboxSIGSYSTest.inotify_add_watch
--NaClNonSfiSandboxSIGSYSTest.inotify_init
--NaClNonSfiSandboxSIGSYSTest.inotify_init1
--NaClNonSfiSandboxSIGSYSTest.inotify_rm_watch
--NaClNonSfiSandboxSIGSYSTest.io_cancel
--NaClNonSfiSandboxSIGSYSTest.io_destroy
--NaClNonSfiSandboxSIGSYSTest.io_getevents
--NaClNonSfiSandboxSIGSYSTest.io_setup
--NaClNonSfiSandboxSIGSYSTest.io_submit
--NaClNonSfiSandboxSIGSYSTest.ioctl
--NaClNonSfiSandboxSIGSYSTest.ioperm
--NaClNonSfiSandboxSIGSYSTest.iopl
--NaClNonSfiSandboxSIGSYSTest.ioprio_get
--NaClNonSfiSandboxSIGSYSTest.ioprio_set
--NaClNonSfiSandboxSIGSYSTest.ipc
--NaClNonSfiSandboxSIGSYSTest.kexec_load
--NaClNonSfiSandboxSIGSYSTest.keyctl
--NaClNonSfiSandboxSIGSYSTest.kill
--NaClNonSfiSandboxSIGSYSTest.lchown
--NaClNonSfiSandboxSIGSYSTest.lchown32
--NaClNonSfiSandboxSIGSYSTest.lgetxattr
--NaClNonSfiSandboxSIGSYSTest.link
--NaClNonSfiSandboxSIGSYSTest.linkat
--NaClNonSfiSandboxSIGSYSTest.listxattr
--NaClNonSfiSandboxSIGSYSTest.llistxattr
--NaClNonSfiSandboxSIGSYSTest.lock
--NaClNonSfiSandboxSIGSYSTest.lookup_dcookie
--NaClNonSfiSandboxSIGSYSTest.lremovexattr
--NaClNonSfiSandboxSIGSYSTest.lseek
--NaClNonSfiSandboxSIGSYSTest.lsetxattr
--NaClNonSfiSandboxSIGSYSTest.lstat
--NaClNonSfiSandboxSIGSYSTest.lstat64
--NaClNonSfiSandboxSIGSYSTest.mbind
--NaClNonSfiSandboxSIGSYSTest.migrate_pages
--NaClNonSfiSandboxSIGSYSTest.mincore
--NaClNonSfiSandboxSIGSYSTest.mkdir
--NaClNonSfiSandboxSIGSYSTest.mkdirat
--NaClNonSfiSandboxSIGSYSTest.mknod
--NaClNonSfiSandboxSIGSYSTest.mknodat
--NaClNonSfiSandboxSIGSYSTest.mlock
--NaClNonSfiSandboxSIGSYSTest.mlockall
--NaClNonSfiSandboxSIGSYSTest.mmap
--NaClNonSfiSandboxSIGSYSTest.modify_ldt
--NaClNonSfiSandboxSIGSYSTest.mount
--NaClNonSfiSandboxSIGSYSTest.move_pages
--NaClNonSfiSandboxSIGSYSTest.mpx
--NaClNonSfiSandboxSIGSYSTest.mq_getsetattr
--NaClNonSfiSandboxSIGSYSTest.mq_notify
--NaClNonSfiSandboxSIGSYSTest.mq_open
--NaClNonSfiSandboxSIGSYSTest.mq_timedreceive
--NaClNonSfiSandboxSIGSYSTest.mq_timedsend
--NaClNonSfiSandboxSIGSYSTest.mq_unlink
--NaClNonSfiSandboxSIGSYSTest.mremap
--NaClNonSfiSandboxSIGSYSTest.msync
--NaClNonSfiSandboxSIGSYSTest.munlock
--NaClNonSfiSandboxSIGSYSTest.munlockall
--NaClNonSfiSandboxSIGSYSTest.name_to_handle_at
--NaClNonSfiSandboxSIGSYSTest.nfsservctl
--NaClNonSfiSandboxSIGSYSTest.nice
--NaClNonSfiSandboxSIGSYSTest.oldfstat
--NaClNonSfiSandboxSIGSYSTest.oldlstat
--NaClNonSfiSandboxSIGSYSTest.oldolduname
--NaClNonSfiSandboxSIGSYSTest.oldstat
--NaClNonSfiSandboxSIGSYSTest.olduname
--NaClNonSfiSandboxSIGSYSTest.open_by_handle_at
--NaClNonSfiSandboxSIGSYSTest.pause
--NaClNonSfiSandboxSIGSYSTest.perf_event_open
--NaClNonSfiSandboxSIGSYSTest.personality
--NaClNonSfiSandboxSIGSYSTest.pipe2
--NaClNonSfiSandboxSIGSYSTest.pivot_root
--NaClNonSfiSandboxSIGSYSTest.ppoll
--NaClNonSfiSandboxSIGSYSTest.preadv
--NaClNonSfiSandboxSIGSYSTest.prlimit64
--NaClNonSfiSandboxSIGSYSTest.process_vm_readv
--NaClNonSfiSandboxSIGSYSTest.process_vm_writev
--NaClNonSfiSandboxSIGSYSTest.prof
--NaClNonSfiSandboxSIGSYSTest.profil
--NaClNonSfiSandboxSIGSYSTest.pselect6
--NaClNonSfiSandboxSIGSYSTest.putpmsg
--NaClNonSfiSandboxSIGSYSTest.pwritev
--NaClNonSfiSandboxSIGSYSTest.query_module
--NaClNonSfiSandboxSIGSYSTest.quotactl
--NaClNonSfiSandboxSIGSYSTest.readahead
--NaClNonSfiSandboxSIGSYSTest.readdir
--NaClNonSfiSandboxSIGSYSTest.readlink
--NaClNonSfiSandboxSIGSYSTest.readlinkat
--NaClNonSfiSandboxSIGSYSTest.readv
--NaClNonSfiSandboxSIGSYSTest.reboot
--NaClNonSfiSandboxSIGSYSTest.recvmmsg
--NaClNonSfiSandboxSIGSYSTest.remap_file_pages
--NaClNonSfiSandboxSIGSYSTest.removexattr
--NaClNonSfiSandboxSIGSYSTest.rename
--NaClNonSfiSandboxSIGSYSTest.renameat
--NaClNonSfiSandboxSIGSYSTest.request_key
--NaClNonSfiSandboxSIGSYSTest.rmdir
--NaClNonSfiSandboxSIGSYSTest.rt_sigaction
--NaClNonSfiSandboxSIGSYSTest.rt_sigpending
--NaClNonSfiSandboxSIGSYSTest.rt_sigprocmask
--NaClNonSfiSandboxSIGSYSTest.rt_sigqueueinfo
--NaClNonSfiSandboxSIGSYSTest.rt_sigreturn
--NaClNonSfiSandboxSIGSYSTest.rt_sigsuspend
--NaClNonSfiSandboxSIGSYSTest.rt_sigtimedwait
--NaClNonSfiSandboxSIGSYSTest.rt_tgsigqueueinfo
--NaClNonSfiSandboxSIGSYSTest.sched_get_priority_max
--NaClNonSfiSandboxSIGSYSTest.sched_get_priority_min
--NaClNonSfiSandboxSIGSYSTest.sched_getaffinity
--NaClNonSfiSandboxSIGSYSTest.sched_getparam
--NaClNonSfiSandboxSIGSYSTest.sched_getscheduler
--NaClNonSfiSandboxSIGSYSTest.sched_rr_get_interval
--NaClNonSfiSandboxSIGSYSTest.sched_setaffinity
--NaClNonSfiSandboxSIGSYSTest.sched_setparam
--NaClNonSfiSandboxSIGSYSTest.sched_setscheduler
--NaClNonSfiSandboxSIGSYSTest.select
--NaClNonSfiSandboxSIGSYSTest.sendfile
--NaClNonSfiSandboxSIGSYSTest.sendfile64
--NaClNonSfiSandboxSIGSYSTest.sendmmsg
--NaClNonSfiSandboxSIGSYSTest.set_mempolicy
--NaClNonSfiSandboxSIGSYSTest.set_thread_area
--NaClNonSfiSandboxSIGSYSTest.set_tid_address
--NaClNonSfiSandboxSIGSYSTest.setdomainname
--NaClNonSfiSandboxSIGSYSTest.setfsgid
--NaClNonSfiSandboxSIGSYSTest.setfsgid32
--NaClNonSfiSandboxSIGSYSTest.setfsuid
--NaClNonSfiSandboxSIGSYSTest.setfsuid32
--NaClNonSfiSandboxSIGSYSTest.setgid
--NaClNonSfiSandboxSIGSYSTest.setgid32
--NaClNonSfiSandboxSIGSYSTest.setgroups
--NaClNonSfiSandboxSIGSYSTest.setgroups32
--NaClNonSfiSandboxSIGSYSTest.sethostname
--NaClNonSfiSandboxSIGSYSTest.setitimer
--NaClNonSfiSandboxSIGSYSTest.setns
--NaClNonSfiSandboxSIGSYSTest.setpgid
--NaClNonSfiSandboxSIGSYSTest.setpriority
--NaClNonSfiSandboxSIGSYSTest.setregid
--NaClNonSfiSandboxSIGSYSTest.setregid32
--NaClNonSfiSandboxSIGSYSTest.setresgid
--NaClNonSfiSandboxSIGSYSTest.setresgid32
--NaClNonSfiSandboxSIGSYSTest.setresuid
--NaClNonSfiSandboxSIGSYSTest.setresuid32
--NaClNonSfiSandboxSIGSYSTest.setreuid
--NaClNonSfiSandboxSIGSYSTest.setreuid32
--NaClNonSfiSandboxSIGSYSTest.setrlimit
--NaClNonSfiSandboxSIGSYSTest.setsid
--NaClNonSfiSandboxSIGSYSTest.settimeofday
--NaClNonSfiSandboxSIGSYSTest.setuid
--NaClNonSfiSandboxSIGSYSTest.setuid32
--NaClNonSfiSandboxSIGSYSTest.setxattr
--NaClNonSfiSandboxSIGSYSTest.sgetmask
--NaClNonSfiSandboxSIGSYSTest.sigaction
--NaClNonSfiSandboxSIGSYSTest.signal
--NaClNonSfiSandboxSIGSYSTest.signalfd
--NaClNonSfiSandboxSIGSYSTest.signalfd4
--NaClNonSfiSandboxSIGSYSTest.sigpending
--NaClNonSfiSandboxSIGSYSTest.sigprocmask
--NaClNonSfiSandboxSIGSYSTest.sigreturn
--NaClNonSfiSandboxSIGSYSTest.sigsuspend
--NaClNonSfiSandboxSIGSYSTest.splice
--NaClNonSfiSandboxSIGSYSTest.ssetmask
--NaClNonSfiSandboxSIGSYSTest.stat
--NaClNonSfiSandboxSIGSYSTest.stat64
--NaClNonSfiSandboxSIGSYSTest.statfs
--NaClNonSfiSandboxSIGSYSTest.statfs64
--NaClNonSfiSandboxSIGSYSTest.stime
--NaClNonSfiSandboxSIGSYSTest.stty
--NaClNonSfiSandboxSIGSYSTest.swapoff
--NaClNonSfiSandboxSIGSYSTest.swapon
--NaClNonSfiSandboxSIGSYSTest.symlink
--NaClNonSfiSandboxSIGSYSTest.symlinkat
--NaClNonSfiSandboxSIGSYSTest.sync
--NaClNonSfiSandboxSIGSYSTest.sync_file_range
--NaClNonSfiSandboxSIGSYSTest.syncfs
--NaClNonSfiSandboxSIGSYSTest.sysfs
--NaClNonSfiSandboxSIGSYSTest.sysinfo
--NaClNonSfiSandboxSIGSYSTest.syslog
--NaClNonSfiSandboxSIGSYSTest.tee
--NaClNonSfiSandboxSIGSYSTest.tgkill
--NaClNonSfiSandboxSIGSYSTest.timer_create
--NaClNonSfiSandboxSIGSYSTest.timer_delete
--NaClNonSfiSandboxSIGSYSTest.timer_getoverrun
--NaClNonSfiSandboxSIGSYSTest.timer_gettime
--NaClNonSfiSandboxSIGSYSTest.timer_settime
--NaClNonSfiSandboxSIGSYSTest.timerfd_create
--NaClNonSfiSandboxSIGSYSTest.timerfd_gettime
--NaClNonSfiSandboxSIGSYSTest.timerfd_settime
--NaClNonSfiSandboxSIGSYSTest.tkill
--NaClNonSfiSandboxSIGSYSTest.truncate
--NaClNonSfiSandboxSIGSYSTest.truncate64
--NaClNonSfiSandboxSIGSYSTest.ugetrlimit
--NaClNonSfiSandboxSIGSYSTest.ulimit
--NaClNonSfiSandboxSIGSYSTest.umask
--NaClNonSfiSandboxSIGSYSTest.umount
--NaClNonSfiSandboxSIGSYSTest.umount2
--NaClNonSfiSandboxSIGSYSTest.uname
--NaClNonSfiSandboxSIGSYSTest.unlink
--NaClNonSfiSandboxSIGSYSTest.unlinkat
--NaClNonSfiSandboxSIGSYSTest.unshare
--NaClNonSfiSandboxSIGSYSTest.uselib
--NaClNonSfiSandboxSIGSYSTest.ustat
--NaClNonSfiSandboxSIGSYSTest.utime
--NaClNonSfiSandboxSIGSYSTest.utimensat
--NaClNonSfiSandboxSIGSYSTest.utimes
--NaClNonSfiSandboxSIGSYSTest.vfork
--NaClNonSfiSandboxSIGSYSTest.vhangup
--NaClNonSfiSandboxSIGSYSTest.vm86
--NaClNonSfiSandboxSIGSYSTest.vm86old
--NaClNonSfiSandboxSIGSYSTest.vmsplice
--NaClNonSfiSandboxSIGSYSTest.vserver
--NaClNonSfiSandboxSIGSYSTest.wait4
--NaClNonSfiSandboxSIGSYSTest.waitid
--NaClNonSfiSandboxSIGSYSTest.waitpid
--NaClNonSfiSandboxSIGSYSTest.writev
--NaClNonSfiSandboxTest.BPFIsSupported
--NaClNonSfiSandboxTest.DoFork
--NaClNonSfiSandboxTest.FutexWithRequeuePriorityInheritence
--NaClNonSfiSandboxTest.FutexWithRequeuePriorityInheritencePrivate
--NaClNonSfiSandboxTest.FutexWithUnlockPIPrivate
--NaClNonSfiSandboxTest.accept
--NaClNonSfiSandboxTest.bind
--NaClNonSfiSandboxTest.brk
--NaClNonSfiSandboxTest.clock_gettime_allowed
--NaClNonSfiSandboxTest.clock_gettime_crash_clock_fd
--NaClNonSfiSandboxTest.clone_by_pthread_create
--NaClNonSfiSandboxTest.clone_for_fork
--NaClNonSfiSandboxTest.connect
--NaClNonSfiSandboxTest.epoll_create_EPERM
--NaClNonSfiSandboxTest.fcntl_DUPFD
--NaClNonSfiSandboxTest.fcntl_DUPFD_CLOEXEC
--NaClNonSfiSandboxTest.fcntl_GETFL_SETFL
--NaClNonSfiSandboxTest.fcntl_GETFL_SETFL_allowed
--NaClNonSfiSandboxTest.fcntl_SETFD
--NaClNonSfiSandboxTest.fcntl_SETFD_allowed
--NaClNonSfiSandboxTest.getegid32_EPERM
--NaClNonSfiSandboxTest.getegid_EPERM
--NaClNonSfiSandboxTest.geteuid32_EPERM
--NaClNonSfiSandboxTest.geteuid_EPERM
--NaClNonSfiSandboxTest.getgid32_EPERM
--NaClNonSfiSandboxTest.getgid_EPERM
--NaClNonSfiSandboxTest.getpeername
--NaClNonSfiSandboxTest.getsockname
--NaClNonSfiSandboxTest.getsockopt
--NaClNonSfiSandboxTest.getuid32_EPERM
--NaClNonSfiSandboxTest.getuid_EPERM
--NaClNonSfiSandboxTest.invalid_syscall_crash
--NaClNonSfiSandboxTest.invalid_sysno
--NaClNonSfiSandboxTest.listen
--NaClNonSfiSandboxTest.madvise_EPERM
--NaClNonSfiSandboxTest.mmap_allowed
--NaClNonSfiSandboxTest.mmap_exec
--NaClNonSfiSandboxTest.mmap_read_exec
--NaClNonSfiSandboxTest.mmap_read_write_exec
--NaClNonSfiSandboxTest.mmap_unallowed_flag
--NaClNonSfiSandboxTest.mmap_unallowed_prot
--NaClNonSfiSandboxTest.mmap_write_exec
--NaClNonSfiSandboxTest.mprotect_allowed
--NaClNonSfiSandboxTest.mprotect_unallowed_prot
--NaClNonSfiSandboxTest.open_EPERM
--NaClNonSfiSandboxTest.openat_EPERM
--NaClNonSfiSandboxTest.prctl_SET_DUMPABLE
--NaClNonSfiSandboxTest.prctl_SET_NAME
--NaClNonSfiSandboxTest.ptrace_EPERM
--NaClNonSfiSandboxTest.random
--NaClNonSfiSandboxTest.recv
--NaClNonSfiSandboxTest.recvfrom
--NaClNonSfiSandboxTest.send
--NaClNonSfiSandboxTest.sendto
--NaClNonSfiSandboxTest.set_robust_list_EPERM
--NaClNonSfiSandboxTest.setsockopt
--NaClNonSfiSandboxTest.socket
--NaClNonSfiSandboxTest.tgkill_with_invalid_signal
--NaClNonSfiSandboxTest.tgkill_with_invalid_tgid
--NaClNonSfiSandboxTest.tgkill_with_invalid_tid
--NaClNonSfiSandboxTest.tgkill_with_negative_tgid
--NaClNonSfiSandboxTest.time_EPERM
--NaClNonsfiSandboxTest.socketpair_af_unix_disallowed
diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
index 57234aa2f3c3be..52b0957c84e040 100644
--- a/testing/buildbot/gn_isolate_map.pyl
+++ b/testing/buildbot/gn_isolate_map.pyl
@@ -567,6 +567,10 @@
     "label": "//chrome/installer/linux:linux",
     "type": "additional_compile_target",
   },
+  "chrome/installer/mac": {
+    "label": "//chrome/installer/mac:mac",
+    "type": "additional_compile_target",
+  },
   "variations_smoke_tests": {
     "label": "//chrome/test:variations_smoke_tests",
     "type": "generated_script",
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index b97a110988a22d..3a221c77a3c2c9 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -4048,9 +4048,6 @@
           '--flag-specific=webgpu-with-backend-validation',
           # Increase the timeout when using backend validation layers (crbug.com/1208253)
           '--time-out-ms=30000',
-          # TODO(crbug.com/1274975): Remove this once loading on newer NVIDIA
-          # GPUs is fixed.
-          '--additional-driver-flag=--disable-gpu-sandbox',
         ],
         'win64_args': [ '--target=Release_x64' ],
         'mac_args': [
@@ -4083,9 +4080,6 @@
           # crbug.com/953991 Ensure WebGPU is ready before running tests
           '--initialize-webgpu-adapter-at-startup-timeout-ms=60000',
           '--flag-specific=webgpu',
-          # TODO(crbug.com/1274975): Remove this once loading on newer NVIDIA
-          # GPUs is fixed.
-          '--additional-driver-flag=--disable-gpu-sandbox',
         ],
         'win64_args': [ '--target=Release_x64' ],
         'mac_args': [
@@ -4122,9 +4116,6 @@
           '--flag-specific=webgpu-with-partial-backend-validation',
           # Increase the timeout when using backend validation layers (crbug.com/1208253)
           '--time-out-ms=30000',
-          # TODO(crbug.com/1274975): Remove this once loading on newer NVIDIA
-          # GPUs is fixed.
-          '--additional-driver-flag=--disable-gpu-sandbox',
         ],
         'win64_args': [ '--target=Release_x64' ],
         'mac_args': [
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index d204d39763d213..574cebb37ca706 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -277,6 +277,7 @@
       'mac-chrome': {
         'additional_compile_targets': [
           'chrome',
+          'chrome/installer/mac',
         ],
         'mixins': [
           'chrome-swarming-pool',
diff --git a/testing/scripts/wpt_common.py b/testing/scripts/wpt_common.py
index b002d99697275f..a6e66b4be4e0ef 100644
--- a/testing/scripts/wpt_common.py
+++ b/testing/scripts/wpt_common.py
@@ -293,6 +293,8 @@ def _add_result_to_sink(self, test_name, result_node):
         unexpected = result_node['actual'] not in result_node['expected']
 
         for artifact_name, paths in result_node.get('artifacts', {}).items():
+            if artifact_name in ["wpt_actual_status", "wpt_subtest_failure"]:
+                continue
             for path in paths:
                 artifacts.AddArtifact(artifact_name, path)
 
@@ -313,7 +315,7 @@ def _add_result_to_sink(self, test_name, result_node):
         test_path = test_name[:index] if index != -1 else test_name
 
         self.sink.report_individual_test_result(
-            test_name, result, self.layout_test_results_subdir,
+            test_name, result, os.path.dirname(self.wpt_output),
             None, os.path.join(WEB_TESTS_DIR, test_path))
 
     def _maybe_write_expected_output(self, results_dir, test_name):
diff --git a/testing/scripts/wpt_common_unittest.py b/testing/scripts/wpt_common_unittest.py
index da83eb6b40fa67..9a4b81f307c61a 100755
--- a/testing/scripts/wpt_common_unittest.py
+++ b/testing/scripts/wpt_common_unittest.py
@@ -122,8 +122,7 @@ def test_result_sink_for_test_expected_result(self):
         self._create_json_output(json_dict)
         self.wpt_adapter.do_post_test_run_tasks()
 
-        baseline_artifacts = {'wpt_actual_status': ['OK'],
-                              'actual_text': [
+        baseline_artifacts = {'actual_text': [
                                   (os.path.join('layout-test-results',
                                                 'external', 'wpt', 'fail',
                                                 'test_variant1-actual.txt'))]}
@@ -156,8 +155,7 @@ def test_result_sink_for_test_variant(self):
                                      'external', 'wpt', 'fail', 'test.html')
         self._create_json_output(json_dict)
         self.wpt_adapter.do_post_test_run_tasks()
-        baseline_artifacts = {'wpt_actual_status': ['OK'],
-                              'actual_text': [
+        baseline_artifacts = {'actual_text': [
                                   (os.path.join('layout-test-results',
                                                 'external', 'wpt', 'fail',
                                                 'test_variant1-actual.txt'))]}
@@ -190,8 +188,7 @@ def test_result_sink_artifacts(self):
         self.wpt_adapter.do_post_test_run_tasks()
         test_abs_path = os.path.join(WEB_TESTS_DIR,
                                      'external', 'wpt', 'fail', 'test.html')
-        baseline_artifacts = {'wpt_actual_status': ['OK'],
-                              'actual_text': [
+        baseline_artifacts = {'actual_text': [
                                   os.path.join('layout-test-results',
                                                'external', 'wpt', 'fail',
                                                'test-actual.txt')]}
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
index 67d95e7f4037f8..0c996144a27636 100644
--- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json
@@ -4789,6 +4789,21 @@
             ]
         }
     ],
+    "LightweightReactions": [
+        {
+            "platforms": [
+                "android"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "enable_features": [
+                        "LightweightReactions"
+                    ]
+                }
+            ]
+        }
+    ],
     "LiteVideo": [
         {
             "platforms": [
@@ -7292,19 +7307,21 @@
                 {
                     "name": "Enabled_Snooze_1_week_20211208",
                     "params": {
-                        "IPH_DownloadHome_availability": ">=0",
+                        "IPH_DownloadHome_availability": ">=14",
                         "IPH_DownloadHome_event_1": "name:download_completed;comparator:>=1;window:90;storage:360",
                         "IPH_DownloadHome_event_trigger": "name:download_home_iph_trigger;comparator:==0;window:90;storage:360",
                         "IPH_DownloadHome_event_used": "name:download_home_opened;comparator:==0;window:90;storage:360",
                         "IPH_DownloadHome_session_rate": "==0",
-                        "IPH_TabSwitcherButton_availability": ">=0",
+                        "IPH_TabSwitcherButton_availability": ">=14",
                         "IPH_TabSwitcherButton_event_trigger": "name:tab_switcher_iph_triggered;comparator:==0;window:90;storage:90",
                         "IPH_TabSwitcherButton_event_used": "name:tab_switcher_button_clicked;comparator:==0;window:14;storage:90",
                         "IPH_TabSwitcherButton_session_rate": "<1",
                         "snooze_params": "max_limit:3,snooze_interval:7"
                     },
                     "enable_features": [
-                        "IPH_Snooze"
+                        "IPH_DownloadHome",
+                        "IPH_Snooze",
+                        "IPH_TabSwitcherButton"
                     ],
                     "disable_features": [
                         "EnableAutomaticSnooze"
diff --git a/third_party/blink/public/mojom/choosers/date_time_chooser.mojom b/third_party/blink/public/mojom/choosers/date_time_chooser.mojom
index 80765dcbd27bc0..d3da876d34b6fb 100644
--- a/third_party/blink/public/mojom/choosers/date_time_chooser.mojom
+++ b/third_party/blink/public/mojom/choosers/date_time_chooser.mojom
@@ -33,4 +33,7 @@ interface DateTimeChooser {
   // returned to replace a date/time input field.
   OpenDateTimeDialog(DateTimeDialogValue value) =>
       (bool success, double dialog_value);
+
+  // Dismiss the date/time dialog.
+  CloseDateTimeDialog();
 };
diff --git a/third_party/blink/renderer/bindings/core/v8/binding_security.cc b/third_party/blink/renderer/bindings/core/v8/binding_security.cc
index f1fc2afdfacc1c..a05ebdceb336d5 100644
--- a/third_party/blink/renderer/bindings/core/v8/binding_security.cc
+++ b/third_party/blink/renderer/bindings/core/v8/binding_security.cc
@@ -365,23 +365,23 @@ namespace {
 template <typename ExceptionStateOrErrorReportOption>
 bool ShouldAllowAccessToV8ContextInternal(
     v8::Local<v8::Context> accessing_context,
-    v8::Local<v8::Context> target_context,
+    v8::MaybeLocal<v8::Context> maybe_target_context,
     ExceptionStateOrErrorReportOption& error_report) {
-  // Fast path for the most likely case.
-  if (accessing_context == target_context)
-    return true;
-
   // Workers and worklets do not support multiple contexts, so both of
   // |accessing_context| and |target_context| must be windows at this point.
 
-  // remote_object->CreationContext() returns the empty handle. Remote contexts
-  // are unconditionally treated as cross origin.
-  if (target_context.IsEmpty()) {
+  // remote_object->GetCreationContext() returns the empty handle. Remote
+  // contexts are unconditionally treated as cross origin.
+  v8::Local<v8::Context> target_context;
+  if (!maybe_target_context.ToLocal(&target_context)) {
     ReportOrThrowSecurityError(ToLocalDOMWindow(accessing_context), nullptr,
                                DOMWindow::CrossDocumentAccessPolicy::kAllowed,
                                error_report);
     return false;
   }
+  // Fast path for the most likely case.
+  if (accessing_context == target_context)
+    return true;
 
   LocalFrame* target_frame = ToLocalFrameIfNotDetached(target_context);
   // TODO(dcheng): Why doesn't this code just use DOMWindows throughout? Can't
@@ -413,7 +413,7 @@ bool ShouldAllowAccessToV8ContextInternal(
 
 bool BindingSecurity::ShouldAllowAccessToV8Context(
     v8::Local<v8::Context> accessing_context,
-    v8::Local<v8::Context> target_context,
+    v8::MaybeLocal<v8::Context> target_context,
     ExceptionState& exception_state) {
   return ShouldAllowAccessToV8ContextInternal(accessing_context, target_context,
                                               exception_state);
@@ -421,7 +421,7 @@ bool BindingSecurity::ShouldAllowAccessToV8Context(
 
 bool BindingSecurity::ShouldAllowAccessToV8Context(
     v8::Local<v8::Context> accessing_context,
-    v8::Local<v8::Context> target_context,
+    v8::MaybeLocal<v8::Context> target_context,
     ErrorReportOption reporting_option) {
   return ShouldAllowAccessToV8ContextInternal(accessing_context, target_context,
                                               reporting_option);
@@ -429,10 +429,11 @@ bool BindingSecurity::ShouldAllowAccessToV8Context(
 
 bool BindingSecurity::ShouldAllowWrapperCreationOrThrowException(
     v8::Local<v8::Context> accessing_context,
-    v8::Local<v8::Context> creation_context,
+    v8::MaybeLocal<v8::Context> creation_context,
     const WrapperTypeInfo* wrapper_type_info) {
   // Fast path for the most likely case.
-  if (accessing_context == creation_context)
+  if (!creation_context.IsEmpty() &&
+      accessing_context == creation_context.ToLocalChecked())
     return true;
 
   // According to
@@ -451,11 +452,11 @@ bool BindingSecurity::ShouldAllowWrapperCreationOrThrowException(
 
 void BindingSecurity::RethrowWrapperCreationException(
     v8::Local<v8::Context> accessing_context,
-    v8::Local<v8::Context> creation_context,
+    v8::MaybeLocal<v8::Context> creation_context,
     const WrapperTypeInfo* wrapper_type_info,
     v8::Local<v8::Value> cross_context_exception) {
   DCHECK(!cross_context_exception.IsEmpty());
-  v8::Isolate* isolate = creation_context->GetIsolate();
+  v8::Isolate* isolate = creation_context.ToLocalChecked()->GetIsolate();
   ExceptionState exception_state(isolate, ExceptionState::kConstructionContext,
                                  wrapper_type_info->interface_name);
   if (!ShouldAllowAccessToV8Context(accessing_context, creation_context,
diff --git a/third_party/blink/renderer/bindings/core/v8/binding_security.h b/third_party/blink/renderer/bindings/core/v8/binding_security.h
index 19f114b1098d63..4272af7902cf87 100644
--- a/third_party/blink/renderer/bindings/core/v8/binding_security.h
+++ b/third_party/blink/renderer/bindings/core/v8/binding_security.h
@@ -113,25 +113,25 @@ class CORE_EXPORT BindingSecurity {
   // returned object, you should use the above overloads.
   static bool ShouldAllowAccessToV8Context(
       v8::Local<v8::Context> accessing_context,
-      v8::Local<v8::Context> target_context,
+      v8::MaybeLocal<v8::Context> target_context,
       ExceptionState&);
   static bool ShouldAllowAccessToV8Context(
       v8::Local<v8::Context> accessing_context,
-      v8::Local<v8::Context> target_context,
+      v8::MaybeLocal<v8::Context> target_context,
       ErrorReportOption);
 
   // Checks if a wrapper creation of the given wrapper type associated with
   // |creation_context| is allowed in |accessing_context|.
   static bool ShouldAllowWrapperCreationOrThrowException(
       v8::Local<v8::Context> accessing_context,
-      v8::Local<v8::Context> creation_context,
+      v8::MaybeLocal<v8::Context> creation_context,
       const WrapperTypeInfo* wrapper_type_info);
 
   // Rethrows a cross context exception, that is possibly cross origin.
   // A SecurityError may be rethrown instead of the exception if necessary.
   static void RethrowWrapperCreationException(
       v8::Local<v8::Context> accessing_context,
-      v8::Local<v8::Context> creation_context,
+      v8::MaybeLocal<v8::Context> creation_context,
       const WrapperTypeInfo* wrapper_type_info,
       v8::Local<v8::Value> cross_context_exception);
 
diff --git a/third_party/blink/renderer/bindings/core/v8/custom/v8_html_all_collection_custom.cc b/third_party/blink/renderer/bindings/core/v8/custom/v8_html_all_collection_custom.cc
index caa17c33219246..9de28f0aa55259 100644
--- a/third_party/blink/renderer/bindings/core/v8/custom/v8_html_all_collection_custom.cc
+++ b/third_party/blink/renderer/bindings/core/v8/custom/v8_html_all_collection_custom.cc
@@ -63,7 +63,8 @@ void GetIndexedOrNamed(const v8::FunctionCallbackInfo<v8::Value>& info) {
   }
 
   TOSTRING_VOID(V8StringResource<>, name, info[0]);
-  ScriptState* script_state = ScriptState::From(info.This()->CreationContext());
+  ScriptState* script_state =
+      ScriptState::From(info.This()->GetCreationContextChecked());
   v8::Local<v8::Value> v8_value;
   if (!ToV8Traits<IDLNullable<V8UnionElementOrHTMLCollection>>::ToV8(
            script_state, impl->NamedGetter(name))
diff --git a/third_party/blink/renderer/bindings/core/v8/generated_code_helper.cc b/third_party/blink/renderer/bindings/core/v8/generated_code_helper.cc
index afe115a832f07b..b6caf985aedf07 100644
--- a/third_party/blink/renderer/bindings/core/v8/generated_code_helper.cc
+++ b/third_party/blink/renderer/bindings/core/v8/generated_code_helper.cc
@@ -398,7 +398,8 @@ void CSSPropertyAttributeSet(const v8::FunctionCallbackInfo<v8::Value>& info) {
   if (UNLIKELY(exception_state.HadException())) {
     return;
   }
-  v8::Local<v8::Context> receiver_context = v8_receiver->CreationContext();
+  v8::Local<v8::Context> receiver_context =
+      v8_receiver->GetCreationContextChecked();
   ScriptState* receiver_script_state = ScriptState::From(receiver_context);
   // TODO(andruud): AnonymousNamedSetter is not the best function.  Change the
   // function to a more appropriate one.  It's better to pass |exception_state|
diff --git a/third_party/blink/renderer/bindings/core/v8/script_promise_property_test.cc b/third_party/blink/renderer/bindings/core/v8/script_promise_property_test.cc
index 75864bcc67c79a..4695d0391348fa 100644
--- a/third_party/blink/renderer/bindings/core/v8/script_promise_property_test.cc
+++ b/third_party/blink/renderer/bindings/core/v8/script_promise_property_test.cc
@@ -256,7 +256,7 @@ TEST_F(ScriptPromisePropertyGarbageCollectedTest,
   ASSERT_FALSE(v.IsEmpty());
   {
     ScriptState::Scope scope(MainScriptState());
-    EXPECT_EQ(v.V8Value().As<v8::Object>()->CreationContext(),
+    EXPECT_EQ(v.V8Value().As<v8::Object>()->GetCreationContextChecked(),
               ToV8Context(DomWindow(), MainWorld()));
   }
   EXPECT_EQ(Property::kPending, GetProperty()->GetState());
@@ -275,12 +275,12 @@ TEST_F(ScriptPromisePropertyGarbageCollectedTest,
   ASSERT_FALSE(v.IsEmpty());
   {
     ScriptState::Scope scope(OtherScriptState());
-    EXPECT_EQ(u.V8Value().As<v8::Object>()->CreationContext(),
+    EXPECT_EQ(u.V8Value().As<v8::Object>()->GetCreationContextChecked(),
               ToV8Context(DomWindow(), OtherWorld()));
   }
   {
     ScriptState::Scope scope(MainScriptState());
-    EXPECT_EQ(v.V8Value().As<v8::Object>()->CreationContext(),
+    EXPECT_EQ(v.V8Value().As<v8::Object>()->GetCreationContextChecked(),
               ToV8Context(DomWindow(), MainWorld()));
   }
   EXPECT_EQ(Property::kPending, GetProperty()->GetState());
diff --git a/third_party/blink/renderer/bindings/core/v8/to_v8_traits.h b/third_party/blink/renderer/bindings/core/v8/to_v8_traits.h
index adae36ca2befa7..a1445272a19fa9 100644
--- a/third_party/blink/renderer/bindings/core/v8/to_v8_traits.h
+++ b/third_party/blink/renderer/bindings/core/v8/to_v8_traits.h
@@ -235,7 +235,7 @@ inline v8::MaybeLocal<v8::Value> ToV8HelperScriptWrappable(
 
   CHECK(!creation_context_object.IsEmpty());
   ScriptState* script_state =
-      ScriptState::From(creation_context_object->CreationContext());
+      ScriptState::From(creation_context_object->GetCreationContextChecked());
   return script_wrappable->Wrap(script_state);
 }
 
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_html_constructor.cc b/third_party/blink/renderer/bindings/core/v8/v8_html_constructor.cc
index 7ee9850ac13b3b..9fac5245b5b6f4 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_html_constructor.cc
+++ b/third_party/blink/renderer/bindings/core/v8/v8_html_constructor.cc
@@ -106,7 +106,7 @@ void V8HTMLConstructor::HtmlConstructor(
   // 7. If Type(prototype) is not Object, then: ...
   if (!prototype->IsObject()) {
     if (V8PerContextData* per_context_data = V8PerContextData::From(
-            new_target.As<v8::Object>()->CreationContext())) {
+            new_target.As<v8::Object>()->GetCreationContextChecked())) {
       prototype = per_context_data->PrototypeForType(&wrapper_type_info);
     } else {
       V8ThrowException::ThrowError(isolate, "The context has been destroyed");
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_page_popup_controller_binding.cc b/third_party/blink/renderer/bindings/core/v8/v8_page_popup_controller_binding.cc
index 7f466d1d58dc43..db1157280347e5 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_page_popup_controller_binding.cc
+++ b/third_party/blink/renderer/bindings/core/v8/v8_page_popup_controller_binding.cc
@@ -40,7 +40,7 @@ void V8PagePopupControllerBinding::InstallPagePopupController(
     v8::Local<v8::Context> context,
     v8::Local<v8::Object> window_wrapper) {
   Document* document =
-      ToLocalDOMWindow(window_wrapper->CreationContext())->document();
+      ToLocalDOMWindow(window_wrapper->GetCreationContextChecked())->document();
   if (!document || !ContextFeatures::PagePopupEnabled(document))
     return;
 
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc b/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc
index 5a3a90c7880524..7d55c623d12305 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc
+++ b/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc
@@ -756,9 +756,10 @@ v8::MaybeLocal<v8::Value> V8ScriptRunner::CallFunction(
     return v8::MaybeLocal<v8::Value>();
   }
 
-  DCHECK(!frame || BindingSecurity::ShouldAllowAccessToFrame(
-                       ToLocalDOMWindow(function->CreationContext()), frame,
-                       BindingSecurity::ErrorReportOption::kDoNotReport));
+  DCHECK(!frame ||
+         BindingSecurity::ShouldAllowAccessToFrame(
+             ToLocalDOMWindow(function->GetCreationContextChecked()), frame,
+             BindingSecurity::ErrorReportOption::kDoNotReport));
   v8::Isolate::SafeForTerminationScope safe_for_termination(isolate);
   v8::MicrotasksScope microtasks_scope(isolate, microtask_queue,
                                        v8::MicrotasksScope::kRunMicrotasks);
diff --git a/third_party/blink/renderer/bindings/core/v8/world_safe_v8_reference.cc b/third_party/blink/renderer/bindings/core/v8/world_safe_v8_reference.cc
index d9a22a692da395..5aaa4845f78a10 100644
--- a/third_party/blink/renderer/bindings/core/v8/world_safe_v8_reference.cc
+++ b/third_party/blink/renderer/bindings/core/v8/world_safe_v8_reference.cc
@@ -41,9 +41,9 @@ void WorldSafeV8ReferenceInternal::MaybeCheckCreationContextWorld(
   if (!value->IsObject())
     return;
 
-  v8::Local<v8::Context> context = value.As<v8::Object>()->CreationContext();
+  v8::Local<v8::Context> context;
   // Creation context is null if the value is a remote object.
-  if (context.IsEmpty())
+  if (!value.As<v8::Object>()->GetCreationContext().ToLocal(&context))
     return;
 
   ScriptState* script_state = ScriptState::From(context);
diff --git a/third_party/blink/renderer/bindings/core/v8/world_safe_v8_reference.h b/third_party/blink/renderer/bindings/core/v8/world_safe_v8_reference.h
index 436d3587669b73..cbcd8cb35701ff 100644
--- a/third_party/blink/renderer/bindings/core/v8/world_safe_v8_reference.h
+++ b/third_party/blink/renderer/bindings/core/v8/world_safe_v8_reference.h
@@ -70,8 +70,8 @@ class WorldSafeV8Reference final {
       WorldSafeV8ReferenceInternal::MaybeCheckCreationContextWorld(
           *world_.get(), value);
     } else if (value->IsObject()) {
-      ScriptState* script_state =
-          ScriptState::From(value.template As<v8::Object>()->CreationContext());
+      ScriptState* script_state = ScriptState::From(
+          value.template As<v8::Object>()->GetCreationContextChecked());
       world_ = &script_state->World();
     }
   }
diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni
index edcef2169e42f1..dfe6954cbea697 100644
--- a/third_party/blink/renderer/bindings/generated_in_modules.gni
+++ b/third_party/blink/renderer/bindings/generated_in_modules.gni
@@ -647,6 +647,8 @@ generated_dictionary_sources_in_modules = [
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_ndef_record_init.h",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_ndef_scan_options.cc",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_ndef_scan_options.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_ndef_make_read_only_options.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_ndef_make_read_only_options.h",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_ndef_write_options.cc",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_ndef_write_options.h",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_notification_action.cc",
diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni
index 3100a2bfd928a1..7314c3fc8e1fc8 100644
--- a/third_party/blink/renderer/bindings/idl_in_modules.gni
+++ b/third_party/blink/renderer/bindings/idl_in_modules.gni
@@ -455,6 +455,7 @@ static_idl_files_in_modules = get_path_info(
           "//third_party/blink/renderer/modules/nfc/ndef_reading_event_init.idl",
           "//third_party/blink/renderer/modules/nfc/ndef_record.idl",
           "//third_party/blink/renderer/modules/nfc/ndef_record_init.idl",
+          "//third_party/blink/renderer/modules/nfc/ndef_make_read_only_options.idl",
           "//third_party/blink/renderer/modules/nfc/ndef_scan_options.idl",
           "//third_party/blink/renderer/modules/nfc/ndef_write_options.idl",
           "//third_party/blink/renderer/modules/notifications/get_notification_options.idl",
diff --git a/third_party/blink/renderer/core/animation/animation_input_helpers_test.cc b/third_party/blink/renderer/core/animation/animation_input_helpers_test.cc
index c0ded0f5d1298c..c1c18465b9bc7c 100644
--- a/third_party/blink/renderer/core/animation/animation_input_helpers_test.cc
+++ b/third_party/blink/renderer/core/animation/animation_input_helpers_test.cc
@@ -89,7 +89,7 @@ TEST_F(AnimationAnimationInputHelpersTest, ParseKeyframePropertyAttributes) {
   EXPECT_EQ(CSSPropertyID::kWidth, KeyframeAttributeToCSSProperty("width"));
   EXPECT_EQ(CSSPropertyID::kFloat, KeyframeAttributeToCSSProperty("float"));
   EXPECT_EQ(CSSPropertyID::kFloat, KeyframeAttributeToCSSProperty("cssFloat"));
-  EXPECT_EQ(CSSPropertyID::kVariable, KeyframeAttributeToCSSProperty("--"));
+  EXPECT_EQ(CSSPropertyID::kInvalid, KeyframeAttributeToCSSProperty("--"));
   EXPECT_EQ(CSSPropertyID::kVariable, KeyframeAttributeToCSSProperty("---"));
   EXPECT_EQ(CSSPropertyID::kVariable, KeyframeAttributeToCSSProperty("--x"));
   EXPECT_EQ(CSSPropertyID::kVariable,
diff --git a/third_party/blink/renderer/core/css/parser/css_property_parser.cc b/third_party/blink/renderer/core/css/parser/css_property_parser.cc
index 2789d738d52c56..a32dd352f781be 100644
--- a/third_party/blink/renderer/core/css/parser/css_property_parser.cc
+++ b/third_party/blink/renderer/core/css/parser/css_property_parser.cc
@@ -193,7 +193,7 @@ static CSSPropertyID UnresolvedCSSPropertyID(
     CSSParserMode mode) {
   if (length == 0)
     return CSSPropertyID::kInvalid;
-  if (length >= 2 && property_name[0] == '-' && property_name[1] == '-')
+  if (length >= 3 && property_name[0] == '-' && property_name[1] == '-')
     return CSSPropertyID::kVariable;
   if (length > kMaxCSSPropertyNameLength)
     return CSSPropertyID::kInvalid;
diff --git a/third_party/blink/renderer/core/css/parser/css_variable_parser.cc b/third_party/blink/renderer/core/css/parser/css_variable_parser.cc
index 261149cd5f0710..4273110e2965dd 100644
--- a/third_party/blink/renderer/core/css/parser/css_variable_parser.cc
+++ b/third_party/blink/renderer/core/css/parser/css_variable_parser.cc
@@ -149,11 +149,11 @@ bool CSSVariableParser::IsValidVariableName(const CSSParserToken& token) {
     return false;
 
   StringView value = token.Value();
-  return value.length() >= 2 && value[0] == '-' && value[1] == '-';
+  return value.length() >= 3 && value[0] == '-' && value[1] == '-';
 }
 
 bool CSSVariableParser::IsValidVariableName(const String& string) {
-  return string.length() >= 2 && string[0] == '-' && string[1] == '-';
+  return string.length() >= 3 && string[0] == '-' && string[1] == '-';
 }
 
 bool CSSVariableParser::ContainsValidVariableReferences(
diff --git a/third_party/blink/renderer/core/dom/mutation_observer.cc b/third_party/blink/renderer/core/dom/mutation_observer.cc
index fbbbfd529d5ee8..2158e8003eb961 100644
--- a/third_party/blink/renderer/core/dom/mutation_observer.cc
+++ b/third_party/blink/renderer/core/dom/mutation_observer.cc
@@ -266,8 +266,8 @@ void MutationObserver::EnqueueMutationRecord(MutationRecord* mutation) {
   DCHECK(IsMainThread());
   records_.push_back(mutation);
   ActivateObserver(this);
-  probe::AsyncTaskScheduled(delegate_->GetExecutionContext(), mutation->type(),
-                            mutation->async_task_id());
+  mutation->async_task_context()->Schedule(delegate_->GetExecutionContext(),
+                                           mutation->type());
 }
 
 void MutationObserver::SetHasTransientRegistration() {
@@ -290,8 +290,7 @@ void MutationObserver::ContextLifecycleStateChanged(
 
 void MutationObserver::CancelInspectorAsyncTasks() {
   for (auto& record : records_) {
-    probe::AsyncTaskCanceled(delegate_->GetExecutionContext(),
-                             record->async_task_id());
+    record->async_task_context()->Cancel();
   }
 }
 
@@ -318,7 +317,7 @@ void MutationObserver::Deliver() {
 
   // Report the first (earliest) stack as the async cause.
   probe::AsyncTask async_task(delegate_->GetExecutionContext(),
-                              records.front()->async_task_id());
+                              records.front()->async_task_context());
   delegate_->Deliver(records, *this);
 }
 
diff --git a/third_party/blink/renderer/core/dom/mutation_record.h b/third_party/blink/renderer/core/dom/mutation_record.h
index 246e76b098da14..1e9c54066c7082 100644
--- a/third_party/blink/renderer/core/dom/mutation_record.h
+++ b/third_party/blink/renderer/core/dom/mutation_record.h
@@ -33,7 +33,7 @@
 
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/dom/static_node_list.h"
-#include "third_party/blink/renderer/core/probe/async_task_id.h"
+#include "third_party/blink/renderer/core/probe/async_task_context.h"
 #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
@@ -78,10 +78,10 @@ class CORE_EXPORT MutationRecord : public ScriptWrappable {
 
   virtual String oldValue() { return String(); }
 
-  probe::AsyncTaskId* async_task_id() { return &async_task_id_; }
+  probe::AsyncTaskContext* async_task_context() { return &async_task_context_; }
 
  private:
-  probe::AsyncTaskId async_task_id_;
+  probe::AsyncTaskContext async_task_context_;
 };
 
 }  // namespace blink
diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
index 69231a8292eab2..74814e7edb5a34 100644
--- a/third_party/blink/renderer/core/execution_context/execution_context.cc
+++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
@@ -110,16 +110,19 @@ ExecutionContext* ExecutionContext::ForCurrentRealm(
 // static
 ExecutionContext* ExecutionContext::ForRelevantRealm(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
-  return ToExecutionContext(info.Holder()->CreationContext());
+  v8::Local<v8::Context> context;
+  if (!info.Holder()->GetCreationContext().ToLocal(&context))
+    return nullptr;
+  return ToExecutionContext(context);
 }
 
 // static
 ExecutionContext* ExecutionContext::ForRelevantRealm(
     const v8::PropertyCallbackInfo<v8::Value>& info) {
-  auto ctx = info.Holder()->CreationContext();
-  if (ctx.IsEmpty())
+  v8::Local<v8::Context> context;
+  if (!info.Holder()->GetCreationContext().ToLocal(&context))
     return nullptr;
-  return ToExecutionContext(ctx);
+  return ToExecutionContext(context);
 }
 
 // static
diff --git a/third_party/blink/renderer/core/exported/web_array_buffer_converter.cc b/third_party/blink/renderer/core/exported/web_array_buffer_converter.cc
index f9f8032e34a730..48fc93e7670f8e 100644
--- a/third_party/blink/renderer/core/exported/web_array_buffer_converter.cc
+++ b/third_party/blink/renderer/core/exported/web_array_buffer_converter.cc
@@ -42,7 +42,8 @@ v8::Local<v8::Value> WebArrayBufferConverter::ToV8Value(
     v8::Isolate* isolate) {
   // We no longer use |creationContext| because it's often misused and points
   // to a context faked by user script.
-  DCHECK(creation_context->CreationContext() == isolate->GetCurrentContext());
+  DCHECK(creation_context->GetCreationContextChecked() ==
+         isolate->GetCurrentContext());
   if (!buffer)
     return v8::Local<v8::Value>();
   return ToV8(*buffer, isolate->GetCurrentContext()->Global(), isolate);
diff --git a/third_party/blink/renderer/core/exported/web_blob.cc b/third_party/blink/renderer/core/exported/web_blob.cc
index a273f5cb99d647..4fa6a3904b7192 100644
--- a/third_party/blink/renderer/core/exported/web_blob.cc
+++ b/third_party/blink/renderer/core/exported/web_blob.cc
@@ -82,7 +82,8 @@ v8::Local<v8::Value> WebBlob::ToV8Value(v8::Local<v8::Object> creation_context,
                                         v8::Isolate* isolate) {
   // We no longer use |creationContext| because it's often misused and points
   // to a context faked by user script.
-  DCHECK(creation_context->CreationContext() == isolate->GetCurrentContext());
+  DCHECK(creation_context->GetCreationContextChecked() ==
+         isolate->GetCurrentContext());
   if (!private_.Get())
     return v8::Local<v8::Value>();
   return ToV8(private_.Get(), isolate->GetCurrentContext()->Global(), isolate);
diff --git a/third_party/blink/renderer/core/exported/web_node.cc b/third_party/blink/renderer/core/exported/web_node.cc
index 91a094f093c826..34f27dcae48561 100644
--- a/third_party/blink/renderer/core/exported/web_node.cc
+++ b/third_party/blink/renderer/core/exported/web_node.cc
@@ -156,7 +156,8 @@ v8::Local<v8::Value> WebNode::ToV8Value(v8::Local<v8::Object> creation_context,
                                         v8::Isolate* isolate) {
   // We no longer use |creation_context| because it's often misused and points
   // to a context faked by user script.
-  DCHECK(creation_context->CreationContext() == isolate->GetCurrentContext());
+  DCHECK(creation_context->GetCreationContextChecked() ==
+         isolate->GetCurrentContext());
   if (!private_.Get())
     return v8::Local<v8::Value>();
   return ToV8(private_.Get(), isolate->GetCurrentContext()->Global(), isolate);
diff --git a/third_party/blink/renderer/core/html/canvas/image_data.cc b/third_party/blink/renderer/core/html/canvas/image_data.cc
index ead28c6eb55e21..e21e30a1e60fde 100644
--- a/third_party/blink/renderer/core/html/canvas/image_data.cc
+++ b/third_party/blink/renderer/core/html/canvas/image_data.cc
@@ -395,7 +395,8 @@ v8::Local<v8::Object> ImageData::AssociateWithWrapper(
     // This is a perf hack breaking the web interop.
 
     v8::Local<v8::Value> v8_data;
-    ScriptState* script_state = ScriptState::From(wrapper->CreationContext());
+    ScriptState* script_state =
+        ScriptState::From(wrapper->GetCreationContextChecked());
     if (!ToV8Traits<V8ImageDataArray>::ToV8(script_state, data_)
              .ToLocal(&v8_data)) {
       return wrapper;
diff --git a/third_party/blink/renderer/core/html/forms/external_date_time_chooser.cc b/third_party/blink/renderer/core/html/forms/external_date_time_chooser.cc
index 857d49097f76e5..ce3b52bd3a7dcd 100644
--- a/third_party/blink/renderer/core/html/forms/external_date_time_chooser.cc
+++ b/third_party/blink/renderer/core/html/forms/external_date_time_chooser.cc
@@ -145,6 +145,10 @@ void ExternalDateTimeChooser::DidCancelChooser() {
 
 void ExternalDateTimeChooser::EndChooser() {
   DCHECK(client_);
+  if (date_time_chooser_.is_bound()) {
+    date_time_chooser_->CloseDateTimeDialog();
+    date_time_chooser_.reset();
+  }
   DateTimeChooserClient* client = client_;
   client_ = nullptr;
   client->DidEndChooser();
diff --git a/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc b/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
index 5d418b8a740e21..83d0d6b5f1aec9 100644
--- a/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+++ b/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
@@ -3534,10 +3534,29 @@ void NGGridLayoutAlgorithm::PlaceGridItemsForFragmentation(
         if (!MovePastBreakpoint(ConstraintSpace(), grid_item.node, *result,
                                 fragment_relative_block_offset, appeal_before,
                                 /* builder */ nullptr)) {
-          // TODO(ikilpatrick): We may have break-before:avoid on this row, we
-          // should search upwards (ensuring that we are still in this
-          // fragmentainer), for the first row with the highest break appeal.
           breakpoint_row_set_index = item_row_set_index;
+
+          // We may have "break-before:avoid" or similar on this row. Instead
+          // of just breaking on this row, search upwards for a row with a
+          // better EBreakBetween.
+          if (IsAvoidBreakValue(ConstraintSpace(), break_between)) {
+            for (int index = item_row_set_index - 1; index >= 0; --index) {
+              // Only consider rows within this fragmentainer.
+              LayoutUnit offset =
+                  grid_geometry->row_geometry.sets[index].offset +
+                  (*row_offset_adjustments)[index] -
+                  previous_consumed_block_size;
+              if (offset <= LayoutUnit())
+                break;
+
+              // Forced row breaks should have been already handled, accept any
+              // row with an "auto" break-between.
+              if (row_break_between[index] == EBreakBetween::kAuto) {
+                breakpoint_row_set_index = index;
+                break;
+              }
+            }
+          }
           continue;
         }
       }
diff --git a/third_party/blink/renderer/extensions/chromeos/chromeos_extensions.cc b/third_party/blink/renderer/extensions/chromeos/chromeos_extensions.cc
index 8895a44836383c..e9ce65761a0e80 100644
--- a/third_party/blink/renderer/extensions/chromeos/chromeos_extensions.cc
+++ b/third_party/blink/renderer/extensions/chromeos/chromeos_extensions.cc
@@ -17,7 +17,8 @@ namespace {
 void ChromeOSDataPropertyGetCallback(
     v8::Local<v8::Name> v8_property_name,
     const v8::PropertyCallbackInfo<v8::Value>& info) {
-  v8::Local<v8::Context> creation_context = info.Holder()->CreationContext();
+  v8::Local<v8::Context> creation_context =
+      info.Holder()->GetCreationContextChecked();
   bindings::V8SetReturnValue(
       info,
       MakeGarbageCollected<ChromeOS>(ExecutionContext::From(creation_context)),
diff --git a/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.cc b/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.cc
index 1edff79f9afa87..de47a8886cb451 100644
--- a/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.cc
+++ b/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.cc
@@ -1028,7 +1028,19 @@ bool AXObjectCacheImpl::IsRelevantSlotElement(const HTMLSlotElement& slot) {
     return true;
 
   const Element* parent_element = DynamicTo<Element>(parent);
-  return parent_element ? parent_element->IsInCanvasSubtree() : false;
+  if (!parent_element)
+    return false;
+
+  // Authors can include elements as "Fallback content" inside a <canvas> in
+  // order to provide an alternative means to interact with the canvas using
+  // a screen reader. Those should always be included.
+  if (parent_element->IsInCanvasSubtree())
+    return true;
+
+  // LayoutObject::CreateObject() will not create an object for elements
+  // with display:contents. If we do not include a <slot> for that reason,
+  // any descendants will be not be included in the accessibility tree.
+  return parent_element->HasDisplayContentsStyle();
 }
 
 // static
diff --git a/third_party/blink/renderer/modules/bluetooth/bluetooth_uuid.cc b/third_party/blink/renderer/modules/bluetooth/bluetooth_uuid.cc
index 41338b060f03e7..a4087803569d1b 100644
--- a/third_party/blink/renderer/modules/bluetooth/bluetooth_uuid.cc
+++ b/third_party/blink/renderer/modules/bluetooth/bluetooth_uuid.cc
@@ -328,7 +328,7 @@ String GetUUIDForGATTAttribute(GATTAttribute attribute,
   // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothuuid-getcharacteristic
   // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothuuid-getdescriptor
 
-  // If name is an unsigned long, return BluetoothUUID.cannonicalUUI(name) and
+  // If name is an unsigned long, return BluetoothUUID.canonicalUUID(name) and
   // abort this steps.
   if (name->IsUnsignedLong())
     return BluetoothUUID::canonicalUUID(name->GetAsUnsignedLong());
@@ -340,7 +340,7 @@ String GetUUIDForGATTAttribute(GATTAttribute attribute,
     return name_str;
 
   // If name is in the corresponding attribute map return
-  // BluetoothUUID.cannonicalUUID(alias).
+  // BluetoothUUID.canonicalUUID(alias).
   NameToAssignedNumberMap* map = nullptr;
   const char* attribute_type = nullptr;
   switch (attribute) {
diff --git a/third_party/blink/renderer/modules/cache_storage/cache.cc b/third_party/blink/renderer/modules/cache_storage/cache.cc
index 47cfa4a0c1d544..30dccc0a9ed1b2 100644
--- a/third_party/blink/renderer/modules/cache_storage/cache.cc
+++ b/third_party/blink/renderer/modules/cache_storage/cache.cc
@@ -4,12 +4,12 @@
 
 #include "third_party/blink/renderer/modules/cache_storage/cache.h"
 
+#include <algorithm>
 #include <memory>
 #include <utility>
 
 #include "base/metrics/histogram_macros.h"
 #include "services/network/public/mojom/fetch_api.mojom-blink.h"
-#include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/blink/public/common/cache_storage/cache_storage_utils.h"
 #include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom-blink.h"
@@ -32,9 +32,7 @@
 #include "third_party/blink/renderer/core/fetch/fetch_data_loader.h"
 #include "third_party/blink/renderer/core/fetch/request.h"
 #include "third_party/blink/renderer/core/fetch/response.h"
-#include "third_party/blink/renderer/core/frame/deprecation.h"
 #include "third_party/blink/renderer/core/html/parser/text_resource_decoder.h"
-#include "third_party/blink/renderer/core/inspector/console_message.h"
 #include "third_party/blink/renderer/modules/cache_storage/cache_storage.h"
 #include "third_party/blink/renderer/modules/cache_storage/cache_storage_blob_client_list.h"
 #include "third_party/blink/renderer/modules/cache_storage/cache_storage_error.h"
@@ -48,7 +46,6 @@
 #include "third_party/blink/renderer/platform/instrumentation/tracing/trace_event.h"
 #include "third_party/blink/renderer/platform/instrumentation/tracing/traced_value.h"
 #include "third_party/blink/renderer/platform/loader/fetch/cached_metadata.h"
-#include "third_party/blink/renderer/platform/loader/fetch/data_pipe_bytes_consumer.h"
 #include "third_party/blink/renderer/platform/network/http_names.h"
 #include "third_party/blink/renderer/platform/network/http_parsers.h"
 #include "third_party/blink/renderer/platform/network/mime/mime_type_registry.h"
diff --git a/third_party/blink/renderer/modules/cache_storage/cache.h b/third_party/blink/renderer/modules/cache_storage/cache.h
index 6bee34432d33e0..630c837a0922c6 100644
--- a/third_party/blink/renderer/modules/cache_storage/cache.h
+++ b/third_party/blink/renderer/modules/cache_storage/cache.h
@@ -5,6 +5,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_CACHE_STORAGE_CACHE_H_
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_CACHE_STORAGE_CACHE_H_
 
+#include "base/memory/scoped_refptr.h"
 #include "mojo/public/cpp/bindings/associated_remote.h"
 #include "mojo/public/cpp/bindings/pending_associated_remote.h"
 #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom-blink.h"
diff --git a/third_party/blink/renderer/modules/cache_storage/cache_storage.cc b/third_party/blink/renderer/modules/cache_storage/cache_storage.cc
index 8f1cc969b86075..9d1da093ebb4b7 100644
--- a/third_party/blink/renderer/modules/cache_storage/cache_storage.cc
+++ b/third_party/blink/renderer/modules/cache_storage/cache_storage.cc
@@ -6,7 +6,7 @@
 
 #include <utility>
 
-#include "base/memory/ptr_util.h"
+#include "base/memory/scoped_refptr.h"
 #include "base/metrics/histogram_macros.h"
 #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
 #include "third_party/blink/public/common/cache_storage/cache_storage_utils.h"
@@ -21,7 +21,6 @@
 #include "third_party/blink/renderer/core/fetch/response.h"
 #include "third_party/blink/renderer/core/frame/local_dom_window.h"
 #include "third_party/blink/renderer/core/frame/local_frame.h"
-#include "third_party/blink/renderer/core/inspector/console_message.h"
 #include "third_party/blink/renderer/modules/cache_storage/cache_storage_blob_client_list.h"
 #include "third_party/blink/renderer/modules/cache_storage/cache_storage_error.h"
 #include "third_party/blink/renderer/modules/cache_storage/cache_storage_trace_utils.h"
@@ -29,6 +28,7 @@
 #include "third_party/blink/renderer/modules/service_worker/service_worker_global_scope.h"
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
 #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
+#include "third_party/blink/renderer/platform/heap/persistent.h"
 #include "third_party/blink/renderer/platform/instrumentation/tracing/trace_event.h"
 #include "third_party/blink/renderer/platform/instrumentation/tracing/traced_value.h"
 #include "third_party/blink/renderer/platform/network/http_names.h"
diff --git a/third_party/blink/renderer/modules/cache_storage/cache_storage.h b/third_party/blink/renderer/modules/cache_storage/cache_storage.h
index 2b1a00d09ce115..2c181134da7308 100644
--- a/third_party/blink/renderer/modules/cache_storage/cache_storage.h
+++ b/third_party/blink/renderer/modules/cache_storage/cache_storage.h
@@ -10,19 +10,17 @@
 #include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
 #include "third_party/blink/renderer/bindings/core/v8/v8_typedefs.h"
-#include "third_party/blink/renderer/core/execution_context/execution_context_lifecycle_observer.h"
 #include "third_party/blink/renderer/core/fetch/global_fetch.h"
 #include "third_party/blink/renderer/modules/cache_storage/cache.h"
-#include "third_party/blink/renderer/platform/bindings/script_state.h"
 #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
 #include "third_party/blink/renderer/platform/mojo/heap_mojo_remote.h"
 #include "third_party/blink/renderer/platform/wtf/forward.h"
-#include "third_party/blink/renderer/platform/wtf/hash_map.h"
 
 namespace blink {
 
 class CacheStorageBlobClientList;
 class MultiCacheQueryOptions;
+class ScriptState;
 
 class CacheStorage final : public ScriptWrappable,
                            public ActiveScriptWrappable<CacheStorage>,
diff --git a/third_party/blink/renderer/modules/cache_storage/cache_storage_blob_client_list.cc b/third_party/blink/renderer/modules/cache_storage/cache_storage_blob_client_list.cc
index 905ceec85fc268..9072214be2ee69 100644
--- a/third_party/blink/renderer/modules/cache_storage/cache_storage_blob_client_list.cc
+++ b/third_party/blink/renderer/modules/cache_storage/cache_storage_blob_client_list.cc
@@ -4,7 +4,10 @@
 
 #include "third_party/blink/renderer/modules/cache_storage/cache_storage_blob_client_list.h"
 
+#include <utility>
+
 #include "third_party/blink/public/platform/task_type.h"
+#include "third_party/blink/renderer/core/execution_context/execution_context.h"
 #include "third_party/blink/renderer/platform/heap/prefinalizer.h"
 #include "third_party/blink/renderer/platform/mojo/heap_mojo_receiver.h"
 
diff --git a/third_party/blink/renderer/modules/cache_storage/cache_storage_blob_client_list.h b/third_party/blink/renderer/modules/cache_storage/cache_storage_blob_client_list.h
index 24b6c196aaaed3..2e810b04cbf419 100644
--- a/third_party/blink/renderer/modules/cache_storage/cache_storage_blob_client_list.h
+++ b/third_party/blink/renderer/modules/cache_storage/cache_storage_blob_client_list.h
@@ -7,7 +7,6 @@
 
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "third_party/blink/public/mojom/blob/blob.mojom-blink.h"
-#include "third_party/blink/renderer/core/execution_context/execution_context.h"
 #include "third_party/blink/renderer/modules/modules_export.h"
 #include "third_party/blink/renderer/platform/heap/collection_support/heap_vector.h"
 #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
@@ -15,6 +14,8 @@
 
 namespace blink {
 
+class ExecutionContext;
+
 // This class holds a list of BlobReaderClient implementations alive until
 // they complete or the entire list is garbage collected.
 class MODULES_EXPORT CacheStorageBlobClientList
diff --git a/third_party/blink/renderer/modules/cache_storage/cache_storage_trace_utils.cc b/third_party/blink/renderer/modules/cache_storage/cache_storage_trace_utils.cc
index 3f815ef34f0685..f74830aadc17cf 100644
--- a/third_party/blink/renderer/modules/cache_storage/cache_storage_trace_utils.cc
+++ b/third_party/blink/renderer/modules/cache_storage/cache_storage_trace_utils.cc
@@ -4,7 +4,7 @@
 
 #include "third_party/blink/renderer/modules/cache_storage/cache_storage_trace_utils.h"
 
-#include <memory>
+#include <sstream>
 
 #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom-blink.h"
 #include "third_party/blink/renderer/platform/instrumentation/tracing/traced_value.h"
diff --git a/third_party/blink/renderer/modules/cache_storage/cache_storage_trace_utils.h b/third_party/blink/renderer/modules/cache_storage/cache_storage_trace_utils.h
index e2d67e48deaf84..84e0ba37c32716 100644
--- a/third_party/blink/renderer/modules/cache_storage/cache_storage_trace_utils.h
+++ b/third_party/blink/renderer/modules/cache_storage/cache_storage_trace_utils.h
@@ -6,6 +6,7 @@
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_CACHE_STORAGE_CACHE_STORAGE_TRACE_UTILS_H_
 
 #include <memory>
+#include <string>
 
 #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom-blink-forward.h"
 #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink-forward.h"
diff --git a/third_party/blink/renderer/modules/cache_storage/cache_test.cc b/third_party/blink/renderer/modules/cache_storage/cache_test.cc
index 6f6130bca42dde..f2db0e9382d367 100644
--- a/third_party/blink/renderer/modules/cache_storage/cache_test.cc
+++ b/third_party/blink/renderer/modules/cache_storage/cache_test.cc
@@ -7,13 +7,13 @@
 #include <algorithm>
 #include <memory>
 #include <string>
+#include <utility>
 
-#include "base/memory/ptr_util.h"
+#include "base/memory/scoped_refptr.h"
 #include "mojo/public/cpp/bindings/associated_receiver.h"
 #include "mojo/public/cpp/bindings/associated_remote.h"
 #include "services/network/public/mojom/fetch_api.mojom-blink.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom-blink.h"
 #include "third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h"
 #include "third_party/blink/public/platform/web_url_response.h"
diff --git a/third_party/blink/renderer/modules/cache_storage/cache_utils.cc b/third_party/blink/renderer/modules/cache_storage/cache_utils.cc
index d852f2b23b51dd..263c9c7b793950 100644
--- a/third_party/blink/renderer/modules/cache_storage/cache_utils.cc
+++ b/third_party/blink/renderer/modules/cache_storage/cache_utils.cc
@@ -4,6 +4,8 @@
 
 #include "third_party/blink/renderer/modules/cache_storage/cache_utils.h"
 
+#include <utility>
+
 #include "third_party/blink/renderer/core/fetch/fetch_response_data.h"
 #include "third_party/blink/renderer/core/fetch/response.h"
 #include "third_party/blink/renderer/modules/cache_storage/cache_storage_blob_client_list.h"
diff --git a/third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.cc b/third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.cc
index c19ef186c096d0..0173d7fb1334fc 100644
--- a/third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.cc
+++ b/third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.cc
@@ -17,10 +17,6 @@
 #include "third_party/blink/public/common/cache_storage/cache_storage_utils.h"
 #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom-blink.h"
 #include "third_party/blink/public/platform/platform.h"
-#include "third_party/blink/public/platform/web_security_origin.h"
-#include "third_party/blink/public/platform/web_string.h"
-#include "third_party/blink/public/platform/web_url.h"
-#include "third_party/blink/public/platform/web_vector.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context.h"
 #include "third_party/blink/renderer/core/fileapi/file_reader_loader.h"
 #include "third_party/blink/renderer/core/fileapi/file_reader_loader_client.h"
diff --git a/third_party/blink/renderer/modules/credentialmanager/credential_manager_proxy.cc b/third_party/blink/renderer/modules/credentialmanager/credential_manager_proxy.cc
index 7de07662a401db..a37b37d7457cb7 100644
--- a/third_party/blink/renderer/modules/credentialmanager/credential_manager_proxy.cc
+++ b/third_party/blink/renderer/modules/credentialmanager/credential_manager_proxy.cc
@@ -69,7 +69,7 @@ void CredentialManagerProxy::BindRemoteForFedCm(
       &CredentialManagerProxy::OnConnectionError, WrapWeakPersistent(this)));
 }
 
-mojom::blink::FederatedAuthRequest* CredentialManagerProxy::FedCMGetRequest() {
+mojom::blink::FederatedAuthRequest* CredentialManagerProxy::FedCmGetRequest() {
   BindRemoteForFedCm(fedcm_get_request_);
   return fedcm_get_request_.get();
 }
diff --git a/third_party/blink/renderer/modules/credentialmanager/credential_manager_proxy.h b/third_party/blink/renderer/modules/credentialmanager/credential_manager_proxy.h
index 5fa0dc0b21b950..69206fbfc3e7d6 100644
--- a/third_party/blink/renderer/modules/credentialmanager/credential_manager_proxy.h
+++ b/third_party/blink/renderer/modules/credentialmanager/credential_manager_proxy.h
@@ -52,7 +52,7 @@ class MODULES_EXPORT CredentialManagerProxy
 
   payments::mojom::blink::PaymentCredential* PaymentCredential();
 
-  mojom::blink::FederatedAuthRequest* FedCMGetRequest();
+  mojom::blink::FederatedAuthRequest* FedCmGetRequest();
 
   void Trace(Visitor*) const override;
 
diff --git a/third_party/blink/renderer/modules/credentialmanager/credentials_container.cc b/third_party/blink/renderer/modules/credentialmanager/credentials_container.cc
index b845b8a47113e1..17317b5f239c78 100644
--- a/third_party/blink/renderer/modules/credentialmanager/credentials_container.cc
+++ b/third_party/blink/renderer/modules/credentialmanager/credentials_container.cc
@@ -1153,7 +1153,7 @@ ScriptPromise CredentialsContainer::get(
         DCHECK(options->federated()->hasPreferAutoSignIn());
         bool prefer_auto_sign_in = options->federated()->preferAutoSignIn();
         auto* fedcm_get_request =
-            CredentialManagerProxy::From(script_state)->FedCMGetRequest();
+            CredentialManagerProxy::From(script_state)->FedCmGetRequest();
         fedcm_get_request->RequestIdToken(
             provider_url, client_id, nonce,
             ToRequestMode(options->federated()->mode()), prefer_auto_sign_in,
diff --git a/third_party/blink/renderer/modules/exported/web_dom_file_system.cc b/third_party/blink/renderer/modules/exported/web_dom_file_system.cc
index 86a71b50fa3912..b2ff903bc932d8 100644
--- a/third_party/blink/renderer/modules/exported/web_dom_file_system.cc
+++ b/third_party/blink/renderer/modules/exported/web_dom_file_system.cc
@@ -118,7 +118,8 @@ v8::Local<v8::Value> WebDOMFileSystem::ToV8Value(
     v8::Isolate* isolate) {
   // We no longer use |creationContext| because it's often misused and points
   // to a context faked by user script.
-  DCHECK(creation_context->CreationContext() == isolate->GetCurrentContext());
+  DCHECK(creation_context->GetCreationContextChecked() ==
+         isolate->GetCurrentContext());
   if (!private_.Get())
     return v8::Local<v8::Value>();
   return ToV8(private_.Get(), isolate->GetCurrentContext()->Global(), isolate);
@@ -131,7 +132,8 @@ v8::Local<v8::Value> WebDOMFileSystem::CreateV8Entry(
     v8::Isolate* isolate) {
   // We no longer use |creationContext| because it's often misused and points
   // to a context faked by user script.
-  DCHECK(creation_context->CreationContext() == isolate->GetCurrentContext());
+  DCHECK(creation_context->GetCreationContextChecked() ==
+         isolate->GetCurrentContext());
   if (!private_.Get())
     return v8::Local<v8::Value>();
   if (entry_type == kEntryTypeDirectory) {
diff --git a/third_party/blink/renderer/modules/nfc/ndef_make_read_only_options.idl b/third_party/blink/renderer/modules/nfc/ndef_make_read_only_options.idl
new file mode 100644
index 00000000000000..12bc355c5cc650
--- /dev/null
+++ b/third_party/blink/renderer/modules/nfc/ndef_make_read_only_options.idl
@@ -0,0 +1,8 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// https://w3c.github.io/web-nfc/#the-ndefmakereadonlyoptions-dictionary
+dictionary NDEFMakeReadOnlyOptions {
+    AbortSignal? signal;
+};
diff --git a/third_party/blink/renderer/modules/nfc/ndef_reader.cc b/third_party/blink/renderer/modules/nfc/ndef_reader.cc
index fa743d8ea30f1a..250b1873c87935 100644
--- a/third_party/blink/renderer/modules/nfc/ndef_reader.cc
+++ b/third_party/blink/renderer/modules/nfc/ndef_reader.cc
@@ -6,6 +6,7 @@
 
 #include "services/device/public/mojom/nfc.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
+#include "third_party/blink/renderer/bindings/modules/v8/v8_ndef_make_read_only_options.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_ndef_scan_options.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_ndef_write_options.h"
 #include "third_party/blink/renderer/core/dom/abort_signal.h"
@@ -59,6 +60,11 @@ DOMException* NDEFErrorTypeToDOMException(
   return nullptr;
 }
 
+DOMException* NDEFErrorPtrToDOMException(
+    device::mojom::blink::NDEFErrorPtr error) {
+  return NDEFErrorTypeToDOMException(error->error_type, error->error_message);
+}
+
 constexpr char kNotSupportedOrPermissionDenied[] =
     "Web NFC is unavailable or permission denied.";
 
@@ -68,6 +74,9 @@ constexpr char kChildFrameErrorMessage[] =
 constexpr char kScanAbortMessage[] = "The NFC scan operation was cancelled.";
 
 constexpr char kWriteAbortMessage[] = "The NFC write operation was cancelled.";
+
+constexpr char kMakeReadOnlyAbortMessage[] =
+    "The NFC make read-only operation was cancelled.";
 }  // namespace
 
 // static
@@ -148,15 +157,17 @@ void NDEFReader::ReadOnRequestPermission(const NDEFScanOptions* options,
     return;
   }
 
-  if (options->hasSignal()) {
-    if (options->signal()->aborted()) {
+  scan_signal_ = options->getSignalOr(nullptr);
+  if (scan_signal_) {
+    if (scan_signal_->aborted()) {
       scan_resolver_->Reject(MakeGarbageCollected<DOMException>(
           DOMExceptionCode::kAbortError, kScanAbortMessage));
       scan_resolver_.Clear();
       return;
     }
-    options->signal()->AddAlgorithm(
-        WTF::Bind(&NDEFReader::ReadAbort, WrapPersistent(this)));
+    scan_signal_->AddAlgorithm(
+        WTF::Bind(&NDEFReader::ReadAbort, WrapWeakPersistent(this),
+                  WrapWeakPersistent(scan_signal_.Get())));
   }
 
   GetNfcProxy()->StartReading(
@@ -170,8 +181,7 @@ void NDEFReader::ReadOnRequestCompleted(
     return;
 
   if (error) {
-    scan_resolver_->Reject(
-        NDEFErrorTypeToDOMException(error->error_type, error->error_message));
+    scan_resolver_->Reject(NDEFErrorPtrToDOMException(std::move(error)));
   } else {
     scan_resolver_->Resolve();
   }
@@ -201,7 +211,12 @@ void NDEFReader::ContextDestroyed() {
   GetNfcProxy()->StopReading(this);
 }
 
-void NDEFReader::ReadAbort() {
+void NDEFReader::ReadAbort(AbortSignal* signal) {
+  // There is no RemoveAlgorithm() method on AbortSignal so compare the signal
+  // bound to this callback to the one last passed to scan().
+  if (scan_signal_ != signal)
+    return;
+
   if (scan_resolver_) {
     scan_resolver_->Reject(MakeGarbageCollected<DOMException>(
         DOMExceptionCode::kAbortError, kScanAbortMessage));
@@ -272,14 +287,16 @@ void NDEFReader::WriteOnRequestPermission(
     return;
   }
 
-  if (options->hasSignal()) {
-    if (options->signal()->aborted()) {
+  write_signal_ = options->getSignalOr(nullptr);
+  if (write_signal_) {
+    if (write_signal_->aborted()) {
       resolver->Reject(MakeGarbageCollected<DOMException>(
           DOMExceptionCode::kAbortError, kWriteAbortMessage));
       return;
     }
-    options->signal()->AddAlgorithm(
-        WTF::Bind(&NDEFReader::WriteAbort, WrapPersistent(this)));
+    write_signal_->AddAlgorithm(
+        WTF::Bind(&NDEFReader::WriteAbort, WrapWeakPersistent(this),
+                  WrapWeakPersistent(write_signal_.Get())));
   }
 
   auto callback = WTF::Bind(&NDEFReader::WriteOnRequestCompleted,
@@ -299,17 +316,101 @@ void NDEFReader::WriteOnRequestCompleted(
   if (error.is_null()) {
     resolver->Resolve();
   } else {
-    resolver->Reject(
-        NDEFErrorTypeToDOMException(error->error_type, error->error_message));
+    resolver->Reject(NDEFErrorPtrToDOMException(std::move(error)));
   }
 }
 
-void NDEFReader::WriteAbort() {
+void NDEFReader::WriteAbort(AbortSignal* signal) {
+  // There is no RemoveAlgorithm() method on AbortSignal so compare the signal
+  // bound to this callback to the one last passed to write().
+  if (write_signal_ != signal)
+    return;
+
   // WriteOnRequestCompleted() should always be called whether the push
   // operation is cancelled successfully or not.
   GetNfcProxy()->CancelPush();
 }
 
+ScriptPromise NDEFReader::makeReadOnly(ScriptState* script_state,
+                                       const NDEFMakeReadOnlyOptions* options,
+                                       ExceptionState& exception_state) {
+  // https://w3c.github.io/web-nfc/#security-policies
+  // WebNFC API must be only accessible from top level browsing context.
+  if (!DomWindow() || !DomWindow()->GetFrame()->IsMainFrame()) {
+    exception_state.ThrowDOMException(DOMExceptionCode::kInvalidStateError,
+                                      kChildFrameErrorMessage);
+    return ScriptPromise();
+  }
+
+  auto* resolver = MakeGarbageCollected<ScriptPromiseResolver>(script_state);
+  make_read_only_requests_.insert(resolver);
+
+  // Add the writer to proxy's writer list for Mojo connection error
+  // notification.
+  GetNfcProxy()->AddWriter(this);
+
+  GetPermissionService()->RequestPermission(
+      CreatePermissionDescriptor(PermissionName::NFC),
+      LocalFrame::HasTransientUserActivation(DomWindow()->GetFrame()),
+      WTF::Bind(&NDEFReader::MakeReadOnlyOnRequestPermission,
+                WrapPersistent(this), WrapPersistent(resolver),
+                WrapPersistent(options)));
+
+  return resolver->Promise();
+}
+
+void NDEFReader::MakeReadOnlyOnRequestPermission(
+    ScriptPromiseResolver* resolver,
+    const NDEFMakeReadOnlyOptions* options,
+    PermissionStatus status) {
+  if (status != PermissionStatus::GRANTED) {
+    resolver->Reject(MakeGarbageCollected<DOMException>(
+        DOMExceptionCode::kNotAllowedError, "NFC permission request denied."));
+    return;
+  }
+
+  make_read_only_signal_ = options->getSignalOr(nullptr);
+  if (make_read_only_signal_) {
+    if (make_read_only_signal_->aborted()) {
+      resolver->Reject(MakeGarbageCollected<DOMException>(
+          DOMExceptionCode::kAbortError, kMakeReadOnlyAbortMessage));
+      return;
+    }
+    make_read_only_signal_->AddAlgorithm(
+        WTF::Bind(&NDEFReader::MakeReadOnlyAbort, WrapWeakPersistent(this),
+                  WrapWeakPersistent(make_read_only_signal_.Get())));
+  }
+
+  auto callback = WTF::Bind(&NDEFReader::MakeReadOnlyOnRequestCompleted,
+                            WrapPersistent(this), WrapPersistent(resolver));
+  GetNfcProxy()->MakeReadOnly(std::move(callback));
+}
+
+void NDEFReader::MakeReadOnlyOnRequestCompleted(
+    ScriptPromiseResolver* resolver,
+    device::mojom::blink::NDEFErrorPtr error) {
+  DCHECK(make_read_only_requests_.Contains(resolver));
+
+  make_read_only_requests_.erase(resolver);
+
+  if (error.is_null()) {
+    resolver->Resolve();
+  } else {
+    resolver->Reject(NDEFErrorPtrToDOMException(std::move(error)));
+  }
+}
+
+void NDEFReader::MakeReadOnlyAbort(AbortSignal* signal) {
+  // There is no RemoveAlgorithm() method on AbortSignal so compare the signal
+  // bound to this callback to the one last passed to makeReadOnly().
+  if (make_read_only_signal_ != signal)
+    return;
+
+  // MakeReadOnlyOnRequestCompleted() should always be called whether the
+  // makeReadOnly operation is cancelled successfully or not.
+  GetNfcProxy()->CancelMakeReadOnly();
+}
+
 NFCProxy* NDEFReader::GetNfcProxy() const {
   DCHECK(DomWindow());
   return NFCProxy::From(*DomWindow());
@@ -318,7 +419,11 @@ NFCProxy* NDEFReader::GetNfcProxy() const {
 void NDEFReader::Trace(Visitor* visitor) const {
   visitor->Trace(permission_service_);
   visitor->Trace(scan_resolver_);
+  visitor->Trace(scan_signal_);
   visitor->Trace(write_requests_);
+  visitor->Trace(write_signal_);
+  visitor->Trace(make_read_only_requests_);
+  visitor->Trace(make_read_only_signal_);
   EventTargetWithInlineData::Trace(visitor);
   ActiveScriptWrappable::Trace(visitor);
   ExecutionContextLifecycleObserver::Trace(visitor);
@@ -348,11 +453,10 @@ void NDEFReader::WriteOnMojoConnectionError() {
   // If the mojo connection breaks, All push requests will be rejected with a
   // default error.
 
-  // Script may execute during a call to Resolve(). Swap these sets to prevent
+  // Script may execute during a call to Reject(). Swap these sets to prevent
   // concurrent modification.
   HeapHashSet<Member<ScriptPromiseResolver>> write_requests;
   write_requests_.swap(write_requests);
-  write_requests_.clear();
   for (ScriptPromiseResolver* resolver : write_requests) {
     resolver->Reject(NDEFErrorTypeToDOMException(
         device::mojom::blink::NDEFErrorType::NOT_SUPPORTED,
@@ -360,4 +464,19 @@ void NDEFReader::WriteOnMojoConnectionError() {
   }
 }
 
+void NDEFReader::MakeReadOnlyOnMojoConnectionError() {
+  // If the mojo connection breaks, All makeReadOnly requests will be rejected
+  // with a default error.
+
+  // Script may execute during a call to Reject(). Swap these sets to prevent
+  // concurrent modification.
+  HeapHashSet<Member<ScriptPromiseResolver>> make_read_only_requests;
+  make_read_only_requests_.swap(make_read_only_requests);
+  for (ScriptPromiseResolver* resolver : make_read_only_requests) {
+    resolver->Reject(NDEFErrorTypeToDOMException(
+        device::mojom::blink::NDEFErrorType::NOT_SUPPORTED,
+        kNotSupportedOrPermissionDenied));
+  }
+}
+
 }  // namespace blink
diff --git a/third_party/blink/renderer/modules/nfc/ndef_reader.h b/third_party/blink/renderer/modules/nfc/ndef_reader.h
index e31634f6c23289..be8ae5e25783dc 100644
--- a/third_party/blink/renderer/modules/nfc/ndef_reader.h
+++ b/third_party/blink/renderer/modules/nfc/ndef_reader.h
@@ -19,7 +19,9 @@
 
 namespace blink {
 
+class AbortSignal;
 class NDEFScanOptions;
+class NDEFMakeReadOnlyOptions;
 class NDEFWriteOptions;
 class NFCProxy;
 class ScriptPromiseResolver;
@@ -56,6 +58,11 @@ class MODULES_EXPORT NDEFReader : public EventTargetWithInlineData,
                       const NDEFWriteOptions* options,
                       ExceptionState& exception_state);
 
+  // Make NFC tag permanently read-only.
+  ScriptPromise makeReadOnly(ScriptState* script_state,
+                             const NDEFMakeReadOnlyOptions* options,
+                             ExceptionState& exception_state);
+
   void Trace(Visitor*) const override;
 
   // Called by NFCProxy for dispatching events.
@@ -66,6 +73,7 @@ class MODULES_EXPORT NDEFReader : public EventTargetWithInlineData,
   // Called by NFCProxy for notification about connection error.
   void ReadOnMojoConnectionError();
   void WriteOnMojoConnectionError();
+  void MakeReadOnlyOnMojoConnectionError();
 
  private:
   // ExecutionContextLifecycleObserver overrides.
@@ -73,13 +81,17 @@ class MODULES_EXPORT NDEFReader : public EventTargetWithInlineData,
 
   NFCProxy* GetNfcProxy() const;
 
-  void ReadAbort();
+  void ReadAbort(AbortSignal* signal);
   void ReadOnRequestCompleted(device::mojom::blink::NDEFErrorPtr error);
 
-  void WriteAbort();
+  void WriteAbort(AbortSignal* signal);
   void WriteOnRequestCompleted(ScriptPromiseResolver* resolver,
                                device::mojom::blink::NDEFErrorPtr error);
 
+  void MakeReadOnlyAbort(AbortSignal* signal);
+  void MakeReadOnlyOnRequestCompleted(ScriptPromiseResolver* resolver,
+                                      device::mojom::blink::NDEFErrorPtr error);
+
   // Read Permission handling
   void ReadOnRequestPermission(const NDEFScanOptions* options,
                                mojom::blink::PermissionStatus status);
@@ -91,10 +103,16 @@ class MODULES_EXPORT NDEFReader : public EventTargetWithInlineData,
       device::mojom::blink::NDEFMessagePtr ndef_message,
       mojom::blink::PermissionStatus status);
 
+  // Make read-only permission handling
+  void MakeReadOnlyOnRequestPermission(ScriptPromiseResolver* resolver,
+                                       const NDEFMakeReadOnlyOptions* options,
+                                       mojom::blink::PermissionStatus status);
+
   // |scan_resolver_| is kept here to handle Mojo connection failures because in
   // that case the callback passed to Watch() won't be called and
   // mojo::WrapCallbackWithDefaultInvokeIfNotRun() is forbidden in Blink.
   Member<ScriptPromiseResolver> scan_resolver_;
+  Member<AbortSignal> scan_signal_;
 
   HeapMojoRemote<mojom::blink::PermissionService> permission_service_;
   mojom::blink::PermissionService* GetPermissionService();
@@ -102,8 +120,14 @@ class MODULES_EXPORT NDEFReader : public EventTargetWithInlineData,
   // |write_requests_| are kept here to handle Mojo connection failures because
   // in that case the callback passed to Push() won't be called and
   // mojo::WrapCallbackWithDefaultInvokeIfNotRun() is forbidden in Blink.
-  // This list will also be used by AbortSignal.
   HeapHashSet<Member<ScriptPromiseResolver>> write_requests_;
+  Member<AbortSignal> write_signal_;
+
+  // |make_read_only_requests_| are kept here to handle Mojo connection failures
+  // because in that case the callback passed to MakeReadOnly() won't be called
+  // and mojo::WrapCallbackWithDefaultInvokeIfNotRun() is forbidden in Blink.
+  HeapHashSet<Member<ScriptPromiseResolver>> make_read_only_requests_;
+  Member<AbortSignal> make_read_only_signal_;
 };
 
 }  // namespace blink
diff --git a/third_party/blink/renderer/modules/nfc/ndef_reader.idl b/third_party/blink/renderer/modules/nfc/ndef_reader.idl
index 63575c5ee080c4..b7d7330c313dc8 100644
--- a/third_party/blink/renderer/modules/nfc/ndef_reader.idl
+++ b/third_party/blink/renderer/modules/nfc/ndef_reader.idl
@@ -23,4 +23,7 @@ typedef (DOMString or BufferSource or NDEFMessageInit) NDEFMessageSource;
     [CallWith=ScriptState, RaisesException, MeasureAs=WebNfcNdefWriterWrite] Promise<void> write(
         NDEFMessageSource message,
         optional NDEFWriteOptions options={});
+
+    [CallWith=ScriptState, RaisesException, RuntimeEnabled=WebNFCMakeReadOnly] Promise<void> makeReadOnly(
+        optional NDEFMakeReadOnlyOptions options={});
 };
diff --git a/third_party/blink/renderer/modules/nfc/nfc_proxy.cc b/third_party/blink/renderer/modules/nfc/nfc_proxy.cc
index aa09e8addd7b50..6b8c9ce8537ce7 100644
--- a/third_party/blink/renderer/modules/nfc/nfc_proxy.cc
+++ b/third_party/blink/renderer/modules/nfc/nfc_proxy.cc
@@ -89,6 +89,17 @@ void NFCProxy::CancelPush() {
   nfc_remote_->CancelPush();
 }
 
+void NFCProxy::MakeReadOnly(device::mojom::blink::NFC::PushCallback cb) {
+  EnsureMojoConnection();
+  nfc_remote_->MakeReadOnly(std::move(cb));
+}
+
+void NFCProxy::CancelMakeReadOnly() {
+  if (!nfc_remote_)
+    return;
+  nfc_remote_->CancelMakeReadOnly();
+}
+
 // device::mojom::blink::NFCClient implementation.
 void NFCProxy::OnWatch(const Vector<uint32_t>& watch_ids,
                        const String& serial_number,
@@ -184,6 +195,7 @@ void NFCProxy::OnMojoConnectionError() {
   // Notify all writers about the connection error and clear the list.
   for (auto& writer : writers_) {
     writer->WriteOnMojoConnectionError();
+    writer->MakeReadOnlyOnMojoConnectionError();
   }
   writers_.clear();
 }
diff --git a/third_party/blink/renderer/modules/nfc/nfc_proxy.h b/third_party/blink/renderer/modules/nfc/nfc_proxy.h
index dfa072d8324a09..886998bf5c04f5 100644
--- a/third_party/blink/renderer/modules/nfc/nfc_proxy.h
+++ b/third_party/blink/renderer/modules/nfc/nfc_proxy.h
@@ -46,6 +46,8 @@ class MODULES_EXPORT NFCProxy final : public GarbageCollected<NFCProxy>,
             device::mojom::blink::NDEFWriteOptionsPtr,
             device::mojom::blink::NFC::PushCallback);
   void CancelPush();
+  void MakeReadOnly(device::mojom::blink::NFC::MakeReadOnlyCallback);
+  void CancelMakeReadOnly();
 
  private:
   // Implementation of device::mojom::blink::NFCClient.
diff --git a/third_party/blink/renderer/modules/nfc/nfc_proxy_test.cc b/third_party/blink/renderer/modules/nfc/nfc_proxy_test.cc
index 44514456e85678..0be76ecf6d4880 100644
--- a/third_party/blink/renderer/modules/nfc/nfc_proxy_test.cc
+++ b/third_party/blink/renderer/modules/nfc/nfc_proxy_test.cc
@@ -107,6 +107,8 @@ class FakeNfcService : public device::mojom::blink::NFC {
     std::move(callback).Run(nullptr);
   }
   void CancelPush() override {}
+  void MakeReadOnly(MakeReadOnlyCallback callback) override {}
+  void CancelMakeReadOnly() override {}
   void Watch(uint32_t id, WatchCallback callback) override {
     if (watch_error_) {
       std::move(callback).Run(watch_error_.Clone());
diff --git a/third_party/blink/renderer/platform/bindings/binding_security_for_platform.cc b/third_party/blink/renderer/platform/bindings/binding_security_for_platform.cc
index 2e5ef41c291d85..750dba211035a7 100644
--- a/third_party/blink/renderer/platform/bindings/binding_security_for_platform.cc
+++ b/third_party/blink/renderer/platform/bindings/binding_security_for_platform.cc
@@ -24,7 +24,7 @@ BindingSecurityForPlatform::RethrowWrapperCreationExceptionFunction
 // static
 bool BindingSecurityForPlatform::ShouldAllowAccessToV8Context(
     v8::Local<v8::Context> accessing_context,
-    v8::Local<v8::Context> target_context,
+    v8::MaybeLocal<v8::Context> target_context,
     ExceptionState& exception_state) {
   return (*should_allow_access_to_v8context_with_exception_state_)(
       accessing_context, target_context, exception_state);
@@ -33,7 +33,7 @@ bool BindingSecurityForPlatform::ShouldAllowAccessToV8Context(
 // static
 bool BindingSecurityForPlatform::ShouldAllowAccessToV8Context(
     v8::Local<v8::Context> accessing_context,
-    v8::Local<v8::Context> target_context,
+    v8::MaybeLocal<v8::Context> target_context,
     ErrorReportOption reporting_option) {
   return (*should_allow_access_to_v8context_with_error_report_option_)(
       accessing_context, target_context, reporting_option);
@@ -42,7 +42,7 @@ bool BindingSecurityForPlatform::ShouldAllowAccessToV8Context(
 // static
 bool BindingSecurityForPlatform::ShouldAllowWrapperCreationOrThrowException(
     v8::Local<v8::Context> accessing_context,
-    v8::Local<v8::Context> creation_context,
+    v8::MaybeLocal<v8::Context> creation_context,
     const WrapperTypeInfo* wrapper_type_info) {
   return (*should_allow_wrapper_creation_or_throw_exception_)(
       accessing_context, creation_context, wrapper_type_info);
@@ -51,7 +51,7 @@ bool BindingSecurityForPlatform::ShouldAllowWrapperCreationOrThrowException(
 // static
 void BindingSecurityForPlatform::RethrowWrapperCreationException(
     v8::Local<v8::Context> accessing_context,
-    v8::Local<v8::Context> creation_context,
+    v8::MaybeLocal<v8::Context> creation_context,
     const WrapperTypeInfo* wrapper_type_info,
     v8::Local<v8::Value> cross_context_exception) {
   (*rethrow_wrapper_creation_exception_)(accessing_context, creation_context,
diff --git a/third_party/blink/renderer/platform/bindings/binding_security_for_platform.h b/third_party/blink/renderer/platform/bindings/binding_security_for_platform.h
index 73def63232cbb9..0f23b6b5bc9ba0 100644
--- a/third_party/blink/renderer/platform/bindings/binding_security_for_platform.h
+++ b/third_party/blink/renderer/platform/bindings/binding_security_for_platform.h
@@ -34,44 +34,44 @@ class PLATFORM_EXPORT BindingSecurityForPlatform {
   // family.
   static bool ShouldAllowAccessToV8Context(
       v8::Local<v8::Context> accessing_context,
-      v8::Local<v8::Context> target_context,
+      v8::MaybeLocal<v8::Context> target_context,
       ExceptionState&);
   static bool ShouldAllowAccessToV8Context(
       v8::Local<v8::Context> accessing_context,
-      v8::Local<v8::Context> target_context,
+      v8::MaybeLocal<v8::Context> target_context,
       ErrorReportOption);
 
   // Checks if a wrapper creation of the given wrapper type associated with
   // |creation_context| is allowed in |accessing_context|.
   static bool ShouldAllowWrapperCreationOrThrowException(
       v8::Local<v8::Context> accessing_context,
-      v8::Local<v8::Context> creation_context,
+      v8::MaybeLocal<v8::Context> creation_context,
       const WrapperTypeInfo* wrapper_type_info);
 
   // Rethrows a cross context exception, that is possibly cross origin.
   // A SecurityError may be rethrown instead of the exception if necessary.
   static void RethrowWrapperCreationException(
       v8::Local<v8::Context> accessing_context,
-      v8::Local<v8::Context> creation_context,
+      v8::MaybeLocal<v8::Context> creation_context,
       const WrapperTypeInfo* wrapper_type_info,
       v8::Local<v8::Value> cross_context_exception);
 
  private:
   using ShouldAllowAccessToV8ContextWithExceptionStateFunction =
       bool (*)(v8::Local<v8::Context> accessing_context,
-               v8::Local<v8::Context> target_context,
+               v8::MaybeLocal<v8::Context> target_context,
                ExceptionState&);
   using ShouldAllowAccessToV8ContextWithErrorReportOptionFunction =
       bool (*)(v8::Local<v8::Context> accessing_context,
-               v8::Local<v8::Context> target_context,
+               v8::MaybeLocal<v8::Context> target_context,
                ErrorReportOption);
   using ShouldAllowWrapperCreationOrThrowExceptionFunction =
       bool (*)(v8::Local<v8::Context> accessing_context,
-               v8::Local<v8::Context> creation_context,
+               v8::MaybeLocal<v8::Context> creation_context,
                const WrapperTypeInfo* wrapper_type_info);
   using RethrowWrapperCreationExceptionFunction =
       void (*)(v8::Local<v8::Context> accessing_context,
-               v8::Local<v8::Context> creation_context,
+               v8::MaybeLocal<v8::Context> creation_context,
                const WrapperTypeInfo* wrapper_type_info,
                v8::Local<v8::Value> cross_context_exception);
 
diff --git a/third_party/blink/renderer/platform/bindings/callback_function_base.cc b/third_party/blink/renderer/platform/bindings/callback_function_base.cc
index 1861fbf066d950..5252971b74745e 100644
--- a/third_party/blink/renderer/platform/bindings/callback_function_base.cc
+++ b/third_party/blink/renderer/platform/bindings/callback_function_base.cc
@@ -22,7 +22,7 @@ CallbackFunctionBase::CallbackFunctionBase(
   // incumbent context are the same origin-domain. Otherwise, leave it as
   // nullptr.
   v8::Local<v8::Context> creation_context =
-      callback_function->CreationContext();
+      callback_function->GetCreationContextChecked();
   if (BindingSecurityForPlatform::ShouldAllowAccessToV8Context(
           incumbent_script_state_->GetContext(), creation_context,
           BindingSecurityForPlatform::ErrorReportOption::kDoNotReport)) {
diff --git a/third_party/blink/renderer/platform/bindings/callback_interface_base.cc b/third_party/blink/renderer/platform/bindings/callback_interface_base.cc
index 1df2fc9dbf4642..55cc3ad6ef70b9 100644
--- a/third_party/blink/renderer/platform/bindings/callback_interface_base.cc
+++ b/third_party/blink/renderer/platform/bindings/callback_interface_base.cc
@@ -24,11 +24,13 @@ CallbackInterfaceBase::CallbackInterfaceBase(
   // Set |callback_relevant_script_state_| iff the creation context and the
   // incumbent context are the same origin-domain. Otherwise, leave it as
   // nullptr.
-  v8::Local<v8::Context> creation_context = callback_object->CreationContext();
+  v8::MaybeLocal<v8::Context> creation_context =
+      callback_object->GetCreationContext();
   if (BindingSecurityForPlatform::ShouldAllowAccessToV8Context(
           incumbent_script_state_->GetContext(), creation_context,
           BindingSecurityForPlatform::ErrorReportOption::kDoNotReport)) {
-    callback_relevant_script_state_ = ScriptState::From(creation_context);
+    callback_relevant_script_state_ =
+        ScriptState::From(creation_context.ToLocalChecked());
   }
 }
 
diff --git a/third_party/blink/renderer/platform/bindings/multi_worlds_v8_reference.cc b/third_party/blink/renderer/platform/bindings/multi_worlds_v8_reference.cc
index 33636c3ff60ad1..ef76f2b589c650 100644
--- a/third_party/blink/renderer/platform/bindings/multi_worlds_v8_reference.cc
+++ b/third_party/blink/renderer/platform/bindings/multi_worlds_v8_reference.cc
@@ -14,7 +14,7 @@ MultiWorldsV8Reference::MultiWorldsV8Reference(v8::Isolate* isolate,
     : value_(isolate, value) {
   if (value->IsObject()) {
     script_state_ =
-        ScriptState::From(value.As<v8::Object>()->CreationContext());
+        ScriptState::From(value.As<v8::Object>()->GetCreationContextChecked());
   } else {
     script_state_ = nullptr;
   }
diff --git a/third_party/blink/renderer/platform/bindings/script_state.h b/third_party/blink/renderer/platform/bindings/script_state.h
index 5e233e05c0e631..dbc2d900c477e0 100644
--- a/third_party/blink/renderer/platform/bindings/script_state.h
+++ b/third_party/blink/renderer/platform/bindings/script_state.h
@@ -151,21 +151,21 @@ class PLATFORM_EXPORT ScriptState final : public GarbageCollected<ScriptState> {
 
   static ScriptState* ForRelevantRealm(
       const v8::FunctionCallbackInfo<v8::Value>& info) {
-    return From(info.Holder()->CreationContext());
+    return From(info.Holder()->GetCreationContextChecked());
   }
 
   static ScriptState* ForRelevantRealm(const V8CrossOriginCallbackInfo& info) {
-    return From(info.Holder()->CreationContext());
+    return From(info.Holder()->GetCreationContextChecked());
   }
 
   static ScriptState* ForRelevantRealm(
       const v8::PropertyCallbackInfo<v8::Value>& info) {
-    return From(info.Holder()->CreationContext());
+    return From(info.Holder()->GetCreationContextChecked());
   }
 
   static ScriptState* ForRelevantRealm(
       const v8::PropertyCallbackInfo<void>& info) {
-    return From(info.Holder()->CreationContext());
+    return From(info.Holder()->GetCreationContextChecked());
   }
 
   static ScriptState* From(v8::Local<v8::Context> context) {
diff --git a/third_party/blink/renderer/platform/bindings/to_v8.h b/third_party/blink/renderer/platform/bindings/to_v8.h
index d0cb0954e79254..10552497f5cc31 100644
--- a/third_party/blink/renderer/platform/bindings/to_v8.h
+++ b/third_party/blink/renderer/platform/bindings/to_v8.h
@@ -43,7 +43,7 @@ inline v8::Local<v8::Value> ToV8(ScriptWrappable* impl,
     return wrapper;
 
   ScriptState* script_state =
-      ScriptState::From(creation_context->CreationContext());
+      ScriptState::From(creation_context->GetCreationContextChecked());
   wrapper = impl->Wrap(script_state).ToLocalChecked();
   DCHECK(!wrapper.IsEmpty());
   return wrapper;
@@ -57,7 +57,7 @@ inline v8::Local<v8::Value> ToV8(const bindings::DictionaryBase* dictionary,
   if (UNLIKELY(!dictionary))
     return v8::Null(isolate);
   ScriptState* script_state =
-      ScriptState::From(creation_context->CreationContext());
+      ScriptState::From(creation_context->GetCreationContextChecked());
   return dictionary->ToV8Value(script_state).ToLocalChecked();
 }
 
@@ -71,7 +71,8 @@ inline v8::Local<v8::Value> ToV8(CallbackFunctionBase* callback,
   // it's in the same world.
   DCHECK(!callback ||
          (&callback->GetWorld() ==
-          &ScriptState::From(creation_context->CreationContext())->World()));
+          &ScriptState::From(creation_context->GetCreationContextChecked())
+               ->World()));
   return callback ? callback->CallbackObject().As<v8::Value>()
                   : v8::Null(isolate).As<v8::Value>();
 }
@@ -86,7 +87,8 @@ inline v8::Local<v8::Value> ToV8(CallbackInterfaceBase* callback,
   // it's in the same world.
   DCHECK(!callback ||
          (&callback->GetWorld() ==
-          &ScriptState::From(creation_context->CreationContext())->World()));
+          &ScriptState::From(creation_context->GetCreationContextChecked())
+               ->World()));
   return callback ? callback->CallbackObject().As<v8::Value>()
                   : v8::Null(isolate).As<v8::Value>();
 }
@@ -104,7 +106,8 @@ inline v8::Local<v8::Value> ToV8(const bindings::UnionBase* union_value,
                                  v8::Local<v8::Object> creation_context,
                                  v8::Isolate* isolate) {
   return union_value
-      ->ToV8Value(ScriptState::From(creation_context->CreationContext()))
+      ->ToV8Value(
+          ScriptState::From(creation_context->GetCreationContextChecked()))
       .ToLocalChecked();
 }
 
@@ -265,7 +268,8 @@ inline v8::Local<v8::Value> ToV8(const Vector<std::pair<String, T>>& value,
                                  v8::Isolate* isolate) {
   v8::Local<v8::Object> object;
   {
-    v8::Context::Scope context_scope(creation_context->CreationContext());
+    v8::Context::Scope context_scope(
+        creation_context->GetCreationContextChecked());
     object = v8::Object::New(isolate);
   }
   v8::Local<v8::Context> context = isolate->GetCurrentContext();
@@ -291,7 +295,8 @@ inline v8::Local<v8::Value> ToV8(const HeapVector<std::pair<String, T>>& value,
                                  v8::Isolate* isolate) {
   v8::Local<v8::Object> object;
   {
-    v8::Context::Scope context_scope(creation_context->CreationContext());
+    v8::Context::Scope context_scope(
+        creation_context->GetCreationContextChecked());
     object = v8::Object::New(isolate);
   }
   v8::Local<v8::Context> context = isolate->GetCurrentContext();
@@ -320,7 +325,8 @@ inline v8::Local<v8::Array> ToV8SequenceInternal(
                            RuntimeCallStats::CounterId::kToV8SequenceInternal);
   v8::Local<v8::Array> array;
   {
-    v8::Context::Scope context_scope(creation_context->CreationContext());
+    v8::Context::Scope context_scope(
+        creation_context->GetCreationContextChecked());
     array = v8::Array::New(isolate, SafeCast<int>(sequence.size()));
   }
   v8::Local<v8::Context> context = isolate->GetCurrentContext();
diff --git a/third_party/blink/renderer/platform/bindings/v8_set_return_value.cc b/third_party/blink/renderer/platform/bindings/v8_set_return_value.cc
index 2eb318e3a64b5f..6302a9ec24cae0 100644
--- a/third_party/blink/renderer/platform/bindings/v8_set_return_value.cc
+++ b/third_party/blink/renderer/platform/bindings/v8_set_return_value.cc
@@ -50,7 +50,7 @@ v8::Local<v8::Value> GetExposedInterfaceObject(
   RUNTIME_CALL_TIMER_SCOPE_DISABLED_BY_DEFAULT(
       isolate, "Blink_GetInterfaceObjectExposedOnGlobal");
   ScriptState* script_state =
-      ScriptState::From(creation_context->CreationContext());
+      ScriptState::From(creation_context->GetCreationContextChecked());
   if (!script_state->ContextIsValid())
     return v8::Undefined(isolate);
 
@@ -64,7 +64,7 @@ v8::Local<v8::Value> GetExposedNamespaceObject(
   RUNTIME_CALL_TIMER_SCOPE_DISABLED_BY_DEFAULT(
       isolate, "Blink_GetInterfaceObjectExposedOnGlobal");
   ScriptState* script_state =
-      ScriptState::From(creation_context->CreationContext());
+      ScriptState::From(creation_context->GetCreationContextChecked());
   if (!script_state->ContextIsValid())
     return v8::Undefined(isolate);
 
diff --git a/third_party/blink/renderer/platform/bindings/v8_set_return_value.h b/third_party/blink/renderer/platform/bindings/v8_set_return_value.h
index f4bb9e465da514..73b286ba6c30b4 100644
--- a/third_party/blink/renderer/platform/bindings/v8_set_return_value.h
+++ b/third_party/blink/renderer/platform/bindings/v8_set_return_value.h
@@ -285,7 +285,8 @@ void V8SetReturnValue(const CallbackInfo& info,
                                                wrappable))
     return;
   V8ReturnValue::SetWrapper(
-      info, wrappable, V8ReturnValue::CreationContext(info)->CreationContext());
+      info, wrappable,
+      V8ReturnValue::CreationContext(info)->GetCreationContextChecked());
 }
 
 template <typename CallbackInfo>
@@ -298,7 +299,8 @@ void V8SetReturnValue(const CallbackInfo& info,
                                                wrappable))
     return;
   V8ReturnValue::SetWrapper(
-      info, wrappable, V8ReturnValue::CreationContext(info)->CreationContext());
+      info, wrappable,
+      V8ReturnValue::CreationContext(info)->GetCreationContextChecked());
 }
 
 template <typename CallbackInfo>
@@ -314,7 +316,8 @@ void V8SetReturnValue(const CallbackInfo& info,
     return;
   }
   V8ReturnValue::SetWrapper(
-      info, wrappable, V8ReturnValue::CreationContext(info)->CreationContext());
+      info, wrappable,
+      V8ReturnValue::CreationContext(info)->GetCreationContextChecked());
 }
 
 template <typename CallbackInfo>
@@ -328,7 +331,8 @@ void V8SetReturnValue(const CallbackInfo& info,
     return;
   }
   V8ReturnValue::SetWrapper(
-      info, wrappable, V8ReturnValue::CreationContext(info)->CreationContext());
+      info, wrappable,
+      V8ReturnValue::CreationContext(info)->GetCreationContextChecked());
 }
 
 template <typename CallbackInfo>
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index a52f0b821841ab..a9d40c2d592975 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2617,6 +2617,11 @@
       name: "WebNFC",
       status: {"Android": "stable", "default": "test"},
     },
+    {
+      name: "WebNFCMakeReadOnly",
+      depends_on: ["WebNFC"],
+      status: "experimental",
+    },
     {
       name: "WebOTP",
       status: "stable",
diff --git a/third_party/blink/web_tests/NeverFixTests b/third_party/blink/web_tests/NeverFixTests
index e3a0b7237555e8..82249b1375d623 100644
--- a/third_party/blink/web_tests/NeverFixTests
+++ b/third_party/blink/web_tests/NeverFixTests
@@ -1522,6 +1522,7 @@ external/wpt/visual-viewport/viewport-scale-manual.html [ Skip ]
 external/wpt/visual-viewport/viewport-scroll-event-manual.html [ Skip ]
 external/wpt/visual-viewport/viewport-url-bar-changes-height-manual.html [ Skip ]
 external/wpt/web-nfc/NDEFReader-read-document-hidden-manual.https.html [ Skip ]
+external/wpt/web-nfc/NDEFReader-make-read-only-document-hidden-manual.https.html [ Skip ]
 external/wpt/web-nfc/NDEFReader-write-document-hidden-manual.https.html [ Skip ]
 external/wpt/web-nfc/nfc-prompt-manual.https.html [ Skip ]
 external/wpt/screen-wake-lock/wakelock-document-hidden-manual.https.html [ Skip ]
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
index 28b9fde374ae0f..9275f08ab6f846 100644
--- a/third_party/blink/web_tests/TestExpectations
+++ b/third_party/blink/web_tests/TestExpectations
@@ -1293,6 +1293,8 @@ virtual/layout_ng_grid_frag/external/wpt/css/css-break/grid/grid-item-fragmentat
 virtual/layout_ng_grid_frag/external/wpt/css/css-break/grid/grid-item-fragmentation-032.html [ Pass ]
 virtual/layout_ng_grid_frag/external/wpt/css/css-break/grid/grid-item-fragmentation-033.html [ Pass ]
 virtual/layout_ng_grid_frag/external/wpt/css/css-break/grid/grid-item-fragmentation-034.html [ Pass ]
+virtual/layout_ng_grid_frag/external/wpt/css/css-break/grid/grid-item-fragmentation-037.html [ Pass ]
+virtual/layout_ng_grid_frag/external/wpt/css/css-break/grid/grid-item-fragmentation-038.html [ Pass ]
 
 ### With LayoutNGPrinting enabled:
 
@@ -1560,8 +1562,6 @@ crbug.com/891944 [ Mac ] external/wpt/css/css-scrollbars/scrollbar-width-paint-0
 
 # css-variables
 
-crbug.com/1220145 external/wpt/css/css-variables/variable-declaration-29.html [ Failure ]
-crbug.com/1220145 external/wpt/css/css-variables/variable-supports-58.html [ Failure ]
 crbug.com/1220148 external/wpt/css/css-variables/variable-declaration-07.html [ Failure ]
 crbug.com/1220148 external/wpt/css/css-variables/variable-declaration-09.html [ Failure ]
 crbug.com/1220148 external/wpt/css/css-variables/variable-reference-06.html [ Failure ]
@@ -4290,6 +4290,8 @@ crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-031.htm
 crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-032.html [ Failure ]
 crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-033.html [ Failure ]
 crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-034.html [ Failure ]
+crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-037.html [ Failure ]
+crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-038.html [ Failure ]
 crbug.com/1066629 external/wpt/css/css-break/hit-test-transformed.html [ Failure ]
 crbug.com/1058792 external/wpt/css/css-break/transform-007.html [ Failure ]
 crbug.com/1224888 external/wpt/css/css-break/transform-009.html [ Failure ]
@@ -7320,10 +7322,6 @@ crbug.com/1256763 [ Linux ] images/color-profile-background-clip-text.html [ Fai
 crbug.com/1256763 [ Linux ] virtual/gpu-rasterization/images/color-profile-svg-fill-text.html [ Failure Pass ]
 crbug.com/1259277 fast/events/message-port-multi.html [ Skip ]
 
-# Sheriff 2021-10-20
-crbug.com/1261770 crbug.com/1245166 [ Linux ] external/wpt/web-bundle/subresource-loading/script-relative-url-in-web-bundle-cors.https.tentative.sub.html [ Failure Pass ]
-crbug.com/1261770 crbug.com/1245166 [ Linux ] virtual/wbn-from-network/external/wpt/web-bundle/subresource-loading/script-relative-url-in-web-bundle-cors.https.tentative.sub.html [ Failure Pass ]
-
 # Sheriff 2021-10-26
 crbug.com/1263349 [ Linux ] external/wpt/resource-timing/object-not-found-after-cross-origin-redirect.html [ Failure Pass ]
 crbug.com/1249043 external/wpt/html/cross-origin-embedder-policy/reporting-navigation.https.html [ Failure Pass ]
diff --git a/third_party/blink/web_tests/android/ChromeWPTOverrideExpectations b/third_party/blink/web_tests/android/ChromeWPTOverrideExpectations
index 2e4796a768a64d..661b3d25bc0b34 100644
--- a/third_party/blink/web_tests/android/ChromeWPTOverrideExpectations
+++ b/third_party/blink/web_tests/android/ChromeWPTOverrideExpectations
@@ -429,14 +429,14 @@ crbug.com/1050754 external/wpt/bluetooth/requestDevice/request-from-iframe.https
 crbug.com/1050754 external/wpt/bluetooth/requestDevice/request-from-sandboxed-iframe.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/requestDevice/same-device.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/requestDevice/single-filter-single-service.https.window.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/connect/connection-succeeds.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/connect/garbage-collection-ran-during-success.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/connect/get-same-gatt-server.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/device-same-object.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/disconnect/connect-disconnect-twice.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/disconnect/detach-gc.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/disconnect/gc-detach.https.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/connect/connection-succeeds.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/connect/garbage-collection-ran-during-success.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/connect/get-same-gatt-server.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/device-same-object.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/disconnect/connect-disconnect-twice.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/disconnect/detach-gc.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/disconnect/gc-detach.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-disconnect-called-before.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-disconnect-called-during-error.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-disconnect-called-during-success.https.window.html [ Failure ]
@@ -453,11 +453,11 @@ crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-no-permiss
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-no-permission-for-any-service.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-no-permission-present-service.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-service-not-found.https.window.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/service-found.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/two-iframes-from-same-origin.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services-with-uuid.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/correct-services.https.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/service-found.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/two-iframes-from-same-origin.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services-with-uuid.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/correct-services.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-disconnect-called-before-with-uuid.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-disconnect-called-before.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error-with-uuid.https.window.html [ Failure ]
@@ -484,9 +484,9 @@ crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-no-permis
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-no-permission-present-service-with-uuid.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-service-not-found-with-uuid.https.window.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/services-found-with-uuid.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/services-found.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/services-not-found.https.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/services-found-with-uuid.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/services-found.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/services-not-found.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/service/device-same-from-2-services.https.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/service/device-same-object.https.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/service/getCharacteristic/characteristic-found.https.html [ Failure ]
diff --git a/third_party/blink/web_tests/android/WebLayerWPTOverrideExpectations b/third_party/blink/web_tests/android/WebLayerWPTOverrideExpectations
index bf596e78fd7547..c95e7b1c91fcbc 100644
--- a/third_party/blink/web_tests/android/WebLayerWPTOverrideExpectations
+++ b/third_party/blink/web_tests/android/WebLayerWPTOverrideExpectations
@@ -498,14 +498,14 @@ crbug.com/1050754 external/wpt/bluetooth/requestDevice/request-from-iframe.https
 crbug.com/1050754 external/wpt/bluetooth/requestDevice/request-from-sandboxed-iframe.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/requestDevice/same-device.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/requestDevice/single-filter-single-service.https.window.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/connect/connection-succeeds.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/connect/garbage-collection-ran-during-success.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/connect/get-same-gatt-server.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/device-same-object.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/disconnect/connect-disconnect-twice.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/disconnect/detach-gc.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/disconnect/gc-detach.https.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/connect/connection-succeeds.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/connect/garbage-collection-ran-during-success.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/connect/get-same-gatt-server.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/device-same-object.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/disconnect/connect-disconnect-twice.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/disconnect/detach-gc.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/disconnect/gc-detach.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-disconnect-called-before.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-disconnect-called-during-error.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-disconnect-called-during-success.https.window.html [ Failure ]
@@ -522,11 +522,11 @@ crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-no-permiss
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-no-permission-for-any-service.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-no-permission-present-service.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-service-not-found.https.window.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/service-found.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/two-iframes-from-same-origin.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services-with-uuid.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/correct-services.https.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/service-found.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/two-iframes-from-same-origin.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services-with-uuid.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/correct-services.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-disconnect-called-before-with-uuid.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-disconnect-called-before.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error-with-uuid.https.window.html [ Failure ]
@@ -553,9 +553,9 @@ crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-no-permis
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-no-permission-present-service-with-uuid.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-service-not-found-with-uuid.https.window.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/services-found-with-uuid.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/services-found.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/services-not-found.https.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/services-found-with-uuid.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/services-found.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/services-not-found.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/service/device-same-from-2-services.https.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/service/device-same-object.https.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/service/getCharacteristic/characteristic-found.https.html [ Failure ]
diff --git a/third_party/blink/web_tests/android/WebviewWPTExpectations b/third_party/blink/web_tests/android/WebviewWPTExpectations
index 854b1c194fa6c0..3ebd097408f0e2 100644
--- a/third_party/blink/web_tests/android/WebviewWPTExpectations
+++ b/third_party/blink/web_tests/android/WebviewWPTExpectations
@@ -387,14 +387,14 @@ crbug.com/1050754 external/wpt/bluetooth/requestDevice/request-from-iframe.https
 crbug.com/1050754 external/wpt/bluetooth/requestDevice/request-from-sandboxed-iframe.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/requestDevice/same-device.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/requestDevice/single-filter-single-service.https.window.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/connect/connection-succeeds.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/connect/garbage-collection-ran-during-success.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/connect/get-same-gatt-server.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/device-same-object.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/disconnect/connect-disconnect-twice.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/disconnect/detach-gc.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/disconnect/gc-detach.https.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/connect/connection-succeeds.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/connect/garbage-collection-ran-during-success.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/connect/get-same-gatt-server.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/device-same-object.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/disconnect/connect-disconnect-twice.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/disconnect/detach-gc.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/disconnect/gc-detach.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-disconnect-called-before.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-disconnect-called-during-error.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-disconnect-called-during-success.https.window.html [ Failure ]
@@ -411,11 +411,11 @@ crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-no-permiss
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-no-permission-for-any-service.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-no-permission-present-service.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/gen-service-not-found.https.window.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/service-found.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/two-iframes-from-same-origin.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services-with-uuid.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/correct-services.https.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/service-found.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryService/two-iframes-from-same-origin.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services-with-uuid.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/correct-services.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-disconnect-called-before-with-uuid.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-disconnect-called-before.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error-with-uuid.https.window.html [ Failure ]
@@ -442,9 +442,9 @@ crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-no-permis
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-no-permission-present-service-with-uuid.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/gen-service-not-found-with-uuid.https.window.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/services-found-with-uuid.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/services-found.https.html [ Failure ]
-crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/services-not-found.https.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/services-found-with-uuid.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/services-found.https.window.html [ Failure ]
+crbug.com/1050754 external/wpt/bluetooth/server/getPrimaryServices/services-not-found.https.window.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/service/device-same-from-2-services.https.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/service/device-same-object.https.html [ Failure ]
 crbug.com/1050754 external/wpt/bluetooth/service/getCharacteristic/characteristic-found.https.html [ Failure ]
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/connect/connection-succeeds.https.html b/third_party/blink/web_tests/external/wpt/bluetooth/server/connect/connection-succeeds.https.html
deleted file mode 100644
index 1326b073879e55..00000000000000
--- a/third_party/blink/web_tests/external/wpt/bluetooth/server/connect/connection-succeeds.https.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-test.js"></script>
-<script src="/bluetooth/resources/bluetooth-fake-devices.js"></script>
-<script>
-'use strict';
-const test_desc = 'Device will connect';
-let device, fake_peripheral;
-
-bluetooth_test(() => getDiscoveredHealthThermometerDevice()
-    .then(_ => ({device, fake_peripheral} = _))
-    .then(() =>
-      fake_peripheral.setNextGATTConnectionResponse({code: HCI_SUCCESS}))
-    .then(() => device.gatt.connect())
-    .then(gatt => assert_true(gatt.connected)),
-    test_desc);
-</script>
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/connect/connection-succeeds.https.window.js b/third_party/blink/web_tests/external/wpt/bluetooth/server/connect/connection-succeeds.https.window.js
new file mode 100644
index 00000000000000..d78d261338c526
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/bluetooth/server/connect/connection-succeeds.https.window.js
@@ -0,0 +1,15 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Device will connect';
+
+bluetooth_test(async () => {
+  let {device, fake_peripheral} = await getDiscoveredHealthThermometerDevice();
+  await fake_peripheral.setNextGATTConnectionResponse({code: HCI_SUCCESS});
+  let gatt = await device.gatt.connect();
+  assert_true(gatt.connected);
+}, test_desc);
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/connect/garbage-collection-ran-during-success.https.html b/third_party/blink/web_tests/external/wpt/bluetooth/server/connect/garbage-collection-ran-during-success.https.html
deleted file mode 100644
index d9c07b64bc0551..00000000000000
--- a/third_party/blink/web_tests/external/wpt/bluetooth/server/connect/garbage-collection-ran-during-success.https.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-test.js"></script>
-<script src="/bluetooth/resources/bluetooth-fake-devices.js"></script>
-<script>
-'use strict';
-const test_desc = 'Garbage Collection ran during a connect call that ' +
-    'succeeds. Should not crash.';
-let device, fake_peripheral;
-
-bluetooth_test(() => getDiscoveredHealthThermometerDevice()
-    .then(_ => ({device, fake_peripheral} = _))
-    .then(() =>
-      fake_peripheral.setNextGATTConnectionResponse({code: HCI_SUCCESS}))
-    // Don't return the promise and let |device| go out of scope
-    // so that it gets garbage collected.
-    .then(() => device.gatt.connect())
-    .then(runGarbageCollection),
-    test_desc);
-</script>
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/connect/garbage-collection-ran-during-success.https.window.js b/third_party/blink/web_tests/external/wpt/bluetooth/server/connect/garbage-collection-ran-during-success.https.window.js
new file mode 100644
index 00000000000000..1a4ad4711edc55
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/bluetooth/server/connect/garbage-collection-ran-during-success.https.window.js
@@ -0,0 +1,20 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Garbage Collection ran during a connect call that ' +
+    'succeeds. Should not crash.';
+
+bluetooth_test(async () => {
+  let connectPromise;
+  {
+    let {device, fake_peripheral} =
+        await getDiscoveredHealthThermometerDevice();
+    await fake_peripheral.setNextGATTConnectionResponse({code: HCI_SUCCESS});
+    connectPromise = device.gatt.connect();
+  }
+  await Promise.all([connectPromise, runGarbageCollection()]);
+}, test_desc);
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/connect/get-same-gatt-server.https.html b/third_party/blink/web_tests/external/wpt/bluetooth/server/connect/get-same-gatt-server.https.html
deleted file mode 100644
index 5e9383851f39a3..00000000000000
--- a/third_party/blink/web_tests/external/wpt/bluetooth/server/connect/get-same-gatt-server.https.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-test.js"></script>
-<script src="/bluetooth/resources/bluetooth-fake-devices.js"></script>
-<script>
-'use strict';
-const test_desc = 'Multiple connects should return the same gatt object.';
-let device, fake_peripheral;
-
-bluetooth_test(() => getDiscoveredHealthThermometerDevice()
-    .then(_ => ({device, fake_peripheral} = _))
-    .then(() =>
-      fake_peripheral.setNextGATTConnectionResponse({code: HCI_SUCCESS}))
-    .then(() => device.gatt.connect())
-    // No second response is necessary because an ATT Bearer
-    // already exists from the first connection.
-    // See https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattserver-connect
-    // step 5.1.
-    .then(gatt1 => device.gatt.connect()
-        .then(gatt2 => [gatt1, gatt2]))
-    .then(([gatt1, gatt2]) => assert_equals(gatt1, gatt2)),
-    test_desc);
-</script>
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/connect/get-same-gatt-server.https.window.js b/third_party/blink/web_tests/external/wpt/bluetooth/server/connect/get-same-gatt-server.https.window.js
new file mode 100644
index 00000000000000..a962d9d28afc4f
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/bluetooth/server/connect/get-same-gatt-server.https.window.js
@@ -0,0 +1,21 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Multiple connects should return the same gatt object.';
+
+bluetooth_test(async () => {
+  let {device, fake_peripheral} = await getDiscoveredHealthThermometerDevice();
+  await fake_peripheral.setNextGATTConnectionResponse({code: HCI_SUCCESS});
+  // No second response is necessary because an ATT Bearer
+  // already exists from the first connection.
+  // See
+  // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattserver-connect
+  // step 5.1.
+  let gatt1 = await device.gatt.connect();
+  let gatt2 = await device.gatt.connect();
+  assert_equals(gatt1, gatt2);
+}, test_desc);
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/device-same-object.https.html b/third_party/blink/web_tests/external/wpt/bluetooth/server/device-same-object.https.html
deleted file mode 100644
index b861040b2366aa..00000000000000
--- a/third_party/blink/web_tests/external/wpt/bluetooth/server/device-same-object.https.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-test.js"></script>
-<script src="/bluetooth/resources/bluetooth-fake-devices.js"></script>
-<script>
-'use strict';
-const test_desc = '[SameObject] test for BluetoothRemoteGATTServer\'s device.';
-let device, fake_peripheral;
-
-bluetooth_test(
-    () => getDiscoveredHealthThermometerDevice()
-              .then(_ => ({device, fake_peripheral} = _))
-              .then(
-                  () => fake_peripheral.setNextGATTConnectionResponse(
-                      {code: HCI_SUCCESS}))
-              .then(() => device.gatt.connect())
-              .then(gatt => assert_equals(gatt.device, gatt.device)),
-    test_desc);
-</script>
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/device-same-object.https.window.js b/third_party/blink/web_tests/external/wpt/bluetooth/server/device-same-object.https.window.js
new file mode 100644
index 00000000000000..1c10a34488bfa1
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/bluetooth/server/device-same-object.https.window.js
@@ -0,0 +1,15 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = '[SameObject] test for BluetoothRemoteGATTServer\'s device.';
+
+bluetooth_test(async () => {
+  let {device, fake_peripheral} = await getDiscoveredHealthThermometerDevice();
+  await fake_peripheral.setNextGATTConnectionResponse({code: HCI_SUCCESS});
+  let gatt = await device.gatt.connect();
+  assert_equals(gatt.device, device);
+}, test_desc);
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/connect-disconnect-twice.https.html b/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/connect-disconnect-twice.https.html
deleted file mode 100644
index 7ed2cb946035c7..00000000000000
--- a/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/connect-disconnect-twice.https.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-test.js"></script>
-<script src="/bluetooth/resources/bluetooth-fake-devices.js"></script>
-<script>
-'use strict';
-const test_desc = 'Connect + Disconnect twice still results in ' +
-  '\'connected\' being false.';
-let device, fake_peripheral;
-
-// TODO(569716): Test that the disconnect signal was sent to the device.
-bluetooth_test(() => getDiscoveredHealthThermometerDevice()
-    .then(_ => ({device, fake_peripheral} = _))
-    .then(() => fake_peripheral.setNextGATTConnectionResponse({
-      code: HCI_SUCCESS,
-    }))
-    .then(() => device.gatt.connect()
-    .then(gattServer => {
-      gattServer.disconnect();
-      assert_false(gattServer.connected);
-    })
-    .then(() => device.gatt.connect())
-    .then(gattServer => {
-      gattServer.disconnect();
-      assert_false(gattServer.connected);
-    })), test_desc);
-</script>
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/connect-disconnect-twice.https.window.js b/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/connect-disconnect-twice.https.window.js
new file mode 100644
index 00000000000000..4d832f2ecd8492
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/connect-disconnect-twice.https.window.js
@@ -0,0 +1,25 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Connect + Disconnect twice still results in ' +
+    '\'connected\' being false.';
+let device, fake_peripheral;
+
+// TODO(569716): Test that the disconnect signal was sent to the device.
+bluetooth_test(async () => {
+  let {device, fake_peripheral} = await getDiscoveredHealthThermometerDevice();
+  await fake_peripheral.setNextGATTConnectionResponse({
+    code: HCI_SUCCESS,
+  });
+  let gattServer = await device.gatt.connect();
+  await gattServer.disconnect();
+  assert_false(gattServer.connected);
+
+  gattServer = await device.gatt.connect();
+  await gattServer.disconnect();
+  assert_false(gattServer.connected);
+}, test_desc);
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/detach-gc.https.html b/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/detach-gc.https.html
deleted file mode 100644
index c1863e923227a6..00000000000000
--- a/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/detach-gc.https.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-test.js"></script>
-<script src="/bluetooth/resources/bluetooth-fake-devices.js"></script>
-<body>
-<script>
-'use strict';
-const test_desc = 'Detach frame then garbage collect. We shouldn\'t crash.';
-let iframe = document.createElement('iframe');
-
-bluetooth_test(() => setUpConnectableHealthThermometerDevice()
-    // 1. Load the iframe.
-    .then(() => new Promise(resolve => {
-      iframe.src = '/bluetooth/resources/health-thermometer-iframe.html';
-      document.body.appendChild(iframe);
-      iframe.addEventListener('load', resolve);
-    }))
-    // 2. Connect device, detach the iframe, and run garbage collection.
-    .then(() => new Promise(resolve => {
-      callWithTrustedClick(() => {
-        iframe.contentWindow.postMessage({
-          type: 'RequestAndConnect',
-          options: {filters: [{services: ['health_thermometer']}]}
-        }, '*');
-      });
-
-      window.onmessage = messageEvent => {
-        assert_equals(messageEvent.data, 'Connected');
-        iframe.remove();
-        runGarbageCollection().then(resolve);
-      }
-    })), test_desc)
-</script>
-</body>
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/detach-gc.https.window.js b/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/detach-gc.https.window.js
new file mode 100644
index 00000000000000..7495c9deae6247
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/detach-gc.https.window.js
@@ -0,0 +1,35 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Detach frame then garbage collect. We shouldn\'t crash.';
+let iframe = document.createElement('iframe');
+
+bluetooth_test(async () => {
+  await setUpConnectableHealthThermometerDevice();
+  // 1. Load the iframe.
+  await new Promise(resolve => {
+    iframe.src = '/bluetooth/resources/health-thermometer-iframe.html';
+    document.body.appendChild(iframe);
+    iframe.addEventListener('load', resolve);
+  });
+  // 2. Connect device, detach the iframe, and run garbage collection.
+  await new Promise(resolve => {
+    callWithTrustedClick(() => {
+      iframe.contentWindow.postMessage(
+          {
+            type: 'RequestAndConnect',
+            options: {filters: [{services: ['health_thermometer']}]}
+          },
+          '*');
+    });
+    window.onmessage = messageEvent => {
+      assert_equals(messageEvent.data, 'Connected');
+      iframe.remove();
+      runGarbageCollection().then(resolve);
+    }
+  })
+}, test_desc)
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.html b/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.html
deleted file mode 100644
index d4d6e2fca782eb..00000000000000
--- a/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-test.js"></script>
-<script src="/bluetooth/resources/bluetooth-fake-devices.js"></script>
-<script>
-'use strict';
-const test_desc = 'Calling disconnect twice in a row still results in ' +
-  '\'connected\' being false.';
-let device, fake_peripheral;
-
-// TODO(569716): Test that the disconnect signal was sent to the device.
-bluetooth_test(() => getDiscoveredHealthThermometerDevice()
-    .then(_ => ({device, fake_peripheral} = _))
-    .then(() => fake_peripheral.setNextGATTConnectionResponse({
-      code: HCI_SUCCESS,
-    }))
-    .then(() => device.gatt.connect())
-    .then(gattServer => {
-      gattServer.disconnect();
-      assert_false(gattServer.connected);
-      gattServer.disconnect();
-      assert_false(gattServer.connected);
-    }), test_desc);
-</script>
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.window.js b/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.window.js
new file mode 100644
index 00000000000000..6f40bf3bc4eb44
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.window.js
@@ -0,0 +1,22 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Calling disconnect twice in a row still results in ' +
+    '\'connected\' being false.';
+
+// TODO(569716): Test that the disconnect signal was sent to the device.
+bluetooth_test(async () => {
+  let {device, fake_peripheral} = await getDiscoveredHealthThermometerDevice();
+  await fake_peripheral.setNextGATTConnectionResponse({
+    code: HCI_SUCCESS,
+  });
+  let gattServer = await device.gatt.connect();
+  await gattServer.disconnect();
+  assert_false(gattServer.connected);
+  await gattServer.disconnect();
+  assert_false(gattServer.connected);
+}, test_desc);
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/gc-detach.https.html b/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/gc-detach.https.html
deleted file mode 100644
index 41d2b151d33c65..00000000000000
--- a/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/gc-detach.https.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-test.js"></script>
-<script src="/bluetooth/resources/bluetooth-fake-devices.js"></script>
-<body>
-<script>
-'use strict';
-const test_desc = 'Garbage collect then detach frame. We shouldn\'t crash.';
-let iframe = document.createElement('iframe');
-
-bluetooth_test(() => setUpConnectableHealthThermometerDevice()
-    // 1. Load the iframe.
-    .then((f) => new Promise(resolve => {
-      iframe.src = '/bluetooth/resources/health-thermometer-iframe.html';
-      document.body.appendChild(iframe);
-      iframe.addEventListener('load', resolve);
-    }))
-    // 2. Connect device, run garbage collection, and detach iframe.
-    .then(() => new Promise(resolve => {
-      callWithTrustedClick(() => {
-        iframe.contentWindow.postMessage({
-          type: 'RequestAndConnect',
-          options: {filters: [{services: ['health_thermometer']}]}
-        }, '*');
-      });
-
-      window.onmessage = messageEvent => {
-        assert_equals(messageEvent.data, 'Connected');
-        runGarbageCollection().then(() => {
-          iframe.remove();
-          resolve();
-        });
-      }
-    })), test_desc)
-</script>
-</body>
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/gc-detach.https.window.js b/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/gc-detach.https.window.js
new file mode 100644
index 00000000000000..cb0899bbe2f3f0
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/bluetooth/server/disconnect/gc-detach.https.window.js
@@ -0,0 +1,37 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Garbage collect then detach frame. We shouldn\'t crash.';
+let iframe = document.createElement('iframe');
+
+bluetooth_test(async () => {
+  await setUpConnectableHealthThermometerDevice();
+  // 1. Load the iframe.
+  await new Promise(resolve => {
+    iframe.src = '/bluetooth/resources/health-thermometer-iframe.html';
+    document.body.appendChild(iframe);
+    iframe.addEventListener('load', resolve);
+  });
+  // 2. Connect device, run garbage collection, and detach iframe.
+  await new Promise(resolve => {
+    callWithTrustedClick(() => {
+      iframe.contentWindow.postMessage(
+          {
+            type: 'RequestAndConnect',
+            options: {filters: [{services: ['health_thermometer']}]}
+          },
+          '*');
+    });
+    window.onmessage = messageEvent => {
+      assert_equals(messageEvent.data, 'Connected');
+      runGarbageCollection().then(() => {
+        iframe.remove();
+        resolve();
+      });
+    }
+  })
+}, test_desc)
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryService/service-found.https.html b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryService/service-found.https.html
deleted file mode 100644
index 6484b8227d27bc..00000000000000
--- a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryService/service-found.https.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-test.js"></script>
-<script src="/bluetooth/resources/bluetooth-fake-devices.js"></script>
-<script>
-'use strict';
-const test_desc = 'Request for service. Should return right service';
-let device;
-
-bluetooth_test(() => getHealthThermometerDevice({
-  filters: [{services: ['health_thermometer']}],
-  optionalServices: ['generic_access']
-})
-    .then(_ => ({device} = _))
-    .then(() => Promise.all([
-      device.gatt.getPrimaryService(generic_access.alias),
-      device.gatt.getPrimaryService(generic_access.name),
-      device.gatt.getPrimaryService(generic_access.uuid)]))
-    .then(services => {
-      services.forEach(service => {
-        assert_equals(service.uuid, generic_access.uuid,
-            'Service UUID should be the same as requested UUID.');
-        assert_true(service.isPrimary,
-            'getPrimaryService should return a primary service.');
-        assert_equals(service.device, device,
-            'Service device should be the same as device.');
-      })
-    }), test_desc);
-</script>
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryService/service-found.https.window.js b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryService/service-found.https.window.js
new file mode 100644
index 00000000000000..fe700d6ef61021
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryService/service-found.https.window.js
@@ -0,0 +1,30 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Request for service. Should return right service';
+
+bluetooth_test(async () => {
+  let {device} = await getHealthThermometerDevice({
+    filters: [{services: ['health_thermometer']}],
+    optionalServices: ['generic_access']
+  });
+  let services = await Promise.all([
+    device.gatt.getPrimaryService(generic_access.alias),
+    device.gatt.getPrimaryService(generic_access.name),
+    device.gatt.getPrimaryService(generic_access.uuid)
+  ]);
+  services.forEach(service => {
+    assert_equals(
+        service.uuid, generic_access.uuid,
+        'Service UUID should be the same as requested UUID.');
+    assert_true(
+        service.isPrimary,
+        'getPrimaryService should return a primary service.');
+    assert_equals(
+        service.device, device, 'Service device should be the same as device.');
+  })
+}, test_desc);
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryService/two-iframes-from-same-origin.https.html b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryService/two-iframes-from-same-origin.https.html
deleted file mode 100644
index 064d8d2e3b4ca2..00000000000000
--- a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryService/two-iframes-from-same-origin.https.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-test.js"></script>
-<script src="/bluetooth/resources/bluetooth-fake-devices.js"></script>
-<script>
-"use strict";
-const test_desc = 'Two iframes in the same origin should be able to access ' +
-    'each other\'s services';
-
-const iframe1 = document.createElement('iframe');
-const iframe2 = document.createElement('iframe');
-
-function add_iframe(iframe) {
-  let promise = new Promise(resolve => iframe.addEventListener('load', resolve));
-  iframe.src = '/bluetooth/resources/health-thermometer-iframe.html';
-  document.body.appendChild(iframe);
-  return promise;
-}
-
-function send_message(iframe, command, arg, assert_func) {
-  let promise = new Promise((resolve, reject) => {
-    window.addEventListener('message', (messageEvent) => {
-      try {
-        assert_func(messageEvent.data);
-      } catch (e) {
-        reject(e);
-      }
-      resolve();
-    }, { once: true });
-  });
-  if (command === 'RequestAndConnect') {
-    arg = {filters: [{services: [arg]}]};
-  }
-  callWithTrustedClick(() => iframe.contentWindow.postMessage({
-      type: command,
-      options: arg,
-    }, '*'));
-  return promise;
-}
-
-bluetooth_test(() => getHealthThermometerDevice()
-    // 1. Add the first iframe.
-    .then(() => add_iframe(iframe1))
-    // 2. Connect with the first iframe, requesting the health thermometer
-    // service.
-    .then(() => send_message(iframe1, 'RequestAndConnect', 'health_thermometer',
-        msg => assert_equals(msg, 'Connected')))
-    // 3. Access the health thermometer service with the first iframe
-    // (successfully).
-    .then(() => send_message(iframe1, 'GetService', 'health_thermometer',
-        msg => assert_equals(msg, 'ServiceReceived')))
-    // 4. Access the generic access service with the first iframe
-    // (unsuccessfully).
-    .then(() => send_message(iframe1, 'GetService', 'generic_access', msg => {
-        let split_msg = msg.split(': ');
-        assert_equals(split_msg[0], 'FAIL');
-        assert_equals(split_msg[1], 'SecurityError');
-    }))
-    // 5. Add the second iframe.
-    .then(() => add_iframe(iframe2))
-    // 6. Connect with the second iframe, requesting the generic access service.
-    .then(() => send_message(iframe2, 'RequestAndConnect', 'generic_access',
-        msg => assert_equals(msg, 'Connected')))
-    // 7. Access the health thermometer service with the second iframe
-    // (successfully).  Both iframes should have access to both services at this
-    // point since they have the same origin.
-    .then(() => send_message(iframe2, 'GetService', 'health_thermometer',
-        msg => assert_equals(msg, 'ServiceReceived')))
-    // 8. Access the generic access service with the second iframe
-    // (unsuccessfully).
-    .then(() => send_message(iframe2, 'GetService', 'generic_access',
-        msg => assert_equals(msg, 'ServiceReceived')))
-    // 9. Access the generic access service with the first iframe
-    // (successfully).
-    .then(() => send_message(iframe1, 'GetService', 'generic_access',
-        msg => assert_equals(msg, 'ServiceReceived'))),
-    test_desc);
-</script>
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryService/two-iframes-from-same-origin.https.window.js b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryService/two-iframes-from-same-origin.https.window.js
new file mode 100644
index 00000000000000..cbb3c19a049337
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryService/two-iframes-from-same-origin.https.window.js
@@ -0,0 +1,90 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Two iframes in the same origin should be able to access ' +
+    'each other\'s services';
+
+const iframe1 = document.createElement('iframe');
+const iframe2 = document.createElement('iframe');
+
+function add_iframe(iframe) {
+  let promise =
+      new Promise(resolve => iframe.addEventListener('load', resolve));
+  iframe.src = '/bluetooth/resources/health-thermometer-iframe.html';
+  document.body.appendChild(iframe);
+  return promise;
+}
+
+function send_message(iframe, command, arg, assert_func) {
+  let promise = new Promise((resolve, reject) => {
+    window.addEventListener('message', (messageEvent) => {
+      try {
+        assert_func(messageEvent.data);
+      } catch (e) {
+        reject(e);
+      }
+      resolve();
+    }, {once: true});
+  });
+  if (command === 'RequestAndConnect') {
+    arg = {filters: [{services: [arg]}]};
+  }
+  callWithTrustedClick(
+      () => iframe.contentWindow.postMessage(
+          {
+            type: command,
+            options: arg,
+          },
+          '*'));
+  return promise;
+}
+
+bluetooth_test(async () => {
+  await getHealthThermometerDevice();
+  // 1. Add the first iframe.
+  await add_iframe(iframe1);
+  // 2. Connect with the first iframe, requesting the health
+  // thermometer service.
+  await send_message(
+      iframe1, 'RequestAndConnect', 'health_thermometer',
+      msg => assert_equals(msg, 'Connected'));
+  // 3. Access the health thermometer service with the first iframe
+  // (successfully).
+  await send_message(
+      iframe1, 'GetService', 'health_thermometer',
+      msg => assert_equals(msg, 'ServiceReceived'));
+  // 4. Access the generic access service with the first iframe
+  // (unsuccessfully).
+  await send_message(iframe1, 'GetService', 'generic_access', msg => {
+    let split_msg = msg.split(': ');
+    assert_equals(split_msg[0], 'FAIL');
+    assert_equals(split_msg[1], 'SecurityError');
+  });
+  // 5. Add the second iframe.
+  await add_iframe(iframe2);
+  // 6. Connect with the second iframe, requesting the generic
+  // access service.
+  await send_message(
+      iframe2, 'RequestAndConnect', 'generic_access',
+      msg => assert_equals(msg, 'Connected'));
+  // 7. Access the health thermometer service with the second iframe
+  // (successfully).  Both iframes should have access to both
+  // services at this point since they have the same origin.
+  await send_message(
+      iframe2, 'GetService', 'health_thermometer',
+      msg => assert_equals(msg, 'ServiceReceived'));
+  // 8. Access the generic access service with the second iframe
+  // (unsuccessfully).
+  await send_message(
+      iframe2, 'GetService', 'generic_access',
+      msg => assert_equals(msg, 'ServiceReceived'));
+  // 9. Access the generic access service with the first iframe
+  // (successfully).
+  await send_message(
+      iframe1, 'GetService', 'generic_access',
+      msg => assert_equals(msg, 'ServiceReceived'));
+}, test_desc);
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services-with-uuid.https.html b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services-with-uuid.https.html
deleted file mode 100644
index 90d776c77ee3cc..00000000000000
--- a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services-with-uuid.https.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-test.js"></script>
-<script src="/bluetooth/resources/bluetooth-fake-devices.js"></script>
-<script>
-'use strict';
-const test_desc = 'Request for services. Does not return blocklisted service.';
-const expected = new DOMException(
-    'Origin is not allowed to access the service. Tip: Add the service ' +
-    'UUID to \'optionalServices\' in requestDevice() options. ' +
-    'https://goo.gl/HxfxSQ', 'SecurityError');
-
-bluetooth_test(() => getConnectedHIDDevice({
-  filters: [{services: ['device_information']}],
-  optionalServices: ['human_interface_device']
-})
-    .then(({device}) => assert_promise_rejects_with_message(
-        device.gatt.getPrimaryServices('human_interface_device'),
-        expected)),
-    test_desc);
-</script>
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services-with-uuid.https.window.js b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services-with-uuid.https.window.js
new file mode 100644
index 00000000000000..5d57e9dc9570c4
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services-with-uuid.https.window.js
@@ -0,0 +1,22 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Request for services. Does not return blocklisted service.';
+const expected = new DOMException(
+    'Origin is not allowed to access the service. Tip: Add the service ' +
+        'UUID to \'optionalServices\' in requestDevice() options. ' +
+        'https://goo.gl/HxfxSQ',
+    'SecurityError');
+
+bluetooth_test(async () => {
+  let {device} = await getConnectedHIDDevice({
+    filters: [{services: ['device_information']}],
+    optionalServices: ['human_interface_device']
+  });
+  assert_promise_rejects_with_message(
+      device.gatt.getPrimaryServices('human_interface_device'), expected)
+}, test_desc);
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services.https.html b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services.https.html
deleted file mode 100644
index df83dfe193fe40..00000000000000
--- a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services.https.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-test.js"></script>
-<script src="/bluetooth/resources/bluetooth-fake-devices.js"></script>
-<script>
-'use strict';
-const test_desc = 'Request for services. Does not return blocklisted service.';
-
-bluetooth_test(() => getHIDDevice({
-  filters: [{services: ['device_information']}],
-  optionalServices: ['generic_access', 'human_interface_device']
-})
-    .then(({device}) => device.gatt.getPrimaryServices())
-    .then(services => {
-      assert_equals(services.length, 2);
-      let uuid_set = new Set(services.map(s => s.uuid));
-
-      assert_equals(uuid_set.size, 2);
-      assert_true(uuid_set.has(BluetoothUUID.getService('generic_access')));
-      assert_true(uuid_set.has(BluetoothUUID.getService('device_information')));
-      assert_false(
-          uuid_set.has(BluetoothUUID.getService('human_interface_device')));
-    }), test_desc);
-</script>
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services.https.window.js b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services.https.window.js
new file mode 100644
index 00000000000000..4dc78bfdd7bf3a
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/blocklisted-services.https.window.js
@@ -0,0 +1,24 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Request for services. Does not return blocklisted service.';
+
+bluetooth_test(async () => {
+  let {device} = await getHIDDevice({
+    filters: [{services: ['device_information']}],
+    optionalServices: ['generic_access', 'human_interface_device']
+  })
+  let services = await device.gatt.getPrimaryServices();
+  assert_equals(services.length, 2);
+  let uuid_set = new Set(services.map(s => s.uuid));
+
+  assert_equals(uuid_set.size, 2);
+  assert_true(uuid_set.has(BluetoothUUID.getService('generic_access')));
+  assert_true(uuid_set.has(BluetoothUUID.getService('device_information')));
+  assert_false(
+      uuid_set.has(BluetoothUUID.getService('human_interface_device')));
+}, test_desc);
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/correct-services.https.html b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/correct-services.https.html
deleted file mode 100644
index 9672d50a2bc229..00000000000000
--- a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/correct-services.https.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-test.js"></script>
-<script src="/bluetooth/resources/bluetooth-fake-devices.js"></script>
-<script>
-'use strict';
-const test_desc = 'Find correct services with UUID.';
-let device, fake_peripheral;
-
-bluetooth_test(() => getConnectedHealthThermometerDevice({
-  filters: [{services: ['health_thermometer']}]
-})
-    .then(_ => ({device, fake_peripheral} = _))
-    .then(() => fake_peripheral.addFakeService({uuid: 'health_thermometer'}))
-    .then(fake_service => Promise.all([
-      fake_service.addFakeCharacteristic({
-        uuid: 'temperature_measurement', properties: ['indicate']}),
-      fake_service.addFakeCharacteristic({
-        uuid: 'temperature_measurement', properties: ['indicate']})
-    ]))
-    .then(() => fake_peripheral.setNextGATTDiscoveryResponse({code:HCI_SUCCESS}))
-    .then(() => device.gatt.getPrimaryServices('health_thermometer'))
-    .then(services => Promise.all([
-      services[0].getCharacteristics(),
-      services[1].getCharacteristics()]))
-    .then(([characteristics1, characteristics2]) => {
-      if (characteristics1.length === 2)
-        assert_equals(characteristics2.length, 3);
-      else if (characteristics2.length === 2)
-        assert_equals(characteristics1.length, 3);
-      else
-        assert_unreached('Invalid lengths.');
-    }), test_desc);
-</script>
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/correct-services.https.window.js b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/correct-services.https.window.js
new file mode 100644
index 00000000000000..4debf5dea4ed3c
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/correct-services.https.window.js
@@ -0,0 +1,32 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Find correct services with UUID.';
+let device, fake_peripheral;
+
+bluetooth_test(async () => {
+  let {device, fake_peripheral} = await getConnectedHealthThermometerDevice(
+      {filters: [{services: ['health_thermometer']}]});
+  let fake_service =
+      await fake_peripheral.addFakeService({uuid: 'health_thermometer'});
+  await Promise.all([
+    fake_service.addFakeCharacteristic(
+        {uuid: 'temperature_measurement', properties: ['indicate']}),
+    fake_service.addFakeCharacteristic(
+        {uuid: 'temperature_measurement', properties: ['indicate']})
+  ]);
+  await fake_peripheral.setNextGATTDiscoveryResponse({code: HCI_SUCCESS});
+  let services = await device.gatt.getPrimaryServices('health_thermometer');
+  let [characteristics1, characteristics2] = await Promise.all(
+      [services[0].getCharacteristics(), services[1].getCharacteristics()]);
+  if (characteristics1.length === 2)
+    assert_equals(characteristics2.length, 3);
+  else if (characteristics2.length === 2)
+    assert_equals(characteristics1.length, 3);
+  else
+    assert_unreached('Invalid lengths.');
+}, test_desc);
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/services-found-with-uuid.https.html b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/services-found-with-uuid.https.html
deleted file mode 100644
index 92ca4ea6a6e583..00000000000000
--- a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/services-found-with-uuid.https.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-test.js"></script>
-<script src="/bluetooth/resources/bluetooth-fake-devices.js"></script>
-<script>
-'use strict';
-const test_desc = 'Request for services. Should return right number of ' +
-    'services.';
-
-bluetooth_test(() => getTwoHealthThermometerServicesDevice({
-  filters: [{services: ['health_thermometer']}]
-})
-    .then(({device}) => Promise.all([
-      device.gatt.getPrimaryServices(health_thermometer.alias),
-      device.gatt.getPrimaryServices(health_thermometer.name),
-      device.gatt.getPrimaryServices(health_thermometer.uuid)]))
-    .then(services_arrays => services_arrays.forEach(services => {
-        assert_equals(services.length, 2);
-        services.forEach(service => {
-          assert_equals(service.uuid,
-              BluetoothUUID.getService('health_thermometer'));
-          assert_true(service.isPrimary);
-        });
-    })), test_desc);
-</script>
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/services-found-with-uuid.https.window.js b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/services-found-with-uuid.https.window.js
new file mode 100644
index 00000000000000..b18bda8247a327
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/services-found-with-uuid.https.window.js
@@ -0,0 +1,27 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Request for services. Should return right number of ' +
+    'services.';
+
+bluetooth_test(async () => {
+  let {device} = await getTwoHealthThermometerServicesDevice(
+      {filters: [{services: ['health_thermometer']}]});
+  let services_arrays = await Promise.all([
+    device.gatt.getPrimaryServices(health_thermometer.alias),
+    device.gatt.getPrimaryServices(health_thermometer.name),
+    device.gatt.getPrimaryServices(health_thermometer.uuid)
+  ]);
+  services_arrays.forEach(services => {
+    assert_equals(services.length, 2);
+    services.forEach(service => {
+      assert_equals(
+          service.uuid, BluetoothUUID.getService('health_thermometer'));
+      assert_true(service.isPrimary);
+    });
+  })
+}, test_desc);
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/services-found.https.html b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/services-found.https.html
deleted file mode 100644
index d39c69fc7f1fd1..00000000000000
--- a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/services-found.https.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-test.js"></script>
-<script src="/bluetooth/resources/bluetooth-fake-devices.js"></script>
-<script>
-'use strict';
-const test_desc = 'Find all services in a device.';
-
-bluetooth_test(() => getTwoHealthThermometerServicesDevice({
-  filters: [{services: ['health_thermometer']}],
-  optionalServices: ['generic_access']
-})
-    .then(({device}) => device.gatt.getPrimaryServices())
-    .then(services => {
-      // Expect three service instances.
-      assert_equals(services.length, 3);
-      services.forEach(s => assert_true(s.isPrimary));
-
-      let uuid_set = new Set(services.map(s => s.uuid));
-      // Two of the expected services are 'health_thermometer', so
-      // only 2 unique UUIDs.
-      assert_equals(uuid_set.size, 2);
-
-      assert_true(uuid_set.has(BluetoothUUID.getService('generic_access')));
-      assert_true(uuid_set.has(BluetoothUUID.getService('health_thermometer')));
-    }), test_desc);
-</script>
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/services-found.https.window.js b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/services-found.https.window.js
new file mode 100644
index 00000000000000..8098e8e8bebb95
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/services-found.https.window.js
@@ -0,0 +1,27 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Find all services in a device.';
+
+bluetooth_test(async () => {
+  let {device} = await getTwoHealthThermometerServicesDevice({
+    filters: [{services: ['health_thermometer']}],
+    optionalServices: ['generic_access']
+  });
+  let services = await device.gatt.getPrimaryServices();
+  // Expect three service instances.
+  assert_equals(services.length, 3);
+  services.forEach(s => assert_true(s.isPrimary));
+
+  let uuid_set = new Set(services.map(s => s.uuid));
+  // Two of the expected services are 'health_thermometer', so
+  // only 2 unique UUIDs.
+  assert_equals(uuid_set.size, 2);
+
+  assert_true(uuid_set.has(BluetoothUUID.getService('generic_access')));
+  assert_true(uuid_set.has(BluetoothUUID.getService('health_thermometer')));
+}, test_desc);
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/services-not-found.https.html b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/services-not-found.https.html
deleted file mode 100644
index 4c78ad19d0ea8a..00000000000000
--- a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/services-not-found.https.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/bluetooth/resources/bluetooth-test.js"></script>
-<script src="/bluetooth/resources/bluetooth-fake-devices.js"></script>
-<script>
-'use strict';
-const test_desc = 'Request for services in a device with no services. Reject ' +
-    'with NotFoundError.';
-const expected = new DOMException('No Services found in device.',
-    'NotFoundError');
-
-bluetooth_test(() => getEmptyHealthThermometerDevice()
-    .then(({device}) => assert_promise_rejects_with_message(
-        device.gatt.getPrimaryServices(),
-        expected)),
-    test_desc);
-</script>
diff --git a/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/services-not-found.https.window.js b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/services-not-found.https.window.js
new file mode 100644
index 00000000000000..6dda95ed430704
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/bluetooth/server/getPrimaryServices/services-not-found.https.window.js
@@ -0,0 +1,17 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Request for services in a device with no services. Reject ' +
+    'with NotFoundError.';
+const expected =
+    new DOMException('No Services found in device.', 'NotFoundError');
+
+bluetooth_test(async () => {
+  let {device} = await getEmptyHealthThermometerDevice();
+  return assert_promise_rejects_with_message(
+      device.gatt.getPrimaryServices(), expected);
+}, test_desc);
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/grid/grid-item-fragmentation-037.html b/third_party/blink/web_tests/external/wpt/css/css-break/grid/grid-item-fragmentation-037.html
new file mode 100644
index 00000000000000..d5d97394c574b0
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-break/grid/grid-item-fragmentation-037.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#pagination">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<title>Tests that break-before:avoid on a grid-item is respected.</title>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="position: relative; width: 100px; height: 100px; columns: 2; column-gap: 0; column-fill: auto; background: red;">
+  <div style="display: grid;">
+    <div style="background: green; height: 50px;"></div>
+    <div style="background: green; height: 40px;"></div>
+    <div style="background: green; break-before: avoid; line-height: 0;">
+      <span style="display: inline-block; width: 100%; height: 60px;"></span>
+    </div>
+  </div>
+  <div style="background: green; position: absolute; width: 50px; height: 50px; bottom: 0; left: 0;"></div>
+</div>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-break/grid/grid-item-fragmentation-038.html b/third_party/blink/web_tests/external/wpt/css/css-break/grid/grid-item-fragmentation-038.html
new file mode 100644
index 00000000000000..40008b5dcd6450
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-break/grid/grid-item-fragmentation-038.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#pagination">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<title>Tests that break-before:avoid on a grid-item is respected.</title>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="position: relative; width: 100px; height: 100px; columns: 4; column-gap: 0; column-fill: auto; background: red;">
+  <div style="display: grid;">
+    <div style="background: green; height: 150px;"></div>
+    <div style="background: green; height: 110px;"></div>
+    <div style="background: green; break-before: avoid; line-height: 0;">
+      <span style="display: inline-block; width: 100%; height: 60px;"></span>
+    </div>
+  </div>
+  <div style="background: green; position: absolute; width: 50px; height: 40px; bottom: 0; right: 0;"></div>
+</div>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-variables/variable-definition-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-variables/variable-definition-expected.txt
index 38da73a2dbf4d2..3cccbb476ae737 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-variables/variable-definition-expected.txt
+++ b/third_party/blink/web_tests/external/wpt/css/css-variables/variable-definition-expected.txt
@@ -1,10 +1,10 @@
 This is a testharness.js-based test.
-Found 73 tests; 44 PASS, 29 FAIL, 0 TIMEOUT, 0 NOTRUN.
+Found 73 tests; 47 PASS, 26 FAIL, 0 TIMEOUT, 0 NOTRUN.
 PASS no variable
 PASS variable
 PASS single char variable
 PASS single char '-' variable
-FAIL no char variable assert_equals: Expected Value should match actual value expected "" but got "value"
+PASS no char variable
 FAIL white space value (single space) assert_equals: Expected Value should match actual value expected "" but got " "
 FAIL white space value (double space) assert_equals: Expected Value should match actual value expected "" but got " "
 PASS overwrite
@@ -27,7 +27,7 @@ PASS no variable (Computed Style)
 PASS variable (Computed Style)
 PASS single char variable (Computed Style)
 PASS single char '-' variable (Computed Style)
-FAIL no char variable (Computed Style) assert_equals: Expected Value should match actual value expected "" but got "value"
+PASS no char variable (Computed Style)
 FAIL white space value (single space) (Computed Style) assert_equals: Expected Value should match actual value expected "" but got " "
 FAIL white space value (double space) (Computed Style) assert_equals: Expected Value should match actual value expected "" but got " "
 PASS overwrite (Computed Style)
@@ -50,7 +50,7 @@ PASS no variable (Cascading)
 PASS variable (Cascading)
 PASS single char variable (Cascading)
 PASS single char '-' variable (Cascading)
-FAIL no char variable (Cascading) assert_equals: Expected Value should match actual value expected "" but got "value"
+PASS no char variable (Cascading)
 FAIL white space value (single space) (Cascading) assert_equals: Expected Value should match actual value expected "" but got " "
 FAIL white space value (double space) (Cascading) assert_equals: Expected Value should match actual value expected "" but got " "
 PASS overwrite (Cascading)
diff --git a/third_party/blink/web_tests/external/wpt/css/css-variables/variable-empty-name-reserved-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-variables/variable-empty-name-reserved-expected.txt
deleted file mode 100644
index 687535526d578b..00000000000000
--- a/third_party/blink/web_tests/external/wpt/css/css-variables/variable-empty-name-reserved-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL -- is a reserved property name assert_false: -- is a reserved property name expected false got true
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/external/wpt/resources/chromium/nfc-mock.js b/third_party/blink/web_tests/external/wpt/resources/chromium/nfc-mock.js
index 6a0437a7975420..a7ce560a9f9a7c 100644
--- a/third_party/blink/web_tests/external/wpt/resources/chromium/nfc-mock.js
+++ b/third_party/blink/web_tests/external/wpt/resources/chromium/nfc-mock.js
@@ -139,8 +139,10 @@ self.WebNFCTest = (() => {
       this.hw_status_ = NFCHWStatus.ENABLED;
       this.pushed_message_ = null;
       this.pending_write_options_ = null;
-      this.pending_promise_func_ = null;
+      this.pending_push_promise_func_ = null;
       this.push_completed_ = true;
+      this.pending_make_read_only_promise_func_ = null;
+      this.make_read_only_completed_ = true;
       this.client_ = null;
       this.watchers_ = [];
       this.reading_messages_ = [];
@@ -152,11 +154,11 @@ self.WebNFCTest = (() => {
 
     // NFC delegate functions.
     async push(message, options) {
-      let error = this.getHWError();
+      const error = this.getHWError();
       if (error)
         return error;
       // Cancels previous pending push operation.
-      if (this.pending_promise_func_) {
+      if (this.pending_push_promise_func_) {
         this.cancelPendingPushOperation();
       }
 
@@ -165,7 +167,7 @@ self.WebNFCTest = (() => {
       return new Promise(resolve => {
         if (this.operations_suspended_ || !this.push_completed_) {
           // Leaves the push pending.
-          this.pending_promise_func_ = resolve;
+          this.pending_push_promise_func_ = resolve;
         } else if (this.is_formatted_tag_ && !options.overwrite) {
           // Resolves with NotAllowedError if there are NDEF records on the device
           // and overwrite is false.
@@ -184,13 +186,40 @@ self.WebNFCTest = (() => {
       return createNDEFError(null);
     }
 
+    async makeReadOnly(options) {
+      const error = this.getHWError();
+      if (error)
+        return error;
+      // Cancels previous pending makeReadOnly operation.
+      if (this.pending_make_read_only_promise_func_) {
+        this.cancelPendingMakeReadOnlyOperation();
+      }
+
+      if (this.operations_suspended_ || !this.make_read_only_completed_) {
+        // Leaves the makeReadOnly pending.
+        return new Promise(resolve => {
+          this.pending_make_read_only_promise_func_ = resolve;
+        });
+      } else if (this.data_transfer_failed_) {
+        // Resolves with NetworkError if data transfer fails.
+        return createNDEFError(NDEFErrorType.IO_ERROR);
+      } else {
+        return createNDEFError(null);
+      }
+    }
+
+    async cancelMakeReadOnly() {
+      this.cancelPendingMakeReadOnlyOperation();
+      return createNDEFError(null);
+    }
+
     setClient(client) {
       this.client_ = client;
     }
 
     async watch(id) {
       assert_true(id > 0);
-      let error = this.getHWError();
+      const error = this.getHWError();
       if (error) {
         return error;
       }
@@ -245,22 +274,27 @@ self.WebNFCTest = (() => {
       this.push_completed_ = result;
     }
 
+    setPendingMakeReadOnlyCompleted(result) {
+      this.make_read_only_completed_ = result;
+    }
+
     reset() {
       this.hw_status_ = NFCHWStatus.ENABLED;
       this.watchers_ = [];
       this.reading_messages_ = [];
       this.operations_suspended_ = false;
       this.cancelPendingPushOperation();
+      this.cancelPendingMakeReadOnlyOperation();
       this.is_formatted_tag_ = false;
       this.data_transfer_failed_ = false;
       this.should_close_pipe_on_request_ = false;
     }
 
     cancelPendingPushOperation() {
-      if (this.pending_promise_func_) {
-        this.pending_promise_func_(
+      if (this.pending_push_promise_func_) {
+        this.pending_push_promise_func_(
             createNDEFError(NDEFErrorType.OPERATION_CANCELLED));
-        this.pending_promise_func_ = null;
+        this.pending_push_promise_func_ = null;
       }
 
       this.pushed_message_ = null;
@@ -268,6 +302,16 @@ self.WebNFCTest = (() => {
       this.push_completed_ = true;
     }
 
+    cancelPendingMakeReadOnlyOperation() {
+      if (this.pending_make_read_only_promise_func_) {
+        this.pending_make_read_only_promise_func_(
+            createNDEFError(NDEFErrorType.OPERATION_CANCELLED));
+        this.pending_make_read_only_promise_func_ = null;
+      }
+
+      this.make_read_only_completed_ = true;
+    }
+
     // Sets message that is used to deliver NFC reading updates.
     setReadingMessage(message) {
       this.reading_messages_.push(message);
@@ -303,9 +347,15 @@ self.WebNFCTest = (() => {
         }
       }
       // Resumes pending push operation.
-      if (this.pending_promise_func_ && this.push_completed_) {
-        this.pending_promise_func_(createNDEFError(null));
-        this.pending_promise_func_ = null;
+      if (this.pending_push_promise_func_ && this.push_completed_) {
+        this.pending_push_promise_func_(createNDEFError(null));
+        this.pending_push_promise_func_ = null;
+      }
+      // Resumes pending makeReadOnly operation.
+      if (this.pending_make_read_only_promise_func_ &&
+          this.make_read_only_completed_) {
+        this.pending_make_read_only_promise_func_(createNDEFError(null));
+        this.pending_make_read_only_promise_func_ = null;
       }
     }
 
@@ -319,10 +369,16 @@ self.WebNFCTest = (() => {
         });
       }
       // Reject the pending push with NotSupportedError.
-      if (this.pending_promise_func_) {
-        this.pending_promise_func_(
+      if (this.pending_push_promise_func_) {
+        this.pending_push_promise_func_(
+            createNDEFError(NDEFErrorType.NOT_SUPPORTED));
+        this.pending_push_promise_func_ = null;
+      }
+      // Reject the pending makeReadOnly with NotSupportedError.
+      if (this.pending_make_read_only_promise_func_) {
+        this.pending_make_read_only_promise_func_(
             createNDEFError(NDEFErrorType.NOT_SUPPORTED));
-        this.pending_promise_func_ = null;
+        this.pending_make_read_only_promise_func_ = null;
       }
     }
 
diff --git a/third_party/blink/web_tests/external/wpt/web-nfc/NDEFReader-make-read-only-document-hidden-manual.https.html b/third_party/blink/web_tests/external/wpt/web-nfc/NDEFReader-make-read-only-document-hidden-manual.https.html
new file mode 100644
index 00000000000000..25cefcbca725ce
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/web-nfc/NDEFReader-make-read-only-document-hidden-manual.https.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<meta name="timeout" content="long">
+<title>NDEFReader.makeReadOnly respect page visibility changes</title>
+<link rel="help" href="https://w3c.github.io/web-nfc/#visible-document">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+
+promise_test(async t => {
+  const ndef = new NDEFReader();
+  const p1 = ndef.makeReadOnly();
+
+  return await new Promise((resolve, reject) => {
+    p1.then(() => {
+      assert_false(document.hidden);
+      resolve();
+    }).catch(e => {
+      reject();
+    });
+  });
+}, "Test NDEFReader.makeReadOnly operation should be suspended when document is not visible");
+
+</script>
+
+<p>Step1: switch the page to the background, then tap an NFC tag.</p>
+<p>Step2: switch back to the page, then tap the tag again.</p>
diff --git a/third_party/blink/web_tests/external/wpt/web-nfc/NDEFReader_make-read-only.https.window.js b/third_party/blink/web_tests/external/wpt/web-nfc/NDEFReader_make-read-only.https.window.js
new file mode 100644
index 00000000000000..244dd6369fd1bd
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/web-nfc/NDEFReader_make-read-only.https.window.js
@@ -0,0 +1,176 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=resources/nfc-helpers.js
+
+// NDEFReader.makeReadOnly method
+// https://w3c.github.io/web-nfc/#dom-ndefreader-makereadonly
+
+'use strict';
+
+const invalid_signals = ['string', 123, {}, true, Symbol(), () => {}, self];
+
+nfc_test(async t => {
+  await test_driver.set_permission({name: 'nfc'}, 'denied', false);
+  const ndef = new NDEFReader();
+  await promise_rejects_dom(t, 'NotAllowedError', ndef.makeReadOnly());
+}, 'NDEFReader.makeReadOnly should fail if user permission is not granted.');
+
+// We do not provide NFC mock here to simulate that there has no available
+// implementation for NFC Mojo interface.
+nfc_test(async (t, mockNFC) => {
+  mockNFC.simulateClosedPipe();
+  const ndef = new NDEFReader();
+  await promise_rejects_dom(t, 'NotSupportedError', ndef.makeReadOnly());
+}, 'NDEFReader.makeReadOnly should fail if no implementation for NFC Mojo interface is available.');
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  const controller = new AbortController();
+
+  // Make sure makeReadOnly is pending
+  mockNFC.setPendingMakeReadOnlyCompleted(false);
+  const p = ndef.makeReadOnly({signal: controller.signal});
+  const rejected = promise_rejects_dom(t, 'AbortError', p);
+  let callback_called = false;
+  await new Promise(resolve => {
+    t.step_timeout(() => {
+      callback_called = true;
+      controller.abort();
+      resolve();
+    }, 10);
+  });
+  await rejected;
+  assert_true(callback_called, 'timeout should have caused the abort');
+}, 'NDEFReader.makeReadOnly should fail if request is aborted before makeReadOnly happends.');
+
+nfc_test(async t => {
+  const ndef = new NDEFReader();
+  const controller = new AbortController();
+  assert_false(controller.signal.aborted);
+  controller.abort();
+  assert_true(controller.signal.aborted);
+  await promise_rejects_dom(
+      t, 'AbortError', ndef.makeReadOnly({signal: controller.signal}));
+}, 'NDEFReader.makeReadOnly should fail if signal is already aborted.');
+
+nfc_test(async t => {
+  const ndef = new NDEFReader();
+  const promises = [];
+  invalid_signals.forEach(invalid_signal => {
+    promises.push(promise_rejects_js(
+        t, TypeError, ndef.makeReadOnly({signal: invalid_signal})));
+  });
+  await Promise.all(promises);
+}, 'NDEFReader.write should fail if signal is not an AbortSignal.');
+
+nfc_test(async (t, mockNFC) => {
+  const ndef1 = new NDEFReader();
+  const ndef2 = new NDEFReader();
+  const controller = new AbortController();
+  const p1 = ndef1.makeReadOnly({signal: controller.signal});
+
+  // Even though makeReadOnly request is grantable,
+  // this abort should be processed synchronously.
+  controller.abort();
+  await promise_rejects_dom(t, 'AbortError', p1);
+
+  await ndef2.makeReadOnly();
+}, 'Synchronously signaled abort.');
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  mockNFC.setHWStatus(NFCHWStatus.DISABLED);
+  await promise_rejects_dom(t, 'NotReadableError', ndef.makeReadOnly());
+}, 'NDEFReader.makeReadOnly should fail when NFC HW is disabled.');
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  mockNFC.setHWStatus(NFCHWStatus.NOT_SUPPORTED);
+  await promise_rejects_dom(t, 'NotSupportedError', ndef.makeReadOnly());
+}, 'NDEFReader.makeReadOnly should fail when NFC HW is not supported.');
+
+nfc_test(async () => {
+  await new Promise((resolve, reject) => {
+    const iframe = document.createElement('iframe');
+    iframe.srcdoc = `<script>
+                      window.onmessage = async (message) => {
+                        if (message.data === "Ready") {
+                          try {
+                            const ndef = new NDEFReader();
+                            await ndef.makeReadOnly();
+                            parent.postMessage("Failure", "*");
+                          } catch (error) {
+                            if (error.name == "InvalidStateError") {
+                              parent.postMessage("Success", "*");
+                            } else {
+                              parent.postMessage("Failure", "*");
+                            }
+                          }
+                        }
+                      };
+                    </script>`;
+    iframe.onload = () => iframe.contentWindow.postMessage('Ready', '*');
+    document.body.appendChild(iframe);
+    window.onmessage = message => {
+      if (message.data == 'Success') {
+        resolve();
+      } else if (message.data == 'Failure') {
+        reject();
+      }
+    }
+  });
+}, 'Test that WebNFC API is not accessible from iframe context.');
+
+nfc_test(async () => {
+  const ndef = new NDEFReader();
+  await ndef.makeReadOnly();
+}, 'NDEFReader.makeReadOnly should succeed when NFC HW is enabled');
+
+nfc_test(async (t, mockNFC) => {
+  const ndef1 = new NDEFReader();
+  const ndef2 = new NDEFReader();
+
+  // Make sure the first makeReadOnly will be pending.
+  mockNFC.setPendingMakeReadOnlyCompleted(false);
+
+  const p1 = ndef1.makeReadOnly();
+  const p2 = ndef2.makeReadOnly();
+
+  await promise_rejects_dom(t, 'AbortError', p1);
+  await p2;
+}, 'NDEFReader.makeReadOnly should replace all previously configured makeReadOnly operations.');
+
+nfc_test(async () => {
+  const ndef = new NDEFReader();
+
+  const controller1 = new AbortController();
+  await ndef.makeReadOnly({signal: controller1.signal});
+
+  const controller2 = new AbortController();
+  const promise = ndef.makeReadOnly({signal: controller2.signal});
+  controller1.abort();
+  await promise;
+}, 'NDEFReader.makeReadOnly signals are independent.');
+
+nfc_test(async (t, mockNFC) => {
+  // Make sure the makeReadOnly will be pending in the mock.
+  mockNFC.setPendingMakeReadOnlyCompleted(false);
+
+  const ndef1 = new NDEFReader();
+  const promise = ndef1.makeReadOnly();
+
+  // Just to make sure the makeReadOnly() request has already reached to the
+  // mock.
+  const ndef2 = new NDEFReader();
+  await ndef2.scan();
+
+  mockNFC.simulateNonNDEFTagDiscovered();
+  await promise_rejects_dom(t, 'NotSupportedError', promise);
+}, 'NDEFReader.makeReadOnly should fail when the NFC device coming up does not expose \
+NDEF technology.');
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  mockNFC.simulateDataTransferFails();
+  await promise_rejects_dom(t, 'NetworkError', ndef.makeReadOnly());
+}, 'NDEFReader.makeReadOnly should fail with NetworkError when NFC data transfer fails.');
diff --git a/third_party/blink/web_tests/external/wpt/web-nfc/NDEFReader_scan.https.html b/third_party/blink/web_tests/external/wpt/web-nfc/NDEFReader_scan.https.html
index 281f3db5b7bd56..cb35aba20faa63 100644
--- a/third_party/blink/web_tests/external/wpt/web-nfc/NDEFReader_scan.https.html
+++ b/third_party/blink/web_tests/external/wpt/web-nfc/NDEFReader_scan.https.html
@@ -123,6 +123,18 @@
 }, "Test that NDEFReader.scan rejects if NDEFScanOptions.signal aborts right after \
 the scan invocation.");
 
+nfc_test(async () => {
+  const ndef = new NDEFReader();
+
+  const controller1 = new AbortController();
+  await ndef.scan({signal: controller1.signal});
+
+  controller1.abort();
+
+  const controller2 = new AbortController();
+  await ndef.scan({signal: controller2.signal});
+}, "Test that NDEFReader.scan signals are independant.");
+
 nfc_test(async (t, mockNFC) => {
   const ndef = new NDEFReader();
   const controller = new AbortController();
diff --git a/third_party/blink/web_tests/external/wpt/web-nfc/NDEFReader_write.https.html b/third_party/blink/web_tests/external/wpt/web-nfc/NDEFReader_write.https.html
index 35e6dd37299485..8f6cd81de5547c 100644
--- a/third_party/blink/web_tests/external/wpt/web-nfc/NDEFReader_write.https.html
+++ b/third_party/blink/web_tests/external/wpt/web-nfc/NDEFReader_write.https.html
@@ -411,6 +411,18 @@
   });
 }, "NDEFReader.write should replace all previously configured write operations.");
 
+nfc_test(async () => {
+  const ndef = new NDEFReader();
+
+  const controller1 = new AbortController();
+  await ndef.write(test_text_data, {signal: controller1.signal});
+
+  const controller2 = new AbortController();
+  const promise = ndef.write(test_text_data, {signal: controller2.signal});
+  controller1.abort();
+  await promise;
+}, 'NDEFReader.write signals are independent.');
+
 nfc_test(async (t, mockNFC) => {
   const ndef = new NDEFReader();
   await ndef.write({ records: [{ recordType: "mime", data: test_buffer_data }] });
diff --git a/third_party/blink/web_tests/external/wpt/web-nfc/README.md b/third_party/blink/web_tests/external/wpt/web-nfc/README.md
index 15c6534a7be35c..b51018d68f1fbc 100644
--- a/third_party/blink/web_tests/external/wpt/web-nfc/README.md
+++ b/third_party/blink/web_tests/external/wpt/web-nfc/README.md
@@ -14,6 +14,7 @@ The `WebNFCTest` interface is defined as:
     setHWStatus(number status); // Sets the hardware status.
     setReadingMessage(NDEFMessageInit message); // Sets message that is used to deliver NFC reading updates.
     setPendingPushCompleted(boolean result); // Sets if the pending push is completed.
+    setPendingMakeReadOnlyCompleted(boolean result); // Sets if the pending makeReadOnly is completed.
     pushedMessage(); // Gets the pushed `NDEFMessageSource`.
     writeOptions(); // Gets the pushed `NDEFWriteOptions`.
     simulateNonNDEFTagDiscovered(); // Simulates that the NFC device discovered does not expose NDEF technology.
diff --git a/third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt b/third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt
index 177658f17eb89f..03b5a03b4ad25a 100644
--- a/third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt
+++ b/third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt
@@ -5724,6 +5724,7 @@ interface NDEFReader : EventTarget
     getter onreading
     getter onreadingerror
     method constructor
+    method makeReadOnly
     method scan
     method write
     setter onreading
diff --git a/tools/accessibility/inspect/README.md b/tools/accessibility/inspect/README.md
index bdfd710ee83efc..3674d5955b986c 100644
--- a/tools/accessibility/inspect/README.md
+++ b/tools/accessibility/inspect/README.md
@@ -96,6 +96,19 @@ For example, `@ALLOW:AXARIALive` will add AXARIALive attributes to the
 result tree. Also see example-tree-filters.txt in tools/accessibility/inspect
 for more examples.
 
+### API option for Windows
+
+On windows, we support two accessibility APIS, IAccessible2 and UI-AUTOMATION.
+By default, IA2 is selected.
+
+To dump a tree with IAccessible2:
+
+`--api=ia2`
+
+To dump a tree with UI-AUTOMATION:
+
+`--api=uia`
+
 ### Other options
 
 `--help` for help
diff --git a/tools/android/build_speed/benchmark.py b/tools/android/build_speed/benchmark.py
index 8f8a03d007f5a1..cf9c5441db91c2 100755
--- a/tools/android/build_speed/benchmark.py
+++ b/tools/android/build_speed/benchmark.py
@@ -413,6 +413,8 @@ def main():
         '--use-emulator',
         action='store_true',
         help='Use an emulator to include install/launch timing.')
+    parser.add_argument('--target',
+                        help='Specify this to override the default target.')
     parser.add_argument('-v',
                         '--verbose',
                         action='count',
@@ -439,7 +441,10 @@ def main():
         devil_chromium.Initialize()
         gn_args += _EMULATOR_GN_ARGS
 
-    target = _TARGETS['bundle' if args.bundle else 'apk']
+    if args.target:
+        target = args.target
+    else:
+        target = _TARGETS['bundle' if args.bundle else 'apk']
     results = run_benchmarks(args.benchmark, gn_args, out_dir, target,
                              args.repeat, args.no_server, args.use_emulator)
     server_str = f'{"not " if args.no_server else ""}using build server'
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
index 2b7c3bd75e2fcb..f3a209264743ce 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -499,6 +499,10 @@
     "includes": [3220],
     "structures": [3240],
   },
+  "<(SHARED_INTERMEDIATE_DIR)/ash/webui/system_extensions_internals_ui/ash_system_extensions_internals_resources.grd": {
+    "META": {"sizes": {"includes": [10],}},
+    "includes": [3260],
+  },
   "chromeos/resources/chromeos_resources.grd": {
     "includes": [3280],
   },
diff --git a/tools/mb/PRESUBMIT.py b/tools/mb/PRESUBMIT.py
index 76ae5243551f27..6d378b30c7116e 100644
--- a/tools/mb/PRESUBMIT.py
+++ b/tools/mb/PRESUBMIT.py
@@ -53,7 +53,7 @@ def _CommonChecks(input_api, output_api):
       version='2.7',
       # pylint complains about Checkfreeze not being defined, its probably
       # finding a different PRESUBMIT.py
-      files_to_skip='PRESUBMIT_test.py',
+      files_to_skip=['PRESUBMIT_test.py'],
       # Disabling certain python3-specific warnings until the conversion
       # is complete.
       disabled_warnings=[
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index 8e35c791bee0be..27756d4c8bd489 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -26960,7 +26960,6 @@ Called by update_document_policy_enum.py.-->
   <int value="338" label="NTPContentSuggestionsEnabled"/>
   <int value="339" label="WebRtcUdpPortRange"/>
   <int value="340" label="EnableSha1ForLocalAnchors"/>
-  <int value="341" label="WebRestrictionsAuthority"/>
   <int value="342" label="ComponentUpdatesEnabled"/>
   <int value="343" label="ExternalStorageReadOnly"/>
   <int value="344" label="RemoteAccessHostAllowUiAccessForRemoteAssistance"/>
@@ -31438,6 +31437,25 @@ Called by update_extension_permission.py.-->
   <int value="1212" label="Pairing Failed: Error UI Settings Button Pressed"/>
 </enum>
 
+<enum name="FastPairPairingMethod">
+  <int value="0" label="Fast Pair Pairing"/>
+  <int value="1" label="System UI Pairing"/>
+</enum>
+
+<enum name="FastPairRetroactiveEngagementFlowEvent">
+  <int value="1" label="Associate Account UI Shown"/>
+  <int value="11" label="Associate Account Dismissed By User"/>
+  <int value="12" label="Associate Account Dismissed By OS"/>
+  <int value="13" label="Associate Account: Learn More Button Pressed"/>
+  <int value="14" label="Associate Account: Save Button Pressed"/>
+  <int value="131"
+      label="Associate Account: Save Button Pressed After Learn More Pressed"/>
+  <int value="132"
+      label="Associate Account Dismissed By User After Learn More Pressed"/>
+  <int value="133"
+      label="Associate Account Dismissed By OS After Learn More Pressed"/>
+</enum>
+
 <enum name="FaultTolerantHeap">
   <int value="0" label="FTH_OFF">FTH is completely off.</int>
   <int value="1" label="FTH_HKLM">FTH is enabled in HKLM.</int>
@@ -37663,6 +37681,7 @@ Called by update_permissions_policy_enum.py.-->
   <int value="4" label="Too Slow"/>
   <int value="5" label="Too Fast"/>
   <int value="6" label="Immobile"/>
+  <int value="7" label="No Match"/>
 </enum>
 
 <enum name="FingerprintSensorMode">
@@ -45870,6 +45889,17 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
       label="App state was UIApplicationStateBackground during XTE."/>
 </enum>
 
+<enum name="IOSColdStartType">
+  <int value="0" label="Cold start"/>
+  <int value="1" label="Cold start with FRE"/>
+  <int value="2" label="Cold start after device restore"/>
+  <int value="3" label="Cold start after Chrome upgrade"/>
+  <int value="4" label="Cold start after device restore and Chrome upgrade"/>
+  <int value="5" label="Cold start with unknown device restore"/>
+  <int value="6"
+      label="Cold start with unknown device restore and Chrome upgrade"/>
+</enum>
+
 <enum name="IOSContentSizeCategory">
   <int value="0" label="Unspecified"/>
   <int value="1" label="ExtraSmall"/>
@@ -45925,6 +45955,13 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="3" label="All Tabs"/>
 </enum>
 
+<enum name="IOSDeviceRestoreSignedinState">
+  <int value="0" label="User not signed in before iOS device restore"/>
+  <int value="1"
+      label="User signed in before iOS device restore, and signed out after"/>
+  <int value="2" label="User signed in before and after iOS device restore"/>
+</enum>
+
 <enum name="IOSDeviceThermalState">
   <int value="0" label="0-Unknown"/>
   <int value="1" label="1-Nominal"/>
@@ -46527,6 +46564,14 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="11" label="YCbCr with other subsampling"/>
 </enum>
 
+<enum name="JsonParserExtension">
+  <int value="0" label="C style comment (/**/)"/>
+  <int value="1" label="C++ style comment (//)"/>
+  <int value="2" label="UTF-8 \xNN string escape"/>
+  <int value="3" label="Vertical tab string escape (\\v)"/>
+  <int value="4" label="Unescaped ASCII control character [0x00,0x1F]"/>
+</enum>
+
 <enum name="JumplisticonsDeleteCategory">
   <int value="0" label="Success"/>
   <int value="1" label="Fail as directory name length exceeds MAX_PATH"/>
@@ -51377,6 +51422,7 @@ from previous Chrome versions.
       label="PrefetchNotificationSchedulingIntegration:enabled"/>
   <int value="-738957187" label="OmniboxUIExperimentSwapTitleAndUrl:disabled"/>
   <int value="-737740161" label="SupportForAddPasswordsInSettings:enabled"/>
+  <int value="-735827773" label="PageInfoHistoryDesktop:enabled"/>
   <int value="-735084806" label="NewTabLoadingAnimation:enabled"/>
   <int value="-734301625"
       label="AutofillImportNonFocusableCreditCardForms:disabled"/>
@@ -54768,6 +54814,7 @@ from previous Chrome versions.
   <int value="1811266774" label="WebUITabStripNewTabButtonInTabStrip:disabled"/>
   <int value="1811744551" label="InterestFeedV2Hearts:enabled"/>
   <int value="1812368073" label="enable-new-app-list-mixer"/>
+  <int value="1813205714" label="PageInfoHistoryDesktop:disabled"/>
   <int value="1813370929"
       label="MigrateDefaultChromeAppToWebAppsNonGSuite:enabled"/>
   <int value="1813741175" label="ZeroSuggestPrefetching:enabled"/>
@@ -57237,6 +57284,18 @@ Called by update_use_counter_css.py.-->
   <int value="2" label="Unsafe"/>
 </enum>
 
+<enum name="MediaFoundationRendererErrorReason">
+  <int value="0" label="Unknown"/>
+  <int value="1" label="CdmProxyReceivedInInvalidState"/>
+  <int value="2" label="FailedToSetSourceOnMediaEngine"/>
+  <int value="3" label="kFailedToSetCurrentTime"/>
+  <int value="4" label="kFailedToPlay"/>
+  <int value="5" label="kOnPlaybackError"/>
+  <int value="6" label="kOnDCompSurfaceReceivedError"/>
+  <int value="7" label="kOnDCompSurfaceHandleSetError"/>
+  <int value="8" label="kOnConnectionError"/>
+</enum>
+
 <enum name="MediaGalleriesUsageType">
   <int value="0" label="Gallery added from permission dialog"/>
   <int value="1" label="Gallery permission added from permission dialog"/>
@@ -79901,7 +79960,9 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
     User turned off sync from the Desktop Identity Consistency internals UI.
   </int>
   <int value="9" label="Account removed from device">
-    Signout forced because account was removed from device.
+    Signout forced because account was removed from device. With M98, on iOS,
+    this value is split with &quot;Signed out forced by iOS device
+    restore&quot;.
   </int>
   <int value="10" label="Signout forced on profile load">
     Signout forced when profile is loaded as browser sign-in is no longer
@@ -79922,6 +79983,10 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
     Signout was forced because account ID migration from email to Gaia ID was
     forced.
   </int>
+  <int value="15" label="Signed out forced by iOS device restore">
+    Sign-out forced because the account was removed from the device after a
+    device restore. iOS only.
+  </int>
 </enum>
 
 <enum name="SigninSource">
@@ -82636,7 +82701,11 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
              resource"/>
   <int value="6"
       label="Abandoned because no content was visible at the beginning of
-             startup"/>
+             startup. Hint: often caused by showing the profile picker
+             instead of immediately opening a browser window on startup"/>
+  <int value="7"
+      label="Abandoned because the content was already painted before
+             profiling started"/>
 </enum>
 
 <enum name="StartupTabPreloaderLoadDecisionCause">
@@ -92773,6 +92842,9 @@ Called by update_scheduler_enums.py.-->
 </enum>
 
 <enum name="WebViewOpenWebVisibility">
+  <obsolete>
+    Deprecated in December 2021.
+  </obsolete>
   <int value="0" label="OpenWebContentVisible"/>
   <int value="1" label="OpenWebContentNotVisible"/>
 </enum>
diff --git a/tools/metrics/histograms/metadata/android/histograms.xml b/tools/metrics/histograms/metadata/android/histograms.xml
index 390de08d92e2b1..1737514318982a 100644
--- a/tools/metrics/histograms/metadata/android/histograms.xml
+++ b/tools/metrics/histograms/metadata/android/histograms.xml
@@ -2449,7 +2449,7 @@ chromium-metrics-reviews@google.com.
 </histogram>
 
 <histogram name="Android.PackageStats.CacheSize" units="MB"
-    expires_after="2022-04-24">
+    expires_after="2022-06-26">
   <owner>nyquist@chromium.org</owner>
   <owner>yfriedman@chromium.org</owner>
   <summary>
@@ -2458,7 +2458,7 @@ chromium-metrics-reviews@google.com.
 </histogram>
 
 <histogram name="Android.PackageStats.CodeSize" units="MB"
-    expires_after="2021-12-26">
+    expires_after="2022-06-26">
   <owner>nyquist@chromium.org</owner>
   <owner>yfriedman@chromium.org</owner>
   <summary>
@@ -2469,7 +2469,7 @@ chromium-metrics-reviews@google.com.
 </histogram>
 
 <histogram name="Android.PackageStats.DataSize" units="MB"
-    expires_after="2021-12-26">
+    expires_after="2022-06-26">
   <owner>nyquist@chromium.org</owner>
   <owner>yfriedman@chromium.org</owner>
   <summary>
@@ -4740,7 +4740,7 @@ chromium-metrics-reviews@google.com.
     Records the global visibility state of WebView in seconds, updated with
     every Metrics upload. The Visible bucket counts total seconds that any
     WebView was visible (the view itself was visible, and was attached to the
-    view hierarchy of a visible window). The NotVisble bucket counts time since
+    view hierarchy of a visible window). The NotVisible bucket counts time since
     WebView initialization for which no WebView was considered visible, or no
     WebView existed. The total of these two buckets reflects the amount of time
     covered by metrics collection.
@@ -4765,8 +4765,38 @@ chromium-metrics-reviews@google.com.
   </summary>
 </histogram>
 
+<histogram name="Android.WebView.VisibleScheme.Global" enum="WebViewUrlScheme"
+    expires_after="2022-06-01">
+  <owner>mvanouwerkerk@chromium.org</owner>
+  <owner>ntfschr@chromium.org</owner>
+  <owner>src/android_webview/OWNERS</owner>
+  <summary>
+    Records the number of seconds any WebView was visible (the view itself was
+    visible, and was attached to the view hierarchy of a visible window) with a
+    particular URL scheme in the primary main frame. Updated with every Metrics
+    upload.
+  </summary>
+</histogram>
+
+<histogram name="Android.WebView.VisibleScheme.PerWebView"
+    enum="WebViewUrlScheme" expires_after="2022-06-01">
+  <owner>mvanouwerkerk@chromium.org</owner>
+  <owner>ntfschr@chromium.org</owner>
+  <owner>src/android_webview/OWNERS</owner>
+  <summary>
+    Records the number of seconds each WebView was visible (the view itself was
+    visible, and was attached to the view hierarchy of a visible window) with a
+    particular URL scheme in the primary main frame. Updated with every Metrics
+    upload.
+  </summary>
+</histogram>
+
 <histogram name="Android.WebView.WebViewOpenWebVisible.Global"
     enum="WebViewOpenWebVisibility" expires_after="2022-06-01">
+  <obsolete>
+    Removed in December 2021, use Android.WebView.VisibleScheme.Global instead
+    which breaks down all the visible time spent into more schemes.
+  </obsolete>
   <owner>idries@google.com</owner>
   <owner>ntfschr@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
@@ -4783,6 +4813,10 @@ chromium-metrics-reviews@google.com.
 
 <histogram name="Android.WebView.WebViewOpenWebVisible.PerWebView"
     enum="WebViewOpenWebVisibility" expires_after="2022-06-01">
+  <obsolete>
+    Deprecated in December 2021, use Android.WebView.VisibleScheme.PerWebView
+    instead which breaks down all the visible time spent into more schemes.
+  </obsolete>
   <owner>idries@google.com</owner>
   <owner>ntfschr@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
diff --git a/tools/metrics/histograms/metadata/bluetooth/histograms.xml b/tools/metrics/histograms/metadata/bluetooth/histograms.xml
index db6ef73d47f5fa..998f357d78cd58 100644
--- a/tools/metrics/histograms/metadata/bluetooth/histograms.xml
+++ b/tools/metrics/histograms/metadata/bluetooth/histograms.xml
@@ -207,6 +207,47 @@ chromium-metrics-reviews@google.com.
   </token>
 </histogram>
 
+<histogram name="Bluetooth.ChromeOS.FastPair.PairingMethod"
+    enum="FastPairPairingMethod" expires_after="2022-09-20">
+  <owner>shanefitz@google.com</owner>
+  <owner>julietlevesque@google.com</owner>
+  <owner>chromeos-cross-device-eng@google.com</owner>
+  <summary>
+    Records the count of eligible users who pair devices without Fast Pair and
+    with Fast Pair. This metric is emitted after a device pairing event to the
+    Bluetooth adapter, once verified that it is not a Fast Pair device pairing,
+    and that the pairing was to connect to the Bluetooth adapter, not to
+    disconnect from it. It is also emitted when the Fast Pair OnDevicePaired
+    event fires.
+  </summary>
+</histogram>
+
+<histogram name="Bluetooth.ChromeOS.FastPair.RetroactiveEngagementFunnel.Steps"
+    enum="FastPairRetroactiveEngagementFlowEvent" expires_after="2022-09-20">
+  <owner>shanefitz@google.com</owner>
+  <owner>julietlevesque@google.com</owner>
+  <owner>chromeos-cross-device-eng@google.com</owner>
+  <summary>
+    Records each step in the Fast Pair flow for the retroactive pairing
+    scenario. Emitted when the associate account UI is shown, the associate
+    account UI is dismissed, the save to account button is pressed on the
+    associate account UI, and when the learn more button is pressed on the
+    associate account UI.
+  </summary>
+</histogram>
+
+<histogram name="Bluetooth.ChromeOS.FastPair.RetroactivePairing.Result"
+    enum="BooleanSuccess" expires_after="2022-09-20">
+  <owner>shanefitz@google.com</owner>
+  <owner>julietlevesque@google.com</owner>
+  <owner>chromeos-cross-device-eng@google.com</owner>
+  <summary>
+    Records the success or failure of retroactive pairings. This metric is
+    emitted after the account key is attempted to be written to the device in
+    the retroactive pairing scenario.
+  </summary>
+</histogram>
+
 <histogram
     name="Bluetooth.ChromeOS.FastPair.TotalUxPairTime.{FastPairPairingProtocol}"
     units="ms" expires_after="2022-09-20">
diff --git a/tools/metrics/histograms/metadata/chromeos/histograms.xml b/tools/metrics/histograms/metadata/chromeos/histograms.xml
index c27e44d900ed0f..a3b5facdbe0eff 100644
--- a/tools/metrics/histograms/metadata/chromeos/histograms.xml
+++ b/tools/metrics/histograms/metadata/chromeos/histograms.xml
@@ -1441,7 +1441,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="ChromeOS.Settings.Accessibility.FullscreenMagnifierMouseFollowingMode"
-    enum="MagnifierMouseFollowingMode" expires_after="2022-01-26">
+    enum="MagnifierMouseFollowingMode" expires_after="2022-12-13">
   <owner>josiahk@chromium.org</owner>
   <owner>chromium-accessibility@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/metadata/gpu/histograms.xml b/tools/metrics/histograms/metadata/gpu/histograms.xml
index 457c71900f0c7b..1a6643fc0870af 100644
--- a/tools/metrics/histograms/metadata/gpu/histograms.xml
+++ b/tools/metrics/histograms/metadata/gpu/histograms.xml
@@ -991,6 +991,17 @@ chromium-metrics-reviews@google.com.
   <summary>The error states generated by OpenGL calls.</summary>
 </histogram>
 
+<histogram name="GPU.EstablishGpuChannelSyncTime" units="ms"
+    expires_after="2022-05-13">
+  <owner>cduvall@chromium.org</owner>
+  <owner>jam@chromium.org</owner>
+  <summary>
+    Measures the time it takes to synchronously establish the GPU channel.
+    Logged every time a sync call to EstableGpuChannelSync is made and a channel
+    is not already available.
+  </summary>
+</histogram>
+
 <histogram name="GPU.FenceSupport" enum="BooleanAvailable" expires_after="M77">
   <owner>reveman@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/metadata/media/histograms.xml b/tools/metrics/histograms/metadata/media/histograms.xml
index ab728a9ca11445..5278b94b41c029 100644
--- a/tools/metrics/histograms/metadata/media/histograms.xml
+++ b/tools/metrics/histograms/metadata/media/histograms.xml
@@ -3184,12 +3184,22 @@ chromium-metrics-reviews@google.com.
   </summary>
 </histogram>
 
+<histogram name="Media.MediaFoundationRenderer.ErrorReason"
+    enum="MediaFoundationRendererErrorReason" expires_after="2022-08-30">
+  <owner>xhwang@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
+  <summary>
+    Recorded when the MediaFoundationRenderer or MediaFoundationRendererClient
+    hits an error.
+  </summary>
+</histogram>
+
 <histogram name="Media.MediaFoundationRenderer.PlaybackError" enum="Hresult"
     expires_after="2022-08-30">
   <owner>xhwang@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
-    Recorded when the MediaFoundationRenderer his a playback error. Some errors
+    Recorded when the MediaFoundationRenderer hits a playback error. Some errors
     are part of the normal user flow (e.g. sleep/resume) and are not a bug.
   </summary>
 </histogram>
diff --git a/tools/metrics/histograms/metadata/others/histograms.xml b/tools/metrics/histograms/metadata/others/histograms.xml
index daf5e2e91911c5..0c6dbdaf317723 100644
--- a/tools/metrics/histograms/metadata/others/histograms.xml
+++ b/tools/metrics/histograms/metadata/others/histograms.xml
@@ -12307,7 +12307,7 @@ chromium-metrics-reviews@google.com.
 
 <histogram name="PrivacySandbox.AggregationService.ReportStatus"
     enum="PrivacySandboxAggregationServiceReportStatus"
-    expires_after="2022-01-16">
+    expires_after="2022-07-16">
   <owner>alexmt@chromium.org</owner>
   <owner>linnan@chromium.org</owner>
   <summary>
@@ -12322,7 +12322,7 @@ chromium-metrics-reviews@google.com.
 
 <histogram name="PrivacySandbox.AggregationService.Storage.Sql.InitStatus"
     enum="PrivacySandboxAggregationServiceStorageSqlInitStatus"
-    expires_after="2022-01-16">
+    expires_after="2022-07-16">
   <owner>alexmt@chromium.org</owner>
   <owner>linnan@chromium.org</owner>
   <summary>
diff --git a/tools/metrics/histograms/metadata/profile/histograms.xml b/tools/metrics/histograms/metadata/profile/histograms.xml
index c928b17311f7ff..518d54da0f70c8 100644
--- a/tools/metrics/histograms/metadata/profile/histograms.xml
+++ b/tools/metrics/histograms/metadata/profile/histograms.xml
@@ -885,6 +885,37 @@ chromium-metrics-reviews@google.com.
   </summary>
 </histogram>
 
+<histogram name="ProfilePicker.FirstProfileTime.FirstWebContentsFinishReason"
+    enum="StartupProfilingFinishReason" expires_after="2022-04-03">
+  <owner>dgn@chromium.org</owner>
+  <owner>chrome-signin-team@google.com</owner>
+  <summary>
+    [Desktop] The reason for which profile picker startup profiling was deemed
+    complete. Logged once per session when the user opens a profile from the
+    profile picker shown on startup.
+
+    Used to understand user behavior shifts when
+    ProfilePicker.FirstProfileTime.FirstWebContentsNonEmptyPaint regresses
+  </summary>
+</histogram>
+
+<histogram name="ProfilePicker.FirstProfileTime.FirstWebContentsNonEmptyPaint"
+    units="ms" expires_after="2022-04-03">
+  <owner>dgn@chromium.org</owner>
+  <owner>chrome-signin-team@google.com</owner>
+  <summary>
+    Measure the elapsed time from when the user selects a profile on the startup
+    profile picker to the first non empty paint of the first web contents. This
+    is recorded when the user selects an existing profile from that profile
+    picker shown on startup.
+
+    Together with ProfilePicker.StartupTime.FirstPaint.FromApplicationStart,
+    this metric is intended to capture the startup latency for a common case
+    where Startup.FirstWebContents.NonEmptyPaint3 is not recorded due to the
+    profile picker interrupting browser startup.
+  </summary>
+</histogram>
+
 <histogram name="ProfilePicker.NewProfileCreateShortcut" enum="BooleanCreated"
     expires_after="M90">
   <owner>msalama@chromium.org</owner>
diff --git a/tools/metrics/histograms/metadata/security/histograms.xml b/tools/metrics/histograms/metadata/security/histograms.xml
index a0e4c2218bf9db..022b7e11be615a 100644
--- a/tools/metrics/histograms/metadata/security/histograms.xml
+++ b/tools/metrics/histograms/metadata/security/histograms.xml
@@ -195,6 +195,17 @@ chromium-metrics-reviews@google.com.
   </summary>
 </histogram>
 
+<histogram name="Security.JSONParser.ChromiumExtensionUsage"
+    enum="JsonParserExtension" expires_after="2022-04-01">
+  <owner>rsesek@chromium.org</owner>
+  <owner>chrome-platform-security@google.com</owner>
+  <summary>
+    Records the usage of the base::JSONParser's non-RFC-8259-conforming
+    extensions when parsing JSON documents. This histogram is emitted each time
+    an instance of non-conforming syntax is detected in a document.
+  </summary>
+</histogram>
+
 <histogram name="Security.LegacyTLS.DownloadStarted" enum="Boolean"
     expires_after="2021-08-09">
   <obsolete>
diff --git a/tools/metrics/histograms/metadata/signin/histograms.xml b/tools/metrics/histograms/metadata/signin/histograms.xml
index 2018a1b182cf50..ee6008834a6782 100644
--- a/tools/metrics/histograms/metadata/signin/histograms.xml
+++ b/tools/metrics/histograms/metadata/signin/histograms.xml
@@ -744,6 +744,28 @@ prefs when the profile is loaded.  -->
   </summary>
 </histogram>
 
+<histogram name="Signin.IOSDeviceRestoreIdentityCountAfter" units="identities"
+    expires_after="2022-04-01">
+  <owner>jlebel@chromium.org</owner>
+  <owner>chrome-signin-team@google.com</owner>
+  <summary>
+    Records the number of identities after iOS device restore. Recorded at cold
+    start when a device restore is detected, and only if the user was signed in
+    before the device backup.
+  </summary>
+</histogram>
+
+<histogram name="Signin.IOSDeviceRestoreIdentityCountBefore" units="identities"
+    expires_after="2022-04-01">
+  <owner>jlebel@chromium.org</owner>
+  <owner>chrome-signin-team@google.com</owner>
+  <summary>
+    Records the number of identities before iOS device restore. Recorded at cold
+    start when a device restore is detected, and only if the user was signed in
+    before the device backup.
+  </summary>
+</histogram>
+
 <histogram name="Signin.IOSDeviceRestoreSentinelError"
     enum="SigninIOSDeviceRestoreSentinelError" expires_after="2022-04-01">
   <owner>jlebel@chromium.org</owner>
@@ -764,6 +786,16 @@ prefs when the profile is loaded.  -->
   </summary>
 </histogram>
 
+<histogram name="Signin.IOSDeviceRestoreSignedInState"
+    enum="IOSDeviceRestoreSignedinState" expires_after="2022-04-01">
+  <owner>jlebel@chromium.org</owner>
+  <owner>chrome-signin-team@google.com</owner>
+  <summary>
+    Records whether the user is signed in or signed out before and after a
+    device restore. Recorded at cold start when a device restore is detected.
+  </summary>
+</histogram>
+
 <histogram name="Signin.IOSGaiaCookiePresentOnNavigation" enum="BooleanPresent"
     expires_after="2022-01-30">
   <obsolete>
diff --git a/tools/metrics/histograms/metadata/startup/histograms.xml b/tools/metrics/histograms/metadata/startup/histograms.xml
index 89ca5f26ffefbb..e8399ec378744d 100644
--- a/tools/metrics/histograms/metadata/startup/histograms.xml
+++ b/tools/metrics/histograms/metadata/startup/histograms.xml
@@ -773,6 +773,16 @@ chromium-metrics-reviews@google.com.
   </summary>
 </histogram>
 
+<histogram name="Startup.IOSColdStartType" enum="IOSColdStartType"
+    expires_after="2022-04-01">
+  <owner>jlebel@chromium.org</owner>
+  <owner>chrome-signin-team@chromium.org</owner>
+  <summary>
+    Records session type for a cold start. It is recorded at cold start.
+    Histogram only for iOS.
+  </summary>
+</histogram>
+
 <histogram name="Startup.LoadTime.ApplicationStartToChromeMain" units="ms"
     expires_after="never">
 <!-- expires-never: used to diagnose regressions to Startup.FirstWebContents.NonEmptyPaint3 -->
diff --git a/tools/metrics/histograms/metadata/sync/histograms.xml b/tools/metrics/histograms/metadata/sync/histograms.xml
index 68acd4d6af1a18..db6f4641259517 100644
--- a/tools/metrics/histograms/metadata/sync/histograms.xml
+++ b/tools/metrics/histograms/metadata/sync/histograms.xml
@@ -1199,11 +1199,7 @@ chromium-metrics-reviews@google.com.
     measure the same time in GetUpdatesResponse-s.
   </summary>
   <token key="SyncModelType" variants="SyncModelType">
-    <variant name="">
-      <obsolete>
-        Base histogram. Use suffixes of this histogram instead.
-      </obsolete>
-    </variant>
+    <variant name=""/>
   </token>
 </histogram>
 
@@ -1220,11 +1216,7 @@ chromium-metrics-reviews@google.com.
     data type, but those are *not* counted in this metric.
   </summary>
   <token key="SyncModelType" variants="SyncModelType">
-    <variant name="">
-      <obsolete>
-        Base histogram. Use suffixes of this histogram instead.
-      </obsolete>
-    </variant>
+    <variant name=""/>
   </token>
 </histogram>
 
diff --git a/tools/perf/benchmarks/rendering.py b/tools/perf/benchmarks/rendering.py
index 2eee04ac314958..c8756bb63e0865 100644
--- a/tools/perf/benchmarks/rendering.py
+++ b/tools/perf/benchmarks/rendering.py
@@ -30,6 +30,9 @@
     'Graphics.Smoothness.PercentDroppedFrames.AllAnimations',
     'Graphics.Smoothness.PercentDroppedFrames.AllInteractions',
     'Graphics.Smoothness.PercentDroppedFrames.AllSequences',
+    'Graphics.Smoothness.PercentDroppedFrames2.AllAnimations',
+    'Graphics.Smoothness.PercentDroppedFrames2.AllInteractions',
+    'Graphics.Smoothness.PercentDroppedFrames2.AllSequences',
     'Memory.GPU.PeakMemoryUsage2.Scroll',
     'Memory.GPU.PeakMemoryUsage2.PageLoad',
 ]
diff --git a/tools/perf/core/perfetto_binary_roller/binary_deps.json b/tools/perf/core/perfetto_binary_roller/binary_deps.json
index 2ecb291f28e894..4002e068009478 100644
--- a/tools/perf/core/perfetto_binary_roller/binary_deps.json
+++ b/tools/perf/core/perfetto_binary_roller/binary_deps.json
@@ -17,8 +17,8 @@
             "remote_path": "perfetto_binaries/trace_processor_shell/linux_arm64/49b4b5dcbc312d8d2c3751cf29238b8efeb4e494/trace_processor_shell"
         },
         "linux": {
-            "hash": "39d6ae444da9ed567efaf34322170f188fcaf559",
-            "remote_path": "perfetto_binaries/trace_processor_shell/linux/1357bd132733ccc23a295739e4bc432d7a53d120/trace_processor_shell"
+            "hash": "bfcfedfd42706342bbca38ea59198da6673d7a06",
+            "remote_path": "perfetto_binaries/trace_processor_shell/linux/f9abf9948a180a56a3595ec54ff9f2f5c2c9947c/trace_processor_shell"
         }
     },
     "power_profile.sql": {
diff --git a/tools/traffic_annotation/auditor/safe_list.txt b/tools/traffic_annotation/auditor/safe_list.txt
index 496112f5f7b68a..816700b139ce35 100644
--- a/tools/traffic_annotation/auditor/safe_list.txt
+++ b/tools/traffic_annotation/auditor/safe_list.txt
@@ -14,14 +14,19 @@ test_annotation,components/safe_search_api/stub_url_checker.cc
 test_annotation,net/quic/quic_chromium_client_session_peer.cc
 test_annotation,net/tools/quic/quic_http_proxy_backend_stream.cc
 # TODO(crbug.com/995852): Fix Android-specific annotations.
-missing,chrome/browser/endpoint_fetcher/endpoint_fetcher.cc
 missing,android_webview/browser/network_service/aw_proxy_config_monitor.cc
+missing,chrome/android/features/tab_ui/java/src/or/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestions.java
+missing,chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcher.java
+missing,chrome/android/java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java
+missing,chrome/android/java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java
+missing,chrome/android/java/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetector.java
+missing,chrome/android/java/src/org/chromium/chrome/browser/offlinepages/measurements/OfflineMeasurementsBackgroundTask.java
+missing,chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
 missing,chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc
 missing,chrome/browser/android/feedback/connectivity_checker.cc
 missing,chrome/browser/android/webapk/webapk_installer.cc
-missing,net/proxy_resolution/proxy_config_service_android.cc
-missing,chrome/android/features/tab_ui/java/src/or/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestions.java
-missing,chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcher.java
 missing,chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceProxy.java
+missing,chrome/browser/endpoint_fetcher/endpoint_fetcher.cc
 missing,chrome/browser/page_annotations/android/java/src/org/chromium/chrome/browser/page_annotations/PageAnnotationsServiceProxy.java
 missing,chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/StorePersistedTabData.java
+missing,net/proxy_resolution/proxy_config_service_android.cc
diff --git a/tools/traffic_annotation/summary/annotations.xml b/tools/traffic_annotation/summary/annotations.xml
index b86ab54cdba1da..a1029d24b920a7 100644
--- a/tools/traffic_annotation/summary/annotations.xml
+++ b/tools/traffic_annotation/summary/annotations.xml
@@ -345,4 +345,6 @@ Refer to README.md for content description and update process.
  <item id="gstatic_change_password_scripts" added_in_milestone="98" content_hash_code="04d28714" os_list="android" file_path="components/password_manager/core/browser/password_scripts_fetcher_impl.cc" />
  <item id="chrome_cast_discovery_api" added_in_milestone="98" content_hash_code="0502b792" os_list="linux,windows,chromeos" file_path="chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc" />
  <item id="fedcm" added_in_milestone="98" content_hash_code="02f3cbfc" os_list="linux,windows,chromeos,android" file_path="content/browser/webid/idp_network_request_manager.cc" />
+ <item id="minidump_uploader_android" added_in_milestone="98" content_hash_code="0327544e" os_list="android" file_path="components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/util/HttpURLConnectionFactoryImpl.java" />
+ <item id="chrome_variations_android" added_in_milestone="98" content_hash_code="04eeb61f" os_list="android" file_path="components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java" />
 </annotations>
diff --git a/tools/traffic_annotation/summary/grouping.xml b/tools/traffic_annotation/summary/grouping.xml
index acb92f06fec96c..9944f59fd8b5ad 100644
--- a/tools/traffic_annotation/summary/grouping.xml
+++ b/tools/traffic_annotation/summary/grouping.xml
@@ -23,6 +23,7 @@ hidden="true" so that these annotations don't show up in the document.
       <traffic_annotation unique_id="cached_image_fetcher"/>
       <traffic_annotation unique_id="chime_sdk"/>
       <traffic_annotation unique_id="chrome_android_hats"/>
+      <traffic_annotation unique_id="chrome_variations_android"/>
       <traffic_annotation unique_id="contextual_search_resolve"/>
       <traffic_annotation unique_id="customtabs_parallel_request"/>
       <traffic_annotation unique_id="download_bitmap"/>
@@ -34,6 +35,7 @@ hidden="true" so that these annotations don't show up in the document.
       <traffic_annotation unique_id="gstatic_change_password_scripts"/>
       <traffic_annotation unique_id="gstatic_onboarding_definition"/>
       <traffic_annotation unique_id="kids_chrome_management_client_classify_url"/>
+      <traffic_annotation unique_id="minidump_uploader_android"/>
       <traffic_annotation unique_id="partner_bookmarks_reader_get_favicon"/>
       <traffic_annotation unique_id="permission_request_creator"/>
       <traffic_annotation unique_id="publish_note_request"/>
diff --git a/ui/gl/gl_image_egl_angle_vulkan.cc b/ui/gl/gl_image_egl_angle_vulkan.cc
index f26c10752f2bc9..7a435908e8d051 100644
--- a/ui/gl/gl_image_egl_angle_vulkan.cc
+++ b/ui/gl/gl_image_egl_angle_vulkan.cc
@@ -11,6 +11,10 @@
 #include "ui/gl/gl_context_egl.h"
 #include "ui/gl/gl_surface_egl.h"
 
+#define EGL_VULKAN_IMAGE_ANGLE 0x34D3
+#define EGL_VULKAN_IMAGE_CREATE_INFO_HI_ANGLE 0x34D4
+#define EGL_VULKAN_IMAGE_CREATE_INFO_LO_ANGLE 0x34D5
+
 namespace gl {
 
 GLImageEGLAngleVulkan::GLImageEGLAngleVulkan(const gfx::Size& size)
@@ -18,53 +22,30 @@ GLImageEGLAngleVulkan::GLImageEGLAngleVulkan(const gfx::Size& size)
 
 GLImageEGLAngleVulkan::~GLImageEGLAngleVulkan() = default;
 
-bool GLImageEGLAngleVulkan::Initialize(unsigned int texture) {
-  EGLDisplay egl_display = gl::GLSurfaceEGL::GetHardwareDisplay();
-  if (egl_display == EGL_NO_DISPLAY) {
-    LOG(ERROR) << "Failed to retrieve EGLDisplay";
-    return false;
-  }
+bool GLImageEGLAngleVulkan::Initialize(VkImage image,
+                                       const VkImageCreateInfo* create_info) {
+  DCHECK(image != VK_NULL_HANDLE);
+  DCHECK(create_info);
 
-  GLContext* current_context = GLContext::GetCurrent();
-  if (!current_context || !current_context->IsCurrent(nullptr)) {
-    LOG(ERROR) << "No gl context bound to the current thread";
-    return false;
-  }
+  uint64_t info = reinterpret_cast<uint64_t>(create_info);
+  EGLint attribs[] = {
+      EGL_VULKAN_IMAGE_CREATE_INFO_HI_ANGLE,
+      static_cast<EGLint>((info >> 32) & 0xffffffff),
+      EGL_VULKAN_IMAGE_CREATE_INFO_LO_ANGLE,
+      static_cast<EGLint>(info & 0xffffffff),
+      EGL_NONE,
+  };
 
-  EGLContext context_handle =
-      reinterpret_cast<EGLContext>(current_context->GetHandle());
-  DCHECK_NE(context_handle, EGL_NO_CONTEXT);
   bool result = GLImageEGL::Initialize(
-      context_handle, EGL_GL_TEXTURE_2D_KHR,
-      reinterpret_cast<EGLClientBuffer>(texture), nullptr);
+      EGL_NO_CONTEXT, EGL_VULKAN_IMAGE_ANGLE,
+      reinterpret_cast<EGLClientBuffer>(&image), attribs);
 
   if (!result) {
-    LOG(ERROR) << "Create EGLImage from texture failed";
+    LOG(ERROR) << "Create EGLImage from VkImage failed";
     return false;
   }
 
   return true;
 }
 
-VkImage GLImageEGLAngleVulkan::ExportVkImage(VkImageCreateInfo* info) {
-  DCHECK(info);
-
-  EGLDisplay egl_display = gl::GLSurfaceEGL::GetHardwareDisplay();
-  if (egl_display == EGL_NO_DISPLAY) {
-    LOG(ERROR) << "Failed to retrieve EGLDisplay";
-    return VK_NULL_HANDLE;
-  }
-
-  VkImage vk_image = VK_NULL_HANDLE;
-  if (!eglExportVkImageANGLE(egl_display, egl_image_, &vk_image, info)) {
-    LOG(ERROR) << "Export VkImage from EGLImage failed";
-    return VK_NULL_HANDLE;
-  }
-
-  DCHECK_NE(vk_image, VK_NULL_HANDLE);
-  DCHECK_EQ(info->sType, VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO);
-  DCHECK_EQ(size_, gfx::Size(info->extent.width, info->extent.height));
-  return vk_image;
-}
-
 }  // namespace gl
diff --git a/ui/gl/gl_image_egl_angle_vulkan.h b/ui/gl/gl_image_egl_angle_vulkan.h
index 81dc41c82014df..c14e85e9ec7843 100644
--- a/ui/gl/gl_image_egl_angle_vulkan.h
+++ b/ui/gl/gl_image_egl_angle_vulkan.h
@@ -21,8 +21,7 @@ class GL_EXPORT GLImageEGLAngleVulkan : public GLImageEGL {
   GLImageEGLAngleVulkan(const GLImageEGLAngleVulkan&) = delete;
   GLImageEGLAngleVulkan& operator=(const GLImageEGLAngleVulkan&) = delete;
 
-  bool Initialize(unsigned int texture);
-  VkImage ExportVkImage(VkImageCreateInfo* info);
+  bool Initialize(VkImage image, const VkImageCreateInfo* create_info);
 
  protected:
   ~GLImageEGLAngleVulkan() override;
diff --git a/ui/ozone/platform/wayland/host/wayland_window.cc b/ui/ozone/platform/wayland/host/wayland_window.cc
index 4cf0a7d365e428..1b2d3250092040 100644
--- a/ui/ozone/platform/wayland/host/wayland_window.cc
+++ b/ui/ozone/platform/wayland/host/wayland_window.cc
@@ -985,12 +985,12 @@ void WaylandWindow::ProcessPendingBoundsDip(uint32_t serial) {
 
 bool WaylandWindow::ProcessVisualSizeUpdate(const gfx::Size& size_px,
                                             float scale_factor) {
-  auto result =
-      std::find_if(pending_configures_.begin(), pending_configures_.end(),
-                   [&size_px, &scale_factor](auto& configure) {
-                     return gfx::ScaleToRoundedSize(configure.bounds_dip.size(),
-                                                    scale_factor) == size_px;
-                   });
+  auto result = std::find_if(
+      pending_configures_.begin(), pending_configures_.end(),
+      [&size_px, &scale_factor](auto& configure) {
+        return gfx::ScaleToRoundedRect(configure.bounds_dip, scale_factor)
+                   .size() == size_px;
+      });
 
   if (result != pending_configures_.end()) {
     SetWindowGeometry(result->bounds_dip);
diff --git a/weblayer/browser/android/javatests/weblayer_instrumentation_test_versions.py b/weblayer/browser/android/javatests/weblayer_instrumentation_test_versions.py
index db3362fef30f60..f9ecc34777283d 100755
--- a/weblayer/browser/android/javatests/weblayer_instrumentation_test_versions.py
+++ b/weblayer/browser/android/javatests/weblayer_instrumentation_test_versions.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython
+#!/usr/bin/env vpython3
 #
 # Copyright 2020 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
@@ -113,7 +113,7 @@ def tests_to_skip(expectation_contents, impl_version='trunk',
             'Only "Skip" is supported in the skew test expectations.')
 
     # Iterate over the first (and only) item since can't index over a frozenset.
-    tag = iter(expectation.tags).next()
+    tag = next(iter(expectation.tags))
     if tag_matches(tag, impl_version, client_version):
       tests.append(expectation.test)
   return tests
diff --git a/weblayer/browser/content_browser_client_impl.cc b/weblayer/browser/content_browser_client_impl.cc
index fc64b37cf086e2..f7797c18f26b90 100644
--- a/weblayer/browser/content_browser_client_impl.cc
+++ b/weblayer/browser/content_browser_client_impl.cc
@@ -1227,4 +1227,9 @@ bool ContentBrowserClientImpl::IsClipboardPasteAllowed(
   return true;
 }
 
+bool ContentBrowserClientImpl::ShouldPreconnectNavigation(
+    content::BrowserContext* browser_context) {
+  return true;
+}
+
 }  // namespace weblayer
diff --git a/weblayer/browser/content_browser_client_impl.h b/weblayer/browser/content_browser_client_impl.h
index 78c6db20a3182a..a3d515d95f945f 100644
--- a/weblayer/browser/content_browser_client_impl.h
+++ b/weblayer/browser/content_browser_client_impl.h
@@ -226,6 +226,8 @@ class ContentBrowserClientImpl : public content::ContentBrowserClient {
   bool HasErrorPage(int http_status_code) override;
   bool IsClipboardPasteAllowed(
       content::RenderFrameHost* render_frame_host) override;
+  bool ShouldPreconnectNavigation(
+      content::BrowserContext* browser_context) override;
 
   void CreateFeatureListAndFieldTrials();