AUTHORS

diff --git a/AUTHORS b/AUTHORS
index a2016b0..2ef558e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -718,6 +718,7 @@
 Kyungsun Lee <kyungsuny.lee@gmail.com>
 Kyungtae Kim <ktf.kim@samsung.com>
 Kyungyoung Heo <bbvch13531@gmail.com>
+Kyutae Lee <gorisanson@gmail.com>
 Lalit Chandivade <lalit.chandivade@einfochips.com>
 Lam Lu <lamlu@amazon.com>
 Laszlo Gombos <l.gombos@samsung.com>

DEPS

diff --git a/DEPS b/DEPS
index f6bf6c5..83d30faa 100644
--- a/DEPS
+++ b/DEPS
@@ -229,7 +229,7 @@
   #
   # CQ_INCLUDE_TRYBOTS=luci.chrome.try:lacros-amd64-generic-chrome-skylab
   # CQ_INCLUDE_TRYBOTS=luci.chrome.try:lacros-arm-generic-chrome-skylab
-  'lacros_sdk_version': '15295.0.0',
+  'lacros_sdk_version': '15300.0.0',
 
   # Generate location tag metadata to include in tests result data uploaded
   # to ResultDB. This isn't needed on some configs and the tool that generates
@@ -304,15 +304,15 @@
   # 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': '8b0def3a0c517c96326e40db2f2d2c86361666a5',
+  'skia_revision': 'a727ba9e976ba2c2882c1ca126079880d32550e5',
   # 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': 'b01aac4fe9c49ca8da02f5760443280819d15de4',
+  'v8_revision': '759353818cc4133aca7f32d55dca3b1e480b14e3',
   # 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': '1afc4d5b4fe796f23bb171bf5535788637bdc38c',
+  'angle_revision': '8e2b87ac4e168290653cbe22d0a33ace29de9a20',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
@@ -419,7 +419,7 @@
   # 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': 'a42280fb668d9564b1a83c14d4c014595da49fa3',
+  'dawn_revision': '4cef4362b0654b52e3c1a6ee5a3133456cf0107d',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
@@ -770,7 +770,7 @@
 
   'src/clank': {
     'url': 'https://chrome-internal.googlesource.com/clank/internal/apps.git' + '@' +
-    'bf3b5aec43c605bdfe2e2e32afe48334c61594af',
+    'b4b88a3dd8228112e0c5e1ea87d610c32d8953e8',
     'condition': 'checkout_android and checkout_src_internal',
   },
 
@@ -959,7 +959,7 @@
     'packages': [
       {
           'package': 'chromium/third_party/androidx',
-          'version': 'fQDeJ1F444tz8xEl55yvq_R7cVqlC9-SsU1E9TD9NREC',
+          'version': 'Hjrr3kAG6HDx0Ht22sw-pZY5W_Vnltz4SdhqbBcEdw4C',
       },
     ],
     'condition': 'checkout_android',
@@ -1176,7 +1176,7 @@
   # 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' + '@' + 'a2ca3783dc515c9002571c3194b6cddc34fd1fe3',
+      'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '8dfea48e521a1efb07edc452350869fee9b4ba4b',
       'condition': 'checkout_chromeos',
   },
 
@@ -1204,13 +1204,13 @@
   },
 
   'src/third_party/depot_tools':
-    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '5b0c93402623ee632077ae073555867a0f984fc6',
+    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '252b19866a6a9f3de069363184e5fca72280e558',
 
   'src/third_party/devtools-frontend/src':
     Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'),
 
   'src/third_party/devtools-frontend-internal': {
-      'url': 'https://chrome-internal.googlesource.com/devtools/devtools-internal.git' + '@' + '0cafa338db28460e2609e22b51b27a05214d1754',
+      'url': 'https://chrome-internal.googlesource.com/devtools/devtools-internal.git' + '@' + 'c2971db011f3d1c4399a10c69b768e2ab19ca442',
     'condition': 'checkout_src_internal',
   },
 
@@ -1821,7 +1821,7 @@
     Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + 'd1b65aa5a88f6efd900604dfcda840154e9f16e2',
 
   'src/third_party/webgpu-cts/src':
-    Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '030f44dcf868629f3b5776bd69207d342873ed3d',
+    Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '861b209779ea94d2225d5630d00f8b9bdd203eaf',
 
   'src/third_party/webrtc':
     Var('webrtc_git') + '/src.git' + '@' + '0c2981364f4ba1ee189afd69de02893bd3d3bdc1',
@@ -1894,7 +1894,7 @@
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@10f59cd5429ec0b5460411fdf8a9c5f48686e4ff',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@1f2e6baa9c1277e1d87537c083369045d7140712',
     'condition': 'checkout_src_internal',
   },
 
@@ -1935,7 +1935,7 @@
     'packages': [
       {
         'package': 'chromeos_internal/apps/media_app/app',
-        'version': 'bgZ5sbhVG730tMiZJsXcZWBOm3DTdPdsX7nzGG0ksUIC',
+        'version': 'reJ-cTcjxat-5N657TCuv337g6y8WYx_wzbnT8Qyt_MC',
       },
     ],
     'condition': 'checkout_chromeos and checkout_src_internal',

android_webview/browser/aw_feature_list_creator.cc

diff --git a/android_webview/browser/aw_feature_list_creator.cc b/android_webview/browser/aw_feature_list_creator.cc
index 9dee62ab..c16b152 100644
--- a/android_webview/browser/aw_feature_list_creator.cc
+++ b/android_webview/browser/aw_feature_list_creator.cc
@@ -260,8 +260,8 @@
   // Populate FieldTrialList.
   // If you update this, consider whether "WebViewEnvironment" in
   // components/variations/variations_seed_processor_unittest.cc needs updates.
-  // Passing null low_entropy_source_value to suppress adding the VariationsId
-  // for it. TODO(b/183955043): Re-evaluate if this is necessary.
+  // TODO(b/263797385): Re-evaluate if we can add entropy source id to
+  // variations ids for WebView or not.
   variations_field_trial_creator_->SetUpFieldTrials(
       variation_ids,
       command_line->GetSwitchValueASCII(
@@ -269,7 +269,7 @@
       GetSwitchDependentFeatureOverrides(*command_line),
       std::move(feature_list), metrics_client->metrics_state_manager(),
       aw_field_trials_.get(), &ignored_safe_seed_manager,
-      /*low_entropy_source_value=*/absl::nullopt);
+      /*add_entropy_source_to_variations_ids=*/false);
 }
 
 }  // namespace android_webview

android_webview/glue/java/src/com/android/webview/chromium/SharedWebViewContentsClientAdapter.java

diff --git a/android_webview/glue/java/src/com/android/webview/chromium/SharedWebViewContentsClientAdapter.java b/android_webview/glue/java/src/com/android/webview/chromium/SharedWebViewContentsClientAdapter.java
index 9f111a1..d4c82490 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/SharedWebViewContentsClientAdapter.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/SharedWebViewContentsClientAdapter.java
@@ -22,7 +22,6 @@
 import org.chromium.base.Log;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.compat.ApiHelperForM;
-import org.chromium.base.compat.ApiHelperForN;
 import org.chromium.components.embedder_support.util.WebResourceResponseInfo;
 import org.chromium.support_lib_boundary.util.Features;
 import org.chromium.support_lib_callback_glue.SupportLibWebViewContentsClientAdapter;
@@ -96,11 +95,9 @@
             if (mSupportLibClient.isFeatureAvailable(Features.SHOULD_OVERRIDE_WITH_REDIRECTS)) {
                 result = mSupportLibClient.shouldOverrideUrlLoading(
                         mWebView, new WebResourceRequestAdapter(request));
-            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                result = ApiHelperForN.shouldOverrideUrlLoading(
-                        mWebViewClient, mWebView, new WebResourceRequestAdapter(request));
             } else {
-                result = mWebViewClient.shouldOverrideUrlLoading(mWebView, request.url);
+                result = mWebViewClient.shouldOverrideUrlLoading(
+                        mWebView, new WebResourceRequestAdapter(request));
             }
             if (TRACE) Log.i(TAG, "shouldOverrideUrlLoading result=" + result);
 

android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java

diff --git a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java
index cd198de..8260344 100644
--- a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java
+++ b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java
@@ -314,8 +314,6 @@
                             + " each forced context switch."),
             Flag.baseFeature(AccessibilityFeatures.ABLATE_SEND_PENDING_ACCESSIBILITY_EVENTS,
                     "Enable to increase the cost of SendPendingAccessibilityEvents"),
-            Flag.baseFeature(ContentFeatures.WEBVIEW_THROTTLE_BACKGROUND_BEGIN_FRAME,
-                    "Enable to throttle begin frames when webview is not being drawn"),
             Flag.baseFeature(BlinkFeatures.RUN_TEXT_INPUT_UPDATE_POST_LIFECYCLE,
                     "Runs code to update IME state at the end of a lifecycle update "
                             + "rather than the beginning."),

android_webview/nonembedded/java/src/org/chromium/android_webview/devui/MainActivity.java

diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/MainActivity.java b/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/MainActivity.java
index 1dcae9e..f7fc0b1 100644
--- a/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/MainActivity.java
+++ b/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/MainActivity.java
@@ -12,7 +12,6 @@
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.view.Menu;
@@ -300,8 +299,7 @@
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.options_menu_switch_provider
-                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        if (item.getItemId() == R.id.options_menu_switch_provider) {
             logMenuSelection(MenuChoice.SWITCH_PROVIDER);
             SafeIntentUtils.startActivityOrShowError(this,
                     new Intent(Settings.ACTION_WEBVIEW_SETTINGS),

android_webview/nonembedded/java/src/org/chromium/android_webview/devui/WebViewPackageError.java

diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/WebViewPackageError.java b/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/WebViewPackageError.java
index 1028082..97a6769 100644
--- a/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/WebViewPackageError.java
+++ b/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/WebViewPackageError.java
@@ -9,7 +9,6 @@
 import android.app.Dialog;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
-import android.os.Build;
 import android.provider.Settings;
 
 import org.chromium.android_webview.devui.util.SafeIntentUtils;
@@ -183,9 +182,7 @@
         // Switching WebView providers is possible from API >= 24.
         // The activity to change WebView provider is only enabled for admin user, see
         // https://crbug.com/1347418#comment8.
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
-                && PackageManagerUtils.canResolveActivity(
-                        new Intent(Settings.ACTION_WEBVIEW_SETTINGS));
+        return PackageManagerUtils.canResolveActivity(new Intent(Settings.ACTION_WEBVIEW_SETTINGS));
     }
 
     private void openChangeWebViewProviderSettings() {

android_webview/nonembedded/java/src/org/chromium/android_webview/nonembedded/WebViewApkApplication.java

diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/nonembedded/WebViewApkApplication.java b/android_webview/nonembedded/java/src/org/chromium/android_webview/nonembedded/WebViewApkApplication.java
index 706073c..9fc343c 100644
--- a/android_webview/nonembedded/java/src/org/chromium/android_webview/nonembedded/WebViewApkApplication.java
+++ b/android_webview/nonembedded/java/src/org/chromium/android_webview/nonembedded/WebViewApkApplication.java
@@ -8,7 +8,6 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.os.Build;
 
 import com.android.webview.chromium.WebViewLibraryPreloader;
 
@@ -112,9 +111,7 @@
             controller.registerActions(NonembeddedSafeModeActionsList.sList);
         }
 
-        // Limit to N+ since external services were added in N.
-        if (!LibraryLoader.getInstance().isLoadedByZygote()
-                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        if (!LibraryLoader.getInstance().isLoadedByZygote()) {
             LibraryLoader.getInstance().setNativeLibraryPreloader(new WebViewLibraryPreloader());
         }
     }

android_webview/nonembedded/java/src/org/chromium/android_webview/services/AwVariationsSeedFetcher.java

diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/services/AwVariationsSeedFetcher.java b/android_webview/nonembedded/java/src/org/chromium/android_webview/services/AwVariationsSeedFetcher.java
index 9f4660a..1e945ef0 100644
--- a/android_webview/nonembedded/java/src/org/chromium/android_webview/services/AwVariationsSeedFetcher.java
+++ b/android_webview/nonembedded/java/src/org/chromium/android_webview/services/AwVariationsSeedFetcher.java
@@ -10,7 +10,6 @@
 import android.app.job.JobService;
 import android.content.ComponentName;
 import android.content.Context;
-import android.os.Build;
 import android.os.PersistableBundle;
 
 import androidx.annotation.VisibleForTesting;
@@ -21,7 +20,6 @@
 import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
-import org.chromium.base.compat.ApiHelperForN;
 import org.chromium.base.task.AsyncTask;
 import org.chromium.base.task.BackgroundOnlyAsyncTask;
 import org.chromium.components.background_task_scheduler.TaskIds;
@@ -83,16 +81,8 @@
         }
     }
 
-    // Use JobScheduler.getPendingJob() if it's available. Otherwise, fall back to iterating over
-    // all jobs to find the one we want.
     private static JobInfo getPendingJob(JobScheduler scheduler, int jobId) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-            for (JobInfo info : scheduler.getAllPendingJobs()) {
-                if (info.getId() == jobId) return info;
-            }
-            return null;
-        }
-        return ApiHelperForN.getPendingJob(scheduler, jobId);
+        return scheduler.getPendingJob(jobId);
     }
 
     private static JobScheduler getScheduler() {

android_webview/nonembedded/java/src/org/chromium/android_webview/services/ComponentsProviderService.java

diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/services/ComponentsProviderService.java b/android_webview/nonembedded/java/src/org/chromium/android_webview/services/ComponentsProviderService.java
index 7305177..7aa5edf5a 100644
--- a/android_webview/nonembedded/java/src/org/chromium/android_webview/services/ComponentsProviderService.java
+++ b/android_webview/nonembedded/java/src/org/chromium/android_webview/services/ComponentsProviderService.java
@@ -11,7 +11,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.ParcelFileDescriptor;
@@ -25,7 +24,6 @@
 import org.chromium.base.ContextUtils;
 import org.chromium.base.FileUtils;
 import org.chromium.base.Log;
-import org.chromium.base.compat.ApiHelperForN;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.task.PostTask;
 import org.chromium.base.task.TaskTraits;
@@ -294,18 +292,10 @@
         }
     }
 
-    // Use JobScheduler.getPendingJob() if it's available. Otherwise, fall back to iterating over
-    // all jobs to find the one we want.
     // TODO(crbug.com/1189126): move this to utils class
     @VisibleForTesting
     public static boolean isJobScheduled(JobScheduler scheduler, int jobId) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-            for (JobInfo info : scheduler.getAllPendingJobs()) {
-                if (info.getId() == jobId) return true;
-            }
-            return false;
-        }
-        return ApiHelperForN.getPendingJob(scheduler, jobId) != null;
+        return scheduler.getPendingJob(jobId) != null;
     }
 
     @VisibleForTesting

ash/components/arc/input_overlay/resources/com.kitkagames.fallbuddies.json

diff --git a/ash/components/arc/input_overlay/resources/com.kitkagames.fallbuddies.json b/ash/components/arc/input_overlay/resources/com.kitkagames.fallbuddies.json
new file mode 100644
index 0000000..6b543ac
--- /dev/null
+++ b/ash/components/arc/input_overlay/resources/com.kitkagames.fallbuddies.json
@@ -0,0 +1,57 @@
+// Copyright 2022 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+{
+  "tap": [
+    {
+      "id": 0,
+      "input_sources": [
+        "keyboard"
+      ],
+      "name": "jump",
+      "key": "Space",
+      "location": [
+        {
+          "type": "position",
+          "anchor": [
+            0,
+            0
+          ],
+          "anchor_to_target": [
+            0.8825215,
+            0.7912037
+          ]
+        }
+      ]
+    }
+  ],
+  "move": [
+    {
+      "id": 1,
+      "input_sources": [
+        "keyboard"
+      ],
+      "name": "Virtual Joystick",
+      "keys": [
+        "KeyW",
+        "KeyA",
+        "KeyS",
+        "KeyD"
+      ],
+      "location": [
+        {
+          "type": "position",
+          "anchor": [
+            0,
+            0
+          ],
+          "anchor_to_target": [
+            0.13623339,
+            0.67638886
+          ]
+        }
+      ]
+    }
+  ]
+}

ash/components/arc/input_overlay/resources/com.robtopx.geometrydashmeltdown.json

diff --git a/ash/components/arc/input_overlay/resources/com.robtopx.geometrydashmeltdown.json b/ash/components/arc/input_overlay/resources/com.robtopx.geometrydashmeltdown.json
new file mode 100644
index 0000000..7c9ef189
--- /dev/null
+++ b/ash/components/arc/input_overlay/resources/com.robtopx.geometrydashmeltdown.json
@@ -0,0 +1,71 @@
+// Copyright 2022 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+{
+  "tap": [
+    {
+      "id": 0,
+      "input_sources": [
+        "keyboard"
+      ],
+      "name": "jump",
+      "key": "Space",
+      "location": [
+        {
+          "type": "position",
+          "anchor": [
+            0,
+            0
+          ],
+          "anchor_to_target": [
+            0.5140772,
+            0.73645204
+          ]
+        }
+      ]
+    },
+    {
+      "id": 1,
+      "input_sources": [
+        "keyboard"
+      ],
+      "name": "add flag",
+      "key": "KeyG",
+      "location": [
+        {
+          "type": "position",
+          "anchor": [
+            0,
+            0
+          ],
+          "anchor_to_target": [
+            0.447341,
+            0.8707735
+          ]
+        }
+      ]
+    },
+    {
+      "id": 2,
+      "input_sources": [
+        "keyboard"
+      ],
+      "name": "remove flag",
+      "key": "KeyH",
+      "location": [
+        {
+          "type": "position",
+          "anchor": [
+            0,
+            0
+          ],
+          "anchor_to_target": [
+            0.5654327,
+            0.8707735
+          ]
+        }
+      ]
+    }
+  ]
+}

ash/components/arc/input_overlay/resources/com.robtopx.geometrydashsubzero.json

diff --git a/ash/components/arc/input_overlay/resources/com.robtopx.geometrydashsubzero.json b/ash/components/arc/input_overlay/resources/com.robtopx.geometrydashsubzero.json
new file mode 100644
index 0000000..7c9ef189
--- /dev/null
+++ b/ash/components/arc/input_overlay/resources/com.robtopx.geometrydashsubzero.json
@@ -0,0 +1,71 @@
+// Copyright 2022 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+{
+  "tap": [
+    {
+      "id": 0,
+      "input_sources": [
+        "keyboard"
+      ],
+      "name": "jump",
+      "key": "Space",
+      "location": [
+        {
+          "type": "position",
+          "anchor": [
+            0,
+            0
+          ],
+          "anchor_to_target": [
+            0.5140772,
+            0.73645204
+          ]
+        }
+      ]
+    },
+    {
+      "id": 1,
+      "input_sources": [
+        "keyboard"
+      ],
+      "name": "add flag",
+      "key": "KeyG",
+      "location": [
+        {
+          "type": "position",
+          "anchor": [
+            0,
+            0
+          ],
+          "anchor_to_target": [
+            0.447341,
+            0.8707735
+          ]
+        }
+      ]
+    },
+    {
+      "id": 2,
+      "input_sources": [
+        "keyboard"
+      ],
+      "name": "remove flag",
+      "key": "KeyH",
+      "location": [
+        {
+          "type": "position",
+          "anchor": [
+            0,
+            0
+          ],
+          "anchor_to_target": [
+            0.5654327,
+            0.8707735
+          ]
+        }
+      ]
+    }
+  ]
+}

ash/components/arc/input_overlay/resources/com.robtopx.geometrydashworld.json

diff --git a/ash/components/arc/input_overlay/resources/com.robtopx.geometrydashworld.json b/ash/components/arc/input_overlay/resources/com.robtopx.geometrydashworld.json
new file mode 100644
index 0000000..7c9ef189
--- /dev/null
+++ b/ash/components/arc/input_overlay/resources/com.robtopx.geometrydashworld.json
@@ -0,0 +1,71 @@
+// Copyright 2022 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+{
+  "tap": [
+    {
+      "id": 0,
+      "input_sources": [
+        "keyboard"
+      ],
+      "name": "jump",
+      "key": "Space",
+      "location": [
+        {
+          "type": "position",
+          "anchor": [
+            0,
+            0
+          ],
+          "anchor_to_target": [
+            0.5140772,
+            0.73645204
+          ]
+        }
+      ]
+    },
+    {
+      "id": 1,
+      "input_sources": [
+        "keyboard"
+      ],
+      "name": "add flag",
+      "key": "KeyG",
+      "location": [
+        {
+          "type": "position",
+          "anchor": [
+            0,
+            0
+          ],
+          "anchor_to_target": [
+            0.447341,
+            0.8707735
+          ]
+        }
+      ]
+    },
+    {
+      "id": 2,
+      "input_sources": [
+        "keyboard"
+      ],
+      "name": "remove flag",
+      "key": "KeyH",
+      "location": [
+        {
+          "type": "position",
+          "anchor": [
+            0,
+            0
+          ],
+          "anchor_to_target": [
+            0.5654327,
+            0.8707735
+          ]
+        }
+      ]
+    }
+  ]
+}

ash/components/arc/input_overlay/resources/com.robtopx.geometryjumplite.json

diff --git a/ash/components/arc/input_overlay/resources/com.robtopx.geometryjumplite.json b/ash/components/arc/input_overlay/resources/com.robtopx.geometryjumplite.json
index b7f3cec5..7c9ef189 100644
--- a/ash/components/arc/input_overlay/resources/com.robtopx.geometryjumplite.json
+++ b/ash/components/arc/input_overlay/resources/com.robtopx.geometryjumplite.json
@@ -19,7 +19,49 @@
             0
           ],
           "anchor_to_target": [
-            0.50013024,
+            0.5140772,
+            0.73645204
+          ]
+        }
+      ]
+    },
+    {
+      "id": 1,
+      "input_sources": [
+        "keyboard"
+      ],
+      "name": "add flag",
+      "key": "KeyG",
+      "location": [
+        {
+          "type": "position",
+          "anchor": [
+            0,
+            0
+          ],
+          "anchor_to_target": [
+            0.447341,
+            0.8707735
+          ]
+        }
+      ]
+    },
+    {
+      "id": 2,
+      "input_sources": [
+        "keyboard"
+      ],
+      "name": "remove flag",
+      "key": "KeyH",
+      "location": [
+        {
+          "type": "position",
+          "anchor": [
+            0,
+            0
+          ],
+          "anchor_to_target": [
+            0.5654327,
             0.8707735
           ]
         }

ash/components/arc/input_overlay/resources/input_overlay_resources.grd

diff --git a/ash/components/arc/input_overlay/resources/input_overlay_resources.grd b/ash/components/arc/input_overlay/resources/input_overlay_resources.grd
index 11ebea46..c17b94b 100644
--- a/ash/components/arc/input_overlay/resources/input_overlay_resources.grd
+++ b/ash/components/arc/input_overlay/resources/input_overlay_resources.grd
@@ -45,6 +45,10 @@
        <include name="IDR_IO_COM_GAMEHIVECORP_TAPTITANS2" file="com.gamehivecorp.taptitans2.json" type="BINDATA" />
        <include name="IDR_IO_COM_ODDROK_POWERHOVER" file="com.oddrok.powerhover.json" type="BINDATA" />
        <include name="IDR_IO_COM_ROBTOPX_GEOMETRYJUMPLITE" file="com.robtopx.geometryjumplite.json" type="BINDATA" />
+       <include name="IDR_IO_COM_ROBTOPX_GEOMETRYDASHWORLD" file="com.robtopx.geometrydashworld.json" type="BINDATA" />
+       <include name="IDR_IO_COM_ROBTOPX_GEOMETRYDASHMELTDOWN" file="com.robtopx.geometrydashmeltdown.json" type="BINDATA" />
+       <include name="IDR_IO_COM_ROBTOPX_GEOMETRYDASHSUBZERO" file="com.robtopx.geometrydashsubzero.json" type="BINDATA" />
+       <include name="IDR_IO_COM_KITKAGAMES_FALLBUDDIES" file="com.kitkagames.fallbuddies.json" type="BINDATA" />
     </includes>
   </release>
 </grit>

ash/public/cpp/projector/annotator_tool.cc

diff --git a/ash/public/cpp/projector/annotator_tool.cc b/ash/public/cpp/projector/annotator_tool.cc
index 5c48c04..31bc0a2 100644
--- a/ash/public/cpp/projector/annotator_tool.cc
+++ b/ash/public/cpp/projector/annotator_tool.cc
@@ -76,26 +76,27 @@
 
 // static
 AnnotatorTool AnnotatorTool::FromValue(const base::Value& value) {
-  DCHECK(value.is_dict());
-  DCHECK(value.FindKey(kToolColor));
-  DCHECK(value.FindKey(kToolColor)->is_string());
-  DCHECK(value.FindKey(kToolSize));
-  DCHECK(value.FindKey(kToolSize)->is_int());
-  DCHECK(value.FindKey(kToolType));
-  DCHECK(value.FindKey(kToolType)->is_string());
+  const base::Value::Dict* dict = value.GetIfDict();
+  DCHECK(dict);
+  DCHECK(dict->Find(kToolColor));
+  DCHECK(dict->FindString(kToolColor));
+  DCHECK(dict->Find(kToolSize));
+  DCHECK(dict->FindInt(kToolSize));
+  DCHECK(dict->Find(kToolType));
+  DCHECK(dict->FindString(kToolType));
   AnnotatorTool t;
-  t.color = ConvertHexStringToColor(*(value.FindStringPath(kToolColor)));
-  t.size = *(value.FindIntPath(kToolSize));
-  t.type = ConvertStringToToolType(*(value.FindStringPath(kToolType)));
+  t.color = ConvertHexStringToColor(*(dict->FindString(kToolColor)));
+  t.size = *(dict->FindInt(kToolSize));
+  t.type = ConvertStringToToolType(*(dict->FindString(kToolType)));
   return t;
 }
 
 base::Value AnnotatorTool::ToValue() const {
-  base::Value val(base::Value::Type::DICTIONARY);
-  val.SetKey(kToolColor, base::Value(ConvertColorToHexString(color)));
-  val.SetKey(kToolSize, base::Value(size));
-  val.SetKey(kToolType, base::Value(ConvertToolTypeToString(type)));
-  return val;
+  base::Value::Dict val;
+  val.Set(kToolColor, ConvertColorToHexString(color));
+  val.Set(kToolSize, size);
+  val.Set(kToolType, ConvertToolTypeToString(type));
+  return base::Value(std::move(val));
 }
 
 bool AnnotatorTool::operator==(const AnnotatorTool& rhs) const {

ash/public/cpp/projector/projector_new_screencast_precondition.cc

diff --git a/ash/public/cpp/projector/projector_new_screencast_precondition.cc b/ash/public/cpp/projector/projector_new_screencast_precondition.cc
index 767c8f0..5399efa 100644
--- a/ash/public/cpp/projector/projector_new_screencast_precondition.cc
+++ b/ash/public/cpp/projector/projector_new_screencast_precondition.cc
@@ -29,15 +29,15 @@
 NewScreencastPrecondition::~NewScreencastPrecondition() = default;
 
 base::Value NewScreencastPrecondition::ToValue() const {
-  base::Value result(base::Value::Type::DICTIONARY);
-  result.SetIntKey(kState, static_cast<int>(state));
+  base::Value::Dict result;
+  result.Set(kState, static_cast<int>(state));
 
-  base::Value reasons_value(base::Value::Type::LIST);
+  base::Value::List reasons_value;
   for (const auto& reason : reasons)
     reasons_value.Append(static_cast<int>(reason));
 
-  result.SetKey(kReasons, std::move(reasons_value));
-  return result;
+  result.Set(kReasons, std::move(reasons_value));
+  return base::Value(std::move(result));
 }
 
 bool NewScreencastPrecondition::operator==(

ash/rgb_keyboard/rgb_keyboard_manager.cc

diff --git a/ash/rgb_keyboard/rgb_keyboard_manager.cc b/ash/rgb_keyboard/rgb_keyboard_manager.cc
index 41c8ba1..1fee15e 100644
--- a/ash/rgb_keyboard/rgb_keyboard_manager.cc
+++ b/ash/rgb_keyboard/rgb_keyboard_manager.cc
@@ -187,11 +187,13 @@
   VLOG(1) << "RGB Keyboard capabilities="
           << static_cast<uint32_t>(capabilities_);
 
-  if (IsRgbKeyboardSupported())
+  if (IsRgbKeyboardSupported()) {
     InitializeRgbKeyboard();
+  }
 
-  for (auto& observer : observers_)
+  for (auto& observer : observers_) {
     observer.OnRgbKeyboardSupportedChanged(IsRgbKeyboardSupported());
+  }
 }
 
 void RgbKeyboardManager::InitializeRgbKeyboard() {

ash/system/keyboard_brightness/OWNERS

diff --git a/ash/system/keyboard_brightness/OWNERS b/ash/system/keyboard_brightness/OWNERS
index 5a5326a..50519a3 100644
--- a/ash/system/keyboard_brightness/OWNERS
+++ b/ash/system/keyboard_brightness/OWNERS
@@ -1,3 +1,4 @@
 jasontt@chromium.org
 jimmyxgong@chromium.org
+dpad@google.com
 zentaro@chromium.org

ash/system/keyboard_brightness/keyboard_backlight_color_controller.cc

diff --git a/ash/system/keyboard_brightness/keyboard_backlight_color_controller.cc b/ash/system/keyboard_brightness/keyboard_backlight_color_controller.cc
index f95071a9..8937a67 100644
--- a/ash/system/keyboard_brightness/keyboard_backlight_color_controller.cc
+++ b/ash/system/keyboard_brightness/keyboard_backlight_color_controller.cc
@@ -18,6 +18,7 @@
 #include "base/functional/bind.h"
 #include "base/metrics/histogram_functions.h"
 #include "chromeos/dbus/power/power_manager_client.h"
+#include "chromeos/dbus/power_manager/backlight.pb.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/session_manager/session_manager_types.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
@@ -99,8 +100,9 @@
 KeyboardBacklightColorController::GetBacklightColor(
     const AccountId& account_id) {
   // |account_id| may be empty in tests.
-  if (account_id.empty())
+  if (account_id.empty()) {
     return personalization_app::mojom::BacklightColor::kWallpaper;
+  }
   auto* pref_service = GetUserPrefService(account_id);
   DCHECK(pref_service);
   return static_cast<personalization_app::mojom::BacklightColor>(
@@ -155,8 +157,9 @@
 void KeyboardBacklightColorController::OnSessionStateChanged(
     session_manager::SessionState state) {
   // If we are in OOBE, we should set the backlight to a default of white.
-  if (state != session_manager::SessionState::OOBE)
+  if (state != session_manager::SessionState::OOBE) {
     return;
+  }
   DisplayBacklightColor(personalization_app::mojom::BacklightColor::kWhite);
 }
 
@@ -174,8 +177,10 @@
 
 void KeyboardBacklightColorController::OnWallpaperColorsChanged() {
   const auto backlight_color = GetBacklightColor(GetActiveAccountId());
-  if (backlight_color != personalization_app::mojom::BacklightColor::kWallpaper)
+  if (backlight_color !=
+      personalization_app::mojom::BacklightColor::kWallpaper) {
     return;
+  }
   DisplayBacklightColor(personalization_app::mojom::BacklightColor::kWallpaper);
 }
 
@@ -240,8 +245,14 @@
     absl::optional<double> percentage) {
   if (!percentage.has_value() || percentage.value() == 0.0) {
     DVLOG(1) << __func__ << " Toggling on the keyboard brightness.";
-    // TODO(b/244139677): Calls API to turn on the keyboard brightness.
-    keyboard_brightness_on_for_testing_ = true;
+    power_manager::SetBacklightBrightnessRequest request;
+    request.set_percent(kDefaultBacklightBrightness);
+    request.set_transition(
+        power_manager::SetBacklightBrightnessRequest_Transition_FAST);
+    request.set_cause(
+        power_manager::SetBacklightBrightnessRequest_Cause_USER_REQUEST);
+    chromeos::PowerManagerClient::Get()->SetKeyboardBrightness(
+        std::move(request));
   }
 }
 

ash/system/keyboard_brightness/keyboard_backlight_color_controller.h

diff --git a/ash/system/keyboard_brightness/keyboard_backlight_color_controller.h b/ash/system/keyboard_brightness/keyboard_backlight_color_controller.h
index 8d150a9..95fb8f478 100644
--- a/ash/system/keyboard_brightness/keyboard_backlight_color_controller.h
+++ b/ash/system/keyboard_brightness/keyboard_backlight_color_controller.h
@@ -32,6 +32,10 @@
       public SessionObserver,
       public WallpaperControllerObserver {
  public:
+  // Default brightness to be set by the `KeyboardBacklightColorController` when
+  // the backlight is off and the user configures a new color.
+  static constexpr double kDefaultBacklightBrightness = 40.0;
+
   explicit KeyboardBacklightColorController(PrefService* local_state);
 
   KeyboardBacklightColorController(const KeyboardBacklightColorController&) =
@@ -92,7 +96,6 @@
   void KeyboardBrightnessPercentReceived(absl::optional<double> percentage);
 
   SkColor displayed_color_for_testing_ = SK_ColorTRANSPARENT;
-  bool keyboard_brightness_on_for_testing_ = false;
 
   base::ScopedObservation<SessionControllerImpl, SessionObserver>
       session_observer_{this};

ash/system/keyboard_brightness/keyboard_backlight_color_controller_unittest.cc

diff --git a/ash/system/keyboard_brightness/keyboard_backlight_color_controller_unittest.cc b/ash/system/keyboard_brightness/keyboard_backlight_color_controller_unittest.cc
index c8e9c11..a8e5bf47 100644
--- a/ash/system/keyboard_brightness/keyboard_backlight_color_controller_unittest.cc
+++ b/ash/system/keyboard_brightness/keyboard_backlight_color_controller_unittest.cc
@@ -14,8 +14,8 @@
 #include "ash/wallpaper/wallpaper_controller_impl.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/scoped_feature_list.h"
+#include "chromeos/dbus/power/fake_power_manager_client.h"
 #include "components/session_manager/session_manager_types.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace ash {
@@ -103,14 +103,6 @@
     return controller_->displayed_color_for_testing_;
   }
 
-  bool keyboard_brightness_on_for_testing() const {
-    return controller_->keyboard_brightness_on_for_testing_;
-  }
-
-  void set_keyboard_brightness_off_for_testing() const {
-    controller_->keyboard_brightness_on_for_testing_ = false;
-  }
-
   void clear_displayed_color() {
     controller_->displayed_color_for_testing_ = SK_ColorTRANSPARENT;
   }
@@ -277,14 +269,35 @@
 }
 
 TEST_F(KeyboardBacklightColorControllerTest, TurnsOnKeyboardBrightnessWhenOff) {
+  chromeos::FakePowerManagerClient* client =
+      chromeos::FakePowerManagerClient::Get();
+
+  // Turn off keyboard backlight
+  client->set_keyboard_brightness_percent(0);
   SimulateUserLogin(account_id_1);
-  set_keyboard_brightness_off_for_testing();
   controller_->SetBacklightColor(
       personalization_app::mojom::BacklightColor::kBlue, account_id_1);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(personalization_app::mojom::BacklightColor::kBlue,
             controller_->GetBacklightColor(account_id_1));
-  EXPECT_TRUE(keyboard_brightness_on_for_testing());
+  EXPECT_EQ(client->keyboard_brightness_percent(),
+            KeyboardBacklightColorController::kDefaultBacklightBrightness);
+}
+
+TEST_F(KeyboardBacklightColorControllerTest,
+       DoesNotModifyKeyboardBrightnessWhenOn) {
+  chromeos::FakePowerManagerClient* client =
+      chromeos::FakePowerManagerClient::Get();
+
+  const double kStartingBrightness = 20.0;
+  client->set_keyboard_brightness_percent(kStartingBrightness);
+  SimulateUserLogin(account_id_1);
+  controller_->SetBacklightColor(
+      personalization_app::mojom::BacklightColor::kBlue, account_id_1);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(personalization_app::mojom::BacklightColor::kBlue,
+            controller_->GetBacklightColor(account_id_1));
+  EXPECT_EQ(client->keyboard_brightness_percent(), kStartingBrightness);
 }
 
 }  // namespace ash

ash/system/keyboard_brightness/keyboard_backlight_color_nudge_controller.cc

diff --git a/ash/system/keyboard_brightness/keyboard_backlight_color_nudge_controller.cc b/ash/system/keyboard_brightness/keyboard_backlight_color_nudge_controller.cc
index 81833e9..68f89a7 100644
--- a/ash/system/keyboard_brightness/keyboard_backlight_color_nudge_controller.cc
+++ b/ash/system/keyboard_brightness/keyboard_backlight_color_nudge_controller.cc
@@ -55,10 +55,9 @@
 
 void KeyboardBacklightColorNudgeController::MaybeShowEducationNudge(
     views::View* keyboard_brightness_slider_view) {
-  if (!keyboard_brightness_slider_view)
+  if (!keyboard_brightness_slider_view || education_nudge_) {
     return;
-  if (education_nudge_)
-    return;
+  }
   if (!contextual_tooltip::ShouldShowNudge(
           GetActivePrefService(),
           contextual_tooltip::TooltipType::kKeyboardBacklightColor,

ash/system/network/fake_network_detailed_network_view.h

diff --git a/ash/system/network/fake_network_detailed_network_view.h b/ash/system/network/fake_network_detailed_network_view.h
index 6f37e19..dd88ca5 100644
--- a/ash/system/network/fake_network_detailed_network_view.h
+++ b/ash/system/network/fake_network_detailed_network_view.h
@@ -50,10 +50,12 @@
   NetworkListWifiHeaderView* AddWifiSectionHeader() override;
   NetworkListMobileHeaderView* AddMobileSectionHeader() override;
   void UpdateScanningBarVisibility(bool visible) override;
+  void ReorderFirstListView(size_t index) override {}
   void ReorderNetworkTopContainer(size_t index) override {}
   void ReorderNetworkListView(size_t index) override {}
   void ReorderMobileTopContainer(size_t index) override {}
   void ReorderMobileListView(size_t index) override {}
+  void MaybeRemoveFirstListView() override {}
 
   // ViewClickListener:
   void OnViewClicked(views::View* view) override;

ash/system/network/network_detailed_network_view.h

diff --git a/ash/system/network/network_detailed_network_view.h b/ash/system/network/network_detailed_network_view.h
index 25e4180..e2db4190 100644
--- a/ash/system/network/network_detailed_network_view.h
+++ b/ash/system/network/network_detailed_network_view.h
@@ -88,11 +88,15 @@
       chromeos::network_config::mojom::NetworkType type) = 0;
 
   // Reorder the container or list view based on the index.
+  virtual void ReorderFirstListView(size_t index) = 0;
   virtual void ReorderNetworkTopContainer(size_t index) = 0;
   virtual void ReorderNetworkListView(size_t index) = 0;
   virtual void ReorderMobileTopContainer(size_t index) = 0;
   virtual void ReorderMobileListView(size_t index) = 0;
 
+  // Remove the first list view if there's no child views in it.
+  virtual void MaybeRemoveFirstListView() = 0;
+
  protected:
   explicit NetworkDetailedNetworkView(Delegate* delegate);
 

ash/system/network/network_detailed_network_view_impl.cc

diff --git a/ash/system/network/network_detailed_network_view_impl.cc b/ash/system/network/network_detailed_network_view_impl.cc
index 7e803fb..b439b09 100644
--- a/ash/system/network/network_detailed_network_view_impl.cc
+++ b/ash/system/network/network_detailed_network_view_impl.cc
@@ -134,12 +134,27 @@
                                                kMainContainerMargins);
       }
       return mobile_network_list_view_;
+    case NetworkType::kAll:
+    case NetworkType::kEthernet:
+      if (!first_list_view_) {
+        first_list_view_ = scroll_content()->AddChildView(
+            std::make_unique<RoundedContainer>());
+        first_list_view_->SetProperty(views::kMarginsKey,
+                                      gfx::Insets::TLBR(0, 0, 6, 0));
+      }
+      return first_list_view_;
     default:
       return scroll_content();
   }
   NOTREACHED();
 }
 
+void NetworkDetailedNetworkViewImpl::ReorderFirstListView(size_t index) {
+  if (first_list_view_) {
+    scroll_content()->ReorderChildView(first_list_view_, index);
+  }
+}
+
 void NetworkDetailedNetworkViewImpl::ReorderNetworkTopContainer(size_t index) {
   if (wifi_top_container_) {
     scroll_content()->ReorderChildView(wifi_top_container_, index);
@@ -164,6 +179,13 @@
   }
 }
 
+void NetworkDetailedNetworkViewImpl::MaybeRemoveFirstListView() {
+  if (first_list_view_ && first_list_view_->children().empty()) {
+    scroll_content()->RemoveChildViewT(first_list_view_);
+    first_list_view_ = nullptr;
+  }
+}
+
 void NetworkDetailedNetworkViewImpl::OnMobileToggleClicked(bool new_state) {
   NetworkDetailedNetworkView::delegate()->OnMobileToggleClicked(new_state);
 }

ash/system/network/network_detailed_network_view_impl.h

diff --git a/ash/system/network/network_detailed_network_view_impl.h b/ash/system/network/network_detailed_network_view_impl.h
index 80765645..e3d115c 100644
--- a/ash/system/network/network_detailed_network_view_impl.h
+++ b/ash/system/network/network_detailed_network_view_impl.h
@@ -49,19 +49,23 @@
   void UpdateScanningBarVisibility(bool visible) override;
   views::View* GetNetworkList(
       chromeos::network_config::mojom::NetworkType type) override;
+  void ReorderFirstListView(size_t index) override;
   void ReorderNetworkTopContainer(size_t index) override;
   void ReorderNetworkListView(size_t index) override;
   void ReorderMobileTopContainer(size_t index) override;
   void ReorderMobileListView(size_t index) override;
+  void MaybeRemoveFirstListView() override;
 
   // NetworkListNetworkHeaderView::Delegate:
   void OnMobileToggleClicked(bool new_state) override;
   void OnWifiToggleClicked(bool new_state) override;
 
-  // Owned by views hierarchy. These are the containers to carry the mobile
-  // header, mobile network entries, wifi header, and wifi network entries.
-  // These containers are only used and added to the `network_list_` when the
-  // `features::IsQsRevampEnabled()` is true.
+  // Owned by the views hierarchy. These are the containers to carry the warning
+  // message, the ethernet entry, the mobile header, mobile network entries,
+  // wifi header, and wifi network entries. These containers are only used and
+  // added to the `network_list_` when the `features::IsQsRevampEnabled()` is
+  // true.
+  RoundedContainer* first_list_view_ = nullptr;
   RoundedContainer* mobile_top_container_ = nullptr;
   RoundedContainer* mobile_network_list_view_ = nullptr;
   RoundedContainer* wifi_top_container_ = nullptr;

ash/system/network/network_list_view_controller_impl.cc

diff --git a/ash/system/network/network_list_view_controller_impl.cc b/ash/system/network/network_list_view_controller_impl.cc
index 74d81693..ece92811 100644
--- a/ash/system/network/network_list_view_controller_impl.cc
+++ b/ash/system/network/network_list_view_controller_impl.cc
@@ -184,7 +184,7 @@
 void NetworkListViewControllerImpl::OnGetNetworkStateList(
     std::vector<NetworkStatePropertiesPtr> networks) {
   // Indicates the current position a view will be added to in
-  // NetworkDetailedNetworkView scroll list.
+  // `NetworkDetailedNetworkView` scroll list.
   size_t index = 0;
 
   // Store current views in `previous_network_views`, views which have
@@ -197,13 +197,34 @@
 
   UpdateNetworkTypeExistence(networks);
 
-  // Show a warning that the connection might be monitored if connected to a VPN
-  // or if the default network has a proxy installed.
-  index = ShowConnectionWarningIfNetworkMonitored(index);
+  if (features::IsQsRevampEnabled()) {
+    network_detailed_network_view()->ReorderFirstListView(index++);
 
-  // Show Ethernet section first.
-  index = CreateItemViewsIfMissingAndReorder(NetworkType::kEthernet, index,
-                                             networks, &previous_network_views);
+    // If `QsRevamp` is enabled, the warning message entry and the ethernet
+    // entry are placed in the `network_detailed_network_view()`'s
+    // `first_list_view_`. Here this index is used to indicate the current
+    // position a entry will be added to or reordered in the `first_list_view_`.
+    size_t first_list_item_index = 0;
+
+    // Show a warning that the connection might be monitored if connected to a
+    // VPN or if the default network has a proxy installed.
+    first_list_item_index =
+        ShowConnectionWarningIfNetworkMonitored(first_list_item_index);
+
+    // Show Ethernet section first.
+    first_list_item_index = CreateItemViewsIfMissingAndReorder(
+        NetworkType::kEthernet, first_list_item_index, networks,
+        &previous_network_views);
+
+  } else {
+    // Show a warning that the connection might be monitored if connected to a
+    // VPN or if the default network has a proxy installed.
+    index = ShowConnectionWarningIfNetworkMonitored(index);
+
+    // Show Ethernet section first.
+    index = CreateItemViewsIfMissingAndReorder(
+        NetworkType::kEthernet, index, networks, &previous_network_views);
+  }
 
   if (ShouldMobileDataSectionBeShown()) {
     // Add separator if mobile section is not the first view child, else
@@ -393,6 +414,7 @@
         ->ReorderChildView(connection_warning_, index++);
   } else if (connected_vpn_guid_.empty() && !using_proxy) {
     HideConnectionWarning();
+    network_detailed_network_view()->MaybeRemoveFirstListView();
   }
 
   return index;

ash/system/network/network_list_view_controller_unittest.cc

diff --git a/ash/system/network/network_list_view_controller_unittest.cc b/ash/system/network/network_list_view_controller_unittest.cc
index d24241e0..a2b2ad2 100644
--- a/ash/system/network/network_list_view_controller_unittest.cc
+++ b/ash/system/network/network_list_view_controller_unittest.cc
@@ -16,6 +16,7 @@
 #include "ash/style/ash_color_provider.h"
 #include "ash/system/model/system_tray_model.h"
 #include "ash/system/network/fake_cros_network_config.h"
+#include "ash/system/network/network_detailed_network_view_impl.h"
 #include "ash/system/network/network_utils.h"
 #include "ash/system/network/tray_network_state_model.h"
 #include "ash/system/tray/detailed_view_delegate.h"
@@ -471,8 +472,8 @@
  private:
   template <class T>
   T FindViewById(int id) {
-    return static_cast<T>(
-        network_list(NetworkType::kAll)->GetViewByID(static_cast<int>(id)));
+    return static_cast<T>(network_detailed_network_view_.get()->GetViewByID(
+        static_cast<int>(id)));
   }
 
   ScopedBluetoothConfigTestHelper* bluetooth_config_test_helper() {

ash/webui/eche_app_ui/system_info_provider.cc

diff --git a/ash/webui/eche_app_ui/system_info_provider.cc b/ash/webui/eche_app_ui/system_info_provider.cc
index 2af1dab..d4d4439 100644
--- a/ash/webui/eche_app_ui/system_info_provider.cc
+++ b/ash/webui/eche_app_ui/system_info_provider.cc
@@ -69,37 +69,28 @@
 void SystemInfoProvider::GetSystemInfo(
     base::OnceCallback<void(const std::string&)> callback) {
   PA_LOG(INFO) << "echeapi SystemInfoProvider GetSystemInfo";
-  base::DictionaryValue json_dictionary;
-  json_dictionary.SetStringKey(kJsonDeviceNameKey,
-                               system_info_->GetDeviceName());
-  json_dictionary.SetStringKey(kJsonBoardNameKey, system_info_->GetBoardName());
-  json_dictionary.SetBoolKey(kJsonTabletModeKey,
-                             TabletMode::Get()->InTabletMode());
-  json_dictionary.SetStringKey(kJsonGaiaIdKey, system_info_->GetGaiaId());
-  json_dictionary.SetStringKey(kJsonDeviceTypeKey,
-                               system_info_->GetDeviceType());
+  base::Value::Dict json_dictionary;
+  json_dictionary.Set(kJsonDeviceNameKey, system_info_->GetDeviceName());
+  json_dictionary.Set(kJsonBoardNameKey, system_info_->GetBoardName());
+  json_dictionary.Set(kJsonTabletModeKey, TabletMode::Get()->InTabletMode());
+  json_dictionary.Set(kJsonGaiaIdKey, system_info_->GetGaiaId());
+  json_dictionary.Set(kJsonDeviceTypeKey, system_info_->GetDeviceType());
   auto found_type = CONNECTION_STATE_TYPE.find(wifi_connection_state_);
   std::string connecton_state_string =
       found_type == CONNECTION_STATE_TYPE.end() ? "" : found_type->second;
-  json_dictionary.SetStringKey(kJsonWifiConnectionStateKey,
-                               connecton_state_string);
-  json_dictionary.SetBoolKey(
-      kJsonDebugModeKey,
-      base::FeatureList::IsEnabled(features::kEcheSWADebugMode));
-
-  json_dictionary.SetBoolKey(
+  json_dictionary.Set(kJsonWifiConnectionStateKey, connecton_state_string);
+  json_dictionary.Set(kJsonDebugModeKey, base::FeatureList::IsEnabled(
+                                             features::kEcheSWADebugMode));
+  json_dictionary.Set(
       kJsonMeasureLatencyKey,
       base::FeatureList::IsEnabled(features::kEcheSWAMeasureLatency));
-
-  json_dictionary.SetBoolKey(
+  json_dictionary.Set(
       kJsonSendStartSignalingKey,
       base::FeatureList::IsEnabled(features::kEcheSWASendStartSignaling));
-
-  json_dictionary.SetBoolKey(
+  json_dictionary.Set(
       kJsonDisableStunServerKey,
       base::FeatureList::IsEnabled(features::kEcheSWADisableStunServer));
-
-  json_dictionary.SetBoolKey(
+  json_dictionary.Set(
       kJsonCheckAndroidNetworkInfoKey,
       base::FeatureList::IsEnabled(features::kEcheSWACheckAndroidNetworkInfo));
 

ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider.cc

diff --git a/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider.cc b/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider.cc
index 53a8b4f..65f2e64 100644
--- a/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider.cc
+++ b/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider.cc
@@ -183,12 +183,6 @@
   return pref_service->GetBoolean(prefs::kSendFunctionKeys);
 }
 
-// TODO(zhangwenyu): Remove this and use member function in ui::accelerator
-// class.
-bool IsModifierSet(const ui::Accelerator accelerator, int modifier) {
-  return accelerator.modifiers() & modifier;
-}
-
 }  // namespace
 
 namespace shortcut_ui {
@@ -384,8 +378,7 @@
 AcceleratorConfigurationProvider::CreateRemappedTopRowAcceleratorInfo(
     const ui::Accelerator& accelerator) const {
   // Avoid remapping if [Search] is part of original accelerator.
-  if (IsModifierSet(accelerator, ui::EF_COMMAND_DOWN) ||
-      !TopRowKeysAreFunctionKeys() ||
+  if (accelerator.IsCmdDown() || !TopRowKeysAreFunctionKeys() ||
       !ui::kLayout2TopRowKeyToFKeyMap.contains(accelerator.key_code())) {
     // No remapping is done.
     return nullptr;
@@ -403,7 +396,7 @@
     const ui::Accelerator& accelerator) const {
   // For all six-pack-keys, avoid remapping if [Search] is part of
   // original accelerator.
-  if (IsModifierSet(accelerator, ui::EF_COMMAND_DOWN) ||
+  if (accelerator.IsCmdDown() ||
       !::features::IsImprovedKeyboardShortcutsEnabled() ||
       !ui::kSixPackKeyToSystemKeyMap.contains(accelerator.key_code())) {
     return nullptr;
@@ -413,7 +406,7 @@
   // [Back] (aka, Insert).
   // 2. For [Insert], avoid remapping if [Shift] is part of original
   // accelerator.
-  if (IsModifierSet(accelerator, ui::EF_SHIFT_DOWN) &&
+  if (accelerator.IsShiftDown() &&
       (accelerator.key_code() == ui::KeyboardCode::VKEY_DELETE ||
        accelerator.key_code() == ui::KeyboardCode::VKEY_INSERT)) {
     return nullptr;

ash/wm/desks/cros_next_desk_button.cc

diff --git a/ash/wm/desks/cros_next_desk_button.cc b/ash/wm/desks/cros_next_desk_button.cc
index 0adc51d..956cf4e 100644
--- a/ash/wm/desks/cros_next_desk_button.cc
+++ b/ash/wm/desks/cros_next_desk_button.cc
@@ -34,7 +34,7 @@
 
 constexpr int kZeroStateButtonWidth = 28;
 
-constexpr int kExpandedStateButtonWidth = 44;
+constexpr int kExpandedStateButtonWidth = 36;
 
 constexpr int kDefaultButtonHorizontalPadding = 16;
 

ash/wm/desks/cros_next_desk_button_base.cc

diff --git a/ash/wm/desks/cros_next_desk_button_base.cc b/ash/wm/desks/cros_next_desk_button_base.cc
index e372d352..d069e40 100644
--- a/ash/wm/desks/cros_next_desk_button_base.cc
+++ b/ash/wm/desks/cros_next_desk_button_base.cc
@@ -34,6 +34,8 @@
   SetPaintToLayer();
   layer()->SetFillsBoundsOpaquely(false);
 
+  SetHorizontalAlignment(gfx::ALIGN_CENTER);
+
   SetAccessibleName(text);
   SetTooltipText(text);
 

ash/wm/desks/desk.cc

diff --git a/ash/wm/desks/desk.cc b/ash/wm/desks/desk.cc
index e310a6f..62d9e56e 100644
--- a/ash/wm/desks/desk.cc
+++ b/ash/wm/desks/desk.cc
@@ -7,7 +7,6 @@
 #include <utility>
 
 #include "ash/constants/app_types.h"
-#include "ash/public/cpp/desks_templates_delegate.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/scoped_animation_disabler.h"
@@ -20,21 +19,17 @@
 #include "ash/wm/overview/overview_controller.h"
 #include "ash/wm/window_positioner.h"
 #include "ash/wm/window_state.h"
-#include "ash/wm/window_transient_descendant_iterator.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/backdrop_controller.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
 #include "ash/wm/workspace_controller.h"
-#include "base/bind.h"
 #include "base/containers/adapters.h"
 #include "base/containers/contains.h"
-#include "base/containers/cxx20_erase.h"
+#include "base/functional/bind.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/ranges/algorithm.h"
 #include "base/strings/stringprintf.h"
-#include "chromeos/ui/base/window_properties.h"
 #include "chromeos/ui/wm/features.h"
-#include "components/app_restore/full_restore_utils.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/compositor/layer.h"

ash/wm/desks/desk.h

diff --git a/ash/wm/desks/desk.h b/ash/wm/desks/desk.h
index 73599ef..6d87622 100644
--- a/ash/wm/desks/desk.h
+++ b/ash/wm/desks/desk.h
@@ -13,7 +13,6 @@
 #include "base/containers/flat_map.h"
 #include "base/guid.h"
 #include "base/observer_list.h"
-#include "base/time/clock.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "ui/aura/window_observer.h"

ash/wm/desks/desks_bar_view.cc

diff --git a/ash/wm/desks/desks_bar_view.cc b/ash/wm/desks/desks_bar_view.cc
index 0e0fdc8e..dd63d44 100644
--- a/ash/wm/desks/desks_bar_view.cc
+++ b/ash/wm/desks/desks_bar_view.cc
@@ -19,6 +19,7 @@
 #include "ash/style/ash_color_id.h"
 #include "ash/style/pill_button.h"
 #include "ash/utility/haptics_util.h"
+#include "ash/wm/desks/cros_next_desk_button.h"
 #include "ash/wm/desks/desk_action_view.h"
 #include "ash/wm/desks/desk_drag_proxy.h"
 #include "ash/wm/desks/desk_mini_view.h"
@@ -210,8 +211,7 @@
   DesksBarScrollViewLayout& operator=(const DesksBarScrollViewLayout&) = delete;
   ~DesksBarScrollViewLayout() override = default;
 
-  // views::LayoutManager:
-  void Layout(views::View* host) override {
+  void LayoutInternal(views::View* host) {
     const gfx::Rect scroll_bounds = bar_view_->scroll_view_->bounds();
 
     // The glanceables UI goes on the left edge regardless of zero state or
@@ -224,7 +224,7 @@
       up_next_button->SetBounds(kUpNextX, y, size.width(), size.height());
     }
 
-    // |host| here is |scroll_view_contents_|.
+    // `host` here is `scroll_view_contents_`.
     if (bar_view_->IsZeroState()) {
       host->SetBoundsRect(scroll_bounds);
       auto* zero_state_default_desk_button =
@@ -288,13 +288,15 @@
     }
 
     std::vector<DeskMiniView*> mini_views = bar_view_->mini_views();
-    if (mini_views.empty())
+    if (mini_views.empty()) {
       return;
+    }
     // When RTL is enabled, we still want desks to be laid our in LTR, to match
     // the spatial order of desks. Therefore, we reverse the order of the mini
     // views before laying them out.
-    if (base::i18n::IsRTL())
+    if (base::i18n::IsRTL()) {
       base::ranges::reverse(mini_views);
+    }
 
     auto* expanded_state_library_button =
         bar_view_->expanded_state_library_button();
@@ -342,6 +344,143 @@
     }
   }
 
+  // TODO(conniekxu): After CrOS Next is launched, remove function
+  // `LayoutInternal`, and move this to Layout.
+  void LayoutInternalCrOSNext(views::View* host) {
+    const gfx::Rect scroll_bounds = bar_view_->scroll_view_->bounds();
+
+    // The glanceables UI goes on the left edge regardless of zero state or
+    // expanded state.
+    // TODO(crbug.com/1353119): Real layout once we have specs for both modes.
+    auto* up_next_button = bar_view_->up_next_button();
+    if (up_next_button) {
+      const gfx::Size size = up_next_button->GetPreferredSize();
+      const int y = (scroll_bounds.height() / 2) - (size.height() / 2);
+      up_next_button->SetBounds(kUpNextX, y, size.width(), size.height());
+    }
+
+    // `host` here is `scroll_view_contents_`.
+    if (bar_view_->IsZeroState()) {
+      host->SetBoundsRect(scroll_bounds);
+      auto* default_desk_button = bar_view_->default_desk_button();
+      const gfx::Size default_desk_button_size =
+          default_desk_button->GetPreferredSize();
+
+      auto* new_desk_button = bar_view_->new_desk_button();
+      const gfx::Size new_desk_button_size =
+          new_desk_button->GetPreferredSize();
+
+      // The presenter is shutdown early in the overview destruction process to
+      // prevent calls to the model. Some animations on the desks bar may still
+      // call this function past shutdown start. In this case we just continue
+      // as if the saved desks UI should be hidden.
+      OverviewSession* session = bar_view_->overview_grid()->overview_session();
+      const bool should_show_saved_desk_library =
+          saved_desk_util::IsSavedDesksEnabled() && session &&
+          !session->is_shutting_down() &&
+          session->saved_desk_presenter()->should_show_saved_desk_library();
+      auto* library_button = bar_view_->library_button();
+      const gfx::Size library_button_size =
+          should_show_saved_desk_library ? library_button->GetPreferredSize()
+                                         : gfx::Size();
+      const int width_for_library_button =
+          should_show_saved_desk_library
+              ? library_button_size.width() + kZeroStateButtonSpacing
+              : 0;
+
+      const int content_width =
+          default_desk_button_size.width() + kZeroStateButtonSpacing +
+          new_desk_button_size.width() + width_for_library_button;
+      default_desk_button->SetBoundsRect(gfx::Rect(
+          gfx::Point((scroll_bounds.width() - content_width) / 2, kZeroStateY),
+          default_desk_button_size));
+      // Update this button's text since it may changes while removing a desk
+      // and going back to the zero state.
+      default_desk_button->UpdateLabelText();
+      // Make sure default desk button is always visible while in zero state
+      // bar.
+      default_desk_button->SetVisible(true);
+      new_desk_button->SetBoundsRect(gfx::Rect(
+          gfx::Point(
+              default_desk_button->bounds().right() + kZeroStateButtonSpacing,
+              kZeroStateY),
+          new_desk_button_size));
+
+      if (library_button) {
+        library_button->SetBoundsRect(gfx::Rect(
+            gfx::Point(
+                new_desk_button->bounds().right() + kZeroStateButtonSpacing,
+                kZeroStateY),
+            library_button_size));
+        library_button->SetVisible(should_show_saved_desk_library);
+      }
+      return;
+    }
+
+    std::vector<DeskMiniView*> mini_views = bar_view_->mini_views();
+    if (mini_views.empty()) {
+      return;
+    }
+    // When RTL is enabled, we still want desks to be laid our in LTR, to match
+    // the spatial order of desks. Therefore, we reverse the order of the mini
+    // views before laying them out.
+    if (base::i18n::IsRTL()) {
+      base::ranges::reverse(mini_views);
+    }
+
+    auto* library_button = bar_view_->library_button();
+    const bool library_button_visible =
+        library_button && library_button->GetVisible();
+
+    gfx::Size mini_view_size = mini_views[0]->GetPreferredSize();
+
+    gfx::Size library_button_size = library_button->GetPreferredSize();
+    // New desk button and library button have the same size;
+    const int num_buttons = library_button_visible ? 2 : 1;
+
+    // Content width is sum of the width of all views, and plus the spacing
+    // between the views, the focus ring's thickness and padding on each sides.
+    const int content_width =
+        mini_views.size() * (mini_view_size.width() + kMiniViewsSpacing) +
+        num_buttons * (library_button_size.width() + kMiniViewsSpacing) -
+        kMiniViewsSpacing + kDeskPreviewViewFocusRingThicknessAndPadding * 2;
+    width_ = std::max(scroll_bounds.width(), content_width);
+
+    // Update the size of the `host`, which is `scroll_view_contents_` here.
+    // This is done to make sure its size can be updated on mini views' adding
+    // or removing, then `scroll_view_` will know whether the contents need to
+    // be scolled or not.
+    host->SetSize(gfx::Size(width_, scroll_bounds.height()));
+
+    // The x of the first mini view should include the focus ring thickness and
+    // padding into consideration, otherwise the focus ring won't be drawn on
+    // the left side of the first mini view.
+    int x = (width_ - content_width) / 2 +
+            kDeskPreviewViewFocusRingThicknessAndPadding;
+    const int y = kMiniViewsY - mini_views[0]->GetPreviewBorderInsets().top();
+    for (auto* mini_view : mini_views) {
+      mini_view->SetBoundsRect(gfx::Rect(gfx::Point(x, y), mini_view_size));
+      x += (mini_view_size.width() + kMiniViewsSpacing);
+    }
+    bar_view_->new_desk_button()->SetBoundsRect(
+        gfx::Rect(gfx::Point(x, y), library_button_size));
+
+    if (library_button) {
+      x += (library_button_size.width() + kMiniViewsSpacing);
+      library_button->SetBoundsRect(
+          gfx::Rect(gfx::Point(x, y), library_button_size));
+    }
+  }
+
+  // views::LayoutManager:
+  void Layout(views::View* host) override {
+    if (features::IsJellyrollEnabled()) {
+      LayoutInternalCrOSNext(host);
+    } else {
+      LayoutInternal(host);
+    }
+  }
+
   // views::LayoutManager:
   gfx::Size GetPreferredSize(const views::View* host) const override {
     return gfx::Size(width_, bar_view_->bounds().height());
@@ -411,41 +550,66 @@
             l10n_util::GetStringUTF16(IDS_GLANCEABLES_UP_NEXT)));
   }
 
-  expanded_state_new_desk_button_ = scroll_view_contents_->AddChildView(
-      std::make_unique<ExpandedDesksBarButton>(
-          this, &kDesksNewDeskButtonIcon,
-          l10n_util::GetStringUTF16(IDS_ASH_DESKS_NEW_DESK_BUTTON),
-          /*initially_enabled=*/DesksController::Get()->CanCreateDesks(),
-          base::BindRepeating(&DesksBarView::OnNewDeskButtonPressed,
-                              base::Unretained(this),
-                              DesksCreationRemovalSource::kButton)));
+  if (features::IsJellyrollEnabled()) {
+    default_desk_button_ = scroll_view_contents_->AddChildView(
+        std::make_unique<CrOSNextDefaultDeskButton>(this));
+    new_desk_button_ = scroll_view_contents_->AddChildView(
+        std::make_unique<CrOSNextDeskIconButton>(
+            this, &kDesksNewDeskButtonIcon,
+            l10n_util::GetStringUTF16(IDS_ASH_DESKS_NEW_DESK_BUTTON),
+            cros_tokens::kCrosSysOnPrimary, cros_tokens::kCrosSysPrimary,
+            base::BindRepeating(&DesksBarView::OnNewDeskButtonPressed,
+                                base::Unretained(this),
+                                DesksCreationRemovalSource::kButton)));
+  } else {
+    expanded_state_new_desk_button_ = scroll_view_contents_->AddChildView(
+        std::make_unique<ExpandedDesksBarButton>(
+            this, &kDesksNewDeskButtonIcon,
+            l10n_util::GetStringUTF16(IDS_ASH_DESKS_NEW_DESK_BUTTON),
+            /*initially_enabled=*/DesksController::Get()->CanCreateDesks(),
+            base::BindRepeating(&DesksBarView::OnNewDeskButtonPressed,
+                                base::Unretained(this),
+                                DesksCreationRemovalSource::kButton)));
 
-  zero_state_default_desk_button_ = scroll_view_contents_->AddChildView(
-      std::make_unique<ZeroStateDefaultDeskButton>(this));
-  zero_state_new_desk_button_ =
-      scroll_view_contents_->AddChildView(std::make_unique<ZeroStateIconButton>(
-          &kDesksNewDeskButtonIcon,
-          l10n_util::GetStringUTF16(IDS_ASH_DESKS_NEW_DESK_BUTTON),
-          base::BindRepeating(&DesksBarView::OnNewDeskButtonPressed,
-                              base::Unretained(this),
-                              DesksCreationRemovalSource::kButton)));
+    zero_state_default_desk_button_ = scroll_view_contents_->AddChildView(
+        std::make_unique<ZeroStateDefaultDeskButton>(this));
+    zero_state_new_desk_button_ = scroll_view_contents_->AddChildView(
+        std::make_unique<ZeroStateIconButton>(
+            &kDesksNewDeskButtonIcon,
+            l10n_util::GetStringUTF16(IDS_ASH_DESKS_NEW_DESK_BUTTON),
+            base::BindRepeating(&DesksBarView::OnNewDeskButtonPressed,
+                                base::Unretained(this),
+                                DesksCreationRemovalSource::kButton)));
+  }
+
   if (saved_desk_util::IsSavedDesksEnabled()) {
     int button_text_id = IDS_ASH_DESKS_TEMPLATES_DESKS_BAR_BUTTON_LIBRARY;
     if (!saved_desk_util::AreDesksTemplatesEnabled())
       button_text_id = IDS_ASH_DESKS_TEMPLATES_DESKS_BAR_BUTTON_SAVED_FOR_LATER;
 
-    expanded_state_library_button_ = scroll_view_contents_->AddChildView(
-        std::make_unique<ExpandedDesksBarButton>(
-            this, &kDesksTemplatesIcon,
-            l10n_util::GetStringUTF16(button_text_id),
-            /*initially_enabled=*/true,
-            base::BindRepeating(&DesksBarView::OnLibraryButtonPressed,
-                                base::Unretained(this))));
-    zero_state_library_button_ = scroll_view_contents_->AddChildView(
-        std::make_unique<ZeroStateIconButton>(
-            &kDesksTemplatesIcon, l10n_util::GetStringUTF16(button_text_id),
-            base::BindRepeating(&DesksBarView::OnLibraryButtonPressed,
-                                base::Unretained(this))));
+    if (features::IsJellyrollEnabled()) {
+      library_button_ = scroll_view_contents_->AddChildView(
+          std::make_unique<CrOSNextDeskIconButton>(
+              this, &kDesksTemplatesIcon,
+              l10n_util::GetStringUTF16(button_text_id),
+              cros_tokens::kCrosSysOnPrimaryContainer,
+              cros_tokens::kCrosSysSystemPrimaryContainer,
+              base::BindRepeating(&DesksBarView::OnLibraryButtonPressed,
+                                  base::Unretained(this))));
+    } else {
+      expanded_state_library_button_ = scroll_view_contents_->AddChildView(
+          std::make_unique<ExpandedDesksBarButton>(
+              this, &kDesksTemplatesIcon,
+              l10n_util::GetStringUTF16(button_text_id),
+              /*initially_enabled=*/true,
+              base::BindRepeating(&DesksBarView::OnLibraryButtonPressed,
+                                  base::Unretained(this))));
+      zero_state_library_button_ = scroll_view_contents_->AddChildView(
+          std::make_unique<ZeroStateIconButton>(
+              &kDesksTemplatesIcon, l10n_util::GetStringUTF16(button_text_id),
+              base::BindRepeating(&DesksBarView::OnLibraryButtonPressed,
+                                  base::Unretained(this))));
+    }
   }
   scroll_view_contents_->SetLayoutManager(
       std::make_unique<DesksBarScrollViewLayout>(this));
@@ -1024,6 +1188,10 @@
 }
 
 void DesksBarView::UpdateDeskButtonsVisibility() {
+  if (features::IsJellyrollEnabled()) {
+    UpdateDeskButtonsVisibilityCrOSNext();
+    return;
+  }
   const bool is_zero_state = IsZeroState();
   zero_state_default_desk_button_->SetVisible(is_zero_state);
   zero_state_new_desk_button_->SetVisible(is_zero_state);
@@ -1034,7 +1202,21 @@
   UpdateLibraryButtonVisibility();
 }
 
+void DesksBarView::UpdateDeskButtonsVisibilityCrOSNext() {
+  const bool is_zero_state = IsZeroState();
+  default_desk_button_->SetVisible(is_zero_state);
+  if (vertical_dots_button_) {
+    vertical_dots_button_->SetVisible(!is_zero_state);
+  }
+
+  UpdateLibraryButtonVisibilityCrOSNext();
+}
+
 void DesksBarView::UpdateLibraryButtonVisibility() {
+  if (features::IsJellyrollEnabled()) {
+    UpdateLibraryButtonVisibilityCrOSNext();
+    return;
+  }
   if (!saved_desk_util::IsSavedDesksEnabled())
     return;
 
@@ -1074,6 +1256,34 @@
       begin_x - GetFirstMiniViewXOffset());
 }
 
+void DesksBarView::UpdateLibraryButtonVisibilityCrOSNext() {
+  if (!saved_desk_util::IsSavedDesksEnabled()) {
+    return;
+  }
+
+  const bool should_show_ui = overview_grid_->overview_session()
+                                  ->saved_desk_presenter()
+                                  ->should_show_saved_desk_library();
+
+  // If the visibility of the library button doesn't change, return early.
+  if (library_button_->GetVisible() == should_show_ui) {
+    return;
+  }
+
+  if (mini_views_.empty()) {
+    return;
+  }
+
+  const int begin_x = GetFirstMiniViewXOffset();
+  Layout();
+
+  // The mini views and new desk button are already laid out in the earlier
+  // `Layout()` call. This call shifts the transforms of the mini views and new
+  // desk button and then animates to the identity transform.
+  PerformLibraryButtonVisibilityAnimation(mini_views_, new_desk_button_,
+                                          begin_x - GetFirstMiniViewXOffset());
+}
+
 DeskMiniView* DesksBarView::FindMiniViewForDesk(const Desk* desk) const {
   for (auto* mini_view : mini_views_) {
     if (mini_view->desk() == desk)

ash/wm/desks/desks_bar_view.h

diff --git a/ash/wm/desks/desks_bar_view.h b/ash/wm/desks/desks_bar_view.h
index 5fdb868..e17c5c8a4 100644
--- a/ash/wm/desks/desks_bar_view.h
+++ b/ash/wm/desks/desks_bar_view.h
@@ -17,6 +17,8 @@
 
 namespace ash {
 
+class CrOSNextDefaultDeskButton;
+class CrOSNextDeskIconButton;
 class DesksBarScrollViewLayout;
 class DeskBarHoverObserver;
 class DeskDragProxy;
@@ -80,6 +82,14 @@
     return expanded_state_library_button_;
   }
 
+  CrOSNextDefaultDeskButton* default_desk_button() const {
+    return default_desk_button_;
+  }
+
+  CrOSNextDeskIconButton* new_desk_button() const { return new_desk_button_; }
+
+  CrOSNextDeskIconButton* library_button() const { return library_button_; }
+
   const std::vector<DeskMiniView*>& mini_views() const { return mini_views_; }
 
   const gfx::Point& last_dragged_item_screen_location() const {
@@ -197,11 +207,23 @@
   // and the ExpandedDesksBarButton on the desk bar's state.
   void UpdateDeskButtonsVisibility();
 
+  // Udates the visibility of the `default_desk_button_` and
+  // `vertical_dots_button_` on the desks bar's state.
+  // TODO(conniekxu): Remove `UpdateDeskButtonsVisibility`, replace it with this
+  // function, and rename this function by removing the prefix CrOSNext.
+  void UpdateDeskButtonsVisibilityCrOSNext();
+
   // Updates the visibility of the saved desk library button based on whether
   // the saved desk feature is enabled, the user has any saved desks and the
   // state of the desks bar.
   void UpdateLibraryButtonVisibility();
 
+  // Updates the visibility of the saved desk library button based on whether
+  // the saved desk feature is enabled and the user has any saved desks.
+  // TODO(conniekxu): Remove `UpdateLibraryButtonVisibility`, replace it with
+  // this function, and rename this function by removing the prefix CrOSNext.
+  void UpdateLibraryButtonVisibilityCrOSNext();
+
   // Returns the mini_view associated with `desk` or nullptr if no mini_view
   // has been created for it yet.
   DeskMiniView* FindMiniViewForDesk(const Desk* desk) const;
@@ -308,6 +330,16 @@
   ZeroStateIconButton* zero_state_library_button_ = nullptr;
   ExpandedDesksBarButton* expanded_state_library_button_ = nullptr;
 
+  // Buttons for the CrOS Next updated UI. They're added behind the feature flag
+  // Jellyroll.
+  // TODO(conniekxu): After CrOS Next is launched, replace
+  // `zero_state_default_desk_button_`, `zero_state_default_desk_button_`,
+  // `expanded_state_new_desk_button_`, `zero_state_library_button_` and
+  // `expanded_state_library_button_` with the buttons below.
+  CrOSNextDefaultDeskButton* default_desk_button_ = nullptr;
+  CrOSNextDeskIconButton* new_desk_button_ = nullptr;
+  CrOSNextDeskIconButton* library_button_ = nullptr;
+
   ScrollArrowButton* left_scroll_button_ = nullptr;
   ScrollArrowButton* right_scroll_button_ = nullptr;
   // Mini view whose preview is being dragged.

ash/wm/desks/desks_controller.cc

diff --git a/ash/wm/desks/desks_controller.cc b/ash/wm/desks/desks_controller.cc
index 0869f280..5afb9895 100644
--- a/ash/wm/desks/desks_controller.cc
+++ b/ash/wm/desks/desks_controller.cc
@@ -96,15 +96,13 @@
 constexpr char kCloseAllUndoHistogramName[] = "Ash.Desks.CloseAllUndo";
 constexpr char kCloseAllTotalHistogramName[] = "Ash.Desks.CloseAllTotal";
 constexpr char kRemoveDeskTypeHistogramName[] = "Ash.Desks.RemoveDeskType";
-constexpr char kNumberOfWindowsClosed[] = "Ash.Desks.NumberOfWindowsClosed";
+constexpr char kNumberOfWindowsClosed[] = "Ash.Desks.NumberOfWindowsClosed2";
 constexpr char kNumberOfWindowsClosedByButton[] =
-    "Ash.Desks.NumberOfWindowsClosed.Button";
+    "Ash.Desks.NumberOfWindowsClosed2.Button";
 constexpr char kNumberOfWindowsClosedByKeyboard[] =
-    "Ash.Desks.NumberOfWindowsClosed.Keyboard";
-constexpr char kNumberOfWindowsClosedBySaveAndRecall[] =
-    "Ash.Desks.NumberOfWindowsClosed.SaveRecall";
+    "Ash.Desks.NumberOfWindowsClosed2.Keyboard";
 constexpr char kNumberOfWindowsClosedByApi[] =
-    "Ash.Desks.NumberOfWindowsClosed.Api";
+    "Ash.Desks.NumberOfWindowsClosed2.Api";
 // Used for histograms from "Ash.Desks.NumberOfWindowsOnDesk_1" up to 16.
 constexpr char kNumberOfWindowsOnDeskHistogramPrefix[] =
     "Ash.Desks.NumberOfWindowsOnDesk_";
@@ -269,7 +267,8 @@
  public:
   RemovedDeskData(std::unique_ptr<Desk> desk,
                   int index,
-                  DesksCreationRemovalSource source)
+                  DesksCreationRemovalSource source,
+                  DeskCloseType type)
       : toast_id_(base::StringPrintf("UndoCloseAllToast_%d",
                                      ++g_close_desk_toast_counter)),
         was_active_(desk->is_active()),
@@ -279,7 +278,8 @@
                                  ->accessibility_controller()
                                  ->spoken_feedback()
                                  .enabled()),
-        source_(source) {
+        source_(source),
+        desk_close_type_(type) {
     desk_->set_is_desk_being_removed(true);
   }
 
@@ -302,6 +302,7 @@
   int index() const { return index_; }
   bool is_toast_persistent() const { return is_toast_persistent_; }
   DesksCreationRemovalSource desk_removal_source() const { return source_; }
+  DeskCloseType desk_close_type() const { return desk_close_type_; }
 
   std::unique_ptr<Desk> AcquireDesk() { return std::move(desk_); }
 
@@ -317,6 +318,8 @@
   const bool is_toast_persistent_;
 
   const DesksCreationRemovalSource source_;
+
+  const DeskCloseType desk_close_type_;
 };
 
 // Helper class which wraps around a OneShotTimer and used for recording how
@@ -1640,7 +1643,7 @@
 
   // Keep the removed desk's data alive until at least the end of this function.
   auto temporary_removed_desk = std::make_unique<RemovedDeskData>(
-      std::move(*iter), removed_desk_index, source);
+      std::move(*iter), removed_desk_index, source, close_type);
   auto* temporary_removed_desk_ptr = temporary_removed_desk.get();
   Desk* removed_desk = temporary_removed_desk_ptr->desk();
 
@@ -1862,11 +1865,18 @@
   non_const_desk->RecordAndResetConsecutiveDailyVisits(
       /*being_removed=*/true);
 
-  // Record number of windows being closed by desk removal.
-  UMA_HISTOGRAM_COUNTS_100(kNumberOfWindowsClosed,
-                           removed_desk->windows().size());
-  ReportClosedWindowsCountPerSourceHistogram(
-      removed_desk_data->desk_removal_source(), removed_desk->windows().size());
+  // Record number of windows being closed by close-all desk removal.
+  // Only record metric for close-all, not for combine desk action.
+  if (removed_desk_data->desk_close_type() == DeskCloseType::kCloseAllWindows ||
+      removed_desk_data->desk_close_type() ==
+          DeskCloseType::kCloseAllWindowsAndWait) {
+    base::UmaHistogramCounts100(kNumberOfWindowsClosed,
+                                removed_desk->windows().size());
+    ReportClosedWindowsCountPerSourceHistogram(
+        removed_desk_data->desk_removal_source(),
+        removed_desk->windows().size());
+  }
+
   ReportDesksCountHistogram();
   ReportNumberOfWindowsPerDeskHistogram();
 
@@ -2117,12 +2127,12 @@
     case DesksCreationRemovalSource::kKeyboard:
       desk_removal_source_histogram = kNumberOfWindowsClosedByKeyboard;
       break;
-    case DesksCreationRemovalSource::kSaveAndRecall:
-      desk_removal_source_histogram = kNumberOfWindowsClosedBySaveAndRecall;
-      break;
     case DesksCreationRemovalSource::kApi:
       desk_removal_source_histogram = kNumberOfWindowsClosedByApi;
       break;
+    // Skip recording for save&recall as windows are already closed before
+    // reaching here.
+    case DesksCreationRemovalSource::kSaveAndRecall:
     // Skip recording for source that can't close a desk.
     case DesksCreationRemovalSource::kDragToNewDeskButton:
     case DesksCreationRemovalSource::kLaunchTemplate:

ash/wm/desks/desks_unittests.cc

diff --git a/ash/wm/desks/desks_unittests.cc b/ash/wm/desks/desks_unittests.cc
index e401160..1423701 100644
--- a/ash/wm/desks/desks_unittests.cc
+++ b/ash/wm/desks/desks_unittests.cc
@@ -7958,6 +7958,7 @@
   };
 
   for (const auto& test_case : kTestCases) {
+    base::HistogramTester histogram_tester;
     SCOPED_TRACE(test_case.scope_trace);
     // Create two desks with one app window each.
     WindowHolder win1(CreateAppWindow());
@@ -8472,6 +8473,11 @@
       // Record undo toast expired
       histogram_tester.ExpectTotalCount("Ash.Desks.CloseAllTotal",
                                         ++undo_toast_expired_count);
+      // Record number of windows being closed.
+      histogram_tester.ExpectTotalCount("Ash.Desks.NumberOfWindowsClosed2", 0);
+      // Record number of windows being closed per source.
+      histogram_tester.ExpectTotalCount(
+          "Ash.Desks.NumberOfWindowsClosed2.Button", 0);
 
     } else {
       // Because undo toasts persist on hover, we need to move the cursor
@@ -8479,17 +8485,19 @@
       GetEventGenerator()->MoveMouseTo(gfx::Point(0, 0));
 
       // When we wait for the undo toast to expire, `desk_1` should be
-      // destroyed.
-      WaitForMilliseconds(ToastData::kDefaultToastDuration.InMilliseconds());
+      // destroyed. Wait a bit longer than the toast expire duration to avoid
+      // flakiness.
+      WaitForMilliseconds(ToastData::kDefaultToastDuration.InMilliseconds() +
+                          base::Seconds(1).InMilliseconds());
       // Record undo toast expired.
       histogram_tester.ExpectTotalCount("Ash.Desks.CloseAllTotal",
                                         ++undo_toast_expired_count);
       // Record number of windows being closed.
-      histogram_tester.ExpectUniqueSample("Ash.Desks.NumberOfWindowsClosed", 2,
+      histogram_tester.ExpectUniqueSample("Ash.Desks.NumberOfWindowsClosed2", 2,
                                           1);
       // Record number of windows being closed per source.
       histogram_tester.ExpectUniqueSample(
-          "Ash.Desks.NumberOfWindowsClosed.Button", 2, 1);
+          "Ash.Desks.NumberOfWindowsClosed2.Button", 2, 1);
     }
   }
 }
@@ -8683,6 +8691,64 @@
             window.window()->parent()->GetId());
 }
 
+TEST_P(DesksCloseAllTest, TestRecordingNumerOfClosedWindowsMetrics) {
+  struct {
+    const std::string scope_trace;
+    const DeskCloseType desk_close_type;
+  } kTestCases[] = {
+      {"Remove second desk with combine desks", DeskCloseType::kCombineDesks},
+      {"Remove second desk with close-all-and-wait",
+       DeskCloseType::kCloseAllWindowsAndWait},
+      {"Remove second desk with close-all", DeskCloseType::kCloseAllWindows},
+  };
+
+  for (const auto& test_case : kTestCases) {
+    base::HistogramTester histogram_tester;
+
+    SCOPED_TRACE(test_case.scope_trace);
+    WindowHolder win1(CreateAppWindow());
+
+    NewDesk();
+    auto* controller = DesksController::Get();
+    controller->SendToDeskAtIndex(win1.window(), 1);
+    Desk* desk = controller->desks()[1].get();
+
+    EnterOverview();
+
+    RemoveDesk(desk, test_case.desk_close_type);
+
+    switch (test_case.desk_close_type) {
+      case DeskCloseType::kCombineDesks:
+        histogram_tester.ExpectTotalCount("Ash.Desks.NumberOfWindowsClosed2",
+                                          0);
+        histogram_tester.ExpectTotalCount(
+            "Ash.Desks.NumberOfWindowsClosed2.Button", 0);
+        break;
+      // Wait and toast expired.
+      case DeskCloseType::kCloseAllWindowsAndWait:
+        // Because undo toasts persist on hover, we need to move the cursor
+        // outside of the undo toast to start the countdown for its expiration.
+        GetEventGenerator()->MoveMouseTo(gfx::Point(0, 0));
+        WaitForMilliseconds(ToastData::kDefaultToastDuration.InMilliseconds() +
+                            base::Seconds(1).InMilliseconds());
+        histogram_tester.ExpectTotalCount("Ash.Desks.NumberOfWindowsClosed2",
+                                          1);
+        histogram_tester.ExpectUniqueSample(
+            "Ash.Desks.NumberOfWindowsClosed2.Button", 1, 1);
+        break;
+
+      case DeskCloseType::kCloseAllWindows:
+        // `kCombineDesks` and `kCloseAllWindows` should both clear the removed
+        // desk immediately.
+        histogram_tester.ExpectTotalCount("Ash.Desks.NumberOfWindowsClosed2",
+                                          1);
+        histogram_tester.ExpectUniqueSample(
+            "Ash.Desks.NumberOfWindowsClosed2.Button", 1, 1);
+        break;
+    }
+  }
+}
+
 // TODO(afakhry): Add more tests:
 // - Always on top windows are not tracked by any desk.
 // - Reusing containers when desks are removed and created.

ash/wm/desks/root_window_desk_switch_animator.cc

diff --git a/ash/wm/desks/root_window_desk_switch_animator.cc b/ash/wm/desks/root_window_desk_switch_animator.cc
index 6ffe1047..36aa91e 100644
--- a/ash/wm/desks/root_window_desk_switch_animator.cc
+++ b/ash/wm/desks/root_window_desk_switch_animator.cc
@@ -620,7 +620,7 @@
 
   // If there is an existing transform, continue animating from there.
   gfx::Transform current_transform = animation_layer->transform();
-  DCHECK(current_transform.IsIdentityOr2DTranslation());
+  DCHECK(current_transform.IsIdentityOr2dTranslation());
   if (!current_transform.IsIdentity()) {
     // If the new layer is located on the left of the prior created layers,
     // shift the animation layer transform so that the content shown to users

ash/wm/desks/root_window_desk_switch_animator_unittest.cc

diff --git a/ash/wm/desks/root_window_desk_switch_animator_unittest.cc b/ash/wm/desks/root_window_desk_switch_animator_unittest.cc
index 7585414..6c940baa 100644
--- a/ash/wm/desks/root_window_desk_switch_animator_unittest.cc
+++ b/ash/wm/desks/root_window_desk_switch_animator_unittest.cc
@@ -52,7 +52,7 @@
   const gfx::Transform animating_layer_transform =
       use_target_transform ? animating_layer->GetTargetTransform()
                            : animating_layer->transform();
-  DCHECK(animating_layer_transform.IsIdentityOr2DTranslation());
+  DCHECK(animating_layer_transform.IsIdentityOr2dTranslation());
   return animating_layer_transform.MapRect(child_layer->bounds());
 }
 

ash/wm/tablet_mode/tablet_mode_multitask_menu.cc

diff --git a/ash/wm/tablet_mode/tablet_mode_multitask_menu.cc b/ash/wm/tablet_mode/tablet_mode_multitask_menu.cc
index 7d0883b..dd89af6 100644
--- a/ash/wm/tablet_mode/tablet_mode_multitask_menu.cc
+++ b/ash/wm/tablet_mode/tablet_mode_multitask_menu.cc
@@ -291,10 +291,9 @@
                           .id()) {
     return;
   }
-  // TODO(shidi): Will do the rotate transition on a separate cl. Close the
-  // menu at rotation for now.
-  if (changed_metrics & display::DisplayObserver::DISPLAY_METRIC_ROTATION)
-    event_handler_->ResetMultitaskMenu();
+  if (changed_metrics) {
+    AnimateFadeOut();
+  }
 }
 
 chromeos::MultitaskMenuView*

base/allocator/partition_allocator/tagging.h

diff --git a/base/allocator/partition_allocator/tagging.h b/base/allocator/partition_allocator/tagging.h
index 53332a1..548b9d4 100644
--- a/base/allocator/partition_allocator/tagging.h
+++ b/base/allocator/partition_allocator/tagging.h
@@ -65,10 +65,9 @@
 // They are designed to be callable without taking a branch. They are initially
 // set to no-op functions in tagging.cc, but can be replaced with MTE-capable
 // ones through InitializeMTEIfNeeded(). This is conceptually similar to an
-// ifunc (but less secure) - we do it this way for now because the CrazyLinker
-// (needed for supporting old Android versions) doesn't support them. Initial
-// solution should be good enough for fuzzing/debug, ideally needs fixing for
-// async deployment on end-user devices.
+// IFUNC, even though less secure. These function pointers were introduced to
+// support older Android releases. With the removal of support for Android M,
+// it became possible to use IFUNC instead.
 // TODO(bartekn): void* -> uintptr_t
 using RemaskPtrInternalFn = void*(void* ptr);
 using TagMemoryRangeIncrementInternalFn = void*(void* ptr, size_t size);

base/android/java/src/org/chromium/base/compat/ApiHelperForM.java

diff --git a/base/android/java/src/org/chromium/base/compat/ApiHelperForM.java b/base/android/java/src/org/chromium/base/compat/ApiHelperForM.java
index d075fd3..e7d617d 100644
--- a/base/android/java/src/org/chromium/base/compat/ApiHelperForM.java
+++ b/base/android/java/src/org/chromium/base/compat/ApiHelperForM.java
@@ -6,7 +6,6 @@
 
 import android.app.Activity;
 import android.app.AlarmManager;
-import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -173,24 +172,8 @@
         return powerManager.isDeviceIdleMode();
     }
 
-    /** See {@link Notification.Builder#setSmallIcon(Icon)}. */
-    public static Notification.Builder setSmallIcon(Notification.Builder builder, Icon icon) {
-        return builder.setSmallIcon(icon);
-    }
-
-    /** See {@link Icon#createWithResource(Context, int)}. */
-    public static Icon createIconWithResource(Context context, int resId) {
-        return Icon.createWithResource(context, resId);
-    }
-
     /** See {@link Context#getSystemService(Class<T>)}. */
     public static <T> T getSystemService(Context context, Class<T> serviceClass) {
         return context.getSystemService(serviceClass);
     }
-
-    /** See {@link Notification.Action.Builder#Builder(Icon, CharSequence, PendingIntent)}. */
-    public static Notification.Action.Builder newNotificationActionBuilder(
-            Icon icon, CharSequence title, PendingIntent intent) {
-        return new Notification.Action.Builder(icon, title, intent);
-    }
 }

base/android/java/src/org/chromium/base/compat/ApiHelperForN.java

diff --git a/base/android/java/src/org/chromium/base/compat/ApiHelperForN.java b/base/android/java/src/org/chromium/base/compat/ApiHelperForN.java
index 464ad82..221960e 100644
--- a/base/android/java/src/org/chromium/base/compat/ApiHelperForN.java
+++ b/base/android/java/src/org/chromium/base/compat/ApiHelperForN.java
@@ -5,9 +5,6 @@
 package org.chromium.base.compat;
 
 import android.app.Activity;
-import android.app.Notification;
-import android.app.job.JobInfo;
-import android.app.job.JobScheduler;
 import android.content.ClipData;
 import android.content.ComponentName;
 import android.content.pm.PackageManager;
@@ -20,10 +17,6 @@
 import android.view.PointerIcon;
 import android.view.View;
 import android.view.View.DragShadowBuilder;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.RemoteViews;
 
 import androidx.annotation.RequiresApi;
 
@@ -36,20 +29,6 @@
 public final class ApiHelperForN {
     private ApiHelperForN() {}
 
-    /**
-     * See {@link WebViewClient#shouldOverrideUrlLoading(WebView, WebResourceRequest)}, which was
-     * added in N.
-     */
-    public static boolean shouldOverrideUrlLoading(
-            WebViewClient webViewClient, WebView webView, WebResourceRequest request) {
-        return webViewClient.shouldOverrideUrlLoading(webView, request);
-    }
-
-    /** See {@link JobScheduler#getPendingJob(int)}. */
-    public static JobInfo getPendingJob(JobScheduler scheduler, int jobId) {
-        return scheduler.getPendingJob(jobId);
-    }
-
     /** See {@link View#startDragAndDrop(ClipData, DragShadowBuilder, Object, int)}. */
     public static boolean startDragAndDrop(View view, ClipData data,
             DragShadowBuilder shadowBuilder, Object myLocalState, int flags) {
@@ -82,18 +61,6 @@
         return Process.getStartUptimeMillis();
     }
 
-    /** See {@link Notification.Builder#setCustomContentView(RemoteViews)}. */
-    public static Notification.Builder setCustomContentView(
-            Notification.Builder builder, RemoteViews views) {
-        return builder.setCustomContentView(views);
-    }
-
-    /** See {@link Notification.Builder#setCustomBigContentView(RemoteViews)}. */
-    public static Notification.Builder setCustomBigContentView(
-            Notification.Builder builder, RemoteViews view) {
-        return builder.setCustomBigContentView(view);
-    }
-
     /** See {@link ConnectivityManager#getRestrictBackgroundStatus(ConnectivityManager)}. */
     public static int getRestrictBackgroundStatus(ConnectivityManager cm) {
         return cm.getRestrictBackgroundStatus();

base/debug/activity_tracker.cc

diff --git a/base/debug/activity_tracker.cc b/base/debug/activity_tracker.cc
index bc00389..c1d4d4b1 100644
--- a/base/debug/activity_tracker.cc
+++ b/base/debug/activity_tracker.cc
@@ -334,22 +334,18 @@
     : ActivityUserData(nullptr, 0, static_cast<ProcessId>(-1)) {}
 
 ActivityUserData::ActivityUserData(void* memory, size_t size, ProcessId pid)
-    : memory_(reinterpret_cast<char*>(memory)),
-      available_(bits::AlignDown(size, kMemoryAlignment)),
-      header_(reinterpret_cast<MemoryHeader*>(memory)),
-      orig_data_id(0),
-      orig_process_id(0),
-      orig_create_stamp(0) {
-  // It's possible that no user data is being stored.
-  if (!memory_)
+    : memory_(reinterpret_cast<char*>(memory),
+              bits::AlignDown(size, kMemoryAlignment)) {
+  // It's possible that no user data is being stored, not even a header.
+  if (memory_.size() < sizeof(MemoryHeader)) {
     return;
+  }
 
-  static_assert(0 == sizeof(MemoryHeader) % kMemoryAlignment, "invalid header");
-  DCHECK_LT(sizeof(MemoryHeader), available_);
+  header_ = reinterpret_cast<MemoryHeader*>(memory_.data());
+  memory_ = memory_.subspan(sizeof(MemoryHeader));
+
   if (header_->owner.data_id.load(std::memory_order_acquire) == 0)
     header_->owner.Release_Initialize(pid);
-  memory_ += sizeof(MemoryHeader);
-  available_ -= sizeof(MemoryHeader);
 
   // Make a copy of identifying information for later comparison.
   *const_cast<uint32_t*>(&orig_data_id) =
@@ -384,12 +380,12 @@
       case RAW_VALUE:
       case STRING_VALUE:
         value.long_value_ = std::string(
-            reinterpret_cast<char*>(entry.second.memory.get()), size);
+            reinterpret_cast<char*>(entry.second.memory.data()), size);
         break;
       case RAW_VALUE_REFERENCE:
       case STRING_VALUE_REFERENCE: {
         ReferenceRecord* ref =
-            reinterpret_cast<ReferenceRecord*>(entry.second.memory.get());
+            reinterpret_cast<ReferenceRecord*>(entry.second.memory.data());
         value.ref_value_ = StringPiece(
             reinterpret_cast<char*>(static_cast<uintptr_t>(ref->address)),
             static_cast<size_t>(ref->size));
@@ -397,13 +393,13 @@
       case BOOL_VALUE:
       case CHAR_VALUE:
         value.short_value_ = static_cast<uint64_t>(
-            reinterpret_cast<std::atomic<char>*>(entry.second.memory.get())
+            reinterpret_cast<std::atomic<char>*>(entry.second.memory.data())
                 ->load(std::memory_order_relaxed));
         break;
       case SIGNED_VALUE:
       case UNSIGNED_VALUE:
         value.short_value_ =
-            reinterpret_cast<std::atomic<uint64_t>*>(entry.second.memory.get())
+            reinterpret_cast<std::atomic<uint64_t>*>(entry.second.memory.data())
                 ->load(std::memory_order_relaxed);
         break;
       case END_OF_VALUES:  // Included for completeness purposes.
@@ -418,7 +414,7 @@
   // been reused for another purpose. Entries added since the first import
   // will be ignored here but will be returned if another snapshot is created.
   ImportExistingData();
-  if (!memory_) {
+  if (!header_) {
     output_snapshot->clear();
     return false;
   }
@@ -455,8 +451,9 @@
   DCHECK_LT(name.length(), kMaxUserDataNameLength);
 
   // It's possible that no user data is being stored.
-  if (!memory_)
+  if (!header_) {
     return nullptr;
+  }
 
   ValueInfo* info;
   auto existing = values_.find(name);
@@ -477,13 +474,14 @@
     // The "base size" is the size of the header and (padded) string key. Stop
     // now if there's not room enough for even this.
     size_t base_size = sizeof(FieldHeader) + name_extent;
-    if (base_size > available_)
+    if (base_size > memory_.size()) {
       return nullptr;
+    }
 
     // The "full size" is the size for storing the entire value.  This must fit
     // into a uint16_t.
     size_t full_size =
-        std::min({base_size + value_extent, available_,
+        std::min({base_size + value_extent, memory_.size(),
                   bits::AlignDown(size_t{std::numeric_limits<uint16_t>::max()},
                                   kMemoryAlignment)});
 
@@ -506,9 +504,11 @@
     }
 
     // Allocate a chunk of memory.
-    FieldHeader* header = reinterpret_cast<FieldHeader*>(memory_.get());
-    memory_ += full_size;
-    available_ -= full_size;
+    const base::span<char> chunk = memory_.first(full_size);
+    memory_ = memory_.subspan(full_size);
+
+    FieldHeader* header = reinterpret_cast<FieldHeader*>(chunk.data());
+    const base::span<char> name_value_span = chunk.subspan(sizeof(FieldHeader));
 
     // Datafill the header and name records. Memory must be zeroed. The |type|
     // is written last, atomically, to release all the other values.
@@ -516,21 +516,21 @@
     DCHECK_EQ(0, header->value_size.load(std::memory_order_relaxed));
     header->name_size = static_cast<uint8_t>(name_size);
     header->record_size = static_cast<uint16_t>(full_size);
-    char* name_memory = reinterpret_cast<char*>(header) + sizeof(FieldHeader);
-    void* value_memory =
-        reinterpret_cast<char*>(header) + sizeof(FieldHeader) + name_extent;
-    memcpy(name_memory, name.data(), name_size);
+
+    const base::span<char> name_span = name_value_span.first(name_extent);
+    const base::span<char> value_span = name_value_span.subspan(name_extent);
+    memcpy(name_span.data(), name.data(), name_size);
     header->type.store(type, std::memory_order_release);
 
     // Create an entry in |values_| so that this field can be found and changed
     // later on without having to allocate new entries.
-    StringPiece persistent_name(name_memory, name_size);
+    StringPiece persistent_name(name_span.data(), name_size);
     auto inserted =
         values_.insert(std::make_pair(persistent_name, ValueInfo()));
     DCHECK(inserted.second);  // True if inserted, false if existed.
     info = &inserted.first->second;
     info->name = persistent_name;
-    info->memory = value_memory;
+    info->memory = value_span;
     info->size_ptr = &header->value_size;
     info->extent = full_size - sizeof(FieldHeader) - name_extent;
     info->type = type;
@@ -542,14 +542,14 @@
   DCHECK_EQ(type, info->type);
   size = std::min(size, info->extent);
   info->size_ptr->store(0, std::memory_order_seq_cst);
-  memcpy(info->memory, memory, size);
+  memcpy(info->memory.data(), memory, size);
   // This cast is safe because `size` <= info->extent < `full_size`, and
   // `full_size` fits in a uint16_t.
   info->size_ptr->store(static_cast<uint16_t>(size), std::memory_order_release);
 
   // The address of the stored value is returned so it can be re-used by the
   // caller, so long as it's done in an atomic way.
-  return info->memory;
+  return info->memory.data();
 }
 
 void ActivityUserData::SetReference(StringPiece name,
@@ -564,17 +564,19 @@
 
 void ActivityUserData::ImportExistingData() const {
   // It's possible that no user data is being stored.
-  if (!memory_)
+  if (!header_) {
     return;
+  }
 
-  while (available_ > sizeof(FieldHeader)) {
-    FieldHeader* header = reinterpret_cast<FieldHeader*>(memory_.get());
+  while (memory_.size() > sizeof(FieldHeader)) {
+    FieldHeader* header = reinterpret_cast<FieldHeader*>(memory_.data());
     ValueType type =
         static_cast<ValueType>(header->type.load(std::memory_order_acquire));
     if (type == END_OF_VALUES)
       return;
-    if (header->record_size > available_)
+    if (header->record_size > memory_.size()) {
       return;
+    }
 
     size_t value_offset = bits::AlignUp(sizeof(FieldHeader) + header->name_size,
                                         kMemoryAlignment);
@@ -585,25 +587,27 @@
     if (value_offset + header->value_size > header->record_size)
       return;
 
+    auto name_span = memory_.subspan(sizeof(FieldHeader), header->name_size);
+
     ValueInfo info;
-    info.name = StringPiece(memory_ + sizeof(FieldHeader), header->name_size);
+    info.name = StringPiece(name_span.data(), name_span.size());
     info.type = type;
-    info.memory = memory_ + value_offset;
+    info.memory = memory_.subspan(value_offset);
     info.size_ptr = &header->value_size;
     info.extent = header->record_size - value_offset;
 
     StringPiece key(info.name);
     values_.insert(std::make_pair(key, std::move(info)));
 
-    memory_ += header->record_size;
-    available_ -= header->record_size;
+    memory_ = memory_.subspan(header->record_size);
   }
 
   // Check if memory has been completely reused.
   if (header_->owner.data_id.load(std::memory_order_acquire) != orig_data_id ||
       static_cast<ProcessId>(header_->owner.process_id) != orig_process_id ||
       header_->owner.create_stamp != orig_create_stamp) {
-    memory_ = nullptr;
+    memory_ = base::span<char>();
+    header_ = nullptr;
     values_.clear();
   }
 }

base/debug/activity_tracker.h

diff --git a/base/debug/activity_tracker.h b/base/debug/activity_tracker.h
index ceb8a53..07c0ed51 100644
--- a/base/debug/activity_tracker.h
+++ b/base/debug/activity_tracker.h
@@ -20,6 +20,7 @@
 #include "base/base_export.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
+#include "base/containers/span.h"
 #include "base/dcheck_is_on.h"
 #include "base/gtest_prod_util.h"
 #include "base/location.h"
@@ -516,6 +517,9 @@
     OwningProcess owner;  // Information about the creating process.
   };
 
+  static_assert(sizeof(MemoryHeader) % kMemoryAlignment == 0,
+                "Memory following header must also be aligned");
+
   // Header to a key/value record held in persistent memory.
   struct FieldHeader {
     FieldHeader();
@@ -542,7 +546,7 @@
 
     StringPiece name;                 // The "key" of the record.
     ValueType type;                   // The type of the value.
-    raw_ptr<void> memory;             // Where the "value" is held.
+    base::span<char> memory;          // Where the "value" is held.
     raw_ptr<std::atomic<uint16_t>>
         size_ptr;                     // Address of the actual size of value.
     size_t extent;                    // The total storage of the value,
@@ -568,17 +572,17 @@
   // Information about the memory block in which new data can be stored. These
   // are "mutable" because they change even on "const" objects that are just
   // skipping already set values.
-  mutable raw_ptr<char> memory_;
-  mutable size_t available_;
+  mutable base::span<char> memory_;
 
   // A pointer to the memory header for this instance.
-  const raw_ptr<MemoryHeader> header_;
+  mutable raw_ptr<MemoryHeader> header_ = nullptr;
 
   // These hold values used when initially creating the object. They are
   // compared against current header values to check for outside changes.
-  const uint32_t orig_data_id;
-  const ProcessId orig_process_id;
-  const int64_t orig_create_stamp;
+  // They may be updated by casting away the const in the constructor.
+  const uint32_t orig_data_id = 0;
+  const ProcessId orig_process_id = 0;
+  const int64_t orig_create_stamp = 0;
 };
 
 // This class manages tracking a stack of activities for a single thread in

base/debug/activity_tracker_unittest.cc

diff --git a/base/debug/activity_tracker_unittest.cc b/base/debug/activity_tracker_unittest.cc
index 0938c69b..317e4f5 100644
--- a/base/debug/activity_tracker_unittest.cc
+++ b/base/debug/activity_tracker_unittest.cc
@@ -118,44 +118,44 @@
   memset(buffer, 0, sizeof(buffer));
   ActivityUserData data(buffer, sizeof(buffer));
   size_t space = sizeof(buffer) - sizeof(ActivityUserData::MemoryHeader);
-  ASSERT_EQ(space, data.available_);
+  ASSERT_EQ(space, data.memory_.size());
 
   data.SetInt("foo", 1);
   space -= 24;
-  ASSERT_EQ(space, data.available_);
+  ASSERT_EQ(space, data.memory_.size());
 
   data.SetUint("b", 1U);  // Small names fit beside header in a word.
   space -= 16;
-  ASSERT_EQ(space, data.available_);
+  ASSERT_EQ(space, data.memory_.size());
 
   data.Set("c", buffer, 10);
   space -= 24;
-  ASSERT_EQ(space, data.available_);
+  ASSERT_EQ(space, data.memory_.size());
 
   data.SetString("dear john", "it's been fun");
   space -= 32;
-  ASSERT_EQ(space, data.available_);
+  ASSERT_EQ(space, data.memory_.size());
 
   data.Set("c", buffer, 20);
-  ASSERT_EQ(space, data.available_);
+  ASSERT_EQ(space, data.memory_.size());
 
   data.SetString("dear john", "but we're done together");
-  ASSERT_EQ(space, data.available_);
+  ASSERT_EQ(space, data.memory_.size());
 
   data.SetString("dear john", "bye");
-  ASSERT_EQ(space, data.available_);
+  ASSERT_EQ(space, data.memory_.size());
 
   data.SetChar("d", 'x');
   space -= 8;
-  ASSERT_EQ(space, data.available_);
+  ASSERT_EQ(space, data.memory_.size());
 
   data.SetBool("ee", true);
   space -= 16;
-  ASSERT_EQ(space, data.available_);
+  ASSERT_EQ(space, data.memory_.size());
 
   data.SetString("f", "");
   space -= 8;
-  ASSERT_EQ(space, data.available_);
+  ASSERT_EQ(space, data.memory_.size());
 }
 
 TEST_F(ActivityTrackerTest, PushPopTest) {

build/fuchsia/test/common.py

diff --git a/build/fuchsia/test/common.py b/build/fuchsia/test/common.py
index ad5a5e22..93c53a589 100644
--- a/build/fuchsia/test/common.py
+++ b/build/fuchsia/test/common.py
@@ -13,7 +13,7 @@
 from argparse import ArgumentParser
 from typing import Iterable, List, Optional
 
-from compatible_utils import get_ssh_prefix, get_host_arch, running_unattended
+from compatible_utils import get_ssh_prefix, get_host_arch
 
 DIR_SRC_ROOT = os.path.abspath(
     os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, os.pardir))
@@ -26,14 +26,6 @@
 # |FFX_ISOLATE_DIR| when running ffx commands in E2E testing scripts.
 _FFX_ISOLATE_DIR = None
 
-# TODO(crbug.com/1280705): Remove each entry when they are migrated to v2.
-_V1_PACKAGE_LIST = [
-    'chrome_v1',
-    'web_engine',
-    'web_engine_with_webui',
-    'web_runner',
-]
-
 
 def set_ffx_isolate_dir(isolate_dir: str) -> None:
     """Overwrites |_FFX_ISOLATE_DIR|."""
@@ -256,10 +248,7 @@
     """Ensure that all |packages| are installed on a device."""
 
     ssh_prefix = get_ssh_prefix(get_ssh_address(target_id))
-
-    # Garbage collection for swarming bots.
-    if running_unattended():
-        subprocess.run(ssh_prefix + ['--', 'pkgctl', 'gc'], check=False)
+    subprocess.run(ssh_prefix + ['--', 'pkgctl', 'gc'], check=False)
 
     for package in packages:
         resolve_cmd = [

build/fuchsia/test/run_test.py

diff --git a/build/fuchsia/test/run_test.py b/build/fuchsia/test/run_test.py
index f7cfe7bf..680fc6b 100755
--- a/build/fuchsia/test/run_test.py
+++ b/build/fuchsia/test/run_test.py
@@ -23,6 +23,7 @@
 from run_executable_test import create_executable_test_runner, \
                                 register_executable_test_args
 from run_telemetry_test import TelemetryTestRunner
+from run_webpage_test import WebpageTestRunner
 from serve_repo import register_serve_args, serve_repository
 from start_emulator import create_emulator_from_args, register_emulator_args
 from test_runner import TestRunner
@@ -39,6 +40,9 @@
     if runner_args.test_type in ['gpu', 'perf']:
         return TelemetryTestRunner(runner_args.test_type, runner_args.out_dir,
                                    test_args, runner_args.target_id)
+    if runner_args.test_type in ['webpage']:
+        return WebpageTestRunner(runner_args.out_dir, test_args,
+                                 runner_args.target_id)
     return create_executable_test_runner(runner_args, test_args)
 
 

build/fuchsia/test/run_webpage_test.py

diff --git a/build/fuchsia/test/run_webpage_test.py b/build/fuchsia/test/run_webpage_test.py
new file mode 100644
index 0000000..e89282f
--- /dev/null
+++ b/build/fuchsia/test/run_webpage_test.py
@@ -0,0 +1,61 @@
+# Copyright 2023 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""Implements commands for running webpage tests."""
+
+import argparse
+import logging
+import time
+
+from typing import List, Optional
+
+from common import run_continuous_ffx_command
+from test_runner import TestRunner
+
+
+class WebpageTestRunner(TestRunner):
+    """Test runner for running GPU tests."""
+
+    def __init__(self, out_dir: str, test_args: List[str],
+                 target_id: Optional[str]) -> None:
+        parser = argparse.ArgumentParser()
+        parser.add_argument(
+            '--browser',
+            choices=['web-engine-shell', 'chrome'],
+            help='The browser to use for Telemetry based tests.')
+        args, _ = parser.parse_known_args(test_args)
+
+        if args.browser == 'web-engine-shell':
+            packages = ['web_engine_shell']
+        else:
+            packages = ['chrome']
+
+        super().__init__(out_dir, test_args, packages, target_id)
+
+    def run_test(self):
+        browser_cmd = [
+            'test',
+            'run',
+            '-t',
+            '3600',  # Keep the webpage running for an hour.
+            f'fuchsia-pkg://fuchsia.com/{self._packages[0]}#meta/'
+            f'{self._packages[0]}.cm'
+        ]
+        browser_cmd.extend([
+            '--', '--web-engine-package-name=web_engine_with_webui',
+            '--use-web-instance', '--enable-web-instance-tmp', '--with-webui'
+        ])
+        if self._test_args:
+            browser_cmd.extend(self._test_args)
+        logging.info('Starting %s', self._packages[0])
+        try:
+            browser_proc = run_continuous_ffx_command(browser_cmd)
+            while True:
+                time.sleep(10000)
+        except KeyboardInterrupt:
+            logging.info('Ctrl-C received; shutting down the webpage.')
+            browser_proc.kill()
+        except SystemExit:
+            logging.info('SIGTERM received; shutting down the webpage.')
+            browser_proc.kill()
+        return browser_proc

build/rust/tests/BUILD.gn

diff --git a/build/rust/tests/BUILD.gn b/build/rust/tests/BUILD.gn
index 904b835..94aaad0 100644
--- a/build/rust/tests/BUILD.gn
+++ b/build/rust/tests/BUILD.gn
@@ -23,6 +23,7 @@
   # All the rest require Rust.
   if (toolchain_has_rust) {
     deps += [
+      "test_aliased_deps",
       "test_cpp_including_rust",
       "test_rlib_crate:target1",
       "test_rlib_crate:target2",
@@ -38,6 +39,7 @@
     if (can_build_rust_unit_tests) {
       deps += [
         "bindgen_test:bindgen_test_lib_unittests",
+        "test_aliased_deps:test_aliased_deps_unittests",
         "test_cpp_including_rust:test_cpp_including_rust_unittests",
         "test_rlib_crate:target1_test_rlib_crate_v0_2_unittests",
         "test_rlib_crate:target2_test_rlib_crate_v0_2_unittests",
@@ -67,7 +69,7 @@
     }
     if (rustc_can_link) {
       deps += [
-        "test_aliased_deps",
+        "test_aliased_deps:test_aliased_deps_exe",
         "test_bin_crate",
         "test_rlib_crate:test_rlib_crate_associated_bin",
         "test_rust_exe",

build/rust/tests/test_aliased_deps/BUILD.gn

diff --git a/build/rust/tests/test_aliased_deps/BUILD.gn b/build/rust/tests/test_aliased_deps/BUILD.gn
index 705852d..85131c6 100644
--- a/build/rust/tests/test_aliased_deps/BUILD.gn
+++ b/build/rust/tests/test_aliased_deps/BUILD.gn
@@ -2,11 +2,20 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/rust.gni")
 import("//build/rust/rust_executable.gni")
 import("//build/rust/rust_static_library.gni")
 
-rust_executable("test_aliased_deps") {
-  crate_root = "main.rs"
+if (rustc_can_link) {
+  rust_executable("test_aliased_deps_exe") {
+    crate_root = "main.rs"
+    sources = [ crate_root ]
+    deps = [ ":test_aliased_deps" ]
+  }
+}
+
+rust_static_library("test_aliased_deps") {
+  crate_root = "lib.rs"
   sources = [ crate_root ]
   deps = [ ":real_name" ]
   aliased_deps = {
@@ -14,6 +23,7 @@
     # actual rlib in `rust_static_library()`.
     other_name = ":real_name__rlib"
   }
+  build_native_rust_unit_tests = true
 }
 
 rust_static_library("real_name") {

build/rust/tests/test_aliased_deps/lib.rs

diff --git a/build/rust/tests/test_aliased_deps/lib.rs b/build/rust/tests/test_aliased_deps/lib.rs
new file mode 100644
index 0000000..dcaa343
--- /dev/null
+++ b/build/rust/tests/test_aliased_deps/lib.rs
@@ -0,0 +1,11 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+pub use other_name;
+
+#[cfg(test)]
+#[test]
+fn test_add_from_renamed_dep() {
+    assert_eq!(other_name::add(2, 3), 5);
+}

build/rust/tests/test_aliased_deps/main.rs

diff --git a/build/rust/tests/test_aliased_deps/main.rs b/build/rust/tests/test_aliased_deps/main.rs
index 49fadc0..8f33abe 100644
--- a/build/rust/tests/test_aliased_deps/main.rs
+++ b/build/rust/tests/test_aliased_deps/main.rs
@@ -3,5 +3,5 @@
 // found in the LICENSE file.
 
 fn main() {
-    other_name::hello_world();
+    test_aliased_deps::other_name::hello_world();
 }

build/rust/tests/test_aliased_deps/real_name.rs

diff --git a/build/rust/tests/test_aliased_deps/real_name.rs b/build/rust/tests/test_aliased_deps/real_name.rs
index e2374948..15f084f3 100644
--- a/build/rust/tests/test_aliased_deps/real_name.rs
+++ b/build/rust/tests/test_aliased_deps/real_name.rs
@@ -5,3 +5,7 @@
 pub fn hello_world() {
     println!("hello world");
 }
+
+pub fn add(a: u32, b: u32) -> u32 {
+    a + b
+}

cc/metrics/frame_sequence_metrics_unittest.cc

diff --git a/cc/metrics/frame_sequence_metrics_unittest.cc b/cc/metrics/frame_sequence_metrics_unittest.cc
index 1b9f83ef..9740397 100644
--- a/cc/metrics/frame_sequence_metrics_unittest.cc
+++ b/cc/metrics/frame_sequence_metrics_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "build/build_config.h"
 #include "cc/metrics/frame_sequence_tracker.h"
 
 #include "base/test/metrics/histogram_tester.h"
@@ -37,7 +38,15 @@
 }
 
 #if DCHECK_IS_ON()
-TEST(FrameSequenceMetricsTest, ScrollingThreadMergeMetrics) {
+// Test is disabled due to flakiness on ChromeOS/Linux and Fuchsia.
+// TODO(crbug.com/1404779): Rehabilitate this test.
+// TODO(crbug.com/1404779): Re-enable this test
+#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS)
+#define MAYBE_ScrollingThreadMergeMetrics DISABLED_ScrollingThreadMergeMetrics
+#else
+#define MAYBE_ScrollingThreadMergeMetrics ScrollingThreadMergeMetrics
+#endif
+TEST(FrameSequenceMetricsTest, MAYBE_ScrollingThreadMergeMetrics) {
   FrameSequenceMetrics first(FrameSequenceTrackerType::kTouchScroll, nullptr);
   first.SetScrollingThread(FrameInfo::SmoothEffectDrivingThread::kCompositor);
   first.impl_throughput().frames_expected = 20;

cc/paint/paint_op.cc

diff --git a/cc/paint/paint_op.cc b/cc/paint/paint_op.cc
index 742ce5c..bacfb9e 100644
--- a/cc/paint/paint_op.cc
+++ b/cc/paint/paint_op.cc
@@ -9,7 +9,7 @@
 #include <utility>
 #include <vector>
 
-#include "base/bind.h"
+#include "base/functional/function_ref.h"
 #include "base/memory/raw_ptr.h"
 #include "base/notreached.h"
 #include "base/types/optional_util.h"
@@ -233,15 +233,26 @@
     g_raster_with_flags_functions[kNumOpTypes] = {TYPES(M)};
 #undef M
 
-using SerializeFunction = size_t (*)(const PaintOp* op,
-                                     void* memory,
-                                     size_t size,
-                                     const PaintOp::SerializeOptions& options,
-                                     const PaintFlags* flags_to_serialize,
-                                     const SkM44& current_ctm,
-                                     const SkM44& original_ctm);
-
-#define M(T) &T::Serialize,
+using SerializeFunction = void (*)(const PaintOp& op,
+                                   PaintOpWriter& writer,
+                                   const PaintFlags* flags_to_serialize,
+                                   const SkM44& current_ctm,
+                                   const SkM44& original_ctm);
+template <typename T>
+void Serialize(const PaintOp& op,
+               PaintOpWriter& writer,
+               const PaintFlags* flags_to_serialize,
+               const SkM44& current_ctm,
+               const SkM44& original_ctm) {
+  if (T::kHasPaintFlags && !flags_to_serialize) {
+    const auto& op_with_flags = static_cast<const PaintOpWithFlags&>(op);
+    flags_to_serialize = &op_with_flags.flags;
+  }
+  const T& op_t = static_cast<const T&>(op);
+  DCHECK(op_t.IsValid());
+  op_t.Serialize(writer, flags_to_serialize, current_ctm, original_ctm);
+}
+#define M(T) &Serialize<T>,
 static const SerializeFunction g_serialize_functions[kNumOpTypes] = {TYPES(M)};
 #undef M
 
@@ -374,294 +385,174 @@
   return os << PaintOpTypeToString(type);
 }
 
-size_t AnnotateOp::Serialize(const PaintOp* base_op,
-                             void* memory,
-                             size_t size,
-                             const SerializeOptions& options,
-                             const PaintFlags* flags_to_serialize,
-                             const SkM44& current_ctm,
-                             const SkM44& original_ctm) {
-  auto* op = static_cast<const AnnotateOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  helper.Write(op->annotation_type);
-  helper.Write(op->rect);
-  helper.Write(op->data);
-  return helper.size();
-}
-
-size_t ClipPathOp::Serialize(const PaintOp* base_op,
-                             void* memory,
-                             size_t size,
-                             const SerializeOptions& options,
-                             const PaintFlags* flags_to_serialize,
-                             const SkM44& current_ctm,
-                             const SkM44& original_ctm) {
-  auto* op = static_cast<const ClipPathOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  helper.Write(op->path, op->use_cache);
-  helper.Write(op->op);
-  helper.Write(op->antialias);
-  return helper.size();
-}
-
-size_t ClipRectOp::Serialize(const PaintOp* base_op,
-                             void* memory,
-                             size_t size,
-                             const SerializeOptions& options,
-                             const PaintFlags* flags_to_serialize,
-                             const SkM44& current_ctm,
-                             const SkM44& original_ctm) {
-  auto* op = static_cast<const ClipRectOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  helper.Write(op->rect);
-  helper.Write(op->op);
-  helper.Write(op->antialias);
-  return helper.size();
-}
-
-size_t ClipRRectOp::Serialize(const PaintOp* base_op,
-                              void* memory,
-                              size_t size,
-                              const SerializeOptions& options,
-                              const PaintFlags* flags_to_serialize,
-                              const SkM44& current_ctm,
-                              const SkM44& original_ctm) {
-  auto* op = static_cast<const ClipRRectOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  helper.Write(op->rrect);
-  helper.Write(op->op);
-  helper.Write(op->antialias);
-  return helper.size();
-}
-
-size_t ConcatOp::Serialize(const PaintOp* base_op,
-                           void* memory,
-                           size_t size,
-                           const SerializeOptions& options,
+void AnnotateOp::Serialize(PaintOpWriter& writer,
                            const PaintFlags* flags_to_serialize,
                            const SkM44& current_ctm,
-                           const SkM44& original_ctm) {
-  auto* op = static_cast<const ConcatOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  helper.Write(op->matrix);
-  return helper.size();
+                           const SkM44& original_ctm) const {
+  writer.Write(annotation_type);
+  writer.Write(rect);
+  writer.Write(data);
 }
 
-size_t CustomDataOp::Serialize(const PaintOp* base_op,
-                               void* memory,
-                               size_t size,
-                               const SerializeOptions& options,
-                               const PaintFlags* flags_to_serialize,
-                               const SkM44& current_ctm,
-                               const SkM44& original_ctm) {
-  auto* op = static_cast<const CustomDataOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  helper.Write(op->id);
-  return helper.size();
+void ClipPathOp::Serialize(PaintOpWriter& writer,
+                           const PaintFlags* flags_to_serialize,
+                           const SkM44& current_ctm,
+                           const SkM44& original_ctm) const {
+  writer.Write(path, use_cache);
+  writer.Write(op);
+  writer.Write(antialias);
 }
 
-size_t DrawColorOp::Serialize(const PaintOp* base_op,
-                              void* memory,
-                              size_t size,
-                              const SerializeOptions& options,
-                              const PaintFlags* flags_to_serialize,
-                              const SkM44& current_ctm,
-                              const SkM44& original_ctm) {
-  auto* op = static_cast<const DrawColorOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  helper.Write(op->color);
-  helper.Write(op->mode);
-  return helper.size();
+void ClipRectOp::Serialize(PaintOpWriter& writer,
+                           const PaintFlags* flags_to_serialize,
+                           const SkM44& current_ctm,
+                           const SkM44& original_ctm) const {
+  writer.Write(rect);
+  writer.Write(op);
+  writer.Write(antialias);
 }
 
-size_t DrawDRRectOp::Serialize(const PaintOp* base_op,
-                               void* memory,
-                               size_t size,
-                               const SerializeOptions& options,
-                               const PaintFlags* flags_to_serialize,
-                               const SkM44& current_ctm,
-                               const SkM44& original_ctm) {
-  auto* op = static_cast<const DrawDRRectOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  if (!flags_to_serialize)
-    flags_to_serialize = &op->flags;
-  helper.Write(*flags_to_serialize, current_ctm);
-  helper.Write(op->outer);
-  helper.Write(op->inner);
-  return helper.size();
+void ClipRRectOp::Serialize(PaintOpWriter& writer,
+                            const PaintFlags* flags_to_serialize,
+                            const SkM44& current_ctm,
+                            const SkM44& original_ctm) const {
+  writer.Write(rrect);
+  writer.Write(op);
+  writer.Write(antialias);
 }
 
-size_t DrawImageOp::Serialize(const PaintOp* base_op,
-                              void* memory,
-                              size_t size,
-                              const SerializeOptions& options,
-                              const PaintFlags* flags_to_serialize,
-                              const SkM44& current_ctm,
-                              const SkM44& original_ctm) {
-  auto* op = static_cast<const DrawImageOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  if (!flags_to_serialize)
-    flags_to_serialize = &op->flags;
-  helper.Write(*flags_to_serialize, current_ctm);
-
-  SkSize scale_adjustment = SkSize::Make(1.f, 1.f);
-  helper.Write(
-      CreateDrawImage(op->image, flags_to_serialize, op->sampling, current_ctm),
-      &scale_adjustment);
-  helper.AssertAlignment(alignof(SkScalar));
-  helper.Write(scale_adjustment.width());
-  helper.Write(scale_adjustment.height());
-
-  helper.Write(op->left);
-  helper.Write(op->top);
-  helper.Write(op->sampling);
-  return helper.size();
+void ConcatOp::Serialize(PaintOpWriter& writer,
+                         const PaintFlags* flags_to_serialize,
+                         const SkM44& current_ctm,
+                         const SkM44& original_ctm) const {
+  writer.Write(matrix);
 }
 
-size_t DrawImageRectOp::Serialize(const PaintOp* base_op,
-                                  void* memory,
-                                  size_t size,
-                                  const SerializeOptions& options,
-                                  const PaintFlags* flags_to_serialize,
-                                  const SkM44& current_ctm,
-                                  const SkM44& original_ctm) {
-  auto* op = static_cast<const DrawImageRectOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  if (!flags_to_serialize)
-    flags_to_serialize = &op->flags;
-  helper.Write(*flags_to_serialize, current_ctm);
+void CustomDataOp::Serialize(PaintOpWriter& writer,
+                             const PaintFlags* flags_to_serialize,
+                             const SkM44& current_ctm,
+                             const SkM44& original_ctm) const {
+  writer.Write(id);
+}
+
+void DrawColorOp::Serialize(PaintOpWriter& writer,
+                            const PaintFlags* flags_to_serialize,
+                            const SkM44& current_ctm,
+                            const SkM44& original_ctm) const {
+  writer.Write(color);
+  writer.Write(mode);
+}
+
+void DrawDRRectOp::Serialize(PaintOpWriter& writer,
+                             const PaintFlags* flags_to_serialize,
+                             const SkM44& current_ctm,
+                             const SkM44& original_ctm) const {
+  writer.Write(*flags_to_serialize, current_ctm);
+  writer.Write(outer);
+  writer.Write(inner);
+}
+
+void DrawImageOp::Serialize(PaintOpWriter& writer,
+                            const PaintFlags* flags_to_serialize,
+                            const SkM44& current_ctm,
+                            const SkM44& original_ctm) const {
+  writer.Write(*flags_to_serialize, current_ctm);
+
+  SkSize serialized_scale_adjustment = SkSize::Make(1.f, 1.f);
+  writer.Write(
+      CreateDrawImage(image, flags_to_serialize, sampling, current_ctm),
+      &serialized_scale_adjustment);
+  writer.AssertAlignment(alignof(SkScalar));
+  writer.Write(serialized_scale_adjustment.width());
+  writer.Write(serialized_scale_adjustment.height());
+
+  writer.Write(left);
+  writer.Write(top);
+  writer.Write(sampling);
+}
+
+void DrawImageRectOp::Serialize(PaintOpWriter& writer,
+                                const PaintFlags* flags_to_serialize,
+                                const SkM44& current_ctm,
+                                const SkM44& original_ctm) const {
+  writer.Write(*flags_to_serialize, current_ctm);
 
   // This adjustment mirrors DiscardableImageMap::GatherDiscardableImage logic.
-  SkM44 matrix = current_ctm * SkM44(SkMatrix::RectToRect(op->src, op->dst));
+  SkM44 matrix = current_ctm * SkM44(SkMatrix::RectToRect(src, dst));
   // Note that we don't request subsets here since the GpuImageCache has no
   // optimizations for using subsets.
-  SkSize scale_adjustment = SkSize::Make(1.f, 1.f);
-  helper.Write(
-      CreateDrawImage(op->image, flags_to_serialize, op->sampling, matrix),
-      &scale_adjustment);
-  helper.AssertAlignment(alignof(SkScalar));
-  helper.Write(scale_adjustment.width());
-  helper.Write(scale_adjustment.height());
+  SkSize serialized_scale_adjustment = SkSize::Make(1.f, 1.f);
+  writer.Write(CreateDrawImage(image, flags_to_serialize, sampling, matrix),
+               &serialized_scale_adjustment);
+  writer.AssertAlignment(alignof(SkScalar));
+  writer.Write(serialized_scale_adjustment.width());
+  writer.Write(serialized_scale_adjustment.height());
 
-  helper.Write(op->src);
-  helper.Write(op->dst);
-  helper.Write(op->sampling);
-  helper.Write(op->constraint);
-  return helper.size();
+  writer.Write(src);
+  writer.Write(dst);
+  writer.Write(sampling);
+  writer.Write(constraint);
 }
 
-size_t DrawIRectOp::Serialize(const PaintOp* base_op,
-                              void* memory,
-                              size_t size,
-                              const SerializeOptions& options,
-                              const PaintFlags* flags_to_serialize,
-                              const SkM44& current_ctm,
-                              const SkM44& original_ctm) {
-  auto* op = static_cast<const DrawIRectOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  if (!flags_to_serialize)
-    flags_to_serialize = &op->flags;
-  helper.Write(*flags_to_serialize, current_ctm);
-  helper.Write(op->rect);
-  return helper.size();
+void DrawIRectOp::Serialize(PaintOpWriter& writer,
+                            const PaintFlags* flags_to_serialize,
+                            const SkM44& current_ctm,
+                            const SkM44& original_ctm) const {
+  writer.Write(*flags_to_serialize, current_ctm);
+  writer.Write(rect);
 }
 
-size_t DrawLineOp::Serialize(const PaintOp* base_op,
-                             void* memory,
-                             size_t size,
-                             const SerializeOptions& options,
+void DrawLineOp::Serialize(PaintOpWriter& writer,
+                           const PaintFlags* flags_to_serialize,
+                           const SkM44& current_ctm,
+                           const SkM44& original_ctm) const {
+  writer.Write(*flags_to_serialize, current_ctm);
+  writer.AssertAlignment(alignof(SkScalar));
+  writer.Write(x0);
+  writer.Write(y0);
+  writer.Write(x1);
+  writer.Write(y1);
+}
+
+void DrawOvalOp::Serialize(PaintOpWriter& writer,
+                           const PaintFlags* flags_to_serialize,
+                           const SkM44& current_ctm,
+                           const SkM44& original_ctm) const {
+  writer.Write(*flags_to_serialize, current_ctm);
+  writer.Write(oval);
+}
+
+void DrawPathOp::Serialize(PaintOpWriter& writer,
+                           const PaintFlags* flags_to_serialize,
+                           const SkM44& current_ctm,
+                           const SkM44& original_ctm) const {
+  writer.Write(*flags_to_serialize, current_ctm);
+  writer.Write(path, use_cache);
+  writer.Write(sk_path_fill_type);
+}
+
+void DrawRecordOp::Serialize(PaintOpWriter& writer,
                              const PaintFlags* flags_to_serialize,
                              const SkM44& current_ctm,
-                             const SkM44& original_ctm) {
-  auto* op = static_cast<const DrawLineOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  if (!flags_to_serialize)
-    flags_to_serialize = &op->flags;
-  helper.Write(*flags_to_serialize, current_ctm);
-  helper.AssertAlignment(alignof(SkScalar));
-  helper.Write(op->x0);
-  helper.Write(op->y0);
-  helper.Write(op->x1);
-  helper.Write(op->y1);
-  return helper.size();
-}
-
-size_t DrawOvalOp::Serialize(const PaintOp* base_op,
-                             void* memory,
-                             size_t size,
-                             const SerializeOptions& options,
-                             const PaintFlags* flags_to_serialize,
-                             const SkM44& current_ctm,
-                             const SkM44& original_ctm) {
-  auto* op = static_cast<const DrawOvalOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  if (!flags_to_serialize)
-    flags_to_serialize = &op->flags;
-  helper.Write(*flags_to_serialize, current_ctm);
-  helper.Write(op->oval);
-  return helper.size();
-}
-
-size_t DrawPathOp::Serialize(const PaintOp* base_op,
-                             void* memory,
-                             size_t size,
-                             const SerializeOptions& options,
-                             const PaintFlags* flags_to_serialize,
-                             const SkM44& current_ctm,
-                             const SkM44& original_ctm) {
-  auto* op = static_cast<const DrawPathOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  if (!flags_to_serialize)
-    flags_to_serialize = &op->flags;
-  helper.Write(*flags_to_serialize, current_ctm);
-  helper.Write(op->path, op->use_cache);
-  helper.Write(op->sk_path_fill_type);
-  return helper.size();
-}
-
-size_t DrawRecordOp::Serialize(const PaintOp* op,
-                               void* memory,
-                               size_t size,
-                               const SerializeOptions& options,
-                               const PaintFlags* flags_to_serialize,
-                               const SkM44& current_ctm,
-                               const SkM44& original_ctm) {
-  // TODO(enne): these must be flattened.  Serializing this will not do
-  // anything.
+                             const SkM44& original_ctm) const {
+  // These are flattened in PaintOpBufferSerializer.
   NOTREACHED();
-  return 0u;
 }
 
-size_t DrawRectOp::Serialize(const PaintOp* base_op,
-                             void* memory,
-                             size_t size,
-                             const SerializeOptions& options,
-                             const PaintFlags* flags_to_serialize,
-                             const SkM44& current_ctm,
-                             const SkM44& original_ctm) {
-  auto* op = static_cast<const DrawRectOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  if (!flags_to_serialize)
-    flags_to_serialize = &op->flags;
-  helper.Write(*flags_to_serialize, current_ctm);
-  helper.Write(op->rect);
-  return helper.size();
+void DrawRectOp::Serialize(PaintOpWriter& writer,
+                           const PaintFlags* flags_to_serialize,
+                           const SkM44& current_ctm,
+                           const SkM44& original_ctm) const {
+  writer.Write(*flags_to_serialize, current_ctm);
+  writer.Write(rect);
 }
 
-size_t DrawRRectOp::Serialize(const PaintOp* base_op,
-                              void* memory,
-                              size_t size,
-                              const SerializeOptions& options,
-                              const PaintFlags* flags_to_serialize,
-                              const SkM44& current_ctm,
-                              const SkM44& original_ctm) {
-  auto* op = static_cast<const DrawRRectOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  if (!flags_to_serialize)
-    flags_to_serialize = &op->flags;
-  helper.Write(*flags_to_serialize, current_ctm);
-  helper.Write(op->rrect);
-  return helper.size();
+void DrawRRectOp::Serialize(PaintOpWriter& writer,
+                            const PaintFlags* flags_to_serialize,
+                            const SkM44& current_ctm,
+                            const SkM44& original_ctm) const {
+  writer.Write(*flags_to_serialize, current_ctm);
+  writer.Write(rrect);
 }
 
 namespace {
@@ -669,21 +560,20 @@
 template <typename T>
 void SerializeSkottieMap(
     const base::flat_map<SkottieResourceIdHash, T>& map,
-    PaintOpWriter& helper,
-    const base::RepeatingCallback<void(const T&, PaintOpWriter&)>&
-        value_serializer) {
+    PaintOpWriter& writer,
+    base::FunctionRef<void(const T&, PaintOpWriter&)> value_serializer) {
   // Write the size of the map first so that we know how many entries to read
   // from the buffer during deserialization.
-  helper.WriteSize(map.size());
+  writer.WriteSize(map.size());
   for (const auto& [resource_id, val] : map) {
-    helper.WriteSize(resource_id.GetUnsafeValue());
-    value_serializer.Run(val, helper);
+    writer.WriteSize(resource_id.GetUnsafeValue());
+    value_serializer(val, writer);
   }
 }
 
 void SerializeSkottieFrameData(const SkM44& current_ctm,
                                const SkottieFrameData& frame_data,
-                               PaintOpWriter& helper) {
+                               PaintOpWriter& writer) {
   // |scale_adjustment| is not ultimately used; Skottie handles image
   // scale adjustment internally when rastering.
   SkSize scale_adjustment = SkSize::MakeEmpty();
@@ -694,206 +584,131 @@
         SkIRect::MakeWH(frame_data.image.width(), frame_data.image.height()),
         frame_data.quality, current_ctm);
   }
-  helper.Write(draw_image, &scale_adjustment);
-  helper.Write(frame_data.quality);
+  writer.Write(draw_image, &scale_adjustment);
+  writer.Write(frame_data.quality);
 }
 
 }  // namespace
 
-size_t DrawSkottieOp::Serialize(const PaintOp* base_op,
-                                void* memory,
-                                size_t size,
-                                const SerializeOptions& options,
-                                const PaintFlags* flags_to_serialize,
-                                const SkM44& current_ctm,
-                                const SkM44& original_ctm) {
-  auto* op = static_cast<const DrawSkottieOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  helper.Write(op->dst);
-  helper.Write(SkFloatToScalar(op->t));
-  helper.Write(op->skottie);
+void DrawSkottieOp::Serialize(PaintOpWriter& writer,
+                              const PaintFlags* flags_to_serialize,
+                              const SkM44& current_ctm,
+                              const SkM44& original_ctm) const {
+  writer.Write(dst);
+  writer.Write(SkFloatToScalar(t));
+  writer.Write(skottie);
 
-  SkottieFrameDataMap images_to_serialize = op->images;
-  SkottieTextPropertyValueMap text_map_to_serialize = op->text_map;
-  if (options.skottie_serialization_history) {
-    options.skottie_serialization_history->FilterNewSkottieFrameState(
-        *op->skottie, images_to_serialize, text_map_to_serialize);
+  SkottieFrameDataMap images_to_serialize = images;
+  SkottieTextPropertyValueMap text_map_to_serialize = text_map;
+  if (writer.options().skottie_serialization_history) {
+    writer.options().skottie_serialization_history->FilterNewSkottieFrameState(
+        *skottie, images_to_serialize, text_map_to_serialize);
   }
 
-  SerializeSkottieMap(
-      images_to_serialize, helper,
-      base::BindRepeating(&SerializeSkottieFrameData, std::cref(current_ctm)));
-  SerializeSkottieMap(
-      op->color_map, helper,
-      base::BindRepeating([](const SkColor& color, PaintOpWriter& helper) {
-        helper.Write(color);
-      }));
-  SerializeSkottieMap(
-      text_map_to_serialize, helper,
-      base::BindRepeating([](const SkottieTextPropertyValue& text_property_val,
-                             PaintOpWriter& helper) {
-        helper.WriteSize(text_property_val.text().size());
+  SerializeSkottieMap<SkottieFrameData>(
+      images_to_serialize, writer,
+      [&current_ctm](const SkottieFrameData& frame_data,
+                     PaintOpWriter& writer) {
+        SerializeSkottieFrameData(current_ctm, frame_data, writer);
+      });
+  SerializeSkottieMap<SkColor>(
+      color_map, writer,
+      [](const SkColor& color, PaintOpWriter& writer) { writer.Write(color); });
+  SerializeSkottieMap<SkottieTextPropertyValue>(
+      text_map_to_serialize, writer,
+      [](const SkottieTextPropertyValue& text_property_val,
+         PaintOpWriter& writer) {
+        writer.WriteSize(text_property_val.text().size());
         // If there is not enough space in the underlying buffer, WriteData()
         // will mark the |helper| as invalid and the buffer will keep growing
         // until a max size is reached (currently 64MB which should be ample for
         // text).
-        helper.WriteData(text_property_val.text().size(),
+        writer.WriteData(text_property_val.text().size(),
                          text_property_val.text().c_str());
-        helper.Write(gfx::RectFToSkRect(text_property_val.box()));
-      }));
-  return helper.size();
+        writer.Write(gfx::RectFToSkRect(text_property_val.box()));
+      });
 }
 
-size_t DrawTextBlobOp::Serialize(const PaintOp* base_op,
-                                 void* memory,
-                                 size_t size,
-                                 const SerializeOptions& options,
-                                 const PaintFlags* flags_to_serialize,
-                                 const SkM44& current_ctm,
-                                 const SkM44& original_ctm) {
-  auto* op = static_cast<const DrawTextBlobOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  if (!flags_to_serialize)
-    flags_to_serialize = &op->flags;
-  helper.Write(*flags_to_serialize, current_ctm);
-  unsigned int count = op->extra_slugs.size() + 1;
-  helper.Write(count);
-  helper.Write(op->slug);
-  for (const auto& slug : op->extra_slugs) {
-    helper.Write(slug);
+void DrawTextBlobOp::Serialize(PaintOpWriter& writer,
+                               const PaintFlags* flags_to_serialize,
+                               const SkM44& current_ctm,
+                               const SkM44& original_ctm) const {
+  writer.Write(*flags_to_serialize, current_ctm);
+  unsigned int count = extra_slugs.size() + 1;
+  writer.Write(count);
+  writer.Write(slug);
+  for (const auto& extra_slug : extra_slugs) {
+    writer.Write(extra_slug);
   }
-  return helper.size();
 }
 
-size_t NoopOp::Serialize(const PaintOp* base_op,
-                         void* memory,
-                         size_t size,
-                         const SerializeOptions& options,
-                         const PaintFlags* flags_to_serialize,
-                         const SkM44& current_ctm,
-                         const SkM44& original_ctm) {
-  PaintOpWriter helper(memory, size, options);
-  return helper.size();
-}
+void NoopOp::Serialize(PaintOpWriter& writer,
+                       const PaintFlags* flags_to_serialize,
+                       const SkM44& current_ctm,
+                       const SkM44& original_ctm) const {}
 
-size_t RestoreOp::Serialize(const PaintOp* base_op,
-                            void* memory,
-                            size_t size,
-                            const SerializeOptions& options,
-                            const PaintFlags* flags_to_serialize,
-                            const SkM44& current_ctm,
-                            const SkM44& original_ctm) {
-  PaintOpWriter helper(memory, size, options);
-  return helper.size();
-}
-
-size_t RotateOp::Serialize(const PaintOp* base_op,
-                           void* memory,
-                           size_t size,
-                           const SerializeOptions& options,
-                           const PaintFlags* flags_to_serialize,
-                           const SkM44& current_ctm,
-                           const SkM44& original_ctm) {
-  auto* op = static_cast<const RotateOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  helper.Write(op->degrees);
-  return helper.size();
-}
-
-size_t SaveOp::Serialize(const PaintOp* base_op,
-                         void* memory,
-                         size_t size,
-                         const SerializeOptions& options,
-                         const PaintFlags* flags_to_serialize,
-                         const SkM44& current_ctm,
-                         const SkM44& original_ctm) {
-  PaintOpWriter helper(memory, size, options);
-  return helper.size();
-}
-
-size_t SaveLayerOp::Serialize(const PaintOp* base_op,
-                              void* memory,
-                              size_t size,
-                              const SerializeOptions& options,
-                              const PaintFlags* flags_to_serialize,
-                              const SkM44& current_ctm,
-                              const SkM44& original_ctm) {
-  auto* op = static_cast<const SaveLayerOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  if (!flags_to_serialize)
-    flags_to_serialize = &op->flags;
-  helper.Write(*flags_to_serialize, current_ctm);
-  helper.Write(op->bounds);
-  return helper.size();
-}
-
-size_t SaveLayerAlphaOp::Serialize(const PaintOp* base_op,
-                                   void* memory,
-                                   size_t size,
-                                   const SerializeOptions& options,
-                                   const PaintFlags* flags_to_serialize,
-                                   const SkM44& current_ctm,
-                                   const SkM44& original_ctm) {
-  auto* op = static_cast<const SaveLayerAlphaOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  helper.Write(op->bounds);
-  helper.Write(op->alpha);
-  return helper.size();
-}
-
-size_t ScaleOp::Serialize(const PaintOp* base_op,
-                          void* memory,
-                          size_t size,
-                          const SerializeOptions& options,
+void RestoreOp::Serialize(PaintOpWriter& writer,
                           const PaintFlags* flags_to_serialize,
                           const SkM44& current_ctm,
-                          const SkM44& original_ctm) {
-  auto* op = static_cast<const ScaleOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  helper.Write(op->sx);
-  helper.Write(op->sy);
-  return helper.size();
+                          const SkM44& original_ctm) const {}
+
+void RotateOp::Serialize(PaintOpWriter& writer,
+                         const PaintFlags* flags_to_serialize,
+                         const SkM44& current_ctm,
+                         const SkM44& original_ctm) const {
+  writer.Write(degrees);
 }
 
-size_t SetMatrixOp::Serialize(const PaintOp* base_op,
-                              void* memory,
-                              size_t size,
-                              const SerializeOptions& options,
-                              const PaintFlags* flags_to_serialize,
-                              const SkM44& current_ctm,
-                              const SkM44& original_ctm) {
-  auto* op = static_cast<const SetMatrixOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
+void SaveOp::Serialize(PaintOpWriter& writer,
+                       const PaintFlags* flags_to_serialize,
+                       const SkM44& current_ctm,
+                       const SkM44& original_ctm) const {}
+
+void SaveLayerOp::Serialize(PaintOpWriter& writer,
+                            const PaintFlags* flags_to_serialize,
+                            const SkM44& current_ctm,
+                            const SkM44& original_ctm) const {
+  writer.Write(*flags_to_serialize, current_ctm);
+  writer.Write(bounds);
+}
+
+void SaveLayerAlphaOp::Serialize(PaintOpWriter& writer,
+                                 const PaintFlags* flags_to_serialize,
+                                 const SkM44& current_ctm,
+                                 const SkM44& original_ctm) const {
+  writer.Write(bounds);
+  writer.Write(alpha);
+}
+
+void ScaleOp::Serialize(PaintOpWriter& writer,
+                        const PaintFlags* flags_to_serialize,
+                        const SkM44& current_ctm,
+                        const SkM44& original_ctm) const {
+  writer.Write(sx);
+  writer.Write(sy);
+}
+
+void SetMatrixOp::Serialize(PaintOpWriter& writer,
+                            const PaintFlags* flags_to_serialize,
+                            const SkM44& current_ctm,
+                            const SkM44& original_ctm) const {
   // Use original_ctm here because SetMatrixOp replaces current_ctm
-  helper.Write(original_ctm * op->matrix);
-  return helper.size();
+  writer.Write(original_ctm * matrix);
 }
 
-size_t SetNodeIdOp::Serialize(const PaintOp* base_op,
-                              void* memory,
-                              size_t size,
-                              const SerializeOptions& options,
-                              const PaintFlags* flags_to_serialize,
-                              const SkM44& current_ctm,
-                              const SkM44& original_ctm) {
-  auto* op = static_cast<const SetNodeIdOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  helper.Write(op->node_id);
-  return helper.size();
+void SetNodeIdOp::Serialize(PaintOpWriter& writer,
+                            const PaintFlags* flags_to_serialize,
+                            const SkM44& current_ctm,
+                            const SkM44& original_ctm) const {
+  writer.Write(node_id);
 }
 
-size_t TranslateOp::Serialize(const PaintOp* base_op,
-                              void* memory,
-                              size_t size,
-                              const SerializeOptions& options,
-                              const PaintFlags* flags_to_serialize,
-                              const SkM44& current_ctm,
-                              const SkM44& original_ctm) {
-  auto* op = static_cast<const TranslateOp*>(base_op);
-  PaintOpWriter helper(memory, size, options);
-  helper.Write(op->dx);
-  helper.Write(op->dy);
-  return helper.size();
+void TranslateOp::Serialize(PaintOpWriter& writer,
+                            const PaintFlags* flags_to_serialize,
+                            const SkM44& current_ctm,
+                            const SkM44& original_ctm) const {
+  writer.Write(dx);
+  writer.Write(dy);
 }
 
 template <typename T>
@@ -2393,9 +2208,10 @@
   DCHECK_EQ(0u,
             reinterpret_cast<uintptr_t>(memory) % PaintOpBuffer::kPaintOpAlign);
 
-  size_t written = g_serialize_functions[type](this, memory, size, options,
-                                               flags_to_serialize, current_ctm,
-                                               original_ctm);
+  PaintOpWriter writer(memory, size, options);
+  g_serialize_functions[type](*this, writer, flags_to_serialize, current_ctm,
+                              original_ctm);
+  size_t written = writer.size();
   DCHECK_LE(written, size);
   if (written < 4)
     return 0u;
@@ -2592,10 +2408,10 @@
     return false;
 
   SkRect rect;
-  if (!PaintOp::GetBounds(op, &rect))
+  if (!PaintOp::GetBounds(op, &rect)) {
     return false;
-  if (!rect.isFinite())
-    return true;
+  }
+  DCHECK(rect.isFinite());
 
   if (op.IsPaintOpWithFlags()) {
     SkPaint paint = static_cast<const PaintOpWithFlags&>(op).flags.ToSkPaint();

cc/paint/paint_op.h

diff --git a/cc/paint/paint_op.h b/cc/paint/paint_op.h
index 899b7d2..5c8a3d0 100644
--- a/cc/paint/paint_op.h
+++ b/cc/paint/paint_op.h
@@ -47,6 +47,8 @@
 
 namespace cc {
 
+class PaintOpWriter;
+
 class CC_PAINT_EXPORT ThreadsafePath : public SkPath {
  public:
   explicit ThreadsafePath(const SkPath& path) : SkPath(path) {
@@ -58,13 +60,11 @@
 // See PaintOp::Serialize/Deserialize for comments.  Derived Serialize types
 // don't write the 4 byte type/skip header because they don't know how much
 // data they will need to write.  PaintOp::Serialize itself must update it.
-#define HAS_SERIALIZATION_FUNCTIONS()                                        \
-  static size_t Serialize(                                                   \
-      const PaintOp* op, void* memory, size_t size,                          \
-      const SerializeOptions& options, const PaintFlags* flags_to_serialize, \
-      const SkM44& current_ctm, const SkM44& original_ctm);                  \
-  static PaintOp* Deserialize(const volatile void* input, size_t input_size, \
-                              void* output, size_t output_size,              \
+#define HAS_SERIALIZATION_FUNCTIONS()                                         \
+  void Serialize(PaintOpWriter& writer, const PaintFlags* flags_to_serialize, \
+                 const SkM44& current_ctm, const SkM44& original_ctm) const;  \
+  static PaintOp* Deserialize(const volatile void* input, size_t input_size,  \
+                              void* output, size_t output_size,               \
                               const DeserializeOptions& options)
 
 enum class PaintOpType : uint8_t {
@@ -135,7 +135,7 @@
     kLastType = kMailbox
   };
 
-  // Subclasses should provide a static Serialize() method called from here.
+  // Subclasses should provide a Serialize() method called from here.
   // If the op can be serialized to |memory| in no more than |size| bytes,
   // then return the number of bytes written.  If it won't fit, return 0.
   // If |flags_to_serialize| is non-null, it overrides any flags within the op.

cc/paint/paint_op_buffer.h

diff --git a/cc/paint/paint_op_buffer.h b/cc/paint/paint_op_buffer.h
index f2a23ae..f6fd881 100644
--- a/cc/paint/paint_op_buffer.h
+++ b/cc/paint/paint_op_buffer.h
@@ -272,6 +272,7 @@
     static_assert(!std::is_same<T, PaintOp>::value,
                   "AnalyzeAddedOp needs a subtype of PaintOp");
     DCHECK(is_mutable());
+    DCHECK(op->IsValid());
 
     if (num_slow_paths_up_to_min_for_MSAA_ < kMinNumberOfSlowPathsForMSAA) {
       num_slow_paths_up_to_min_for_MSAA_ += op->CountSlowPathsFromFlags();

cc/paint/paint_op_buffer_unittest.cc

diff --git a/cc/paint/paint_op_buffer_unittest.cc b/cc/paint/paint_op_buffer_unittest.cc
index bfb1bfdc..eedcd65 100644
--- a/cc/paint/paint_op_buffer_unittest.cc
+++ b/cc/paint/paint_op_buffer_unittest.cc
@@ -2387,168 +2387,31 @@
                                     options_provider.deserialize_options()));
 }
 
-// Test that deserializing invalid SkClipOp enums fails silently.
-// Skia release asserts on this in several places so these are not safe
-// to pass through to the SkCanvas API.
-TEST(PaintOpBufferTest, ValidateSkClip) {
-  size_t buffer_size = kBufferBytesPerOp;
-  auto serialized = AllocateBuffer(buffer_size);
-  auto deserialized = AllocateBuffer(buffer_size);
-
-  PaintOpBuffer buffer;
-
-  // Successful first op.
-  SkPath path;
-  buffer.push<ClipPathOp>(path, SkClipOp::kMax_EnumValue, /*antialias=*/true,
-                          UsePaintCache::kDisabled);
-
-  // Bad other ops.
-  SkClipOp bad_clip = static_cast<SkClipOp>(
-      static_cast<uint32_t>(SkClipOp::kMax_EnumValue) + 1);
-
-  buffer.push<ClipPathOp>(path, bad_clip, /*antialias=*/true,
-                          UsePaintCache::kDisabled);
-  buffer.push<ClipRectOp>(test_rects[0], bad_clip, true);
-  buffer.push<ClipRRectOp>(test_rrects[0], bad_clip, false);
-
-  // SkClipOp is serialized to uint8_t (see WriteEnum). Values outside uint8_t
-  // would crash the serialization, so this is the max value that passes checked
-  // cast but will still fail validation during deserialization.
-  SkClipOp bad_clip_max = static_cast<SkClipOp>(static_cast<uint8_t>(~0));
-  buffer.push<ClipRectOp>(test_rects[1], bad_clip_max, false);
-
-  TestOptionsProvider options_provider;
-
-  int op_idx = 0;
-  for (const PaintOp& op : buffer) {
-    size_t bytes_written = op.Serialize(serialized.get(), buffer_size,
-                                        options_provider.serialize_options(),
-                                        nullptr, SkM44(), SkM44());
-    ASSERT_GT(bytes_written, 0u);
-    size_t bytes_read = 0;
-    PaintOp* written = PaintOp::Deserialize(
-        serialized.get(), bytes_written, deserialized.get(), buffer_size,
-        &bytes_read, options_provider.deserialize_options());
-    // First op should succeed.  Other ops with bad enums should
-    // serialize correctly but fail to deserialize due to the bad
-    // SkClipOp enum.
-    if (!op_idx) {
-      EXPECT_TRUE(written) << "op: " << op_idx;
-      EXPECT_EQ(bytes_written, bytes_read);
-      written->DestroyThis();
-    } else {
-      EXPECT_FALSE(written) << "op: " << op_idx;
-    }
-
-    ++op_idx;
-  }
-}
-
-TEST(PaintOpBufferTest, ValidateSkBlendMode) {
-  size_t buffer_size = kBufferBytesPerOp;
-  auto serialized = AllocateBuffer(buffer_size);
-  auto deserialized = AllocateBuffer(buffer_size);
-
-  PaintOpBuffer buffer;
-
-  // Successful first two ops.
-  buffer.push<DrawColorOp>(SkColors::kMagenta, SkBlendMode::kDstIn);
-  PaintFlags good_flags = test_flags[0];
-  good_flags.setBlendMode(SkBlendMode::kColorBurn);
-  buffer.push<DrawRectOp>(test_rects[0], good_flags);
-
-  // Modes that are not supported by drawColor or SkPaint.
-  SkBlendMode bad_modes_for_draw_color[] = {
-      SkBlendMode::kOverlay,
-      SkBlendMode::kDarken,
-      SkBlendMode::kLighten,
-      SkBlendMode::kColorDodge,
-      SkBlendMode::kColorBurn,
-      SkBlendMode::kHardLight,
-      SkBlendMode::kSoftLight,
-      SkBlendMode::kDifference,
-      SkBlendMode::kExclusion,
-      SkBlendMode::kMultiply,
-      SkBlendMode::kHue,
-      SkBlendMode::kSaturation,
-      SkBlendMode::kColor,
-      SkBlendMode::kLuminosity,
-      static_cast<SkBlendMode>(static_cast<uint8_t>(SkBlendMode::kLastMode) +
-                               1),
-      static_cast<SkBlendMode>(static_cast<uint8_t>(~0)),
-  };
-
-  SkBlendMode bad_modes_for_flags[] = {
-      static_cast<SkBlendMode>(static_cast<uint8_t>(SkBlendMode::kLastMode) +
-                               1),
-      static_cast<SkBlendMode>(static_cast<uint8_t>(~0)),
-  };
-
-  for (SkBlendMode blend_mode : bad_modes_for_draw_color) {
-    buffer.push<DrawColorOp>(SkColors::kMagenta, blend_mode);
-  }
-
-  for (size_t i = 0; i < std::size(bad_modes_for_flags); ++i) {
-    PaintFlags flags = test_flags[i % test_flags.size()];
-    flags.setBlendMode(bad_modes_for_flags[i]);
-    buffer.push<DrawRectOp>(test_rects[i % test_rects.size()], flags);
-  }
-
-  TestOptionsProvider options_provider;
-
-  int op_idx = 0;
-  for (const PaintOp& op : buffer) {
-    size_t bytes_written = op.Serialize(serialized.get(), buffer_size,
-                                        options_provider.serialize_options(),
-                                        nullptr, SkM44(), SkM44());
-    ASSERT_GT(bytes_written, 0u);
-    size_t bytes_read = 0;
-    PaintOp* written = PaintOp::Deserialize(
-        serialized.get(), bytes_written, deserialized.get(), buffer_size,
-        &bytes_read, options_provider.deserialize_options());
-    // First two ops should succeed.  Other ops with bad enums should
-    // serialize correctly but fail to deserialize due to the bad
-    // SkBlendMode enum.
-    if (op_idx < 2) {
-      EXPECT_TRUE(written) << "op: " << op_idx;
-      EXPECT_EQ(bytes_written, bytes_read);
-      written->DestroyThis();
-    } else {
-      EXPECT_FALSE(written) << "op: " << op_idx;
-    }
-
-    ++op_idx;
-  }
-}
-
+// Test that deserializing invalid paint ops fails silently. Skia release
+// asserts on invalid values in several places so these are not safe to pass
+// them to the SkCanvas API.
 TEST(PaintOpBufferTest, ValidateRects) {
   size_t buffer_size = kBufferBytesPerOp;
   auto serialized = AllocateBuffer(buffer_size);
   auto deserialized = AllocateBuffer(buffer_size);
 
-  // Used for QuickRejectDraw
-  SkCanvas device(256, 256);
-  SkCanvas* canvas = &device;
-
-  SkRect bad_rect = SkRect::MakeEmpty();
-  bad_rect.fBottom = std::numeric_limits<float>::quiet_NaN();
-  EXPECT_FALSE(bad_rect.isFinite());
-
+  float rect_size = 0x8.765432p1;
+  SkRect rect = SkRect::MakeWH(rect_size, rect_size);
   // Push all op variations that take rects.
   PaintOpBuffer buffer;
-  buffer.push<AnnotateOp>(PaintCanvas::AnnotationType::URL, bad_rect,
+  buffer.push<AnnotateOp>(PaintCanvas::AnnotationType::URL, rect,
                           SkData::MakeWithCString("test1"));
-  buffer.push<ClipRectOp>(bad_rect, SkClipOp::kDifference, true);
+  buffer.push<ClipRectOp>(rect, SkClipOp::kDifference, true);
 
-  buffer.push<DrawImageRectOp>(test_images[0], bad_rect, test_rects[1],
+  buffer.push<DrawImageRectOp>(test_images[0], rect, test_rects[1],
                                SkCanvas::kStrict_SrcRectConstraint);
-  buffer.push<DrawImageRectOp>(test_images[0], test_rects[0], bad_rect,
+  buffer.push<DrawImageRectOp>(test_images[0], test_rects[0], rect,
                                SkCanvas::kStrict_SrcRectConstraint);
-  buffer.push<DrawOvalOp>(bad_rect, test_flags[0]);
-  buffer.push<DrawRectOp>(bad_rect, test_flags[0]);
-  buffer.push<SaveLayerOp>(bad_rect, PaintFlags());
-  buffer.push<SaveLayerOp>(bad_rect, test_flags[0]);
-  buffer.push<SaveLayerAlphaOp>(bad_rect, test_floats[0]);
+  buffer.push<DrawOvalOp>(rect, test_flags[0]);
+  buffer.push<DrawRectOp>(rect, test_flags[0]);
+  buffer.push<SaveLayerOp>(rect, PaintFlags());
+  buffer.push<SaveLayerOp>(rect, test_flags[0]);
+  buffer.push<SaveLayerAlphaOp>(rect, test_floats[0]);
 
   TestOptionsProvider options_provider;
 
@@ -2558,24 +2421,64 @@
     size_t bytes_written = op.Serialize(serialized.get(), buffer_size,
                                         options_provider.serialize_options(),
                                         nullptr, SkM44(), SkM44());
-    ASSERT_GT(bytes_written, 0u);
+    ASSERT_GT(bytes_written, sizeof(float));
+
     size_t bytes_read = 0;
-    PaintOp* written = PaintOp::Deserialize(
+    PaintOp* deserialized_op = PaintOp::Deserialize(
         serialized.get(), bytes_written, deserialized.get(), buffer_size,
         &bytes_read, options_provider.deserialize_options());
-    EXPECT_FALSE(written) << "op: " << op_idx;
+    EXPECT_TRUE(deserialized_op) << op_idx;
+    deserialized_op->DestroyThis();
 
-    // Additionally, every draw op should be rejected by QuickRejectDraw if
-    // the paint op buffer were played back directly without going through
-    // deserialization (e.g. canvas2D, crbug.com/1186392)
-    if (op.IsDrawOp()) {
-      EXPECT_TRUE(PaintOp::QuickRejectDraw(op, canvas));
+    // Replace the first occurrence of rect_size with NaN to make the ClipRectOp
+    // invalid.
+    for (size_t i = 0; i < bytes_written; i += sizeof(float)) {
+      float* f = reinterpret_cast<float*>(serialized.get() + i);
+      if (*f == rect_size) {
+        *f = std::numeric_limits<float>::quiet_NaN();
+        break;
+      }
     }
+    deserialized_op = PaintOp::Deserialize(
+        serialized.get(), bytes_written, deserialized.get(), buffer_size,
+        &bytes_read, options_provider.deserialize_options());
+    EXPECT_FALSE(deserialized_op) << op_idx;
 
     ++op_idx;
   }
 }
 
+TEST(PaintOpBufferTest, ValidateSkClip) {
+  SkPath path;
+  ClipPathOp good(path, SkClipOp::kMax_EnumValue, /*antialias=*/true,
+                  UsePaintCache::kDisabled);
+  EXPECT_TRUE(good.IsValid());
+
+  SkClipOp bad_clip = static_cast<SkClipOp>(
+      static_cast<uint32_t>(SkClipOp::kMax_EnumValue) + 1);
+  ClipPathOp bad1(path, bad_clip, /*antialias=*/true, UsePaintCache::kDisabled);
+  EXPECT_FALSE(bad1.IsValid());
+  ClipRectOp bad2(test_rects[0], bad_clip, true);
+  EXPECT_FALSE(bad2.IsValid());
+  ClipRRectOp bad3(test_rrects[0], bad_clip, false);
+  EXPECT_FALSE(bad3.IsValid());
+}
+
+TEST(PaintOpBufferTest, ValidateSkBlendMode) {
+  for (uint8_t i = 0; i < static_cast<uint8_t>(SkBlendMode::kLastMode) + 1;
+       i++) {
+    SkBlendMode blend_mode = static_cast<SkBlendMode>(i);
+
+    DrawColorOp draw_color(SkColors::kMagenta, blend_mode);
+    EXPECT_EQ(blend_mode <= SkBlendMode::kLastCoeffMode, draw_color.IsValid());
+
+    PaintFlags flags = test_flags[i % test_flags.size()];
+    flags.setBlendMode(blend_mode);
+    DrawRectOp draw_rect(test_rects[0], flags);
+    EXPECT_EQ(blend_mode <= SkBlendMode::kLastMode, draw_rect.IsValid());
+  }
+}
+
 TEST(PaintOpBufferTest, BoundingRect_DrawImageOp) {
   PaintOpBuffer buffer;
   PushDrawImageOps(&buffer);

cc/paint/paint_op_writer.h

diff --git a/cc/paint/paint_op_writer.h b/cc/paint/paint_op_writer.h
index 28b488e..672f212 100644
--- a/cc/paint/paint_op_writer.h
+++ b/cc/paint/paint_op_writer.h
@@ -39,6 +39,8 @@
                 bool enable_security_constraints = false);
   ~PaintOpWriter();
 
+  const PaintOp::SerializeOptions& options() const { return *options_; }
+
   static size_t constexpr HeaderBytes() { return 4u; }
   static size_t constexpr Alignment() { return 4u; }
   static size_t GetFlattenableSize(const SkFlattenable* flattenable);

cc/trees/property_tree_builder.cc

diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
index cdf5e70..49e2db3 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc
@@ -248,7 +248,7 @@
       is_scrollable || layer->IsSnappedToPixelGridInTarget();
 
   const bool has_significant_transform =
-      !layer->transform().IsIdentityOr2DTranslation();
+      !layer->transform().IsIdentityOr2dTranslation();
 
   const bool has_potentially_animated_transform =
       HasPotentiallyRunningTransformAnimation(*mutator_host_, layer);

chrome/android/BUILD.gn

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 88ad8428..b2c443d4 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -684,6 +684,7 @@
       "//third_party/android_media:android_media_java",
       "//third_party/android_swipe_refresh:android_swipe_refresh_java",
       "//third_party/androidx:androidx_activity_activity_java",
+      "//third_party/androidx:androidx_asynclayoutinflater_asynclayoutinflater_appcompat_java",
       "//third_party/androidx:androidx_browser_browser_java",
       "//third_party/androidx:androidx_collection_collection_java",
       "//third_party/androidx:androidx_coordinatorlayout_coordinatorlayout_java",

chrome/android/chrome_java_sources.gni

diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
index 2c82fea2..f2c42ed 100644
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -568,7 +568,6 @@
   "java/src/org/chromium/chrome/browser/explore_sites/CategoryCardViewHolderFactory.java",
   "java/src/org/chromium/chrome/browser/explore_sites/CategoryCardViewHolderFactoryDenseTitleBottom.java",
   "java/src/org/chromium/chrome/browser/explore_sites/CategoryCardViewHolderFactoryDenseTitleRight.java",
-  "java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBackgroundTask.java",
   "java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBridge.java",
   "java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesCategory.java",
   "java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesCategoryCardView.java",

chrome/android/chrome_junit_test_java_sources.gni

diff --git a/chrome/android/chrome_junit_test_java_sources.gni b/chrome/android/chrome_junit_test_java_sources.gni
index b1d0d63..ed5c2b60 100644
--- a/chrome/android/chrome_junit_test_java_sources.gni
+++ b/chrome/android/chrome_junit_test_java_sources.gni
@@ -135,7 +135,6 @@
   "junit/src/org/chromium/chrome/browser/download/OfflineContentAvailabilityStatusProviderTest.java",
   "junit/src/org/chromium/chrome/browser/download/items/OfflineContentAggregatorNotificationBridgeUiTest.java",
   "junit/src/org/chromium/chrome/browser/dragdrop/ChromeDragAndDropBrowserDelegateUnitTest.java",
-  "junit/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBackgroundTaskUnitTest.java",
   "junit/src/org/chromium/chrome/browser/explore_sites/ExploreSitesCategoryUnitTest.java",
   "junit/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPageStateUnitTest.java",
   "junit/src/org/chromium/chrome/browser/feed/FeedActionDelegateImplTest.java",

chrome/android/java/res/xml/privacy_preferences_v2.xml

diff --git a/chrome/android/java/res/xml/privacy_preferences_v2.xml b/chrome/android/java/res/xml/privacy_preferences_v2.xml
index 2a73d850..f4f18cc2 100644
--- a/chrome/android/java/res/xml/privacy_preferences_v2.xml
+++ b/chrome/android/java/res/xml/privacy_preferences_v2.xml
@@ -26,6 +26,11 @@
         android:title="@string/third_party_cookies_page_title"
         android:fragment="org.chromium.components.browser_ui.site_settings.SingleCategorySettings" />
     <Preference
+        android:key="privacy_sandbox"
+        android:title="@string/ad_privacy_link_row_label"
+        android:summary="@string/ad_privacy_link_row_sub_label"
+        android:fragment="org.chromium.chrome.browser.privacy_sandbox.v4.PrivacySandboxSettingsFragmentV4" />
+    <Preference
         android:key="do_not_track"
         android:title="@string/do_not_track_title"
         android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" />
@@ -34,11 +39,6 @@
         android:title="@string/preload_pages_title"
         android:summary="@string/preload_pages_summary"
         android:fragment="org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsFragment" />
-    <Preference
-        android:key="privacy_sandbox"
-        android:title="@string/ad_privacy_link_row_label"
-        android:summary="@string/ad_privacy_link_row_sub_label"
-        android:fragment="org.chromium.chrome.browser.privacy_sandbox.v4.PrivacySandboxSettingsFragmentV4" />
     <org.chromium.chrome.browser.incognito.reauth.IncognitoReauthSettingSwitchPreference
         android:key="incognito_lock"
         android:title="@string/settings_incognito_tab_lock_title"

chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
index 160c193..8763230 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
@@ -9,12 +9,14 @@
 import android.net.Uri;
 import android.view.ContextThemeWrapper;
 import android.view.InflateException;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewStub;
 import android.widget.FrameLayout;
 
 import androidx.annotation.VisibleForTesting;
+import androidx.asynclayoutinflater.appcompat.AsyncAppCompatFactory;
 
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
@@ -112,8 +114,10 @@
             ContextThemeWrapper context =
                     new ContextThemeWrapper(baseContext, ActivityUtils.getThemeId());
             FrameLayout contentHolder = new FrameLayout(context);
-            ViewGroup mainView =
-                    (ViewGroup) LayoutInflaterUtils.inflate(context, R.layout.main, contentHolder);
+            var layoutInflater = LayoutInflater.from(context);
+            layoutInflater.setFactory2(new AsyncAppCompatFactory());
+            ViewGroup mainView = (ViewGroup) LayoutInflaterUtils.inflate(
+                    layoutInflater, R.layout.main, contentHolder);
             if (toolbarContainerId != ActivityUtils.NO_RESOURCE_ID) {
                 ViewStub stub = (ViewStub) mainView.findViewById(R.id.control_container_stub);
                 stub.setLayoutResource(toolbarContainerId);

chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
index ffbb39630..0369dc6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -1077,7 +1077,7 @@
 
         final SyncService syncService = SyncService.get();
 
-        if (syncService != null && syncService.isSyncingUrlsWithKeystorePassphrase()) {
+        if (syncService != null && syncService.isSyncingUnencryptedUrls()) {
             ContextReporter.SelectionReporter controller =
                     getContextualSearchManagerSupplier().hasValue() ? new ContextReporter.SelectionReporter() {
                         @Override

chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java
index e48ec92..d8cd109f0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java
@@ -9,7 +9,6 @@
 import org.chromium.chrome.browser.background_sync.BackgroundSyncBackgroundTask;
 import org.chromium.chrome.browser.background_sync.PeriodicBackgroundSyncChromeWakeUpTask;
 import org.chromium.chrome.browser.download.service.DownloadBackgroundTask;
-import org.chromium.chrome.browser.explore_sites.ExploreSitesBackgroundTask;
 import org.chromium.chrome.browser.notifications.NotificationTriggerBackgroundTask;
 import org.chromium.chrome.browser.notifications.scheduler.NotificationSchedulerTask;
 import org.chromium.chrome.browser.offlinepages.OfflineBackgroundTask;
@@ -71,9 +70,6 @@
                 return new WebApkUpdateTask();
             case TaskIds.COMPONENT_UPDATE_JOB_ID:
                 return new UpdateTask();
-            case TaskIds.DEPRECATED_EXPLORE_SITES_REFRESH_JOB_ID:
-            case TaskIds.EXPLORE_SITES_REFRESH_JOB_ID:
-                return new ExploreSitesBackgroundTask();
             case TaskIds.BACKGROUND_SYNC_ONE_SHOT_JOB_ID:
                 return new BackgroundSyncBackgroundTask();
             case TaskIds.NOTIFICATION_SCHEDULER_JOB_ID:

chrome/android/java/src/org/chromium/chrome/browser/download/DownloadNotificationFactory.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadNotificationFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadNotificationFactory.java
index da4363a..9855a6ca 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadNotificationFactory.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadNotificationFactory.java
@@ -26,7 +26,6 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 
@@ -201,7 +200,7 @@
                         && !LegacyHelpers.isLegacyOfflinePage(downloadUpdate.getContentId())) {
                     String subText = StringUtils.timeLeftForUi(
                             context, downloadUpdate.getTimeRemainingInMillis());
-                    setSubText(builder, subText);
+                    builder.setSubText(subText);
                 }
 
                 if (downloadUpdate.getStartTime() > 0) {
@@ -358,14 +357,13 @@
 
         if (downloadUpdate.getIsOffTheRecord()) {
             // A sub text to inform the users that they are using incognito mode.
-            setSubText(builder,
-                    context.getResources().getString(
-                            R.string.download_notification_incognito_subtext));
+            builder.setSubText(context.getResources().getString(
+                    R.string.download_notification_incognito_subtext));
         } else if (downloadUpdate.getShouldPromoteOrigin()) {
             // Always show the origin URL if available (for normal profiles).
             String formattedUrl = DownloadUtils.formatUrlForDisplayInNotification(
                     downloadUpdate.getOriginalUrl());
-            if (formattedUrl != null) setSubText(builder, formattedUrl);
+            if (formattedUrl != null) builder.setSubText(formattedUrl);
         }
 
         return builder.build();
@@ -383,19 +381,6 @@
     }
 
     /**
-     * Helper method to set the sub text on different versions of Android.
-     * @param builder The builder to build notification.
-     * @param subText A string shown as sub text on the notification.
-     */
-    private static void setSubText(NotificationWrapperBuilder builder, String subText) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            builder.setSubText(subText);
-        } else {
-            builder.setContentInfo(subText);
-        }
-    }
-
-    /**
      * Helper method to build an download action Intent from the provided information.
      * @param context {@link Context} to pull resources from.
      * @param action Download action to perform.

chrome/android/java/src/org/chromium/chrome/browser/download/DuplicateDownloadClickableSpan.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DuplicateDownloadClickableSpan.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DuplicateDownloadClickableSpan.java
index ed183dd..c342c44 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/DuplicateDownloadClickableSpan.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DuplicateDownloadClickableSpan.java
@@ -65,9 +65,9 @@
         @Override
         protected void onPostExecute(String filePath) {
             if (mRunnable != null) mRunnable.run();
-            if (mFilePath != null) {
+            if (filePath != null) {
                 DownloadUtils.openDownload(
-                        mFilePath, mMimeType, null, mOTRProfileID, null, null, mSource);
+                        filePath, mMimeType, null, mOTRProfileID, null, null, mSource);
             } else {
                 DownloadManagerService.openDownloadsPage(mOTRProfileID, mSource);
             }

chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBackgroundTask.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBackgroundTask.java b/chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBackgroundTask.java
deleted file mode 100644
index 6ae8cd0..0000000
--- a/chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBackgroundTask.java
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2018 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.explore_sites;
-
-import android.content.Context;
-import android.text.format.DateUtils;
-
-import androidx.annotation.VisibleForTesting;
-
-import org.chromium.base.ContextUtils;
-import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.metrics.RecordHistogram;
-import org.chromium.build.annotations.UsedByReflection;
-import org.chromium.chrome.browser.device.DeviceConditions;
-import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.components.background_task_scheduler.BackgroundTaskSchedulerFactory;
-import org.chromium.components.background_task_scheduler.NativeBackgroundTask;
-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.ConnectionType;
-
-/**
- * Schedules and executes background update of the Explore Sites catalog.
- *
- * The catalog is updated on a somewhat slow schedule, but this code checks for updates
- * approximately daily so that freshness is maintained.
- */
-@JNINamespace("explore_sites")
-@UsedByReflection("BackgroundTaskReflection.java")
-public class ExploreSitesBackgroundTask extends NativeBackgroundTask {
-    private static final String TAG = "ESBackgroundTask";
-    public static final int DEFAULT_DELAY_HOURS = 25;
-    public static final int DEFAULT_FLEX_HOURS = 2;
-
-    private TaskFinishedCallback mTaskFinishedCallback;
-    private Profile mProfile;
-
-    public ExploreSitesBackgroundTask() {}
-
-    @VisibleForTesting
-    protected Profile getProfile() {
-        if (mProfile == null) mProfile = Profile.getLastUsedRegularProfile();
-        return mProfile;
-    }
-
-    @Override
-    public @StartBeforeNativeResult int onStartTaskBeforeNativeLoaded(
-            Context context, TaskParameters taskParameters, TaskFinishedCallback callback) {
-        @ConnectionType
-        int connectionType = DeviceConditions.getCurrentNetConnectionType(context);
-        if (connectionType == ConnectionType.CONNECTION_NONE) {
-            return StartBeforeNativeResult.RESCHEDULE;
-        }
-        return StartBeforeNativeResult.LOAD_NATIVE;
-    }
-
-    @Override
-    protected void onStartTaskWithNative(
-            Context context, TaskParameters taskParameters, TaskFinishedCallback callback) {
-        assert taskParameters.getTaskId() == TaskIds.EXPLORE_SITES_REFRESH_JOB_ID;
-        if (!ExploreSitesBridge.isEnabled(ExploreSitesBridge.getVariation())) {
-            cancelTask();
-            return;
-        }
-
-        mTaskFinishedCallback = callback;
-        ExploreSitesBridge.updateCatalogFromNetwork(getProfile(), false /*isImmediateFetch*/,
-                (ignored) -> mTaskFinishedCallback.taskFinished(false));
-        RecordHistogram.recordEnumeratedHistogram("ExploreSites.CatalogUpdateRequestSource",
-                ExploreSitesCatalogUpdateRequestSource.BACKGROUND,
-                ExploreSitesCatalogUpdateRequestSource.NUM_ENTRIES);
-    }
-
-    @Override
-    protected boolean onStopTaskBeforeNativeLoaded(Context context, TaskParameters taskParameters) {
-        // Don't retry, this task is periodic anyways.
-        return false;
-    }
-
-    @Override
-    protected boolean onStopTaskWithNative(Context context, TaskParameters taskParameters) {
-        // Don't retry, this task is periodic anyways.
-        return false;
-    }
-
-    @Override
-    public void reschedule(Context context) {
-        schedule(true /* updateCurrent */);
-    }
-
-    // Removes the task from the JobScheduler queue.  Should be called when the feature is disabled.
-    public static void cancelTask() {
-        BackgroundTaskSchedulerFactory.getScheduler().cancel(
-                ContextUtils.getApplicationContext(), TaskIds.EXPLORE_SITES_REFRESH_JOB_ID);
-    }
-
-    /**
-     * Cancels an obsolete task ID that was saved in JobScheduler with the wrong background task
-     * class name.
-     */
-    public static void cancelObsoleteTaskId() {
-        BackgroundTaskSchedulerFactory.getScheduler().cancel(ContextUtils.getApplicationContext(),
-                TaskIds.DEPRECATED_EXPLORE_SITES_REFRESH_JOB_ID);
-    }
-
-    // Begins the periodic update task.
-    public static void schedule(boolean updateCurrent) {
-        cancelObsoleteTaskId();
-        TaskInfo.Builder taskInfoBuilder =
-                TaskInfo.createPeriodicTask(TaskIds.EXPLORE_SITES_REFRESH_JOB_ID,
-                                DateUtils.HOUR_IN_MILLIS * DEFAULT_DELAY_HOURS,
-                                DateUtils.HOUR_IN_MILLIS * DEFAULT_FLEX_HOURS)
-                        .setRequiredNetworkType(TaskInfo.NetworkType.ANY)
-                        .setIsPersisted(true)
-                        .setUpdateCurrent(updateCurrent);
-        BackgroundTaskSchedulerFactory.getScheduler().schedule(
-                ContextUtils.getApplicationContext(), taskInfoBuilder.build());
-    }
-}

chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBridge.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBridge.java
index 5a9aaef..411ab14 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBridge.java
@@ -138,11 +138,6 @@
         return variation != DenseVariation.ORIGINAL;
     }
 
-    @CalledByNative
-    static void scheduleDailyTask() {
-        ExploreSitesBackgroundTask.schedule(false /* updateCurrent */);
-    }
-
     /**
      * Returns the scale factor on this device.
      */

chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/AutoplayMutedNotificationTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/AutoplayMutedNotificationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/AutoplayMutedNotificationTest.java
index 047d4a6..8d762a2 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/AutoplayMutedNotificationTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/AutoplayMutedNotificationTest.java
@@ -8,7 +8,6 @@
 
 import android.content.Context;
 import android.media.AudioManager;
-import android.os.Build.VERSION_CODES;
 import android.support.test.InstrumentationRegistry;
 
 import androidx.test.filters.SmallTest;
@@ -21,7 +20,6 @@
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisableIf;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
@@ -222,9 +220,6 @@
     @Test
     @SmallTest
     @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
-    @DisableIf.
-    Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N,
-            message = "Flaky on Marshmallow https://crbug.com/1122185")
     public void testUnmutedPlaybackTakesAudioFocus() throws Exception {
         Tab tab = mActivityTestRule.getActivity().getActivityTab();
 

chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/voice/AssistantActionsHandlerTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/voice/AssistantActionsHandlerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/voice/AssistantActionsHandlerTest.java
index 9833f31a..b82b0a7 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/voice/AssistantActionsHandlerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/voice/AssistantActionsHandlerTest.java
@@ -15,7 +15,6 @@
 import static org.mockito.Mockito.verify;
 
 import android.content.Intent;
-import android.os.Bundle;
 
 import androidx.test.filters.SmallTest;
 
@@ -162,126 +161,6 @@
 
     @Test
     @SmallTest
-    @Feature("AssistantIntentPageUrl")
-    public void testStartVoiceRecognition_ToolbarButtonIncludesPageUrlForPersonalizedVoiceSearch() {
-        RecognitionTestHelper.enableFeatures(
-                mFeatures, ChromeFeatureList.ASSISTANT_INTENT_PAGE_URL);
-        RecognitionTestHelper.disableFeatures(
-                mFeatures, ChromeFeatureList.ASSISTANT_NON_PERSONALIZED_VOICE_SEARCH);
-
-        doReturn(true).when(mAssistantVoiceSearchService).canRequestAssistantVoiceSearch();
-        doReturn(true).when(mAssistantVoiceSearchService).shouldRequestAssistantVoiceSearch();
-        RecognitionTestHelper.startVoiceRecognition(
-                mPermissionDelegate, mHandler, VoiceInteractionSource.TOOLBAR);
-
-        Assert.assertTrue(mWindowAndroid.wasCancelableIntentShown());
-        Assert.assertEquals(mIntent, mWindowAndroid.getCancelableIntent());
-        verify(mIntent).putExtra(VoiceRecognitionHandler.EXTRA_INTENT_USER_EMAIL,
-                RecognitionTestHelper.DEFAULT_USER_EMAIL);
-        verify(mIntent).putExtra(
-                VoiceRecognitionHandler.EXTRA_PAGE_URL, RecognitionTestHelper.DEFAULT_URL);
-    }
-
-    @Test
-    @SmallTest
-    @Feature("AssistantIntentPageUrl")
-    public void testStartVoiceRecognition_OmitPageUrlForNonPersonalizedVoiceSearch() {
-        RecognitionTestHelper.enableFeatures(mFeatures, ChromeFeatureList.ASSISTANT_INTENT_PAGE_URL,
-                ChromeFeatureList.ASSISTANT_NON_PERSONALIZED_VOICE_SEARCH);
-        doReturn(true).when(mAssistantVoiceSearchService).canRequestAssistantVoiceSearch();
-        doReturn(true).when(mAssistantVoiceSearchService).shouldRequestAssistantVoiceSearch();
-        RecognitionTestHelper.startVoiceRecognition(
-                mPermissionDelegate, mHandler, VoiceInteractionSource.TOOLBAR);
-
-        Assert.assertTrue(mWindowAndroid.wasCancelableIntentShown());
-        Assert.assertEquals(mIntent, mWindowAndroid.getCancelableIntent());
-        verify(mIntent, never())
-                .putExtra(
-                        VoiceRecognitionHandler.EXTRA_PAGE_URL, RecognitionTestHelper.DEFAULT_URL);
-    }
-
-    @Test
-    @SmallTest
-    @Feature("AssistantIntentPageUrl")
-    public void testStartVoiceRecognition_OmitPageUrlWhenAssistantVoiceSearchDisabled() {
-        RecognitionTestHelper.enableFeatures(
-                mFeatures, ChromeFeatureList.ASSISTANT_INTENT_PAGE_URL);
-        doReturn(true).when(mAssistantVoiceSearchService).canRequestAssistantVoiceSearch();
-        doReturn(false).when(mAssistantVoiceSearchService).shouldRequestAssistantVoiceSearch();
-
-        RecognitionTestHelper.startVoiceRecognition(
-                mPermissionDelegate, mHandler, VoiceInteractionSource.TOOLBAR);
-
-        Assert.assertTrue(mWindowAndroid.wasCancelableIntentShown());
-        verify(mIntent, never()).putExtra(eq(VoiceRecognitionHandler.EXTRA_PAGE_URL), anyString());
-    }
-
-    @Test
-    @SmallTest
-    @Feature("AssistantIntentPageUrl")
-    public void testStartVoiceRecognition_OmitPageUrlForNonToolbar() {
-        RecognitionTestHelper.enableFeatures(
-                mFeatures, ChromeFeatureList.ASSISTANT_INTENT_PAGE_URL);
-        doReturn(true).when(mAssistantVoiceSearchService).canRequestAssistantVoiceSearch();
-        doReturn(true).when(mAssistantVoiceSearchService).shouldRequestAssistantVoiceSearch();
-
-        RecognitionTestHelper.startVoiceRecognition(
-                mPermissionDelegate, mHandler, VoiceInteractionSource.NTP);
-
-        verify(mIntent, never()).putExtra(eq(VoiceRecognitionHandler.EXTRA_PAGE_URL), anyString());
-    }
-
-    @Test
-    @SmallTest
-    @Feature("AssistantIntentPageUrl")
-    public void testStartVoiceRecognition_OmitPageUrlForIncognito() {
-        RecognitionTestHelper.enableFeatures(
-                mFeatures, ChromeFeatureList.ASSISTANT_INTENT_PAGE_URL);
-        doReturn(true).when(mAssistantVoiceSearchService).canRequestAssistantVoiceSearch();
-        doReturn(true).when(mAssistantVoiceSearchService).shouldRequestAssistantVoiceSearch();
-        doReturn(true).when(mTab).isIncognito();
-
-        RecognitionTestHelper.startVoiceRecognition(
-                mPermissionDelegate, mHandler, VoiceInteractionSource.TOOLBAR);
-
-        verify(mIntent, never()).putExtra(eq(VoiceRecognitionHandler.EXTRA_PAGE_URL), anyString());
-    }
-
-    @Test
-    @SmallTest
-    @Feature("AssistantIntentPageUrl")
-    public void testStartVoiceRecognition_OmitPageUrlForInternalPages() {
-        RecognitionTestHelper.enableFeatures(
-                mFeatures, ChromeFeatureList.ASSISTANT_INTENT_PAGE_URL);
-        doReturn(true).when(mAssistantVoiceSearchService).canRequestAssistantVoiceSearch();
-        doReturn(true).when(mAssistantVoiceSearchService).shouldRequestAssistantVoiceSearch();
-        GURL url = new GURL("chrome://version");
-        doReturn(url).when(mTab).getUrl();
-
-        RecognitionTestHelper.startVoiceRecognition(
-                mPermissionDelegate, mHandler, VoiceInteractionSource.TOOLBAR);
-
-        verify(mIntent, never()).putExtra(eq(VoiceRecognitionHandler.EXTRA_PAGE_URL), anyString());
-    }
-
-    @Test
-    @SmallTest
-    @Feature("AssistantIntentPageUrl")
-    public void testStartVoiceRecognition_OmitPageUrlForNonHttp() {
-        RecognitionTestHelper.enableFeatures(
-                mFeatures, ChromeFeatureList.ASSISTANT_INTENT_PAGE_URL);
-        doReturn(true).when(mAssistantVoiceSearchService).shouldRequestAssistantVoiceSearch();
-        GURL url = new GURL("ftp://example.org/");
-        doReturn(url).when(mTab).getUrl();
-
-        RecognitionTestHelper.startVoiceRecognition(
-                mPermissionDelegate, mHandler, VoiceInteractionSource.TOOLBAR);
-
-        verify(mIntent, never()).putExtra(eq(VoiceRecognitionHandler.EXTRA_PAGE_URL), anyString());
-    }
-
-    @Test
-    @SmallTest
     @Feature("AssistantIntentTranslateInfo")
     public void testStartVoiceRecognition_ToolbarButtonIncludesTranslateInfo() {
         RecognitionTestHelper.enableFeatures(mFeatures,
@@ -299,8 +178,6 @@
         verify(mIntent).putExtra(VoiceRecognitionHandler.EXTRA_TRANSLATE_ORIGINAL_LANGUAGE, "fr");
         verify(mIntent).putExtra(VoiceRecognitionHandler.EXTRA_TRANSLATE_CURRENT_LANGUAGE, "de");
         verify(mIntent).putExtra(VoiceRecognitionHandler.EXTRA_TRANSLATE_TARGET_LANGUAGE, "ja");
-        verify(mIntent).putExtra(
-                VoiceRecognitionHandler.EXTRA_PAGE_URL, RecognitionTestHelper.DEFAULT_URL);
     }
 
     @Test
@@ -348,7 +225,6 @@
                         eq(VoiceRecognitionHandler.EXTRA_TRANSLATE_CURRENT_LANGUAGE), anyString());
         verify(mIntent, never())
                 .putExtra(eq(VoiceRecognitionHandler.EXTRA_TRANSLATE_TARGET_LANGUAGE), anyString());
-        verify(mIntent, never()).putExtra(eq(VoiceRecognitionHandler.EXTRA_PAGE_URL), anyString());
     }
 
     @Test
@@ -399,7 +275,6 @@
                         eq(VoiceRecognitionHandler.EXTRA_TRANSLATE_CURRENT_LANGUAGE), anyString());
         verify(mIntent, never())
                 .putExtra(eq(VoiceRecognitionHandler.EXTRA_TRANSLATE_TARGET_LANGUAGE), anyString());
-        verify(mIntent, never()).putExtra(eq(VoiceRecognitionHandler.EXTRA_PAGE_URL), anyString());
     }
 
     @Test
@@ -426,7 +301,6 @@
                         eq(VoiceRecognitionHandler.EXTRA_TRANSLATE_CURRENT_LANGUAGE), anyString());
         verify(mIntent, never())
                 .putExtra(eq(VoiceRecognitionHandler.EXTRA_TRANSLATE_TARGET_LANGUAGE), anyString());
-        verify(mIntent, never()).putExtra(eq(VoiceRecognitionHandler.EXTRA_PAGE_URL), anyString());
     }
 
     @Test
@@ -449,70 +323,12 @@
         verify(mIntent).putExtra(VoiceRecognitionHandler.EXTRA_TRANSLATE_CURRENT_LANGUAGE, "de");
         verify(mIntent, never())
                 .putExtra(eq(VoiceRecognitionHandler.EXTRA_TRANSLATE_TARGET_LANGUAGE), anyString());
-        verify(mIntent).putExtra(
-                VoiceRecognitionHandler.EXTRA_PAGE_URL, RecognitionTestHelper.DEFAULT_URL);
-    }
-
-    @Test
-    @SmallTest
-    @Feature("AssistantIntentPageUrl")
-    public void testCallback_nonTranscriptionAction() {
-        RecognitionTestHelper.enableFeatures(
-                mFeatures, ChromeFeatureList.ASSISTANT_INTENT_PAGE_URL);
-        TestThreadUtils.runOnUiThreadBlocking(() -> {
-            Bundle bundle = new Bundle();
-            bundle.putString(VoiceRecognitionHandler.EXTRA_ACTION_PERFORMED, "TRANSLATE");
-
-            mWindowAndroid.setVoiceResults(bundle);
-            RecognitionTestHelper.startVoiceRecognition(
-                    mPermissionDelegate, mHandler, VoiceInteractionSource.TOOLBAR);
-            Assert.assertEquals(
-                    VoiceInteractionSource.TOOLBAR, mHandler.getVoiceSearchStartEventSource());
-            Assert.assertEquals(
-                    VoiceInteractionSource.TOOLBAR, mHandler.getVoiceSearchFinishEventSource());
-            Assert.assertEquals(
-                    AssistantActionPerformed.TRANSLATE, mHandler.getAssistantActionPerformed());
-            Assert.assertEquals(
-                    VoiceInteractionSource.TOOLBAR, mHandler.getAssistantActionPerformedSource());
-            Assert.assertEquals(1,
-                    mHistograms.getHistogramTotalCount("VoiceInteraction.QueryDuration.Android"));
-            Assert.assertEquals(1,
-                    mHistograms.getHistogramTotalCount("VoiceInteraction.QueryDuration.Android"));
-        });
-    }
-
-    @Test
-    @SmallTest
-    @Feature("AssistantIntentPageUrl")
-    public void testCallback_defaultToTranscription() {
-        RecognitionTestHelper.enableFeatures(
-                mFeatures, ChromeFeatureList.ASSISTANT_INTENT_PAGE_URL);
-        RecognitionTestHelper.disableFeatures(
-                mFeatures, ChromeFeatureList.ASSISTANT_NON_PERSONALIZED_VOICE_SEARCH);
-        TestThreadUtils.runOnUiThreadBlocking(() -> {
-            mWindowAndroid.setVoiceResults(RecognitionTestHelper.createDummyBundle(
-                    "testing", VoiceRecognitionHandler.VOICE_SEARCH_CONFIDENCE_NAVIGATE_THRESHOLD));
-            RecognitionTestHelper.startVoiceRecognition(
-                    mPermissionDelegate, mHandler, VoiceInteractionSource.TOOLBAR);
-            Assert.assertEquals(
-                    AssistantActionPerformed.TRANSCRIPTION, mHandler.getAssistantActionPerformed());
-            Assert.assertEquals(
-                    VoiceInteractionSource.TOOLBAR, mHandler.getAssistantActionPerformedSource());
-            Assert.assertTrue(mHandler.getVoiceSearchResult());
-            RecognitionTestHelper.assertVoiceResultsAreEqual(
-                    mAutocompleteCoordinator.getAutocompleteVoiceResults(),
-                    new String[] {"testing"},
-                    new float[] {
-                            VoiceRecognitionHandler.VOICE_SEARCH_CONFIDENCE_NAVIGATE_THRESHOLD});
-        });
     }
 
     @Test
     @SmallTest
     @Feature("AssistantIntentPageUrl")
     public void testCallback_pageUrlExtraDisabled() {
-        RecognitionTestHelper.disableFeatures(
-                mFeatures, ChromeFeatureList.ASSISTANT_INTENT_PAGE_URL);
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             mWindowAndroid.setVoiceResults(RecognitionTestHelper.createDummyBundle(
                     "testing", VoiceRecognitionHandler.VOICE_SEARCH_CONFIDENCE_NAVIGATE_THRESHOLD));
@@ -528,8 +344,6 @@
     @Test
     @SmallTest
     public void testRecordSuccessMetrics_noActionMetrics() {
-        RecognitionTestHelper.disableFeatures(
-                mFeatures, ChromeFeatureList.ASSISTANT_INTENT_PAGE_URL);
         mHandler.setQueryStartTimeForTesting(100L);
         mHandler.recordSuccessMetrics(VoiceInteractionSource.OMNIBOX, VoiceIntentTarget.ASSISTANT,
                 AssistantActionPerformed.TRANSCRIPTION);
@@ -546,32 +360,4 @@
                 mHistograms.getHistogramTotalCount(
                         "VoiceInteraction.QueryDuration.Android.Transcription"));
     }
-
-    @Test
-    @SmallTest
-    public void testRecordSuccessMetrics_splitActionMetrics() {
-        RecognitionTestHelper.enableFeatures(
-                mFeatures, ChromeFeatureList.ASSISTANT_INTENT_PAGE_URL);
-        RecognitionTestHelper.disableFeatures(
-                mFeatures, ChromeFeatureList.ASSISTANT_NON_PERSONALIZED_VOICE_SEARCH);
-        mHandler.setQueryStartTimeForTesting(100L);
-        mHandler.recordSuccessMetrics(VoiceInteractionSource.OMNIBOX, VoiceIntentTarget.ASSISTANT,
-                AssistantActionPerformed.TRANSLATE);
-        Assert.assertEquals(
-                VoiceInteractionSource.OMNIBOX, mHandler.getVoiceSearchFinishEventSource());
-        Assert.assertEquals(
-                VoiceIntentTarget.ASSISTANT, mHandler.getVoiceSearchFinishEventTarget());
-        Assert.assertEquals(
-                AssistantActionPerformed.TRANSLATE, mHandler.getAssistantActionPerformed());
-        Assert.assertEquals(
-                VoiceInteractionSource.OMNIBOX, mHandler.getAssistantActionPerformedSource());
-        Assert.assertEquals(
-                1, mHistograms.getHistogramTotalCount("VoiceInteraction.QueryDuration.Android"));
-        Assert.assertEquals(0,
-                mHistograms.getHistogramTotalCount(
-                        "VoiceInteraction.QueryDuration.Android.Transcription"));
-        Assert.assertEquals(1,
-                mHistograms.getHistogramTotalCount(
-                        "VoiceInteraction.QueryDuration.Android.Translate"));
-    }
 }

chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/voice/RecognitionTestHelper.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/voice/RecognitionTestHelper.java b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/voice/RecognitionTestHelper.java
index ccd063b..5a849bc 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/voice/RecognitionTestHelper.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/voice/RecognitionTestHelper.java
@@ -40,7 +40,6 @@
 import org.chromium.ui.base.ActivityWindowAndroid;
 import org.chromium.ui.base.IntentRequestTracker;
 import org.chromium.ui.base.WindowAndroid;
-import org.chromium.ui.base.WindowAndroid.IntentCallback;
 import org.chromium.ui.modaldialog.ModalDialogManager;
 import org.chromium.ui.permissions.AndroidPermissionDelegate;
 import org.chromium.ui.permissions.PermissionCallback;
@@ -642,13 +641,6 @@
         }
 
         @Override
-        protected void recordAssistantActionPerformed(
-                @VoiceInteractionSource int source, @AssistantActionPerformed int action) {
-            mActionPerformedSource = source;
-            mActionPerformed = action;
-        }
-
-        @Override
         protected void recordVoiceSearchFailureEvent(
                 @VoiceInteractionSource int source, @VoiceIntentTarget int target) {
             mFailureSource = source;

chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
index 686beaf..3b6dc4e 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
@@ -48,11 +48,11 @@
     private static final String TAG = "SyncTest";
 
     /**
-     * Waits until {@link SyncService#isSyncingUrlsWithKeystorePassphrase} returns desired value.
+     * Waits until {@link SyncService#isSyncingUnencryptedUrls} returns desired value.
      */
-    private void waitForIsSyncingUrlsWithKeystorePassphrase(boolean desiredValue) {
+    private void waitForIsSyncingUnencryptedUrls(boolean desiredValue) {
         CriteriaHelper.pollUiThread(() -> {
-            Criteria.checkThat(mSyncTestRule.getSyncService().isSyncingUrlsWithKeystorePassphrase(),
+            Criteria.checkThat(mSyncTestRule.getSyncService().isSyncingUnencryptedUrls(),
                     Matchers.is(desiredValue));
         }, SyncTestUtil.TIMEOUT_MS, SyncTestUtil.INTERVAL_MS);
     }
@@ -116,7 +116,7 @@
     @Test
     @LargeTest
     @Feature({"Sync"})
-    public void testIsSyncingUrlsWithKeystorePassphraseWhileUsingKeystorePassphrase() {
+    public void testIsSyncingUnencryptedUrlsWhileUsingKeystorePassphrase() {
         mSyncTestRule.setUpAccountAndEnableSyncForTesting();
         // By default Sync is being setup with KEYSTORE_PASSPHRASE and all types enabled.
         CriteriaHelper.pollUiThread(()
@@ -124,50 +124,50 @@
                         == PassphraseType.KEYSTORE_PASSPHRASE,
                 "Timed out checking getPassphraseType() == PassphraseType.KEYSTORE_PASSPHRASE",
                 SyncTestUtil.TIMEOUT_MS, SyncTestUtil.INTERVAL_MS);
-        waitForIsSyncingUrlsWithKeystorePassphrase(true);
+        waitForIsSyncingUnencryptedUrls(true);
 
-        // isSyncingUrlsWithKeystorePassphrase() should return false when history is disabled.
+        // isSyncingUnencryptedUrls() should return false when history is disabled.
         mSyncTestRule.disableDataType(UserSelectableType.HISTORY);
-        waitForIsSyncingUrlsWithKeystorePassphrase(false);
+        waitForIsSyncingUnencryptedUrls(false);
 
-        // Now enable only history datatypes and verify that isSyncingUrlsWithKeystorePassphrase()
-        // returns true again.
+        // Now enable only history datatypes and verify that isSyncingUnencryptedUrls() returns true
+        // again.
         mSyncTestRule.setSelectedTypes(
                 false, new HashSet<>(Arrays.asList(UserSelectableType.HISTORY)));
-        waitForIsSyncingUrlsWithKeystorePassphrase(true);
+        waitForIsSyncingUnencryptedUrls(true);
     }
 
     @Test
     @LargeTest
     @Feature({"Sync"})
-    public void testIsSyncingUrlsWithKeystorePassphraseWhileUsingTrustedVaultPassprhase() {
+    public void testIsSyncingUnencryptedUrlsWhileUsingTrustedVaultPassprhase() {
         mSyncTestRule.getFakeServerHelper().setTrustedVaultNigori(new byte[] {1, 2, 3, 4});
         mSyncTestRule.setUpAccountAndEnableSyncForTesting();
 
-        // Although not reflected in the name, isSyncingUrlsWithKeystorePassphrase() should treat
-        // TRUSTED_VAULT_PASSPHRASE in exactly the same way as KEYSTORE_PASSPHRASE.
+        // isSyncingUnencryptedUrls() should treat TRUSTED_VAULT_PASSPHRASE in exactly the same way
+        // as KEYSTORE_PASSPHRASE.
         CriteriaHelper.pollUiThread(()
                                             -> mSyncTestRule.getSyncService().getPassphraseType()
                         == PassphraseType.TRUSTED_VAULT_PASSPHRASE,
                 "Timed out checking getPassphraseType() == PassphraseType.TRUSTED_VAULT_PASSPHRASE",
                 SyncTestUtil.TIMEOUT_MS, SyncTestUtil.INTERVAL_MS);
-        waitForIsSyncingUrlsWithKeystorePassphrase(true);
+        waitForIsSyncingUnencryptedUrls(true);
 
-        // isSyncingUrlsWithKeystorePassphrase() should return false when history is disabled.
+        // isSyncingUnencryptedUrls() should return false when history is disabled.
         mSyncTestRule.disableDataType(UserSelectableType.HISTORY);
-        waitForIsSyncingUrlsWithKeystorePassphrase(false);
+        waitForIsSyncingUnencryptedUrls(false);
 
-        // Now enable only history datatypes and verify that isSyncingUrlsWithKeystorePassphrase()
-        // returns true again.
+        // Now enable only history datatypes and verify that isSyncingUnencryptedUrls() returns true
+        // again.
         mSyncTestRule.setSelectedTypes(
                 false, new HashSet<>(Arrays.asList(UserSelectableType.HISTORY)));
-        waitForIsSyncingUrlsWithKeystorePassphrase(true);
+        waitForIsSyncingUnencryptedUrls(true);
     }
 
     @Test
     @LargeTest
     @Feature({"Sync"})
-    public void testIsSyncingUrlsWithKeystorePassphraseWhileUsingCustomPassphrase() {
+    public void testIsSyncingUnencryptedUrlsWhileUsingCustomPassphrase() {
         mSyncTestRule.setUpAccountAndEnableSyncForTesting();
         SyncTestUtil.encryptWithPassphrase("passphrase");
         CriteriaHelper.pollUiThread(()
@@ -176,8 +176,8 @@
                 "Timed out checking getPassphraseType() == PassphraseType.CUSTOM_PASSPHRASE",
                 SyncTestUtil.TIMEOUT_MS, SyncTestUtil.INTERVAL_MS);
 
-        // isSyncingUrlsWithKeystorePassphrase() should return false with CUSTOM_PASSPHRASE no
-        // matter which datatypes are enabled.
-        waitForIsSyncingUrlsWithKeystorePassphrase(false);
+        // isSyncingUnencryptedUrls() should return false with CUSTOM_PASSPHRASE no matter which
+        // datatypes are enabled.
+        waitForIsSyncingUnencryptedUrls(false);
     }
 }

chrome/android/javatests/src/org/chromium/chrome/browser/vr/XrTestFramework.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr/XrTestFramework.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr/XrTestFramework.java
index 457639d..d8b2c9f 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr/XrTestFramework.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr/XrTestFramework.java
@@ -71,11 +71,6 @@
     public static final int POLL_TIMEOUT_LONG_MS = getLongPollTimeout();
     public static final boolean DEBUG_LOGS = false;
 
-    // We need to make sure the port is constant, otherwise the URL changes between test runs, which
-    // is really bad for image diff tests. There's nothing special about this port other than that
-    // it shouldn't be in use by anything.
-    public static final int SERVER_PORT = 39558;
-
     // The "3" corresponds to the "Mobile Bookmarks" folder - omitting a particular folder
     // automatically redirects to that folder, and not having it in the URL causes issues with the
     // URL we expect to be loaded being different than the actual URL.
@@ -451,9 +446,6 @@
 
         // WebXr requires HTTPS, so configure the server to by default use it.
         mRule.getEmbeddedTestServerRule().setServerUsesHttps(true);
-        // Tests that use RenderTestRule need a static port, as the port shows up in the URL. It
-        // doesn't hurt to use the same port in non-RenderTests, so set here.
-        mRule.getEmbeddedTestServerRule().setServerPort(SERVER_PORT);
     }
 
     /**

chrome/android/junit/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBackgroundTaskUnitTest.java

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBackgroundTaskUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBackgroundTaskUnitTest.java
deleted file mode 100644
index 5801c2b..0000000
--- a/chrome/android/junit/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBackgroundTaskUnitTest.java
+++ /dev/null
@@ -1,273 +0,0 @@
-// Copyright 2018 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.explore_sites;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.eq;
-
-import android.content.Context;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
-import org.mockito.invocation.InvocationOnMock;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-import org.chromium.base.Callback;
-import org.chromium.base.metrics.UmaRecorderHolder;
-import org.chromium.base.test.BaseRobolectricTestRunner;
-import org.chromium.chrome.browser.device.DeviceConditions;
-import org.chromium.chrome.browser.device.ShadowDeviceConditions;
-import org.chromium.chrome.browser.init.BrowserParts;
-import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
-import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.components.background_task_scheduler.BackgroundTaskScheduler;
-import org.chromium.components.background_task_scheduler.BackgroundTaskSchedulerFactory;
-import org.chromium.components.background_task_scheduler.NativeBackgroundTask;
-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.ConnectionType;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-/** Unit tests for {@link ExploreSitesBackgroundTask}. */
-@RunWith(BaseRobolectricTestRunner.class)
-@Config(manifest = Config.NONE,
-        shadows = {ShadowDeviceConditions.class,
-                ExploreSitesBackgroundTaskUnitTest.ShadowExploreSitesBridge.class})
-public class ExploreSitesBackgroundTaskUnitTest {
-    /** Implementation of ExploreSitesBridge which does not rely on native. */
-    @Implements(ExploreSitesBridge.class)
-    public static class ShadowExploreSitesBridge {
-        public static Callback<Void> mUpdateCatalogFinishedCallback;
-        public static int mVariation = ExploreSitesVariation.ENABLED;
-
-        @Implementation
-        public static void getEspCatalog(
-                Profile profile, Callback<List<ExploreSitesCategory>> callback) {}
-
-        @Implementation
-        public static void updateCatalogFromNetwork(
-                Profile profile, boolean isImmediateFetch, Callback<Void> finishedCallback) {
-            mUpdateCatalogFinishedCallback = finishedCallback;
-        }
-
-        @Implementation
-        @ExploreSitesVariation
-        public static int getVariation() {
-            return mVariation;
-        }
-    }
-
-    /**
-     * Fake of BackgroundTaskScheduler system service.
-     */
-    public static class FakeBackgroundTaskScheduler implements BackgroundTaskScheduler {
-        private HashMap<Integer, TaskInfo> mTaskInfos = new HashMap<>();
-
-        @Override
-        public boolean schedule(Context context, TaskInfo taskInfo) {
-            mTaskInfos.put(taskInfo.getTaskId(), taskInfo);
-            return true;
-        }
-
-        @Override
-        public void cancel(Context context, int taskId) {
-            mTaskInfos.remove(taskId);
-        }
-
-        @Override
-        public boolean isScheduled(Context context, int taskId) {
-            return (mTaskInfos.get(taskId) != null);
-        }
-
-        @Override
-        public void checkForOSUpgrade(Context context) {}
-
-        @Override
-        public void reschedule(Context context) {}
-
-        public TaskInfo getTaskInfo(int taskId) {
-            return mTaskInfos.get(taskId);
-        }
-    }
-
-    void initDeviceConditions(@ConnectionType int connectionType) {
-        boolean powerConnected = true;
-        boolean powerSaveModeOn = true;
-        int highBatteryLevel = 75;
-        boolean metered = true;
-        boolean screenOnAndUnlocked = true;
-
-        DeviceConditions deviceConditions = new DeviceConditions(!powerConnected, highBatteryLevel,
-                connectionType, !powerSaveModeOn, !metered, screenOnAndUnlocked);
-        ShadowDeviceConditions.setCurrentConditions(deviceConditions);
-    }
-
-    @Spy
-    private ExploreSitesBackgroundTask mExploreSitesBackgroundTask =
-            new ExploreSitesBackgroundTask();
-    @Mock
-    private ChromeBrowserInitializer mChromeBrowserInitializer;
-    @Captor
-    ArgumentCaptor<BrowserParts> mBrowserParts;
-    private FakeBackgroundTaskScheduler mFakeTaskScheduler;
-
-    public void disableExploreSites() {
-        ShadowExploreSitesBridge.mVariation = ExploreSitesVariation.DISABLED;
-    }
-
-    @Before
-    public void setUp() {
-        UmaRecorderHolder.resetForTesting();
-        MockitoAnnotations.initMocks(this);
-        doNothing()
-                .when(mChromeBrowserInitializer)
-                .handlePreNativeStartupAndLoadLibraries(any(BrowserParts.class));
-        doAnswer((InvocationOnMock invocation) -> {
-            mBrowserParts.getValue().finishNativeInitialization();
-            return null;
-        })
-                .when(mChromeBrowserInitializer)
-                .handlePostNativeStartup(eq(true), mBrowserParts.capture());
-
-        ChromeBrowserInitializer.setForTesting(mChromeBrowserInitializer);
-
-        mFakeTaskScheduler = new FakeBackgroundTaskScheduler();
-        BackgroundTaskSchedulerFactory.setSchedulerForTesting(mFakeTaskScheduler);
-        doReturn(null).when(mExploreSitesBackgroundTask).getProfile();
-
-        ShadowExploreSitesBridge.mVariation = ExploreSitesVariation.ENABLED;
-    }
-
-    @Test
-    public void scheduleTask() {
-        ExploreSitesBackgroundTask.schedule(false /* updateCurrent */);
-        TaskInfo scheduledTask =
-                mFakeTaskScheduler.getTaskInfo(TaskIds.EXPLORE_SITES_REFRESH_JOB_ID);
-        assertNotNull(scheduledTask);
-        assertEquals(TimeUnit.HOURS.toMillis(ExploreSitesBackgroundTask.DEFAULT_DELAY_HOURS),
-                scheduledTask.getPeriodicInfo().getIntervalMs());
-        assertEquals(true, scheduledTask.isPersisted());
-        assertEquals(TaskInfo.NetworkType.ANY, scheduledTask.getRequiredNetworkType());
-    }
-
-    @Test
-    public void cancelTask() {
-        TaskInfo scheduledTask =
-                mFakeTaskScheduler.getTaskInfo(TaskIds.EXPLORE_SITES_REFRESH_JOB_ID);
-        assertNull(scheduledTask);
-
-        ExploreSitesBackgroundTask.schedule(false /* updateCurrent */);
-        scheduledTask = mFakeTaskScheduler.getTaskInfo(TaskIds.EXPLORE_SITES_REFRESH_JOB_ID);
-        assertNotNull(scheduledTask);
-        assertEquals(TimeUnit.HOURS.toMillis(ExploreSitesBackgroundTask.DEFAULT_DELAY_HOURS),
-                scheduledTask.getPeriodicInfo().getIntervalMs());
-
-        ExploreSitesBackgroundTask.cancelTask();
-        scheduledTask = mFakeTaskScheduler.getTaskInfo(TaskIds.EXPLORE_SITES_REFRESH_JOB_ID);
-        assertNull(scheduledTask);
-    }
-
-    @Test
-    public void testNoNetwork() {
-        initDeviceConditions(ConnectionType.CONNECTION_NONE);
-        TaskParameters params = TaskParameters.create(TaskIds.EXPLORE_SITES_REFRESH_JOB_ID).build();
-
-        int result = mExploreSitesBackgroundTask.onStartTaskBeforeNativeLoaded(
-                RuntimeEnvironment.application, params, (boolean needsReschedule) -> {
-                    fail("Finished callback should not be run, network conditions not met.");
-                });
-        assertEquals(NativeBackgroundTask.StartBeforeNativeResult.RESCHEDULE, result);
-    }
-
-    @Test
-    public void testRemovesDeprecatedJobId() {
-        TaskInfo.Builder deprecatedTaskInfoBuilder =
-                TaskInfo.createPeriodicTask(TaskIds.DEPRECATED_EXPLORE_SITES_REFRESH_JOB_ID,
-                                TimeUnit.HOURS.toMillis(4), TimeUnit.HOURS.toMillis(1))
-                        .setRequiredNetworkType(TaskInfo.NetworkType.ANY)
-                        .setIsPersisted(true)
-                        .setUpdateCurrent(false);
-        mFakeTaskScheduler.schedule(
-                RuntimeEnvironment.application, deprecatedTaskInfoBuilder.build());
-        TaskInfo deprecatedTask =
-                mFakeTaskScheduler.getTaskInfo(TaskIds.DEPRECATED_EXPLORE_SITES_REFRESH_JOB_ID);
-        assertNotNull(deprecatedTask);
-
-        ExploreSitesBackgroundTask.schedule(false /* updateCurrent */);
-        TaskInfo scheduledTask =
-                mFakeTaskScheduler.getTaskInfo(TaskIds.EXPLORE_SITES_REFRESH_JOB_ID);
-        assertNotNull(scheduledTask);
-
-        deprecatedTask =
-                mFakeTaskScheduler.getTaskInfo(TaskIds.DEPRECATED_EXPLORE_SITES_REFRESH_JOB_ID);
-        assertNull(deprecatedTask);
-    }
-
-    @Test
-    public void testRemovesTaskIfFeatureIsDisabled() {
-        disableExploreSites();
-
-        TaskInfo.Builder taskInfoBuilder =
-                TaskInfo.createPeriodicTask(TaskIds.EXPLORE_SITES_REFRESH_JOB_ID,
-                                TimeUnit.HOURS.toMillis(4), TimeUnit.HOURS.toMillis(1))
-                        .setRequiredNetworkType(TaskInfo.NetworkType.ANY)
-                        .setIsPersisted(true)
-                        .setUpdateCurrent(false);
-        mFakeTaskScheduler.schedule(RuntimeEnvironment.application, taskInfoBuilder.build());
-        TaskInfo task = mFakeTaskScheduler.getTaskInfo(TaskIds.EXPLORE_SITES_REFRESH_JOB_ID);
-        assertNotNull(task);
-
-        TaskParameters params = TaskParameters.create(TaskIds.EXPLORE_SITES_REFRESH_JOB_ID).build();
-        mExploreSitesBackgroundTask.onStartTaskWithNative(
-                RuntimeEnvironment.application, params, (boolean needsReschedule) -> {
-                    fail("Finished callback should not be run, the task should be cancelled.");
-                });
-
-        TaskInfo scheduledTask =
-                mFakeTaskScheduler.getTaskInfo(TaskIds.EXPLORE_SITES_REFRESH_JOB_ID);
-        assertNull(scheduledTask);
-    }
-
-    @Test
-    public void testDoesNotRemoveTaskIfFeatureIsEnabled() {
-        TaskInfo.Builder taskInfoBuilder =
-                TaskInfo.createPeriodicTask(TaskIds.EXPLORE_SITES_REFRESH_JOB_ID,
-                                TimeUnit.HOURS.toMillis(4), TimeUnit.HOURS.toMillis(1))
-                        .setRequiredNetworkType(TaskInfo.NetworkType.ANY)
-                        .setIsPersisted(true)
-                        .setUpdateCurrent(false);
-        mFakeTaskScheduler.schedule(RuntimeEnvironment.application, taskInfoBuilder.build());
-        TaskInfo task = mFakeTaskScheduler.getTaskInfo(TaskIds.EXPLORE_SITES_REFRESH_JOB_ID);
-        assertNotNull(task);
-
-        TaskParameters params = TaskParameters.create(TaskIds.EXPLORE_SITES_REFRESH_JOB_ID).build();
-        mExploreSitesBackgroundTask.onStartTaskWithNative(RuntimeEnvironment.application, params,
-                (boolean needsReschedule) -> { fail("Finished callback should not be run"); });
-
-        TaskInfo scheduledTask =
-                mFakeTaskScheduler.getTaskInfo(TaskIds.EXPLORE_SITES_REFRESH_JOB_ID);
-        assertNotNull(scheduledTask);
-    }
-}

chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerNotificationTest.java

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerNotificationTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerNotificationTest.java
index 34758ec2..2d4a0ba 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerNotificationTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerNotificationTest.java
@@ -20,7 +20,6 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowNotification;
@@ -53,17 +52,12 @@
         if (info.isPrivate) {
             assertNotEquals(info.metadata.getTitle(), shadowNotification.getContentTitle());
             assertNull(shadowNotification.getContentText());
-            if (hasNApis()) {
-                assertNotEquals(
-                        info.origin, notification.extras.getString(Notification.EXTRA_SUB_TEXT));
-            }
+            assertNotEquals(
+                    info.origin, notification.extras.getString(Notification.EXTRA_SUB_TEXT));
         } else {
             assertEquals(info.metadata.getTitle(), shadowNotification.getContentTitle());
             assertEquals("", shadowNotification.getContentText());
-            if (hasNApis()) {
-                assertEquals(
-                        info.origin, notification.extras.getString(Notification.EXTRA_SUB_TEXT));
-            }
+            assertEquals(info.origin, notification.extras.getString(Notification.EXTRA_SUB_TEXT));
         }
     }
 
@@ -75,12 +69,10 @@
         MediaNotificationInfo info = mMediaNotificationInfoBuilder.build();
         Notification notification = updateNotificationBuilderAndBuild(info);
 
-        if (hasNApis()) {
-            if (info.isPrivate) {
-                assertNull(notification.getLargeIcon());
-            } else {
-                assertTrue(largeIcon.sameAs(iconToBitmap(notification.getLargeIcon())));
-            }
+        if (info.isPrivate) {
+            assertNull(notification.getLargeIcon());
+        } else {
+            assertTrue(largeIcon.sameAs(iconToBitmap(notification.getLargeIcon())));
         }
     }
 
@@ -91,9 +83,7 @@
         MediaNotificationInfo info = mMediaNotificationInfoBuilder.build();
         Notification notification = updateNotificationBuilderAndBuild(info);
 
-        if (hasNApis()) {
-            assertNull(notification.getLargeIcon());
-        }
+        assertNull(notification.getLargeIcon());
         assertNull(getController().mDefaultNotificationLargeIcon);
     }
 
@@ -105,9 +95,7 @@
         MediaNotificationInfo info = mMediaNotificationInfoBuilder.build();
         Notification notification = updateNotificationBuilderAndBuild(info);
 
-        if (hasNApis()) {
-            assertNull(notification.getLargeIcon());
-        }
+        assertNull(notification.getLargeIcon());
     }
 
     @Test
@@ -122,15 +110,13 @@
 
         assertFalse(shadowNotification.isWhenShown());
         assertFalse(shadowNotification.isOngoing());
-        if (hasNApis()) {
-            assertNotNull(notification.getSmallIcon());
-            assertFalse((notification.flags & Notification.FLAG_AUTO_CANCEL) != 0);
-            assertTrue((notification.flags & Notification.FLAG_LOCAL_ONLY) != 0);
-            assertEquals(NOTIFICATION_GROUP_NAME, notification.getGroup());
-            assertTrue(notification.isGroupSummary());
-            assertNotNull(notification.contentIntent);
-            assertEquals(Notification.VISIBILITY_PRIVATE, notification.visibility);
-        }
+        assertNotNull(notification.getSmallIcon());
+        assertFalse((notification.flags & Notification.FLAG_AUTO_CANCEL) != 0);
+        assertTrue((notification.flags & Notification.FLAG_LOCAL_ONLY) != 0);
+        assertEquals(NOTIFICATION_GROUP_NAME, notification.getGroup());
+        assertTrue(notification.isGroupSummary());
+        assertNotNull(notification.contentIntent);
+        assertEquals(Notification.VISIBILITY_PRIVATE, notification.visibility);
     }
 
     @Test
@@ -141,9 +127,7 @@
         ShadowNotification shadowNotification = Shadows.shadowOf(notification);
 
         assertTrue(shadowNotification.isOngoing());
-        if (hasNApis()) {
-            assertNotNull(notification.deleteIntent);
-        }
+        assertNotNull(notification.deleteIntent);
     }
 
     @Test
@@ -152,9 +136,7 @@
         MediaNotificationInfo info = mMediaNotificationInfoBuilder.build();
         Notification notification = updateNotificationBuilderAndBuild(info);
 
-        if (hasNApis()) {
-            assertEquals(Notification.VISIBILITY_PUBLIC, notification.visibility);
-        }
+        assertEquals(Notification.VISIBILITY_PUBLIC, notification.visibility);
     }
 
     @Test
@@ -234,8 +216,4 @@
 
         return getController().mNotificationBuilder.build();
     }
-
-    private boolean hasNApis() {
-        return RuntimeEnvironment.getApiLevel() >= Build.VERSION_CODES.N;
-    }
 }

chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationTestBase.java

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationTestBase.java b/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationTestBase.java
index 0097116..8344ed1 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationTestBase.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationTestBase.java
@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.media.ui;
 
-import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.clearInvocations;
 import static org.mockito.Mockito.doAnswer;
@@ -19,7 +18,6 @@
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Icon;
-import android.os.Build;
 import android.support.v4.media.session.MediaSessionCompat;
 
 import org.junit.After;
@@ -108,9 +106,6 @@
 
     @Before
     public void setUp() {
-        // For checking the notification presented to NotificationManager.
-        assertTrue(RuntimeEnvironment.getApiLevel() >= Build.VERSION_CODES.N);
-
         ShadowLog.stream = System.out;
 
         mMockContext = spy(RuntimeEnvironment.application);

chrome/android/webapk/shell_apk/current_version/current_version.gni

diff --git a/chrome/android/webapk/shell_apk/current_version/current_version.gni b/chrome/android/webapk/shell_apk/current_version/current_version.gni
index 71680a06..91c2e09 100644
--- a/chrome/android/webapk/shell_apk/current_version/current_version.gni
+++ b/chrome/android/webapk/shell_apk/current_version/current_version.gni
@@ -12,4 +12,4 @@
 # //chrome/android/webapk/shell_apk:webapk is changed. This includes
 # Java files, Android resource files and AndroidManifest.xml. Does not affect
 # Chrome.apk
-current_shell_apk_version = 157
+current_shell_apk_version = 158

chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/HostBrowserUtils.java

diff --git a/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/HostBrowserUtils.java b/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/HostBrowserUtils.java
index fa0af82c..333dde6 100644
--- a/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/HostBrowserUtils.java
+++ b/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/HostBrowserUtils.java
@@ -10,7 +10,6 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.os.Build;
 import android.text.TextUtils;
 
 import org.chromium.components.webapk.lib.common.WebApkMetaDataKeys;
@@ -173,8 +172,7 @@
                 && !params.getHostBrowserPackageName().equals(ARC_INTENT_HELPER_BROWSER)
                 && !params.getHostBrowserPackageName().equals(ARC_WEBAPK_BROWSER)
                 && params.getHostBrowserMajorChromiumVersion()
-                >= MINIMUM_REQUIRED_CHROMIUM_VERSION_NEW_SPLASH
-                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N;
+                >= MINIMUM_REQUIRED_CHROMIUM_VERSION_NEW_SPLASH;
     }
 
     /**

chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/NotificationPermissionRequestActivity.java

diff --git a/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/NotificationPermissionRequestActivity.java b/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/NotificationPermissionRequestActivity.java
index 5e35163..197619d 100644
--- a/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/NotificationPermissionRequestActivity.java
+++ b/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/NotificationPermissionRequestActivity.java
@@ -107,7 +107,7 @@
         // running on and targeting >= T. Check whether notifications are actually enabled, perhaps
         // because the system displayed a permission dialog after the first notification channel was
         // created and the user approved it.
-        if (!enabled && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        if (!enabled) {
             enabled = getNotificationManager().areNotificationsEnabled();
         }
 

chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/WebApkServiceImplWrapper.java

diff --git a/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/WebApkServiceImplWrapper.java b/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/WebApkServiceImplWrapper.java
index 24c2288b..a79fc578 100644
--- a/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/WebApkServiceImplWrapper.java
+++ b/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/WebApkServiceImplWrapper.java
@@ -127,10 +127,8 @@
     @Override
     @PermissionStatus
     public int checkNotificationPermission() {
-        boolean enabled = true;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            enabled = getNotificationManager().areNotificationsEnabled();
-        }
+        boolean enabled = getNotificationManager().areNotificationsEnabled();
+
         @PermissionStatus
         int status = enabled ? PermissionStatus.ALLOW : PermissionStatus.BLOCK;
         if (status == PermissionStatus.BLOCK

chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/h2o/SplashActivity.java

diff --git a/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/h2o/SplashActivity.java b/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/h2o/SplashActivity.java
index 3ec596d..1b12849 100644
--- a/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/h2o/SplashActivity.java
+++ b/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/h2o/SplashActivity.java
@@ -85,9 +85,8 @@
         // - Both the WebAPK and Chrome have been killed by the Android out-of-memory killer
         // both the SplashActivity and the browser activity are created when the user selects the
         // WebAPK in Android Recents.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-                && !new ComponentName(this, SplashActivity.class)
-                            .equals(WebApkUtils.fetchTopActivityComponent(this, getTaskId()))) {
+        if (!new ComponentName(this, SplashActivity.class)
+                        .equals(WebApkUtils.fetchTopActivityComponent(this, getTaskId()))) {
             return;
         }
 

chrome/browser/about_flags.cc

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 4267fcb0..b8f876a 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -4096,10 +4096,6 @@
      FEATURE_WITH_PARAMS_VALUE_TYPE(chrome::android::kAssistantConsentV2,
                                     kAssistantConsentV2_Variations,
                                     "AssistantConsentV2")},
-    {"assistant-intent-page-url",
-     flag_descriptions::kAssistantIntentPageUrlName,
-     flag_descriptions::kAssistantIntentPageUrlDescription, kOsAndroid,
-     FEATURE_VALUE_TYPE(chrome::android::kAssistantIntentPageUrl)},
     {"assistant-intent-translate-info",
      flag_descriptions::kAssistantIntentTranslateInfoName,
      flag_descriptions::kAssistantIntentTranslateInfoDescription, kOsAndroid,
@@ -4881,9 +4877,10 @@
      flag_descriptions::kWebPaymentsExperimentalFeaturesName,
      flag_descriptions::kWebPaymentsExperimentalFeaturesDescription, kOsAll,
      FEATURE_VALUE_TYPE(payments::features::kWebPaymentsExperimentalFeatures)},
-    {"web-payment-api-csp", flag_descriptions::kWebPaymentAPICSPName,
-     flag_descriptions::kWebPaymentAPICSPDescription, kOsAll,
-     FEATURE_VALUE_TYPE(features::kWebPaymentAPICSP)},
+    {"ignore-csp-in-web-payment-api",
+     flag_descriptions::kIgnoreCSPInWebPaymentAPIName,
+     flag_descriptions::kIgnoreCSPInWebPaymentAPIDescription, kOsAll,
+     FEATURE_VALUE_TYPE(blink::features::kIgnoreCSPInWebPaymentAPI)},
     {"clear-identity-in-can-make-payment",
      flag_descriptions::kClearIdentityInCanMakePaymentEventName,
      flag_descriptions::kClearIdentityInCanMakePaymentEventDescription, kOsAll,
@@ -9105,10 +9102,6 @@
      flag_descriptions::kSyncAccessHandleAllSyncSurfaceDescription, kOsAll,
      FEATURE_VALUE_TYPE(blink::features::kSyncAccessHandleAllSyncSurface)},
 
-    {"webauthn-conditional-ui", flag_descriptions::kWebAuthnConditionalUIName,
-     flag_descriptions::kWebAuthnConditionalUIDescription, kOsAll,
-     FEATURE_VALUE_TYPE(features::kWebAuthConditionalUI)},
-
     {"webauthn-new-desktop-ui", flag_descriptions::kWebAuthnNewDesktopUIName,
      flag_descriptions::kWebAuthnNewDesktopUIDescription, kOsDesktop,
      FEATURE_VALUE_TYPE(device::kWebAuthnNewDiscoverableCredentialsUi)},
@@ -9517,8 +9510,9 @@
   }
 #endif  // !BUILDFLAG(IS_ANDROID)
 
-  if (flags::IsFlagExpired(storage, entry.internal_name))
+  if (flags::IsFlagExpired(storage, entry.internal_name)) {
     return true;
+  }
 
   return false;
 }
@@ -9526,8 +9520,9 @@
 void ConvertFlagsToSwitches(flags_ui::FlagsStorage* flags_storage,
                             base::CommandLine* command_line,
                             flags_ui::SentinelsMode sentinels) {
-  if (command_line->HasSwitch(switches::kNoExperiments))
+  if (command_line->HasSwitch(switches::kNoExperiments)) {
     return;
+  }
 
   FlagsStateSingleton::GetFlagsState()->ConvertFlagsToSwitches(
       flags_storage, command_line, sentinels, switches::kEnableFeatures,
@@ -9627,8 +9622,9 @@
 
 void SetFeatureEntries(const std::vector<FeatureEntry>& entries) {
   CHECK(GetEntriesForTesting()->empty());  // IN-TEST
-  for (const auto& entry : entries)
+  for (const auto& entry : entries) {
     GetEntriesForTesting()->push_back(entry);  // IN-TEST
+  }
   FlagsStateSingleton::GetInstance()->RebuildState(
       *GetEntriesForTesting());  // IN-TEST
 }
@@ -9645,8 +9641,9 @@
 }
 
 base::span<const FeatureEntry> GetFeatureEntries() {
-  if (!GetEntriesForTesting()->empty())
+  if (!GetEntriesForTesting()->empty()) {
     return base::span<FeatureEntry>(*GetEntriesForTesting());
+  }
   return base::make_span(kFeatureEntries, std::size(kFeatureEntries));
 }
 

chrome/browser/android/explore_sites/explore_sites_bridge.cc

diff --git a/chrome/browser/android/explore_sites/explore_sites_bridge.cc b/chrome/browser/android/explore_sites/explore_sites_bridge.cc
index 7af5fb73..88e62fa 100644
--- a/chrome/browser/android/explore_sites/explore_sites_bridge.cc
+++ b/chrome/browser/android/explore_sites/explore_sites_bridge.cc
@@ -294,11 +294,6 @@
 }
 
 // static
-void ExploreSitesBridge::ScheduleDailyTask() {
-  JNIEnv* env = base::android::AttachCurrentThread();
-  Java_ExploreSitesBridge_scheduleDailyTask(env);
-}
-
 float ExploreSitesBridge::GetScaleFactorFromDevice() {
   JNIEnv* env = base::android::AttachCurrentThread();
   // Get scale factor from Java as a float.

chrome/browser/android/explore_sites/explore_sites_bridge.h

diff --git a/chrome/browser/android/explore_sites/explore_sites_bridge.h b/chrome/browser/android/explore_sites/explore_sites_bridge.h
index eaeff51..541066d 100644
--- a/chrome/browser/android/explore_sites/explore_sites_bridge.h
+++ b/chrome/browser/android/explore_sites/explore_sites_bridge.h
@@ -27,11 +27,6 @@
 // Methods for interacting with the Java side via JNI.
 class ExploreSitesBridge {
  public:
-  // Causes the Android JobScheduler to execute the catalog update daily.
-  // The catalog update task checks that the feature is enabled and if not,
-  // unschedules itself.
-  static void ScheduleDailyTask();
-
   // Gets the device screen scale factor from Android.
   static float GetScaleFactorFromDevice();
 };

chrome/browser/android/explore_sites/explore_sites_service_impl.cc

diff --git a/chrome/browser/android/explore_sites/explore_sites_service_impl.cc b/chrome/browser/android/explore_sites/explore_sites_service_impl.cc
index 7f8ee4bb..7764fe7 100644
--- a/chrome/browser/android/explore_sites/explore_sites_service_impl.cc
+++ b/chrome/browser/android/explore_sites/explore_sites_service_impl.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/android/explore_sites/catalog.pb.h"
 #include "chrome/browser/android/explore_sites/clear_activities_task.h"
 #include "chrome/browser/android/explore_sites/clear_catalog_task.h"
-#include "chrome/browser/android/explore_sites/explore_sites_bridge.h"
 #include "chrome/browser/android/explore_sites/explore_sites_feature.h"
 #include "chrome/browser/android/explore_sites/explore_sites_schema.h"
 #include "chrome/browser/android/explore_sites/explore_sites_store.h"
@@ -58,9 +57,6 @@
       explore_sites_store_(std::move(store)),
       url_loader_factory_getter_(std::move(url_loader_factory_getter)),
       history_statistics_reporter_(std::move(history_statistics_reporter)) {
-  if (IsExploreSitesEnabled()) {
-    ExploreSitesBridge::ScheduleDailyTask();
-  }
   // Collect history statistics unconditionally, to have baseline as well.
   history_statistics_reporter_->ScheduleReportStatistics();
 }

chrome/browser/android/omnibox/autocomplete_controller_android.cc

diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
index 4404286..f44ffaf56 100644
--- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc
+++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
@@ -42,6 +42,7 @@
 #include "chrome/common/webui_url_constants.h"
 #include "components/browser_ui/util/android/url_constants.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
+#include "components/omnibox/browser/autocomplete_controller_emitter.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_match_type.h"
@@ -49,7 +50,6 @@
 #include "components/omnibox/browser/autocomplete_provider_client.h"
 #include "components/omnibox/browser/autocomplete_result.h"
 #include "components/omnibox/browser/base_search_provider.h"
-#include "components/omnibox/browser/omnibox_controller_emitter.h"
 #include "components/omnibox/browser/omnibox_event_global_tracker.h"
 #include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/omnibox/browser/omnibox_log.h"
@@ -131,8 +131,8 @@
           AutocompleteClassifier::DefaultOmniboxProviders())} {
   autocomplete_controller_->AddObserver(this);
 
-  OmniboxControllerEmitter* emitter =
-      OmniboxControllerEmitter::GetForBrowserContext(profile_);
+  AutocompleteControllerEmitter* emitter =
+      AutocompleteControllerEmitter::GetForBrowserContext(profile_);
   if (emitter)
     autocomplete_controller_->AddObserver(emitter);
 }

chrome/browser/android/vr/autocomplete_controller.cc

diff --git a/chrome/browser/android/vr/autocomplete_controller.cc b/chrome/browser/android/vr/autocomplete_controller.cc
index 7bf6ce89..310e5f6 100644
--- a/chrome/browser/android/vr/autocomplete_controller.cc
+++ b/chrome/browser/android/vr/autocomplete_controller.cc
@@ -14,8 +14,8 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/vr/model/omnibox_suggestions.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
+#include "components/omnibox/browser/autocomplete_controller_emitter.h"
 #include "components/omnibox/browser/autocomplete_input.h"
-#include "components/omnibox/browser/omnibox_controller_emitter.h"
 #include "components/search_engines/util.h"
 
 namespace vr {
@@ -35,8 +35,8 @@
       std::move(client), AutocompleteClassifier::DefaultOmniboxProviders());
   autocomplete_controller_->AddObserver(this);
 
-  OmniboxControllerEmitter* emitter =
-      OmniboxControllerEmitter::GetForBrowserContext(profile_);
+  AutocompleteControllerEmitter* emitter =
+      AutocompleteControllerEmitter::GetForBrowserContext(profile_);
   if (emitter)
     autocomplete_controller_->AddObserver(emitter);
 }

chrome/browser/app_controller_mac.mm

diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 9a82eef..412920d 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -164,12 +164,14 @@
 // not possible. If the last active browser is minimized (in particular, if
 // there are only minimized windows), it will unminimize it.
 Browser* ActivateBrowser(Profile* profile) {
-  Browser* browser =
-      chrome::FindLastActiveWithProfile(
-          profile->IsGuestSession()
-              ? profile->GetPrimaryOTRProfile(/*create_if_needed=*/true)
-              : profile)
-          ->GetBrowserForOpeningWebUi();
+  Browser* browser = chrome::FindLastActiveWithProfile(
+      profile->IsGuestSession()
+          ? profile->GetPrimaryOTRProfile(/*create_if_needed=*/true)
+          : profile);
+
+  if (browser) {
+    browser = browser->GetBrowserForOpeningWebUi();
+  }
 
   if (browser)
     browser->window()->Activate();
@@ -1278,7 +1280,7 @@
       }
       [[fallthrough]];  // To create new window.
     case IDC_NEW_WINDOW:
-      CreateBrowser(profile);
+      CreateBrowser(profile->GetOriginalProfile());
       break;
     case IDC_FOCUS_LOCATION:
       chrome::ExecuteCommand(ActivateOrCreateBrowser(profile),

chrome/browser/app_controller_mac_browsertest.mm

diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm
index 2456715..aae0aa2 100644
--- a/chrome/browser/app_controller_mac_browsertest.mm
+++ b/chrome/browser/app_controller_mac_browsertest.mm
@@ -975,6 +975,43 @@
   EXPECT_EQ(profile, new_browser->profile()->GetOriginalProfile());
 }
 
+// Tests opening a new window from dock menu while incognito browser is opened.
+// Regression test for https://crbug.com/1371923
+IN_PROC_BROWSER_TEST_F(AppControllerMainMenuBrowserTest,
+                       WhileIncognitoBrowserIsOpened_NewWindow) {
+  EXPECT_EQ(BrowserList::GetInstance()->size(), 1u);
+
+  // Close the current browser.
+  Profile* profile = browser()->profile();
+  chrome::CloseAllBrowsers();
+  ui_test_utils::WaitForBrowserToClose();
+  EXPECT_TRUE(BrowserList::GetInstance()->empty());
+
+  // Create an incognito browser.
+  Browser* incognito_browser = CreateIncognitoBrowser(profile);
+  EXPECT_TRUE(incognito_browser->profile()->IsIncognitoProfile());
+  EXPECT_EQ(BrowserList::GetInstance()->size(), 1u);
+  EXPECT_EQ(incognito_browser, chrome::GetLastActiveBrowser());
+
+  // Simulate click on "New Window".
+  ui_test_utils::BrowserChangeObserver browser_added_observer(
+      nullptr, ui_test_utils::BrowserChangeObserver::ChangeType::kAdded);
+  AppController* ac = base::mac::ObjCCast<AppController>(
+      [[NSApplication sharedApplication] delegate]);
+  ASSERT_TRUE(ac);
+  NSMenu* menu = [ac applicationDockMenu:NSApp];
+  ASSERT_TRUE(menu);
+  NSMenuItem* item = [menu itemWithTag:IDC_NEW_WINDOW];
+  ASSERT_TRUE(item);
+  [ac commandDispatch:item];
+
+  // Check that a new non-incognito browser is opened.
+  Browser* new_browser = browser_added_observer.Wait();
+  EXPECT_EQ(BrowserList::GetInstance()->size(), 2u);
+  EXPECT_TRUE(new_browser->profile()->IsRegularProfile());
+  EXPECT_EQ(profile, new_browser->profile());
+}
+
 class AppControllerIncognitoSwitchTest : public InProcessBrowserTest {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override {

chrome/browser/apps/app_service/metrics/website_metrics_browsertest.cc

diff --git a/chrome/browser/apps/app_service/metrics/website_metrics_browsertest.cc b/chrome/browser/apps/app_service/metrics/website_metrics_browsertest.cc
index 94ab9791..320d0b7 100644
--- a/chrome/browser/apps/app_service/metrics/website_metrics_browsertest.cc
+++ b/chrome/browser/apps/app_service/metrics/website_metrics_browsertest.cc
@@ -5,6 +5,7 @@
 #include "base/containers/contains.h"
 #include "base/json/values_util.h"
 #include "base/run_loop.h"
+#include "build/chromeos_buildflags.h"
 #include "chrome/browser/apps/app_service/app_service_proxy.h"
 #include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -323,7 +324,13 @@
   std::unique_ptr<ukm::TestAutoSetUkmRecorder> test_ukm_recorder_;
 };
 
-IN_PROC_BROWSER_TEST_F(WebsiteMetricsBrowserTest, InsertAndCloseTabs) {
+// crbug.com/1399461 Disable flaky test.
+#if BUILDFLAG(IS_CHROMEOS_LACROS)
+#define MAYBE_InsertAndCloseTabs DISABLED_InsertAndCloseTabs
+#else
+#define MAYBE_InsertAndCloseTabs InsertAndCloseTabs
+#endif
+IN_PROC_BROWSER_TEST_F(WebsiteMetricsBrowserTest, MAYBE_InsertAndCloseTabs) {
   InstallWebAppOpeningAsTab("https://a.example.org");
 
   Browser* browser = CreateBrowser();
@@ -420,7 +427,13 @@
   EXPECT_TRUE(url_infos().empty());
 }
 
-IN_PROC_BROWSER_TEST_F(WebsiteMetricsBrowserTest, ForegroundTabNavigate) {
+// crbug.com/1399461 Disable flaky test.
+#if BUILDFLAG(IS_CHROMEOS_LACROS)
+#define MAYBE_ForegroundTabNavigate DISABLED_ForegroundTabNavigate
+#else
+#define MAYBE_ForegroundTabNavigate ForegroundTabNavigate
+#endif
+IN_PROC_BROWSER_TEST_F(WebsiteMetricsBrowserTest, MAYBE_ForegroundTabNavigate) {
   Browser* browser = CreateBrowser();
   auto* window = browser->window()->GetNativeWindow();
   EXPECT_EQ(1u, window_to_web_contents().size());
@@ -476,7 +489,14 @@
   EXPECT_TRUE(url_infos().empty());
 }
 
-IN_PROC_BROWSER_TEST_F(WebsiteMetricsBrowserTest, NavigateToBackgroundTab) {
+// crbug.com/1399461 Disable flaky test.
+#if BUILDFLAG(IS_CHROMEOS_LACROS)
+#define MAYBE_NavigateToBackgroundTab DISABLED_NavigateToBackgroundTab
+#else
+#define MAYBE_NavigateToBackgroundTab NavigateToBackgroundTab
+#endif
+IN_PROC_BROWSER_TEST_F(WebsiteMetricsBrowserTest,
+                       MAYBE_NavigateToBackgroundTab) {
   auto website_metrics_ptr = std::make_unique<apps::TestWebsiteMetrics>(
       ProfileManager::GetPrimaryUserProfile());
   auto* metrics = website_metrics_ptr.get();
@@ -610,7 +630,14 @@
   EXPECT_TRUE(url_infos().empty());
 }
 
-IN_PROC_BROWSER_TEST_F(WebsiteMetricsBrowserTest, NavigateToUrlWithManifest) {
+// crbug.com/1399461 Disable flaky test.
+#if BUILDFLAG(IS_CHROMEOS_LACROS)
+#define MAYBE_NavigateToUrlWithManifest DISABLED_NavigateToUrlWithManifest
+#else
+#define MAYBE_NavigateToUrlWithManifest NavigateToUrlWithManifest
+#endif
+IN_PROC_BROWSER_TEST_F(WebsiteMetricsBrowserTest,
+                       MAYBE_NavigateToUrlWithManifest) {
   auto website_metrics_ptr = std::make_unique<apps::TestWebsiteMetrics>(
       ProfileManager::GetPrimaryUserProfile());
   auto* metrics = website_metrics_ptr.get();
@@ -674,7 +701,13 @@
   EXPECT_TRUE(url_infos().empty());
 }
 
-IN_PROC_BROWSER_TEST_F(WebsiteMetricsBrowserTest, MultipleBrowser) {
+// crbug.com/1399461 Disable flaky test.
+#if BUILDFLAG(IS_CHROMEOS_LACROS)
+#define MAYBE_MultipleBrowser DISABLED_MultipleBrowser
+#else
+#define MAYBE_MultipleBrowser MultipleBrowser
+#endif
+IN_PROC_BROWSER_TEST_F(WebsiteMetricsBrowserTest, MAYBE_MultipleBrowser) {
   // Setup: two browsers with two tabs each.
   auto* browser1 = CreateBrowser();
   auto* window1 = browser1->window()->GetNativeWindow();
@@ -794,8 +827,14 @@
   EXPECT_TRUE(url_infos().empty());
 }
 
+// crbug.com/1399461 Disable flaky test.
+#if BUILDFLAG(IS_CHROMEOS_LACROS)
+#define MAYBE_MoveActivatedTabToNewBrowser DISABLED_MoveActivatedTabToNewBrowser
+#else
+#define MAYBE_MoveActivatedTabToNewBrowser MoveActivatedTabToNewBrowser
+#endif
 IN_PROC_BROWSER_TEST_F(WebsiteMetricsBrowserTest,
-                       MoveActivatedTabToNewBrowser) {
+                       MAYBE_MoveActivatedTabToNewBrowser) {
   auto website_metrics_ptr = std::make_unique<apps::TestWebsiteMetrics>(
       ProfileManager::GetPrimaryUserProfile());
   auto* metrics = website_metrics_ptr.get();
@@ -927,8 +966,15 @@
   EXPECT_TRUE(url_infos().empty());
 }
 
+// crbug.com/1399461 Disable flaky test.
+#if BUILDFLAG(IS_CHROMEOS_LACROS)
+#define MAYBE_MoveInActivatedTabToNewBrowser \
+  DISABLED_MoveInActivatedTabToNewBrowser
+#else
+#define MAYBE_MoveInActivatedTabToNewBrowser MoveInActivatedTabToNewBrowser
+#endif
 IN_PROC_BROWSER_TEST_F(WebsiteMetricsBrowserTest,
-                       MoveInActivatedTabToNewBrowser) {
+                       MAYBE_MoveInActivatedTabToNewBrowser) {
   // Create a browser with two tabs.
   auto* browser1 = CreateBrowser();
   auto* window1 = browser1->window()->GetNativeWindow();
@@ -1049,7 +1095,13 @@
   EXPECT_TRUE(webcontents_to_ukm_key().empty());
 }
 
-IN_PROC_BROWSER_TEST_F(WebsiteMetricsBrowserTest, OnURLsDeleted) {
+// crbug.com/1399461 Disable flaky test.
+#if BUILDFLAG(IS_CHROMEOS_LACROS)
+#define MAYBE_OnURLsDeleted DISABLED_OnURLsDeleted
+#else
+#define MAYBE_OnURLsDeleted OnURLsDeleted
+#endif
+IN_PROC_BROWSER_TEST_F(WebsiteMetricsBrowserTest, MAYBE_OnURLsDeleted) {
   // Setup: two browsers with one tabs each.
   auto* browser1 = CreateBrowser();
   auto* window1 = browser1->window()->GetNativeWindow();

chrome/browser/apps/app_service/publishers/remote_apps.cc

diff --git a/chrome/browser/apps/app_service/publishers/remote_apps.cc b/chrome/browser/apps/app_service/publishers/remote_apps.cc
index 167566319..d3570ba0 100644
--- a/chrome/browser/apps/app_service/publishers/remote_apps.cc
+++ b/chrome/browser/apps/app_service/publishers/remote_apps.cc
@@ -10,7 +10,6 @@
 #include "chrome/browser/apps/app_service/app_icon/app_icon_factory.h"
 #include "chrome/browser/apps/app_service/app_launch_params.h"
 #include "chrome/browser/apps/app_service/app_service_proxy.h"
-#include "components/services/app_service/public/cpp/features.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace apps {
@@ -18,33 +17,16 @@
 RemoteApps::RemoteApps(AppServiceProxy* proxy, Delegate* delegate)
     : AppPublisher(proxy), profile_(proxy->profile()), delegate_(delegate) {
   DCHECK(delegate);
-
-  mojo::Remote<mojom::AppService>& app_service = proxy->AppService();
-  if (!base::FeatureList::IsEnabled(kStopMojomAppService) &&
-      !app_service.is_bound()) {
-    return;
-  }
-
-  PublisherBase::Initialize(app_service, mojom::AppType::kRemote);
 }
 
 RemoteApps::~RemoteApps() = default;
 
 void RemoteApps::AddApp(const ash::RemoteAppsModel::AppInfo& info) {
-  mojom::AppPtr mojom_app = Convert(info);
-  PublisherBase::Publish(std::move(mojom_app), subscribers_);
-
   auto app = CreateApp(info);
   AppPublisher::Publish(std::move(app));
 }
 
 void RemoteApps::UpdateAppIcon(const std::string& app_id) {
-  mojom::AppPtr mojom_app = mojom::App::New();
-  mojom_app->app_type = mojom::AppType::kRemote;
-  mojom_app->app_id = app_id;
-  mojom_app->icon_key = icon_key_factory_.MakeIconKey(IconEffects::kNone);
-  PublisherBase::Publish(std::move(mojom_app), subscribers_);
-
   auto app = std::make_unique<App>(AppType::kRemote, app_id);
   app->icon_key =
       std::move(*icon_key_factory_.CreateIconKey(IconEffects::kNone));
@@ -52,12 +34,6 @@
 }
 
 void RemoteApps::DeleteApp(const std::string& app_id) {
-  mojom::AppPtr mojom_app = mojom::App::New();
-  mojom_app->app_type = mojom::AppType::kRemote;
-  mojom_app->app_id = app_id;
-  mojom_app->readiness = mojom::Readiness::kUninstalledByUser;
-  PublisherBase::Publish(std::move(mojom_app), subscribers_);
-
   auto app = std::make_unique<App>(AppType::kRemote, app_id);
   app->readiness = Readiness::kUninstalledByUser;
   AppPublisher::Publish(std::move(app));
@@ -78,21 +54,6 @@
   return app;
 }
 
-apps::mojom::AppPtr RemoteApps::Convert(
-    const ash::RemoteAppsModel::AppInfo& info) {
-  apps::mojom::AppPtr app = PublisherBase::MakeApp(
-      mojom::AppType::kRemote, info.id, mojom::Readiness::kReady, info.name,
-      mojom::InstallReason::kUser);
-  app->show_in_launcher = mojom::OptionalBool::kTrue;
-  app->show_in_management = mojom::OptionalBool::kFalse;
-  app->show_in_search = mojom::OptionalBool::kTrue;
-  app->show_in_shelf = mojom::OptionalBool::kFalse;
-  app->allow_uninstall = mojom::OptionalBool::kFalse;
-  app->handles_intents = mojom::OptionalBool::kTrue;
-  app->icon_key = icon_key_factory_.MakeIconKey(IconEffects::kNone);
-  return app;
-}
-
 void RemoteApps::Initialize() {
   RegisterPublisher(AppType::kRemote);
   AppPublisher::Publish(std::vector<AppPtr>{}, AppType::kRemote,
@@ -153,19 +114,4 @@
   std::move(callback).Run(delegate_->GetMenuModel(app_id));
 }
 
-void RemoteApps::Connect(
-    mojo::PendingRemote<mojom::Subscriber> subscriber_remote,
-    mojom::ConnectOptionsPtr opts) {
-  mojo::Remote<mojom::Subscriber> subscriber(std::move(subscriber_remote));
-
-  std::vector<mojom::AppPtr> apps;
-  for (const auto& entry : delegate_->GetApps()) {
-    apps.push_back(Convert(entry.second));
-  }
-  subscriber->OnApps(std::move(apps), apps::mojom::AppType::kRemote,
-                     true /* should_notify_initialized */);
-
-  subscribers_.Add(std::move(subscriber));
-}
-
 }  // namespace apps

chrome/browser/apps/app_service/publishers/remote_apps.h

diff --git a/chrome/browser/apps/app_service/publishers/remote_apps.h b/chrome/browser/apps/app_service/publishers/remote_apps.h
index a16d477..3fb82ea3 100644
--- a/chrome/browser/apps/app_service/publishers/remote_apps.h
+++ b/chrome/browser/apps/app_service/publishers/remote_apps.h
@@ -18,9 +18,6 @@
 #include "components/services/app_service/public/cpp/icon_types.h"
 #include "components/services/app_service/public/cpp/menu.h"
 #include "components/services/app_service/public/cpp/publisher_base.h"
-#include "components/services/app_service/public/mojom/app_service.mojom.h"
-#include "mojo/public/cpp/bindings/pending_remote.h"
-#include "mojo/public/cpp/bindings/remote_set.h"
 
 class Profile;
 
@@ -38,11 +35,7 @@
 // An app publisher (in the App Service sense) of Remote apps.
 //
 // See components/services/app_service/README.md.
-//
-// TODO(crbug.com/1253250):
-// 1. Remove the parent class apps::PublisherBase.
-// 2. Remove all apps::mojom related code.
-class RemoteApps : public apps::PublisherBase, public AppPublisher {
+class RemoteApps : public AppPublisher {
  public:
   // Delegate which handles calls to get the properties of the app and also
   // handles launching of the app.
@@ -79,8 +72,6 @@
 
   AppPtr CreateApp(const ash::RemoteAppsModel::AppInfo& info);
 
-  apps::mojom::AppPtr Convert(const ash::RemoteAppsModel::AppInfo& info);
-
   void Initialize();
 
   // apps::AppPublisher overrides.
@@ -101,13 +92,8 @@
                     int64_t display_id,
                     base::OnceCallback<void(MenuItems)> callback) override;
 
-  // apps::PublisherBase:
-  void Connect(mojo::PendingRemote<apps::mojom::Subscriber> subscriber_remote,
-               apps::mojom::ConnectOptionsPtr opts) override;
-
   Profile* const profile_;
   Delegate* const delegate_;
-  mojo::RemoteSet<apps::mojom::Subscriber> subscribers_;
   apps_util::IncrementingIconKeyFactory icon_key_factory_;
 };
 

chrome/browser/ash/app_mode/startup_app_launcher_unittest.cc

diff --git a/chrome/browser/ash/app_mode/startup_app_launcher_unittest.cc b/chrome/browser/ash/app_mode/startup_app_launcher_unittest.cc
index 153e4872..0225bb2 100644
--- a/chrome/browser/ash/app_mode/startup_app_launcher_unittest.cc
+++ b/chrome/browser/ash/app_mode/startup_app_launcher_unittest.cc
@@ -26,6 +26,7 @@
 #include "chrome/browser/ash/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/ash/app_mode/test_kiosk_extension_builder.h"
 #include "chrome/browser/ash/extensions/test_external_cache.h"
+#include "chrome/browser/ash/login/users/avatar/user_image_manager_impl.h"
 #include "chrome/browser/ash/policy/core/device_local_account.h"
 #include "chrome/browser/ash/settings/scoped_cros_settings_test_helper.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_external_loader.h"
@@ -371,6 +372,7 @@
   void SetUp() override {
     ash_test_helper_.SetUp();
 
+    UserImageManagerImpl::SkipDefaultUserImageDownloadForTesting();
     command_line_.GetProcessCommandLine()->AppendSwitch(
         switches::kForceAppMode);
     command_line_.GetProcessCommandLine()->AppendSwitch(switches::kAppId);

chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.cc

diff --git a/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.cc b/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.cc
index 1d7c4c90..fe20185 100644
--- a/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.cc
+++ b/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.cc
@@ -258,8 +258,6 @@
     // TODO(yhanada): Remove this line after we migrate to SPM completely.
     owner_->OnInputContextHandlerChanged();
   }
-  void OnCompositionBoundsChanged(
-      const std::vector<gfx::Rect>& bounds) override {}
   void OnCaretBoundsChanged(const gfx::Rect& caret_bounds) override {}
   void OnSurroundingTextChanged(const std::string& engine_id,
                                 const std::u16string& text,

chrome/browser/ash/arc/input_method_manager/input_connection_impl_unittest.cc

diff --git a/chrome/browser/ash/arc/input_method_manager/input_connection_impl_unittest.cc b/chrome/browser/ash/arc/input_method_manager/input_connection_impl_unittest.cc
index 725dcc0..7e75d99 100644
--- a/chrome/browser/ash/arc/input_method_manager/input_connection_impl_unittest.cc
+++ b/chrome/browser/ash/arc/input_method_manager/input_connection_impl_unittest.cc
@@ -45,8 +45,6 @@
       ash::TextInputMethod::KeyEventDoneCallback key_data) override {}
   void OnReset(const std::string& engine_id) override {}
   void OnDeactivated(const std::string& engine_id) override {}
-  void OnCompositionBoundsChanged(
-      const std::vector<gfx::Rect>& bounds) override {}
   void OnCaretBoundsChanged(const gfx::Rect& caret_bounds) override {}
   void OnSurroundingTextChanged(const std::string& engine_id,
                                 const std::u16string& text,

chrome/browser/ash/arc/input_overlay/input_overlay_resources_util.cc

diff --git a/chrome/browser/ash/arc/input_overlay/input_overlay_resources_util.cc b/chrome/browser/ash/arc/input_overlay/input_overlay_resources_util.cc
index cdc2206..7efec130 100644
--- a/chrome/browser/ash/arc/input_overlay/input_overlay_resources_util.cc
+++ b/chrome/browser/ash/arc/input_overlay/input_overlay_resources_util.cc
@@ -50,6 +50,10 @@
       {"com.gamehivecorp.taptitans2", IDR_IO_COM_GAMEHIVECORP_TAPTITANS2},
       {"com.oddrok.powerhover", IDR_IO_COM_ODDROK_POWERHOVER},
       {"com.robtopx.geometryjumplite", IDR_IO_COM_ROBTOPX_GEOMETRYJUMPLITE},
+      {"com.robtopx.geometrydashworld", IDR_IO_COM_ROBTOPX_GEOMETRYDASHWORLD},
+      {"com.robtopx.geometrydashmeltdown", IDR_IO_COM_ROBTOPX_GEOMETRYDASHMELTDOWN},
+      {"com.robtopx.geometrydashsubzero", IDR_IO_COM_ROBTOPX_GEOMETRYDASHSUBZERO},
+      {"com.kitkagames.fallbuddies", IDR_IO_COM_KITKAGAMES_FALLBUDDIES},
   };
 
   auto it = resource_id_map.find(package_name);

chrome/browser/ash/child_accounts/edu_coexistence_tos_store_utils.cc

diff --git a/chrome/browser/ash/child_accounts/edu_coexistence_tos_store_utils.cc b/chrome/browser/ash/child_accounts/edu_coexistence_tos_store_utils.cc
index d787f167..9a32032 100644
--- a/chrome/browser/ash/child_accounts/edu_coexistence_tos_store_utils.cc
+++ b/chrome/browser/ash/child_accounts/edu_coexistence_tos_store_utils.cc
@@ -53,14 +53,14 @@
 void SetUserConsentInfoListForProfile(
     Profile* profile,
     const std::vector<UserConsentInfo>& user_consent_info_list) {
-  base::Value user_consent_info_list_value(base::Value::Type::DICTIONARY);
+  base::Value::Dict user_consent_info_list_value;
   for (const auto& info : user_consent_info_list) {
-    user_consent_info_list_value.SetStringPath(
+    user_consent_info_list_value.SetByDottedPath(
         info.edu_account_gaia_id, info.edu_coexistence_tos_version);
   }
 
-  profile->GetPrefs()->Set(prefs::kEduCoexistenceToSAcceptedVersion,
-                           std::move(user_consent_info_list_value));
+  profile->GetPrefs()->SetDict(prefs::kEduCoexistenceToSAcceptedVersion,
+                               std::move(user_consent_info_list_value));
 }
 
 std::vector<UserConsentInfo> GetUserConsentInfoListForProfile(

chrome/browser/ash/child_accounts/family_user_parental_control_metrics_unittest.cc

diff --git a/chrome/browser/ash/child_accounts/family_user_parental_control_metrics_unittest.cc b/chrome/browser/ash/child_accounts/family_user_parental_control_metrics_unittest.cc
index 3ff5f300..c835f15f 100644
--- a/chrome/browser/ash/child_accounts/family_user_parental_control_metrics_unittest.cc
+++ b/chrome/browser/ash/child_accounts/family_user_parental_control_metrics_unittest.cc
@@ -264,7 +264,7 @@
 
     builder.SetResetTime(6, 0);
     GetPrefs()->SetDict(prefs::kPerAppTimeLimitsPolicy,
-                        builder.value().GetDict().Clone());
+                        builder.value().Clone());
   }
 
   histogram_tester_.ExpectBucketCount(

chrome/browser/ash/child_accounts/parent_access_code/authenticator.cc

diff --git a/chrome/browser/ash/child_accounts/parent_access_code/authenticator.cc b/chrome/browser/ash/child_accounts/parent_access_code/authenticator.cc
index d12ac72..94fbd0a 100644
--- a/chrome/browser/ash/child_accounts/parent_access_code/authenticator.cc
+++ b/chrome/browser/ash/child_accounts/parent_access_code/authenticator.cc
@@ -10,7 +10,6 @@
 #include "base/big_endian.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
-#include "base/values.h"
 
 namespace ash {
 namespace parent_access {
@@ -32,8 +31,7 @@
 
 // static
 absl::optional<AccessCodeConfig> AccessCodeConfig::FromDictionary(
-    const base::Value& value) {
-  const base::Value::Dict& dict = value.GetDict();
+    const base::Value::Dict& dict) {
   const std::string* secret = dict.FindString(kSharedSecretDictKey);
   if (!secret || secret->empty())
     return absl::nullopt;
@@ -74,14 +72,13 @@
 
 AccessCodeConfig::~AccessCodeConfig() = default;
 
-base::Value AccessCodeConfig::ToDictionary() const {
-  base::Value config(base::Value::Type::DICTIONARY);
-  config.SetKey(kSharedSecretDictKey, base::Value(shared_secret_));
-  config.SetKey(kCodeValidityDictKey,
-                base::Value(static_cast<int>(code_validity_.InSeconds())));
-  config.SetKey(
-      kClockDriftDictKey,
-      base::Value(static_cast<int>(clock_drift_tolerance_.InSeconds())));
+base::Value::Dict AccessCodeConfig::ToDictionary() const {
+  base::Value::Dict config;
+  config.Set(kSharedSecretDictKey, base::Value(shared_secret_));
+  config.Set(kCodeValidityDictKey,
+             base::Value(static_cast<int>(code_validity_.InSeconds())));
+  config.Set(kClockDriftDictKey,
+             base::Value(static_cast<int>(clock_drift_tolerance_.InSeconds())));
   return config;
 }
 

chrome/browser/ash/child_accounts/parent_access_code/authenticator.h

diff --git a/chrome/browser/ash/child_accounts/parent_access_code/authenticator.h b/chrome/browser/ash/child_accounts/parent_access_code/authenticator.h
index 18fc6e5..598f64d3 100644
--- a/chrome/browser/ash/child_accounts/parent_access_code/authenticator.h
+++ b/chrome/browser/ash/child_accounts/parent_access_code/authenticator.h
@@ -10,14 +10,11 @@
 #include <string>
 
 #include "base/time/time.h"
+#include "base/values.h"
 #include "components/account_id/account_id.h"
 #include "crypto/hmac.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
-namespace base {
-class Value;
-}  // namespace base
-
 namespace ash {
 namespace parent_access {
 
@@ -27,7 +24,7 @@
   // Returns AccessCodeConfig created from a |dictionary|, if the |dictionary|
   // contains valid config data.
   static absl::optional<AccessCodeConfig> FromDictionary(
-      const base::Value& value);
+      const base::Value::Dict& dictionary);
 
   // TODO(agawronska): Make constructor private.
   // To create valid AccessCodeConfig:
@@ -59,7 +56,7 @@
   }
 
   // Converts the AccessCodeConfig object to its dictionary equivalent.
-  base::Value ToDictionary() const;
+  base::Value::Dict ToDictionary() const;
 
  private:
   std::string shared_secret_;

chrome/browser/ash/child_accounts/parent_access_code/config_source.cc

diff --git a/chrome/browser/ash/child_accounts/parent_access_code/config_source.cc b/chrome/browser/ash/child_accounts/parent_access_code/config_source.cc
index 9b82721..0368ffa7 100644
--- a/chrome/browser/ash/child_accounts/parent_access_code/config_source.cc
+++ b/chrome/browser/ash/child_accounts/parent_access_code/config_source.cc
@@ -51,35 +51,33 @@
   // Clear old authenticators for that user.
   config_map_[user->GetAccountId()].clear();
 
-  const base::Value* future_config_value = dictionary->FindKeyOfType(
-      kFutureConfigDictKey, base::Value::Type::DICTIONARY);
+  const base::Value::Dict* future_config_value =
+      dictionary->GetDict().FindDict(kFutureConfigDictKey);
   if (future_config_value) {
     AddAuthenticator(*future_config_value, user);
   } else {
     LOG(WARNING) << "No future config for parent access code in the policy";
   }
 
-  const base::Value* current_config_value = dictionary->FindKeyOfType(
-      kCurrentConfigDictKey, base::Value::Type::DICTIONARY);
+  const base::Value::Dict* current_config_value =
+      dictionary->GetDict().FindDict(kCurrentConfigDictKey);
   if (current_config_value) {
     AddAuthenticator(*current_config_value, user);
   } else {
     LOG(WARNING) << "No current config for parent access code in the policy";
   }
 
-  const base::Value* old_configs_value =
-      dictionary->FindKeyOfType(kOldConfigsDictKey, base::Value::Type::LIST);
+  const base::Value::List* old_configs_value =
+      dictionary->GetDict().FindList(kOldConfigsDictKey);
   if (old_configs_value) {
-    for (const auto& config_value : old_configs_value->GetList())
-      AddAuthenticator(config_value, user);
+    for (const auto& config_value : *old_configs_value) {
+      AddAuthenticator(config_value.GetDict(), user);
+    }
   }
 }
 
-void ConfigSource::AddAuthenticator(const base::Value& dict,
+void ConfigSource::AddAuthenticator(const base::Value::Dict& dict,
                                     const user_manager::User* user) {
-  if (!dict.is_dict())
-    return;
-
   absl::optional<AccessCodeConfig> code_config =
       AccessCodeConfig::FromDictionary(dict);
   if (code_config) {

chrome/browser/ash/child_accounts/parent_access_code/config_source.h

diff --git a/chrome/browser/ash/child_accounts/parent_access_code/config_source.h b/chrome/browser/ash/child_accounts/parent_access_code/config_source.h
index f42699a4..d947f99d 100644
--- a/chrome/browser/ash/child_accounts/parent_access_code/config_source.h
+++ b/chrome/browser/ash/child_accounts/parent_access_code/config_source.h
@@ -47,7 +47,7 @@
  private:
   // Creates and adds an authenticator to the |config_map_|. |dict| corresponds
   // to an AccessCodeConfig in its serialized format.
-  void AddAuthenticator(const base::Value& dict,
+  void AddAuthenticator(const base::Value::Dict& dict,
                         const user_manager::User* user);
 
   // Holds the Parent Access Code Authenticators for all children signed in this

chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc

diff --git a/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc
index 1c45187..f8565df 100644
--- a/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc
+++ b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc
@@ -42,7 +42,7 @@
   base::Value::Dict dict;
   dict.Set(kFutureConfigDictKey, future_config.ToDictionary());
   dict.Set(kCurrentConfigDictKey, current_config.ToDictionary());
-  base::Value old_configs_value(base::Value::Type::LIST);
+  base::Value::List old_configs_value;
   for (const auto& config : old_configs)
     old_configs_value.Append(config.ToDictionary());
   dict.Set(kOldConfigsDictKey, std::move(old_configs_value));

chrome/browser/ash/child_accounts/screen_time_controller.cc

diff --git a/chrome/browser/ash/child_accounts/screen_time_controller.cc b/chrome/browser/ash/child_accounts/screen_time_controller.cc
index 0c17511..8f07f40b 100644
--- a/chrome/browser/ash/child_accounts/screen_time_controller.cc
+++ b/chrome/browser/ash/child_accounts/screen_time_controller.cc
@@ -332,28 +332,26 @@
 
 void ScreenTimeController::SaveCurrentStateToPref(
     const usage_time_limit::State& state) {
-  auto state_dict =
-      std::make_unique<base::Value>(base::Value::Type::DICTIONARY);
+  base::Value::Dict state_dict;
 
-  state_dict->SetKey(kScreenStateLocked, base::Value(state.is_locked));
-  state_dict->SetKey(kScreenStateCurrentPolicyType,
-                     base::Value(static_cast<int>(state.active_policy)));
-  state_dict->SetKey(kScreenStateTimeUsageLimitEnabled,
-                     base::Value(state.is_time_usage_limit_enabled));
-  state_dict->SetKey(kScreenStateRemainingUsage,
-                     base::Value(base::checked_cast<int>(
-                         state.remaining_usage.InMilliseconds())));
-  state_dict->SetKey(kScreenStateUsageLimitStarted,
-                     base::Value(state.time_usage_limit_started.ToDoubleT()));
-  state_dict->SetKey(kScreenStateNextStateChangeTime,
-                     base::Value(state.next_state_change_time.ToDoubleT()));
-  state_dict->SetKey(
-      kScreenStateNextPolicyType,
-      base::Value(static_cast<int>(state.next_state_active_policy)));
-  state_dict->SetKey(kScreenStateNextUnlockTime,
-                     base::Value(state.next_unlock_time.ToDoubleT()));
+  state_dict.Set(kScreenStateLocked, base::Value(state.is_locked));
+  state_dict.Set(kScreenStateCurrentPolicyType,
+                 static_cast<int>(state.active_policy));
+  state_dict.Set(kScreenStateTimeUsageLimitEnabled,
+                 state.is_time_usage_limit_enabled);
+  state_dict.Set(
+      kScreenStateRemainingUsage,
+      base::checked_cast<int>(state.remaining_usage.InMilliseconds()));
+  state_dict.Set(kScreenStateUsageLimitStarted,
+                 state.time_usage_limit_started.ToDoubleT());
+  state_dict.Set(kScreenStateNextStateChangeTime,
+                 state.next_state_change_time.ToDoubleT());
+  state_dict.Set(kScreenStateNextPolicyType,
+                 static_cast<int>(state.next_state_active_policy));
+  state_dict.Set(kScreenStateNextUnlockTime,
+                 state.next_unlock_time.ToDoubleT());
 
-  pref_service_->Set(prefs::kScreenTimeLastState, *state_dict);
+  pref_service_->SetDict(prefs::kScreenTimeLastState, std::move(state_dict));
   pref_service_->CommitPendingWrite();
 }
 

chrome/browser/ash/child_accounts/time_limit_override.cc

diff --git a/chrome/browser/ash/child_accounts/time_limit_override.cc b/chrome/browser/ash/child_accounts/time_limit_override.cc
index b6d6ce1b5..b80786a 100644
--- a/chrome/browser/ash/child_accounts/time_limit_override.cc
+++ b/chrome/browser/ash/child_accounts/time_limit_override.cc
@@ -86,15 +86,15 @@
 
 // static
 absl::optional<TimeLimitOverride> TimeLimitOverride::MostRecentFromList(
-    const base::Value* list) {
-  if (!list || !list->is_list()) {
+    const base::Value::List* list) {
+  if (!list) {
     DLOG(ERROR) << "Override entries should be a list.";
     return absl::nullopt;
   }
 
   // The most recent override created.
   absl::optional<TimeLimitOverride> last_override;
-  for (const base::Value& override_value : list->GetList()) {
+  for (const base::Value& override_value : *list) {
     absl::optional<TimeLimitOverride> current_override =
         FromDictionary(&override_value.GetDict());
     if (!current_override.has_value()) {

chrome/browser/ash/child_accounts/time_limit_override.h

diff --git a/chrome/browser/ash/child_accounts/time_limit_override.h b/chrome/browser/ash/child_accounts/time_limit_override.h
index a85f0e25..71c6f4f 100644
--- a/chrome/browser/ash/child_accounts/time_limit_override.h
+++ b/chrome/browser/ash/child_accounts/time_limit_override.h
@@ -39,7 +39,7 @@
   // the list of overrides passed in |list|. Returns nullopt if |list| could not
   // be parsed.
   static absl::optional<TimeLimitOverride> MostRecentFromList(
-      const base::Value* list);
+      const base::Value::List* list);
 
   TimeLimitOverride(Action action,
                     base::Time created_at,

chrome/browser/ash/child_accounts/time_limit_test_utils.cc

diff --git a/chrome/browser/ash/child_accounts/time_limit_test_utils.cc b/chrome/browser/ash/child_accounts/time_limit_test_utils.cc
index b290dc97..c29be44 100644
--- a/chrome/browser/ash/child_accounts/time_limit_test_utils.cc
+++ b/chrome/browser/ash/child_accounts/time_limit_test_utils.cc
@@ -64,38 +64,37 @@
   return base::Minutes(hour * 60 + minute);
 }
 
-base::Value CreatePolicyTime(base::TimeDelta time) {
+base::Value::Dict CreatePolicyTime(base::TimeDelta time) {
   DCHECK_EQ(time.InNanoseconds() % base::Minutes(1).InNanoseconds(), 0);
   DCHECK_LT(time, base::Hours(24));
 
   int hour = time.InHours();
   int minute = time.InMinutes() - time.InHours() * base::Hours(1).InMinutes();
-  base::Value policyTime(base::Value::Type::DICTIONARY);
-  policyTime.SetKey(kWindowLimitEntryTimeHour, base::Value(hour));
-  policyTime.SetKey(kWindowLimitEntryTimeMinute, base::Value(minute));
+  base::Value::Dict policyTime;
+  policyTime.Set(kWindowLimitEntryTimeHour, base::Value(hour));
+  policyTime.Set(kWindowLimitEntryTimeMinute, base::Value(minute));
   return policyTime;
 }
 
-base::Value CreateTimeWindow(const std::string& day,
-                             base::TimeDelta start_time,
-                             base::TimeDelta end_time,
-                             base::Time last_updated) {
-  base::Value time_window(base::Value::Type::DICTIONARY);
-  time_window.SetKey(kWindowLimitEntryEffectiveDay, base::Value(day));
-  time_window.SetKey(kWindowLimitEntryStartsAt, CreatePolicyTime(start_time));
-  time_window.SetKey(kWindowLimitEntryEndsAt, CreatePolicyTime(end_time));
-  time_window.SetKey(kTimeLimitLastUpdatedAt,
-                     base::Value(CreatePolicyTimestamp(last_updated)));
+base::Value::Dict CreateTimeWindow(const std::string& day,
+                                   base::TimeDelta start_time,
+                                   base::TimeDelta end_time,
+                                   base::Time last_updated) {
+  base::Value::Dict time_window;
+  time_window.Set(kWindowLimitEntryEffectiveDay, base::Value(day));
+  time_window.Set(kWindowLimitEntryStartsAt, CreatePolicyTime(start_time));
+  time_window.Set(kWindowLimitEntryEndsAt, CreatePolicyTime(end_time));
+  time_window.Set(kTimeLimitLastUpdatedAt,
+                  base::Value(CreatePolicyTimestamp(last_updated)));
   return time_window;
 }
 
-base::Value CreateTimeUsage(base::TimeDelta usage_quota,
-                            base::Time last_updated) {
-  base::Value time_usage(base::Value::Type::DICTIONARY);
-  time_usage.SetKey(kUsageLimitUsageQuota,
-                    base::Value(usage_quota.InMinutes()));
-  time_usage.SetKey(kTimeLimitLastUpdatedAt,
-                    base::Value(CreatePolicyTimestamp(last_updated)));
+base::Value::Dict CreateTimeUsage(base::TimeDelta usage_quota,
+                                  base::Time last_updated) {
+  base::Value::Dict time_usage;
+  time_usage.Set(kUsageLimitUsageQuota, base::Value(usage_quota.InMinutes()));
+  time_usage.Set(kTimeLimitLastUpdatedAt,
+                 base::Value(CreatePolicyTimestamp(last_updated)));
   return time_usage;
 }
 
@@ -120,7 +119,8 @@
 
   std::transform(day.begin(), day.end(), day.begin(), ::tolower);
   policy->Find(kTimeUsageLimit)
-      ->SetKey(day, CreateTimeUsage(quota, last_updated));
+      ->GetDict()
+      .Set(day, CreateTimeUsage(quota, last_updated));
 }
 
 void AddTimeWindowLimit(base::Value::Dict* policy,
@@ -134,11 +134,12 @@
         &policy->Set(kTimeWindowLimit, base::Value::Dict())->GetDict();
   }
 
-  base::Value* window_limit_entries =
-      time_window_limit->Find(kWindowLimitEntries);
+  base::Value::List* window_limit_entries =
+      time_window_limit->FindList(kWindowLimitEntries);
   if (!window_limit_entries) {
     window_limit_entries =
-        time_window_limit->Set(kWindowLimitEntries, base::Value::List());
+        &time_window_limit->Set(kWindowLimitEntries, base::Value::List())
+             ->GetList();
   }
 
   window_limit_entries->Append(

chrome/browser/ash/child_accounts/time_limit_test_utils.h

diff --git a/chrome/browser/ash/child_accounts/time_limit_test_utils.h b/chrome/browser/ash/child_accounts/time_limit_test_utils.h
index 77a20da1..283352d 100644
--- a/chrome/browser/ash/child_accounts/time_limit_test_utils.h
+++ b/chrome/browser/ash/child_accounts/time_limit_test_utils.h
@@ -41,17 +41,17 @@
 
 // Creates a time object with the correct format that is used in the Time Limit
 // policy.
-base::Value CreatePolicyTime(base::TimeDelta time);
+base::Value::Dict CreatePolicyTime(base::TimeDelta time);
 
 // Creates a time window limit dictionary used in the Time Limit policy.
-base::Value CreateTimeWindow(const std::string& day,
-                             base::TimeDelta start_time,
-                             base::TimeDelta end_time,
-                             base::Time last_updated);
+base::Value::Dict CreateTimeWindow(const std::string& day,
+                                   base::TimeDelta start_time,
+                                   base::TimeDelta end_time,
+                                   base::Time last_updated);
 
 // Creates a time usage limit dictionary used in the Time Limit policy.
-base::Value CreateTimeUsage(base::TimeDelta usage_quota,
-                            base::Time last_updated);
+base::Value::Dict CreateTimeUsage(base::TimeDelta usage_quota,
+                                  base::Time last_updated);
 
 // Creates dictionary with a minimalist Time Limit policy, containing only the
 // time usage limit reset time.

chrome/browser/ash/child_accounts/time_limits/app_activity_registry.cc

diff --git a/chrome/browser/ash/child_accounts/time_limits/app_activity_registry.cc b/chrome/browser/ash/child_accounts/time_limits/app_activity_registry.cc
index 8231334b..c4b6767 100644
--- a/chrome/browser/ash/child_accounts/time_limits/app_activity_registry.cc
+++ b/chrome/browser/ash/child_accounts/time_limits/app_activity_registry.cc
@@ -637,25 +637,26 @@
     const base::Time now = base::Time::Now();
 
     for (base::Value& entry : list) {
-      absl::optional<AppId> app_id = policy::AppIdFromAppInfoDict(entry);
+      absl::optional<AppId> app_id =
+          policy::AppIdFromAppInfoDict(entry.GetIfDict());
       DCHECK(app_id.has_value());
 
       if (!base::Contains(activity_registry_, app_id.value())) {
         absl::optional<AppState> state =
-            PersistedAppInfo::GetAppStateFromDict(&entry);
+            PersistedAppInfo::GetAppStateFromDict(entry.GetIfDict());
         DCHECK(state.has_value() && state.value() == AppState::kUninstalled);
         continue;
       }
 
       const PersistedAppInfo info =
           GetPersistedAppInfoForApp(app_id.value(), now);
-      info.UpdateAppActivityPreference(&entry, /* replace */ false);
+      info.UpdateAppActivityPreference(entry.GetDict(), /* replace */ false);
     }
 
     for (const AppId& app_id : newly_installed_apps_) {
       const PersistedAppInfo info = GetPersistedAppInfoForApp(app_id, now);
-      base::Value value(base::Value::Type::DICTIONARY);
-      info.UpdateAppActivityPreference(&value, /* replace */ false);
+      base::Value::Dict value;
+      info.UpdateAppActivityPreference(value, /* replace */ false);
       list.Append(std::move(value));
     }
     newly_installed_apps_.clear();
@@ -709,10 +710,10 @@
   for (size_t index = 0; index < list.size();) {
     base::Value& entry = list[index];
     absl::optional<PersistedAppInfo> info =
-        PersistedAppInfo::PersistedAppInfoFromDict(&entry, true);
+        PersistedAppInfo::PersistedAppInfoFromDict(entry.GetIfDict(), true);
     DCHECK(info.has_value());
     info->RemoveActiveTimeEarlierThan(timestamp);
-    info->UpdateAppActivityPreference(&entry, /* replace */ true);
+    info->UpdateAppActivityPreference(entry.GetDict(), /* replace */ true);
 
     if (info->ShouldRemoveApp()) {
       // Remove entry in |activity_registry_| if it is present.

chrome/browser/ash/child_accounts/time_limits/app_time_browsertest.cc

diff --git a/chrome/browser/ash/child_accounts/time_limits/app_time_browsertest.cc b/chrome/browser/ash/child_accounts/time_limits/app_time_browsertest.cc
index 00c0562..c4e77ee 100644
--- a/chrome/browser/ash/child_accounts/time_limits/app_time_browsertest.cc
+++ b/chrome/browser/ash/child_accounts/time_limits/app_time_browsertest.cc
@@ -111,7 +111,7 @@
     arc::ArcSessionManager::Get()->Shutdown();
   }
 
-  void UpdatePerAppTimeLimitsPolicy(const base::Value& policy) {
+  void UpdatePerAppTimeLimitsPolicy(const base::Value::Dict& policy) {
     std::string policy_value;
     base::JSONWriter::Write(policy, &policy_value);
 

chrome/browser/ash/child_accounts/time_limits/app_time_controller_unittest.cc

diff --git a/chrome/browser/ash/child_accounts/time_limits/app_time_controller_unittest.cc b/chrome/browser/ash/child_accounts/time_limits/app_time_controller_unittest.cc
index 9bb6106a..01abe53d 100644
--- a/chrome/browser/ash/child_accounts/time_limits/app_time_controller_unittest.cc
+++ b/chrome/browser/ash/child_accounts/time_limits/app_time_controller_unittest.cc
@@ -450,7 +450,7 @@
                                         kOneHour / 2, base::Time::Now()));
     builder.SetResetTime(6, 0);
     profile().GetPrefs()->SetDict(prefs::kPerAppTimeLimitsPolicy,
-                                  builder.value().GetDict().Clone());
+                                  builder.value().Clone());
   }
 
   // If there was no valid last reset time stored in user pref,
@@ -532,7 +532,7 @@
     builder.AddAppLimit(kApp2, blocked_app);
     builder.SetResetTime(6, 0);
     profile().GetPrefs()->SetDict(prefs::kPerAppTimeLimitsPolicy,
-                                  builder.value().GetDict().Clone());
+                                  builder.value().Clone());
   }
 
   // Enagagement is recorded at the beginning of the session when

chrome/browser/ash/child_accounts/time_limits/app_time_limits_allowlist_policy_wrapper.cc

diff --git a/chrome/browser/ash/child_accounts/time_limits/app_time_limits_allowlist_policy_wrapper.cc b/chrome/browser/ash/child_accounts/time_limits/app_time_limits_allowlist_policy_wrapper.cc
index 317b8e3..8a9c4eb 100644
--- a/chrome/browser/ash/child_accounts/time_limits/app_time_limits_allowlist_policy_wrapper.cc
+++ b/chrome/browser/ash/child_accounts/time_limits/app_time_limits_allowlist_policy_wrapper.cc
@@ -30,7 +30,7 @@
   }
 
   for (const base::Value& value : *app_list) {
-    absl::optional<AppId> app_id = policy::AppIdFromDict(value);
+    absl::optional<AppId> app_id = policy::AppIdFromDict(value.GetIfDict());
     if (app_id)
       return_value.push_back(*app_id);
   }

chrome/browser/ash/child_accounts/time_limits/app_time_limits_policy_builder.cc

diff --git a/chrome/browser/ash/child_accounts/time_limits/app_time_limits_policy_builder.cc b/chrome/browser/ash/child_accounts/time_limits/app_time_limits_policy_builder.cc
index 2fec0e0..21ac149 100644
--- a/chrome/browser/ash/child_accounts/time_limits/app_time_limits_policy_builder.cc
+++ b/chrome/browser/ash/child_accounts/time_limits/app_time_limits_policy_builder.cc
@@ -10,32 +10,31 @@
 namespace app_time {
 
 AppTimeLimitsPolicyBuilder::AppTimeLimitsPolicyBuilder() {
-  value_.SetKey(policy::kAppLimitsArray, base::Value(base::Value::Type::LIST));
-  value_.SetKey(policy::kResetAtDict,
-                base::Value(base::Value::Type::DICTIONARY));
-  value_.SetBoolKey(policy::kActivityReportingEnabled, true);
+  value_.Set(policy::kAppLimitsArray, base::Value::List());
+  value_.Set(policy::kResetAtDict, base::Value::Dict());
+  value_.Set(policy::kActivityReportingEnabled, true);
 }
 
 AppTimeLimitsPolicyBuilder::~AppTimeLimitsPolicyBuilder() = default;
 
 void AppTimeLimitsPolicyBuilder::AddAppLimit(const AppId& app_id,
                                              const AppLimit& app_limit) {
-  base::Value new_entry(base::Value::Type::DICTIONARY);
-  new_entry.SetKey(policy::kAppInfoDict, policy::AppIdToDict(app_id));
-  base::Value app_limit_value = policy::AppLimitToDict(app_limit);
-  new_entry.MergeDictionary(&app_limit_value);
+  base::Value::Dict new_entry;
+  new_entry.Set(policy::kAppInfoDict, policy::AppIdToDict(app_id));
+  base::Value::Dict app_limit_value = policy::AppLimitToDict(app_limit);
+  new_entry.Merge(std::move(app_limit_value));
 
-  base::Value* list = value_.FindListKey(policy::kAppLimitsArray);
+  base::Value::List* list = value_.FindList(policy::kAppLimitsArray);
   DCHECK(list);
   list->Append(std::move(new_entry));
 }
 
 void AppTimeLimitsPolicyBuilder::SetResetTime(int hour, int minutes) {
-  value_.SetKey(policy::kResetAtDict, policy::ResetTimeToDict(hour, minutes));
+  value_.Set(policy::kResetAtDict, policy::ResetTimeToDict(hour, minutes));
 }
 
 void AppTimeLimitsPolicyBuilder::SetAppActivityReportingEnabled(bool enabled) {
-  value_.SetBoolKey(policy::kActivityReportingEnabled, enabled);
+  value_.Set(policy::kActivityReportingEnabled, enabled);
 }
 
 }  // namespace app_time

chrome/browser/ash/child_accounts/time_limits/app_time_limits_policy_builder.h

diff --git a/chrome/browser/ash/child_accounts/time_limits/app_time_limits_policy_builder.h b/chrome/browser/ash/child_accounts/time_limits/app_time_limits_policy_builder.h
index 79261f55..55205e41 100644
--- a/chrome/browser/ash/child_accounts/time_limits/app_time_limits_policy_builder.h
+++ b/chrome/browser/ash/child_accounts/time_limits/app_time_limits_policy_builder.h
@@ -30,10 +30,10 @@
 
   void SetAppActivityReportingEnabled(bool enabled);
 
-  const base::Value& value() const { return value_; }
+  const base::Value::Dict& value() const { return value_; }
 
  private:
-  base::Value value_{base::Value::Type::DICTIONARY};
+  base::Value::Dict value_;
 };
 
 }  // namespace app_time

chrome/browser/ash/child_accounts/time_limits/app_time_policy_helpers.cc

diff --git a/chrome/browser/ash/child_accounts/time_limits/app_time_policy_helpers.cc b/chrome/browser/ash/child_accounts/time_limits/app_time_policy_helpers.cc
index 63c556b6..ac2711d 100644
--- a/chrome/browser/ash/child_accounts/time_limits/app_time_policy_helpers.cc
+++ b/chrome/browser/ash/child_accounts/time_limits/app_time_policy_helpers.cc
@@ -94,17 +94,18 @@
   }
 }
 
-absl::optional<AppId> AppIdFromDict(const base::Value& dict) {
-  if (!dict.is_dict())
+absl::optional<AppId> AppIdFromDict(const base::Value::Dict* dict) {
+  if (!dict) {
     return absl::nullopt;
+  }
 
-  const std::string* id = dict.FindStringKey(kAppId);
+  const std::string* id = dict->FindString(kAppId);
   if (!id || id->empty()) {
     DLOG(ERROR) << "Invalid id.";
     return absl::nullopt;
   }
 
-  const std::string* type_string = dict.FindStringKey(kAppType);
+  const std::string* type_string = dict->FindString(kAppType);
   if (!type_string || type_string->empty()) {
     DLOG(ERROR) << "Invalid type.";
     return absl::nullopt;
@@ -113,24 +114,25 @@
   return AppId(PolicyStringToAppType(*type_string), *id);
 }
 
-base::Value AppIdToDict(const AppId& app_id) {
-  base::Value value(base::Value::Type::DICTIONARY);
-  value.SetKey(kAppId, base::Value(app_id.app_id()));
-  value.SetKey(kAppType, base::Value(AppTypeToPolicyString(app_id.app_type())));
+base::Value::Dict AppIdToDict(const AppId& app_id) {
+  base::Value::Dict dict;
+  dict.Set(kAppId, base::Value(app_id.app_id()));
+  dict.Set(kAppType, base::Value(AppTypeToPolicyString(app_id.app_type())));
 
-  return value;
+  return dict;
 }
 
-absl::optional<AppId> AppIdFromAppInfoDict(const base::Value& dict) {
-  if (!dict.is_dict())
+absl::optional<AppId> AppIdFromAppInfoDict(const base::Value::Dict* dict) {
+  if (!dict) {
     return absl::nullopt;
+  }
 
-  const base::Value* app_info = dict.FindKey(kAppInfoDict);
-  if (!app_info || !app_info->is_dict()) {
+  const base::Value::Dict* app_info = dict->FindDict(kAppInfoDict);
+  if (!app_info) {
     DLOG(ERROR) << "Invalid app info dictionary.";
     return absl::nullopt;
   }
-  return AppIdFromDict(*app_info);
+  return AppIdFromDict(app_info);
 }
 
 absl::optional<AppLimit> AppLimitFromDict(const base::Value::Dict& dict) {
@@ -173,17 +175,17 @@
   return AppLimit(restriction, daily_limit, last_updated);
 }
 
-base::Value AppLimitToDict(const AppLimit& limit) {
-  base::Value value(base::Value::Type::DICTIONARY);
-  value.SetKey(kRestrictionEnum,
-               base::Value(AppRestrictionToPolicyString(limit.restriction())));
+base::Value::Dict AppLimitToDict(const AppLimit& limit) {
+  base::Value::Dict dict;
+  dict.Set(kRestrictionEnum,
+           base::Value(AppRestrictionToPolicyString(limit.restriction())));
   if (limit.daily_limit())
-    value.SetKey(kDailyLimitInt, base::Value(limit.daily_limit()->InMinutes()));
+    dict.Set(kDailyLimitInt, base::Value(limit.daily_limit()->InMinutes()));
   const std::string last_updated_string = base::NumberToString(
       (limit.last_updated() - base::Time::UnixEpoch()).InMilliseconds());
-  value.SetKey(kLastUpdatedString, base::Value(last_updated_string));
+  dict.Set(kLastUpdatedString, base::Value(last_updated_string));
 
-  return value;
+  return dict;
 }
 
 absl::optional<base::TimeDelta> ResetTimeFromDict(
@@ -210,12 +212,12 @@
   return base::Minutes(hour.value() * hour_in_mins + minutes.value());
 }
 
-base::Value ResetTimeToDict(int hour, int minutes) {
-  base::Value value(base::Value::Type::DICTIONARY);
-  value.SetKey(kHourInt, base::Value(hour));
-  value.SetKey(kMinInt, base::Value(minutes));
+base::Value::Dict ResetTimeToDict(int hour, int minutes) {
+  base::Value::Dict dict;
+  dict.Set(kHourInt, base::Value(hour));
+  dict.Set(kMinInt, base::Value(minutes));
 
-  return value;
+  return dict;
 }
 
 absl::optional<bool> ActivityReportingEnabledFromDict(
@@ -238,7 +240,8 @@
       continue;
     }
 
-    absl::optional<AppId> app_id = AppIdFromAppInfoDict(app_limits_dict);
+    absl::optional<AppId> app_id =
+        AppIdFromAppInfoDict(&app_limits_dict.GetDict());
     if (!app_id) {
       DLOG(ERROR) << "Invalid app id.";
       continue;

chrome/browser/ash/child_accounts/time_limits/app_time_policy_helpers.h

diff --git a/chrome/browser/ash/child_accounts/time_limits/app_time_policy_helpers.h b/chrome/browser/ash/child_accounts/time_limits/app_time_policy_helpers.h
index 2c74bb8..ad1dbaa 100644
--- a/chrome/browser/ash/child_accounts/time_limits/app_time_policy_helpers.h
+++ b/chrome/browser/ash/child_accounts/time_limits/app_time_policy_helpers.h
@@ -50,22 +50,22 @@
 
 // Deserializes AppId from |dict|.
 // Returns value if |dict| contains valid app information.
-absl::optional<AppId> AppIdFromDict(const base::Value& dict);
+absl::optional<AppId> AppIdFromDict(const base::Value::Dict* dict);
 
 // Serializes AppId to the dictionary.
-base::Value AppIdToDict(const AppId& app_id);
+base::Value::Dict AppIdToDict(const AppId& app_id);
 
 // Deserializes AppId from |dict|.
 // Returns value if |dict| contains valid app information in its entry keyed by
 // kAppInfoDict.
-absl::optional<AppId> AppIdFromAppInfoDict(const base::Value& dict);
+absl::optional<AppId> AppIdFromAppInfoDict(const base::Value::Dict* dict);
 
 // Deserializes AppLimit from |dict|.
 // Returns value if |dict| contains valid app limit information.
 absl::optional<AppLimit> AppLimitFromDict(const base::Value::Dict& dict);
 
 // Serializes AppLimit to the dictionary.
-base::Value AppLimitToDict(const AppLimit& limit);
+base::Value::Dict AppLimitToDict(const AppLimit& limit);
 
 // Deserializes daily limits reset time from |dict|.
 // Returns value if |dict| contains valid reset time information.
@@ -73,7 +73,7 @@
     const base::Value::Dict& dict);
 
 // Serializes daily limits reset to the dictionary.
-base::Value ResetTimeToDict(int hour, int minutes);
+base::Value::Dict ResetTimeToDict(int hour, int minutes);
 
 // Deserializes activity reporting enabled boolean from |dict|.
 // Returns value if |dict| contains a valid entry.

chrome/browser/ash/child_accounts/time_limits/persisted_app_info.cc

diff --git a/chrome/browser/ash/child_accounts/time_limits/persisted_app_info.cc b/chrome/browser/ash/child_accounts/time_limits/persisted_app_info.cc
index e9f9c114..aa05f1e 100644
--- a/chrome/browser/ash/child_accounts/time_limits/persisted_app_info.cc
+++ b/chrome/browser/ash/child_accounts/time_limits/persisted_app_info.cc
@@ -56,32 +56,31 @@
   return AppActivity::ActiveTime(active_from_time, active_to_time);
 }
 
-base::Value AppActivityToDict(const AppActivity::ActiveTime& active_time) {
-  base::Value value(base::Value::Type::DICTIONARY);
+base::Value::Dict AppActivityToDict(
+    const AppActivity::ActiveTime& active_time) {
+  base::Value::Dict dict;
 
   auto serializeTime = [](base::Time time) -> std::string {
     return base::NumberToString(
         time.ToDeltaSinceWindowsEpoch().InMicroseconds());
   };
 
-  value.SetStringKey(kActiveFromKey, serializeTime(active_time.active_from()));
-  value.SetStringKey(kActiveToKey, serializeTime(active_time.active_to()));
+  dict.Set(kActiveFromKey, serializeTime(active_time.active_from()));
+  dict.Set(kActiveToKey, serializeTime(active_time.active_to()));
 
-  return value;
+  return dict;
 }
 
 std::vector<AppActivity::ActiveTime> AppActiveTimesFromList(
-    const base::Value* list) {
+    const base::Value::List* list) {
   std::vector<AppActivity::ActiveTime> active_times;
 
-  if (!list || !list->is_list()) {
+  if (!list) {
     VLOG(1) << " Invalid app activity list";
     return active_times;
   }
 
-  const base::Value::List& list_view = list->GetList();
-
-  for (const auto& value : list_view) {
+  for (const auto& value : *list) {
     absl::optional<AppActivity::ActiveTime> entry = AppActivityFromDict(value);
     if (!entry)
       continue;
@@ -95,14 +94,14 @@
 
 // static
 absl::optional<PersistedAppInfo> PersistedAppInfo::PersistedAppInfoFromDict(
-    const base::Value* dict,
+    const base::Value::Dict* dict,
     bool include_app_activity_array) {
-  if (!dict || !dict->is_dict()) {
+  if (!dict) {
     VLOG(1) << "Invalid application information.";
     return absl::nullopt;
   }
 
-  absl::optional<AppId> app_id = policy::AppIdFromAppInfoDict(*dict);
+  absl::optional<AppId> app_id = policy::AppIdFromAppInfoDict(dict);
   if (!app_id)
     return absl::nullopt;
 
@@ -113,7 +112,7 @@
   }
 
   const std::string* running_active_time =
-      dict->FindStringKey(kRunningActiveTimeKey);
+      dict->FindString(kRunningActiveTimeKey);
   if (!running_active_time) {
     VLOG(1) << "Invalid running active time.";
     return absl::nullopt;
@@ -127,7 +126,7 @@
 
   std::vector<AppActivity::ActiveTime> active_times;
   if (include_app_activity_array) {
-    const base::Value* list = dict->FindListKey(kActiveTimesKey);
+    const base::Value::List* list = dict->FindList(kActiveTimesKey);
     active_times = AppActiveTimesFromList(list);
   }
 
@@ -143,8 +142,8 @@
   std::vector<PersistedAppInfo> apps_info;
 
   for (const auto& per_app_info : list) {
-    absl::optional<PersistedAppInfo> info =
-        PersistedAppInfoFromDict(&per_app_info, include_app_activity_array);
+    absl::optional<PersistedAppInfo> info = PersistedAppInfoFromDict(
+        per_app_info.GetIfDict(), include_app_activity_array);
     if (!info.has_value())
       continue;
 
@@ -156,11 +155,12 @@
 
 // static
 absl::optional<AppState> PersistedAppInfo::GetAppStateFromDict(
-    const base::Value* value) {
-  if (!value || !value->is_dict())
+    const base::Value::Dict* value) {
+  if (!value) {
     return absl::nullopt;
+  }
 
-  absl::optional<int> state = value->FindIntKey(kAppStateKey);
+  absl::optional<int> state = value->FindInt(kAppStateKey);
   if (!state.has_value())
     return absl::nullopt;
 
@@ -208,30 +208,27 @@
 PersistedAppInfo::~PersistedAppInfo() = default;
 
 void PersistedAppInfo::UpdateAppActivityPreference(
-    base::Value* dict,
+    base::Value::Dict& dict,
     bool replace_activity) const {
-  DCHECK(!!dict && dict->is_dict());
-
-  dict->SetKey(kAppInfoKey, policy::AppIdToDict(app_id_));
-  dict->SetIntKey(kAppStateKey, static_cast<int>(app_state()));
-  dict->SetStringKey(
-      kRunningActiveTimeKey,
-      base::NumberToString(active_running_time().InMicroseconds()));
+  dict.Set(kAppInfoKey, policy::AppIdToDict(app_id_));
+  dict.Set(kAppStateKey, static_cast<int>(app_state()));
+  dict.Set(kRunningActiveTimeKey,
+           base::NumberToString(active_running_time().InMicroseconds()));
 
   if (replace_activity) {
-    base::Value active_times_value(base::Value::Type::LIST);
+    base::Value::List active_times_value;
     for (const auto& entry : active_times_) {
       active_times_value.Append(AppActivityToDict(entry));
     }
 
-    dict->SetPath(kActiveTimesKey, std::move(active_times_value));
+    dict.SetByDottedPath(kActiveTimesKey, std::move(active_times_value));
     return;
   }
 
-  base::Value* value = dict->FindListKey(kActiveTimesKey);
-  if (!value || !value->is_list()) {
+  base::Value::List* value = dict.FindList(kActiveTimesKey);
+  if (!value) {
     value =
-        dict->SetPath(kActiveTimesKey, base::Value(base::Value::Type::LIST));
+        &dict.SetByDottedPath(kActiveTimesKey, base::Value::List())->GetList();
   }
 
   if (active_times_.size() == 0)
@@ -242,7 +239,7 @@
 
   // If the last entry in |value| can be merged with the first entry in
   // |active_times_| merge them.
-  base::Value::List& list_view = value->GetList();
+  base::Value::List& list_view = *value;
   if (list_view.size() > 0) {
     base::Value& mergeable_entry = list_view[list_view.size() - 1];
     absl::optional<AppActivity::ActiveTime> active_time =
@@ -252,7 +249,7 @@
     absl::optional<AppActivity::ActiveTime> merged =
         AppActivity::ActiveTime::Merge(active_time.value(), active_times_[0]);
     if (merged.has_value()) {
-      mergeable_entry = AppActivityToDict(merged.value());
+      mergeable_entry = base::Value(AppActivityToDict(merged.value()));
       start_index = 1;
     }
   }

chrome/browser/ash/child_accounts/time_limits/persisted_app_info.h

diff --git a/chrome/browser/ash/child_accounts/time_limits/persisted_app_info.h b/chrome/browser/ash/child_accounts/time_limits/persisted_app_info.h
index 93e807e..40fd3d1 100644
--- a/chrome/browser/ash/child_accounts/time_limits/persisted_app_info.h
+++ b/chrome/browser/ash/child_accounts/time_limits/persisted_app_info.h
@@ -18,12 +18,13 @@
 class PersistedAppInfo {
  public:
   static absl::optional<PersistedAppInfo> PersistedAppInfoFromDict(
-      const base::Value* value,
+      const base::Value::Dict* value,
       bool include_app_activity_array);
   static std::vector<PersistedAppInfo> PersistedAppInfosFromList(
       const base::Value::List& list,
       bool include_app_activity_array);
-  static absl::optional<AppState> GetAppStateFromDict(const base::Value* value);
+  static absl::optional<AppState> GetAppStateFromDict(
+      const base::Value::Dict* value);
 
   PersistedAppInfo(const AppId& app_id,
                    AppState state,
@@ -40,7 +41,7 @@
   // If |replace_activity| is true, then completely replaces the list keyed by
   // |kActiveTimesKey| in the dicationary. Otherwise, appends the values in
   // |active_running_time_|.
-  void UpdateAppActivityPreference(base::Value* dict,
+  void UpdateAppActivityPreference(base::Value::Dict& dict,
                                    bool replace_activity) const;
 
   void RemoveActiveTimeEarlierThan(base::Time timestamp);

chrome/browser/ash/child_accounts/time_limits/persisted_app_info_unittest.cc

diff --git a/chrome/browser/ash/child_accounts/time_limits/persisted_app_info_unittest.cc b/chrome/browser/ash/child_accounts/time_limits/persisted_app_info_unittest.cc
index 9ac205b..1ec8da803 100644
--- a/chrome/browser/ash/child_accounts/time_limits/persisted_app_info_unittest.cc
+++ b/chrome/browser/ash/child_accounts/time_limits/persisted_app_info_unittest.cc
@@ -66,14 +66,14 @@
 
   PersistedAppInfo app_info(app, app_state, running_active_time,
                             {{entry1, entry2, entry3}});
-  base::Value entry(base::Value::Type::DICTIONARY);
+  base::Value::Dict entry;
 
-  app_info.UpdateAppActivityPreference(&entry, /* replace */ false);
+  app_info.UpdateAppActivityPreference(entry, /* replace */ false);
   AppActivity::ActiveTime to_append = AppActivity::ActiveTime(
       start_time + 6 * activity, start_time + 7 * activity);
   PersistedAppInfo app_info2(app, app_state, running_active_time,
                              {{to_append}});
-  app_info2.UpdateAppActivityPreference(&entry, /* replace */ false);
+  app_info2.UpdateAppActivityPreference(entry, /* replace */ false);
 
   absl::optional<PersistedAppInfo> updated_entry =
       PersistedAppInfo::PersistedAppInfoFromDict(
@@ -89,7 +89,7 @@
   EXPECT_EQ(active_times[2], entry3);
   EXPECT_EQ(active_times[3], to_append);
 
-  app_info2.UpdateAppActivityPreference(&entry, /* replace */ true);
+  app_info2.UpdateAppActivityPreference(entry, /* replace */ true);
   absl::optional<PersistedAppInfo> final_entry =
       PersistedAppInfo::PersistedAppInfoFromDict(
           &entry, /* include_app_activity_array */ true);

chrome/browser/ash/child_accounts/usage_time_limit_processor.cc

diff --git a/chrome/browser/ash/child_accounts/usage_time_limit_processor.cc b/chrome/browser/ash/child_accounts/usage_time_limit_processor.cc
index d8dab51..037615d 100644
--- a/chrome/browser/ash/child_accounts/usage_time_limit_processor.cc
+++ b/chrome/browser/ash/child_accounts/usage_time_limit_processor.cc
@@ -1218,8 +1218,8 @@
 
 absl::optional<TimeLimitOverride> OverrideFromPolicy(
     const base::Value::Dict& time_limit) {
-  const base::Value* override_value =
-      time_limit.Find(TimeLimitOverride::kOverridesDictKey);
+  const base::Value::List* override_value =
+      time_limit.FindList(TimeLimitOverride::kOverridesDictKey);
   return TimeLimitOverride::MostRecentFromList(override_value);
 }
 

chrome/browser/ash/child_accounts/usage_time_limit_processor_unittest.cc

diff --git a/chrome/browser/ash/child_accounts/usage_time_limit_processor_unittest.cc b/chrome/browser/ash/child_accounts/usage_time_limit_processor_unittest.cc
index 5c04ead07..1c0681db 100644
--- a/chrome/browser/ash/child_accounts/usage_time_limit_processor_unittest.cc
+++ b/chrome/browser/ash/child_accounts/usage_time_limit_processor_unittest.cc
@@ -63,22 +63,23 @@
 
 TEST_F(UsageTimeLimitProcessorInternalTest, TimeLimitWindowValid) {
   base::Time last_updated = utils::TimeFromString("1 Jan 1970 00:00:00");
-  base::Value monday_time_limit =
+  base::Value::Dict monday_time_limit =
       utils::CreateTimeWindow(utils::kMonday, base::Minutes(22 * 60 + 30),
                               base::Minutes(7 * 60 + 30), last_updated);
-  base::Value friday_time_limit =
+  base::Value::Dict friday_time_limit =
       utils::CreateTimeWindow(utils::kFriday, base::Hours(23),
                               base::Minutes(8 * 60 + 20), last_updated);
 
-  base::Value window_limit_entries(base::Value::Type::LIST);
+  base::Value::List window_limit_entries;
   window_limit_entries.Append(std::move(monday_time_limit));
   window_limit_entries.Append(std::move(friday_time_limit));
 
-  base::Value time_window_limit = base::Value(base::Value::Type::DICTIONARY);
-  time_window_limit.SetKey("entries", std::move(window_limit_entries));
+  base::Value::Dict time_window_limit;
+  time_window_limit.Set("entries", std::move(window_limit_entries));
 
   // Call tested function.
-  TimeWindowLimit window_limit_struct(time_window_limit);
+  TimeWindowLimit window_limit_struct(
+      base::Value(std::move(time_window_limit)));
 
   ASSERT_TRUE(window_limit_struct.entries[Weekday::kMonday]);
   ASSERT_EQ(window_limit_struct.entries[Weekday::kMonday]
@@ -117,19 +118,19 @@
   // Create dictionary containing the policy information.
   base::Time last_updated_one = utils::TimeFromString("1 Jan 2018 10:00:00");
   base::Time last_updated_two = utils::TimeFromString("1 Jan 2018 11:00:00");
-  base::Value tuesday_time_usage =
+  base::Value::Dict tuesday_time_usage =
       utils::CreateTimeUsage(base::Minutes(120), last_updated_one);
-  base::Value thursday_time_usage =
+  base::Value::Dict thursday_time_usage =
       utils::CreateTimeUsage(base::Minutes(80), last_updated_two);
 
-  base::Value time_usage_limit = base::Value(base::Value::Type::DICTIONARY);
-  time_usage_limit.SetKey("tuesday", std::move(tuesday_time_usage));
-  time_usage_limit.SetKey("thursday", std::move(thursday_time_usage));
-  time_usage_limit.SetKey("reset_at",
-                          utils::CreatePolicyTime(utils::CreateTime(8, 0)));
+  base::Value::Dict time_usage_limit;
+  time_usage_limit.Set("tuesday", std::move(tuesday_time_usage));
+  time_usage_limit.Set("thursday", std::move(thursday_time_usage));
+  time_usage_limit.Set("reset_at",
+                       utils::CreatePolicyTime(utils::CreateTime(8, 0)));
 
   // Call tested functions.
-  TimeUsageLimit usage_limit_struct(time_usage_limit);
+  TimeUsageLimit usage_limit_struct(base::Value(std::move(time_usage_limit)));
 
   ASSERT_EQ(usage_limit_struct.resets_at.InMinutes(), 8 * 60);
 
@@ -162,19 +163,18 @@
   // Create policy information.
   std::string created_at_millis =
       utils::CreatePolicyTimestamp("1 Jan 2018 10:00:00");
-  base::Value override_one = base::Value(base::Value::Type::DICTIONARY);
-  override_one.SetKey("action",
-                      ValueFromAction(TimeLimitOverride::Action::kUnlock));
-  override_one.SetKey("created_at_millis", base::Value(created_at_millis));
+  base::Value::Dict override_one;
+  override_one.Set("action",
+                   ValueFromAction(TimeLimitOverride::Action::kUnlock));
+  override_one.Set("created_at_millis", base::Value(created_at_millis));
 
-  base::Value override_two = base::Value(base::Value::Type::DICTIONARY);
-  override_two.SetKey("action",
-                      ValueFromAction(TimeLimitOverride::Action::kLock));
-  override_two.SetKey(
+  base::Value::Dict override_two;
+  override_two.Set("action", ValueFromAction(TimeLimitOverride::Action::kLock));
+  override_two.Set(
       "created_at_millis",
       base::Value(utils::CreatePolicyTimestamp("1 Jan 2018 9:00:00")));
 
-  base::Value overrides(base::Value::Type::LIST);
+  base::Value::List overrides;
   overrides.Append(std::move(override_one));
   overrides.Append(std::move(override_two));
 
@@ -197,30 +197,29 @@
   // Create policy information.
   std::string created_at_millis =
       utils::CreatePolicyTimestamp("1 Jan 2018 10:00:00");
-  base::Value action_specific_data = base::Value(base::Value::Type::DICTIONARY);
-  action_specific_data.SetKey("duration_mins", base::Value(30));
+  base::Value::Dict action_specific_data;
+  action_specific_data.Set("duration_mins", base::Value(30));
 
-  base::Value override_one = base::Value(base::Value::Type::DICTIONARY);
-  override_one.SetKey("action",
-                      ValueFromAction(TimeLimitOverride::Action::kUnlock));
-  override_one.SetKey("created_at_millis", base::Value(created_at_millis));
-  override_one.SetKey("action_specific_data", std::move(action_specific_data));
+  base::Value::Dict override_one;
+  override_one.Set("action",
+                   ValueFromAction(TimeLimitOverride::Action::kUnlock));
+  override_one.Set("created_at_millis", base::Value(created_at_millis));
+  override_one.Set("action_specific_data", std::move(action_specific_data));
 
-  base::Value override_two = base::Value(base::Value::Type::DICTIONARY);
-  override_two.SetKey("action",
-                      ValueFromAction(TimeLimitOverride::Action::kLock));
-  override_two.SetKey(
+  base::Value::Dict override_two;
+  override_two.Set("action", ValueFromAction(TimeLimitOverride::Action::kLock));
+  override_two.Set(
       "created_at_millis",
       base::Value(utils::CreatePolicyTimestamp("1 Jan 2018 9:00:00")));
 
-  base::Value override_three = base::Value(base::Value::Type::DICTIONARY);
-  override_three.SetKey("action",
-                        ValueFromAction(TimeLimitOverride::Action::kLock));
-  override_three.SetKey(
+  base::Value::Dict override_three;
+  override_three.Set("action",
+                     ValueFromAction(TimeLimitOverride::Action::kLock));
+  override_three.Set(
       "created_at_millis",
       base::Value(utils::CreatePolicyTimestamp("1 Jan 2018 8:00:00")));
 
-  base::Value overrides(base::Value::Type::LIST);
+  base::Value::List overrides;
   overrides.Append(std::move(override_one));
   overrides.Append(std::move(override_two));
   overrides.Append(std::move(override_three));
@@ -243,27 +242,25 @@
 // different sizes.
 TEST_F(UsageTimeLimitProcessorInternalTest, MultipleOverrides) {
   // Create policy information.
-  base::Value override_one = base::Value(base::Value::Type::DICTIONARY);
-  override_one.SetKey("action",
-                      ValueFromAction(TimeLimitOverride::Action::kUnlock));
-  override_one.SetKey("created_at_millis", base::Value("1000000"));
+  base::Value::Dict override_one;
+  override_one.Set("action",
+                   ValueFromAction(TimeLimitOverride::Action::kUnlock));
+  override_one.Set("created_at_millis", base::Value("1000000"));
 
-  base::Value override_two = base::Value(base::Value::Type::DICTIONARY);
-  override_two.SetKey("action",
-                      ValueFromAction(TimeLimitOverride::Action::kLock));
-  override_two.SetKey("created_at_millis", base::Value("999999"));
+  base::Value::Dict override_two;
+  override_two.Set("action", ValueFromAction(TimeLimitOverride::Action::kLock));
+  override_two.Set("created_at_millis", base::Value("999999"));
 
-  base::Value override_three = base::Value(base::Value::Type::DICTIONARY);
-  override_two.SetKey("action",
-                      ValueFromAction(TimeLimitOverride::Action::kLock));
-  override_two.SetKey("created_at_millis", base::Value("900000"));
+  base::Value::Dict override_three;
+  override_two.Set("action", ValueFromAction(TimeLimitOverride::Action::kLock));
+  override_two.Set("created_at_millis", base::Value("900000"));
 
-  base::Value override_four = base::Value(base::Value::Type::DICTIONARY);
-  override_two.SetKey("action",
-                      ValueFromAction(TimeLimitOverride::Action::kUnlock));
-  override_two.SetKey("created_at_millis", base::Value("1200000"));
+  base::Value::Dict override_four;
+  override_two.Set("action",
+                   ValueFromAction(TimeLimitOverride::Action::kUnlock));
+  override_two.Set("created_at_millis", base::Value("1200000"));
 
-  base::Value overrides(base::Value::Type::LIST);
+  base::Value::List overrides;
   overrides.Append(std::move(override_one));
   overrides.Append(std::move(override_two));
   overrides.Append(std::move(override_three));
@@ -2807,8 +2804,8 @@
   // be returned.
   const int kHour = 8;
   const int kMinutes = 30;
-  auto time_usage_limit = base::Value(base::Value::Type::DICTIONARY);
-  time_usage_limit.SetKey(
+  base::Value::Dict time_usage_limit;
+  time_usage_limit.Set(
       "reset_at", utils::CreatePolicyTime(utils::CreateTime(kHour, kMinutes)));
   base::Value::Dict time_limit_dictionary;
   time_limit_dictionary.Set("time_usage_limit", std::move(time_usage_limit));

chrome/browser/ash/drive/drive_integration_service.cc

diff --git a/chrome/browser/ash/drive/drive_integration_service.cc b/chrome/browser/ash/drive/drive_integration_service.cc
index e59e132..dd0408f 100644
--- a/chrome/browser/ash/drive/drive_integration_service.cc
+++ b/chrome/browser/ash/drive/drive_integration_service.cc
@@ -459,7 +459,7 @@
         pref_service_->GetBoolean(prefs::kDriveFsBulkPinningEnabled);
     integration_service_->GetDriveFsPinManager()->SetBulkPinningEnabled(
         enabled);
-
+    integration_service_->GetDriveFsHost()->SetAlwaysEnableDocsOffline(enabled);
     if (enabled) {
       VLOG(1) << "Starting bulk pinning";
       pin_manager->Start(base::DoNothing());
@@ -1020,6 +1020,7 @@
     pin_manager_->Stop();
     GetDriveFsHost()->RemoveObserver(pin_manager_.get());
     pin_manager_.reset();
+    GetDriveFsHost()->SetAlwaysEnableDocsOffline(false);
   }
 }
 

chrome/browser/ash/extensions/autotest_private/autotest_private_api.cc

diff --git a/chrome/browser/ash/extensions/autotest_private/autotest_private_api.cc b/chrome/browser/ash/extensions/autotest_private/autotest_private_api.cc
index d3601a1b..358cdc7 100644
--- a/chrome/browser/ash/extensions/autotest_private/autotest_private_api.cc
+++ b/chrome/browser/ash/extensions/autotest_private/autotest_private_api.cc
@@ -6374,6 +6374,11 @@
 
 void AutotestPrivateStopFrameCountingFunction::OnDataReceived(
     viz::mojom::FrameCountingDataPtr data_ptr) {
+  if (!data_ptr || data_ptr->per_sink_data.empty()) {
+    Respond(Error("No frame counting data"));
+    return;
+  }
+
   std::vector<api::autotest_private::FrameCountingPerSinkData> result;
   for (const auto& per_sink_data : data_ptr->per_sink_data) {
     api::autotest_private::FrameCountingPerSinkData result_per_sink_data;

chrome/browser/ash/extensions/file_manager/event_router_unittest.cc

diff --git a/chrome/browser/ash/extensions/file_manager/event_router_unittest.cc b/chrome/browser/ash/extensions/file_manager/event_router_unittest.cc
index 6c90ae60..362d2ae 100644
--- a/chrome/browser/ash/extensions/file_manager/event_router_unittest.cc
+++ b/chrome/browser/ash/extensions/file_manager/event_router_unittest.cc
@@ -176,14 +176,13 @@
 // the `field` against the `expected_value`.
 MATCHER_P3(ExpectEventArgString, index, field, expected_value, "") {
   EXPECT_GE(arg.size(), 1u);
-  const base::Value* outputs =
-      arg[0].FindKeyOfType("outputs", base::Value::Type::LIST);
+  const base::Value::List* outputs = arg[0].GetDict().FindList("outputs");
   EXPECT_TRUE(outputs) << "The outputs field is not available on the event";
-  EXPECT_GT((*outputs).GetList().size(), index)
+  EXPECT_GT(outputs->size(), index)
       << "The supplied index on outputs is not available, size: "
-      << (*outputs).GetList().size() << ", index: " << index;
+      << outputs->size() << ", index: " << index;
   const std::string* actual_value =
-      (*outputs).GetList()[index].FindStringKey(field);
+      (*outputs)[index].GetDict().FindString(field);
   EXPECT_TRUE(actual_value) << "Could not find the string with key: " << field;
   return testing::ExplainMatchResult(expected_value, *actual_value,
                                      result_listener);

chrome/browser/ash/extensions/file_manager/private_api_file_system.cc

diff --git a/chrome/browser/ash/extensions/file_manager/private_api_file_system.cc b/chrome/browser/ash/extensions/file_manager/private_api_file_system.cc
index 9a46f9665..e1cd0b8 100644
--- a/chrome/browser/ash/extensions/file_manager/private_api_file_system.cc
+++ b/chrome/browser/ash/extensions/file_manager/private_api_file_system.cc
@@ -433,8 +433,6 @@
   const FileSystemURL file_system_url =
       file_system_context->CrackURLInFirstPartyContext(GURL(url));
   if (file_system_url.path().empty()) {
-    auto result_list = std::make_unique<base::ListValue>();
-    result_list->Append(false);
     return RespondNow(Error("Invalid URL"));
   }
 

chrome/browser/ash/input_method/input_method_engine.cc

diff --git a/chrome/browser/ash/input_method/input_method_engine.cc b/chrome/browser/ash/input_method/input_method_engine.cc
index 346640f..d5356d1 100644
--- a/chrome/browser/ash/input_method/input_method_engine.cc
+++ b/chrome/browser/ash/input_method/input_method_engine.cc
@@ -626,7 +626,6 @@
 void InputMethodEngine::SetCompositionBounds(
     const std::vector<gfx::Rect>& bounds) {
   composition_bounds_ = bounds;
-  observer_->OnCompositionBoundsChanged(bounds);
 }
 
 void InputMethodEngine::SetCaretBounds(const gfx::Rect& caret_bounds) {

chrome/browser/ash/input_method/input_method_engine_observer.h

diff --git a/chrome/browser/ash/input_method/input_method_engine_observer.h b/chrome/browser/ash/input_method/input_method_engine_observer.h
index 959577d..106c8bc 100644
--- a/chrome/browser/ash/input_method/input_method_engine_observer.h
+++ b/chrome/browser/ash/input_method/input_method_engine_observer.h
@@ -70,10 +70,6 @@
   // Called when the IME is no longer active.
   virtual void OnDeactivated(const std::string& engine_id) = 0;
 
-  // Called when composition bounds are changed.
-  virtual void OnCompositionBoundsChanged(
-      const std::vector<gfx::Rect>& bounds) = 0;
-
   // Called when the caret bounds change.
   virtual void OnCaretBoundsChanged(const gfx::Rect& caret_bounds) = 0;
 

chrome/browser/ash/input_method/input_method_engine_unittest.cc

diff --git a/chrome/browser/ash/input_method/input_method_engine_unittest.cc b/chrome/browser/ash/input_method/input_method_engine_unittest.cc
index 0bad139..fe302a68 100644
--- a/chrome/browser/ash/input_method/input_method_engine_unittest.cc
+++ b/chrome/browser/ash/input_method/input_method_engine_unittest.cc
@@ -47,8 +47,7 @@
   DEACTIVATED = 2U,
   ONFOCUS = 4U,
   ONBLUR = 8U,
-  ONCOMPOSITIONBOUNDSCHANGED = 16U,
-  RESET = 32U
+  RESET = 16U
 };
 
 void InitInputMethod() {
@@ -104,11 +103,6 @@
                   TextInputMethod::KeyEventDoneCallback callback) override {
     std::move(callback).Run(ui::ime::KeyEventHandledState::kHandledByIME);
   }
-  void OnCompositionBoundsChanged(
-      const std::vector<gfx::Rect>& bounds) override {
-    calls_bitmap_ |= ONCOMPOSITIONBOUNDSCHANGED;
-  }
-
   void OnReset(const std::string& engine_id) override {
     calls_bitmap_ |= RESET;
     engine_id_ = engine_id;
@@ -341,13 +335,6 @@
             false);
 }
 
-TEST_F(InputMethodEngineTest, TestCompositionBoundsChanged) {
-  CreateEngine(true);
-  // Enable/disable with focus.
-  engine_->SetCompositionBounds({gfx::Rect()});
-  EXPECT_EQ(ONCOMPOSITIONBOUNDSCHANGED, observer_->GetCallsBitmapAndReset());
-}
-
 // See https://crbug.com/980437.
 TEST_F(InputMethodEngineTest, TestDisableAfterSetCompositionRange) {
   CreateEngine(true);

chrome/browser/ash/input_method/native_input_method_engine_observer.cc

diff --git a/chrome/browser/ash/input_method/native_input_method_engine_observer.cc b/chrome/browser/ash/input_method/native_input_method_engine_observer.cc
index f2fc243..bedebce 100644
--- a/chrome/browser/ash/input_method/native_input_method_engine_observer.cc
+++ b/chrome/browser/ash/input_method/native_input_method_engine_observer.cc
@@ -952,11 +952,6 @@
   ime_base_observer_->OnDeactivated(engine_id);
 }
 
-void NativeInputMethodEngineObserver::OnCompositionBoundsChanged(
-    const std::vector<gfx::Rect>& bounds) {
-  ime_base_observer_->OnCompositionBoundsChanged(bounds);
-}
-
 void NativeInputMethodEngineObserver::OnCaretBoundsChanged(
     const gfx::Rect& caret_bounds) {
   ime_base_observer_->OnCaretBoundsChanged(caret_bounds);

chrome/browser/ash/input_method/native_input_method_engine_observer.h

diff --git a/chrome/browser/ash/input_method/native_input_method_engine_observer.h b/chrome/browser/ash/input_method/native_input_method_engine_observer.h
index e6129c8..6c57bfd 100644
--- a/chrome/browser/ash/input_method/native_input_method_engine_observer.h
+++ b/chrome/browser/ash/input_method/native_input_method_engine_observer.h
@@ -67,8 +67,6 @@
                   TextInputMethod::KeyEventDoneCallback callback) override;
   void OnReset(const std::string& engine_id) override;
   void OnDeactivated(const std::string& engine_id) override;
-  void OnCompositionBoundsChanged(
-      const std::vector<gfx::Rect>& bounds) override;
   void OnCaretBoundsChanged(const gfx::Rect& caret_bounds) override;
   void OnSurroundingTextChanged(const std::string& engine_id,
                                 const std::u16string& text,

chrome/browser/ash/input_method/stub_input_method_engine_observer.h

diff --git a/chrome/browser/ash/input_method/stub_input_method_engine_observer.h b/chrome/browser/ash/input_method/stub_input_method_engine_observer.h
index 4f54ec31..819739d8 100644
--- a/chrome/browser/ash/input_method/stub_input_method_engine_observer.h
+++ b/chrome/browser/ash/input_method/stub_input_method_engine_observer.h
@@ -40,8 +40,6 @@
                                 int cursor_pos,
                                 int anchor_pos,
                                 int offset) override {}
-  void OnCompositionBoundsChanged(
-      const std::vector<gfx::Rect>& bounds) override {}
   void OnCaretBoundsChanged(const gfx::Rect& caret_bounds) override {}
   void OnScreenProjectionChanged(bool is_projected) override {}
   void OnReset(const std::string& engine_id) override {}

chrome/browser/ash/login/users/avatar/user_image_manager_impl.cc

diff --git a/chrome/browser/ash/login/users/avatar/user_image_manager_impl.cc b/chrome/browser/ash/login/users/avatar/user_image_manager_impl.cc
index 38d1044..516a9db9 100644
--- a/chrome/browser/ash/login/users/avatar/user_image_manager_impl.cc
+++ b/chrome/browser/ash/login/users/avatar/user_image_manager_impl.cc
@@ -285,6 +285,15 @@
             image_path_, base::BindOnce(&Job::OnLoadImageDone,
                                         weak_factory_.GetWeakPtr(), false));
       } else {
+        if (g_skip_default_user_image_download) {
+          auto user_image = std::make_unique<user_manager::UserImage>(
+              *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+                  IDR_LOGIN_DEFAULT_USER));
+          UpdateUser(std::move(user_image));
+          UpdateLocalState();
+          NotifyJobDone();
+          return;
+        }
         // Fetch the default image from cloud before caching it.
         image_url_ = default_user_image::GetDefaultImageUrl(image_index_);
         user_image_loader::StartWithGURLAnimated(

chrome/browser/ash/login/users/user_manager_unittest.cc

diff --git a/chrome/browser/ash/login/users/user_manager_unittest.cc b/chrome/browser/ash/login/users/user_manager_unittest.cc
index ef06de1..0950cea 100644
--- a/chrome/browser/ash/login/users/user_manager_unittest.cc
+++ b/chrome/browser/ash/login/users/user_manager_unittest.cc
@@ -12,6 +12,7 @@
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
+#include "chrome/browser/ash/login/users/avatar/user_image_manager_impl.h"
 #include "chrome/browser/ash/login/users/chrome_user_manager_impl.h"
 #include "chrome/browser/ash/profiles/profile_helper.h"
 #include "chrome/browser/ash/settings/scoped_cros_settings_test_helper.h"
@@ -125,6 +126,8 @@
     command_line.AppendSwitch(::switches::kTestType);
     command_line.AppendSwitch(switches::kIgnoreUserProfileMappingForTests);
 
+    UserImageManagerImpl::SkipDefaultUserImageDownloadForTesting();
+
     settings_helper_.ReplaceDeviceSettingsProviderWithStub();
 
     // Populate the stub DeviceSettingsProvider with valid values.

chrome/browser/ash/policy/core/device_policy_decoder.cc

diff --git a/chrome/browser/ash/policy/core/device_policy_decoder.cc b/chrome/browser/ash/policy/core/device_policy_decoder.cc
index 3771fc4..1a7dd25 100644
--- a/chrome/browser/ash/policy/core/device_policy_decoder.cc
+++ b/chrome/browser/ash/policy/core/device_policy_decoder.cc
@@ -1999,6 +1999,14 @@
     }
   }
 
+  if (policy.has_device_borealis_allowed() &&
+      policy.device_borealis_allowed().has_allowed()) {
+    policies->Set(key::kDeviceBorealisAllowed, POLICY_LEVEL_MANDATORY,
+                  POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+                  base::Value(policy.device_borealis_allowed().allowed()),
+                  nullptr);
+  }
+
   if (policy.has_device_allowed_bluetooth_services()) {
     const em::DeviceAllowedBluetoothServicesProto& container(
         policy.device_allowed_bluetooth_services());

chrome/browser/ash/policy/dlp/data_transfer_dlp_controller_ash_browsertest.cc

diff --git a/chrome/browser/ash/policy/dlp/data_transfer_dlp_controller_ash_browsertest.cc b/chrome/browser/ash/policy/dlp/data_transfer_dlp_controller_ash_browsertest.cc
index b2604a4..930709c 100644
--- a/chrome/browser/ash/policy/dlp/data_transfer_dlp_controller_ash_browsertest.cc
+++ b/chrome/browser/ash/policy/dlp/data_transfer_dlp_controller_ash_browsertest.cc
@@ -235,18 +235,18 @@
     ScopedListPrefUpdate update(g_browser_process->local_state(),
                                 policy_prefs::kDlpRulesList);
 
-    base::Value src_urls(base::Value::Type::LIST);
+    base::Value::List src_urls;
     src_urls.Append(kMailUrl);
-    base::Value dst_components(base::Value::Type::LIST);
+    base::Value::List dst_components;
     dst_components.Append(dlp::kArc);
     dst_components.Append(dlp::kCrostini);
-    base::Value restrictions(base::Value::Type::LIST);
+    base::Value::List restrictions;
     restrictions.Append(dlp_test_util::CreateRestrictionWithLevel(
         dlp::kClipboardRestriction, dlp::kBlockLevel));
     update->Append(dlp_test_util::CreateRule(
         "rule #1", "Block Gmail", std::move(src_urls),
-        /*dst_urls=*/base::Value(base::Value::Type::LIST),
-        std::move(dst_components), std::move(restrictions)));
+        /*dst_urls=*/base::Value::List(), std::move(dst_components),
+        std::move(restrictions)));
   }
 
   {
@@ -296,28 +296,28 @@
   {
     ScopedListPrefUpdate update(g_browser_process->local_state(),
                                 policy_prefs::kDlpRulesList);
-    base::Value rule(base::Value::Type::DICTIONARY);
-    base::Value src_urls(base::Value::Type::DICTIONARY);
-    base::Value src_urls_list(base::Value::Type::LIST);
-    src_urls_list.Append(base::Value(kMailUrl));
-    src_urls.SetKey("urls", std::move(src_urls_list));
-    rule.SetKey("sources", std::move(src_urls));
+    base::Value::Dict rule;
+    base::Value::Dict src_urls;
+    base::Value::List src_urls_list;
+    src_urls_list.Append(kMailUrl);
+    src_urls.Set("urls", std::move(src_urls_list));
+    rule.Set("sources", std::move(src_urls));
 
-    base::Value dst_components(base::Value::Type::DICTIONARY);
-    base::Value dst_components_list(base::Value::Type::LIST);
-    dst_components_list.Append(base::Value("ARC"));
-    dst_components_list.Append(base::Value("CROSTINI"));
-    dst_components_list.Append(base::Value("PLUGIN_VM"));
-    dst_components.SetKey("components", std::move(dst_components_list));
-    rule.SetKey("destinations", std::move(dst_components));
+    base::Value::Dict dst_components;
+    base::Value::List dst_components_list;
+    dst_components_list.Append("ARC");
+    dst_components_list.Append("CROSTINI");
+    dst_components_list.Append("PLUGIN_VM");
+    dst_components.Set("components", std::move(dst_components_list));
+    rule.Set("destinations", std::move(dst_components));
 
-    base::Value restrictions(base::Value::Type::DICTIONARY);
-    base::Value restrictions_list(base::Value::Type::LIST);
-    base::Value class_level_dict(base::Value::Type::DICTIONARY);
-    class_level_dict.SetKey("class", base::Value("CLIPBOARD"));
-    class_level_dict.SetKey("level", base::Value("WARN"));
+    base::Value::Dict restrictions;
+    base::Value::List restrictions_list;
+    base::Value::Dict class_level_dict;
+    class_level_dict.Set("class", "CLIPBOARD");
+    class_level_dict.Set("level", "WARN");
     restrictions_list.Append(std::move(class_level_dict));
-    rule.SetKey("restrictions", std::move(restrictions_list));
+    rule.Set("restrictions", std::move(restrictions_list));
 
     update->Append(std::move(rule));
   }

chrome/browser/ash/policy/remote_commands/crd_host_delegate.cc

diff --git a/chrome/browser/ash/policy/remote_commands/crd_host_delegate.cc b/chrome/browser/ash/policy/remote_commands/crd_host_delegate.cc
index a8180e5..a36c2e7f 100644
--- a/chrome/browser/ash/policy/remote_commands/crd_host_delegate.cc
+++ b/chrome/browser/ash/policy/remote_commands/crd_host_delegate.cc
@@ -133,6 +133,10 @@
     // Note the oauth token must be prefixed with 'oauth2:', or it will be
     // rejected by the CRD host.
     result->oauth_access_token = "oauth2:" + parameters_.oauth_token;
+
+    // TODO(joedow): Set the |authorized_helper| field once it is provided by
+    // the admin console and available in |parameters_|.
+
     return result;
   }
 

chrome/browser/ash/policy/status_collector/child_status_collector_browsertest.cc

diff --git a/chrome/browser/ash/policy/status_collector/child_status_collector_browsertest.cc b/chrome/browser/ash/policy/status_collector/child_status_collector_browsertest.cc
index acd00c9..4ea4777 100644
--- a/chrome/browser/ash/policy/status_collector/child_status_collector_browsertest.cc
+++ b/chrome/browser/ash/policy/status_collector/child_status_collector_browsertest.cc
@@ -776,7 +776,7 @@
     ash::app_time::AppTimeLimitsPolicyBuilder builder;
     builder.SetAppActivityReportingEnabled(/* enabled */ false);
     testing_profile()->GetPrefs()->SetDict(prefs::kPerAppTimeLimitsPolicy,
-                                           builder.value().GetDict().Clone());
+                                           builder.value().Clone());
   }
 
   SimulateAppActivity(app1, app1_interval);

chrome/browser/ash/settings/device_settings_provider.cc

diff --git a/chrome/browser/ash/settings/device_settings_provider.cc b/chrome/browser/ash/settings/device_settings_provider.cc
index ec49e4a..4ff96b4 100644
--- a/chrome/browser/ash/settings/device_settings_provider.cc
+++ b/chrome/browser/ash/settings/device_settings_provider.cc
@@ -72,6 +72,7 @@
     kAllowedConnectionTypesForUpdate,
     kAllowRedeemChromeOsRegistrationOffers,
     kAttestationForContentProtectionEnabled,
+    kBorealisAllowedForDevice,
     kCastReceiverName,
     kDeviceAllowedBluetoothServices,
     kDeviceAttestationEnabled,
@@ -1186,6 +1187,15 @@
                                base::Value(std::move(allowlist)));
   }
 
+  if (policy.has_device_borealis_allowed()) {
+    const em::DeviceBorealisAllowedProto& container(
+        policy.device_borealis_allowed());
+    if (container.has_allowed()) {
+      new_values_cache->SetValue(kBorealisAllowedForDevice,
+                                 base::Value(container.allowed()));
+    }
+  }
+
   if (policy.has_device_allowed_bluetooth_services()) {
     base::Value::List list;
     const em::DeviceAllowedBluetoothServicesProto& container(

chrome/browser/ash/settings/device_settings_provider_unittest.cc

diff --git a/chrome/browser/ash/settings/device_settings_provider_unittest.cc b/chrome/browser/ash/settings/device_settings_provider_unittest.cc
index d9811a2..16e3c14c2 100644
--- a/chrome/browser/ash/settings/device_settings_provider_unittest.cc
+++ b/chrome/browser/ash/settings/device_settings_provider_unittest.cc
@@ -1170,6 +1170,20 @@
   EXPECT_EQ(expected_feature_flags, provider_->Get(kFeatureFlags)->GetList());
 }
 
+TEST_F(DeviceSettingsProviderTest, DecodeBorealisAllowed) {
+  device_policy_->payload().mutable_device_borealis_allowed()->set_allowed(
+      true);
+  BuildAndInstallDevicePolicy();
+  EXPECT_EQ(base::Value(true), *provider_->Get(kBorealisAllowedForDevice));
+}
+
+TEST_F(DeviceSettingsProviderTest, DecodeBorealisDisallowed) {
+  device_policy_->payload().mutable_device_borealis_allowed()->set_allowed(
+      false);
+  BuildAndInstallDevicePolicy();
+  EXPECT_EQ(base::Value(false), *provider_->Get(kBorealisAllowedForDevice));
+}
+
 TEST_F(DeviceSettingsProviderTest, DeviceAllowedBluetoothServices) {
   em::DeviceAllowedBluetoothServicesProto* proto =
       device_policy_->payload().mutable_device_allowed_bluetooth_services();

chrome/browser/ash/wallpaper/OWNERS

diff --git a/chrome/browser/ash/wallpaper/OWNERS b/chrome/browser/ash/wallpaper/OWNERS
new file mode 100644
index 0000000..026d929
--- /dev/null
+++ b/chrome/browser/ash/wallpaper/OWNERS
@@ -0,0 +1 @@
+file://ash/wallpaper/OWNERS

chrome/browser/ash/web_applications/personalization_app/personalization_app_user_provider_impl_unittest.cc

diff --git a/chrome/browser/ash/web_applications/personalization_app/personalization_app_user_provider_impl_unittest.cc b/chrome/browser/ash/web_applications/personalization_app/personalization_app_user_provider_impl_unittest.cc
index 0fec6d3..3a117b9 100644
--- a/chrome/browser/ash/web_applications/personalization_app/personalization_app_user_provider_impl_unittest.cc
+++ b/chrome/browser/ash/web_applications/personalization_app/personalization_app_user_provider_impl_unittest.cc
@@ -165,6 +165,8 @@
  protected:
   // testing::Test:
   void SetUp() override {
+    UserImageManagerImpl::SkipDefaultUserImageDownloadForTesting();
+
     ASSERT_TRUE(profile_manager_.SetUp());
     profile_ = profile_manager_.CreateTestingProfile(kFakeTestEmail);
     AddAndLoginUser(AccountId::FromUserEmailGaiaId(kFakeTestEmail, kTestGaiaId),

chrome/browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc

diff --git a/chrome/browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc b/chrome/browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc
index de21e6b8..5b33d73 100644
--- a/chrome/browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc
+++ b/chrome/browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc
@@ -124,10 +124,10 @@
         CreditCard credit_card) {
   LegalMessageLines legal_message_lines;
   if (!legal_message_string.empty()) {
-    std::unique_ptr<base::Value> value(
-        base::JSONReader::ReadDeprecated(legal_message_string));
+    absl::optional<base::Value> value =
+        base::JSONReader::Read(legal_message_string);
     EXPECT_TRUE(value);
-    LegalMessageLine::Parse(*value, &legal_message_lines,
+    LegalMessageLine::Parse(value->GetDict(), &legal_message_lines,
                             /*escape_apostrophes=*/true);
   }
   if (is_uploading) {

chrome/browser/banners/test_app_banner_manager_desktop.cc

diff --git a/chrome/browser/banners/test_app_banner_manager_desktop.cc b/chrome/browser/banners/test_app_banner_manager_desktop.cc
index fb6d1c43..1c79bfa8 100644
--- a/chrome/browser/banners/test_app_banner_manager_desktop.cc
+++ b/chrome/browser/banners/test_app_banner_manager_desktop.cc
@@ -11,6 +11,7 @@
 #include "base/strings/strcat.h"
 #include "base/strings/stringprintf.h"
 #include "base/task/single_thread_task_runner.h"
+#include "components/webapps/browser/banners/app_banner_manager.h"
 #include "components/webapps/browser/installable/installable_data.h"
 #include "content/public/browser/web_contents.h"
 
@@ -67,7 +68,7 @@
     promotable_quit_closure_ = run_loop.QuitClosure();
     run_loop.Run();
   }
-  return *installable_ && promotable_;
+  return *installable_ && IsPromotableWebApp();
 }
 
 void TestAppBannerManagerDesktop::PrepareDone(base::OnceClosure on_done) {
@@ -111,14 +112,18 @@
     const InstallableData& result) {
   debug_log_.Append("OnDidPerformWorkerCheck");
   AppBannerManagerDesktop::OnDidPerformWorkerCheck(result);
-  SetPromotable(result.NoBlockingErrors());
+
+  DCHECK(waiting_for_worker_);
+  waiting_for_worker_ = false;
+  if (promotable_quit_closure_) {
+    std::move(promotable_quit_closure_).Run();
+  }
 }
 
 void TestAppBannerManagerDesktop::ResetCurrentPageData() {
   debug_log_.Append("ResetCurrentPageData");
   AppBannerManagerDesktop::ResetCurrentPageData();
   installable_.reset();
-  promotable_ = false;
   waiting_for_worker_ = false;
   if (tear_down_quit_closure_)
     std::move(tear_down_quit_closure_).Run();
@@ -146,7 +151,8 @@
     content::RenderFrameHost* render_frame_host,
     const GURL& validated_url) {
   debug_log_.Append(base::StrCat({"DidFinishLoad ", validated_url.spec()}));
-  if (ShouldIgnore(render_frame_host, validated_url)) {
+  UrlType url_type = GetUrlType(render_frame_host, validated_url);
+  if (url_type == AppBannerManager::UrlType::kInvalidPrimaryFrameUrl) {
     SetInstallable(false);
     return;
   }
@@ -178,15 +184,6 @@
     std::move(installable_quit_closure_).Run();
 }
 
-void TestAppBannerManagerDesktop::SetPromotable(bool promotable) {
-  debug_log_.Append(base::StringPrintf("SetPromotable(%d)", promotable));
-  DCHECK(waiting_for_worker_);
-  waiting_for_worker_ = false;
-  promotable_ = promotable;
-  if (promotable_quit_closure_)
-    std::move(promotable_quit_closure_).Run();
-}
-
 void TestAppBannerManagerDesktop::OnFinished() {
   if (on_done_) {
     base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(

chrome/browser/banners/test_app_banner_manager_desktop.h

diff --git a/chrome/browser/banners/test_app_banner_manager_desktop.h b/chrome/browser/banners/test_app_banner_manager_desktop.h
index a9542661..79a487c 100644
--- a/chrome/browser/banners/test_app_banner_manager_desktop.h
+++ b/chrome/browser/banners/test_app_banner_manager_desktop.h
@@ -80,7 +80,6 @@
   absl::optional<bool> installable_;
   base::Value::List debug_log_;
   bool waiting_for_worker_;
-  bool promotable_;
   base::OnceClosure tear_down_quit_closure_;
   base::OnceClosure installable_quit_closure_;
   base::OnceClosure promotable_quit_closure_;

chrome/browser/browser_process_impl.cc

diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index b8686da..30f7940 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -363,10 +363,8 @@
 #endif
 
 #if BUILDFLAG(IS_ANDROID)
-  if (base::FeatureList::IsEnabled(features::kWebAuthConditionalUI)) {
-    components::WebAuthnClientAndroid::SetClient(
-        std::make_unique<ChromeWebAuthnClientAndroid>());
-  }
+  components::WebAuthnClientAndroid::SetClient(
+      std::make_unique<ChromeWebAuthnClientAndroid>());
 #endif
 
 #if !BUILDFLAG(IS_ANDROID)

chrome/browser/browsing_topics/browsing_topics_service_browsertest.cc

diff --git a/chrome/browser/browsing_topics/browsing_topics_service_browsertest.cc b/chrome/browser/browsing_topics/browsing_topics_service_browsertest.cc
index cd60f1a..8375059 100644
--- a/chrome/browser/browsing_topics/browsing_topics_service_browsertest.cc
+++ b/chrome/browser/browsing_topics/browsing_topics_service_browsertest.cc
@@ -8,6 +8,7 @@
 #include "base/strings/strcat.h"
 #include "base/test/scoped_feature_list.h"
 #include "chrome/browser/browsing_topics/browsing_topics_service_factory.h"
+#include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/optimization_guide/browser_test_util.h"
 #include "chrome/browser/optimization_guide/optimization_guide_keyed_service.h"
@@ -23,6 +24,7 @@
 #include "components/browsing_topics/epoch_topics.h"
 #include "components/browsing_topics/test_util.h"
 #include "components/content_settings/browser/page_specific_content_settings.h"
+#include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/optimization_guide/content/browser/page_content_annotations_service.h"
 #include "components/optimization_guide/content/browser/test_page_content_annotator.h"
@@ -62,12 +64,25 @@
 constexpr size_t kPaddedTopTopicsStartIndex = 5;
 constexpr Topic kExpectedTopic1 = Topic(1);
 constexpr Topic kExpectedTopic2 = Topic(10);
+
 constexpr char kExpectedApiResult[] =
     "[{\"configVersion\":\"chrome.1\",\"modelVersion\":\"2\","
     "\"taxonomyVersion\":\"1\",\"topic\":1,\"version\":\"chrome.1:1:2\"};{"
     "\"configVersion\":\"chrome.1\",\"modelVersion\":\"2\","
     "\"taxonomyVersion\":\"1\",\"topic\":10,\"version\":\"chrome.1:1:2\"};]";
 
+constexpr char kExpectedHeaderValueForSiteA[] =
+    "1;version=\"chrome.1:1:2\";config_version=\"chrome.1\";model_version="
+    "\"2\";taxonomy_version=\"1\", "
+    "10;version=\"chrome.1:1:2\";config_version=\"chrome.1\";model_version="
+    "\"2\";taxonomy_version=\"1\"";
+
+constexpr char kExpectedHeaderValueForSiteB[] =
+    "1;version=\"chrome.1:1:2\";config_version=\"chrome.1\";model_version="
+    "\"2\";taxonomy_version=\"1\", "
+    "7;version=\"chrome.1:1:2\";config_version=\"chrome.1\";model_version="
+    "\"2\";taxonomy_version=\"1\"";
+
 EpochTopics CreateTestEpochTopics(
     const std::vector<std::pair<Topic, std::set<HashedDomain>>>& topics,
     base::Time calculation_time) {
@@ -160,6 +175,16 @@
     https_server_.SetSSLConfig(net::EmbeddedTestServer::CERT_TEST_NAMES);
     https_server_.AddDefaultHandlers(GetChromeTestDataDir());
 
+    https_server_.RegisterRequestMonitor(base::BindRepeating(
+        &BrowsingTopicsBrowserTestBase::MonitorRequestOnNetworkThread,
+        base::Unretained(this),
+        base::SequencedTaskRunner::GetCurrentDefault()));
+
+    embedded_test_server()->RegisterRequestMonitor(base::BindRepeating(
+        &BrowsingTopicsBrowserTestBase::MonitorRequestOnNetworkThread,
+        base::Unretained(this),
+        base::SequencedTaskRunner::GetCurrentDefault()));
+
     content::SetupCrossSiteRedirector(&https_server_);
     ASSERT_TRUE(https_server_.Start());
 
@@ -191,6 +216,34 @@
         .ExtractString();
   }
 
+  void MonitorRequestOnNetworkThread(
+      const scoped_refptr<base::SequencedTaskRunner>& main_thread_task_runner,
+      const net::test_server::HttpRequest& request) {
+    main_thread_task_runner->PostTask(
+        FROM_HERE,
+        base::BindOnce(
+            &BrowsingTopicsBrowserTestBase::MonitorRequestOnMainThread,
+            base::Unretained(this), request));
+  }
+
+  void MonitorRequestOnMainThread(
+      const net::test_server::HttpRequest& request) {
+    auto topics_header = request.headers.find("Sec-Browsing-Topics");
+    if (topics_header != request.headers.end()) {
+      request_path_topics_map_[request.GetURL().path()] = topics_header->second;
+    }
+  }
+
+  absl::optional<std::string> GetTopicsHeaderForRequestPath(
+      const std::string& request_path) {
+    auto it = request_path_topics_map_.find(request_path);
+    if (it == request_path_topics_map_.end()) {
+      return absl::nullopt;
+    }
+
+    return it->second;
+  }
+
   content::WebContents* web_contents() {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
@@ -198,6 +251,9 @@
  protected:
   net::EmbeddedTestServer https_server_{
       net::test_server::EmbeddedTestServer::TYPE_HTTPS};
+
+  // Mapping of request paths to the topics header they were requested with.
+  std::map<std::string, std::string> request_path_topics_map_;
 };
 
 class BrowsingTopicsDisabledBrowserTest : public BrowsingTopicsBrowserTestBase {
@@ -895,15 +951,15 @@
 
 IN_PROC_BROWSER_TEST_F(BrowsingTopicsBrowserTest,
                        PermissionsPolicyAllowCertainOrigin_TopicsAPI) {
-  base::StringPairs port_replacement;
-  port_replacement.push_back(
-      std::make_pair("{{PORT}}", base::NumberToString(https_server_.port())));
+  base::StringPairs allowed_origin_replacement;
+  allowed_origin_replacement.emplace_back(
+      "{{ALLOWED_ORIGIN}}", https_server_.GetOrigin("c.test").Serialize());
 
   GURL main_frame_url = https_server_.GetURL(
       "a.test", net::test_server::GetFilePathWithReplacements(
                     "/browsing_topics/"
                     "one_iframe_page_browsing_topics_allow_certain_origin.html",
-                    port_replacement));
+                    allowed_origin_replacement));
 
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), main_frame_url));
 
@@ -1100,10 +1156,238 @@
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), new_url));
 }
 
-IN_PROC_BROWSER_TEST_F(BrowsingTopicsBrowserTest,
-                       Fetch_InsecureInitiatorContext) {
+IN_PROC_BROWSER_TEST_F(
+    BrowsingTopicsBrowserTest,
+    FetchSameOrigin_TopicsEligible_SendOneTopic_HasNoObserveResponse) {
+  GURL main_frame_url =
+      https_server_.GetURL("a.test", "/browsing_topics/empty_page.html");
+  ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), main_frame_url));
+
+  GURL fetch_url = https_server_.GetURL(
+      "a.test", "/browsing_topics/page_with_custom_topics_header.html");
+
+  EXPECT_TRUE(ExecJs(
+      web_contents()->GetPrimaryMainFrame(),
+      content::JsReplace("fetch($1, {browsingTopics: true})", fetch_url)));
+
+  absl::optional<std::string> topics_header_value =
+      GetTopicsHeaderForRequestPath(
+          "/browsing_topics/page_with_custom_topics_header.html");
+
+  EXPECT_TRUE(topics_header_value);
+  EXPECT_EQ(*topics_header_value, kExpectedHeaderValueForSiteA);
+
+  // No observation should have been recorded in addition to the pre-existing
+  // one.
+  std::vector<ApiUsageContext> api_usage_contexts =
+      content::GetBrowsingTopicsApiUsage(browsing_topics_site_data_manager());
+  EXPECT_EQ(api_usage_contexts.size(), 1u);
+}
+
+IN_PROC_BROWSER_TEST_F(BrowsingTopicsBrowserTest, FetchWithoutTopicsFlagSet) {
+  GURL main_frame_url =
+      https_server_.GetURL("b.test", "/browsing_topics/empty_page.html");
+  ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), main_frame_url));
+
+  GURL fetch_url = https_server_.GetURL(
+      "b.test", "/browsing_topics/page_with_custom_topics_header.html");
+
+  {
+    // Invoke fetch() without the `browsingTopics` flag. This request isn't
+    // eligible for topics.
+    EXPECT_TRUE(ExecJs(web_contents()->GetPrimaryMainFrame(),
+                       content::JsReplace("fetch($1)", fetch_url)));
+
+    absl::optional<std::string> topics_header_value =
+        GetTopicsHeaderForRequestPath(
+            "/browsing_topics/page_with_custom_topics_header.html");
+
+    // Expect no topics header as the request did not specify
+    // {browsingTopics: true}.
+    EXPECT_FALSE(topics_header_value);
+  }
+
+  {
+    // Invoke fetch() with the `browsingTopics` flag set to false. This request
+    // isn't eligible for topics.
+    EXPECT_TRUE(ExecJs(
+        web_contents()->GetPrimaryMainFrame(),
+        content::JsReplace("fetch($1, {browsingTopics: false})", fetch_url)));
+
+    absl::optional<std::string> topics_header_value =
+        GetTopicsHeaderForRequestPath(
+            "/browsing_topics/page_with_custom_topics_header.html");
+
+    // Expect no topics header as the request did not specify
+    // {browsingTopics: true}.
+    EXPECT_FALSE(topics_header_value);
+  }
+}
+
+IN_PROC_BROWSER_TEST_F(
+    BrowsingTopicsBrowserTest,
+    FetchSameOrigin_TopicsEligible_SendNoTopic_HasNoObserveResponse) {
+  GURL main_frame_url =
+      https_server_.GetURL("b.test", "/browsing_topics/empty_page.html");
+  ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), main_frame_url));
+
+  GURL fetch_url = https_server_.GetURL(
+      "b.test", "/browsing_topics/page_with_custom_topics_header.html");
+
+  EXPECT_TRUE(ExecJs(
+      web_contents()->GetPrimaryMainFrame(),
+      content::JsReplace("fetch($1, {browsingTopics: true})", fetch_url)));
+
+  absl::optional<std::string> topics_header_value =
+      GetTopicsHeaderForRequestPath(
+          "/browsing_topics/page_with_custom_topics_header.html");
+
+  // Expect an empty header value as "b.test" did not observe the candidate
+  // topics.
+  EXPECT_TRUE(topics_header_value);
+  EXPECT_TRUE(topics_header_value->empty());
+
+  // No observation should have been recorded in addition to the pre-existing
+  // one, as the response did not have the `Observe-Browsing-Topics: ?1` header.
+  std::vector<ApiUsageContext> api_usage_contexts =
+      content::GetBrowsingTopicsApiUsage(browsing_topics_site_data_manager());
+  EXPECT_EQ(api_usage_contexts.size(), 1u);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    BrowsingTopicsBrowserTest,
+    FetchSameOrigin_TopicsEligible_SendNoTopic_HasObserveResponse) {
+  GURL main_frame_url =
+      https_server_.GetURL("b.test", "/browsing_topics/empty_page.html");
+  ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), main_frame_url));
+
+  base::StringPairs replacement;
+  replacement.emplace_back(std::make_pair("{{STATUS}}", "200 OK"));
+  replacement.emplace_back(std::make_pair("{{OBSERVE_BROWSING_TOPICS_HEADER}}",
+                                          "Observe-Browsing-Topics: ?1"));
+  replacement.emplace_back(std::make_pair("{{REDIRECT_HEADER}}", ""));
+
+  GURL fetch_url = https_server_.GetURL(
+      "b.test", net::test_server::GetFilePathWithReplacements(
+                    "/browsing_topics/"
+                    "page_with_custom_topics_header.html",
+                    replacement));
+
+  EXPECT_TRUE(ExecJs(
+      web_contents()->GetPrimaryMainFrame(),
+      content::JsReplace("fetch($1, {browsingTopics: true})", fetch_url)));
+
+  // A new observation should have been recorded in addition to the pre-existing
+  // one, as the response had the `Observe-Browsing-Topics: ?1` header and the
+  // request was eligible for topics.
+  std::vector<ApiUsageContext> api_usage_contexts =
+      content::GetBrowsingTopicsApiUsage(browsing_topics_site_data_manager());
+  EXPECT_EQ(api_usage_contexts.size(), 2u);
+  EXPECT_EQ(api_usage_contexts[0].hashed_main_frame_host,
+            HashMainFrameHostForStorage("foo1.com"));
+  EXPECT_EQ(api_usage_contexts[0].hashed_context_domain, HashedDomain(1));
+  EXPECT_EQ(
+      api_usage_contexts[1].hashed_main_frame_host,
+      HashMainFrameHostForStorage(https_server_.GetURL("b.test", "/").host()));
+  EXPECT_EQ(api_usage_contexts[1].hashed_context_domain,
+            GetHashedDomain("b.test"));
+}
+
+IN_PROC_BROWSER_TEST_F(
+    BrowsingTopicsBrowserTest,
+    FetchSameOrigin_TopicsNotEligibleDueToUserSettings_HasObserveResponse) {
+  GURL main_frame_url =
+      https_server_.GetURL("a.test", "/browsing_topics/empty_page.html");
+  ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), main_frame_url));
+
+  base::StringPairs replacement;
+  replacement.emplace_back(std::make_pair("{{STATUS}}", "200 OK"));
+  replacement.emplace_back(std::make_pair("{{OBSERVE_BROWSING_TOPICS_HEADER}}",
+                                          "Observe-Browsing-Topics: ?1"));
+  replacement.emplace_back(std::make_pair("{{REDIRECT_HEADER}}", ""));
+
+  GURL fetch_url = https_server_.GetURL(
+      "a.test", net::test_server::GetFilePathWithReplacements(
+                    "/browsing_topics/"
+                    "page_with_custom_topics_header.html",
+                    replacement));
+
+  CookieSettingsFactory::GetForProfile(browser()->profile())
+      ->SetCookieSetting(fetch_url, CONTENT_SETTING_BLOCK);
+
+  EXPECT_TRUE(ExecJs(
+      web_contents()->GetPrimaryMainFrame(),
+      content::JsReplace("fetch($1, {browsingTopics: true})", fetch_url)));
+
+  absl::optional<std::string> topics_header_value =
+      GetTopicsHeaderForRequestPath(
+          "/browsing_topics/page_with_custom_topics_header.html");
+
+  // Expect no topics header as the request was not eligible for topics due to
+  // user settings.
+  EXPECT_FALSE(topics_header_value);
+
+  // No observation should have been recorded in addition to the pre-existing
+  // one even though the response had the `Observe-Browsing-Topics: ?1` header,
+  // as the request was not eligible for topics.
+  std::vector<ApiUsageContext> api_usage_contexts =
+      content::GetBrowsingTopicsApiUsage(browsing_topics_site_data_manager());
+  EXPECT_EQ(api_usage_contexts.size(), 1u);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    BrowsingTopicsBrowserTest,
+    FetchCrossOrigin_TopicsEligible_SendOneTopic_HasObserveResponse) {
+  GURL main_frame_url =
+      https_server_.GetURL("b.test", "/browsing_topics/empty_page.html");
+  ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), main_frame_url));
+
+  base::StringPairs replacement;
+  replacement.emplace_back(std::make_pair("{{STATUS}}", "200 OK"));
+  replacement.emplace_back(std::make_pair("{{OBSERVE_BROWSING_TOPICS_HEADER}}",
+                                          "Observe-Browsing-Topics: ?1"));
+  replacement.emplace_back(std::make_pair("{{REDIRECT_HEADER}}", ""));
+
+  GURL fetch_url = https_server_.GetURL(
+      "a.test", net::test_server::GetFilePathWithReplacements(
+                    "/browsing_topics/"
+                    "page_with_custom_topics_header.html",
+                    replacement));
+
+  EXPECT_TRUE(ExecJs(
+      web_contents()->GetPrimaryMainFrame(),
+      content::JsReplace("fetch($1, {browsingTopics: true})", fetch_url)));
+
+  absl::optional<std::string> topics_header_value =
+      GetTopicsHeaderForRequestPath(
+          "/browsing_topics/page_with_custom_topics_header.html");
+
+  EXPECT_TRUE(topics_header_value);
+  EXPECT_EQ(*topics_header_value, kExpectedHeaderValueForSiteB);
+
+  // A new observation should have been recorded in addition to the pre-existing
+  // one, as the response had the `Observe-Browsing-Topics: ?1` header and the
+  // request was eligible for topics.
+  std::vector<ApiUsageContext> api_usage_contexts =
+      content::GetBrowsingTopicsApiUsage(browsing_topics_site_data_manager());
+  EXPECT_EQ(api_usage_contexts.size(), 2u);
+  EXPECT_EQ(
+      api_usage_contexts[0].hashed_main_frame_host,
+      HashMainFrameHostForStorage(https_server_.GetURL("b.test", "/").host()));
+  EXPECT_EQ(api_usage_contexts[0].hashed_context_domain,
+            GetHashedDomain("a.test"));
+  EXPECT_EQ(api_usage_contexts[1].hashed_main_frame_host,
+            HashMainFrameHostForStorage("foo1.com"));
+  EXPECT_EQ(api_usage_contexts[1].hashed_context_domain, HashedDomain(1));
+}
+
+// On an insecure site (i.e. URL with http scheme), test fetch request with
+// the `browsingTopics` set to true. Expect it to throw an exception.
+IN_PROC_BROWSER_TEST_F(
+    BrowsingTopicsBrowserTest,
+    FetchCrossOrigin_TopicsNotEligibleDueToInsecureInitiatorContext) {
   GURL main_frame_url = embedded_test_server()->GetURL(
-      "a.test", "/browsing_topics/empty_page.html");
+      "b.test", "/browsing_topics/empty_page.html");
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), main_frame_url));
 
   GURL fetch_url =
@@ -1116,21 +1400,224 @@
   EXPECT_THAT(result.error,
               testing::HasSubstr("browsingTopics: Topics operations are only "
                                  "available in secure contexts."));
+
+  absl::optional<std::string> topics_header_value =
+      GetTopicsHeaderForRequestPath("/browsing_topics/empty_page.html");
+
+  // Expect no topics header as the request was not eligible for topics due to
+  // insecure initiator context.
+  EXPECT_FALSE(topics_header_value);
 }
 
-// Right now the E2E topics handling isn't implemented. This test just show the
-// distinction with other failure test case.
-IN_PROC_BROWSER_TEST_F(BrowsingTopicsBrowserTest, Fetch_Success) {
-  GURL main_frame_url =
-      https_server_.GetURL("a.test", "/browsing_topics/empty_page.html");
+// Only allow topics from origin c.test, and test fetch requests to b.test and
+// c.test to verify that only c.test gets them.
+IN_PROC_BROWSER_TEST_F(
+    BrowsingTopicsBrowserTest,
+    FetchCrossOrigin_TopicsNotEligibleDueToPermissionsPolicyAgainstRequestOrigin) {
+  base::StringPairs allowed_origin_replacement;
+  allowed_origin_replacement.emplace_back(
+      "{{ALLOWED_ORIGIN}}", https_server_.GetOrigin("c.test").Serialize());
+
+  GURL main_frame_url = https_server_.GetURL(
+      "b.test", net::test_server::GetFilePathWithReplacements(
+                    "/browsing_topics/"
+                    "one_iframe_page_browsing_topics_allow_certain_origin.html",
+                    allowed_origin_replacement));
+
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), main_frame_url));
 
-  GURL fetch_url =
-      https_server_.GetURL("a.test", "/browsing_topics/empty_page.html");
+  {
+    GURL fetch_url =
+        https_server_.GetURL("a.test", "/browsing_topics/empty_page.html");
+
+    EXPECT_TRUE(ExecJs(
+        web_contents()->GetPrimaryMainFrame(),
+        content::JsReplace("fetch($1, {browsingTopics: true})", fetch_url)));
+
+    absl::optional<std::string> topics_header_value =
+        GetTopicsHeaderForRequestPath("/browsing_topics/empty_page.html");
+
+    // No topics header was sent, as the permissions policy denied it.
+    EXPECT_FALSE(topics_header_value);
+  }
+
+  {
+    GURL fetch_url =
+        https_server_.GetURL("c.test", "/browsing_topics/empty_page.html");
+
+    EXPECT_TRUE(ExecJs(
+        web_contents()->GetPrimaryMainFrame(),
+        content::JsReplace("fetch($1, {browsingTopics: true})", fetch_url)));
+
+    absl::optional<std::string> topics_header_value =
+        GetTopicsHeaderForRequestPath("/browsing_topics/empty_page.html");
+
+    EXPECT_TRUE(topics_header_value);
+  }
+}
+
+// On site b.test, test fetch request to a.test that gets redirected to c.test.
+// The topics header should be calculated for them individually (i.e. given that
+// only a.test has observed the candidate topics for site b.test, the request to
+// a.test should have a non-empty topics header, while the redirected request to
+// c.test should have an empty topics header.)
+IN_PROC_BROWSER_TEST_F(BrowsingTopicsBrowserTest,
+                       FetchCrossOriginWithRedirect) {
+  GURL main_frame_url =
+      https_server_.GetURL("b.test", "/browsing_topics/empty_page.html");
+
+  ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), main_frame_url));
+
+  base::StringPairs redirect_replacement;
+  redirect_replacement.emplace_back(std::make_pair("{{STATUS}}", "200 OK"));
+  redirect_replacement.emplace_back(std::make_pair(
+      "{{OBSERVE_BROWSING_TOPICS_HEADER}}", "Observe-Browsing-Topics: ?1"));
+  redirect_replacement.emplace_back(std::make_pair("{{REDIRECT_HEADER}}", ""));
+
+  GURL redirect_url = https_server_.GetURL(
+      "c.test", net::test_server::GetFilePathWithReplacements(
+                    "/browsing_topics/"
+                    "page_with_custom_topics_header2.html",
+                    redirect_replacement));
+
+  base::StringPairs replacement;
+  replacement.emplace_back(
+      std::make_pair("{{STATUS}}", "301 Moved Permanently"));
+  replacement.emplace_back(std::make_pair("{{OBSERVE_BROWSING_TOPICS_HEADER}}",
+                                          "Observe-Browsing-Topics: ?1"));
+  replacement.emplace_back(std::make_pair("{{REDIRECT_HEADER}}",
+                                          "Location: " + redirect_url.spec()));
+
+  GURL fetch_url = https_server_.GetURL(
+      "a.test", net::test_server::GetFilePathWithReplacements(
+                    "/browsing_topics/"
+                    "page_with_custom_topics_header.html",
+                    replacement));
 
   EXPECT_TRUE(ExecJs(
       web_contents()->GetPrimaryMainFrame(),
       content::JsReplace("fetch($1, {browsingTopics: true})", fetch_url)));
+
+  {
+    absl::optional<std::string> topics_header_value =
+        GetTopicsHeaderForRequestPath(
+            "/browsing_topics/page_with_custom_topics_header.html");
+    EXPECT_TRUE(topics_header_value);
+    EXPECT_EQ(*topics_header_value, kExpectedHeaderValueForSiteB);
+  }
+  {
+    absl::optional<std::string> topics_header_value =
+        GetTopicsHeaderForRequestPath(
+            "/browsing_topics/page_with_custom_topics_header2.html");
+    EXPECT_TRUE(topics_header_value);
+
+    // An empty topics header value was sent, because "c.test" did not observe
+    // the candidate topics.
+    EXPECT_TRUE(topics_header_value->empty());
+  }
+
+  // Two new observations should have been recorded in addition to the
+  // pre-existing one.
+  std::vector<ApiUsageContext> api_usage_contexts =
+      content::GetBrowsingTopicsApiUsage(browsing_topics_site_data_manager());
+  EXPECT_EQ(api_usage_contexts.size(), 3u);
+  EXPECT_EQ(
+      api_usage_contexts[0].hashed_main_frame_host,
+      HashMainFrameHostForStorage(https_server_.GetURL("b.test", "/").host()));
+  EXPECT_EQ(api_usage_contexts[0].hashed_context_domain,
+            GetHashedDomain("c.test"));
+  EXPECT_EQ(
+      api_usage_contexts[1].hashed_main_frame_host,
+      HashMainFrameHostForStorage(https_server_.GetURL("b.test", "/").host()));
+  EXPECT_EQ(api_usage_contexts[1].hashed_context_domain,
+            GetHashedDomain("a.test"));
+  EXPECT_EQ(api_usage_contexts[2].hashed_main_frame_host,
+            HashMainFrameHostForStorage("foo1.com"));
+  EXPECT_EQ(api_usage_contexts[2].hashed_context_domain, HashedDomain(1));
+}
+
+// On site b.test, test fetch request to a.test that gets redirected to c.test.
+// The topics header eligibility should be checked for them individually (i.e.
+// given that the declared policy on the page only allows origin c.test, the
+// request to a.test should not have the topics header, while the redirected
+// request to c.test should have the topics header.)
+IN_PROC_BROWSER_TEST_F(
+    BrowsingTopicsBrowserTest,
+    FetchCrossOriginWithRedirect_InitialRequestTopicsNotEligibleDueToPermissionsPolicy) {
+  base::StringPairs allowed_origin_replacement;
+  allowed_origin_replacement.emplace_back(
+      "{{ALLOWED_ORIGIN}}", https_server_.GetOrigin("c.test").Serialize());
+
+  GURL main_frame_url = https_server_.GetURL(
+      "b.test", net::test_server::GetFilePathWithReplacements(
+                    "/browsing_topics/"
+                    "one_iframe_page_browsing_topics_allow_certain_origin.html",
+                    allowed_origin_replacement));
+
+  ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), main_frame_url));
+
+  base::StringPairs redirect_replacement;
+  redirect_replacement.emplace_back(std::make_pair("{{STATUS}}", "200 OK"));
+  redirect_replacement.emplace_back(std::make_pair(
+      "{{OBSERVE_BROWSING_TOPICS_HEADER}}", "Observe-Browsing-Topics: ?1"));
+  redirect_replacement.emplace_back(std::make_pair("{{REDIRECT_HEADER}}", ""));
+
+  GURL redirect_url = https_server_.GetURL(
+      "c.test", net::test_server::GetFilePathWithReplacements(
+                    "/browsing_topics/"
+                    "page_with_custom_topics_header2.html",
+                    redirect_replacement));
+
+  base::StringPairs replacement;
+  replacement.emplace_back(
+      std::make_pair("{{STATUS}}", "301 Moved Permanently"));
+  replacement.emplace_back(std::make_pair("{{OBSERVE_BROWSING_TOPICS_HEADER}}",
+                                          "Observe-Browsing-Topics: ?1"));
+  replacement.emplace_back(std::make_pair("{{REDIRECT_HEADER}}",
+                                          "Location: " + redirect_url.spec()));
+
+  GURL fetch_url = https_server_.GetURL(
+      "a.test", net::test_server::GetFilePathWithReplacements(
+                    "/browsing_topics/"
+                    "page_with_custom_topics_header.html",
+                    replacement));
+
+  EXPECT_TRUE(ExecJs(
+      web_contents()->GetPrimaryMainFrame(),
+      content::JsReplace("fetch($1, {browsingTopics: true})", fetch_url)));
+
+  {
+    absl::optional<std::string> topics_header_value =
+        GetTopicsHeaderForRequestPath(
+            "/browsing_topics/page_with_custom_topics_header.html");
+
+    // No topics header was sent, as the permissions policy denied it.
+    EXPECT_FALSE(topics_header_value);
+  }
+  {
+    absl::optional<std::string> topics_header_value =
+        GetTopicsHeaderForRequestPath(
+            "/browsing_topics/page_with_custom_topics_header2.html");
+    EXPECT_TRUE(topics_header_value);
+
+    // An empty topics header value was sent, as "c.test" did not observe the
+    // candidate topics.
+    EXPECT_TRUE(topics_header_value->empty());
+  }
+
+  // A new observation should have been recorded in addition to the pre-existing
+  // one.
+  std::vector<ApiUsageContext> api_usage_contexts =
+      content::GetBrowsingTopicsApiUsage(browsing_topics_site_data_manager());
+  EXPECT_EQ(api_usage_contexts.size(), 2u);
+  EXPECT_EQ(
+      api_usage_contexts[0].hashed_main_frame_host,
+      HashMainFrameHostForStorage(https_server_.GetURL("b.test", "/").host()));
+  EXPECT_EQ(api_usage_contexts[0].hashed_context_domain,
+            GetHashedDomain("c.test"));
+  EXPECT_EQ(api_usage_contexts[1].hashed_main_frame_host,
+            HashMainFrameHostForStorage("foo1.com"));
+  EXPECT_EQ(api_usage_contexts[1].hashed_context_domain, HashedDomain(1));
 }
 
 }  // namespace browsing_topics

chrome/browser/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 7d0d470..20e6a087 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2023,17 +2023,19 @@
   return false;
 }
 
-bool ChromeContentBrowserClient::DoesWebUISchemeRequireProcessLock(
-    base::StringPiece scheme) {
+bool ChromeContentBrowserClient::DoesWebUIUrlRequireProcessLock(
+    const GURL& url) {
   // Note: This method can be called from multiple threads. It is not safe to
   // assume it runs only on the UI thread.
 
-  // chrome-search: documents commit only in the NTP instant process and are not
-  // locked to chrome-search: origin.  Locking to chrome-search would kill
-  // processes upon legitimate requests for cookies from the search engine's
-  // domain.
-  if (scheme == chrome::kChromeSearchScheme)
+  // We only allow the most visited tiles on third-party NTPs to not require a
+  // process lock. Everything else, including the actual third-party NTP which
+  // embeds those tiles, should be locked.  This allows most visited tiles to
+  // stay in their parent (i.e., third-party NTP's) process.
+  if (url.SchemeIs(chrome::kChromeSearchScheme) &&
+      url.host() == chrome::kChromeSearchMostVisitedHost) {
     return false;
+  }
 
   // All other WebUIs must be locked to origin.
   return true;
@@ -2201,12 +2203,21 @@
 
 bool ChromeContentBrowserClient::ShouldStayInParentProcessForNTP(
     const GURL& url,
-    SiteInstance* parent_site_instance) {
-  // While using SiteInstance::GetSiteURL() is unreliable and the wrong thing to
-  // use for making security decisions 99.44% of the time, for detecting the NTP
-  // it is reliable and the correct way. See http://crbug.com/624410.
-  return url.SchemeIs(chrome::kChromeSearchScheme) && parent_site_instance &&
-         search::IsNTPURL(parent_site_instance->GetSiteURL());
+    const GURL& parent_site_url) {
+  // Allow most visited iframes to stay in the parent process but only if that
+  // process is for NTP.
+  //
+  // TODO(alexmos): Consider further tightening this exception to just the
+  // third-party remote NTP in the parent, rather than any NTP.
+  //
+  // TODO(crbug.com/566091): place those iframes into OOPIFs and remove this
+  // exception. Relaxing site isolation like this is a bad idea and should be
+  // avoided.
+  //
+  // TODO(crbug.com/624410): clean up the logic for detecting NTP.
+  return url.SchemeIs(chrome::kChromeSearchScheme) &&
+         url.host() == chrome::kChromeSearchMostVisitedHost &&
+         search::IsNTPURL(parent_site_url);
 }
 
 bool ChromeContentBrowserClient::IsSuitableHost(

chrome/browser/chrome_content_browser_client.h

diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index b6c5f30..d7096b1 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -166,7 +166,7 @@
                                        const GURL& site_url) override;
   bool DoesSiteRequireDedicatedProcess(content::BrowserContext* browser_context,
                                        const GURL& effective_site_url) override;
-  bool DoesWebUISchemeRequireProcessLock(base::StringPiece scheme) override;
+  bool DoesWebUIUrlRequireProcessLock(const GURL& url) override;
   bool ShouldTreatURLSchemeAsFirstPartyWhenTopLevel(
       base::StringPiece scheme,
       bool is_embedded_origin_secure) override;
@@ -200,9 +200,8 @@
       bool* is_renderer_initiated,
       content::Referrer* referrer,
       absl::optional<url::Origin>* initiator_origin) override;
-  bool ShouldStayInParentProcessForNTP(
-      const GURL& url,
-      content::SiteInstance* parent_site_instance) override;
+  bool ShouldStayInParentProcessForNTP(const GURL& url,
+                                       const GURL& parent_site_url) override;
   bool IsSuitableHost(content::RenderProcessHost* process_host,
                       const GURL& site_url) override;
   bool MayReuseHost(content::RenderProcessHost* process_host) override;

chrome/browser/chrome_content_browser_client_unittest.cc

diff --git a/chrome/browser/chrome_content_browser_client_unittest.cc b/chrome/browser/chrome_content_browser_client_unittest.cc
index f2900f3f..6737845 100644
--- a/chrome/browser/chrome_content_browser_client_unittest.cc
+++ b/chrome/browser/chrome_content_browser_client_unittest.cc
@@ -196,15 +196,29 @@
       content::SiteInstance::CreateForURL(browser()->profile(),
                                           GURL("chrome-search://remote-ntp"));
   EXPECT_TRUE(client.ShouldStayInParentProcessForNTP(
-      GURL("chrome-search://remote-ntp"), site_instance.get()));
+      GURL("chrome-search://most-visited/title.html"),
+      site_instance->GetSiteURL()));
+
+  // Only the most visited tiles host is allowed to stay in the 3P NTP.
+  EXPECT_FALSE(client.ShouldStayInParentProcessForNTP(
+      GURL("chrome-search://foo/"), site_instance->GetSiteURL()));
+  EXPECT_FALSE(client.ShouldStayInParentProcessForNTP(
+      GURL("chrome://new-tab-page"), site_instance->GetSiteURL()));
 
   site_instance = content::SiteInstance::CreateForURL(
       browser()->profile(), GURL("chrome://new-tab-page"));
+
   // chrome://new-tab-page is an NTP replacing local-ntp and supports OOPIFs.
   // ShouldStayInParentProcessForNTP() should only return true for NTPs hosted
   // under the chrome-search: scheme.
   EXPECT_FALSE(client.ShouldStayInParentProcessForNTP(
-      GURL("chrome://new-tab-page"), site_instance.get()));
+      GURL("chrome://new-tab-page"), site_instance->GetSiteURL()));
+
+  // For now, we also allow chrome-search://most-visited to stay in 1P NTP,
+  // chrome://new-tab-page.  We should consider tightening this to only allow
+  // most-visited tiles to stay in 3P NTP.
+  EXPECT_TRUE(client.ShouldStayInParentProcessForNTP(
+      GURL("chrome-search://most-visited"), site_instance->GetSiteURL()));
 }
 
 TEST_F(ChromeContentBrowserClientWindowTest, OverrideNavigationParams) {

chrome/browser/chrome_notification_types.h

diff --git a/chrome/browser/chrome_notification_types.h b/chrome/browser/chrome_notification_types.h
index 306440a..94b4b33 100644
--- a/chrome/browser/chrome_notification_types.h
+++ b/chrome/browser/chrome_notification_types.h
@@ -64,18 +64,6 @@
   // TODO(https://crbug.com/1174785): Remove.
   NOTIFICATION_AUTH_CANCELLED,
 
-  // Profiles -----------------------------------------------------------------
-
-  // Use ProfileManagerObserver::OnProfileAdded instead of this notification.
-  // Sent after a Profile has been added to ProfileManager.
-  // The details are none and the source is the new profile.
-  // Note: this notification is only sent for profiles owned by the
-  // `ProfileManager`. In particular, off-the-record profiles don't trigger this
-  // notification, but on-the-record System and Guest profiles do.
-  //  TODO(https://crbug.com/1174720): Remove. See also
-  //  https://crbug.com/1038437.
-  NOTIFICATION_PROFILE_ADDED,
-
   // Misc --------------------------------------------------------------------
   // Note:-
   // Currently only Content and Chrome define and use notifications.

chrome/browser/chromeos/policy/dlp/data_transfer_dlp_controller_browsertest.cc

diff --git a/chrome/browser/chromeos/policy/dlp/data_transfer_dlp_controller_browsertest.cc b/chrome/browser/chromeos/policy/dlp/data_transfer_dlp_controller_browsertest.cc
index 49b5e31..bc4f0a00 100644
--- a/chrome/browser/chromeos/policy/dlp/data_transfer_dlp_controller_browsertest.cc
+++ b/chrome/browser/chromeos/policy/dlp/data_transfer_dlp_controller_browsertest.cc
@@ -291,30 +291,28 @@
     ScopedListPrefUpdate update(g_browser_process->local_state(),
                                 policy_prefs::kDlpRulesList);
 
-    base::Value src_urls1(base::Value::Type::LIST);
+    base::Value::List src_urls1;
     src_urls1.Append(kMailUrl);
-    base::Value dst_urls1(base::Value::Type::LIST);
+    base::Value::List dst_urls1;
     dst_urls1.Append("*");
-    base::Value restrictions1(base::Value::Type::LIST);
+    base::Value::List restrictions1;
     restrictions1.Append(dlp_test_util::CreateRestrictionWithLevel(
         dlp::kClipboardRestriction, dlp::kBlockLevel));
     update->Append(dlp_test_util::CreateRule(
         "rule #1", "Block Gmail", std::move(src_urls1), std::move(dst_urls1),
-        /*dst_components=*/base::Value(base::Value::Type::LIST),
-        std::move(restrictions1)));
+        /*dst_components=*/base::Value::List(), std::move(restrictions1)));
 
-    base::Value src_urls2(base::Value::Type::LIST);
+    base::Value::List src_urls2;
     src_urls2.Append(kMailUrl);
-    base::Value dst_urls2(base::Value::Type::LIST);
+    base::Value::List dst_urls2;
     dst_urls2.Append(kDocsUrl);
-    base::Value restrictions2(base::Value::Type::LIST);
+    base::Value::List restrictions2;
     restrictions2.Append(dlp_test_util::CreateRestrictionWithLevel(
         dlp::kClipboardRestriction, dlp::kAllowLevel));
     update->Append(dlp_test_util::CreateRule(
         "rule #2", "Allow Gmail for work purposes", std::move(src_urls2),
         std::move(dst_urls2),
-        /*dst_components=*/base::Value(base::Value::Type::LIST),
-        std::move(restrictions2)));
+        /*dst_components=*/base::Value::List(), std::move(restrictions2)));
   }
 
   SetClipboardText(

chrome/browser/chromeos/policy/dlp/dlp_content_restriction_set_browsertest.cc

diff --git a/chrome/browser/chromeos/policy/dlp/dlp_content_restriction_set_browsertest.cc b/chrome/browser/chromeos/policy/dlp/dlp_content_restriction_set_browsertest.cc
index 809d901..f488f19 100644
--- a/chrome/browser/chromeos/policy/dlp/dlp_content_restriction_set_browsertest.cc
+++ b/chrome/browser/chromeos/policy/dlp/dlp_content_restriction_set_browsertest.cc
@@ -76,49 +76,45 @@
     ScopedListPrefUpdate update(g_browser_process->local_state(),
                                 policy_prefs::kDlpRulesList);
 
-    base::Value src_urls1(base::Value::Type::LIST);
+    base::Value::List src_urls1;
     src_urls1.Append(kUrl1);
-    base::Value restrictions1(base::Value::Type::LIST);
+    base::Value::List restrictions1;
     restrictions1.Append(dlp_test_util::CreateRestrictionWithLevel(
         dlp::kScreenshotRestriction, dlp::kBlockLevel));
     update->Append(dlp_test_util::CreateRule(
         "rule #1", "Block", std::move(src_urls1),
-        /*dst_urls=*/base::Value(base::Value::Type::LIST),
-        /*dst_components=*/base::Value(base::Value::Type::LIST),
-        std::move(restrictions1)));
+        /*dst_urls=*/base::Value::List(),
+        /*dst_components=*/base::Value::List(), std::move(restrictions1)));
 
-    base::Value src_urls2(base::Value::Type::LIST);
+    base::Value::List src_urls2;
     src_urls2.Append(kUrl2);
-    base::Value restrictions2(base::Value::Type::LIST);
+    base::Value::List restrictions2;
     restrictions2.Append(dlp_test_util::CreateRestrictionWithLevel(
         dlp::kPrivacyScreenRestriction, dlp::kBlockLevel));
     update->Append(dlp_test_util::CreateRule(
         "rule #2", "Block", std::move(src_urls2),
-        /*dst_urls=*/base::Value(base::Value::Type::LIST),
-        /*dst_components=*/base::Value(base::Value::Type::LIST),
-        std::move(restrictions2)));
+        /*dst_urls=*/base::Value::List(),
+        /*dst_components=*/base::Value::List(), std::move(restrictions2)));
 
-    base::Value src_urls3(base::Value::Type::LIST);
+    base::Value::List src_urls3;
     src_urls3.Append(kUrl3);
-    base::Value restrictions3(base::Value::Type::LIST);
+    base::Value::List restrictions3;
     restrictions3.Append(dlp_test_util::CreateRestrictionWithLevel(
         dlp::kPrintingRestriction, dlp::kBlockLevel));
     update->Append(dlp_test_util::CreateRule(
         "rule #3", "Block", std::move(src_urls3),
-        /*dst_urls=*/base::Value(base::Value::Type::LIST),
-        /*dst_components=*/base::Value(base::Value::Type::LIST),
-        std::move(restrictions3)));
+        /*dst_urls=*/base::Value::List(),
+        /*dst_components=*/base::Value::List(), std::move(restrictions3)));
 
-    base::Value src_urls4(base::Value::Type::LIST);
+    base::Value::List src_urls4;
     src_urls4.Append(kUrl4);
-    base::Value restrictions4(base::Value::Type::LIST);
+    base::Value::List restrictions4;
     restrictions4.Append(dlp_test_util::CreateRestrictionWithLevel(
         dlp::kScreenShareRestriction, dlp::kBlockLevel));
     update->Append(dlp_test_util::CreateRule(
         "rule #4", "Block", std::move(src_urls4),
-        /*dst_urls=*/base::Value(base::Value::Type::LIST),
-        /*dst_components=*/base::Value(base::Value::Type::LIST),
-        std::move(restrictions4)));
+        /*dst_urls=*/base::Value::List(),
+        /*dst_components=*/base::Value::List(), std::move(restrictions4)));
   }
 
   EXPECT_EQ(kScreenshotRestricted,

chrome/browser/chromeos/policy/dlp/dlp_rules_manager_impl_browsertest.cc

diff --git a/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_impl_browsertest.cc b/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_impl_browsertest.cc
index 5685ef4..0a3a008 100644
--- a/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_impl_browsertest.cc
+++ b/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_impl_browsertest.cc
@@ -62,20 +62,19 @@
     ScopedListPrefUpdate update(g_browser_process->local_state(),
                                 policy_prefs::kDlpRulesList);
 
-    base::Value rules(base::Value::Type::LIST);
+    base::Value::List rules;
 
-    base::Value src_urls(base::Value::Type::LIST);
+    base::Value::List src_urls;
     src_urls.Append(kUrlStr1);
 
-    base::Value restrictions(base::Value::Type::LIST);
+    base::Value::List restrictions;
     restrictions.Append(dlp_test_util::CreateRestrictionWithLevel(
         dlp::kScreenshotRestriction, dlp::kBlockLevel));
 
     update->Append(dlp_test_util::CreateRule(
         "rule #1", "Block", std::move(src_urls),
-        /*dst_urls=*/base::Value(base::Value::Type::LIST),
-        /*dst_components=*/base::Value(base::Value::Type::LIST),
-        std::move(restrictions)));
+        /*dst_urls=*/base::Value::List(),
+        /*dst_components=*/base::Value::List(), std::move(restrictions)));
   }
 
   EXPECT_EQ(DlpRulesManager::Level::kBlock,

chrome/browser/chromeos/policy/dlp/dlp_rules_manager_impl_unittest.cc

diff --git a/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_impl_unittest.cc b/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_impl_unittest.cc
index 6396846..34be1aa 100644
--- a/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_impl_unittest.cc
+++ b/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_impl_unittest.cc
@@ -61,10 +61,9 @@
       : testing_local_state_(TestingBrowserProcess::GetGlobal()),
         dlp_rules_manager_(testing_local_state_.Get()) {}
 
-  void UpdatePolicyPref(base::Value rules_list) {
-    DCHECK(rules_list.is_list());
-    testing_local_state_.Get()->Set(policy_prefs::kDlpRulesList,
-                                    std::move(rules_list));
+  void UpdatePolicyPref(base::Value::List rules_list) {
+    testing_local_state_.Get()->SetList(policy_prefs::kDlpRulesList,
+                                        std::move(rules_list));
   }
 
   content::BrowserTaskEnvironment task_environment_;
@@ -74,7 +73,7 @@
 };
 
 TEST_F(DlpRulesManagerImplTest, EmptyPref) {
-  UpdatePolicyPref(base::Value(base::Value::Type::LIST));
+  UpdatePolicyPref(base::Value::List());
 
   EXPECT_EQ(DlpRulesManager::Level::kAllow,
             dlp_rules_manager_.IsRestricted(
@@ -91,22 +90,21 @@
 }
 
 TEST_F(DlpRulesManagerImplTest, UnknownRestriction) {
-  base::Value rules(base::Value::Type::LIST);
+  base::Value::List rules;
 
-  base::Value src_urls(base::Value::Type::LIST);
+  base::Value::List src_urls;
   src_urls.Append(kExampleUrl);
 
-  base::Value dst_urls(base::Value::Type::LIST);
+  base::Value::List dst_urls;
   dst_urls.Append(kWildCardMatching);
 
-  base::Value restrictions(base::Value::Type::LIST);
+  base::Value::List restrictions;
   restrictions.Append(dlp_test_util::CreateRestrictionWithLevel(
       "Wrong restriction", dlp::kBlockLevel));
 
   rules.Append(dlp_test_util::CreateRule(
       "rule #1", "Unknown", std::move(src_urls), std::move(dst_urls),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions)));
 
   UpdatePolicyPref(std::move(rules));
   histogram_tester_.ExpectBucketCount(
@@ -115,22 +113,22 @@
 }
 
 TEST_F(DlpRulesManagerImplTest, UnknownComponent) {
-  base::Value rules(base::Value::Type::LIST);
+  base::Value::List rules;
 
-  base::Value src_urls(base::Value::Type::LIST);
+  base::Value::List src_urls;
   src_urls.Append(kExampleUrl);
 
-  base::Value dst_components(base::Value::Type::LIST);
+  base::Value::List dst_components;
   dst_components.Append("Wrong component");
 
-  base::Value restrictions(base::Value::Type::LIST);
+  base::Value::List restrictions;
   restrictions.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kBlockLevel));
 
   rules.Append(dlp_test_util::CreateRule(
       "rule #1", "Unknown", std::move(src_urls),
-      /*dst_urls=*/base::Value(base::Value::Type::LIST),
-      std::move(dst_components), std::move(restrictions)));
+      /*dst_urls=*/base::Value::List(), std::move(dst_components),
+      std::move(restrictions)));
 
   UpdatePolicyPref(std::move(rules));
   histogram_tester_.ExpectBucketCount("Enterprise.Dlp.RestrictionConfigured",
@@ -148,22 +146,21 @@
 }
 
 TEST_F(DlpRulesManagerImplTest, UnknownLevel) {
-  base::Value rules(base::Value::Type::LIST);
+  base::Value::List rules;
 
-  base::Value src_urls(base::Value::Type::LIST);
+  base::Value::List src_urls;
   src_urls.Append(kExampleUrl);
 
-  base::Value dst_urls(base::Value::Type::LIST);
+  base::Value::List dst_urls;
   dst_urls.Append(kWildCardMatching);
 
-  base::Value restrictions(base::Value::Type::LIST);
+  base::Value::List restrictions;
   restrictions.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, "Wrong level"));
 
   rules.Append(dlp_test_util::CreateRule(
       "rule #1", "Unknown", std::move(src_urls), std::move(dst_urls),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions)));
 
   UpdatePolicyPref(std::move(rules));
   histogram_tester_.ExpectBucketCount("Enterprise.Dlp.RestrictionConfigured",
@@ -172,16 +169,16 @@
 }
 
 TEST_F(DlpRulesManagerImplTest, BlockPriority) {
-  base::Value rules(base::Value::Type::LIST);
+  base::Value::List rules;
 
   // First Rule
-  base::Value src_urls_1(base::Value::Type::LIST);
+  base::Value::List src_urls_1;
   src_urls_1.Append(kExampleUrl);
 
-  base::Value dst_urls_1(base::Value::Type::LIST);
+  base::Value::List dst_urls_1;
   dst_urls_1.Append(kWildCardMatching);
 
-  base::Value restrictions_1(base::Value::Type::LIST);
+  base::Value::List restrictions_1;
   restrictions_1.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kBlockLevel));
   restrictions_1.Append(dlp_test_util::CreateRestrictionWithLevel(
@@ -189,25 +186,23 @@
 
   rules.Append(dlp_test_util::CreateRule(
       "rule #1", "Block", std::move(src_urls_1), std::move(dst_urls_1),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions_1)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions_1)));
 
   // Second Rule
-  base::Value src_urls_2(base::Value::Type::LIST);
+  base::Value::List src_urls_2;
   src_urls_2.Append(kExampleUrl);
 
-  base::Value dst_urls_2(base::Value::Type::LIST);
+  base::Value::List dst_urls_2;
   dst_urls_2.Append(kGoogleUrl);
 
-  base::Value restrictions_2(base::Value::Type::LIST);
+  base::Value::List restrictions_2;
   restrictions_2.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kAllowLevel));
 
   rules.Append(dlp_test_util::CreateRule(
       "rule #2", "exceptional allow", std::move(src_urls_2),
       std::move(dst_urls_2),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions_2)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions_2)));
   UpdatePolicyPref(std::move(rules));
 
   std::string src_pattern;
@@ -249,7 +244,7 @@
                                       1);
 
   // Clear pref
-  UpdatePolicyPref(base::Value(base::Value::Type::LIST));
+  UpdatePolicyPref(base::Value::List());
 
   src_pattern.clear();
   dst_pattern.clear();
@@ -280,20 +275,19 @@
 
 TEST_F(DlpRulesManagerImplTest, UpdatePref) {
   // First DLP rule
-  base::Value rules_1(base::Value::Type::LIST);
+  base::Value::List rules_1;
 
-  base::Value src_urls_1(base::Value::Type::LIST);
+  base::Value::List src_urls_1;
   src_urls_1.Append(kExampleUrl);
 
-  base::Value restrictions_1(base::Value::Type::LIST);
+  base::Value::List restrictions_1;
   restrictions_1.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kScreenshotRestriction, dlp::kBlockLevel));
 
   rules_1.Append(dlp_test_util::CreateRule(
       "rule #1", "Block", std::move(src_urls_1),
-      /*dst_urls=*/base::Value(base::Value::Type::LIST),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions_1)));
+      /*dst_urls=*/base::Value::List(),
+      /*dst_components=*/base::Value::List(), std::move(restrictions_1)));
   UpdatePolicyPref(std::move(rules_1));
 
   EXPECT_EQ(DlpRulesManager::Level::kBlock,
@@ -301,20 +295,19 @@
                 GURL(kExampleUrl), DlpRulesManager::Restriction::kScreenshot));
 
   // Second DLP rule
-  base::Value rules_2(base::Value::Type::LIST);
+  base::Value::List rules_2;
 
-  base::Value src_urls_2(base::Value::Type::LIST);
+  base::Value::List src_urls_2;
   src_urls_2.Append(kGoogleUrl);
 
-  base::Value restrictions_2(base::Value::Type::LIST);
+  base::Value::List restrictions_2;
   restrictions_2.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kScreenshotRestriction, dlp::kBlockLevel));
 
   rules_2.Append(dlp_test_util::CreateRule(
       "rule #2", "exceptional allow", std::move(src_urls_2),
-      /*dst_urls=*/base::Value(base::Value::Type::LIST),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions_2)));
+      /*dst_urls=*/base::Value::List(),
+      /*dst_components=*/base::Value::List(), std::move(restrictions_2)));
   UpdatePolicyPref(std::move(rules_2));
 
   EXPECT_EQ(DlpRulesManager::Level::kAllow,
@@ -326,22 +319,22 @@
 }
 
 TEST_F(DlpRulesManagerImplTest, IsRestrictedComponent_Clipboard) {
-  base::Value rules(base::Value::Type::LIST);
+  base::Value::List rules;
 
-  base::Value src_urls(base::Value::Type::LIST);
+  base::Value::List src_urls;
   src_urls.Append(kExampleUrl);
 
-  base::Value dst_components(base::Value::Type::LIST);
+  base::Value::List dst_components;
   dst_components.Append("ARC");
 
-  base::Value restrictions(base::Value::Type::LIST);
+  base::Value::List restrictions;
   restrictions.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kBlockLevel));
 
   rules.Append(dlp_test_util::CreateRule(
       "rule #1", "Block", std::move(src_urls),
-      /*dst_urls=*/base::Value(base::Value::Type::LIST),
-      std::move(dst_components), std::move(restrictions)));
+      /*dst_urls=*/base::Value::List(), std::move(dst_components),
+      std::move(restrictions)));
   UpdatePolicyPref(std::move(rules));
 
   std::string src_pattern;
@@ -361,18 +354,17 @@
 }
 
 TEST_F(DlpRulesManagerImplTest, SameSrcDst_Clipboard) {
-  base::Value rules(base::Value::Type::LIST);
-  base::Value src_urls(base::Value::Type::LIST);
+  base::Value::List rules;
+  base::Value::List src_urls;
   src_urls.Append(kExampleUrl);
-  base::Value dst_urls(base::Value::Type::LIST);
+  base::Value::List dst_urls;
   dst_urls.Append(kWildCardMatching);
-  base::Value restrictions(base::Value::Type::LIST);
+  base::Value::List restrictions;
   restrictions.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kBlockLevel));
   rules.Append(dlp_test_util::CreateRule(
       "rule #1", "Block", std::move(src_urls), std::move(dst_urls),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions)));
 
   UpdatePolicyPref(std::move(rules));
 
@@ -388,34 +380,32 @@
 }
 
 TEST_F(DlpRulesManagerImplTest, EmptyUrl_Clipboard) {
-  base::Value rules(base::Value::Type::LIST);
-  base::Value src_urls(base::Value::Type::LIST);
+  base::Value::List rules;
+  base::Value::List src_urls;
   src_urls.Append(kExampleUrl);
-  base::Value dst_urls(base::Value::Type::LIST);
+  base::Value::List dst_urls;
   dst_urls.Append(kWildCardMatching);
-  base::Value restrictions(base::Value::Type::LIST);
+  base::Value::List restrictions;
   restrictions.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kBlockLevel));
   rules.Append(dlp_test_util::CreateRule(
       "rule #1", "Block", std::move(src_urls), std::move(dst_urls),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions)));
 
   // Second Rule
-  base::Value src_urls_2(base::Value::Type::LIST);
+  base::Value::List src_urls_2;
   src_urls_2.Append(kGmailUrl);
 
-  base::Value dst_urls_2(base::Value::Type::LIST);
+  base::Value::List dst_urls_2;
   dst_urls_2.Append(kGoogleUrl);
 
-  base::Value restrictions_2(base::Value::Type::LIST);
+  base::Value::List restrictions_2;
   restrictions_2.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kBlockLevel));
 
   rules.Append(dlp_test_util::CreateRule(
       "rule #2", "Block", std::move(src_urls_2), std::move(dst_urls_2),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions_2)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions_2)));
 
   UpdatePolicyPref(std::move(rules));
 
@@ -441,32 +431,31 @@
 }
 
 TEST_F(DlpRulesManagerImplTest, IsRestricted_MultipleURLs) {
-  base::Value rules(base::Value::Type::LIST);
+  base::Value::List rules;
 
-  base::Value src_urls_1(base::Value::Type::LIST);
+  base::Value::List src_urls_1;
   src_urls_1.Append(kChatPattern);
   src_urls_1.Append(kSalesforcePattern);
   src_urls_1.Append(kDocsPattern);
   src_urls_1.Append(kDrivePattern);
   src_urls_1.Append(kCompanyPattern);
 
-  base::Value dst_urls_1 = src_urls_1.Clone();
-  base::Value src_urls_2 = src_urls_1.Clone();
+  base::Value::List dst_urls_1 = src_urls_1.Clone();
+  base::Value::List src_urls_2 = src_urls_1.Clone();
 
-  base::Value restrictions_1(base::Value::Type::LIST);
+  base::Value::List restrictions_1;
   restrictions_1.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kAllowLevel));
 
   rules.Append(dlp_test_util::CreateRule(
       "Support agent work flows", "Allow copy and paste for work purposes",
       std::move(src_urls_1), std::move(dst_urls_1),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions_1)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions_1)));
 
-  base::Value dst_urls_2(base::Value::Type::LIST);
+  base::Value::List dst_urls_2;
   dst_urls_2.Append(kWildCardMatching);
 
-  base::Value restrictions_2(base::Value::Type::LIST);
+  base::Value::List restrictions_2;
   restrictions_2.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kBlockLevel));
 
@@ -474,8 +463,7 @@
       "Block non-agent work flows",
       "Disallow copy and paste for non-work purposes", std::move(src_urls_2),
       std::move(dst_urls_2),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions_2)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions_2)));
 
   UpdatePolicyPref(std::move(rules));
 
@@ -565,20 +553,19 @@
 }
 
 TEST_F(DlpRulesManagerImplTest, DisabledByFeature) {
-  base::Value rules_1(base::Value::Type::LIST);
-  base::Value src_urls_1(base::Value::Type::LIST);
+  base::Value::List rules_1;
+  base::Value::List src_urls_1;
   src_urls_1.Append(kExampleUrl);
-  base::Value dst_urls_1(base::Value::Type::LIST);
+  base::Value::List dst_urls_1;
   dst_urls_1.Append(kWildCardMatching);
-  base::Value restrictions_1(base::Value::Type::LIST);
+  base::Value::List restrictions_1;
   restrictions_1.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kBlockLevel));
   restrictions_1.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kScreenshotRestriction, dlp::kBlockLevel));
   rules_1.Append(dlp_test_util::CreateRule(
       "rule #1", "Block", std::move(src_urls_1), std::move(dst_urls_1),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions_1)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions_1)));
 
   UpdatePolicyPref(std::move(rules_1));
 
@@ -601,18 +588,17 @@
   scoped_feature_list.InitAndDisableFeature(
       features::kDataLeakPreventionPolicy);
 
-  base::Value rules_2(base::Value::Type::LIST);
-  base::Value src_urls_2(base::Value::Type::LIST);
+  base::Value::List rules_2;
+  base::Value::List src_urls_2;
   src_urls_2.Append(kExampleUrl);
-  base::Value dst_urls_2(base::Value::Type::LIST);
+  base::Value::List dst_urls_2;
   dst_urls_2.Append(kWildCardMatching);
-  base::Value restrictions_2(base::Value::Type::LIST);
+  base::Value::List restrictions_2;
   restrictions_2.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kBlockLevel));
   rules_2.Append(dlp_test_util::CreateRule(
       "rule #1", "Block", std::move(src_urls_2), std::move(dst_urls_2),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions_2)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions_2)));
 
   UpdatePolicyPref(std::move(rules_2));
 
@@ -628,57 +614,54 @@
 }
 
 TEST_F(DlpRulesManagerImplTest, WarnPriority) {
-  base::Value rules(base::Value::Type::LIST);
+  base::Value::List rules;
 
   // First Rule
-  base::Value src_urls_1(base::Value::Type::LIST);
+  base::Value::List src_urls_1;
   src_urls_1.Append(kGooglePattern);
 
-  base::Value dst_urls_1(base::Value::Type::LIST);
+  base::Value::List dst_urls_1;
   dst_urls_1.Append(kWildCardMatching);
 
-  base::Value restrictions_1(base::Value::Type::LIST);
+  base::Value::List restrictions_1;
   restrictions_1.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kWarnLevel));
 
   rules.Append(dlp_test_util::CreateRule(
       "rule #1", "Warn on every copy from google.com", std::move(src_urls_1),
       std::move(dst_urls_1),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions_1)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions_1)));
 
   // Second Rule
-  base::Value src_urls_2(base::Value::Type::LIST);
+  base::Value::List src_urls_2;
   src_urls_2.Append(kDocsPattern);
   src_urls_2.Append(kDrivePattern);
   src_urls_2.Append(kMailPattern);
-  base::Value src_urls_3 = src_urls_2.Clone();
+  base::Value::List src_urls_3 = src_urls_2.Clone();
 
-  base::Value dst_urls_2(base::Value::Type::LIST);
+  base::Value::List dst_urls_2;
   dst_urls_2.Append(kWildCardMatching);
 
-  base::Value restrictions_2(base::Value::Type::LIST);
+  base::Value::List restrictions_2;
   restrictions_2.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kBlockLevel));
 
   rules.Append(dlp_test_util::CreateRule(
       "rule #2", "Block copy/paste from docs, drive, gmail",
       std::move(src_urls_2), std::move(dst_urls_2),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions_2)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions_2)));
 
   // Third Rule
-  base::Value dst_urls_3 = src_urls_3.Clone();
+  base::Value::List dst_urls_3 = src_urls_3.Clone();
 
-  base::Value restrictions_3(base::Value::Type::LIST);
+  base::Value::List restrictions_3;
   restrictions_3.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kAllowLevel));
 
   rules.Append(dlp_test_util::CreateRule(
       "rule #3", "Allow copy/paste inside docs, drive, gmail",
       std::move(src_urls_3), std::move(dst_urls_3),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions_3)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions_3)));
 
   UpdatePolicyPref(std::move(rules));
 
@@ -730,22 +713,21 @@
                    ->GetTestInterface()
                    ->GetSetDlpFilesPolicyCount());
 
-  base::Value rules(base::Value::Type::LIST);
+  base::Value::List rules;
 
-  base::Value src_urls(base::Value::Type::LIST);
+  base::Value::List src_urls;
   src_urls.Append(kExampleUrl);
 
-  base::Value dst_urls(base::Value::Type::LIST);
+  base::Value::List dst_urls;
   dst_urls.Append(kExampleUrl);
 
-  base::Value restrictions(base::Value::Type::LIST);
+  base::Value::List restrictions;
   restrictions.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kFilesRestriction, dlp::kBlockLevel));
 
   rules.Append(dlp_test_util::CreateRule(
       "rule #1", "Block Files", std::move(src_urls), std::move(dst_urls),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions)));
   UpdatePolicyPref(std::move(rules));
 
   EXPECT_EQ(1, chromeos::DlpClient::Get()
@@ -775,22 +757,21 @@
                    ->GetTestInterface()
                    ->GetSetDlpFilesPolicyCount());
 
-  base::Value rules(base::Value::Type::LIST);
+  base::Value::List rules;
 
-  base::Value src_urls(base::Value::Type::LIST);
+  base::Value::List src_urls;
   src_urls.Append(kExampleUrl);
 
-  base::Value dst_urls(base::Value::Type::LIST);
+  base::Value::List dst_urls;
   dst_urls.Append(kExampleUrl);
 
-  base::Value restrictions(base::Value::Type::LIST);
+  base::Value::List restrictions;
   restrictions.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kFilesRestriction, dlp::kBlockLevel));
 
   rules.Append(dlp_test_util::CreateRule(
       "rule #1", "Block Files", std::move(src_urls), std::move(dst_urls),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions)));
   UpdatePolicyPref(std::move(rules));
 
   EXPECT_EQ(0, chromeos::DlpClient::Get()
@@ -801,38 +782,36 @@
 }
 
 TEST_F(DlpRulesManagerImplTest, GetSourceUrlPattern) {
-  base::Value rules(base::Value::Type::LIST);
+  base::Value::List rules;
 
-  base::Value src_urls_1(base::Value::Type::LIST);
+  base::Value::List src_urls_1;
   src_urls_1.Append(kChatPattern);
   src_urls_1.Append(kSalesforcePattern);
   src_urls_1.Append(kDocsPattern);
   src_urls_1.Append(kDrivePattern);
   src_urls_1.Append(kCompanyPattern);
 
-  base::Value restrictions_1(base::Value::Type::LIST);
+  base::Value::List restrictions_1;
   restrictions_1.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kScreenshotRestriction, dlp::kBlockLevel));
 
   rules.Append(dlp_test_util::CreateRule(
       "Block screenshots", "Block screenshots of work urls",
       std::move(src_urls_1),
-      /*dst_urls=*/base::Value(base::Value::Type::LIST),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions_1)));
+      /*dst_urls=*/base::Value::List(),
+      /*dst_components=*/base::Value::List(), std::move(restrictions_1)));
 
-  base::Value src_urls_2(base::Value::Type::LIST);
+  base::Value::List src_urls_2;
   src_urls_2.Append(kWildCardMatching);
 
-  base::Value restrictions_2(base::Value::Type::LIST);
+  base::Value::List restrictions_2;
   restrictions_2.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kPrintingRestriction, dlp::kBlockLevel));
 
   rules.Append(dlp_test_util::CreateRule(
       "Block any printing", "Block printing any docs", std::move(src_urls_2),
-      /*dst_urls=*/base::Value(base::Value::Type::LIST),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions_2)));
+      /*dst_urls=*/base::Value::List(),
+      /*dst_components=*/base::Value::List(), std::move(restrictions_2)));
 
   UpdatePolicyPref(std::move(rules));
 
@@ -870,49 +849,46 @@
 }
 
 TEST_F(DlpRulesManagerImplTest, ReportPriority) {
-  base::Value rules(base::Value::Type::LIST);
+  base::Value::List rules;
 
-  base::Value src_urls_1(base::Value::Type::LIST);
+  base::Value::List src_urls_1;
   src_urls_1.Append(kWildCardMatching);
 
-  base::Value restrictions_1(base::Value::Type::LIST);
+  base::Value::List restrictions_1;
   restrictions_1.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kScreenShareRestriction, dlp::kReportLevel));
 
   rules.Append(dlp_test_util::CreateRule(
       "Report screensharing", "Report any screensharing", std::move(src_urls_1),
-      /*dst_urls=*/base::Value(base::Value::Type::LIST),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions_1)));
+      /*dst_urls=*/base::Value::List(),
+      /*dst_components=*/base::Value::List(), std::move(restrictions_1)));
 
-  base::Value src_urls_2(base::Value::Type::LIST);
+  base::Value::List src_urls_2;
   src_urls_2.Append(kDrivePattern);
   src_urls_2.Append(kDocsPattern);
 
-  base::Value restrictions_2(base::Value::Type::LIST);
+  base::Value::List restrictions_2;
   restrictions_2.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kScreenShareRestriction, dlp::kBlockLevel));
 
   rules.Append(dlp_test_util::CreateRule(
       "Block screensharing", "Block screensharing of company urls",
       std::move(src_urls_2),
-      /*dst_urls=*/base::Value(base::Value::Type::LIST),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions_2)));
+      /*dst_urls=*/base::Value::List(),
+      /*dst_components=*/base::Value::List(), std::move(restrictions_2)));
 
-  base::Value src_urls_3(base::Value::Type::LIST);
+  base::Value::List src_urls_3;
   src_urls_3.Append(kChatPattern);
 
-  base::Value restrictions_3(base::Value::Type::LIST);
+  base::Value::List restrictions_3;
   restrictions_3.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kScreenShareRestriction, dlp::kAllowLevel));
 
   rules.Append(dlp_test_util::CreateRule(
       "Allow screensharing", "Allow screensharing for chat urls",
       std::move(src_urls_3),
-      /*dst_urls=*/base::Value(base::Value::Type::LIST),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions_3)));
+      /*dst_urls=*/base::Value::List(),
+      /*dst_components=*/base::Value::List(), std::move(restrictions_3)));
 
   UpdatePolicyPref(std::move(rules));
 
@@ -958,36 +934,34 @@
       features::kDataLeakPreventionFilesRestriction);
   chromeos::DlpClient::InitializeFake();
 
-  base::Value rules(base::Value::Type::LIST);
+  base::Value::List rules;
 
-  base::Value src_urls1(base::Value::Type::LIST);
+  base::Value::List src_urls1;
   src_urls1.Append(kExampleUrl);
-  base::Value dst_urls1(base::Value::Type::LIST);
+  base::Value::List dst_urls1;
   // Duplicates should be ignored.
   dst_urls1.Append(kGoogleUrl);
   dst_urls1.Append(kGoogleUrl);
   dst_urls1.Append(kCompanyUrl);
   dst_urls1.Append(kGmailUrl);
-  base::Value restrictions1(base::Value::Type::LIST);
+  base::Value::List restrictions1;
   restrictions1.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kFilesRestriction, dlp::kBlockLevel));
   rules.Append(dlp_test_util::CreateRule(
       "rule #1", "Block Files", std::move(src_urls1), std::move(dst_urls1),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions1)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions1)));
 
-  base::Value src_urls2(base::Value::Type::LIST);
+  base::Value::List src_urls2;
   src_urls2.Append(kExampleUrl);
-  base::Value dst_urls2(base::Value::Type::LIST);
+  base::Value::List dst_urls2;
   dst_urls2.Append(kGmailUrl);
-  base::Value restrictions2(base::Value::Type::LIST);
+  base::Value::List restrictions2;
   restrictions2.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kFilesRestriction, dlp::kAllowLevel));
   rules.Append(dlp_test_util::CreateRule(
       "rule #2", "Explicit Allow Files", std::move(src_urls2),
       std::move(dst_urls2),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions2)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions2)));
 
   UpdatePolicyPref(std::move(rules));
 
@@ -1013,22 +987,21 @@
       features::kDataLeakPreventionFilesRestriction);
   chromeos::DlpClient::InitializeFake();
 
-  base::Value rules(base::Value::Type::LIST);
+  base::Value::List rules;
 
-  base::Value src_urls1(base::Value::Type::LIST);
+  base::Value::List src_urls1;
   src_urls1.Append(kExampleUrl);
-  base::Value dst_urls1(base::Value::Type::LIST);
+  base::Value::List dst_urls1;
   dst_urls1.Append(kWildCardMatching);
   // Since there is a wildcard, all specific destinations will be ignored.
   dst_urls1.Append(kCompanyUrl);
-  base::Value restrictions1(base::Value::Type::LIST);
+  base::Value::List restrictions1;
   restrictions1.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kFilesRestriction, dlp::kBlockLevel));
   rules.Append(dlp_test_util::CreateRule(
       "rule #1", "Block Files for all destinations", std::move(src_urls1),
       std::move(dst_urls1),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions1)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions1)));
 
   UpdatePolicyPref(std::move(rules));
 
@@ -1046,45 +1019,42 @@
 }
 
 TEST_F(DlpRulesManagerImplTest, GetAggregatedDestinations_MixedLevels) {
-  base::Value rules(base::Value::Type::LIST);
+  base::Value::List rules;
 
-  base::Value src_urls1(base::Value::Type::LIST);
+  base::Value::List src_urls1;
   src_urls1.Append(kExampleUrl);
-  base::Value dst_urls1(base::Value::Type::LIST);
+  base::Value::List dst_urls1;
   dst_urls1.Append(kCompanyUrl);
-  base::Value restrictions1(base::Value::Type::LIST);
+  base::Value::List restrictions1;
   restrictions1.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kBlockLevel));
   rules.Append(dlp_test_util::CreateRule(
       "rule #1", "Block Clipboard", std::move(src_urls1), std::move(dst_urls1),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions1)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions1)));
 
-  base::Value src_urls2(base::Value::Type::LIST);
+  base::Value::List src_urls2;
   src_urls2.Append(kExampleUrl);
-  base::Value dst_urls2(base::Value::Type::LIST);
+  base::Value::List dst_urls2;
   // Ignored because of a block restriction for the same destination.
   dst_urls2.Append(kCompanyUrl);
   dst_urls2.Append(kGmailUrl);
-  base::Value restrictions2(base::Value::Type::LIST);
+  base::Value::List restrictions2;
   restrictions2.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kWarnLevel));
   rules.Append(dlp_test_util::CreateRule(
       "rule #2", "Warn Clipboard", std::move(src_urls2), std::move(dst_urls2),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions2)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions2)));
 
-  base::Value src_urls3(base::Value::Type::LIST);
+  base::Value::List src_urls3;
   src_urls3.Append(kExampleUrl);
-  base::Value dst_urls3(base::Value::Type::LIST);
+  base::Value::List dst_urls3;
   dst_urls3.Append(kGoogleUrl);
-  base::Value restrictions3(base::Value::Type::LIST);
+  base::Value::List restrictions3;
   restrictions3.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kReportLevel));
   rules.Append(dlp_test_util::CreateRule(
       "rule #2", "Report Clipboard", std::move(src_urls3), std::move(dst_urls3),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions3)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions3)));
 
   UpdatePolicyPref(std::move(rules));
 
@@ -1099,45 +1069,42 @@
 }
 
 TEST_F(DlpRulesManagerImplTest, GetAggregatedDestinations_MixedWithWildcard) {
-  base::Value rules(base::Value::Type::LIST);
+  base::Value::List rules;
 
-  base::Value src_urls1(base::Value::Type::LIST);
+  base::Value::List src_urls1;
   src_urls1.Append(kExampleUrl);
-  base::Value dst_urls1(base::Value::Type::LIST);
+  base::Value::List dst_urls1;
   dst_urls1.Append(kCompanyUrl);
-  base::Value restrictions1(base::Value::Type::LIST);
+  base::Value::List restrictions1;
   restrictions1.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kBlockLevel));
   rules.Append(dlp_test_util::CreateRule(
       "rule #1", "Block Clipboard", std::move(src_urls1), std::move(dst_urls1),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions1)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions1)));
 
-  base::Value src_urls2(base::Value::Type::LIST);
+  base::Value::List src_urls2;
   src_urls2.Append(kExampleUrl);
-  base::Value dst_urls2(base::Value::Type::LIST);
+  base::Value::List dst_urls2;
   dst_urls2.Append(kWildCardMatching);
-  base::Value restrictions2(base::Value::Type::LIST);
+  base::Value::List restrictions2;
   restrictions2.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kWarnLevel));
   rules.Append(dlp_test_util::CreateRule(
       "rule #2", "Warn Clipboard", std::move(src_urls2), std::move(dst_urls2),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions2)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions2)));
 
-  base::Value src_urls3(base::Value::Type::LIST);
+  base::Value::List src_urls3;
   src_urls3.Append(kExampleUrl);
-  base::Value dst_urls3(base::Value::Type::LIST);
+  base::Value::List dst_urls3;
   // Ignored because of "*" at warn level.
   dst_urls3.Append(kGoogleUrl);
   dst_urls3.Append(kWildCardMatching);
-  base::Value restrictions3(base::Value::Type::LIST);
+  base::Value::List restrictions3;
   restrictions3.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kClipboardRestriction, dlp::kReportLevel));
   rules.Append(dlp_test_util::CreateRule(
       "rule #2", "Report Clipboard", std::move(src_urls3), std::move(dst_urls3),
-      /*dst_components=*/base::Value(base::Value::Type::LIST),
-      std::move(restrictions3)));
+      /*dst_components=*/base::Value::List(), std::move(restrictions3)));
 
   UpdatePolicyPref(std::move(rules));
 
@@ -1168,20 +1135,20 @@
       features::kDataLeakPreventionFilesRestriction);
   chromeos::DlpClient::InitializeFake();
 
-  base::Value rules(base::Value::Type::LIST);
+  base::Value::List rules;
 
-  base::Value src_urls(base::Value::Type::LIST);
+  base::Value::List src_urls;
   src_urls.Append(kExampleUrl);
-  base::Value dst_components(base::Value::Type::LIST);
+  base::Value::List dst_components;
   dst_components.Append("ARC");
   dst_components.Append("CROSTINI");
-  base::Value restrictions(base::Value::Type::LIST);
+  base::Value::List restrictions;
   restrictions.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kFilesRestriction, dlp::kBlockLevel));
   rules.Append(dlp_test_util::CreateRule(
       "rule #1", "Block Files", std::move(src_urls),
-      /*dst_urls=*/base::Value(base::Value::Type::LIST),
-      std::move(dst_components), std::move(restrictions)));
+      /*dst_urls=*/base::Value::List(), std::move(dst_components),
+      std::move(restrictions)));
 
   UpdatePolicyPref(std::move(rules));
 
@@ -1216,14 +1183,14 @@
       features::kDataLeakPreventionFilesRestriction);
   chromeos::DlpClient::InitializeFake();
 
-  base::Value rules(base::Value::Type::LIST);
+  base::Value::List rules;
 
-  base::Value src_urls(base::Value::Type::LIST);
+  base::Value::List src_urls;
   src_urls.Append(kExampleUrl);
-  base::Value dst_components(base::Value::Type::LIST);
+  base::Value::List dst_components;
   dst_components.Append("ARC");
   dst_components.Append("CROSTINI");
-  base::Value restrictions(base::Value::Type::LIST);
+  base::Value::List restrictions;
   restrictions.Append(dlp_test_util::CreateRestrictionWithLevel(
       dlp::kFilesRestriction, dlp::kBlockLevel));
   rules.Append(dlp_test_util::CreateRule(

chrome/browser/chromeos/policy/dlp/dlp_rules_manager_test_utils.cc

diff --git a/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_test_utils.cc b/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_test_utils.cc
index 46c7b4d..0464b064 100644
--- a/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_test_utils.cc
+++ b/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_test_utils.cc
@@ -26,49 +26,46 @@
 
 }  // namespace
 
-base::Value CreateSources(base::Value urls) {
-  base::Value srcs(base::Value::Type::DICTIONARY);
-  srcs.SetKey(kUrls, std::move(urls));
+base::Value::Dict CreateSources(base::Value::List urls) {
+  base::Value::Dict srcs;
+  srcs.Set(kUrls, std::move(urls));
   return srcs;
 }
 
-base::Value CreateDestinations(absl::optional<base::Value> urls,
-                               absl::optional<base::Value> components) {
-  base::Value dsts(base::Value::Type::DICTIONARY);
+base::Value::Dict CreateDestinations(
+    absl::optional<base::Value::List> urls,
+    absl::optional<base::Value::List> components) {
+  base::Value::Dict dsts;
   if (urls.has_value()) {
-    DCHECK(urls->is_list());
-    dsts.SetKey(kUrls, std::move(urls.value()));
+    dsts.Set(kUrls, std::move(urls.value()));
   }
   if (components.has_value()) {
-    DCHECK(components->is_list());
-    dsts.SetKey(kComponents, std::move(components.value()));
+    dsts.Set(kComponents, std::move(components.value()));
   }
   return dsts;
 }
 
-base::Value CreateRestrictionWithLevel(const std::string& restriction,
-                                       const std::string& level) {
-  base::Value dict(base::Value::Type::DICTIONARY);
-  dict.SetStringKey(kClass, restriction);
-  dict.SetStringKey(kLevel, level);
+base::Value::Dict CreateRestrictionWithLevel(const std::string& restriction,
+                                             const std::string& level) {
+  base::Value::Dict dict;
+  dict.Set(kClass, restriction);
+  dict.Set(kLevel, level);
   return dict;
 }
 
-base::Value CreateRule(const std::string& name,
-                       const std::string& desc,
-                       base::Value src_urls,
-                       absl::optional<base::Value> dst_urls,
-                       absl::optional<base::Value> dst_components,
-                       base::Value restrictions) {
-  base::Value rule(base::Value::Type::DICTIONARY);
-  rule.SetStringKey(kName, name);
-  rule.SetStringKey(kDescription, desc);
-  DCHECK(src_urls.is_list());
-  rule.SetKey(kSources, CreateSources(std::move(src_urls)));
-  rule.SetKey(kDestinations, CreateDestinations(std::move(dst_urls),
-                                                std::move(dst_components)));
-  DCHECK(restrictions.is_list());
-  rule.SetKey(kRestrictions, std::move(restrictions));
+base::Value::Dict CreateRule(const std::string& name,
+                             const std::string& desc,
+                             base::Value::List src_urls,
+                             absl::optional<base::Value::List> dst_urls,
+                             absl::optional<base::Value::List> dst_components,
+                             base::Value::List restrictions) {
+  base::Value::Dict rule;
+  rule.Set(kName, name);
+  rule.Set(kDescription, desc);
+  rule.Set(kSources, CreateSources(std::move(src_urls)));
+  rule.Set(kDestinations,
+           CreateDestinations(std::move(dst_urls), std::move(dst_components)));
+  rule.Set(kRestrictions, std::move(restrictions));
   return rule;
 }
 

chrome/browser/chromeos/policy/dlp/dlp_rules_manager_test_utils.h

diff --git a/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_test_utils.h b/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_test_utils.h
index 3ea81fd..859aa0b 100644
--- a/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_test_utils.h
+++ b/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_test_utils.h
@@ -15,19 +15,21 @@
 // For testing purposes, the following functions are used for creating the value
 // object of DataLeakPreventionRulesList policy.
 
-base::Value CreateSources(base::Value urls);
+base::Value::Dict CreateSources(base::Value::List urls);
 
-base::Value CreateDestinations(base::Value urls, base::Value components);
+base::Value::Dict CreateDestinations(
+    absl::optional<base::Value::List> urls,
+    absl::optional<base::Value::List> components);
 
-base::Value CreateRestrictionWithLevel(const std::string& restriction,
-                                       const std::string& level);
+base::Value::Dict CreateRestrictionWithLevel(const std::string& restriction,
+                                             const std::string& level);
 
-base::Value CreateRule(const std::string& name,
-                       const std::string& desc,
-                       base::Value src_urls,
-                       absl::optional<base::Value> dst_urls,
-                       absl::optional<base::Value> dst_components,
-                       base::Value restrictions);
+base::Value::Dict CreateRule(const std::string& name,
+                             const std::string& desc,
+                             base::Value::List src_urls,
+                             absl::optional<base::Value::List> dst_urls,
+                             absl::optional<base::Value::List> dst_components,
+                             base::Value::List restrictions);
 
 }  // namespace dlp_test_util
 

chrome/browser/defaults.cc

diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc
index 6d5dbb2..9e71538 100644
--- a/chrome/browser/defaults.cc
+++ b/chrome/browser/defaults.cc
@@ -25,11 +25,11 @@
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 const bool kShowUpgradeMenuItem = false;
 const bool kShowImportOnBookmarkBar = false;
-const bool kAlwaysOpenIncognitoWindow = true;
+const bool kAlwaysOpenIncognitoBrowserIfStartedWithIncognitoSwitch = true;
 #else
 const bool kShowUpgradeMenuItem = true;
 const bool kShowImportOnBookmarkBar = true;
-const bool kAlwaysOpenIncognitoWindow = false;
+const bool kAlwaysOpenIncognitoBrowserIfStartedWithIncognitoSwitch = false;
 #endif
 
 #if BUILDFLAG(IS_CHROMEOS)

chrome/browser/defaults.h

diff --git a/chrome/browser/defaults.h b/chrome/browser/defaults.h
index b9b3829..0550ba7 100644
--- a/chrome/browser/defaults.h
+++ b/chrome/browser/defaults.h
@@ -25,8 +25,9 @@
 // bookmarks?
 extern const bool kShowImportOnBookmarkBar;
 
-// Should always open incognito windows when started with --incognito switch?
-extern const bool kAlwaysOpenIncognitoWindow;
+// If true, redefines `--incognito` switch to cause all browsers to be in
+// incognito mode rather than just the initial browser.
+extern const bool kAlwaysOpenIncognitoBrowserIfStartedWithIncognitoSwitch;
 
 // Indicates whether session restore should always create a new
 // tabbed browser. This is true every where except on ChromeOS

chrome/browser/download/download_frame_policy_browsertest.cc

diff --git a/chrome/browser/download/download_frame_policy_browsertest.cc b/chrome/browser/download/download_frame_policy_browsertest.cc
index df10cc6..1fd0010 100644
--- a/chrome/browser/download/download_frame_policy_browsertest.cc
+++ b/chrome/browser/download/download_frame_policy_browsertest.cc
@@ -658,7 +658,7 @@
       ExecJs(web_contents()->GetPrimaryMainFrame(),
              content::JsReplace("document.querySelector('iframe').src = $1",
                                 download_url)));
-  navigation_observer.WaitForNavigationFinished();
+  ASSERT_TRUE(navigation_observer.WaitForNavigationFinished());
   EXPECT_FALSE(navigation_observer.was_successful());
 
   GetHistogramTester()->ExpectBucketCount(
@@ -699,7 +699,7 @@
                                                      download_url);
   EXPECT_TRUE(ExecJs(GetSubframeRfh(),
                      content::JsReplace("top.location = $1", download_url)));
-  navigation_observer.WaitForNavigationFinished();
+  ASSERT_TRUE(navigation_observer.WaitForNavigationFinished());
   EXPECT_FALSE(navigation_observer.was_successful());
 
   GetHistogramTester()->ExpectBucketCount(

chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc

diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
index 96bc0415..8c27818 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
@@ -53,8 +53,6 @@
 namespace SetAssistiveWindowButtonHighlighted =
     extensions::api::input_ime::SetAssistiveWindowButtonHighlighted;
 namespace ClearComposition = extensions::api::input_ime::ClearComposition;
-namespace OnCompositionBoundsChanged =
-    extensions::api::input_method_private::OnCompositionBoundsChanged;
 namespace OnScreenProjectionChanged =
     extensions::api::input_method_private::OnScreenProjectionChanged;
 namespace FinishComposingText =
@@ -410,37 +408,6 @@
                              std::move(args));
   }
 
-  void OnCompositionBoundsChanged(
-      const std::vector<gfx::Rect>& bounds) override {
-    if (bounds.empty() || extension_id_.empty() ||
-        !HasListener(OnCompositionBoundsChanged::kEventName)) {
-      return;
-    }
-
-    // Note: this is a private API event.
-    base::Value::List bounds_list;
-    bounds_list.reserve(bounds.size());
-    for (const auto& bound : bounds) {
-      base::Value::Dict bounds_value;
-      bounds_value.Set("x", bound.x());
-      bounds_value.Set("y", bound.y());
-      bounds_value.Set("w", bound.width());
-      bounds_value.Set("h", bound.height());
-      bounds_list.Append(std::move(bounds_value));
-    }
-
-    base::Value::List args;
-
-    // The old extension code uses the first parameter to get the bounds of the
-    // first composition character, so for backward compatibility, add it here.
-    args.Append(bounds_list[0].Clone());
-    args.Append(std::move(bounds_list));
-
-    DispatchEventToExtension(
-        extensions::events::INPUT_METHOD_PRIVATE_ON_COMPOSITION_BOUNDS_CHANGED,
-        OnCompositionBoundsChanged::kEventName, std::move(args));
-  }
-
   void OnCaretBoundsChanged(const gfx::Rect& caret_bounds) override {
     if (extension_id_.empty() ||
         !HasListener(input_method_private::OnCaretBoundsChanged::kEventName)) {

chrome/browser/extensions/api/omnibox/omnibox_api_interactive_test.cc

diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api_interactive_test.cc b/chrome/browser/extensions/api/omnibox/omnibox_api_interactive_test.cc
index 5bee6781..6edac894 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api_interactive_test.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api_interactive_test.cc
@@ -26,7 +26,6 @@
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_result.h"
-#include "components/omnibox/browser/omnibox_controller_emitter.h"
 #include "components/omnibox/browser/omnibox_edit_model.h"
 #include "components/omnibox/browser/omnibox_view.h"
 #include "content/public/test/browser_test.h"

chrome/browser/extensions/api/tabs/tabs_api.cc

diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index e3ab61d..3137816 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -20,6 +20,7 @@
 #include "base/memory/raw_ptr.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_refptr.h"
+#include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/notreached.h"
 #include "base/strings/escape.h"
@@ -707,6 +708,13 @@
 
     if (create_data->focused)
       focused = *create_data->focused;
+
+    // Record the window height and width to determine if we
+    // can set a mininimum value for them (crbug.com/1369103).
+    UMA_HISTOGRAM_COUNTS_1000("Extensions.CreateWindowWidth",
+                              window_bounds.width());
+    UMA_HISTOGRAM_COUNTS_1000("Extensions.CreateWindowHeight",
+                              window_bounds.height());
   }
 
   // Create a new BrowserWindow if possible.

chrome/browser/extensions/extension_util.cc

diff --git a/chrome/browser/extensions/extension_util.cc b/chrome/browser/extensions/extension_util.cc
index d71cc367..f734e82 100644
--- a/chrome/browser/extensions/extension_util.cc
+++ b/chrome/browser/extensions/extension_util.cc
@@ -156,17 +156,6 @@
   }
 }
 
-bool CanLoadInIncognito(const Extension* extension,
-                        content::BrowserContext* context) {
-  CHECK(extension);
-  if (extension->is_hosted_app())
-    return true;
-  // Packaged apps and regular extensions need to be enabled specifically for
-  // incognito (and split mode should be set).
-  return IncognitoInfo::IsSplitMode(extension) &&
-         IsIncognitoEnabled(extension->id(), context);
-}
-
 bool AllowFileAccess(const std::string& extension_id,
                      content::BrowserContext* context) {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(

chrome/browser/extensions/extension_util.h

diff --git a/chrome/browser/extensions/extension_util.h b/chrome/browser/extensions/extension_util.h
index 29266ba..ff2167a 100644
--- a/chrome/browser/extensions/extension_util.h
+++ b/chrome/browser/extensions/extension_util.h
@@ -49,10 +49,6 @@
                            content::BrowserContext* context,
                            bool enabled);
 
-// Returns true if |extension| can be loaded in incognito.
-bool CanLoadInIncognito(const extensions::Extension* extension,
-                        content::BrowserContext* context);
-
 // Returns true if this extension can inject scripts into pages with file URLs.
 bool AllowFileAccess(const std::string& extension_id,
                      content::BrowserContext* context);

chrome/browser/extensions/installed_loader.cc

diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc
index f559c7f..9cbe4fc 100644
--- a/chrome/browser/extensions/installed_loader.cc
+++ b/chrome/browser/extensions/installed_loader.cc
@@ -16,6 +16,7 @@
 #include "base/threading/thread_restrictions.h"
 #include "base/trace_event/trace_event.h"
 #include "base/values.h"
+#include "build/chromeos_buildflags.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/corrupted_extension_reinstaller.h"
 #include "chrome/browser/extensions/extension_management.h"
@@ -53,6 +54,10 @@
 #include "extensions/common/permissions/permissions_data.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+#include "chrome/browser/ash/profiles/profile_helper.h"
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+
 using content::BrowserThread;
 
 namespace extensions {
@@ -408,20 +413,50 @@
   RecordExtensionsMetrics();
 }
 
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+// static
+bool InstalledLoader::ProfileCanUseNonComponentExtensions(
+    const Profile* profile,
+    ash::ProfileHelper* profile_helper) {
+  if (!profile || !profile_helper ||
+      !ash::ProfileHelper::IsUserProfile(profile)) {
+    return false;
+  }
+
+  const user_manager::User* user = profile_helper->GetUserByProfile(profile);
+  if (!user) {
+    return false;
+  }
+
+  // ChromeOS has special irregular profiles that must also be filtered
+  // out in addition to `ProfileHelper::IsUserProfile()`. `IsUserProfile()`
+  // includes guest and public users (which cannot use non-component
+  // extensions) so instead only look for those user types that can use them.
+  switch (user->GetType()) {
+    case user_manager::USER_TYPE_REGULAR:
+    case user_manager::USER_TYPE_CHILD:
+    case user_manager::USER_TYPE_ACTIVE_DIRECTORY:
+      return true;
+
+    case user_manager::USER_TYPE_GUEST:
+    case user_manager::USER_TYPE_PUBLIC_ACCOUNT:
+    case user_manager::USER_TYPE_KIOSK_APP:
+    case user_manager::USER_TYPE_ARC_KIOSK_APP:
+    case user_manager::USER_TYPE_WEB_KIOSK_APP:
+    case user_manager::NUM_USER_TYPES:
+      return false;
+  }
+}
+#else
 // static
 bool InstalledLoader::ProfileCanUseNonComponentExtensions(
     const Profile* profile) {
   if (!profile) {
     return false;
   }
-
-#if !BUILDFLAG(IS_CHROMEOS_ASH)
   return profile->IsRegularProfile();
-#else
-  // TODO(crbug.com/1383740): Expand to CrOS.
-  return false;
-#endif
 }
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
 // TODO(crbug.com/1163038): Separate out Webstore/Offstore metrics.
 void InstalledLoader::RecordExtensionsMetrics() {

chrome/browser/extensions/installed_loader.h

diff --git a/chrome/browser/extensions/installed_loader.h b/chrome/browser/extensions/installed_loader.h
index 032fd28..4989be2f 100644
--- a/chrome/browser/extensions/installed_loader.h
+++ b/chrome/browser/extensions/installed_loader.h
@@ -9,8 +9,14 @@
 
 #include "base/files/file_path.h"
 #include "base/memory/raw_ptr.h"
+#include "build/chromeos_buildflags.h"
 
 class Profile;
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+namespace ash {
+class ProfileHelper;
+}
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
 namespace extensions {
 
@@ -51,12 +57,22 @@
   // LoadAllExtensions().
   void RecordExtensionsMetricsForTesting();
 
-  // TODO(crbug.com/1383740): Expand to CrOS.
-  // TODO(crbug.com/1383740): Move to another file in
-  // //chrome/browser/extensions.
-  // Returns true for profiles that can use anything other than component
-  // extensions.
+// TODO(crbug.com/1383740): Move ProfileCanUseNonComponentExtensions to another
+// file in //chrome/browser/extensions.
+
+// Returns true for ChromeOS Ash profiles that can use anything other than
+// component extensions. It is required to provide a `profile_helper` otherwise
+// this will always be `false`.
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+  static bool ProfileCanUseNonComponentExtensions(
+      const Profile* profile,
+      ash::ProfileHelper* profile_helper);
+#else
+  // Returns true for (browser and Lacros) profiles that can use anything other
+  // than component extensions. Lacros uses multi-profiles like the browser
+  // (go/multi-something).
   static bool ProfileCanUseNonComponentExtensions(const Profile* profile);
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
  private:
   // Returns the flags that should be used with Extension::Create() for an

chrome/browser/extensions/installed_loader_unittest.cc

diff --git a/chrome/browser/extensions/installed_loader_unittest.cc b/chrome/browser/extensions/installed_loader_unittest.cc
index c8f38a4..d319e8c 100644
--- a/chrome/browser/extensions/installed_loader_unittest.cc
+++ b/chrome/browser/extensions/installed_loader_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/extensions/installed_loader.h"
 
 #include "base/test/metrics/histogram_tester.h"
+#include "build/chromeos_buildflags.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
 #include "chrome/browser/extensions/permissions_updater.h"
@@ -14,6 +15,18 @@
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/extension_features.h"
 
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+#include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
+#include "chrome/browser/ash/profiles/profile_helper.h"
+#include "components/account_id/account_id.h"
+#include "components/user_manager/scoped_user_manager.h"
+#include "components/user_manager/user.h"
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+using testing::NiceMock;
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+
 namespace extensions {
 
 namespace {
@@ -58,6 +71,41 @@
   RequestScope request_scope = RequestScope::kNone;
 };
 
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+class MockProfileHelper : public ash::ProfileHelper {
+ public:
+  MOCK_METHOD(const user_manager::User*,
+              GetUserByProfile,
+              (const Profile* profile),
+              (const, override));
+  MOCK_METHOD(user_manager::User*,
+              GetUserByProfile,
+              (Profile * profile),
+              (const, override));
+  MOCK_METHOD(base::FilePath, GetActiveUserProfileDir, (), ());
+  MOCK_METHOD(void, Initialize, (), ());
+  MOCK_METHOD(void, FlushProfile, (Profile * profile), ());
+  MOCK_METHOD(void,
+              SetProfileToUserMappingForTesting,
+              (user_manager::User * user),
+              ());
+  MOCK_METHOD(void,
+              SetUserToProfileMappingForTesting,
+              (const user_manager::User* user, Profile* profile),
+              ());
+  MOCK_METHOD(Profile*,
+              GetProfileByAccountId,
+              (const AccountId& account_id),
+              ());
+  MOCK_METHOD(Profile*, GetProfileByUser, (const user_manager::User* user), ());
+  MOCK_METHOD(void,
+              RemoveUserFromListForTesting,
+              (const AccountId& account_id),
+              ());
+};
+
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+
 }  // namespace
 
 class InstalledLoaderUnitTest : public ExtensionServiceTestBase {
@@ -78,6 +126,33 @@
                                 mojom::ManifestLocation location);
 
   void RunHostPermissionsMetricsTest(HostPermissionsMetricsTestParams params);
+
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+  // Set an expectation on the profile helper and expect a return from the
+  // `ProfileCanUseNonComponentExtensions` method.
+  void MockAndRunProfileCanUseNonComponentExtensionsTest(
+      const user_manager::User* fake_user,
+      bool expected_return);
+
+  ash::FakeChromeUserManager* user_manager() { return fake_user_manager_; }
+  NiceMock<MockProfileHelper>* profile_helper() { return &mock_profile_helper; }
+
+ protected:
+  const AccountId account_id_ =
+      AccountId::FromUserEmailGaiaId("test-user@testdomain.com", "1234567890");
+  NiceMock<MockProfileHelper> mock_profile_helper;
+
+ private:
+  // Setting up a fake user manager seems excessive for a unit test
+  // as opposed to mocking, but it seems you cannot create a
+  // `user_manager::User` without it (or a real impl).
+  ash::FakeChromeUserManager* fake_user_manager_ =
+      new ash::FakeChromeUserManager();
+  // Tears down the FakeUserManager singleton on destruction.
+  std::unique_ptr<user_manager::ScopedUserManager> scoped_user_manager_ =
+      std::make_unique<user_manager::ScopedUserManager>(
+          base::WrapUnique(fake_user_manager_));
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 };
 
 const Extension* InstalledLoaderUnitTest::AddExtension(
@@ -138,6 +213,22 @@
       break;
   }
 }
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+
+void InstalledLoaderUnitTest::MockAndRunProfileCanUseNonComponentExtensionsTest(
+    const user_manager::User* fake_user,
+    bool expected_return) {
+  ON_CALL(testing::Const(*profile_helper()),
+          GetUserByProfile(testing::An<const Profile*>()))
+      .WillByDefault(testing::Return(fake_user));
+
+  InstalledLoader loader(service());
+  // testing_profile() defaults to a regular profile.
+  EXPECT_EQ(expected_return, loader.ProfileCanUseNonComponentExtensions(
+                                 (testing_profile()), profile_helper()));
+  testing::Mock::VerifyAndClear(profile_helper());
+}
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
 TEST_F(InstalledLoaderUnitTest,
        RuntimeHostPermissions_Metrics_HasWithheldHosts_False) {
@@ -433,13 +524,95 @@
 #endif  // !BUILDFLAG(IS_CHROMEOS_ASH)
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
-// TODO(crbug.com/1383740): Expand to CrOS.
 TEST_F(InstalledLoaderUnitTest,
        ChromeOS_ProfileCanUseNonComponentExtensions_RegularProfile) {
-  InstalledLoader loader(service());
-  // testing_profile() defaults to a regular profile.
-  EXPECT_FALSE(loader.ProfileCanUseNonComponentExtensions(testing_profile()));
+  const user_manager::User* user = user_manager()->AddUser(account_id_);
+  ASSERT_TRUE(user);
+
+  MockAndRunProfileCanUseNonComponentExtensionsTest(user, true);
 }
+
+TEST_F(InstalledLoaderUnitTest,
+       ChromeOS_ProfileCanUseNonComponentExtensions_ChildProfile) {
+  const user_manager::User* user = user_manager()->AddChildUser(account_id_);
+  ASSERT_TRUE(user);
+
+  MockAndRunProfileCanUseNonComponentExtensionsTest(user, true);
+}
+
+TEST_F(InstalledLoaderUnitTest,
+       ChromeOS_ProfileCanUseNonComponentExtensions_ActiveDirectoryProfile) {
+  const AccountId account_id(AccountId::AdFromUserEmailObjGuid(
+      "activedirectory@gmail.com", "obj-guid"));
+  const user_manager::User* user =
+      user_manager()->AddActiveDirectoryUser(account_id);
+  ASSERT_TRUE(user);
+
+  MockAndRunProfileCanUseNonComponentExtensionsTest(user, true);
+}
+
+TEST_F(InstalledLoaderUnitTest,
+       ChromeOS_ProfileCannotUseNonComponentExtensions_GuestProfile) {
+  const user_manager::User* user = user_manager()->AddGuestUser();
+  ASSERT_TRUE(user);
+
+  MockAndRunProfileCanUseNonComponentExtensionsTest(user, false);
+}
+
+// TODO(crbug.com/1383740): Test a signin, lockscreen, or lockscreen app
+// profile. `FakeChromeUserManager` doesn't have one currently. Worst case can
+// mock `Profile` path.
+TEST_F(InstalledLoaderUnitTest,
+       ChromeOS_ProfileCannotUseNonComponentExtensions_NotUserProfile) {}
+
+TEST_F(InstalledLoaderUnitTest,
+       ChromeOS_ProfileCannotUseNonComponentExtensions_KioskAppProfile) {
+  const user_manager::User* user = user_manager()->AddKioskAppUser(account_id_);
+  ASSERT_TRUE(user);
+
+  MockAndRunProfileCanUseNonComponentExtensionsTest(user, false);
+}
+
+TEST_F(InstalledLoaderUnitTest,
+       ChromeOS_ProfileCannotUseNonComponentExtensions_WebKioskAppProfile) {
+  const user_manager::User* user =
+      user_manager()->AddWebKioskAppUser(account_id_);
+  ASSERT_TRUE(user);
+
+  MockAndRunProfileCanUseNonComponentExtensionsTest(user, false);
+}
+
+TEST_F(InstalledLoaderUnitTest,
+       ChromeOS_ProfileCannotUseNonComponentExtensions_ArcKioskAppProfile) {
+  const user_manager::User* user =
+      user_manager()->AddArcKioskAppUser(account_id_);
+  ASSERT_TRUE(user);
+
+  MockAndRunProfileCanUseNonComponentExtensionsTest(user, false);
+}
+
+TEST_F(InstalledLoaderUnitTest,
+       ChromeOS_ProfileCannotUseNonComponentExtensions_PublicProfile) {
+  const user_manager::User* user =
+      user_manager()->AddPublicAccountUser(account_id_);
+  ASSERT_TRUE(user);
+
+  MockAndRunProfileCanUseNonComponentExtensionsTest(user, false);
+}
+
+TEST_F(InstalledLoaderUnitTest,
+       ChromeOS_ProfileCannotUseNonComponentExtensions_NoUserInProfile) {
+  MockAndRunProfileCanUseNonComponentExtensionsTest(nullptr, false);
+}
+
+TEST_F(
+    InstalledLoaderUnitTest,
+    ChromeOS_ProfileCannotUseNonComponentExtensions_NoProfileHelperProvided) {
+  InstalledLoader loader(service());
+  EXPECT_FALSE(
+      loader.ProfileCanUseNonComponentExtensions(testing_profile(), nullptr));
+}
+
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
 }  // namespace extensions

chrome/browser/extensions/service_worker_apitest.cc

diff --git a/chrome/browser/extensions/service_worker_apitest.cc b/chrome/browser/extensions/service_worker_apitest.cc
index 9e326f8..f1a0b75 100644
--- a/chrome/browser/extensions/service_worker_apitest.cc
+++ b/chrome/browser/extensions/service_worker_apitest.cc
@@ -2796,8 +2796,7 @@
   const char* kDefaultCSP = GetParam() == ManifestVersion::kTwo
                                 ? "script-src 'self' blob: filesystem:; "
                                   "object-src 'self' blob: filesystem:;"
-                                : "script-src 'self'; "
-                                  "object-src 'self';";
+                                : "script-src 'self';";
   ExtensionTestMessageListener csp_modified_listener(kDefaultCSP);
   csp_modified_listener.set_extension_id(extension_id);
   ASSERT_TRUE(ui_test_utils::NavigateToURL(

chrome/browser/flag-metadata.json

diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index 07f9d7f..4385c717 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -1057,7 +1057,7 @@
       "kimjae",
       "xiaohuic"
     ],
-    "expiry_milestone": 110
+    "expiry_milestone": 120
   },
   {
     "name": "content-languages-in-language-picker",
@@ -4104,6 +4104,11 @@
     "expiry_milestone":120
   },
   {
+    "name": "ignore-csp-in-web-payment-api",
+    "owners": [ "rouslan", "chrome-payments-team@google.com" ],
+    "expiry_milestone": 115
+  },
+  {
     "name": "ignore-gpu-blocklist",
     "owners": [ "kbr", "zmo" ],
     // A debugging flag intended for end-users where there may not be any other
@@ -6999,11 +7004,6 @@
     "expiry_milestone": 114
   },
   {
-    "name": "web-payment-api-csp",
-    "owners": [ "rouslan", "web-payments-team@google.com" ],
-    "expiry_milestone": 115
-  },
-  {
     "name": "web-share",
     "owners": [ "mhochk@microsoft.com", "ericwilligers@google.com", "hatalat@microsoft.com" ],
     "expiry_milestone": 114
@@ -7014,11 +7014,6 @@
     "expiry_milestone": 113
   },
   {
-    "name": "webauthn-conditional-ui",
-    "owners": [ "chrome-webauthn@google.com" ],
-    "expiry_milestone": 110
-  },
-  {
     "name": "webauthn-new-desktop-ui",
     "owners": [
       "chrome-webauthn@google.com"

chrome/browser/flag_descriptions.cc

diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index cb0d363a7..a70e386 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -3169,11 +3169,11 @@
 const char kWebPaymentsExperimentalFeaturesDescription[] =
     "Enable experimental Web Payments API features";
 
-const char kWebPaymentAPICSPName[] = "CSP policy for Web Payment API";
-const char kWebPaymentAPICSPDescription[] =
-    "Enforce Content Security Policy connect-src directive for Web Payment API "
-    "when fetching manifest files, app icons, and service worker JavaScript "
-    "files.";
+const char kIgnoreCSPInWebPaymentAPIName[] = "Ignore CSP in Web Payment API";
+const char kIgnoreCSPInWebPaymentAPIDescription[] =
+    "Temporarily disable enforcing Content Security Policy connect-src "
+    "directive for Web Payment API when fetching manifest files, app icons, "
+    "and service worker JavaScript files.";
 
 const char kClearIdentityInCanMakePaymentEventName[] =
     "Remove identity from canmakepayment event";
@@ -3188,10 +3188,6 @@
     "requested using the Payment Request API. This flag removes the "
     "restriction that the TWA has to be installed from the app-store.";
 
-const char kWebAuthnConditionalUIName[] = "Web Authentication Conditional UI";
-const char kWebAuthnConditionalUIDescription[] =
-    "Enable support for Conditional UI WebAuthn requests.";
-
 const char kWebAuthnNewDesktopUIName[] = "Web Authentication new desktop UI";
 const char kWebAuthnNewDesktopUIDescription[] =
     "Enable updated UI dialog for WebAuthn requests.";
@@ -3400,12 +3396,6 @@
     " DisplayCompositor on Android. This feature is only available on "
     " android Q+ devices";
 
-const char kAssistantIntentPageUrlName[] =
-    "Include page URL in Assistant intent";
-const char kAssistantIntentPageUrlDescription[] =
-    "Include the current page's URL in the Assistant voice transcription "
-    "intent.";
-
 const char kAssistantIntentTranslateInfoName[] =
     "Translate info in Assistant intent";
 const char kAssistantIntentTranslateInfoDescription[] =

chrome/browser/flag_descriptions.h

diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 4a1ee1b..67f32cf 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1803,8 +1803,8 @@
 extern const char kWebPaymentsExperimentalFeaturesName[];
 extern const char kWebPaymentsExperimentalFeaturesDescription[];
 
-extern const char kWebPaymentAPICSPName[];
-extern const char kWebPaymentAPICSPDescription[];
+extern const char kIgnoreCSPInWebPaymentAPIName[];
+extern const char kIgnoreCSPInWebPaymentAPIDescription[];
 
 extern const char kClearIdentityInCanMakePaymentEventName[];
 extern const char kClearIdentityInCanMakePaymentEventDescription[];
@@ -1812,9 +1812,6 @@
 extern const char kAppStoreBillingDebugName[];
 extern const char kAppStoreBillingDebugDescription[];
 
-extern const char kWebAuthnConditionalUIName[];
-extern const char kWebAuthnConditionalUIDescription[];
-
 extern const char kWebAuthnNewDesktopUIName[];
 extern const char kWebAuthnNewDesktopUIDescription[];
 
@@ -1945,9 +1942,6 @@
 extern const char kAndroidSurfaceControlName[];
 extern const char kAndroidSurfaceControlDescription[];
 
-extern const char kAssistantIntentPageUrlName[];
-extern const char kAssistantIntentPageUrlDescription[];
-
 extern const char kAssistantIntentTranslateInfoName[];
 extern const char kAssistantIntentTranslateInfoDescription[];
 

chrome/browser/flags/android/chrome_feature_list.cc

diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
index a50bc7c..407a093 100644
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -166,7 +166,6 @@
     &kAssistantConsentSimplifiedText,
     &kAssistantConsentV2,
     &kAssistantIntentExperimentId,
-    &kAssistantIntentPageUrl,
     &kAssistantIntentTranslateInfo,
     &kAssistantNonPersonalizedVoiceSearch,
     &kAppMenuMobileSiteOption,
@@ -449,10 +448,6 @@
              "AssistantIntentExperimentId",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
-BASE_FEATURE(kAssistantIntentPageUrl,
-             "AssistantIntentPageUrl",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-
 BASE_FEATURE(kAssistantIntentTranslateInfo,
              "AssistantIntentTranslateInfo",
              base::FEATURE_DISABLED_BY_DEFAULT);

chrome/browser/flags/android/chrome_feature_list.h

diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
index c86fe40..de9ad63 100644
--- a/chrome/browser/flags/android/chrome_feature_list.h
+++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -23,7 +23,6 @@
 BASE_DECLARE_FEATURE(kAssistantConsentSimplifiedText);
 BASE_DECLARE_FEATURE(kAssistantConsentV2);
 BASE_DECLARE_FEATURE(kAssistantIntentExperimentId);
-BASE_DECLARE_FEATURE(kAssistantIntentPageUrl);
 BASE_DECLARE_FEATURE(kAssistantIntentTranslateInfo);
 BASE_DECLARE_FEATURE(kAssistantNonPersonalizedVoiceSearch);
 BASE_DECLARE_FEATURE(kAppMenuMobileSiteOption);

chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

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 846e2972e..14ec218 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
@@ -197,7 +197,6 @@
     public static final String ASSISTANT_CONSENT_SIMPLIFIED_TEXT = "AssistantConsentSimplifiedText";
     public static final String ASSISTANT_CONSENT_V2 = "AssistantConsentV2";
     public static final String ASSISTANT_INTENT_EXPERIMENT_ID = "AssistantIntentExperimentId";
-    public static final String ASSISTANT_INTENT_PAGE_URL = "AssistantIntentPageUrl";
     public static final String ASSISTANT_INTENT_TRANSLATE_INFO = "AssistantIntentTranslateInfo";
     public static final String ASSISTANT_NON_PERSONALIZED_VOICE_SEARCH =
             "AssistantNonPersonalizedVoiceSearch";

chrome/browser/metrics/power/power_metrics.cc

diff --git a/chrome/browser/metrics/power/power_metrics.cc b/chrome/browser/metrics/power/power_metrics.cc
index 6e84b00..eb8a819 100644
--- a/chrome/browser/metrics/power/power_metrics.cc
+++ b/chrome/browser/metrics/power/power_metrics.cc
@@ -20,6 +20,12 @@
     "Power.BatteryDischargeRateMilliwatts5";
 constexpr const char* kAltBatteryDischargeRateMilliwattsHistogramName =
     "Power.AltBatteryDischargeRateMilliwatts5";
+#if BUILDFLAG(IS_WIN)
+constexpr const char* kHasPreciseBatteryDischargeGranularity =
+    "Power.HasPreciseBatteryDischargeGranularity";
+constexpr const char* kBatteryDischargeRatePreciseMilliwattsHistogramName =
+    "Power.BatteryDischargeRatePreciseMilliwatts";
+#endif  // BUILDFLAG(IS_WIN)
 constexpr const char* kBatteryDischargeRateRelativeHistogramName =
     "Power.BatteryDischargeRateRelative5";
 constexpr const char* kBatteryDischargeModeHistogramName =
@@ -217,14 +223,39 @@
   const auto alt_discharge_rate_mw = CalculateAltDischargeRateMilliwatts(
       *previous_battery_state, *new_battery_state, interval_duration);
 
+#if BUILDFLAG(IS_WIN)
+  // The maximum granularity allowed for the following battery discharge value.
+  // The bell curve of the battery discharge rate starts at 1000 mW. This
+  // correspond to a discharge amount of 1000/60 ~ 17 mWh every 1 minute
+  // interval.
+  static const int64_t kMaximumGranularityInMilliwattHours = 17;
+  absl::optional<int64_t> discharge_rate_with_precise_granularity;
+  if (previous_battery_state->battery_discharge_granularity.has_value() &&
+      previous_battery_state->battery_discharge_granularity.value() <=
+          kMaximumGranularityInMilliwattHours &&
+      new_battery_state->battery_discharge_granularity.has_value() &&
+      new_battery_state->battery_discharge_granularity.value() <=
+          kMaximumGranularityInMilliwattHours) {
+    discharge_rate_with_precise_granularity = alt_discharge_rate_mw;
+  }
+#endif  // BUILDFLAG(IS_WIN)
+
   const auto discharge_rate_relative = CalculateDischargeRateRelative(
       *previous_battery_state, *new_battery_state, interval_duration);
 
   if (discharge_rate_relative < 0 || discharge_rate_mw < 0) {
     return {BatteryDischargeMode::kBatteryLevelIncreased, absl::nullopt};
   }
-  return {BatteryDischargeMode::kDischarging, discharge_rate_mw,
-          alt_discharge_rate_mw, discharge_rate_relative};
+  return {
+    .mode = BatteryDischargeMode::kDischarging,
+    .rate_milliwatts = discharge_rate_mw,
+    .alt_rate_milliwatts = alt_discharge_rate_mw,
+#if BUILDFLAG(IS_WIN)
+    .rate_milliwatts_with_precise_granularity =
+        discharge_rate_with_precise_granularity,
+#endif
+    .rate_relative = discharge_rate_relative
+  };
 }
 
 void ReportBatteryHistograms(
@@ -232,16 +263,20 @@
     BatteryDischarge battery_discharge,
     bool is_initial_interval,
     const std::vector<const char*>& scenario_suffixes) {
+#if BUILDFLAG(IS_WIN)
+  base::UmaHistogramBoolean(
+      kHasPreciseBatteryDischargeGranularity,
+      battery_discharge.rate_milliwatts_with_precise_granularity.has_value());
+#endif  // BUILDFLAG(IS_WIN)
+
   const char* interval_type_suffixes[] = {
       "", is_initial_interval ? ".Initial" : ".Periodic"};
-
   for (const char* scenario_suffix : scenario_suffixes) {
     for (const char* interval_type_suffix : interval_type_suffixes) {
       base::UmaHistogramEnumeration(
           base::StrCat({kBatteryDischargeModeHistogramName, scenario_suffix,
                         interval_type_suffix}),
           battery_discharge.mode);
-
       if (battery_discharge.mode == BatteryDischargeMode::kDischarging) {
         DCHECK(battery_discharge.rate_milliwatts.has_value());
         base::UmaHistogramCounts100000(
@@ -253,6 +288,14 @@
             base::StrCat({kAltBatteryDischargeRateMilliwattsHistogramName,
                           scenario_suffix, interval_type_suffix}),
             *battery_discharge.alt_rate_milliwatts);
+#if BUILDFLAG(IS_WIN)
+        if (battery_discharge.rate_milliwatts_with_precise_granularity) {
+          base::UmaHistogramCounts100000(
+              base::StrCat({kBatteryDischargeRatePreciseMilliwattsHistogramName,
+                            scenario_suffix, interval_type_suffix}),
+              *battery_discharge.rate_milliwatts_with_precise_granularity);
+        }
+#endif  // BUILDFLAG(IS_WIN)
         DCHECK(battery_discharge.rate_relative.has_value());
         base::UmaHistogramCounts1000(
             base::StrCat({kBatteryDischargeRateRelativeHistogramName,

chrome/browser/metrics/power/power_metrics.h

diff --git a/chrome/browser/metrics/power/power_metrics.h b/chrome/browser/metrics/power/power_metrics.h
index 462df18..ee23877 100644
--- a/chrome/browser/metrics/power/power_metrics.h
+++ b/chrome/browser/metrics/power/power_metrics.h
@@ -47,6 +47,12 @@
   // Discharge rate in milliwatts, calculated using the used capacity instead of
   // the current capacity.
   absl::optional<int64_t> alt_rate_milliwatts;
+#if BUILDFLAG(IS_WIN)
+  // Discharge rate in milliwatts, if the client's battery discharge granularity
+  // is at most 17 mWh. Calculated using the used capacity instead of the
+  // current capacity.
+  absl::optional<int64_t> rate_milliwatts_with_precise_granularity;
+#endif  // BUILDFLAG(IS_WIN)
   // Discharge rate in hundredth of a percent per minute.
   absl::optional<int64_t> rate_relative;
 };

chrome/browser/net/private_network_access_browsertest.cc

diff --git a/chrome/browser/net/private_network_access_browsertest.cc b/chrome/browser/net/private_network_access_browsertest.cc
index 4f54297..7e523b0 100644
--- a/chrome/browser/net/private_network_access_browsertest.cc
+++ b/chrome/browser/net/private_network_access_browsertest.cc
@@ -391,8 +391,9 @@
 // This test verifies that when a preflight request is sent ahead of a private
 // network request, fails, and enforcement is not enabled, the correct
 // WebFeature is use-counted to reflect the suppressed error.
-IN_PROC_BROWSER_TEST_F(PrivateNetworkAccessWithFeatureEnabledBrowserTest,
-                       RecordsAddressSpaceFeatureForFetchWithPreflight) {
+IN_PROC_BROWSER_TEST_F(
+    PrivateNetworkAccessWithFeatureEnabledBrowserTest,
+    RecordsAddressSpaceFeatureForFetchWithPreflightUnreplied) {
   std::unique_ptr<net::EmbeddedTestServer> server = NewServer();
 
   EXPECT_TRUE(content::NavigateToURL(web_contents(), PublicSecureURL(*server)));
@@ -414,6 +415,34 @@
       }));
 }
 
+// This test verifies that when a preflight request is sent ahead of a private
+// network request, the server replies with Access-Control-Allow-Origins but
+// without Access-Control-Allow-Private-Network, and enforcement is not enabled,
+// the correct WebFeature is use-counted to reflect the suppressed error.
+IN_PROC_BROWSER_TEST_F(
+    PrivateNetworkAccessWithFeatureEnabledBrowserTest,
+    RecordsAddressSpaceFeatureForFetchWithPreflightRepliedWithoutPNAHeaders) {
+  std::unique_ptr<net::EmbeddedTestServer> server = NewServer();
+
+  EXPECT_TRUE(content::NavigateToURL(web_contents(), PublicSecureURL(*server)));
+
+  WebFeatureHistogramTester feature_histogram_tester;
+
+  // The server does not reply with valid CORS headers, so the preflight fails.
+  // The enforcement feature is not enabled however, so the error is suppressed.
+  // Instead, a warning is shown in DevTools and a WebFeature use-counted.
+  EXPECT_EQ(true, content::EvalJs(web_contents(), R"(
+    fetch("/cors-ok.txt").then(response => response.ok)
+  )"));
+
+  feature_histogram_tester.ExpectCounts(AddFeatureCounts(
+      AllZeroFeatureCounts(AllAddressSpaceFeatures()),
+      {
+          {WebFeature::kAddressSpacePublicSecureContextEmbeddedLocal, 1},
+          {WebFeature::kPrivateNetworkAccessIgnoredPreflightError, 1},
+      }));
+}
+
 // This test verifies that when a non-secure context served from the public
 // address space loads a resource from the local network, the correct WebFeature
 // is use-counted.

chrome/browser/optimization_guide/prediction/prediction_model_store_browsertest.cc

diff --git a/chrome/browser/optimization_guide/prediction/prediction_model_store_browsertest.cc b/chrome/browser/optimization_guide/prediction/prediction_model_store_browsertest.cc
index 1695acba..306a304 100644
--- a/chrome/browser/optimization_guide/prediction/prediction_model_store_browsertest.cc
+++ b/chrome/browser/optimization_guide/prediction/prediction_model_store_browsertest.cc
@@ -270,7 +270,7 @@
             model_file_observer_foo.model_info()->GetModelFilePath());
 }
 
-#if BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 #define MAYBE_TestDissimilarProfilesNotShareModel \
   DISABLED_TestDissimilarProfilesNotShareModel
 #else

chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc

diff --git a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
index fe4cd827..cdd70ef 100644
--- a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
+++ b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
@@ -959,7 +959,6 @@
   histogram_tester_->ExpectTotalCount(internal::kHistogramDomContentLoaded, 1);
   histogram_tester_->ExpectTotalCount(internal::kHistogramLoad, 1);
   histogram_tester_->ExpectTotalCount(internal::kHistogramFirstPaint, 1);
-  histogram_tester_->ExpectTotalCount(internal::kHistogramParseDuration, 1);
   histogram_tester_->ExpectTotalCount(
       internal::kHistogramParseBlockedOnScriptLoad, 1);
   histogram_tester_->ExpectTotalCount(
@@ -997,7 +996,6 @@
   histogram_tester_->ExpectTotalCount(internal::kHistogramDomContentLoaded, 1);
   histogram_tester_->ExpectTotalCount(internal::kHistogramLoad, 1);
   histogram_tester_->ExpectTotalCount(internal::kHistogramFirstPaint, 1);
-  histogram_tester_->ExpectTotalCount(internal::kHistogramParseDuration, 1);
   histogram_tester_->ExpectTotalCount(
       internal::kHistogramParseBlockedOnScriptLoad, 1);
   histogram_tester_->ExpectTotalCount(

chrome/browser/password_manager/chrome_password_manager_client.cc

diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
index 8338c1f..f4fb124 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -468,7 +468,7 @@
     autofill::mojom::SubmissionReadinessState submission_readiness) {
   std::vector<TouchToFillWebAuthnCredential> webauthn_credentials;
   auto* webauthn_delegate = GetWebAuthnCredentialsDelegateForDriver(driver);
-  if (webauthn_delegate && webauthn_delegate->IsWebAuthnAutofillEnabled()) {
+  if (webauthn_delegate) {
     const absl::optional<std::vector<autofill::Suggestion>>& suggestions =
         webauthn_delegate->GetWebAuthnSuggestions();
     if (suggestions.has_value()) {

chrome/browser/password_manager/chrome_webauthn_credentials_delegate.cc

diff --git a/chrome/browser/password_manager/chrome_webauthn_credentials_delegate.cc b/chrome/browser/password_manager/chrome_webauthn_credentials_delegate.cc
index a6fe2a6..9ce42d2 100644
--- a/chrome/browser/password_manager/chrome_webauthn_credentials_delegate.cc
+++ b/chrome/browser/password_manager/chrome_webauthn_credentials_delegate.cc
@@ -5,14 +5,12 @@
 #include "chrome/browser/password_manager/chrome_webauthn_credentials_delegate.h"
 
 #include "base/base64.h"
-#include "base/callback.h"
-#include "base/feature_list.h"
+#include "base/functional/callback.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "components/password_manager/core/browser/password_ui_utils.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/common/content_features.h"
 #include "device/fido/discoverable_credential_metadata.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -33,10 +31,6 @@
 ChromeWebAuthnCredentialsDelegate::~ChromeWebAuthnCredentialsDelegate() =
     default;
 
-bool ChromeWebAuthnCredentialsDelegate::IsWebAuthnAutofillEnabled() const {
-  return base::FeatureList::IsEnabled(features::kWebAuthConditionalUI);
-}
-
 void ChromeWebAuthnCredentialsDelegate::LaunchWebAuthnFlow() {
 #if !BUILDFLAG(IS_ANDROID)
   ChromeAuthenticatorRequestDelegate* authenticator_delegate =

chrome/browser/password_manager/chrome_webauthn_credentials_delegate.h

diff --git a/chrome/browser/password_manager/chrome_webauthn_credentials_delegate.h b/chrome/browser/password_manager/chrome_webauthn_credentials_delegate.h
index cf37d81..af8e9bb 100644
--- a/chrome/browser/password_manager/chrome_webauthn_credentials_delegate.h
+++ b/chrome/browser/password_manager/chrome_webauthn_credentials_delegate.h
@@ -32,7 +32,6 @@
       const ChromeWebAuthnCredentialsDelegate&) = delete;
 
   // password_manager::WebAuthnCredentialsDelegate:
-  bool IsWebAuthnAutofillEnabled() const override;
   void LaunchWebAuthnFlow() override;
   void SelectWebAuthnCredential(std::string backend_id) override;
   const absl::optional<std::vector<autofill::Suggestion>>&

chrome/browser/payments/iframe_csp_browsertest.cc

diff --git a/chrome/browser/payments/iframe_csp_browsertest.cc b/chrome/browser/payments/iframe_csp_browsertest.cc
index bf0e1a2..764ed47 100644
--- a/chrome/browser/payments/iframe_csp_browsertest.cc
+++ b/chrome/browser/payments/iframe_csp_browsertest.cc
@@ -7,10 +7,10 @@
 #include "chrome/test/payments/payment_request_platform_browsertest_base.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/common/content_features.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/blink/public/common/features.h"
 
 namespace payments {
 
@@ -19,9 +19,11 @@
  public:
   IframeCspTest() {
     if (WebPaymentAPICSPEnabled()) {
-      features_.InitAndEnableFeature(::features::kWebPaymentAPICSP);
+      features_.InitAndDisableFeature(
+          blink::features::kIgnoreCSPInWebPaymentAPI);
     } else {
-      features_.InitAndDisableFeature(::features::kWebPaymentAPICSP);
+      features_.InitAndEnableFeature(
+          blink::features::kIgnoreCSPInWebPaymentAPI);
     }
   }
 

chrome/browser/prefs/incognito_mode_prefs.cc

diff --git a/chrome/browser/prefs/incognito_mode_prefs.cc b/chrome/browser/prefs/incognito_mode_prefs.cc
index e75f5a45..0ee66fd5 100644
--- a/chrome/browser/prefs/incognito_mode_prefs.cc
+++ b/chrome/browser/prefs/incognito_mode_prefs.cc
@@ -10,6 +10,7 @@
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
+#include "chrome/browser/defaults.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ -72,23 +73,14 @@
 bool IncognitoModePrefs::ShouldLaunchIncognito(
     const base::CommandLine& command_line,
     const PrefService* prefs) {
-  // Note: This code only checks parental controls if the user requested
-  // to launch in incognito mode or if it was forced via prefs. This way,
-  // the parental controls check (which can be quite slow) can be avoided
-  // most of the time.
-  bool should_use_incognito =
-      command_line.HasSwitch(switches::kIncognito) ||
-      GetAvailabilityInternal(prefs, DONT_CHECK_PARENTAL_CONTROLS) ==
-          IncognitoModePrefs::Availability::kForced;
-#if BUILDFLAG(IS_CHROMEOS_LACROS)
-  auto* init_params = chromeos::BrowserParamsProxy::Get();
-  should_use_incognito |=
-      init_params->InitialBrowserAction() ==
-      crosapi::mojom::InitialBrowserAction::kOpenIncognitoWindow;
-#endif
-  return should_use_incognito &&
-         GetAvailabilityInternal(prefs, CHECK_PARENTAL_CONTROLS) !=
-             IncognitoModePrefs::Availability::kDisabled;
+  return ShouldLaunchIncognitoInternal(command_line, prefs, false);
+}
+
+// static
+bool IncognitoModePrefs::ShouldOpenSubsequentBrowsersInIncognito(
+    const base::CommandLine& command_line,
+    const PrefService* prefs) {
+  return ShouldLaunchIncognitoInternal(command_line, prefs, true);
 }
 
 // static
@@ -144,3 +136,34 @@
   }
   return result;
 }
+
+// static
+bool IncognitoModePrefs::ShouldLaunchIncognitoInternal(
+    const base::CommandLine& command_line,
+    const PrefService* prefs,
+    const bool for_subsequent_browsers) {
+  // Note: This code only checks parental controls if the user requested
+  // to launch in incognito mode or if it was forced via prefs. This way,
+  // the parental controls check (which can be quite slow) can be avoided
+  // most of the time.
+  bool forced_by_switch = command_line.HasSwitch(switches::kIncognito);
+  if (for_subsequent_browsers) {
+    forced_by_switch =
+        forced_by_switch &&
+        browser_defaults::
+            kAlwaysOpenIncognitoBrowserIfStartedWithIncognitoSwitch;
+  }
+  bool should_use_incognito =
+      forced_by_switch ||
+      GetAvailabilityInternal(prefs, DONT_CHECK_PARENTAL_CONTROLS) ==
+          IncognitoModePrefs::Availability::kForced;
+#if BUILDFLAG(IS_CHROMEOS_LACROS)
+  auto* init_params = chromeos::BrowserParamsProxy::Get();
+  should_use_incognito |=
+      init_params->InitialBrowserAction() ==
+      crosapi::mojom::InitialBrowserAction::kOpenIncognitoWindow;
+#endif
+  return should_use_incognito &&
+         GetAvailabilityInternal(prefs, CHECK_PARENTAL_CONTROLS) !=
+             IncognitoModePrefs::Availability::kDisabled;
+}

chrome/browser/prefs/incognito_mode_prefs.h

diff --git a/chrome/browser/prefs/incognito_mode_prefs.h b/chrome/browser/prefs/incognito_mode_prefs.h
index 6722f47..eb8a611 100644
--- a/chrome/browser/prefs/incognito_mode_prefs.h
+++ b/chrome/browser/prefs/incognito_mode_prefs.h
@@ -58,10 +58,15 @@
   // and *out_value is set to ENABLED.
   static bool IntToAvailability(int in_value, Availability* out_value);
 
-  // Returns true if the browser should start in incognito mode.
+  // Returns true if the initial browser should start in incognito mode.
   static bool ShouldLaunchIncognito(const base::CommandLine& command_line,
                                     const PrefService* prefs);
 
+  // Returns true if subsequent browsers should be opened in incognito mode.
+  static bool ShouldOpenSubsequentBrowsersInIncognito(
+      const base::CommandLine& command_line,
+      const PrefService* prefs);
+
   // Returns true if |profile| can open a new Browser. This checks the incognito
   // availability policies and verifies if the |profile| type is allowed to
   // open new windows.
@@ -88,6 +93,14 @@
   // to do - such as when checking for FORCED state).
   static Availability GetAvailabilityInternal(const PrefService* pref_service,
                                               GetAvailabilityMode mode);
+
+  // Internal version of ShouldLaunchIncognito() and
+  // ShouldOpenSubsequentBrowsersInIncognito() that specifies whether it is for
+  // subsequent browsers or not.
+  static bool ShouldLaunchIncognitoInternal(
+      const base::CommandLine& command_line,
+      const PrefService* prefs,
+      const bool for_subsequent_browsers);
 };
 
 #endif  // CHROME_BROWSER_PREFS_INCOGNITO_MODE_PREFS_H_

chrome/browser/profiles/profile_manager.cc

diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index afc4791..2819cfa 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -43,7 +43,6 @@
 #include "chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.h"
 #include "chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_factory.h"
 #include "chrome/browser/buildflags.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
@@ -89,7 +88,6 @@
 #include "components/sync/base/stop_source.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_service.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_switches.h"
 #include "extensions/buildflags/buildflags.h"
@@ -1350,10 +1348,6 @@
   for (auto& observer : observers_)
     observer.OnProfileAdded(profile);
 
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_PROFILE_ADDED, content::Source<Profile>(profile),
-      content::NotificationService::NoDetails());
-
   // At this point, the user policy service and the child account service
   // had enough time to initialize and should have updated the user signout
   // flag attached to the profile.

chrome/browser/profiles/profile_manager_unittest.cc

diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
index 54008533..6359d3be 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -69,6 +69,7 @@
 #include "ash/components/arc/arc_prefs.h"
 #include "ash/components/arc/session/arc_management_transition.h"
 #include "ash/constants/ash_switches.h"
+#include "chrome/browser/ash/login/users/avatar/user_image_manager_impl.h"
 #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/ash/login/users/scoped_test_user_manager.h"
 #include "chrome/browser/ash/profiles/profile_helper.h"
@@ -159,6 +160,7 @@
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
     base::CommandLine::ForCurrentProcess()->AppendSwitch(switches::kTestType);
+    ash::UserImageManagerImpl::SkipDefaultUserImageDownloadForTesting();
     wallpaper_controller_client_ =
         std::make_unique<WallpaperControllerClientImpl>();
     wallpaper_controller_client_->InitForTesting(&test_wallpaper_controller_);

chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc

diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc b/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc
index 0c7e322..b36703e 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc
@@ -583,22 +583,22 @@
       const RenderViewContextMenuDlpPrefsTest&) = delete;
 
   void SetDlpClipboardRestriction() {
-    base::Value rules(base::Value::Type::LIST);
-    base::Value src_urls(base::Value::Type::LIST);
+    base::Value::List rules;
+    base::Value::List src_urls;
     src_urls.Append(PAGE_URL);
 
-    base::Value dst_urls(base::Value::Type::LIST);
+    base::Value::List dst_urls;
     dst_urls.Append(RESTRICTED_URL);
 
-    base::Value restrictions(base::Value::Type::LIST);
+    base::Value::List restrictions;
     restrictions.Append(policy::dlp_test_util::CreateRestrictionWithLevel(
         policy::dlp::kClipboardRestriction, policy::dlp::kBlockLevel));
 
     rules.Append(policy::dlp_test_util::CreateRule(
         "Rule #1", "Block", std::move(src_urls), std::move(dst_urls),
-        /*dst_components=*/base::Value(base::Value::Type::LIST),
-        std::move(restrictions)));
-    local_state()->Set(policy::policy_prefs::kDlpRulesList, std::move(rules));
+        /*dst_components=*/base::Value::List(), std::move(restrictions)));
+    local_state()->SetList(policy::policy_prefs::kDlpRulesList,
+                           std::move(rules));
   }
 
   static constexpr char PAGE_URL[] = "http://www.foo.com/";

chrome/browser/resources/bookmarks/bookmarks.ts

diff --git a/chrome/browser/resources/bookmarks/bookmarks.ts b/chrome/browser/resources/bookmarks/bookmarks.ts
index 77a1b55..d745b959 100644
--- a/chrome/browser/resources/bookmarks/bookmarks.ts
+++ b/chrome/browser/resources/bookmarks/bookmarks.ts
@@ -4,7 +4,7 @@
 
 import './app.js';
 
-export {changeFolderOpen, clearSearch, createBookmark, deselectItems, editBookmark, moveBookmark, removeBookmark, reorderChildren, selectFolder, SelectFolderAction, selectItem, SelectItemsAction, setSearchResults, setSearchTerm, updateAnchor} from './actions.js';
+export {changeFolderOpen, clearSearch, createBookmark, deselectItems, editBookmark, moveBookmark, removeBookmark, reorderChildren, selectFolder, SelectFolderAction, selectItem, SelectItemsAction, setSearchResults, setSearchTerm, StartSearchAction, updateAnchor} from './actions.js';
 export {BookmarksAppElement} from './app.js';
 export {BookmarksApiProxy, BookmarksApiProxyImpl, Query} from './bookmarks_api_proxy.js';
 export {BrowserProxy, BrowserProxyImpl} from './browser_proxy.js';

chrome/browser/resources/chromeos/accessibility/chromevox/BUILD.gn

diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/BUILD.gn b/chrome/browser/resources/chromeos/accessibility/chromevox/BUILD.gn
index 784bb26..cf39c82d 100644
--- a/chrome/browser/resources/chromeos/accessibility/chromevox/BUILD.gn
+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/BUILD.gn
@@ -43,7 +43,6 @@
   "../common/rect_util.js",
   "../common/string_util.js",
   "../common/tree_walker.js",
-  "background/abstract_earcons.js",
   "background/abstract_tts.js",
   "background/automation_object_constructor_installer.js",
   "background/auto_scroll_handler.js",
@@ -118,6 +117,7 @@
   "background/smart_sticky_mode.js",
   "background/tts_background.js",
   "background/user_action_monitor.js",
+  "common/abstract_earcons.js",
   "common/background_bridge.js",
   "common/braille/braille_command_data.js",
   "common/braille/braille_key_types.js",
@@ -457,7 +457,6 @@
       "../common/testing/callback_helper.js",
       "../common/testing/documents.js",
       "../common/testing/e2e_test_base.js",
-      "testing/chromevox_e2e_test_base.js",
       "testing/chromevox_next_e2e_test_base.js",
       "testing/mock_feedback.js",
     ]

chrome/browser/resources/chromeos/accessibility/chromevox/background/background.js

diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/background.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/background.js
index 1fa3d965b..4892db1 100644
--- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/background.js
+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/background.js
@@ -8,6 +8,7 @@
 import {CursorRange} from '../../common/cursors/range.js';
 import {InstanceChecker} from '../../common/instance_checker.js';
 import {LocalStorage} from '../../common/local_storage.js';
+import {AbstractEarcons} from '../common/abstract_earcons.js';
 import {NavBraille} from '../common/braille/nav_braille.js';
 import {ContentScriptBridge} from '../common/content_script_bridge.js';
 import {LocaleOutputHelper} from '../common/locale_output_helper.js';
@@ -16,7 +17,6 @@
 import {QueueMode, TtsSpeechProperties} from '../common/tts_types.js';
 import {JaPhoneticMap} from '../third_party/tamachiyomi/ja_phonetic_map.js';
 
-import {AbstractEarcons} from './abstract_earcons.js';
 import {AutoScrollHandler} from './auto_scroll_handler.js';
 import {BrailleBackground} from './braille/braille_background.js';
 import {BrailleCommandHandler} from './braille/braille_command_handler.js';
@@ -52,10 +52,10 @@
  * @fileoverview The entry point for all ChromeVox related code for the
  * background page.
  */
+
 const Dir = constants.Dir;
 const RoleType = chrome.automation.RoleType;
 const StateType = chrome.automation.StateType;
-
 /** ChromeVox background page. */
 export class Background extends ChromeVoxState {
   constructor() {

chrome/browser/resources/chromeos/accessibility/chromevox/background/braille/braille_background.js

diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/braille/braille_background.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/braille/braille_background.js
index 14b18e9..8c2d4e5 100644
--- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/braille/braille_background.js
+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/braille/braille_background.js
@@ -20,6 +20,9 @@
 import {BrailleKeyEventRewriter} from './braille_key_event_rewriter.js';
 import {BrailleTranslatorManager} from './braille_translator_manager.js';
 
+const Action = BridgeConstants.BrailleBackground.Action;
+const TARGET = BridgeConstants.BrailleBackground.TARGET;
+
 /** @implements {BrailleInterface} */
 export class BrailleBackground {
   /**
@@ -62,16 +65,14 @@
     BrailleBackground.instance = new BrailleBackground();
 
     BridgeHelper.registerHandler(
-        BridgeConstants.BrailleBackground.TARGET,
-        BridgeConstants.BrailleBackground.Action.BACK_TRANSLATE,
+        TARGET, Action.BACK_TRANSLATE,
         cells => new Promise(resolve => {
           BrailleBackground.instance.getTranslatorManager()
               .getDefaultTranslator()
               .backTranslate(cells, resolve);
         }));
     BridgeHelper.registerHandler(
-        BridgeConstants.BrailleBackground.TARGET,
-        BridgeConstants.BrailleBackground.Action.REFRESH_BRAILLE_TABLE,
+        TARGET, Action.REFRESH_BRAILLE_TABLE,
         brailleTable =>
             BrailleBackground.instance.getTranslatorManager().refresh(
                 brailleTable));

chrome/browser/resources/chromeos/accessibility/chromevox/background/chromevox.js

diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/chromevox.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/chromevox.js
index db082154e..cb585f21 100644
--- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/chromevox.js
+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/chromevox.js
@@ -6,9 +6,9 @@
  * @fileoverview Defines a global object that holds references to the three
  * different output engines.
  */
+import {AbstractEarcons} from '../common/abstract_earcons.js';
 import {TtsInterface} from '../common/tts_interface.js';
 
-import {AbstractEarcons} from './abstract_earcons.js';
 import {BrailleInterface} from './braille/braille_interface.js';
 
 export const ChromeVox = {

chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons.js

diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons.js
index 7020f1f..babfd6d 100644
--- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons.js
+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons.js
@@ -8,10 +8,10 @@
  */
 
 import {LocalStorage} from '../../common/local_storage.js';
+import {AbstractEarcons} from '../common/abstract_earcons.js';
 import {EarconId} from '../common/earcon_id.js';
 import {LogType} from '../common/log_types.js';
 
-import {AbstractEarcons} from './abstract_earcons.js';
 import {ChromeVoxState} from './chromevox_state.js';
 import {EarconEngine} from './earcon_engine.js';
 import {LogStore} from './logging/log_store.js';

chrome/browser/resources/chromeos/accessibility/chromevox/background/logging/event_stream_logger.js

diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/logging/event_stream_logger.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/logging/event_stream_logger.js
index 17bff37..7f09dff 100644
--- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/logging/event_stream_logger.js
+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/logging/event_stream_logger.js
@@ -16,7 +16,8 @@
 const AutomationEvent = chrome.automation.AutomationEvent;
 const AutomationNode = chrome.automation.AutomationNode;
 const EventType = chrome.automation.EventType;
-const Constants = BridgeConstants.EventStreamLogger;
+const Action = BridgeConstants.EventStreamLogger.Action;
+const TARGET = BridgeConstants.EventStreamLogger.TARGET;
 
 export class EventStreamLogger {
   constructor(node) {
@@ -83,7 +84,7 @@
           LocalStorage.get('enableEventStreamLogging'));
 
       BridgeHelper.registerHandler(
-          Constants.TARGET, Constants.Action.NOTIFY_EVENT_STREAM_FILTER_CHANGED,
+          TARGET, Action.NOTIFY_EVENT_STREAM_FILTER_CHANGED,
           (name, enabled) =>
               EventStreamLogger.instance.notifyEventStreamFilterChanged(
                   name, enabled));

chrome/browser/resources/chromeos/accessibility/chromevox/background/logging/log_store.js

diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/logging/log_store.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/logging/log_store.js
index 6592280..d7f1ef5d 100644
--- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/logging/log_store.js
+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/logging/log_store.js
@@ -11,6 +11,9 @@
 import {BaseLog, LogType, TextLog, TreeLog} from '../../common/log_types.js';
 import {TreeDumper} from '../../common/tree_dumper.js';
 
+const Action = BridgeConstants.LogStore.Action;
+const TARGET = BridgeConstants.LogStore.TARGET;
+
 export class LogStore {
   constructor() {
     /**
@@ -133,12 +136,9 @@
     LogStore.instance = new LogStore();
 
     BridgeHelper.registerHandler(
-        BridgeConstants.LogStore.TARGET,
-        BridgeConstants.LogStore.Action.CLEAR_LOG,
-        () => LogStore.instance.clearLog());
+        TARGET, Action.CLEAR_LOG, () => LogStore.instance.clearLog());
     BridgeHelper.registerHandler(
-        BridgeConstants.LogStore.TARGET,
-        BridgeConstants.LogStore.Action.GET_LOGS,
+        TARGET, Action.GET_LOGS,
         () => LogStore.instance.getLogs().map(log => log.serialize()));
   }
 }

chrome/browser/resources/chromeos/accessibility/chromevox/background/panel/panel_background.js

diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/panel/panel_background.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/panel/panel_background.js
index 1e30ab15..b6483e7c 100644
--- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/panel/panel_background.js
+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/panel/panel_background.js
@@ -25,7 +25,8 @@
 import {PanelTabMenuBackground} from './panel_tab_menu_background.js';
 
 const AutomationNode = chrome.automation.AutomationNode;
-const Constants = BridgeConstants.PanelBackground;
+const TARGET = BridgeConstants.PanelBackground.TARGET;
+const Action = BridgeConstants.PanelBackground.Action;
 
 /** @implements {ISearchHandler} */
 export class PanelBackground {
@@ -48,54 +49,52 @@
     ChromeVoxState.addObserver(PanelBackground.stateObserver_);
 
     BridgeHelper.registerHandler(
-        Constants.TARGET, Constants.Action.CLEAR_SAVED_NODE,
+        TARGET, Action.CLEAR_SAVED_NODE,
         () => PanelBackground.instance.clearSavedNode_());
     BridgeHelper.registerHandler(
-        Constants.TARGET, Constants.Action.CREATE_ALL_NODE_MENU_BACKGROUNDS,
+        TARGET, Action.CREATE_ALL_NODE_MENU_BACKGROUNDS,
         opt_activateMenuTitle =>
             PanelBackground.instance.createAllNodeMenuBackgrounds_(
                 opt_activateMenuTitle));
     BridgeHelper.registerHandler(
-        Constants.TARGET, Constants.Action.CREATE_NEW_I_SEARCH,
+        TARGET, Action.CREATE_NEW_I_SEARCH,
         () => PanelBackground.instance.createNewISearch_());
     BridgeHelper.registerHandler(
-        Constants.TARGET, Constants.Action.DESTROY_I_SEARCH,
+        TARGET, Action.DESTROY_I_SEARCH,
         () => PanelBackground.instance.destroyISearch_());
     BridgeHelper.registerHandler(
-        Constants.TARGET, Constants.Action.FOCUS_TAB,
+        TARGET, Action.FOCUS_TAB,
         (windowId, tabId) => PanelTabMenuBackground.focusTab(windowId, tabId));
     BridgeHelper.registerHandler(
-        Constants.TARGET, Constants.Action.GET_ACTIONS_FOR_CURRENT_NODE,
+        TARGET, Action.GET_ACTIONS_FOR_CURRENT_NODE,
         () => PanelBackground.instance.getActionsForCurrentNode_());
     BridgeHelper.registerHandler(
-        Constants.TARGET, Constants.Action.GET_TAB_MENU_DATA,
+        TARGET, Action.GET_TAB_MENU_DATA,
         () => PanelTabMenuBackground.getTabMenuData());
     BridgeHelper.registerHandler(
-        Constants.TARGET, Constants.Action.INCREMENTAL_SEARCH,
+        TARGET, Action.INCREMENTAL_SEARCH,
         (searchStr, dir, opt_nextObject) =>
             PanelBackground.instance.incrementalSearch_(
                 searchStr, dir, opt_nextObject));
     BridgeHelper.registerHandler(
-        Constants.TARGET,
-        Constants.Action.PERFORM_CUSTOM_ACTION_ON_CURRENT_NODE,
+        TARGET, Action.PERFORM_CUSTOM_ACTION_ON_CURRENT_NODE,
         actionId => PanelBackground.instance.performCustomActionOnCurrentNode_(
             actionId));
     BridgeHelper.registerHandler(
-        Constants.TARGET,
-        Constants.Action.PERFORM_STANDARD_ACTION_ON_CURRENT_NODE,
+        TARGET, Action.PERFORM_STANDARD_ACTION_ON_CURRENT_NODE,
         action => PanelBackground.instance.performStandardActionOnCurrentNode_(
             action));
     BridgeHelper.registerHandler(
-        Constants.TARGET, Constants.Action.SAVE_CURRENT_NODE,
+        TARGET, Action.SAVE_CURRENT_NODE,
         () => PanelBackground.instance.saveCurrentNode_());
     BridgeHelper.registerHandler(
-        Constants.TARGET, Constants.Action.SET_PANEL_COLLAPSE_WATCHER,
+        TARGET, Action.SET_PANEL_COLLAPSE_WATCHER,
         () => PanelBackground.instance.setPanelCollapseWatcher_());
     BridgeHelper.registerHandler(
-        Constants.TARGET, Constants.Action.SET_RANGE_TO_I_SEARCH_NODE,
+        TARGET, Action.SET_RANGE_TO_I_SEARCH_NODE,
         () => PanelBackground.instance.setRangeToISearchNode_());
     BridgeHelper.registerHandler(
-        Constants.TARGET, Constants.Action.WAIT_FOR_PANEL_COLLAPSE,
+        TARGET, Action.WAIT_FOR_PANEL_COLLAPSE,
         () => PanelBackground.instance.waitForPanelCollapse_());
   }
 

chrome/browser/resources/chromeos/accessibility/chromevox/background/prefs.js

diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/prefs.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/prefs.js
index 772a6c9..fb2fd478 100644
--- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/prefs.js
+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/prefs.js
@@ -19,6 +19,9 @@
 import {Output} from './output/output.js';
 import {TtsBackground} from './tts_background.js';
 
+const Action = BridgeConstants.ChromeVoxPrefs.Action;
+const TARGET = BridgeConstants.ChromeVoxPrefs.TARGET;
+
 /**
  * This object has default values of preferences and contains the common
  * code for working with preferences shared by the Options and Background
@@ -54,20 +57,14 @@
     ChromeVoxPrefs.instance.enableOrDisableLogUrlWatcher_();
 
     BridgeHelper.registerHandler(
-        BridgeConstants.ChromeVoxPrefs.TARGET,
-        BridgeConstants.ChromeVoxPrefs.Action.GET_PREFS,
-        () => ChromeVoxPrefs.instance.getPrefs());
+        TARGET, Action.GET_PREFS, () => ChromeVoxPrefs.instance.getPrefs());
     BridgeHelper.registerHandler(
-        BridgeConstants.ChromeVoxPrefs.TARGET,
-        BridgeConstants.ChromeVoxPrefs.Action.GET_STICKY_PREF,
-        () => ChromeVoxPrefs.isStickyPrefOn);
+        TARGET, Action.GET_STICKY_PREF, () => ChromeVoxPrefs.isStickyPrefOn);
     BridgeHelper.registerHandler(
-        BridgeConstants.ChromeVoxPrefs.TARGET,
-        BridgeConstants.ChromeVoxPrefs.Action.SET_LOGGING_PREFS,
+        TARGET, Action.SET_LOGGING_PREFS,
         (key, value) => ChromeVoxPrefs.instance.setLoggingPrefs(key, value));
     BridgeHelper.registerHandler(
-        BridgeConstants.ChromeVoxPrefs.TARGET,
-        BridgeConstants.ChromeVoxPrefs.Action.SET_PREF,
+        TARGET, Action.SET_PREF,
         (key, value) => ChromeVoxPrefs.instance.setPref(key, value));
   }
 

chrome/browser/resources/chromeos/accessibility/chromevox/background/tts_background.js

diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/tts_background.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/tts_background.js
index 8e9283f2..ba70bc1 100644
--- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/tts_background.js
+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/tts_background.js
@@ -22,6 +22,9 @@
 import {ConsoleTts} from './console_tts.js';
 import {PhoneticData} from './phonetic_data.js';
 
+const Action = BridgeConstants.TtsBackground.Action;
+const TARGET = BridgeConstants.TtsBackground.TARGET;
+
 /** This class broadly handles TTS within the background context. */
 export class TtsBackground {
   static init() {
@@ -34,16 +37,13 @@
     ChromeVox.tts = TtsBackground.composite;
 
     BridgeHelper.registerHandler(
-        BridgeConstants.TtsBackground.TARGET,
-        BridgeConstants.TtsBackground.Action.UPDATE_PUNCTUATION_ECHO,
+        TARGET, Action.UPDATE_PUNCTUATION_ECHO,
         echo => TtsBackground.primary.updatePunctuationEcho(echo));
     BridgeHelper.registerHandler(
-        BridgeConstants.TtsBackground.TARGET,
-        BridgeConstants.TtsBackground.Action.GET_CURRENT_VOICE,
+        TARGET, Action.GET_CURRENT_VOICE,
         () => TtsBackground.primary.currentVoice);
     BridgeHelper.registerHandler(
-        BridgeConstants.TtsBackground.TARGET,
-        BridgeConstants.TtsBackground.Action.SPEAK,
+        TARGET, Action.SPEAK,
         (textString, queue, properties) =>
             TtsBackground.composite.speak(textString, queue, properties));
   }

chrome/browser/resources/chromeos/accessibility/chromevox/background/user_action_monitor.js

diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/user_action_monitor.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/user_action_monitor.js
index d00a8c4..da266f61a 100644
--- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/user_action_monitor.js
+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/user_action_monitor.js
@@ -17,6 +17,9 @@
 import {CommandHandlerInterface} from './command_handler_interface.js';
 import {Output} from './output/output.js';
 
+const Action = BridgeConstants.UserActionMonitor.Action;
+const TARGET = BridgeConstants.UserActionMonitor.TARGET;
+
 /**
  * The types of actions we want to monitor.
  * @enum {string}
@@ -369,20 +372,15 @@
 UserActionMonitor.instance;
 
 BridgeHelper.registerHandler(
-    BridgeConstants.UserActionMonitor.TARGET,
-    BridgeConstants.UserActionMonitor.Action.CREATE,
+    TARGET, Action.CREATE,
     actions =>
         new Promise(resolve => UserActionMonitor.create(actions, resolve)));
 BridgeHelper.registerHandler(
-    BridgeConstants.UserActionMonitor.TARGET,
-    BridgeConstants.UserActionMonitor.Action.DESTROY,
-    () => UserActionMonitor.destroy());
-BridgeHelper.registerHandler(
-    BridgeConstants.UserActionMonitor.TARGET,
-    BridgeConstants.UserActionMonitor.Action.ON_KEY_DOWN, evt => {
-      if (!UserActionMonitor.instance) {
-        // Continue propagating.
-        return true;
-      }
-      return UserActionMonitor.instance.onKeyDown(evt);
-    });
+    TARGET, Action.DESTROY, () => UserActionMonitor.destroy());
+BridgeHelper.registerHandler(TARGET, Action.ON_KEY_DOWN, evt => {
+  if (!UserActionMonitor.instance) {
+    // Continue propagating.
+    return true;
+  }
+  return UserActionMonitor.instance.onKeyDown(evt);
+});

chrome/browser/resources/chromeos/accessibility/chromevox/common/abstract_earcons.js

diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/abstract_earcons.js b/chrome/browser/resources/chromeos/accessibility/chromevox/common/abstract_earcons.js
similarity index 96%
rename from chrome/browser/resources/chromeos/accessibility/chromevox/background/abstract_earcons.js
rename to chrome/browser/resources/chromeos/accessibility/chromevox/common/abstract_earcons.js
index d9fc14c..c9bc8fe 100644
--- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/abstract_earcons.js
+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/common/abstract_earcons.js
@@ -9,7 +9,8 @@
  *
  */
 import {LocalStorage} from '../../common/local_storage.js';
-import {EarconId} from '../common/earcon_id.js';
+
+import {EarconId} from './earcon_id.js';
 
 export class AbstractEarcons {
   /**

chrome/browser/resources/chromeos/accessibility/chromevox/common/log_types.js

diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/common/log_types.js b/chrome/browser/resources/chromeos/accessibility/chromevox/common/log_types.js
index a51b759c..5ac0a2f 100644
--- a/chrome/browser/resources/chromeos/accessibility/chromevox/common/log_types.js
+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/common/log_types.js
@@ -9,8 +9,11 @@
 import {TreeDumper} from './tree_dumper.js';
 import {QueueMode} from './tts_types.js';
 
+const AutomationEvent = chrome.automation.AutomationEvent;
+const EventType = chrome.automation.EventType;
+
 /**
- * List of all types of logs supported.
+ * Supported log types.
  * Note that filter type checkboxes are shown in this order at the log page.
  * @enum {string}
  */
@@ -36,14 +39,10 @@
 
 export class BaseLog {
   constructor(logType) {
-    /**
-     * @type {!LogType}
-     */
+    /** @public {!LogType} */
     this.logType = logType;
 
-    /**
-     * @type {!Date}
-     */
+    /** @public {!Date} */
     this.date = new Date();
   }
 
@@ -59,36 +58,21 @@
   }
 }
 
-
 export class EventLog extends BaseLog {
-  /**
-   * @param {!chrome.automation.AutomationEvent} event
-   */
+  /** @param {!AutomationEvent} event */
   constructor(event) {
     super(LogType.EVENT);
 
-    /**
-     * @type {chrome.automation.EventType}
-     * @private
-     */
+    /** @private {EventType} */
     this.type_ = event.type;
 
-    /**
-     * @type {string | undefined}
-     * @private
-     */
+    /** @private {string|undefined} */
     this.targetName_ = event.target.name;
 
-    /**
-     * @type {string | undefined}
-     * @private
-     */
+    /** @private {string|undefined} */
     this.rootName_ = event.target.root.name;
 
-    /**
-     * @type {string | undefined}
-     * @private
-     */
+    /** @private {string|undefined} */
     this.docUrl_ = event.target.docUrl;
   }
 
@@ -99,7 +83,6 @@
   }
 }
 
-
 export class SpeechLog extends BaseLog {
   /**
    * @param {!string} textString
@@ -109,22 +92,13 @@
   constructor(textString, queueMode, category) {
     super(LogType.SPEECH);
 
-    /**
-     * @type {string}
-     * @private
-     */
+    /** @private {string} */
     this.textString_ = textString;
 
-    /**
-     * @type {QueueMode}
-     * @private
-     */
+    /** @private {QueueMode} */
     this.queueMode_ = queueMode;
 
-    /**
-     * @type {?string}
-     * @private
-     */
+    /** @private {?string} */
     this.category_ = category;
   }
 
@@ -148,7 +122,6 @@
   }
 }
 
-
 export class TextLog extends BaseLog {
   /**
    * @param {string} logStr
@@ -157,10 +130,7 @@
   constructor(logStr, logType) {
     super(logType);
 
-    /**
-     * @type {string}
-     * @private
-     */
+    /** @private {string} */
     this.logStr_ = logStr;
   }
 
@@ -170,23 +140,17 @@
   }
 }
 
-
 export class TreeLog extends BaseLog {
-  /**
-   * @param {!TreeDumper} logTree
-   */
-  constructor(logTree) {
+  /** @param {!TreeDumper} tree */
+  constructor(tree) {
     super(LogType.TREE);
 
-    /**
-     * @type {!TreeDumper}
-     * @private
-     */
-    this.logTree_ = logTree;
+    /** @private {!TreeDumper} */
+    this.tree_ = tree;
   }
 
   /** @override */
   toString() {
-    return this.logTree_.treeToString();
+    return this.tree_.treeToString();
   }
 }

chrome/browser/resources/chromeos/accessibility/chromevox/testing/chromevox_e2e_test_base.js

diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/testing/chromevox_e2e_test_base.js b/chrome/browser/resources/chromeos/accessibility/chromevox/testing/chromevox_e2e_test_base.js
deleted file mode 100644
index 81da633..0000000
--- a/chrome/browser/resources/chromeos/accessibility/chromevox/testing/chromevox_e2e_test_base.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2014 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-GEN_INCLUDE([
-  'common.js',
-  '../../common/testing/assert_additions.js',
-  '../../common/testing/e2e_test_base.js',
-]);
-
-/**
- * Base test fixture for ChromeVox end to end tests.
- * These tests run against production ChromeVox inside of the extension's
- * background page context.
- */
-ChromeVoxE2ETest = class extends E2ETestBase {
-  /** @override */
-  testGenCppIncludes() {
-    super.testGenCppIncludes();
-    GEN(`
-  #include "extensions/common/extension_l10n_util.h"
-      `);
-  }
-
-  /** @override */
-  testGenPreamble() {
-    super.testGenPreamble();
-    GEN(`
-    auto allow = extension_l10n_util::AllowGzippedMessagesAllowedForTest();
-    base::OnceClosure load_cb =
-        base::BindOnce(&ash::AccessibilityManager::EnableSpokenFeedback,
-            base::Unretained(ash::AccessibilityManager::Get()),
-            true);
-      `);
-
-    super.testGenPreambleCommon(
-        'kChromeVoxExtensionId', ChromeVoxE2ETest.prototype.failOnConsoleError);
-  }
-
-  /**@override */
-  async setUpDeferred() {
-    await super.setUpDeferred();
-
-    // Alphabetical based on file path.
-    await importModule(
-        'BrailleInterface',
-        '/chromevox/background/braille/braille_interface.js');
-    await importModule('ChromeVox', '/chromevox/background/chromevox.js');
-    await importModule(
-        'ChromeVoxState', '/chromevox/background/chromevox_state.js');
-    await importModule(
-        'NavBraille', '/chromevox/common/braille/nav_braille.js');
-    await importModule(
-        'AbstractEarcons', '/chromevox/common/abstract_earcons.js');
-    await importModule('TtsInterface', '/chromevox/common/tts_interface.js');
-    await importModule('QueueMode', '/chromevox/common/tts_types.js');
-
-    await ChromeVoxState.ready();
-  }
-};
-
-// TODO: wasm logs errors if it takes too long to load (e.g. liblouis wasm).
-// Separately, LibLouis also logs errors.
-// See https://crbug.com/1170991.
-ChromeVoxE2ETest.prototype.failOnConsoleError = false;

chrome/browser/resources/chromeos/accessibility/chromevox/testing/chromevox_next_e2e_test_base.js

diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/testing/chromevox_next_e2e_test_base.js b/chrome/browser/resources/chromeos/accessibility/chromevox/testing/chromevox_next_e2e_test_base.js
index 4b10268..d40513a 100644
--- a/chrome/browser/resources/chromeos/accessibility/chromevox/testing/chromevox_next_e2e_test_base.js
+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/testing/chromevox_next_e2e_test_base.js
@@ -3,19 +3,19 @@
 // found in the LICENSE file.
 
 // Include test fixture.
-GEN_INCLUDE(['chromevox_e2e_test_base.js']);
+GEN_INCLUDE(['../../common/testing/e2e_test_base.js']);
+GEN_INCLUDE(['../../common/testing/assert_additions.js']);
+GEN_INCLUDE(['common.js']);
 GEN_INCLUDE(['mock_feedback.js']);
 
 /**
- * Base test fixture for ChromeVox Next end to end tests.
- * These tests are identical to ChromeVoxE2ETests except for performing the
- * necessary setup to run ChromeVox Next.
+ * Base test fixture for ChromeVox end to end tests.
+ * These tests run against production ChromeVox inside of the extension's
+ * background context.
  */
-ChromeVoxNextE2ETest = class extends ChromeVoxE2ETest {
-  /** @param {boolean=} opt_isCommonClass Disables ChromeVox specific code */
-  constructor(opt_isCommonClass) {
+ChromeVoxNextE2ETest = class extends E2ETestBase {
+  constructor() {
     super();
-    this.isCommonClass = opt_isCommonClass || false;
 
     if (this.runtimeDeps.length > 0) {
       chrome.extension.getViews().forEach(view => {
@@ -42,6 +42,30 @@
     super.setUp();
   }
 
+  /** @override */
+  testGenCppIncludes() {
+    super.testGenCppIncludes();
+    GEN(`
+  #include "extensions/common/extension_l10n_util.h"
+      `);
+  }
+
+  /** @override */
+  testGenPreamble() {
+    super.testGenPreamble();
+    GEN(`
+    auto allow = extension_l10n_util::AllowGzippedMessagesAllowedForTest();
+    base::OnceClosure load_cb =
+        base::BindOnce(&ash::AccessibilityManager::EnableSpokenFeedback,
+            base::Unretained(ash::AccessibilityManager::Get()),
+            true);
+      `);
+
+    super.testGenPreambleCommon(
+        'kChromeVoxExtensionId',
+        ChromeVoxNextE2ETest.prototype.failOnConsoleError);
+  }
+
   /** @return {!MockFeedback} */
   createMockFeedback() {
     const mockFeedback = new MockFeedback(this.newCallback());
@@ -108,40 +132,49 @@
   /** @override */
   async setUpDeferred() {
     await super.setUpDeferred();
-    if (!this.isCommonClass) {
-      // Alphabetical based on file path.
-      await importModule(
-          'BaseAutomationHandler',
-          '/chromevox/background/base_automation_handler.js');
-      await importModule(
-          'CommandHandler', '/chromevox/background/command_handler.js');
-      await importModule(
-          'CommandHandlerInterface',
-          '/chromevox/background/command_handler_interface.js');
-      await importModule(
-          'GestureCommandHandler',
-          '/chromevox/background/gesture_command_handler.js');
-      await importModule(
-          'OutputRoleInfo', '/chromevox/background/output/output_role_info.js');
-      await importModule(
-          'OutputContextOrder', '/chromevox/background/output/output_types.js');
+    // Alphabetical based on file path.
+    await importModule(
+        'BaseAutomationHandler',
+        '/chromevox/background/base_automation_handler.js');
+    await importModule(
+        'BrailleInterface',
+        '/chromevox/background/braille/braille_interface.js');
+    await importModule('ChromeVox', '/chromevox/background/chromevox.js');
+    await importModule(
+        'ChromeVoxState', '/chromevox/background/chromevox_state.js');
+    await importModule(
+        'CommandHandler', '/chromevox/background/command_handler.js');
+    await importModule(
+        'CommandHandlerInterface',
+        '/chromevox/background/command_handler_interface.js');
+    await importModule(
+        'GestureCommandHandler',
+        '/chromevox/background/gesture_command_handler.js');
+    await importModule(
+        'OutputRoleInfo', '/chromevox/background/output/output_role_info.js');
+    await importModule(
+        'OutputContextOrder', '/chromevox/background/output/output_types.js');
+    await importModule(
+        'NavBraille', '/chromevox/common/braille/nav_braille.js');
+    await importModule(
+        ['AbstractEarcons', 'Earcon'], '/chromevox/common/abstract_earcons.js');
+    await importModule('TtsInterface', '/chromevox/common/tts_interface.js');
+    await importModule('QueueMode', '/chromevox/common/tts_types.js');
 
-      // For tests, enable announcement of events we trigger via automation.
-      BaseAutomationHandler.announceActions = true;
+    // For tests, enable announcement of events we trigger via automation.
+    BaseAutomationHandler.announceActions = true;
 
-      for (const role in OutputRoleInfo) {
-        this.originalOutputContextValues_[role] =
-            OutputRoleInfo[role]['contextOrder'];
-      }
+    for (const role in OutputRoleInfo) {
+      this.originalOutputContextValues_[role] =
+          OutputRoleInfo[role]['contextOrder'];
     }
+    await ChromeVoxState.ready();
   }
 
   /** @override */
   async runWithLoadedTree(doc, opt_params = {}) {
     const rootWebArea = await super.runWithLoadedTree(doc, opt_params);
-    if (!this.isCommonClass) {
-      CommandHandlerInterface.instance.onCommand('nextObject');
-    }
+    CommandHandlerInterface.instance.onCommand('nextObject');
     return rootWebArea;
   }
 
@@ -172,3 +205,8 @@
     }
   }
 };
+
+// TODO: wasm logs errors if it takes too long to load (e.g. liblouis wasm).
+// Separately, LibLouis also logs errors.
+// See https://crbug.com/1170991.
+ChromeVoxNextE2ETest.prototype.failOnConsoleError = false;

chrome/browser/resources/chromeos/parent_access/parent_access.html

diff --git a/chrome/browser/resources/chromeos/parent_access/parent_access.html b/chrome/browser/resources/chromeos/parent_access/parent_access.html
index a25c6161..4dd5aadbc 100644
--- a/chrome/browser/resources/chromeos/parent_access/parent_access.html
+++ b/chrome/browser/resources/chromeos/parent_access/parent_access.html
@@ -17,6 +17,11 @@
     <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css">
     <link rel="stylesheet" href="chrome://resources/chromeos/colors/cros_styles.css">
     <script type="module" src="parent_access_app.js"></script>
+    <style>
+      body {
+        background-color: var(--cros-bg-color-elevation-1);
+      }
+    </style>
   </head>
   <body>
     <parent-access-app></parent-access-app>

chrome/browser/resources/conflicts/about_conflicts.html

diff --git a/chrome/browser/resources/conflicts/about_conflicts.html b/chrome/browser/resources/conflicts/about_conflicts.html
index 027b8c56..5eff272d 100644
--- a/chrome/browser/resources/conflicts/about_conflicts.html
+++ b/chrome/browser/resources/conflicts/about_conflicts.html
@@ -169,28 +169,28 @@
               <td valign="top">
                 <table cellpadding="2" cellspacing="0" border="0">
                   <tr>
-                    <td class="datacell">
+                    <th role="columnheader">
                       <span dir="ltr">Software</span>
-                    </td>
-                    <td class="datacell">
+                    </th>
+                    <th role="columnheader">
                       <span dir="ltr">Signed by</span>
-                    </td>
-                    <td class="datacell">
+                    </th>
+                    <th role="columnheader">
                       <span dir="ltr">Version</span>
-                    </td>
-                    <td class="datacell">
+                    </th>
+                    <th role="columnheader">
                       <span dir="ltr">Code Id</span>
-                    </td>
-                    <td class="datacell">
+                    </th>
+
+                    <th role="columnheader">
                       <span dir="ltr">Process types</span>
-                    </td>
-                    <td class="datacell">
+                    </th>
+                    <th role="columnheader">
                       <span dir="ltr">Location</span>
-                    </td>
-                    <td hidden$="[[!data.thirdPartyFeatureEnabled]]"
-                        class="datacell">
+                    </th>
+                    <th role="columnheader" hidden$="[[!data.thirdPartyFeatureEnabled]]">
                       <span dir="ltr">Conflicts Status</span>
-                    </td>
+                    </th>
                   </tr>
 
                   <template is="dom-repeat" items="[[data.moduleList]]">

chrome/browser/resources/settings/chromeos/BUILD.gn

diff --git a/chrome/browser/resources/settings/chromeos/BUILD.gn b/chrome/browser/resources/settings/chromeos/BUILD.gn
index 18c99a0..974e5ef6 100644
--- a/chrome/browser/resources/settings/chromeos/BUILD.gn
+++ b/chrome/browser/resources/settings/chromeos/BUILD.gn
@@ -294,7 +294,6 @@
 group("generate_web_components") {
   public_deps = [
     # Sub-folder targets
-    "internet_page:web_components",
     "multidevice_page:web_components",
     "nearby_share_page:web_components",
     "os_a11y_page:web_components",
@@ -307,7 +306,6 @@
 group("closure_compile_module") {
   deps = [
     ":closure_compile_local_module",
-    "internet_page:closure_compile_module",
     "multidevice_page:closure_compile_module",
     "os_a11y_page:closure_compile_module",
     "os_languages_page:closure_compile_module",

chrome/browser/resources/settings/chromeos/common/types.ts

diff --git a/chrome/browser/resources/settings/chromeos/common/types.ts b/chrome/browser/resources/settings/chromeos/common/types.ts
new file mode 100644
index 0000000..22eb6ed
--- /dev/null
+++ b/chrome/browser/resources/settings/chromeos/common/types.ts
@@ -0,0 +1,9 @@
+// Copyright 2022 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/**
+ * @fileoverview Common types/interfaces used throughout ChromeOS Settings
+ */
+
+export type Constructor<T> = new (...args: any[]) => T;

chrome/browser/resources/settings/chromeos/crostini_page/crostini_arc_adb.ts

diff --git a/chrome/browser/resources/settings/chromeos/crostini_page/crostini_arc_adb.ts b/chrome/browser/resources/settings/chromeos/crostini_page/crostini_arc_adb.ts
index 98ea2bdc..3868274 100644
--- a/chrome/browser/resources/settings/chromeos/crostini_page/crostini_arc_adb.ts
+++ b/chrome/browser/resources/settings/chromeos/crostini_page/crostini_arc_adb.ts
@@ -22,6 +22,7 @@
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
@@ -41,11 +42,9 @@
         [
           DeepLinkingBehavior,
         ],
-        RouteObserverMixin(WebUiListenerMixin(I18nMixin(PolymerElement)))) as {
-      new (): PolymerElement & DeepLinkingBehaviorInterface &
-          I18nMixinInterface & RouteObserverMixinInterface &
-          WebUiListenerMixinInterface,
-    };
+        RouteObserverMixin(WebUiListenerMixin(I18nMixin(PolymerElement)))) as
+    Constructor<PolymerElement&DeepLinkingBehaviorInterface&I18nMixinInterface&
+                RouteObserverMixinInterface&WebUiListenerMixinInterface>;
 
 class SettingsCrostiniArcAdbElement extends SettingsCrostiniArcAdbElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/crostini_page/crostini_export_import.ts

diff --git a/chrome/browser/resources/settings/chromeos/crostini_page/crostini_export_import.ts b/chrome/browser/resources/settings/chromeos/crostini_page/crostini_export_import.ts
index 3b32c36..eecf78a5 100644
--- a/chrome/browser/resources/settings/chromeos/crostini_page/crostini_export_import.ts
+++ b/chrome/browser/resources/settings/chromeos/crostini_page/crostini_export_import.ts
@@ -16,6 +16,7 @@
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {ContainerInfo, GuestId} from '../guest_os/guest_os_browser_proxy.js';
 import {equalContainerId} from '../guest_os/guest_os_container_select.js';
@@ -29,10 +30,9 @@
 const SettingsCrostiniExportImportElementBase =
     mixinBehaviors(
         [DeepLinkingBehavior],
-        RouteObserverMixin(WebUiListenerMixin(PolymerElement))) as {
-      new (): PolymerElement & DeepLinkingBehaviorInterface &
-          RouteObserverMixinInterface & WebUiListenerMixinInterface,
-    };
+        RouteObserverMixin(WebUiListenerMixin(PolymerElement))) as
+    Constructor<PolymerElement&DeepLinkingBehaviorInterface&
+                RouteObserverMixinInterface&WebUiListenerMixinInterface>;
 
 class SettingsCrostiniExportImportElement extends
     SettingsCrostiniExportImportElementBase {

chrome/browser/resources/settings/chromeos/crostini_page/crostini_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/crostini_page/crostini_page.ts b/chrome/browser/resources/settings/chromeos/crostini_page/crostini_page.ts
index 06653443..671c495 100644
--- a/chrome/browser/resources/settings/chromeos/crostini_page/crostini_page.ts
+++ b/chrome/browser/resources/settings/chromeos/crostini_page/crostini_page.ts
@@ -33,6 +33,7 @@
 
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
@@ -47,11 +48,10 @@
           DeepLinkingBehavior,
         ],
         PrefsMixin(RouteObserverMixin(
-            I18nMixin(WebUiListenerMixin(PolymerElement))))) as {
-      new (): PolymerElement & WebUiListenerMixinInterface &
-          I18nMixinInterface & RouteObserverMixinInterface &
-          PrefsMixinInterface & DeepLinkingBehaviorInterface,
-    };
+            I18nMixin(WebUiListenerMixin(PolymerElement))))) as
+    Constructor<PolymerElement&WebUiListenerMixinInterface&I18nMixinInterface&
+                RouteObserverMixinInterface&PrefsMixinInterface&
+                DeepLinkingBehaviorInterface>;
 
 class SettingsCrostiniPageElement extends SettingsCrostiniPageElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/crostini_page/crostini_subpage.ts

diff --git a/chrome/browser/resources/settings/chromeos/crostini_page/crostini_subpage.ts b/chrome/browser/resources/settings/chromeos/crostini_page/crostini_subpage.ts
index a527324..76c5357 100644
--- a/chrome/browser/resources/settings/chromeos/crostini_page/crostini_subpage.ts
+++ b/chrome/browser/resources/settings/chromeos/crostini_page/crostini_subpage.ts
@@ -26,6 +26,7 @@
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
 import {castExists} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {TERMINA_VM_TYPE} from '../guest_os/guest_os_browser_proxy.js';
 import {recordSettingChange} from '../metrics_recorder.js';
@@ -49,11 +50,9 @@
         [
           DeepLinkingBehavior,
         ],
-        RouteOriginMixin(PrefsMixin(WebUiListenerMixin(PolymerElement)))) as {
-      new (): PolymerElement & WebUiListenerMixinInterface &
-          PrefsMixinInterface & RouteOriginMixinInterface &
-          DeepLinkingBehaviorInterface,
-    };
+        RouteOriginMixin(PrefsMixin(WebUiListenerMixin(PolymerElement)))) as
+    Constructor<PolymerElement&WebUiListenerMixinInterface&PrefsMixinInterface&
+                RouteOriginMixinInterface&DeepLinkingBehaviorInterface>;
 
 class SettingsCrostiniSubpageElement extends
     SettingsCrostiniSubpageElementBase {

chrome/browser/resources/settings/chromeos/date_time_page/date_time_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/date_time_page/date_time_page.ts b/chrome/browser/resources/settings/chromeos/date_time_page/date_time_page.ts
index c81b85b..dcb971f 100644
--- a/chrome/browser/resources/settings/chromeos/date_time_page/date_time_page.ts
+++ b/chrome/browser/resources/settings/chromeos/date_time_page/date_time_page.ts
@@ -20,11 +20,12 @@
 
 import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js';
 import {WebUiListenerMixin, WebUiListenerMixinInterface} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
@@ -39,11 +40,10 @@
           DeepLinkingBehavior,
         ],
         RouteObserverMixin(
-            PrefsMixin(I18nMixin(WebUiListenerMixin(PolymerElement))))) as {
-      new (): PolymerElement & WebUiListenerMixinInterface &
-          I18nMixinInterface & PrefsMixinInterface &
-          RouteObserverMixinInterface & DeepLinkingBehaviorInterface,
-    };
+            PrefsMixin(I18nMixin(WebUiListenerMixin(PolymerElement))))) as
+    Constructor<PolymerElement&WebUiListenerMixinInterface&I18nMixinInterface&
+                PrefsMixinInterface&RouteObserverMixinInterface&
+                DeepLinkingBehaviorInterface>;
 
 class SettingsDateTimePageElement extends SettingsDateTimePageElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/date_time_page/timezone_selector.ts

diff --git a/chrome/browser/resources/settings/chromeos/date_time_page/timezone_selector.ts b/chrome/browser/resources/settings/chromeos/date_time_page/timezone_selector.ts
index fea84a0..32789b53 100644
--- a/chrome/browser/resources/settings/chromeos/date_time_page/timezone_selector.ts
+++ b/chrome/browser/resources/settings/chromeos/date_time_page/timezone_selector.ts
@@ -9,10 +9,10 @@
 import '../../settings_shared.css.js';
 import '../../controls/settings_dropdown_menu.js';
 
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {DropdownMenuOptionList} from '../../controls/settings_dropdown_menu.js';
-import {loadTimeData} from '../../i18n_setup.js';
 import {PrefsMixin} from '../../prefs/prefs_mixin.js';
 import {CrSettingsPrefs} from '../../prefs/prefs_types.js';
 

chrome/browser/resources/settings/chromeos/date_time_page/timezone_subpage.ts

diff --git a/chrome/browser/resources/settings/chromeos/date_time_page/timezone_subpage.ts b/chrome/browser/resources/settings/chromeos/date_time_page/timezone_subpage.ts
index 65dae1b..ab1ca71 100644
--- a/chrome/browser/resources/settings/chromeos/date_time_page/timezone_subpage.ts
+++ b/chrome/browser/resources/settings/chromeos/date_time_page/timezone_subpage.ts
@@ -20,6 +20,7 @@
 import {SettingsDropdownMenuElement} from '../../controls/settings_dropdown_menu.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
@@ -42,11 +43,9 @@
         [
           DeepLinkingBehavior,
         ],
-        RouteObserverMixin(PrefsMixin(WebUiListenerMixin(PolymerElement)))) as {
-      new (): PolymerElement & WebUiListenerMixinInterface &
-          PrefsMixinInterface & RouteObserverMixinInterface &
-          DeepLinkingBehaviorInterface,
-    };
+        RouteObserverMixin(PrefsMixin(WebUiListenerMixin(PolymerElement)))) as
+    Constructor<PolymerElement&WebUiListenerMixinInterface&PrefsMixinInterface&
+                RouteObserverMixinInterface&DeepLinkingBehaviorInterface>;
 
 class TimezoneSubpageElement extends TimezoneSubpageElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/device_page/display.ts

diff --git a/chrome/browser/resources/settings/chromeos/device_page/display.ts b/chrome/browser/resources/settings/chromeos/device_page/display.ts
index ea94610e..f2e38e6cd 100644
--- a/chrome/browser/resources/settings/chromeos/device_page/display.ts
+++ b/chrome/browser/resources/settings/chromeos/device_page/display.ts
@@ -37,6 +37,7 @@
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
 import {assertExists, cast, castExists} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
@@ -85,11 +86,9 @@
 const SettingsDisplayElementBase =
     mixinBehaviors(
         [DeepLinkingBehavior],
-        PrefsMixin(RouteObserverMixin(I18nMixin(PolymerElement)))) as {
-      new (): PolymerElement & I18nMixinInterface &
-          RouteObserverMixinInterface & PrefsMixinInterface &
-          DeepLinkingBehaviorInterface,
-    };
+        PrefsMixin(RouteObserverMixin(I18nMixin(PolymerElement)))) as
+    Constructor<PolymerElement&I18nMixinInterface&RouteObserverMixinInterface&
+                PrefsMixinInterface&DeepLinkingBehaviorInterface>;
 
 class SettingsDisplayElement extends SettingsDisplayElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/device_page/display_layout.ts

diff --git a/chrome/browser/resources/settings/chromeos/device_page/display_layout.ts b/chrome/browser/resources/settings/chromeos/device_page/display_layout.ts
index 52124dde..7551859a 100644
--- a/chrome/browser/resources/settings/chromeos/device_page/display_layout.ts
+++ b/chrome/browser/resources/settings/chromeos/device_page/display_layout.ts
@@ -16,6 +16,7 @@
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {castExists} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 
 import {DevicePageBrowserProxy, DevicePageBrowserProxyImpl} from './device_page_browser_proxy.js';
 import {getTemplate} from './display_layout.html.js';
@@ -50,9 +51,8 @@
 }
 
 const DisplayLayoutElementBase =
-    mixinBehaviors([IronResizableBehavior], LayoutMixin(PolymerElement)) as {
-      new (): PolymerElement & LayoutMixinInterface,
-    };
+    mixinBehaviors([IronResizableBehavior], LayoutMixin(PolymerElement)) as
+    Constructor<PolymerElement&LayoutMixinInterface>;
 
 class DisplayLayoutElement extends DisplayLayoutElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/device_page/drag_mixin.ts

diff --git a/chrome/browser/resources/settings/chromeos/device_page/drag_mixin.ts b/chrome/browser/resources/settings/chromeos/device_page/drag_mixin.ts
index 98420de8..346c778f 100644
--- a/chrome/browser/resources/settings/chromeos/device_page/drag_mixin.ts
+++ b/chrome/browser/resources/settings/chromeos/device_page/drag_mixin.ts
@@ -11,6 +11,7 @@
 import {dedupingMixin, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {cast} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 
 export interface Position {
   x: number;
@@ -28,8 +29,6 @@
 
 type DragCallback = (id: string, amount: Position|null) => void;
 
-type Constructor<T> = new (...args: any[]) => T;
-
 export interface DragMixinInterface {
   dragId: string;
   dragEnabled: boolean;

chrome/browser/resources/settings/chromeos/device_page/fake_cros_audio_config.ts

diff --git a/chrome/browser/resources/settings/chromeos/device_page/fake_cros_audio_config.ts b/chrome/browser/resources/settings/chromeos/device_page/fake_cros_audio_config.ts
index 0413919f..8ee227d 100644
--- a/chrome/browser/resources/settings/chromeos/device_page/fake_cros_audio_config.ts
+++ b/chrome/browser/resources/settings/chromeos/device_page/fake_cros_audio_config.ts
@@ -79,7 +79,6 @@
 // handle audio input.
 export interface FakeAudioSystemProperties extends AudioSystemPropertiesMojom {
   inputDevices: AudioDevice[];
-  inputMuteState: MuteState;
   inputVolumePercent: number;
 }
 

chrome/browser/resources/settings/chromeos/device_page/keyboard.ts

diff --git a/chrome/browser/resources/settings/chromeos/device_page/keyboard.ts b/chrome/browser/resources/settings/chromeos/device_page/keyboard.ts
index d70eacb..f8301de 100644
--- a/chrome/browser/resources/settings/chromeos/device_page/keyboard.ts
+++ b/chrome/browser/resources/settings/chromeos/device_page/keyboard.ts
@@ -16,13 +16,14 @@
 
 import {focusWithoutInk} from 'chrome://resources/ash/common/focus_without_ink_js.js';
 import {WebUiListenerMixin, WebUiListenerMixinInterface} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {afterNextRender, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {DropdownMenuOptionList} from '../../controls/settings_dropdown_menu.js';
 import {FocusConfig} from '../../focus_config.js';
-import {loadTimeData} from '../../i18n_setup.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {castExists} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
@@ -49,10 +50,9 @@
 const SettingsKeyboardElementBase =
     mixinBehaviors(
         [DeepLinkingBehavior],
-        RouteObserverMixin(WebUiListenerMixin(PolymerElement))) as {
-      new (): PolymerElement & WebUiListenerMixinInterface &
-          RouteObserverMixinInterface & DeepLinkingBehaviorInterface,
-    };
+        RouteObserverMixin(WebUiListenerMixin(PolymerElement))) as
+    Constructor<PolymerElement&WebUiListenerMixinInterface&
+                RouteObserverMixinInterface&DeepLinkingBehaviorInterface>;
 
 class SettingsKeyboardElement extends SettingsKeyboardElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/device_page/layout_mixin.ts

diff --git a/chrome/browser/resources/settings/chromeos/device_page/layout_mixin.ts b/chrome/browser/resources/settings/chromeos/device_page/layout_mixin.ts
index c755544..fac7926 100644
--- a/chrome/browser/resources/settings/chromeos/device_page/layout_mixin.ts
+++ b/chrome/browser/resources/settings/chromeos/device_page/layout_mixin.ts
@@ -10,6 +10,8 @@
 import {assert} from 'chrome://resources/js/assert_ts.js';
 import {dedupingMixin, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
+import {Constructor} from '../common/types.js';
+
 import {getDisplayApi} from './device_page_browser_proxy.js';
 import {DragMixin, DragMixinInterface, Position} from './drag_mixin.js';
 
@@ -18,8 +20,6 @@
 import DisplayUnitInfo = chrome.system.display.DisplayUnitInfo;
 import LayoutPosition = chrome.system.display.LayoutPosition;
 
-type Constructor<T> = new (...args: any[]) => T;
-
 export {Position};
 
 export interface LayoutMixinInterface extends DragMixinInterface {

chrome/browser/resources/settings/chromeos/device_page/per_device_keyboard.ts

diff --git a/chrome/browser/resources/settings/chromeos/device_page/per_device_keyboard.ts b/chrome/browser/resources/settings/chromeos/device_page/per_device_keyboard.ts
index b5c418425..84ce8653 100644
--- a/chrome/browser/resources/settings/chromeos/device_page/per_device_keyboard.ts
+++ b/chrome/browser/resources/settings/chromeos/device_page/per_device_keyboard.ts
@@ -11,18 +11,17 @@
 import '../../icons.html.js';
 import '../../settings_shared.css.js';
 
-import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js';
+import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js';
 import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+
 import {routes} from '../os_route.js';
+import {RouteObserverMixin} from '../route_observer_mixin.js';
 import {Route} from '../router.js';
-import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
 
 import {getTemplate} from './per_device_keyboard.html.js';
 
 const SettingsPerDeviceKeyboardElementBase =
-    RouteObserverMixin(I18nMixin(PolymerElement)) as {
-      new (): PolymerElement & I18nMixinInterface & RouteObserverMixinInterface,
-    };
+    RouteObserverMixin(I18nMixin(PolymerElement));
 
 class SettingsPerDeviceKeyboardElement extends
     SettingsPerDeviceKeyboardElementBase {
@@ -58,4 +57,4 @@
 }
 
 customElements.define(
-    SettingsPerDeviceKeyboardElement.is, SettingsPerDeviceKeyboardElement);
\ No newline at end of file
+    SettingsPerDeviceKeyboardElement.is, SettingsPerDeviceKeyboardElement);

chrome/browser/resources/settings/chromeos/device_page/per_device_pointing_stick.ts

diff --git a/chrome/browser/resources/settings/chromeos/device_page/per_device_pointing_stick.ts b/chrome/browser/resources/settings/chromeos/device_page/per_device_pointing_stick.ts
index eb6cd92..ddbca3dd 100644
--- a/chrome/browser/resources/settings/chromeos/device_page/per_device_pointing_stick.ts
+++ b/chrome/browser/resources/settings/chromeos/device_page/per_device_pointing_stick.ts
@@ -11,19 +11,17 @@
 import '../../icons.html.js';
 import '../../settings_shared.css.js';
 
-import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js';
+import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js';
 import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {routes} from '../os_route.js';
-import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
+import {RouteObserverMixin} from '../route_observer_mixin.js';
 import {Route} from '../router.js';
 
 import {getTemplate} from './per_device_pointing_stick.html.js';
 
 const SettingsPerDevicePointingStickElementBase =
-    RouteObserverMixin(I18nMixin(PolymerElement)) as {
-      new (): PolymerElement & I18nMixinInterface & RouteObserverMixinInterface,
-    };
+    RouteObserverMixin(I18nMixin(PolymerElement));
 
 class SettingsPerDevicePointingStickElement extends
     SettingsPerDevicePointingStickElementBase {

chrome/browser/resources/settings/chromeos/device_page/per_device_touchpad.ts

diff --git a/chrome/browser/resources/settings/chromeos/device_page/per_device_touchpad.ts b/chrome/browser/resources/settings/chromeos/device_page/per_device_touchpad.ts
index 7f54cbb1..757080e1 100644
--- a/chrome/browser/resources/settings/chromeos/device_page/per_device_touchpad.ts
+++ b/chrome/browser/resources/settings/chromeos/device_page/per_device_touchpad.ts
@@ -11,19 +11,17 @@
 import '../../icons.html.js';
 import '../../settings_shared.css.js';
 
-import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js';
+import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js';
 import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {routes} from '../os_route.js';
-import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
+import {RouteObserverMixin} from '../route_observer_mixin.js';
 import {Route} from '../router.js';
 
 import {getTemplate} from './per_device_touchpad.html.js';
 
 const SettingsPerDeviceTouchpadElementBase =
-    RouteObserverMixin(I18nMixin(PolymerElement)) as {
-      new (): PolymerElement & I18nMixinInterface & RouteObserverMixinInterface,
-    };
+    RouteObserverMixin(I18nMixin(PolymerElement));
 
 class SettingsPerDeviceTouchpadElement extends
     SettingsPerDeviceTouchpadElementBase {

chrome/browser/resources/settings/chromeos/device_page/pointers.ts

diff --git a/chrome/browser/resources/settings/chromeos/device_page/pointers.ts b/chrome/browser/resources/settings/chromeos/device_page/pointers.ts
index 70761b9..f7efee59 100644
--- a/chrome/browser/resources/settings/chromeos/device_page/pointers.ts
+++ b/chrome/browser/resources/settings/chromeos/device_page/pointers.ts
@@ -20,6 +20,7 @@
 
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
@@ -30,10 +31,9 @@
 const SettingsPointersElementBase =
     mixinBehaviors(
         [DeepLinkingBehavior],
-        RouteObserverMixin(PrefsMixin(PolymerElement))) as {
-      new (): PolymerElement & PrefsMixinInterface &
-          RouteObserverMixinInterface & DeepLinkingBehaviorInterface,
-    };
+        RouteObserverMixin(PrefsMixin(PolymerElement))) as
+    Constructor<PolymerElement&PrefsMixinInterface&RouteObserverMixinInterface&
+                DeepLinkingBehaviorInterface>;
 
 class SettingsPointersElement extends SettingsPointersElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/device_page/power.ts

diff --git a/chrome/browser/resources/settings/chromeos/device_page/power.ts b/chrome/browser/resources/settings/chromeos/device_page/power.ts
index d6bfd17..13e179da 100644
--- a/chrome/browser/resources/settings/chromeos/device_page/power.ts
+++ b/chrome/browser/resources/settings/chromeos/device_page/power.ts
@@ -23,6 +23,7 @@
 import {SettingsToggleButtonElement} from '../../controls/settings_toggle_button.js';
 import {SettingChangeValue} from '../../mojom-webui/search/user_action_recorder.mojom-webui.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {recordSettingChange} from '../metrics_recorder.js';
 import {routes} from '../os_route.js';
@@ -51,11 +52,9 @@
         [
           DeepLinkingBehavior,
         ],
-        RouteObserverMixin(WebUiListenerMixin(I18nMixin(PolymerElement)))) as {
-      new (): PolymerElement & I18nMixinInterface &
-          WebUiListenerMixinInterface & RouteObserverMixinInterface &
-          DeepLinkingBehaviorInterface,
-    };
+        RouteObserverMixin(WebUiListenerMixin(I18nMixin(PolymerElement)))) as
+    Constructor<PolymerElement&I18nMixinInterface&WebUiListenerMixinInterface&
+                RouteObserverMixinInterface&DeepLinkingBehaviorInterface>;
 
 class SettingsPowerElement extends SettingsPowerElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/device_page/stylus.ts

diff --git a/chrome/browser/resources/settings/chromeos/device_page/stylus.ts b/chrome/browser/resources/settings/chromeos/device_page/stylus.ts
index 3ae8f0b..3714e927 100644
--- a/chrome/browser/resources/settings/chromeos/device_page/stylus.ts
+++ b/chrome/browser/resources/settings/chromeos/device_page/stylus.ts
@@ -21,6 +21,7 @@
 
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {assertExists} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {recordSettingChange} from '../metrics_recorder.js';
 import {routes} from '../os_route.js';
@@ -41,10 +42,8 @@
 
 const SettingsStylusElementBase =
     mixinBehaviors([DeepLinkingBehavior], RouteObserverMixin(PolymerElement)) as
-    {
-      new (): PolymerElement & DeepLinkingBehaviorInterface &
-          RouteObserverMixinInterface,
-    };
+    Constructor<PolymerElement&DeepLinkingBehaviorInterface&
+                RouteObserverMixinInterface>;
 
 class SettingsStylusElement extends SettingsStylusElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/google_assistant_page/google_assistant_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/google_assistant_page/google_assistant_page.ts b/chrome/browser/resources/settings/chromeos/google_assistant_page/google_assistant_page.ts
index b92d4d6..5ecc49c2 100644
--- a/chrome/browser/resources/settings/chromeos/google_assistant_page/google_assistant_page.ts
+++ b/chrome/browser/resources/settings/chromeos/google_assistant_page/google_assistant_page.ts
@@ -24,6 +24,7 @@
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
 import {cast, castExists} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {recordSettingChange} from '../metrics_recorder.js';
 import {routes} from '../os_route.js';
@@ -69,11 +70,10 @@
           DeepLinkingBehavior,
         ],
         RouteObserverMixin(
-            PrefsMixin(WebUiListenerMixin(I18nMixin(PolymerElement))))) as {
-      new (): PolymerElement & I18nMixinInterface &
-          WebUiListenerMixinInterface & PrefsMixinInterface &
-          RouteObserverMixinInterface & DeepLinkingBehaviorInterface,
-    };
+            PrefsMixin(WebUiListenerMixin(I18nMixin(PolymerElement))))) as
+    Constructor<PolymerElement&I18nMixinInterface&WebUiListenerMixinInterface&
+                PrefsMixinInterface&RouteObserverMixinInterface&
+                DeepLinkingBehaviorInterface>;
 
 class SettingsGoogleAssistantPageElement extends
     SettingsGoogleAssistantPageElementBase {

chrome/browser/resources/settings/chromeos/internet_page/BUILD.gn

diff --git a/chrome/browser/resources/settings/chromeos/internet_page/BUILD.gn b/chrome/browser/resources/settings/chromeos/internet_page/BUILD.gn
deleted file mode 100644
index b3e63e73..0000000
--- a/chrome/browser/resources/settings/chromeos/internet_page/BUILD.gn
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2018 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//chrome/browser/resources/settings/chromeos/os_settings.gni")
-import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/html_to_js.gni")
-import("../os_settings.gni")
-
-js_type_check("closure_compile_module") {
-  closure_flags = os_settings_closure_flags
-  is_polymer3 = true
-  deps = [
-    ":internet_page",
-    ":internet_page_browser_proxy",
-    ":internet_subpage",
-  ]
-}
-
-js_library("internet_page") {
-  deps = [
-    ":internet_page_browser_proxy",
-    ":internet_subpage",
-    "//ash/webui/common/resources:i18n_behavior",
-    "//ash/webui/common/resources:web_ui_listener_behavior",
-    "//ash/webui/common/resources/cellular_setup:cellular_types",
-    "//ash/webui/common/resources/cellular_setup:esim_manager_utils",
-    "//ash/webui/common/resources/network:cellular_utils",
-    "//ash/webui/common/resources/network:mojo_interface_provider",
-    "//ash/webui/common/resources/network:network_listener_behavior",
-    "//ash/webui/common/resources/network:onc_mojo",
-    "//ash/webui/common/resources/network:sim_lock_dialogs",
-    "//chrome/browser/resources/settings/chromeos:deep_linking_behavior",
-    "//chrome/browser/resources/settings/chromeos:metrics_recorder",
-    "//chrome/browser/resources/settings/chromeos:os_route",
-    "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
-    "//chrome/browser/resources/settings/chromeos:router",
-    "//chromeos/ash/services/hotspot_config/public/mojom:mojom_webui_js",
-    "//third_party/polymer/v3_0/components-chromium/iron-icon:iron-icon",
-    "//third_party/polymer/v3_0/components-chromium/paper-tooltip:paper-tooltip",
-    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-  ]
-  externs_list = [
-    "../settings_controls_types.js",
-    "$externs_path/settings_private.js",
-    "//ui/webui/resources/cr_elements/cr_toast/cr_toast_externs.js",
-    "//ui/webui/resources/cr_elements/policy/cr_policy_indicator_externs.js",
-  ]
-}
-
-js_library("internet_page_browser_proxy") {
-  externs_list = [ "$externs_path/chrome_send.js" ]
-}
-
-js_library("internet_subpage") {
-  deps = [
-    ":internet_page_browser_proxy",
-    "//ash/webui/common/resources:i18n_behavior",
-    "//ash/webui/common/resources/cellular_setup:cellular_types",
-    "//ash/webui/common/resources/network:cr_policy_network_behavior_mojo",
-    "//ash/webui/common/resources/network:network_list",
-    "//ash/webui/common/resources/network:network_listener_behavior",
-    "//ash/webui/common/resources/network:onc_mojo",
-    "//chrome/browser/resources/settings/chromeos:deep_linking_behavior",
-    "//chrome/browser/resources/settings/chromeos:metrics_recorder",
-    "//chrome/browser/resources/settings/chromeos:os_route",
-    "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
-    "//chrome/browser/resources/settings/chromeos:route_origin_behavior",
-    "//chrome/browser/resources/settings/chromeos:router",
-    "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout-classes",
-    "//third_party/polymer/v3_0/components-chromium/iron-icon:iron-icon",
-    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-  ]
-  externs_list = [
-    "//ui/webui/resources/cr_elements/cr_toggle/cr_toggle_externs.js",
-    "//ui/webui/resources/cr_elements/policy/cr_policy_indicator_externs.js",
-  ]
-}
-
-html_to_js("web_components") {
-  js_files = [
-    "internet_page.js",
-    "internet_subpage.js",
-  ]
-}

chrome/browser/resources/settings/chromeos/internet_page/apn_subpage.ts

diff --git a/chrome/browser/resources/settings/chromeos/internet_page/apn_subpage.ts b/chrome/browser/resources/settings/chromeos/internet_page/apn_subpage.ts
index e33983a..aca8e2dd 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/apn_subpage.ts
+++ b/chrome/browser/resources/settings/chromeos/internet_page/apn_subpage.ts
@@ -20,6 +20,7 @@
 import {NetworkType} from 'chrome://resources/mojo/chromeos/services/network_config/public/mojom/network_types.mojom-webui.js';
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
+import {Constructor} from '../common/types.js';
 import {routes} from '../os_route.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
 import {Route, Router} from '../router.js';
@@ -36,10 +37,9 @@
                                   [
                                     NetworkListenerBehavior,
                                   ],
-                                  RouteObserverMixin(PolymerElement)) as {
-  new (): PolymerElement & RouteObserverMixinInterface &
-      NetworkListenerBehaviorInterface,
-};
+                                  RouteObserverMixin(PolymerElement)) as
+    Constructor<PolymerElement&RouteObserverMixinInterface&
+                NetworkListenerBehaviorInterface>;
 
 export class ApnSubpageElement extends ApnSubpageElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/internet_page/cellular_networks_list.ts

diff --git a/chrome/browser/resources/settings/chromeos/internet_page/cellular_networks_list.ts b/chrome/browser/resources/settings/chromeos/internet_page/cellular_networks_list.ts
index 5b6280b..ee2dad5 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/cellular_networks_list.ts
+++ b/chrome/browser/resources/settings/chromeos/internet_page/cellular_networks_list.ts
@@ -38,6 +38,7 @@
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {castExists} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 import {MultiDeviceBrowserProxyImpl} from '../multidevice_page/multidevice_browser_proxy.js';
 import {MultiDeviceFeatureState, MultiDevicePageContentData} from '../multidevice_page/multidevice_constants.js';
 
@@ -52,10 +53,9 @@
 const CellularNetworksListElementBase =
     mixinBehaviors(
         [ESimManagerListenerBehavior],
-        WebUiListenerMixin(I18nMixin(PolymerElement))) as {
-      new (): PolymerElement & I18nMixinInterface &
-          WebUiListenerMixinInterface & ESimManagerListenerBehaviorInterface,
-    };
+        WebUiListenerMixin(I18nMixin(PolymerElement))) as
+    Constructor<PolymerElement&I18nMixinInterface&WebUiListenerMixinInterface&
+                ESimManagerListenerBehaviorInterface>;
 
 class CellularNetworksListElement extends CellularNetworksListElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/internet_page/internet_detail_menu.ts

diff --git a/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_menu.ts b/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_menu.ts
index 2ee0007..858503d 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_menu.ts
+++ b/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_menu.ts
@@ -23,6 +23,7 @@
 
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {castExists} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
@@ -39,10 +40,10 @@
 const SettingsInternetDetailMenuElementBase =
     mixinBehaviors(
         [ESimManagerListenerBehavior, DeepLinkingBehavior],
-        RouteObserverMixin(PolymerElement)) as {
-      new (): PolymerElement & RouteObserverMixinInterface &
-          ESimManagerListenerBehaviorInterface & DeepLinkingBehaviorInterface,
-    };
+        RouteObserverMixin(PolymerElement)) as
+    Constructor<PolymerElement&RouteObserverMixinInterface&
+                ESimManagerListenerBehaviorInterface&
+                DeepLinkingBehaviorInterface>;
 
 class SettingsInternetDetailMenuElement extends
     SettingsInternetDetailMenuElementBase {

chrome/browser/resources/settings/chromeos/internet_page/internet_detail_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_page.ts b/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_page.ts
index a78ed73a..8b51531 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_page.ts
+++ b/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_page.ts
@@ -52,6 +52,7 @@
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
 import {assertExists, castExists} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {recordSettingChange} from '../metrics_recorder.js';
 import {OsSyncBrowserProxy, OsSyncBrowserProxyImpl, OsSyncPrefs} from '../os_people_page/os_sync_browser_proxy.js';
@@ -72,12 +73,12 @@
           DeepLinkingBehavior,
         ],
         PrefsMixin(RouteObserverMixin(
-            WebUiListenerMixin(I18nMixin(PolymerElement))))) as {
-      new (): PolymerElement & I18nMixinInterface &
-          WebUiListenerMixinInterface & RouteObserverMixinInterface &
-          PrefsMixinInterface & NetworkListenerBehaviorInterface &
-          CrPolicyNetworkBehaviorMojoInterface & DeepLinkingBehaviorInterface,
-    };
+            WebUiListenerMixin(I18nMixin(PolymerElement))))) as
+    Constructor<PolymerElement&I18nMixinInterface&WebUiListenerMixinInterface&
+                RouteObserverMixinInterface&PrefsMixinInterface&
+                NetworkListenerBehaviorInterface&
+                CrPolicyNetworkBehaviorMojoInterface&
+                DeepLinkingBehaviorInterface>;
 
 class SettingsInternetDetailPageElement extends
     SettingsInternetDetailPageElementBase {
@@ -1605,7 +1606,7 @@
   }
 
   private onActivateTap_(): void {
-    this.browserProxy_.showCellularSetupUI(this.guid);
+    this.browserProxy_.showCellularSetupUi(this.guid);
   }
 
   private onConfigureTap_(): void {

chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_page.ts b/chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_page.ts
index f9e0747..007c8bc5 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_page.ts
+++ b/chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_page.ts
@@ -26,6 +26,7 @@
 
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {assertExists} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {recordSettingChange} from '../metrics_recorder.js';
 import {routes} from '../os_route.js';
@@ -47,12 +48,10 @@
           NetworkListenerBehavior,
           CrPolicyNetworkBehaviorMojo,
         ],
-        RouteObserverMixin(I18nMixin(PolymerElement))) as {
-      new (): PolymerElement & I18nMixinInterface &
-          RouteObserverMixinInterface & DeepLinkingBehaviorInterface &
-          NetworkListenerBehaviorInterface &
-          CrPolicyNetworkBehaviorMojoInterface,
-    };
+        RouteObserverMixin(I18nMixin(PolymerElement))) as
+    Constructor<PolymerElement&I18nMixinInterface&RouteObserverMixinInterface&
+                DeepLinkingBehaviorInterface&NetworkListenerBehaviorInterface&
+                CrPolicyNetworkBehaviorMojoInterface>;
 
 class SettingsInternetKnownNetworksPageElement extends
     SettingsInternetKnownNetworksPageElementBase {

chrome/browser/resources/settings/chromeos/internet_page/internet_page.html

diff --git a/chrome/browser/resources/settings/chromeos/internet_page/internet_page.html b/chrome/browser/resources/settings/chromeos/internet_page/internet_page.html
index 2960dfc..2790b36 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/internet_page.html
+++ b/chrome/browser/resources/settings/chromeos/internet_page/internet_page.html
@@ -68,7 +68,7 @@
             </div>
           </template>
           <div actionable$="[[!vpnIsProhibited_]]" class="list-item"
-              on-click="onAddVPNTap_">
+              on-click="onAddVpnTap_">
             <div class="start settings-box-text"
                 id="add-vpn-label" aria-hidden="true">
               $i18n{internetAddVPN}
@@ -203,7 +203,7 @@
 
 <template is="dom-if" if="[[showESimProfileRenameDialog_]]" restamp>
   <esim-rename-dialog id="esimRenameDialog"
-      on-close="onCloseESimProfileRenameDialog_"
+      on-close="onCloseEsimProfileRenameDialog_"
       network-state="[[eSimNetworkState_]]"
       show-cellular-disconnect-warning="[[hasActiveCellularNetwork_]]">
   </esim-rename-dialog>
@@ -211,7 +211,7 @@
 
 <template is="dom-if" if="[[showESimRemoveProfileDialog_]]" restamp>
   <esim-remove-profile-dialog id="esimRemoveProfileDialog"
-      on-close="onCloseESimRemoveProfileDialog_"
+      on-close="onCloseEsimRemoveProfileDialog_"
       on-show-error-toast="onShowErrorToast_"
       network-state="[[eSimNetworkState_]]"
       show-cellular-disconnect-warning="[[hasActiveCellularNetwork_]]">

chrome/browser/resources/settings/chromeos/internet_page/internet_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/internet_page/internet_page.js b/chrome/browser/resources/settings/chromeos/internet_page/internet_page.ts
similarity index 61%
rename from chrome/browser/resources/settings/chromeos/internet_page/internet_page.js
rename to chrome/browser/resources/settings/chromeos/internet_page/internet_page.ts
index cacc54de..6fbed553 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/internet_page.js
+++ b/chrome/browser/resources/settings/chromeos/internet_page/internet_page.ts
@@ -33,118 +33,94 @@
 import './esim_rename_dialog.js';
 import './esim_remove_profile_dialog.js';
 
-import {assert, assertNotReached} from 'chrome://resources/ash/common/assert.js';
 import {CellularSetupPageName} from 'chrome://resources/ash/common/cellular_setup/cellular_types.js';
 import {getNumESimProfiles} from 'chrome://resources/ash/common/cellular_setup/esim_manager_utils.js';
-import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/ash/common/i18n_behavior.js';
-import {loadTimeData} from 'chrome://resources/ash/common/load_time_data.m.js';
 import {hasActiveCellularNetwork, isConnectedToNonCellularNetwork} from 'chrome://resources/ash/common/network/cellular_utils.js';
-import {MojoInterfaceProvider, MojoInterfaceProviderImpl} from 'chrome://resources/ash/common/network/mojo_interface_provider.js';
+import {MojoInterfaceProviderImpl} from 'chrome://resources/ash/common/network/mojo_interface_provider.js';
 import {NetworkListenerBehavior, NetworkListenerBehaviorInterface} from 'chrome://resources/ash/common/network/network_listener_behavior.js';
 import {OncMojo} from 'chrome://resources/ash/common/network/onc_mojo.js';
-import {WebUIListenerBehavior, WebUIListenerBehaviorInterface} from 'chrome://resources/ash/common/web_ui_listener_behavior.js';
+import {CrToastElement} from 'chrome://resources/cr_elements/cr_toast/cr_toast.js';
+import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js';
+import {WebUiListenerMixin, WebUiListenerMixinInterface} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js';
+import {assert, assertNotReached} from 'chrome://resources/js/assert_ts.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {HotspotInfo} from 'chrome://resources/mojo/chromeos/ash/services/hotspot_config/public/mojom/cros_hotspot_config.mojom-webui.js';
 import {CrosNetworkConfigRemote, GlobalPolicy, NetworkStateProperties, StartConnectResult, VpnProvider} from 'chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom-webui.js';
 import {DeviceStateType, NetworkType} from 'chrome://resources/mojo/chromeos/services/network_config/public/mojom/network_types.mojom-webui.js';
-import {afterNextRender, html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+import {afterNextRender, DomRepeatEvent, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
+import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
+import {castExists} from '../assert_extras.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {recordSettingChange} from '../metrics_recorder.js';
 import {routes} from '../os_route.js';
-import {RouteObserverBehavior, RouteObserverBehaviorInterface} from '../route_observer_behavior.js';
+import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
 import {Route, Router} from '../router.js';
 
+import {ApnSubpageElement} from './apn_subpage.js';
+import {InternetConfigElement} from './internet_config.js';
+import {getTemplate} from './internet_page.html.js';
 import {InternetPageBrowserProxy, InternetPageBrowserProxyImpl} from './internet_page_browser_proxy.js';
 
-// TODO(crbug/1315757) The following type definitions are only needed for
-// Closure compiler and can be removed when this file is converted to TS.
-/**
- * @constructor
- * @extends {HTMLElement}
- */
-function NetworkSummaryItemElement() {}
-/** @return {?CrToggleElement} */
-NetworkSummaryItemElement.prototype.getDeviceEnabledToggle = function() {};
-
-/**
- * @constructor
- * @extends {HTMLElement}
- */
-function NetworkSummaryElement() {}
-/**
- * @param {?NetworkType} networkType
- * @return {?NetworkSummaryItemElement}
- */
-NetworkSummaryElement.prototype.getNetworkRow = function(networkType) {};
-
-/**
- * @constructor
- * @extends {HTMLElement}
- */
-function InternetConfigElement() {}
-/** @type {string} */
-InternetConfigElement.prototype.guid;
-/** @type {string} */
-InternetConfigElement.prototype.name;
-/** @type {boolean} */
-InternetConfigElement.prototype.showConnect;
-/** @type {string} */
-InternetConfigElement.prototype.type;
-InternetConfigElement.prototype.open = function() {};
-
-/**
- * @constructor
- * @extends {HTMLElement}
- */
-function ApnSubpageElement() {}
-ApnSubpageElement.prototype.openApnDetailDialogInCreateMode = function() {};
-
-/** @type {number} */
 const ESIM_PROFILE_LIMIT = 5;
 
-/**
- * @constructor
- * @extends {PolymerElement}
- * @implements {NetworkListenerBehaviorInterface}
- * @implements {DeepLinkingBehaviorInterface}
- * @implements {I18nBehaviorInterface}
- * @implements {RouteObserverBehaviorInterface}
- * @implements {WebUIListenerBehaviorInterface}
- */
-const SettingsInternetPageElementBase = mixinBehaviors(
-    [
-      NetworkListenerBehavior,
-      DeepLinkingBehavior,
-      I18nBehavior,
-      RouteObserverBehavior,
-      WebUIListenerBehavior,
-    ],
-    PolymerElement);
+declare global {
+  interface HTMLElementEventMap {
+    'device-enabled-toggled':
+        CustomEvent<{enabled: boolean, type: NetworkType}>;
+    'network-connect': CustomEvent<{
+      networkState: OncMojo.NetworkStateProperties,
+      bypassConnectionDialog: boolean|undefined,
+    }>;
+    'show-cellular-setup': CustomEvent<{pageName: CellularSetupPageName}>;
+    'show-config':
+        CustomEvent<{type: string, guid: string|null, name: string|null}>;
+    'show-detail': CustomEvent<OncMojo.NetworkStateProperties>;
+    'show-error-toast': CustomEvent<string>;
+    'show-esim-profile-rename-dialog':
+        CustomEvent<{networkState: NetworkStateProperties}>;
+    'show-esim-remove-profile-dialog':
+        CustomEvent<{networkState: NetworkStateProperties}>;
+    'show-known-networks': CustomEvent<NetworkType>;
+    'show-networks': CustomEvent<NetworkType>;
+  }
+}
 
-/** @polymer */
+interface SettingsInternetPageElement {
+  $: {
+    errorToast: CrToastElement,
+  };
+}
+
+const SettingsInternetPageElementBase =
+    mixinBehaviors(
+        [
+          NetworkListenerBehavior,
+          DeepLinkingBehavior,
+        ],
+        PrefsMixin(RouteObserverMixin(
+            WebUiListenerMixin(I18nMixin(PolymerElement))))) as {
+      new (): PolymerElement & I18nMixinInterface &
+          WebUiListenerMixinInterface & RouteObserverMixinInterface &
+          PrefsMixinInterface & NetworkListenerBehaviorInterface &
+          DeepLinkingBehaviorInterface,
+    };
+
 class SettingsInternetPageElement extends SettingsInternetPageElementBase {
   static get is() {
-    return 'settings-internet-page';
+    return 'settings-internet-page' as const;
   }
 
   static get template() {
-    return html`{__html_template__}`;
+    return getTemplate();
   }
 
   static get properties() {
     return {
-      /** Preferences state. */
-      prefs: {
-        type: Object,
-        notify: true,
-      },
-
       /**
        * The device state for each network device type, keyed by NetworkType.
        * Set by network-summary.
-       * @type {!Object<!OncMojo.DeviceStateProperties>|undefined}
-       * @private
        */
       deviceStates: {
         type: Object,
@@ -154,7 +130,6 @@
 
       /**
        * Highest priority connected network or null. Set by network-summary.
-       * @type {?OncMojo.NetworkStateProperties|undefined}
        */
       defaultNetwork: {
         type: Object,
@@ -163,7 +138,6 @@
 
       /**
        * Hotspot information. Set by network-summary.
-       * @type {!HotspotInfo|undefined}
        */
       hotspotInfo: {
         type: Object,
@@ -172,27 +146,21 @@
 
       /**
        * Set by internet-subpage. Controls spinner visibility in subpage header.
-       * @private
        */
       showSpinner_: Boolean,
 
       /**
        * The network type for the networks subpage when shown.
-       * @type {NetworkType}
-       * @private
        */
       subpageType_: Number,
 
       /**
        * The network type for the known networks subpage when shown.
-       * @type {NetworkType}
-       * @private
        */
       knownNetworksType_: Number,
 
       /**
        * Whether the 'Add connection' section is expanded.
-       * @private
        */
       addConnectionExpanded_: {
         type: Boolean,
@@ -201,19 +169,16 @@
 
       /**
        * True if VPN is prohibited by policy.
-       * @private {boolean}
        */
       vpnIsProhibited_: {
         type: Boolean,
         value: false,
       },
 
-      /** @private {!GlobalPolicy|undefined} */
       globalPolicy_: Object,
 
       /**
        * Whether a managed network is available in the visible network list.
-       * @private {boolean}
        */
       managedNetworkAvailable: {
         type: Boolean,
@@ -222,8 +187,6 @@
 
       /**
        * List of third party (Extension + Arc) VPN providers.
-       * @type {!Array<!VpnProvider>}
-       * @private
        */
       vpnProviders_: {
         type: Array,
@@ -232,15 +195,11 @@
         },
       },
 
-      /** @private {boolean} */
       showInternetConfig_: {
         type: Boolean,
         value: false,
       },
 
-      /**
-       * @private
-       */
       isApnRevampEnabled_: {
         type: Boolean,
         value() {
@@ -252,14 +211,12 @@
       /**
        * Page name, if defined, indicating that the next deviceStates update
        * should call attemptShowCellularSetupDialog_().
-       * @private {CellularSetupPageName|null}
        */
       pendingShowCellularSetupDialogAttemptPageName_: {
         type: String,
         value: null,
       },
 
-      /** @private {boolean} */
       showCellularSetupDialog_: {
         type: Boolean,
         value: false,
@@ -267,29 +224,24 @@
 
       /**
        * Name of cellular setup dialog page.
-       * @private {!CellularSetupPageName|null}
        */
       cellularSetupDialogPageName_: String,
 
-      /** @private {boolean} */
       hasActiveCellularNetwork_: {
         type: Boolean,
         value: false,
       },
 
-      /** @private {boolean} */
       isConnectedToNonCellularNetwork_: {
         type: Boolean,
         value: false,
       },
 
-      /** @private {boolean} */
       showESimProfileRenameDialog_: {
         type: Boolean,
         value: false,
       },
 
-      /** @private {boolean} */
       showESimRemoveProfileDialog_: {
         type: Boolean,
         value: false,
@@ -298,14 +250,12 @@
       /**
        * Flag, if true, indicating that the next deviceStates update
        * should set showSimLockDialog_ to true.
-       * @private
        */
       pendingShowSimLockDialog_: {
         type: Boolean,
         value: false,
       },
 
-      /** @private */
       showSimLockDialog_: {
         type: Boolean,
         value: false,
@@ -313,14 +263,12 @@
 
       /**
        * eSIM network used in internet detail menu.
-       * @private {NetworkStateProperties}
        */
       eSimNetworkState_: {
         type: Object,
         value: '',
       },
 
-      /** @private {!Map<string, Element>} */
       focusConfig_: {
         type: Object,
         value() {
@@ -330,7 +278,6 @@
 
       /**
        * Used by DeepLinkingBehavior to focus this page's deep links.
-       * @type {!Set<!Setting>}
        */
       supportedSettingIds: {
         type: Object,
@@ -340,7 +287,6 @@
         ]),
       },
 
-      /** @private */
       errorToastMessage_: {
         type: String,
         value: '',
@@ -348,7 +294,6 @@
 
       /**
        * Return true if hotspot feature flag is enabled.
-       * @private
        */
       isHotspotFeatureEnabled_: {
         type: Boolean,
@@ -367,96 +312,88 @@
     };
   }
 
-  /** @override */
+  defaultNetwork: OncMojo.NetworkStateProperties|null|undefined;
+  deviceStates: Record<string, OncMojo.DeviceStateProperties>|undefined;
+  hotspotInfo: HotspotInfo|undefined;
+  managedNetworkAvailable: boolean;
+  private addConnectionExpanded_: boolean;
+  private browserProxy_: InternetPageBrowserProxy;
+  private cellularSetupDialogPageName_: CellularSetupPageName|null;
+  private detailType_: NetworkType|undefined;
+  private errorToastMessage_: string;
+  private eSimNetworkState_: NetworkStateProperties;
+  private focusConfig_: Map<string, HTMLElement>;
+  private globalPolicy_: GlobalPolicy|undefined;
+  private hasActiveCellularNetwork_: boolean;
+  private isApnRevampEnabled_: boolean;
+  private isConnectedToNonCellularNetwork_: boolean;
+  private isCreateCustomApnButtonDisabled_: boolean;
+  private isHotspotFeatureEnabled_: boolean;
+  private knownNetworksType_: NetworkType;
+  private networkConfig_: CrosNetworkConfigRemote;
+  private pendingShowCellularSetupDialogAttemptPageName_: CellularSetupPageName|
+      null;
+  private pendingShowSimLockDialog_: boolean;
+  private showCellularSetupDialog_: boolean;
+  private showESimProfileRenameDialog_: boolean;
+  private showESimRemoveProfileDialog_: boolean;
+  private showInternetConfig_: boolean;
+  private showSimLockDialog_: boolean;
+  private showSpinner_: boolean;
+  private subpageType_: NetworkType;
+  private vpnIsProhibited_: boolean;
+  private vpnProviders_: VpnProvider[];
+
   constructor() {
     super();
 
     /**
      * Type of last detail page visited
-     * @private {NetworkType|undefined}
      */
     this.detailType_ = undefined;
 
-    /** @private  {!InternetPageBrowserProxy} */
     this.browserProxy_ = InternetPageBrowserProxyImpl.getInstance();
 
-    /** @private {!CrosNetworkConfigRemote} */
     this.networkConfig_ =
         MojoInterfaceProviderImpl.getInstance().getMojoServiceRemote();
   }
 
-  ready() {
+  override ready(): void {
     super.ready();
 
     this.addEventListener('device-enabled-toggled', (event) => {
-      this.onDeviceEnabledToggled_(
-          /**
-           * @type {!CustomEvent<!{
-           *     enabled: boolean,
-           *     type: NetworkType
-           * }>}
-           */
-          (event));
+      this.onDeviceEnabledToggled_(event);
     });
     this.addEventListener('network-connect', (event) => {
-      this.onNetworkConnect_(
-          /**
-           * @type {!CustomEvent<!{
-           *     networkState: !OncMojo.NetworkStateProperties,
-           *     bypassConnectionDialog: (boolean|undefined)
-           * }>}
-           */
-          (event));
+      this.onNetworkConnect_(event);
     });
     this.addEventListener('show-cellular-setup', (event) => {
       this.onShowCellularSetupDialog_(event);
     });
     this.addEventListener('show-config', (event) => {
-      this.onShowConfig_(
-          /**
-             @type {!CustomEvent<!{type: string, guid: ?string, name:
-                 ?string}>}
-           */
-          (event));
+      this.onShowConfig_(event);
     });
     this.addEventListener('show-detail', (event) => {
-      this.onShowDetail_(
-          /** @type {!CustomEvent<!OncMojo.NetworkStateProperties>} */ (event));
+      this.onShowDetail_(event);
     });
     this.addEventListener('show-known-networks', (event) => {
-      this.onShowKnownNetworks_(
-          /** @type {!CustomEvent<NetworkType>} */
-          (event));
+      this.onShowKnownNetworks_(event);
     });
     this.addEventListener('show-networks', (event) => {
-      this.onShowNetworks_(
-          /** @type {!CustomEvent<NetworkType>} */
-          (event));
+      this.onShowNetworks_(event);
     });
     this.addEventListener('show-esim-profile-rename-dialog', (event) => {
-      this.onShowESimProfileRenameDialog_(
-          /**
-                   @type {!CustomEvent<!{networkState:
-                       NetworkStateProperties}>}
-                     */
-          (event));
+      this.onShowEsimProfileRenameDialog_(event);
     });
     this.addEventListener('show-esim-remove-profile-dialog', (event) => {
-      this.onShowESimRemoveProfileDialog_(
-          /**
-             @type {!CustomEvent<!{networkState:
-                 NetworkStateProperties}>}
-               */
-          (event));
+      this.onShowEsimRemoveProfileDialog_(event);
     });
     this.addEventListener('show-error-toast', (event) => {
-      this.onShowErrorToast_(
-          /** @type {!CustomEvent<string>} */ (event));
+      this.onShowErrorToast_(event);
     });
   }
 
-  /** @override */
-  connectedCallback() {
+  override connectedCallback(): void {
     super.connectedCallback();
 
     this.onPoliciesApplied(/*userhash=*/ '');
@@ -466,12 +403,10 @@
 
   /**
    * Overridden from DeepLinkingBehavior.
-   * @param {!Setting} settingId
-   * @return {boolean}
    */
-  beforeDeepLinkAttempt(settingId) {
+  override beforeDeepLinkAttempt(settingId: Setting): boolean {
     // Manually show the deep links for settings nested within elements.
-    let networkType = null;
+    let networkType: NetworkType|null = null;
     if (settingId === Setting.kWifiOnOff) {
       networkType = NetworkType.kWiFi;
     } else if (settingId === Setting.kMobileOnOff) {
@@ -479,9 +414,9 @@
     }
 
     afterNextRender(this, () => {
-      const networkRow = /** @type {NetworkSummaryElement} */ (
-                             this.shadowRoot.querySelector('network-summary'))
-                             .getNetworkRow(networkType);
+      const networkRow =
+          this.shadowRoot!.querySelector('network-summary')!.getNetworkRow(
+              networkType!);
       if (networkRow) {
         const toggleEl = networkRow.getDeviceEnabledToggle();
         if (toggleEl) {
@@ -497,11 +432,8 @@
 
   /**
    * RouteObserverBehavior
-   * @param {!Route} route
-   * @param {!Route=} oldRoute
-   * @protected
    */
-  currentRouteChanged(route, oldRoute) {
+  override currentRouteChanged(route: Route, oldRoute?: Route): void {
     if (route === routes.INTERNET_NETWORKS) {
       // Handle direct navigation to the networks page,
       // e.g. chrome://settings/internet/networks?type=WiFi
@@ -552,27 +484,26 @@
     }
 
     // Focus the subpage arrow where appropriate.
-    let element;
+    let element: HTMLElement|null = null;
     if (route === routes.INTERNET_NETWORKS) {
       // iron-list makes the correct timing to focus an item in the list
       // very complicated, and the item may not exist, so just focus the
       // entire list for now.
       const subPage =
-          this.shadowRoot.querySelector('settings-internet-subpage');
+          this.shadowRoot!.querySelector('settings-internet-subpage');
       if (subPage) {
-        element = subPage.shadowRoot.querySelector('#networkList');
+        element = subPage.shadowRoot!.querySelector('#networkList');
       }
     } else if (this.detailType_ !== undefined) {
       const rowForDetailType =
-          /** @type {NetworkSummaryElement} */ (
-              this.shadowRoot.querySelector('network-summary'))
-              .getNetworkRow(this.detailType_);
+          this.shadowRoot!.querySelector('network-summary')!.getNetworkRow(
+              this.detailType_);
 
       // Note: It is possible that the row is no longer present in the DOM
       // (e.g., when a Cellular dongle is unplugged or when Instant Tethering
       // becomes unavailable due to the Bluetooth controller disconnecting).
       if (rowForDetailType) {
-        element = rowForDetailType.shadowRoot.querySelector('.subpage-arrow');
+        element = rowForDetailType.shadowRoot!.querySelector('.subpage-arrow');
       }
     }
 
@@ -584,74 +515,57 @@
   }
 
   /** NetworkListenerBehavior override */
-  onNetworkStateListChanged() {
+  override onNetworkStateListChanged(): void {
     hasActiveCellularNetwork().then((hasActive) => {
       this.hasActiveCellularNetwork_ = hasActive;
     });
     this.updateIsConnectedToNonCellularNetwork_();
   }
 
-  onVpnProvidersChanged() {
-    this.networkConfig_.getVpnProviders().then(response => {
-      const providers = response.providers;
-      providers.sort(this.compareVpnProviders_);
-      this.vpnProviders_ = providers;
-    });
+  override async onVpnProvidersChanged(): Promise<void> {
+    const response = await this.networkConfig_.getVpnProviders();
+    const providers = response.providers;
+    providers.sort(this.compareVpnProviders_);
+    this.vpnProviders_ = providers;
   }
 
-  /** @param {string} userhash */
-  onPoliciesApplied(userhash) {
-    this.networkConfig_.getGlobalPolicy().then(response => {
-      this.globalPolicy_ = response.result;
-    });
+  override async onPoliciesApplied(_userhash: string): Promise<void> {
+    const response = await this.networkConfig_.getGlobalPolicy();
+    this.globalPolicy_ = response.result;
   }
 
-  /**
-   * @return {!Promise<boolean>}
-   * @private
-   */
-  updateIsConnectedToNonCellularNetwork_() {
-    return isConnectedToNonCellularNetwork().then((isConnected) => {
-      this.isConnectedToNonCellularNetwork_ = isConnected;
-      return isConnected;
-    });
+  private async updateIsConnectedToNonCellularNetwork_(): Promise<boolean> {
+    const isConnected = await isConnectedToNonCellularNetwork();
+    this.isConnectedToNonCellularNetwork_ = isConnected;
+    return isConnected;
   }
 
   /**
    * Event triggered by a device state enabled toggle.
-   * @param {!CustomEvent<!{
-   *     enabled: boolean,
-   *     type: NetworkType
-   * }>} event
-   * @private
    */
-  onDeviceEnabledToggled_(event) {
+  private onDeviceEnabledToggled_(
+      event: CustomEvent<{enabled: boolean, type: NetworkType}>): void {
     this.networkConfig_.setNetworkTypeEnabledState(
         event.detail.type, event.detail.enabled);
     recordSettingChange();
   }
 
-  /**
-   * @param {!CustomEvent<!{type: string, guid: ?string, name: ?string}>} event
-   * @private
-   */
-  onShowConfig_(event) {
+  private onShowConfig_(
+      event: CustomEvent<{type: string, guid: string|null, name: string|null}>):
+      void {
     const type = OncMojo.getNetworkTypeFromString(event.detail.type);
     if (!event.detail.guid) {
       // New configuration
-      this.showConfig_(true /* configAndConnect */, type);
+      this.showConfig_(/* configAndConnect= */ true, type);
     } else {
       this.showConfig_(
-          false /* configAndConnect */, type, event.detail.guid,
+          /* configAndConnect= */ false, type, event.detail.guid,
           event.detail.name);
     }
   }
 
-  /**
-   * @param {Event} event
-   * @private
-   */
-  onShowCellularSetupDialog_(event) {
+  private onShowCellularSetupDialog_(
+      event: CustomEvent<{pageName: CellularSetupPageName}>): void {
     this.attemptShowCellularSetupDialog_(event.detail.pageName);
   }
 
@@ -659,10 +573,9 @@
    * Opens the cellular setup dialog if pageName is PSIM_FLOW_UI, or if pageName
    * is ESIM_FLOW_UI and isConnectedToNonCellularNetwork_ is true. If
    * isConnectedToNonCellularNetwork_ is false, shows an error toast.
-   * @param {CellularSetupPageName} pageName
-   * @private
    */
-  attemptShowCellularSetupDialog_(pageName) {
+  private attemptShowCellularSetupDialog_(pageName: CellularSetupPageName):
+      void {
     const cellularDeviceState =
         this.getDeviceState_(NetworkType.kCellular, this.deviceStates);
     if (!cellularDeviceState ||
@@ -675,64 +588,47 @@
       this.showCellularSetupDialog_ = true;
       this.cellularSetupDialogPageName_ = pageName;
     } else {
-      this.attemptShowESimSetupDialog_();
+      this.attemptShowEsimSetupDialog_();
     }
   }
 
-  /** @private */
-  async attemptShowESimSetupDialog_() {
+  private async attemptShowEsimSetupDialog_(): Promise<void> {
     const numProfiles = await getNumESimProfiles();
     if (numProfiles >= ESIM_PROFILE_LIMIT) {
       this.showErrorToast_(
           this.i18n('eSimProfileLimitReachedErrorToast', ESIM_PROFILE_LIMIT));
       return;
     }
+
     // isConnectedToNonCellularNetwork_ may
     // not be fetched yet if the page just opened, fetch it
     // explicitly.
-    this.updateIsConnectedToNonCellularNetwork_().then(
-        ((isConnected) => {
-          this.showCellularSetupDialog_ =
-              isConnected || loadTimeData.getBoolean('bypassConnectivityCheck');
-          if (!this.showCellularSetupDialog_) {
-            this.showErrorToast_(this.i18n('eSimNoConnectionErrorToast'));
-            return;
-          }
-          this.cellularSetupDialogPageName_ =
-              CellularSetupPageName.ESIM_FLOW_UI;
-        }).bind(this));
+    const isConnected = await this.updateIsConnectedToNonCellularNetwork_();
+    this.showCellularSetupDialog_ =
+        isConnected || loadTimeData.getBoolean('bypassConnectivityCheck');
+    if (!this.showCellularSetupDialog_) {
+      this.showErrorToast_(this.i18n('eSimNoConnectionErrorToast'));
+      return;
+    }
+    this.cellularSetupDialogPageName_ = CellularSetupPageName.ESIM_FLOW_UI;
   }
 
-  /**
-   * @param {!CustomEvent<string>} event
-   * @private
-   */
-  onShowErrorToast_(event) {
+  private onShowErrorToast_(event: CustomEvent<string>): void {
     this.showErrorToast_(event.detail);
   }
 
-  /**
-   * @param {string} message
-   * @private
-   */
-  showErrorToast_(message) {
+  private showErrorToast_(message: string): void {
     this.errorToastMessage_ = message;
     this.$.errorToast.show();
   }
 
-  /** @private */
-  onCloseCellularSetupDialog_() {
+  private onCloseCellularSetupDialog_(): void {
     this.showCellularSetupDialog_ = false;
   }
 
-  /**
-   * @param {boolean} configAndConnect
-   * @param {NetworkType} type
-   * @param {?string=} opt_guid
-   * @param {?string=} opt_name
-   * @private
-   */
-  showConfig_(configAndConnect, type, opt_guid, opt_name) {
+  private showConfig_(
+      configAndConnect: boolean, type: NetworkType, guid?: string|null,
+      name?: string|null): void {
     assert(type !== NetworkType.kCellular && type !== NetworkType.kTether);
     if (this.showInternetConfig_) {
       return;
@@ -741,27 +637,22 @@
     // Async call to ensure dialog is stamped.
     setTimeout(() => {
       const configDialog =
-          /** @type {!InternetConfigElement} */ (
-              this.shadowRoot.querySelector('#configDialog'));
-      assert(!!configDialog);
+          castExists(this.shadowRoot!.querySelector<InternetConfigElement>(
+              '#configDialog'));
       configDialog.type = OncMojo.getNetworkTypeString(type);
-      configDialog.guid = opt_guid || '';
-      configDialog.name = opt_name || '';
+      configDialog.guid = guid || '';
+      configDialog.name = name || '';
       configDialog.showConnect = configAndConnect;
       configDialog.open();
     });
   }
 
-  /** @private */
-  onInternetConfigClose_() {
+  private onInternetConfigClose_(): void {
     this.showInternetConfig_ = false;
   }
 
-  /**
-   * @param {!CustomEvent<!OncMojo.NetworkStateProperties>} event
-   * @private
-   */
-  onShowDetail_(event) {
+  private onShowDetail_(event: CustomEvent<OncMojo.NetworkStateProperties>):
+      void {
     const networkState = event.detail;
     this.detailType_ = networkState.type;
     const params = new URLSearchParams();
@@ -771,49 +662,31 @@
     Router.getInstance().navigateTo(routes.NETWORK_DETAIL, params);
   }
 
-  /**
-   * @param {!CustomEvent<!{networkState:
-   *     NetworkStateProperties}>} event
-   * @private
-   */
-  onShowESimProfileRenameDialog_(event) {
+  private onShowEsimProfileRenameDialog_(
+      event: CustomEvent<{networkState: NetworkStateProperties}>): void {
     this.eSimNetworkState_ = event.detail.networkState;
     this.showESimProfileRenameDialog_ = true;
   }
 
-  /** @private */
-  onCloseESimProfileRenameDialog_() {
+  private onCloseEsimProfileRenameDialog_(): void {
     this.showESimProfileRenameDialog_ = false;
   }
 
-  /**
-   * @param {!CustomEvent<!{networkState:
-   *     NetworkStateProperties}>} event
-   * @private
-   */
-  onShowESimRemoveProfileDialog_(event) {
+  private onShowEsimRemoveProfileDialog_(
+      event: CustomEvent<{networkState: NetworkStateProperties}>): void {
     this.eSimNetworkState_ = event.detail.networkState;
     this.showESimRemoveProfileDialog_ = true;
   }
 
-  /** @private */
-  onCloseESimRemoveProfileDialog_() {
+  private onCloseEsimRemoveProfileDialog_(): void {
     this.showESimRemoveProfileDialog_ = false;
   }
 
-  /**
-   * @param {!CustomEvent<NetworkType>} event
-   * @private
-   */
-  onShowNetworks_(event) {
+  private onShowNetworks_(event: CustomEvent<NetworkType>): void {
     this.showNetworksSubpage_(event.detail);
   }
 
-  /**
-   * @return {string}
-   * @private
-   */
-  getNetworksPageTitle_() {
+  private getNetworksPageTitle_(): string {
     // The shared Cellular/Tether subpage is referred to as "Mobile".
     // TODO(khorimoto): Remove once Cellular/Tether are split into their own
     // sections.
@@ -825,40 +698,32 @@
         'OncType' + OncMojo.getNetworkTypeString(this.subpageType_));
   }
 
-  /**
-   * @param {NetworkType} subpageType
-   * @param {!Object<!OncMojo.DeviceStateProperties>|undefined} deviceStates
-   * @return {!OncMojo.DeviceStateProperties|undefined}
-   * @private
-   */
-  getDeviceState_(subpageType, deviceStates) {
+  private getDeviceState_(
+      subpageType: NetworkType,
+      deviceStates: Record<string, OncMojo.DeviceStateProperties>|
+      undefined): OncMojo.DeviceStateProperties|undefined {
     if (subpageType === undefined) {
       return undefined;
     }
     // If both Tether and Cellular are enabled, use the Cellular device state
     // when directly navigating to the Tether page.
     if (subpageType === NetworkType.kTether &&
-        this.deviceStates[NetworkType.kCellular]) {
+        this.deviceStates![NetworkType.kCellular]) {
       subpageType = NetworkType.kCellular;
     }
-    return deviceStates[subpageType];
+    return deviceStates![subpageType];
   }
 
-  /**
-   * @param {!Object<!OncMojo.DeviceStateProperties>|undefined} deviceStates
-   * @return {!OncMojo.DeviceStateProperties|undefined}
-   * @private
-   */
-  getTetherDeviceState_(deviceStates) {
-    return deviceStates[NetworkType.kTether];
+  private getTetherDeviceState_(
+      deviceStates: Record<string, OncMojo.DeviceStateProperties>|
+      undefined): OncMojo.DeviceStateProperties|undefined {
+    return deviceStates![NetworkType.kTether];
   }
 
-  /**
-   * @param {!OncMojo.DeviceStateProperties|undefined} newValue
-   * @param {!OncMojo.DeviceStateProperties|undefined} oldValue
-   * @private
-   */
-  onDeviceStatesChanged_(newValue, oldValue) {
+  private onDeviceStatesChanged_(
+      newValue: Record<string, OncMojo.DeviceStateProperties>|undefined,
+      _oldValue: Record<string, OncMojo.DeviceStateProperties>|
+      undefined): void {
     const wifiDeviceState = this.getDeviceState_(NetworkType.kWiFi, newValue);
     let managedNetworkAvailable = false;
     if (wifiDeviceState) {
@@ -869,6 +734,7 @@
       this.managedNetworkAvailable = managedNetworkAvailable;
     }
 
+    assert(this.deviceStates);
     const vpn = this.deviceStates[NetworkType.kVPN];
     this.vpnIsProhibited_ =
         !!vpn && vpn.deviceState === DeviceStateType.kProhibited;
@@ -879,7 +745,7 @@
       // if visible, displays controls which are no longer functional. If this
       // case occurs, close the details page.
       const detailPage =
-          this.shadowRoot.querySelector('settings-internet-detail-page');
+          this.shadowRoot!.querySelector('settings-internet-detail-page');
       if (detailPage) {
         detailPage.close();
       }
@@ -897,11 +763,7 @@
     }
   }
 
-  /**
-   * @param {!CustomEvent<NetworkType>} event
-   * @private
-   */
-  onShowKnownNetworks_(event) {
+  private onShowKnownNetworks_(event: CustomEvent<NetworkType>): void {
     const type = event.detail;
     this.detailType_ = type;
     this.knownNetworksType_ = type;
@@ -910,33 +772,23 @@
     Router.getInstance().navigateTo(routes.KNOWN_NETWORKS, params);
   }
 
-  /** @private */
-  onAddWiFiTap_() {
+  private onAddWiFiTap_(): void {
     this.showConfig_(true /* configAndConnect */, NetworkType.kWiFi);
   }
 
-  /** @private */
-  onAddVPNTap_() {
+  private onAddVpnTap_(): void {
     if (!this.vpnIsProhibited_) {
       this.showConfig_(true /* configAndConnect */, NetworkType.kVPN);
     }
   }
 
-  /**
-   * @param {!{model: !{item: !VpnProvider}}} event
-   * @private
-   */
-  onAddThirdPartyVpnTap_(event) {
+  private onAddThirdPartyVpnTap_(event: DomRepeatEvent<VpnProvider>): void {
     const provider = event.model.item;
     this.browserProxy_.addThirdPartyVpn(provider.appId);
     recordSettingChange();
   }
 
-  /**
-   * @param {NetworkType} type
-   * @private
-   */
-  showNetworksSubpage_(type) {
+  private showNetworksSubpage_(type: NetworkType): void {
     this.detailType_ = type;
     const params = new URLSearchParams();
     params.append('type', OncMojo.getNetworkTypeString(type));
@@ -944,12 +796,8 @@
     Router.getInstance().navigateTo(routes.INTERNET_NETWORKS, params);
   }
 
-  /**
-   * @param {!VpnProvider} vpnProvider1
-   * @param {!VpnProvider} vpnProvider2
-   * @return {number}
-   */
-  compareVpnProviders_(vpnProvider1, vpnProvider2) {
+  private compareVpnProviders_(
+      vpnProvider1: VpnProvider, vpnProvider2: VpnProvider): number {
     // Show Extension VPNs before Arc VPNs.
     if (vpnProvider1.type < vpnProvider2.type) {
       return -1;
@@ -969,35 +817,22 @@
     return 0;
   }
 
-  /**
-   * @param {!Array<!OncMojo.DeviceStateProperties>} deviceStates
-   * @return {boolean}
-   * @private
-   */
-  wifiIsEnabled_(deviceStates) {
+  private wifiIsEnabled_(deviceStates: OncMojo.DeviceStateProperties[]):
+      boolean {
     const wifi = deviceStates[NetworkType.kWiFi];
     return !!wifi && wifi.deviceState === DeviceStateType.kEnabled;
   }
 
-  /**
-   * @param {!GlobalPolicy} globalPolicy
-   * @param {boolean} managedNetworkAvailable
-   * @param {!Array<!OncMojo.DeviceStateProperties>} deviceStates
-   * @return {boolean}
-   * @private
-   */
-  shouldShowAddWiFiRow_(globalPolicy, managedNetworkAvailable, deviceStates) {
+  private shouldShowAddWiFiRow_(
+      globalPolicy: GlobalPolicy, managedNetworkAvailable: boolean,
+      deviceStates: OncMojo.DeviceStateProperties[]): boolean {
     return this.allowAddWiFiConnection_(
                globalPolicy, managedNetworkAvailable) &&
         this.wifiIsEnabled_(deviceStates);
   }
 
-  /**
-   * @param {!GlobalPolicy} globalPolicy
-   * @param {boolean} managedNetworkAvailable
-   * @return {boolean}
-   */
-  allowAddWiFiConnection_(globalPolicy, managedNetworkAvailable) {
+  private allowAddWiFiConnection_(
+      globalPolicy: GlobalPolicy, managedNetworkAvailable: boolean): boolean {
     if (!globalPolicy) {
       return true;
     }
@@ -1007,42 +842,32 @@
          !managedNetworkAvailable);
   }
 
-  /**
-   * @param {!GlobalPolicy} globalPolicy
-   * @param {boolean} managedNetworkAvailable
-   * @return {boolean}
-   */
-  allowAddConnection_(globalPolicy, managedNetworkAvailable) {
+  private allowAddConnection_(
+      globalPolicy: GlobalPolicy, managedNetworkAvailable: boolean): boolean {
     if (!this.vpnIsProhibited_) {
       return true;
     }
     return this.allowAddWiFiConnection_(globalPolicy, managedNetworkAvailable);
   }
 
-  /**
-   * @param {!VpnProvider} provider
-   * @return {string}
-   */
-  getAddThirdPartyVpnLabel_(provider) {
+  private getAddThirdPartyVpnLabel_(provider: VpnProvider): string {
     return this.i18n('internetAddThirdPartyVPN', provider.providerName || '');
   }
 
   /**
    * Handles UI requests to connect to a network.
    * TODO(stevenjb): Handle Cellular activation, etc.
-   * @param {!CustomEvent<!{
-   *     networkState: !OncMojo.NetworkStateProperties,
-   *     bypassConnectionDialog: (boolean|undefined)
-   * }>} event
-   * @private
    */
-  onNetworkConnect_(event) {
+  private async onNetworkConnect_(event: CustomEvent<{
+    networkState: OncMojo.NetworkStateProperties,
+    bypassConnectionDialog: boolean|undefined,
+  }>): Promise<void> {
     const networkState = event.detail.networkState;
     const type = networkState.type;
     const displayName = OncMojo.getNetworkStateDisplayName(networkState);
 
     if (!event.detail.bypassConnectionDialog && type === NetworkType.kTether &&
-        !networkState.typeState.tether.hasConnectedToHost) {
+        !networkState.typeState.tether!.hasConnectedToHost) {
       const params = new URLSearchParams();
       params.append('guid', networkState.guid);
       params.append('type', OncMojo.getNetworkTypeString(type));
@@ -1061,49 +886,52 @@
       return;
     }
 
-    this.networkConfig_.startConnect(networkState.guid).then(response => {
-      switch (response.result) {
-        case StartConnectResult.kSuccess:
-          return;
-        case StartConnectResult.kInvalidGuid:
-        case StartConnectResult.kInvalidState:
-        case StartConnectResult.kCanceled:
-          // TODO(stevenjb/khorimoto): Consider handling these cases.
-          return;
-        case StartConnectResult.kNotConfigured:
-          if (OncMojo.networkTypeHasConfigurationFlow(type)) {
-            this.showConfig_(
-                true /* configAndConnect */, type, networkState.guid,
-                displayName);
-          }
-          return;
-        case StartConnectResult.kBlocked:
-          // This shouldn't happen, the UI should prevent this, fall through and
-          // show the error.
-        case StartConnectResult.kUnknown:
-          console.warn(
-              'startConnect failed for: ' + networkState.guid +
-              ' Error: ' + response.message);
-          return;
-      }
-      assertNotReached();
-    });
+    const response = await this.networkConfig_.startConnect(networkState.guid);
+    switch (response.result) {
+      case StartConnectResult.kSuccess:
+        return;
+      case StartConnectResult.kInvalidGuid:
+      case StartConnectResult.kInvalidState:
+      case StartConnectResult.kCanceled:
+        // TODO(stevenjb/khorimoto): Consider handling these cases.
+        return;
+      case StartConnectResult.kNotConfigured:
+        if (OncMojo.networkTypeHasConfigurationFlow(type)) {
+          this.showConfig_(
+              true /* configAndConnect */, type, networkState.guid,
+              displayName);
+        }
+        return;
+      case StartConnectResult.kBlocked:
+        // This shouldn't happen, the UI should prevent this, fall through and
+        // show the error.
+      case StartConnectResult.kUnknown:
+        console.warn(
+            'startConnect failed for: ' + networkState.guid +
+            ' Error: ' + response.message);
+        return;
+    }
+    assertNotReached();
   }
 
   /**
    * Handles UI requests to add new APN.
-   * @private
    */
-  onCreateCustomApnClicked_() {
+  private onCreateCustomApnClicked_(): void {
     if (this.isCreateCustomApnButtonDisabled_) {
       return;
     }
-    const apnSubpage = /** @type {ApnSubpageElement} */ (
-        this.shadowRoot.querySelector('#apnSubpage'));
-    assert(!!apnSubpage);
+    const apnSubpage = castExists(
+        this.shadowRoot!.querySelector<ApnSubpageElement>('#apnSubpage'));
     apnSubpage.openApnDetailDialogInCreateMode();
   }
 }
 
+declare global {
+  interface HTMLElementTagNameMap {
+    [SettingsInternetPageElement.is]: SettingsInternetPageElement;
+  }
+}
+
 customElements.define(
     SettingsInternetPageElement.is, SettingsInternetPageElement);

chrome/browser/resources/settings/chromeos/internet_page/internet_page_browser_proxy.js

diff --git a/chrome/browser/resources/settings/chromeos/internet_page/internet_page_browser_proxy.js b/chrome/browser/resources/settings/chromeos/internet_page/internet_page_browser_proxy.js
deleted file mode 100644
index 2901164..0000000
--- a/chrome/browser/resources/settings/chromeos/internet_page/internet_page_browser_proxy.js
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2017 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-/** @fileoverview A helper object used for Internet page. */
-
-import {addWebUIListener} from 'chrome://resources/ash/common/cr.m.js';
-
-/** @interface */
-export class InternetPageBrowserProxy {
-  /**
-   * Shows the account details page of a cellular network.
-   * @param {string} guid
-   */
-  showCarrierAccountDetail(guid) {}
-
-  /**
-   * Shows the Cellular activation UI.
-   * @param {string} guid
-   */
-  showCellularSetupUI(guid) {}
-
-  /**
-   * Shows the Portal Signin.
-   * @param {string} guid
-   */
-  showPortalSignin(guid) {}
-
-  /**
-   * Shows configuration for external VPNs. Includes ThirdParty (extension
-   * configured) VPNs, and Arc VPNs.
-   * @param {string} guid
-   */
-  configureThirdPartyVpn(guid) {}
-
-  /**
-   * Sends an add VPN request to the external VPN provider (ThirdParty VPN
-   * extension or Arc VPN provider app).
-   * @param {string} appId
-   */
-  addThirdPartyVpn(appId) {}
-
-  /**
-   * Requests that Chrome send the list of devices whose "Google Play
-   * Services" notifications are disabled (these notifications must be enabled
-   * to utilize Instant Tethering). The names will be provided via
-   * setGmsCoreNotificationsDisabledDeviceNamesCallback().
-   */
-  requestGmsCoreNotificationsDisabledDeviceNames() {}
-
-  /**
-   * Sets the callback to be used to receive the list of devices whose "Google
-   * Play Services" notifications are disabled. |callback| is invoked with an
-   * array of the names of these devices; note that if no devices have this
-   * property, the provided list of device names is empty.
-   * @param {function(!Array<string>):void} callback
-   */
-  setGmsCoreNotificationsDisabledDeviceNamesCallback(callback) {}
-}
-
-/** @type {?InternetPageBrowserProxy} */
-let instance = null;
-
-/**
- * @implements {InternetPageBrowserProxy}
- */
-export class InternetPageBrowserProxyImpl {
-  /** @return {!InternetPageBrowserProxy} */
-  static getInstance() {
-    return instance || (instance = new InternetPageBrowserProxyImpl());
-  }
-
-  /** @param {!InternetPageBrowserProxy} obj */
-  static setInstance(obj) {
-    instance = obj;
-  }
-
-  /** @override */
-  showCarrierAccountDetail(guid) {
-    chrome.send('showCarrierAccountDetail', [guid]);
-  }
-
-  /** @override */
-  showCellularSetupUI(guid) {
-    chrome.send('showCellularSetupUI', [guid]);
-  }
-
-  /** @override */
-  showPortalSignin(guid) {
-    chrome.send('showPortalSignin', [guid]);
-  }
-
-  /** @override */
-  configureThirdPartyVpn(guid) {
-    chrome.send('configureThirdPartyVpn', [guid]);
-  }
-
-  /** @override */
-  addThirdPartyVpn(appId) {
-    chrome.send('addThirdPartyVpn', [appId]);
-  }
-
-  /** @override */
-  requestGmsCoreNotificationsDisabledDeviceNames() {
-    chrome.send('requestGmsCoreNotificationsDisabledDeviceNames');
-  }
-
-  /** @override */
-  setGmsCoreNotificationsDisabledDeviceNamesCallback(callback) {
-    addWebUIListener('sendGmsCoreNotificationsDisabledDeviceNames', callback);
-  }
-}

chrome/browser/resources/settings/chromeos/internet_page/internet_page_browser_proxy.ts

diff --git a/chrome/browser/resources/settings/chromeos/internet_page/internet_page_browser_proxy.ts b/chrome/browser/resources/settings/chromeos/internet_page/internet_page_browser_proxy.ts
new file mode 100644
index 0000000..e8dd3a5
--- /dev/null
+++ b/chrome/browser/resources/settings/chromeos/internet_page/internet_page_browser_proxy.ts
@@ -0,0 +1,94 @@
+// Copyright 2017 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/** @fileoverview A helper object used for Internet page. */
+
+import {addWebUiListener} from 'chrome://resources/js/cr.js';
+
+export interface InternetPageBrowserProxy {
+  /**
+   * Shows the account details page of a cellular network.
+   */
+  showCarrierAccountDetail(guid: string): void;
+
+  /**
+   * Shows the Cellular activation UI.
+   */
+  showCellularSetupUi(guid: string): void;
+
+  /**
+   * Shows the Portal Signin.
+   */
+  showPortalSignin(guid: string): void;
+
+  /**
+   * Shows configuration for external VPNs. Includes ThirdParty (extension
+   * configured) VPNs, and Arc VPNs.
+   */
+  configureThirdPartyVpn(guid: string): void;
+
+  /**
+   * Sends an add VPN request to the external VPN provider (ThirdParty VPN
+   * extension or Arc VPN provider app).
+   */
+  addThirdPartyVpn(appId: string): void;
+
+  /**
+   * Requests that Chrome send the list of devices whose "Google Play
+   * Services" notifications are disabled (these notifications must be enabled
+   * to utilize Instant Tethering). The names will be provided via
+   * setGmsCoreNotificationsDisabledDeviceNamesCallback().
+   */
+  requestGmsCoreNotificationsDisabledDeviceNames(): void;
+
+  /**
+   * Sets the callback to be used to receive the list of devices whose "Google
+   * Play Services" notifications are disabled. |callback| is invoked with an
+   * array of the names of these devices; note that if no devices have this
+   * property, the provided list of device names is empty.
+   */
+  setGmsCoreNotificationsDisabledDeviceNamesCallback(
+      callback: (deviceNames: string[]) => void): void;
+}
+
+let instance: InternetPageBrowserProxy|null = null;
+
+export class InternetPageBrowserProxyImpl implements InternetPageBrowserProxy {
+  static getInstance(): InternetPageBrowserProxy {
+    return instance || (instance = new InternetPageBrowserProxyImpl());
+  }
+
+  static setInstance(obj: InternetPageBrowserProxy): void {
+    instance = obj;
+  }
+
+  showCarrierAccountDetail(guid: string): void {
+    chrome.send('showCarrierAccountDetail', [guid]);
+  }
+
+  showCellularSetupUi(guid: string): void {
+    chrome.send('showCellularSetupUi', [guid]);
+  }
+
+  showPortalSignin(guid: string): void {
+    chrome.send('showPortalSignin', [guid]);
+  }
+
+  configureThirdPartyVpn(guid: string): void {
+    chrome.send('configureThirdPartyVpn', [guid]);
+  }
+
+  addThirdPartyVpn(appId: string): void {
+    chrome.send('addThirdPartyVpn', [appId]);
+  }
+
+  requestGmsCoreNotificationsDisabledDeviceNames(): void {
+    chrome.send('requestGmsCoreNotificationsDisabledDeviceNames');
+  }
+
+  setGmsCoreNotificationsDisabledDeviceNamesCallback(
+      callback: (deviceNames: string[]) => void) {
+    addWebUiListener('sendGmsCoreNotificationsDisabledDeviceNames', callback);
+  }
+}

chrome/browser/resources/settings/chromeos/internet_page/internet_subpage.ts

diff --git a/chrome/browser/resources/settings/chromeos/internet_page/internet_subpage.js b/chrome/browser/resources/settings/chromeos/internet_page/internet_subpage.ts
similarity index 69%
rename from chrome/browser/resources/settings/chromeos/internet_page/internet_subpage.js
rename to chrome/browser/resources/settings/chromeos/internet_page/internet_subpage.ts
index 0c2adf9..f9babaa 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/internet_subpage.js
+++ b/chrome/browser/resources/settings/chromeos/internet_page/internet_subpage.ts
@@ -23,69 +23,49 @@
 import './cellular_networks_list.js';
 import './network_always_on_vpn.js';
 
-import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/ash/common/i18n_behavior.js';
 import {CrPolicyNetworkBehaviorMojo, CrPolicyNetworkBehaviorMojoInterface} from 'chrome://resources/ash/common/network/cr_policy_network_behavior_mojo.js';
-import {MojoInterfaceProvider, MojoInterfaceProviderImpl} from 'chrome://resources/ash/common/network/mojo_interface_provider.js';
+import {MojoInterfaceProviderImpl} from 'chrome://resources/ash/common/network/mojo_interface_provider.js';
 import {NetworkListenerBehavior, NetworkListenerBehaviorInterface} from 'chrome://resources/ash/common/network/network_listener_behavior.js';
 import {OncMojo} from 'chrome://resources/ash/common/network/onc_mojo.js';
-import {assert, assertNotReached} from 'chrome://resources/ash/common/assert.js';
-import {loadTimeData} from 'chrome://resources/ash/common/load_time_data.m.js';
+import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js';
+import {assert, assertNotReached} from 'chrome://resources/js/assert_ts.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {AlwaysOnVpnMode, AlwaysOnVpnProperties, CrosNetworkConfigRemote, FilterType, GlobalPolicy, NO_LIMIT, VpnProvider, VpnType} from 'chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom-webui.js';
 import {ConnectionStateType, DeviceStateType, NetworkType} from 'chrome://resources/mojo/chromeos/services/network_config/public/mojom/network_types.mojom-webui.js';
-import {afterNextRender, html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+import {afterNextRender, DomRepeatEvent, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
-import {Route, Router} from '../router.js';
+import {castExists} from '../assert_extras.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {recordSettingChange} from '../metrics_recorder.js';
 import {routes} from '../os_route.js';
-import {RouteObserverBehavior, RouteObserverBehaviorInterface} from '../route_observer_behavior.js';
-import {RouteOriginBehavior, RouteOriginBehaviorImpl, RouteOriginBehaviorInterface} from '../route_origin_behavior.js';
+import {RouteOriginMixin, RouteOriginMixinInterface} from '../route_origin_mixin.js';
+import {Route, Router} from '../router.js';
 
 import {InternetPageBrowserProxy, InternetPageBrowserProxyImpl} from './internet_page_browser_proxy.js';
+import {getTemplate} from './internet_subpage.html.js';
 
-/**
- * TODO(crbug/1315757) The following type definitions are only needed for
- * Closure compiler and can be removed when this file is converted to TS.
- *
- * @constructor
- * @extends {HTMLElement}
- */
-export function CellularNetworksListElement() {}
+const SettingsInternetSubpageElementBase =
+    mixinBehaviors(
+        [
+          NetworkListenerBehavior,
+          CrPolicyNetworkBehaviorMojo,
+          DeepLinkingBehavior,
+        ],
+        RouteOriginMixin(I18nMixin(PolymerElement))) as {
+      new (): PolymerElement & I18nMixinInterface & RouteOriginMixinInterface &
+          NetworkListenerBehaviorInterface &
+          CrPolicyNetworkBehaviorMojoInterface & DeepLinkingBehaviorInterface,
+    };
 
-/** @return {?HTMLElement} */
-CellularNetworksListElement.prototype.getAddEsimButton = function() {};
-
-/**
- * @constructor
- * @extends {PolymerElement}
- * @implements {NetworkListenerBehaviorInterface}
- * @implements {CrPolicyNetworkBehaviorMojoInterface}
- * @implements {DeepLinkingBehaviorInterface}
- * @implements {RouteObserverBehaviorInterface}
- * @implements {RouteOriginBehaviorInterface}
- * @implements {I18nBehaviorInterface}
- */
-const SettingsInternetSubpageElementBase = mixinBehaviors(
-    [
-      NetworkListenerBehavior,
-      CrPolicyNetworkBehaviorMojo,
-      DeepLinkingBehavior,
-      RouteObserverBehavior,
-      RouteOriginBehavior,
-      I18nBehavior,
-    ],
-    PolymerElement);
-
-/** @polymer */
 class SettingsInternetSubpageElement extends
     SettingsInternetSubpageElementBase {
   static get is() {
-    return 'settings-internet-subpage';
+    return 'settings-internet-subpage' as const;
   }
 
   static get template() {
-    return html`{__html_template__}`;
+    return getTemplate();
   }
 
   static get properties() {
@@ -93,7 +73,6 @@
       /**
        * Highest priority connected network or null. Provided by
        * settings-internet-page (but set in network-summary).
-       * @type {?OncMojo.NetworkStateProperties|undefined}
        */
       defaultNetwork: Object,
 
@@ -101,23 +80,19 @@
        * Device state for the network type. Note: when both Cellular and Tether
        * are available this will always be set to the Cellular device state and
        * |tetherDeviceState| will be set to the Tether device state.
-       * @type {!OncMojo.DeviceStateProperties|undefined}
        */
       deviceState: Object,
 
       /**
        * If both Cellular and Tether technologies exist, we combine the subpages
        * and set this to the device state for Tether.
-       * @type {!OncMojo.DeviceStateProperties|undefined}
        */
       tetherDeviceState: Object,
 
-      /** @type {!GlobalPolicy|undefined} */
       globalPolicy: Object,
 
       /**
        * List of third party (Extension + Arc) VPN providers.
-       * @type {!Array<!VpnProvider>}
        */
       vpnProviders: Array,
 
@@ -137,7 +112,6 @@
 
       /**
        * List of all network state data for the network type.
-       * @private {!Array<!OncMojo.NetworkStateProperties>}
        */
       networkStateList_: {
         type: Array,
@@ -148,7 +122,6 @@
 
       /**
        * Dictionary of lists of network states for third party VPNs.
-       * @private {!Object<!Array<!OncMojo.NetworkStateProperties>>}
        */
       thirdPartyVpns_: {
         type: Object,
@@ -157,7 +130,6 @@
         },
       },
 
-      /** @private */
       isShowingVpn_: {
         type: Boolean,
         computed: 'computeIsShowingVpn_(deviceState)',
@@ -167,7 +139,6 @@
       /**
        * Whether the browser/ChromeOS is managed by their organization
        * through enterprise policies.
-       * @private
        */
       isManaged_: {
         type: Boolean,
@@ -178,13 +149,11 @@
 
       /**
        * Always-on VPN operating mode.
-       * @private {!AlwaysOnVpnMode|undefined}
        */
       alwaysOnVpnMode_: Number,
 
       /**
        * Always-on VPN service automatically started on login.
-       * @private {!string|undefined}
        */
       alwaysOnVpnService_: String,
 
@@ -192,7 +161,6 @@
        * List of potential Tether hosts whose "Google Play Services"
        * notifications are disabled (these notifications are required to use
        * Instant Tethering).
-       * @private {!Array<string>}
        */
       notificationsDisabledDeviceNames_: {
         type: Array,
@@ -203,7 +171,6 @@
 
       /**
        * Whether to show technology badge on mobile network icons.
-       * @private
        */
       showTechnologyBadge_: {
         type: Boolean,
@@ -213,7 +180,6 @@
         },
       },
 
-      /** @private */
       hasCompletedScanSinceLastEnabled_: {
         type: Boolean,
         value: false,
@@ -221,7 +187,6 @@
 
       /**
        * False if VPN is disabled by policy.
-       * @private {boolean}
        */
       vpnIsEnabled_: {
         type: Boolean,
@@ -231,7 +196,6 @@
       /**
        * Contains the settingId of any deep link that wasn't able to be shown,
        * null otherwise.
-       * @private {?Setting}
        */
       pendingSettingId_: {
         type: Number,
@@ -240,7 +204,6 @@
 
       /**
        * Used by DeepLinkingBehavior to focus this page's deep links.
-       * @type {!Set<!Setting>}
        */
       supportedSettingIds: {
         type: Object,
@@ -262,26 +225,41 @@
     ];
   }
 
-  /** @override */
+  defaultNetwork: OncMojo.NetworkStateProperties|null|undefined;
+  deviceState: OncMojo.DeviceStateProperties|undefined;
+  globalPolicy: GlobalPolicy|undefined;
+  isCellularSetupActive: boolean;
+  isConnectedToNonCellularNetwork: boolean;
+  showSpinner: boolean;
+  tetherDeviceState: OncMojo.DeviceStateProperties|undefined;
+  vpnProviders: VpnProvider[];
+  private alwaysOnVpnMode_: AlwaysOnVpnMode|undefined;
+  private alwaysOnVpnService_: string|undefined;
+  private browserProxy_: InternetPageBrowserProxy;
+  private hasCompletedScanSinceLastEnabled_: boolean;
+  private isManaged_: boolean;
+  private isShowingVpn_: boolean;
+  private networkConfig_: CrosNetworkConfigRemote;
+  private networkStateList_: OncMojo.NetworkStateProperties[];
+  private notificationsDisabledDeviceNames_: string[];
+  private pendingSettingId_: Setting|null;
+  private route_: Route;
+  private scanIntervalId_: number|null;
+  private showTechnologyBadge_: boolean;
+  private thirdPartyVpns_: Record<string, OncMojo.NetworkStateProperties[]>;
+  private vpnIsEnabled_: boolean;
+
   constructor() {
     super();
 
-    /** RouteOriginBehavior override */
     this.route_ = routes.INTERNET_NETWORKS;
-
-    /** @private {number|null} */
     this.scanIntervalId_ = null;
-
-    /** @private  {!InternetPageBrowserProxy} */
     this.browserProxy_ = InternetPageBrowserProxyImpl.getInstance();
-
-    /** @private {!CrosNetworkConfigRemote} */
     this.networkConfig_ =
         MojoInterfaceProviderImpl.getInstance().getMojoServiceRemote();
   }
 
-  /** @override */
-  ready() {
+  override ready(): void {
     super.ready();
 
     this.browserProxy_.setGmsCoreNotificationsDisabledDeviceNamesCallback(
@@ -294,8 +272,7 @@
     this.addFocusConfig(routes.KNOWN_NETWORKS, '#knownNetworksSubpageButton');
   }
 
-  /** override */
-  disconnectedCallback() {
+  override disconnectedCallback(): void {
     super.disconnectedCallback();
 
     this.stopScanning_();
@@ -303,16 +280,13 @@
 
   /**
    * Overridden from DeepLinkingBehavior.
-   * @param {!Setting} settingId
-   * @return {boolean}
    */
-  beforeDeepLinkAttempt(settingId) {
+  override beforeDeepLinkAttempt(settingId: Setting): boolean {
     if (settingId === Setting.kAddESimNetwork) {
       afterNextRender(this, () => {
         const deepLinkElement =
-            /** @type {CellularNetworksListElement} */ (
-                this.shadowRoot.querySelector('cellular-networks-list'))
-                .getAddEsimButton();
+            this.shadowRoot!.querySelector(
+                                'cellular-networks-list')!.getAddEsimButton();
         if (!deepLinkElement || deepLinkElement.hidden) {
           console.warn(`Element with deep link id ${settingId} not focusable.`);
           return;
@@ -328,7 +302,7 @@
         // If both Cellular and Instant Tethering are enabled, we show a special
         // toggle for Instant Tethering. If it exists, deep link to it.
         const tetherEnabled =
-            this.shadowRoot.querySelector('#tetherEnabledButton');
+            this.shadowRoot!.querySelector('#tetherEnabledButton');
         if (tetherEnabled) {
           this.showDeepLinkElement(tetherEnabled);
           return;
@@ -336,7 +310,7 @@
         // Otherwise, the device does not support Cellular and Instant Tethering
         // on/off is controlled by the top-level "Mobile data" toggle instead.
         const deviceEnabled =
-            this.shadowRoot.querySelector('#deviceEnabledButton');
+            this.shadowRoot!.querySelector('#deviceEnabledButton');
         if (deviceEnabled) {
           this.showDeepLinkElement(deviceEnabled);
           return;
@@ -350,18 +324,15 @@
   }
 
   /**
-   * RouteObserverBehavior
-   * @param {!Route} newRoute
-   * @param {!Route=} oldRoute
-   * @protected
+   * RouteObserverBehavior override
    */
-  currentRouteChanged(newRoute, oldRoute) {
+  override currentRouteChanged(newRoute: Route, oldRoute?: Route): void {
     if (newRoute !== routes.INTERNET_NETWORKS) {
       this.stopScanning_();
       return;
     }
     this.init();
-    RouteOriginBehaviorImpl.currentRouteChanged.call(this, newRoute, oldRoute);
+    super.currentRouteChanged(newRoute, oldRoute);
 
     this.attemptDeepLink().then(result => {
       if (!result.deepLinkShown && result.pendingSettingId) {
@@ -372,7 +343,7 @@
     });
   }
 
-  init() {
+  init(): void {
     // Clear any stale data.
     this.networkStateList_ = [];
     this.thirdPartyVpns_ = {};
@@ -389,29 +360,27 @@
 
   /**
    * NetworkListenerBehavior override
-   * @param {!Array<OncMojo.NetworkStateProperties>} networks
    */
-  onActiveNetworksChanged(networks) {
+  override onActiveNetworksChanged(): void {
     this.getNetworkStateList_();
   }
 
   /** NetworkListenerBehavior override */
-  onNetworkStateListChanged() {
+  override onNetworkStateListChanged(): void {
     this.getNetworkStateList_();
     this.updateAlwaysOnVpnPreferences_();
   }
 
   /** NetworkListenerBehavior override */
-  onVpnProvidersChanged() {
-    if (this.deviceState.type !== NetworkType.kVPN) {
+  override onVpnProvidersChanged(): void {
+    if (this.deviceState!.type !== NetworkType.kVPN) {
       return;
     }
     this.getNetworkStateList_();
   }
 
-  /** @private */
-  deviceStateChanged_() {
-    if (this.deviceState !== undefined) {
+  private deviceStateChanged_(): void {
+    if (this.deviceState) {
       // Set |vpnIsEnabled_| to be used for VPN special cases.
       if (this.deviceState.type === NetworkType.kVPN) {
         this.vpnIsEnabled_ =
@@ -443,8 +412,7 @@
     this.updateScanning_();
   }
 
-  /** @private */
-  updateScanning_() {
+  private updateScanning_(): void {
     if (!this.deviceState) {
       return;
     }
@@ -455,11 +423,8 @@
     }
   }
 
-  /**
-   * @return {boolean}
-   * @private
-   */
-  shouldStartScan_() {
+  private shouldStartScan_(): boolean {
+    assert(this.deviceState);
     // Scans should be kicked off from the Wi-Fi networks subpage.
     if (this.deviceState.type === NetworkType.kWiFi) {
       return true;
@@ -476,13 +441,12 @@
     return false;
   }
 
-  /** @private */
-  startScanning_() {
-    if (this.scanIntervalId_ != null) {
+  private startScanning_(): void {
+    if (this.scanIntervalId_ !== null) {
       return;
     }
     const INTERVAL_MS = 10 * 1000;
-    let type = this.deviceState.type;
+    let type = this.deviceState!.type;
     if (type === NetworkType.kCellular && this.tetherDeviceState) {
       // Only request tether scan. Cellular scan is disruptive and should
       // only be triggered by explicit user action.
@@ -494,17 +458,15 @@
     }, INTERVAL_MS);
   }
 
-  /** @private */
-  stopScanning_() {
-    if (this.scanIntervalId_ == null) {
+  private stopScanning_(): void {
+    if (this.scanIntervalId_ === null) {
       return;
     }
     window.clearInterval(this.scanIntervalId_);
     this.scanIntervalId_ = null;
   }
 
-  /** @private */
-  getNetworkStateList_() {
+  private async getNetworkStateList_(): Promise<void> {
     if (!this.deviceState) {
       return;
     }
@@ -513,27 +475,22 @@
       limit: NO_LIMIT,
       networkType: this.deviceState.type,
     };
-    this.networkConfig_.getNetworkStateList(filter).then(response => {
-      this.onGetNetworks_(response.result);
+    const response = await this.networkConfig_.getNetworkStateList(filter);
+    await this.onGetNetworks_(response.result);
 
-      // Check if we have yet to focus a deep-linked element.
-      if (!this.pendingSettingId_) {
-        return;
-      }
+    // Check if we have yet to focus a deep-linked element.
+    if (!this.pendingSettingId_) {
+      return;
+    }
 
-      this.showDeepLink(this.pendingSettingId_).then(result => {
-        if (result.deepLinkShown) {
-          this.pendingSettingId_ = null;
-        }
-      });
-    });
+    const result = await this.showDeepLink(this.pendingSettingId_);
+    if (result.deepLinkShown) {
+      this.pendingSettingId_ = null;
+    }
   }
 
-  /**
-   * @param {!Array<!OncMojo.NetworkStateProperties>} networkStates
-   * @private
-   */
-  onGetNetworks_(networkStates) {
+  private async onGetNetworks_(networkStates: OncMojo.NetworkStateProperties[]):
+      Promise<void> {
     if (!this.deviceState) {
       // Edge case when device states change before this callback.
       return;
@@ -547,18 +504,18 @@
         limit: NO_LIMIT,
         networkType: NetworkType.kTether,
       };
-      this.networkConfig_.getNetworkStateList(filter).then(response => {
-        this.set('networkStateList_', networkStates.concat(response.result));
-      });
+      const response = await this.networkConfig_.getNetworkStateList(filter);
+      this.set('networkStateList_', networkStates.concat(response.result));
       return;
     }
 
     // For VPNs, separate out third party (Extension + Arc) VPNs.
     if (this.deviceState.type === NetworkType.kVPN) {
-      const builtinNetworkStates = [];
-      const thirdPartyVpns = {};
+      const builtinNetworkStates: OncMojo.NetworkStateProperties[] = [];
+      const thirdPartyVpns:
+          Record<string, OncMojo.NetworkStateProperties[]> = {};
       networkStates.forEach(state => {
-        assert(state.type === NetworkType.kVPN);
+        assert(state.type === NetworkType.kVPN && state.typeState.vpn);
         switch (state.typeState.vpn.type) {
           case VpnType.kIKEv2:
           case VpnType.kL2TPIPsec:
@@ -566,12 +523,13 @@
           case VpnType.kWireGuard:
             builtinNetworkStates.push(state);
             break;
+          // @ts-expect-error Fallthrough case in switch
           case VpnType.kArc:
             // Only show connected Arc VPNs.
             if (!OncMojo.connectionStateIsConnected(state.connectionState)) {
               break;
             }
-          // Otherwise Arc VPNs are treated the same as Extension VPNs.
+            // Otherwise Arc VPNs are treated the same as Extension VPNs.
           case VpnType.kExtension:
             const providerId = state.typeState.vpn.providerId;
             thirdPartyVpns[providerId] = thirdPartyVpns[providerId] || [];
@@ -589,32 +547,31 @@
   /**
    * Returns an ordered list of VPN providers for all third party VPNs and any
    * other known providers.
-   * @param {!Array<!VpnProvider>} vpnProviders
-   * @param {!Object<!Array<!OncMojo.NetworkStateProperties>>} thirdPartyVpns
-   * @return {!Array<!VpnProvider>}
-   * @private
    */
-  getVpnProviders_(vpnProviders, thirdPartyVpns) {
+  private getVpnProviders_(
+      vpnProviders: VpnProvider[],
+      thirdPartyVpns: Record<string, OncMojo.NetworkStateProperties[]>):
+      VpnProvider[] {
     // First add providers for configured thirdPartyVpns. This list will
     // generally be empty or small.
     const configuredProviders = [];
     for (const vpnList of Object.values(thirdPartyVpns)) {
       assert(vpnList.length > 0);
       // All vpns in the list will have the same type and provider id.
-      const vpn = vpnList[0].typeState.vpn;
+      const vpn = castExists(vpnList[0].typeState.vpn);
       const provider = {
         type: vpn.type,
         providerId: vpn.providerId,
         providerName: vpn.providerName || vpn.providerId,
         appId: '',
-        lastLaunchTime: {internalValue: 0},
+        lastLaunchTime: {internalValue: BigInt(0)},
       };
       configuredProviders.push(provider);
     }
     // Next update or append known third party providers.
     const unconfiguredProviders = [];
     for (const provider of vpnProviders) {
-      const idx = configuredProviders.findIndex(
+      const idx: number = configuredProviders.findIndex(
           p => p.providerId === provider.providerId);
       if (idx >= 0) {
         configuredProviders[idx] = provider;
@@ -626,48 +583,34 @@
   }
 
   /**
-   * @param {!OncMojo.DeviceStateProperties|undefined} deviceState
-   * @return {boolean} True if the device is enabled or if it is a VPN.
+   * @return True if the device is enabled or if it is a VPN.
    *     Note: This function will always return true for VPN because VPNs can be
    *     disabled by policy only for built-in VPNs (OpenVPN & L2TP). So even
    *     when VPNs are disabled by policy; the VPN network summary item should
    *     still be visible and actionable to show details for other VPN
    *     providers.
-   * @private
    */
-  deviceIsEnabled_(deviceState) {
+  private deviceIsEnabled_(deviceState: OncMojo.DeviceStateProperties|
+                           undefined): boolean {
     return !!deviceState &&
         (deviceState.type === NetworkType.kVPN ||
          deviceState.deviceState === DeviceStateType.kEnabled);
   }
 
-  /**
-   * @param {!OncMojo.DeviceStateProperties|undefined} deviceState
-   * @param {string} onstr
-   * @param {string} offstr
-   * @return {string}
-   * @private
-   */
-  getOffOnString_(deviceState, onstr, offstr) {
+  private getOffOnString_(
+      deviceState: OncMojo.DeviceStateProperties|undefined, onstr: string,
+      offstr: string): string {
     return this.deviceIsEnabled_(deviceState) ? onstr : offstr;
   }
 
-  /**
-   * @param {!OncMojo.DeviceStateProperties|undefined} deviceState
-   * @return {boolean}
-   * @private
-   */
-  enableToggleIsVisible_(deviceState) {
+  private enableToggleIsVisible_(deviceState: OncMojo.DeviceStateProperties|
+                                 undefined): boolean {
     return !!deviceState && deviceState.type !== NetworkType.kEthernet &&
         deviceState.type !== NetworkType.kVPN;
   }
 
-  /**
-   * @param {!OncMojo.DeviceStateProperties|undefined} deviceState
-   * @return {boolean}
-   * @private
-   */
-  enableToggleIsEnabled_(deviceState) {
+  private enableToggleIsEnabled_(deviceState: OncMojo.DeviceStateProperties|
+                                 undefined): boolean {
     if (!deviceState) {
       return false;
     }
@@ -680,27 +623,19 @@
     return !this.isDeviceInhibited_();
   }
 
-  /**
-   * @return {boolean}
-   * @private
-   */
-  isDeviceInhibited_() {
+  private isDeviceInhibited_(): boolean {
     if (!this.deviceState) {
       return false;
     }
     return OncMojo.deviceIsInhibited(this.deviceState);
   }
 
-  /**
-   * @param {!OncMojo.DeviceStateProperties|undefined} deviceState
-   * @return {string}
-   * @private
-   */
-  getToggleA11yString_(deviceState) {
+  private getToggleA11yString_(deviceState: OncMojo.DeviceStateProperties|
+                               undefined): string {
     if (!this.enableToggleIsVisible_(deviceState)) {
       return '';
     }
-    switch (deviceState.type) {
+    switch (deviceState!.type) {
       case NetworkType.kTether:
       case NetworkType.kCellular:
         return this.i18n('internetToggleMobileA11yLabel');
@@ -708,49 +643,31 @@
         return this.i18n('internetToggleWiFiA11yLabel');
     }
     assertNotReached();
-    return '';
   }
 
-  /**
-   * @param {!VpnProvider} provider
-   * @return {string}
-   * @private
-   */
-  getAddThirdPartyVpnA11yString_(provider) {
+  private getAddThirdPartyVpnA11yString_(provider: VpnProvider): string {
     return this.i18n('internetAddThirdPartyVPN', provider.providerName || '');
   }
 
-  /**
-   * @param {!OncMojo.DeviceStateProperties|undefined} deviceState
-   * @param {!GlobalPolicy} globalPolicy
-   * @return {boolean}
-   * @private
-   */
-  allowAddConnection_(deviceState, globalPolicy) {
+  private allowAddConnection_(
+      deviceState: OncMojo.DeviceStateProperties|undefined,
+      globalPolicy: GlobalPolicy): boolean {
     if (!this.deviceIsEnabled_(deviceState)) {
       return false;
     }
     return globalPolicy && !globalPolicy.allowOnlyPolicyWifiNetworksToConnect;
   }
 
-  /**
-   * @param {!OncMojo.DeviceStateProperties|undefined} deviceState
-   * @param {!GlobalPolicy} globalPolicy
-   * @return {boolean}
-   * @private
-   */
-  showAddWifiButton_(deviceState, globalPolicy) {
+  private showAddWifiButton_(
+      deviceState: OncMojo.DeviceStateProperties|undefined,
+      globalPolicy: GlobalPolicy): boolean {
     if (!deviceState || deviceState.type !== NetworkType.kWiFi) {
       return false;
     }
     return this.allowAddConnection_(deviceState, globalPolicy);
   }
 
-  /**
-   * @private
-   * @param {!string} type
-   */
-  dispatchShowConfigEvent_(type) {
+  private dispatchShowConfigEvent_(type: string): void {
     const event = new CustomEvent('show-config', {
       bubbles: true,
       composed: true,
@@ -759,47 +676,36 @@
     this.dispatchEvent(event);
   }
 
-  /** @private */
-  onAddWifiButtonTap_() {
+  private onAddWifiButtonTap_(): void {
     assert(this.deviceState, 'Device state is falsey - Wifi expected.');
     const type = this.deviceState.type;
     assert(type === NetworkType.kWiFi, 'Wifi type expected.');
     this.dispatchShowConfigEvent_(OncMojo.getNetworkTypeString(type));
   }
 
-  /** @private */
-  onAddVpnButtonTap_() {
+  private onAddVpnButtonTap_(): void {
     assert(this.deviceState, 'Device state is falsey - VPN expected.');
     const type = this.deviceState.type;
     assert(type === NetworkType.kVPN, 'VPN type expected.');
     this.dispatchShowConfigEvent_(OncMojo.getNetworkTypeString(type));
   }
 
-  /**
-   * @param {!{model: !{item: !VpnProvider}}} event
-   * @private
-   */
-  onAddThirdPartyVpnTap_(event) {
+  private onAddThirdPartyVpnTap_(event: DomRepeatEvent<VpnProvider>): void {
     const provider = event.model.item;
     this.browserProxy_.addThirdPartyVpn(provider.appId);
     recordSettingChange();
   }
 
-  /**
-   * @param {!OncMojo.DeviceStateProperties|undefined} deviceState
-   * @return {boolean}
-   * @private
-   */
-  knownNetworksIsVisible_(deviceState) {
+  private knownNetworksIsVisible_(deviceState: OncMojo.DeviceStateProperties|
+                                  undefined): boolean {
     return !!deviceState && deviceState.type === NetworkType.kWiFi;
   }
 
   /**
    * Event triggered when the known networks button is clicked.
-   * @private
    */
-  onKnownNetworksTap_() {
-    assert(this.deviceState.type === NetworkType.kWiFi);
+  private onKnownNetworksTap_(): void {
+    assert(this.deviceState?.type === NetworkType.kWiFi);
     const showKnownNetworksEvent = new CustomEvent('show-known-networks', {
       bubbles: true,
       composed: true,
@@ -810,10 +716,8 @@
 
   /**
    * Event triggered when the enable button is toggled.
-   * @param {!Event} event
-   * @private
    */
-  onDeviceEnabledChange_(event) {
+  private onDeviceEnabledChange_(): void {
     assert(this.deviceState);
     const deviceEnabledToggledEvent =
         new CustomEvent('device-enabled-toggled', {
@@ -827,37 +731,28 @@
     this.dispatchEvent(deviceEnabledToggledEvent);
   }
 
-  /**
-   * @param {!Object<!Array<!OncMojo.NetworkStateProperties>>} thirdPartyVpns
-   * @param {!VpnProvider} provider
-   * @return {!Array<!OncMojo.NetworkStateProperties>}
-   * @private
-   */
-  getThirdPartyVpnNetworks_(thirdPartyVpns, provider) {
+  private getThirdPartyVpnNetworks_(
+      thirdPartyVpns: Record<string, OncMojo.NetworkStateProperties[]>,
+      provider: VpnProvider): OncMojo.NetworkStateProperties[] {
     return thirdPartyVpns[provider.providerId] || [];
   }
 
-  /**
-   * @param {!Object<!Array<!OncMojo.NetworkStateProperties>>} thirdPartyVpns
-   * @param {!VpnProvider} provider
-   * @return {boolean}
-   * @private
-   */
-  haveThirdPartyVpnNetwork_(thirdPartyVpns, provider) {
+  private haveThirdPartyVpnNetwork_(
+      thirdPartyVpns: Record<string, OncMojo.NetworkStateProperties[]>,
+      provider: VpnProvider): boolean {
     const list = this.getThirdPartyVpnNetworks_(thirdPartyVpns, provider);
     return !!list.length;
   }
 
   /**
    * Event triggered when a network list item is selected.
-   * @param {!{target: HTMLElement, detail: !OncMojo.NetworkStateProperties}} e
-   * @private
    */
-  onNetworkSelected_(e) {
+  private onNetworkSelected_(e: CustomEvent<OncMojo.NetworkStateProperties>):
+      void {
     assert(this.globalPolicy);
     assert(this.defaultNetwork !== undefined);
     const networkState = e.detail;
-    e.target.blur();
+    (e.target as HTMLElement).blur();
     if (this.canAttemptConnection_(networkState)) {
       const networkConnectEvent = new CustomEvent('network-connect', {
         bubbles: true,
@@ -877,12 +772,7 @@
     this.dispatchEvent(showDetailEvent);
   }
 
-  /**
-   * @param {!OncMojo.NetworkStateProperties} state The network state.
-   * @return {boolean}
-   * @private
-   */
-  isBlockedByPolicy_(state) {
+  private isBlockedByPolicy_(state: OncMojo.NetworkStateProperties): boolean {
     if (state.type !== NetworkType.kWiFi &&
         state.type !== NetworkType.kCellular) {
       return false;
@@ -900,17 +790,16 @@
          !!this.deviceState && !!this.deviceState.managedNetworkAvailable) ||
         (!!this.globalPolicy.blockedHexSsids &&
          this.globalPolicy.blockedHexSsids.includes(
-             state.typeState.wifi.hexSsid));
+             state.typeState.wifi!.hexSsid));
   }
 
   /**
    * Determines whether or not it is possible to attempt a connection to the
    * provided network (e.g., whether it's possible to connect or configure the
    * network for connection).
-   * @param {!OncMojo.NetworkStateProperties} state The network state.
-   * @private
    */
-  canAttemptConnection_(state) {
+  private canAttemptConnection_(state: OncMojo.NetworkStateProperties):
+      boolean {
     if (state.connectionState !== ConnectionStateType.kNotConnected) {
       return false;
     }
@@ -930,31 +819,21 @@
 
     // Locked SIM profiles must be unlocked before a connection can occur.
     if (state.type === NetworkType.kCellular &&
-        state.typeState.cellular.simLocked) {
+        state.typeState.cellular!.simLocked) {
       return false;
     }
 
     return true;
   }
 
-  /**
-   * @param {string} typeString
-   * @param {OncMojo.DeviceStateProperties} device
-   * @return {boolean}
-   * @private
-   */
-  matchesType_(typeString, device) {
+  private matchesType_(
+      typeString: string, device: OncMojo.DeviceStateProperties): boolean {
     return !!device &&
         device.type === OncMojo.getNetworkTypeFromString(typeString);
   }
 
-  /**
-   * @param {!Array<!OncMojo.NetworkStateProperties>}
-   *     networkStateList
-   * @return {boolean}
-   * @private
-   */
-  shouldShowNetworkList_(networkStateList) {
+  private shouldShowNetworkList_(
+      networkStateList: OncMojo.NetworkStateProperties[]): boolean {
     if (this.shouldShowCellularNetworkList_()) {
       return false;
     }
@@ -962,50 +841,36 @@
     if (!!this.deviceState && this.deviceState.type === NetworkType.kVPN) {
       return this.shouldShowVpnList_();
     }
-    return this.networkStateList_.length > 0;
+    return networkStateList.length > 0;
   }
 
   /**
-   * @return {boolean} True if native VPN is not disabled by policy and there
+   * @return True if native VPN is not disabled by policy and there
    *     are more than one VPN network configured.
-   * @private
    */
-  shouldShowVpnList_() {
+  private shouldShowVpnList_(): boolean {
     return this.vpnIsEnabled_ && this.networkStateList_.length > 0;
   }
 
-  /**
-   * @return {boolean}
-   * @private
-   */
-  shouldShowCellularNetworkList_() {
+  private shouldShowCellularNetworkList_(): boolean {
     // Only shown if the currently-active subpage is for Cellular networks.
     return !!this.deviceState &&
         this.deviceState.type === NetworkType.kCellular;
   }
 
-  /**
-   * @param {!Array<!OncMojo.NetworkStateProperties>}
-   *     networkStateList
-   * @return {boolean}
-   * @private
-   */
-  hideNoNetworksMessage_(networkStateList) {
+  private hideNoNetworksMessage_(
+      networkStateList: OncMojo.NetworkStateProperties[]): boolean {
     return this.shouldShowCellularNetworkList_() ||
         this.shouldShowNetworkList_(networkStateList);
   }
 
-  /**
-   * @param {!OncMojo.DeviceStateProperties|undefined} deviceState
-   * @param {!OncMojo.DeviceStateProperties|undefined} tetherDeviceState
-   * @return {string}
-   * @private
-   */
-  getNoNetworksInnerHtml_(deviceState, tetherDeviceState) {
+  private getNoNetworksInnerHtml_(
+      deviceState: OncMojo.DeviceStateProperties,
+      _tetherDeviceState: OncMojo.DeviceStateProperties|undefined): string {
     const type = deviceState.type;
     if (type === NetworkType.kTether ||
         (type === NetworkType.kCellular && this.tetherDeviceState)) {
-      return this.i18nAdvanced('internetNoNetworksMobileData');
+      return this.i18nAdvanced('internetNoNetworksMobileData').toString();
     }
 
     if (type === NetworkType.kVPN) {
@@ -1024,21 +889,13 @@
         this.i18n('networkScanningLabel');
   }
 
-  /**
-   * @param {!Array<string>} notificationsDisabledDeviceNames
-   * @return {boolean}
-   * @private
-   */
-  showGmsCoreNotificationsSection_(notificationsDisabledDeviceNames) {
+  private showGmsCoreNotificationsSection_(notificationsDisabledDeviceNames:
+                                               string[]): boolean {
     return notificationsDisabledDeviceNames.length > 0;
   }
 
-  /**
-   * @param {!Array<string>} notificationsDisabledDeviceNames
-   * @return {string}
-   * @private
-   */
-  getGmsCoreNotificationsDevicesString_(notificationsDisabledDeviceNames) {
+  private getGmsCoreNotificationsDevicesString_(
+      notificationsDisabledDeviceNames: string[]): string {
     if (notificationsDisabledDeviceNames.length === 1) {
       return this.i18n(
           'gmscoreNotificationsOneDeviceSubtitle',
@@ -1055,11 +912,7 @@
     return this.i18n('gmscoreNotificationsManyDevicesSubtitle');
   }
 
-  /**
-   * @return {boolean}
-   * @private
-   */
-  computeIsShowingVpn_() {
+  private computeIsShowingVpn_(): boolean {
     if (!this.deviceState) {
       return false;
     }
@@ -1070,10 +923,8 @@
   /**
    * Tells when VPN preferences section should be displayed. It is
    * displayed when the preferences are applicable to the current device.
-   * @return {boolean}
-   * @private
    */
-  shouldShowVpnPreferences_() {
+  private shouldShowVpnPreferences_(): boolean {
     if (!this.deviceState) {
       return false;
     }
@@ -1086,15 +937,12 @@
   /**
    * Generates the list of VPN services available for always-on. It keeps from
    * the network list only the supported technologies.
-   * @return {!Array<!OncMojo.NetworkStateProperties>}
-   * @private
    */
-  getAlwaysOnVpnNetworks_() {
+  private getAlwaysOnVpnNetworks_(): OncMojo.NetworkStateProperties[] {
     if (!this.deviceState || this.deviceState.type !== NetworkType.kVPN) {
       return [];
     }
 
-    /** @type {!Array<!OncMojo.NetworkStateProperties>} */
     const alwaysOnVpnList = this.networkStateList_.slice();
     for (const vpnList of Object.values(this.thirdPartyVpns_)) {
       assert(vpnList.length > 0);
@@ -1102,8 +950,8 @@
       // - TODO(b/188864779): ARC VPNs are not supported yet,
       // - Chrome VPN apps are deprecated and incompatible with lockdown mode
       //   (see b/206910855).
-      if (vpnList[0].typeState.vpn.type === VpnType.kArc ||
-          vpnList[0].typeState.vpn.type === VpnType.kExtension) {
+      if (vpnList[0].typeState.vpn!.type === VpnType.kArc ||
+          vpnList[0].typeState.vpn!.type === VpnType.kExtension) {
         continue;
       }
       alwaysOnVpnList.push(...vpnList);
@@ -1114,32 +962,28 @@
 
   /**
    * Fetches the always-on VPN configuration from network config.
-   * @private
    */
-  updateAlwaysOnVpnPreferences_() {
+  private async updateAlwaysOnVpnPreferences_(): Promise<void> {
     if (!this.deviceState || this.deviceState.type !== NetworkType.kVPN) {
       return;
     }
 
-    this.networkConfig_.getAlwaysOnVpn().then(result => {
-      this.alwaysOnVpnMode_ = result.properties.mode;
-      this.alwaysOnVpnService_ = result.properties.serviceGuid;
-    });
+    const result = await this.networkConfig_.getAlwaysOnVpn();
+    this.alwaysOnVpnMode_ = result.properties.mode;
+    this.alwaysOnVpnService_ = result.properties.serviceGuid;
   }
 
   /**
    * Handles a change in |alwaysOnVpnMode_| or |alwaysOnVpnService_|
    * triggered via the observer.
-   * @private
    */
-  onAlwaysOnVpnChanged_() {
+  private onAlwaysOnVpnChanged_(): void {
     if (this.alwaysOnVpnMode_ === undefined ||
         this.alwaysOnVpnService_ === undefined) {
       return;
     }
 
-    /** @type {!AlwaysOnVpnProperties} */
-    const properties = {
+    const properties: AlwaysOnVpnProperties = {
       mode: this.alwaysOnVpnMode_,
       serviceGuid: this.alwaysOnVpnService_,
     };
@@ -1147,5 +991,11 @@
   }
 }
 
+declare global {
+  interface HTMLElementTagNameMap {
+    [SettingsInternetSubpageElement.is]: SettingsInternetSubpageElement;
+  }
+}
+
 customElements.define(
     SettingsInternetSubpageElement.is, SettingsInternetSubpageElement);

chrome/browser/resources/settings/chromeos/internet_page/network_proxy_section.ts

diff --git a/chrome/browser/resources/settings/chromeos/internet_page/network_proxy_section.ts b/chrome/browser/resources/settings/chromeos/internet_page/network_proxy_section.ts
index 1d097a0..16a921a 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/network_proxy_section.ts
+++ b/chrome/browser/resources/settings/chromeos/internet_page/network_proxy_section.ts
@@ -32,6 +32,7 @@
 
 import {SettingsToggleButtonElement} from '../../controls/settings_toggle_button.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
+import {Constructor} from '../common/types.js';
 import {routes} from '../os_route.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
 import {Route} from '../router.js';
@@ -56,11 +57,9 @@
         [
           CrPolicyNetworkBehaviorMojo,
         ],
-        PrefsMixin(RouteObserverMixin(I18nMixin(PolymerElement)))) as {
-      new (): PolymerElement & I18nMixinInterface &
-          RouteObserverMixinInterface & PrefsMixinInterface &
-          CrPolicyNetworkBehaviorMojoInterface,
-    };
+        PrefsMixin(RouteObserverMixin(I18nMixin(PolymerElement)))) as
+    Constructor<PolymerElement&I18nMixinInterface&RouteObserverMixinInterface&
+                PrefsMixinInterface&CrPolicyNetworkBehaviorMojoInterface>;
 
 class NetworkProxySectionElement extends NetworkProxySectionElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/internet_page/network_summary.ts

diff --git a/chrome/browser/resources/settings/chromeos/internet_page/network_summary.ts b/chrome/browser/resources/settings/chromeos/internet_page/network_summary.ts
index 3c53f5a..d87fbdf3 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/network_summary.ts
+++ b/chrome/browser/resources/settings/chromeos/internet_page/network_summary.ts
@@ -21,16 +21,16 @@
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {castExists} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 
 import {getTemplate} from './network_summary.html.js';
 import {NetworkSummaryItemElement} from './network_summary_item.js';
 
 const NetworkSummaryElementBase =
-    mixinBehaviors([NetworkListenerBehavior], PolymerElement) as {
-      new (): PolymerElement & NetworkListenerBehaviorInterface,
-    };
+    mixinBehaviors([NetworkListenerBehavior], PolymerElement) as
+    Constructor<PolymerElement&NetworkListenerBehaviorInterface>;
 
-class NetworkSummaryElement extends NetworkSummaryElementBase {
+export class NetworkSummaryElement extends NetworkSummaryElementBase {
   static get is() {
     return 'network-summary' as const;
   }

chrome/browser/resources/settings/chromeos/internet_page/network_summary_item.ts

diff --git a/chrome/browser/resources/settings/chromeos/internet_page/network_summary_item.ts b/chrome/browser/resources/settings/chromeos/internet_page/network_summary_item.ts
index b0ad7d8e..ffdc621 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/network_summary_item.ts
+++ b/chrome/browser/resources/settings/chromeos/internet_page/network_summary_item.ts
@@ -28,15 +28,15 @@
 import {ConnectionStateType, DeviceStateType, NetworkType, OncSource, PortalState} from 'chrome://resources/mojo/chromeos/services/network_config/public/mojom/network_types.mojom-webui.js';
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
+import {Constructor} from '../common/types.js';
+
 import {InternetPageBrowserProxy, InternetPageBrowserProxyImpl} from './internet_page_browser_proxy.js';
 import {getTemplate} from './network_summary_item.html.js';
 
 const NetworkSummaryItemElementBase =
     mixinBehaviors([CrPolicyNetworkBehaviorMojo], I18nMixin(PolymerElement)) as
-    {
-      new (): PolymerElement & I18nMixinInterface &
-          CrPolicyNetworkBehaviorMojoInterface,
-    };
+    Constructor<PolymerElement&I18nMixinInterface&
+                CrPolicyNetworkBehaviorMojoInterface>;
 
 export class NetworkSummaryItemElement extends NetworkSummaryItemElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/kerberos_page/kerberos_accounts.ts

diff --git a/chrome/browser/resources/settings/chromeos/kerberos_page/kerberos_accounts.ts b/chrome/browser/resources/settings/chromeos/kerberos_page/kerberos_accounts.ts
index 9a0ae9bd..a935566 100644
--- a/chrome/browser/resources/settings/chromeos/kerberos_page/kerberos_accounts.ts
+++ b/chrome/browser/resources/settings/chromeos/kerberos_page/kerberos_accounts.ts
@@ -21,11 +21,12 @@
 import {CrToastElement} from 'chrome://resources/cr_elements/cr_toast/cr_toast.js';
 import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js';
 import {WebUiListenerMixin, WebUiListenerMixinInterface} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {DomRepeatEvent, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {cast, castExists} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {getImage} from '../icon.js';
 import {recordSettingChange} from '../metrics_recorder.js';
@@ -41,11 +42,9 @@
         [
           DeepLinkingBehavior,
         ],
-        RouteObserverMixin(WebUiListenerMixin(I18nMixin(PolymerElement)))) as {
-      new (): PolymerElement & DeepLinkingBehaviorInterface &
-          I18nMixinInterface & WebUiListenerMixinInterface &
-          RouteObserverMixinInterface,
-    };
+        RouteObserverMixin(WebUiListenerMixin(I18nMixin(PolymerElement)))) as
+    Constructor<PolymerElement&DeepLinkingBehaviorInterface&I18nMixinInterface&
+                WebUiListenerMixinInterface&RouteObserverMixinInterface>;
 
 class SettingsKerberosAccountsElement extends
     SettingsKerberosAccountsElementBase {

chrome/browser/resources/settings/chromeos/main_page_mixin.ts

diff --git a/chrome/browser/resources/settings/chromeos/main_page_mixin.ts b/chrome/browser/resources/settings/chromeos/main_page_mixin.ts
index adcd0ac..565098a4 100644
--- a/chrome/browser/resources/settings/chromeos/main_page_mixin.ts
+++ b/chrome/browser/resources/settings/chromeos/main_page_mixin.ts
@@ -6,6 +6,7 @@
 import {beforeNextRender, dedupingMixin, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {castExists} from './assert_extras.js';
+import {Constructor} from './common/types.js';
 import {ensureLazyLoaded} from './ensure_lazy_loaded.js';
 import {SettingsIdleLoadElement} from './os_settings_page/settings_idle_load.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from './route_observer_mixin.js';
@@ -71,8 +72,6 @@
   [RouteState.TOP_LEVEL, ALL_STATES],
 ]);
 
-type Constructor<T> = new (...args: any[]) => T;
-
 export interface MainPageMixinInterface extends RouteObserverMixinInterface {
   containsRoute(route: Route|undefined): boolean;
   querySection(section: string): HTMLElement|null;

chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_page.js

diff --git a/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_page.js b/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_page.js
index cf36cfe3..5768f68 100644
--- a/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_page.js
+++ b/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_page.js
@@ -17,20 +17,20 @@
 import './multidevice_permissions_setup_dialog.js';
 import './multidevice_subpage.js';
 
+import {assert, assertNotReached} from 'chrome://resources/ash/common/assert.js';
 import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/ash/common/i18n_behavior.js';
 import {WebUIListenerBehavior, WebUIListenerBehaviorInterface} from 'chrome://resources/ash/common/web_ui_listener_behavior.js';
-import {assert, assertNotReached} from 'chrome://resources/ash/common/assert.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {beforeNextRender, html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
-import {Route, Router} from '../router.js';
 import {NearbyShareSettingsBehavior, NearbyShareSettingsBehaviorInterface} from '../../shared/nearby_share_settings_behavior.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {recordSettingChange} from '../metrics_recorder.js';
 import {routes} from '../os_route.js';
 import {PrefsBehavior, PrefsBehaviorInterface} from '../prefs_behavior.js';
 import {RouteObserverBehavior, RouteObserverBehaviorInterface} from '../route_observer_behavior.js';
+import {Route, Router} from '../router.js';
 
 import {MultiDeviceBrowserProxy, MultiDeviceBrowserProxyImpl} from './multidevice_browser_proxy.js';
 import {MultiDeviceFeature, MultiDeviceFeatureState, MultiDevicePageContentData, MultiDeviceSettingsMode, PhoneHubFeatureAccessStatus, PhoneHubPermissionsSetupAction, PhoneHubPermissionsSetupFlowScreens} from './multidevice_constants.js';

chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_smartlock_item.js

diff --git a/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_smartlock_item.js b/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_smartlock_item.js
index 2e99bc3..4733eaff 100644
--- a/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_smartlock_item.js
+++ b/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_smartlock_item.js
@@ -15,7 +15,6 @@
 import {WebUIListenerBehavior, WebUIListenerBehaviorInterface} from 'chrome://resources/ash/common/web_ui_listener_behavior.js';
 import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {recordSettingChange} from '../metrics_recorder.js';
 import {routes} from '../os_route.js';
 import {OsSettingsRoutes} from '../os_settings_routes.js';

chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_subpage.js

diff --git a/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_subpage.js b/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_subpage.js
index d129afe..f0d8caf8 100644
--- a/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_subpage.js
+++ b/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_subpage.js
@@ -23,7 +23,6 @@
 import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/ash/common/i18n_behavior.js';
 import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {Route} from '../router.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';

chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_tether_item.js

diff --git a/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_tether_item.js b/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_tether_item.js
index 04c9a71..164d614 100644
--- a/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_tether_item.js
+++ b/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_tether_item.js
@@ -19,11 +19,11 @@
 import {MojoInterfaceProviderImpl} from 'chrome://resources/ash/common/network/mojo_interface_provider.js';
 import {NetworkListenerBehavior, NetworkListenerBehaviorInterface} from 'chrome://resources/ash/common/network/network_listener_behavior.js';
 import {OncMojo} from 'chrome://resources/ash/common/network/onc_mojo.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {CrosNetworkConfigRemote, FilterType, InhibitReason, NetworkStateProperties} from 'chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom-webui.js';
 import {DeviceStateType, NetworkType} from 'chrome://resources/mojo/chromeos/services/network_config/public/mojom/network_types.mojom-webui.js';
 import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {routes} from '../os_route.js';
 import {OsSettingsRoutes} from '../os_settings_routes.js';
 

chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_receive_dialog.js

diff --git a/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_receive_dialog.js b/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_receive_dialog.js
index 65f3e8a..717f302 100644
--- a/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_receive_dialog.js
+++ b/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_receive_dialog.js
@@ -30,9 +30,9 @@
 import 'chrome://resources/cr_elements/cr_view_manager/cr_view_manager.js';
 
 import {assert} from 'chrome://resources/ash/common/assert.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {NearbySettings} from '../../shared/nearby_share_settings_behavior.js';
 
 import {getReceiveManager, observeReceiveManager} from './nearby_share_receive_manager.js';

chrome/browser/resources/settings/chromeos/os_a11y_page/audio_and_captions_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/audio_and_captions_page.ts b/chrome/browser/resources/settings/chromeos/os_a11y_page/audio_and_captions_page.ts
index f802e165..3250849 100644
--- a/chrome/browser/resources/settings/chromeos/os_a11y_page/audio_and_captions_page.ts
+++ b/chrome/browser/resources/settings/chromeos/os_a11y_page/audio_and_captions_page.ts
@@ -26,6 +26,7 @@
 import {afterNextRender, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteOriginMixin, RouteOriginMixinInterface} from '../route_origin_mixin.js';
@@ -45,11 +46,9 @@
         [
           DeepLinkingBehavior,
         ],
-        RouteOriginMixin(WebUiListenerMixin(I18nMixin(PolymerElement)))) as {
-      new (): PolymerElement & I18nMixinInterface &
-          WebUiListenerMixinInterface & RouteOriginMixinInterface &
-          DeepLinkingBehaviorInterface,
-    };
+        RouteOriginMixin(WebUiListenerMixin(I18nMixin(PolymerElement)))) as
+    Constructor<PolymerElement&I18nMixinInterface&WebUiListenerMixinInterface&
+                RouteOriginMixinInterface&DeepLinkingBehaviorInterface>;
 
 class SettingsAudioAndCaptionsPageElement extends
     SettingsAudioAndCaptionsPageElementBase {

chrome/browser/resources/settings/chromeos/os_a11y_page/cursor_and_touchpad_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/cursor_and_touchpad_page.ts b/chrome/browser/resources/settings/chromeos/os_a11y_page/cursor_and_touchpad_page.ts
index 281ea2b1..c227c1e 100644
--- a/chrome/browser/resources/settings/chromeos/os_a11y_page/cursor_and_touchpad_page.ts
+++ b/chrome/browser/resources/settings/chromeos/os_a11y_page/cursor_and_touchpad_page.ts
@@ -26,6 +26,7 @@
 import {SettingsToggleButtonElement} from '../../controls/settings_toggle_button.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {DevicePageBrowserProxy, DevicePageBrowserProxyImpl} from '../device_page/device_page_browser_proxy.js';
 import {routes} from '../os_route.js';
@@ -54,11 +55,10 @@
           DeepLinkingBehavior,
         ],
         RouteOriginMixin(
-            PrefsMixin(WebUiListenerMixin(I18nMixin(PolymerElement))))) as {
-      new (): PolymerElement & I18nMixinInterface &
-          WebUiListenerMixinInterface & PrefsMixinInterface &
-          RouteOriginMixinInterface & DeepLinkingBehaviorInterface,
-    };
+            PrefsMixin(WebUiListenerMixin(I18nMixin(PolymerElement))))) as
+    Constructor<PolymerElement&I18nMixinInterface&WebUiListenerMixinInterface&
+                PrefsMixinInterface&RouteOriginMixinInterface&
+                DeepLinkingBehaviorInterface>;
 
 class SettingsCursorAndTouchpadPageElement extends
     SettingsCursorAndTouchpadPageElementBase {

chrome/browser/resources/settings/chromeos/os_a11y_page/display_and_magnification_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/display_and_magnification_page.ts b/chrome/browser/resources/settings/chromeos/os_a11y_page/display_and_magnification_page.ts
index 081e5be..8641ed1 100644
--- a/chrome/browser/resources/settings/chromeos/os_a11y_page/display_and_magnification_page.ts
+++ b/chrome/browser/resources/settings/chromeos/os_a11y_page/display_and_magnification_page.ts
@@ -23,6 +23,7 @@
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteOriginMixin, RouteOriginMixinInterface} from '../route_origin_mixin.js';
@@ -35,11 +36,9 @@
         [
           DeepLinkingBehavior,
         ],
-        RouteOriginMixin(WebUiListenerMixin(I18nMixin(PolymerElement)))) as {
-      new (): PolymerElement & I18nMixinInterface &
-          WebUiListenerMixinInterface & RouteOriginMixinInterface &
-          DeepLinkingBehaviorInterface,
-    };
+        RouteOriginMixin(WebUiListenerMixin(I18nMixin(PolymerElement)))) as
+    Constructor<PolymerElement&I18nMixinInterface&WebUiListenerMixinInterface&
+                RouteOriginMixinInterface&DeepLinkingBehaviorInterface>;
 
 class SettingsDisplayAndMagnificationElement extends
     SettingsDisplayAndMagnificationElementBase {

chrome/browser/resources/settings/chromeos/os_a11y_page/keyboard_and_text_input_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/keyboard_and_text_input_page.ts b/chrome/browser/resources/settings/chromeos/os_a11y_page/keyboard_and_text_input_page.ts
index 0195389..1d19861 100644
--- a/chrome/browser/resources/settings/chromeos/os_a11y_page/keyboard_and_text_input_page.ts
+++ b/chrome/browser/resources/settings/chromeos/os_a11y_page/keyboard_and_text_input_page.ts
@@ -26,6 +26,7 @@
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
 import {cast} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteOriginMixin, RouteOriginMixinInterface} from '../route_origin_mixin.js';
@@ -48,11 +49,10 @@
           DeepLinkingBehavior,
         ],
         RouteOriginMixin(
-            PrefsMixin(WebUiListenerMixin(I18nMixin(PolymerElement))))) as {
-      new (): PolymerElement & I18nMixinInterface &
-          WebUiListenerMixinInterface & PrefsMixinInterface &
-          RouteOriginMixinInterface & DeepLinkingBehaviorInterface,
-    };
+            PrefsMixin(WebUiListenerMixin(I18nMixin(PolymerElement))))) as
+    Constructor<PolymerElement&I18nMixinInterface&WebUiListenerMixinInterface&
+                PrefsMixinInterface&RouteOriginMixinInterface&
+                DeepLinkingBehaviorInterface>;
 
 class SettingsKeyboardAndTextInputPageElement extends
     SettingsKeyboardAndTextInputPageElementBase {

chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.ts b/chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.ts
index b0ed8d9..7581032b 100644
--- a/chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.ts
+++ b/chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.ts
@@ -29,6 +29,7 @@
 import {SettingsToggleButtonElement} from '../../controls/settings_toggle_button.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteOriginMixin, RouteOriginMixinInterface} from '../route_origin_mixin.js';
@@ -46,11 +47,9 @@
 const OsSettingsA11yPageElementBase =
     mixinBehaviors(
         [DeepLinkingBehavior],
-        RouteOriginMixin(PrefsMixin(WebUiListenerMixin(PolymerElement)))) as {
-      new (): PolymerElement & WebUiListenerMixinInterface &
-          PrefsMixinInterface & RouteOriginMixinInterface &
-          DeepLinkingBehaviorInterface,
-    };
+        RouteOriginMixin(PrefsMixin(WebUiListenerMixin(PolymerElement)))) as
+    Constructor<PolymerElement&WebUiListenerMixinInterface&PrefsMixinInterface&
+                RouteOriginMixinInterface&DeepLinkingBehaviorInterface>;
 
 class OsSettingsA11yPageElement extends OsSettingsA11yPageElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/os_a11y_page/select_to_speak_subpage.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/select_to_speak_subpage.ts b/chrome/browser/resources/settings/chromeos/os_a11y_page/select_to_speak_subpage.ts
index c6eb36d..3306486 100644
--- a/chrome/browser/resources/settings/chromeos/os_a11y_page/select_to_speak_subpage.ts
+++ b/chrome/browser/resources/settings/chromeos/os_a11y_page/select_to_speak_subpage.ts
@@ -21,6 +21,7 @@
 import {SettingsToggleButtonElement} from '../../controls/settings_toggle_button.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {LanguagesBrowserProxy, LanguagesBrowserProxyImpl} from '../os_languages_page/languages_browser_proxy.js';
 import {routes} from '../os_route.js';
@@ -88,11 +89,10 @@
           DeepLinkingBehavior,
         ],
         RouteOriginMixin(
-            PrefsMixin(WebUiListenerMixin(I18nMixin(PolymerElement))))) as {
-      new (): PolymerElement & I18nMixinInterface &
-          WebUiListenerMixinInterface & PrefsMixinInterface &
-          RouteOriginMixinInterface & DeepLinkingBehaviorInterface,
-    };
+            PrefsMixin(WebUiListenerMixin(I18nMixin(PolymerElement))))) as
+    Constructor<PolymerElement&I18nMixinInterface&WebUiListenerMixinInterface&
+                PrefsMixinInterface&RouteOriginMixinInterface&
+                DeepLinkingBehaviorInterface>;
 
 class SettingsSelectToSpeakSubpageElement extends
     SettingsSelectToSpeakSubpageElementBase {

chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_subpage.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_subpage.ts b/chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_subpage.ts
index 8c680eaf..034b600 100644
--- a/chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_subpage.ts
+++ b/chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_subpage.ts
@@ -26,6 +26,7 @@
 
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
@@ -66,11 +67,10 @@
     mixinBehaviors(
         [DeepLinkingBehavior],
         PrefsMixin(RouteObserverMixin(
-            WebUiListenerMixin(I18nMixin(PolymerElement))))) as {
-      new (): PolymerElement & I18nMixinInterface &
-          WebUiListenerMixinInterface & RouteObserverMixinInterface &
-          PrefsMixinInterface & DeepLinkingBehaviorInterface,
-    };
+            WebUiListenerMixin(I18nMixin(PolymerElement))))) as
+    Constructor<PolymerElement&I18nMixinInterface&WebUiListenerMixinInterface&
+                RouteObserverMixinInterface&PrefsMixinInterface&
+                DeepLinkingBehaviorInterface>;
 
 class SettingsSwitchAccessSubpageElement extends
     SettingsSwitchAccessSubpageElementBase {

chrome/browser/resources/settings/chromeos/os_a11y_page/text_to_speech_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/text_to_speech_page.ts b/chrome/browser/resources/settings/chromeos/os_a11y_page/text_to_speech_page.ts
index 095ec0f..670c6bd3 100644
--- a/chrome/browser/resources/settings/chromeos/os_a11y_page/text_to_speech_page.ts
+++ b/chrome/browser/resources/settings/chromeos/os_a11y_page/text_to_speech_page.ts
@@ -19,6 +19,7 @@
 
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {DevicePageBrowserProxy, DevicePageBrowserProxyImpl} from '../device_page/device_page_browser_proxy.js';
 import {routes} from '../os_route.js';
@@ -34,11 +35,10 @@
           DeepLinkingBehavior,
         ],
         RouteOriginMixin(
-            PrefsMixin(WebUiListenerMixin(I18nMixin(PolymerElement))))) as {
-      new (): PolymerElement & I18nMixinInterface &
-          WebUiListenerMixinInterface & PrefsMixinInterface &
-          RouteOriginMixinInterface & DeepLinkingBehaviorInterface,
-    };
+            PrefsMixin(WebUiListenerMixin(I18nMixin(PolymerElement))))) as
+    Constructor<PolymerElement&I18nMixinInterface&WebUiListenerMixinInterface&
+                PrefsMixinInterface&RouteOriginMixinInterface&
+                DeepLinkingBehaviorInterface>;
 
 class SettingsTextToSpeechPageElement extends
     SettingsTextToSpeechPageElementBase {

chrome/browser/resources/settings/chromeos/os_a11y_page/tts_subpage.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_a11y_page/tts_subpage.ts b/chrome/browser/resources/settings/chromeos/os_a11y_page/tts_subpage.ts
index 5d1ba7c8..05b1b17 100644
--- a/chrome/browser/resources/settings/chromeos/os_a11y_page/tts_subpage.ts
+++ b/chrome/browser/resources/settings/chromeos/os_a11y_page/tts_subpage.ts
@@ -21,6 +21,7 @@
 import {DomRepeat, DomRepeatEvent, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {LanguagesBrowserProxy, LanguagesBrowserProxyImpl} from '../os_languages_page/languages_browser_proxy.js';
 import {routes} from '../os_route.js';
@@ -75,11 +76,9 @@
         [
           DeepLinkingBehavior,
         ],
-        RouteObserverMixin(WebUiListenerMixin(I18nMixin(PolymerElement)))) as {
-      new (): PolymerElement & I18nMixinInterface &
-          WebUiListenerMixinInterface & RouteObserverMixinInterface &
-          DeepLinkingBehaviorInterface,
-    };
+        RouteObserverMixin(WebUiListenerMixin(I18nMixin(PolymerElement)))) as
+    Constructor<PolymerElement&I18nMixinInterface&WebUiListenerMixinInterface&
+                RouteObserverMixinInterface&DeepLinkingBehaviorInterface>;
 
 class SettingsTtsSubpageElement extends SettingsTtsSubpageElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/os_about_page/detailed_build_info.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_about_page/detailed_build_info.ts b/chrome/browser/resources/settings/chromeos/os_about_page/detailed_build_info.ts
index 044d301..fc47007 100644
--- a/chrome/browser/resources/settings/chromeos/os_about_page/detailed_build_info.ts
+++ b/chrome/browser/resources/settings/chromeos/os_about_page/detailed_build_info.ts
@@ -21,12 +21,13 @@
 import {CrPolicyIndicatorType} from 'chrome://resources/cr_elements/policy/cr_policy_indicator_mixin.js';
 import {WebUiListenerMixin, WebUiListenerMixinInterface} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js';
 import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
 import {castExists} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
@@ -49,11 +50,10 @@
           DeepLinkingBehavior,
         ],
         RouteObserverMixin(
-            PrefsMixin(I18nMixin(WebUiListenerMixin(PolymerElement))))) as {
-      new (): PolymerElement & WebUiListenerMixinInterface &
-          I18nMixinInterface & PrefsMixinInterface &
-          RouteObserverMixinInterface & DeepLinkingBehaviorInterface,
-    };
+            PrefsMixin(I18nMixin(WebUiListenerMixin(PolymerElement))))) as
+    Constructor<PolymerElement&WebUiListenerMixinInterface&I18nMixinInterface&
+                PrefsMixinInterface&RouteObserverMixinInterface&
+                DeepLinkingBehaviorInterface>;
 
 class SettingsDetailedBuildInfoElement extends SettingsDetailedBuildInfoBase {
   static get is() {

chrome/browser/resources/settings/chromeos/os_about_page/os_about_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_about_page/os_about_page.ts b/chrome/browser/resources/settings/chromeos/os_about_page/os_about_page.ts
index 0df91fa0..344040ce 100644
--- a/chrome/browser/resources/settings/chromeos/os_about_page/os_about_page.ts
+++ b/chrome/browser/resources/settings/chromeos/os_about_page/os_about_page.ts
@@ -29,17 +29,18 @@
 import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js';
 import {WebUiListenerMixin, WebUiListenerMixinInterface} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js';
 import {assert} from 'chrome://resources/js/assert_ts.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {sanitizeInnerHtml} from 'chrome://resources/js/parse_html_subset.js';
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {LifetimeBrowserProxyImpl} from '../../lifetime_browser_proxy.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
-import {Route, Router} from '../router.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {MainPageMixin, MainPageMixinInterface} from '../main_page_mixin.js';
 import {recordSettingChange} from '../metrics_recorder.js';
 import {routes} from '../os_route.js';
+import {Route, Router} from '../router.js';
 
 import {AboutPageBrowserProxy, AboutPageBrowserProxyImpl, AboutPageUpdateInfo, BrowserChannel, browserChannelToI18nId, RegulatoryInfo, TpmFirmwareUpdateStatusChangedEvent, UpdateStatus, UpdateStatusChangedEvent} from './about_page_browser_proxy.js';
 import {getTemplate} from './os_about_page.html.js';
@@ -62,11 +63,9 @@
         [
           DeepLinkingBehavior,
         ],
-        MainPageMixin(I18nMixin(WebUiListenerMixin(PolymerElement)))) as {
-      new (): PolymerElement & WebUiListenerMixinInterface &
-          I18nMixinInterface & MainPageMixinInterface &
-          DeepLinkingBehaviorInterface,
-    };
+        MainPageMixin(I18nMixin(WebUiListenerMixin(PolymerElement)))) as
+    Constructor<PolymerElement&WebUiListenerMixinInterface&I18nMixinInterface&
+                MainPageMixinInterface&DeepLinkingBehaviorInterface>;
 
 class OsSettingsAboutPageElement extends OsSettingsAboutPageBaseElement {
   static get is() {

chrome/browser/resources/settings/chromeos/os_apps_page/android_apps_subpage.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_apps_page/android_apps_subpage.ts b/chrome/browser/resources/settings/chromeos/os_apps_page/android_apps_subpage.ts
index c97d26bc..f94ff7b 100644
--- a/chrome/browser/resources/settings/chromeos/os_apps_page/android_apps_subpage.ts
+++ b/chrome/browser/resources/settings/chromeos/os_apps_page/android_apps_subpage.ts
@@ -20,6 +20,7 @@
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
 import {castExists} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
@@ -37,10 +38,9 @@
 const SettingsAndroidAppsSubpageElementBase =
     mixinBehaviors(
         [DeepLinkingBehavior],
-        RouteObserverMixin(PrefsMixin(I18nMixin(PolymerElement)))) as {
-      new (): PolymerElement & I18nMixinInterface & PrefsMixinInterface &
-          RouteObserverMixinInterface & DeepLinkingBehaviorInterface,
-    };
+        RouteObserverMixin(PrefsMixin(I18nMixin(PolymerElement)))) as
+    Constructor<PolymerElement&I18nMixinInterface&PrefsMixinInterface&
+                RouteObserverMixinInterface&DeepLinkingBehaviorInterface>;
 
 class SettingsAndroidAppsSubpageElement extends
     SettingsAndroidAppsSubpageElementBase {

chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/store_mixin.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/store_mixin.ts b/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/store_mixin.ts
index f1febfd..3d432a9 100644
--- a/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/store_mixin.ts
+++ b/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/store_mixin.ts
@@ -10,9 +10,9 @@
 import {StoreClient, StoreClientInterface} from 'chrome://resources/ash/common/store/store_client.js';
 import {dedupingMixin, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {AppManagementPageState, AppManagementStore} from './store.js';
+import {Constructor} from '../../common/types.js';
 
-type Constructor<T> = new (...args: any[]) => T;
+import {AppManagementPageState, AppManagementStore} from './store.js';
 
 type ValueGetterFn<T = any> = (state: T) => any;
 type WatchFn = (localProperty: string, valueGetter: ValueGetterFn) => void;

chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/app_notifications_subpage.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/app_notifications_subpage.ts b/chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/app_notifications_subpage.ts
index 90d1c7d..5d10260e 100644
--- a/chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/app_notifications_subpage.ts
+++ b/chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/app_notifications_subpage.ts
@@ -18,6 +18,7 @@
 import {App, AppNotificationsHandlerInterface, AppNotificationsObserverReceiver} from '../../../mojom-webui/os_apps_page/app_notification_handler.mojom-webui.js';
 import {SettingChangeValue} from '../../../mojom-webui/search/user_action_recorder.mojom-webui.js';
 import {Setting} from '../../../mojom-webui/setting.mojom-webui.js';
+import {Constructor} from '../../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../../deep_linking_behavior.js';
 import {recordSettingChange} from '../../metrics_recorder.js';
 import {routes} from '../../os_route.js';
@@ -30,10 +31,8 @@
 
 const AppNotificationsSubpageBase =
     mixinBehaviors([DeepLinkingBehavior], RouteObserverMixin(PolymerElement)) as
-    {
-      new (): PolymerElement & RouteObserverMixinInterface &
-          DeepLinkingBehaviorInterface,
-    };
+    Constructor<PolymerElement&RouteObserverMixinInterface&
+                DeepLinkingBehaviorInterface>;
 
 export class AppNotificationsSubpage extends AppNotificationsSubpageBase {
   static get is() {

chrome/browser/resources/settings/chromeos/os_apps_page/os_apps_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_apps_page/os_apps_page.ts b/chrome/browser/resources/settings/chromeos/os_apps_page/os_apps_page.ts
index f4758cf..cdd9524 100644
--- a/chrome/browser/resources/settings/chromeos/os_apps_page/os_apps_page.ts
+++ b/chrome/browser/resources/settings/chromeos/os_apps_page/os_apps_page.ts
@@ -37,6 +37,7 @@
 import {App as AppWithNotifications, AppNotificationsHandlerInterface, AppNotificationsObserverReceiver, Readiness} from '../../mojom-webui/os_apps_page/app_notification_handler.mojom-webui.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
@@ -68,12 +69,11 @@
         [
           DeepLinkingBehavior,
         ],
-        RouteObserverMixin(PrefsMixin(
-            AppManagementStoreMixin(I18nMixin(PolymerElement))))) as {
-      new (): PolymerElement & AppManagementStoreMixinInterface &
-          I18nMixinInterface & PrefsMixinInterface &
-          RouteObserverMixinInterface & DeepLinkingBehaviorInterface,
-    };
+        RouteObserverMixin(
+            PrefsMixin(AppManagementStoreMixin(I18nMixin(PolymerElement))))) as
+    Constructor<PolymerElement&AppManagementStoreMixinInterface&
+                I18nMixinInterface&PrefsMixinInterface&
+                RouteObserverMixinInterface&DeepLinkingBehaviorInterface>;
 
 class OsSettingsAppsPageElement extends OsSettingsAppsPageElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_devices_subpage.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_devices_subpage.ts b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_devices_subpage.ts
index fa4923e..58cbee47 100644
--- a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_devices_subpage.ts
+++ b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_devices_subpage.ts
@@ -22,6 +22,7 @@
 
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
@@ -36,11 +37,10 @@
           DeepLinkingBehavior,
         ],
         PrefsMixin(RouteObserverMixin(
-            WebUiListenerMixin(I18nMixin(PolymerElement))))) as {
-      new (): PolymerElement & I18nMixinInterface &
-          WebUiListenerMixinInterface & RouteObserverMixinInterface &
-          PrefsMixinInterface & DeepLinkingBehaviorInterface,
-    };
+            WebUiListenerMixin(I18nMixin(PolymerElement))))) as
+    Constructor<PolymerElement&I18nMixinInterface&WebUiListenerMixinInterface&
+                RouteObserverMixinInterface&PrefsMixinInterface&
+                DeepLinkingBehaviorInterface>;
 
 class SettingsBluetoothDevicesSubpageElement extends
     SettingsBluetoothDevicesSubpageElementBase {

chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_forget_device_dialog.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_forget_device_dialog.ts b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_forget_device_dialog.ts
index 55573fe7..796f4834 100644
--- a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_forget_device_dialog.ts
+++ b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_forget_device_dialog.ts
@@ -13,11 +13,10 @@
 import {getDeviceName} from 'chrome://resources/ash/common/bluetooth/bluetooth_utils.js';
 import {CrDialogElement} from 'chrome://resources/cr_elements/cr_dialog/cr_dialog.js';
 import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {PairedBluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js';
 import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
-
 import {getTemplate} from './os_bluetooth_forget_device_dialog.html.js';
 
 interface SettingsBluetoothForgetDeviceDialogElement {

chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_summary.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_summary.ts b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_summary.ts
index 988838d..410a4683 100644
--- a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_summary.ts
+++ b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_summary.ts
@@ -16,10 +16,10 @@
 import {getBluetoothConfig} from 'chrome://resources/ash/common/bluetooth/cros_bluetooth_config.js';
 import {getInstance as getAnnouncerInstance} from 'chrome://resources/cr_elements/cr_a11y_announcer/cr_a11y_announcer.js';
 import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {BluetoothSystemProperties, BluetoothSystemState, DeviceConnectionState, PairedBluetoothDeviceProperties} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js';
 import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {routes} from '../os_route.js';
 import {RouteOriginMixin} from '../route_origin_mixin.js';
 import {Route, Router} from '../router.js';

chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_remove_saved_device_dialog.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_remove_saved_device_dialog.ts b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_remove_saved_device_dialog.ts
index 40991e89..e4dd2bd 100644
--- a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_remove_saved_device_dialog.ts
+++ b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_remove_saved_device_dialog.ts
@@ -14,10 +14,9 @@
 import {CrDialogElement} from 'chrome://resources/cr_elements/cr_dialog/cr_dialog.js';
 import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js';
 import {WebUiListenerMixin} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
-
 import {getTemplate} from './os_remove_saved_device_dialog.html.js';
 import {FastPairSavedDevice} from './settings_fast_pair_constants.js';
 

chrome/browser/resources/settings/chromeos/os_files_page/os_files_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_files_page/os_files_page.ts b/chrome/browser/resources/settings/chromeos/os_files_page/os_files_page.ts
index 1d609a5..cc6fa63 100644
--- a/chrome/browser/resources/settings/chromeos/os_files_page/os_files_page.ts
+++ b/chrome/browser/resources/settings/chromeos/os_files_page/os_files_page.ts
@@ -16,6 +16,7 @@
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
@@ -25,10 +26,8 @@
 
 const OsSettingsFilesPageElementBase =
     mixinBehaviors([DeepLinkingBehavior], RouteObserverMixin(PolymerElement)) as
-    {
-      new (): PolymerElement & RouteObserverMixinInterface &
-          DeepLinkingBehaviorInterface,
-    };
+    Constructor<PolymerElement&RouteObserverMixinInterface&
+                DeepLinkingBehaviorInterface>;
 
 class OsSettingsFilesPageElement extends OsSettingsFilesPageElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/os_languages_page/input_method_options_page.js

diff --git a/chrome/browser/resources/settings/chromeos/os_languages_page/input_method_options_page.js b/chrome/browser/resources/settings/chromeos/os_languages_page/input_method_options_page.js
index 741cfd11..096bf09a 100644
--- a/chrome/browser/resources/settings/chromeos/os_languages_page/input_method_options_page.js
+++ b/chrome/browser/resources/settings/chromeos/os_languages_page/input_method_options_page.js
@@ -13,11 +13,11 @@
 import './os_japanese_clear_ime_data_dialog.js';
 import './os_japanese_manage_user_dictionary_page.js';
 
-import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/ash/common/i18n_behavior.js';
 import {assert, assertNotReached} from 'chrome://resources/ash/common/assert.js';
+import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/ash/common/i18n_behavior.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {afterNextRender, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {routes} from '../os_route.js';
 import {PrefsBehavior, PrefsBehaviorInterface} from '../prefs_behavior.js';
 import {RouteObserverBehavior, RouteObserverBehaviorInterface} from '../route_observer_behavior.js';

chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.js

diff --git a/chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.js b/chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.js
index 176d2770..a63a552 100644
--- a/chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.js
+++ b/chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.js
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {assert, assertNotReached} from 'chrome://resources/ash/common/assert.js';
+/**
+ * @fileoverview constants related to input method options.
+ */
 
-import {loadTimeData} from '../../i18n_setup.js';
-import {Route} from '../router.js';
+import {assert, assertNotReached} from 'chrome://resources/ash/common/assert.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
+
 import {routes} from '../os_route.js';
+import {Route} from '../router.js';
 
 import {getInputMethodSettings, SettingsType} from './input_method_settings.js';
 import {JAPANESE_INPUT_MODE, JAPANESE_KEYMAP_STYLE, JAPANESE_PUNCTUATION_STYLE, JAPANESE_SECTION_SHORTCUT, JAPANESE_SHIFT_KEY_MODE_STYLE, JAPANESE_SPACE_INPUT_STYLE, JAPANESE_SYMBOL_STYLE} from './input_method_types.js';
 
-
-/**
- * @fileoverview constants related to input method options.
- */
 /**
  * The prefix string shared by all first party input method ID.
  * @private @const

chrome/browser/resources/settings/chromeos/os_languages_page/input_page.js

diff --git a/chrome/browser/resources/settings/chromeos/os_languages_page/input_page.js b/chrome/browser/resources/settings/chromeos/os_languages_page/input_page.js
index 95ac4b07..df769ae 100644
--- a/chrome/browser/resources/settings/chromeos/os_languages_page/input_page.js
+++ b/chrome/browser/resources/settings/chromeos/os_languages_page/input_page.js
@@ -20,19 +20,19 @@
 import '../../settings_shared.css.js';
 import '../os_settings_page/os_settings_animated_pages.js';
 
+import {assert} from 'chrome://resources/ash/common/assert.js';
 import {focusWithoutInk} from 'chrome://resources/ash/common/focus_without_ink_js.js';
 import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/ash/common/i18n_behavior.js';
-import {assert} from 'chrome://resources/ash/common/assert.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
-import {Route, Router} from '../router.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {recordSettingChange} from '../metrics_recorder.js';
 import {routes} from '../os_route.js';
 import {PrefsBehavior, PrefsBehaviorInterface} from '../prefs_behavior.js';
 import {RouteObserverBehavior, RouteObserverBehaviorInterface} from '../route_observer_behavior.js';
+import {Route, Router} from '../router.js';
 
 import {hasOptionsPageInSettings} from './input_method_util.js';
 import {getTemplate} from './input_page.html.js';

chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_page_v2.js

diff --git a/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_page_v2.js b/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_page_v2.js
index 3a3092c..6ca1d00 100644
--- a/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_page_v2.js
+++ b/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_page_v2.js
@@ -22,19 +22,19 @@
 import '../../controls/settings_toggle_button.js';
 import '../../settings_shared.css.js';
 
+import {assert} from 'chrome://resources/ash/common/assert.js';
 import {focusWithoutInk} from 'chrome://resources/ash/common/focus_without_ink_js.js';
 import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/ash/common/i18n_behavior.js';
-import {assert} from 'chrome://resources/ash/common/assert.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
-import {Route, Router} from '../router.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {recordSettingChange} from '../metrics_recorder.js';
 import {routes} from '../os_route.js';
 import {PrefsBehavior, PrefsBehaviorInterface} from '../prefs_behavior.js';
 import {RouteObserverBehavior, RouteObserverBehaviorInterface} from '../route_observer_behavior.js';
+import {Route, Router} from '../router.js';
 
 import {LanguagesMetricsProxy, LanguagesMetricsProxyImpl, LanguagesPageInteraction} from './languages_metrics_proxy.js';
 import {LanguageHelper, LanguagesModel, LanguageState} from './languages_types.js';

chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_section.js

diff --git a/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_section.js b/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_section.js
index 7466e98..cea7449 100644
--- a/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_section.js
+++ b/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_section.js
@@ -22,16 +22,15 @@
 import '../../settings_vars.css.js';
 
 import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/ash/common/i18n_behavior.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
-import {Router} from '../router.js';
 import {routes} from '../os_route.js';
+import {Router} from '../router.js';
 
 import {LanguageHelper, LanguagesModel} from './languages_types.js';
 import {getTemplate} from './os_languages_section.html.js';
 
-
 // The IME ID for the Accessibility Common extension used by Dictation.
 /** @type {string} */
 const ACCESSIBILITY_COMMON_IME_ID =

chrome/browser/resources/settings/chromeos/os_languages_page/smart_inputs_page.js

diff --git a/chrome/browser/resources/settings/chromeos/os_languages_page/smart_inputs_page.js b/chrome/browser/resources/settings/chromeos/os_languages_page/smart_inputs_page.js
index 7628a042..3934e5e 100644
--- a/chrome/browser/resources/settings/chromeos/os_languages_page/smart_inputs_page.js
+++ b/chrome/browser/resources/settings/chromeos/os_languages_page/smart_inputs_page.js
@@ -12,15 +12,15 @@
 import '../../settings_shared.css.js';
 
 import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/ash/common/i18n_behavior.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
-import {Route} from '../router.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {PrefsBehavior, PrefsBehaviorInterface} from '../prefs_behavior.js';
 import {RouteObserverBehavior, RouteObserverBehaviorInterface} from '../route_observer_behavior.js';
+import {Route} from '../router.js';
 
 import {getTemplate} from './smart_inputs_page.html.js';
 

chrome/browser/resources/settings/chromeos/os_people_page/account_manager.js

diff --git a/chrome/browser/resources/settings/chromeos/os_people_page/account_manager.js b/chrome/browser/resources/settings/chromeos/os_people_page/account_manager.js
index 8f9ec9f..4457440e 100644
--- a/chrome/browser/resources/settings/chromeos/os_people_page/account_manager.js
+++ b/chrome/browser/resources/settings/chromeos/os_people_page/account_manager.js
@@ -19,9 +19,9 @@
 
 import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/ash/common/i18n_behavior.js';
 import {WebUIListenerBehavior, WebUIListenerBehaviorInterface} from 'chrome://resources/ash/common/web_ui_listener_behavior.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {getImage} from '../icon.js';

chrome/browser/resources/settings/chromeos/os_people_page/lock_screen.js

diff --git a/chrome/browser/resources/settings/chromeos/os_people_page/lock_screen.js b/chrome/browser/resources/settings/chromeos/os_people_page/lock_screen.js
index 5b3741a1..bc5f8254 100644
--- a/chrome/browser/resources/settings/chromeos/os_people_page/lock_screen.js
+++ b/chrome/browser/resources/settings/chromeos/os_people_page/lock_screen.js
@@ -33,10 +33,10 @@
 import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/ash/common/i18n_behavior.js';
 import {LockScreenProgress, recordLockScreenProgress} from 'chrome://resources/ash/common/quick_unlock/lock_screen_constants.js';
 import {WebUIListenerBehavior, WebUIListenerBehaviorInterface} from 'chrome://resources/ash/common/web_ui_listener_behavior.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {AuthFactor, FactorObserverInterface, FactorObserverReceiver, ManagementType, RecoveryFactorEditor_ConfigureResult} from 'chrome://resources/mojo/chromeos/ash/services/auth_factor_config/public/mojom/auth_factor_config.mojom-webui.js';
 import {afterNextRender, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';

chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.js

diff --git a/chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.js b/chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.js
index 7a49fa4..6049036c 100644
--- a/chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.js
+++ b/chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.js
@@ -32,9 +32,9 @@
 import {focusWithoutInk} from 'chrome://resources/ash/common/focus_without_ink_js.js';
 import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/ash/common/i18n_behavior.js';
 import {WebUIListenerBehavior, WebUIListenerBehaviorInterface} from 'chrome://resources/ash/common/web_ui_listener_behavior.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {afterNextRender, flush, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {ProfileInfoBrowserProxyImpl} from '../../people_page/profile_info_browser_proxy.js';
 import {SyncBrowserProxyImpl} from '../../people_page/sync_browser_proxy.js';

chrome/browser/resources/settings/chromeos/os_people_page/os_signout_dialog.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_people_page/os_signout_dialog.ts b/chrome/browser/resources/settings/chromeos/os_people_page/os_signout_dialog.ts
index 7abd79c..de454d85 100644
--- a/chrome/browser/resources/settings/chromeos/os_people_page/os_signout_dialog.ts
+++ b/chrome/browser/resources/settings/chromeos/os_people_page/os_signout_dialog.ts
@@ -17,11 +17,11 @@
 import {WebUiListenerMixin} from '//resources/cr_elements/web_ui_listener_mixin.js';
 import {sanitizeInnerHtml} from '//resources/js/parse_html_subset.js';
 import {microTask, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
+import {SyncBrowserProxyImpl, SyncStatus} from '../../people_page/sync_browser_proxy.js';
 
 import {getTemplate} from './os_signout_dialog.html.js';
-import {SyncBrowserProxyImpl, SyncStatus} from '../../people_page/sync_browser_proxy.js';
 
 export interface OsSettingsSignoutDialogElement {
   $: {

chrome/browser/resources/settings/chromeos/os_people_page/os_sync_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_people_page/os_sync_page.ts b/chrome/browser/resources/settings/chromeos/os_people_page/os_sync_page.ts
index bbc5df68..9411851 100644
--- a/chrome/browser/resources/settings/chromeos/os_people_page/os_sync_page.ts
+++ b/chrome/browser/resources/settings/chromeos/os_people_page/os_sync_page.ts
@@ -33,9 +33,9 @@
 import {IronCollapseElement} from '//resources/polymer/v3_0/iron-collapse/iron-collapse.js';
 import {PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 
 import {FocusConfig} from '../../focus_config.js';
-import {loadTimeData} from '../../i18n_setup.js';
 import {PageStatus, StatusAction, SyncBrowserProxy, SyncBrowserProxyImpl, SyncPrefs, SyncStatus} from '../../people_page/sync_browser_proxy.js';
 import {RouteObserverMixin} from '../route_observer_mixin.js';
 import {Route, Router} from '../router.js';

chrome/browser/resources/settings/chromeos/os_people_page/users_page.js

diff --git a/chrome/browser/resources/settings/chromeos/os_people_page/users_page.js b/chrome/browser/resources/settings/chromeos/os_people_page/users_page.js
index e2099c3..bbe853ab 100644
--- a/chrome/browser/resources/settings/chromeos/os_people_page/users_page.js
+++ b/chrome/browser/resources/settings/chromeos/os_people_page/users_page.js
@@ -18,9 +18,9 @@
 
 import {assert} from 'chrome://resources/ash/common/assert.js';
 import {focusWithoutInk} from 'chrome://resources/ash/common/focus_without_ink_js.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {afterNextRender, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';

chrome/browser/resources/settings/chromeos/os_printing_page/cups_add_printer_manufacturer_model_dialog.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_printing_page/cups_add_printer_manufacturer_model_dialog.ts b/chrome/browser/resources/settings/chromeos/os_printing_page/cups_add_printer_manufacturer_model_dialog.ts
index 6f5153f..f909833 100644
--- a/chrome/browser/resources/settings/chromeos/os_printing_page/cups_add_printer_manufacturer_model_dialog.ts
+++ b/chrome/browser/resources/settings/chromeos/os_printing_page/cups_add_printer_manufacturer_model_dialog.ts
@@ -15,10 +15,9 @@
 import './cups_printer_shared.css.js';
 import './cups_printers_browser_proxy.js';
 
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
-
 import {getTemplate} from './cups_add_printer_manufacturer_model_dialog.html.js';
 import {getBaseName, getErrorText, isPPDInfoValid} from './cups_printer_dialog_util.js';
 import {CupsPrinterInfo, CupsPrintersBrowserProxy, CupsPrintersBrowserProxyImpl, ManufacturersInfo, ModelsInfo, PrinterSetupResult} from './cups_printers_browser_proxy.js';

chrome/browser/resources/settings/chromeos/os_printing_page/cups_edit_printer_dialog.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_printing_page/cups_edit_printer_dialog.ts b/chrome/browser/resources/settings/chromeos/os_printing_page/cups_edit_printer_dialog.ts
index 5d70d83f..c2a8fcc 100644
--- a/chrome/browser/resources/settings/chromeos/os_printing_page/cups_edit_printer_dialog.ts
+++ b/chrome/browser/resources/settings/chromeos/os_printing_page/cups_edit_printer_dialog.ts
@@ -29,6 +29,7 @@
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {cast} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 import {recordSettingChange} from '../metrics_recorder.js';
 
 import {getTemplate} from './cups_edit_printer_dialog.html.js';
@@ -51,10 +52,9 @@
 const METRICS_KEYWORD = 'Printing.CUPS.EditDialog';
 
 const SettingsCupsEditPrinterDialogElementBase =
-    mixinBehaviors([NetworkListenerBehavior], I18nMixin(PolymerElement)) as {
-      new (): PolymerElement & I18nMixinInterface &
-          NetworkListenerBehaviorInterface,
-    };
+    mixinBehaviors([NetworkListenerBehavior], I18nMixin(PolymerElement)) as
+    Constructor<PolymerElement&I18nMixinInterface&
+                NetworkListenerBehaviorInterface>;
 
 class SettingsCupsEditPrinterDialogElement extends
     SettingsCupsEditPrinterDialogElementBase {

chrome/browser/resources/settings/chromeos/os_printing_page/cups_enterprise_printers.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_printing_page/cups_enterprise_printers.ts b/chrome/browser/resources/settings/chromeos/os_printing_page/cups_enterprise_printers.ts
index d1ae78a..00b9ff4f 100644
--- a/chrome/browser/resources/settings/chromeos/os_printing_page/cups_enterprise_printers.ts
+++ b/chrome/browser/resources/settings/chromeos/os_printing_page/cups_enterprise_printers.ts
@@ -23,6 +23,7 @@
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {castExists} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 
 import {getTemplate} from './cups_enterprise_printers.html.js';
 import {matchesSearchTerm, sortPrinters} from './cups_printer_dialog_util.js';
@@ -51,10 +52,9 @@
         [
           CupsPrintersEntryListBehavior,
         ],
-        WebUiListenerMixin(ListPropertyUpdateMixin(PolymerElement))) as {
-      new (): PolymerElement & CupsPrintersEntryListBehaviorInterface &
-          ListPropertyUpdateMixinInterface & WebUiListenerMixinInterface,
-    };
+        WebUiListenerMixin(ListPropertyUpdateMixin(PolymerElement))) as
+    Constructor<PolymerElement&CupsPrintersEntryListBehaviorInterface&
+                ListPropertyUpdateMixinInterface&WebUiListenerMixinInterface>;
 
 class SettingsCupsEnterprisePrintersElement extends
     SettingsCupsEnterprisePrintersElementBase {

chrome/browser/resources/settings/chromeos/os_printing_page/cups_nearby_printers.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_printing_page/cups_nearby_printers.ts b/chrome/browser/resources/settings/chromeos/os_printing_page/cups_nearby_printers.ts
index fecf27a..bb4e72d 100644
--- a/chrome/browser/resources/settings/chromeos/os_printing_page/cups_nearby_printers.ts
+++ b/chrome/browser/resources/settings/chromeos/os_printing_page/cups_nearby_printers.ts
@@ -17,6 +17,7 @@
 import {WebUiListenerMixin, WebUiListenerMixinInterface} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js';
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
+import {Constructor} from '../common/types.js';
 import {recordSettingChange} from '../metrics_recorder.js';
 
 import {getTemplate} from './cups_nearby_printers.html.js';
@@ -30,10 +31,9 @@
         [
           CupsPrintersEntryListBehavior,
         ],
-        WebUiListenerMixin(ListPropertyUpdateMixin(PolymerElement))) as {
-      new (): PolymerElement & CupsPrintersEntryListBehaviorInterface &
-          ListPropertyUpdateMixinInterface & WebUiListenerMixinInterface,
-    };
+        WebUiListenerMixin(ListPropertyUpdateMixin(PolymerElement))) as
+    Constructor<PolymerElement&CupsPrintersEntryListBehaviorInterface&
+                ListPropertyUpdateMixinInterface&WebUiListenerMixinInterface>;
 
 export class SettingsCupsNearbyPrintersElement extends
     SettingsCupsNearbyPrintersElementBase {

chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers.ts b/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers.ts
index 2e8f639..ddd388de 100644
--- a/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers.ts
+++ b/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers.ts
@@ -44,10 +44,11 @@
 import {afterNextRender, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
-import {Route} from '../router.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
-import {RouteObserverBehavior, RouteObserverBehaviorInterface} from '../route_observer_behavior.js';
+import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
+import {Route} from '../router.js';
 
 import {PrinterListEntry, PrinterType} from './cups_printer_types.js';
 import {getTemplate} from './cups_printers.html.js';
@@ -60,13 +61,11 @@
         [
           DeepLinkingBehavior,
           NetworkListenerBehavior,
-          RouteObserverBehavior,
         ],
-        WebUiListenerMixin(PolymerElement)) as {
-      new (): PolymerElement & DeepLinkingBehaviorInterface &
-          NetworkListenerBehaviorInterface & RouteObserverBehaviorInterface &
-          WebUiListenerMixinInterface,
-    };
+        RouteObserverMixin(WebUiListenerMixin(PolymerElement))) as
+    Constructor<PolymerElement&WebUiListenerMixinInterface&
+                RouteObserverMixinInterface&DeepLinkingBehaviorInterface&
+                NetworkListenerBehaviorInterface>;
 
 interface SettingsCupsPrintersElement {
   $: {

chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_entry.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_entry.ts b/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_entry.ts
index 823504f4..0401d3a1 100644
--- a/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_entry.ts
+++ b/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_entry.ts
@@ -12,10 +12,9 @@
 import './cups_printer_types.js';
 
 import {FocusRowMixin} from 'chrome://resources/js/focus_row_mixin.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
-
 import {PrinterListEntry, PrinterType} from './cups_printer_types.js';
 import {getTemplate} from './cups_printers_entry.html.js';
 

chrome/browser/resources/settings/chromeos/os_printing_page/cups_saved_printers.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_printing_page/cups_saved_printers.ts b/chrome/browser/resources/settings/chromeos/os_printing_page/cups_saved_printers.ts
index 9024709..f1c36035 100644
--- a/chrome/browser/resources/settings/chromeos/os_printing_page/cups_saved_printers.ts
+++ b/chrome/browser/resources/settings/chromeos/os_printing_page/cups_saved_printers.ts
@@ -20,6 +20,7 @@
 import {WebUiListenerMixin, WebUiListenerMixinInterface} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js';
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
+import {Constructor} from '../common/types.js';
 import {recordSettingChange} from '../metrics_recorder.js';
 
 import {matchesSearchTerm, sortPrinters} from './cups_printer_dialog_util.js';
@@ -49,10 +50,9 @@
         [
           CupsPrintersEntryListBehavior,
         ],
-        WebUiListenerMixin(ListPropertyUpdateMixin(PolymerElement))) as {
-      new (): PolymerElement & CupsPrintersEntryListBehaviorInterface &
-          ListPropertyUpdateMixinInterface & WebUiListenerMixinInterface,
-    };
+        WebUiListenerMixin(ListPropertyUpdateMixin(PolymerElement))) as
+    Constructor<PolymerElement&CupsPrintersEntryListBehaviorInterface&
+                ListPropertyUpdateMixinInterface&WebUiListenerMixinInterface>;
 
 export class SettingsCupsSavedPrintersElement extends
     SettingsCupsSavedPrintersElementBase {

chrome/browser/resources/settings/chromeos/os_printing_page/os_printing_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_printing_page/os_printing_page.ts b/chrome/browser/resources/settings/chromeos/os_printing_page/os_printing_page.ts
index 303ff1b..e775eea9 100644
--- a/chrome/browser/resources/settings/chromeos/os_printing_page/os_printing_page.ts
+++ b/chrome/browser/resources/settings/chromeos/os_printing_page/os_printing_page.ts
@@ -11,6 +11,7 @@
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {recordSettingChange} from '../metrics_recorder.js';
 import {routes} from '../os_route.js';
@@ -25,10 +26,9 @@
         [
           DeepLinkingBehavior,
         ],
-        RouteObserverMixin(PolymerElement)) as {
-      new (): PolymerElement & DeepLinkingBehaviorInterface &
-          RouteObserverMixinInterface,
-    };
+        RouteObserverMixin(PolymerElement)) as
+    Constructor<PolymerElement&DeepLinkingBehaviorInterface&
+                RouteObserverMixinInterface>;
 
 class OsSettingsPrintingPageElement extends OsSettingsPrintingPageElementBase {
   static get is(): string {

chrome/browser/resources/settings/chromeos/os_search_page/search_subpage.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_search_page/search_subpage.ts b/chrome/browser/resources/settings/chromeos/os_search_page/search_subpage.ts
index 9e571f16..a01782a 100644
--- a/chrome/browser/resources/settings/chromeos/os_search_page/search_subpage.ts
+++ b/chrome/browser/resources/settings/chromeos/os_search_page/search_subpage.ts
@@ -27,6 +27,7 @@
 import {Setting} from '../../mojom-webui/setting.mojom-webui.js';
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
 import {castExists} from '../assert_extras.js';
+import {Constructor} from '../common/types.js';
 import {DeepLinkingBehavior, DeepLinkingBehaviorInterface} from '../deep_linking_behavior.js';
 import {routes} from '../os_route.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
@@ -37,10 +38,9 @@
 const SettingsSearchSubpageElementBase =
     mixinBehaviors(
         [DeepLinkingBehavior],
-        RouteObserverMixin(PrefsMixin(I18nMixin(PolymerElement)))) as {
-      new (): PolymerElement & I18nMixinInterface & PrefsMixinInterface &
-          RouteObserverMixinInterface & DeepLinkingBehaviorInterface,
-    };
+        RouteObserverMixin(PrefsMixin(I18nMixin(PolymerElement)))) as
+    Constructor<PolymerElement&I18nMixinInterface&PrefsMixinInterface&
+                RouteObserverMixinInterface&DeepLinkingBehaviorInterface>;
 
 class SettingsSearchSubpageElement extends SettingsSearchSubpageElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/os_settings.gni

diff --git a/chrome/browser/resources/settings/chromeos/os_settings.gni b/chrome/browser/resources/settings/chromeos/os_settings.gni
index 2fe5cd8..dc75966 100644
--- a/chrome/browser/resources/settings/chromeos/os_settings.gni
+++ b/chrome/browser/resources/settings/chromeos/os_settings.gni
@@ -72,6 +72,8 @@
   "chromeos/internet_page/internet_detail_menu.ts",
   "chromeos/internet_page/internet_detail_page.ts",
   "chromeos/internet_page/internet_known_networks_page.ts",
+  "chromeos/internet_page/internet_page.ts",
+  "chromeos/internet_page/internet_subpage.ts",
   "chromeos/internet_page/network_always_on_vpn.ts",
   "chromeos/internet_page/network_proxy_section.ts",
   "chromeos/internet_page/network_summary_item.ts",
@@ -268,6 +270,7 @@
 
 non_web_component_files = [
   "chromeos/assert_extras.ts",
+  "chromeos/common/types.ts",
   "chromeos/crostini_page/crostini_browser_proxy.ts",
   "chromeos/crostini_page/crostini_shared_usb_devices.ts",
   "chromeos/date_time_page/date_time_types.ts",
@@ -285,7 +288,7 @@
   "chromeos/guest_os/guest_os_browser_proxy.ts",
   "chromeos/icon.js",
   "chromeos/internet_page/cellular_setup_settings_delegate.ts",
-  "chromeos/internet_page/internet_page_browser_proxy.js",
+  "chromeos/internet_page/internet_page_browser_proxy.ts",
   "chromeos/kerberos_page/kerberos_accounts_browser_proxy.ts",
   "chromeos/lazy_load.js",
   "chromeos/main_page_mixin.ts",
@@ -388,8 +391,6 @@
 
 # Files that are generated by html_to_js() or other build rule.
 generated_web_component_files = [
-  "chromeos/internet_page/internet_page.js",
-  "chromeos/internet_page/internet_subpage.js",
   "chromeos/multidevice_page/multidevice_combined_setup_item.js",
   "chromeos/multidevice_page/multidevice_feature_item.js",
   "chromeos/multidevice_page/multidevice_feature_toggle.js",

chrome/browser/resources/settings/chromeos/os_settings.js

diff --git a/chrome/browser/resources/settings/chromeos/os_settings.js b/chrome/browser/resources/settings/chromeos/os_settings.js
index 6744722..0a0c4f9d 100644
--- a/chrome/browser/resources/settings/chromeos/os_settings.js
+++ b/chrome/browser/resources/settings/chromeos/os_settings.js
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import '../strings.m.js';
 import '../prefs/prefs.js';
 import './device_page/audio.js';
 import './device_page/cros_audio_config.js';

chrome/browser/resources/settings/chromeos/os_settings_main/os_settings_main.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_settings_main/os_settings_main.ts b/chrome/browser/resources/settings/chromeos/os_settings_main/os_settings_main.ts
index 742aec5..58c892d0 100644
--- a/chrome/browser/resources/settings/chromeos/os_settings_main/os_settings_main.ts
+++ b/chrome/browser/resources/settings/chromeos/os_settings_main/os_settings_main.ts
@@ -17,9 +17,9 @@
 import '../../settings_shared.css.js';
 import '../../settings_vars.css.js';
 
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {assertExists} from '../assert_extras.js';
 import {OSPageVisibility} from '../os_page_visibility.js';
 import {routes} from '../os_route.js';

chrome/browser/resources/settings/chromeos/os_settings_page/os_settings_subpage.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_settings_page/os_settings_subpage.ts b/chrome/browser/resources/settings/chromeos/os_settings_page/os_settings_subpage.ts
index 92661e04..079ef11 100644
--- a/chrome/browser/resources/settings/chromeos/os_settings_page/os_settings_subpage.ts
+++ b/chrome/browser/resources/settings/chromeos/os_settings_page/os_settings_subpage.ts
@@ -25,8 +25,9 @@
 import {IronResizableBehavior} from '//resources/polymer/v3_0/iron-resizable-behavior/iron-resizable-behavior.js';
 import {afterNextRender, mixinBehaviors, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 import {EventTracker} from 'chrome://resources/js/event_tracker.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
+import {Constructor} from '../common/types.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from '../route_observer_mixin.js';
 import {Route, Router} from '../router.js';
 import {getSettingIdParameter} from '../setting_id_param_util.js';
@@ -42,10 +43,9 @@
 const OsSettingsSubpageElementBase =
     mixinBehaviors(
         [IronResizableBehavior],
-        RouteObserverMixin(FindShortcutMixin(I18nMixin(PolymerElement)))) as {
-      new (): PolymerElement & FindShortcutMixinInterface & I18nMixinInterface &
-          RouteObserverMixinInterface,
-    };
+        RouteObserverMixin(FindShortcutMixin(I18nMixin(PolymerElement)))) as
+    Constructor<PolymerElement&FindShortcutMixinInterface&I18nMixinInterface&
+                RouteObserverMixinInterface>;
 
 export class OsSettingsSubpageElement extends OsSettingsSubpageElementBase {
   static get is() {

chrome/browser/resources/settings/chromeos/os_settings_ui/os_settings_ui.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_settings_ui/os_settings_ui.ts b/chrome/browser/resources/settings/chromeos/os_settings_ui/os_settings_ui.ts
index 8414780..4b6e234 100644
--- a/chrome/browser/resources/settings/chromeos/os_settings_ui/os_settings_ui.ts
+++ b/chrome/browser/resources/settings/chromeos/os_settings_ui/os_settings_ui.ts
@@ -26,10 +26,10 @@
 import {CrDrawerElement} from 'chrome://resources/cr_elements/cr_drawer/cr_drawer.js';
 import {FindShortcutMixin} from 'chrome://resources/cr_elements/find_shortcut_mixin.js';
 import {assert} from 'chrome://resources/js/assert_ts.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {listenOnce} from 'chrome://resources/js/util_ts.js';
 import {Debouncer, DomIf, microTask, PolymerElement, timeOut} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {SettingsPrefsElement} from '../../prefs/prefs.js';
 import {castExists} from '../assert_extras.js';
 import {setGlobalScrollTarget} from '../global_scroll_target_behavior.js';

chrome/browser/resources/settings/chromeos/parental_controls_page/parental_controls_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/parental_controls_page/parental_controls_page.ts b/chrome/browser/resources/settings/chromeos/parental_controls_page/parental_controls_page.ts
index bfeba0c..641daaa8 100644
--- a/chrome/browser/resources/settings/chromeos/parental_controls_page/parental_controls_page.ts
+++ b/chrome/browser/resources/settings/chromeos/parental_controls_page/parental_controls_page.ts
@@ -15,9 +15,9 @@
 
 import {CrButtonElement} from 'chrome://resources/cr_elements/cr_button/cr_button.js';
 import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {loadTimeData} from '../../i18n_setup.js';
 import {castExists} from '../assert_extras.js';
 
 import {ParentalControlsBrowserProxy, ParentalControlsBrowserProxyImpl} from './parental_controls_browser_proxy.js';

chrome/browser/resources/settings/chromeos/route_observer_mixin.ts

diff --git a/chrome/browser/resources/settings/chromeos/route_observer_mixin.ts b/chrome/browser/resources/settings/chromeos/route_observer_mixin.ts
index 6a892ed8..fd572522 100644
--- a/chrome/browser/resources/settings/chromeos/route_observer_mixin.ts
+++ b/chrome/browser/resources/settings/chromeos/route_observer_mixin.ts
@@ -5,10 +5,9 @@
 import {assertNotReached} from 'chrome://resources/js/assert_ts.js';
 import {dedupingMixin, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
+import {Constructor} from './common/types.js';
 import {Route, Router} from './router.js';
 
-type Constructor<T> = new (...args: any[]) => T;
-
 export interface RouteObserverMixinInterface {
   currentRouteChanged(newRoute: Route, oldRoute?: Route): void;
 }

chrome/browser/resources/settings/chromeos/route_origin_mixin.ts

diff --git a/chrome/browser/resources/settings/chromeos/route_origin_mixin.ts b/chrome/browser/resources/settings/chromeos/route_origin_mixin.ts
index 09f29e64..6e1e196 100644
--- a/chrome/browser/resources/settings/chromeos/route_origin_mixin.ts
+++ b/chrome/browser/resources/settings/chromeos/route_origin_mixin.ts
@@ -7,11 +7,10 @@
 import {beforeNextRender, dedupingMixin, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {castExists} from './assert_extras.js';
+import {Constructor} from './common/types.js';
 import {RouteObserverMixin, RouteObserverMixinInterface} from './route_observer_mixin.js';
 import {Route, Router} from './router.js';
 
-type Constructor<T> = new (...args: any[]) => T;
-
 export interface RouteOriginMixinInterface extends RouteObserverMixinInterface {
   addFocusConfig(route: Route|undefined, value: string): void;
 }

chrome/browser/resources/settings/chromeos/router.js

diff --git a/chrome/browser/resources/settings/chromeos/router.js b/chrome/browser/resources/settings/chromeos/router.js
index 5658de7..89de8a777 100644
--- a/chrome/browser/resources/settings/chromeos/router.js
+++ b/chrome/browser/resources/settings/chromeos/router.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import '../i18n_setup.js';
-
 import {assert} from 'chrome://resources/ash/common/assert.js';
 import {loadTimeData} from 'chrome://resources/ash/common/load_time_data.m.js';
 
@@ -176,7 +174,7 @@
     /** @private {boolean}*/
     this.initializeRouteFromUrlCalled_ = false;
 
-    /** @private {!Set} */
+    /** @private {!Set<Object>} */
     this.routeObservers_ = new Set();
   }
 

chrome/browser/resources/settings/chromeos/settings_scheduler_slider/settings_scheduler_slider.ts

diff --git a/chrome/browser/resources/settings/chromeos/settings_scheduler_slider/settings_scheduler_slider.ts b/chrome/browser/resources/settings/chromeos/settings_scheduler_slider/settings_scheduler_slider.ts
index 8e5c94a..8add10c 100644
--- a/chrome/browser/resources/settings/chromeos/settings_scheduler_slider/settings_scheduler_slider.ts
+++ b/chrome/browser/resources/settings/chromeos/settings_scheduler_slider/settings_scheduler_slider.ts
@@ -17,6 +17,7 @@
 import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {PrefsMixin, PrefsMixinInterface} from '../../prefs/prefs_mixin.js';
+import {Constructor} from '../common/types.js';
 
 import {getTemplate} from './settings_scheduler_slider.html.js';
 
@@ -73,10 +74,9 @@
 const SettingsSchedulerSliderElementBase =
     mixinBehaviors(
         [IronResizableBehavior, PaperRippleBehavior],
-        PrefsMixin(I18nMixin(PolymerElement))) as {
-      new (): PolymerElement & I18nMixinInterface & PrefsMixinInterface &
-          IronResizableBehavior & PaperRippleBehavior,
-    };
+        PrefsMixin(I18nMixin(PolymerElement))) as
+    Constructor<PolymerElement&I18nMixinInterface&PrefsMixinInterface&
+                IronResizableBehavior&PaperRippleBehavior>;
 
 class SettingsSchedulerSliderElement extends
     SettingsSchedulerSliderElementBase {

chrome/browser/resources/side_panel/customize_chrome/BUILD.gn

diff --git a/chrome/browser/resources/side_panel/customize_chrome/BUILD.gn b/chrome/browser/resources/side_panel/customize_chrome/BUILD.gn
index 68edc24e..6992ed6 100644
--- a/chrome/browser/resources/side_panel/customize_chrome/BUILD.gn
+++ b/chrome/browser/resources/side_panel/customize_chrome/BUILD.gn
@@ -17,6 +17,7 @@
   # Files holding a Polymer element definition and have an equivalent .html file.
   web_component_files = [
     "app.ts",
+    "button_label.ts",
     "cards.ts",
     "shortcuts.ts",
     "categories.ts",

chrome/browser/resources/side_panel/customize_chrome/button_label.html

diff --git a/chrome/browser/resources/side_panel/customize_chrome/button_label.html b/chrome/browser/resources/side_panel/customize_chrome/button_label.html
new file mode 100644
index 0000000..b1cbc4c
--- /dev/null
+++ b/chrome/browser/resources/side_panel/customize_chrome/button_label.html
@@ -0,0 +1,17 @@
+<style include="cr-hidden-style">
+  :host {
+    display: block;
+  }
+
+  #label {
+    color: var(--cr-primary-text-color);
+  }
+
+  #labelDescription {
+    color: var(--cr-secondary-text-color)
+  }
+</style>
+<div id="label">[[label]]</div>
+<div id="labelDescription" hidden="[[!labelDescription]]">
+  [[labelDescription]]
+</div>

chrome/browser/resources/side_panel/customize_chrome/button_label.ts

diff --git a/chrome/browser/resources/side_panel/customize_chrome/button_label.ts b/chrome/browser/resources/side_panel/customize_chrome/button_label.ts
new file mode 100644
index 0000000..bc70e39
--- /dev/null
+++ b/chrome/browser/resources/side_panel/customize_chrome/button_label.ts
@@ -0,0 +1,49 @@
+// Copyright 2022 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+
+import {getTemplate} from './button_label.html.js';
+
+export interface ButtonLabelElement {
+  $: {
+    label: HTMLButtonElement,
+    labelDescription: HTMLElement,
+  };
+}
+
+export class ButtonLabelElement extends PolymerElement {
+  static get is() {
+    return 'customize-chrome-button-label';
+  }
+
+  static get template() {
+    return getTemplate();
+  }
+
+  static get properties() {
+    return {
+      label: {
+        reflectToAttribute: true,
+        type: String,
+      },
+
+      labelDescription: {
+        reflectToAttribute: true,
+        type: String,
+      },
+    };
+  }
+
+  label: string;
+  labelDescription: string|null = null;
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'customize-chrome-button-label': ButtonLabelElement;
+  }
+}
+
+customElements.define(ButtonLabelElement.is, ButtonLabelElement);

chrome/browser/resources/side_panel/customize_chrome/shortcuts.html

diff --git a/chrome/browser/resources/side_panel/customize_chrome/shortcuts.html b/chrome/browser/resources/side_panel/customize_chrome/shortcuts.html
index a4ddea78..f6ea7f9 100644
--- a/chrome/browser/resources/side_panel/customize_chrome/shortcuts.html
+++ b/chrome/browser/resources/side_panel/customize_chrome/shortcuts.html
@@ -13,17 +13,14 @@
   #options {
     align-items: center;
     display: flex;
+    line-height: 20px;
+    margin: 0 16px;
   }
 
   iron-collapse {
     --iron-collapse-transition-duration: 300ms;
   }
 
-  #options {
-    line-height: 20px;
-    margin: 0 16px;
-  }
-
   cr-radio-group {
     --cr-radio-group-item-padding: 0px;
     width: 100%;
@@ -35,19 +32,11 @@
     float: right;
   }
 
-  .option-container {
+  customize-chrome-button-label {
     margin-bottom: 16px;
     margin-inline-start: 24px;
   }
 
-  .option-label {
-    color: var(--cr-primary-text-color);
-  }
-
-  .option-description {
-    color: var(--cr-secondary-text-color);
-  }
-
   hr {
     background-color: var(--horizontal-rule-color);
     border: none;
@@ -69,16 +58,14 @@
       on-selected-changed="onShortcutsRadioSelectionChanged_">
       <cr-radio-button id="customLinksButton" name="customLinksOption">
       </cr-radio-button>
-      <div class="option-container">
-        <div class="option-label">$i18n{myShortcuts}</div>
-        <div class="option-description">$i18n{shortcutsCurated}</div>
-      </div>
+      <customize-chrome-button-label label="$i18n{myShortcuts}"
+          label-description="$i18n{shortcutsCurated}">
+      </customize-chrome-button-label>
       <cr-radio-button id="mostVisitedButton" name="mostVisitedOption">
       </cr-radio-button>
-      <div class="option-container">
-        <div>$i18n{mostVisited}</div>
-        <div class="option-description">$i18n{shortcutsSuggested}</div>
-      </div>
+      <customize-chrome-button-label label="$i18n{mostVisited}"
+          label-description="$i18n{shortcutsSuggested}">
+      </customize-chrome-button-label>
     </cr-radio-group>
   </iron-collapse>
 </div>

chrome/browser/resources/side_panel/customize_chrome/shortcuts.ts

diff --git a/chrome/browser/resources/side_panel/customize_chrome/shortcuts.ts b/chrome/browser/resources/side_panel/customize_chrome/shortcuts.ts
index 0343001..910f93a 100644
--- a/chrome/browser/resources/side_panel/customize_chrome/shortcuts.ts
+++ b/chrome/browser/resources/side_panel/customize_chrome/shortcuts.ts
@@ -6,6 +6,7 @@
 import 'chrome://resources/cr_elements/cr_radio_group/cr_radio_group.js';
 import 'chrome://resources/cr_elements/cr_radio_button/cr_radio_button.js';
 import 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js';
+import './button_label.js';
 
 import {CrRadioButtonElement} from 'chrome://resources/cr_elements/cr_radio_button/cr_radio_button.js';
 import {CrRadioGroupElement} from 'chrome://resources/cr_elements/cr_radio_group/cr_radio_group.js';

chrome/browser/ssl/ssl_browsertest.cc

diff --git a/chrome/browser/ssl/ssl_browsertest.cc b/chrome/browser/ssl/ssl_browsertest.cc
index 1cd1e3b..94b8df6 100644
--- a/chrome/browser/ssl/ssl_browsertest.cc
+++ b/chrome/browser/ssl/ssl_browsertest.cc
@@ -5448,7 +5448,7 @@
   WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
   content::TestNavigationManager observer(tab, url1);
   chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
-  observer.WaitForNavigationFinished();
+  ASSERT_TRUE(observer.WaitForNavigationFinished());
   ssl_test_util::CheckAuthenticatedState(tab, AuthState::NONE);
 }
 
@@ -5536,8 +5536,8 @@
   tab->GetController().LoadURL(url, content::Referrer(),
                                ui::PAGE_TRANSITION_LINK, std::string());
 
-  navigation_observer_https.WaitForNavigationFinished();
-  navigation_observer_http.WaitForNavigationFinished();
+  ASSERT_TRUE(navigation_observer_https.WaitForNavigationFinished());
+  ASSERT_TRUE(navigation_observer_http.WaitForNavigationFinished());
   EXPECT_TRUE(content::WaitForLoadStop(tab));
 
   ssl_test_util::CheckUnauthenticatedState(tab, AuthState::NONE);
@@ -5577,8 +5577,8 @@
   tab->GetController().LoadURL(url, content::Referrer(),
                                ui::PAGE_TRANSITION_LINK, std::string());
 
-  navigation_manager_redirect.WaitForNavigationFinished();
-  navigation_manager_final_url.WaitForNavigationFinished();
+  ASSERT_TRUE(navigation_manager_redirect.WaitForNavigationFinished());
+  ASSERT_TRUE(navigation_manager_final_url.WaitForNavigationFinished());
   EXPECT_TRUE(content::WaitForLoadStop(tab));
 
   ssl_test_util::CheckSecurityState(tab, CertError::NONE,

chrome/browser/ssl/stateful_ssl_host_state_delegate_test.cc

diff --git a/chrome/browser/ssl/stateful_ssl_host_state_delegate_test.cc b/chrome/browser/ssl/stateful_ssl_host_state_delegate_test.cc
index 71b980af..980bbc5 100644
--- a/chrome/browser/ssl/stateful_ssl_host_state_delegate_test.cc
+++ b/chrome/browser/ssl/stateful_ssl_host_state_delegate_test.cc
@@ -984,10 +984,17 @@
                                net::ERR_CERT_DATE_INVALID, storage_partition));
   EXPECT_TRUE(state->HasAllowException(kWWWGoogleHost, storage_partition));
 
+  // Test that the exception is not carried over to the guest's embedder.
+  EXPECT_EQ(
+      content::SSLHostStateDelegate::DENIED,
+      state->QueryPolicy(kWWWGoogleHost, *cert, net::ERR_CERT_DATE_INVALID,
+                         tab->GetPrimaryMainFrame()->GetStoragePartition()));
+  EXPECT_FALSE(state->HasAllowException(
+      kWWWGoogleHost, tab->GetPrimaryMainFrame()->GetStoragePartition()));
+
   // Navigate to a non-app page and test that the exception is not carried over.
   ASSERT_TRUE(ui_test_utils::NavigateToURL(
-      browser(), embedded_test_server()->GetURL(
-                     "/extensions/isolated_apps/non_app/main.html")));
+      browser(), embedded_test_server()->GetURL("/title1.html")));
   EXPECT_EQ(
       content::SSLHostStateDelegate::DENIED,
       state->QueryPolicy(kWWWGoogleHost, *cert, net::ERR_CERT_DATE_INVALID,
@@ -1032,10 +1039,15 @@
   EXPECT_TRUE(state->IsHttpAllowedForHost(kWWWGoogleHost, storage_partition));
   EXPECT_TRUE(state->HasAllowException(kWWWGoogleHost, storage_partition));
 
+  // Test that the exception is not carried over to the guest's embedder.
+  EXPECT_FALSE(state->IsHttpAllowedForHost(
+      kWWWGoogleHost, tab->GetPrimaryMainFrame()->GetStoragePartition()));
+  EXPECT_FALSE(state->HasAllowException(
+      kWWWGoogleHost, tab->GetPrimaryMainFrame()->GetStoragePartition()));
+
   // Navigate to a non-app page and test that the exception is not carried over.
   ASSERT_TRUE(ui_test_utils::NavigateToURL(
-      browser(), embedded_test_server()->GetURL(
-                     "/extensions/isolated_apps/non_app/main.html")));
+      browser(), embedded_test_server()->GetURL("/title1.html")));
   EXPECT_FALSE(state->IsHttpAllowedForHost(
       kWWWGoogleHost, tab->GetPrimaryMainFrame()->GetStoragePartition()));
   EXPECT_FALSE(state->HasAllowException(

chrome/browser/sync/android/java/src/org/chromium/chrome/browser/sync/SyncService.java

diff --git a/chrome/browser/sync/android/java/src/org/chromium/chrome/browser/sync/SyncService.java b/chrome/browser/sync/android/java/src/org/chromium/chrome/browser/sync/SyncService.java
index 8eb899d..36f51f88 100644
--- a/chrome/browser/sync/android/java/src/org/chromium/chrome/browser/sync/SyncService.java
+++ b/chrome/browser/sync/android/java/src/org/chromium/chrome/browser/sync/SyncService.java
@@ -307,9 +307,15 @@
 
     /**
      * @return Whether sync is enabled to sync urls with a non custom passphrase.
-     * TODO(crbug.com/1396310): Rename method to reflect that it returns true with TrustedVault
-     * passphrase.
      */
+    public abstract boolean isSyncingUnencryptedUrls();
+
+    /**
+     * @return Whether sync is enabled to sync urls or open tabs with a non custom passphrase.
+     * @deprecated Use isSyncingUnencryptedUrls.
+     * TODO(crbug/1396310): Delete once Clank is no longer calling it.
+     */
+    @Deprecated()
     public abstract boolean isSyncingUrlsWithKeystorePassphrase();
 
     /**

chrome/browser/sync/android/java/src/org/chromium/chrome/browser/sync/SyncServiceImpl.java

diff --git a/chrome/browser/sync/android/java/src/org/chromium/chrome/browser/sync/SyncServiceImpl.java b/chrome/browser/sync/android/java/src/org/chromium/chrome/browser/sync/SyncServiceImpl.java
index 7b25c04d..45302b02 100644
--- a/chrome/browser/sync/android/java/src/org/chromium/chrome/browser/sync/SyncServiceImpl.java
+++ b/chrome/browser/sync/android/java/src/org/chromium/chrome/browser/sync/SyncServiceImpl.java
@@ -315,7 +315,7 @@
     }
 
     @Override
-    public boolean isSyncingUrlsWithKeystorePassphrase() {
+    public boolean isSyncingUnencryptedUrls() {
         return isEngineInitialized()
                 && (getActiveDataTypes().contains(ModelType.TYPED_URLS)
                         || getActiveDataTypes().contains(ModelType.HISTORY))
@@ -323,6 +323,13 @@
                         || getPassphraseType() == PassphraseType.TRUSTED_VAULT_PASSPHRASE);
     }
 
+    // TODO(crbug/1396310): Delete once Clank is no longer calling it.
+    @Deprecated
+    @Override
+    public boolean isSyncingUrlsWithKeystorePassphrase() {
+        return isSyncingUnencryptedUrls();
+    }
+
     @VisibleForTesting
     @Override
     public long getLastSyncedTimeForDebugging() {

chrome/browser/touch_to_fill/touch_to_fill_controller_autofill_delegate_unittest.cc

diff --git a/chrome/browser/touch_to_fill/touch_to_fill_controller_autofill_delegate_unittest.cc b/chrome/browser/touch_to_fill/touch_to_fill_controller_autofill_delegate_unittest.cc
index 7e4f3d6..7b38d9e 100644
--- a/chrome/browser/touch_to_fill/touch_to_fill_controller_autofill_delegate_unittest.cc
+++ b/chrome/browser/touch_to_fill/touch_to_fill_controller_autofill_delegate_unittest.cc
@@ -139,8 +139,6 @@
         std::make_unique<password_manager::MockWebAuthnCredentialsDelegate>();
     ON_CALL(client_, GetWebAuthnCredentialsDelegateForDriver)
         .WillByDefault(Return(webauthn_credentials_delegate_.get()));
-    ON_CALL(*webauthn_credentials_delegate_, IsWebAuthnAutofillEnabled)
-        .WillByDefault(Return(false));
 
     scoped_feature_list_.InitAndEnableFeature(
         password_manager::features::kBiometricTouchToFill);
@@ -687,9 +685,6 @@
   MockTouchToFillView* weak_view = mock_view.get();
   touch_to_fill_controller().set_view(std::move(mock_view));
 
-  ON_CALL(*webauthn_credentials_delegate(), IsWebAuthnAutofillEnabled)
-      .WillByDefault(Return(true));
-
   TouchToFillWebAuthnCredential credential(
       TouchToFillWebAuthnCredential::Username(u"alice@example.com"),
       TouchToFillWebAuthnCredential::BackendId("12345"));

chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/SpannableAutocompleteEditTextModel.java

diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/SpannableAutocompleteEditTextModel.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/SpannableAutocompleteEditTextModel.java
index 5bd45f36..8f827ee 100644
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/SpannableAutocompleteEditTextModel.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/SpannableAutocompleteEditTextModel.java
@@ -575,7 +575,15 @@
             if (mBatchEditNestCount == 1) {
                 mPreBatchEditState.copyFrom(mCurrentState);
             } else if (mDeletePostfixOnNextBeginImeCommand > 0) {
+                // Note: in languages that rely on character composition, the last incomplete
+                // character may not be recognized as part of the string, but it may still be
+                // accounted for by the mDeletePostfixOnNextBeginImeCommand.
+                // In such case, the text below is actually shorter than the user input, and the
+                // computed string boundaries enter negative index space.
                 int len = mDelegate.getText().length();
+                if (mDeletePostfixOnNextBeginImeCommand > len) {
+                    mDeletePostfixOnNextBeginImeCommand = len;
+                }
                 mDelegate.getText().delete(len - mDeletePostfixOnNextBeginImeCommand, len);
             }
             mDeletePostfixOnNextBeginImeCommand = 0;

chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/geo/PlatformNetworksManagerTest.java

diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/geo/PlatformNetworksManagerTest.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/geo/PlatformNetworksManagerTest.java
index ee7f09b..150f171d2 100644
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/geo/PlatformNetworksManagerTest.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/geo/PlatformNetworksManagerTest.java
@@ -274,7 +274,7 @@
 
     @Test
     public void testGetConnectedCell_allPermissionsDenied() {
-        ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.M);
+        ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.P);
         allPermissionsDenied();
         VisibleCell visibleCell =
                 PlatformNetworksManager.getConnectedCell(mContext, mTelephonyManager);
@@ -289,7 +289,7 @@
 
     @Test
     public void testGetAllVisibleCells_allPermissionsDenied() {
-        ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.M);
+        ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.P);
         allPermissionsDenied();
         PlatformNetworksManager.getAllVisibleCells(
                 mContext, mTelephonyManager, mVisibleCellCallback);
@@ -326,7 +326,7 @@
 
     @Test
     public void testGetConnectedWifi_allPermissionsDenied() {
-        ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.M);
+        ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.P);
         allPermissionsDenied();
         VisibleWifi visibleWifi = PlatformNetworksManager.getConnectedWifi(mContext);
         assertEquals(UNKNOWN_VISIBLE_WIFI, visibleWifi);
@@ -335,8 +335,7 @@
 
     @Test
     public void testGetConnectedWifi_locationGrantedWifiDenied() {
-        ReflectionHelpers.setStaticField(
-                Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.LOLLIPOP);
+        ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.P);
         locationGrantedWifiDenied();
         VisibleWifi visibleWifi = PlatformNetworksManager.getConnectedWifi(mContext);
         assertEquals(CONNECTED_WIFI, visibleWifi);
@@ -346,8 +345,7 @@
 
     @Test
     public void testGetConnectedWifi_locationGrantedWifiDenied_noWifiInfo() {
-        ReflectionHelpers.setStaticField(
-                Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.LOLLIPOP);
+        ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.P);
         locationGrantedWifiDenied();
         when(mNetworkStateChangedIntent.getParcelableExtra(eq(WifiManager.EXTRA_WIFI_INFO)))
                 .thenReturn(null);
@@ -359,7 +357,7 @@
 
     @Test
     public void testGetConnectedWifi_locationDeniedWifiGranted() {
-        ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.M);
+        ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.P);
         locationDeniedWifiGranted();
         VisibleWifi visibleWifi = PlatformNetworksManager.getConnectedWifi(mContext);
         assertEquals(UNKNOWN_VISIBLE_WIFI, visibleWifi);
@@ -387,7 +385,7 @@
 
     @Test
     public void testGetAllVisibleWifis_allPermissionsDenied() {
-        ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.M);
+        ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.P);
         allPermissionsDenied();
         Set<VisibleWifi> visibleWifis =
                 PlatformNetworksManager.getAllVisibleWifis(mContext, mWifiManager);
@@ -397,7 +395,7 @@
 
     @Test
     public void testGetAllVisibleWifis_locationGrantedWifiDenied() {
-        ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.M);
+        ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.P);
         locationGrantedWifiDenied();
         Set<VisibleWifi> visibleWifis =
                 PlatformNetworksManager.getAllVisibleWifis(mContext, mWifiManager);
@@ -407,7 +405,7 @@
 
     @Test
     public void testGetAllVisibleWifis_locationDeniedWifiGranted() {
-        ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.M);
+        ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.P);
         locationDeniedWifiGranted();
         Set<VisibleWifi> visibleWifis =
                 PlatformNetworksManager.getAllVisibleWifis(mContext, mWifiManager);

chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/VoiceRecognitionHandler.java

diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/VoiceRecognitionHandler.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/VoiceRecognitionHandler.java
index 56f299f..d30b425 100644
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/VoiceRecognitionHandler.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/VoiceRecognitionHandler.java
@@ -88,14 +88,6 @@
     @VisibleForTesting
     static final String ASSISTANT_EXPERIMENT_ID_PARAM_NAME = "experiment_id";
     /**
-     * Extra containing the URL of the current page.
-     *
-     * This is only populated for intents initiated via the toolbar button, and is not populated for
-     * internal Chrome URLs.
-     */
-    @VisibleForTesting
-    static final String EXTRA_PAGE_URL = "com.android.chrome.voice.PAGE_URL";
-    /**
      * Extra containing the source language code of the current page.
      *
      * This is only populated for pages that are translatable and only for intents initiated via the
@@ -123,14 +115,6 @@
     static final String EXTRA_TRANSLATE_TARGET_LANGUAGE =
             "com.android.chrome.voice.TRANSLATE_TARGET_LANGUAGE";
     /**
-     * Extra containing a string that represents the action taken by Assistant after being opened
-     * for voice transcription.
-     *
-     * See AssistantActionPerformed, below.
-     */
-    @VisibleForTesting
-    static final String EXTRA_ACTION_PERFORMED = "com.android.chrome.voice.ACTION_PERFORMED";
-    /**
      * Extra containing the current timestamp (in epoch time) used for tracking intent latency.
      */
     @VisibleForTesting
@@ -152,8 +136,6 @@
 
     private static final MutableFlagWithSafeDefault sToolbarMicIphFlag =
             new MutableFlagWithSafeDefault(ChromeFeatureList.TOOLBAR_MIC_IPH_ANDROID, false);
-    private static final MutableFlagWithSafeDefault sAssistantIntentPageUrlFlag =
-            new MutableFlagWithSafeDefault(ChromeFeatureList.ASSISTANT_INTENT_PAGE_URL, false);
     private static final MutableFlagWithSafeDefault sAssistantIntentExperimentIdFlag =
             new MutableFlagWithSafeDefault(ChromeFeatureList.ASSISTANT_INTENT_EXPERIMENT_ID, false);
     private static final MutableFlagWithSafeDefault sAssistantNonPersonalizedVoiceSearchFlag =
@@ -500,18 +482,9 @@
                 Tracker tracker = TrackerFactory.getTrackerForProfile(mProfileSupplier.get());
                 tracker.notifyEvent(EventConstants.SUCCESSFUL_VOICE_SEARCH);
             }
-            // Assume transcription by default when the page URL feature is disabled.
-            @AssistantActionPerformed
-            int actionPerformed = AssistantActionPerformed.TRANSCRIPTION;
-            if (sAssistantIntentPageUrlFlag.isEnabled()) {
-                actionPerformed = getActionPerformed(data.getExtras());
-            }
 
-            recordSuccessMetrics(mSource, mTarget, actionPerformed);
-
-            if (actionPerformed == AssistantActionPerformed.TRANSCRIPTION) {
-                handleTranscriptionResult(data);
-            }
+            recordSuccessMetrics(mSource, mTarget, AssistantActionPerformed.TRANSCRIPTION);
+            handleTranscriptionResult(data);
         }
 
         /**
@@ -591,85 +564,6 @@
     }
 
     /**
-     * Returns the action performed by Assistant from the Assistant Intent callback bundle.
-     *
-     * If the extra is unavailable, assume TRANSCRIPTION.
-     */
-    private static @AssistantActionPerformed int getActionPerformed(Bundle extras) {
-        assert extras != null;
-        String actionPerformed = extras.getString(EXTRA_ACTION_PERFORMED);
-        if (actionPerformed == null) {
-            // Older versions of Assistant will not set EXTRA_ACTION_PERFORMED. These versions of
-            // Assistant also do not handle translate or readout, so we should assume transcription.
-            return AssistantActionPerformed.TRANSCRIPTION;
-        }
-        return parseActionPerformed(actionPerformed);
-    }
-
-    /**
-     * Parses actionPerformed and returns the associated AssistantActionPerformedValue.
-     * @param actionPerformed A String representation of the action enum.
-     * @return The parsed action or AssistantActionPerformed.UNKNOWN if no match was found.
-     */
-    private static @AssistantActionPerformed int parseActionPerformed(String actionPerformed) {
-        switch (actionPerformed) {
-            case "TRANSCRIPTION":
-                return AssistantActionPerformed.TRANSCRIPTION;
-            case "TRANSLATE":
-                return AssistantActionPerformed.TRANSLATE;
-            case "READOUT":
-                return AssistantActionPerformed.READOUT;
-            default:
-                return AssistantActionPerformed.UNKNOWN;
-        }
-    }
-
-    /**
-     * Returns a String for use as a histogram suffix for histograms split by
-     * AssistantActionPerformed.
-     * @param action The action performed by the Assistant.
-     * @return The histogram suffix for the given action. No '.' separator is included.
-     */
-    private static String getHistogramSuffixForAction(@AssistantActionPerformed int action) {
-        switch (action) {
-            case AssistantActionPerformed.TRANSCRIPTION:
-                return "Transcription";
-            case AssistantActionPerformed.TRANSLATE:
-                return "Translate";
-            case AssistantActionPerformed.READOUT:
-                return "Readout";
-            default:
-                return "Unknown";
-        }
-    }
-
-    /**
-     * Returns a String for use as a histogram suffix for histograms split by
-     * VoiceInteractionSource.
-     * @param source The source of the voice interaction.
-     * @return The histogram suffix for the given source or null if unknown. No '.' separator is
-     *         included.
-     */
-    private static @Nullable String getHistogramSuffixForSource(
-            @VoiceInteractionSource int source) {
-        switch (source) {
-            case VoiceInteractionSource.OMNIBOX:
-                return "Omnibox";
-            case VoiceInteractionSource.NTP:
-                return "NTP";
-            case VoiceInteractionSource.SEARCH_WIDGET:
-                return "SearchWidget";
-            case VoiceInteractionSource.TASKS_SURFACE:
-                return "TasksSurface";
-            case VoiceInteractionSource.TOOLBAR:
-                return "Toolbar";
-            default:
-                assert false : "Unknown VoiceInteractionSource: " + source;
-                return null;
-        }
-    }
-
-    /**
      * Returns a String for use as a histogram suffix for histograms split by VoiceIntentTarget.
      * @param target The target of the voice search intent.
      * @return The histogram suffix for the given target. No '.' separator is included.
@@ -897,13 +791,6 @@
             // TODO(crbug.com/1344574): This is currently still needed by AGSA.
             intent.putExtra(EXTRA_INTENT_USER_EMAIL, assistantVoiceSearchService.getUserEmail());
 
-            if (shouldAddPageUrl(source)) {
-                String url = getUrl();
-                if (url != null) {
-                    intent.putExtra(EXTRA_PAGE_URL, url);
-                }
-            }
-
             if (source == VoiceInteractionSource.TOOLBAR
                     && sAssistantIntentTranslateInfoFlag.isEnabled()) {
                 boolean attached = attachTranslateExtras(intent);
@@ -921,18 +808,6 @@
     }
 
     /**
-     * Returns true if the current tab's URL should be included with an Assistant intent initiated
-     * via the given source.
-     */
-    private static boolean shouldAddPageUrl(@VoiceInteractionSource int source) {
-        // Non-toolbar entrypoints (Omnibox, NTP, etc) obscure the current page contents and make it
-        // less obvious that user actions in Assistant may interact with the current page. Omit the
-        // page URL in those cases to signal to Assistant that page-actions (e.g. translate,
-        // readout) should be disallowed.
-        return source == VoiceInteractionSource.TOOLBAR && sAssistantIntentPageUrlFlag.isEnabled();
-    }
-
-    /**
      * Returns the URL of the tab associated with this VoiceRecognitionHandler or null if it is not
      * available.
      */
@@ -989,11 +864,6 @@
         intent.putExtra(EXTRA_TRANSLATE_ORIGINAL_LANGUAGE, sourceLanguageCode);
         intent.putExtra(EXTRA_TRANSLATE_CURRENT_LANGUAGE, currentLanguageCode);
 
-        // If ASSISTANT_INTENT_PAGE_URL is enabled, the URL may have already been added.
-        if (!intent.hasExtra(EXTRA_PAGE_URL)) {
-            intent.putExtra(EXTRA_PAGE_URL, url);
-        }
-
         // The target language is not necessary for Assistant to decide whether to show the
         // translate UI.
         String targetLanguageCode = mTranslateBridgeWrapper.getTargetLanguage();
@@ -1076,13 +946,6 @@
 
         recordVoiceSearchFinishEvent(source, target);
         recordVoiceSearchOpenDuration(target, elapsedTimeMs);
-
-        // We should only record per-action metrics when the page URL feature is enabled. When
-        // disabled, only transcription should occur.
-        if (sAssistantIntentPageUrlFlag.isEnabled()) {
-            recordAssistantActionPerformed(source, action);
-            recordPerActionVoiceSearchOpenDuration(action, elapsedTimeMs);
-        }
     }
 
     /**
@@ -1166,22 +1029,6 @@
     }
 
     /**
-     * Records the action performed by Assistant as a result of the voice search intent.
-     * @param action The action performed, such as transcription or translation. Values taken from
-     *        the enum AssistantActionPerformed in enums.xml.
-     */
-    @VisibleForTesting
-    protected void recordAssistantActionPerformed(
-            @VoiceInteractionSource int source, @AssistantActionPerformed int action) {
-        String sourceSuffix = getHistogramSuffixForSource(source);
-        if (sourceSuffix != null) {
-            RecordHistogram.recordEnumeratedHistogram(
-                    "VoiceInteraction.AssistantActionPerformed." + sourceSuffix, action,
-                    AssistantActionPerformed.NUM_ENTRIES);
-        }
-    }
-
-    /**
      * Records the result of a voice search.
      *
      * This also records submetrics split by the intent target.
@@ -1246,14 +1093,6 @@
         }
     }
 
-    /** Records end-to-end voice search duration split by the action performed. */
-    private void recordPerActionVoiceSearchOpenDuration(
-            @AssistantActionPerformed int action, long openDurationMs) {
-        String actionSuffix = getHistogramSuffixForAction(action);
-        RecordHistogram.recordMediumTimesHistogram(
-                "VoiceInteraction.QueryDuration.Android." + actionSuffix, openDurationMs);
-    }
-
     /** Records whether translate information was successfully attached to an Assistant intent. */
     @VisibleForTesting
     protected void recordTranslateExtrasAttachResult(boolean result) {

chrome/browser/ui/ash/desks/desks_client_browsertest.cc

diff --git a/chrome/browser/ui/ash/desks/desks_client_browsertest.cc b/chrome/browser/ui/ash/desks/desks_client_browsertest.cc
index d6ae169..dcfaadb7 100644
--- a/chrome/browser/ui/ash/desks/desks_client_browsertest.cc
+++ b/chrome/browser/ui/ash/desks/desks_client_browsertest.cc
@@ -2465,7 +2465,7 @@
   // Record number of windows being closed per source.
   // NOTE: The template contains an existing browser with 1 tab created by
   // `BrowserMain()`.
-  histogram_tester.ExpectUniqueSample("Ash.Desks.NumberOfWindowsClosed.Api", 2,
+  histogram_tester.ExpectUniqueSample("Ash.Desks.NumberOfWindowsClosed2.Api", 2,
                                       1);
   EXPECT_EQ(1u, desks_controller->desks().size());
 }

chrome/browser/ui/ash/network/mobile_data_notifications_unittest.cc

diff --git a/chrome/browser/ui/ash/network/mobile_data_notifications_unittest.cc b/chrome/browser/ui/ash/network/mobile_data_notifications_unittest.cc
index 892ccb8a..ac4b018f 100644
--- a/chrome/browser/ui/ash/network/mobile_data_notifications_unittest.cc
+++ b/chrome/browser/ui/ash/network/mobile_data_notifications_unittest.cc
@@ -122,11 +122,12 @@
     device_test->ClearDevices();
     device_test->AddDevice(kCellularDevicePath, shill::kTypeCellular,
                            "stub_cellular_device1");
-    base::DictionaryValue home_provider;
-    home_provider.SetStringKey("name", "Cellular1_Provider");
-    home_provider.SetStringKey("country", "us");
+    base::Value::Dict home_provider;
+    home_provider.Set("name", "Cellular1_Provider");
+    home_provider.Set("country", "us");
     device_test->SetDeviceProperty(kCellularDevicePath,
-                                   shill::kHomeProviderProperty, home_provider,
+                                   shill::kHomeProviderProperty,
+                                   base::Value(std::move(home_provider)),
                                    /*notify_changed=*/true);
 
     // Create a cellular network and activate it.

chrome/browser/ui/ash/network/tether_notification_presenter_unittest.cc

diff --git a/chrome/browser/ui/ash/network/tether_notification_presenter_unittest.cc b/chrome/browser/ui/ash/network/tether_notification_presenter_unittest.cc
index b4584bf..7265b84 100644
--- a/chrome/browser/ui/ash/network/tether_notification_presenter_unittest.cc
+++ b/chrome/browser/ui/ash/network/tether_notification_presenter_unittest.cc
@@ -47,9 +47,9 @@
     void ConfigureNetworkIdAndConnect(const std::string& network_id,
                                       const base::Value& shill_properties,
                                       bool shared) override {}
-    void CreateConfigurationAndConnect(base::Value* shill_properties,
+    void CreateConfigurationAndConnect(base::Value::Dict shill_properties,
                                        bool shared) override {}
-    void CreateConfiguration(base::Value* shill_properties,
+    void CreateConfiguration(base::Value::Dict shill_properties,
                              bool shared) override {}
 
     void ConnectToNetworkId(const std::string& network_id) override {

chrome/browser/ui/ash/projector/pending_screencast_manager.cc

diff --git a/chrome/browser/ui/ash/projector/pending_screencast_manager.cc b/chrome/browser/ui/ash/projector/pending_screencast_manager.cc
index dd52196..c9a1509 100644
--- a/chrome/browser/ui/ash/projector/pending_screencast_manager.cc
+++ b/chrome/browser/ui/ash/projector/pending_screencast_manager.cc
@@ -185,14 +185,13 @@
     return std::string();
 
   // Builds request body:
-  base::DictionaryValue root;
+  base::Value::Dict root;
   base::Value::Dict contentHints;
   contentHints.Set(kDriveRequestIndexableTextKey, indexable_text);
-  root.SetKey(kDriveRequestContentHintsKey,
-              base::Value(std::move(contentHints)));
+  root.Set(kDriveRequestContentHintsKey, std::move(contentHints));
 
   std::string request_body;
-  base::JSONWriter::Write(root, &request_body);
+  base::JSONWriter::Write(std::move(root), &request_body);
 
   return request_body;
 }

chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_browsertest.cc

diff --git a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_browsertest.cc b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_browsertest.cc
index e7f765a..0d86ee16 100644
--- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_browsertest.cc
+++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_browsertest.cc
@@ -52,7 +52,7 @@
         "}"));
     EXPECT_TRUE(value->is_dict());
     LegalMessageLines legal_message_lines;
-    LegalMessageLine::Parse(*value, &legal_message_lines,
+    LegalMessageLine::Parse(value->GetDict(), &legal_message_lines,
                             /*escape_apostrophes=*/true);
     return legal_message_lines;
   }

chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_unittest.cc

diff --git a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_unittest.cc b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_unittest.cc
index 708cf28..8859587 100644
--- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_unittest.cc
+++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_unittest.cc
@@ -113,7 +113,7 @@
     ASSERT_TRUE(value);
     ASSERT_TRUE(value->is_dict());
     LegalMessageLines legal_message_lines;
-    LegalMessageLine::Parse(*value, &legal_message_lines,
+    LegalMessageLine::Parse(value->GetDict(), &legal_message_lines,
                             /*escape_apostrophes=*/true);
     controller()->OfferUploadSave(CreditCard(), legal_message_lines, options,
                                   base::BindOnce(&UploadSaveCardCallback));

chrome/browser/ui/browser_commands.cc

diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 2d7a34c..1c03abf 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -492,9 +492,8 @@
       off_the_record = false;
     }
   } else if (profile->IsGuestSession() ||
-             (browser_defaults::kAlwaysOpenIncognitoWindow &&
-              IncognitoModePrefs::ShouldLaunchIncognito(
-                  *base::CommandLine::ForCurrentProcess(), prefs))) {
+             IncognitoModePrefs::ShouldOpenSubsequentBrowsersInIncognito(
+                 *base::CommandLine::ForCurrentProcess(), prefs)) {
     off_the_record = true;
   }
 

chrome/browser/ui/extensions/extension_installed_bubble_model_unittest.cc

diff --git a/chrome/browser/ui/extensions/extension_installed_bubble_model_unittest.cc b/chrome/browser/ui/extensions/extension_installed_bubble_model_unittest.cc
index 0893d04..c775443e 100644
--- a/chrome/browser/ui/extensions/extension_installed_bubble_model_unittest.cc
+++ b/chrome/browser/ui/extensions/extension_installed_bubble_model_unittest.cc
@@ -43,14 +43,14 @@
   void AddOmniboxKeyword(extensions::ExtensionBuilder* builder,
                          const std::string& keyword) {
     using ManifestKeys = extensions::api::omnibox::ManifestKeys;
-    auto info = std::make_unique<base::DictionaryValue>();
-    info->SetStringKey(ManifestKeys::Omnibox::kKeyword, keyword);
+    base::Value::Dict info;
+    info.Set(ManifestKeys::Omnibox::kKeyword, keyword);
     builder->SetManifestKey(ManifestKeys::kOmnibox, std::move(info));
   }
 
   void AddRegularAction(extensions::ExtensionBuilder* builder) {
     builder->SetManifestKey(extensions::manifest_keys::kAction,
-                            std::make_unique<base::DictionaryValue>());
+                            base::Value::Dict());
   }
 
   void AddBrowserActionKeyBinding(extensions::ExtensionBuilder* builder,

chrome/browser/ui/omnibox/chrome_omnibox_client.cc

diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
index 15ab83b..47d668d 100644
--- a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
@@ -53,11 +53,11 @@
 #include "chrome/browser/ui/omnibox/omnibox_tab_helper.h"
 #include "components/favicon/content/content_favicon_driver.h"
 #include "components/favicon/core/favicon_service.h"
+#include "components/omnibox/browser/autocomplete_controller_emitter.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_result.h"
 #include "components/omnibox/browser/base_search_provider.h"
 #include "components/omnibox/browser/location_bar_model.h"
-#include "components/omnibox/browser/omnibox_controller_emitter.h"
 #include "components/omnibox/browser/search_provider.h"
 #include "components/omnibox/browser/shortcuts_backend.h"
 #include "components/omnibox/common/omnibox_features.h"
@@ -78,9 +78,10 @@
 
 using predictors::AutocompleteActionPredictor;
 
-ChromeOmniboxClient::ChromeOmniboxClient(OmniboxEditController* controller,
-                                         Profile* profile)
-    : controller_(static_cast<ChromeOmniboxEditController*>(controller)),
+ChromeOmniboxClient::ChromeOmniboxClient(
+    ChromeOmniboxEditController* controller,
+    Profile* profile)
+    : controller_(controller),
       profile_(profile),
       scheme_classifier_(profile),
       favicon_cache_(FaviconServiceFactory::GetForProfile(
@@ -157,8 +158,9 @@
   return BookmarkModelFactory::GetForBrowserContext(profile_);
 }
 
-OmniboxControllerEmitter* ChromeOmniboxClient::GetOmniboxControllerEmitter() {
-  return OmniboxControllerEmitter::GetForBrowserContext(profile_);
+AutocompleteControllerEmitter*
+ChromeOmniboxClient::GetAutocompleteControllerEmitter() {
+  return AutocompleteControllerEmitter::GetForBrowserContext(profile_);
 }
 
 TemplateURLService* ChromeOmniboxClient::GetTemplateURLService() {

chrome/browser/ui/omnibox/chrome_omnibox_client.h

diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_client.h b/chrome/browser/ui/omnibox/chrome_omnibox_client.h
index 3b7c25d..ac905c5 100644
--- a/chrome/browser/ui/omnibox/chrome_omnibox_client.h
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.h
@@ -21,12 +21,12 @@
 
 class ChromeOmniboxEditController;
 class GURL;
-class OmniboxEditController;
 class Profile;
 
 class ChromeOmniboxClient : public OmniboxClient {
  public:
-  ChromeOmniboxClient(OmniboxEditController* controller, Profile* profile);
+  ChromeOmniboxClient(ChromeOmniboxEditController* controller,
+                      Profile* profile);
 
   ChromeOmniboxClient(const ChromeOmniboxClient&) = delete;
   ChromeOmniboxClient& operator=(const ChromeOmniboxClient&) = delete;
@@ -45,7 +45,7 @@
   bool IsDefaultSearchProviderEnabled() const override;
   const SessionID& GetSessionID() const override;
   bookmarks::BookmarkModel* GetBookmarkModel() override;
-  OmniboxControllerEmitter* GetOmniboxControllerEmitter() override;
+  AutocompleteControllerEmitter* GetAutocompleteControllerEmitter() override;
   TemplateURLService* GetTemplateURLService() override;
   const AutocompleteSchemeClassifier& GetSchemeClassifier() const override;
   AutocompleteClassifier* GetAutocompleteClassifier() override;

chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.cc

diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.cc b/chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.cc
index 0288401..4c0afa8 100644
--- a/chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.cc
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.cc
@@ -25,6 +25,14 @@
 #include "chrome/browser/ui/extensions/settings_api_bubble_helpers.h"
 #endif
 
+ChromeOmniboxEditController::ChromeOmniboxEditController(
+    Browser* browser,
+    Profile* profile,
+    CommandUpdater* command_updater)
+    : browser_(browser), profile_(profile), command_updater_(command_updater) {}
+
+ChromeOmniboxEditController::~ChromeOmniboxEditController() = default;
+
 void ChromeOmniboxEditController::OnAutocompleteAccept(
     const GURL& destination_url,
     TemplateURLRef::PostContent* post_content,
@@ -71,17 +79,3 @@
 void ChromeOmniboxEditController::OnInputInProgress(bool in_progress) {
   UpdateWithoutTabRestore();
 }
-
-content::WebContents* ChromeOmniboxEditController::GetWebContents() {
-  return nullptr;
-}
-
-void ChromeOmniboxEditController::UpdateWithoutTabRestore() {}
-
-ChromeOmniboxEditController::ChromeOmniboxEditController(
-    Browser* browser,
-    Profile* profile,
-    CommandUpdater* command_updater)
-    : browser_(browser), profile_(profile), command_updater_(command_updater) {}
-
-ChromeOmniboxEditController::~ChromeOmniboxEditController() {}

chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.h

diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.h b/chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.h
index ef4203b..87f586cf 100644
--- a/chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.h
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.h
@@ -19,9 +19,13 @@
 // Chrome-specific extension of the OmniboxEditController base class.
 class ChromeOmniboxEditController : public OmniboxEditController {
  public:
+  ChromeOmniboxEditController(Browser* browser,
+                              Profile* profile,
+                              CommandUpdater* command_updater);
   ChromeOmniboxEditController(const ChromeOmniboxEditController&) = delete;
   ChromeOmniboxEditController& operator=(const ChromeOmniboxEditController&) =
       delete;
+  ~ChromeOmniboxEditController() override;
 
   // OmniboxEditController:
   void OnAutocompleteAccept(
@@ -39,21 +43,15 @@
   void OnInputInProgress(bool in_progress) override;
 
   // Returns the WebContents of the currently active tab.
-  virtual content::WebContents* GetWebContents();
+  virtual content::WebContents* GetWebContents() = 0;
 
   // Called when the the controller should update itself without restoring any
   // tab state.
-  virtual void UpdateWithoutTabRestore();
+  virtual void UpdateWithoutTabRestore() = 0;
 
   CommandUpdater* command_updater() { return command_updater_; }
   const CommandUpdater* command_updater() const { return command_updater_; }
 
- protected:
-  ChromeOmniboxEditController(Browser* browser,
-                              Profile* profile,
-                              CommandUpdater* command_updater);
-  ~ChromeOmniboxEditController() override;
-
  private:
   const raw_ptr<Browser> browser_;
   const raw_ptr<Profile> profile_;

chrome/browser/ui/tabs/tab_group.cc

diff --git a/chrome/browser/ui/tabs/tab_group.cc b/chrome/browser/ui/tabs/tab_group.cc
index 5798706a7..1b4ce33 100644
--- a/chrome/browser/ui/tabs/tab_group.cc
+++ b/chrome/browser/ui/tabs/tab_group.cc
@@ -147,22 +147,23 @@
   std::vector<SavedTabGroupTab> tabs;
   const gfx::Range tab_range = ListTabs();
   const base::GUID saved_group_guid = base::GUID::GenerateRandomV4();
+  SavedTabGroup group(visual_data_->title(), visual_data_->color(), {},
+                      saved_group_guid, absl::nullopt, id_);
+
   for (auto i = tab_range.start(); i < tab_range.end(); ++i) {
     content::WebContents* web_contents = controller_->GetWebContentsAt(i);
     const GURL& url = web_contents->GetVisibleURL();
     const std::u16string& title = web_contents->GetTitle();
-    tabs.emplace_back(
-        SavedTabGroupTab(url, title, saved_group_guid)
-            .SetFavicon(favicon::TabFaviconFromWebContents(web_contents)));
+    SavedTabGroupTab tab(url, title, saved_group_guid);
+    tab.SetFavicon(favicon::TabFaviconFromWebContents(web_contents));
+    group.AddTab(tab);
   }
 
   SavedTabGroupKeyedService* backend =
       SavedTabGroupServiceFactory::GetForProfile(controller_->GetProfile());
   if (!backend || !backend->model())
     return;
-  SavedTabGroup saved_tab_group(visual_data_->title(), visual_data_->color(),
-                                tabs, saved_group_guid, absl::nullopt, id_);
-  backend->model()->Add(saved_tab_group);
+  backend->model()->Add(std::move(group));
 }
 
 void TabGroup::UnsaveGroup() {

chrome/browser/ui/task_manager/task_manager_table_model.cc

diff --git a/chrome/browser/ui/task_manager/task_manager_table_model.cc b/chrome/browser/ui/task_manager/task_manager_table_model.cc
index ee0fea5..c1565b9 100644
--- a/chrome/browser/ui/task_manager/task_manager_table_model.cc
+++ b/chrome/browser/ui/task_manager/task_manager_table_model.cc
@@ -311,7 +311,6 @@
     : TaskManagerObserver(base::Milliseconds(kRefreshTimeMS),
                           REFRESH_TYPE_NONE),
       table_view_delegate_(delegate),
-      columns_settings_(new base::DictionaryValue),
       table_model_observer_(nullptr),
       stringifier_(new TaskManagerValuesStringifier),
 #if BUILDFLAG(ENABLE_NACL)
@@ -843,7 +842,7 @@
 
     // If the above FindBoolPath() fails, the |col_visibility| remains at the
     // default visibility.
-    columns_settings_->SetBoolPath(col_id_key, col_visibility);
+    columns_settings_.SetByDottedPath(col_id_key, col_visibility);
     table_view_delegate_->SetColumnVisibility(col_id, col_visibility);
     UpdateRefreshTypes(col_id, col_visibility);
 
@@ -864,7 +863,7 @@
   ScopedDictPrefUpdate dict_update(local_state,
                                    prefs::kTaskManagerColumnVisibility);
 
-  for (const auto item : columns_settings_->GetDict()) {
+  for (const auto item : columns_settings_) {
     dict_update->SetByDottedPath(item.first, item.second.Clone());
   }
 
@@ -882,8 +881,8 @@
 void TaskManagerTableModel::ToggleColumnVisibility(int column_id) {
   bool new_visibility = !table_view_delegate_->IsColumnVisible(column_id);
   table_view_delegate_->SetColumnVisibility(column_id, new_visibility);
-  columns_settings_->SetBoolPath(GetColumnIdAsString(column_id),
-                                 new_visibility);
+  columns_settings_.SetByDottedPath(GetColumnIdAsString(column_id),
+                                    new_visibility);
   UpdateRefreshTypes(column_id, new_visibility);
 }
 

chrome/browser/ui/task_manager/task_manager_table_model.h

diff --git a/chrome/browser/ui/task_manager/task_manager_table_model.h b/chrome/browser/ui/task_manager/task_manager_table_model.h
index 3786348..87c7175 100644
--- a/chrome/browser/ui/task_manager/task_manager_table_model.h
+++ b/chrome/browser/ui/task_manager/task_manager_table_model.h
@@ -133,7 +133,7 @@
   // exists, or the default column settings.
   // The columns settings are the visible columns and the last sorted column
   // and the direction of the sort.
-  std::unique_ptr<base::DictionaryValue> columns_settings_;
+  base::Value::Dict columns_settings_;
 
   // The table model observer that will be set by the table view of the task
   // manager.

chrome/browser/ui/views/extensions/extension_installed_bubble_view_browsertest.cc

diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble_view_browsertest.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble_view_browsertest.cc
index 75b7868..cf471066 100644
--- a/chrome/browser/ui/views/extensions/extension_installed_bubble_view_browsertest.cc
+++ b/chrome/browser/ui/views/extensions/extension_installed_bubble_view_browsertest.cc
@@ -48,7 +48,8 @@
 
     if (type == "Omnibox") {
       base::Value::Dict extra_keys;
-      extra_keys.Set(extensions::manifest_keys::kOmniboxKeyword, "foo");
+      extra_keys.SetByDottedPath(extensions::manifest_keys::kOmniboxKeyword,
+                                 "foo");
       builder.MergeManifest(std::move(extra_keys));
     }
 

chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc

diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc
index 8ea1928..aa44e29 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc
@@ -279,6 +279,7 @@
   const LocationBarModel* GetLocationBarModel() const override {
     return location_bar_model_;
   }
+  content::WebContents* GetWebContents() override { return nullptr; }
   void UpdateWithoutTabRestore() override {
     // This is a minimal amount of what LocationBarView does. Not all tests
     // set |omnibox_view_|.

chrome/browser/ui/views/side_panel/side_panel_web_ui_view.cc

diff --git a/chrome/browser/ui/views/side_panel/side_panel_web_ui_view.cc b/chrome/browser/ui/views/side_panel/side_panel_web_ui_view.cc
index 8add145d..5c35598 100644
--- a/chrome/browser/ui/views/side_panel/side_panel_web_ui_view.cc
+++ b/chrome/browser/ui/views/side_panel/side_panel_web_ui_view.cc
@@ -34,10 +34,6 @@
   SetWebContents(contents_wrapper_->web_contents());
 }
 
-void SidePanelWebUIView::SetVisible(bool visible) {
-  views::WebView::SetVisible(visible);
-}
-
 SidePanelWebUIView::~SidePanelWebUIView() = default;
 
 void SidePanelWebUIView::ViewHierarchyChanged(

chrome/browser/ui/views/side_panel/side_panel_web_ui_view.h

diff --git a/chrome/browser/ui/views/side_panel/side_panel_web_ui_view.h b/chrome/browser/ui/views/side_panel/side_panel_web_ui_view.h
index 9806ff4e..a44d3d62 100644
--- a/chrome/browser/ui/views/side_panel/side_panel_web_ui_view.h
+++ b/chrome/browser/ui/views/side_panel/side_panel_web_ui_view.h
@@ -35,7 +35,6 @@
   ~SidePanelWebUIView() override;
 
   // views::WebView:
-  void SetVisible(bool visible) override;
   void ViewHierarchyChanged(
       const views::ViewHierarchyChangedDetails& details) override;
 

chrome/browser/ui/views/status_icons/status_icon_button_linux.cc

diff --git a/chrome/browser/ui/views/status_icons/status_icon_button_linux.cc b/chrome/browser/ui/views/status_icons/status_icon_button_linux.cc
index 8cf52bf0..f64118e 100644
--- a/chrome/browser/ui/views/status_icons/status_icon_button_linux.cc
+++ b/chrome/browser/ui/views/status_icons/status_icon_button_linux.cc
@@ -73,10 +73,9 @@
 
   widget_->Init(std::move(params));
 
-  auto* window = widget_->GetNativeWindow();
-  DCHECK(window);
-  host_ = window->GetHost();
-  if (host_->GetAcceleratedWidget() == gfx::kNullAcceleratedWidget) {
+  // The window and host are non-null because the widget was just initialized.
+  auto* host = widget_->GetNativeWindow()->GetHost();
+  if (host->GetAcceleratedWidget() == gfx::kNullAcceleratedWidget) {
     delegate_->OnImplInitializationFailed();
     // |this| might be destroyed.
     return;
@@ -98,8 +97,9 @@
     const gfx::Point& point,
     ui::MenuSourceType source_type) {
   ui::MenuModel* menu = delegate_->GetMenuModel();
-  if (!menu)
+  if (!menu) {
     return;
+  }
   menu_runner_ = std::make_unique<views::MenuRunner>(
       menu, views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU |
                 views::MenuRunner::FIXED_ANCHOR);
@@ -111,7 +111,7 @@
   gfx::ScopedCanvas scoped_canvas(canvas);
   canvas->UndoDeviceScaleFactor();
 
-  gfx::Rect bounds = host_->GetBoundsInPixels();
+  gfx::Rect bounds = widget_->GetNativeWindow()->GetHost()->GetBoundsInPixels();
   const gfx::ImageSkia& image = delegate_->GetImage();
 
   // If the image fits in the window, center it.  But if it won't fit, downscale

chrome/browser/ui/views/status_icons/status_icon_button_linux.h

diff --git a/chrome/browser/ui/views/status_icons/status_icon_button_linux.h b/chrome/browser/ui/views/status_icons/status_icon_button_linux.h
index e561ee1..94a97e4 100644
--- a/chrome/browser/ui/views/status_icons/status_icon_button_linux.h
+++ b/chrome/browser/ui/views/status_icons/status_icon_button_linux.h
@@ -7,7 +7,6 @@
 
 #include <memory>
 
-#include "base/memory/raw_ptr.h"
 #include "ui/base/metadata/metadata_header_macros.h"
 #include "ui/linux/status_icon_linux.h"
 #include "ui/views/context_menu_controller.h"
@@ -15,11 +14,7 @@
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/widget/widget.h"
 
-namespace aura {
-class WindowTreeHost;
-}
-
-// A button that is internally mapped as a status icon if the underlaying
+// A button that is internally mapped as a status icon if the underlying
 // platform supports that kind of windows. Otherwise, calls
 // OnImplInitializationFailed.
 class StatusIconButtonLinux : public ui::StatusIconLinux,
@@ -50,8 +45,6 @@
  private:
   std::unique_ptr<views::Widget> widget_;
 
-  raw_ptr<aura::WindowTreeHost, DanglingUntriaged> host_ = nullptr;
-
   std::unique_ptr<views::MenuRunner> menu_runner_;
 };
 

chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc

diff --git a/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc b/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc
index 01caa54..5dceaa41 100644
--- a/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc
+++ b/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc
@@ -564,133 +564,4 @@
 
 INSTANTIATE_TEST_SUITE_P(, WebAppFileHandlingIconBrowserTest, testing::Bool());
 
-// The following fixtures help test what happens when the feature's state
-// changes between browser launches.
-class WebAppFileHandlingBrowserTest_FeatureSwitchesState
-    : public WebAppFileHandlingBrowserTest {
- public:
-  explicit WebAppFileHandlingBrowserTest_FeatureSwitchesState(
-      bool feature_switches_from_off_to_on = false) {
-    if (feature_switches_from_off_to_on == content::IsPreTest()) {
-      scoped_feature_list_.InitAndDisableFeature(
-          blink::features::kFileHandlingAPI);
-    }
-
-    WebAppFileHandlerManager::DisableOsIntegrationForTesting(
-        base::BindRepeating(
-            &WebAppFileHandlingBrowserTest_FeatureSwitchesState::
-                IntegrationWasSet,
-            base::Unretained(this)));
-  }
-  ~WebAppFileHandlingBrowserTest_FeatureSwitchesState() override = default;
-
-  void InstallApp() {
-    EXPECT_EQ(0u, registrar().GetAppIds().size());
-    InstallFileHandlingPWA();
-    EXPECT_EQ(1u, registrar().GetAppIds().size());
-
-    // `InstallFileHandlingPWA()` doesn't perform OS integration, so explicitly
-    // call it here to simulate a user install. Note: does nothing if the
-    // feature is disabled.
-    base::RunLoop run_loop;
-    file_handler_manager().EnableAndRegisterOsFileHandlers(
-        app_id(), base::BindLambdaForTesting([&](Result result) {
-          EXPECT_EQ(result, Result::kOk);
-          run_loop.Quit();
-        }));
-    run_loop.Run();
-  }
-
-  void IntegrationWasSet(bool enabled) {
-    if (enabled)
-      added_count_++;
-    else
-      removed_count_++;
-  }
-
- protected:
-  // The number of times Chrome has called into the OS to set state.
-  int added_count_ = 0;
-  int removed_count_ = 0;
-
- private:
-  base::test::ScopedFeatureList scoped_feature_list_;
-};
-
-// TODO(crbug/1288442): re-enable these tests
-#if !BUILDFLAG(IS_CHROMEOS)
-// This test fixture will run the PRE_ test with the feature disabled, then the
-// main test with the feature enabled. If a FH app was installed when the
-// feature was disabled, then the feature becomes enabled, it should be
-// registered with the OS.
-class WebAppFileHandlingBrowserTest_FeatureSwitchesOn
-    : public WebAppFileHandlingBrowserTest_FeatureSwitchesState {
- public:
-  WebAppFileHandlingBrowserTest_FeatureSwitchesOn()
-      : WebAppFileHandlingBrowserTest_FeatureSwitchesState(
-            /*feature_switches_from_off_to_on=*/true) {}
-  ~WebAppFileHandlingBrowserTest_FeatureSwitchesOn() override = default;
-};
-
-IN_PROC_BROWSER_TEST_F(WebAppFileHandlingBrowserTest_FeatureSwitchesOn,
-                       PRE_PRE_OsIntegrationIsAdded) {
-  InstallApp();
-  EXPECT_FALSE(file_handler_manager().IsFileHandlingAPIAvailable(app_id()));
-  EXPECT_FALSE(registrar().ExpectThatFileHandlersAreRegisteredWithOs(app_id()));
-  EXPECT_EQ(0, added_count_);
-  EXPECT_EQ(0, removed_count_);
-}
-
-IN_PROC_BROWSER_TEST_F(WebAppFileHandlingBrowserTest_FeatureSwitchesOn,
-                       PRE_OsIntegrationIsAdded) {
-  // In this intermediate test, the feature is still off. Verify that Chrome
-  // doesn't make excess calls to the OS.
-  EXPECT_EQ(0, added_count_);
-  EXPECT_EQ(0, removed_count_);
-}
-
-IN_PROC_BROWSER_TEST_F(WebAppFileHandlingBrowserTest_FeatureSwitchesOn,
-                       // TODO(crbug.com/1403367): Re-enable this test
-                       DISABLED_OsIntegrationIsAdded) {
-  ASSERT_EQ(1u, registrar().GetAppIds().size());
-  AppId app_id = registrar().GetAppIds()[0];
-  EXPECT_TRUE(file_handler_manager().IsFileHandlingAPIAvailable(app_id));
-  EXPECT_TRUE(registrar().ExpectThatFileHandlersAreRegisteredWithOs(app_id));
-  EXPECT_EQ(1, added_count_);
-  EXPECT_EQ(0, removed_count_);
-}
-
-// This test fixture verifies the opposite of the above. It will run the PRE_
-// test with the feature enabled, then the main test with the feature disabled.
-// If a FH app was installed when the feature was enabled, then the feature
-// becomes disabled, it should be no longer be registered with the OS.
-class WebAppFileHandlingBrowserTest_FeatureSwitchesOff
-    : public WebAppFileHandlingBrowserTest_FeatureSwitchesState {
- public:
-  WebAppFileHandlingBrowserTest_FeatureSwitchesOff()
-      : WebAppFileHandlingBrowserTest_FeatureSwitchesState(
-            /*feature_switches_from_off_to_on=*/false) {}
-  ~WebAppFileHandlingBrowserTest_FeatureSwitchesOff() override = default;
-};
-
-IN_PROC_BROWSER_TEST_F(WebAppFileHandlingBrowserTest_FeatureSwitchesOff,
-                       PRE_OsIntegrationIsRemoved) {
-  InstallApp();
-  EXPECT_TRUE(file_handler_manager().IsFileHandlingAPIAvailable(app_id()));
-  EXPECT_TRUE(registrar().ExpectThatFileHandlersAreRegisteredWithOs(app_id()));
-  EXPECT_EQ(1, added_count_);
-  EXPECT_EQ(0, removed_count_);
-}
-
-IN_PROC_BROWSER_TEST_F(WebAppFileHandlingBrowserTest_FeatureSwitchesOff,
-                       OsIntegrationIsRemoved) {
-  ASSERT_EQ(1u, registrar().GetAppIds().size());
-  AppId app_id = registrar().GetAppIds()[0];
-  EXPECT_FALSE(file_handler_manager().IsFileHandlingAPIAvailable(app_id));
-  EXPECT_FALSE(registrar().ExpectThatFileHandlersAreRegisteredWithOs(app_id));
-  EXPECT_EQ(0, added_count_);
-  EXPECT_EQ(1, removed_count_);
-}
-#endif  // !BUILDFLAG(IS_CHROMEOS)
-
 }  // namespace web_app

chrome/browser/ui/webui/app_home/app_home_page_handler_browsertest.cc

diff --git a/chrome/browser/ui/webui/app_home/app_home_page_handler_browsertest.cc b/chrome/browser/ui/webui/app_home/app_home_page_handler_browsertest.cc
index 3b08c6e1..e993405 100644
--- a/chrome/browser/ui/webui/app_home/app_home_page_handler_browsertest.cc
+++ b/chrome/browser/ui/webui/app_home/app_home_page_handler_browsertest.cc
@@ -200,18 +200,17 @@
   }
 
   scoped_refptr<const extensions::Extension> InstallTestExtensionApp() {
-    base::DictionaryValue manifest;
-    manifest.SetString(extensions::manifest_keys::kName, kTestAppName);
-    manifest.SetString(extensions::manifest_keys::kVersion, "0.0.0.0");
-    manifest.SetString(extensions::manifest_keys::kApp, "true");
-    manifest.SetString(extensions::manifest_keys::kPlatformAppBackgroundPage,
-                       std::string());
+    base::Value::Dict manifest;
+    manifest.SetByDottedPath(extensions::manifest_keys::kName, kTestAppName);
+    manifest.SetByDottedPath(extensions::manifest_keys::kVersion, "0.0.0.0");
+    manifest.SetByDottedPath(
+        extensions::manifest_keys::kPlatformAppBackgroundPage, std::string());
 
     std::string error;
     scoped_refptr<extensions::Extension> extension =
         extensions::Extension::Create(
             base::FilePath(), extensions::mojom::ManifestLocation::kUnpacked,
-            manifest.GetDict(), 0, &error);
+            manifest, 0, &error);
 
     extension_service()->AddExtension(extension.get());
     return extension;

chrome/browser/ui/webui/ntp/app_launcher_handler.h

diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/chrome/browser/ui/webui/ntp/app_launcher_handler.h
index f595756..70ce37c1 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.h
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.h
@@ -126,9 +126,6 @@
   // Create a dictionary value for the given web app.
   base::Value::Dict GetWebAppInfo(const web_app::AppId& app_id);
 
-  // Populate the given dictionary with the web store promo content.
-  void FillPromoDictionary(base::DictionaryValue* value);
-
   // Handles the "launchApp" message with unused |args|.
   void HandleGetApps(const base::Value::List& args);
 

chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc

diff --git a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc b/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc
index 05ac81fc..395bc67f 100644
--- a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc
+++ b/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc
@@ -30,9 +30,9 @@
 #include "components/history/core/browser/url_database.h"
 #include "components/omnibox/browser/actions/omnibox_pedal.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
+#include "components/omnibox/browser/autocomplete_controller_emitter.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_provider.h"
-#include "components/omnibox/browser/omnibox_controller_emitter.h"
 #include "components/search_engines/template_url.h"
 #include "content/public/browser/web_ui.h"
 #include "third_party/metrics_proto/omnibox_event.pb.h"
@@ -211,7 +211,7 @@
     mojo::PendingReceiver<mojom::OmniboxPageHandler> receiver)
     : profile_(profile), receiver_(this, std::move(receiver)) {
   observation_.Observe(
-      OmniboxControllerEmitter::GetForBrowserContext(profile_));
+      AutocompleteControllerEmitter::GetForBrowserContext(profile_));
   ResetController();
 }
 
@@ -371,6 +371,6 @@
       std::make_unique<ChromeAutocompleteProviderClient>(profile_),
       AutocompleteClassifier::DefaultOmniboxProviders());
   // We will observe our internal AutocompleteController directly, so there's
-  // no reason to hook it up to the profile-keyed OmniboxControllerEmitter.
+  // no reason to hook it up to the profile-keyed AutocompleteControllerEmitter.
   controller_->AddObserver(this);
 }

chrome/browser/ui/webui/omnibox/omnibox_page_handler.h

diff --git a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.h b/chrome/browser/ui/webui/omnibox/omnibox_page_handler.h
index 84dd4cc8..7bdeedbb 100644
--- a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.h
+++ b/chrome/browser/ui/webui/omnibox/omnibox_page_handler.h
@@ -15,9 +15,9 @@
 #include "base/time/time.h"
 #include "chrome/browser/ui/webui/omnibox/omnibox.mojom.h"
 #include "components/omnibox/browser/autocomplete_controller.h"
+#include "components/omnibox/browser/autocomplete_controller_emitter.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
-#include "components/omnibox/browser/omnibox_controller_emitter.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver.h"
@@ -93,7 +93,7 @@
 
   mojo::Receiver<mojom::OmniboxPageHandler> receiver_;
 
-  base::ScopedObservation<OmniboxControllerEmitter,
+  base::ScopedObservation<AutocompleteControllerEmitter,
                           AutocompleteController::Observer>
       observation_{this};
 

chrome/browser/ui/webui/realbox/realbox_handler.cc

diff --git a/chrome/browser/ui/webui/realbox/realbox_handler.cc b/chrome/browser/ui/webui/realbox/realbox_handler.cc
index 5a8c9ea8..44317d1 100644
--- a/chrome/browser/ui/webui/realbox/realbox_handler.cc
+++ b/chrome/browser/ui/webui/realbox/realbox_handler.cc
@@ -534,7 +534,7 @@
       metrics_reporter_(metrics_reporter),
       page_handler_(this, std::move(pending_page_handler)) {
   controller_emitter_observation_.Observe(
-      OmniboxControllerEmitter::GetForBrowserContext(profile_));
+      AutocompleteControllerEmitter::GetForBrowserContext(profile_));
 }
 
 RealboxHandler::~RealboxHandler() = default;
@@ -551,8 +551,8 @@
         std::make_unique<ChromeAutocompleteProviderClient>(profile_),
         AutocompleteClassifier::DefaultOmniboxProviders());
 
-    OmniboxControllerEmitter* emitter =
-        OmniboxControllerEmitter::GetForBrowserContext(profile_);
+    AutocompleteControllerEmitter* emitter =
+        AutocompleteControllerEmitter::GetForBrowserContext(profile_);
     if (emitter) {
       autocomplete_controller_->AddObserver(emitter);
     }

chrome/browser/ui/webui/realbox/realbox_handler.h

diff --git a/chrome/browser/ui/webui/realbox/realbox_handler.h b/chrome/browser/ui/webui/realbox/realbox_handler.h
index 1e7203b4..e676a1a 100644
--- a/chrome/browser/ui/webui/realbox/realbox_handler.h
+++ b/chrome/browser/ui/webui/realbox/realbox_handler.h
@@ -12,8 +12,8 @@
 #include "base/scoped_observation.h"
 #include "base/time/time.h"
 #include "components/omnibox/browser/autocomplete_controller.h"
+#include "components/omnibox/browser/autocomplete_controller_emitter.h"
 #include "components/omnibox/browser/omnibox.mojom.h"
-#include "components/omnibox/browser/omnibox_controller_emitter.h"
 #include "components/url_formatter/spoof_checks/idna_metrics.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"
@@ -115,7 +115,7 @@
   raw_ptr<Profile> profile_;
   raw_ptr<content::WebContents> web_contents_;
   std::unique_ptr<AutocompleteController> autocomplete_controller_;
-  base::ScopedObservation<OmniboxControllerEmitter,
+  base::ScopedObservation<AutocompleteControllerEmitter,
                           AutocompleteController::Observer>
       controller_emitter_observation_{this};
   base::TimeTicks time_user_first_modified_realbox_;

chrome/browser/ui/webui/settings/ash/internet_handler.cc

diff --git a/chrome/browser/ui/webui/settings/ash/internet_handler.cc b/chrome/browser/ui/webui/settings/ash/internet_handler.cc
index c8c7593..7d2b246 100644
--- a/chrome/browser/ui/webui/settings/ash/internet_handler.cc
+++ b/chrome/browser/ui/webui/settings/ash/internet_handler.cc
@@ -39,7 +39,7 @@
 const char kAddThirdPartyVpnMessage[] = "addThirdPartyVpn";
 const char kConfigureThirdPartyVpnMessage[] = "configureThirdPartyVpn";
 const char kShowCarrierAccountDetail[] = "showCarrierAccountDetail";
-const char kShowCellularSetupUI[] = "showCellularSetupUI";
+const char kShowCellularSetupUI[] = "showCellularSetupUi";
 const char kShowPortalSignin[] = "showPortalSignin";
 const char kRequestGmsCoreNotificationsDisabledDeviceNames[] =
     "requestGmsCoreNotificationsDisabledDeviceNames";

chrome/browser/ui/webui/settings/performance_settings_interactive_uitest.cc

diff --git a/chrome/browser/ui/webui/settings/performance_settings_interactive_uitest.cc b/chrome/browser/ui/webui/settings/performance_settings_interactive_uitest.cc
index b81fb51..4269bca3 100644
--- a/chrome/browser/ui/webui/settings/performance_settings_interactive_uitest.cc
+++ b/chrome/browser/ui/webui/settings/performance_settings_interactive_uitest.cc
@@ -22,11 +22,11 @@
 namespace {
 DEFINE_LOCAL_ELEMENT_IDENTIFIER_VALUE(kPerformanceSettingsPage);
 DEFINE_LOCAL_CUSTOM_ELEMENT_EVENT_TYPE(kButtonWasClicked);
+DEFINE_LOCAL_CUSTOM_ELEMENT_EVENT_TYPE(kElementRenders);
 
 constexpr char kCheckJsElementIsChecked[] = "(el) => { return el.checked; }";
 constexpr char kCheckJsElementIsNotChecked[] =
     "(el) => { return !el.checked; }";
-constexpr char kClickElement[] = "(el) => { return el.click(); }";
 
 class PerformanceSettingsInteractiveTest : public InteractiveBrowserTest {
  public:
@@ -69,6 +69,11 @@
             std::move(test_battery_level_provider));
   }
 
+  auto ClickElement(const ui::ElementIdentifier& contents_id,
+                    DeepQuery element) {
+    return Steps(MoveMouseTo(contents_id, element), ClickMouse());
+  }
+
   auto CheckTabCount(int expected_tab_count) {
     auto get_tab_count = base::BindLambdaForTesting(
         [this]() { return browser()->tab_strip_model()->GetTabCount(); });
@@ -97,7 +102,9 @@
     }));
   }
 
-  auto WaitForButtonStateChange(DeepQuery element, bool is_checked) {
+  auto WaitForButtonStateChange(const ui::ElementIdentifier& contents_id,
+                                DeepQuery element,
+                                bool is_checked) {
     StateChange toggle_selection_change;
     toggle_selection_change.event = kButtonWasClicked;
     toggle_selection_change.where = element;
@@ -105,8 +112,19 @@
     toggle_selection_change.test_function =
         is_checked ? kCheckJsElementIsChecked : kCheckJsElementIsNotChecked;
 
-    return WaitForStateChange(kPerformanceSettingsPage,
-                              std::move(toggle_selection_change));
+    return WaitForStateChange(contents_id, std::move(toggle_selection_change));
+  }
+
+  auto WaitForElementToRender(const ui::ElementIdentifier& contents_id,
+                              DeepQuery element) {
+    StateChange element_renders;
+    element_renders.event = kElementRenders;
+    element_renders.where = element;
+    element_renders.type = StateChange::Type::kExistsAndConditionTrue;
+    element_renders.test_function =
+        "(el) => { return el.clientWidth > 0 && el.clientHeight > 0; }";
+
+    return WaitForStateChange(contents_id, std::move(element_renders));
   }
 
   base::test::ScopedFeatureList scoped_feature_list_;
@@ -130,8 +148,8 @@
       NavigateWebContents(kPerformanceSettingsPage,
                           GURL(chrome::kChromeUIPerformanceSettingsURL)),
       InstrumentNextTab(kLearnMorePage),
-      MoveMouseTo(kPerformanceSettingsPage, high_efficiency_learn_more),
-      ClickMouse(), WaitForShow(kLearnMorePage), CheckTabCount(2),
+      ClickElement(kPerformanceSettingsPage, high_efficiency_learn_more),
+      WaitForShow(kLearnMorePage), CheckTabCount(2),
       WaitForWebContentsReady(kLearnMorePage,
                               GURL(chrome::kHighEfficiencyModeLearnMoreUrl)));
 }
@@ -151,8 +169,8 @@
       NavigateWebContents(kPerformanceSettingsPage,
                           GURL(chrome::kChromeUIPerformanceSettingsURL)),
       InstrumentNextTab(kLearnMorePage),
-      MoveMouseTo(kPerformanceSettingsPage, battery_saver_learn_more),
-      ClickMouse(), WaitForShow(kLearnMorePage), CheckTabCount(2),
+      ClickElement(kPerformanceSettingsPage, battery_saver_learn_more),
+      WaitForShow(kLearnMorePage), CheckTabCount(2),
       WaitForWebContentsReady(kLearnMorePage,
                               GURL(chrome::kBatterySaverModeLearnMoreUrl)));
 }
@@ -172,26 +190,35 @@
       InstrumentTab(kPerformanceSettingsPage),
       NavigateWebContents(kPerformanceSettingsPage,
                           GURL(chrome::kChromeUIPerformanceSettingsURL)),
+      WaitForElementToRender(kPerformanceSettingsPage, high_efficiency_toggle),
       CheckJsResultAt(kPerformanceSettingsPage, high_efficiency_toggle,
                       kCheckJsElementIsChecked),
 
       // Turn Off High Efficiency Mode
-      MoveMouseTo(kPerformanceSettingsPage, high_efficiency_toggle),
-      ClickMouse(), WaitForButtonStateChange(high_efficiency_toggle, false),
+      ClickElement(kPerformanceSettingsPage, high_efficiency_toggle),
+      WaitForButtonStateChange(kPerformanceSettingsPage, high_efficiency_toggle,
+                               false),
       CheckHighEffiencyModeLogged(false, 1, histogram_tester),
 
       // Turn High Efficiency Mode back on
-      MoveMouseTo(kPerformanceSettingsPage, high_efficiency_toggle),
-      ClickMouse(), WaitForButtonStateChange(high_efficiency_toggle, true),
+      ClickElement(kPerformanceSettingsPage, high_efficiency_toggle),
+      WaitForButtonStateChange(kPerformanceSettingsPage, high_efficiency_toggle,
+                               true),
       CheckHighEffiencyModeLogged(true, 1, histogram_tester));
 }
 
 IN_PROC_BROWSER_TEST_F(PerformanceSettingsInteractiveTest,
                        BatterySaverMetricsShouldLogOnToggle) {
+  DEFINE_LOCAL_CUSTOM_ELEMENT_EVENT_TYPE(kIronCollapseContentShows);
+
   const DeepQuery battery_saver_toggle = {
       "settings-ui",           "settings-main",          "settings-basic-page",
       "settings-battery-page", "settings-toggle-button", "cr-toggle#control"};
 
+  const DeepQuery iron_collapse = {
+      "settings-ui", "settings-main", "settings-basic-page",
+      "settings-battery-page", "iron-collapse#radioGroupCollapse"};
+
   const DeepQuery turn_on_at_threshold_button = {
       "settings-ui", "settings-main", "settings-basic-page",
       "settings-battery-page", "controlled-radio-button"};
@@ -201,40 +228,53 @@
       "settings-battery-page",
       "controlled-radio-button#enabledOnBatteryButton"};
 
+  StateChange iron_collapse_finish_animating;
+  iron_collapse_finish_animating.event = kIronCollapseContentShows;
+  iron_collapse_finish_animating.where = iron_collapse;
+  iron_collapse_finish_animating.type =
+      StateChange::Type::kExistsAndConditionTrue;
+  iron_collapse_finish_animating.test_function =
+      "(el) => { return !el.transitioning; }";
+
   base::HistogramTester histogram_tester;
   RunTestSequence(
       InstrumentTab(kPerformanceSettingsPage),
       NavigateWebContents(kPerformanceSettingsPage,
                           GURL(chrome::kChromeUIPerformanceSettingsURL)),
+      WaitForElementToRender(kPerformanceSettingsPage, battery_saver_toggle),
       CheckJsResultAt(kPerformanceSettingsPage, battery_saver_toggle,
                       kCheckJsElementIsChecked),
 
       // Turn off Battery Saver Mode
-      ExecuteJsAt(kPerformanceSettingsPage, battery_saver_toggle,
-                  kClickElement),
-      WaitForButtonStateChange(battery_saver_toggle, false),
+      ClickElement(kPerformanceSettingsPage, battery_saver_toggle),
+      WaitForButtonStateChange(kPerformanceSettingsPage, battery_saver_toggle,
+                               false),
       CheckBatteryStateLogged(histogram_tester,
                               BatterySaverModeState::kDisabled, 1),
 
       // Turn Battery Saver Mode back on
-      ExecuteJsAt(kPerformanceSettingsPage, battery_saver_toggle,
-                  kClickElement),
-      WaitForButtonStateChange(battery_saver_toggle, true),
+      ClickElement(kPerformanceSettingsPage, battery_saver_toggle),
+      WaitForButtonStateChange(kPerformanceSettingsPage, battery_saver_toggle,
+                               true),
       CheckBatteryStateLogged(histogram_tester,
                               BatterySaverModeState::kEnabledBelowThreshold, 1),
 
+      // Wait for the iron-collapse animation to finish so that the battery
+      // saver radio buttons will show on screen
+      WaitForStateChange(kPerformanceSettingsPage,
+                         std::move(iron_collapse_finish_animating)),
+
       // Change Battery Saver Setting to turn on when unplugged
-      ExecuteJsAt(kPerformanceSettingsPage, turn_on_when_unplugged_button,
-                  kClickElement),
-      ClickMouse(),
-      WaitForButtonStateChange(turn_on_when_unplugged_button, true),
+      ClickElement(kPerformanceSettingsPage, turn_on_when_unplugged_button),
+      WaitForButtonStateChange(kPerformanceSettingsPage,
+                               turn_on_when_unplugged_button, true),
       CheckBatteryStateLogged(histogram_tester,
                               BatterySaverModeState::kEnabledOnBattery, 1),
 
       // Change Battery Saver Setting to turn on when battery is at 20%
-      ExecuteJsAt(kPerformanceSettingsPage, turn_on_at_threshold_button,
-                  kClickElement),
-      WaitForButtonStateChange(turn_on_at_threshold_button, true),
+      ClickElement(kPerformanceSettingsPage, turn_on_at_threshold_button),
+      WaitForButtonStateChange(kPerformanceSettingsPage,
+                               turn_on_at_threshold_button, true),
       CheckBatteryStateLogged(
           histogram_tester, BatterySaverModeState::kEnabledBelowThreshold, 2));
 }
@@ -253,8 +293,7 @@
       InstrumentTab(kPerformanceSettingsPage),
       NavigateWebContents(kPerformanceSettingsPage,
                           GURL(chrome::kChromeUIPerformanceSettingsURL)),
-      MoveMouseTo(kPerformanceSettingsPage, high_efficiency_feedback),
-      ClickMouse(),
+      ClickElement(kPerformanceSettingsPage, high_efficiency_feedback),
       InAnyContext(WaitForShow(FeedbackDialog::kFeedbackDialogForTesting)));
 }
 
@@ -271,8 +310,7 @@
       InstrumentTab(kPerformanceSettingsPage),
       NavigateWebContents(kPerformanceSettingsPage,
                           GURL(chrome::kChromeUIPerformanceSettingsURL)),
-      MoveMouseTo(kPerformanceSettingsPage, battery_saver_feedback),
-      ClickMouse(),
+      ClickElement(kPerformanceSettingsPage, battery_saver_feedback),
       InAnyContext(WaitForShow(FeedbackDialog::kFeedbackDialogForTesting)));
 }
 

chrome/browser/web_applications/os_integration/web_app_file_handler_manager.cc

diff --git a/chrome/browser/web_applications/os_integration/web_app_file_handler_manager.cc b/chrome/browser/web_applications/os_integration/web_app_file_handler_manager.cc
index a2c3012..854cd4f 100644
--- a/chrome/browser/web_applications/os_integration/web_app_file_handler_manager.cc
+++ b/chrome/browser/web_applications/os_integration/web_app_file_handler_manager.cc
@@ -60,14 +60,6 @@
 
 void WebAppFileHandlerManager::Start() {
   DCHECK(sync_bridge_);
-
-  // Don't compete for resources during browser startup.
-  content::GetUIThreadTaskRunner({base::TaskPriority::BEST_EFFORT})
-      ->PostTask(
-          FROM_HERE,
-          base::BindOnce(base::IgnoreResult(
-                             &WebAppFileHandlerManager::SyncOsIntegrationState),
-                         weak_ptr_factory_.GetWeakPtr()));
 }
 
 // static

chrome/browser/webauthn/chrome_webauthn_autofill_interactive_uitest.cc

diff --git a/chrome/browser/webauthn/chrome_webauthn_autofill_interactive_uitest.cc b/chrome/browser/webauthn/chrome_webauthn_autofill_interactive_uitest.cc
index fe45121..4444327 100644
--- a/chrome/browser/webauthn/chrome_webauthn_autofill_interactive_uitest.cc
+++ b/chrome/browser/webauthn/chrome_webauthn_autofill_interactive_uitest.cc
@@ -8,7 +8,6 @@
 #include "base/memory/raw_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
-#include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/ssl/cert_verifier_browser_test.h"
@@ -24,7 +23,6 @@
 #include "components/password_manager/core/browser/password_ui_utils.h"
 #include "content/public/browser/authenticator_environment.h"
 #include "content/public/browser/render_frame_host.h"
-#include "content/public/common/content_features.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "device/fido/fido_transport_protocol.h"
@@ -250,8 +248,6 @@
     }
   }
 
-  base::test::ScopedFeatureList scoped_feature_list_{
-      features::kWebAuthConditionalUI};
   raw_ptr<device::test::VirtualFidoDeviceFactory> virtual_device_factory_;
   net::EmbeddedTestServer https_server_{net::EmbeddedTestServer::TYPE_HTTPS};
 };

chrome/browser/webauthn/chrome_webauthn_autofill_mac_interactive_uitest.mm

diff --git a/chrome/browser/webauthn/chrome_webauthn_autofill_mac_interactive_uitest.mm b/chrome/browser/webauthn/chrome_webauthn_autofill_mac_interactive_uitest.mm
index c7a116e..be10740 100644
--- a/chrome/browser/webauthn/chrome_webauthn_autofill_mac_interactive_uitest.mm
+++ b/chrome/browser/webauthn/chrome_webauthn_autofill_mac_interactive_uitest.mm
@@ -6,7 +6,6 @@
 #include <vector>
 
 #include "base/test/bind.h"
-#include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
 #include "chrome/browser/password_manager/chrome_webauthn_credentials_delegate.h"
 #include "chrome/browser/ssl/cert_verifier_browser_test.h"
@@ -20,10 +19,8 @@
 #include "components/network_session_configurator/common/network_switches.h"
 #include "components/password_manager/core/browser/password_ui_utils.h"
 #include "content/public/browser/render_frame_host.h"
-#include "content/public/common/content_features.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
-#include "device/fido/features.h"
 #include "device/fido/mac/credential_store.h"
 #include "device/fido/mac/scoped_touch_id_test_environment.h"
 #include "device/fido/public_key_credential_user_entity.h"
@@ -91,8 +88,6 @@
     touch_id_test_environment_->SimulateTouchIdPromptSuccess();
   }
 
-  base::test::ScopedFeatureList scoped_feature_list_{
-      features::kWebAuthConditionalUI};
   net::EmbeddedTestServer https_server_{net::EmbeddedTestServer::TYPE_HTTPS};
   device::fido::mac::AuthenticatorConfig config_;
   std::unique_ptr<device::fido::mac::ScopedTouchIdTestEnvironment>

chrome/browser/webauthn/chrome_webauthn_browsertest.cc

diff --git a/chrome/browser/webauthn/chrome_webauthn_browsertest.cc b/chrome/browser/webauthn/chrome_webauthn_browsertest.cc
index 54c73f0f..6a00135c7 100644
--- a/chrome/browser/webauthn/chrome_webauthn_browsertest.cc
+++ b/chrome/browser/webauthn/chrome_webauthn_browsertest.cc
@@ -29,7 +29,6 @@
 #include "components/network_session_configurator/common/network_switches.h"
 #include "content/public/browser/authenticator_environment.h"
 #include "content/public/browser/render_frame_host.h"
-#include "content/public/common/content_features.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "device/fido/cable/cable_discovery_data.h"
@@ -281,8 +280,6 @@
   }
 
  protected:
-  base::test::ScopedFeatureList scoped_feature_list_{
-      features::kWebAuthConditionalUI};
   std::unique_ptr<Observer> observer_;
   raw_ptr<device::test::VirtualFidoDeviceFactory> virtual_device_factory_;
 };

chrome/browser/webauthn/local_credential_management_mac.cc

diff --git a/chrome/browser/webauthn/local_credential_management_mac.cc b/chrome/browser/webauthn/local_credential_management_mac.cc
index 30f2b46..075faeb 100644
--- a/chrome/browser/webauthn/local_credential_management_mac.cc
+++ b/chrome/browser/webauthn/local_credential_management_mac.cc
@@ -6,8 +6,6 @@
 #include "chrome/browser/webauthn/local_credential_management.h"
 
 #include "base/bind.h"
-#include "base/feature_list.h"
-#include "content/public/common/content_features.h"
 #include "device/fido/mac/credential_store.h"
 
 LocalCredentialManagementMac::LocalCredentialManagementMac(
@@ -24,10 +22,6 @@
 
 void LocalCredentialManagementMac::HasCredentials(
     base::OnceCallback<void(bool)> callback) {
-  if (!base::FeatureList::IsEnabled(features::kWebAuthConditionalUI)) {
-    std::move(callback).Run(false);
-    return;
-  }
   Enumerate(
       base::BindOnce(
           [](absl::optional<std::vector<device::DiscoverableCredentialMetadata>>

chrome/browser/webauthn/local_credential_management_mac_unittest.mm

diff --git a/chrome/browser/webauthn/local_credential_management_mac_unittest.mm b/chrome/browser/webauthn/local_credential_management_mac_unittest.mm
index 28d7bd9..ce15a2b8 100644
--- a/chrome/browser/webauthn/local_credential_management_mac_unittest.mm
+++ b/chrome/browser/webauthn/local_credential_management_mac_unittest.mm
@@ -6,10 +6,8 @@
 
 #include "chrome/browser/webauthn/local_credential_management_mac.h"
 
-#include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/public/common/content_features.h"
 #include "content/public/test/browser_task_environment.h"
 #include "device/fido/mac/authenticator_config.h"
 #include "device/fido/mac/credential_store.h"
@@ -39,28 +37,8 @@
   device::fido::mac::ScopedFakeKeychain keychain_{
       config_.keychain_access_group};
   device::fido::mac::TouchIdCredentialStore store_{config_};
-  base::test::ScopedFeatureList scoped_feature_list_{
-      features::kWebAuthConditionalUI};
 };
 
-class WebAuthConditionalUIFlagOffTest : public LocalCredentialManagementTest {
- protected:
-  WebAuthConditionalUIFlagOffTest() {
-    scoped_feature_list_.Reset();
-    scoped_feature_list_.InitAndDisableFeature(features::kWebAuthConditionalUI);
-  }
-};
-
-TEST_F(WebAuthConditionalUIFlagOffTest, FeatureFlagOff) {
-  device::test::TestCallbackReceiver<bool> callback;
-  auto credential = store_.CreateCredential(
-      kRpId, kUser, device::fido::mac::TouchIdCredentialStore::kDiscoverable);
-  EXPECT_TRUE(credential);
-  local_cred_man_.HasCredentials(callback.callback());
-  callback.WaitForCallback();
-  EXPECT_FALSE(std::get<0>(callback.TakeResult()));
-}
-
 TEST_F(LocalCredentialManagementTest, NoCredentials) {
   device::test::TestCallbackReceiver<bool> callback;
   local_cred_man_.HasCredentials(callback.callback());

chrome/browser/webauthn/local_credential_management_win.cc

diff --git a/chrome/browser/webauthn/local_credential_management_win.cc b/chrome/browser/webauthn/local_credential_management_win.cc
index 4b166f4..97e25d2 100644
--- a/chrome/browser/webauthn/local_credential_management_win.cc
+++ b/chrome/browser/webauthn/local_credential_management_win.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/webauthn/local_credential_management_win.h"
 
 #include "base/bind.h"
-#include "base/feature_list.h"
 #include "base/notreached.h"
 #include "base/task/sequenced_task_runner.h"
 #include "build/build_config.h"
@@ -14,7 +13,6 @@
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/user_prefs/user_prefs.h"
-#include "content/public/common/content_features.h"
 #include "device/fido/win/authenticator.h"
 #include "device/fido/win/webauthn_api.h"
 
@@ -122,8 +120,7 @@
     base::OnceCallback<void(bool)> callback) {
   absl::optional<bool> result;
 
-  if (!api_->IsAvailable() || !api_->SupportsSilentDiscovery() ||
-      !base::FeatureList::IsEnabled(features::kWebAuthConditionalUI)) {
+  if (!api_->IsAvailable() || !api_->SupportsSilentDiscovery()) {
     result = false;
   } else if (profile_->GetPrefs()->GetBoolean(kHasPlatformCredentialsPref)) {
     result = true;

chrome/browser/webauthn/local_credential_management_win_unittest.cc

diff --git a/chrome/browser/webauthn/local_credential_management_win_unittest.cc b/chrome/browser/webauthn/local_credential_management_win_unittest.cc
index e4155cf4..7ff8b14 100644
--- a/chrome/browser/webauthn/local_credential_management_win_unittest.cc
+++ b/chrome/browser/webauthn/local_credential_management_win_unittest.cc
@@ -7,12 +7,10 @@
 #include "chrome/browser/webauthn/local_credential_management_win.h"
 
 #include "base/run_loop.h"
-#include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/prefs/pref_service.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
-#include "content/public/common/content_features.h"
 #include "content/public/test/browser_task_environment.h"
 #include "device/fido/test_callback_receiver.h"
 #include "device/fido/win/fake_webauthn_api.h"
@@ -27,8 +25,7 @@
 
 class LocalCredentialManagementTest : public testing::Test {
  protected:
-  LocalCredentialManagementTest()
-      : scoped_feature_list_(features::kWebAuthConditionalUI) {}
+  LocalCredentialManagementTest() = default;
 
   void SetUp() override { api_.set_supports_silent_discovery(true); }
 
@@ -57,7 +54,6 @@
   TestingProfile profile_;
   device::FakeWinWebAuthnApi api_;
   LocalCredentialManagementWin local_cred_man_{&api_, &profile_};
-  const base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 TEST_F(LocalCredentialManagementTest, NoSupport) {

chrome/browser/window_management/screen_details_browsertest.cc

diff --git a/chrome/browser/window_management/screen_details_browsertest.cc b/chrome/browser/window_management/screen_details_browsertest.cc
index 39cf8cf..03393f2 100644
--- a/chrome/browser/window_management/screen_details_browsertest.cc
+++ b/chrome/browser/window_management/screen_details_browsertest.cc
@@ -87,30 +87,37 @@
   EXPECT_NE(display_size, EvalJs(tab, "`${innerWidth}x${innerHeight}`"));
   EXPECT_EQ(display_size, EvalJs(tab, kGetCurrentScreenSizeScript));
 
-  // Enter fullscreen; and show docked devtools, which shrinks the content area.
-  constexpr char kEnterFullscreenScript[] = R"JS(
-    document.documentElement.requestFullscreen().then(() => {
-        return !!document.fullscreenElement;
-    });
+  // Check dimensions after entering fullscreen yields a `resize`, and after
+  // docking DevTools yields a `resize` as the fullscreen content area shrinks.
+  constexpr char kEnterFullscreenAndResizeScript[] = R"JS(
+    Promise.all([ document.documentElement.requestFullscreen(),
+                  new Promise(r => { onresize = r; })
+                ]).then(() => {
+                  window.nextResize = new Promise(r => { onresize = r; });
+                  return !!document.fullscreenElement;
+                });
   )JS";
-  ASSERT_TRUE(EvalJs(tab, kEnterFullscreenScript).ExtractBool());
-  ASSERT_TRUE(tab->IsFullscreen());
+  ASSERT_TRUE(EvalJs(tab, kEnterFullscreenAndResizeScript).ExtractBool());
   DevToolsWindowTesting::OpenDevToolsWindowSync(tab, true);
+  ASSERT_TRUE(EvalJs(tab, "window.nextResize").error.empty());
   ASSERT_TRUE(tab->IsFullscreen());
   if (FullscreenScreenSizeMatchesDisplayEnabled()) {
     // `window.screen` dimensions match the display size.
     EXPECT_EQ(display_size, EvalJs(tab, "`${screen.width}x${screen.height}`"));
+    EXPECT_NE(EvalJs(tab, "`${screen.width}x${screen.height}`").ExtractString(),
+              EvalJs(tab, "`${innerWidth}x${innerHeight}`").ExtractString());
   } else {
     // `window.screen` dimensions match the smaller viewport size.
     EXPECT_NE(display_size, EvalJs(tab, "`${screen.width}x${screen.height}`"));
+    EXPECT_EQ(EvalJs(tab, "`${screen.width}x${screen.height}`").ExtractString(),
+              EvalJs(tab, "`${innerWidth}x${innerHeight}`").ExtractString());
   }
-  EXPECT_NE(display_size, EvalJs(tab, "`${innerWidth}x${innerHeight}`"));
   EXPECT_EQ(display_size, EvalJs(tab, kGetCurrentScreenSizeScript));
 
-  // Check dimensions again after exiting fullscreen and getting a `resize`.
+  // Check dimensions again after exiting fullscreen yields a `resize`.
   constexpr char kExitFullscreenAndResizeScript[] = R"JS(
     Promise.all([ document.exitFullscreen(),
-                  new Promise(r => { window.onresize = r; })
+                  new Promise(r => { onresize = r; })
                 ]).then(() => {
                   return !document.fullscreenElement;
                 });
@@ -118,6 +125,5 @@
   ASSERT_TRUE(EvalJs(tab, kExitFullscreenAndResizeScript).ExtractBool());
   ASSERT_FALSE(tab->IsFullscreen());
   EXPECT_EQ(display_size, EvalJs(tab, "`${screen.width}x${screen.height}`"));
-  EXPECT_NE(display_size, EvalJs(tab, "`${innerWidth}x${innerHeight}`"));
   EXPECT_EQ(display_size, EvalJs(tab, kGetCurrentScreenSizeScript));
 }

chrome/build/linux.pgo.txt

diff --git a/chrome/build/linux.pgo.txt b/chrome/build/linux.pgo.txt
index 9297a7ef..e916854 100644
--- a/chrome/build/linux.pgo.txt
+++ b/chrome/build/linux.pgo.txt
@@ -1 +1 @@
-chrome-linux-main-1672747127-fb44f1606536d80d3ad39bc873ad7615ed48c8dd.profdata
+chrome-linux-main-1672768604-02e07768de6f9e782be0bff18efe56f271ef18f2.profdata

chrome/build/mac-arm.pgo.txt

diff --git a/chrome/build/mac-arm.pgo.txt b/chrome/build/mac-arm.pgo.txt
index 275482d..167fa6a 100644
--- a/chrome/build/mac-arm.pgo.txt
+++ b/chrome/build/mac-arm.pgo.txt
@@ -1 +1 @@
-chrome-mac-arm-main-1672747127-84aa0de29438f98caa27cb014603635db5cb9167.profdata
+chrome-mac-arm-main-1672768604-17d1d9682a1b10df8e779c979c79ac2169f9dfe2.profdata

chrome/build/mac.pgo.txt

diff --git a/chrome/build/mac.pgo.txt b/chrome/build/mac.pgo.txt
index 9d31f17b..596edc9 100644
--- a/chrome/build/mac.pgo.txt
+++ b/chrome/build/mac.pgo.txt
@@ -1 +1 @@
-chrome-mac-main-1672747127-2b2d0dc11fb80d20f4b754d0284b4c2cd994c6a7.profdata
+chrome-mac-main-1672768604-f7f43286d8b833779c2cf3cb6baf8dcb15abcb77.profdata

chrome/build/win32.pgo.txt

diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt
index 5c5cc990b..00ed62c 100644
--- a/chrome/build/win32.pgo.txt
+++ b/chrome/build/win32.pgo.txt
@@ -1 +1 @@
-chrome-win32-main-1672747127-0e0b8562d2b8bb0d9f1a07c0d2298e6e226686cb.profdata
+chrome-win32-main-1672768604-0184dbab237a45944e284e084332b3a92d758063.profdata

chrome/build/win64.pgo.txt

diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt
index b024f7f..7add4ef 100644
--- a/chrome/build/win64.pgo.txt
+++ b/chrome/build/win64.pgo.txt
@@ -1 +1 @@
-chrome-win64-main-1672747127-4595f025e6148342f8e3454ef9b35054e99f2235.profdata
+chrome-win64-main-1672768604-8da543c818b6aea3eae2ad5cb80cfe61abd454a1.profdata

chrome/chrome_cleaner/engines/common/registry_util_unittest.cc

diff --git a/chrome/chrome_cleaner/engines/common/registry_util_unittest.cc b/chrome/chrome_cleaner/engines/common/registry_util_unittest.cc
index beb81d3..87a76dc7 100644
--- a/chrome/chrome_cleaner/engines/common/registry_util_unittest.cc
+++ b/chrome/chrome_cleaner/engines/common/registry_util_unittest.cc
@@ -171,13 +171,13 @@
 
 std::wstring HandlePath(HANDLE handle) {
   std::wstring full_path;
-  // The size parameter of GetFinalPathNameByHandle does NOT include the null
+  // The size parameter of GetFinalPathNameByHandle includes the null
   // terminator.
   DWORD result = ::GetFinalPathNameByHandleW(
-      handle, base::WriteInto(&full_path, MAX_PATH), MAX_PATH - 1, 0);
+      handle, base::WriteInto(&full_path, MAX_PATH + 1), MAX_PATH + 1, 0);
   if (result > MAX_PATH) {
-    result = ::GetFinalPathNameByHandle(
-        handle, base::WriteInto(&full_path, result), result - 1, 0);
+    result = ::GetFinalPathNameByHandleW(
+        handle, base::WriteInto(&full_path, result), result, 0);
   }
   if (!result) {
     PLOG(ERROR) << "Could not get full path for handle " << handle;

chrome/common/chrome_switches.cc

diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 3d9eeb2f..2097ca1 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -342,7 +342,8 @@
 // http://google.com.
 const char kHomePage[] = "homepage";
 
-// Causes the browser to launch directly in incognito mode.
+// Causes the initial browser opened to be in incognito mode. Further browsers
+// may or may not be in incognito mode; see `IncognitoModePrefs`.
 const char kIncognito[] = "incognito";
 
 #if BUILDFLAG(IS_CHROMEOS_LACROS)

chrome/common/extensions/api/input_method_private.json

diff --git a/chrome/common/extensions/api/input_method_private.json b/chrome/common/extensions/api/input_method_private.json
index 6d7ebdf..360550f 100644
--- a/chrome/common/extensions/api/input_method_private.json
+++ b/chrome/common/extensions/api/input_method_private.json
@@ -633,36 +633,6 @@
           }
         ]
       }, {
-        "name": "onCompositionBoundsChanged",
-        "type": "function",
-        "description": "Fired when the composition bounds or cursor bounds are changed.",
-        "parameters": [
-          {
-            "name": "firstBounds",
-            "type": "object",
-            "description": "The bounds information for the first character in composition.",
-            "properties": {
-              "x": {"type": "integer"},
-              "y": {"type": "integer"},
-              "w": {"type": "integer"},
-              "h": {"type": "integer"}
-            }
-          }, {
-            "name": "boundsList",
-            "type": "array",
-            "description": "List of bounds information.",
-            "items": {
-              "type": "object",
-              "properties": {
-                "x": {"type": "integer"},
-                "y": {"type": "integer"},
-                "w": {"type": "integer"},
-                "h": {"type": "integer"}
-              }
-            }
-          }
-        ]
-      }, {
         "name": "onDictionaryLoaded",
         "type": "function",
         "description": "Fired when the custom spelling dictionary is loaded.",

chrome/renderer/BUILD.gn

diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
index c4f19d7d..de2dacb1 100644
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -208,6 +208,7 @@
     "//third_party/blink/public:scaled_resources",
     "//third_party/blink/public/strings",
     "//third_party/icu",
+    "//third_party/libwebp",
     "//third_party/re2",
     "//third_party/widevine/cdm:buildflags",
     "//ui/surface",

chrome/renderer/DEPS

diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS
index add72c8bd..b151d98 100644
--- a/chrome/renderer/DEPS
+++ b/chrome/renderer/DEPS
@@ -96,6 +96,7 @@
   "+third_party/blink/public/strings/grit/blink_strings.h",
   "+third_party/metrics_proto",
   "+third_party/widevine/cdm/buildflags.h",
+  "+third_party/libwebp/src/src/webp/decode.h",
   "+third_party/widevine/cdm/widevine_cdm_common.h",
   "+ui/gfx/geometry/size_f.h",
 ]

chrome/renderer/chrome_render_frame_observer.cc

diff --git a/chrome/renderer/chrome_render_frame_observer.cc b/chrome/renderer/chrome_render_frame_observer.cc
index 5b95eac..9397c4b 100644
--- a/chrome/renderer/chrome_render_frame_observer.cc
+++ b/chrome/renderer/chrome_render_frame_observer.cc
@@ -58,6 +58,7 @@
 #include "third_party/blink/public/web/web_node.h"
 #include "third_party/blink/public/web/web_security_policy.h"
 #include "third_party/blink/public/web/web_view.h"
+#include "third_party/libwebp/src/src/webp/decode.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/codec/png_codec.h"
@@ -417,7 +418,8 @@
   image_extension = "." + web_element.ImageExtension();
   bool needs_downscale = NeedsDownscale(
       original_size, thumbnail_min_area_pixels, thumbnail_max_size_pixels);
-  bool needs_encode = NeedsEncodeImage(image_extension, image_format);
+  bool needs_encode = NeedsEncodeImage(image_extension, image_format) ||
+                      IsAnimatedWebp(web_element.CopyOfImageData());
   if (!needs_encode && !needs_downscale) {
     image_data = web_element.CopyOfImageData();
     std::move(callback).Run(std::move(image_data), original_size,
@@ -723,3 +725,12 @@
   NOTREACHED();
   return true;
 }
+
+// static
+bool ChromeRenderFrameObserver::IsAnimatedWebp(
+    const std::vector<uint8_t>& image_data) {
+  WebPBitstreamFeatures features{};
+  VP8StatusCode status =
+      WebPGetFeatures(image_data.data(), image_data.size(), &features);
+  return status == VP8_STATUS_OK && features.has_animation;
+}

chrome/renderer/chrome_render_frame_observer.h

diff --git a/chrome/renderer/chrome_render_frame_observer.h b/chrome/renderer/chrome_render_frame_observer.h
index 323bf23..9a7d5d63 100644
--- a/chrome/renderer/chrome_render_frame_observer.h
+++ b/chrome/renderer/chrome_render_frame_observer.h
@@ -135,6 +135,10 @@
   static bool NeedsEncodeImage(const std::string& image_extension,
                                chrome::mojom::ImageFormat image_format);
 
+  // Check if the image is an animated Webp image by looking for animation
+  // feature flag
+  static bool IsAnimatedWebp(const std::vector<uint8_t>& image_data);
+
   // Have the same lifetime as us.
   translate::TranslateAgent* translate_agent_;
   optimization_guide::PageTextAgent* page_text_agent_;

chrome/renderer/chrome_render_frame_observer_unittest.cc

diff --git a/chrome/renderer/chrome_render_frame_observer_unittest.cc b/chrome/renderer/chrome_render_frame_observer_unittest.cc
index f518fdb..43b6ab0a 100644
--- a/chrome/renderer/chrome_render_frame_observer_unittest.cc
+++ b/chrome/renderer/chrome_render_frame_observer_unittest.cc
@@ -22,6 +22,10 @@
     return ChromeRenderFrameObserver::NeedsEncodeImage(image_extension,
                                                        image_format);
   }
+
+  bool IsAnimatedWebp(const std::vector<uint8_t> image_data) {
+    return ChromeRenderFrameObserver::IsAnimatedWebp(image_data);
+  }
 };
 
 TEST_F(ChromeRenderFrameObserverTest,
@@ -123,3 +127,45 @@
       /* image_extension */ ".webp",
       /* image_format */ chrome::mojom::ImageFormat::ORIGINAL));
 }
+
+TEST_F(ChromeRenderFrameObserverTest,
+       IsAnimatedWebp_HeaderTooSmall_ReturnsFalse) {
+  // First 10 bytes taken from a real animated webp image.
+  const std::vector<uint8_t> broken_image_data{82, 73, 70, 70, 228,
+                                               26, 0,  0,  87};
+  EXPECT_FALSE(IsAnimatedWebp(broken_image_data));
+}
+
+TEST_F(ChromeRenderFrameObserverTest, IsAnimatedWebp_StaticWebp_ReturnsFalse) {
+  // First 75 bytes taken from a real animated webp image.
+  const std::vector<uint8_t> static_webp_image_data{
+      82,  73,  70,  70,  88,  59,  1,   0,   87,  69,  66,  80,  86,
+      80,  56,  32,  76,  59,  1,   0,   208, 98,  5,   157, 1,   42,
+      0,   4,   64,  2,   62,  109, 50,  148, 71,  36,  35,  34,  38,
+      166, 86,  124, 72,  208, 13,  137, 103, 106, 155, 24,  53,  233,
+      164, 233, 87,  115, 20,  237, 92,  128, 131, 202, 189, 198, 245,
+      91,  174, 63,  84,  114, 136, 231, 31,  212, 255};
+  EXPECT_FALSE(IsAnimatedWebp(static_webp_image_data));
+}
+
+TEST_F(ChromeRenderFrameObserverTest, IsAnimatedWebp_Jpeg_ReturnsFalse) {
+  // First 75 bytes taken from a real jpeg image.
+  const std::vector<uint8_t> jpeg_image_data{
+      255, 216, 255, 224, 0,  16,  74,  70,  73,  70, 0,  1,  1,  1,   0,
+      72,  0,   72,  0,   0,  255, 226, 12,  88,  73, 67, 67, 95, 80,  82,
+      79,  70,  73,  76,  69, 0,   1,   1,   0,   0,  12, 72, 76, 105, 110,
+      111, 2,   16,  0,   0,  109, 110, 116, 114, 82, 71, 66, 32, 88,  89,
+      90,  32,  7,   206, 0,  2,   0,   9,   0,   6,  0,  49, 0,  0,   97};
+  EXPECT_FALSE(IsAnimatedWebp(jpeg_image_data));
+}
+
+TEST_F(ChromeRenderFrameObserverTest, IsAnimatedWebp_AnimatedWebp_ReturnsTrue) {
+  // First 75 bytes taken from a real animated webp image.
+  const std::vector<uint8_t> animated_webp_image_data{
+      82, 73, 70, 70, 228, 26, 0, 0, 87,  69,  66,  80,  86,  80,  56,
+      88, 10, 0,  0,  0,   18, 0, 0, 0,   219, 1,   0,   23,  1,   0,
+      65, 78, 73, 77, 6,   0,  0, 0, 255, 255, 255, 255, 0,   0,   65,
+      78, 77, 70, 20, 2,   0,  0, 0, 0,   0,   0,   0,   0,   219, 1,
+      0,  23, 1,  0,  60,  0,  0, 3, 86,  80,  56,  76,  251, 1,   0};
+  EXPECT_TRUE(IsAnimatedWebp(animated_webp_image_data));
+}

chrome/test/base/ui_test_utils.cc

diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc
index 14ed492..b33ed6d 100644
--- a/chrome/test/base/ui_test_utils.cc
+++ b/chrome/test/base/ui_test_utils.cc
@@ -50,7 +50,7 @@
 #include "components/javascript_dialogs/app_modal_dialog_controller.h"
 #include "components/javascript_dialogs/app_modal_dialog_queue.h"
 #include "components/omnibox/browser/autocomplete_controller.h"
-#include "components/omnibox/browser/omnibox_controller_emitter.h"
+#include "components/omnibox/browser/autocomplete_controller_emitter.h"
 #include "components/omnibox/browser/omnibox_edit_model.h"
 #include "components/omnibox/browser/omnibox_view.h"
 #include "components/prefs/pref_service.h"
@@ -174,7 +174,7 @@
  public:
   explicit AutocompleteChangeObserver(Profile* profile) {
     scoped_observation_.Observe(
-        OmniboxControllerEmitter::GetForBrowserContext(profile));
+        AutocompleteControllerEmitter::GetForBrowserContext(profile));
   }
 
   AutocompleteChangeObserver(const AutocompleteChangeObserver&) = delete;
@@ -193,7 +193,7 @@
 
  private:
   base::RunLoop run_loop_;
-  base::ScopedObservation<OmniboxControllerEmitter,
+  base::ScopedObservation<AutocompleteControllerEmitter,
                           AutocompleteController::Observer>
       scoped_observation_{this};
 };

chrome/test/data/browsing_topics/empty_page.html.mock-http-headers

diff --git a/chrome/test/data/browsing_topics/empty_page.html.mock-http-headers b/chrome/test/data/browsing_topics/empty_page.html.mock-http-headers
new file mode 100644
index 0000000..fe9a3f0
--- /dev/null
+++ b/chrome/test/data/browsing_topics/empty_page.html.mock-http-headers
@@ -0,0 +1,2 @@
+HTTP/1.1 200 OK
+Access-Control-Allow-Origin: *

chrome/test/data/browsing_topics/one_iframe_page_browsing_topics_allow_certain_origin.html.mock-http-headers

diff --git a/chrome/test/data/browsing_topics/one_iframe_page_browsing_topics_allow_certain_origin.html.mock-http-headers b/chrome/test/data/browsing_topics/one_iframe_page_browsing_topics_allow_certain_origin.html.mock-http-headers
index 584910a2..f4ebf5b0 100644
--- a/chrome/test/data/browsing_topics/one_iframe_page_browsing_topics_allow_certain_origin.html.mock-http-headers
+++ b/chrome/test/data/browsing_topics/one_iframe_page_browsing_topics_allow_certain_origin.html.mock-http-headers
@@ -1,2 +1,2 @@
 HTTP/1.1 200 OK
-Permissions-Policy: browsing-topics=(self "https://c.test:{{PORT}}")
+Permissions-Policy: browsing-topics=(self "{{ALLOWED_ORIGIN}}")

chrome/test/data/browsing_topics/page_with_custom_topics_header.html

diff --git a/chrome/test/data/browsing_topics/page_with_custom_topics_header.html b/chrome/test/data/browsing_topics/page_with_custom_topics_header.html
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/chrome/test/data/browsing_topics/page_with_custom_topics_header.html

chrome/test/data/browsing_topics/page_with_custom_topics_header.html.mock-http-headers

diff --git a/chrome/test/data/browsing_topics/page_with_custom_topics_header.html.mock-http-headers b/chrome/test/data/browsing_topics/page_with_custom_topics_header.html.mock-http-headers
new file mode 100644
index 0000000..90c64ce3
--- /dev/null
+++ b/chrome/test/data/browsing_topics/page_with_custom_topics_header.html.mock-http-headers
@@ -0,0 +1,4 @@
+HTTP/1.1 {{STATUS}}
+Access-Control-Allow-Origin: *
+{{OBSERVE_BROWSING_TOPICS_HEADER}}
+{{REDIRECT_HEADER}}

chrome/test/data/browsing_topics/page_with_custom_topics_header2.html

diff --git a/chrome/test/data/browsing_topics/page_with_custom_topics_header2.html b/chrome/test/data/browsing_topics/page_with_custom_topics_header2.html
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/chrome/test/data/browsing_topics/page_with_custom_topics_header2.html

chrome/test/data/browsing_topics/page_with_custom_topics_header2.html.mock-http-headers

diff --git a/chrome/test/data/browsing_topics/page_with_custom_topics_header2.html.mock-http-headers b/chrome/test/data/browsing_topics/page_with_custom_topics_header2.html.mock-http-headers
new file mode 100644
index 0000000..90c64ce3
--- /dev/null
+++ b/chrome/test/data/browsing_topics/page_with_custom_topics_header2.html.mock-http-headers
@@ -0,0 +1,4 @@
+HTTP/1.1 {{STATUS}}
+Access-Control-Allow-Origin: *
+{{OBSERVE_BROWSING_TOPICS_HEADER}}
+{{REDIRECT_HEADER}}

chrome/test/data/extensions/api_test/autotest_private/test.js

diff --git a/chrome/test/data/extensions/api_test/autotest_private/test.js b/chrome/test/data/extensions/api_test/autotest_private/test.js
index 6d699ae..b5bdc69 100644
--- a/chrome/test/data/extensions/api_test/autotest_private/test.js
+++ b/chrome/test/data/extensions/api_test/autotest_private/test.js
@@ -1128,6 +1128,12 @@
         });
   },
 
+  function stopFrameCountingWithoutStart() {
+    // Expects the stop call to fail when not paired with a start call.
+    chrome.autotestPrivate.stopFrameCounting(
+        chrome.test.callbackFail('No frame counting data'));
+  },
+
   // KEEP |lockScreen()| TESTS AT THE BOTTOM OF THE defaultTests AS IT WILL
   // CHANGE THE SESSION STATE TO LOCKED STATE.
   function lockScreen() {

chrome/test/data/extensions/api_test/input_method/typing/background.js

diff --git a/chrome/test/data/extensions/api_test/input_method/typing/background.js b/chrome/test/data/extensions/api_test/input_method/typing/background.js
index cb0dddc..454b70b 100644
--- a/chrome/test/data/extensions/api_test/input_method/typing/background.js
+++ b/chrome/test/data/extensions/api_test/input_method/typing/background.js
@@ -20,11 +20,6 @@
         (_, surroundingInfo) => {
           this.surroundingText = surroundingInfo.text;
         });
-
-    chrome.inputMethodPrivate.onCompositionBoundsChanged.addListener(
-        (_, boundsList) => {
-          this.compositionBounds = boundsList;
-        });
   }
 
   getContextID() {

chrome/test/data/policy/policy_test_cases.json

diff --git a/chrome/test/data/policy/policy_test_cases.json b/chrome/test/data/policy/policy_test_cases.json
index 23702ec..afc316d 100644
--- a/chrome/test/data/policy/policy_test_cases.json
+++ b/chrome/test/data/policy/policy_test_cases.json
@@ -15946,7 +15946,7 @@
     ]
   },
   "DeviceBorealisAllowed": {
-    "reason_for_missing_test": "Policy was removed"
+    "reason_for_missing_test": "Maps into CrosSettings"
   },
   "DeviceAllowedBluetoothServices": {
     "reason_for_missing_test": "Maps into CrosSettings"

chrome/test/data/webui/bookmarks/BUILD.gn

diff --git a/chrome/test/data/webui/bookmarks/BUILD.gn b/chrome/test/data/webui/bookmarks/BUILD.gn
index 1dfbe6a..7bfcf50 100644
--- a/chrome/test/data/webui/bookmarks/BUILD.gn
+++ b/chrome/test/data/webui/bookmarks/BUILD.gn
@@ -34,7 +34,7 @@
     "list_test.js",
     "policy_test.ts",
     "reducers_test.ts",
-    "router_test.js",
+    "router_test.ts",
     "store_test.js",
     "test_bookmarks_api_proxy.ts",
     "test_browser_proxy.ts",

chrome/test/data/webui/bookmarks/router_test.ts

diff --git a/chrome/test/data/webui/bookmarks/router_test.js b/chrome/test/data/webui/bookmarks/router_test.ts
similarity index 77%
rename from chrome/test/data/webui/bookmarks/router_test.js
rename to chrome/test/data/webui/bookmarks/router_test.ts
index 43b34941..83063d01f4 100644
--- a/chrome/test/data/webui/bookmarks/router_test.js
+++ b/chrome/test/data/webui/bookmarks/router_test.ts
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {BookmarksApiProxyImpl, getDisplayedList, Store} from 'chrome://bookmarks/bookmarks.js';
+import {BookmarksApiProxyImpl, getDisplayedList, SelectFolderAction, StartSearchAction, Store} from 'chrome://bookmarks/bookmarks.js';
+import {assertDeepEquals, assertEquals} from 'chrome://webui-test/chai_assert.js';
 import {flushTasks} from 'chrome://webui-test/polymer_test_util.js';
 
 import {TestBookmarksApiProxy} from './test_bookmarks_api_proxy.js';
@@ -10,10 +11,9 @@
 import {createFolder, createItem, getAllFoldersOpenState, replaceBody, testTree} from './test_util.js';
 
 suite('<bookmarks-router>', function() {
-  let store;
-  let router;
+  let store: TestStore;
 
-  function navigateTo(route) {
+  function navigateTo(route: string) {
     window.history.replaceState({}, '', route);
     window.dispatchEvent(new CustomEvent('location-changed'));
   }
@@ -30,21 +30,23 @@
     });
     store.replaceSingleton();
 
-    router = document.createElement('bookmarks-router');
+    const router = document.createElement('bookmarks-router');
     replaceBody(router);
     return flushTasks();
   });
 
   test('search updates from route', function() {
     navigateTo('/?q=bleep');
-    assertEquals('start-search', store.lastAction.name);
-    assertEquals('bleep', store.lastAction.term);
+    const action = store.lastAction as StartSearchAction;
+    assertEquals('start-search', action.name);
+    assertEquals('bleep', action.term);
   });
 
   test('selected folder updates from route', function() {
     navigateTo('/?id=2');
-    assertEquals('select-folder', store.lastAction.name);
-    assertEquals('2', store.lastAction.id);
+    const action = store.lastAction as SelectFolderAction;
+    assertEquals('select-folder', action.name);
+    assertEquals('2', action.id);
   });
 
   test('route updates from ID', async function() {
@@ -61,14 +63,14 @@
   });
 
   test('route updates from search', async function() {
-    store.data.search = {term: 'bloop'};
+    store.data.search.term = 'bloop';
     store.notifyObservers();
     await flushTasks();
 
     assertEquals('chrome://bookmarks/?q=bloop', window.location.href);
 
     // Ensure that the route doesn't change when the search finishes.
-    store.data.selectedFolder = null;
+    store.data.selectedFolder = '';
     store.notifyObservers();
     await flushTasks();
     assertEquals('chrome://bookmarks/?q=bloop', window.location.href);
@@ -77,13 +79,14 @@
   test('bookmarks bar selected with empty route', function() {
     navigateTo('/?id=2');
     navigateTo('/');
-    assertEquals('select-folder', store.lastAction.name);
-    assertEquals('1', store.lastAction.id);
+    const action = store.lastAction as SelectFolderAction;
+    assertEquals('select-folder', action.name);
+    assertEquals('1', action.id);
   });
 });
 
 suite('URL preload', function() {
-  let testBookmarksApiProxy;
+  let testBookmarksApiProxy: TestBookmarksApiProxy;
 
   setup(function() {
     testBookmarksApiProxy = new TestBookmarksApiProxy();
@@ -94,9 +97,9 @@
    * Reset the page state with a <bookmarks-app> and a clean Store, with the
    * given |url| to trigger routing initialization code.
    */
-  function setupWithUrl(url) {
-    document.body.innerHTML = window.trustedTypes.emptyHTML;
-    Store.setInstance(undefined);
+  function setupWithUrl(url: string) {
+    document.body.innerHTML = window.trustedTypes!.emptyHTML;
+    Store.setInstance(new Store());
     window.history.replaceState({}, '', url);
 
     testBookmarksApiProxy.setGetTree([
@@ -122,7 +125,7 @@
   }
 
   test('loading a search URL performs a search', async function() {
-    testBookmarksApiProxy.setSearchResponse(['11']);
+    testBookmarksApiProxy.setSearchResponse([createItem('11')]);
     await setupWithUrl('/?q=testQuery');
     const lastQuery = await testBookmarksApiProxy.whenCalled('search');
     assertEquals('testQuery', lastQuery);

chrome/test/data/webui/settings/chromeos/app_management/app_details_item_test.js

diff --git a/chrome/test/data/webui/settings/chromeos/app_management/app_details_item_test.js b/chrome/test/data/webui/settings/chromeos/app_management/app_details_item_test.js
index b1e28f3..f69e22e 100644
--- a/chrome/test/data/webui/settings/chromeos/app_management/app_details_item_test.js
+++ b/chrome/test/data/webui/settings/chromeos/app_management/app_details_item_test.js
@@ -22,7 +22,7 @@
     flushTasks();
   });
 
-  test('PWA type', async function() {
+  test('PWA type from unknown source', async function() {
     const options = {
       type: AppType.kWeb,
       installSource: InstallSource.kUnknown,
@@ -50,6 +50,43 @@
         'Web App');
   });
 
+  test('PWA type from browser', async function() {
+    const options = {
+      type: AppType.kWeb,
+      installSource: InstallSource.kBrowser,
+      publisherId: 'https://google.com/',
+    };
+
+    // Add PWA app, and make it the currently selected app.
+    const app = await fakeHandler.addApp('app', options);
+
+    AppManagementStore.getInstance().dispatch(updateSelectedAppId(app.id));
+
+    await fakeHandler.flushPipesForTesting();
+
+    assertTrue(!!AppManagementStore.getInstance().data.apps[app.id]);
+
+    appDetailsItem.app = app;
+
+    replaceBody(appDetailsItem);
+    fakeHandler.flushPipesForTesting();
+    flushTasks();
+
+    assertTrue(!!appDetailsItem.shadowRoot.querySelector('#typeAndSourceText'));
+    assertEquals(
+        appDetailsItem.shadowRoot.querySelector('#typeAndSourceText')
+            .textContent.trim(),
+        'Web App installed from Chrome browser');
+
+    assertTrue(!!appDetailsItem.shadowRoot.querySelector('#infoIconTooltip')
+                     .querySelector('#tooltipText'));
+    assertEquals(
+        appDetailsItem.shadowRoot.querySelector('#infoIconTooltip')
+            .querySelector('#tooltipText')
+            .textContent.trim(),
+        options.publisherId);
+  });
+
   test('Android type', async function() {
     const options = {
       type: AppType.kArc,

chrome/test/data/webui/settings/chromeos/test_internet_page_browser_proxy.js

diff --git a/chrome/test/data/webui/settings/chromeos/test_internet_page_browser_proxy.js b/chrome/test/data/webui/settings/chromeos/test_internet_page_browser_proxy.js
index 780af4e..9a729a5 100644
--- a/chrome/test/data/webui/settings/chromeos/test_internet_page_browser_proxy.js
+++ b/chrome/test/data/webui/settings/chromeos/test_internet_page_browser_proxy.js
@@ -12,7 +12,7 @@
     super([
       'showCarrierAccountDetail',
       'showPortalSignin',
-      'showCellularSetupUI',
+      'showCellularSetupUi',
       'configureThirdPartyVpn',
       'addThirdPartyVpn',
       'requestGmsCoreNotificationsDisabledDeviceNames',
@@ -31,8 +31,8 @@
   }
 
   /** @override */
-  showCellularSetupUI(guid) {
-    this.methodCalled('showCellularSetupUI');
+  showCellularSetupUi(guid) {
+    this.methodCalled('showCellularSetupUi');
   }
 
   /** @override */

chrome/test/data/webui/side_panel/customize_chrome/BUILD.gn

diff --git a/chrome/test/data/webui/side_panel/customize_chrome/BUILD.gn b/chrome/test/data/webui/side_panel/customize_chrome/BUILD.gn
index 07e22dc6..ed537189 100644
--- a/chrome/test/data/webui/side_panel/customize_chrome/BUILD.gn
+++ b/chrome/test/data/webui/side_panel/customize_chrome/BUILD.gn
@@ -18,6 +18,7 @@
                     target_gen_dir),
   ]
   in_files = [
+    "button_label_test.ts",
     "cards_test.ts",
     "shortcuts_test.ts",
     "test_support.ts",

chrome/test/data/webui/side_panel/customize_chrome/button_label_test.ts

diff --git a/chrome/test/data/webui/side_panel/customize_chrome/button_label_test.ts b/chrome/test/data/webui/side_panel/customize_chrome/button_label_test.ts
new file mode 100644
index 0000000..0116970
--- /dev/null
+++ b/chrome/test/data/webui/side_panel/customize_chrome/button_label_test.ts
@@ -0,0 +1,49 @@
+// Copyright 2022 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'chrome://webui-test/mojo_webui_test_support.js';
+import 'chrome://customize-chrome-side-panel.top-chrome/button_label.js';
+
+import {ButtonLabelElement} from 'chrome://customize-chrome-side-panel.top-chrome/button_label.js';
+import {assertEquals} from 'chrome://webui-test/chai_assert.js';
+
+import {assertNotStyle, assertStyle} from './test_support.js';
+
+
+suite('ButtonLabelTest', () => {
+  let buttonLabelElement: ButtonLabelElement;
+
+  setup(async () => {
+    document.body.innerHTML = window.trustedTypes!.emptyHTML;
+    buttonLabelElement =
+        document.createElement('customize-chrome-button-label');
+    document.body.appendChild(buttonLabelElement);
+  });
+
+  test(
+      'setting `label` gives the button label element text content',
+      async () => {
+        // Act.
+        buttonLabelElement.label = 'foo';
+
+        // Assert.
+        assertEquals('foo', buttonLabelElement.$.label.textContent);
+        assertStyle(buttonLabelElement.$.labelDescription, 'display', 'none');
+      });
+
+  test(
+      'setting `labelDescription` makes the label description show',
+      async () => {
+        // Act.
+        buttonLabelElement.label = 'foo';
+        buttonLabelElement.labelDescription = 'bar';
+
+        // Assert.
+        assertNotStyle(
+            buttonLabelElement.$.labelDescription, 'display', 'none');
+        assertEquals('foo', buttonLabelElement.$.label.textContent);
+        assertEquals(
+            'bar', buttonLabelElement.$.labelDescription.textContent!.trim());
+      });
+});

chrome/test/data/webui/side_panel/customize_chrome/side_panel_customize_chrome_browsertest.js

diff --git a/chrome/test/data/webui/side_panel/customize_chrome/side_panel_customize_chrome_browsertest.js b/chrome/test/data/webui/side_panel/customize_chrome/side_panel_customize_chrome_browsertest.js
index 01aaaa2..1b8caab 100644
--- a/chrome/test/data/webui/side_panel/customize_chrome/side_panel_customize_chrome_browsertest.js
+++ b/chrome/test/data/webui/side_panel/customize_chrome/side_panel_customize_chrome_browsertest.js
@@ -26,6 +26,15 @@
   };
 }
 
+var SidePanelCustomizeChromeButtonLabelTest =
+    class extends SidePanelCustomizeChromeBrowserTest {
+  /** @override */
+  get browsePreload() {
+    return 'chrome://customize-chrome-side-panel.top-chrome/test_loader.html' +
+        '?module=side_panel_customize_chrome/button_label_test.js';
+  }
+};
+
 var SidePanelCustomizeChromeCardsTest =
     class extends SidePanelCustomizeChromeBrowserTest {
   /** @override */
@@ -116,6 +125,10 @@
   }
 };
 
+TEST_F('SidePanelCustomizeChromeButtonLabelTest', 'All', function() {
+  mocha.run();
+});
+
 TEST_F('SidePanelCustomizeChromeCardsTest', 'All', function() {
   mocha.run();
 });

chrome/updater/test/integration_tests.cc

diff --git a/chrome/updater/test/integration_tests.cc b/chrome/updater/test/integration_tests.cc
index e85c30c..c50565b 100644
--- a/chrome/updater/test/integration_tests.cc
+++ b/chrome/updater/test/integration_tests.cc
@@ -950,7 +950,7 @@
 }
 
 TEST_F(IntegrationTest, MigrateLegacyUpdater) {
-  SetupFakeLegacyUpdaterData();
+  ASSERT_NO_FATAL_FAILURE(SetupFakeLegacyUpdaterData());
   ASSERT_NO_FATAL_FAILURE(Install());
   ASSERT_NO_FATAL_FAILURE(ExpectInstalled());
   ASSERT_NO_FATAL_FAILURE(ExpectLegacyUpdaterDataMigrated());

chromeos/ash/components/audio/cros_audio_config.cc

diff --git a/chromeos/ash/components/audio/cros_audio_config.cc b/chromeos/ash/components/audio/cros_audio_config.cc
index e4c57f8..81c1d587 100644
--- a/chromeos/ash/components/audio/cros_audio_config.cc
+++ b/chromeos/ash/components/audio/cros_audio_config.cc
@@ -24,6 +24,7 @@
   auto properties = mojom::AudioSystemProperties::New();
   properties->output_volume_percent = GetOutputVolumePercent();
   properties->output_mute_state = GetOutputMuteState();
+  properties->input_mute_state = GetInputMuteState();
   GetAudioDevices(&properties->output_devices, &properties->input_devices);
   return properties;
 }

chromeos/ash/components/audio/cros_audio_config.h

diff --git a/chromeos/ash/components/audio/cros_audio_config.h b/chromeos/ash/components/audio/cros_audio_config.h
index a45fbf30..46c757f 100644
--- a/chromeos/ash/components/audio/cros_audio_config.h
+++ b/chromeos/ash/components/audio/cros_audio_config.h
@@ -36,6 +36,7 @@
   virtual void GetAudioDevices(
       std::vector<mojom::AudioDevicePtr>* output_devices_out,
       std::vector<mojom::AudioDevicePtr>* input_devices_out) const = 0;
+  virtual mojom::MuteState GetInputMuteState() const = 0;
 
  private:
   // mojom::CrosAudioConfig:

chromeos/ash/components/audio/cros_audio_config_impl.cc

diff --git a/chromeos/ash/components/audio/cros_audio_config_impl.cc b/chromeos/ash/components/audio/cros_audio_config_impl.cc
index 8668d8c..5ca5457e 100644
--- a/chromeos/ash/components/audio/cros_audio_config_impl.cc
+++ b/chromeos/ash/components/audio/cros_audio_config_impl.cc
@@ -101,6 +101,20 @@
   }
 }
 
+mojom::MuteState CrosAudioConfigImpl::GetInputMuteState() const {
+  CrasAudioHandler* audio_handler = CrasAudioHandler::Get();
+  if (audio_handler->input_muted_by_microphone_mute_switch() &&
+      audio_handler->IsInputMuted()) {
+    return mojom::MuteState::kMutedExternally;
+  }
+
+  if (audio_handler->IsInputMuted()) {
+    return mojom::MuteState::kMutedByUser;
+  }
+
+  return mojom::MuteState::kNotMuted;
+}
+
 void CrosAudioConfigImpl::SetOutputVolumePercent(int8_t volume) {
   CrasAudioHandler* audio_handler = CrasAudioHandler::Get();
   audio_handler->SetOutputVolumePercent(volume);
@@ -149,4 +163,15 @@
   NotifyObserversAudioSystemPropertiesChanged();
 }
 
+void CrosAudioConfigImpl::OnInputMuteChanged(
+    bool mute_on,
+    CrasAudioHandler::InputMuteChangeMethod method) {
+  NotifyObserversAudioSystemPropertiesChanged();
+}
+
+void CrosAudioConfigImpl::OnInputMutedByMicrophoneMuteSwitchChanged(
+    bool muted) {
+  NotifyObserversAudioSystemPropertiesChanged();
+}
+
 }  // namespace ash::audio_config

chromeos/ash/components/audio/cros_audio_config_impl.h

diff --git a/chromeos/ash/components/audio/cros_audio_config_impl.h b/chromeos/ash/components/audio/cros_audio_config_impl.h
index 3bda804..c3763e2 100644
--- a/chromeos/ash/components/audio/cros_audio_config_impl.h
+++ b/chromeos/ash/components/audio/cros_audio_config_impl.h
@@ -25,6 +25,7 @@
   void GetAudioDevices(
       std::vector<mojom::AudioDevicePtr>* output_devices_out,
       std::vector<mojom::AudioDevicePtr>* input_devices_out) const override;
+  mojom::MuteState GetInputMuteState() const override;
   void SetOutputVolumePercent(int8_t volume) override;
   void SetActiveDevice(uint64_t device_id) override;
 
@@ -34,6 +35,10 @@
   void OnAudioNodesChanged() override;
   void OnActiveOutputNodeChanged() override;
   void OnActiveInputNodeChanged() override;
+  void OnInputMuteChanged(
+      bool mute_on,
+      CrasAudioHandler::InputMuteChangeMethod method) override;
+  void OnInputMutedByMicrophoneMuteSwitchChanged(bool muted) override;
 };
 
 }  // namespace ash::audio_config

chromeos/ash/components/audio/cros_audio_config_impl_unittest.cc

diff --git a/chromeos/ash/components/audio/cros_audio_config_impl_unittest.cc b/chromeos/ash/components/audio/cros_audio_config_impl_unittest.cc
index 4a3d5f69..a68c2479 100644
--- a/chromeos/ash/components/audio/cros_audio_config_impl_unittest.cc
+++ b/chromeos/ash/components/audio/cros_audio_config_impl_unittest.cc
@@ -95,6 +95,8 @@
     audio_pref_handler_ = base::MakeRefCounted<AudioDevicesPrefHandlerStub>();
     cras_audio_handler_->SetPrefHandlerForTesting(audio_pref_handler_);
     cros_audio_config_ = std::make_unique<CrosAudioConfigImpl>();
+    ui::MicrophoneMuteSwitchMonitor::Get()->SetMicrophoneMuteSwitchValue(
+        /*switch_on=*/false);
   }
 
   void TearDown() override {
@@ -138,6 +140,32 @@
         // Calling this method does not alert AudioSystemPropertiesObserver.
         audio_pref_handler_->SetAudioOutputAllowedValue(false);
         break;
+      case mojom::MuteState::kMutedExternally:
+        NOTREACHED() << "Output audio does not support kMutedExternally.";
+        break;
+    }
+    base::RunLoop().RunUntilIdle();
+  }
+
+  void SetInputMuteState(mojom::MuteState mute_state, bool switch_on = false) {
+    switch (mute_state) {
+      case mojom::MuteState::kMutedByUser:
+        cras_audio_handler_->SetMuteForDevice(
+            cras_audio_handler_->GetPrimaryActiveInputNode(),
+            /*mute_on=*/true);
+        break;
+      case mojom::MuteState::kNotMuted:
+        cras_audio_handler_->SetMuteForDevice(
+            cras_audio_handler_->GetPrimaryActiveInputNode(),
+            /*mute_on=*/false);
+        break;
+      case mojom::MuteState::kMutedByPolicy:
+        NOTREACHED() << "Input audio does not support kMutedByPolicy.";
+        break;
+      case mojom::MuteState::kMutedExternally:
+        ui::MicrophoneMuteSwitchMonitor::Get()->SetMicrophoneMuteSwitchValue(
+            switch_on);
+        break;
     }
     base::RunLoop().RunUntilIdle();
   }
@@ -518,4 +546,34 @@
                   ->is_active);
 }
 
+TEST_F(CrosAudioConfigImplTest, HandleInputMuteState) {
+  std::unique_ptr<FakeAudioSystemPropertiesObserver> fake_observer = Observe();
+  SetAudioNodes({kInternalSpeaker, kMicJack});
+  ASSERT_EQ(
+      mojom::MuteState::kNotMuted,
+      fake_observer->last_audio_system_properties_.value()->input_mute_state);
+
+  SetInputMuteState(mojom::MuteState::kMutedByUser);
+  ASSERT_EQ(
+      mojom::MuteState::kMutedByUser,
+      fake_observer->last_audio_system_properties_.value()->input_mute_state);
+
+  SetInputMuteState(mojom::MuteState::kNotMuted);
+  ASSERT_EQ(
+      mojom::MuteState::kNotMuted,
+      fake_observer->last_audio_system_properties_.value()->input_mute_state);
+
+  // Simulate turning physical switch on.
+  SetInputMuteState(mojom::MuteState::kMutedExternally, true);
+  ASSERT_EQ(
+      mojom::MuteState::kMutedExternally,
+      fake_observer->last_audio_system_properties_.value()->input_mute_state);
+
+  // Simulate turning physical switch off.
+  SetInputMuteState(mojom::MuteState::kMutedExternally, false);
+  ASSERT_EQ(
+      mojom::MuteState::kNotMuted,
+      fake_observer->last_audio_system_properties_.value()->input_mute_state);
+}
+
 }  // namespace ash::audio_config

chromeos/ash/components/audio/public/mojom/cros_audio_config.mojom

diff --git a/chromeos/ash/components/audio/public/mojom/cros_audio_config.mojom b/chromeos/ash/components/audio/public/mojom/cros_audio_config.mojom
index 776621d5..7b3c303 100644
--- a/chromeos/ash/components/audio/public/mojom/cros_audio_config.mojom
+++ b/chromeos/ash/components/audio/public/mojom/cros_audio_config.mojom
@@ -34,7 +34,10 @@
   kMutedByUser,
 
   // The device is muted by the device policy.
-  kMutedByPolicy
+  kMutedByPolicy,
+
+  // The device is muted by physical switch.
+  kMutedExternally
 };
 
 // Represents a user's audio device.
@@ -71,6 +74,9 @@
   // List of input devices. UI surfaces should display devices in the order
   // indicated by this array.
   array<AudioDevice> input_devices;
+
+  // The mute state of the active input device.
+  MuteState input_mute_state;
 };
 
 // Observer for changes to audio system properties.

chromeos/ash/components/drivefs/drivefs_host.cc

diff --git a/chromeos/ash/components/drivefs/drivefs_host.cc b/chromeos/ash/components/drivefs/drivefs_host.cc
index 962f9be..524c9be 100644
--- a/chromeos/ash/components/drivefs/drivefs_host.cc
+++ b/chromeos/ash/components/drivefs/drivefs_host.cc
@@ -256,6 +256,11 @@
       std::move(callback).Run(mojom::DialogResult::kNotDisplayed);
       return;
     }
+    if (error->type == mojom::DialogReason::Type::kEnableDocsOffline &&
+        host_->ShouldAlwaysEnableDocsOffline()) {
+      std::move(callback).Run(mojom::DialogResult::kAccept);
+      return;
+    }
     host_->dialog_handler_.Run(
         *error, mojo::WrapCallbackWithDefaultInvokeIfNotRun(
                     std::move(callback), mojom::DialogResult::kNotDisplayed));

chromeos/ash/components/drivefs/drivefs_host.h

diff --git a/chromeos/ash/components/drivefs/drivefs_host.h b/chromeos/ash/components/drivefs/drivefs_host.h
index 2a77c2e2..1a1aa97 100644
--- a/chromeos/ash/components/drivefs/drivefs_host.h
+++ b/chromeos/ash/components/drivefs/drivefs_host.h
@@ -122,6 +122,12 @@
     dialog_handler_ = dialog_handler;
   }
 
+  void SetAlwaysEnableDocsOffline(bool enabled) {
+    always_enable_docs_offline_ = enabled;
+  }
+
+  bool ShouldAlwaysEnableDocsOffline() { return always_enable_docs_offline_; }
+
  private:
   class AccountTokenDelegate;
   class MountState;
@@ -142,6 +148,11 @@
 
   std::unique_ptr<DriveFsAuth> account_token_delegate_;
 
+  // When user intent to enable docs offline has been captured in some other
+  // form (e.g. from enabling bulk pinning) don't show the enable docs offline
+  // notification.
+  bool always_enable_docs_offline_ = false;
+
   // State specific to the current mount, or null if not mounted.
   std::unique_ptr<MountState> mount_state_;
 

chromeos/ash/components/drivefs/drivefs_host_unittest.cc

diff --git a/chromeos/ash/components/drivefs/drivefs_host_unittest.cc b/chromeos/ash/components/drivefs/drivefs_host_unittest.cc
index c131688..a461be7 100644
--- a/chromeos/ash/components/drivefs/drivefs_host_unittest.cc
+++ b/chromeos/ash/components/drivefs/drivefs_host_unittest.cc
@@ -22,6 +22,7 @@
 #include "base/test/bind.h"
 #include "base/test/gmock_callback_support.h"
 #include "base/test/gmock_move_support.h"
+#include "base/test/mock_callback.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/test/simple_test_clock.h"
 #include "base/test/task_environment.h"
@@ -659,6 +660,31 @@
   EXPECT_TRUE(called);
 }
 
+TEST_F(DriveFsHostTest, DisplayConfirmDialog_AlwaysEnableIfTrue) {
+  ASSERT_NO_FATAL_FAILURE(DoMount());
+  auto reason = mojom::DialogReason::New(
+      mojom::DialogReason::Type::kEnableDocsOffline, base::FilePath());
+
+  // Set the dialog handler to always dismiss the dialog, this should get
+  // ignored if the "always enable" option is toggled.
+  host_->set_dialog_handler(base::BindLambdaForTesting(
+      [](const mojom::DialogReason& reason,
+         base::OnceCallback<void(mojom::DialogResult)> callback) {
+        std::move(callback).Run(mojom::DialogResult::kDismiss);
+      }));
+
+  host_->SetAlwaysEnableDocsOffline(true);
+  base::RunLoop run_loop;
+  base::MockCallback<DriveFsSession::DisplayConfirmDialogCallback>
+      mock_callback;
+  EXPECT_CALL(mock_callback, Run(mojom::DialogResult::kAccept))
+      .Times(1)
+      .WillOnce(RunOnceClosure(run_loop.QuitClosure()));
+
+  delegate_->DisplayConfirmDialog(std::move(reason), mock_callback.Get());
+  delegate_.FlushForTesting();
+}
+
 TEST_F(DriveFsHostTest, TeamDriveTracking) {
   ASSERT_NO_FATAL_FAILURE(DoMount());
 

chromeos/ash/components/drivefs/drivefs_pin_manager.cc

diff --git a/chromeos/ash/components/drivefs/drivefs_pin_manager.cc b/chromeos/ash/components/drivefs/drivefs_pin_manager.cc
index 496483d..c367f61 100644
--- a/chromeos/ash/components/drivefs/drivefs_pin_manager.cc
+++ b/chromeos/ash/components/drivefs/drivefs_pin_manager.cc
@@ -170,6 +170,8 @@
     const std::string& path,
     const int64_t total_bytes) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  DCHECK_GE(total_bytes, 0) << " for '" << path << "'";
+
   const auto it = in_progress_items_.find(path);
   if (it == in_progress_items_.end()) {
     // TODO(b/261530520): Items can end up in this flow when a removal is
@@ -177,10 +179,17 @@
     // In this case, gracefully degrade by responding with the total bytes
     // transferred. This should ideally fail as all syncing operations should be
     // identified as they affect disk space.
+    LOG(ERROR) << "Cannot remove '" << path << "'";
     return total_bytes_transferred_;
   }
 
-  total_bytes_transferred_ += total_bytes - it->second.transferred;
+  DCHECK_EQ(it->first, path);
+  const Progress& progress = it->second;
+  LOG_IF(ERROR, progress.transferred > total_bytes)
+      << "Progress went backwards from "
+      << HumanReadableSize(progress.transferred) << " to "
+      << HumanReadableSize(total_bytes) << " for '" << path << "'";
+  total_bytes_transferred_ += total_bytes - progress.transferred;
   in_progress_items_.erase(it);
   return total_bytes_transferred_;
 }
@@ -190,6 +199,15 @@
     int64_t bytes_transferred,
     int64_t bytes_to_transfer) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  DCHECK_GE(bytes_to_transfer, 0) << " for '" << path << "'";
+
+  if (bytes_transferred < 0) {
+    LOG(ERROR) << "Negative bytes_transferred = "
+               << HumanReadableSize(bytes_transferred) << " for '" << path
+               << "'";
+    return total_bytes_transferred_;
+  }
+
   const auto it = in_progress_items_.find(path);
   if (it == in_progress_items_.end()) {
     // TODO(b/261530520): Items can end up in this flow when an update is
@@ -197,11 +215,19 @@
     // In this case, gracefully degrade by responding with the total bytes
     // transferred. This should ideally fail as all syncing operations should be
     // identified as they affect disk space.
+    LOG(ERROR) << "Cannot update '" << path << "' with bytes_transferred = "
+               << HumanReadableSize(bytes_transferred)
+               << " and bytes_to_transfer = "
+               << HumanReadableSize(bytes_to_transfer);
     return total_bytes_transferred_;
   }
 
   DCHECK_EQ(it->first, path);
   Progress& progress = it->second;
+  LOG_IF(ERROR, progress.transferred > bytes_transferred)
+      << "Progress went backwards from "
+      << HumanReadableSize(progress.transferred) << " to "
+      << HumanReadableSize(bytes_transferred) << " for '" << path << "'";
   total_bytes_transferred_ += bytes_transferred - progress.transferred;
   progress.transferred = bytes_transferred;
   progress.total = bytes_to_transfer;
@@ -324,11 +350,18 @@
     DCHECK(item);
     DCHECK(item->metadata);
 
+    VLOG(2) << "path: '" << item->path
+            << "', size: " << HumanReadableSize(item->metadata->size)
+            << ", pinned: " << item->metadata->pinned
+            << ", available_offline: " << item->metadata->available_offline;
     if (item->metadata->pinned) {
       VLOG(2) << "Skipped '" << item->path << "': Already pinned";
       continue;
     }
 
+    DCHECK_GE(item->metadata->size, 0)
+        << "Negative size " << HumanReadableSize(item->metadata->size)
+        << "for '" << item->path << "'";
     state_.progress.required_disk_space += item->metadata->size;
   }
 
@@ -429,6 +462,7 @@
       continue;
     }
 
+    VLOG(2) << "Pinning '" << path << "'...";
     drivefs_interface_->SetPinned(
         path, /*pinned=*/true,
         base::BindOnce(&DriveFsPinManager::OnFilePinned,
@@ -459,6 +493,7 @@
     return;
   }
 
+  VLOG(2) << "Pinned '" << path << "'";
   syncing_items_.AsyncCall(&InProgressSyncingItems::AddItem).WithArgs(path);
 }
 
@@ -500,6 +535,10 @@
 
 void DriveFsPinManager::ReportTotalBytesTransferred(
     int64_t total_bytes_transferred) {
+  LOG_IF(ERROR, state_.progress.pinned_disk_space > total_bytes_transferred)
+      << "Pinned space went backwards from "
+      << HumanReadableSize(state_.progress.pinned_disk_space) << " to "
+      << HumanReadableSize(total_bytes_transferred);
   state_.progress.pinned_disk_space = total_bytes_transferred;
   NotifyProgress();
 }
@@ -526,10 +565,15 @@
 }
 
 void DriveFsPinManager::NotifyProgress() {
-  VLOG_IF(2, !observers_.empty()) << "Notifying progress to list of observers";
-  for (auto& observer : observers_) {
+  if (observers_.empty()) {
+    return;
+  }
+
+  VLOG(2) << "Notifying observers...";
+  for (DriveFsBulkPinObserver& observer : observers_) {
     observer.OnSetupProgress(state_.progress);
   }
+  VLOG(2) << "Notified observers";
 }
 
 void DriveFsPinManager::AddObserver(DriveFsBulkPinObserver* observer) {
@@ -584,9 +628,14 @@
   }
 
   DCHECK(metadata);
+  VLOG(2) << "Got metadata of path: '" << path
+          << "', size: " << HumanReadableSize(metadata->size)
+          << ", pinned: " << metadata->pinned
+          << ", available_offline: " << metadata->available_offline;
+
   if (metadata->available_offline || metadata->size == 0) {
     VLOG_IF(2, metadata->available_offline)
-        << "Skipped '" << path << "': Already pinned";
+        << "Skipped '" << path << "': Already available offline";
     VLOG_IF(2, metadata->size == 0) << "Skipped '" << path << "': Empty file";
     syncing_items_.AsyncCall(&InProgressSyncingItems::RemoveItem)
         .WithArgs(std::move(path), metadata->size)

chromeos/ash/components/network/network_configuration_handler_unittest.cc

diff --git a/chromeos/ash/components/network/network_configuration_handler_unittest.cc b/chromeos/ash/components/network/network_configuration_handler_unittest.cc
index 29f9b658..539fe53 100644
--- a/chromeos/ash/components/network/network_configuration_handler_unittest.cc
+++ b/chromeos/ash/components/network/network_configuration_handler_unittest.cc
@@ -225,18 +225,17 @@
 
   void CreateTestConfiguration(const std::string& service_path,
                                const std::string& type) {
-    base::Value properties(base::Value::Type::DICTIONARY);
+    base::Value::Dict properties;
     shill_property_util::SetSSID(service_path, &properties);
-    properties.SetKey(shill::kNameProperty, base::Value(service_path));
-    properties.SetKey(shill::kGuidProperty, base::Value(service_path));
-    properties.SetKey(shill::kTypeProperty, base::Value(type));
-    properties.SetKey(shill::kStateProperty, base::Value(shill::kStateIdle));
-    properties.SetKey(
-        shill::kProfileProperty,
-        base::Value(NetworkProfileHandler::GetSharedProfilePath()));
+    properties.Set(shill::kNameProperty, service_path);
+    properties.Set(shill::kGuidProperty, service_path);
+    properties.Set(shill::kTypeProperty, type);
+    properties.Set(shill::kStateProperty, shill::kStateIdle);
+    properties.Set(shill::kProfileProperty,
+                   NetworkProfileHandler::GetSharedProfilePath());
 
     network_configuration_handler_->CreateShillConfiguration(
-        properties,
+        base::Value(std::move(properties)),
         base::BindOnce(
             &NetworkConfigurationHandlerTest::CreateConfigurationCallback,
             base::Unretained(this)),
@@ -475,17 +474,18 @@
   constexpr char kGuid[] = "/service/2";
   constexpr char kNetworkName[] = "MyNetwork";
 
-  base::Value value(base::Value::Type::DICTIONARY);
+  base::Value::Dict value;
   shill_property_util::SetSSID(kNetworkName, &value);
-  value.SetStringKey(shill::kTypeProperty, "wifi");
-  value.SetStringKey(shill::kProfileProperty, "profile path");
-  value.SetStringKey(shill::kGuidProperty, kGuid);
+  value.Set(shill::kTypeProperty, "wifi");
+  value.Set(shill::kProfileProperty, "profile path");
+  value.Set(shill::kGuidProperty, kGuid);
 
   bool success = false;
   std::string service_path;
   std::string guid;
   network_configuration_handler_->CreateShillConfiguration(
-      value, base::BindOnce(&CopyServiceResult, &success, &service_path, &guid),
+      base::Value(std::move(value)),
+      base::BindOnce(&CopyServiceResult, &success, &service_path, &guid),
       base::BindOnce(&ErrorCallback));
   base::RunLoop().RunUntilIdle();
 

chromeos/ash/components/network/network_connect.cc

diff --git a/chromeos/ash/components/network/network_connect.cc b/chromeos/ash/components/network/network_connect.cc
index 74368674..6727aeb3 100644
--- a/chromeos/ash/components/network/network_connect.cc
+++ b/chromeos/ash/components/network/network_connect.cc
@@ -69,9 +69,10 @@
   void ConfigureNetworkIdAndConnect(const std::string& network_id,
                                     const base::Value& shill_properties,
                                     bool shared) override;
-  void CreateConfigurationAndConnect(base::Value* shill_properties,
+  void CreateConfigurationAndConnect(base::Value::Dict shill_properties,
                                      bool shared) override;
-  void CreateConfiguration(base::Value* shill_properties, bool shared) override;
+  void CreateConfiguration(base::Value::Dict shill_properties,
+                           bool shared) override;
 
  private:
   void ActivateCellular(const std::string& network_id);
@@ -86,7 +87,7 @@
   void OnConfigureSucceeded(bool connect_on_configure,
                             const std::string& service_path,
                             const std::string& network_id);
-  void CallCreateConfiguration(base::Value* properties,
+  void CallCreateConfiguration(base::Value::Dict properties,
                                bool shared,
                                bool connect_on_configure);
   void SetPropertiesFailed(const std::string& desc,
@@ -263,20 +264,21 @@
   CallConnectToNetwork(network_id, check_error_state);
 }
 
-void NetworkConnectImpl::CallCreateConfiguration(base::Value* shill_properties,
-                                                 bool shared,
-                                                 bool connect_on_configure) {
+void NetworkConnectImpl::CallCreateConfiguration(
+    base::Value::Dict shill_properties,
+    bool shared,
+    bool connect_on_configure) {
   std::string profile_path;
   if (!GetNetworkProfilePath(shared, &profile_path)) {
     delegate_->ShowNetworkConnectError(
         NetworkConnectionHandler::kErrorConfigureFailed, "");
     return;
   }
-  shill_properties->SetKey(shill::kProfileProperty, base::Value(profile_path));
+  shill_properties.Set(shill::kProfileProperty, profile_path);
   NetworkHandler::Get()
       ->network_configuration_handler()
       ->CreateShillConfiguration(
-          *shill_properties,
+          base::Value(std::move(shill_properties)),
           base::BindOnce(&NetworkConnectImpl::OnConfigureSucceeded,
                          weak_factory_.GetWeakPtr(), connect_on_configure),
           base::BindOnce(&NetworkConnectImpl::OnConfigureFailed,
@@ -523,16 +525,19 @@
                      network_id));
 }
 
-void NetworkConnectImpl::CreateConfigurationAndConnect(base::Value* properties,
-                                                       bool shared) {
+void NetworkConnectImpl::CreateConfigurationAndConnect(
+    base::Value::Dict properties,
+    bool shared) {
   NET_LOG(USER) << "CreateConfigurationAndConnect";
-  CallCreateConfiguration(properties, shared, true /* connect_on_configure */);
+  CallCreateConfiguration(std::move(properties), shared,
+                          true /* connect_on_configure */);
 }
 
-void NetworkConnectImpl::CreateConfiguration(base::Value* properties,
+void NetworkConnectImpl::CreateConfiguration(base::Value::Dict properties,
                                              bool shared) {
   NET_LOG(USER) << "CreateConfiguration";
-  CallCreateConfiguration(properties, shared, false /* connect_on_configure */);
+  CallCreateConfiguration(std::move(properties), shared,
+                          false /* connect_on_configure */);
 }
 
 }  // namespace

chromeos/ash/components/network/network_connect.h

diff --git a/chromeos/ash/components/network/network_connect.h b/chromeos/ash/components/network/network_connect.h
index 94502e8..701982b 100644
--- a/chromeos/ash/components/network/network_connect.h
+++ b/chromeos/ash/components/network/network_connect.h
@@ -8,10 +8,7 @@
 #include <string>
 
 #include "base/component_export.h"
-
-namespace base {
-class Value;
-}
+#include "base/values.h"
 
 namespace ash {
 
@@ -118,12 +115,12 @@
   // Shill properties and sends a connect request if the configuration succeeds.
   // The profile used is determined by |shared|.
   // TODO(stevenjb): Use ONC properties instead of shill.
-  virtual void CreateConfigurationAndConnect(base::Value* shill_properties,
+  virtual void CreateConfigurationAndConnect(base::Value::Dict shill_properties,
                                              bool shared) = 0;
 
   // Requests a new network configuration to be created from a dictionary of
   // Shill properties. The profile used is determined by |shared|.
-  virtual void CreateConfiguration(base::Value* shill_properties,
+  virtual void CreateConfiguration(base::Value::Dict shill_properties,
                                    bool shared) = 0;
 
  protected:

chromeos/ash/components/network/shill_property_util.cc

diff --git a/chromeos/ash/components/network/shill_property_util.cc b/chromeos/ash/components/network/shill_property_util.cc
index 35d7a40..f7860ce0 100644
--- a/chromeos/ash/components/network/shill_property_util.cc
+++ b/chromeos/ash/components/network/shill_property_util.cc
@@ -67,9 +67,9 @@
 
 }  // namespace
 
-void SetSSID(const std::string& ssid, base::Value* properties) {
+void SetSSID(const std::string& ssid, base::Value::Dict* properties) {
   std::string hex_ssid = base::HexEncode(ssid.c_str(), ssid.size());
-  properties->SetKey(shill::kWifiHexSsid, base::Value(hex_ssid));
+  properties->Set(shill::kWifiHexSsid, hex_ssid);
 }
 
 std::string GetSSIDFromProperties(const base::Value& properties,

chromeos/ash/components/network/shill_property_util.h

diff --git a/chromeos/ash/components/network/shill_property_util.h b/chromeos/ash/components/network/shill_property_util.h
index c5d9ef3..7a897d0e 100644
--- a/chromeos/ash/components/network/shill_property_util.h
+++ b/chromeos/ash/components/network/shill_property_util.h
@@ -9,12 +9,9 @@
 #include <string>
 
 #include "base/component_export.h"
+#include "base/values.h"
 #include "components/onc/onc_constants.h"
 
-namespace base {
-class Value;
-}
-
 namespace ash {
 
 class NetworkUIData;
@@ -23,7 +20,7 @@
 
 // Sets the |ssid| in |properties|.
 COMPONENT_EXPORT(CHROMEOS_NETWORK)
-void SetSSID(const std::string& ssid, base::Value* properties);
+void SetSSID(const std::string& ssid, base::Value::Dict* properties);
 
 // Returns the SSID from |properties| in UTF-8 encoding. If |verbose_logging| is
 // true, detailed DEBUG log events will be added to the device event log. If

chromeos/ash/components/settings/cros_settings_names.cc

diff --git a/chromeos/ash/components/settings/cros_settings_names.cc b/chromeos/ash/components/settings/cros_settings_names.cc
index 90b7f15..e3fb004 100644
--- a/chromeos/ash/components/settings/cros_settings_names.cc
+++ b/chromeos/ash/components/settings/cros_settings_names.cc
@@ -483,6 +483,10 @@
 // device.
 const char kPluginVmAllowed[] = "cros.device.plugin_vm_allowed";
 
+// A boolean pref that indicates whether Borealis is allowed to run on this
+// device.
+const char kBorealisAllowedForDevice[] = "cros.device.borealis_allowed";
+
 // An enum pref specifying the case when device needs to reboot on user sign
 // out.
 const char kDeviceRebootOnUserSignout[] = "cros.device.reboot_on_user_signout";

chromeos/ash/components/settings/cros_settings_names.h

diff --git a/chromeos/ash/components/settings/cros_settings_names.h b/chromeos/ash/components/settings/cros_settings_names.h
index 81b378be..42339dd 100644
--- a/chromeos/ash/components/settings/cros_settings_names.h
+++ b/chromeos/ash/components/settings/cros_settings_names.h
@@ -309,6 +309,9 @@
 extern const char kPluginVmAllowed[];
 
 COMPONENT_EXPORT(CHROMEOS_ASH_COMPONENTS_SETTINGS)
+extern const char kBorealisAllowedForDevice[];
+
+COMPONENT_EXPORT(CHROMEOS_ASH_COMPONENTS_SETTINGS)
 extern const char kDeviceRebootOnUserSignout[];
 
 COMPONENT_EXPORT(CHROMEOS_ASH_COMPONENTS_SETTINGS)

chromeos/ash/components/tether/message_wrapper.cc

diff --git a/chromeos/ash/components/tether/message_wrapper.cc b/chromeos/ash/components/tether/message_wrapper.cc
index 0d1038f..b36fbb1 100644
--- a/chromeos/ash/components/tether/message_wrapper.cc
+++ b/chromeos/ash/components/tether/message_wrapper.cc
@@ -162,9 +162,9 @@
                         base::Base64UrlEncodePolicy::INCLUDE_PADDING,
                         &encoded_message);
 
-  base::DictionaryValue json_dictionary;
-  json_dictionary.SetIntKey(kJsonTypeKey, static_cast<int>(type_));
-  json_dictionary.SetStringKey(kJsonDataKey, encoded_message);
+  base::Value::Dict json_dictionary;
+  json_dictionary.Set(kJsonTypeKey, static_cast<int>(type_));
+  json_dictionary.Set(kJsonDataKey, encoded_message);
 
   std::string raw_message;
   base::JSONWriter::Write(json_dictionary, &raw_message);

chromeos/ash/components/tether/wifi_hotspot_connector.cc

diff --git a/chromeos/ash/components/tether/wifi_hotspot_connector.cc b/chromeos/ash/components/tether/wifi_hotspot_connector.cc
index 87c0f19c..687b8ad 100644
--- a/chromeos/ash/components/tether/wifi_hotspot_connector.cc
+++ b/chromeos/ash/components/tether/wifi_hotspot_connector.cc
@@ -247,15 +247,15 @@
 }
 
 void WifiHotspotConnector::CreateWifiConfiguration() {
-  base::DictionaryValue properties =
-      CreateWifiPropertyDictionary(ssid_, password_);
+  base::Value::Dict properties = CreateWifiPropertyDictionary(ssid_, password_);
 
   // This newly configured network will eventually be passed as an argument to
   // NetworkPropertiesUpdated().
-  network_connect_->CreateConfiguration(&properties, false /* shared */);
+  network_connect_->CreateConfiguration(std::move(properties),
+                                        /* shared */ false);
 }
 
-base::DictionaryValue WifiHotspotConnector::CreateWifiPropertyDictionary(
+base::Value::Dict WifiHotspotConnector::CreateWifiPropertyDictionary(
     const std::string& ssid,
     const std::string& password) {
   PA_LOG(VERBOSE) << "Creating network configuration. "
@@ -263,21 +263,19 @@
                   << "Password: " << password << ", "
                   << "Wi-Fi network GUID: " << wifi_network_guid_;
 
-  base::DictionaryValue properties;
+  base::Value::Dict properties;
 
   shill_property_util::SetSSID(ssid, &properties);
-  properties.SetKey(shill::kGuidProperty, base::Value(wifi_network_guid_));
-  properties.SetKey(shill::kAutoConnectProperty, base::Value(false));
-  properties.SetKey(shill::kTypeProperty, base::Value(shill::kTypeWifi));
-  properties.SetKey(shill::kSaveCredentialsProperty, base::Value(true));
+  properties.Set(shill::kGuidProperty, wifi_network_guid_);
+  properties.Set(shill::kAutoConnectProperty, false);
+  properties.Set(shill::kTypeProperty, shill::kTypeWifi);
+  properties.Set(shill::kSaveCredentialsProperty, true);
 
   if (password.empty()) {
-    properties.SetKey(shill::kSecurityClassProperty,
-                      base::Value(shill::kSecurityClassNone));
+    properties.Set(shill::kSecurityClassProperty, shill::kSecurityClassNone);
   } else {
-    properties.SetKey(shill::kSecurityClassProperty,
-                      base::Value(shill::kSecurityClassPsk));
-    properties.SetKey(shill::kPassphraseProperty, base::Value(password));
+    properties.Set(shill::kSecurityClassProperty, shill::kSecurityClassPsk);
+    properties.Set(shill::kPassphraseProperty, password);
   }
 
   return properties;

chromeos/ash/components/tether/wifi_hotspot_connector.h

diff --git a/chromeos/ash/components/tether/wifi_hotspot_connector.h b/chromeos/ash/components/tether/wifi_hotspot_connector.h
index 38c5e05b..cf5dbf2 100644
--- a/chromeos/ash/components/tether/wifi_hotspot_connector.h
+++ b/chromeos/ash/components/tether/wifi_hotspot_connector.h
@@ -69,9 +69,8 @@
   void InitiateConnectionToCurrentNetwork();
   void CompleteActiveConnectionAttempt(bool success);
   void CreateWifiConfiguration();
-  base::DictionaryValue CreateWifiPropertyDictionary(
-      const std::string& ssid,
-      const std::string& password);
+  base::Value::Dict CreateWifiPropertyDictionary(const std::string& ssid,
+                                                 const std::string& password);
   void OnConnectionTimeout();
 
   void SetTestDoubles(std::unique_ptr<base::OneShotTimer> test_timer,

chromeos/ash/components/tether/wifi_hotspot_connector_unittest.cc

diff --git a/chromeos/ash/components/tether/wifi_hotspot_connector_unittest.cc b/chromeos/ash/components/tether/wifi_hotspot_connector_unittest.cc
index ccb3fab..12269d3d 100644
--- a/chromeos/ash/components/tether/wifi_hotspot_connector_unittest.cc
+++ b/chromeos/ash/components/tether/wifi_hotspot_connector_unittest.cc
@@ -55,26 +55,25 @@
   return ss.str();
 }
 
-std::string GetSsid(const base::Value& shill_properties) {
-  return shill_property_util::GetSSIDFromProperties(shill_properties, false,
-                                                    nullptr);
+std::string GetSsid(const base::Value::Dict& shill_properties) {
+  return shill_property_util::GetSSIDFromProperties(
+      base::Value(shill_properties.Clone()), false, nullptr);
 }
 
-std::string GetSecurityClass(const base::Value& shill_properties) {
+std::string GetSecurityClass(const base::Value::Dict& shill_properties) {
   const std::string* security =
-      shill_properties.FindStringKey(shill::kSecurityClassProperty);
+      shill_properties.FindString(shill::kSecurityClassProperty);
   return security ? *security : std::string();
 }
 
-std::string GetPassphrase(const base::Value& shill_properties) {
+std::string GetPassphrase(const base::Value::Dict& shill_properties) {
   const std::string* passphrase =
-      shill_properties.FindStringKey(shill::kPassphraseProperty);
+      shill_properties.FindString(shill::kPassphraseProperty);
   return passphrase ? *passphrase : std::string();
 }
 
-std::string GetGuid(const base::Value& shill_properties) {
-  const std::string* guid =
-      shill_properties.FindStringKey(shill::kGuidProperty);
+std::string GetGuid(const base::Value::Dict& shill_properties) {
+  const std::string* guid = shill_properties.FindString(shill::kGuidProperty);
   return guid ? *guid : std::string();
 }
 
@@ -83,7 +82,7 @@
 //   - has a non-empty GUID.
 // Returns true if all checks were successful, false otherwise.
 // Fills the GUID of the service into |*out_guid|.
-bool VerifyBaseConfiguration(const base::Value& shill_properties,
+bool VerifyBaseConfiguration(const base::Value::Dict& shill_properties,
                              const std::string& expected_ssid,
                              std::string* out_guid) {
   bool ok = true;
@@ -109,10 +108,14 @@
 //   - has the passphrase |expected_passphrase|.
 // Returns true if all checks were successful, false otherwise.
 // Fills the GUID of the service into |*out_guid|.
-bool VerifyPskConfiguration(const base::Value& shill_properties,
+bool VerifyPskConfiguration(const base::Value::Dict& shill_properties,
                             const std::string& expected_ssid,
                             const std::string& expected_passphrase,
                             std::string* out_guid) {
+  if (shill_properties.empty()) {
+    ADD_FAILURE() << "Received empty shill_properties";
+    return false;
+  }
   bool ok = VerifyBaseConfiguration(shill_properties, expected_ssid, out_guid);
 
   std::string actual_security_class = GetSecurityClass(shill_properties);
@@ -136,7 +139,7 @@
 //   - has security class None.
 // Returns true if all checks were successful, false otherwise.
 // Fills the GUID of the service into |*out_guid|.
-bool VerifyOpenConfiguration(const base::Value& shill_properties,
+bool VerifyOpenConfiguration(const base::Value::Dict& shill_properties,
                              const std::string& expected_ssid,
                              std::string* out_guid) {
   bool ok = VerifyBaseConfiguration(shill_properties, expected_ssid, out_guid);
@@ -165,11 +168,11 @@
       is_running_in_test_task_runner_ = is_running_in_test_task_runner;
     }
 
-    // Returns a NONE value if no configuration has been passed to
-    // TestNetworkConnect yet.
-    const base::Value GetLastConfiguration() {
-      return last_configuration_.is_none() ? base::Value()
-                                           : last_configuration_.Clone();
+    // Returns a Dict object with no entries if no configuration has been passed
+    // to TestNetworkConnect yet.
+    const base::Value::Dict GetLastConfiguration() {
+      return last_configuration_.empty() ? base::Value::Dict()
+                                         : last_configuration_.Clone();
     }
 
     std::string last_service_path_created() {
@@ -186,9 +189,9 @@
 
     // Finish configuring the last specified Wi-Fi network config.
     void ConfigureServiceWithLastNetworkConfig() {
-      ASSERT_FALSE(last_configuration_.is_none());
+      ASSERT_FALSE(last_configuration_.empty());
       const std::string* wifi_guid =
-          last_configuration_.FindStringKey(shill::kGuidProperty);
+          last_configuration_.FindString(shill::kGuidProperty);
       ASSERT_TRUE(wifi_guid);
 
       last_service_path_created_ =
@@ -205,14 +208,13 @@
     void ConfigureNetworkIdAndConnect(const std::string& network_id,
                                       const base::Value& shill_properties,
                                       bool shared) override {}
-    void CreateConfigurationAndConnect(base::Value* shill_properties,
+    void CreateConfigurationAndConnect(base::Value::Dict shill_properties,
                                        bool shared) override {}
 
-    void CreateConfiguration(base::Value* shill_properties,
+    void CreateConfiguration(base::Value::Dict shill_properties,
                              bool shared) override {
-      ASSERT_TRUE(shill_properties);
       EXPECT_FALSE(shared);
-      last_configuration_ = shill_properties->Clone();
+      last_configuration_ = std::move(shill_properties);
 
       // Prevent nested RunLoops when ConfigureServiceWithLastNetworkConfig()
       // calls NetworkStateTestHelper::ConfigureService(); that causes threading
@@ -237,7 +239,7 @@
     NetworkStateTestHelper* helper_;
     // Has type base::Value::Type::NONE if no configuration has been passed to
     // TestNetworkConnect yet.
-    base::Value last_configuration_;
+    base::Value::Dict last_configuration_;
     std::string last_service_path_created_;
     std::string network_id_to_connect_;
     std::string network_id_to_disconnect_;
@@ -395,12 +397,10 @@
       base::BindOnce(&WifiHotspotConnectorTest::WifiConnectionCallback,
                      base::Unretained(this)));
 
-  const base::Value last_configuration =
-      test_network_connect_->GetLastConfiguration();
-  ASSERT_TRUE(!last_configuration.is_none());
   std::string guid_unused;
-  EXPECT_TRUE(VerifyPskConfiguration(last_configuration, kSsid, kPassword,
-                                     &guid_unused));
+  EXPECT_TRUE(
+      VerifyPskConfiguration(test_network_connect_->GetLastConfiguration(),
+                             kSsid, kPassword, &guid_unused));
 
   // Network does not become connectable.
   EXPECT_TRUE(test_network_connect_->network_id_to_connect().empty());
@@ -421,12 +421,10 @@
       base::BindOnce(&WifiHotspotConnectorTest::WifiConnectionCallback,
                      base::Unretained(this)));
 
-  const base::Value last_configuration =
-      test_network_connect_->GetLastConfiguration();
-  ASSERT_TRUE(!last_configuration.is_none());
   std::string wifi_guid;
   EXPECT_TRUE(
-      VerifyPskConfiguration(last_configuration, kSsid, kPassword, &wifi_guid));
+      VerifyPskConfiguration(test_network_connect_->GetLastConfiguration(),
+                             kSsid, kPassword, &wifi_guid));
 
   // Another network becomes connectable. This should not cause the connection
   // to start.
@@ -454,12 +452,10 @@
       base::BindOnce(&WifiHotspotConnectorTest::WifiConnectionCallback,
                      base::Unretained(this)));
 
-  const base::Value last_configuration =
-      test_network_connect_->GetLastConfiguration();
-  ASSERT_TRUE(!last_configuration.is_none());
   std::string wifi_guid;
   EXPECT_TRUE(
-      VerifyPskConfiguration(last_configuration, kSsid, kPassword, &wifi_guid));
+      VerifyPskConfiguration(test_network_connect_->GetLastConfiguration(),
+                             kSsid, kPassword, &wifi_guid));
 
   // Network becomes connectable.
   NotifyConnectable(test_network_connect_->last_service_path_created());
@@ -486,12 +482,10 @@
       base::BindOnce(&WifiHotspotConnectorTest::WifiConnectionCallback,
                      base::Unretained(this)));
 
-  const base::Value last_configuration =
-      test_network_connect_->GetLastConfiguration();
-  ASSERT_TRUE(!last_configuration.is_none());
   std::string wifi_guid;
   EXPECT_TRUE(
-      VerifyPskConfiguration(last_configuration, kSsid, kPassword, &wifi_guid));
+      VerifyPskConfiguration(test_network_connect_->GetLastConfiguration(),
+                             kSsid, kPassword, &wifi_guid));
 
   // Network becomes connectable.
   NotifyConnectable(test_network_connect_->last_service_path_created());
@@ -515,12 +509,10 @@
       base::BindOnce(&WifiHotspotConnectorTest::WifiConnectionCallback,
                      base::Unretained(this)));
 
-  const base::Value last_configuration =
-      test_network_connect_->GetLastConfiguration();
-  ASSERT_TRUE(!last_configuration.is_none());
   std::string wifi_guid;
   EXPECT_TRUE(
-      VerifyPskConfiguration(last_configuration, kSsid, kPassword, &wifi_guid));
+      VerifyPskConfiguration(test_network_connect_->GetLastConfiguration(),
+                             kSsid, kPassword, &wifi_guid));
 
   // Network becomes connectable.
   NotifyConnectable(test_network_connect_->last_service_path_created());
@@ -547,11 +539,9 @@
       base::BindOnce(&WifiHotspotConnectorTest::WifiConnectionCallback,
                      base::Unretained(this)));
 
-  const base::Value last_configuration =
-      test_network_connect_->GetLastConfiguration();
-  ASSERT_TRUE(!last_configuration.is_none());
   std::string wifi_guid;
-  EXPECT_TRUE(VerifyOpenConfiguration(last_configuration, kSsid, &wifi_guid));
+  EXPECT_TRUE(VerifyOpenConfiguration(
+      test_network_connect_->GetLastConfiguration(), kSsid, &wifi_guid));
 
   // Network becomes connectable.
   NotifyConnectable(test_network_connect_->last_service_path_created());
@@ -579,12 +569,10 @@
       base::BindOnce(&WifiHotspotConnectorTest::WifiConnectionCallback,
                      base::Unretained(this)));
 
-  const base::Value configuration_1 =
-      test_network_connect_->GetLastConfiguration();
-  ASSERT_TRUE(!configuration_1.is_none());
   std::string wifi_guid_1;
-  EXPECT_TRUE(VerifyPskConfiguration(configuration_1, "ssid1", "password1",
-                                     &wifi_guid_1));
+  EXPECT_TRUE(
+      VerifyPskConfiguration(test_network_connect_->GetLastConfiguration(),
+                             "ssid1", "password1", &wifi_guid_1));
   std::string service_path_1 =
       test_network_connect_->last_service_path_created();
   EXPECT_FALSE(service_path_1.empty());
@@ -601,12 +589,10 @@
       base::BindOnce(&WifiHotspotConnectorTest::WifiConnectionCallback,
                      base::Unretained(this)));
 
-  const base::Value configuration_2 =
-      test_network_connect_->GetLastConfiguration();
-  ASSERT_TRUE(!configuration_2.is_none());
   std::string wifi_guid_2;
-  EXPECT_TRUE(VerifyPskConfiguration(configuration_2, "ssid2", "password2",
-                                     &wifi_guid_2));
+  EXPECT_TRUE(
+      VerifyPskConfiguration(test_network_connect_->GetLastConfiguration(),
+                             "ssid2", "password2", &wifi_guid_2));
   std::string service_path_2 =
       test_network_connect_->last_service_path_created();
   EXPECT_FALSE(service_path_2.empty());
@@ -657,12 +643,10 @@
   // for a new network attempt.
   test_clock_.Advance(base::Seconds(13));
 
-  const base::Value configuration_1 =
-      test_network_connect_->GetLastConfiguration();
-  ASSERT_TRUE(!configuration_1.is_none());
   std::string wifi_guid_1;
-  EXPECT_TRUE(VerifyPskConfiguration(configuration_1, "ssid1", "password1",
-                                     &wifi_guid_1));
+  EXPECT_TRUE(
+      VerifyPskConfiguration(test_network_connect_->GetLastConfiguration(),
+                             "ssid1", "password1", &wifi_guid_1));
   std::string service_path_1 =
       test_network_connect_->last_service_path_created();
   EXPECT_FALSE(service_path_1.empty());
@@ -691,12 +675,10 @@
   EXPECT_EQ(1u, test_network_connect_->num_disconnection_attempts());
   EXPECT_EQ(wifi_guid_1, test_network_connect_->network_id_to_disconnect());
 
-  const base::Value configuration_2 =
-      test_network_connect_->GetLastConfiguration();
-  ASSERT_TRUE(!configuration_2.is_none());
   std::string wifi_guid_2;
-  EXPECT_TRUE(VerifyPskConfiguration(configuration_2, "ssid2", "password2",
-                                     &wifi_guid_2));
+  EXPECT_TRUE(
+      VerifyPskConfiguration(test_network_connect_->GetLastConfiguration(),
+                             "ssid2", "password2", &wifi_guid_2));
   std::string service_path_2 =
       test_network_connect_->last_service_path_created();
   EXPECT_FALSE(service_path_2.empty());
@@ -748,12 +730,10 @@
   RunTestTaskRunner();
   test_network_connect_->ConfigureServiceWithLastNetworkConfig();
 
-  const base::Value last_configuration =
-      test_network_connect_->GetLastConfiguration();
-  ASSERT_TRUE(!last_configuration.is_none());
   std::string wifi_guid;
   EXPECT_TRUE(
-      VerifyPskConfiguration(last_configuration, kSsid, kPassword, &wifi_guid));
+      VerifyPskConfiguration(test_network_connect_->GetLastConfiguration(),
+                             kSsid, kPassword, &wifi_guid));
 
   test_clock_.Advance(kConnectionToHotspotTime);
 
@@ -792,7 +772,7 @@
   // once Wi-Fi is enabled.
   wifi_hotspot_connector_->DeviceListChanged();
   wifi_hotspot_connector_->DeviceListChanged();
-  EXPECT_TRUE(test_network_connect_->GetLastConfiguration().is_none());
+  EXPECT_TRUE(test_network_connect_->GetLastConfiguration().empty());
 
   // Allow the asyncronous call to NetworkStateHandler::SetTechnologyEnabled()
   // within WifiHotspotConnector::ConnectToWifiHotspot() to synchronously
@@ -807,12 +787,10 @@
   RunTestTaskRunner();
   test_network_connect_->ConfigureServiceWithLastNetworkConfig();
 
-  const base::Value last_configuration =
-      test_network_connect_->GetLastConfiguration();
-  ASSERT_TRUE(!last_configuration.is_none());
   std::string wifi_guid;
   EXPECT_TRUE(
-      VerifyPskConfiguration(last_configuration, kSsid, kPassword, &wifi_guid));
+      VerifyPskConfiguration(test_network_connect_->GetLastConfiguration(),
+                             kSsid, kPassword, &wifi_guid));
 
   // Network becomes connectable.
   NotifyConnectable(test_network_connect_->last_service_path_created());
@@ -861,7 +839,7 @@
 
   // No configuration should have been created since the connection attempt
   // timed out before Wi-Fi was successfully enabled.
-  EXPECT_TRUE(test_network_connect_->GetLastConfiguration().is_none());
+  EXPECT_TRUE(test_network_connect_->GetLastConfiguration().empty());
 
   VerifyConnectionToHotspotDurationRecorded(false /* expected */);
   EXPECT_EQ(0u, test_network_connect_->num_disconnection_attempts());
@@ -886,7 +864,7 @@
   // for a new network attempt.
   test_clock_.Advance(base::Seconds(13));
 
-  EXPECT_TRUE(test_network_connect_->GetLastConfiguration().is_none());
+  EXPECT_TRUE(test_network_connect_->GetLastConfiguration().empty());
 
   wifi_hotspot_connector_->ConnectToWifiHotspot(
       "ssid2", "password2", kTetherNetworkGuid2,
@@ -906,12 +884,10 @@
   RunTestTaskRunner();
   test_network_connect_->ConfigureServiceWithLastNetworkConfig();
 
-  const base::Value last_configuration =
-      test_network_connect_->GetLastConfiguration();
-  ASSERT_TRUE(!last_configuration.is_none());
   std::string wifi_guid_2;
-  EXPECT_TRUE(VerifyPskConfiguration(last_configuration, "ssid2", "password2",
-                                     &wifi_guid_2));
+  EXPECT_TRUE(
+      VerifyPskConfiguration(test_network_connect_->GetLastConfiguration(),
+                             "ssid2", "password2", &wifi_guid_2));
   std::string service_path_2 =
       test_network_connect_->last_service_path_created();
   EXPECT_FALSE(service_path_2.empty());

chromeos/dbus/power/OWNERS

diff --git a/chromeos/dbus/power/OWNERS b/chromeos/dbus/power/OWNERS
index beab343..71ae7b03 100644
--- a/chromeos/dbus/power/OWNERS
+++ b/chromeos/dbus/power/OWNERS
@@ -1,3 +1,4 @@
+dpad@google.com
 zentaro@chromium.org
 
 # Non-committers (can do the primary review, but an OWNER is still required)

chromeos/dbus/power/fake_power_manager_client.h

diff --git a/chromeos/dbus/power/fake_power_manager_client.h b/chromeos/dbus/power/fake_power_manager_client.h
index d7ec10b..d657626 100644
--- a/chromeos/dbus/power/fake_power_manager_client.h
+++ b/chromeos/dbus/power/fake_power_manager_client.h
@@ -67,6 +67,9 @@
   double screen_brightness_percent() const {
     return screen_brightness_percent_.value();
   }
+  double keyboard_brightness_percent() const {
+    return keyboard_brightness_percent_.value();
+  }
   bool is_projecting() const { return is_projecting_; }
   bool have_video_activity_report() const {
     return !video_activity_reports_.empty();

chromeos/services/network_config/cros_network_config_unittest.cc

diff --git a/chromeos/services/network_config/cros_network_config_unittest.cc b/chromeos/services/network_config/cros_network_config_unittest.cc
index 8042d4bd..4e3d366 100644
--- a/chromeos/services/network_config/cros_network_config_unittest.cc
+++ b/chromeos/services/network_config/cros_network_config_unittest.cc
@@ -150,6 +150,26 @@
   DOUBLE,
 };
 
+struct ApnHistogramCounts {
+  size_t num_modify_success = 0u;
+  size_t num_modify_failure = 0u;
+  size_t num_modify_type_default = 0u;
+  size_t num_modify_type_attach = 0u;
+  size_t num_modify_type_default_and_attach = 0u;
+
+  size_t num_enable_success = 0u;
+  size_t num_enable_failure = 0u;
+  size_t num_enable_type_default = 0u;
+  size_t num_enable_type_attach = 0u;
+  size_t num_enable_type_default_and_attach = 0u;
+
+  size_t num_disable_success = 0u;
+  size_t num_disable_failure = 0u;
+  size_t num_disable_type_default = 0u;
+  size_t num_disable_type_attach = 0u;
+  size_t num_disable_type_default_and_attach = 0u;
+};
+
 void CompareTrafficCounters(
     const std::vector<mojom::TrafficCounterPtr>& actual_traffic_counters,
     const base::Value::List& expected_traffic_counters,
@@ -984,64 +1004,63 @@
         apn_types, apn_types_count);
   }
 
-  void AssertModifyCustomApnResultBucketCount(size_t num_success,
-                                              size_t num_failure) {
+  void AssertApnHistogramCounts(const ApnHistogramCounts& count) {
     histogram_tester_.ExpectBucketCount(
         ash::CellularNetworkMetricsLogger::kModifyCustomApnResultHistogram,
-        true, num_success);
+        true, count.num_modify_success);
     histogram_tester_.ExpectBucketCount(
         ash::CellularNetworkMetricsLogger::kModifyCustomApnResultHistogram,
-        false, num_failure);
+        false, count.num_modify_failure);
     histogram_tester_.ExpectTotalCount(
         ash::CellularNetworkMetricsLogger::kModifyCustomApnApnTypesHistogram,
-        num_success);
-  }
-
-  void AssertModifyCustomApnPropertiesBucketCount(ApnTypes apn_types,
-                                                  size_t apn_types_count) {
+        count.num_modify_success);
     histogram_tester_.ExpectBucketCount(
         ash::CellularNetworkMetricsLogger::kModifyCustomApnApnTypesHistogram,
-        apn_types, apn_types_count);
-  }
+        ApnTypes::kAttach, count.num_modify_type_attach);
+    histogram_tester_.ExpectBucketCount(
+        ash::CellularNetworkMetricsLogger::kModifyCustomApnApnTypesHistogram,
+        ApnTypes::kDefault, count.num_modify_type_default);
+    histogram_tester_.ExpectBucketCount(
+        ash::CellularNetworkMetricsLogger::kModifyCustomApnApnTypesHistogram,
+        ApnTypes::kDefaultAndAttach, count.num_modify_type_default_and_attach);
 
-  void AssertEnableCustomApnResultBucketCount(size_t num_success,
-                                              size_t num_failure) {
     histogram_tester_.ExpectBucketCount(
         ash::CellularNetworkMetricsLogger::kEnableCustomApnResultHistogram,
-        true, num_success);
+        true, count.num_enable_success);
     histogram_tester_.ExpectBucketCount(
         ash::CellularNetworkMetricsLogger::kEnableCustomApnResultHistogram,
-        false, num_failure);
+        false, count.num_enable_failure);
     histogram_tester_.ExpectTotalCount(
         ash::CellularNetworkMetricsLogger::kEnableCustomApnApnTypesHistogram,
-        num_success);
-  }
-
-  void AssertEnableCustomApnPropertiesBucketCount(ApnTypes apn_types,
-                                                  size_t apn_types_count) {
+        count.num_enable_success);
     histogram_tester_.ExpectBucketCount(
         ash::CellularNetworkMetricsLogger::kEnableCustomApnApnTypesHistogram,
-        apn_types, apn_types_count);
-  }
+        ApnTypes::kAttach, count.num_enable_type_attach);
+    histogram_tester_.ExpectBucketCount(
+        ash::CellularNetworkMetricsLogger::kEnableCustomApnApnTypesHistogram,
+        ApnTypes::kDefault, count.num_enable_type_default);
+    histogram_tester_.ExpectBucketCount(
+        ash::CellularNetworkMetricsLogger::kEnableCustomApnApnTypesHistogram,
+        ApnTypes::kDefaultAndAttach, count.num_enable_type_default_and_attach);
 
-  void AssertDisableCustomApnResultBucketCount(size_t num_success,
-                                               size_t num_failure) {
     histogram_tester_.ExpectBucketCount(
         ash::CellularNetworkMetricsLogger::kDisableCustomApnResultHistogram,
-        true, num_success);
+        true, count.num_disable_success);
     histogram_tester_.ExpectBucketCount(
         ash::CellularNetworkMetricsLogger::kDisableCustomApnResultHistogram,
-        false, num_failure);
+        false, count.num_disable_failure);
     histogram_tester_.ExpectTotalCount(
         ash::CellularNetworkMetricsLogger::kDisableCustomApnApnTypesHistogram,
-        num_success);
-  }
-
-  void AssertDisableCustomApnPropertiesBucketCount(ApnTypes apn_types,
-                                                   size_t apn_types_count) {
+        count.num_disable_success);
     histogram_tester_.ExpectBucketCount(
         ash::CellularNetworkMetricsLogger::kDisableCustomApnApnTypesHistogram,
-        apn_types, apn_types_count);
+        ApnTypes::kAttach, count.num_disable_type_attach);
+    histogram_tester_.ExpectBucketCount(
+        ash::CellularNetworkMetricsLogger::kDisableCustomApnApnTypesHistogram,
+        ApnTypes::kDefault, count.num_disable_type_default);
+    histogram_tester_.ExpectBucketCount(
+        ash::CellularNetworkMetricsLogger::kDisableCustomApnApnTypesHistogram,
+        ApnTypes::kDefaultAndAttach, count.num_disable_type_default_and_attach);
   }
 
   NetworkHandlerTestHelper* helper() { return helper_.get(); }
@@ -2150,6 +2169,7 @@
   TestNetworkConfigurationObserver network_config_observer(
       network_configuration_handler());
 
+  ApnHistogramCounts counts;
   ASSERT_FALSE(network_metadata_store()->GetCustomApnList(kCellularGuid));
   // Verify ModifyCustomApn reports an error and return when the
   // network_metadata_store has a nullptr custom APN list
@@ -2168,15 +2188,13 @@
   test_apn1.onc_state = ::onc::cellular_apn::kStateEnabled;
 
   test_apn1.id = "apn_id_1";
+  AssertApnHistogramCounts(counts);
   ModifyCustomApn(kCellularGuid, test_apn1.AsMojoApn());
   EXPECT_EQ(expected_network_config_calls,
             network_config_observer.GetOnConfigurationModifiedCallCount());
   ASSERT_FALSE(network_metadata_store()->GetCustomApnList(kCellularGuid));
-  AssertModifyCustomApnResultBucketCount(/*num_success=*/0, /*num_failure=*/1);
-  AssertDisableCustomApnResultBucketCount(/*num_success=*/0,
-                                          /*num_failure=*/0);
-  AssertEnableCustomApnResultBucketCount(/*num_success=*/0,
-                                         /*num_failure=*/0);
+  counts.num_modify_failure++;
+  AssertApnHistogramCounts(counts);
   // Try to replace an APN when the custom APN list is empty, it should do
   // nothing
   network_metadata_store()->SetCustomApnList(kCellularGuid,
@@ -2185,11 +2203,8 @@
   EXPECT_EQ(expected_network_config_calls,
             network_config_observer.GetOnConfigurationModifiedCallCount());
   EXPECT_TRUE(UserApnsInNetworkMetadataStoreMatch(kCellularGuid, {}));
-  AssertModifyCustomApnResultBucketCount(/*num_success=*/0, /*num_failure=*/2);
-  AssertDisableCustomApnResultBucketCount(/*num_success=*/0,
-                                          /*num_failure=*/0);
-  AssertEnableCustomApnResultBucketCount(/*num_success=*/0,
-                                         /*num_failure=*/0);
+  counts.num_modify_failure++;
+  AssertApnHistogramCounts(counts);
 
   TestApnData test_apn2;
   test_apn2.access_point_name = kCellularTestApn2;
@@ -2246,12 +2261,8 @@
                                               network_config_observer));
     EXPECT_TRUE(UserApnsInManagedPropertiesMatch(kCellularGuid, expected_apns));
   }
-  AssertModifyCustomApnResultBucketCount(/*num_success=*/0,
-                                         /*num_failure=*/3);
-  AssertDisableCustomApnResultBucketCount(/*num_success=*/0,
-                                          /*num_failure=*/0);
-  AssertEnableCustomApnResultBucketCount(/*num_success=*/0,
-                                         /*num_failure=*/0);
+  counts.num_modify_failure++;
+  AssertApnHistogramCounts(counts);
   // Verify that ModifyCustomApn replaces the first custom APN
   test_apn3.id = first_apn_id;
   ModifyCustomApn(kCellularGuid, test_apn3.AsMojoApn());
@@ -2265,16 +2276,9 @@
                                               network_config_observer));
     EXPECT_TRUE(UserApnsInManagedPropertiesMatch(kCellularGuid, expected_apns));
 
-    AssertModifyCustomApnResultBucketCount(/*num_success=*/1,
-                                           /*num_failure=*/3);
-    // Note: The old APN types should be logged
-    AssertModifyCustomApnPropertiesBucketCount(ApnTypes::kDefaultAndAttach,
-                                               /*apn_types_count=*/1);
-    // Enable/Disable metrics are not logged if the ApnState doesn't change.
-    AssertDisableCustomApnResultBucketCount(/*num_success=*/0,
-                                            /*num_failure=*/0);
-    AssertEnableCustomApnResultBucketCount(/*num_success=*/0,
-                                           /*num_failure=*/0);
+    counts.num_modify_success++;
+    counts.num_modify_type_default_and_attach++;
+    AssertApnHistogramCounts(counts);
   }
 
   // Try to update an ID not found in the list, API should do nothing
@@ -2290,10 +2294,8 @@
                                               network_config_observer));
     EXPECT_TRUE(UserApnsInManagedPropertiesMatch(kCellularGuid, expected_apns));
   }
-  AssertModifyCustomApnResultBucketCount(/*num_success=*/1,
-                                         /*num_failure=*/4);
-  AssertModifyCustomApnPropertiesBucketCount(ApnTypes::kDefaultAndAttach,
-                                             /*apn_types_count=*/1);
+  counts.num_modify_failure++;
+  AssertApnHistogramCounts(counts);
 
   // Verify that disabling a custom APN changes its ApnState to disabled and
   // logs metrics
@@ -2311,20 +2313,11 @@
                                               network_config_observer));
     EXPECT_TRUE(UserApnsInManagedPropertiesMatch(kCellularGuid, expected_apns));
   }
-  AssertModifyCustomApnResultBucketCount(/*num_success=*/2,
-                                         /*num_failure=*/4);
-  AssertModifyCustomApnPropertiesBucketCount(ApnTypes::kAttach,
-                                             /*apn_types_count=*/1);
-  AssertModifyCustomApnPropertiesBucketCount(ApnTypes::kDefaultAndAttach,
-                                             /*apn_types_count=*/1);
-  AssertDisableCustomApnResultBucketCount(/*num_success=*/1,
-                                          /*num_failure=*/0);
-  AssertDisableCustomApnPropertiesBucketCount(ApnTypes::kAttach,
-                                              /*apn_types_count=*/1);
-  AssertEnableCustomApnResultBucketCount(/*num_success=*/0,
-                                         /*num_failure=*/0);
-  AssertEnableCustomApnPropertiesBucketCount(ApnTypes::kAttach,
-                                             /*apn_types_count=*/0);
+  counts.num_modify_success++;
+  counts.num_modify_type_attach++;
+  counts.num_disable_success++;
+  counts.num_disable_type_attach++;
+  AssertApnHistogramCounts(counts);
 
   // Verify that enabling a custom APN changes its ApnState to enabled and
   // logs metrics
@@ -2344,22 +2337,11 @@
                                               network_config_observer));
     EXPECT_TRUE(UserApnsInManagedPropertiesMatch(kCellularGuid, expected_apns));
   }
-  AssertModifyCustomApnResultBucketCount(/*num_success=*/3,
-                                         /*num_failure=*/4);
-  AssertModifyCustomApnPropertiesBucketCount(ApnTypes::kAttach,
-                                             /*apn_types_count=*/2);
-  AssertModifyCustomApnPropertiesBucketCount(ApnTypes::kDefaultAndAttach,
-                                             /*apn_types_count=*/1);
-  AssertModifyCustomApnPropertiesBucketCount(ApnTypes::kDefault,
-                                             /*apn_types_count=*/0);
-  AssertEnableCustomApnResultBucketCount(/*num_success=*/1,
-                                         /*num_failure=*/0);
-  AssertEnableCustomApnPropertiesBucketCount(ApnTypes::kAttach,
-                                             /*apn_types_count=*/1);
-  AssertDisableCustomApnResultBucketCount(/*num_success=*/1,
-                                          /*num_failure=*/0);
-  AssertDisableCustomApnPropertiesBucketCount(ApnTypes::kAttach,
-                                              /*apn_types_count=*/1);
+  counts.num_modify_success++;
+  counts.num_modify_type_attach++;
+  counts.num_enable_success++;
+  counts.num_enable_type_attach++;
+  AssertApnHistogramCounts(counts);
 
   // Verify that changing the APN type logs an event when changing from default
   // APN type to a different type
@@ -2379,20 +2361,11 @@
                                               network_config_observer));
     EXPECT_TRUE(UserApnsInManagedPropertiesMatch(kCellularGuid, expected_apns));
   }
-  AssertModifyCustomApnResultBucketCount(/*num_success=*/4,
-                                         /*num_failure=*/4);
-  AssertModifyCustomApnPropertiesBucketCount(ApnTypes::kDefault,
-                                             /*apn_types_count=*/1);
-  AssertModifyCustomApnPropertiesBucketCount(ApnTypes::kAttach,
-                                             /*apn_types_count=*/2);
-  AssertModifyCustomApnPropertiesBucketCount(ApnTypes::kDefaultAndAttach,
-                                             /*apn_types_count=*/1);
-  AssertDisableCustomApnResultBucketCount(/*num_success=*/2,
-                                          /*num_failure=*/0);
-  AssertDisableCustomApnPropertiesBucketCount(ApnTypes::kAttach,
-                                              /*apn_types_count=*/1);
-  AssertDisableCustomApnPropertiesBucketCount(ApnTypes::kDefault,
-                                              /*apn_types_count=*/1);
+  counts.num_modify_success++;
+  counts.num_modify_type_default++;
+  counts.num_disable_success++;
+  counts.num_disable_type_default++;
+  AssertApnHistogramCounts(counts);
 }
 
 TEST_F(CrosNetworkConfigTest, ConnectedAPN_ApnRevampEnabled) {

chromeos/ui/frame/caption_buttons/frame_size_button.cc

diff --git a/chromeos/ui/frame/caption_buttons/frame_size_button.cc b/chromeos/ui/frame/caption_buttons/frame_size_button.cc
index 1971c60..34dfe65 100644
--- a/chromeos/ui/frame/caption_buttons/frame_size_button.cc
+++ b/chromeos/ui/frame/caption_buttons/frame_size_button.cc
@@ -45,8 +45,7 @@
 constexpr base::TimeDelta kPieAnimationPressDuration = base::Milliseconds(150);
 constexpr base::TimeDelta kPieAnimationHoverDuration = base::Milliseconds(500);
 
-// TODO(sammiequon): Update the color to match specs.
-constexpr SkColor kPieColor = SkColorSetA(SK_ColorGRAY, 128);
+constexpr SkColor kPieColor = SkColorSetARGB(0x10, 0x00, 0x00, 0x00);
 
 // Returns true if a mouse drag while in "snap mode" at |location_in_screen|
 // would hover/press |button| or keep it hovered/pressed.

chromeos/ui/frame/multitask_menu/multitask_button.cc

diff --git a/chromeos/ui/frame/multitask_menu/multitask_button.cc b/chromeos/ui/frame/multitask_menu/multitask_button.cc
index 0b62de6..b70aaed 100644
--- a/chromeos/ui/frame/multitask_menu/multitask_button.cc
+++ b/chromeos/ui/frame/multitask_menu/multitask_button.cc
@@ -25,10 +25,12 @@
 MultitaskButton::MultitaskButton(PressedCallback callback,
                                  Type type,
                                  bool is_portrait_mode,
+                                 bool paint_as_active,
                                  const std::u16string& name)
     : views::Button(std::move(callback)),
       type_(type),
-      is_portrait_mode_(is_portrait_mode) {
+      is_portrait_mode_(is_portrait_mode),
+      paint_as_active_(paint_as_active) {
   SetPreferredSize(is_portrait_mode_ ? kMultitaskButtonPortraitSize
                                      : kMultitaskButtonLandscapeSize);
   views::InkDrop::Get(this)->SetMode(views::InkDropHost::InkDropMode::ON);
@@ -51,7 +53,8 @@
   pattern_flags.setAntiAlias(true);
   pattern_flags.setStyle(cc::PaintFlags::kFill_Style);
 
-  if (GetState() == Button::STATE_HOVERED) {
+  if (paint_as_active_ || GetState() == Button::STATE_HOVERED ||
+      GetState() == Button::STATE_PRESSED) {
     fill_flags.setColor(kMultitaskButtonViewHoverColor);
     border_flags.setColor(kMultitaskButtonPrimaryHoverColor);
     pattern_flags.setColor(gfx::kGoogleBlue600);

chromeos/ui/frame/multitask_menu/multitask_button.h

diff --git a/chromeos/ui/frame/multitask_menu/multitask_button.h b/chromeos/ui/frame/multitask_menu/multitask_button.h
index 7a62e75..6f67478 100644
--- a/chromeos/ui/frame/multitask_menu/multitask_button.h
+++ b/chromeos/ui/frame/multitask_menu/multitask_button.h
@@ -24,6 +24,7 @@
   MultitaskButton(PressedCallback callback,
                   Type type,
                   bool is_portrait_mode,
+                  bool paint_as_active,
                   const std::u16string& name);
 
   MultitaskButton(const MultitaskButton&) = delete;
@@ -39,6 +40,10 @@
   // The display orientation. This determines whether button is in
   // landscape/portrait mode.
   const bool is_portrait_mode_;
+
+  // Used to determine whether the button should be painted as active. If a
+  // window is in fullscreen or floated state, it should be painted as active.
+  const bool paint_as_active_;
 };
 
 }  // namespace chromeos

chromeos/ui/frame/multitask_menu/multitask_menu_view.cc

diff --git a/chromeos/ui/frame/multitask_menu/multitask_menu_view.cc b/chromeos/ui/frame/multitask_menu/multitask_menu_view.cc
index 8f4b309..4c71935 100644
--- a/chromeos/ui/frame/multitask_menu/multitask_menu_view.cc
+++ b/chromeos/ui/frame/multitask_menu/multitask_menu_view.cc
@@ -106,6 +106,7 @@
         base::BindRepeating(&MultitaskMenuView::FullScreenButtonPressed,
                             base::Unretained(this)),
         MultitaskButton::Type::kFull, is_portrait_mode,
+        /*paint_as_active=*/fullscreened,
         l10n_util::GetStringUTF16(message_id));
     full_button_for_testing_ = full_button.get();
     AddChildView(CreateButtonContainer(std::move(full_button), message_id));
@@ -121,7 +122,7 @@
         base::BindRepeating(&MultitaskMenuView::FloatButtonPressed,
                             base::Unretained(this)),
         MultitaskButton::Type::kFloat, is_portrait_mode,
-        l10n_util::GetStringUTF16(message_id));
+        /*paint_as_active=*/floated, l10n_util::GetStringUTF16(message_id));
     float_button_for_testing_ = float_button.get();
     AddChildView(CreateButtonContainer(std::move(float_button), message_id));
   }

chromeos/ui/frame/multitask_menu/split_button_view.cc

diff --git a/chromeos/ui/frame/multitask_menu/split_button_view.cc b/chromeos/ui/frame/multitask_menu/split_button_view.cc
index d3a74020..6263466 100644
--- a/chromeos/ui/frame/multitask_menu/split_button_view.cc
+++ b/chromeos/ui/frame/multitask_menu/split_button_view.cc
@@ -43,6 +43,11 @@
 constexpr SkColor kSplitButtonSecondaryHoverColor =
     SkColorSetA(gfx::kGoogleBlue600, SK_AlphaOPAQUE * 0.4);
 
+bool IsHoveredOrPressedState(views::Button::ButtonState button_state) {
+  return button_state == views::Button::STATE_PRESSED ||
+         button_state == views::Button::STATE_HOVERED;
+}
+
 }  // namespace
 
 // -----------------------------------------------------------------------------
@@ -51,13 +56,13 @@
 class SplitButtonView::SplitButton : public views::Button {
  public:
   SplitButton(views::Button::PressedCallback pressed_callback,
-              base::RepeatingClosure hovered_callback,
+              base::RepeatingClosure hovered_pressed_callback,
               const std::u16string& name,
               const gfx::Insets& insets)
       : views::Button(std::move(pressed_callback)),
         button_color_(kMultitaskButtonDefaultColor),
         insets_(insets),
-        hovered_callback_(std::move(hovered_callback)) {
+        hovered_pressed_callback_(std::move(hovered_pressed_callback)) {
     // Subtract by the preferred insets so that the focus ring is drawn around
     // the painted region below. Also, use the parent's rounded radius so the
     // ring matches the parent border.
@@ -84,18 +89,20 @@
   }
 
   void StateChanged(ButtonState old_state) override {
-    if (old_state == STATE_HOVERED || GetState() == STATE_HOVERED)
-      hovered_callback_.Run();
+    if (IsHoveredOrPressedState(old_state) ||
+        IsHoveredOrPressedState(GetState())) {
+      hovered_pressed_callback_.Run();
+    }
   }
 
  private:
   SkColor button_color_;
   // The inset between the button window pattern and the border.
-  const gfx::Insets insets_;
-  // Callback to `SplitButtonView` to change button color.
-  // When one split button is hovered, both split buttons on SplitButtonView
-  // changed color.
-  base::RepeatingClosure hovered_callback_;
+  gfx::Insets insets_;
+  // Callback to `SplitButtonView` to change button color. When one split button
+  // is hovered or pressed, both split buttons on `SplitButtonView` change
+  // color.
+  base::RepeatingClosure hovered_pressed_callback_;
 };
 
 // -----------------------------------------------------------------------------
@@ -114,8 +121,8 @@
   SetPreferredSize(is_portrait_mode ? kMultitaskButtonPortraitSize
                                     : kMultitaskButtonLandscapeSize);
 
-  auto on_hover = base::BindRepeating(&SplitButtonView::OnButtonHovered,
-                                      base::Unretained(this));
+  auto on_hover_pressed = base::BindRepeating(
+      &SplitButtonView::OnButtonHoveredOrPressed, base::Unretained(this));
 
   const SnapDirection left_top_direction =
       GetSnapDirectionForWindow(window, /*left_top=*/true);
@@ -129,11 +136,11 @@
       base::BindRepeating(split_button_callback, right_bottom_direction);
 
   left_top_button_ = AddChildView(std::make_unique<SplitButton>(
-      on_left_top_press, on_hover,
+      on_left_top_press, on_hover_pressed,
       is_portrait_mode ? kTopButtonName : kLeftButtonName,
       is_portrait_mode ? kTopButtonInsets : kLeftButtonInsets));
   right_bottom_button_ = AddChildView(std::make_unique<SplitButton>(
-      on_right_bottom_press, on_hover,
+      on_right_bottom_press, on_hover_pressed,
       is_portrait_mode ? kBottomButtonName : kRightButtonName,
       is_portrait_mode ? kBottomButtonInsets : kRightButtonInsets));
 
@@ -153,13 +160,13 @@
           : gfx::Size(right_bottom_width, kMultitaskHalfButtonHeight));
 }
 
-void SplitButtonView::OnButtonHovered() {
+void SplitButtonView::OnButtonHoveredOrPressed() {
   border_color_ = kMultitaskButtonPrimaryHoverColor;
   fill_color_ = kMultitaskButtonViewHoverColor;
-  if (right_bottom_button_->GetState() == views::Button::STATE_HOVERED) {
+  if (IsHoveredOrPressedState(right_bottom_button_->GetState())) {
     right_bottom_button_->set_button_color(kMultitaskButtonPrimaryHoverColor);
     left_top_button_->set_button_color(kSplitButtonSecondaryHoverColor);
-  } else if (left_top_button_->GetState() == views::Button::STATE_HOVERED) {
+  } else if (IsHoveredOrPressedState(left_top_button_->GetState())) {
     left_top_button_->set_button_color(kMultitaskButtonPrimaryHoverColor);
     right_bottom_button_->set_button_color(kSplitButtonSecondaryHoverColor);
   } else {
@@ -169,8 +176,6 @@
     right_bottom_button_->set_button_color(kMultitaskButtonDefaultColor);
     left_top_button_->set_button_color(kMultitaskButtonDefaultColor);
   }
-  left_top_button_->SchedulePaint();
-  right_bottom_button_->SchedulePaint();
   SchedulePaint();
 }
 

chromeos/ui/frame/multitask_menu/split_button_view.h

diff --git a/chromeos/ui/frame/multitask_menu/split_button_view.h b/chromeos/ui/frame/multitask_menu/split_button_view.h
index 03cef98a..feaf1b3 100644
--- a/chromeos/ui/frame/multitask_menu/split_button_view.h
+++ b/chromeos/ui/frame/multitask_menu/split_button_view.h
@@ -45,8 +45,8 @@
   void OnPaint(gfx::Canvas* canvas) override;
   void OnThemeChanged() override;
 
-  // Called when either button is hovered. Updates button colors.
-  void OnButtonHovered();
+  // Called when either button is hovered or pressed. Updates button colors.
+  void OnButtonHoveredOrPressed();
 
   // Pointers to the buttons that are owned by the views hierarchy. The names
   // refer to the physical location of the button, which do not change in RTL

components/attribution_reporting/source_registration.cc

diff --git a/components/attribution_reporting/source_registration.cc b/components/attribution_reporting/source_registration.cc
index de6e5fc..40d73929 100644
--- a/components/attribution_reporting/source_registration.cc
+++ b/components/attribution_reporting/source_registration.cc
@@ -10,6 +10,7 @@
 #include <utility>
 
 #include "base/json/json_reader.h"
+#include "base/metrics/histogram_functions.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/time/time.h"
@@ -71,6 +72,10 @@
 
 }  // namespace
 
+void RecordSourceRegistrationError(mojom::SourceRegistrationError error) {
+  base::UmaHistogramEnumeration("Conversions.SourceRegistrationError", error);
+}
+
 SourceRegistration::SourceRegistration() = default;
 
 SourceRegistration::SourceRegistration(SuitableOrigin destination)
@@ -134,15 +139,25 @@
 // static
 base::expected<SourceRegistration, SourceRegistrationError>
 SourceRegistration::Parse(base::StringPiece json) {
+  base::expected<SourceRegistration, SourceRegistrationError> source =
+      base::unexpected(SourceRegistrationError::kInvalidJson);
+
   absl::optional<base::Value> value =
       base::JSONReader::Read(json, base::JSON_PARSE_RFC);
-  if (!value)
-    return base::unexpected(SourceRegistrationError::kInvalidJson);
 
-  if (!value->is_dict())
-    return base::unexpected(SourceRegistrationError::kRootWrongType);
+  if (value) {
+    if (value->is_dict()) {
+      source = Parse(std::move(*value).TakeDict());
+    } else {
+      source = base::unexpected(SourceRegistrationError::kRootWrongType);
+    }
+  }
 
-  return Parse(std::move(*value).TakeDict());
+  if (!source.has_value()) {
+    RecordSourceRegistrationError(source.error());
+  }
+
+  return source;
 }
 
 base::Value::Dict SourceRegistration::ToJson() const {

components/attribution_reporting/source_registration.h

diff --git a/components/attribution_reporting/source_registration.h b/components/attribution_reporting/source_registration.h
index 06e088b2..c28cf3d 100644
--- a/components/attribution_reporting/source_registration.h
+++ b/components/attribution_reporting/source_registration.h
@@ -24,10 +24,15 @@
 
 namespace attribution_reporting {
 
+COMPONENT_EXPORT(ATTRIBUTION_REPORTING)
+void RecordSourceRegistrationError(mojom::SourceRegistrationError);
+
 struct COMPONENT_EXPORT(ATTRIBUTION_REPORTING) SourceRegistration {
+  // Doesn't log metric on parsing failures.
   static base::expected<SourceRegistration, mojom::SourceRegistrationError>
       Parse(base::Value::Dict);
 
+  // Logs metric on parsing failures.
   static base::expected<SourceRegistration, mojom::SourceRegistrationError>
   Parse(base::StringPiece json);
 

components/attribution_reporting/source_registration_error.mojom

diff --git a/components/attribution_reporting/source_registration_error.mojom b/components/attribution_reporting/source_registration_error.mojom
index ac145191..5778c8f1 100644
--- a/components/attribution_reporting/source_registration_error.mojom
+++ b/components/attribution_reporting/source_registration_error.mojom
@@ -4,6 +4,8 @@
 
 module attribution_reporting.mojom;
 
+// These values are persisted to logs. Entries should not be renumbered and
+// numeric values should never be reused.
 enum SourceRegistrationError {
   kInvalidJson,
   kRootWrongType,

components/attribution_reporting/source_registration_unittest.cc

diff --git a/components/attribution_reporting/source_registration_unittest.cc b/components/attribution_reporting/source_registration_unittest.cc
index 0edb88d..d5ba607f 100644
--- a/components/attribution_reporting/source_registration_unittest.cc
+++ b/components/attribution_reporting/source_registration_unittest.cc
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "base/functional/invoke.h"
+#include "base/test/metrics/histogram_tester.h"
 #include "base/test/values_test_util.h"
 #include "base/time/time.h"
 #include "base/types/expected.h"
@@ -231,9 +232,21 @@
       },
   };
 
+  static constexpr char kSourceRegistrationErrorMetric[] =
+      "Conversions.SourceRegistrationError";
+
   for (const auto& test_case : kTestCases) {
-    EXPECT_EQ(test_case.expected, SourceRegistration::Parse(test_case.json))
-        << test_case.desc;
+    base::HistogramTester histograms;
+
+    auto source = SourceRegistration::Parse(test_case.json);
+    EXPECT_EQ(test_case.expected, source) << test_case.desc;
+
+    if (source.has_value()) {
+      histograms.ExpectTotalCount(kSourceRegistrationErrorMetric, 0);
+    } else {
+      histograms.ExpectUniqueSample(kSourceRegistrationErrorMetric,
+                                    source.error(), 1);
+    }
   }
 }
 

components/attribution_reporting/trigger_registration.cc

diff --git a/components/attribution_reporting/trigger_registration.cc b/components/attribution_reporting/trigger_registration.cc
index b2ab49cf..46064f6d 100644
--- a/components/attribution_reporting/trigger_registration.cc
+++ b/components/attribution_reporting/trigger_registration.cc
@@ -148,15 +148,26 @@
 // static
 base::expected<TriggerRegistration, TriggerRegistrationError>
 TriggerRegistration::Parse(base::StringPiece json) {
+  base::expected<TriggerRegistration, TriggerRegistrationError> trigger =
+      base::unexpected(TriggerRegistrationError::kInvalidJson);
+
   absl::optional<base::Value> value =
       base::JSONReader::Read(json, base::JSON_PARSE_RFC);
-  if (!value)
-    return base::unexpected(TriggerRegistrationError::kInvalidJson);
 
-  if (!value->is_dict())
-    return base::unexpected(TriggerRegistrationError::kRootWrongType);
+  if (value) {
+    if (value->is_dict()) {
+      trigger = Parse(std::move(*value).TakeDict());
+    } else {
+      trigger = base::unexpected(TriggerRegistrationError::kRootWrongType);
+    }
+  }
 
-  return Parse(std::move(*value).TakeDict());
+  if (!trigger.has_value()) {
+    base::UmaHistogramEnumeration("Conversions.TriggerRegistrationError",
+                                  trigger.error());
+  }
+
+  return trigger;
 }
 
 TriggerRegistration::TriggerRegistration() = default;

components/attribution_reporting/trigger_registration.h

diff --git a/components/attribution_reporting/trigger_registration.h b/components/attribution_reporting/trigger_registration.h
index e94ef86..37b6b6bf 100644
--- a/components/attribution_reporting/trigger_registration.h
+++ b/components/attribution_reporting/trigger_registration.h
@@ -22,9 +22,11 @@
 namespace attribution_reporting {
 
 struct COMPONENT_EXPORT(ATTRIBUTION_REPORTING) TriggerRegistration {
+  // Doesn't log metric on parsing failures.
   static base::expected<TriggerRegistration, mojom::TriggerRegistrationError>
       Parse(base::Value::Dict);
 
+  // Logs metric on parsing failures.
   static base::expected<TriggerRegistration, mojom::TriggerRegistrationError>
   Parse(base::StringPiece json);
 

components/attribution_reporting/trigger_registration_error.mojom

diff --git a/components/attribution_reporting/trigger_registration_error.mojom b/components/attribution_reporting/trigger_registration_error.mojom
index 14cf868..abb8478d 100644
--- a/components/attribution_reporting/trigger_registration_error.mojom
+++ b/components/attribution_reporting/trigger_registration_error.mojom
@@ -4,6 +4,8 @@
 
 module attribution_reporting.mojom;
 
+// These values are persisted to logs. Entries should not be renumbered and
+// numeric values should never be reused.
 enum TriggerRegistrationError {
   kInvalidJson,
   kRootWrongType,
@@ -22,6 +24,8 @@
   kAggregatableValuesValueWrongType,
   kAggregatableValuesValueOutOfRange,
 
+  kAggregatableTriggerDataListWrongType,
+  kAggregatableTriggerDataListTooLong,
   kAggregatableTriggerDataWrongType,
   kAggregatableTriggerDataKeyPieceMissing,
   kAggregatableTriggerDataKeyPieceWrongType,
@@ -31,13 +35,9 @@
   kAggregatableTriggerDataSourceKeysKeyWrongType,
   kAggregatableTriggerDataSourceKeysKeyTooLong,
 
-  kEventTriggerDataWrongType,
-
   kEventTriggerDataListWrongType,
   kEventTriggerDataListTooLong,
-
-  kAggregatableTriggerDataListWrongType,
-  kAggregatableTriggerDataListTooLong,
+  kEventTriggerDataWrongType,
 
   kAggregationCoordinatorWrongType,
   kAggregationCoordinatorUnknownValue,

components/attribution_reporting/trigger_registration_unittest.cc

diff --git a/components/attribution_reporting/trigger_registration_unittest.cc b/components/attribution_reporting/trigger_registration_unittest.cc
index 92dff58..a8032c8 100644
--- a/components/attribution_reporting/trigger_registration_unittest.cc
+++ b/components/attribution_reporting/trigger_registration_unittest.cc
@@ -245,9 +245,21 @@
       },
   };
 
+  static constexpr char kTriggerRegistrationErrorMetric[] =
+      "Conversions.TriggerRegistrationError";
+
   for (const auto& test_case : kTestCases) {
-    EXPECT_EQ(TriggerRegistration::Parse(test_case.json), test_case.expected)
-        << test_case.description;
+    base::HistogramTester histograms;
+
+    auto trigger = TriggerRegistration::Parse(test_case.json);
+    EXPECT_EQ(trigger, test_case.expected) << test_case.description;
+
+    if (trigger.has_value()) {
+      histograms.ExpectTotalCount(kTriggerRegistrationErrorMetric, 0);
+    } else {
+      histograms.ExpectUniqueSample(kTriggerRegistrationErrorMetric,
+                                    trigger.error(), 1);
+    }
   }
 }
 

components/autofill/core/browser/payments/credit_card_access_manager.cc

diff --git a/components/autofill/core/browser/payments/credit_card_access_manager.cc b/components/autofill/core/browser/payments/credit_card_access_manager.cc
index b833a15..0fb43ad9 100644
--- a/components/autofill/core/browser/payments/credit_card_access_manager.cc
+++ b/components/autofill/core/browser/payments/credit_card_access_manager.cc
@@ -211,11 +211,11 @@
   // Set delay as fido request timeout if available, otherwise set to default.
   int delay_ms = kDelayForGetUnmaskDetails;
   if (unmask_details_.fido_request_options.has_value()) {
-    const auto* request_timeout =
-        unmask_details_.fido_request_options->FindKeyOfType(
-            "timeout_millis", base::Value::Type::INTEGER);
-    if (request_timeout)
-      delay_ms = request_timeout->GetInt();
+    const absl::optional<int> request_timeout =
+        unmask_details_.fido_request_options->FindInt("timeout_millis");
+    if (request_timeout.has_value()) {
+      delay_ms = *request_timeout;
+    }
   }
 
 #if !BUILDFLAG(IS_IOS)
@@ -470,7 +470,7 @@
       // For virtual cards the |fido_request_option| comes from the
       // UnmaskResponseDetails while for masked server cards, it comes from the
       // UnmaskDetails.
-      base::Value fido_request_options;
+      base::Value::Dict fido_request_options;
       absl::optional<std::string> context_token;
       if (card_->record_type() == CreditCard::VIRTUAL_CARD) {
         context_token = virtual_card_unmask_response_details_.context_token;
@@ -568,7 +568,7 @@
     unmask_auth_flow_type_ = UnmaskAuthFlowType::kNone;
   } else if (should_register_card_with_fido) {
 #if !BUILDFLAG(IS_IOS)
-    absl::optional<base::Value> request_options = absl::nullopt;
+    absl::optional<base::Value::Dict> request_options = absl::nullopt;
     if (unmask_details_.fido_request_options.has_value()) {
       // For opted-in user (CVC then FIDO case), request options are returned in
       // unmask detail response.

components/autofill/core/browser/payments/credit_card_access_manager_unittest.cc

diff --git a/components/autofill/core/browser/payments/credit_card_access_manager_unittest.cc b/components/autofill/core/browser/payments/credit_card_access_manager_unittest.cc
index 0ae7bfc..5039e03b 100644
--- a/components/autofill/core/browser/payments/credit_card_access_manager_unittest.cc
+++ b/components/autofill/core/browser/payments/credit_card_access_manager_unittest.cc
@@ -330,25 +330,22 @@
         ->GetStrikes();
   }
 
-  base::Value GetTestRequestOptions() {
-    base::Value request_options = base::Value(base::Value::Type::DICTIONARY);
-    request_options.SetKey("challenge", base::Value(kTestChallenge));
-    request_options.SetKey("relying_party_id",
-                           base::Value(kGooglePaymentsRpid));
+  base::Value::Dict GetTestRequestOptions() {
+    base::Value::Dict request_options;
+    request_options.Set("challenge", base::Value(kTestChallenge));
+    request_options.Set("relying_party_id", base::Value(kGooglePaymentsRpid));
 
-    base::Value key_info(base::Value::Type::DICTIONARY);
-    key_info.SetKey("credential_id", base::Value(kCredentialId));
-    request_options.SetKey("key_info", base::Value(base::Value::Type::LIST));
-    request_options.FindKeyOfType("key_info", base::Value::Type::LIST)
-        ->Append(std::move(key_info));
+    base::Value::Dict key_info;
+    key_info.Set("credential_id", base::Value(kCredentialId));
+    request_options.Set("key_info", base::Value(base::Value::Type::LIST));
+    request_options.FindList("key_info")->Append(std::move(key_info));
     return request_options;
   }
 
-  base::Value GetTestCreationOptions() {
-    base::Value creation_options = base::Value(base::Value::Type::DICTIONARY);
-    creation_options.SetKey("challenge", base::Value(kTestChallenge));
-    creation_options.SetKey("relying_party_id",
-                            base::Value(kGooglePaymentsRpid));
+  base::Value::Dict GetTestCreationOptions() {
+    base::Value::Dict creation_options;
+    creation_options.Set("challenge", base::Value(kTestChallenge));
+    creation_options.Set("relying_party_id", base::Value(kGooglePaymentsRpid));
     return creation_options;
   }
 

components/autofill/core/browser/payments/credit_card_cvc_authenticator.h

diff --git a/components/autofill/core/browser/payments/credit_card_cvc_authenticator.h b/components/autofill/core/browser/payments/credit_card_cvc_authenticator.h
index b5497b9..a6a3b8ce 100644
--- a/components/autofill/core/browser/payments/credit_card_cvc_authenticator.h
+++ b/components/autofill/core/browser/payments/credit_card_cvc_authenticator.h
@@ -45,7 +45,7 @@
       return *this;
     }
     CVCAuthenticationResponse& with_request_options(
-        absl::optional<base::Value> v) {
+        absl::optional<base::Value::Dict> v) {
       request_options = std::move(v);
       return *this;
     }
@@ -56,7 +56,7 @@
     bool did_succeed = false;
     raw_ptr<const CreditCard> card = nullptr;
     std::u16string cvc = std::u16string();
-    absl::optional<base::Value> request_options;
+    absl::optional<base::Value::Dict> request_options;
     std::string card_authorization_token = std::string();
   };
   class Requester {

components/autofill/core/browser/payments/credit_card_fido_authenticator.cc

diff --git a/components/autofill/core/browser/payments/credit_card_fido_authenticator.cc b/components/autofill/core/browser/payments/credit_card_fido_authenticator.cc
index f53ed5d..cd1a2d55 100644
--- a/components/autofill/core/browser/payments/credit_card_fido_authenticator.cc
+++ b/components/autofill/core/browser/payments/credit_card_fido_authenticator.cc
@@ -79,7 +79,7 @@
 void CreditCardFIDOAuthenticator::Authenticate(
     const CreditCard* card,
     base::WeakPtr<Requester> requester,
-    base::Value request_options,
+    base::Value::Dict request_options,
     absl::optional<std::string> context_token) {
   card_ = card;
   requester_ = requester;
@@ -98,14 +98,14 @@
 }
 
 void CreditCardFIDOAuthenticator::Register(std::string card_authorization_token,
-                                           base::Value creation_options) {
+                                           base::Value::Dict creation_options) {
   // Cancel any previous pending WebAuthn requests.
   authenticator()->Cancel();
 
   // If |creation_options| is set, then must enroll a new credential. Otherwise
   // directly send request to payments for opting in.
   card_authorization_token_ = card_authorization_token;
-  if (creation_options.is_dict()) {
+  if (!creation_options.empty()) {
     if (IsValidCreationOptions(creation_options)) {
       current_flow_ = OPT_IN_WITH_CHALLENGE_FLOW;
       MakeCredential(ParseCreationOptions(creation_options));
@@ -119,7 +119,7 @@
 void CreditCardFIDOAuthenticator::Authorize(
     base::WeakPtr<Requester> requester,
     std::string card_authorization_token,
-    base::Value request_options) {
+    base::Value::Dict request_options) {
   requester_ = requester;
   card_authorization_token_ = card_authorization_token;
 
@@ -329,7 +329,7 @@
 }
 
 void CreditCardFIDOAuthenticator::OptChange(
-    base::Value authenticator_response) {
+    base::Value::Dict authenticator_response) {
   payments::PaymentsClient::OptChangeRequestDetails request_details;
   request_details.app_locale =
       autofill_client_->GetPersonalDataManager()->app_locale();
@@ -363,11 +363,11 @@
   // the subsequent OptChange call.
   autofill_metrics::WebauthnOptInParameters opt_change_metric;
   bool is_checkout_flow = !card_authorization_token_.empty();
-  if (authenticator_response.is_dict()) {
+  if (!authenticator_response.empty()) {
     request_details.fido_authenticator_response =
         std::move(authenticator_response);
     opt_change_metric =
-        request_details.fido_authenticator_response->FindKey(
+        request_details.fido_authenticator_response->contains(
             "fido_assertion_info")
             ? autofill_metrics::WebauthnOptInParameters::kWithRequestChallenge
             : autofill_metrics::WebauthnOptInParameters::kWithCreationChallenge;
@@ -505,27 +505,24 @@
 
 blink::mojom::PublicKeyCredentialRequestOptionsPtr
 CreditCardFIDOAuthenticator::ParseRequestOptions(
-    const base::Value& request_options) {
+    const base::Value::Dict& request_options) {
   auto options = blink::mojom::PublicKeyCredentialRequestOptions::New();
 
-  const auto* rpid = request_options.FindStringKey("relying_party_id");
+  const auto* rpid = request_options.FindString("relying_party_id");
   options->relying_party_id = rpid ? *rpid : std::string(kGooglePaymentsRpid);
 
-  const auto* challenge = request_options.FindStringKey("challenge");
+  const auto* challenge = request_options.FindString("challenge");
   DCHECK(challenge);
   options->challenge = Base64ToBytes(*challenge);
 
-  const auto* timeout = request_options.FindKeyOfType(
-      "timeout_millis", base::Value::Type::INTEGER);
-  options->timeout =
-      base::Milliseconds(timeout ? timeout->GetInt() : kWebAuthnTimeoutMs);
+  const absl::optional<int> timeout = request_options.FindInt("timeout_millis");
+  options->timeout = base::Milliseconds(timeout.value_or(kWebAuthnTimeoutMs));
 
   options->user_verification = device::UserVerificationRequirement::kRequired;
 
-  const auto* key_info_list =
-      request_options.FindKeyOfType("key_info", base::Value::Type::LIST);
+  const auto* key_info_list = request_options.FindList("key_info");
   DCHECK(key_info_list);
-  for (const base::Value& key_info : key_info_list->GetList()) {
+  for (const base::Value& key_info : *key_info_list) {
     options->allow_credentials.push_back(ParseCredentialDescriptor(key_info));
   }
 
@@ -534,14 +531,14 @@
 
 blink::mojom::PublicKeyCredentialCreationOptionsPtr
 CreditCardFIDOAuthenticator::ParseCreationOptions(
-    const base::Value& creation_options) {
+    const base::Value::Dict& creation_options) {
   auto options = blink::mojom::PublicKeyCredentialCreationOptions::New();
 
-  const auto* rpid = creation_options.FindStringKey("relying_party_id");
+  const auto* rpid = creation_options.FindString("relying_party_id");
   options->relying_party.id = rpid ? *rpid : kGooglePaymentsRpid;
 
   const auto* relying_party_name =
-      creation_options.FindStringKey("relying_party_name");
+      creation_options.FindString("relying_party_name");
   options->relying_party.name =
       relying_party_name ? *relying_party_name : kGooglePaymentsRpName;
 
@@ -560,14 +557,14 @@
               ->GetAccountInfoForPaymentsServer());
   options->user.display_name = account_info.given_name;
 
-  const auto* challenge = creation_options.FindStringKey("challenge");
+  const auto* challenge = creation_options.FindString("challenge");
   DCHECK(challenge);
   options->challenge = Base64ToBytes(*challenge);
 
-  const auto* identifier_list = creation_options.FindKeyOfType(
-      "algorithm_identifier", base::Value::Type::LIST);
+  const auto* identifier_list =
+      creation_options.FindList("algorithm_identifier");
   if (identifier_list) {
-    for (const base::Value& algorithm_identifier : identifier_list->GetList()) {
+    for (const base::Value& algorithm_identifier : *identifier_list) {
       device::PublicKeyCredentialParams::CredentialInfo parameter;
       parameter.type = device::CredentialType::kPublicKey;
       parameter.algorithm = algorithm_identifier.GetInt();
@@ -575,13 +572,12 @@
     }
   }
 
-  const auto* timeout = creation_options.FindKeyOfType(
-      "timeout_millis", base::Value::Type::INTEGER);
-  options->timeout =
-      base::Milliseconds(timeout ? timeout->GetInt() : kWebAuthnTimeoutMs);
+  const absl::optional<int> timeout =
+      creation_options.FindInt("timeout_millis");
+  options->timeout = base::Milliseconds(timeout.value_or(kWebAuthnTimeoutMs));
 
   const auto* attestation =
-      creation_options.FindStringKey("attestation_conveyance_preference");
+      creation_options.FindString("attestation_conveyance_preference");
   if (!attestation || base::EqualsCaseInsensitiveASCII(*attestation, "NONE")) {
     options->attestation = device::AttestationConveyancePreference::kNone;
   } else if (base::EqualsCaseInsensitiveASCII(*attestation, "INDIRECT")) {
@@ -600,10 +596,9 @@
 
   // List of keys that Payments already knows about, and so should not make a
   // new credential.
-  const auto* excluded_keys_list =
-      creation_options.FindKeyOfType("key_info", base::Value::Type::LIST);
+  const auto* excluded_keys_list = creation_options.FindList("key_info");
   if (excluded_keys_list) {
-    for (const base::Value& key_info : excluded_keys_list->GetList()) {
+    for (const base::Value& key_info : *excluded_keys_list) {
       options->exclude_credentials.push_back(
           ParseCredentialDescriptor(key_info));
     }
@@ -638,29 +633,28 @@
       authenticator_transports);
 }
 
-base::Value CreditCardFIDOAuthenticator::ParseAssertionResponse(
+base::Value::Dict CreditCardFIDOAuthenticator::ParseAssertionResponse(
     blink::mojom::GetAssertionAuthenticatorResponsePtr assertion_response) {
-  base::Value response = base::Value(base::Value::Type::DICTIONARY);
-  response.SetKey("credential_id",
-                  BytesToBase64(assertion_response->info->raw_id));
-  response.SetKey("authenticator_data",
-                  BytesToBase64(assertion_response->info->authenticator_data));
-  response.SetKey("client_data",
-                  BytesToBase64(assertion_response->info->client_data_json));
-  response.SetKey("signature", BytesToBase64(assertion_response->signature));
+  base::Value::Dict response;
+  response.Set("credential_id",
+               BytesToBase64(assertion_response->info->raw_id));
+  response.Set("authenticator_data",
+               BytesToBase64(assertion_response->info->authenticator_data));
+  response.Set("client_data",
+               BytesToBase64(assertion_response->info->client_data_json));
+  response.Set("signature", BytesToBase64(assertion_response->signature));
   return response;
 }
 
-base::Value CreditCardFIDOAuthenticator::ParseAttestationResponse(
+base::Value::Dict CreditCardFIDOAuthenticator::ParseAttestationResponse(
     blink::mojom::MakeCredentialAuthenticatorResponsePtr attestation_response) {
-  base::Value response = base::Value(base::Value::Type::DICTIONARY);
+  base::Value::Dict response;
 
-  base::Value fido_attestation_info =
-      base::Value(base::Value::Type::DICTIONARY);
-  fido_attestation_info.SetKey(
+  base::Value::Dict fido_attestation_info;
+  fido_attestation_info.Set(
       "client_data",
       BytesToBase64(attestation_response->info->client_data_json));
-  fido_attestation_info.SetKey(
+  fido_attestation_info.Set(
       "attestation_object",
       BytesToBase64(attestation_response->attestation_object));
 
@@ -672,28 +666,27 @@
         base::Value(base::ToUpperASCII(device::ToString(protocol))));
   }
 
-  response.SetKey("fido_attestation_info", std::move(fido_attestation_info));
-  response.SetKey("authenticator_transport",
-                  std::move(authenticator_transport_list));
+  response.Set("fido_attestation_info", std::move(fido_attestation_info));
+  response.Set("authenticator_transport",
+               std::move(authenticator_transport_list));
 
   return response;
 }
 
 bool CreditCardFIDOAuthenticator::IsValidRequestOptions(
-    const base::Value& request_options) {
-  if (!request_options.is_dict() || request_options.DictEmpty() ||
-      !request_options.FindStringKey("challenge") ||
-      !request_options.FindKeyOfType("key_info", base::Value::Type::LIST)) {
+    const base::Value::Dict& request_options) {
+  if (request_options.empty() || !request_options.contains("challenge") ||
+      !request_options.contains("key_info")) {
     return false;
   }
 
-  const auto* key_info_list =
-      request_options.FindKeyOfType("key_info", base::Value::Type::LIST);
+  const auto* key_info_list = request_options.FindList("key_info");
 
-  if (key_info_list->GetList().empty())
+  if (key_info_list->empty()) {
     return false;
+  }
 
-  for (const base::Value& key_info : key_info_list->GetList()) {
+  for (const base::Value& key_info : *key_info_list) {
     if (!key_info.is_dict() || !key_info.FindStringKey("credential_id"))
       return false;
   }
@@ -702,9 +695,8 @@
 }
 
 bool CreditCardFIDOAuthenticator::IsValidCreationOptions(
-    const base::Value& creation_options) {
-  return creation_options.is_dict() &&
-         creation_options.FindStringKey("challenge");
+    const base::Value::Dict& creation_options) {
+  return creation_options.contains("challenge");
 }
 
 void CreditCardFIDOAuthenticator::LogWebauthnResult(
@@ -752,7 +744,7 @@
     blink::mojom::GetAssertionAuthenticatorResponsePtr assertion_response) {
   switch (current_flow_) {
     case AUTHENTICATION_FLOW: {
-      base::Value response =
+      base::Value::Dict response =
           ParseAssertionResponse(std::move(assertion_response));
       full_card_request_ = std::make_unique<payments::FullCardRequest>(
           autofill_client_, autofill_client_->GetPaymentsClient(),
@@ -810,9 +802,9 @@
     }
   }
 
-  base::Value response = base::Value(base::Value::Type::DICTIONARY);
-  response.SetKey("fido_assertion_info",
-                  ParseAssertionResponse(std::move(assertion_response)));
+  base::Value::Dict response;
+  response.Set("fido_assertion_info",
+               ParseAssertionResponse(std::move(assertion_response)));
   OptChange(std::move(response));
 }
 

components/autofill/core/browser/payments/credit_card_fido_authenticator.h

diff --git a/components/autofill/core/browser/payments/credit_card_fido_authenticator.h b/components/autofill/core/browser/payments/credit_card_fido_authenticator.h
index 607da02..588f5ff 100644
--- a/components/autofill/core/browser/payments/credit_card_fido_authenticator.h
+++ b/components/autofill/core/browser/payments/credit_card_fido_authenticator.h
@@ -97,14 +97,14 @@
   virtual void Authenticate(
       const CreditCard* card,
       base::WeakPtr<Requester> requester,
-      base::Value request_options,
+      base::Value::Dict request_options,
       absl::optional<std::string> context_token = absl::nullopt);
 
   // Invokes Registration flow. Sends credentials created from
   // |creation_options| along with the |card_authorization_token| to Payments in
   // order to enroll the user and authorize the corresponding card.
   void Register(std::string card_authorization_token = std::string(),
-                base::Value creation_options = base::Value());
+                base::Value::Dict creation_options = base::Value::Dict());
 
   // Invokes an Authorization flow. Sends signature created from
   // |request_options| along with the |card_authorization_token| to Payments in
@@ -112,7 +112,7 @@
   // Authorization is complete.
   void Authorize(base::WeakPtr<Requester> requester,
                  std::string card_authorization_token,
-                 base::Value request_options);
+                 base::Value::Dict request_options);
 
   // Opts the user out.
   virtual void OptOut();
@@ -174,7 +174,8 @@
       blink::mojom::PublicKeyCredentialCreationOptionsPtr creation_options);
 
   // Makes a request to payments to either opt-in or opt-out the user.
-  void OptChange(base::Value authenticator_response = base::Value());
+  void OptChange(
+      base::Value::Dict authenticator_response = base::Value::Dict());
 
   // The callback invoked from the WebAuthn prompt including the
   // |assertion_response|, which will be sent to Google Payments to retrieve
@@ -208,11 +209,11 @@
 
   // Converts |request_options| from JSON to mojom pointer.
   blink::mojom::PublicKeyCredentialRequestOptionsPtr ParseRequestOptions(
-      const base::Value& request_options);
+      const base::Value::Dict& request_options);
 
   // Converts |creation_options| from JSON to mojom pointer.
   blink::mojom::PublicKeyCredentialCreationOptionsPtr ParseCreationOptions(
-      const base::Value& creation_options);
+      const base::Value::Dict& creation_options);
 
   // Helper function to parse |key_info| sub-dictionary found in
   // |request_options| and |creation_options|.
@@ -220,20 +221,20 @@
       const base::Value& key_info);
 
   // Converts |assertion_response| from mojom pointer to JSON.
-  base::Value ParseAssertionResponse(
+  base::Value::Dict ParseAssertionResponse(
       blink::mojom::GetAssertionAuthenticatorResponsePtr assertion_response);
 
   // Converts |attestation_response| from mojom pointer to JSON.
-  base::Value ParseAttestationResponse(
+  base::Value::Dict ParseAttestationResponse(
       blink::mojom::MakeCredentialAuthenticatorResponsePtr
           attestation_response);
 
   // Returns true if |request_options| contains a challenge and has a non-empty
   // list of keys that each have a Credential ID.
-  bool IsValidRequestOptions(const base::Value& request_options);
+  bool IsValidRequestOptions(const base::Value::Dict& request_options);
 
   // Returns true if |request_options| contains a challenge.
-  bool IsValidCreationOptions(const base::Value& creation_options);
+  bool IsValidCreationOptions(const base::Value::Dict& creation_options);
 
   // Logs the result of a WebAuthn prompt.
   void LogWebauthnResult(blink::mojom::AuthenticatorStatus status);

components/autofill/core/browser/payments/credit_card_fido_authenticator_unittest.cc

diff --git a/components/autofill/core/browser/payments/credit_card_fido_authenticator_unittest.cc b/components/autofill/core/browser/payments/credit_card_fido_authenticator_unittest.cc
index b071948..700324d 100644
--- a/components/autofill/core/browser/payments/credit_card_fido_authenticator_unittest.cc
+++ b/components/autofill/core/browser/payments/credit_card_fido_authenticator_unittest.cc
@@ -156,10 +156,10 @@
     return masked_server_card;
   }
 
-  base::Value GetTestRequestOptions(std::string challenge,
-                                    std::string relying_party_id,
-                                    std::string credential_id) {
-    base::Value request_options = base::Value(base::Value::Type::DICTIONARY);
+  base::Value::Dict GetTestRequestOptions(std::string challenge,
+                                          std::string relying_party_id,
+                                          std::string credential_id) {
+    base::Value::Dict request_options;
 
     // Building the following JSON structure--
     // request_options = {
@@ -170,27 +170,23 @@
     //       "credential_id": credential_id,
     //       "authenticator_transport_support": ["INTERNAL"]
     // }]}
-    request_options.SetKey("challenge", base::Value(challenge));
-    request_options.SetKey("relying_party_id", base::Value(relying_party_id));
+    request_options.Set("challenge", base::Value(challenge));
+    request_options.Set("relying_party_id", base::Value(relying_party_id));
 
-    base::Value key_info(base::Value::Type::DICTIONARY);
-    key_info.SetKey("credential_id", base::Value(credential_id));
-    key_info.SetKey("authenticator_transport_support",
-                    base::Value(base::Value::Type::LIST));
-    key_info
-        .FindKeyOfType("authenticator_transport_support",
-                       base::Value::Type::LIST)
-        ->Append("INTERNAL");
+    base::Value::Dict key_info;
+    key_info.Set("credential_id", base::Value(credential_id));
+    key_info.Set("authenticator_transport_support",
+                 base::Value(base::Value::Type::LIST));
+    key_info.FindList("authenticator_transport_support")->Append("INTERNAL");
 
-    request_options.SetKey("key_info", base::Value(base::Value::Type::LIST));
-    request_options.FindKeyOfType("key_info", base::Value::Type::LIST)
-        ->Append(std::move(key_info));
+    request_options.Set("key_info", base::Value(base::Value::Type::LIST));
+    request_options.FindList("key_info")->Append(std::move(key_info));
     return request_options;
   }
 
-  base::Value GetTestCreationOptions(std::string challenge,
-                                     std::string relying_party_id) {
-    base::Value creation_options = base::Value(base::Value::Type::DICTIONARY);
+  base::Value::Dict GetTestCreationOptions(std::string challenge,
+                                           std::string relying_party_id) {
+    base::Value::Dict creation_options;
 
     // Building the following JSON structure--
     // request_options = {
@@ -198,8 +194,8 @@
     //   "relying_party_id": relying_party_id,
     // }]}
     if (!challenge.empty())
-      creation_options.SetKey("challenge", base::Value(challenge));
-    creation_options.SetKey("relying_party_id", base::Value(relying_party_id));
+      creation_options.Set("challenge", base::Value(challenge));
+    creation_options.Set("relying_party_id", base::Value(relying_party_id));
     return creation_options;
   }
 
@@ -345,7 +341,7 @@
 }
 
 TEST_F(CreditCardFIDOAuthenticatorTest, ParseRequestOptions) {
-  base::Value request_options_json = GetTestRequestOptions(
+  base::Value::Dict request_options_json = GetTestRequestOptions(
       kTestChallenge, kTestRelyingPartyId, kTestCredentialId);
 
   blink::mojom::PublicKeyCredentialRequestOptionsPtr request_options_ptr =
@@ -363,17 +359,16 @@
   assertion_response_ptr->info->raw_id = Base64ToBytes(kTestCredentialId);
   assertion_response_ptr->signature = Base64ToBytes(kTestSignature);
 
-  base::Value assertion_response_json =
+  base::Value::Dict assertion_response_json =
       fido_authenticator_->ParseAssertionResponse(
           std::move(assertion_response_ptr));
   EXPECT_EQ(kTestCredentialId,
-            *assertion_response_json.FindStringKey("credential_id"));
-  EXPECT_EQ(kTestSignature,
-            *assertion_response_json.FindStringKey("signature"));
+            *assertion_response_json.FindString("credential_id"));
+  EXPECT_EQ(kTestSignature, *assertion_response_json.FindString("signature"));
 }
 
 TEST_F(CreditCardFIDOAuthenticatorTest, ParseCreationOptions) {
-  base::Value creation_options_json =
+  base::Value::Dict creation_options_json =
       GetTestCreationOptions(kTestChallenge, kTestRelyingPartyId);
 
   blink::mojom::PublicKeyCredentialCreationOptionsPtr creation_options_ptr =
@@ -398,10 +393,10 @@
   attestation_response_ptr->info = blink::mojom::CommonCredentialInfo::New();
   attestation_response_ptr->attestation_object = Base64ToBytes(kTestSignature);
 
-  base::Value attestation_response_json =
+  base::Value::Dict attestation_response_json =
       fido_authenticator_->ParseAttestationResponse(
           std::move(attestation_response_ptr));
-  EXPECT_EQ(kTestSignature, *attestation_response_json.FindStringPath(
+  EXPECT_EQ(kTestSignature, *attestation_response_json.FindStringByDottedPath(
                                 "fido_attestation_info.attestation_object"));
 }
 
@@ -409,7 +404,7 @@
   CreditCard card = CreateServerCard(kTestGUID, kTestNumber);
 
   fido_authenticator_->Authenticate(&card, requester_->GetWeakPtr(),
-                                    base::Value(base::Value::Type::DICTIONARY));
+                                    base::Value::Dict());
   EXPECT_FALSE((*requester_->did_succeed()));
 }
 

components/autofill/core/browser/payments/credit_card_save_manager.cc

diff --git a/components/autofill/core/browser/payments/credit_card_save_manager.cc b/components/autofill/core/browser/payments/credit_card_save_manager.cc
index fcc10a5a..4336474 100644
--- a/components/autofill/core/browser/payments/credit_card_save_manager.cc
+++ b/components/autofill/core/browser/payments/credit_card_save_manager.cc
@@ -408,7 +408,7 @@
 void CreditCardSaveManager::OnDidGetUploadDetails(
     AutofillClient::PaymentsRpcResult result,
     const std::u16string& context_token,
-    std::unique_ptr<base::Value> legal_message,
+    std::unique_ptr<base::Value::Dict> legal_message,
     std::vector<std::pair<int, int>> supported_card_bin_ranges) {
   if (observer_for_testing_)
     observer_for_testing_->OnReceivedGetUploadDetailsResponse();

components/autofill/core/browser/payments/credit_card_save_manager.h

diff --git a/components/autofill/core/browser/payments/credit_card_save_manager.h b/components/autofill/core/browser/payments/credit_card_save_manager.h
index 35ed7c6..9c77ad50 100644
--- a/components/autofill/core/browser/payments/credit_card_save_manager.h
+++ b/components/autofill/core/browser/payments/credit_card_save_manager.h
@@ -190,7 +190,7 @@
   void OnDidGetUploadDetails(
       AutofillClient::PaymentsRpcResult result,
       const std::u16string& context_token,
-      std::unique_ptr<base::Value> legal_message,
+      std::unique_ptr<base::Value::Dict> legal_message,
       std::vector<std::pair<int, int>> supported_card_bin_ranges);
 
   // Logs the number of strikes that a card had when save succeeded.

components/autofill/core/browser/payments/full_card_request.cc

diff --git a/components/autofill/core/browser/payments/full_card_request.cc b/components/autofill/core/browser/payments/full_card_request.cc
index 64e8292..03e20624 100644
--- a/components/autofill/core/browser/payments/full_card_request.cc
+++ b/components/autofill/core/browser/payments/full_card_request.cc
@@ -75,10 +75,9 @@
     const CreditCard& card,
     AutofillClient::UnmaskCardReason reason,
     base::WeakPtr<ResultDelegate> result_delegate,
-    base::Value fido_assertion_info,
+    base::Value::Dict fido_assertion_info,
     absl::optional<GURL> last_committed_primary_main_frame_origin,
     absl::optional<std::string> context_token) {
-  DCHECK(fido_assertion_info.is_dict());
   GetFullCardImpl(
       card, reason, result_delegate, nullptr, std::move(fido_assertion_info),
       std::move(last_committed_primary_main_frame_origin),
@@ -90,7 +89,7 @@
     AutofillClient::UnmaskCardReason reason,
     base::WeakPtr<ResultDelegate> result_delegate,
     base::WeakPtr<UIDelegate> ui_delegate,
-    absl::optional<base::Value> fido_assertion_info,
+    absl::optional<base::Value::Dict> fido_assertion_info,
     absl::optional<GURL> last_committed_primary_main_frame_origin,
     absl::optional<std::string> context_token,
     absl::optional<CardUnmaskChallengeOption> selected_challenge_option) {

components/autofill/core/browser/payments/full_card_request.h

diff --git a/components/autofill/core/browser/payments/full_card_request.h b/components/autofill/core/browser/payments/full_card_request.h
index 98df4c0..8e3e6a04 100644
--- a/components/autofill/core/browser/payments/full_card_request.h
+++ b/components/autofill/core/browser/payments/full_card_request.h
@@ -156,7 +156,7 @@
       const CreditCard& card,
       AutofillClient::UnmaskCardReason reason,
       base::WeakPtr<ResultDelegate> result_delegate,
-      base::Value fido_assertion_info,
+      base::Value::Dict fido_assertion_info,
       absl::optional<GURL> last_committed_primary_main_frame_origin =
           absl::nullopt,
       absl::optional<std::string> context_token = absl::nullopt);
@@ -213,7 +213,7 @@
       AutofillClient::UnmaskCardReason reason,
       base::WeakPtr<ResultDelegate> result_delegate,
       base::WeakPtr<UIDelegate> ui_delegate,
-      absl::optional<base::Value> fido_assertion_info,
+      absl::optional<base::Value::Dict> fido_assertion_info,
       absl::optional<GURL> last_committed_primary_main_frame_origin,
       absl::optional<std::string> context_token,
       absl::optional<CardUnmaskChallengeOption> selected_challenge_option);

components/autofill/core/browser/payments/full_card_request_unittest.cc

diff --git a/components/autofill/core/browser/payments/full_card_request_unittest.cc b/components/autofill/core/browser/payments/full_card_request_unittest.cc
index 552b6dc..6ccf67f0 100644
--- a/components/autofill/core/browser/payments/full_card_request_unittest.cc
+++ b/components/autofill/core/browser/payments/full_card_request_unittest.cc
@@ -271,8 +271,7 @@
   request()->GetFullCardViaFIDO(
       CreditCard(CreditCard::MASKED_SERVER_CARD, "server_id"),
       AutofillClient::UnmaskCardReason::kAutofill,
-      result_delegate()->AsWeakPtr(),
-      base::Value(base::Value::Type::DICTIONARY));
+      result_delegate()->AsWeakPtr(), base::Value::Dict());
   OnDidGetRealPan(AutofillClient::PaymentsRpcResult::kSuccess, "4111");
 }
 

components/autofill/core/browser/payments/legal_message_line.cc

diff --git a/components/autofill/core/browser/payments/legal_message_line.cc b/components/autofill/core/browser/payments/legal_message_line.cc
index 7b14a308..fa3ba5e 100644
--- a/components/autofill/core/browser/payments/legal_message_line.cc
+++ b/components/autofill/core/browser/payments/legal_message_line.cc
@@ -77,16 +77,14 @@
 LegalMessageLine::~LegalMessageLine() {}
 
 // static
-bool LegalMessageLine::Parse(const base::Value& legal_message,
+bool LegalMessageLine::Parse(const base::Value::Dict& legal_message,
                              LegalMessageLines* out,
                              bool escape_apostrophes) {
-  DCHECK(legal_message.is_dict());
-  const base::Value* lines_list =
-      legal_message.FindKeyOfType("line", base::Value::Type::LIST);
+  const base::Value::List* lines_list = legal_message.FindList("line");
   if (lines_list) {
     LegalMessageLines lines;
-    lines.reserve(lines_list->GetList().size());
-    for (const base::Value& single_line : lines_list->GetList()) {
+    lines.reserve(lines_list->size());
+    for (const base::Value& single_line : *lines_list) {
       lines.emplace_back();
       if (!single_line.is_dict() ||
           !lines.back().ParseLine(single_line, escape_apostrophes))

components/autofill/core/browser/payments/legal_message_line.h

diff --git a/components/autofill/core/browser/payments/legal_message_line.h b/components/autofill/core/browser/payments/legal_message_line.h
index 9b4c35cf..9fa590dd 100644
--- a/components/autofill/core/browser/payments/legal_message_line.h
+++ b/components/autofill/core/browser/payments/legal_message_line.h
@@ -9,13 +9,10 @@
 #include <vector>
 
 #include "base/gtest_prod_util.h"
+#include "base/values.h"
 #include "ui/gfx/range/range.h"
 #include "url/gurl.h"
 
-namespace base {
-class Value;
-}
-
 namespace autofill {
 
 class LegalMessageLine;
@@ -67,9 +64,7 @@
   //    text in MessageFormat, "'{0}" gets treated as a literal.  To avoid
   //    situations like these, setting |escape_apostrophes| to true will escape
   //    all ASCII apostrophes by doubling them up.
-  //
-  // |legal_message| must be a base::Value of type DICTIONARY.
-  static bool Parse(const base::Value& legal_message,
+  static bool Parse(const base::Value::Dict& legal_message,
                     LegalMessageLines* out,
                     bool escape_apostrophes = false);
 

components/autofill/core/browser/payments/legal_message_line_fuzzer.cc

diff --git a/components/autofill/core/browser/payments/legal_message_line_fuzzer.cc b/components/autofill/core/browser/payments/legal_message_line_fuzzer.cc
index 2f8f907..f6eb3d16 100644
--- a/components/autofill/core/browser/payments/legal_message_line_fuzzer.cc
+++ b/components/autofill/core/browser/payments/legal_message_line_fuzzer.cc
@@ -23,7 +23,8 @@
 
   // Run tested code.
   autofill::LegalMessageLines lines;
-  autofill::LegalMessageLine::Parse(*legal_message, &lines, escape_apostrophes);
+  autofill::LegalMessageLine::Parse(legal_message->GetDict(), &lines,
+                                    escape_apostrophes);
 
   return 0;
 }

components/autofill/core/browser/payments/legal_message_line_unittest.cc

diff --git a/components/autofill/core/browser/payments/legal_message_line_unittest.cc b/components/autofill/core/browser/payments/legal_message_line_unittest.cc
index c780344..93331ff 100644
--- a/components/autofill/core/browser/payments/legal_message_line_unittest.cc
+++ b/components/autofill/core/browser/payments/legal_message_line_unittest.cc
@@ -313,7 +313,8 @@
   ASSERT_TRUE(value);
   ASSERT_TRUE(value->is_dict());
   LegalMessageLines actual_lines;
-  LegalMessageLine::Parse(*value, &actual_lines, test_case.escape_apostrophes);
+  LegalMessageLine::Parse(value->GetDict(), &actual_lines,
+                          test_case.escape_apostrophes);
 
   EXPECT_EQ(test_case.expected_lines, actual_lines);
 }

components/autofill/core/browser/payments/local_card_migration_manager.cc

diff --git a/components/autofill/core/browser/payments/local_card_migration_manager.cc b/components/autofill/core/browser/payments/local_card_migration_manager.cc
index 9bf5479..09bbb2f 100644
--- a/components/autofill/core/browser/payments/local_card_migration_manager.cc
+++ b/components/autofill/core/browser/payments/local_card_migration_manager.cc
@@ -202,7 +202,7 @@
     bool is_from_settings_page,
     AutofillClient::PaymentsRpcResult result,
     const std::u16string& context_token,
-    std::unique_ptr<base::Value> legal_message,
+    std::unique_ptr<base::Value::Dict> legal_message,
     std::vector<std::pair<int, int>> supported_card_bin_ranges) {
   if (observer_for_testing_)
     observer_for_testing_->OnReceivedGetUploadDetailsResponse();

components/autofill/core/browser/payments/local_card_migration_manager.h

diff --git a/components/autofill/core/browser/payments/local_card_migration_manager.h b/components/autofill/core/browser/payments/local_card_migration_manager.h
index 82682125..6be1b3b4 100644
--- a/components/autofill/core/browser/payments/local_card_migration_manager.h
+++ b/components/autofill/core/browser/payments/local_card_migration_manager.h
@@ -163,7 +163,7 @@
       bool is_from_settings_page,
       AutofillClient::PaymentsRpcResult result,
       const std::u16string& context_token,
-      std::unique_ptr<base::Value> legal_message,
+      std::unique_ptr<base::Value::Dict> legal_message,
       std::vector<std::pair<int, int>> supported_card_bin_ranges);
 
   // Callback after successfully getting the migration save results. Map

components/autofill/core/browser/payments/payments_client.cc

diff --git a/components/autofill/core/browser/payments/payments_client.cc b/components/autofill/core/browser/payments/payments_client.cc
index 2d18334f..58b392c 100644
--- a/components/autofill/core/browser/payments/payments_client.cc
+++ b/components/autofill/core/browser/payments/payments_client.cc
@@ -282,7 +282,7 @@
     const std::string& app_locale,
     base::OnceCallback<void(AutofillClient::PaymentsRpcResult,
                             const std::u16string&,
-                            std::unique_ptr<base::Value>,
+                            std::unique_ptr<base::Value::Dict>,
                             std::vector<std::pair<int, int>>)> callback,
     const int billable_service_number,
     const int64_t billing_customer_number,
@@ -433,7 +433,7 @@
         if (found_error_reason)
           error_api_error_reason = found_error_reason->GetString();
 
-        request_->ParseResponse(*message_value);
+        request_->ParseResponse(message_value->GetDict());
       }
 
       if (base::EqualsCaseInsensitiveASCII(error_api_error_reason,

components/autofill/core/browser/payments/payments_client.h

diff --git a/components/autofill/core/browser/payments/payments_client.h b/components/autofill/core/browser/payments/payments_client.h
index a34bd4c..591161df 100644
--- a/components/autofill/core/browser/payments/payments_client.h
+++ b/components/autofill/core/browser/payments/payments_client.h
@@ -89,7 +89,7 @@
     bool offer_fido_opt_in = false;
     // Public Key Credential Request Options required for authentication.
     // https://www.w3.org/TR/webauthn/#dictdef-publickeycredentialrequestoptions
-    absl::optional<base::Value> fido_request_options;
+    absl::optional<base::Value::Dict> fido_request_options;
     // Set of credit cards ids that are eligible for FIDO Authentication.
     std::set<std::string> fido_eligible_card_ids;
   };
@@ -106,7 +106,7 @@
     CreditCard card;
     std::string risk_data;
     CardUnmaskDelegate::UserProvidedUnmaskDetails user_response;
-    absl::optional<base::Value> fido_assertion_info;
+    absl::optional<base::Value::Dict> fido_assertion_info;
     std::u16string otp;
     // An opaque token used to chain consecutive payments requests together.
     std::string context_token;
@@ -147,7 +147,7 @@
     std::string expiration_year;
     // Challenge required for authorizing user for FIDO authentication for
     // future card unmasking.
-    absl::optional<base::Value> fido_request_options;
+    absl::optional<base::Value::Dict> fido_request_options;
     // An opaque token used to logically chain consecutive UnmaskCard and
     // OptChange calls together.
     std::string card_authorization_token;
@@ -196,7 +196,7 @@
     Reason reason;
     // Signature required for enrolling user into FIDO authentication for future
     // card unmasking.
-    absl::optional<base::Value> fido_authenticator_response;
+    absl::optional<base::Value::Dict> fido_authenticator_response;
     // An opaque token used to logically chain consecutive UnmaskCard and
     // OptChange calls together.
     std::string card_authorization_token = std::string();
@@ -213,10 +213,10 @@
     absl::optional<bool> user_is_opted_in;
     // Challenge required for enrolling user into FIDO authentication for future
     // card unmasking.
-    absl::optional<base::Value> fido_creation_options;
+    absl::optional<base::Value::Dict> fido_creation_options;
     // Challenge required for authorizing user for FIDO authentication for
     // future card unmasking.
-    absl::optional<base::Value> fido_request_options;
+    absl::optional<base::Value::Dict> fido_request_options;
   };
 
   // A collection of the information required to make local credit cards
@@ -463,7 +463,7 @@
       const std::string& app_locale,
       base::OnceCallback<void(AutofillClient::PaymentsRpcResult,
                               const std::u16string&,
-                              std::unique_ptr<base::Value>,
+                              std::unique_ptr<base::Value::Dict>,
                               std::vector<std::pair<int, int>>)> callback,
       const int billable_service_number,
       const int64_t billing_customer_number,

components/autofill/core/browser/payments/payments_client_unittest.cc

diff --git a/components/autofill/core/browser/payments/payments_client_unittest.cc b/components/autofill/core/browser/payments/payments_client_unittest.cc
index fca6fe9..7e72fb7 100644
--- a/components/autofill/core/browser/payments/payments_client_unittest.cc
+++ b/components/autofill/core/browser/payments/payments_client_unittest.cc
@@ -204,7 +204,7 @@
   void OnDidGetUploadDetails(
       AutofillClient::PaymentsRpcResult result,
       const std::u16string& context_token,
-      std::unique_ptr<base::Value> legal_message,
+      std::unique_ptr<base::Value::Dict> legal_message,
       std::vector<std::pair<int, int>> supported_card_bin_ranges) {
     result_ = result;
     legal_message_ = std::move(legal_message);
@@ -274,8 +274,7 @@
 
     request_details.risk_data = "some risk data";
     if (options.use_fido) {
-      request_details.fido_assertion_info =
-          base::Value(base::Value::Type::DICTIONARY);
+      request_details.fido_assertion_info = base::Value::Dict();
     }
     if (options.use_cvc)
       request_details.user_response.cvc = base::ASCIIToUTF16(options.cvc);
@@ -483,7 +482,7 @@
   raw_ptr<PaymentsClient::UnmaskResponseDetails> unmask_response_details_ =
       nullptr;
   // The legal message returned from a GetDetails upload save preflight call.
-  std::unique_ptr<base::Value> legal_message_;
+  std::unique_ptr<base::Value::Dict> legal_message_;
   // A list of card BIN ranges supported by Google Payments, returned from a
   // GetDetails upload save preflight call.
   std::vector<std::pair<int, int>> supported_card_bin_ranges_;
@@ -729,9 +728,9 @@
   EXPECT_EQ(AutofillClient::PaymentsRpcResult::kSuccess, result_);
   EXPECT_EQ("fake_context_token", unmask_response_details_->context_token);
   // Verify the FIDO request challenge is correctly parsed.
-  EXPECT_EQ("fake_fido_challenge",
-            *unmask_response_details_->fido_request_options->FindStringKey(
-                "challenge"));
+  EXPECT_EQ(
+      "fake_fido_challenge",
+      *unmask_response_details_->fido_request_options->FindString("challenge"));
   // Verify the two idv challenge options are both sms challenge and fields can
   // be correctly parsed.
   ASSERT_EQ(2u, unmask_response_details_->card_unmask_challenge_options.size());
@@ -769,9 +768,9 @@
   EXPECT_EQ(AutofillClient::PaymentsRpcResult::kSuccess, result_);
   EXPECT_EQ("fake_context_token", unmask_response_details_->context_token);
   // Verify the FIDO request challenge is correctly parsed.
-  EXPECT_EQ("fake_fido_challenge",
-            *unmask_response_details_->fido_request_options->FindStringKey(
-                "challenge"));
+  EXPECT_EQ(
+      "fake_fido_challenge",
+      *unmask_response_details_->fido_request_options->FindString("challenge"));
   // Verify the three challenge options are two sms challenge options and one
   // cvc challenge option, and fields can be correctly parsed.
   ASSERT_EQ(3u, unmask_response_details_->card_unmask_challenge_options.size());
@@ -825,9 +824,9 @@
   EXPECT_EQ(AutofillClient::PaymentsRpcResult::kSuccess, result_);
   EXPECT_EQ("fake_context_token", unmask_response_details_->context_token);
   // Verify the FIDO request challenge is correctly parsed.
-  EXPECT_EQ("fake_fido_challenge",
-            *unmask_response_details_->fido_request_options->FindStringKey(
-                "challenge"));
+  EXPECT_EQ(
+      "fake_fido_challenge",
+      *unmask_response_details_->fido_request_options->FindString("challenge"));
   // Verify that the unknow new challenge option type won't break the parsing.
   // We ignore the unknown new type, and only return the supported challenge
   // option.
@@ -1128,7 +1127,7 @@
   EXPECT_EQ(AutofillClient::PaymentsRpcResult::kSuccess, result_);
   EXPECT_FALSE(opt_change_response_.user_is_opted_in.value());
   EXPECT_EQ("google.com",
-            *opt_change_response_.fido_creation_options->FindStringKey(
+            *opt_change_response_.fido_creation_options->FindString(
                 "relying_party_id"));
 }
 

components/autofill/core/browser/payments/payments_requests/get_details_for_enrollment_request.cc

diff --git a/components/autofill/core/browser/payments/payments_requests/get_details_for_enrollment_request.cc b/components/autofill/core/browser/payments/payments_requests/get_details_for_enrollment_request.cc
index e748b4c..7e7f9b45 100644
--- a/components/autofill/core/browser/payments/payments_requests/get_details_for_enrollment_request.cc
+++ b/components/autofill/core/browser/payments/payments_requests/get_details_for_enrollment_request.cc
@@ -100,24 +100,24 @@
 }
 
 void GetDetailsForEnrollmentRequest::ParseResponse(
-    const base::Value& response) {
-  const base::Value* google_legal_message = response.FindKeyOfType(
-      "google_legal_message", base::Value::Type::DICTIONARY);
+    const base::Value::Dict& response) {
+  const base::Value::Dict* google_legal_message =
+      response.FindDict("google_legal_message");
   if (google_legal_message) {
     LegalMessageLine::Parse(*google_legal_message,
                             &response_details_.google_legal_message,
                             /*escape_apostrophes=*/true);
   }
 
-  const base::Value* external_legal_message = response.FindKeyOfType(
-      "external_legal_message", base::Value::Type::DICTIONARY);
+  const base::Value::Dict* external_legal_message =
+      response.FindDict("external_legal_message");
   if (external_legal_message) {
     LegalMessageLine::Parse(*external_legal_message,
                             &response_details_.issuer_legal_message,
                             /*escape_apostrophes=*/true);
   }
 
-  const auto* context_token = response.FindStringKey("context_token");
+  const auto* context_token = response.FindString("context_token");
   response_details_.vcn_context_token =
       context_token ? *context_token : std::string();
 }

components/autofill/core/browser/payments/payments_requests/get_details_for_enrollment_request.h

diff --git a/components/autofill/core/browser/payments/payments_requests/get_details_for_enrollment_request.h b/components/autofill/core/browser/payments/payments_requests/get_details_for_enrollment_request.h
index bda1b447..92db6b5 100644
--- a/components/autofill/core/browser/payments/payments_requests/get_details_for_enrollment_request.h
+++ b/components/autofill/core/browser/payments/payments_requests/get_details_for_enrollment_request.h
@@ -31,7 +31,7 @@
   std::string GetRequestUrlPath() override;
   std::string GetRequestContentType() override;
   std::string GetRequestContent() override;
-  void ParseResponse(const base::Value& response) override;
+  void ParseResponse(const base::Value::Dict& response) override;
   bool IsResponseComplete() override;
   void RespondToDelegate(AutofillClient::PaymentsRpcResult result) override;
 

components/autofill/core/browser/payments/payments_requests/get_details_for_enrollment_request_unittest.cc

diff --git a/components/autofill/core/browser/payments/payments_requests/get_details_for_enrollment_request_unittest.cc b/components/autofill/core/browser/payments/payments_requests/get_details_for_enrollment_request_unittest.cc
index 729d1e0..563b28b0 100644
--- a/components/autofill/core/browser/payments/payments_requests/get_details_for_enrollment_request_unittest.cc
+++ b/components/autofill/core/browser/payments/payments_requests/get_details_for_enrollment_request_unittest.cc
@@ -85,7 +85,7 @@
       "{ \"google_legal_message\": {}, \"external_legal_message\": {}, "
       "\"context_token\": \"some_token\" }");
   ASSERT_TRUE(response.has_value());
-  GetRequest()->ParseResponse(response.value());
+  GetRequest()->ParseResponse(response->GetDict());
 
   EXPECT_EQ(GetParsedResponse().vcn_context_token, "some_token");
   EXPECT_TRUE(GetParsedResponse().issuer_legal_message.empty());

components/autofill/core/browser/payments/payments_requests/get_unmask_details_request.cc

diff --git a/components/autofill/core/browser/payments/payments_requests/get_unmask_details_request.cc b/components/autofill/core/browser/payments/payments_requests/get_unmask_details_request.cc
index 500725b..900875f 100644
--- a/components/autofill/core/browser/payments/payments_requests/get_unmask_details_request.cc
+++ b/components/autofill/core/browser/payments/payments_requests/get_unmask_details_request.cc
@@ -53,8 +53,8 @@
   return request_content;
 }
 
-void GetUnmaskDetailsRequest::ParseResponse(const base::Value& response) {
-  const auto* method = response.FindStringKey("authentication_method");
+void GetUnmaskDetailsRequest::ParseResponse(const base::Value::Dict& response) {
+  const auto* method = response.FindString("authentication_method");
   if (method) {
     if (*method == "CVC") {
       unmask_details_.unmask_auth_method =
@@ -65,20 +65,20 @@
     }
   }
 
-  const auto* offer_fido_opt_in =
-      response.FindKeyOfType("offer_fido_opt_in", base::Value::Type::BOOLEAN);
+  const absl::optional<bool> offer_fido_opt_in =
+      response.FindBool("offer_fido_opt_in");
   unmask_details_.offer_fido_opt_in =
-      offer_fido_opt_in && offer_fido_opt_in->GetBool();
+      offer_fido_opt_in.has_value() && *offer_fido_opt_in;
 
-  const auto* dictionary_value = response.FindKeyOfType(
-      "fido_request_options", base::Value::Type::DICTIONARY);
+  const base::Value::Dict* dictionary_value =
+      response.FindDict("fido_request_options");
   if (dictionary_value)
     unmask_details_.fido_request_options = dictionary_value->Clone();
 
   const auto* fido_eligible_card_ids =
-      response.FindKeyOfType("fido_eligible_card_id", base::Value::Type::LIST);
+      response.FindList("fido_eligible_card_id");
   if (fido_eligible_card_ids) {
-    for (const base::Value& result : fido_eligible_card_ids->GetList()) {
+    for (const base::Value& result : *fido_eligible_card_ids) {
       unmask_details_.fido_eligible_card_ids.insert(result.GetString());
     }
   }

components/autofill/core/browser/payments/payments_requests/get_unmask_details_request.h

diff --git a/components/autofill/core/browser/payments/payments_requests/get_unmask_details_request.h b/components/autofill/core/browser/payments/payments_requests/get_unmask_details_request.h
index cb917e4..ae4e1046 100644
--- a/components/autofill/core/browser/payments/payments_requests/get_unmask_details_request.h
+++ b/components/autofill/core/browser/payments/payments_requests/get_unmask_details_request.h
@@ -33,7 +33,7 @@
   std::string GetRequestUrlPath() override;
   std::string GetRequestContentType() override;
   std::string GetRequestContent() override;
-  void ParseResponse(const base::Value& response) override;
+  void ParseResponse(const base::Value::Dict& response) override;
   bool IsResponseComplete() override;
   void RespondToDelegate(AutofillClient::PaymentsRpcResult result) override;
 

components/autofill/core/browser/payments/payments_requests/get_upload_details_request.cc

diff --git a/components/autofill/core/browser/payments/payments_requests/get_upload_details_request.cc b/components/autofill/core/browser/payments/payments_requests/get_upload_details_request.cc
index af9d0d2..ca3af53 100644
--- a/components/autofill/core/browser/payments/payments_requests/get_upload_details_request.cc
+++ b/components/autofill/core/browser/payments/payments_requests/get_upload_details_request.cc
@@ -10,6 +10,7 @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/values.h"
 
 namespace autofill::payments {
 
@@ -26,7 +27,7 @@
     const std::string& app_locale,
     base::OnceCallback<void(AutofillClient::PaymentsRpcResult,
                             const std::u16string&,
-                            std::unique_ptr<base::Value>,
+                            std::unique_ptr<base::Value::Dict>,
                             std::vector<std::pair<int, int>>)> callback,
     const int billable_service_number,
     const int64_t billing_customer_number,
@@ -117,18 +118,19 @@
   return request_content;
 }
 
-void GetUploadDetailsRequest::ParseResponse(const base::Value& response) {
-  const auto* context_token = response.FindStringKey("context_token");
+void GetUploadDetailsRequest::ParseResponse(const base::Value::Dict& response) {
+  const auto* context_token = response.FindString("context_token");
   context_token_ =
       context_token ? base::UTF8ToUTF16(*context_token) : std::u16string();
 
-  const base::Value* dictionary_value =
-      response.FindKeyOfType("legal_message", base::Value::Type::DICTIONARY);
+  const base::Value::Dict* dictionary_value =
+      response.FindDict("legal_message");
   if (dictionary_value)
-    legal_message_ = std::make_unique<base::Value>(dictionary_value->Clone());
+    legal_message_ =
+        std::make_unique<base::Value::Dict>(dictionary_value->Clone());
 
   const auto* supported_card_bin_ranges_string =
-      response.FindStringKey("supported_card_bin_ranges_string");
+      response.FindString("supported_card_bin_ranges_string");
   supported_card_bin_ranges_ = ParseSupportedCardBinRangesString(
       supported_card_bin_ranges_string ? *supported_card_bin_ranges_string
                                        : base::EmptyString());

components/autofill/core/browser/payments/payments_requests/get_upload_details_request.h

diff --git a/components/autofill/core/browser/payments/payments_requests/get_upload_details_request.h b/components/autofill/core/browser/payments/payments_requests/get_upload_details_request.h
index 44bd141..5b917149 100644
--- a/components/autofill/core/browser/payments/payments_requests/get_upload_details_request.h
+++ b/components/autofill/core/browser/payments/payments_requests/get_upload_details_request.h
@@ -8,14 +8,11 @@
 #include <string>
 
 #include "base/callback.h"
+#include "base/values.h"
 #include "components/autofill/core/browser/autofill_client.h"
 #include "components/autofill/core/browser/payments/payments_client.h"
 #include "components/autofill/core/browser/payments/payments_requests/payments_request.h"
 
-namespace base {
-class Value;
-}  // namespace base
-
 namespace autofill::payments {
 
 class GetUploadDetailsRequest : public PaymentsRequest {
@@ -28,7 +25,7 @@
       const std::string& app_locale,
       base::OnceCallback<void(AutofillClient::PaymentsRpcResult,
                               const std::u16string&,
-                              std::unique_ptr<base::Value>,
+                              std::unique_ptr<base::Value::Dict>,
                               std::vector<std::pair<int, int>>)> callback,
       const int billable_service_number,
       const int64_t billing_customer_number,
@@ -41,7 +38,7 @@
   std::string GetRequestUrlPath() override;
   std::string GetRequestContentType() override;
   std::string GetRequestContent() override;
-  void ParseResponse(const base::Value& response) override;
+  void ParseResponse(const base::Value::Dict& response) override;
   bool IsResponseComplete() override;
   void RespondToDelegate(AutofillClient::PaymentsRpcResult result) override;
 
@@ -60,11 +57,11 @@
   std::string app_locale_;
   base::OnceCallback<void(AutofillClient::PaymentsRpcResult,
                           const std::u16string&,
-                          std::unique_ptr<base::Value>,
+                          std::unique_ptr<base::Value::Dict>,
                           std::vector<std::pair<int, int>>)>
       callback_;
   std::u16string context_token_;
-  std::unique_ptr<base::Value> legal_message_;
+  std::unique_ptr<base::Value::Dict> legal_message_;
   std::vector<std::pair<int, int>> supported_card_bin_ranges_;
   const int billable_service_number_;
   PaymentsClient::UploadCardSource upload_card_source_;

components/autofill/core/browser/payments/payments_requests/migrate_cards_request.cc

diff --git a/components/autofill/core/browser/payments/payments_requests/migrate_cards_request.cc b/components/autofill/core/browser/payments/payments_requests/migrate_cards_request.cc
index 1d56278a..13584b2 100644
--- a/components/autofill/core/browser/payments/payments_requests/migrate_cards_request.cc
+++ b/components/autofill/core/browser/payments/payments_requests/migrate_cards_request.cc
@@ -88,15 +88,14 @@
   return request_content;
 }
 
-void MigrateCardsRequest::ParseResponse(const base::Value& response) {
-  const auto* found_list =
-      response.FindKeyOfType("save_result", base::Value::Type::LIST);
+void MigrateCardsRequest::ParseResponse(const base::Value::Dict& response) {
+  const auto* found_list = response.FindList("save_result");
   if (!found_list)
     return;
 
   save_result_ =
       std::make_unique<std::unordered_map<std::string, std::string>>();
-  for (const base::Value& result : found_list->GetList()) {
+  for (const base::Value& result : *found_list) {
     if (result.is_dict()) {
       const std::string* unique_id = result.FindStringKey("unique_id");
       const std::string* status = result.FindStringKey("status");
@@ -107,7 +106,7 @@
   }
 
   const std::string* display_text =
-      response.FindStringKey("value_prop_display_text");
+      response.FindString("value_prop_display_text");
   display_text_ = display_text ? *display_text : std::string();
 }
 

components/autofill/core/browser/payments/payments_requests/migrate_cards_request.h

diff --git a/components/autofill/core/browser/payments/payments_requests/migrate_cards_request.h b/components/autofill/core/browser/payments/payments_requests/migrate_cards_request.h
index 3455a52..52baf6b 100644
--- a/components/autofill/core/browser/payments/payments_requests/migrate_cards_request.h
+++ b/components/autofill/core/browser/payments/payments_requests/migrate_cards_request.h
@@ -34,7 +34,7 @@
   std::string GetRequestUrlPath() override;
   std::string GetRequestContentType() override;
   std::string GetRequestContent() override;
-  void ParseResponse(const base::Value& response) override;
+  void ParseResponse(const base::Value::Dict& response) override;
   bool IsResponseComplete() override;
   void RespondToDelegate(AutofillClient::PaymentsRpcResult result) override;
 

components/autofill/core/browser/payments/payments_requests/opt_change_request.cc

diff --git a/components/autofill/core/browser/payments/payments_requests/opt_change_request.cc b/components/autofill/core/browser/payments/payments_requests/opt_change_request.cc
index 18084dd..037c72e 100644
--- a/components/autofill/core/browser/payments/payments_requests/opt_change_request.cc
+++ b/components/autofill/core/browser/payments/payments_requests/opt_change_request.cc
@@ -85,24 +85,23 @@
   return request_content;
 }
 
-void OptChangeRequest::ParseResponse(const base::Value& response) {
-  const auto* fido_authentication_info = response.FindKeyOfType(
-      "fido_authentication_info", base::Value::Type::DICTIONARY);
+void OptChangeRequest::ParseResponse(const base::Value::Dict& response) {
+  const auto* fido_authentication_info =
+      response.FindDict("fido_authentication_info");
   if (!fido_authentication_info)
     return;
 
-  const auto* user_status =
-      fido_authentication_info->FindStringKey("user_status");
+  const auto* user_status = fido_authentication_info->FindString("user_status");
   if (user_status && *user_status != "UNKNOWN_USER_STATUS")
     response_details_.user_is_opted_in = (*user_status == "FIDO_AUTH_ENABLED");
 
-  const auto* fido_creation_options = fido_authentication_info->FindKeyOfType(
-      "fido_creation_options", base::Value::Type::DICTIONARY);
+  const auto* fido_creation_options =
+      fido_authentication_info->FindDict("fido_creation_options");
   if (fido_creation_options)
     response_details_.fido_creation_options = fido_creation_options->Clone();
 
-  const auto* fido_request_options = fido_authentication_info->FindKeyOfType(
-      "fido_request_options", base::Value::Type::DICTIONARY);
+  const auto* fido_request_options =
+      fido_authentication_info->FindDict("fido_request_options");
   if (fido_request_options)
     response_details_.fido_request_options = fido_request_options->Clone();
 }

components/autofill/core/browser/payments/payments_requests/opt_change_request.h

diff --git a/components/autofill/core/browser/payments/payments_requests/opt_change_request.h b/components/autofill/core/browser/payments/payments_requests/opt_change_request.h
index dcfcf6d0..38805389 100644
--- a/components/autofill/core/browser/payments/payments_requests/opt_change_request.h
+++ b/components/autofill/core/browser/payments/payments_requests/opt_change_request.h
@@ -34,7 +34,7 @@
   std::string GetRequestUrlPath() override;
   std::string GetRequestContentType() override;
   std::string GetRequestContent() override;
-  void ParseResponse(const base::Value& response) override;
+  void ParseResponse(const base::Value::Dict& response) override;
   bool IsResponseComplete() override;
   void RespondToDelegate(AutofillClient::PaymentsRpcResult result) override;
 

components/autofill/core/browser/payments/payments_requests/payments_request.h

diff --git a/components/autofill/core/browser/payments/payments_requests/payments_request.h b/components/autofill/core/browser/payments/payments_requests/payments_request.h
index e7d7921..457d75a 100644
--- a/components/autofill/core/browser/payments/payments_requests/payments_request.h
+++ b/components/autofill/core/browser/payments/payments_requests/payments_request.h
@@ -30,7 +30,7 @@
   virtual std::string GetRequestContent() = 0;
 
   // Parses the required elements of the HTTP response.
-  virtual void ParseResponse(const base::Value& response) = 0;
+  virtual void ParseResponse(const base::Value::Dict& response) = 0;
 
   // Returns true if all of the required elements were successfully retrieved by
   // a call to ParseResponse.

components/autofill/core/browser/payments/payments_requests/select_challenge_option_request.cc

diff --git a/components/autofill/core/browser/payments/payments_requests/select_challenge_option_request.cc b/components/autofill/core/browser/payments/payments_requests/select_challenge_option_request.cc
index 696b932..0de74bf 100644
--- a/components/autofill/core/browser/payments/payments_requests/select_challenge_option_request.cc
+++ b/components/autofill/core/browser/payments/payments_requests/select_challenge_option_request.cc
@@ -74,9 +74,10 @@
   return request_content;
 }
 
-void SelectChallengeOptionRequest::ParseResponse(const base::Value& response) {
+void SelectChallengeOptionRequest::ParseResponse(
+    const base::Value::Dict& response) {
   const std::string* updated_context_token =
-      response.FindStringKey("context_token");
+      response.FindString("context_token");
   updated_context_token_ =
       updated_context_token ? *updated_context_token : std::string();
 }

components/autofill/core/browser/payments/payments_requests/select_challenge_option_request.h

diff --git a/components/autofill/core/browser/payments/payments_requests/select_challenge_option_request.h b/components/autofill/core/browser/payments/payments_requests/select_challenge_option_request.h
index 5ac03798..9bf8d39 100644
--- a/components/autofill/core/browser/payments/payments_requests/select_challenge_option_request.h
+++ b/components/autofill/core/browser/payments/payments_requests/select_challenge_option_request.h
@@ -26,7 +26,7 @@
   std::string GetRequestUrlPath() override;
   std::string GetRequestContentType() override;
   std::string GetRequestContent() override;
-  void ParseResponse(const base::Value& response) override;
+  void ParseResponse(const base::Value::Dict& response) override;
   bool IsResponseComplete() override;
   void RespondToDelegate(AutofillClient::PaymentsRpcResult result) override;
 

components/autofill/core/browser/payments/payments_requests/unmask_card_request.cc

diff --git a/components/autofill/core/browser/payments/payments_requests/unmask_card_request.cc b/components/autofill/core/browser/payments/payments_requests/unmask_card_request.cc
index 7fc41620..cc8bff4 100644
--- a/components/autofill/core/browser/payments/payments_requests/unmask_card_request.cc
+++ b/components/autofill/core/browser/payments/payments_requests/unmask_card_request.cc
@@ -40,18 +40,18 @@
 // Parses the `defined_challenge_option` as an SMS OTP challenge option, and
 // sets the appropriate fields in `parsed_challenge_option`.
 void ParseAsSmsOtpChallengeOption(
-    const base::Value* defined_challenge_option,
+    const base::Value::Dict* defined_challenge_option,
     CardUnmaskChallengeOption* parsed_challenge_option) {
   parsed_challenge_option->type = CardUnmaskChallengeOptionType::kSmsOtp;
   const auto* challenge_id =
-      defined_challenge_option->FindStringKey("challenge_id");
+      defined_challenge_option->FindString("challenge_id");
   DCHECK(challenge_id);
   parsed_challenge_option->id = *challenge_id;
 
   // For SMS OTP challenge, masked phone number is the challenge_info for
   // display.
   const auto* masked_phone_number =
-      defined_challenge_option->FindStringKey("masked_phone_number");
+      defined_challenge_option->FindString("masked_phone_number");
   DCHECK(masked_phone_number);
   parsed_challenge_option->challenge_info =
       base::UTF8ToUTF16(*masked_phone_number);
@@ -60,7 +60,7 @@
   // in the OTP input dialog so that the user knows how many digits the OTP
   // should be.
   absl::optional<int> otp_length =
-      defined_challenge_option->FindIntKey("otp_length");
+      defined_challenge_option->FindInt("otp_length");
   parsed_challenge_option->challenge_input_length =
       otp_length ? *otp_length : kDefaultOtpLength;
 }
@@ -68,7 +68,7 @@
 // Parses the `defined_challenge_option` as a CVC challenge option, and sets the
 // appropriate fields in `parsed_challenge_option`.
 void ParseAsCvcChallengeOption(
-    const base::Value* defined_challenge_option,
+    const base::Value::Dict* defined_challenge_option,
     CardUnmaskChallengeOption* parsed_challenge_option) {
   parsed_challenge_option->type = CardUnmaskChallengeOptionType::kCvc;
 
@@ -76,7 +76,7 @@
   // option. The payments server will need this challenge id to know which
   // challenge option was selected.
   const auto* challenge_id =
-      defined_challenge_option->FindStringKey("challenge_id");
+      defined_challenge_option->FindString("challenge_id");
   DCHECK(challenge_id);
   parsed_challenge_option->id = *challenge_id;
 
@@ -84,7 +84,7 @@
   // but it is possible for this to be 4 digits, for example in the case of
   // the Card Identification Number on the front of an American Express card.
   absl::optional<int> cvc_length =
-      defined_challenge_option->FindIntKey("cvc_length");
+      defined_challenge_option->FindInt("cvc_length");
   parsed_challenge_option->challenge_input_length =
       cvc_length ? *cvc_length : kDefaultCvcLength;
 
@@ -96,7 +96,7 @@
   // end up displaying the authentication selection dialog.
   std::u16string challenge_info_position_string;
   const auto* cvc_position =
-      defined_challenge_option->FindStringKey("cvc_position");
+      defined_challenge_option->FindString("cvc_position");
   if (cvc_position) {
     if (*cvc_position == "CVC_POSITION_FRONT") {
       parsed_challenge_option->cvc_position = CvcPosition::kFrontOfCard;
@@ -125,15 +125,15 @@
 }
 
 CardUnmaskChallengeOption ParseCardUnmaskChallengeOption(
-    const base::Value& challenge_option) {
-  const base::Value* defined_challenge_option;
+    const base::Value::Dict& challenge_option) {
+  const base::Value::Dict* defined_challenge_option;
   CardUnmaskChallengeOption parsed_challenge_option;
 
   // Check if it's an SMS OTP challenge option, and if it is, set
   // `defined_challenge_option` to the defined challenge option found, parse the
   // challenge option, and return it.
-  if ((defined_challenge_option = challenge_option.FindKeyOfType(
-           "sms_otp_challenge_option", base::Value::Type::DICTIONARY))) {
+  if ((defined_challenge_option =
+           challenge_option.FindDict("sms_otp_challenge_option"))) {
     ParseAsSmsOtpChallengeOption(defined_challenge_option,
                                  &parsed_challenge_option);
   }
@@ -142,8 +142,8 @@
   // challenge option, and return it.
   else if (base::FeatureList::IsEnabled(
                features::kAutofillEnableCvcForVcnYellowPath) &&
-           (defined_challenge_option = challenge_option.FindKeyOfType(
-                "cvc_challenge_option", base::Value::Type::DICTIONARY))) {
+           (defined_challenge_option =
+                challenge_option.FindDict("cvc_challenge_option"))) {
     ParseAsCvcChallengeOption(defined_challenge_option,
                               &parsed_challenge_option);
   }
@@ -302,37 +302,36 @@
   return request_content;
 }
 
-void UnmaskCardRequest::ParseResponse(const base::Value& response) {
-  const std::string* pan = response.FindStringKey("pan");
+void UnmaskCardRequest::ParseResponse(const base::Value::Dict& response) {
+  const std::string* pan = response.FindString("pan");
   response_details_.real_pan = pan ? *pan : std::string();
 
-  const std::string* dcvv = response.FindStringKey("dcvv");
+  const std::string* dcvv = response.FindString("dcvv");
   response_details_.dcvv = dcvv ? *dcvv : std::string();
 
-  const base::Value* expiration =
-      response.FindKeyOfType("expiration", base::Value::Type::DICTIONARY);
+  const base::Value::Dict* expiration = response.FindDict("expiration");
   if (expiration) {
-    if (absl::optional<int> month = expiration->FindIntKey("month")) {
+    if (absl::optional<int> month = expiration->FindInt("month")) {
       response_details_.expiration_month = base::NumberToString(month.value());
     }
 
-    if (absl::optional<int> year = expiration->FindIntKey("year"))
+    if (absl::optional<int> year = expiration->FindInt("year")) {
       response_details_.expiration_year = base::NumberToString(year.value());
+    }
   }
 
-  const base::Value* request_options = response.FindKeyOfType(
-      "fido_request_options", base::Value::Type::DICTIONARY);
+  const base::Value::Dict* request_options =
+      response.FindDict("fido_request_options");
   if (request_options)
     response_details_.fido_request_options = request_options->Clone();
 
-  const base::Value* challenge_option_list =
-      response.FindKeyOfType("idv_challenge_options", base::Value::Type::LIST);
+  const base::Value::List* challenge_option_list =
+      response.FindList("idv_challenge_options");
   if (challenge_option_list) {
     std::vector<CardUnmaskChallengeOption> card_unmask_challenge_options;
-    for (const base::Value& challenge_option :
-         challenge_option_list->GetList()) {
+    for (const base::Value& challenge_option : *challenge_option_list) {
       CardUnmaskChallengeOption parsed_challenge_option =
-          ParseCardUnmaskChallengeOption(challenge_option);
+          ParseCardUnmaskChallengeOption(challenge_option.GetDict());
       // Only return successfully parsed challenge option.
       if (parsed_challenge_option.type !=
           CardUnmaskChallengeOptionType::kUnknownType) {
@@ -344,15 +343,15 @@
   }
 
   const std::string* card_authorization_token =
-      response.FindStringKey("card_authorization_token");
+      response.FindString("card_authorization_token");
   response_details_.card_authorization_token =
       card_authorization_token ? *card_authorization_token : std::string();
 
-  const std::string* context_token = response.FindStringKey("context_token");
+  const std::string* context_token = response.FindString("context_token");
   response_details_.context_token =
       context_token ? *context_token : std::string();
 
-  const std::string* flow_status = response.FindStringKey("flow_status");
+  const std::string* flow_status = response.FindString("flow_status");
   response_details_.flow_status = flow_status ? *flow_status : std::string();
 
   if (request_details_.card.record_type() == CreditCard::VIRTUAL_CARD) {
@@ -368,20 +367,20 @@
 
   if (base::FeatureList::IsEnabled(
           features::kAutofillEnableMerchantOptOutErrorDialog)) {
-    const base::Value* decline_details = response.FindKeyOfType(
-        "decline_details", base::Value::Type::DICTIONARY);
+    const base::Value::Dict* decline_details =
+        response.FindDict("decline_details");
     if (decline_details) {
       AutofillErrorDialogContext autofill_error_dialog_context;
 
       const std::string* user_message_title =
-          decline_details->FindStringKey("user_message_title");
+          decline_details->FindString("user_message_title");
       if (user_message_title && !user_message_title->empty()) {
         autofill_error_dialog_context.server_returned_title =
             *user_message_title;
       }
 
       const std::string* user_message_description =
-          decline_details->FindStringKey("user_message_description");
+          decline_details->FindString("user_message_description");
       if (user_message_description && !user_message_description->empty()) {
         autofill_error_dialog_context.server_returned_description =
             *user_message_description;

components/autofill/core/browser/payments/payments_requests/unmask_card_request.h

diff --git a/components/autofill/core/browser/payments/payments_requests/unmask_card_request.h b/components/autofill/core/browser/payments/payments_requests/unmask_card_request.h
index 0926984d..032a6ad 100644
--- a/components/autofill/core/browser/payments/payments_requests/unmask_card_request.h
+++ b/components/autofill/core/browser/payments/payments_requests/unmask_card_request.h
@@ -31,7 +31,7 @@
   std::string GetRequestUrlPath() override;
   std::string GetRequestContentType() override;
   std::string GetRequestContent() override;
-  void ParseResponse(const base::Value& response) override;
+  void ParseResponse(const base::Value::Dict& response) override;
   bool IsResponseComplete() override;
   void RespondToDelegate(AutofillClient::PaymentsRpcResult result) override;
   bool IsRetryableFailure(const std::string& error_code) override;

components/autofill/core/browser/payments/payments_requests/unmask_card_request_unittest.cc

diff --git a/components/autofill/core/browser/payments/payments_requests/unmask_card_request_unittest.cc b/components/autofill/core/browser/payments/payments_requests/unmask_card_request_unittest.cc
index 50d9894d..f5e3d8c5 100644
--- a/components/autofill/core/browser/payments/payments_requests/unmask_card_request_unittest.cc
+++ b/components/autofill/core/browser/payments/payments_requests/unmask_card_request_unittest.cc
@@ -137,15 +137,14 @@
         "\"cvc_challenge_option\":{ \"challenge_id\": \"fake_challenge_id_4\", "
         "\"cvc_length\": 4, \"cvc_position\": \"CVC_POSITION_FRONT\"}}]}");
     ASSERT_TRUE(response.has_value());
-    GetRequest()->ParseResponse(response.value());
+    GetRequest()->ParseResponse(response->GetDict());
 
     const PaymentsClient::UnmaskResponseDetails& response_details =
         GetParsedResponse();
     EXPECT_EQ("fake_context_token", response_details.context_token);
     // Verify the FIDO request challenge is correctly parsed.
-    EXPECT_EQ(
-        "fake_fido_challenge",
-        *response_details.fido_request_options->FindStringKey("challenge"));
+    EXPECT_EQ("fake_fido_challenge",
+              *response_details.fido_request_options->FindString("challenge"));
     // Verify the three challenge options are two sms challenge options and one
     // cvc challenge option, and fields can be correctly parsed.
     ASSERT_EQ(enable_cvc_challenge_option ? 4u : 2u,
@@ -196,7 +195,7 @@
     absl::optional<base::Value> response = base::JSONReader::Read(
         "{\"flow_status\": \"FLOW_STATUS_INCORRECT_ACCOUNT_SECURITY_CODE\"}");
     ASSERT_TRUE(response);
-    GetRequest()->ParseResponse(*response);
+    GetRequest()->ParseResponse(response->GetDict());
     EXPECT_TRUE(GetRequest()->IsRetryableFailure(""));
 
     // The next several tests ensure that `IsRetryableFailure()` returns false
@@ -208,7 +207,7 @@
         "\"\", \"user_message_description\": "
         "\"\"}}");
     ASSERT_TRUE(response);
-    GetRequest()->ParseResponse(*response);
+    GetRequest()->ParseResponse(response->GetDict());
     EXPECT_FALSE(GetRequest()->IsRetryableFailure(""));
 
     response = base::JSONReader::Read(
@@ -218,12 +217,12 @@
         "\"\", \"user_message_description\": "
         "\"\"}}");
     ASSERT_TRUE(response);
-    GetRequest()->ParseResponse(*response);
+    GetRequest()->ParseResponse(response->GetDict());
     EXPECT_FALSE(GetRequest()->IsRetryableFailure(""));
 
     response = base::JSONReader::Read("{ \"pan\": \"1234\" }");
     ASSERT_TRUE(response);
-    GetRequest()->ParseResponse(*response);
+    GetRequest()->ParseResponse(response->GetDict());
     EXPECT_FALSE(GetRequest()->IsRetryableFailure(""));
   }
 }

components/autofill/core/browser/payments/payments_requests/update_virtual_card_enrollment_request.cc

diff --git a/components/autofill/core/browser/payments/payments_requests/update_virtual_card_enrollment_request.cc b/components/autofill/core/browser/payments/payments_requests/update_virtual_card_enrollment_request.cc
index d62080e..6e49f9dbc 100644
--- a/components/autofill/core/browser/payments/payments_requests/update_virtual_card_enrollment_request.cc
+++ b/components/autofill/core/browser/payments/payments_requests/update_virtual_card_enrollment_request.cc
@@ -61,15 +61,14 @@
 }
 
 void UpdateVirtualCardEnrollmentRequest::ParseResponse(
-    const base::Value& response) {
+    const base::Value::Dict& response) {
   // Only enroll requests have a response to parse, unenroll request responses
   // are empty except for possible errors which are parsed in PaymentsClient.
   if (request_details_.virtual_card_enrollment_request_type ==
       VirtualCardEnrollmentRequestType::kEnroll) {
-    auto* enroll_result =
-        response.FindKeyOfType("enroll_result", base::Value::Type::STRING);
+    auto* enroll_result = response.FindString("enroll_result");
     if (enroll_result) {
-      enroll_result_ = enroll_result->GetString();
+      enroll_result_ = *enroll_result;
     }
   }
 }

components/autofill/core/browser/payments/payments_requests/update_virtual_card_enrollment_request.h

diff --git a/components/autofill/core/browser/payments/payments_requests/update_virtual_card_enrollment_request.h b/components/autofill/core/browser/payments/payments_requests/update_virtual_card_enrollment_request.h
index 04dab70..558e09c3 100644
--- a/components/autofill/core/browser/payments/payments_requests/update_virtual_card_enrollment_request.h
+++ b/components/autofill/core/browser/payments/payments_requests/update_virtual_card_enrollment_request.h
@@ -40,7 +40,7 @@
   std::string GetRequestUrlPath() override;
   std::string GetRequestContentType() override;
   std::string GetRequestContent() override;
-  void ParseResponse(const base::Value& response) override;
+  void ParseResponse(const base::Value::Dict& response) override;
   bool IsResponseComplete() override;
   void RespondToDelegate(AutofillClient::PaymentsRpcResult result) override;
 

components/autofill/core/browser/payments/payments_requests/update_virtual_card_enrollment_request_unittest.cc

diff --git a/components/autofill/core/browser/payments/payments_requests/update_virtual_card_enrollment_request_unittest.cc b/components/autofill/core/browser/payments/payments_requests/update_virtual_card_enrollment_request_unittest.cc
index 59443dff..e6c08d6 100644
--- a/components/autofill/core/browser/payments/payments_requests/update_virtual_card_enrollment_request_unittest.cc
+++ b/components/autofill/core/browser/payments/payments_requests/update_virtual_card_enrollment_request_unittest.cc
@@ -123,7 +123,7 @@
     absl::optional<base::Value> response =
         base::JSONReader::Read("{ \"enroll_result\": \"ENROLL_SUCCESS\" }");
     ASSERT_TRUE(response.has_value());
-    GetRequest()->ParseResponse(response.value());
+    GetRequest()->ParseResponse(response->GetDict());
 
     EXPECT_TRUE(GetRequest()->IsResponseComplete());
     return;
@@ -135,7 +135,7 @@
   if (std::get<1>(GetParam()) == VirtualCardEnrollmentSource::kSettingsPage) {
     absl::optional<base::Value> response = base::JSONReader::Read("{}");
     ASSERT_TRUE(response.has_value());
-    GetRequest()->ParseResponse(response.value());
+    GetRequest()->ParseResponse(response->GetDict());
 
     EXPECT_TRUE(GetRequest()->IsResponseComplete());
   }

components/autofill/core/browser/payments/payments_requests/upload_card_request.cc

diff --git a/components/autofill/core/browser/payments/payments_requests/upload_card_request.cc b/components/autofill/core/browser/payments/payments_requests/upload_card_request.cc
index d573cc65..8b7ccf70 100644
--- a/components/autofill/core/browser/payments/payments_requests/upload_card_request.cc
+++ b/components/autofill/core/browser/payments/payments_requests/upload_card_request.cc
@@ -119,9 +119,9 @@
   return request_content;
 }
 
-void UploadCardRequest::ParseResponse(const base::Value& response) {
+void UploadCardRequest::ParseResponse(const base::Value::Dict& response) {
   const std::string* response_instrument_id =
-      response.FindStringKey("instrument_id");
+      response.FindString("instrument_id");
   if (response_instrument_id) {
     int64_t instrument_id;
     if (base::StringToInt64(base::StringPiece(*response_instrument_id),
@@ -130,15 +130,15 @@
     }
   }
 
-  const std::string* card_art_url = response.FindStringKey("card_art_url");
+  const std::string* card_art_url = response.FindString("card_art_url");
   upload_card_response_details_.card_art_url =
       card_art_url ? GURL(*card_art_url) : GURL();
 
-  const auto* virtual_card_metadata = response.FindKeyOfType(
-      "virtual_card_metadata", base::Value::Type::DICTIONARY);
+  const auto* virtual_card_metadata =
+      response.FindDict("virtual_card_metadata");
   if (virtual_card_metadata) {
     const std::string* virtual_card_enrollment_status =
-        virtual_card_metadata->FindStringKey("status");
+        virtual_card_metadata->FindString("status");
     if (virtual_card_enrollment_status) {
       if (*virtual_card_enrollment_status == "ENROLLED") {
         upload_card_response_details_.virtual_card_enrollment_state =
@@ -155,14 +155,12 @@
     if (upload_card_response_details_.virtual_card_enrollment_state ==
         CreditCard::VirtualCardEnrollmentState::UNENROLLED_AND_ELIGIBLE) {
       const auto* virtual_card_enrollment_data =
-          virtual_card_metadata->FindKeyOfType("virtual_card_enrollment_data",
-                                               base::Value::Type::DICTIONARY);
+          virtual_card_metadata->FindDict("virtual_card_enrollment_data");
       if (virtual_card_enrollment_data) {
         PaymentsClient::GetDetailsForEnrollmentResponseDetails
             get_details_for_enrollment_response_details;
-        const base::Value* google_legal_message =
-            virtual_card_enrollment_data->FindKeyOfType(
-                "google_legal_message", base::Value::Type::DICTIONARY);
+        const base::Value::Dict* google_legal_message =
+            virtual_card_enrollment_data->FindDict("google_legal_message");
         if (google_legal_message) {
           LegalMessageLine::Parse(
               *google_legal_message,
@@ -170,9 +168,8 @@
               /*escape_apostrophes=*/true);
         }
 
-        const base::Value* external_legal_message =
-            virtual_card_enrollment_data->FindKeyOfType(
-                "external_legal_message", base::Value::Type::DICTIONARY);
+        const base::Value::Dict* external_legal_message =
+            virtual_card_enrollment_data->FindDict("external_legal_message");
         if (external_legal_message) {
           LegalMessageLine::Parse(
               *external_legal_message,
@@ -181,7 +178,7 @@
         }
 
         const auto* context_token =
-            virtual_card_enrollment_data->FindStringKey("context_token");
+            virtual_card_enrollment_data->FindString("context_token");
         get_details_for_enrollment_response_details.vcn_context_token =
             context_token ? *context_token : std::string();
 

components/autofill/core/browser/payments/payments_requests/upload_card_request.h

diff --git a/components/autofill/core/browser/payments/payments_requests/upload_card_request.h b/components/autofill/core/browser/payments/payments_requests/upload_card_request.h
index 3f7380f..38135434 100644
--- a/components/autofill/core/browser/payments/payments_requests/upload_card_request.h
+++ b/components/autofill/core/browser/payments/payments_requests/upload_card_request.h
@@ -34,7 +34,7 @@
   std::string GetRequestUrlPath() override;
   std::string GetRequestContentType() override;
   std::string GetRequestContent() override;
-  void ParseResponse(const base::Value& response) override;
+  void ParseResponse(const base::Value::Dict& response) override;
   bool IsResponseComplete() override;
   void RespondToDelegate(AutofillClient::PaymentsRpcResult result) override;
 

components/autofill/core/browser/payments/test_credit_card_fido_authenticator.cc

diff --git a/components/autofill/core/browser/payments/test_credit_card_fido_authenticator.cc b/components/autofill/core/browser/payments/test_credit_card_fido_authenticator.cc
index 406277c..664f742 100644
--- a/components/autofill/core/browser/payments/test_credit_card_fido_authenticator.cc
+++ b/components/autofill/core/browser/payments/test_credit_card_fido_authenticator.cc
@@ -23,7 +23,7 @@
 void TestCreditCardFIDOAuthenticator::Authenticate(
     const CreditCard* card,
     base::WeakPtr<Requester> requester,
-    base::Value request_options,
+    base::Value::Dict request_options,
     absl::optional<std::string> context_token) {
   authenticate_invoked_ = true;
   card_ = *card;

components/autofill/core/browser/payments/test_credit_card_fido_authenticator.h

diff --git a/components/autofill/core/browser/payments/test_credit_card_fido_authenticator.h b/components/autofill/core/browser/payments/test_credit_card_fido_authenticator.h
index 5507fe3..97a75ed 100644
--- a/components/autofill/core/browser/payments/test_credit_card_fido_authenticator.h
+++ b/components/autofill/core/browser/payments/test_credit_card_fido_authenticator.h
@@ -33,7 +33,7 @@
   // CreditCardFIDOAuthenticator:
   void Authenticate(const CreditCard* card,
                     base::WeakPtr<Requester> requester,
-                    base::Value request_options,
+                    base::Value::Dict request_options,
                     absl::optional<std::string> context_token) override;
   void IsUserVerifiable(base::OnceCallback<void(bool)> callback) override;
   bool IsUserOptedIn() override;

components/autofill/core/browser/payments/test_local_card_migration_manager.cc

diff --git a/components/autofill/core/browser/payments/test_local_card_migration_manager.cc b/components/autofill/core/browser/payments/test_local_card_migration_manager.cc
index e7690dc1..4527306 100644
--- a/components/autofill/core/browser/payments/test_local_card_migration_manager.cc
+++ b/components/autofill/core/browser/payments/test_local_card_migration_manager.cc
@@ -61,7 +61,7 @@
     bool is_from_settings_page,
     AutofillClient::PaymentsRpcResult result,
     const std::u16string& context_token,
-    std::unique_ptr<base::Value> legal_message,
+    std::unique_ptr<base::Value::Dict> legal_message,
     std::vector<std::pair<int, int>> supported_bin_ranges) {
   if (result == AutofillClient::PaymentsRpcResult::kSuccess) {
     local_card_migration_was_triggered_ = true;

components/autofill/core/browser/payments/test_local_card_migration_manager.h

diff --git a/components/autofill/core/browser/payments/test_local_card_migration_manager.h b/components/autofill/core/browser/payments/test_local_card_migration_manager.h
index 0b13ca46..75d3d80 100644
--- a/components/autofill/core/browser/payments/test_local_card_migration_manager.h
+++ b/components/autofill/core/browser/payments/test_local_card_migration_manager.h
@@ -69,7 +69,7 @@
       bool is_from_settings_page,
       AutofillClient::PaymentsRpcResult result,
       const std::u16string& context_token,
-      std::unique_ptr<base::Value> legal_message,
+      std::unique_ptr<base::Value::Dict> legal_message,
       std::vector<std::pair<int, int>> supported_bin_ranges) override;
 
   bool local_card_migration_was_triggered_ = false;

components/autofill/core/browser/payments/test_payments_client.cc

diff --git a/components/autofill/core/browser/payments/test_payments_client.cc b/components/autofill/core/browser/payments/test_payments_client.cc
index 8617689..42d57219 100644
--- a/components/autofill/core/browser/payments/test_payments_client.cc
+++ b/components/autofill/core/browser/payments/test_payments_client.cc
@@ -60,7 +60,7 @@
     const std::string& app_locale,
     base::OnceCallback<void(AutofillClient::PaymentsRpcResult,
                             const std::u16string&,
-                            std::unique_ptr<base::Value>,
+                            std::unique_ptr<base::Value::Dict>,
                             std::vector<std::pair<int, int>>)> callback,
     const int billable_service_number,
     const int64_t billing_customer_number,
@@ -149,8 +149,7 @@
   unmask_details_.offer_fido_opt_in = false;
   unmask_details_.unmask_auth_method = AutofillClient::UnmaskAuthMethod::kFido;
   unmask_details_.fido_eligible_card_ids.insert(server_id);
-  unmask_details_.fido_request_options =
-      base::Value(base::Value::Type::DICTIONARY);
+  unmask_details_.fido_request_options = base::Value::Dict();
 
   // Building the following JSON structure--
   // fido_request_options = {
@@ -161,25 +160,22 @@
   //       "credential_id": credential_id,
   //       "authenticator_transport_support": ["INTERNAL"]
   // }]}
-  unmask_details_.fido_request_options->SetKey("challenge",
-                                               base::Value(kTestChallenge));
-  unmask_details_.fido_request_options->SetKey(
-      "timeout_millis", base::Value(kTestTimeoutSeconds));
-  unmask_details_.fido_request_options->SetKey("relying_party_id",
-                                               base::Value(relying_party_id));
+  unmask_details_.fido_request_options->Set("challenge",
+                                            base::Value(kTestChallenge));
+  unmask_details_.fido_request_options->Set("timeout_millis",
+                                            base::Value(kTestTimeoutSeconds));
+  unmask_details_.fido_request_options->Set("relying_party_id",
+                                            base::Value(relying_party_id));
 
-  base::Value key_info(base::Value::Type::DICTIONARY);
+  base::Value::Dict key_info;
   if (!credential_id.empty())
-    key_info.SetKey("credential_id", base::Value(credential_id));
-  key_info.SetKey("authenticator_transport_support",
-                  base::Value(base::Value::Type::LIST));
-  key_info
-      .FindKeyOfType("authenticator_transport_support", base::Value::Type::LIST)
-      ->Append("INTERNAL");
-  unmask_details_.fido_request_options->SetKey(
+    key_info.Set("credential_id", base::Value(credential_id));
+  key_info.Set("authenticator_transport_support",
+               base::Value(base::Value::Type::LIST));
+  key_info.FindList("authenticator_transport_support")->Append("INTERNAL");
+  unmask_details_.fido_request_options->Set(
       "key_info", base::Value(base::Value::Type::LIST));
-  unmask_details_.fido_request_options
-      ->FindKeyOfType("key_info", base::Value::Type::LIST)
+  unmask_details_.fido_request_options->FindList("key_info")
       ->Append(std::move(key_info));
 }
 
@@ -210,10 +206,11 @@
       use_legal_message_with_multiple_lines;
 }
 
-std::unique_ptr<base::Value> TestPaymentsClient::LegalMessage() {
+std::unique_ptr<base::Value::Dict> TestPaymentsClient::LegalMessage() {
+  absl::optional<base::Value> parsed_json;
   if (use_invalid_legal_message_) {
     // Legal message is invalid because it's missing the url.
-    absl::optional<base::Value> parsed_json = base::JSONReader::Read(
+    parsed_json = base::JSONReader::Read(
         "{"
         "  \"line\" : [ {"
         "     \"template\": \"Panda {0}.\","
@@ -223,9 +220,8 @@
         "  } ]"
         "}");
     DCHECK(parsed_json);
-    return base::Value::ToUniquePtrValue(std::move(*parsed_json));
   } else if (use_legal_message_with_multiple_lines_) {
-    absl::optional<base::Value> parsed_json = base::JSONReader::Read(
+    parsed_json = base::JSONReader::Read(
         "{"
         "  \"line\": ["
         "    {"
@@ -256,10 +252,9 @@
         "    }"
         "  ]"
         "}");
-      DCHECK(parsed_json);
-      return base::Value::ToUniquePtrValue(std::move(*parsed_json));
+    DCHECK(parsed_json);
   } else {
-    absl::optional<base::Value> parsed_json = base::JSONReader::Read(
+    parsed_json = base::JSONReader::Read(
         "{"
         "  \"line\" : [ {"
         "     \"template\": \"The legal documents are: {0} and {1}.\","
@@ -272,9 +267,11 @@
         "     } ]"
         "  } ]"
         "}");
-      DCHECK(parsed_json);
-      return base::Value::ToUniquePtrValue(std::move(*parsed_json));
+    DCHECK(parsed_json);
   }
+  // TODO(crbug/1303949): Refactor when `base::JSONReader::Read` is updated to
+  // return a Dict.
+  return std::make_unique<base::Value::Dict>(std::move(parsed_json->GetDict()));
 }
 
 }  // namespace autofill::payments

components/autofill/core/browser/payments/test_payments_client.h

diff --git a/components/autofill/core/browser/payments/test_payments_client.h b/components/autofill/core/browser/payments/test_payments_client.h
index 8822e22..363bd7b 100644
--- a/components/autofill/core/browser/payments/test_payments_client.h
+++ b/components/autofill/core/browser/payments/test_payments_client.h
@@ -51,7 +51,7 @@
       const std::string& app_locale,
       base::OnceCallback<void(AutofillClient::PaymentsRpcResult,
                               const std::u16string&,
-                              std::unique_ptr<base::Value>,
+                              std::unique_ptr<base::Value::Dict>,
                               std::vector<std::pair<int, int>>)> callback,
       const int billable_service_number,
       const int64_t billing_customer_number,
@@ -184,7 +184,7 @@
   std::unique_ptr<std::unordered_map<std::string, std::string>> save_result_;
   bool use_invalid_legal_message_ = false;
   bool use_legal_message_with_multiple_lines_ = false;
-  std::unique_ptr<base::Value> LegalMessage();
+  std::unique_ptr<base::Value::Dict> LegalMessage();
   absl::optional<AutofillClient::PaymentsRpcResult>
       select_challenge_option_result_;
   absl::optional<AutofillClient::PaymentsRpcResult>

components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerExternalUma.java

diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerExternalUma.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerExternalUma.java
index fd20ad1..509dc05 100644
--- a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerExternalUma.java
+++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerExternalUma.java
@@ -29,8 +29,6 @@
     public static final int BACKGROUND_TASK_DEPRECATED_DOWNLOAD_RESUMPTION = 13;
     public static final int BACKGROUND_TASK_FEED_REFRESH = 14;
     public static final int BACKGROUND_TASK_COMPONENT_UPDATE = 15;
-    public static final int BACKGROUND_TASK_DEPRECATED_EXPLORE_SITES_REFRESH = 16;
-    public static final int BACKGROUND_TASK_EXPLORE_SITES_REFRESH = 17;
     public static final int BACKGROUND_TASK_DOWNLOAD_AUTO_RESUMPTION = 18;
     public static final int BACKGROUND_TASK_ONE_SHOT_SYNC_WAKE_UP = 19;
     public static final int BACKGROUND_TASK_NOTIFICATION_SCHEDULER = 20;
@@ -121,10 +119,6 @@
                 return BACKGROUND_TASK_FEED_REFRESH;
             case TaskIds.COMPONENT_UPDATE_JOB_ID:
                 return BACKGROUND_TASK_COMPONENT_UPDATE;
-            case TaskIds.DEPRECATED_EXPLORE_SITES_REFRESH_JOB_ID:
-                return BACKGROUND_TASK_DEPRECATED_EXPLORE_SITES_REFRESH;
-            case TaskIds.EXPLORE_SITES_REFRESH_JOB_ID:
-                return BACKGROUND_TASK_EXPLORE_SITES_REFRESH;
             case TaskIds.BACKGROUND_SYNC_ONE_SHOT_JOB_ID:
                 return BACKGROUND_TASK_ONE_SHOT_SYNC_WAKE_UP;
             case TaskIds.NOTIFICATION_SCHEDULER_JOB_ID:
@@ -188,10 +182,6 @@
                 return "FeedRefresh";
             case TaskIds.COMPONENT_UPDATE_JOB_ID:
                 return "ComponentUpdate";
-            case TaskIds.DEPRECATED_EXPLORE_SITES_REFRESH_JOB_ID:
-                return "DeprecatedExploreSitesRefresh";
-            case TaskIds.EXPLORE_SITES_REFRESH_JOB_ID:
-                return "ExploreSitesRefresh";
             case TaskIds.BACKGROUND_SYNC_ONE_SHOT_JOB_ID:
                 return "BackgroundSyncOneShot";
             case TaskIds.NOTIFICATION_SCHEDULER_JOB_ID:

components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerUmaTest.java

diff --git a/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerUmaTest.java b/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerUmaTest.java
index 4079684..6babb2b 100644
--- a/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerUmaTest.java
+++ b/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerUmaTest.java
@@ -107,12 +107,6 @@
         assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_COMPONENT_UPDATE,
                 BackgroundTaskSchedulerUma.toUmaEnumValueFromTaskId(
                         TaskIds.COMPONENT_UPDATE_JOB_ID));
-        assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_EXPLORE_SITES_REFRESH,
-                BackgroundTaskSchedulerUma.toUmaEnumValueFromTaskId(
-                        TaskIds.EXPLORE_SITES_REFRESH_JOB_ID));
-        assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_DEPRECATED_EXPLORE_SITES_REFRESH,
-                BackgroundTaskSchedulerUma.toUmaEnumValueFromTaskId(
-                        TaskIds.DEPRECATED_EXPLORE_SITES_REFRESH_JOB_ID));
         assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_ONE_SHOT_SYNC_WAKE_UP,
                 BackgroundTaskSchedulerUma.toUmaEnumValueFromTaskId(
                         TaskIds.BACKGROUND_SYNC_ONE_SHOT_JOB_ID));

components/background_task_scheduler/task_ids.h

diff --git a/components/background_task_scheduler/task_ids.h b/components/background_task_scheduler/task_ids.h
index 963b69d..277633c 100644
--- a/components/background_task_scheduler/task_ids.h
+++ b/components/background_task_scheduler/task_ids.h
@@ -40,8 +40,6 @@
   DOWNLOAD_LATER_JOB_ID = 57,
   FEED_REFRESH_JOB_ID = 22,
   COMPONENT_UPDATE_JOB_ID = 2,
-  DEPRECATED_EXPLORE_SITES_REFRESH_JOB_ID = 100,
-  EXPLORE_SITES_REFRESH_JOB_ID = 101,
   BACKGROUND_SYNC_ONE_SHOT_JOB_ID = 102,
   NOTIFICATION_SCHEDULER_JOB_ID = 103,
   NOTIFICATION_TRIGGER_JOB_ID = 104,

components/blocked_content/safe_browsing_triggered_popup_blocker.cc

diff --git a/components/blocked_content/safe_browsing_triggered_popup_blocker.cc b/components/blocked_content/safe_browsing_triggered_popup_blocker.cc
index b1e522c..e0e4153 100644
--- a/components/blocked_content/safe_browsing_triggered_popup_blocker.cc
+++ b/components/blocked_content/safe_browsing_triggered_popup_blocker.cc
@@ -45,12 +45,7 @@
 SafeBrowsingTriggeredPopupBlocker::PageData::PageData(content::Page& page)
     : PageUserData(page) {}
 
-SafeBrowsingTriggeredPopupBlocker::PageData::~PageData() {
-  if (is_triggered_) {
-    UMA_HISTOGRAM_COUNTS_100("ContentSettings.Popups.StrongBlocker.NumBlocked",
-                             num_popups_blocked_);
-  }
-}
+SafeBrowsingTriggeredPopupBlocker::PageData::~PageData() = default;
 
 SafeBrowsingTriggeredPopupBlocker::NavigationHandleData::NavigationHandleData(
     content::NavigationHandle&) {}

components/blocked_content/safe_browsing_triggered_popup_blocker_unittest.cc

diff --git a/components/blocked_content/safe_browsing_triggered_popup_blocker_unittest.cc b/components/blocked_content/safe_browsing_triggered_popup_blocker_unittest.cc
index 7328d68..b466b57 100644
--- a/components/blocked_content/safe_browsing_triggered_popup_blocker_unittest.cc
+++ b/components/blocked_content/safe_browsing_triggered_popup_blocker_unittest.cc
@@ -47,8 +47,6 @@
 #include "url/gurl.h"
 
 namespace blocked_content {
-const char kNumBlockedHistogram[] =
-    "ContentSettings.Popups.StrongBlocker.NumBlocked";
 
 class SafeBrowsingTriggeredPopupBlockerTestBase
     : public content::RenderViewHostTestHarness {
@@ -389,12 +387,8 @@
   check_histogram(SafeBrowsingTriggeredPopupBlocker::Action::kBlocked, 2);
   histogram_tester.ExpectTotalCount(kActionHistogram, total_count);
 
-  // Only log the num blocked histogram after navigation.
-  histogram_tester.ExpectTotalCount(kNumBlockedHistogram, 0);
-
   // Navigate to a warn site.
   NavigateAndCommit(url_warn);
-  histogram_tester.ExpectBucketCount(kNumBlockedHistogram, 2, 1);
 
   check_histogram(SafeBrowsingTriggeredPopupBlocker::Action::kNavigation, 2);
   check_histogram(SafeBrowsingTriggeredPopupBlocker::Action::kWarningSite, 1);
@@ -416,23 +410,6 @@
       web_contents()->GetPrimaryPage()));
   check_histogram(SafeBrowsingTriggeredPopupBlocker::Action::kConsidered, 4);
   histogram_tester.ExpectTotalCount(kActionHistogram, total_count);
-
-  histogram_tester.ExpectTotalCount(kNumBlockedHistogram, 1);
-}
-
-TEST_F(SafeBrowsingTriggeredPopupBlockerTest, LogBlockMetricsOnClose) {
-  base::HistogramTester histogram_tester;
-  const GURL url_enforce("https://example.enforce/");
-  MarkUrlAsAbusiveEnforce(url_enforce);
-
-  NavigateAndCommit(url_enforce);
-  EXPECT_TRUE(popup_blocker()->ShouldApplyAbusivePopupBlocker(
-      web_contents()->GetPrimaryPage()));
-
-  histogram_tester.ExpectTotalCount(kNumBlockedHistogram, 0);
-  // Simulate deleting the web contents.
-  SimulateDeleteContents();
-  histogram_tester.ExpectUniqueSample(kNumBlockedHistogram, 1, 1);
 }
 
 class SafeBrowsingTriggeredPopupBlockerFilterAdsDisabledTest

components/browser_ui/notifications/android/java/src/org/chromium/components/browser_ui/notifications/NotificationWrapperBuilder.java

diff --git a/components/browser_ui/notifications/android/java/src/org/chromium/components/browser_ui/notifications/NotificationWrapperBuilder.java b/components/browser_ui/notifications/android/java/src/org/chromium/components/browser_ui/notifications/NotificationWrapperBuilder.java
index f9ae19f7..d8e0431 100644
--- a/components/browser_ui/notifications/android/java/src/org/chromium/components/browser_ui/notifications/NotificationWrapperBuilder.java
+++ b/components/browser_ui/notifications/android/java/src/org/chromium/components/browser_ui/notifications/NotificationWrapperBuilder.java
@@ -94,8 +94,6 @@
 
     NotificationWrapperBuilder setSubText(CharSequence text);
 
-    NotificationWrapperBuilder setContentInfo(String info);
-
     NotificationWrapperBuilder setWhen(long time);
 
     NotificationWrapperBuilder setLargeIcon(Bitmap icon);

components/browser_ui/notifications/android/java/src/org/chromium/components/browser_ui/notifications/NotificationWrapperCompatBuilder.java

diff --git a/components/browser_ui/notifications/android/java/src/org/chromium/components/browser_ui/notifications/NotificationWrapperCompatBuilder.java b/components/browser_ui/notifications/android/java/src/org/chromium/components/browser_ui/notifications/NotificationWrapperCompatBuilder.java
index af8aa30..fc53d6f 100644
--- a/components/browser_ui/notifications/android/java/src/org/chromium/components/browser_ui/notifications/NotificationWrapperCompatBuilder.java
+++ b/components/browser_ui/notifications/android/java/src/org/chromium/components/browser_ui/notifications/NotificationWrapperCompatBuilder.java
@@ -217,12 +217,6 @@
     }
 
     @Override
-    public NotificationWrapperBuilder setContentInfo(String info) {
-        mBuilder.setContentInfo(info);
-        return this;
-    }
-
-    @Override
     public NotificationWrapperBuilder setWhen(long time) {
         mBuilder.setWhen(time);
         return this;

components/browser_ui/notifications/android/java/src/org/chromium/components/browser_ui/notifications/NotificationWrapperStandardBuilder.java

diff --git a/components/browser_ui/notifications/android/java/src/org/chromium/components/browser_ui/notifications/NotificationWrapperStandardBuilder.java b/components/browser_ui/notifications/android/java/src/org/chromium/components/browser_ui/notifications/NotificationWrapperStandardBuilder.java
index a2ddf6d..be94e64 100644
--- a/components/browser_ui/notifications/android/java/src/org/chromium/components/browser_ui/notifications/NotificationWrapperStandardBuilder.java
+++ b/components/browser_ui/notifications/android/java/src/org/chromium/components/browser_ui/notifications/NotificationWrapperStandardBuilder.java
@@ -19,8 +19,6 @@
 import androidx.core.app.NotificationCompat;
 
 import org.chromium.base.Log;
-import org.chromium.base.compat.ApiHelperForM;
-import org.chromium.base.compat.ApiHelperForN;
 import org.chromium.base.compat.ApiHelperForO;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.components.browser_ui.notifications.channels.ChannelsInitializer;
@@ -83,7 +81,7 @@
 
     @Override
     public NotificationWrapperBuilder setSmallIcon(Icon icon) {
-        ApiHelperForM.setSmallIcon(mBuilder, icon);
+        mBuilder.setSmallIcon(icon);
         return this;
     }
 
@@ -145,12 +143,11 @@
     @SuppressWarnings("deprecation")
     public NotificationWrapperBuilder addAction(
             int icon, CharSequence title, PendingIntent intent) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && icon != 0) {
-            mBuilder.addAction(ApiHelperForM
-                                       .newNotificationActionBuilder(
-                                               ApiHelperForM.createIconWithResource(mContext, icon),
-                                               title, intent)
-                                       .build());
+        if (icon != 0) {
+            mBuilder.addAction(
+                    new Notification.Action
+                            .Builder(Icon.createWithResource(mContext, icon), title, intent)
+                            .build());
         } else {
             mBuilder.addAction(icon, title, intent);
         }
@@ -226,17 +223,6 @@
     }
 
     @Override
-    @SuppressWarnings("deprecation")
-    public NotificationWrapperBuilder setContentInfo(String info) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-            mBuilder.setContentInfo(info);
-        } else {
-            mBuilder.setSubText(info);
-        }
-        return this;
-    }
-
-    @Override
     public NotificationWrapperBuilder setWhen(long time) {
         mBuilder.setWhen(time);
         return this;
@@ -287,11 +273,7 @@
     @Override
     @SuppressWarnings("deprecation")
     public NotificationWrapperBuilder setContent(RemoteViews views) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            ApiHelperForN.setCustomContentView(mBuilder, views);
-        } else {
-            mBuilder.setContent(views);
-        }
+        mBuilder.setCustomContentView(views);
         return this;
     }
 
@@ -300,11 +282,11 @@
             Bitmap bigPicture, CharSequence summaryText) {
         Notification.BigPictureStyle style =
                 new Notification.BigPictureStyle().bigPicture(bigPicture);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            // Android N doesn't show content text when expanded, so duplicate body text as a
-            // summary for the big picture.
-            style.setSummaryText(summaryText);
-        }
+
+        // Android N doesn't show content text when expanded, so duplicate body text as a
+        // summary for the big picture.
+        style.setSummaryText(summaryText);
+
         mBuilder.setStyle(style);
         return this;
     }
@@ -342,14 +324,7 @@
     @SuppressWarnings("deprecation")
     public NotificationWrapper buildWithBigContentView(RemoteViews view) {
         assert mMetadata != null;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            return new NotificationWrapper(
-                    ApiHelperForN.setCustomBigContentView(mBuilder, view).build(), mMetadata);
-        } else {
-            Notification notification = mBuilder.build();
-            notification.bigContentView = view;
-            return new NotificationWrapper(notification, mMetadata);
-        }
+        return new NotificationWrapper(mBuilder.setCustomBigContentView(view).build(), mMetadata);
     }
 
     @Override

components/browser_ui/share/android/java/src/org/chromium/components/browser_ui/share/ShareHelper.java

diff --git a/components/browser_ui/share/android/java/src/org/chromium/components/browser_ui/share/ShareHelper.java b/components/browser_ui/share/android/java/src/org/chromium/components/browser_ui/share/ShareHelper.java
index da93b0b..225507d0 100644
--- a/components/browser_ui/share/android/java/src/org/chromium/components/browser_ui/share/ShareHelper.java
+++ b/components/browser_ui/share/android/java/src/org/chromium/components/browser_ui/share/ShareHelper.java
@@ -22,7 +22,6 @@
 import android.content.res.Resources.NotFoundException;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.Build;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.AdapterView;
@@ -160,8 +159,7 @@
         }
 
         public static boolean isSupported() {
-            return !sForceCustomChooserForTesting
-                    && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1;
+            return !sForceCustomChooserForTesting;
         }
 
         public static void sendChooserIntent(WindowAndroid window, Intent sharingIntent,

components/cronet/cronet_context.cc

diff --git a/components/cronet/cronet_context.cc b/components/cronet/cronet_context.cc
index 7de9f12..56322ea 100644
--- a/components/cronet/cronet_context.cc
+++ b/components/cronet/cronet_context.cc
@@ -46,6 +46,7 @@
 #include "net/cert/cert_verifier.h"
 #include "net/cert/x509_certificate.h"
 #include "net/cookies/cookie_monster.h"
+#include "net/cookies/cookie_setting_override.h"
 #include "net/first_party_sets/first_party_set_metadata.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/transport_security_state.h"
@@ -122,6 +123,7 @@
   bool OnAnnotateAndMoveUserBlockedCookies(
       const net::URLRequest& request,
       const net::FirstPartySetMetadata& first_party_set_metadata,
+      net::CookieSettingOverrides overrides,
       net::CookieAccessResultList& maybe_included_cookies,
       net::CookieAccessResultList& excluded_cookies) override {
     // Disallow sending cookies by default.

components/feedback/pii_types.h

diff --git a/components/feedback/pii_types.h b/components/feedback/pii_types.h
index 5045a0f..e1d38878 100644
--- a/components/feedback/pii_types.h
+++ b/components/feedback/pii_types.h
@@ -45,7 +45,7 @@
   kUIHierarchyWindowTitles,
   // URLs that can appear in logs.
   kURL,
-  // Serial numbers.
+  // Serial numbers, which also includes PSM identifiers.
   kSerial,
   // SSID (Service Set Identifier) of wifi networks can be detected in the logs
   // provided by wpa_supplicant and shill. BSSID (Basic Service Set Identifier)

components/feedback/redaction_tool.cc

diff --git a/components/feedback/redaction_tool.cc b/components/feedback/redaction_tool.cc
index a5c31816..19a10a6c 100644
--- a/components/feedback/redaction_tool.cc
+++ b/components/feedback/redaction_tool.cc
@@ -97,6 +97,12 @@
     // appear first or last
     {"Serial", "(\"attested_device_id\"=\")([^-][0-9a-zA-Z-]+[^-])(\")",
      PIIType::kSerial},
+    // PSM identifier is a 4-character brand code, which can be encoded as 8 hex
+    // digits, followed by a slash ('/') and a serial number.
+    {"PSM ID",
+     "(?i)(PSM.*\\b)((?:[a-z]{4}|[0-9a-f]{8})\\/"
+     "[0-9a-z\\-.:\\/\\\\\\x00-\\x09\\x0B-\\x1F]+)(\\b)",
+     PIIType::kSerial},
 
     // GAIA IDs
     {"GAIA", R"xxx((\"?\bgaia_id\"?[=:]['\"])(\d+)(\b['\"]))xxx",

components/feedback/redaction_tool_unittest.cc

diff --git a/components/feedback/redaction_tool_unittest.cc b/components/feedback/redaction_tool_unittest.cc
index 9fb87ed..944c8bfc 100644
--- a/components/feedback/redaction_tool_unittest.cc
+++ b/components/feedback/redaction_tool_unittest.cc
@@ -428,6 +428,20 @@
   EXPECT_EQ("\"attested_device_id\"=\"5CD045B0DZ-\"",
             RedactCustomPatterns("\"attested_device_id\"=\"5CD045B0DZ-\""));
 
+  // Valid PSM identifiers.
+  EXPECT_EQ("PSM id: <PSM ID: 1>", RedactCustomPatterns("PSM id: ABCZ/123xx"));
+  EXPECT_EQ("psm: <PSM ID: 2>", RedactCustomPatterns("psm: ABC123F2/123xx"));
+  EXPECT_EQ("PsM: <PSM ID: 3>", RedactCustomPatterns("PsM: abcf6677/123xx"));
+  EXPECT_EQ("PSM determination successful. Identifier <PSM ID: 4> not present.",
+            RedactCustomPatterns("PSM determination successful. Identifier "
+                                 "JTFE/223PE6015195 not present."));
+  // Wrong number of brand code characters.
+  EXPECT_EQ("PSM: ABC/123xx", RedactCustomPatterns("PSM: ABC/123xx"));
+  // Non-hex brand code.
+  EXPECT_EQ("PSM: zefg0000/123xx", RedactCustomPatterns("PSM: zefg0000/123xx"));
+  // No mention of PSM prior to identifier, e.g. in unrelated paths.
+  EXPECT_EQ("/root/123xx", RedactCustomPatterns("/root/123xx"));
+
   EXPECT_EQ("\"gaia_id\":\"<GAIA: 1>\"",
             RedactCustomPatterns("\"gaia_id\":\"1234567890\""));
   EXPECT_EQ("gaia_id='<GAIA: 2>'", RedactCustomPatterns("gaia_id='987654321'"));

components/messages/android/internal/java/src/org/chromium/components/messages/MessageAnimationCoordinator.java

diff --git a/components/messages/android/internal/java/src/org/chromium/components/messages/MessageAnimationCoordinator.java b/components/messages/android/internal/java/src/org/chromium/components/messages/MessageAnimationCoordinator.java
index 47b40e7..8aebdd6 100644
--- a/components/messages/android/internal/java/src/org/chromium/components/messages/MessageAnimationCoordinator.java
+++ b/components/messages/android/internal/java/src/org/chromium/components/messages/MessageAnimationCoordinator.java
@@ -260,10 +260,14 @@
         if (currentFront == null) {
             // No message is being displayed now: trigger #onStartShowing.
             mCurrentDisplayedMessages = new ArrayList<>(candidates);
+            // Use ref because when startShowing is finished, other animation might have been
+            // triggered such that those two member variables have been mutated.
+            var frontAnimator = mFrontAnimator;
+            var backAnimator = mBackAnimator;
             mMessageQueueDelegate.onStartShowing(() -> {
                 if (candidates.get(0) == mCurrentDisplayedMessages.get(0)
                         && candidates.get(1) == mCurrentDisplayedMessages.get(1)) {
-                    triggerStackingAnimation(candidates, onFinished, mFrontAnimator, mBackAnimator);
+                    triggerStackingAnimation(candidates, onFinished, frontAnimator, backAnimator);
                 }
             });
         } else if (nextFront == null) {

components/messages/android/internal/java/src/org/chromium/components/messages/MessageAnimationCoordinatorUnitTest.java

diff --git a/components/messages/android/internal/java/src/org/chromium/components/messages/MessageAnimationCoordinatorUnitTest.java b/components/messages/android/internal/java/src/org/chromium/components/messages/MessageAnimationCoordinatorUnitTest.java
index dde6359..81ac3ef 100644
--- a/components/messages/android/internal/java/src/org/chromium/components/messages/MessageAnimationCoordinatorUnitTest.java
+++ b/components/messages/android/internal/java/src/org/chromium/components/messages/MessageAnimationCoordinatorUnitTest.java
@@ -486,6 +486,54 @@
         verify(mAnimatorStartCallback, times(1)).onResult(any());
     }
 
+    // Test showing animation is triggered after hiding animation is started.
+    @Test
+    @SmallTest
+    public void testObsoleteShowingAnimationByOnStartedShowing() {
+        mAnimationCoordinator = new MessageAnimationCoordinator(mContainer, mAnimatorStartCallback);
+        MessageQueueDelegate queueDelegate = Mockito.mock(MessageQueueDelegate.class);
+        mAnimationCoordinator.setMessageQueueDelegate(queueDelegate);
+        var currentMessages = mAnimationCoordinator.getCurrentDisplayedMessages();
+        Assert.assertArrayEquals(new MessageState[] {null, null}, currentMessages.toArray());
+        HistogramDelta d1 = new HistogramDelta(MessagesMetrics.STACKING_HISTOGRAM_NAME,
+                MessagesMetrics.StackingAnimationType.SHOW_ALL);
+        HistogramDelta d2 = new HistogramDelta(MessagesMetrics.STACKING_ACTION_HISTOGRAM_PREFIX
+                        + MessagesMetrics.stackingAnimationActionToHistogramSuffix(
+                                MessagesMetrics.StackingAnimationAction.INSERT_AT_FRONT),
+                1);
+        HistogramDelta d3 = new HistogramDelta(MessagesMetrics.STACKING_ACTION_HISTOGRAM_PREFIX
+                        + MessagesMetrics.stackingAnimationActionToHistogramSuffix(
+                                MessagesMetrics.StackingAnimationAction.INSERT_AT_BACK),
+                2);
+        MessageState m1 = buildMessageState();
+        setMessageIdentifier(m1, 1);
+        MessageState m2 = buildMessageState();
+        setMessageIdentifier(m2, 2);
+        ArgumentCaptor<Runnable> captor = ArgumentCaptor.forClass(Runnable.class);
+        mAnimationCoordinator.updateWithStacking(Arrays.asList(m1, m2), false, () -> {});
+        verify(queueDelegate).onStartShowing(captor.capture());
+        Assert.assertEquals(1, d1.getDelta());
+        Assert.assertEquals(1, d2.getDelta());
+        Assert.assertEquals(1, d3.getDelta());
+        verify(m1.handler).show(Position.INVISIBLE, Position.FRONT);
+        verify(m2.handler).show(Position.FRONT, Position.BACK);
+        currentMessages = mAnimationCoordinator.getCurrentDisplayedMessages();
+        Assert.assertArrayEquals(new MessageState[] {m1, m2}, currentMessages.toArray());
+        verify(mAnimatorStartCallback, never()).onResult(any());
+
+        mAnimationCoordinator.updateWithStacking(Arrays.asList(null, null), false, () -> {});
+        verify(m1.handler).hide(anyInt(), anyInt(), anyBoolean());
+        verify(m2.handler).hide(anyInt(), anyInt(), anyBoolean());
+        verify(queueDelegate, times(1)).onAnimationStart();
+        verify(mAnimatorStartCallback, times(1)).onResult(any());
+
+        // Trigger showing animation after hiding animation is started.
+        captor.getValue().run();
+        verify(mContainer).runAfterInitialMessageLayout(captor.capture());
+        captor.getValue().run();
+        verify(queueDelegate, times(1)).onAnimationStart();
+        verify(mAnimatorStartCallback, times(1)).onResult(any());
+    }
     private void setMessageIdentifier(MessageState message, int messageIdentifier) {
         doReturn(messageIdentifier).when(message.handler).getMessageIdentifier();
     }

components/messages/android/java/src/org/chromium/components/messages/MessageContainer.java

diff --git a/components/messages/android/java/src/org/chromium/components/messages/MessageContainer.java b/components/messages/android/java/src/org/chromium/components/messages/MessageContainer.java
index e8ac38d..2397aad1 100644
--- a/components/messages/android/java/src/org/chromium/components/messages/MessageContainer.java
+++ b/components/messages/android/java/src/org/chromium/components/messages/MessageContainer.java
@@ -16,12 +16,15 @@
 import androidx.core.view.ViewCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat;
 
+import org.chromium.base.Log;
 import org.chromium.base.TraceEvent;
 
 /**
  * Container holding messages.
  */
 public class MessageContainer extends FrameLayout {
+    private static final String TAG = "MessageContainer";
+
     interface MessageContainerA11yDelegate {
         void onA11yFocused();
         void onA11yFocusCleared();
@@ -99,6 +102,10 @@
 
     public int getMessageBannerHeight() {
         assert getChildCount() > 0;
+        // TODO(https://crbug.com/1382275): remove this log after fix.
+        if (getChildAt(0) == null) {
+            Log.w(TAG, "Null child in message container; child count %s", getChildCount());
+        }
         return getChildAt(0).getHeight();
     }
 

components/omnibox/browser/BUILD.gn

diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn
index 00091f3..b93fbab 100644
--- a/components/omnibox/browser/BUILD.gn
+++ b/components/omnibox/browser/BUILD.gn
@@ -106,6 +106,8 @@
     "autocomplete_classifier.h",
     "autocomplete_controller.cc",
     "autocomplete_controller.h",
+    "autocomplete_controller_emitter.cc",
+    "autocomplete_controller_emitter.h",
     "autocomplete_controller_metrics.cc",
     "autocomplete_controller_metrics.h",
     "autocomplete_grouper_groups.cc",
@@ -174,8 +176,6 @@
     "omnibox_client.h",
     "omnibox_controller.cc",
     "omnibox_controller.h",
-    "omnibox_controller_emitter.cc",
-    "omnibox_controller_emitter.h",
     "omnibox_edit_controller.cc",
     "omnibox_edit_controller.h",
     "omnibox_edit_model.cc",

components/omnibox/browser/autocomplete_controller_emitter.cc

diff --git a/components/omnibox/browser/autocomplete_controller_emitter.cc b/components/omnibox/browser/autocomplete_controller_emitter.cc
new file mode 100644
index 0000000..5156b09
--- /dev/null
+++ b/components/omnibox/browser/autocomplete_controller_emitter.cc
@@ -0,0 +1,90 @@
+// Copyright 2018 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "autocomplete_controller_emitter.h"
+
+#include "base/observer_list.h"
+#include "build/build_config.h"
+
+#if !BUILDFLAG(IS_IOS)
+#include "base/memory/singleton.h"
+#include "components/keyed_service/content/browser_context_dependency_manager.h"
+#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
+#endif  // !BUILDFLAG(IS_IOS)
+
+namespace {
+
+#if !BUILDFLAG(IS_IOS)
+class AutocompleteControllerEmitterFactory
+    : public BrowserContextKeyedServiceFactory {
+ public:
+  static AutocompleteControllerEmitter* GetForBrowserContext(
+      content::BrowserContext* context) {
+    return static_cast<AutocompleteControllerEmitter*>(
+        GetInstance()->GetServiceForBrowserContext(context, true));
+  }
+
+  static AutocompleteControllerEmitterFactory* GetInstance() {
+    return base::Singleton<AutocompleteControllerEmitterFactory>::get();
+  }
+
+  AutocompleteControllerEmitterFactory()
+      : BrowserContextKeyedServiceFactory(
+            "AutocompleteControllerEmitter",
+            BrowserContextDependencyManager::GetInstance()) {}
+
+ private:
+  // BrowserContextKeyedServiceFactory overrides
+
+  KeyedService* BuildServiceInstanceFor(
+      content::BrowserContext* context) const override {
+    return new AutocompleteControllerEmitter();
+  }
+
+  content::BrowserContext* GetBrowserContextToUse(
+      content::BrowserContext* context) const override {
+    return context;
+  }
+};
+#endif  // !BUILDFLAG(IS_IOS)
+
+}  // namespace
+
+AutocompleteControllerEmitter::AutocompleteControllerEmitter() = default;
+AutocompleteControllerEmitter::~AutocompleteControllerEmitter() = default;
+
+#if !BUILDFLAG(IS_IOS)
+// static
+AutocompleteControllerEmitter*
+AutocompleteControllerEmitter::GetForBrowserContext(
+    content::BrowserContext* browser_context) {
+  return AutocompleteControllerEmitterFactory::GetForBrowserContext(
+      browser_context);
+}
+#endif  // !BUILDFLAG(IS_IOS)
+
+void AutocompleteControllerEmitter::AddObserver(
+    AutocompleteController::Observer* observer) {
+  observers_.AddObserver(observer);
+}
+
+void AutocompleteControllerEmitter::RemoveObserver(
+    AutocompleteController::Observer* observer) {
+  observers_.RemoveObserver(observer);
+}
+
+void AutocompleteControllerEmitter::OnStart(AutocompleteController* controller,
+                                            const AutocompleteInput& input) {
+  for (auto& observer : observers_) {
+    observer.OnStart(controller, input);
+  }
+}
+
+void AutocompleteControllerEmitter::OnResultChanged(
+    AutocompleteController* controller,
+    bool default_match_changed) {
+  for (auto& observer : observers_) {
+    observer.OnResultChanged(controller, default_match_changed);
+  }
+}

components/omnibox/browser/autocomplete_controller_emitter.h

diff --git a/components/omnibox/browser/omnibox_controller_emitter.h b/components/omnibox/browser/autocomplete_controller_emitter.h
similarity index 66%
rename from components/omnibox/browser/omnibox_controller_emitter.h
rename to components/omnibox/browser/autocomplete_controller_emitter.h
index 54e7878..80e8efd 100644
--- a/components/omnibox/browser/omnibox_controller_emitter.h
+++ b/components/omnibox/browser/autocomplete_controller_emitter.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 COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_CONTROLLER_EMITTER_H_
-#define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_CONTROLLER_EMITTER_H_
+#ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_CONTROLLER_EMITTER_H_
+#define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_CONTROLLER_EMITTER_H_
 
 #include "base/observer_list.h"
 #include "build/build_config.h"
@@ -18,18 +18,19 @@
 // instances and forward the notifications to its own observers.
 // Its main purpose is to act as a bridge between the chrome://omnibox WebUI
 // handler, and the many usages of AutocompleteController (Views, NTP, Android).
-class OmniboxControllerEmitter : public KeyedService,
-                                 public AutocompleteController::Observer {
+class AutocompleteControllerEmitter : public KeyedService,
+                                      public AutocompleteController::Observer {
  public:
 #if !BUILDFLAG(IS_IOS)
-  static OmniboxControllerEmitter* GetForBrowserContext(
+  static AutocompleteControllerEmitter* GetForBrowserContext(
       content::BrowserContext* browser_context);
 #endif  // !BUILDFLAG(IS_IOS)
 
-  OmniboxControllerEmitter();
-  ~OmniboxControllerEmitter() override;
-  OmniboxControllerEmitter(const OmniboxControllerEmitter&) = delete;
-  OmniboxControllerEmitter& operator=(const OmniboxControllerEmitter&) = delete;
+  AutocompleteControllerEmitter();
+  ~AutocompleteControllerEmitter() override;
+  AutocompleteControllerEmitter(const AutocompleteControllerEmitter&) = delete;
+  AutocompleteControllerEmitter& operator=(
+      const AutocompleteControllerEmitter&) = delete;
 
   // Add/remove observer.
   void AddObserver(AutocompleteController::Observer* observer);
@@ -45,4 +46,4 @@
   base::ObserverList<AutocompleteController::Observer> observers_;
 };
 
-#endif  // COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_CONTROLLER_EMITTER_H_
+#endif  // COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_CONTROLLER_EMITTER_H_

components/omnibox/browser/document_provider.cc

diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibox/browser/document_provider.cc
index 0b4007223..e2578497 100644
--- a/components/omnibox/browser/document_provider.cc
+++ b/components/omnibox/browser/document_provider.cc
@@ -194,11 +194,12 @@
     return {};
 
   const auto& list = values->GetList();
-  std::vector<const std::string*> extracted(list.size());
-  std::transform(list.begin(), list.end(), extracted.begin(),
-                 [field_path](const auto& value) {
-                   return value.FindStringKey(field_path);
-                 });
+  std::vector<const std::string*> extracted;
+  for (const auto& value : list) {
+    auto* string = value.FindStringKey(field_path);
+    if (string)
+      extracted.push_back(string);
+  }
   return extracted;
 }
 
@@ -1032,7 +1033,7 @@
       }
       auto owners = ExtractResultList(&result, "metadata.owner.personNames",
                                       "displayName");
-      const std::string owner = !owners.empty() && owners[0] ? *owners[0] : "";
+      const std::string owner = !owners.empty() ? *owners[0] : "";
       if (!owner.empty())
         match.RecordAdditionalInfo("document owner", owner);
       match.description = GetMatchDescription(update_time, mimetype, owner);

components/omnibox/browser/document_provider_unittest.cc

diff --git a/components/omnibox/browser/document_provider_unittest.cc b/components/omnibox/browser/document_provider_unittest.cc
index 19f139db..af6bb37 100644
--- a/components/omnibox/browser/document_provider_unittest.cc
+++ b/components/omnibox/browser/document_provider_unittest.cc
@@ -1078,7 +1078,8 @@
               [{"emailAddress": "GoodemaiL@gmail.com"}]
             }}},
           {"title": "Document 2", "score": 1150, "url": "url"},
-          {"title": "Document 3", "score": 1150, "url": "url"}
+          {"title": "Document 3", "score": 1150, "url": "url",
+            "metadata": {"owner": {"emailAddresses": [{}] }} }
         ]})",
       "input", {1150, 950, 949});
 
@@ -1394,15 +1395,14 @@
     ACMatches matches = provider_->ParseDocumentSearchResults(*response);
 
     ASSERT_EQ(matches.size(), expected_scores.size());
-    for (size_t i = 0; i < matches.size(); i++) {
+    for (size_t i = 0; i < matches.size(); i++)
       EXPECT_EQ(matches[i].relevance, expected_scores[i]) << "Match " << i;
-    }
   };
 
   {
     SCOPED_TRACE(
         "Unowned and non-title matching docs are limited. Title matching docs "
-        "are not limited");
+        "are not limited.");
     test(true,
          R"({"results": [
           {"title": "bad title1 title2",  "score": 1000, "url": "good url isn't sufficient"},
@@ -1451,4 +1451,27 @@
         ]})",
          "goo title1", {1000, 999, 998, 997, 996, 995, 994});
   }
+
+  {
+    SCOPED_TRACE("Responses with missing owner don't crash and are limited.");
+    test(true,
+         R"({"results": [
+            {"title": "title", "score": 1000,  "url": "url", "metadata":
+              { "owner": { "emailAddresses": [{}] } }
+            },
+            {"title": "title", "score": 999,  "url": "url", "metadata":
+              { "owner": { "emailAddresses": [{}] } }
+            },
+            {"title": "title", "score": 998,  "url": "url", "metadata":
+              { "owner": { "emailAddresses": [] } }
+            },
+            {"title": "title", "score": 997,  "url": "url", "metadata":
+              { "owner": {} }
+            },
+            {"title": "title", "score": 996,  "url": "url", "metadata": {}},
+            {"title": "title", "score": 995,  "url": "url"},
+            {}
+          ]})",
+         "input", {1000, 0, 0, 0, 0, 0});
+  }
 }

components/omnibox/browser/omnibox_client.cc

diff --git a/components/omnibox/browser/omnibox_client.cc b/components/omnibox/browser/omnibox_client.cc
index 5eee0fc1..e497a7a 100644
--- a/components/omnibox/browser/omnibox_client.cc
+++ b/components/omnibox/browser/omnibox_client.cc
@@ -41,7 +41,8 @@
   return nullptr;
 }
 
-OmniboxControllerEmitter* OmniboxClient::GetOmniboxControllerEmitter() {
+AutocompleteControllerEmitter*
+OmniboxClient::GetAutocompleteControllerEmitter() {
   return nullptr;
 }
 

components/omnibox/browser/omnibox_client.h

diff --git a/components/omnibox/browser/omnibox_client.h b/components/omnibox/browser/omnibox_client.h
index b678df8..6325b64 100644
--- a/components/omnibox/browser/omnibox_client.h
+++ b/components/omnibox/browser/omnibox_client.h
@@ -33,7 +33,7 @@
 struct VectorIcon;
 }
 
-class OmniboxControllerEmitter;
+class AutocompleteControllerEmitter;
 
 using BitmapFetchedCallback =
     base::RepeatingCallback<void(int result_index, const SkBitmap& bitmap)>;
@@ -87,7 +87,7 @@
       omnibox::mojom::NavigationPredictor navigation_predictor) {}
 
   virtual bookmarks::BookmarkModel* GetBookmarkModel();
-  virtual OmniboxControllerEmitter* GetOmniboxControllerEmitter();
+  virtual AutocompleteControllerEmitter* GetAutocompleteControllerEmitter();
   virtual TemplateURLService* GetTemplateURLService();
   virtual const AutocompleteSchemeClassifier& GetSchemeClassifier() const = 0;
   virtual AutocompleteClassifier* GetAutocompleteClassifier();

components/omnibox/browser/omnibox_controller.cc

diff --git a/components/omnibox/browser/omnibox_controller.cc b/components/omnibox/browser/omnibox_controller.cc
index 8ed9c38..67207ba 100644
--- a/components/omnibox/browser/omnibox_controller.cc
+++ b/components/omnibox/browser/omnibox_controller.cc
@@ -7,9 +7,9 @@
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
+#include "components/omnibox/browser/autocomplete_controller_emitter.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/omnibox_client.h"
-#include "components/omnibox/browser/omnibox_controller_emitter.h"
 #include "components/omnibox/browser/omnibox_edit_controller.h"
 #include "components/omnibox/browser/omnibox_edit_model.h"
 #include "components/omnibox/browser/omnibox_popup_selection.h"
@@ -25,7 +25,8 @@
           AutocompleteClassifier::DefaultOmniboxProviders())) {
   autocomplete_controller_->AddObserver(this);
 
-  OmniboxControllerEmitter* emitter = client_->GetOmniboxControllerEmitter();
+  AutocompleteControllerEmitter* emitter =
+      client_->GetAutocompleteControllerEmitter();
   if (emitter)
     autocomplete_controller_->AddObserver(emitter);
 }

components/omnibox/browser/omnibox_controller_emitter.cc

diff --git a/components/omnibox/browser/omnibox_controller_emitter.cc b/components/omnibox/browser/omnibox_controller_emitter.cc
deleted file mode 100644
index d1a6fe3..0000000
--- a/components/omnibox/browser/omnibox_controller_emitter.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2018 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "omnibox_controller_emitter.h"
-
-#include "base/observer_list.h"
-#include "build/build_config.h"
-
-#if !BUILDFLAG(IS_IOS)
-#include "base/memory/singleton.h"
-#include "components/keyed_service/content/browser_context_dependency_manager.h"
-#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
-#endif  // !BUILDFLAG(IS_IOS)
-
-namespace {
-
-#if !BUILDFLAG(IS_IOS)
-class OmniboxControllerEmitterFactory
-    : public BrowserContextKeyedServiceFactory {
- public:
-  static OmniboxControllerEmitter* GetForBrowserContext(
-      content::BrowserContext* context) {
-    return static_cast<OmniboxControllerEmitter*>(
-        GetInstance()->GetServiceForBrowserContext(context, true));
-  }
-
-  static OmniboxControllerEmitterFactory* GetInstance() {
-    return base::Singleton<OmniboxControllerEmitterFactory>::get();
-  }
-
-  OmniboxControllerEmitterFactory()
-      : BrowserContextKeyedServiceFactory(
-            "OmniboxControllerEmitter",
-            BrowserContextDependencyManager::GetInstance()) {}
-
- private:
-  // BrowserContextKeyedServiceFactory overrides
-
-  KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* context) const override {
-    return new OmniboxControllerEmitter();
-  }
-
-  content::BrowserContext* GetBrowserContextToUse(
-      content::BrowserContext* context) const override {
-    return context;
-  }
-};
-#endif  // !BUILDFLAG(IS_IOS)
-
-}  // namespace
-
-OmniboxControllerEmitter::OmniboxControllerEmitter() {}
-OmniboxControllerEmitter::~OmniboxControllerEmitter() {}
-
-#if !BUILDFLAG(IS_IOS)
-// static
-OmniboxControllerEmitter* OmniboxControllerEmitter::GetForBrowserContext(
-    content::BrowserContext* browser_context) {
-  return OmniboxControllerEmitterFactory::GetForBrowserContext(browser_context);
-}
-#endif  // !BUILDFLAG(IS_IOS)
-
-void OmniboxControllerEmitter::AddObserver(
-    AutocompleteController::Observer* observer) {
-  observers_.AddObserver(observer);
-}
-
-void OmniboxControllerEmitter::RemoveObserver(
-    AutocompleteController::Observer* observer) {
-  observers_.RemoveObserver(observer);
-}
-
-void OmniboxControllerEmitter::OnStart(AutocompleteController* controller,
-                                       const AutocompleteInput& input) {
-  for (auto& observer : observers_)
-    observer.OnStart(controller, input);
-}
-
-void OmniboxControllerEmitter::OnResultChanged(
-    AutocompleteController* controller,
-    bool default_match_changed) {
-  for (auto& observer : observers_)
-    observer.OnResultChanged(controller, default_match_changed);
-}

components/omnibox/browser/scored_history_match.h

diff --git a/components/omnibox/browser/scored_history_match.h b/components/omnibox/browser/scored_history_match.h
index 4859ecd..196b2a2 100644
--- a/components/omnibox/browser/scored_history_match.h
+++ b/components/omnibox/browser/scored_history_match.h
@@ -20,8 +20,6 @@
 #include "components/omnibox/browser/omnibox_field_trial.h"
 #include "omnibox_event.pb.h"
 
-class ScoredHistoryMatchTest;
-
 // An HistoryMatch that has a score as well as metrics defining where in the
 // history item's URL and/or page title matches have occurred.
 struct ScoredHistoryMatch : public history::HistoryMatch {
@@ -115,14 +113,7 @@
   metrics::OmniboxEventProto::Suggestion::ScoringSignals scoring_signals;
 
  private:
-  friend class ScoredHistoryMatchTest;
-  FRIEND_TEST_ALL_PREFIXES(ScoredHistoryMatchTest, GetDocumentSpecificityScore);
-  FRIEND_TEST_ALL_PREFIXES(ScoredHistoryMatchTest, GetFinalRelevancyScore);
-  FRIEND_TEST_ALL_PREFIXES(ScoredHistoryMatchTest, GetFrequency);
-  FRIEND_TEST_ALL_PREFIXES(ScoredHistoryMatchTest, GetHQPBucketsFromString);
-  FRIEND_TEST_ALL_PREFIXES(ScoredHistoryMatchTest, ScoringBookmarks);
-  FRIEND_TEST_ALL_PREFIXES(ScoredHistoryMatchTest, ScoringScheme);
-  FRIEND_TEST_ALL_PREFIXES(ScoredHistoryMatchTest, ScoringTLD);
+  friend class ScoredHistoryMatchPublic;
 
   // Initialize ScoredHistoryMatch statics. Must be called before any other
   // method of ScoredHistoryMatch and before creating any instances.

components/omnibox/browser/scored_history_match_unittest.cc

diff --git a/components/omnibox/browser/scored_history_match_unittest.cc b/components/omnibox/browser/scored_history_match_unittest.cc
index da6f6d29..8856813d 100644
--- a/components/omnibox/browser/scored_history_match_unittest.cc
+++ b/components/omnibox/browser/scored_history_match_unittest.cc
@@ -45,6 +45,46 @@
 
 }  // namespace
 
+class ScoredHistoryMatchPublic : public ScoredHistoryMatch {
+ public:
+  ScoredHistoryMatchPublic(const history::URLRow& row,
+                           const VisitInfoVector& visits,
+                           const std::u16string& lower_string,
+                           const String16Vector& terms_vector,
+                           const WordStarts& terms_to_word_starts_offsets,
+                           const RowWordStarts& word_starts,
+                           bool is_url_bookmarked,
+                           size_t num_matching_pages,
+                           bool is_highly_visited_host,
+                           base::Time now)
+      : ScoredHistoryMatch(row,
+                           visits,
+                           lower_string,
+                           terms_vector,
+                           terms_to_word_starts_offsets,
+                           word_starts,
+                           is_url_bookmarked,
+                           num_matching_pages,
+                           is_highly_visited_host,
+                           now) {}
+  using ScoredHistoryMatch::FilterTermMatchesByWordStarts;
+  using ScoredHistoryMatch::GetDocumentSpecificityScore;
+  using ScoredHistoryMatch::GetFinalRelevancyScore;
+  using ScoredHistoryMatch::GetFrequency;
+  using ScoredHistoryMatch::GetHQPBuckets;
+  using ScoredHistoryMatch::GetHQPBucketsFromString;
+  using ScoredHistoryMatch::GetTopicalityScore;
+  using ScoredHistoryMatch::ScoreMaxRelevance;
+
+  using ScoredHistoryMatch::allow_scheme_matches_;
+  using ScoredHistoryMatch::allow_tld_matches_;
+  using ScoredHistoryMatch::bookmark_value_;
+  using ScoredHistoryMatch::matches_to_specificity_override_;
+  using ScoredHistoryMatch::max_visits_to_score_;
+  using ScoredHistoryMatch::relevance_buckets_override_;
+  using ScoredHistoryMatch::topicality_threshold_;
+};
+
 class ScoredHistoryMatchTest : public testing::Test {
  protected:
   // Convenience function to create a history::URLRow with basic data for |url|,
@@ -133,7 +173,7 @@
   String16SetFromString16(title, &row_word_starts.title_word_starts_);
   auto row = history::URLRow(GURL(url));
   row.set_title(title);
-  ScoredHistoryMatch scored_match(
+  ScoredHistoryMatchPublic scored_match(
       row, VisitInfoVector(), base::UTF8ToUTF16(terms_joint), term_vector,
       term_word_starts, row_word_starts, false, 1, false, base::Time::Max());
   scored_match.topicality_threshold_ = -1;
@@ -154,9 +194,9 @@
   VisitInfoVector visits_a = CreateVisitInfoVector(3, 30, now);
   // Mark one visit as typed.
   visits_a[0].second = ui::PAGE_TRANSITION_TYPED;
-  ScoredHistoryMatch scored_a(row_a, visits_a, u"abc", Make1Term("abc"),
-                              one_word_no_offset, word_starts_a, false, 1,
-                              false, now);
+  ScoredHistoryMatchPublic scored_a(row_a, visits_a, u"abc", Make1Term("abc"),
+                                    one_word_no_offset, word_starts_a, false, 1,
+                                    false, now);
 
   // Test scores based on visit_count.
   history::URLRow row_b(MakeURLRow("http://abcdef", "abcd bcd", 10, 30, 1));
@@ -164,9 +204,9 @@
   PopulateWordStarts(row_b, &word_starts_b);
   VisitInfoVector visits_b = CreateVisitInfoVector(10, 30, now);
   visits_b[0].second = ui::PAGE_TRANSITION_TYPED;
-  ScoredHistoryMatch scored_b(row_b, visits_b, u"abc", Make1Term("abc"),
-                              one_word_no_offset, word_starts_b, false, 1,
-                              false, now);
+  ScoredHistoryMatchPublic scored_b(row_b, visits_b, u"abc", Make1Term("abc"),
+                                    one_word_no_offset, word_starts_b, false, 1,
+                                    false, now);
   EXPECT_GT(scored_b.raw_score, scored_a.raw_score);
 
   // Test scores based on last_visit.
@@ -175,9 +215,9 @@
   PopulateWordStarts(row_c, &word_starts_c);
   VisitInfoVector visits_c = CreateVisitInfoVector(3, 10, now);
   visits_c[0].second = ui::PAGE_TRANSITION_TYPED;
-  ScoredHistoryMatch scored_c(row_c, visits_c, u"abc", Make1Term("abc"),
-                              one_word_no_offset, word_starts_c, false, 1,
-                              false, now);
+  ScoredHistoryMatchPublic scored_c(row_c, visits_c, u"abc", Make1Term("abc"),
+                                    one_word_no_offset, word_starts_c, false, 1,
+                                    false, now);
   EXPECT_GT(scored_c.raw_score, scored_a.raw_score);
 
   // Test scores based on typed_count.
@@ -188,9 +228,9 @@
   visits_d[0].second = ui::PAGE_TRANSITION_TYPED;
   visits_d[1].second = ui::PAGE_TRANSITION_TYPED;
   visits_d[2].second = ui::PAGE_TRANSITION_TYPED;
-  ScoredHistoryMatch scored_d(row_d, visits_d, u"abc", Make1Term("abc"),
-                              one_word_no_offset, word_starts_d, false, 1,
-                              false, now);
+  ScoredHistoryMatchPublic scored_d(row_d, visits_d, u"abc", Make1Term("abc"),
+                                    one_word_no_offset, word_starts_d, false, 1,
+                                    false, now);
   EXPECT_GT(scored_d.raw_score, scored_a.raw_score);
 
   // Test scores based on a terms appearing multiple times.
@@ -200,16 +240,16 @@
   RowWordStarts word_starts_e;
   PopulateWordStarts(row_e, &word_starts_e);
   const VisitInfoVector visits_e = visits_d;
-  ScoredHistoryMatch scored_e(row_e, visits_e, u"csi", Make1Term("csi"),
-                              one_word_no_offset, word_starts_e, false, 1,
-                              false, now);
+  ScoredHistoryMatchPublic scored_e(row_e, visits_e, u"csi", Make1Term("csi"),
+                                    one_word_no_offset, word_starts_e, false, 1,
+                                    false, now);
   EXPECT_LT(scored_e.raw_score, 1400);
 
   // Test that a result with only a mid-term match (i.e., not at a word
   // boundary) scores 0.
-  ScoredHistoryMatch scored_f(row_a, visits_a, u"cd", Make1Term("cd"),
-                              one_word_no_offset, word_starts_a, false, 1,
-                              false, now);
+  ScoredHistoryMatchPublic scored_f(row_a, visits_a, u"cd", Make1Term("cd"),
+                                    one_word_no_offset, word_starts_a, false, 1,
+                                    false, now);
   EXPECT_EQ(scored_f.raw_score, 0);
 }
 
@@ -225,14 +265,14 @@
   PopulateWordStarts(row, &word_starts);
   WordStarts one_word_no_offset(1, 0u);
   VisitInfoVector visits = CreateVisitInfoVector(8, 3, now);
-  ScoredHistoryMatch scored(row, visits, u"abc", Make1Term("abc"),
-                            one_word_no_offset, word_starts, false, 1, false,
-                            now);
+  ScoredHistoryMatchPublic scored(row, visits, u"abc", Make1Term("abc"),
+                                  one_word_no_offset, word_starts, false, 1,
+                                  false, now);
   // Now check that if URL is bookmarked then its score increases.
-  base::AutoReset<float> reset(&ScoredHistoryMatch::bookmark_value_, 5);
-  ScoredHistoryMatch scored_with_bookmark(row, visits, u"abc", Make1Term("abc"),
-                                          one_word_no_offset, word_starts, true,
-                                          1, false, now);
+  base::AutoReset<float> reset(&ScoredHistoryMatchPublic::bookmark_value_, 5);
+  ScoredHistoryMatchPublic scored_with_bookmark(
+      row, visits, u"abc", Make1Term("abc"), one_word_no_offset, word_starts,
+      true, 1, false, now);
   EXPECT_GT(scored_with_bookmark.raw_score, scored.raw_score);
 }
 
@@ -249,14 +289,15 @@
   PopulateWordStarts(row, &word_starts);
   WordStarts two_words_no_offsets(2, 0u);
   VisitInfoVector visits = CreateVisitInfoVector(8, 3, now);
-  ScoredHistoryMatch scored(row, visits, u"fed com", Make2Terms("fed", "com"),
-                            two_words_no_offsets, word_starts, false, 1, false,
-                            now);
+  ScoredHistoryMatchPublic scored(
+      row, visits, u"fed com", Make2Terms("fed", "com"), two_words_no_offsets,
+      word_starts, false, 1, false, now);
   EXPECT_GT(scored.raw_score, 0);
 
   // Now allow credit for the match in the TLD.
-  base::AutoReset<bool> reset(&ScoredHistoryMatch::allow_tld_matches_, true);
-  ScoredHistoryMatch scored_with_tld(
+  base::AutoReset<bool> reset(&ScoredHistoryMatchPublic::allow_tld_matches_,
+                              true);
+  ScoredHistoryMatchPublic scored_with_tld(
       row, visits, u"fed com", Make2Terms("fed", "com"), two_words_no_offsets,
       word_starts, false, 1, false, now);
   EXPECT_GT(scored_with_tld.raw_score, 0);
@@ -277,14 +318,15 @@
   PopulateWordStarts(row, &word_starts);
   WordStarts two_words_no_offsets(2, 0u);
   VisitInfoVector visits = CreateVisitInfoVector(8, 3, now);
-  ScoredHistoryMatch scored(row, visits, u"fed http", Make2Terms("fed", "http"),
-                            two_words_no_offsets, word_starts, false, 1, false,
-                            now);
+  ScoredHistoryMatchPublic scored(
+      row, visits, u"fed http", Make2Terms("fed", "http"), two_words_no_offsets,
+      word_starts, false, 1, false, now);
   EXPECT_GT(scored.raw_score, 0);
 
   // Now allow credit for the match in the scheme.
-  base::AutoReset<bool> reset(&ScoredHistoryMatch::allow_scheme_matches_, true);
-  ScoredHistoryMatch scored_with_scheme(
+  base::AutoReset<bool> reset(&ScoredHistoryMatchPublic::allow_scheme_matches_,
+                              true);
+  ScoredHistoryMatchPublic scored_with_scheme(
       row, visits, u"fed http", Make2Terms("fed", "http"), two_words_no_offsets,
       word_starts, false, 1, false, now);
   EXPECT_GT(scored_with_scheme.raw_score, 0);
@@ -304,24 +346,24 @@
     history::URLRow row(
         MakeURLRow("http://www.google.com", "abcdef", 3, 30, 1));
     PopulateWordStarts(row, &word_starts);
-    ScoredHistoryMatch scored_a(row, visits, u"g", Make1Term("g"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_a(row, visits, u"g", Make1Term("g"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_FALSE(scored_a.match_in_scheme);
     EXPECT_FALSE(scored_a.match_in_subdomain);
-    ScoredHistoryMatch scored_b(row, visits, u"w", Make1Term("w"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_b(row, visits, u"w", Make1Term("w"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_FALSE(scored_b.match_in_scheme);
     EXPECT_TRUE(scored_b.match_in_subdomain);
-    ScoredHistoryMatch scored_c(row, visits, u"h", Make1Term("h"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_c(row, visits, u"h", Make1Term("h"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_TRUE(scored_c.match_in_scheme);
     EXPECT_FALSE(scored_c.match_in_subdomain);
-    ScoredHistoryMatch scored_d(row, visits, u"o", Make1Term("o"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_d(row, visits, u"o", Make1Term("o"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_FALSE(scored_d.match_in_scheme);
     EXPECT_FALSE(scored_d.match_in_subdomain);
   }
@@ -329,19 +371,19 @@
   {
     history::URLRow row(MakeURLRow("http://teams.foo.com", "abcdef", 3, 30, 1));
     PopulateWordStarts(row, &word_starts);
-    ScoredHistoryMatch scored_a(row, visits, u"t", Make1Term("t"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_a(row, visits, u"t", Make1Term("t"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_FALSE(scored_a.match_in_scheme);
     EXPECT_TRUE(scored_a.match_in_subdomain);
-    ScoredHistoryMatch scored_b(row, visits, u"f", Make1Term("f"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_b(row, visits, u"f", Make1Term("f"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_FALSE(scored_b.match_in_scheme);
     EXPECT_FALSE(scored_b.match_in_subdomain);
-    ScoredHistoryMatch scored_c(row, visits, u"o", Make1Term("o"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_c(row, visits, u"o", Make1Term("o"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_FALSE(scored_c.match_in_scheme);
     EXPECT_FALSE(scored_c.match_in_subdomain);
   }
@@ -349,19 +391,19 @@
   {
     history::URLRow row(MakeURLRow("http://en.m.foo.com", "abcdef", 3, 30, 1));
     PopulateWordStarts(row, &word_starts);
-    ScoredHistoryMatch scored_a(row, visits, u"e", Make1Term("e"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_a(row, visits, u"e", Make1Term("e"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_FALSE(scored_a.match_in_scheme);
     EXPECT_TRUE(scored_a.match_in_subdomain);
-    ScoredHistoryMatch scored_b(row, visits, u"m", Make1Term("m"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_b(row, visits, u"m", Make1Term("m"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_FALSE(scored_b.match_in_scheme);
     EXPECT_TRUE(scored_b.match_in_subdomain);
-    ScoredHistoryMatch scored_c(row, visits, u"f", Make1Term("f"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_c(row, visits, u"f", Make1Term("f"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_FALSE(scored_c.match_in_scheme);
     EXPECT_FALSE(scored_c.match_in_subdomain);
   }
@@ -370,50 +412,50 @@
     history::URLRow row(
         MakeURLRow("https://www.testing.com/xxx?yyy#zzz", "abcdef", 3, 30, 1));
     PopulateWordStarts(row, &word_starts);
-    ScoredHistoryMatch scored_a(row, visits, u"t", Make1Term("t"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_a(row, visits, u"t", Make1Term("t"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_FALSE(scored_a.match_in_scheme);
     EXPECT_FALSE(scored_a.match_in_subdomain);
-    ScoredHistoryMatch scored_b(row, visits, u"h", Make1Term("h"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_b(row, visits, u"h", Make1Term("h"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_TRUE(scored_b.match_in_scheme);
     EXPECT_FALSE(scored_b.match_in_subdomain);
-    ScoredHistoryMatch scored_c(row, visits, u"w", Make1Term("w"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_c(row, visits, u"w", Make1Term("w"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_FALSE(scored_c.match_in_scheme);
     EXPECT_TRUE(scored_c.match_in_subdomain);
-    ScoredHistoryMatch scored_d(row, visits, u"x", Make1Term("x"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_d(row, visits, u"x", Make1Term("x"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_FALSE(scored_d.match_in_scheme);
     EXPECT_FALSE(scored_d.match_in_subdomain);
-    ScoredHistoryMatch scored_e(row, visits, u"y", Make1Term("y"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_e(row, visits, u"y", Make1Term("y"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_FALSE(scored_e.match_in_scheme);
     EXPECT_FALSE(scored_e.match_in_subdomain);
-    ScoredHistoryMatch scored_f(row, visits, u"z", Make1Term("z"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_f(row, visits, u"z", Make1Term("z"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_FALSE(scored_f.match_in_scheme);
     EXPECT_FALSE(scored_f.match_in_subdomain);
-    ScoredHistoryMatch scored_g(row, visits, u"https://www",
-                                Make1Term("https://www"), one_word_no_offset,
-                                word_starts, false, 1, false, now);
+    ScoredHistoryMatchPublic scored_g(
+        row, visits, u"https://www", Make1Term("https://www"),
+        one_word_no_offset, word_starts, false, 1, false, now);
     EXPECT_TRUE(scored_g.match_in_scheme);
     EXPECT_TRUE(scored_g.match_in_subdomain);
-    ScoredHistoryMatch scored_h(row, visits, u"testing.com/x",
-                                Make1Term("testing.com/x"), one_word_no_offset,
-                                word_starts, false, 1, false, now);
+    ScoredHistoryMatchPublic scored_h(
+        row, visits, u"testing.com/x", Make1Term("testing.com/x"),
+        one_word_no_offset, word_starts, false, 1, false, now);
     EXPECT_FALSE(scored_h.match_in_scheme);
     EXPECT_FALSE(scored_h.match_in_subdomain);
-    ScoredHistoryMatch scored_i(row, visits, u"https://www.testing.com/x",
-                                Make1Term("https://www.testing.com/x"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_i(row, visits, u"https://www.testing.com/x",
+                                      Make1Term("https://www.testing.com/x"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_TRUE(scored_i.match_in_scheme);
     EXPECT_TRUE(scored_i.match_in_subdomain);
   }
@@ -422,19 +464,19 @@
     history::URLRow row(
         MakeURLRow("http://www.xn--1lq90ic7f1rc.cn/xnblah", "abcd", 3, 30, 1));
     PopulateWordStarts(row, &word_starts);
-    ScoredHistoryMatch scored_a(row, visits, u"x", Make1Term("x"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_a(row, visits, u"x", Make1Term("x"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_FALSE(scored_a.match_in_scheme);
     EXPECT_FALSE(scored_a.match_in_subdomain);
-    ScoredHistoryMatch scored_b(row, visits, u"xn", Make1Term("xn"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_b(row, visits, u"xn", Make1Term("xn"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_FALSE(scored_b.match_in_scheme);
     EXPECT_FALSE(scored_b.match_in_subdomain);
-    ScoredHistoryMatch scored_c(row, visits, u"w", Make1Term("w"),
-                                one_word_no_offset, word_starts, false, 1,
-                                false, now);
+    ScoredHistoryMatchPublic scored_c(row, visits, u"w", Make1Term("w"),
+                                      one_word_no_offset, word_starts, false, 1,
+                                      false, now);
     EXPECT_FALSE(scored_c.match_in_scheme);
     EXPECT_TRUE(scored_c.match_in_subdomain);
   }
@@ -476,7 +518,7 @@
   term_matches.push_back(TermMatch(0, 37, 1));
   term_matches.push_back(TermMatch(0, 43, 1));
   TermMatches filtered_term_matches =
-      ScoredHistoryMatch::FilterTermMatchesByWordStarts(
+      ScoredHistoryMatchPublic::FilterTermMatchesByWordStarts(
           term_matches, terms_to_word_starts_offsets, word_starts, 15,
           std::string::npos);
   ASSERT_EQ(3u, filtered_term_matches.size());
@@ -485,8 +527,10 @@
   EXPECT_EQ(43u, filtered_term_matches[2].offset);
   // The "http" match should remain after removing the mid-word matches in the
   // scheme.  The "4" is the position of the ":" character ending the scheme.
-  filtered_term_matches = ScoredHistoryMatch::FilterTermMatchesByWordStarts(
-      filtered_term_matches, terms_to_word_starts_offsets, word_starts, 0, 5);
+  filtered_term_matches =
+      ScoredHistoryMatchPublic::FilterTermMatchesByWordStarts(
+          filtered_term_matches, terms_to_word_starts_offsets, word_starts, 0,
+          5);
   ASSERT_EQ(3u, filtered_term_matches.size());
   EXPECT_EQ(0u, filtered_term_matches[0].offset);
   EXPECT_EQ(37u, filtered_term_matches[1].offset);
@@ -501,9 +545,10 @@
   term_matches.push_back(TermMatch(0, 10, 1));
   term_matches.push_back(TermMatch(0, 22, 1));
   term_matches.push_back(TermMatch(0, 45, 1));
-  filtered_term_matches = ScoredHistoryMatch::FilterTermMatchesByWordStarts(
-      term_matches, terms_to_word_starts_offsets, word_starts, 15,
-      std::string::npos);
+  filtered_term_matches =
+      ScoredHistoryMatchPublic::FilterTermMatchesByWordStarts(
+          term_matches, terms_to_word_starts_offsets, word_starts, 15,
+          std::string::npos);
   ASSERT_EQ(4u, filtered_term_matches.size());
   EXPECT_EQ(1u, filtered_term_matches[0].offset);
   EXPECT_EQ(2u, filtered_term_matches[1].offset);
@@ -511,8 +556,10 @@
   EXPECT_EQ(10u, filtered_term_matches[3].offset);
   // The "http" matches should disappear after removing mid-word matches in the
   // scheme.
-  filtered_term_matches = ScoredHistoryMatch::FilterTermMatchesByWordStarts(
-      filtered_term_matches, terms_to_word_starts_offsets, word_starts, 0, 4);
+  filtered_term_matches =
+      ScoredHistoryMatchPublic::FilterTermMatchesByWordStarts(
+          filtered_term_matches, terms_to_word_starts_offsets, word_starts, 0,
+          4);
   ASSERT_EQ(2u, filtered_term_matches.size());
   EXPECT_EQ(7u, filtered_term_matches[0].offset);
   EXPECT_EQ(10u, filtered_term_matches[1].offset);
@@ -523,9 +570,10 @@
   term_matches.push_back(TermMatch(0, 8, 1));
   term_matches.push_back(TermMatch(0, 17, 1));
   term_matches.push_back(TermMatch(0, 38, 1));
-  filtered_term_matches = ScoredHistoryMatch::FilterTermMatchesByWordStarts(
-      term_matches, terms_to_word_starts_offsets, word_starts, 15,
-      std::string::npos);
+  filtered_term_matches =
+      ScoredHistoryMatchPublic::FilterTermMatchesByWordStarts(
+          term_matches, terms_to_word_starts_offsets, word_starts, 15,
+          std::string::npos);
   ASSERT_EQ(1u, filtered_term_matches.size());
   EXPECT_EQ(8u, filtered_term_matches[0].offset);
 
@@ -533,9 +581,10 @@
   // matches after the hostname.
   term_matches.clear();
   term_matches.push_back(TermMatch(0, 16, 1));
-  filtered_term_matches = ScoredHistoryMatch::FilterTermMatchesByWordStarts(
-      term_matches, terms_to_word_starts_offsets, word_starts, 15,
-      std::string::npos);
+  filtered_term_matches =
+      ScoredHistoryMatchPublic::FilterTermMatchesByWordStarts(
+          term_matches, terms_to_word_starts_offsets, word_starts, 15,
+          std::string::npos);
   ASSERT_EQ(1u, filtered_term_matches.size());
   EXPECT_EQ(16u, filtered_term_matches[0].offset);
 
@@ -544,9 +593,10 @@
   term_matches.clear();
   term_matches.push_back(TermMatch(0, 19, 1));
   term_matches.push_back(TermMatch(0, 28, 1));
-  filtered_term_matches = ScoredHistoryMatch::FilterTermMatchesByWordStarts(
-      term_matches, terms_to_word_starts_offsets, word_starts, 15,
-      std::string::npos);
+  filtered_term_matches =
+      ScoredHistoryMatchPublic::FilterTermMatchesByWordStarts(
+          term_matches, terms_to_word_starts_offsets, word_starts, 15,
+          std::string::npos);
   ASSERT_EQ(1u, filtered_term_matches.size());
   EXPECT_EQ(28u, filtered_term_matches[0].offset);
 
@@ -556,9 +606,10 @@
   // starts at the second character.
   term_matches.clear();
   term_matches.push_back(TermMatch(0, 27, 1));
-  filtered_term_matches = ScoredHistoryMatch::FilterTermMatchesByWordStarts(
-      term_matches, /*terms_to_word_starts_offsets*/ {1}, word_starts, 15,
-      std::string::npos);
+  filtered_term_matches =
+      ScoredHistoryMatchPublic::FilterTermMatchesByWordStarts(
+          term_matches, /*terms_to_word_starts_offsets*/ {1}, word_starts, 15,
+          std::string::npos);
   ASSERT_EQ(1u, filtered_term_matches.size());
   EXPECT_EQ(27u, filtered_term_matches[0].offset);
 
@@ -568,8 +619,9 @@
   term_matches.push_back(TermMatch(0, 16, 2));
   term_matches.push_back(TermMatch(1, 18, 2));
   term_matches.push_back(TermMatch(2, 21, 2));
-  filtered_term_matches = ScoredHistoryMatch::FilterTermMatchesByWordStarts(
-      term_matches, {0, 0, 0}, word_starts, 15, std::string::npos, true);
+  filtered_term_matches =
+      ScoredHistoryMatchPublic::FilterTermMatchesByWordStarts(
+          term_matches, {0, 0, 0}, word_starts, 15, std::string::npos, true);
   ASSERT_EQ(2u, filtered_term_matches.size());
   EXPECT_EQ(16u, filtered_term_matches[0].offset);
   EXPECT_EQ(18u, filtered_term_matches[1].offset);
@@ -580,8 +632,9 @@
   term_matches.push_back(TermMatch(0, 16, 2));
   term_matches.push_back(TermMatch(1, 18, 2));
   term_matches.push_back(TermMatch(2, 21, 2));
-  filtered_term_matches = ScoredHistoryMatch::FilterTermMatchesByWordStarts(
-      term_matches, {0, 0, 0}, word_starts, 15, std::string::npos, false);
+  filtered_term_matches =
+      ScoredHistoryMatchPublic::FilterTermMatchesByWordStarts(
+          term_matches, {0, 0, 0}, word_starts, 15, std::string::npos, false);
   ASSERT_EQ(1u, filtered_term_matches.size());
   EXPECT_EQ(16u, filtered_term_matches[0].offset);
 }
@@ -593,8 +646,9 @@
   PopulateWordStarts(row, &row_word_starts);
   base::Time now(base::Time::Max());
   VisitInfoVector visits;
-  ScoredHistoryMatch match(row, visits, u"foo", Make1Term("foo"), WordStarts{0},
-                           row_word_starts, false, 1, false, now);
+  ScoredHistoryMatchPublic match(row, visits, u"foo", Make1Term("foo"),
+                                 WordStarts{0}, row_word_starts, false, 1,
+                                 false, now);
 
   // Record the score for one untyped visit.
   visits = {{now, ui::PAGE_TRANSITION_LINK}};
@@ -636,7 +690,8 @@
   // If we're only supposed to consider the most recent two visits, then the
   // score should be the same as in the two-visit case.
   {
-    base::AutoReset<size_t> tmp1(&ScoredHistoryMatch::max_visits_to_score_, 2);
+    base::AutoReset<size_t> tmp1(
+        &ScoredHistoryMatchPublic::max_visits_to_score_, 2);
     EXPECT_EQ(two_visits_score, match.GetFrequency(now, false, visits));
 
     // Check again with the third visit being typed.
@@ -652,8 +707,9 @@
   PopulateWordStarts(row, &row_word_starts);
   base::Time now(base::Time::Max());
   VisitInfoVector visits;
-  ScoredHistoryMatch match(row, visits, u"foo", Make1Term("foo"), WordStarts{0},
-                           row_word_starts, false, 1, false, now);
+  ScoredHistoryMatchPublic match(row, visits, u"foo", Make1Term("foo"),
+                                 WordStarts{0}, row_word_starts, false, 1,
+                                 false, now);
 
   EXPECT_EQ(3.0, match.GetDocumentSpecificityScore(1));
   EXPECT_EQ(1.0, match.GetDocumentSpecificityScore(5));
@@ -661,7 +717,7 @@
 
   OmniboxFieldTrial::NumMatchesScores matches_to_specificity;
   base::AutoReset<OmniboxFieldTrial::NumMatchesScores*> tmp(
-      &ScoredHistoryMatch::matches_to_specificity_override_,
+      &ScoredHistoryMatchPublic::matches_to_specificity_override_,
       &matches_to_specificity);
 
   matches_to_specificity = {{1, 3.0}};
@@ -777,10 +833,11 @@
 // Test the function GetFinalRelevancyScore().
 TEST_F(ScoredHistoryMatchTest, GetFinalRelevancyScore) {
   // relevance_buckets = "0.0:100,1.0:200,4.0:500,8.0:900,10.0:1000";
-  ScoredHistoryMatch::ScoreMaxRelevances relevance_buckets = {
+  ScoredHistoryMatchPublic::ScoreMaxRelevances relevance_buckets = {
       {0.0, 100}, {1.0, 200}, {4.0, 500}, {8.0, 900}, {10.0, 1000}};
-  base::AutoReset<ScoredHistoryMatch::ScoreMaxRelevances*> tmp(
-      &ScoredHistoryMatch::relevance_buckets_override_, &relevance_buckets);
+  base::AutoReset<ScoredHistoryMatchPublic::ScoreMaxRelevances*> tmp(
+      &ScoredHistoryMatchPublic::relevance_buckets_override_,
+      &relevance_buckets);
 
   // Check when topicality score is zero.
   float topicality_score = 0.0;
@@ -788,7 +845,7 @@
   float specificity_score = 1.0;
   float domain_score = 1.0;
   // intermediate_score = 0.0 * 10.0 * 1.0 * 1.0 = 0.0.
-  EXPECT_EQ(0, ScoredHistoryMatch::GetFinalRelevancyScore(
+  EXPECT_EQ(0, ScoredHistoryMatchPublic::GetFinalRelevancyScore(
                    topicality_score, frequency_score, specificity_score,
                    domain_score));
 
@@ -796,7 +853,7 @@
   topicality_score = 0.4f;
   frequency_score = 10.0f;
   // intermediate_score = 0.4 * 10.0 * 1.0 * 1.0 = 4.0.
-  EXPECT_EQ(500, ScoredHistoryMatch::GetFinalRelevancyScore(
+  EXPECT_EQ(500, ScoredHistoryMatchPublic::GetFinalRelevancyScore(
                      topicality_score, frequency_score, specificity_score,
                      domain_score));
 
@@ -806,14 +863,14 @@
   // intermediate_score = 0.5 * 10.0 * 1.0 * 1.0 = 5.0.
   EXPECT_EQ(
       600,  // 500 + (((900 - 500)/(8 -4)) * 1) = 600.
-      ScoredHistoryMatch::GetFinalRelevancyScore(
+      ScoredHistoryMatchPublic::GetFinalRelevancyScore(
           topicality_score, frequency_score, specificity_score, domain_score));
 
   // Never give the score greater than maximum specified.
   topicality_score = 0.5f;
   frequency_score = 22.0f;
   // intermediate_score = 0.5 * 22.0 * 1.0 * 1.0 = 11.0
-  EXPECT_EQ(1000, ScoredHistoryMatch::GetFinalRelevancyScore(
+  EXPECT_EQ(1000, ScoredHistoryMatchPublic::GetFinalRelevancyScore(
                       topicality_score, frequency_score, specificity_score,
                       domain_score));
 }
@@ -821,12 +878,12 @@
 // Test the function GetHQPBucketsFromString().
 TEST_F(ScoredHistoryMatchTest, GetHQPBucketsFromString) {
   std::string buckets_str = "0.0:400,1.5:600,12.0:1300,20.0:1399";
-  std::vector<ScoredHistoryMatch::ScoreMaxRelevance> hqp_buckets =
-      ScoredHistoryMatch::GetHQPBucketsFromString(buckets_str);
+  std::vector<ScoredHistoryMatchPublic::ScoreMaxRelevance> hqp_buckets =
+      ScoredHistoryMatchPublic::GetHQPBucketsFromString(buckets_str);
   EXPECT_THAT(hqp_buckets, ElementsAre(Pair(0.0, 400), Pair(1.5, 600),
                                        Pair(12.0, 1300), Pair(20.0, 1399)));
   // Test using an invalid string.
   buckets_str = "0.0,400,1.5,600";
-  hqp_buckets = ScoredHistoryMatch::GetHQPBucketsFromString(buckets_str);
+  hqp_buckets = ScoredHistoryMatchPublic::GetHQPBucketsFromString(buckets_str);
   EXPECT_TRUE(hqp_buckets.empty());
 }

components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.cc

diff --git a/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.cc b/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.cc
index 4572ca8..e075797 100644
--- a/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.cc
+++ b/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.cc
@@ -163,10 +163,6 @@
     "PageLoad.InteractiveTiming.FirstInputDelay4";
 const char kHistogramFirstInputTimestamp[] =
     "PageLoad.InteractiveTiming.FirstInputTimestamp4";
-const char kHistogramLongestInputDelay[] =
-    "PageLoad.InteractiveTiming.LongestInputDelay4";
-const char kHistogramLongestInputTimestamp[] =
-    "PageLoad.InteractiveTiming.LongestInputTimestamp4";
 const char kHistogramParseStartToFirstContentfulPaint[] =
     "PageLoad.PaintTiming.ParseStartToFirstContentfulPaint";
 const char kBackgroundHistogramParseStartToFirstContentfulPaint[] =
@@ -175,18 +171,10 @@
     "PageLoad.ParseTiming.NavigationToParseStart";
 const char kBackgroundHistogramParseStart[] =
     "PageLoad.ParseTiming.NavigationToParseStart.Background";
-const char kHistogramParseDuration[] = "PageLoad.ParseTiming.ParseDuration";
-const char kBackgroundHistogramParseDuration[] =
-    "PageLoad.ParseTiming.ParseDuration.Background";
 const char kHistogramParseBlockedOnScriptLoad[] =
     "PageLoad.ParseTiming.ParseBlockedOnScriptLoad";
 const char kBackgroundHistogramParseBlockedOnScriptLoad[] =
     "PageLoad.ParseTiming.ParseBlockedOnScriptLoad.Background";
-const char kHistogramParseBlockedOnScriptLoadDocumentWrite[] =
-    "PageLoad.ParseTiming.ParseBlockedOnScriptLoadFromDocumentWrite";
-const char kBackgroundHistogramParseBlockedOnScriptLoadDocumentWrite[] =
-    "PageLoad.ParseTiming.ParseBlockedOnScriptLoadFromDocumentWrite."
-    "Background";
 const char kHistogramParseBlockedOnScriptExecution[] =
     "PageLoad.ParseTiming.ParseBlockedOnScriptExecution";
 const char kHistogramParseBlockedOnScriptExecutionDocumentWrite[] =
@@ -243,8 +231,6 @@
     "PageLoad.PageTiming.ForegroundDuration.PageEndReason."
     "ForwardBackNavigation.UserGesture";
 
-const char kHistogramForegroundToFirstPaint[] =
-    "PageLoad.PaintTiming.ForegroundToFirstPaint";
 const char kHistogramForegroundToFirstContentfulPaint[] =
     "PageLoad.PaintTiming.ForegroundToFirstContentfulPaint";
 
@@ -379,8 +365,7 @@
       was_no_store_main_resource_(false),
       cache_bytes_(0),
       network_bytes_(0),
-      network_bytes_including_headers_(0),
-      redirect_chain_size_(0) {}
+      network_bytes_including_headers_(0) {}
 
 UmaPageLoadMetricsObserver::~UmaPageLoadMetricsObserver() {}
 
@@ -410,7 +395,6 @@
 page_load_metrics::PageLoadMetricsObserver::ObservePolicy
 UmaPageLoadMetricsObserver::OnRedirect(
     content::NavigationHandle* navigation_handle) {
-  redirect_chain_size_++;
   return CONTINUE_OBSERVING;
 }
 
@@ -424,8 +408,6 @@
     was_no_store_main_resource_ =
         headers->HasHeaderValue("cache-control", "no-store");
   }
-  UMA_HISTOGRAM_COUNTS_100("PageLoad.Navigation.RedirectChainLength",
-                           redirect_chain_size_);
   navigation_handle_timing_ = navigation_handle->GetNavigationHandleTiming();
 
   // TODO(crbug/1097328): Remove collecting visits to support.google.com after
@@ -494,13 +476,6 @@
                               timing.paint_timing->first_paint.value());
     }
   }
-
-  if (page_load_metrics::WasStartedInBackgroundOptionalEventInForeground(
-          timing.paint_timing->first_paint, GetDelegate())) {
-    PAGE_LOAD_HISTOGRAM(internal::kHistogramForegroundToFirstPaint,
-                        timing.paint_timing->first_paint.value() -
-                            GetDelegate().GetTimeToFirstForeground().value());
-  }
 }
 
 void UmaPageLoadMetricsObserver::OnFirstImagePaintInPage(
@@ -718,20 +693,12 @@
 
 void UmaPageLoadMetricsObserver::OnParseStop(
     const page_load_metrics::mojom::PageLoadTiming& timing) {
-  base::TimeDelta parse_duration = timing.parse_timing->parse_stop.value() -
-                                   timing.parse_timing->parse_start.value();
   if (page_load_metrics::WasStartedInForegroundOptionalEventInForeground(
           timing.parse_timing->parse_stop, GetDelegate())) {
-    PAGE_LOAD_HISTOGRAM(internal::kHistogramParseDuration, parse_duration);
     PAGE_LOAD_HISTOGRAM(
         internal::kHistogramParseBlockedOnScriptLoad,
         timing.parse_timing->parse_blocked_on_script_load_duration.value());
     PAGE_LOAD_HISTOGRAM(
-        internal::kHistogramParseBlockedOnScriptLoadDocumentWrite,
-        timing.parse_timing
-            ->parse_blocked_on_script_load_from_document_write_duration
-            .value());
-    PAGE_LOAD_HISTOGRAM(
         internal::kHistogramParseBlockedOnScriptExecution,
         timing.parse_timing->parse_blocked_on_script_execution_duration
             .value());
@@ -741,16 +708,9 @@
             ->parse_blocked_on_script_execution_from_document_write_duration
             .value());
   } else {
-    PAGE_LOAD_HISTOGRAM(internal::kBackgroundHistogramParseDuration,
-                        parse_duration);
     PAGE_LOAD_HISTOGRAM(
         internal::kBackgroundHistogramParseBlockedOnScriptLoad,
         timing.parse_timing->parse_blocked_on_script_load_duration.value());
-    PAGE_LOAD_HISTOGRAM(
-        internal::kBackgroundHistogramParseBlockedOnScriptLoadDocumentWrite,
-        timing.parse_timing
-            ->parse_blocked_on_script_load_from_document_write_duration
-            .value());
   }
 }
 
@@ -1023,13 +983,6 @@
 
   if (main_frame_timing.interactive_timing->longest_input_timestamp) {
     DCHECK(main_frame_timing.interactive_timing->longest_input_delay);
-    UMA_HISTOGRAM_CUSTOM_TIMES(
-        internal::kHistogramLongestInputDelay,
-        main_frame_timing.interactive_timing->longest_input_delay.value(),
-        base::Milliseconds(1), base::Seconds(60), 50);
-    PAGE_LOAD_HISTOGRAM(
-        internal::kHistogramLongestInputTimestamp,
-        main_frame_timing.interactive_timing->longest_input_timestamp.value());
   }
 
   RecordNormalizedResponsivenessMetrics();

components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.h

diff --git a/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.h b/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.h
index a5b7f7c0..181a392 100644
--- a/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.h
+++ b/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.h
@@ -32,8 +32,6 @@
 extern const char kHistogramFirstInputTimestamp[];
 extern const char kHistogramFirstInputDelay4[];
 extern const char kHistogramFirstInputTimestamp4[];
-extern const char kHistogramLongestInputDelay[];
-extern const char kHistogramLongestInputTimestamp[];
 extern const char kHistogramFirstPaint[];
 extern const char kHistogramFirstImagePaint[];
 extern const char kHistogramDomContentLoaded[];
@@ -44,7 +42,6 @@
 extern const char kHistogramLargestContentfulPaintMainFrame[];
 extern const char kHistogramLargestContentfulPaintMainFrameContentType[];
 extern const char kHistogramLargestContentfulPaintCrossSiteSubFrame[];
-extern const char kHistogramParseDuration[];
 extern const char kHistogramParseBlockedOnScriptLoad[];
 extern const char kHistogramParseBlockedOnScriptExecution[];
 
@@ -74,9 +71,6 @@
 extern const char kHistogramFirstEligibleToPaint[];
 extern const char kHistogramFirstEligibleToPaintToFirstPaint[];
 
-extern const char kHistogramFirstNonScrollInputAfterFirstPaint[];
-extern const char kHistogramFirstScrollInputAfterFirstPaint[];
-
 extern const char kHistogramPageLoadTotalBytes[];
 extern const char kHistogramPageLoadNetworkBytes[];
 extern const char kHistogramPageLoadCacheBytes[];
@@ -263,9 +257,6 @@
   base::TimeDelta total_cpu_usage_;
   base::TimeDelta foreground_cpu_usage_;
 
-  // Size of the redirect chain, which excludes the first URL.
-  int redirect_chain_size_;
-
   base::TimeTicks first_paint_;
 
   // Tracks user input clicks for possible click burst.

components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer_unittest.cc

diff --git a/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer_unittest.cc b/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer_unittest.cc
index 9034733..85cd2380 100644
--- a/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer_unittest.cc
+++ b/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer_unittest.cc
@@ -212,9 +212,6 @@
       internal::kHistogramDomContentLoaded, 0);
   tester()->histogram_tester().ExpectTotalCount(internal::kHistogramLoad, 0);
   tester()->histogram_tester().ExpectBucketCount(
-      internal::kHistogramParseDuration,
-      (parse_stop - parse_start).InMilliseconds(), 1);
-  tester()->histogram_tester().ExpectBucketCount(
       internal::kHistogramParseBlockedOnScriptLoad,
       parse_script_load_duration.InMilliseconds(), 1);
   tester()->histogram_tester().ExpectBucketCount(
@@ -1224,28 +1221,6 @@
               testing::ElementsAre(base::Bucket(4780, 1)));
 }
 
-TEST_P(UmaPageLoadMetricsObserverTest, LongestInputDelayAndTimestamp) {
-  page_load_metrics::mojom::PageLoadTiming timing;
-  page_load_metrics::InitPageLoadTimingForTest(&timing);
-  timing.navigation_start = base::Time::FromDoubleT(1);
-  timing.interactive_timing->longest_input_delay = base::Milliseconds(5);
-  // Pick a value that lines up with a histogram bucket.
-  timing.interactive_timing->longest_input_timestamp = base::Milliseconds(4780);
-  PopulateRequiredTimingFields(&timing);
-
-  NavigateAndCommit(GURL(kDefaultTestUrl));
-  tester()->SimulateTimingUpdate(timing);
-  // Navigate again to force histogram recording.
-  NavigateAndCommit(GURL(kDefaultTestUrl2));
-
-  EXPECT_THAT(tester()->histogram_tester().GetAllSamples(
-                  internal::kHistogramLongestInputDelay),
-              testing::ElementsAre(base::Bucket(5, 1)));
-  EXPECT_THAT(tester()->histogram_tester().GetAllSamples(
-                  internal::kHistogramLongestInputTimestamp),
-              testing::ElementsAre(base::Bucket(4780, 1)));
-}
-
 TEST_P(UmaPageLoadMetricsObserverTest,
        FirstInputDelayAndTimestampBackgrounded) {
   page_load_metrics::mojom::PageLoadTiming timing;

components/password_manager/core/browser/mock_webauthn_credentials_delegate.h

diff --git a/components/password_manager/core/browser/mock_webauthn_credentials_delegate.h b/components/password_manager/core/browser/mock_webauthn_credentials_delegate.h
index 1863bb1..6fe9e95 100644
--- a/components/password_manager/core/browser/mock_webauthn_credentials_delegate.h
+++ b/components/password_manager/core/browser/mock_webauthn_credentials_delegate.h
@@ -24,7 +24,6 @@
   MockWebAuthnCredentialsDelegate& operator=(
       const MockWebAuthnCredentialsDelegate&) = delete;
 
-  MOCK_METHOD(bool, IsWebAuthnAutofillEnabled, (), (const, override));
   MOCK_METHOD(void, LaunchWebAuthnFlow, (), (override));
   MOCK_METHOD(void,
               SelectWebAuthnCredential,

components/password_manager/core/browser/password_autofill_manager.cc

diff --git a/components/password_manager/core/browser/password_autofill_manager.cc b/components/password_manager/core/browser/password_autofill_manager.cc
index c69df5b..71d0a0f 100644
--- a/components/password_manager/core/browser/password_autofill_manager.cc
+++ b/components/password_manager/core/browser/password_autofill_manager.cc
@@ -721,8 +721,7 @@
       password_client_->GetWebAuthnCredentialsDelegateForDriver(
           password_manager_driver_);
   absl::optional<std::vector<autofill::Suggestion>> webauthn_suggestions;
-  if (show_webauthn_credentials && delegate &&
-      delegate->IsWebAuthnAutofillEnabled()) {
+  if (show_webauthn_credentials && delegate) {
     webauthn_suggestions = delegate->GetWebAuthnSuggestions();
   }
   if (webauthn_suggestions.has_value()) {

components/password_manager/core/browser/password_autofill_manager_unittest.cc

diff --git a/components/password_manager/core/browser/password_autofill_manager_unittest.cc b/components/password_manager/core/browser/password_autofill_manager_unittest.cc
index c96df7a..21199b2 100644
--- a/components/password_manager/core/browser/password_autofill_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_autofill_manager_unittest.cc
@@ -339,8 +339,6 @@
 #endif
     ON_CALL(*client, GetWebAuthnCredentialsDelegateForDriver)
         .WillByDefault(Return(webauthn_credentials_delegate_.get()));
-    ON_CALL(*webauthn_credentials_delegate_, IsWebAuthnAutofillEnabled)
-        .WillByDefault(Return(false));
   }
 
   autofill::PasswordFormFillData CreateTestFormFillData() {
@@ -2125,8 +2123,6 @@
   webauthn_credential.frontend_id = autofill::POPUP_ITEM_ID_WEBAUTHN_CREDENTIAL;
   webauthn_credential.payload = Suggestion::BackendId(kId);
   webauthn_credential.labels = {{Suggestion::Text(kAuthenticator)}};
-  EXPECT_CALL(webauthn_credentials_delegate, IsWebAuthnAutofillEnabled)
-      .WillRepeatedly(Return(true));
   EXPECT_CALL(client, GetWebAuthnCredentialsDelegateForDriver)
       .WillRepeatedly(Return(&webauthn_credentials_delegate));
   absl::optional<std::vector<autofill::Suggestion>> webauthn_credential_list =
@@ -2195,8 +2191,6 @@
   // Enable WebAuthn autofill.
   absl::optional<std::vector<autofill::Suggestion>> webauthn_credentials(
       absl::in_place);
-  EXPECT_CALL(webauthn_credentials_delegate, IsWebAuthnAutofillEnabled)
-      .WillRepeatedly(Return(true));
   EXPECT_CALL(client, GetWebAuthnCredentialsDelegateForDriver)
       .WillRepeatedly(Return(&webauthn_credentials_delegate));
   EXPECT_CALL(webauthn_credentials_delegate, GetWebAuthnSuggestions)
@@ -2249,8 +2243,6 @@
   webauthn_credential.labels = {{Suggestion::Text(kAuthenticator)}};
   absl::optional<std::vector<autofill::Suggestion>> webauthn_credentials =
       std::vector{std::move(webauthn_credential)};
-  EXPECT_CALL(webauthn_credentials_delegate, IsWebAuthnAutofillEnabled)
-      .WillRepeatedly(Return(true));
   EXPECT_CALL(client, GetWebAuthnCredentialsDelegateForDriver)
       .WillRepeatedly(Return(&webauthn_credentials_delegate));
   EXPECT_CALL(webauthn_credentials_delegate, GetWebAuthnSuggestions)
@@ -2289,8 +2281,6 @@
   // Enable WebAuthn autofill.
   absl::optional<std::vector<autofill::Suggestion>> webauthn_credentials(
       absl::in_place);
-  EXPECT_CALL(webauthn_credentials_delegate, IsWebAuthnAutofillEnabled)
-      .WillRepeatedly(Return(true));
   EXPECT_CALL(client, GetWebAuthnCredentialsDelegateForDriver)
       .WillRepeatedly(Return(&webauthn_credentials_delegate));
   EXPECT_CALL(webauthn_credentials_delegate, GetWebAuthnSuggestions)

components/password_manager/core/browser/password_form_filling.cc

diff --git a/components/password_manager/core/browser/password_form_filling.cc b/components/password_manager/core/browser/password_form_filling.cc
index 3e2cf1a8..e15f7bb2 100644
--- a/components/password_manager/core/browser/password_form_filling.cc
+++ b/components/password_manager/core/browser/password_form_filling.cc
@@ -234,9 +234,7 @@
     wait_for_username_reason = WaitForUsernameReason::kInsecureOrigin;
   } else if (IsFillOnAccountSelectFeatureEnabled()) {
     wait_for_username_reason = WaitForUsernameReason::kFoasFeature;
-  } else if (observed_form.accepts_webauthn_credentials &&
-             client->GetWebAuthnCredentialsDelegateForDriver(driver)
-                 ->IsWebAuthnAutofillEnabled()) {
+  } else if (observed_form.accepts_webauthn_credentials) {
     wait_for_username_reason =
         WaitForUsernameReason::kAcceptsWebAuthnCredentials;
   }

components/password_manager/core/browser/password_form_filling_unittest.cc

diff --git a/components/password_manager/core/browser/password_form_filling_unittest.cc b/components/password_manager/core/browser/password_form_filling_unittest.cc
index 4159d0e..bb1e211 100644
--- a/components/password_manager/core/browser/password_form_filling_unittest.cc
+++ b/components/password_manager/core/browser/password_form_filling_unittest.cc
@@ -136,8 +136,6 @@
         .WillByDefault(Return(&webauthn_credentials_delegate_));
     ON_CALL(client_, GetPasswordFeatureManager)
         .WillByDefault(Return(&feature_manager_));
-    ON_CALL(webauthn_credentials_delegate_, IsWebAuthnAutofillEnabled)
-        .WillByDefault(Return(false));
   }
 
  protected:
@@ -286,38 +284,9 @@
 }
 
 #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
-TEST_F(PasswordFormFillingTest, DontFillOnLoadWebAuthnCredentials) {
-  MockWebAuthnCredentialsDelegate webauthn_credentials_delegate;
-  observed_form_.accepts_webauthn_credentials = true;
-  for (bool webauthn_autofill_enabled : {false, true}) {
-    PasswordFormFillData fill_data;
-    EXPECT_CALL(client_, GetWebAuthnCredentialsDelegateForDriver)
-        .WillOnce(Return(&webauthn_credentials_delegate));
-    EXPECT_CALL(webauthn_credentials_delegate, IsWebAuthnAutofillEnabled())
-        .WillOnce(Return(webauthn_autofill_enabled));
-    EXPECT_CALL(driver_, SetPasswordFillData(_))
-        .WillOnce(SaveArg<0>(&fill_data));
-    EXPECT_CALL(client_, PasswordWasAutofilled);
-    LikelyFormFilling likely_form_filling = SendFillInformationToRenderer(
-        &client_, &driver_, observed_form_, {&saved_match_}, federated_matches_,
-        &saved_match_, /*blocked_by_user=*/false, metrics_recorder_.get(),
-        /*webauthn_suggestions_available=*/false);
-    if (webauthn_autofill_enabled) {
-      EXPECT_EQ(LikelyFormFilling::kFillOnAccountSelect, likely_form_filling);
-    } else {
-      EXPECT_EQ(LikelyFormFilling::kFillOnPageLoad, likely_form_filling);
-    }
-  }
-}
-
 TEST_F(PasswordFormFillingTest, FillWithOnlyWebAuthnCredentials) {
-  MockWebAuthnCredentialsDelegate webauthn_credentials_delegate;
   observed_form_.accepts_webauthn_credentials = true;
 
-  EXPECT_CALL(client_, GetWebAuthnCredentialsDelegateForDriver)
-      .WillOnce(Return(&webauthn_credentials_delegate));
-  EXPECT_CALL(webauthn_credentials_delegate, IsWebAuthnAutofillEnabled())
-      .WillOnce(Return(true));
   EXPECT_CALL(client_, PasswordWasAutofilled);
   LikelyFormFilling likely_form_filling = SendFillInformationToRenderer(
       &client_, &driver_, observed_form_, {&saved_match_}, federated_matches_,

components/password_manager/core/browser/password_form_manager.cc

diff --git a/components/password_manager/core/browser/password_form_manager.cc b/components/password_manager/core/browser/password_form_manager.cc
index 7745d14..eba077c 100644
--- a/components/password_manager/core/browser/password_form_manager.cc
+++ b/components/password_manager/core/browser/password_form_manager.cc
@@ -178,7 +178,7 @@
 
     WebAuthnCredentialsDelegate* delegate =
         client_->GetWebAuthnCredentialsDelegateForDriver(driver_.get());
-    if (delegate && delegate->IsWebAuthnAutofillEnabled()) {
+    if (delegate) {
       delegate->RetrieveWebAuthnSuggestions(
           async_predictions_waiter_.CreateClosure());
     }
@@ -734,7 +734,7 @@
 bool PasswordFormManager::WebAuthnCredentialsAvailable() const {
   WebAuthnCredentialsDelegate* delegate =
       client_->GetWebAuthnCredentialsDelegateForDriver(driver_.get());
-  if (delegate && delegate->IsWebAuthnAutofillEnabled()) {
+  if (delegate) {
     return delegate->GetWebAuthnSuggestions().has_value();
   }
   return false;

components/password_manager/core/browser/password_form_manager_unittest.cc

diff --git a/components/password_manager/core/browser/password_form_manager_unittest.cc b/components/password_manager/core/browser/password_form_manager_unittest.cc
index 75db377..b27d3f2f 100644
--- a/components/password_manager/core/browser/password_form_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_form_manager_unittest.cc
@@ -59,6 +59,7 @@
 #include "components/ukm/test_ukm_recorder.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
 
 using autofill::AutofillUploadContents;
 using autofill::FieldPropertiesFlags;
@@ -463,8 +464,8 @@
         .WillByDefault(Return(url::Origin::Create(observed_form_.url)));
     ON_CALL(client_, GetWebAuthnCredentialsDelegateForDriver)
         .WillByDefault(Return(&webauthn_credentials_delegate_));
-    ON_CALL(webauthn_credentials_delegate_, IsWebAuthnAutofillEnabled)
-        .WillByDefault(Return(false));
+    ON_CALL(webauthn_credentials_delegate_, GetWebAuthnSuggestions)
+        .WillByDefault(ReturnRef(webauthn_suggestions_));
 
     fetcher_ = std::make_unique<FakeFormFetcher>();
     fetcher_->Fetch();
@@ -490,6 +491,7 @@
   MockPasswordManagerClient client_;
   MockPasswordManagerDriver driver_;
   MockWebAuthnCredentialsDelegate webauthn_credentials_delegate_;
+  absl::optional<std::vector<autofill::Suggestion>> webauthn_suggestions_;
 
   // Define |fetcher_| before |form_manager_|, because the former needs to
   // outlive the latter.

components/password_manager/core/browser/password_manager_unittest.cc

diff --git a/components/password_manager/core/browser/password_manager_unittest.cc b/components/password_manager/core/browser/password_manager_unittest.cc
index befbf942..dfcd2bd 100644
--- a/components/password_manager/core/browser/password_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_manager_unittest.cc
@@ -159,8 +159,8 @@
 
     ON_CALL(*this, GetWebAuthnCredentialsDelegateForDriver)
         .WillByDefault(Return(&webauthn_credentials_delegate_));
-    ON_CALL(webauthn_credentials_delegate_, IsWebAuthnAutofillEnabled)
-        .WillByDefault(Return(false));
+    ON_CALL(webauthn_credentials_delegate_, GetWebAuthnSuggestions)
+        .WillByDefault(ReturnRef(webauthn_suggestions_));
   }
 
   MOCK_METHOD(bool,
@@ -266,6 +266,7 @@
   mutable FakeNetworkContext network_context_;
   testing::NiceMock<MockStoreResultFilter> filter_;
   MockWebAuthnCredentialsDelegate webauthn_credentials_delegate_;
+  absl::optional<std::vector<autofill::Suggestion>> webauthn_suggestions_;
 };
 
 class MockPasswordManagerDriver : public StubPasswordManagerDriver {

components/password_manager/core/browser/sync_credentials_filter_unittest.cc

diff --git a/components/password_manager/core/browser/sync_credentials_filter_unittest.cc b/components/password_manager/core/browser/sync_credentials_filter_unittest.cc
index e3aad820..b2fa98bab 100644
--- a/components/password_manager/core/browser/sync_credentials_filter_unittest.cc
+++ b/components/password_manager/core/browser/sync_credentials_filter_unittest.cc
@@ -57,9 +57,6 @@
     prefs_->registry()->RegisterListPref(prefs::kPasswordProtectionLoginURLs);
     prefs_->SetString(prefs::kPasswordProtectionChangePasswordURL,
                       kEnterpriseURL);
-
-    ON_CALL(webauthn_credentials_delegate_, IsWebAuthnAutofillEnabled)
-        .WillByDefault(testing::Return(false));
   }
 
   FakePasswordManagerClient(const FakePasswordManagerClient&) = delete;

components/password_manager/core/browser/webauthn_credentials_delegate.h

diff --git a/components/password_manager/core/browser/webauthn_credentials_delegate.h b/components/password_manager/core/browser/webauthn_credentials_delegate.h
index 99f4837..209bc8d 100644
--- a/components/password_manager/core/browser/webauthn_credentials_delegate.h
+++ b/components/password_manager/core/browser/webauthn_credentials_delegate.h
@@ -20,9 +20,6 @@
  public:
   virtual ~WebAuthnCredentialsDelegate() = default;
 
-  // Returns true if integration between WebAuthn and Autofill is enabled.
-  virtual bool IsWebAuthnAutofillEnabled() const = 0;
-
   // Launches the normal WebAuthn flow that lets users use their phones or
   // security keys to sign-in.
   virtual void LaunchWebAuthnFlow() = 0;

components/permissions/object_permission_context_base.cc

diff --git a/components/permissions/object_permission_context_base.cc b/components/permissions/object_permission_context_base.cc
index 5398d084..507be05 100644
--- a/components/permissions/object_permission_context_base.cc
+++ b/components/permissions/object_permission_context_base.cc
@@ -236,14 +236,15 @@
   }
 }
 
-base::Value ObjectPermissionContextBase::GetWebsiteSetting(
+base::Value::Dict ObjectPermissionContextBase::GetWebsiteSetting(
     const url::Origin& origin,
     content_settings::SettingInfo* info) {
   base::Value value = host_content_settings_map_->GetWebsiteSetting(
       origin.GetURL(), GURL(), data_content_settings_type_, info);
-  if (value.is_none())
-    return base::Value(base::Value::Type::DICTIONARY);
-  return value;
+  if (!value.is_dict()) {
+    return base::Value::Dict();
+  }
+  return std::move(value.GetDict());
 }
 
 void ObjectPermissionContextBase::SaveWebsiteSetting(
@@ -269,11 +270,11 @@
   for (const auto& object : origin_objects_it->second) {
     objects_list.Append(object.second->value.Clone());
   }
-  base::Value website_setting_value(base::Value::Type::DICTIONARY);
-  website_setting_value.SetKey(kObjectListKey, std::move(objects_list));
+  base::Value::Dict website_setting_value;
+  website_setting_value.Set(kObjectListKey, std::move(objects_list));
   host_content_settings_map_->SetWebsiteSettingDefaultScope(
       origin.GetURL(), GURL(), data_content_settings_type_,
-      std::move(website_setting_value));
+      base::Value(std::move(website_setting_value)));
 }
 
 void ObjectPermissionContextBase::ScheduleSaveWebsiteSetting(
@@ -315,12 +316,12 @@
       continue;
 
     content_settings::SettingInfo info;
-    base::Value setting = GetWebsiteSetting(origin, &info);
-    base::Value* objects = setting.FindListKey(kObjectListKey);
+    base::Value::Dict setting = GetWebsiteSetting(origin, &info);
+    base::Value::List* objects = setting.FindList(kObjectListKey);
     if (!objects)
       continue;
 
-    for (auto& object : objects->GetList()) {
+    for (auto& object : *objects) {
       if (!IsValidObject(object)) {
         continue;
       }

components/permissions/object_permission_context_base.h

diff --git a/components/permissions/object_permission_context_base.h b/components/permissions/object_permission_context_base.h
index 8766b32d..9ebf06e 100644
--- a/components/permissions/object_permission_context_base.h
+++ b/components/permissions/object_permission_context_base.h
@@ -172,8 +172,8 @@
   base::ObserverList<PermissionObserver> permission_observer_list_;
 
  private:
-  base::Value GetWebsiteSetting(const url::Origin& origin,
-                                content_settings::SettingInfo* info);
+  base::Value::Dict GetWebsiteSetting(const url::Origin& origin,
+                                      content_settings::SettingInfo* info);
   void SaveWebsiteSetting(const url::Origin& origin);
   void ScheduleSaveWebsiteSetting(const url::Origin& origin);
   virtual std::vector<std::unique_ptr<Object>> GetWebsiteSettingObjects();

components/permissions/object_permission_context_base_unittest.cc

diff --git a/components/permissions/object_permission_context_base_unittest.cc b/components/permissions/object_permission_context_base_unittest.cc
index 2618897..a9f74bc 100644
--- a/components/permissions/object_permission_context_base_unittest.cc
+++ b/components/permissions/object_permission_context_base_unittest.cc
@@ -32,8 +32,9 @@
   ~TestObjectPermissionContext() override = default;
 
   bool IsValidObject(const base::Value& object) override {
-    return object.DictSize() == 2 && object.FindKey(kRequiredKey1) &&
-           object.FindKey(kRequiredKey2);
+    const base::Value::Dict& dict = object.GetDict();
+    return dict.size() == 2 && dict.Find(kRequiredKey1) &&
+           dict.Find(kRequiredKey2);
   }
 
   std::u16string GetObjectDisplayName(const base::Value& object) override {
@@ -41,7 +42,7 @@
   }
 
   std::string GetKeyForObject(const base::Value& object) override {
-    return *object.FindStringKey(kRequiredKey1);
+    return *object.GetDict().FindString(kRequiredKey1);
   }
 };
 
@@ -54,13 +55,13 @@
         url2_("https://chromium.org"),
         origin1_(url::Origin::Create(url1_)),
         origin2_(url::Origin::Create(url2_)),
-        object1_(base::Value::Type::DICTIONARY),
-        object2_(base::Value::Type::DICTIONARY),
+        object1_(base::Value::Type::DICT),
+        object2_(base::Value::Type::DICT),
         context_(browser_context()) {
-    object1_.SetStringKey(kRequiredKey1, "value1");
-    object1_.SetStringKey(kRequiredKey2, "value2");
-    object2_.SetStringKey(kRequiredKey1, "value3");
-    object2_.SetStringKey(kRequiredKey2, "value4");
+    object1_.GetDict().Set(kRequiredKey1, "value1");
+    object1_.GetDict().Set(kRequiredKey2, "value2");
+    object2_.GetDict().Set(kRequiredKey1, "value3");
+    object2_.GetDict().Set(kRequiredKey2, "value4");
   }
 
   ~ObjectPermissionContextBaseTest() override = default;

components/permissions/permission_decision_auto_blocker.cc

diff --git a/components/permissions/permission_decision_auto_blocker.cc b/components/permissions/permission_decision_auto_blocker.cc
index bc80788..370cf60 100644
--- a/components/permissions/permission_decision_auto_blocker.cc
+++ b/components/permissions/permission_decision_auto_blocker.cc
@@ -73,46 +73,39 @@
   return PermissionUtil::GetPermissionString(content_type);
 }
 
-std::unique_ptr<base::Value> GetOriginAutoBlockerData(
-    HostContentSettingsMap* settings,
-    const GURL& origin_url) {
+base::Value::Dict GetOriginAutoBlockerData(HostContentSettingsMap* settings,
+                                           const GURL& origin_url) {
   base::Value website_setting = settings->GetWebsiteSetting(
       origin_url, GURL(), ContentSettingsType::PERMISSION_AUTOBLOCKER_DATA,
       nullptr);
-  if (!website_setting.is_dict())
-    return std::make_unique<base::Value>(base::Value::Type::DICTIONARY);
+  if (!website_setting.is_dict()) {
+    return base::Value::Dict();
+  }
 
-  return base::Value::ToUniquePtrValue(std::move(website_setting));
+  return std::move(website_setting.GetDict());
 }
 
-base::Value* GetOrCreatePermissionDict(base::Value* origin_dict,
-                                       const std::string& permission) {
-  base::Value* permission_dict =
-      origin_dict->FindKeyOfType(permission, base::Value::Type::DICTIONARY);
-  if (permission_dict)
-    return permission_dict;
-  return origin_dict->SetKey(permission,
-                             base::Value(base::Value::Type::DICTIONARY));
+base::Value::Dict* GetOrCreatePermissionDict(base::Value::Dict& origin_dict,
+                                             const std::string& permission) {
+  return origin_dict.EnsureDict(permission);
 }
 
 int RecordActionInWebsiteSettings(const GURL& url,
                                   ContentSettingsType permission,
                                   const char* key,
                                   HostContentSettingsMap* settings_map) {
-  std::unique_ptr<base::Value> dict =
-      GetOriginAutoBlockerData(settings_map, url);
+  base::Value::Dict dict = GetOriginAutoBlockerData(settings_map, url);
 
-  base::Value* permission_dict = GetOrCreatePermissionDict(
-      dict.get(), GetStringForContentType(permission));
+  base::Value::Dict* permission_dict =
+      GetOrCreatePermissionDict(dict, GetStringForContentType(permission));
 
-  base::Value* value =
-      permission_dict->FindKeyOfType(key, base::Value::Type::INTEGER);
-  int current_count = value ? value->GetInt() : 0;
-  permission_dict->SetKey(key, base::Value(++current_count));
+  absl::optional<int> value = permission_dict->FindInt(key);
+  int current_count = value.value_or(0);
+  permission_dict->Set(key, base::Value(++current_count));
 
   settings_map->SetWebsiteSettingDefaultScope(
       url, GURL(), ContentSettingsType::PERMISSION_AUTOBLOCKER_DATA,
-      base::Value::FromUniquePtrValue(std::move(dict)));
+      base::Value(std::move(dict)));
 
   return current_count;
 }
@@ -121,14 +114,12 @@
                    ContentSettingsType permission,
                    const char* key,
                    HostContentSettingsMap* settings_map) {
-  std::unique_ptr<base::Value> dict =
-      GetOriginAutoBlockerData(settings_map, url);
-  base::Value* permission_dict = GetOrCreatePermissionDict(
-      dict.get(), GetStringForContentType(permission));
+  base::Value::Dict dict = GetOriginAutoBlockerData(settings_map, url);
+  base::Value::Dict* permission_dict =
+      GetOrCreatePermissionDict(dict, GetStringForContentType(permission));
 
-  base::Value* value =
-      permission_dict->FindKeyOfType(key, base::Value::Type::INTEGER);
-  return value ? value->GetInt() : 0;
+  absl::optional<int> value = permission_dict->FindInt(key);
+  return value.value_or(0);
 }
 
 // Returns the number of times that users may explicitly dismiss a permission
@@ -156,28 +147,24 @@
   return base::Days(g_dismissal_embargo_days);
 }
 
-base::Time GetEmbargoStartTime(base::Value* permission_dict,
+base::Time GetEmbargoStartTime(base::Value::Dict* permission_dict,
                                const base::Feature& feature,
                                const char* key) {
-  base::Value* found =
-      permission_dict->FindKeyOfType(key, base::Value::Type::DOUBLE);
+  absl::optional<double> found = permission_dict->FindDouble(key);
   if (found && base::FeatureList::IsEnabled(feature)) {
-    return base::Time::FromDeltaSinceWindowsEpoch(
-        base::Microseconds(found->GetDouble()));
+    return base::Time::FromDeltaSinceWindowsEpoch(base::Microseconds(*found));
   }
   return base::Time();
 }
 
-bool IsUnderEmbargo(base::Value* permission_dict,
+bool IsUnderEmbargo(base::Value::Dict* permission_dict,
                     const base::Feature& feature,
                     const char* key,
                     base::Time current_time,
                     base::TimeDelta offset) {
-  base::Value* found =
-      permission_dict->FindKeyOfType(key, base::Value::Type::DOUBLE);
+  absl::optional<double> found = permission_dict->FindDouble(key);
   if (found && base::FeatureList::IsEnabled(feature) &&
-      current_time <
-          base::Time::FromInternalValue(found->GetDouble()) + offset) {
+      current_time < base::Time::FromInternalValue(*found) + offset) {
     return true;
   }
 
@@ -237,10 +224,10 @@
   DCHECK(settings_map);
   DCHECK(IsEnabledForContentSetting(permission));
 
-  std::unique_ptr<base::Value> dict =
+  base::Value::Dict dict =
       GetOriginAutoBlockerData(settings_map, request_origin);
-  base::Value* permission_dict = GetOrCreatePermissionDict(
-      dict.get(), GetStringForContentType(permission));
+  base::Value::Dict* permission_dict =
+      GetOrCreatePermissionDict(dict, GetStringForContentType(permission));
 
   int dismiss_count = GetActionCount(request_origin, permission,
                                      kPromptDismissCountKey, settings_map);
@@ -322,10 +309,10 @@
     const GURL& request_origin,
     ContentSettingsType permission) {
   DCHECK(settings_map_);
-  std::unique_ptr<base::Value> dict =
+  base::Value::Dict dict =
       GetOriginAutoBlockerData(settings_map_, request_origin);
-  base::Value* permission_dict = GetOrCreatePermissionDict(
-      dict.get(), GetStringForContentType(permission));
+  base::Value::Dict* permission_dict =
+      GetOrCreatePermissionDict(dict, GetStringForContentType(permission));
 
   // A permission may have a record for both dismisal and ignore, return the
   // most recent. A permission will only actually be under one embargo, but
@@ -463,14 +450,13 @@
   if (!IsEnabledForContentSetting(permission))
     return;
 
-  std::unique_ptr<base::Value> dict =
-      GetOriginAutoBlockerData(settings_map_, url);
+  base::Value::Dict dict = GetOriginAutoBlockerData(settings_map_, url);
 
-  dict->RemoveKey(GetStringForContentType(permission));
+  dict.Remove(GetStringForContentType(permission));
 
   settings_map_->SetWebsiteSettingDefaultScope(
       url, GURL(), ContentSettingsType::PERMISSION_AUTOBLOCKER_DATA,
-      base::Value::FromUniquePtrValue(std::move(dict)));
+      base::Value(std::move(dict)));
 }
 
 void PermissionDecisionAutoBlocker::RemoveEmbargoAndResetCounts(
@@ -515,15 +501,15 @@
     const GURL& request_origin,
     ContentSettingsType permission,
     const char* key) {
-  std::unique_ptr<base::Value> dict =
+  base::Value::Dict dict =
       GetOriginAutoBlockerData(settings_map_, request_origin);
-  base::Value* permission_dict = GetOrCreatePermissionDict(
-      dict.get(), GetStringForContentType(permission));
-  permission_dict->SetKey(
+  base::Value::Dict* permission_dict =
+      GetOrCreatePermissionDict(dict, GetStringForContentType(permission));
+  permission_dict->Set(
       key, base::Value(static_cast<double>(clock_->Now().ToInternalValue())));
   settings_map_->SetWebsiteSettingDefaultScope(
       request_origin, GURL(), ContentSettingsType::PERMISSION_AUTOBLOCKER_DATA,
-      base::Value::FromUniquePtrValue(std::move(dict)));
+      base::Value(std::move(dict)));
   NotifyEmbargoStarted(request_origin, permission);
 }
 

components/policy/proto/chrome_device_policy.proto

diff --git a/components/policy/proto/chrome_device_policy.proto b/components/policy/proto/chrome_device_policy.proto
index 28fef58..861786c2 100644
--- a/components/policy/proto/chrome_device_policy.proto
+++ b/components/policy/proto/chrome_device_policy.proto
@@ -1671,7 +1671,7 @@
 }
 
 // Setting that controls whether Borealis will be allowed on the device.
-message OBSOLETE_DeviceBorealisAllowedProto {
+message DeviceBorealisAllowedProto {
   optional bool allowed = 1 [default = true];
 }
 
@@ -1885,8 +1885,7 @@
       device_system_wide_tracing_enabled = 117;
   optional DevicePciPeripheralDataAccessEnabledProto
       device_pci_peripheral_data_access_enabled = 118;
-  optional OBSOLETE_DeviceBorealisAllowedProto device_borealis_allowed = 119
-      [deprecated = true];
+  optional DeviceBorealisAllowedProto device_borealis_allowed = 119;
   optional DeviceAllowedBluetoothServicesProto
       device_allowed_bluetooth_services = 120;
   optional DeviceDebugPacketCaptureAllowedProto

components/policy/resources/templates/device_policy_proto_map.yaml

diff --git a/components/policy/resources/templates/device_policy_proto_map.yaml b/components/policy/resources/templates/device_policy_proto_map.yaml
index 000865a..184d166 100644
--- a/components/policy/resources/templates/device_policy_proto_map.yaml
+++ b/components/policy/resources/templates/device_policy_proto_map.yaml
@@ -26,6 +26,7 @@
 DeviceBatteryChargeMode: device_battery_charge_mode.battery_charge_mode
 DeviceBlockDevmode: system_settings.block_devmode
 DeviceBootOnAcEnabled: device_boot_on_ac.enabled
+DeviceBorealisAllowed: device_borealis_allowed.allowed
 DeviceChannelDowngradeBehavior: auto_update_settings.channel_downgrade_behavior
 DeviceChromeVariations: device_chrome_variations_type.value
 DeviceCrostiniArcAdbSideloadingAllowed: device_crostini_arc_adb_sideloading_allowed.mode

components/policy/resources/templates/policy_definitions/Borealis/DeviceBorealisAllowed.yaml

diff --git a/components/policy/resources/templates/policy_definitions/Borealis/DeviceBorealisAllowed.yaml b/components/policy/resources/templates/policy_definitions/Borealis/DeviceBorealisAllowed.yaml
index 9a8f4ae..e1925d14 100644
--- a/components/policy/resources/templates/policy_definitions/Borealis/DeviceBorealisAllowed.yaml
+++ b/components/policy/resources/templates/policy_definitions/Borealis/DeviceBorealisAllowed.yaml
@@ -1,11 +1,8 @@
 caption: Allow devices to use <ph name="BOREALIS_NAME">Borealis</ph> on <ph name="PRODUCT_OS_NAME">$2<ex>Google
   ChromeOS</ex></ph>
 default: true
-deprecated: True
 desc: |-
-  This policy is deprecated, please use <ph name="USER_BOREALIS_ALLOWED_NAME">UserBorealisAllowed</ph> instead.
-
-        Controls the availability of <ph name="BOREALIS_NAME">Borealis</ph> for this device.
+  Controls the availability of <ph name="BOREALIS_NAME">Borealis</ph> for this device.
 
         If the policy is set to false, <ph name="BOREALIS_NAME">Borealis</ph> will be unavailable for all users of the device. Otherwise (when the policy is unset, or true) <ph name="BOREALIS_NAME">Borealis</ph> will be available if and only if no other policy or setting disables it.
 device_only: true
@@ -24,6 +21,6 @@
 schema:
   type: boolean
 supported_on:
-- chrome_os:91-110
+- chrome_os:91-
 tags: []
 type: main

components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h

diff --git a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h
index 4f9b7c3a..a96fb97 100644
--- a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h
+++ b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h
@@ -15,7 +15,7 @@
 #include "components/safe_browsing/core/browser/db/hit_report.h"
 #include "components/safe_browsing/core/browser/download_check_result.h"
 #include "components/safe_browsing/core/browser/ping_manager.h"
-#include "components/safe_browsing/core/browser/safe_browsing_url_checker_impl.h"
+#include "components/safe_browsing/core/browser/url_realtime_mechanism.h"
 #include "components/safe_browsing/core/common/proto/csd.pb.h"
 #include "components/safe_browsing/core/common/proto/realtimeapi.pb.h"
 #include "components/safe_browsing/core/common/proto/webui.pb.h"
@@ -303,7 +303,7 @@
   ~SafeBrowsingUI() override;
 };
 
-class WebUIInfoSingleton : public SafeBrowsingUrlCheckerImpl::WebUIDelegate,
+class WebUIInfoSingleton : public UrlRealTimeMechanism::WebUIDelegate,
                            public PingManager::WebUIDelegate {
  public:
   WebUIInfoSingleton();

components/safe_browsing/content/resources/download_file_types.asciipb

diff --git a/components/safe_browsing/content/resources/download_file_types.asciipb b/components/safe_browsing/content/resources/download_file_types.asciipb
index 4aee78d8..54afc625 100644
--- a/components/safe_browsing/content/resources/download_file_types.asciipb
+++ b/components/safe_browsing/content/resources/download_file_types.asciipb
@@ -8,7 +8,7 @@
 ##
 ## Top level settings
 ##
-version_id: 55
+version_id: 56
 sampled_ping_probability: 0.01
 max_archived_binaries_to_report: 10
 default_file_type {
@@ -1722,6 +1722,16 @@
     auto_open_hint: DISALLOW_AUTO_OPEN
   }
 }
+file_types {
+  extension: "psm1"
+  uma_value: 402
+  ping_setting: FULL_PING
+  platform_settings {
+    platform: PLATFORM_TYPE_WINDOWS
+    danger_level: ALLOW_ON_USER_GESTURE
+    auto_open_hint: DISALLOW_AUTO_OPEN
+  }
+}
 
 # Internet Shortcuts (new since IE9). Both .url and .website are .ini
 # files that describe a shortcut that points to a URL. They can point at

components/safe_browsing/content/resources/download_file_types_experiment.asciipb

diff --git a/components/safe_browsing/content/resources/download_file_types_experiment.asciipb b/components/safe_browsing/content/resources/download_file_types_experiment.asciipb
index ffa7cb9..51d1128 100644
--- a/components/safe_browsing/content/resources/download_file_types_experiment.asciipb
+++ b/components/safe_browsing/content/resources/download_file_types_experiment.asciipb
@@ -12,7 +12,7 @@
 ## version id is larger than the version id in download_file_types.asciipb. If
 ## there isn't an ongoing experiment, this version id is equal to the version id
 ## in download_file_types.asciipb.
-version_id: 55
+version_id: 56
 sampled_ping_probability: 0.01
 max_archived_binaries_to_report: 10
 default_file_type {
@@ -1726,6 +1726,16 @@
     auto_open_hint: DISALLOW_AUTO_OPEN
   }
 }
+file_types {
+  extension: "psm1"
+  uma_value: 402
+  ping_setting: FULL_PING
+  platform_settings {
+    platform: PLATFORM_TYPE_WINDOWS
+    danger_level: ALLOW_ON_USER_GESTURE
+    auto_open_hint: DISALLOW_AUTO_OPEN
+  }
+}
 
 # Internet Shortcuts (new since IE9). Both .url and .website are .ini
 # files that describe a shortcut that points to a URL. They can point at

components/safe_browsing/core/browser/BUILD.gn

diff --git a/components/safe_browsing/core/browser/BUILD.gn b/components/safe_browsing/core/browser/BUILD.gn
index 7f24670..3f108703 100644
--- a/components/safe_browsing/core/browser/BUILD.gn
+++ b/components/safe_browsing/core/browser/BUILD.gn
@@ -6,11 +6,19 @@
 
 source_set("browser") {
   sources = [
+    "hash_database_mechanism.cc",
+    "hash_database_mechanism.h",
     "ping_manager.cc",
     "ping_manager.h",
+    "safe_browsing_lookup_mechanism.cc",
+    "safe_browsing_lookup_mechanism.h",
+    "safe_browsing_lookup_mechanism_runner.cc",
+    "safe_browsing_lookup_mechanism_runner.h",
     "safe_browsing_url_checker_impl.cc",
     "safe_browsing_url_checker_impl.h",
     "url_checker_delegate.h",
+    "url_realtime_mechanism.cc",
+    "url_realtime_mechanism.h",
     "user_population.cc",
     "user_population.h",
   ]

components/safe_browsing/core/browser/hash_database_mechanism.cc

diff --git a/components/safe_browsing/core/browser/hash_database_mechanism.cc b/components/safe_browsing/core/browser/hash_database_mechanism.cc
new file mode 100644
index 0000000..e84921ed
--- /dev/null
+++ b/components/safe_browsing/core/browser/hash_database_mechanism.cc
@@ -0,0 +1,62 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "components/safe_browsing/core/browser/hash_database_mechanism.h"
+
+#include "components/safe_browsing/core/browser/db/database_manager.h"
+#include "components/safe_browsing/core/browser/db/util.h"
+#include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
+#include "components/safe_browsing/core/browser/safe_browsing_lookup_mechanism.h"
+
+namespace safe_browsing {
+
+HashDatabaseMechanism::HashDatabaseMechanism(
+    const GURL& url,
+    const SBThreatTypeSet& threat_types,
+    scoped_refptr<SafeBrowsingDatabaseManager> database_manager,
+    bool can_check_db)
+    : SafeBrowsingLookupMechanism(url,
+                                  threat_types,
+                                  database_manager,
+                                  can_check_db) {}
+
+HashDatabaseMechanism::~HashDatabaseMechanism() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+  if (is_async_database_manager_check_in_progress_) {
+    database_manager_->CancelCheck(this);
+  }
+}
+
+SafeBrowsingLookupMechanism::StartCheckResult
+HashDatabaseMechanism::StartCheckInternal() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  bool safe_synchronously = can_check_db_ ? CallCheckBrowseUrl() : true;
+  return StartCheckResult(
+      /*is_safe_synchronously=*/safe_synchronously,
+      /*did_check_allowlist=*/false);
+}
+
+bool HashDatabaseMechanism::CallCheckBrowseUrl() {
+  bool is_safe_synchronously =
+      database_manager_->CheckBrowseUrl(url_, threat_types_, this);
+  if (!is_safe_synchronously) {
+    is_async_database_manager_check_in_progress_ = true;
+  }
+  return is_safe_synchronously;
+}
+
+void HashDatabaseMechanism::OnCheckBrowseUrlResult(
+    const GURL& url,
+    SBThreatType threat_type,
+    const ThreatMetadata& metadata) {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  is_async_database_manager_check_in_progress_ = false;
+  CompleteCheck(std::make_unique<CompleteCheckResult>(
+      url, threat_type, metadata,
+      /*is_from_real_time_check=*/false,
+      /*real_time_lookup_response=*/nullptr));
+}
+
+}  // namespace safe_browsing

components/safe_browsing/core/browser/hash_database_mechanism.h

diff --git a/components/safe_browsing/core/browser/hash_database_mechanism.h b/components/safe_browsing/core/browser/hash_database_mechanism.h
new file mode 100644
index 0000000..d2f7c89
--- /dev/null
+++ b/components/safe_browsing/core/browser/hash_database_mechanism.h
@@ -0,0 +1,52 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef COMPONENTS_SAFE_BROWSING_CORE_BROWSER_HASH_DATABASE_MECHANISM_H_
+#define COMPONENTS_SAFE_BROWSING_CORE_BROWSER_HASH_DATABASE_MECHANISM_H_
+
+#include "base/sequence_checker.h"
+#include "components/safe_browsing/core/browser/db/database_manager.h"
+#include "components/safe_browsing/core/browser/safe_browsing_lookup_mechanism.h"
+#include "url/gurl.h"
+
+namespace safe_browsing {
+
+// This performs the hash-based Safe Browsing check using the database manager.
+class HashDatabaseMechanism : public SafeBrowsingLookupMechanism,
+                              public SafeBrowsingDatabaseManager::Client {
+ public:
+  HashDatabaseMechanism(
+      const GURL& url,
+      const SBThreatTypeSet& threat_types,
+      scoped_refptr<SafeBrowsingDatabaseManager> database_manager,
+      bool can_check_db);
+
+  HashDatabaseMechanism(const HashDatabaseMechanism&) = delete;
+  HashDatabaseMechanism& operator=(const HashDatabaseMechanism&) = delete;
+  ~HashDatabaseMechanism() override;
+
+ private:
+  // SafeBrowsingLookupMechanism implementation:
+  StartCheckResult StartCheckInternal() override;
+
+  // SafeBrowsingDatabaseManager::Client implementation:
+  void OnCheckBrowseUrlResult(const GURL& url,
+                              SBThreatType threat_type,
+                              const ThreatMetadata& metadata) override;
+
+  // Calls |CheckBrowseUrl| on the database manager and sets
+  // is_async_database_manager_check_in_progress_ if the check is asynchronous.
+  bool CallCheckBrowseUrl();
+
+  SEQUENCE_CHECKER(sequence_checker_);
+
+  // Tracks whether there is currently an async call into the database manager
+  // that the checker is waiting to hear back on. This is used in order to
+  // decide whether to ask the database manager to cancel the check on destruct.
+  bool is_async_database_manager_check_in_progress_ = false;
+};
+
+}  // namespace safe_browsing
+
+#endif  // COMPONENTS_SAFE_BROWSING_CORE_BROWSER_HASH_DATABASE_MECHANISM_H_

components/safe_browsing/core/browser/safe_browsing_lookup_mechanism.cc

diff --git a/components/safe_browsing/core/browser/safe_browsing_lookup_mechanism.cc b/components/safe_browsing/core/browser/safe_browsing_lookup_mechanism.cc
new file mode 100644
index 0000000..193b2501
--- /dev/null
+++ b/components/safe_browsing/core/browser/safe_browsing_lookup_mechanism.cc
@@ -0,0 +1,59 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "components/safe_browsing/core/browser/safe_browsing_lookup_mechanism.h"
+
+namespace safe_browsing {
+
+SafeBrowsingLookupMechanism::SafeBrowsingLookupMechanism(
+    const GURL& url,
+    const SBThreatTypeSet& threat_types,
+    scoped_refptr<SafeBrowsingDatabaseManager> database_manager,
+    bool can_check_db)
+    : url_(url),
+      threat_types_(threat_types),
+      database_manager_(database_manager),
+      can_check_db_(can_check_db) {}
+
+SafeBrowsingLookupMechanism::~SafeBrowsingLookupMechanism() = default;
+
+SafeBrowsingLookupMechanism::StartCheckResult::StartCheckResult(
+    bool is_safe_synchronously,
+    bool did_check_allowlist)
+    : is_safe_synchronously(is_safe_synchronously),
+      did_check_allowlist(did_check_allowlist) {}
+
+SafeBrowsingLookupMechanism::CompleteCheckResult::CompleteCheckResult(
+    const GURL& url,
+    SBThreatType threat_type,
+    const ThreatMetadata& metadata,
+    bool is_from_real_time_check,
+    std::unique_ptr<RTLookupResponse> real_time_lookup_response)
+    : url(url),
+      threat_type(threat_type),
+      metadata(metadata),
+      is_from_real_time_check(is_from_real_time_check),
+      real_time_lookup_response(std::move(real_time_lookup_response)) {}
+
+SafeBrowsingLookupMechanism::CompleteCheckResult::~CompleteCheckResult() =
+    default;
+
+SafeBrowsingLookupMechanism::StartCheckResult
+SafeBrowsingLookupMechanism::StartCheck(
+    CompleteCheckResultCallback complete_check_callback) {
+#if DCHECK_IS_ON()
+  DCHECK(!has_started_check_);
+  has_started_check_ = true;
+#endif
+  complete_check_callback_ = std::move(complete_check_callback);
+  return StartCheckInternal();
+}
+
+void SafeBrowsingLookupMechanism::CompleteCheck(
+    std::unique_ptr<CompleteCheckResult> result) {
+  DCHECK(complete_check_callback_);
+  std::move(complete_check_callback_).Run(std::move(result));
+}
+
+}  // namespace safe_browsing

components/safe_browsing/core/browser/safe_browsing_lookup_mechanism.h

diff --git a/components/safe_browsing/core/browser/safe_browsing_lookup_mechanism.h b/components/safe_browsing/core/browser/safe_browsing_lookup_mechanism.h
new file mode 100644
index 0000000..3859c699
--- /dev/null
+++ b/components/safe_browsing/core/browser/safe_browsing_lookup_mechanism.h
@@ -0,0 +1,104 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef COMPONENTS_SAFE_BROWSING_CORE_BROWSER_SAFE_BROWSING_LOOKUP_MECHANISM_H_
+#define COMPONENTS_SAFE_BROWSING_CORE_BROWSER_SAFE_BROWSING_LOOKUP_MECHANISM_H_
+
+#include "base/functional/callback_forward.h"
+#include "components/safe_browsing/core/browser/db/database_manager.h"
+#include "components/safe_browsing/core/browser/db/util.h"
+#include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
+#include "components/safe_browsing/core/common/proto/realtimeapi.pb.h"
+#include "url/gurl.h"
+
+namespace safe_browsing {
+
+// This is the base class for specific lookup mechanism objects and holds the
+// shared logic among the objects. Each lookup mechanism object is responsible
+// for starting the lookup mechanism and eventually returning the results up to
+// the caller.
+class SafeBrowsingLookupMechanism {
+ public:
+  struct StartCheckResult {
+    StartCheckResult(bool is_safe_synchronously, bool did_check_allowlist);
+    bool is_safe_synchronously;
+    bool did_check_allowlist;
+  };
+
+  // This is used by individual lookup mechanisms as the input for the
+  // |complete_check_callback_| to the consumer. It contains the details about
+  // the mechanism's lookup.
+  struct CompleteCheckResult {
+    CompleteCheckResult(
+        const GURL& url,
+        SBThreatType threat_type,
+        const ThreatMetadata& metadata,
+        bool is_from_real_time_check,
+        std::unique_ptr<RTLookupResponse> real_time_lookup_response);
+    ~CompleteCheckResult();
+    GURL url;
+    SBThreatType threat_type;
+    ThreatMetadata metadata;
+    bool is_from_real_time_check;
+    std::unique_ptr<RTLookupResponse> real_time_lookup_response;
+  };
+  using CompleteCheckResultCallback =
+      base::OnceCallback<void(std::unique_ptr<CompleteCheckResult> result)>;
+
+  SafeBrowsingLookupMechanism(
+      const GURL& url,
+      const SBThreatTypeSet& threat_types,
+      scoped_refptr<SafeBrowsingDatabaseManager> database_manager,
+      bool can_check_db);
+  virtual ~SafeBrowsingLookupMechanism();
+  SafeBrowsingLookupMechanism(const SafeBrowsingLookupMechanism&) = delete;
+  SafeBrowsingLookupMechanism& operator=(const SafeBrowsingLookupMechanism&) =
+      delete;
+
+  // Starts the lookup mechanism check. This should only be called once. If the
+  // check completes synchronously, then it will specify |is_safe_synchronously|
+  // in the result instead of calling the |complete_check_callback| callback.
+  StartCheckResult StartCheck(
+      CompleteCheckResultCallback complete_check_callback);
+
+ protected:
+  // Called by children classes when the check is complete (unless it completes
+  // synchronously). This should only be called once, since it calls std::move
+  // on |complete_check_callback_|.
+  void CompleteCheck(std::unique_ptr<CompleteCheckResult> result);
+
+  // The URL to run the lookup for.
+  GURL url_;
+
+  // Which threat types are eligible for the check.
+  SBThreatTypeSet threat_types_;
+
+  // Used for interactions with the database, such as running a hash-based
+  // check or checking the high-confidence allowlist.
+  scoped_refptr<SafeBrowsingDatabaseManager> database_manager_;
+
+  // Whether safe browsing database can be checked. It is set to false when
+  // enterprise real time URL lookup is enabled and safe browsing is disabled
+  // for this profile.
+  bool can_check_db_;
+
+ private:
+  // |StartCheck| has some logic used across mechanisms. |StartCheckInternal| is
+  // implemented only by the inheriting classes and performs the mechanism-
+  // specific logic for starting the check.
+  virtual StartCheckResult StartCheckInternal() = 0;
+
+  // The callback that will eventually be called when the check completes,
+  // unless it completes synchronously.
+  CompleteCheckResultCallback complete_check_callback_;
+
+#if DCHECK_IS_ON()
+  // Used only to validate that StartCheck is called only once.
+  bool has_started_check_ = false;
+#endif
+};
+
+}  // namespace safe_browsing
+
+#endif  // COMPONENTS_SAFE_BROWSING_CORE_BROWSER_SAFE_BROWSING_LOOKUP_MECHANISM_H_

components/safe_browsing/core/browser/safe_browsing_lookup_mechanism_runner.cc

diff --git a/components/safe_browsing/core/browser/safe_browsing_lookup_mechanism_runner.cc b/components/safe_browsing/core/browser/safe_browsing_lookup_mechanism_runner.cc
new file mode 100644
index 0000000..4ca0e878
--- /dev/null
+++ b/components/safe_browsing/core/browser/safe_browsing_lookup_mechanism_runner.cc
@@ -0,0 +1,67 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "components/safe_browsing/core/browser/safe_browsing_lookup_mechanism_runner.h"
+
+namespace safe_browsing {
+
+namespace {
+// Maximum time in milliseconds to wait for the SafeBrowsing service reputation
+// check. After this amount of time the outstanding check will be aborted, and
+// the resource will be treated as if it were safe.
+const int kCheckUrlTimeoutMs = 5000;
+}  // namespace
+
+SafeBrowsingLookupMechanismRunner::SafeBrowsingLookupMechanismRunner(
+    std::unique_ptr<SafeBrowsingLookupMechanism> lookup_mechanism,
+    CompleteCheckCallbackWithTimeout complete_check_callback)
+    : lookup_mechanism_(std::move(lookup_mechanism)),
+      complete_check_callback_(std::move(complete_check_callback)) {}
+
+SafeBrowsingLookupMechanismRunner::~SafeBrowsingLookupMechanismRunner() =
+    default;
+
+SafeBrowsingLookupMechanism::StartCheckResult
+SafeBrowsingLookupMechanismRunner::Run() {
+  // Start a timer to abort the check if it takes too long.
+  timer_->Start(FROM_HERE, base::Milliseconds(kCheckUrlTimeoutMs), this,
+                &SafeBrowsingLookupMechanismRunner::OnTimeout);
+
+  SafeBrowsingLookupMechanism::StartCheckResult result =
+      lookup_mechanism_->StartCheck(base::BindOnce(
+          &SafeBrowsingLookupMechanismRunner::OnCompleteCheckResult,
+          weak_factory_.GetWeakPtr()));
+  if (result.is_safe_synchronously) {
+    OnCheckComplete();
+  }
+  return result;
+}
+
+void SafeBrowsingLookupMechanismRunner::OnCompleteCheckResult(
+    std::unique_ptr<SafeBrowsingLookupMechanism::CompleteCheckResult> result) {
+  OnCheckComplete();
+  std::move(complete_check_callback_)
+      .Run(/*timed_out=*/false, std::move(result));
+  // NOTE: Invoking the callback results in the synchronous destruction of this
+  // object, so there is nothing safe to do here but return.
+}
+
+void SafeBrowsingLookupMechanismRunner::OnTimeout() {
+  OnCheckComplete();
+  std::move(complete_check_callback_).Run(/*timed_out=*/true, absl::nullopt);
+  // NOTE: Invoking the callback results in the synchronous destruction of this
+  // object, so there is nothing safe to do here but return.
+}
+
+void SafeBrowsingLookupMechanismRunner::OnCheckComplete() {
+#if DCHECK_IS_ON()
+  DCHECK(!is_check_complete_);
+  is_check_complete_ = true;
+#endif
+  timer_->Stop();
+  weak_factory_.InvalidateWeakPtrs();
+  lookup_mechanism_.reset();
+}
+
+}  // namespace safe_browsing

components/safe_browsing/core/browser/safe_browsing_lookup_mechanism_runner.h

diff --git a/components/safe_browsing/core/browser/safe_browsing_lookup_mechanism_runner.h b/components/safe_browsing/core/browser/safe_browsing_lookup_mechanism_runner.h
new file mode 100644
index 0000000..11ab15ee
--- /dev/null
+++ b/components/safe_browsing/core/browser/safe_browsing_lookup_mechanism_runner.h
@@ -0,0 +1,76 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef COMPONENTS_SAFE_BROWSING_CORE_BROWSER_SAFE_BROWSING_LOOKUP_MECHANISM_RUNNER_H_
+#define COMPONENTS_SAFE_BROWSING_CORE_BROWSER_SAFE_BROWSING_LOOKUP_MECHANISM_RUNNER_H_
+
+#include "base/functional/callback_forward.h"
+#include "base/timer/timer.h"
+#include "components/safe_browsing/core/browser/safe_browsing_lookup_mechanism.h"
+
+namespace safe_browsing {
+
+// This class is responsible for handling timeouts for running a specific Safe
+// Browsing mechanism lookup. It keeps a timer while the mechanism runs and
+// responds back to the caller either with the mechanism's results or with a
+// flag indicating that the check timed out. If the check timed out, this object
+// will also perform clean-up by destroying the mechanism object.
+class SafeBrowsingLookupMechanismRunner {
+ public:
+  using CompleteCheckCallbackWithTimeout = base::OnceCallback<void(
+      bool timed_out,
+      absl::optional<std::unique_ptr<
+          SafeBrowsingLookupMechanism::CompleteCheckResult>> result)>;
+
+  SafeBrowsingLookupMechanismRunner(
+      std::unique_ptr<SafeBrowsingLookupMechanism> lookup_mechanism,
+      CompleteCheckCallbackWithTimeout complete_check_callback);
+  ~SafeBrowsingLookupMechanismRunner();
+  SafeBrowsingLookupMechanismRunner(const SafeBrowsingLookupMechanismRunner&) =
+      delete;
+  SafeBrowsingLookupMechanismRunner& operator=(
+      const SafeBrowsingLookupMechanismRunner&) = delete;
+
+  // Kicks off the lookup mechanism run and starts the timer. The result
+  // includes metadata as well as a boolean indicating whether the run completed
+  // synchronously and was found to be safe. In that case, the callback passed
+  // through the constructor will not be called.
+  SafeBrowsingLookupMechanism::StartCheckResult Run();
+
+ private:
+  // The function that the lookup mechanism calls into when its run completes.
+  // This calls the |complete_check_callback_| passed in through the
+  // constructor.
+  void OnCompleteCheckResult(
+      std::unique_ptr<SafeBrowsingLookupMechanism::CompleteCheckResult> result);
+  // The function that |timer_| calls when the lookup mechanism run times out.
+  // This calls the |complete_check_callback_| passed in through the
+  // constructor.
+  void OnTimeout();
+  // This performs clean up once a run is complete. It is only called once.
+  void OnCheckComplete();
+
+  // The lookup mechanism responsible for running the check and returning the
+  // relevant results.
+  std::unique_ptr<SafeBrowsingLookupMechanism> lookup_mechanism_;
+  // The callback passed in through the constructor that should be called either
+  // when the mechanism completes or when it times out, unless the run completes
+  // synchronously.
+  CompleteCheckCallbackWithTimeout complete_check_callback_;
+  // Timer to abort the SafeBrowsing check if it takes too long.
+  std::unique_ptr<base::OneShotTimer> timer_ =
+      std::make_unique<base::OneShotTimer>();
+
+#if DCHECK_IS_ON()
+  // Used only for a DCHECK to confirm that |OnCheckComplete| is called only
+  // once.
+  bool is_check_complete_ = false;
+#endif
+
+  base::WeakPtrFactory<SafeBrowsingLookupMechanismRunner> weak_factory_{this};
+};
+
+}  // namespace safe_browsing
+
+#endif  // COMPONENTS_SAFE_BROWSING_CORE_BROWSER_SAFE_BROWSING_LOOKUP_MECHANISM_RUNNER_H_

components/safe_browsing/core/browser/safe_browsing_url_checker_impl.cc

diff --git a/components/safe_browsing/core/browser/safe_browsing_url_checker_impl.cc b/components/safe_browsing/core/browser/safe_browsing_url_checker_impl.cc
index 3a15da23..d56cd77 100644
--- a/components/safe_browsing/core/browser/safe_browsing_url_checker_impl.cc
+++ b/components/safe_browsing/core/browser/safe_browsing_url_checker_impl.cc
@@ -4,7 +4,8 @@
 
 #include "components/safe_browsing/core/browser/safe_browsing_url_checker_impl.h"
 
-#include "base/bind.h"
+#include <memory>
+
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/histogram_macros_local.h"
@@ -12,53 +13,28 @@
 #include "base/trace_event/trace_event.h"
 #include "components/safe_browsing/core/browser/db/database_manager.h"
 #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
+#include "components/safe_browsing/core/browser/hash_database_mechanism.h"
 #include "components/safe_browsing/core/browser/realtime/policy_engine.h"
 #include "components/safe_browsing/core/browser/realtime/url_lookup_service_base.h"
+#include "components/safe_browsing/core/browser/safe_browsing_lookup_mechanism.h"
 #include "components/safe_browsing/core/browser/url_checker_delegate.h"
 #include "components/safe_browsing/core/common/features.h"
-#include "components/safe_browsing/core/common/utils.h"
 #include "components/safe_browsing/core/common/web_ui_constants.h"
 #include "components/security_interstitials/core/unsafe_resource.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_request_headers.h"
-#include "net/log/net_log_event_type.h"
 #include "services/network/public/cpp/request_destination.h"
 
 using security_interstitials::UnsafeResource;
 
 namespace safe_browsing {
+using CompleteCheckResult = SafeBrowsingLookupMechanism::CompleteCheckResult;
+
 namespace {
-
-// Maximum time in milliseconds to wait for the SafeBrowsing service reputation
-// check. After this amount of time the outstanding check will be aborted, and
-// the resource will be treated as if it were safe.
-const int kCheckUrlTimeoutMs = 5000;
-
-constexpr char kMatchResultHistogramName[] =
-    "SafeBrowsing.RT.LocalMatch.Result";
-
 void RecordCheckUrlTimeout(bool timed_out) {
   UMA_HISTOGRAM_BOOLEAN("SafeBrowsing.CheckUrl.Timeout", timed_out);
 }
-
-void RecordLocalMatchResult(
-    bool has_match,
-    network::mojom::RequestDestination request_destination,
-    std::string url_lookup_service_metric_suffix) {
-  AsyncMatch match_result =
-      has_match ? AsyncMatch::MATCH : AsyncMatch::NO_MATCH;
-  base::UmaHistogramEnumeration(kMatchResultHistogramName, match_result);
-  bool is_mainframe =
-      request_destination == network::mojom::RequestDestination::kDocument;
-  std::string frame_suffix = is_mainframe ? ".Mainframe" : ".NonMainframe";
-  base::UmaHistogramEnumeration(kMatchResultHistogramName + frame_suffix,
-                                match_result);
-  base::UmaHistogramEnumeration(kMatchResultHistogramName + frame_suffix +
-                                    url_lookup_service_metric_suffix,
-                                match_result);
-}
-
 }  // namespace
 
 SafeBrowsingUrlCheckerImpl::Notifier::Notifier(CheckUrlCallback callback)
@@ -72,8 +48,8 @@
 
 SafeBrowsingUrlCheckerImpl::Notifier::Notifier(Notifier&& other) = default;
 
-SafeBrowsingUrlCheckerImpl::Notifier& SafeBrowsingUrlCheckerImpl::Notifier::
-operator=(Notifier&& other) = default;
+SafeBrowsingUrlCheckerImpl::Notifier&
+SafeBrowsingUrlCheckerImpl::Notifier::operator=(Notifier&& other) = default;
 
 void SafeBrowsingUrlCheckerImpl::Notifier::OnStartSlowCheck() {
   if (callback_) {
@@ -121,13 +97,11 @@
 SafeBrowsingUrlCheckerImpl::UrlInfo::UrlInfo(const GURL& in_url,
                                              const std::string& in_method,
                                              Notifier in_notifier,
-                                             bool in_is_cached_safe_url,
                                              bool did_perform_real_time_check,
                                              bool did_check_allowlist)
     : url(in_url),
       method(in_method),
       notifier(std::move(in_notifier)),
-      is_cached_safe_url(in_is_cached_safe_url),
       did_perform_real_time_check(did_perform_real_time_check),
       did_check_allowlist(did_check_allowlist) {}
 
@@ -153,7 +127,7 @@
     GURL last_committed_url,
     scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
     base::WeakPtr<RealTimeUrlLookupServiceBase> url_lookup_service_on_ui,
-    WebUIDelegate* webui_delegate)
+    UrlRealTimeMechanism::WebUIDelegate* webui_delegate)
     : headers_(headers),
       load_flags_(load_flags),
       request_destination_(request_destination),
@@ -212,7 +186,6 @@
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   if (state_ == STATE_CHECKING_URL) {
-    CancelCheckIfRelevant();
     const GURL& url = urls_[next_index_].url;
     TRACE_EVENT_NESTABLE_ASYNC_END1("safe_browsing", "CheckUrl",
                                     TRACE_ID_LOCAL(this), "url", url.spec());
@@ -242,8 +215,9 @@
   resource.original_url = urls_[0].url;
   if (urls_.size() > 1) {
     resource.redirect_urls.reserve(urls_.size() - 1);
-    for (size_t i = 1; i < urls_.size(); ++i)
+    for (size_t i = 1; i < urls_.size(); ++i) {
       resource.redirect_urls.push_back(urls_[i].url);
+    }
   }
   resource.is_subresource =
       request_destination_ != network::mojom::RequestDestination::kDocument;
@@ -269,16 +243,29 @@
   return resource;
 }
 
-void SafeBrowsingUrlCheckerImpl::OnCheckBrowseUrlResult(
-    const GURL& url,
-    SBThreatType threat_type,
-    const ThreatMetadata& metadata) {
-  is_async_database_manager_check_in_progress_ = false;
-  OnUrlResult(url, threat_type, metadata, /*is_from_real_time_check=*/false,
-              /*rt_lookup_response=*/nullptr);
+void SafeBrowsingUrlCheckerImpl::OnUrlResult(
+    bool timed_out,
+    absl::optional<std::unique_ptr<CompleteCheckResult>> result) {
+  DCHECK_EQ(result.has_value(), !timed_out);
+  lookup_mechanism_runner_.reset();
+  if (timed_out) {
+    // Any pending callbacks on this URL check should be skipped.
+    weak_factory_.InvalidateWeakPtrs();
+    OnUrlResultInternal(urls_[next_index_].url,
+                        safe_browsing::SB_THREAT_TYPE_SAFE, ThreatMetadata(),
+                        /*is_from_real_time_check=*/false,
+                        /*rt_lookup_response=*/nullptr,
+                        /*timed_out=*/true);
+  } else {
+    OnUrlResultInternal(result.value()->url, result.value()->threat_type,
+                        result.value()->metadata,
+                        result.value()->is_from_real_time_check,
+                        std::move(result.value()->real_time_lookup_response),
+                        /*timed_out=*/false);
+  }
 }
 
-void SafeBrowsingUrlCheckerImpl::OnUrlResult(
+void SafeBrowsingUrlCheckerImpl::OnUrlResultInternal(
     const GURL& url,
     SBThreatType threat_type,
     const ThreatMetadata& metadata,
@@ -289,13 +276,7 @@
   DCHECK_LT(next_index_, urls_.size());
   DCHECK_EQ(urls_[next_index_].url, url);
 
-  timer_->Stop();
   RecordCheckUrlTimeout(timed_out);
-  if (urls_[next_index_].is_cached_safe_url) {
-    UMA_HISTOGRAM_ENUMERATION("SafeBrowsing.RT.GetCache.FallbackThreatType",
-                              threat_type, SB_THREAT_TYPE_MAX + 1);
-  }
-
   TRACE_EVENT_NESTABLE_ASYNC_END1("safe_browsing", "CheckUrl",
                                   TRACE_ID_LOCAL(this), "url", url.spec());
 
@@ -334,8 +315,9 @@
       url_checker_delegate_->NotifySuspiciousSiteDetected(web_contents_getter_);
     }
 
-    if (!RunNextCallback(true, false))
+    if (!RunNextCallback(true, false)) {
       return;
+    }
 
     ProcessUrls();
     return;
@@ -371,18 +353,6 @@
       has_user_gesture_);
 }
 
-void SafeBrowsingUrlCheckerImpl::OnTimeout() {
-  CancelCheckIfRelevant();
-
-  // Any pending callbacks on this URL check should be skipped.
-  weak_factory_.InvalidateWeakPtrs();
-
-  OnUrlResult(urls_[next_index_].url, safe_browsing::SB_THREAT_TYPE_SAFE,
-              ThreatMetadata(), /*is_from_real_time_check=*/false,
-              /*rt_lookup_response=*/nullptr,
-              /*timed_out=*/true);
-}
-
 void SafeBrowsingUrlCheckerImpl::CheckUrlImpl(const GURL& url,
                                               const std::string& method,
                                               Notifier notifier) {
@@ -390,7 +360,6 @@
 
   DVLOG(1) << "SafeBrowsingUrlCheckerImpl checks URL: " << url;
   urls_.emplace_back(url, method, std::move(notifier),
-                     /*safe_from_real_time_cache=*/false,
                      /*did_perform_real_time_check=*/false,
                      /*did_check_allowlist=*/false);
 
@@ -415,8 +384,9 @@
 
     const GURL& url = urls_[next_index_].url;
     if (url_checker_delegate_->IsUrlAllowlisted(url)) {
-      if (!RunNextCallback(true, false))
+      if (!RunNextCallback(true, false)) {
         return;
+      }
 
       continue;
     }
@@ -428,8 +398,9 @@
       UMA_HISTOGRAM_ENUMERATION("SB2.RequestDestination.Skipped",
                                 request_destination_);
 
-      if (!RunNextCallback(true, false))
+      if (!RunNextCallback(true, false)) {
         return;
+      }
 
       continue;
     }
@@ -445,57 +416,53 @@
 
       base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
           FROM_HERE,
-          base::BindOnce(&SafeBrowsingUrlCheckerImpl::OnCheckBrowseUrlResult,
+          base::BindOnce(&SafeBrowsingUrlCheckerImpl::OnUrlResultInternal,
                          weak_factory_.GetWeakPtr(), url, threat_type,
-                         ThreatMetadata()));
+                         ThreatMetadata(), /*is_from_real_time_check=*/false,
+                         /*rt_lookup_response=*/nullptr, /*timed_out=*/false));
       break;
     }
 
     TRACE_EVENT_NESTABLE_ASYNC_BEGIN1("safe_browsing", "CheckUrl",
                                       TRACE_ID_LOCAL(this), "url", url.spec());
-
-    // Start a timer to abort the check if it takes too long.
-    timer_->Start(FROM_HERE, base::Milliseconds(kCheckUrlTimeoutMs), this,
-                  &SafeBrowsingUrlCheckerImpl::OnTimeout);
-
-    bool safe_synchronously;
     bool can_perform_full_url_lookup = CanPerformFullURLLookup(url);
     base::UmaHistogramBoolean("SafeBrowsing.RT.CanCheckDatabase",
                               can_check_db_);
+    std::unique_ptr<SafeBrowsingLookupMechanism> lookup_mechanism;
     if (can_perform_full_url_lookup) {
-      DCHECK_NE(url_lookup_service_metric_suffix_, kNoRealTimeURLLookupService);
-      UMA_HISTOGRAM_ENUMERATION("SafeBrowsing.RT.RequestDestinations.Checked",
-                                request_destination_);
       urls_[next_index_].did_perform_real_time_check = true;
-      safe_synchronously = false;
-
-      bool check_allowlist =
-          can_check_db_ && can_check_high_confidence_allowlist_;
-      bool has_allowlist_match =
-          check_allowlist &&
-          database_manager_->CheckUrlForHighConfidenceAllowlist(url);
-      urls_[next_index_].did_check_allowlist = check_allowlist;
-      RecordLocalMatchResult(has_allowlist_match, request_destination_,
-                             url_lookup_service_metric_suffix_);
-      base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
-          FROM_HERE,
-          base::BindOnce(
-              &SafeBrowsingUrlCheckerImpl::OnCheckUrlForHighConfidenceAllowlist,
-              weak_factory_.GetWeakPtr(),
-              /*did_match_allowlist=*/has_allowlist_match));
+      lookup_mechanism = std::make_unique<UrlRealTimeMechanism>(
+          url, url_checker_delegate_->GetThreatTypes(), request_destination_,
+          database_manager_, can_check_db_,
+          can_check_high_confidence_allowlist_,
+          url_lookup_service_metric_suffix_, last_committed_url_,
+          ui_task_runner_, url_lookup_service_on_ui_, webui_delegate_);
     } else {
-      safe_synchronously = can_check_db_ ? CallCheckBrowseUrl(url) : true;
+      lookup_mechanism = std::make_unique<HashDatabaseMechanism>(
+          url, url_checker_delegate_->GetThreatTypes(), database_manager_,
+          can_check_db_);
     }
+    DCHECK(!lookup_mechanism_runner_);
+    lookup_mechanism_runner_ =
+        std::make_unique<SafeBrowsingLookupMechanismRunner>(
+            std::move(lookup_mechanism),
+            base::BindOnce(&SafeBrowsingUrlCheckerImpl::OnUrlResult,
+                           weak_factory_.GetWeakPtr()));
+    SafeBrowsingLookupMechanism::StartCheckResult start_check_result =
+        lookup_mechanism_runner_->Run();
+    urls_[next_index_].did_check_allowlist =
+        start_check_result.did_check_allowlist;
 
-    if (safe_synchronously) {
-      timer_->Stop();
+    if (start_check_result.is_safe_synchronously) {
+      lookup_mechanism_runner_.reset();
       RecordCheckUrlTimeout(/*timed_out=*/false);
 
       TRACE_EVENT_NESTABLE_ASYNC_END1("safe_browsing", "CheckUrl",
                                       TRACE_ID_LOCAL(this), "url", url.spec());
 
-      if (!RunNextCallback(true, false))
+      if (!RunNextCallback(true, false)) {
         return;
+      }
 
       continue;
     }
@@ -513,8 +480,9 @@
     // check is complete and return SAFE, so there's no Safe Browsing bypass
     // risk here.
     if (!can_perform_full_url_lookup &&
-        !database_manager_->ChecksAreAlwaysAsync())
+        !database_manager_->ChecksAreAlwaysAsync()) {
       urls_[next_index_].notifier.OnStartSlowCheck();
+    }
 
     break;
   }
@@ -528,8 +496,9 @@
   // If user decided to not proceed through a warning, mark all the remaining
   // redirects as "bad".
   while (next_index_ < urls_.size()) {
-    if (!RunNextCallback(false, showed_interstitial))
+    if (!RunNextCallback(false, showed_interstitial)) {
       return;
+    }
   }
 }
 
@@ -541,8 +510,9 @@
 
   if (proceed) {
     state_ = STATE_NONE;
-    if (!RunNextCallback(true, showed_interstitial))
+    if (!RunNextCallback(true, showed_interstitial)) {
       return;
+    }
     ProcessUrls();
   } else {
     BlockAndProcessUrls(showed_interstitial);
@@ -550,14 +520,18 @@
 }
 
 SBThreatType SafeBrowsingUrlCheckerImpl::CheckWebUIUrls(const GURL& url) {
-  if (url == kChromeUISafeBrowsingMatchMalwareUrl)
+  if (url == kChromeUISafeBrowsingMatchMalwareUrl) {
     return safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
-  if (url == kChromeUISafeBrowsingMatchPhishingUrl)
+  }
+  if (url == kChromeUISafeBrowsingMatchPhishingUrl) {
     return safe_browsing::SB_THREAT_TYPE_URL_PHISHING;
-  if (url == kChromeUISafeBrowsingMatchUnwantedUrl)
+  }
+  if (url == kChromeUISafeBrowsingMatchUnwantedUrl) {
     return safe_browsing::SB_THREAT_TYPE_URL_UNWANTED;
-  if (url == kChromeUISafeBrowsingMatchBillingUrl)
+  }
+  if (url == kChromeUISafeBrowsingMatchBillingUrl) {
     return safe_browsing::SB_THREAT_TYPE_BILLING;
+  }
   return safe_browsing::SB_THREAT_TYPE_SAFE;
 }
 
@@ -576,112 +550,6 @@
   return !!weak_self;
 }
 
-void SafeBrowsingUrlCheckerImpl::OnCheckUrlForHighConfidenceAllowlist(
-    bool did_match_allowlist) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  bool is_expected_request_destination =
-      (network::mojom::RequestDestination::kDocument == request_destination_) ||
-      (network::IsRequestDestinationEmbeddedFrame(request_destination_) &&
-       can_rt_check_subresource_url_);
-  DCHECK(is_expected_request_destination);
-
-  const GURL& url = urls_[next_index_].url;
-  if (did_match_allowlist) {
-    ui_task_runner_->PostTask(
-        FROM_HERE,
-        base::BindOnce(&SafeBrowsingUrlCheckerImpl::MaybeSendSampleRequest,
-                       weak_factory_.GetWeakPtr(), url, last_committed_url_,
-                       /*is_mainframe=*/request_destination_ ==
-                           network::mojom::RequestDestination::kDocument,
-                       url_lookup_service_on_ui_,
-                       base::SequencedTaskRunner::GetCurrentDefault()));
-    // If the URL matches the high-confidence allowlist, still do the hash based
-    // checks.
-    PerformHashBasedCheck(url);
-    return;
-  }
-
-  ui_task_runner_->PostTask(
-      FROM_HERE,
-      base::BindOnce(&SafeBrowsingUrlCheckerImpl::StartLookupOnUIThread,
-                     weak_factory_.GetWeakPtr(), url, last_committed_url_,
-                     /*is_mainframe=*/request_destination_ ==
-                         network::mojom::RequestDestination::kDocument,
-                     url_lookup_service_on_ui_,
-                     base::SequencedTaskRunner::GetCurrentDefault()));
-}
-
-void SafeBrowsingUrlCheckerImpl::SetWebUIToken(int token) {
-  url_web_ui_token_ = token;
-}
-
-void SafeBrowsingUrlCheckerImpl::MaybeSendSampleRequest(
-    base::WeakPtr<SafeBrowsingUrlCheckerImpl> weak_checker_on_io,
-    const GURL& url,
-    const GURL& last_committed_url,
-    bool is_mainframe,
-    base::WeakPtr<RealTimeUrlLookupServiceBase> url_lookup_service_on_ui,
-    scoped_refptr<base::SequencedTaskRunner> io_task_runner) {
-  bool can_send_protego_sampled_ping =
-      url_lookup_service_on_ui &&
-      url_lookup_service_on_ui->CanSendRTSampleRequest();
-
-  if (!can_send_protego_sampled_ping) {
-    return;
-  }
-  bool is_lookup_service_available =
-      !url_lookup_service_on_ui->IsInBackoffMode();
-  if (is_lookup_service_available) {
-    RTLookupRequestCallback request_callback = base::BindOnce(
-        &SafeBrowsingUrlCheckerImpl::OnRTLookupRequest, weak_checker_on_io);
-    url_lookup_service_on_ui->SendSampledRequest(
-        url, last_committed_url, is_mainframe, std::move(request_callback),
-        std::move(io_task_runner));
-  }
-}
-
-// static
-void SafeBrowsingUrlCheckerImpl::StartLookupOnUIThread(
-    base::WeakPtr<SafeBrowsingUrlCheckerImpl> weak_checker_on_io,
-    const GURL& url,
-    const GURL& last_committed_url,
-    bool is_mainframe,
-    base::WeakPtr<RealTimeUrlLookupServiceBase> url_lookup_service_on_ui,
-    scoped_refptr<base::SequencedTaskRunner> io_task_runner) {
-  bool is_lookup_service_available =
-      url_lookup_service_on_ui && !url_lookup_service_on_ui->IsInBackoffMode();
-  base::UmaHistogramBoolean("SafeBrowsing.RT.IsLookupServiceAvailable",
-                            is_lookup_service_available);
-  if (!is_lookup_service_available) {
-    io_task_runner->PostTask(
-        FROM_HERE,
-        base::BindOnce(&SafeBrowsingUrlCheckerImpl::PerformHashBasedCheck,
-                       weak_checker_on_io, url));
-    return;
-  }
-
-  RTLookupRequestCallback request_callback = base::BindOnce(
-      &SafeBrowsingUrlCheckerImpl::OnRTLookupRequest, weak_checker_on_io);
-
-  RTLookupResponseCallback response_callback = base::BindOnce(
-      &SafeBrowsingUrlCheckerImpl::OnRTLookupResponse, weak_checker_on_io);
-
-  url_lookup_service_on_ui->StartLookup(
-      url, last_committed_url, is_mainframe, std::move(request_callback),
-      std::move(response_callback), std::move(io_task_runner));
-}
-
-void SafeBrowsingUrlCheckerImpl::PerformHashBasedCheck(const GURL& url) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  if (!can_check_db_ || CallCheckBrowseUrl(url)) {
-    // No match found in the local database. Safe to call |OnUrlResult| here
-    // directly.
-    OnUrlResult(url, SB_THREAT_TYPE_SAFE, ThreatMetadata(),
-                /*is_from_real_time_check=*/false,
-                /*rt_lookup_response=*/nullptr);
-  }
-}
-
 bool SafeBrowsingUrlCheckerImpl::CanPerformFullURLLookup(const GURL& url) {
   return real_time_lookup_enabled_ &&
          RealTimePolicyEngine::CanPerformFullURLLookupForRequestDestination(
@@ -689,118 +557,4 @@
          RealTimeUrlLookupServiceBase::CanCheckUrl(url);
 }
 
-void SafeBrowsingUrlCheckerImpl::OnRTLookupRequest(
-    std::unique_ptr<RTLookupRequest> request,
-    std::string oauth_token) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-
-  LogRTLookupRequest(*request, oauth_token);
-}
-
-void SafeBrowsingUrlCheckerImpl::OnRTLookupResponse(
-    bool is_rt_lookup_successful,
-    bool is_cached_response,
-    std::unique_ptr<RTLookupResponse> response) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  bool is_expected_request_destination =
-      (network::mojom::RequestDestination::kDocument == request_destination_) ||
-      (network::IsRequestDestinationEmbeddedFrame(request_destination_) &&
-       can_rt_check_subresource_url_);
-  DCHECK(is_expected_request_destination);
-
-  const GURL& url = urls_[next_index_].url;
-
-  if (!is_rt_lookup_successful) {
-    PerformHashBasedCheck(url);
-    return;
-  }
-
-  LogRTLookupResponse(*response);
-
-  // Filter the response to remove enterprise verdicts if experiment is not
-  // enabled for Managed Policy UrlFiltering
-  if (!base::FeatureList::IsEnabled((kRealTimeUrlFilteringForEnterprise))) {
-    auto* response_threat_info = response->mutable_threat_info();
-    auto unsupported = std::remove_if(
-        response_threat_info->begin(), response_threat_info->end(),
-        [](const auto& threat_info) {
-          return threat_info.threat_type() ==
-                 RTLookupResponse::ThreatInfo::MANAGED_POLICY;
-        });
-    response_threat_info->erase(unsupported, response_threat_info->end());
-  }
-
-  SBThreatType sb_threat_type = SB_THREAT_TYPE_SAFE;
-  if (response && (response->threat_info_size() > 0)) {
-    sb_threat_type =
-        RealTimeUrlLookupServiceBase::GetSBThreatTypeForRTThreatType(
-            response->threat_info(0).threat_type(),
-            response->threat_info(0).verdict_type());
-  }
-
-  if (is_cached_response && sb_threat_type == SB_THREAT_TYPE_SAFE) {
-    urls_[next_index_].is_cached_safe_url = true;
-    PerformHashBasedCheck(url);
-  } else {
-    OnUrlResult(url, sb_threat_type, ThreatMetadata(),
-                /*is_from_real_time_check=*/true, std::move(response),
-                /*timed_out=*/false);
-  }
-}
-
-void SafeBrowsingUrlCheckerImpl::LogRTLookupRequest(
-    const RTLookupRequest& request,
-    const std::string& oauth_token) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-
-  if (!webui_delegate_)
-    return;
-
-  // The following is to log this RTLookupRequest on any open
-  // chrome://safe-browsing pages.
-  ui_task_runner_->PostTaskAndReplyWithResult(
-      FROM_HERE,
-      base::BindOnce(&WebUIDelegate::AddToRTLookupPings,
-                     base::Unretained(webui_delegate_), request, oauth_token),
-      base::BindOnce(&SafeBrowsingUrlCheckerImpl::SetWebUIToken,
-                     weak_factory_.GetWeakPtr()));
-}
-
-void SafeBrowsingUrlCheckerImpl::LogRTLookupResponse(
-    const RTLookupResponse& response) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-
-  if (!webui_delegate_)
-    return;
-
-  if (url_web_ui_token_ != -1) {
-    // The following is to log this RTLookupResponse on any open
-    // chrome://safe-browsing pages.
-    ui_task_runner_->PostTask(
-        FROM_HERE, base::BindOnce(&WebUIDelegate::AddToRTLookupResponses,
-                                  base::Unretained(webui_delegate_),
-                                  url_web_ui_token_, response));
-  }
-}
-
-bool SafeBrowsingUrlCheckerImpl::CallCheckBrowseUrl(const GURL& url) {
-  bool is_safe_synchronously = database_manager_->CheckBrowseUrl(
-      url, url_checker_delegate_->GetThreatTypes(), this);
-  if (!is_safe_synchronously) {
-    is_async_database_manager_check_in_progress_ = true;
-  }
-  return is_safe_synchronously;
-}
-
-void SafeBrowsingUrlCheckerImpl::CancelCheckIfRelevant() {
-  if (is_async_database_manager_check_in_progress_) {
-    database_manager_->CancelCheck(this);
-  }
-}
-
-void SafeBrowsingUrlCheckerImpl::SetTimerForTesting(
-    std::unique_ptr<base::OneShotTimer> timer) {
-  timer_ = std::move(timer);
-}
-
 }  // namespace safe_browsing

components/safe_browsing/core/browser/safe_browsing_url_checker_impl.h

diff --git a/components/safe_browsing/core/browser/safe_browsing_url_checker_impl.h b/components/safe_browsing/core/browser/safe_browsing_url_checker_impl.h
index 318465ec..5552f2e 100644
--- a/components/safe_browsing/core/browser/safe_browsing_url_checker_impl.h
+++ b/components/safe_browsing/core/browser/safe_browsing_url_checker_impl.h
@@ -5,20 +5,20 @@
 #ifndef COMPONENTS_SAFE_BROWSING_CORE_BROWSER_SAFE_BROWSING_URL_CHECKER_IMPL_H_
 #define COMPONENTS_SAFE_BROWSING_CORE_BROWSER_SAFE_BROWSING_URL_CHECKER_IMPL_H_
 
+#include <memory>
 #include <vector>
 
 #include "base/memory/raw_ptr.h"
-#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequence_checker.h"
-#include "base/timer/timer.h"
 #include "components/safe_browsing/core/browser/db/database_manager.h"
+#include "components/safe_browsing/core/browser/safe_browsing_lookup_mechanism_runner.h"
+#include "components/safe_browsing/core/browser/url_realtime_mechanism.h"
 #include "components/safe_browsing/core/common/proto/realtimeapi.pb.h"
 #include "components/safe_browsing/core/common/safe_browsing_url_checker.mojom.h"
 #include "components/security_interstitials/core/unsafe_resource.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "net/http/http_request_headers.h"
-#include "services/network/public/mojom/fetch_api.mojom.h"
 #include "url/gurl.h"
 
 namespace content {
@@ -40,32 +40,15 @@
 // To be considered "safe", a URL must not appear in the SafeBrowsing blocklists
 // (see SafeBrowsingService for details).
 //
-// Note that the SafeBrowsing check takes at most kCheckUrlTimeoutMs
-// milliseconds. If it takes longer than this, then the system defaults to
-// treating the URL as safe.
+// Note that the SafeBrowsing check takes at most kCheckUrlTimeoutMs (defined in
+// SafeBrowsingLookupMechanismRunner) milliseconds. If it takes longer than
+// this, then the system defaults to treating the URL as safe.
 //
 // If the URL is classified as dangerous, a warning interstitial page is
 // displayed. In that case, the user can click through the warning page if they
 // decides to procced with loading the URL anyway.
-class SafeBrowsingUrlCheckerImpl : public mojom::SafeBrowsingUrlChecker,
-                                   public SafeBrowsingDatabaseManager::Client {
+class SafeBrowsingUrlCheckerImpl : public mojom::SafeBrowsingUrlChecker {
  public:
-  // Interface via which a client of this class can surface relevant events in
-  // WebUI. All methods must be called on the UI thread.
-  class WebUIDelegate {
-   public:
-    virtual ~WebUIDelegate() = default;
-
-    // Adds the new ping to the set of RT lookup pings. Returns a token that can
-    // be used in |AddToRTLookupResponses| to correlate a ping and response.
-    virtual int AddToRTLookupPings(const RTLookupRequest request,
-                                   const std::string oauth_token) = 0;
-
-    // Adds the new response to the set of RT lookup pings.
-    virtual void AddToRTLookupResponses(int token,
-                                        const RTLookupResponse response) = 0;
-  };
-
   using NativeUrlCheckNotifier =
       base::OnceCallback<void(bool /* proceed */,
                               bool /* showed_interstitial */,
@@ -115,7 +98,7 @@
       GURL last_committed_url,
       scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
       base::WeakPtr<RealTimeUrlLookupServiceBase> url_lookup_service_on_ui,
-      WebUIDelegate* webui_delegate);
+      UrlRealTimeMechanism::WebUIDelegate* webui_delegate);
 
   // Constructor that takes only a RequestDestination, a UrlCheckerDelegate, and
   // real-time lookup-related arguments, omitting other arguments that never
@@ -152,9 +135,14 @@
                         const std::string& method,
                         NativeCheckUrlCallback callback);
 
+ protected:
+  // This is created when a specific mechanism check needs to be run, and is
+  // destroyed once the check completes. This handles running the check and
+  // responding back to this class once the check is complete or has timed out.
+  std::unique_ptr<SafeBrowsingLookupMechanismRunner> lookup_mechanism_runner_;
+
  private:
-  FRIEND_TEST_ALL_PREFIXES(SafeBrowsingUrlCheckerTest,
-                           CheckUrl_CancelCheckOnTimeout);
+  using CompleteCheckResult = SafeBrowsingLookupMechanism::CompleteCheckResult;
 
   class Notifier {
    public:
@@ -182,21 +170,20 @@
     NativeUrlCheckNotifier native_slow_check_notifier_;
   };
 
-  // SafeBrowsingDatabaseManager::Client implementation:
-  void OnCheckBrowseUrlResult(const GURL& url,
-                              SBThreatType threat_type,
-                              const ThreatMetadata& metadata) override;
+  // Called once the lookup mechanism runner indicates that the check is
+  // complete. The |result| parameter will only be populated if |timed_out| is
+  // false. This function eventually decides whether or not to show a blocking
+  // page.
+  void OnUrlResult(bool timed_out,
+                   absl::optional<std::unique_ptr<CompleteCheckResult>> result);
 
-  void OnCheckUrlForHighConfidenceAllowlist(bool did_match_allowlist);
-
-  void OnTimeout();
-
-  void OnUrlResult(const GURL& url,
-                   SBThreatType threat_type,
-                   const ThreatMetadata& metadata,
-                   bool is_from_real_time_check,
-                   std::unique_ptr<RTLookupResponse> response,
-                   bool timed_out = false);
+  // Helper function to handle deciding whether or not to show a blocking page.
+  void OnUrlResultInternal(const GURL& url,
+                           SBThreatType threat_type,
+                           const ThreatMetadata& metadata,
+                           bool is_from_real_time_check,
+                           std::unique_ptr<RTLookupResponse> rt_lookup_response,
+                           bool timed_out);
 
   void CheckUrlImpl(const GURL& url,
                     const std::string& method,
@@ -220,61 +207,6 @@
   // case none of the members of this object should be touched again.
   bool RunNextCallback(bool proceed, bool showed_interstitial);
 
-  // Perform the hash based check for the url.
-  void PerformHashBasedCheck(const GURL& url);
-
-  // Checks the eligibility of sending a sampled ping first;
-  // Send a sampled report if one should be sent, otherwise, exit.
-  static void MaybeSendSampleRequest(
-      base::WeakPtr<SafeBrowsingUrlCheckerImpl> weak_checker_on_io,
-      const GURL& url,
-      const GURL& last_committed_url,
-      bool is_mainframe,
-      base::WeakPtr<RealTimeUrlLookupServiceBase> url_lookup_service_on_ui,
-      scoped_refptr<base::SequencedTaskRunner> io_task_runner);
-
-  // This function has to be static because it is called in UI thread.
-  // This function starts a real time url check if |url_lookup_service_on_ui| is
-  // available and is not in backoff mode. Otherwise, hop back to IO thread and
-  // perform hash based check.
-  static void StartLookupOnUIThread(
-      base::WeakPtr<SafeBrowsingUrlCheckerImpl> weak_checker_on_io,
-      const GURL& url,
-      const GURL& last_committed_url,
-      bool is_mainframe,
-      base::WeakPtr<RealTimeUrlLookupServiceBase> url_lookup_service_on_ui,
-      scoped_refptr<base::SequencedTaskRunner> io_task_runner);
-
-  // Called when the |request| from the real-time lookup service is sent.
-  void OnRTLookupRequest(std::unique_ptr<RTLookupRequest> request,
-                         std::string oauth_token);
-
-  // Called when the |response| from the real-time lookup service is received.
-  // |is_rt_lookup_successful| is true if the response code is OK and the
-  // response body is successfully parsed.
-  // |is_cached_response| is true if the response is a cache hit. In such a
-  // case, fall back to hash-based checks if the cached verdict is |SAFE|.
-  void OnRTLookupResponse(bool is_rt_lookup_successful,
-                          bool is_cached_response,
-                          std::unique_ptr<RTLookupResponse> response);
-
-  // Logs |request| on any open chrome://safe-browsing pages.
-  void LogRTLookupRequest(const RTLookupRequest& request,
-                          const std::string& oauth_token);
-
-  // Logs |response| on any open chrome://safe-browsing pages.
-  void LogRTLookupResponse(const RTLookupResponse& response);
-
-  void SetWebUIToken(int token);
-
-  // Calls |CheckBrowseUrl| on the database manager and sets
-  // is_async_database_manager_check_in_progress_ if the check is asynchronous.
-  bool CallCheckBrowseUrl(const GURL& url);
-  // Cancels the ongoing database manager check if there is one.
-  void CancelCheckIfRelevant();
-
-  void SetTimerForTesting(std::unique_ptr<base::OneShotTimer> timer);
-
   security_interstitials::UnsafeResource MakeUnsafeResource(
       const GURL& url,
       SBThreatType threat_type,
@@ -300,7 +232,6 @@
     UrlInfo(const GURL& url,
             const std::string& method,
             Notifier notifier,
-            bool is_cached_safe_url,
             bool did_perform_real_time_check,
             bool did_check_allowlist);
     UrlInfo(UrlInfo&& other);
@@ -310,9 +241,7 @@
     GURL url;
     std::string method;
     Notifier notifier;
-    // If the URL is classified as safe in cache manager during real time
-    // lookup.
-    bool is_cached_safe_url;
+
     // Whether real time check (including allowlist and cache checks) was
     // performed.
     bool did_perform_real_time_check;
@@ -350,16 +279,8 @@
   // than the size of |urls_|, the URL at |next_index_| is being processed.
   size_t next_index_ = 0;
 
-  // Token used for displaying url real time lookup pings. A single token is
-  // sufficient since real time check only happens on main frame url.
-  int url_web_ui_token_ = -1;
-
   State state_ = STATE_NONE;
 
-  // Timer to abort the SafeBrowsing check if it takes too long.
-  std::unique_ptr<base::OneShotTimer> timer_ =
-      std::make_unique<base::OneShotTimer>();
-
   // Whether real time lookup is enabled for this request.
   bool real_time_lookup_enabled_;
 
@@ -376,12 +297,6 @@
   // enabled (SafeBrowsingRealTimeUrlLookupForEnterpriseAllowlistBypass).
   bool can_check_high_confidence_allowlist_ = true;
 
-  // Tracks whether there is currently an async call into the database manager
-  // that the checker is waiting to hear back on. This is used in order to
-  // decide whether to ask the database manager to cancel the check for timeouts
-  // or on destruct.
-  bool is_async_database_manager_check_in_progress_ = false;
-
   // URL Lookup service suffix for logging metrics.
   std::string url_lookup_service_metric_suffix_;
 
@@ -400,7 +315,7 @@
   // May be null on certain platforms that don't support chrome://safe-browsing
   // and in unit tests. If non-null, guaranteed to outlive this object by
   // contract.
-  raw_ptr<WebUIDelegate> webui_delegate_ = nullptr;
+  raw_ptr<UrlRealTimeMechanism::WebUIDelegate> webui_delegate_ = nullptr;
 
   base::WeakPtrFactory<SafeBrowsingUrlCheckerImpl> weak_factory_{this};
 };

components/safe_browsing/core/browser/safe_browsing_url_checker_impl_unittest.cc

diff --git a/components/safe_browsing/core/browser/safe_browsing_url_checker_impl_unittest.cc b/components/safe_browsing/core/browser/safe_browsing_url_checker_impl_unittest.cc
index 536381c..a8901342 100644
--- a/components/safe_browsing/core/browser/safe_browsing_url_checker_impl_unittest.cc
+++ b/components/safe_browsing/core/browser/safe_browsing_url_checker_impl_unittest.cc
@@ -7,6 +7,7 @@
 
 #include "base/bind.h"
 #include "base/containers/contains.h"
+#include "base/functional/bind.h"
 #include "base/memory/raw_ptr.h"
 #include "base/run_loop.h"
 #include "base/task/sequenced_task_runner.h"
@@ -203,13 +204,13 @@
       RTLookupResponseCallback response_callback,
       scoped_refptr<base::SequencedTaskRunner> callback_task_runner) override {
     std::string url = gurl.spec();
-    DCHECK(base::Contains(urls_threat_type_, url));
+    DCHECK(base::Contains(url_details_, url));
     auto response = std::make_unique<RTLookupResponse>();
     RTLookupResponse::ThreatInfo* new_threat_info = response->add_threat_info();
     RTLookupResponse::ThreatInfo threat_info;
     RTLookupResponse::ThreatInfo::ThreatType threat_type;
     RTLookupResponse::ThreatInfo::VerdictType verdict_type;
-    SBThreatType sb_threat_type = urls_threat_type_[url];
+    SBThreatType sb_threat_type = url_details_[url].threat_type;
     switch (sb_threat_type) {
       case SB_THREAT_TYPE_URL_PHISHING:
         threat_type = RTLookupResponse::ThreatInfo::SOCIAL_ENGINEERING;
@@ -235,11 +236,13 @@
     threat_info.set_threat_type(threat_type);
     threat_info.set_verdict_type(verdict_type);
     *new_threat_info = threat_info;
-    callback_task_runner->PostTask(
-        FROM_HERE, base::BindOnce(std::move(response_callback),
-                                  /*is_rt_lookup_successful=*/true,
-                                  /*is_cached_response=*/is_cached_response_,
-                                  std::move(response)));
+    if (url_details_[url].should_complete_lookup) {
+      callback_task_runner->PostTask(
+          FROM_HERE, base::BindOnce(std::move(response_callback),
+                                    /*is_rt_lookup_successful=*/true,
+                                    /*is_cached_response=*/is_cached_response_,
+                                    std::move(response)));
+    }
   }
 
   void SendSampledRequest(
@@ -249,8 +252,14 @@
       RTLookupRequestCallback request_callback,
       scoped_refptr<base::SequencedTaskRunner> callback_task_runner) override {}
 
-  void SetThreatTypeForUrl(const GURL& gurl, SBThreatType threat_type) {
-    urls_threat_type_[gurl.spec()] = threat_type;
+  // |should_complete_lookup| should generally be true, unless you specifically
+  // want to test time-sensitive things like timeouts. Setting it to false will
+  // avoid calling into |response_callback| in |StartLookup|.
+  void SetThreatTypeForUrl(const GURL& gurl,
+                           SBThreatType threat_type,
+                           bool should_complete_lookup) {
+    url_details_[gurl.spec()].threat_type = threat_type;
+    url_details_[gurl.spec()].should_complete_lookup = should_complete_lookup;
   }
 
   void SetIsCachedResponse(bool is_cached_response) {
@@ -267,6 +276,11 @@
   bool CanSendRTSampleRequest() const override { return true; }
 
  private:
+  struct UrlDetail {
+    SBThreatType threat_type;
+    bool should_complete_lookup;
+  };
+
   // RealTimeUrlLookupServiceBase:
   GURL GetRealTimeLookupUrl() const override { return GURL(); }
   net::NetworkTrafficAnnotationTag GetTrafficAnnotationTag() const override {
@@ -289,7 +303,7 @@
   bool ShouldIncludeCredentials() const override { return false; }
   double GetMinAllowedTimestampForReferrerChains() const override { return 0; }
 
-  base::flat_map<std::string, SBThreatType> urls_threat_type_;
+  base::flat_map<std::string, UrlDetail> url_details_;
   bool is_cached_response_ = false;
 };
 
@@ -343,7 +357,8 @@
   }
 
  protected:
-  base::test::TaskEnvironment task_environment_;
+  base::test::TaskEnvironment task_environment_{
+      base::test::TaskEnvironment::TimeSource::MOCK_TIME};
   scoped_refptr<MockSafeBrowsingDatabaseManager> database_manager_;
   scoped_refptr<MockUrlCheckerDelegate> url_checker_delegate_;
   std::unique_ptr<MockRealTimeUrlLookupService> url_lookup_service_;
@@ -504,7 +519,8 @@
 
   GURL url("https://example.test/");
   database_manager_->SetAllowlistResultForUrl(url, false);
-  url_lookup_service_->SetThreatTypeForUrl(url, SB_THREAT_TYPE_SAFE);
+  url_lookup_service_->SetThreatTypeForUrl(url, SB_THREAT_TYPE_SAFE,
+                                           /*should_complete_lookup=*/true);
 
   base::MockCallback<SafeBrowsingUrlCheckerImpl::NativeCheckUrlCallback>
       callback;
@@ -536,7 +552,8 @@
   database_manager_->SetAllowlistResultForUrl(url, false);
   database_manager_->SetThreatTypeForUrl(url, SB_THREAT_TYPE_SAFE,
                                          /*delayed_callback=*/false);
-  url_lookup_service_->SetThreatTypeForUrl(url, SB_THREAT_TYPE_SAFE);
+  url_lookup_service_->SetThreatTypeForUrl(url, SB_THREAT_TYPE_SAFE,
+                                           /*should_complete_lookup=*/true);
   url_lookup_service_->SetIsCachedResponse(true);
 
   base::MockCallback<SafeBrowsingUrlCheckerImpl::NativeCheckUrlCallback>
@@ -566,7 +583,8 @@
   database_manager_->SetAllowlistResultForUrl(url, false);
   database_manager_->SetThreatTypeForUrl(url, SB_THREAT_TYPE_URL_PHISHING,
                                          /*delayed_callback=*/false);
-  url_lookup_service_->SetThreatTypeForUrl(url, SB_THREAT_TYPE_SAFE);
+  url_lookup_service_->SetThreatTypeForUrl(url, SB_THREAT_TYPE_SAFE,
+                                           /*should_complete_lookup=*/true);
   url_lookup_service_->SetIsCachedResponse(true);
 
   base::MockCallback<SafeBrowsingUrlCheckerImpl::NativeCheckUrlCallback>
@@ -592,8 +610,8 @@
       /*real_time_lookup_enabled=*/true, /*can_check_safe_browsing_db=*/false);
 
   GURL url("https://example.test/");
-  url_lookup_service_->SetThreatTypeForUrl(url,
-                                           SB_THREAT_TYPE_MANAGED_POLICY_WARN);
+  url_lookup_service_->SetThreatTypeForUrl(
+      url, SB_THREAT_TYPE_MANAGED_POLICY_WARN, /*should_complete_lookup=*/true);
 
   base::MockCallback<SafeBrowsingUrlCheckerImpl::NativeCheckUrlCallback>
       callback;
@@ -615,8 +633,8 @@
       /*real_time_lookup_enabled=*/true, /*can_check_safe_browsing_db=*/false);
 
   GURL url("https://example.test/");
-  url_lookup_service_->SetThreatTypeForUrl(url,
-                                           SB_THREAT_TYPE_MANAGED_POLICY_WARN);
+  url_lookup_service_->SetThreatTypeForUrl(
+      url, SB_THREAT_TYPE_MANAGED_POLICY_WARN, /*should_complete_lookup=*/true);
 
   base::MockCallback<SafeBrowsingUrlCheckerImpl::NativeCheckUrlCallback>
       callback;
@@ -640,7 +658,8 @@
 
   GURL url("https://example.test/");
   url_lookup_service_->SetThreatTypeForUrl(url,
-                                           SB_THREAT_TYPE_MANAGED_POLICY_BLOCK);
+                                           SB_THREAT_TYPE_MANAGED_POLICY_BLOCK,
+                                           /*should_complete_lookup=*/true);
 
   base::MockCallback<SafeBrowsingUrlCheckerImpl::NativeCheckUrlCallback>
       callback;
@@ -663,7 +682,8 @@
 
   GURL url("https://example.test/");
   url_lookup_service_->SetThreatTypeForUrl(url,
-                                           SB_THREAT_TYPE_MANAGED_POLICY_BLOCK);
+                                           SB_THREAT_TYPE_MANAGED_POLICY_BLOCK,
+                                           /*should_complete_lookup=*/true);
 
   base::MockCallback<SafeBrowsingUrlCheckerImpl::NativeCheckUrlCallback>
       callback;
@@ -684,7 +704,8 @@
       /*real_time_lookup_enabled=*/true, /*can_check_safe_browsing_db=*/false);
 
   GURL url("https://example.test/");
-  url_lookup_service_->SetThreatTypeForUrl(url, SB_THREAT_TYPE_URL_PHISHING);
+  url_lookup_service_->SetThreatTypeForUrl(url, SB_THREAT_TYPE_URL_PHISHING,
+                                           /*should_complete_lookup=*/true);
 
   base::MockCallback<SafeBrowsingUrlCheckerImpl::NativeCheckUrlCallback>
       callback;
@@ -705,7 +726,8 @@
       /*real_time_lookup_enabled=*/true, /*can_check_safe_browsing_db=*/false);
 
   GURL url("https://example.test/");
-  url_lookup_service_->SetThreatTypeForUrl(url, SB_THREAT_TYPE_SAFE);
+  url_lookup_service_->SetThreatTypeForUrl(url, SB_THREAT_TYPE_SAFE,
+                                           /*should_complete_lookup=*/true);
 
   base::MockCallback<SafeBrowsingUrlCheckerImpl::NativeCheckUrlCallback>
       callback;
@@ -728,7 +750,8 @@
 
     GURL url("https://example.test/");
     database_manager_->SetAllowlistResultForUrl(url, false);
-    url_lookup_service_->SetThreatTypeForUrl(url, SB_THREAT_TYPE_URL_PHISHING);
+    url_lookup_service_->SetThreatTypeForUrl(url, SB_THREAT_TYPE_URL_PHISHING,
+                                             /*should_complete_lookup=*/true);
 
     base::MockCallback<SafeBrowsingUrlCheckerImpl::NativeCheckUrlCallback> cb;
     safe_browsing_url_checker->CheckUrl(url, "GET", cb.Get());
@@ -766,22 +789,21 @@
   {
     base::HistogramTester histograms;
     auto safe_browsing_url_checker = CreateSafeBrowsingUrlChecker(
-        /*real_time_lookup_enabled=*/true, /*can_check_safe_browsing_db=*/true);
-    auto timer = std::make_unique<base::MockOneShotTimer>();
-    auto* timer_ptr = timer.get();
-    safe_browsing_url_checker->SetTimerForTesting(std::move(timer));
+        /*real_time_lookup_enabled=*/true,
+        /*can_check_safe_browsing_db=*/true);
 
     GURL url("https://example.test/");
     database_manager_->SetAllowlistResultForUrl(url, false);
-    url_lookup_service_->SetThreatTypeForUrl(url, SB_THREAT_TYPE_URL_PHISHING);
-
+    url_lookup_service_->SetThreatTypeForUrl(url, SB_THREAT_TYPE_URL_PHISHING,
+                                             /*should_complete_lookup=*/false);
     base::MockCallback<SafeBrowsingUrlCheckerImpl::NativeCheckUrlCallback> cb;
-    EXPECT_CALL(cb, Run(_, /*proceed=*/true, /*showed_interstitial=*/false,
+    EXPECT_CALL(cb, Run(_, /*proceed=*/true,
+                        /*showed_interstitial=*/false,
                         /*did_perform_real_time_check=*/true,
                         /*did_check_allowlist=*/true));
     safe_browsing_url_checker->CheckUrl(url, "GET", cb.Get());
     EXPECT_FALSE(database_manager_->HasCalledCancelCheck());
-    timer_ptr->Fire();
+    task_environment_.FastForwardBy(base::Seconds(5));
     EXPECT_FALSE(database_manager_->HasCalledCancelCheck());
     task_environment_.RunUntilIdle();
     histograms.ExpectUniqueSample("SafeBrowsing.CheckUrl.Timeout",
@@ -794,13 +816,10 @@
     auto safe_browsing_url_checker = CreateSafeBrowsingUrlChecker(
         /*real_time_lookup_enabled=*/false,
         /*can_check_safe_browsing_db=*/true);
-    auto timer = std::make_unique<base::MockOneShotTimer>();
-    auto* timer_ptr = timer.get();
-    safe_browsing_url_checker->SetTimerForTesting(std::move(timer));
 
     GURL url("https://example.test/");
     database_manager_->SetThreatTypeForUrl(url, SB_THREAT_TYPE_URL_PHISHING,
-                                           /*delayed_callback=*/false);
+                                           /*delayed_callback=*/true);
 
     SafeBrowsingUrlCheckerImpl::NativeCheckUrlCallback callback =
         base::BindOnce(&SafeBrowsingUrlCheckerTest::
@@ -812,7 +831,7 @@
                     /*did_check_allowlist=*/false));
     safe_browsing_url_checker->CheckUrl(url, "GET", std::move(callback));
     EXPECT_FALSE(database_manager_->HasCalledCancelCheck());
-    timer_ptr->Fire();
+    task_environment_.FastForwardBy(base::Seconds(5));
     EXPECT_TRUE(database_manager_->HasCalledCancelCheck());
     task_environment_.RunUntilIdle();
     histograms.ExpectUniqueSample("SafeBrowsing.CheckUrl.Timeout",

components/safe_browsing/core/browser/url_realtime_mechanism.cc

diff --git a/components/safe_browsing/core/browser/url_realtime_mechanism.cc b/components/safe_browsing/core/browser/url_realtime_mechanism.cc
new file mode 100644
index 0000000..079f9af
--- /dev/null
+++ b/components/safe_browsing/core/browser/url_realtime_mechanism.cc
@@ -0,0 +1,304 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "components/safe_browsing/core/browser/url_realtime_mechanism.h"
+
+#include "base/metrics/histogram_functions.h"
+#include "base/metrics/histogram_macros.h"
+#include "base/task/sequenced_task_runner.h"
+#include "components/safe_browsing/core/browser/db/database_manager.h"
+#include "components/safe_browsing/core/browser/db/util.h"
+#include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h"
+#include "components/safe_browsing/core/browser/realtime/url_lookup_service_base.h"
+#include "components/safe_browsing/core/browser/safe_browsing_lookup_mechanism.h"
+#include "components/safe_browsing/core/common/features.h"
+
+namespace safe_browsing {
+namespace {
+
+constexpr char kMatchResultHistogramName[] =
+    "SafeBrowsing.RT.LocalMatch.Result";
+
+void RecordLocalMatchResult(
+    bool has_match,
+    network::mojom::RequestDestination request_destination,
+    std::string url_lookup_service_metric_suffix) {
+  AsyncMatch match_result =
+      has_match ? AsyncMatch::MATCH : AsyncMatch::NO_MATCH;
+  base::UmaHistogramEnumeration(kMatchResultHistogramName, match_result);
+  bool is_mainframe =
+      request_destination == network::mojom::RequestDestination::kDocument;
+  std::string frame_suffix = is_mainframe ? ".Mainframe" : ".NonMainframe";
+  base::UmaHistogramEnumeration(kMatchResultHistogramName + frame_suffix,
+                                match_result);
+  base::UmaHistogramEnumeration(kMatchResultHistogramName + frame_suffix +
+                                    url_lookup_service_metric_suffix,
+                                match_result);
+}
+
+}  // namespace
+
+UrlRealTimeMechanism::UrlRealTimeMechanism(
+    const GURL& url,
+    const SBThreatTypeSet& threat_types,
+    network::mojom::RequestDestination request_destination,
+    scoped_refptr<SafeBrowsingDatabaseManager> database_manager,
+    bool can_check_db,
+    bool can_check_high_confidence_allowlist,
+    std::string url_lookup_service_metric_suffix,
+    const GURL& last_committed_url,
+    scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
+    base::WeakPtr<RealTimeUrlLookupServiceBase> url_lookup_service_on_ui,
+    WebUIDelegate* webui_delegate)
+    : SafeBrowsingLookupMechanism(url,
+                                  threat_types,
+                                  database_manager,
+                                  can_check_db),
+      request_destination_(request_destination),
+      can_check_high_confidence_allowlist_(can_check_high_confidence_allowlist),
+      url_lookup_service_metric_suffix_(url_lookup_service_metric_suffix),
+      last_committed_url_(last_committed_url),
+      ui_task_runner_(ui_task_runner),
+      url_lookup_service_on_ui_(url_lookup_service_on_ui),
+      webui_delegate_(webui_delegate) {}
+
+UrlRealTimeMechanism::~UrlRealTimeMechanism() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+}
+
+SafeBrowsingLookupMechanism::StartCheckResult
+UrlRealTimeMechanism::StartCheckInternal() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  DCHECK_NE(url_lookup_service_metric_suffix_, kNoRealTimeURLLookupService);
+  UMA_HISTOGRAM_ENUMERATION("SafeBrowsing.RT.RequestDestinations.Checked",
+                            request_destination_);
+
+  bool check_allowlist = can_check_db_ && can_check_high_confidence_allowlist_;
+  bool has_allowlist_match =
+      check_allowlist &&
+      database_manager_->CheckUrlForHighConfidenceAllowlist(url_);
+  RecordLocalMatchResult(has_allowlist_match, request_destination_,
+                         url_lookup_service_metric_suffix_);
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+      FROM_HERE,
+      base::BindOnce(
+          &UrlRealTimeMechanism::OnCheckUrlForHighConfidenceAllowlist,
+          weak_factory_.GetWeakPtr(),
+          /*did_match_allowlist=*/has_allowlist_match));
+
+  return StartCheckResult(
+      /*is_safe_synchronously=*/false,
+      /*did_check_allowlist=*/check_allowlist);
+}
+
+void UrlRealTimeMechanism::OnCheckUrlForHighConfidenceAllowlist(
+    bool did_match_allowlist) {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+  if (did_match_allowlist) {
+    ui_task_runner_->PostTask(
+        FROM_HERE,
+        base::BindOnce(&UrlRealTimeMechanism::MaybeSendSampleRequest,
+                       weak_factory_.GetWeakPtr(), url_, last_committed_url_,
+                       /*is_mainframe=*/request_destination_ ==
+                           network::mojom::RequestDestination::kDocument,
+                       url_lookup_service_on_ui_,
+                       base::SequencedTaskRunner::GetCurrentDefault()));
+    // If the URL matches the high-confidence allowlist, still do the hash based
+    // checks.
+    PerformHashBasedCheck(url_);
+  } else {
+    ui_task_runner_->PostTask(
+        FROM_HERE,
+        base::BindOnce(&UrlRealTimeMechanism::StartLookupOnUIThread,
+                       weak_factory_.GetWeakPtr(), url_, last_committed_url_,
+                       /*is_mainframe=*/request_destination_ ==
+                           network::mojom::RequestDestination::kDocument,
+                       url_lookup_service_on_ui_,
+                       base::SequencedTaskRunner::GetCurrentDefault()));
+  }
+}
+
+// static
+void UrlRealTimeMechanism::StartLookupOnUIThread(
+    base::WeakPtr<UrlRealTimeMechanism> weak_ptr_on_io,
+    const GURL& url,
+    const GURL& last_committed_url,
+    bool is_mainframe,
+    base::WeakPtr<RealTimeUrlLookupServiceBase> url_lookup_service_on_ui,
+    scoped_refptr<base::SequencedTaskRunner> io_task_runner) {
+  bool is_lookup_service_available =
+      url_lookup_service_on_ui && !url_lookup_service_on_ui->IsInBackoffMode();
+  base::UmaHistogramBoolean("SafeBrowsing.RT.IsLookupServiceAvailable",
+                            is_lookup_service_available);
+  if (!is_lookup_service_available) {
+    io_task_runner->PostTask(
+        FROM_HERE, base::BindOnce(&UrlRealTimeMechanism::PerformHashBasedCheck,
+                                  weak_ptr_on_io, url));
+    return;
+  }
+
+  RTLookupRequestCallback request_callback =
+      base::BindOnce(&UrlRealTimeMechanism::OnRTLookupRequest, weak_ptr_on_io);
+
+  RTLookupResponseCallback response_callback =
+      base::BindOnce(&UrlRealTimeMechanism::OnRTLookupResponse, weak_ptr_on_io);
+
+  url_lookup_service_on_ui->StartLookup(
+      url, last_committed_url, is_mainframe, std::move(request_callback),
+      std::move(response_callback), std::move(io_task_runner));
+}
+
+void UrlRealTimeMechanism::MaybeSendSampleRequest(
+    base::WeakPtr<UrlRealTimeMechanism> weak_ptr_on_io,
+    const GURL& url,
+    const GURL& last_committed_url,
+    bool is_mainframe,
+    base::WeakPtr<RealTimeUrlLookupServiceBase> url_lookup_service_on_ui,
+    scoped_refptr<base::SequencedTaskRunner> io_task_runner) {
+  bool can_send_protego_sampled_ping =
+      url_lookup_service_on_ui &&
+      url_lookup_service_on_ui->CanSendRTSampleRequest();
+
+  if (!can_send_protego_sampled_ping) {
+    return;
+  }
+  bool is_lookup_service_available =
+      !url_lookup_service_on_ui->IsInBackoffMode();
+  if (is_lookup_service_available) {
+    RTLookupRequestCallback request_callback = base::BindOnce(
+        &UrlRealTimeMechanism::OnRTLookupRequest, weak_ptr_on_io);
+    url_lookup_service_on_ui->SendSampledRequest(
+        url, last_committed_url, is_mainframe, std::move(request_callback),
+        std::move(io_task_runner));
+  }
+}
+
+void UrlRealTimeMechanism::OnRTLookupRequest(
+    std::unique_ptr<RTLookupRequest> request,
+    std::string oauth_token) {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+  LogRTLookupRequest(*request, oauth_token);
+}
+
+void UrlRealTimeMechanism::OnRTLookupResponse(
+    bool is_rt_lookup_successful,
+    bool is_cached_response,
+    std::unique_ptr<RTLookupResponse> response) {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+  if (!is_rt_lookup_successful) {
+    PerformHashBasedCheck(url_);
+    return;
+  }
+
+  LogRTLookupResponse(*response);
+
+  // Filter the response to remove enterprise verdicts if experiment is not
+  // enabled for Managed Policy UrlFiltering
+  if (!base::FeatureList::IsEnabled((kRealTimeUrlFilteringForEnterprise))) {
+    auto* response_threat_info = response->mutable_threat_info();
+    auto unsupported = std::remove_if(
+        response_threat_info->begin(), response_threat_info->end(),
+        [](const auto& threat_info) {
+          return threat_info.threat_type() ==
+                 RTLookupResponse::ThreatInfo::MANAGED_POLICY;
+        });
+    response_threat_info->erase(unsupported, response_threat_info->end());
+  }
+
+  SBThreatType sb_threat_type = SB_THREAT_TYPE_SAFE;
+  if (response && (response->threat_info_size() > 0)) {
+    sb_threat_type =
+        RealTimeUrlLookupServiceBase::GetSBThreatTypeForRTThreatType(
+            response->threat_info(0).threat_type(),
+            response->threat_info(0).verdict_type());
+  }
+
+  if (is_cached_response && sb_threat_type == SB_THREAT_TYPE_SAFE) {
+    is_cached_safe_url_ = true;
+    PerformHashBasedCheck(url_);
+  } else {
+    CompleteCheck(std::make_unique<CompleteCheckResult>(
+        url_, sb_threat_type, ThreatMetadata(),
+        /*is_from_real_time_check=*/true, std::move(response)));
+  }
+}
+
+void UrlRealTimeMechanism::LogRTLookupRequest(const RTLookupRequest& request,
+                                              const std::string& oauth_token) {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+  if (!webui_delegate_) {
+    return;
+  }
+
+  // The following is to log this RTLookupRequest on any open
+  // chrome://safe-browsing pages.
+  ui_task_runner_->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      base::BindOnce(&WebUIDelegate::AddToRTLookupPings,
+                     base::Unretained(webui_delegate_), request, oauth_token),
+      base::BindOnce(&UrlRealTimeMechanism::SetWebUIToken,
+                     weak_factory_.GetWeakPtr()));
+}
+
+void UrlRealTimeMechanism::LogRTLookupResponse(
+    const RTLookupResponse& response) {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+  if (!webui_delegate_) {
+    return;
+  }
+
+  if (url_web_ui_token_ != -1) {
+    // The following is to log this RTLookupResponse on any open
+    // chrome://safe-browsing pages.
+    ui_task_runner_->PostTask(
+        FROM_HERE, base::BindOnce(&WebUIDelegate::AddToRTLookupResponses,
+                                  base::Unretained(webui_delegate_),
+                                  url_web_ui_token_, response));
+  }
+}
+
+void UrlRealTimeMechanism::SetWebUIToken(int token) {
+  url_web_ui_token_ = token;
+}
+
+void UrlRealTimeMechanism::PerformHashBasedCheck(const GURL& url) {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
+  hash_database_mechanism_ = std::make_unique<HashDatabaseMechanism>(
+      url, threat_types_, database_manager_, can_check_db_);
+  auto result = hash_database_mechanism_->StartCheck(
+      base::BindOnce(&UrlRealTimeMechanism::OnHashDatabaseCompleteCheckResult,
+                     weak_factory_.GetWeakPtr()));
+  if (result.is_safe_synchronously) {
+    // No match found in the database, so conclude this is safe.
+    OnHashDatabaseCompleteCheckResultInternal(SB_THREAT_TYPE_SAFE,
+                                              ThreatMetadata());
+  }
+}
+
+void UrlRealTimeMechanism::OnHashDatabaseCompleteCheckResult(
+    std::unique_ptr<SafeBrowsingLookupMechanism::CompleteCheckResult> result) {
+  OnHashDatabaseCompleteCheckResultInternal(result->threat_type,
+                                            result->metadata);
+}
+
+void UrlRealTimeMechanism::OnHashDatabaseCompleteCheckResultInternal(
+    SBThreatType threat_type,
+    const ThreatMetadata& metadata) {
+  if (is_cached_safe_url_) {
+    UMA_HISTOGRAM_ENUMERATION("SafeBrowsing.RT.GetCache.FallbackThreatType",
+                              threat_type, SB_THREAT_TYPE_MAX + 1);
+  }
+  CompleteCheck(std::make_unique<CompleteCheckResult>(
+      url_, threat_type, metadata,
+      /*is_from_real_time_check=*/false,
+      /*real_time_lookup_response=*/nullptr));
+}
+
+}  // namespace safe_browsing

components/safe_browsing/core/browser/url_realtime_mechanism.h

diff --git a/components/safe_browsing/core/browser/url_realtime_mechanism.h b/components/safe_browsing/core/browser/url_realtime_mechanism.h
new file mode 100644
index 0000000..6021faa
--- /dev/null
+++ b/components/safe_browsing/core/browser/url_realtime_mechanism.h
@@ -0,0 +1,170 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef COMPONENTS_SAFE_BROWSING_CORE_BROWSER_URL_REALTIME_MECHANISM_H_
+#define COMPONENTS_SAFE_BROWSING_CORE_BROWSER_URL_REALTIME_MECHANISM_H_
+
+#include <vector>
+
+#include "base/memory/raw_ptr.h"
+#include "base/memory/weak_ptr.h"
+#include "base/sequence_checker.h"
+#include "components/safe_browsing/core/browser/db/database_manager.h"
+#include "components/safe_browsing/core/browser/hash_database_mechanism.h"
+#include "components/safe_browsing/core/browser/realtime/url_lookup_service_base.h"
+#include "components/safe_browsing/core/browser/safe_browsing_lookup_mechanism.h"
+#include "components/safe_browsing/core/common/proto/realtimeapi.pb.h"
+#include "url/gurl.h"
+
+namespace safe_browsing {
+
+// This performs the real-time URL Safe Browsing check.
+class UrlRealTimeMechanism : public SafeBrowsingLookupMechanism {
+ public:
+  // Interface via which a client of this class can surface relevant events in
+  // WebUI. All methods must be called on the UI thread.
+  class WebUIDelegate {
+   public:
+    virtual ~WebUIDelegate() = default;
+
+    // Adds the new ping to the set of RT lookup pings. Returns a token that can
+    // be used in |AddToRTLookupResponses| to correlate a ping and response.
+    virtual int AddToRTLookupPings(const RTLookupRequest request,
+                                   const std::string oauth_token) = 0;
+
+    // Adds the new response to the set of RT lookup pings.
+    virtual void AddToRTLookupResponses(int token,
+                                        const RTLookupResponse response) = 0;
+  };
+
+  UrlRealTimeMechanism(
+      const GURL& url,
+      const SBThreatTypeSet& threat_types,
+      network::mojom::RequestDestination request_destination,
+      scoped_refptr<SafeBrowsingDatabaseManager> database_manager,
+      bool can_check_db,
+      bool can_check_high_confidence_allowlist,
+      std::string url_lookup_service_metric_suffix,
+      const GURL& last_committed_url,
+      scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
+      base::WeakPtr<RealTimeUrlLookupServiceBase> url_lookup_service_on_ui,
+      WebUIDelegate* webui_delegate);
+  UrlRealTimeMechanism(const UrlRealTimeMechanism&) = delete;
+  UrlRealTimeMechanism& operator=(const UrlRealTimeMechanism&) = delete;
+  ~UrlRealTimeMechanism() override;
+
+ private:
+  // SafeBrowsingLookupMechanism implementation:
+  StartCheckResult StartCheckInternal() override;
+
+  // If |did_match_allowlist| is true, this will fall back to the hash-based
+  // check instead of performing the URL lookup.
+  void OnCheckUrlForHighConfidenceAllowlist(bool did_match_allowlist);
+
+  // This function has to be static because it is called in UI thread.
+  // This function starts a real time url check if |url_lookup_service_on_ui| is
+  // available and is not in backoff mode. Otherwise, hop back to IO thread and
+  // perform hash based check.
+  static void StartLookupOnUIThread(
+      base::WeakPtr<UrlRealTimeMechanism> weak_ptr_on_io,
+      const GURL& url,
+      const GURL& last_committed_url,
+      bool is_mainframe,
+      base::WeakPtr<RealTimeUrlLookupServiceBase> url_lookup_service_on_ui,
+      scoped_refptr<base::SequencedTaskRunner> io_task_runner);
+
+  // Checks the eligibility of sending a sampled ping first;
+  // Send a sampled report if one should be sent, otherwise, exit.
+  static void MaybeSendSampleRequest(
+      base::WeakPtr<UrlRealTimeMechanism> weak_ptr_on_io,
+      const GURL& url,
+      const GURL& last_committed_url,
+      bool is_mainframe,
+      base::WeakPtr<RealTimeUrlLookupServiceBase> url_lookup_service_on_ui,
+      scoped_refptr<base::SequencedTaskRunner> io_task_runner);
+
+  // Called when the |request| from the real-time lookup service is sent.
+  void OnRTLookupRequest(std::unique_ptr<RTLookupRequest> request,
+                         std::string oauth_token);
+
+  // Called when the |response| from the real-time lookup service is received.
+  // |is_rt_lookup_successful| is true if the response code is OK and the
+  // response body is successfully parsed.
+  // |is_cached_response| is true if the response is a cache hit. In such a
+  // case, fall back to hash-based checks if the cached verdict is |SAFE|.
+  void OnRTLookupResponse(bool is_rt_lookup_successful,
+                          bool is_cached_response,
+                          std::unique_ptr<RTLookupResponse> response);
+
+  // Logs |request| on any open chrome://safe-browsing pages.
+  void LogRTLookupRequest(const RTLookupRequest& request,
+                          const std::string& oauth_token);
+
+  // Logs |response| on any open chrome://safe-browsing pages.
+  void LogRTLookupResponse(const RTLookupResponse& response);
+
+  void SetWebUIToken(int token);
+
+  // Perform the hash based check for the url.
+  void PerformHashBasedCheck(const GURL& url);
+
+  // The real-time URL check can sometimes default back to the hash-based check.
+  // In these cases, this function is called once the check has completed, so
+  // that the real-time URL check can report back the final results to the
+  // caller.
+  void OnHashDatabaseCompleteCheckResult(
+      std::unique_ptr<SafeBrowsingLookupMechanism::CompleteCheckResult> result);
+  void OnHashDatabaseCompleteCheckResultInternal(
+      SBThreatType threat_type,
+      const ThreatMetadata& metadata);
+
+  SEQUENCE_CHECKER(sequence_checker_);
+
+  // This is used only for logging purposes, primarily (but not exclusively) to
+  // distinguish between mainframe and non-mainframe resources.
+  const network::mojom::RequestDestination request_destination_;
+
+  // Token used for displaying url real time lookup pings. A single token is
+  // sufficient since real time check only happens on main frame url.
+  int url_web_ui_token_ = -1;
+
+  // Whether the high confidence allowlist can be checked. It is set to
+  // false when enterprise real time URL lookup and allowlist bypass is also
+  // enabled (SafeBrowsingRealTimeUrlLookupForEnterpriseAllowlistBypass).
+  bool can_check_high_confidence_allowlist_;
+
+  // URL Lookup service suffix for logging metrics.
+  std::string url_lookup_service_metric_suffix_;
+
+  // The last committed URL when the checker is constructed. It is used to
+  // obtain page load token when the URL being checked is not a mainframe
+  // URL.
+  GURL last_committed_url_;
+
+  // The task runner for the UI thread.
+  scoped_refptr<base::SequencedTaskRunner> ui_task_runner_;
+
+  // This object is used to perform real time url check. Can only be
+  // accessed in UI thread.
+  base::WeakPtr<RealTimeUrlLookupServiceBase> url_lookup_service_on_ui_;
+
+  // May be null on certain platforms that don't support
+  // chrome://safe-browsing and in unit tests. If non-null, guaranteed to
+  // outlive this object by contract.
+  raw_ptr<WebUIDelegate> webui_delegate_ = nullptr;
+
+  // If the URL is classified as safe in cache manager during real time
+  // lookup.
+  bool is_cached_safe_url_ = false;
+
+  // This will be created in cases where the real-time URL check decides to fall
+  // back to the hash-based checks.
+  std::unique_ptr<HashDatabaseMechanism> hash_database_mechanism_ = nullptr;
+
+  base::WeakPtrFactory<UrlRealTimeMechanism> weak_factory_{this};
+};
+
+}  // namespace safe_browsing
+
+#endif  // COMPONENTS_SAFE_BROWSING_CORE_BROWSER_URL_REALTIME_MECHANISM_H_

components/saved_tab_groups/saved_tab_group.cc

diff --git a/components/saved_tab_groups/saved_tab_group.cc b/components/saved_tab_groups/saved_tab_group.cc
index 9ac8a2e..9a1e333 100644
--- a/components/saved_tab_groups/saved_tab_group.cc
+++ b/components/saved_tab_groups/saved_tab_group.cc
@@ -122,21 +122,36 @@
   return *this;
 }
 
-SavedTabGroup& SavedTabGroup::AddTab(size_t index, SavedTabGroupTab tab) {
-  CHECK_GE(index, 0u);
-  CHECK_LE(index, saved_tabs_.size());
+SavedTabGroup& SavedTabGroup::AddTab(SavedTabGroupTab tab,
+                                     bool update_tab_positions) {
   CHECK(!ContainsTab(tab.saved_tab_guid()));
-  saved_tabs_.emplace(saved_tabs_.begin() + index, std::move(tab));
+
+  if (tab.position() == SavedTabGroupTab::kUnsetPosition) {
+    tab.SetPosition(saved_tabs_.size());
+  }
+
+  InsertTabImpl(tab);
+
+  if (update_tab_positions) {
+    UpdateTabPositionsImpl();
+  }
+
   SetUpdateTimeWindowsEpochMicros(base::Time::Now());
   return *this;
 }
 
-SavedTabGroup& SavedTabGroup::RemoveTab(const base::GUID& saved_tab_guid) {
+SavedTabGroup& SavedTabGroup::RemoveTab(const base::GUID& saved_tab_guid,
+                                        bool update_tab_positions) {
   absl::optional<size_t> index = GetIndexOfTab(saved_tab_guid);
   CHECK(index.has_value());
   CHECK_GE(index.value(), 0u);
   CHECK_LT(index.value(), saved_tabs_.size());
   saved_tabs_.erase(saved_tabs_.begin() + index.value());
+
+  if (update_tab_positions) {
+    UpdateTabPositionsImpl();
+  }
+
   SetUpdateTimeWindowsEpochMicros(base::Time::Now());
   return *this;
 }
@@ -161,6 +176,7 @@
   CHECK(!ContainsTab(tab.saved_tab_guid()));
   saved_tabs_.erase(saved_tabs_.begin() + index.value());
   saved_tabs_.insert(saved_tabs_.begin() + index.value(), std::move(tab));
+  UpdateTabPositionsImpl();
   SetUpdateTimeWindowsEpochMicros(base::Time::Now());
   return *this;
 }
@@ -185,10 +201,52 @@
         saved_tabs_.rbegin() + ((saved_tabs_.size() - 1) - curr_index.value()) +
             1);
   }
+  UpdateTabPositionsImpl();
   SetUpdateTimeWindowsEpochMicros(base::Time::Now());
   return *this;
 }
 
+void SavedTabGroup::UpdateTabPositionsImpl() {
+  for (size_t i = 0; i < saved_tabs_.size(); ++i) {
+    saved_tabs_[i].SetPosition(i);
+  }
+}
+
+void SavedTabGroup::InsertTabImpl(const SavedTabGroupTab& tab) {
+  // We can always safely insert the first tab at the end. We can also safely
+  // insert `tab` if its position is larger than the position at the end of
+  // `saved_tabs_`.
+  if (saved_tabs_.empty() ||
+      saved_tabs_[saved_tabs_.size() - 1].position() < tab.position()) {
+    saved_tabs_.emplace_back(std::move(tab));
+    return;
+  }
+
+  // Insert `tab` in front of an element if one of these criteria
+  // are met:
+  // 1. The current index is larger than `tab`.
+  // 2. The current index has the same position as `tab` and is not
+  // the most recently updated position.
+  for (size_t index = 0; index < saved_tabs_.size(); ++index) {
+    const SavedTabGroupTab& curr_tab = saved_tabs_[index];
+    bool curr_position_larger = curr_tab.position() > tab.position();
+    bool curr_position_same = curr_tab.position() == tab.position();
+    bool curr_position_least_recently_updated =
+        curr_tab.update_time_windows_epoch_micros() <=
+        tab.update_time_windows_epoch_micros();
+
+    if (curr_position_larger ||
+        (curr_position_same && curr_position_least_recently_updated)) {
+      saved_tabs_.insert(saved_tabs_.begin() + index, std::move(tab));
+      return;
+    }
+  }
+
+  // This can happen when the last element of the vector has the same position
+  // as `group` and was more recently updated.
+  saved_tabs_.push_back(std::move(tab));
+}
+
 bool SavedTabGroup::ShouldMergeGroup(
     const sync_pb::SavedTabGroupSpecifics& sync_specific) {
   bool sync_update_is_latest =

components/saved_tab_groups/saved_tab_group.h

diff --git a/components/saved_tab_groups/saved_tab_group.h b/components/saved_tab_groups/saved_tab_group.h
index dc03c74c3..ce50577 100644
--- a/components/saved_tab_groups/saved_tab_group.h
+++ b/components/saved_tab_groups/saved_tab_group.h
@@ -24,6 +24,7 @@
 // tab_group_editor_bubble_view.
 class SavedTabGroup {
  public:
+  // Used to denote groups that have not been given a position.
   static constexpr int kUnsetPosition = -1;
 
   SavedTabGroup(
@@ -83,15 +84,22 @@
   SavedTabGroup& SetPosition(int position);
 
   // Tab mutators.
-  // Adds `tab` to `saved_tabs_` at the specified `index` unless the added tab
-  // already exists. In this case we CHECK.
-  SavedTabGroup& AddTab(size_t index, SavedTabGroupTab tab);
-  // Removes the tab denoted by `tab_id` from `saved_tabs_`. This function will
-  // remove the last tab: crbug/1371959.
-  SavedTabGroup& RemoveTab(const base::GUID& tab_id);
+  // Add `tab` into its position in `saved_tabs_` if it is set. Otherwise add it
+  // to the end. If the tab already exists, CHECK. If `update_tab_positions` is
+  // true, update the positions of all tabs in the group.
+  SavedTabGroup& AddTab(SavedTabGroupTab tab,
+                        bool update_tab_positions = false);
+
   // Updates the tab with with `tab_id` tab.guid() with a value of `tab`. If
   // there is no tab, this function will CHECK.
   SavedTabGroup& UpdateTab(SavedTabGroupTab tab);
+
+  // Removes a tab from `saved_tabs_` denoted by `saved_tab_guid` even if that
+  // was the last tab in the group: crbug/1371959. If `update_tab_positions` is
+  // true, update the positions of all tabs in the group.
+  SavedTabGroup& RemoveTab(const base::GUID& saved_tab_guid,
+                           bool update_tab_positions = false);
+
   // Replaces that tab denoted by `tab_id` with value of `tab` unless the
   // replacement tab already exists. In this case we CHECK.
   SavedTabGroup& ReplaceTabAt(const base::GUID& saved_tab_guid,
@@ -110,6 +118,17 @@
   // 2. The `sync_specific` has the oldest (smallest) creation time.
   bool ShouldMergeGroup(const sync_pb::SavedTabGroupSpecifics& sync_specific);
 
+  // Insert `tab` into sorted order based on its position compared to already
+  // stored tabs in its group. It should be noted that the list of tabs in each
+  // group must already be in sorted order for this function to work as
+  // intended. To do this, UpdateTabPositionsImpl() can be called before calling
+  // this method.
+  void InsertTabImpl(const SavedTabGroupTab& tab);
+
+  // Updates all tab positions to match the index they are currently stored at
+  // in the group at `group_index`. Does not call observers.
+  void UpdateTabPositionsImpl();
+
   // Converts a `SavedTabGroupSpecifics` retrieved from sync into a
   // `SavedTabGroupTab`.
   static SavedTabGroup FromSpecifics(
@@ -146,8 +165,8 @@
   std::vector<SavedTabGroupTab> saved_tabs_;
 
   // The current position of the group in relation to all other saved groups.
-  // A value of -1 means that the group was not assigned a position and will be
-  // assigned one when it is added into the SavedTabGroupModel.
+  // A value of kUnsetPosition means that the group was not assigned a position
+  // and will be assigned one when it is added into the SavedTabGroupModel.
   int position_;
 
   // Timestamp for when the tab was created using windows epoch microseconds.

components/saved_tab_groups/saved_tab_group_model.cc

diff --git a/components/saved_tab_groups/saved_tab_group_model.cc b/components/saved_tab_groups/saved_tab_group_model.cc
index bd0ece2..6694210 100644
--- a/components/saved_tab_groups/saved_tab_group_model.cc
+++ b/components/saved_tab_groups/saved_tab_group_model.cc
@@ -88,8 +88,9 @@
 
   InsertGroupImpl(std::move(saved_group));
 
-  for (auto& observer : observers_)
+  for (auto& observer : observers_) {
     observer.SavedTabGroupAddedLocally(Get(group_guid)->saved_guid());
+  }
 }
 
 void SavedTabGroupModel::Remove(const tab_groups::TabGroupId tab_group_id) {
@@ -99,9 +100,10 @@
   const int index = GetIndexOf(tab_group_id).value();
   base::GUID removed_guid = Get(tab_group_id)->saved_guid();
   std::unique_ptr<SavedTabGroup> removed_group = RemoveImpl(index);
-  UpdatePositionsImpl();
-  for (auto& observer : observers_)
+  UpdateGroupPositionsImpl();
+  for (auto& observer : observers_) {
     observer.SavedTabGroupRemovedLocally(removed_group.get());
+  }
 }
 
 void SavedTabGroupModel::Remove(const base::GUID& id) {
@@ -111,9 +113,10 @@
   const int index = GetIndexOf(id).value();
   base::GUID removed_guid = Get(id)->saved_guid();
   std::unique_ptr<SavedTabGroup> removed_group = RemoveImpl(index);
-  UpdatePositionsImpl();
-  for (auto& observer : observers_)
+  UpdateGroupPositionsImpl();
+  for (auto& observer : observers_) {
     observer.SavedTabGroupRemovedLocally(removed_group.get());
+  }
 }
 
 void SavedTabGroupModel::UpdateVisualData(
@@ -125,8 +128,9 @@
   const absl::optional<int> index = GetIndexOf(tab_group_id);
   UpdateVisualDataImpl(index.value(), visual_data);
   base::GUID updated_guid = Get(tab_group_id)->saved_guid();
-  for (auto& observer : observers_)
+  for (auto& observer : observers_) {
     observer.SavedTabGroupUpdatedLocally(updated_guid);
+  }
 }
 
 void SavedTabGroupModel::UpdateVisualData(
@@ -137,8 +141,9 @@
 
   const absl::optional<int> index = GetIndexOf(id);
   UpdateVisualDataImpl(index.value(), visual_data);
-  for (auto& observer : observers_)
+  for (auto& observer : observers_) {
     observer.SavedTabGroupUpdatedLocally(id);
+  }
 }
 
 void SavedTabGroupModel::AddedFromSync(SavedTabGroup saved_group) {
@@ -148,8 +153,9 @@
 
   InsertGroupImpl(std::move(saved_group));
 
-  for (auto& observer : observers_)
+  for (auto& observer : observers_) {
     observer.SavedTabGroupAddedFromSync(Get(group_guid)->saved_guid());
+  }
 }
 
 void SavedTabGroupModel::RemovedFromSync(
@@ -160,8 +166,9 @@
   const absl::optional<int> index = GetIndexOf(tab_group_id);
   base::GUID removed_guid = Get(tab_group_id)->saved_guid();
   std::unique_ptr<SavedTabGroup> removed_group = RemoveImpl(index.value());
-  for (auto& observer : observers_)
+  for (auto& observer : observers_) {
     observer.SavedTabGroupRemovedFromSync(removed_group.get());
+  }
 }
 
 void SavedTabGroupModel::RemovedFromSync(const base::GUID& id) {
@@ -171,8 +178,9 @@
   const absl::optional<int> index = GetIndexOf(id);
   base::GUID removed_guid = Get(id)->saved_guid();
   std::unique_ptr<SavedTabGroup> removed_group = RemoveImpl(index.value());
-  for (auto& observer : observers_)
+  for (auto& observer : observers_) {
     observer.SavedTabGroupRemovedFromSync(removed_group.get());
+  }
 }
 
 void SavedTabGroupModel::UpdatedVisualDataFromSync(
@@ -184,8 +192,9 @@
   const absl::optional<int> index = GetIndexOf(tab_group_id);
   UpdateVisualDataImpl(index.value(), visual_data);
   base::GUID updated_guid = Get(tab_group_id)->saved_guid();
-  for (auto& observer : observers_)
+  for (auto& observer : observers_) {
     observer.SavedTabGroupUpdatedFromSync(updated_guid);
+  }
 }
 
 void SavedTabGroupModel::UpdatedVisualDataFromSync(
@@ -196,8 +205,9 @@
 
   const absl::optional<int> index = GetIndexOf(id);
   UpdateVisualDataImpl(index.value(), visual_data);
-  for (auto& observer : observers_)
+  for (auto& observer : observers_) {
     observer.SavedTabGroupUpdatedFromSync(id);
+  }
 }
 
 SavedTabGroup* SavedTabGroupModel::GetGroupContainingTab(
@@ -222,16 +232,23 @@
 
 void SavedTabGroupModel::AddTabToGroup(const base::GUID& group_id,
                                        SavedTabGroupTab tab,
-                                       int index) {
+                                       bool update_tab_positions) {
   if (!Contains(group_id))
     return;
 
   const base::GUID tab_id = tab.saved_tab_guid();
   absl::optional<int> group_index = GetIndexOf(group_id);
-  saved_tab_groups_[group_index.value()].AddTab(index, tab);
+  saved_tab_groups_[group_index.value()].AddTab(tab, update_tab_positions);
 
-  for (auto& observer : observers_)
-    observer.SavedTabGroupUpdatedLocally(group_id, tab_id);
+  if (!update_tab_positions) {
+    for (auto& observer : observers_) {
+      observer.SavedTabGroupUpdatedFromSync(group_id);
+    }
+  } else {
+    for (auto& observer : observers_) {
+      observer.SavedTabGroupUpdatedLocally(group_id, tab_id);
+    }
+  }
 }
 
 void SavedTabGroupModel::UpdateTabInGroup(const base::GUID& group_id,
@@ -246,7 +263,8 @@
 }
 
 void SavedTabGroupModel::RemoveTabFromGroup(const base::GUID& group_id,
-                                            const base::GUID& tab_id) {
+                                            const base::GUID& tab_id,
+                                            bool update_tab_positions) {
   if (!Contains(group_id))
     return;
 
@@ -263,10 +281,21 @@
     return;
   }
 
-  saved_tab_groups_[index.value()].RemoveTab(tab_id);
+  // Copy `tab_id` to prevent uaf when ungrouping a saved tab: crbug/1401965.
+  const base::GUID copy_tab_id = tab_id;
+  saved_tab_groups_[index.value()].RemoveTab(tab_id, update_tab_positions);
 
-  for (auto& observer : observers_)
-    observer.SavedTabGroupUpdatedLocally(group_id, tab_id);
+  // TODO(dljames): Update to use SavedTabGroupRemoveLocally and update the API
+  // to pass a group_id and an optional tab_id.
+  if (!update_tab_positions) {
+    for (auto& observer : observers_) {
+      observer.SavedTabGroupUpdatedFromSync(group_id);
+    }
+  } else {
+    for (auto& observer : observers_) {
+      observer.SavedTabGroupUpdatedLocally(group_id, copy_tab_id);
+    }
+  }
 }
 
 void SavedTabGroupModel::ReplaceTabInGroupAt(const base::GUID& group_id,
@@ -275,12 +304,14 @@
   if (!Contains(group_id))
     return;
 
+  // Copy `tab_id` to prevent uaf when ungrouping a saved tab: crbug/1401965.
+  const base::GUID copy_tab_id = tab_id;
   const base::GUID guid = new_tab.saved_tab_guid();
   absl::optional<int> index = GetIndexOf(group_id);
   saved_tab_groups_[index.value()].ReplaceTabAt(tab_id, new_tab);
 
   for (auto& observer : observers_) {
-    observer.SavedTabGroupUpdatedLocally(group_id, tab_id);
+    observer.SavedTabGroupUpdatedLocally(group_id, copy_tab_id);
     observer.SavedTabGroupUpdatedLocally(group_id, guid);
   }
 }
@@ -291,11 +322,14 @@
   if (!Contains(group_id))
     return;
 
+  // Copy `tab_id` to prevent uaf when ungrouping a saved tab: crbug/1401965.
+  const base::GUID copy_tab_id = tab_id;
   absl::optional<int> index = GetIndexOf(group_id);
   saved_tab_groups_[index.value()].MoveTab(tab_id, new_index);
 
-  for (auto& observer : observers_)
-    observer.SavedTabGroupUpdatedLocally(group_id, tab_id);
+  for (auto& observer : observers_) {
+    observer.SavedTabGroupUpdatedLocally(group_id, copy_tab_id);
+  }
 }
 
 std::unique_ptr<sync_pb::SavedTabGroupSpecifics> SavedTabGroupModel::MergeGroup(
@@ -312,8 +346,9 @@
     Reorder(group_id, preferred_index);
   }
 
-  for (auto& observer : observers_)
+  for (auto& observer : observers_) {
     observer.SavedTabGroupUpdatedFromSync(group_id);
+  }
 
   return Get(group_id)->ToSpecifics();
 }
@@ -331,8 +366,9 @@
 
   tab->MergeTab(std::move(sync_specific));
 
-  for (auto& observer : observers_)
+  for (auto& observer : observers_) {
     observer.SavedTabGroupUpdatedFromSync(group_id, tab->saved_group_guid());
+  }
 
   return tab->ToSpecifics();
 }
@@ -351,13 +387,14 @@
   saved_tab_groups_.emplace(saved_tab_groups_.begin() + new_index,
                             std::move(group));
 
-  UpdatePositionsImpl();
+  UpdateGroupPositionsImpl();
 
-  for (auto& observer : observers_)
+  for (auto& observer : observers_) {
     observer.SavedTabGroupReorderedLocally();
+  }
 }
 
-void SavedTabGroupModel::UpdatePositionsImpl() {
+void SavedTabGroupModel::UpdateGroupPositionsImpl() {
   for (size_t i = 0; i < saved_tab_groups_.size(); ++i)
     saved_tab_groups_[i].SetPosition(i);
 }
@@ -420,7 +457,7 @@
       tabs.emplace_back(SavedTabGroupTab::FromSpecifics(proto));
   }
 
-  UpdatePositionsImpl();
+  UpdateGroupPositionsImpl();
 
   for (const SavedTabGroupTab& tab : tabs) {
     absl::optional<int> index = GetIndexOf(tab.saved_group_guid());
@@ -428,7 +465,7 @@
       tabs_missing_groups.emplace_back(std::move(*tab.ToSpecifics()));
     } else {
       base::GUID group_id = tab.saved_group_guid();
-      AddTabToGroup(group_id, std::move(tab), 0);
+      AddTabToGroup(group_id, std::move(tab), /*update_tab_positions=*/false);
     }
   }
 
@@ -444,8 +481,9 @@
   SavedTabGroup& saved_group = saved_tab_groups_[index.value()];
   saved_group.SetLocalGroupId(absl::nullopt);
 
-  for (auto& observer : observers_)
+  for (auto& observer : observers_) {
     observer.SavedTabGroupUpdatedLocally(saved_group.saved_guid());
+  }
 }
 
 void SavedTabGroupModel::OnGroupOpenedInTabStrip(
@@ -458,8 +496,9 @@
   SavedTabGroup& saved_group = saved_tab_groups_[index.value()];
   saved_group.SetLocalGroupId(tab_group_id);
 
-  for (auto& observer : observers_)
+  for (auto& observer : observers_) {
     observer.SavedTabGroupUpdatedLocally(saved_group.saved_guid());
+  }
 }
 
 std::unique_ptr<SavedTabGroup> SavedTabGroupModel::RemoveImpl(int index) {

components/saved_tab_groups/saved_tab_group_model.h

diff --git a/components/saved_tab_groups/saved_tab_group_model.h b/components/saved_tab_groups/saved_tab_group_model.h
index 46936393..78f736e2 100644
--- a/components/saved_tab_groups/saved_tab_group_model.h
+++ b/components/saved_tab_groups/saved_tab_group_model.h
@@ -90,18 +90,23 @@
   SavedTabGroup* GetGroupContainingTab(const base::Token& local_tab_id);
 
   // Adds a saved tab to `index` in the specified group denoted by `group_id` if
-  // it exists.
+  // it exists. If `update_tab_positions` is true, update the positions of all
+  // tabs in the group.
   void AddTabToGroup(const base::GUID& group_id,
                      SavedTabGroupTab tab,
-                     int index);
+                     bool update_tab_positions = false);
 
   // Calls the UpdateTab method on a group found by group id in the model.
   // Calls the observer function SavedTabGroupUpdatedLocally.
   void UpdateTabInGroup(const base::GUID& group_id, SavedTabGroupTab tab);
 
-  // Removes a saved tab from `index` in the specified group denoted by
-  // `group_id` if it exists.
-  void RemoveTabFromGroup(const base::GUID& group_id, const base::GUID& tab_id);
+  // Removes saved tab `tab_id` in the specified group denoted by
+  // `group_id` if it exists. We delete the group instead if the last tab is
+  // removed from it. If `update_tab_positions` is true, update the positions of
+  // all tabs in the group.
+  void RemoveTabFromGroup(const base::GUID& group_id,
+                          const base::GUID& tab_id,
+                          bool update_tab_positions = false);
 
   // Replaces a saved tab `tab_id` in the specified group denoted by
   // `group_id` if it exists with `new_tab`.
@@ -147,7 +152,7 @@
  private:
   // Updates all group positions to match the index they are currently stored
   // at.
-  void UpdatePositionsImpl();
+  void UpdateGroupPositionsImpl();
 
   // Insert `group` into sorted order based on its position compared to already
   // stored groups in `saved_tab_groups_`. It should be noted that

components/saved_tab_groups/saved_tab_group_model_unittest.cc

diff --git a/components/saved_tab_groups/saved_tab_group_model_unittest.cc b/components/saved_tab_groups/saved_tab_group_model_unittest.cc
index 8b28dc4..2ddc09b 100644
--- a/components/saved_tab_groups/saved_tab_group_model_unittest.cc
+++ b/components/saved_tab_groups/saved_tab_group_model_unittest.cc
@@ -78,8 +78,10 @@
 
 SavedTabGroupTab CreateSavedTabGroupTab(const std::string& url,
                                         const std::u16string& title,
-                                        const base::GUID& group_guid) {
-  SavedTabGroupTab tab(GURL(url), title, group_guid);
+                                        const base::GUID& group_guid,
+                                        absl::optional<int> position) {
+  SavedTabGroupTab tab(GURL(url), title, group_guid, nullptr, absl::nullopt,
+                       absl::nullopt, position);
   tab.SetFavicon(gfx::Image());
   return tab;
 }
@@ -90,9 +92,9 @@
   const tab_groups::TabGroupColorId& color = tab_groups::TabGroupColorId::kBlue;
 
   SavedTabGroupTab tab1 =
-      CreateSavedTabGroupTab("www.google.com", u"Google", id);
+      CreateSavedTabGroupTab("www.google.com", u"Google", id, absl::nullopt);
   SavedTabGroupTab tab2 =
-      CreateSavedTabGroupTab("chrome://newtab", u"new tab", id);
+      CreateSavedTabGroupTab("chrome://newtab", u"new tab", id, absl::nullopt);
 
   tab1.SetFavicon(gfx::Image());
   tab2.SetFavicon(gfx::Image());
@@ -209,14 +211,14 @@
         tab_groups::TabGroupColorId::kGreen;
 
     std::vector<SavedTabGroupTab> group_1_tabs = {
-        CreateSavedTabGroupTab("A_Link", u"Only Tab", id_1_)};
+        CreateSavedTabGroupTab("A_Link", u"Only Tab", id_1_, 0)};
     std::vector<SavedTabGroupTab> group_2_tabs = {
-        CreateSavedTabGroupTab("One_Link", u"One Of Two", id_2_),
-        CreateSavedTabGroupTab("Two_Link", u"Second", id_2_)};
+        CreateSavedTabGroupTab("One_Link", u"One Of Two", id_2_, 0),
+        CreateSavedTabGroupTab("Two_Link", u"Second", id_2_, 1)};
     std::vector<SavedTabGroupTab> group_3_tabs = {
-        CreateSavedTabGroupTab("Athos", u"All For One", id_3_),
-        CreateSavedTabGroupTab("Porthos", u"And", id_3_),
-        CreateSavedTabGroupTab("Aramis", u"One For All", id_3_)};
+        CreateSavedTabGroupTab("Athos", u"All For One", id_3_, 0),
+        CreateSavedTabGroupTab("Porthos", u"And", id_3_, 1),
+        CreateSavedTabGroupTab("Aramis", u"One For All", id_3_, 2)};
 
     saved_tab_group_model_->Add(
         CreateSavedTabGroup(title_1, color_1, group_1_tabs, id_1_));
@@ -304,9 +306,9 @@
       tab_groups::TabGroupColorId::kBlue;
 
   SavedTabGroupTab tab1 =
-      CreateSavedTabGroupTab("4th group", u"First Tab 4th Group", id_4);
+      CreateSavedTabGroupTab("4th group", u"First Tab 4th Group", id_4, 0);
   SavedTabGroupTab tab2 =
-      CreateSavedTabGroupTab("2nd link", u"Second Tab 4th Group", id_4);
+      CreateSavedTabGroupTab("2nd link", u"Second Tab 4th Group", id_4, 1);
 
   std::vector<SavedTabGroupTab> group_4_tabs = {tab1, tab2};
   SavedTabGroup group_4(title_4, color_4, group_4_tabs, id_4);
@@ -378,21 +380,23 @@
 // Tests that the correct tabs are added to the correct position in group 1.
 TEST_F(SavedTabGroupModelTest, AddTabToGroup) {
   SavedTabGroupTab tab1 =
-      CreateSavedTabGroupTab("4th group", u"First Tab 4th Group", id_1_);
+      CreateSavedTabGroupTab("4th group", u"First Tab 4th Group", id_1_, 0);
   SavedTabGroupTab tab2 =
-      CreateSavedTabGroupTab("2nd link", u"Second Tab 4th Group", id_1_);
+      CreateSavedTabGroupTab("2nd link", u"Second Tab 4th Group", id_1_, 2);
 
   SavedTabGroup* group = saved_tab_group_model_->Get(id_1_);
   ASSERT_EQ(group->saved_tabs().size(), size_t(1));
 
-  saved_tab_group_model_->AddTabToGroup(group->saved_guid(), tab1, 0);
+  saved_tab_group_model_->AddTabToGroup(group->saved_guid(), tab1,
+                                        /*update_tab_positions=*/true);
   EXPECT_EQ(group->saved_tabs().size(), size_t(2));
   EXPECT_EQ(0, group->GetIndexOfTab(tab1.saved_tab_guid()));
   EXPECT_TRUE(group->ContainsTab(tab1.saved_tab_guid()));
   ASSERT_TRUE(group->GetTab(tab1.saved_tab_guid()));
   CompareSavedTabGroupTabs({*group->GetTab(tab1.saved_tab_guid())}, {tab1});
 
-  saved_tab_group_model_->AddTabToGroup(group->saved_guid(), tab2, 2);
+  saved_tab_group_model_->AddTabToGroup(group->saved_guid(), tab2,
+                                        /*update_tab_positions=*/true);
   EXPECT_EQ(group->saved_tabs().size(), size_t(3));
   EXPECT_EQ(2, group->GetIndexOfTab(tab2.saved_tab_guid()));
   EXPECT_TRUE(group->ContainsTab(tab2.saved_tab_guid()));
@@ -405,24 +409,28 @@
 // Tests that the correct tabs are removed from the correct position in group 1.
 TEST_F(SavedTabGroupModelTest, RemoveTabFromGroup) {
   SavedTabGroupTab tab1 =
-      CreateSavedTabGroupTab("4th group", u"First Tab 4th Group", id_1_);
+      CreateSavedTabGroupTab("4th group", u"First Tab 4th Group", id_1_, 0);
   SavedTabGroupTab tab2 =
-      CreateSavedTabGroupTab("2nd link", u"Second Tab 4th Group", id_1_);
+      CreateSavedTabGroupTab("2nd link", u"Second Tab 4th Group", id_1_, 2);
 
   SavedTabGroup* group = saved_tab_group_model_->Get(id_1_);
   ASSERT_EQ(group->saved_tabs().size(), size_t(1));
 
-  saved_tab_group_model_->AddTabToGroup(group->saved_guid(), tab1, 0);
-  saved_tab_group_model_->AddTabToGroup(group->saved_guid(), tab2, 2);
+  saved_tab_group_model_->AddTabToGroup(group->saved_guid(), tab1,
+                                        /*update_tab_positions=*/true);
+  saved_tab_group_model_->AddTabToGroup(group->saved_guid(), tab2,
+                                        /*update_tab_positions=*/true);
   EXPECT_EQ(group->saved_tabs().size(), size_t(3));
 
   saved_tab_group_model_->RemoveTabFromGroup(group->saved_guid(),
-                                             tab1.saved_tab_guid());
+                                             tab1.saved_tab_guid(),
+                                             /*update_tab_positions=*/true);
   EXPECT_EQ(group->saved_tabs().size(), size_t(2));
   CompareSavedTabGroupTabs(group->saved_tabs(), {group->saved_tabs()[0], tab2});
 
   saved_tab_group_model_->RemoveTabFromGroup(group->saved_guid(),
-                                             tab2.saved_tab_guid());
+                                             tab2.saved_tab_guid(),
+                                             /*update_tab_positions=*/true);
   EXPECT_EQ(group->saved_tabs().size(), size_t(1));
   CompareSavedTabGroupTabs(group->saved_tabs(), {group->saved_tabs()[0]});
 }
@@ -434,23 +442,28 @@
   ASSERT_EQ(group->saved_tabs().size(), size_t(1));
 
   saved_tab_group_model_->RemoveTabFromGroup(
-      group->saved_guid(), group->saved_tabs()[0].saved_tab_guid());
+      group->saved_guid(), group->saved_tabs()[0].saved_tab_guid(),
+      /*update_tab_positions=*/true);
 
   EXPECT_FALSE(saved_tab_group_model_->Contains(id_1_));
 }
 
 // Tests that the correct tabs are replaced in group 1.
 TEST_F(SavedTabGroupModelTest, ReplaceTabInGroup) {
-  SavedTabGroupTab tab1 = CreateSavedTabGroupTab("first", u"First Tab", id_1_);
+  SavedTabGroupTab tab1 =
+      CreateSavedTabGroupTab("first", u"First Tab", id_1_, 0);
   SavedTabGroupTab tab2 =
-      CreateSavedTabGroupTab("second", u"Second Tab", id_1_);
-  SavedTabGroupTab tab3 = CreateSavedTabGroupTab("third", u"Third Tab", id_1_);
+      CreateSavedTabGroupTab("second", u"Second Tab", id_1_, 2);
+  SavedTabGroupTab tab3 =
+      CreateSavedTabGroupTab("third", u"Third Tab", id_1_, absl::nullopt);
 
   SavedTabGroup* group = saved_tab_group_model_->Get(id_1_);
   ASSERT_EQ(group->saved_tabs().size(), size_t(1));
 
-  saved_tab_group_model_->AddTabToGroup(group->saved_guid(), tab1, 0);
-  saved_tab_group_model_->AddTabToGroup(group->saved_guid(), tab2, 2);
+  saved_tab_group_model_->AddTabToGroup(group->saved_guid(), tab1,
+                                        /*update_tab_positions=*/true);
+  saved_tab_group_model_->AddTabToGroup(group->saved_guid(), tab2,
+                                        /*update_tab_positions=*/true);
   EXPECT_EQ(group->saved_tabs().size(), size_t(3));
 
   saved_tab_group_model_->ReplaceTabInGroupAt(group->saved_guid(),
@@ -471,15 +484,17 @@
 // Tests that the correct tabs are moved in group 1.
 TEST_F(SavedTabGroupModelTest, MoveTabInGroup) {
   SavedTabGroupTab tab1 =
-      CreateSavedTabGroupTab("4th group", u"First Tab 4th Group", id_1_);
+      CreateSavedTabGroupTab("4th group", u"First Tab 4th Group", id_1_, 0);
   SavedTabGroupTab tab2 =
-      CreateSavedTabGroupTab("2nd link", u"Second Tab 4th Group", id_1_);
+      CreateSavedTabGroupTab("2nd link", u"Second Tab 4th Group", id_1_, 2);
 
   SavedTabGroup* group = saved_tab_group_model_->Get(id_1_);
   ASSERT_EQ(group->saved_tabs().size(), size_t(1));
 
-  saved_tab_group_model_->AddTabToGroup(group->saved_guid(), tab1, 0);
-  saved_tab_group_model_->AddTabToGroup(group->saved_guid(), tab2, 2);
+  saved_tab_group_model_->AddTabToGroup(group->saved_guid(), tab1,
+                                        /*update_tab_positions=*/true);
+  saved_tab_group_model_->AddTabToGroup(group->saved_guid(), tab2,
+                                        /*update_tab_positions=*/true);
   EXPECT_EQ(group->saved_tabs().size(), size_t(3));
 
   saved_tab_group_model_->MoveTabInGroupTo(group->saved_guid(),
@@ -524,8 +539,9 @@
   EXPECT_EQ(saved_group->saved_guid(), id_3_);
   EXPECT_EQ(saved_group->title(), group->title());
   EXPECT_EQ(saved_group->color(), group->color());
-  // TODO(dljames): Use CompareSavedTabGroupTabs when we can ensure the order of
-  // tabs and groups are maintained.
+
+  // We can not use CompareSavedTabGroupTabs because the favicons are not loaded
+  // until the tab is opened through the saved group button.
   EXPECT_EQ(saved_group->saved_tabs().size(), group->saved_tabs().size());
 }
 
@@ -989,7 +1005,7 @@
   SavedTabGroupTab tab(GURL(url::kAboutBlankURL), std::u16string(u"title"),
                        matching_group.saved_guid(), &matching_group,
                        matching_tab_guid, matching_local_tab_id);
-  matching_group.AddTab(0, std::move(tab));
+  matching_group.AddTab(std::move(tab));
   saved_tab_group_model_->Add(std::move(matching_group));
 
   // Add another non matching SavedTabGroup.

components/saved_tab_groups/saved_tab_group_proto_conversion_unittest.cc

diff --git a/components/saved_tab_groups/saved_tab_group_proto_conversion_unittest.cc b/components/saved_tab_groups/saved_tab_group_proto_conversion_unittest.cc
index 25411b2..55306fc 100644
--- a/components/saved_tab_groups/saved_tab_group_proto_conversion_unittest.cc
+++ b/components/saved_tab_groups/saved_tab_group_proto_conversion_unittest.cc
@@ -95,8 +95,8 @@
   // Create a tab.
   SavedTabGroupTab tab(GURL("chrome://hidden_link"), u"Hidden Title",
                        base::GUID::GenerateRandomV4(), nullptr,
-                       base::GUID::GenerateRandomV4(), absl::nullopt, time_,
-                       time_);
+                       base::GUID::GenerateRandomV4(), absl::nullopt,
+                       absl::nullopt, time_, time_);
 
   // Create a STGSpecific using `tab`.
   std::unique_ptr<sync_pb::SavedTabGroupSpecifics> specific = tab.ToSpecifics();

components/saved_tab_groups/saved_tab_group_sync_bridge.cc

diff --git a/components/saved_tab_groups/saved_tab_group_sync_bridge.cc b/components/saved_tab_groups/saved_tab_group_sync_bridge.cc
index 4e0447a..ab59865b 100644
--- a/components/saved_tab_groups/saved_tab_group_sync_bridge.cc
+++ b/components/saved_tab_groups/saved_tab_group_sync_bridge.cc
@@ -32,8 +32,6 @@
 #include "components/sync/protocol/entity_data.h"
 #include "components/sync/protocol/saved_tab_group_specifics.pb.h"
 
-#include "base/logging.h"
-
 namespace {
 constexpr base::TimeDelta discard_orphaned_tabs_threshold =
     base::Microseconds(base::Time::kMicrosecondsPerDay * 90);
@@ -356,7 +354,8 @@
     if (existing_group) {
       // We do not have this tab. Add the tab from sync into local storage.
       model_->AddTabToGroup(existing_group->saved_guid(),
-                            SavedTabGroupTab::FromSpecifics(specifics), 0);
+                            SavedTabGroupTab::FromSpecifics(specifics),
+                            /*update_tab_positions=*/false);
     } else {
       // We reach this case if we were unable to find a group for this tab. This
       // can happen when sync sends the tab data before the group data. In this
@@ -383,7 +382,8 @@
     if (!group.ContainsTab(guid))
       continue;
 
-    model_->RemoveTabFromGroup(group.saved_guid(), guid);
+    model_->RemoveTabFromGroup(group.saved_guid(), guid,
+                               /*update_tab_positions=*/false);
     return;
   }
 }
@@ -411,7 +411,8 @@
       write_batch->WriteData(tab_iterator->guid(),
                              tab_iterator->SerializeAsString());
       model_->AddTabToGroup(group->saved_guid(),
-                            SavedTabGroupTab::FromSpecifics(*tab_iterator), 0);
+                            SavedTabGroupTab::FromSpecifics(*tab_iterator),
+                            /*update_tab_positions=*/false);
       tab_iterator = tabs_missing_groups_.erase(tab_iterator);
     }
   }

components/saved_tab_groups/saved_tab_group_sync_bridge_unittest.cc

diff --git a/components/saved_tab_groups/saved_tab_group_sync_bridge_unittest.cc b/components/saved_tab_groups/saved_tab_group_sync_bridge_unittest.cc
index 88ff2ee..777664e 100644
--- a/components/saved_tab_groups/saved_tab_group_sync_bridge_unittest.cc
+++ b/components/saved_tab_groups/saved_tab_group_sync_bridge_unittest.cc
@@ -158,7 +158,7 @@
                          group.saved_guid());
   SavedTabGroupTab tab_2(GURL("https://google.com"), u"Google",
                          group.saved_guid());
-  group.AddTab(0, tab_1).AddTab(1, tab_2);
+  group.AddTab(tab_1).AddTab(tab_2);
   group.SetPosition(0);
 
   // Note: Here the change type does not matter. The initial merge will add
@@ -196,7 +196,7 @@
                          group.saved_guid());
   SavedTabGroupTab tab_2(GURL("https://google.com"), u"Google",
                          group.saved_guid());
-  group.AddTab(0, tab_1).AddTab(1, tab_2);
+  group.AddTab(tab_1).AddTab(tab_2);
 
   base::GUID group_guid = group.saved_guid();
   base::GUID tab_1_guid = tab_1.saved_tab_guid();
@@ -216,8 +216,8 @@
                               group_creation_time);
   SavedTabGroupTab updated_tab_1(GURL("https://support.google.com"), u"Support",
                                  group_guid, nullptr, tab_1_guid, absl::nullopt,
-                                 tab_1_creation_time);
-  updated_group.AddTab(0, updated_tab_1);
+                                 absl::nullopt, tab_1_creation_time);
+  updated_group.AddTab(updated_tab_1);
   updated_group.SetPosition(0);
 
   syncer::EntityChangeList entity_change_list = CreateEntityChangeListFromGroup(
@@ -240,7 +240,7 @@
   // Ensure tab_2 was left untouched.
   SavedTabGroupTab tab_2_replica(GURL("https://google.com"), u"Google",
                                  group_guid, nullptr, tab_2_guid, absl::nullopt,
-                                 tab_2_creation_time);
+                                 absl::nullopt, tab_2_creation_time);
   EXPECT_TRUE(AreTabSpecificsEqual(
       *tab_2_replica.ToSpecifics(),
       *group_from_model->GetTab(tab_2_guid)->ToSpecifics()));
@@ -404,7 +404,7 @@
                          group.saved_guid());
   SavedTabGroupTab tab_2(GURL("https://google.com"), u"Google",
                          group.saved_guid());
-  group.AddTab(0, tab_1).AddTab(1, tab_2);
+  group.AddTab(tab_1).AddTab(tab_2);
   group.SetPosition(0);
 
   bridge_->ApplySyncChanges(
@@ -470,7 +470,7 @@
                          group.saved_guid());
   SavedTabGroupTab tab_2(GURL("https://google.com"), u"Google",
                          group.saved_guid());
-  group.AddTab(0, tab_1).AddTab(1, tab_2);
+  group.AddTab(tab_1).AddTab(tab_2);
   group.SetPosition(0);
 
   bridge_->ApplySyncChanges(
@@ -512,7 +512,7 @@
                          group.saved_guid());
   SavedTabGroupTab tab_2(GURL("https://google.com"), u"Google",
                          group.saved_guid());
-  group.AddTab(0, tab_1).AddTab(1, tab_2);
+  group.AddTab(tab_1).AddTab(tab_2);
 
   EXPECT_EQ(group.saved_tabs().size(), 2u);
 
@@ -562,7 +562,7 @@
                          group.saved_guid());
   SavedTabGroupTab tab_2(GURL("https://google.com"), u"Google",
                          group.saved_guid());
-  group.AddTab(0, tab_1).AddTab(1, tab_2);
+  group.AddTab(tab_1).AddTab(tab_2);
 
   base::GUID group_guid = group.saved_guid();
   base::GUID tab_1_guid = tab_1.saved_tab_guid();
@@ -584,7 +584,7 @@
                          group.saved_guid());
   SavedTabGroupTab tab_2(GURL("https://google.com"), u"Google",
                          group.saved_guid());
-  group.AddTab(0, tab_1).AddTab(1, tab_2);
+  group.AddTab(tab_1).AddTab(tab_2);
 
   base::GUID group_guid = group.saved_guid();
   base::GUID tab_1_guid = tab_1.saved_tab_guid();
@@ -607,7 +607,7 @@
                          group.saved_guid());
   SavedTabGroupTab tab_2(GURL("https://google.com"), u"Google",
                          group.saved_guid());
-  group.AddTab(0, tab_1).AddTab(1, tab_2);
+  group.AddTab(tab_1).AddTab(tab_2);
 
   base::GUID group_guid = group.saved_guid();
   base::GUID tab_1_guid = tab_1.saved_tab_guid();
@@ -634,7 +634,7 @@
                          group.saved_guid());
   SavedTabGroupTab tab_3(GURL("https://youtube.com"), u"Youtube",
                          group.saved_guid());
-  group.AddTab(0, tab_1).AddTab(1, tab_2);
+  group.AddTab(tab_1).AddTab(tab_2);
 
   base::GUID group_guid = group.saved_guid();
   base::GUID tab_1_guid = tab_1.saved_tab_guid();
@@ -651,7 +651,8 @@
   // `tab_2` will have its position updated. Once tab ordering is implemented,
   // only the affected tabs will need to be updated. In that case, the Put()
   // call for tab_1 can be removed.
-  saved_tab_group_model_.AddTabToGroup(group_guid, tab_3, 1);
+  saved_tab_group_model_.AddTabToGroup(group_guid, tab_3,
+                                       /*update_tab_positions=*/true);
 }
 
 // Verify that locally removed tabs remove the correct tabs from the processor.
@@ -663,7 +664,7 @@
                          group.saved_guid());
   SavedTabGroupTab tab_2(GURL("https://google.com"), u"Goole",
                          group.saved_guid());
-  group.AddTab(0, tab_1).AddTab(1, tab_2);
+  group.AddTab(tab_1).AddTab(tab_2);
 
   base::GUID group_guid = group.saved_guid();
   base::GUID tab_1_guid = tab_1.saved_tab_guid();
@@ -674,7 +675,8 @@
   EXPECT_CALL(processor_, Put(tab_2_guid.AsLowercaseString(), _, _)).Times(0);
   EXPECT_CALL(processor_, Put(group_guid.AsLowercaseString(), _, _)).Times(0);
 
-  saved_tab_group_model_.RemoveTabFromGroup(group_guid, tab_1_guid);
+  saved_tab_group_model_.RemoveTabFromGroup(group_guid, tab_1_guid,
+                                            /*update_tab_positions=*/true);
 }
 
 // Verify that locally updated tabs update the correct tabs in the processor.
@@ -688,7 +690,7 @@
                          group.saved_guid());
   SavedTabGroupTab tab_3(GURL("https://youtube.com"), u"Youtube",
                          group.saved_guid());
-  group.AddTab(0, tab_1).AddTab(1, tab_2);
+  group.AddTab(tab_1).AddTab(tab_2);
 
   base::GUID group_guid = group.saved_guid();
   base::GUID tab_1_guid = tab_1.saved_tab_guid();

components/saved_tab_groups/saved_tab_group_tab.cc

diff --git a/components/saved_tab_groups/saved_tab_group_tab.cc b/components/saved_tab_groups/saved_tab_group_tab.cc
index f48d5bc..94b0e0f5 100644
--- a/components/saved_tab_groups/saved_tab_group_tab.cc
+++ b/components/saved_tab_groups/saved_tab_group_tab.cc
@@ -14,6 +14,7 @@
     SavedTabGroup* group,
     absl::optional<base::GUID> saved_tab_guid,
     absl::optional<base::Token> local_tab_id,
+    absl::optional<int> position,
     absl::optional<base::Time> creation_time_windows_epoch_micros,
     absl::optional<base::Time> update_time_windows_epoch_micros,
     absl::optional<gfx::Image> favicon)
@@ -22,6 +23,7 @@
                           : base::GUID::GenerateRandomV4()),
       saved_group_guid_(group_guid),
       local_tab_id_(local_tab_id),
+      position_(position.value_or(kUnsetPosition)),
       saved_tab_group_(group),
       url_(url),
       title_(title),
@@ -66,6 +68,7 @@
       base::GUID::ParseLowercase(specific.tab().group_guid());
   const GURL& url = GURL(specific.tab().url());
   const std::u16string title = base::UTF8ToUTF16(specific.tab().title());
+  int position = specific.tab().position();
 
   base::GUID guid = base::GUID::ParseLowercase(specific.guid());
   base::Time creation_time = base::Time::FromDeltaSinceWindowsEpoch(
@@ -74,7 +77,7 @@
       base::Microseconds(specific.update_time_windows_epoch_micros()));
 
   return SavedTabGroupTab(url, title, group_guid, nullptr, guid, absl::nullopt,
-                          creation_time, update_time);
+                          position, creation_time, update_time);
 }
 
 std::unique_ptr<sync_pb::SavedTabGroupSpecifics> SavedTabGroupTab::ToSpecifics()
@@ -95,6 +98,7 @@
   pb_tab->set_url(url().spec());
   pb_tab->set_group_guid(saved_group_guid().AsLowercaseString());
   pb_tab->set_title(base::UTF16ToUTF8(title()));
+  pb_tab->set_position(position());
 
   return pb_specific;
 }

components/saved_tab_groups/saved_tab_group_tab.h

diff --git a/components/saved_tab_groups/saved_tab_group_tab.h b/components/saved_tab_groups/saved_tab_group_tab.h
index 2ec9c53b..4b8461a 100644
--- a/components/saved_tab_groups/saved_tab_group_tab.h
+++ b/components/saved_tab_groups/saved_tab_group_tab.h
@@ -23,12 +23,16 @@
 // A SavedTabGroupTab stores the url, title, and favicon of a tab.
 class SavedTabGroupTab {
  public:
+  // Used to denote groups that have not been given a position.
+  static constexpr int kUnsetPosition = -1;
+
   SavedTabGroupTab(const GURL& url,
                    const std::u16string& title,
                    const base::GUID& group_guid,
                    SavedTabGroup* group = nullptr,
                    absl::optional<base::GUID> saved_tab_guid = absl::nullopt,
                    absl::optional<base::Token> local_tab_id = absl::nullopt,
+                   absl::optional<int> position = absl::nullopt,
                    absl::optional<base::Time>
                        creation_time_windows_epoch_micros = absl::nullopt,
                    absl::optional<base::Time> update_time_windows_epoch_micros =
@@ -43,6 +47,7 @@
   const absl::optional<base::Token> local_tab_id() const {
     return local_tab_id_;
   }
+  int position() const { return position_; }
   SavedTabGroup* saved_tab_group() const { return saved_tab_group_; }
   const GURL& url() const { return url_; }
   const std::u16string& title() const { return title_; }
@@ -80,6 +85,11 @@
     SetUpdateTimeWindowsEpochMicros(base::Time::Now());
     return *this;
   }
+  SavedTabGroupTab& SetPosition(int position) {
+    position_ = position;
+    SetUpdateTimeWindowsEpochMicros(base::Time::Now());
+    return *this;
+  }
   SavedTabGroupTab& SetUpdateTimeWindowsEpochMicros(
       base::Time update_time_windows_epoch_micros) {
     update_time_windows_epoch_micros_ = update_time_windows_epoch_micros;
@@ -114,6 +124,11 @@
   // The ID used to represent the tab in reference to the web_contents locally.
   absl::optional<base::Token> local_tab_id_;
 
+  // The current position of the tab in relation to all other tabs in the group.
+  // A value of kUnsetPosition means that the group was not assigned a position
+  // and will be assigned one when it is added into its saved group.
+  int position_;
+
   // The Group which owns this tab, this can be null if sync hasn't sent the
   // group over yet.
   raw_ptr<SavedTabGroup> saved_tab_group_;

components/saved_tab_groups/saved_tab_group_unittest.cc

diff --git a/components/saved_tab_groups/saved_tab_group_unittest.cc b/components/saved_tab_groups/saved_tab_group_unittest.cc
index 29d6d77..ce7d024 100644
--- a/components/saved_tab_groups/saved_tab_group_unittest.cc
+++ b/components/saved_tab_groups/saved_tab_group_unittest.cc
@@ -29,18 +29,21 @@
                        tab_groups::TabGroupColorId::kGrey, {});
 }
 
+SavedTabGroupTab CreateDefaultSavedTabGroupTab(const base::GUID& group_guid) {
+  return SavedTabGroupTab(GURL("www.google.com"), u"Default Title", group_guid);
+}
+
 void AddTabToEndOfGroup(
     SavedTabGroup& group,
     absl::optional<base::GUID> saved_guid = absl::nullopt,
     absl::optional<base::Token> local_tab_id = absl::nullopt) {
-  group.AddTab(group.saved_tabs().size(),
-               SavedTabGroupTab(
-                   GURL(url::kAboutBlankURL), std::u16string(u"default_title"),
-                   group.saved_guid(), &group, saved_guid, local_tab_id));
+  group.AddTab(SavedTabGroupTab(
+      GURL(url::kAboutBlankURL), std::u16string(u"default_title"),
+      group.saved_guid(), &group, saved_guid, local_tab_id));
 }
 }  // namespace
 
-TEST(SavedTabGroup, GetTabByGUID) {
+TEST(SavedTabGroupTest, GetTabByGUID) {
   base::GUID tab_1_saved_guid = MakeUniqueGUID();
   base::GUID tab_2_saved_guid = MakeUniqueGUID();
 
@@ -57,7 +60,7 @@
   EXPECT_EQ(&group.saved_tabs()[1], tab_2);
 }
 
-TEST(SavedTabGroup, GetTabByToken) {
+TEST(SavedTabGroupTest, GetTabByToken) {
   base::Token tab_1_local_id = MakeUniqueToken();
   base::Token tab_2_local_id = MakeUniqueToken();
 
@@ -73,3 +76,138 @@
   SavedTabGroupTab* tab_2 = group.GetTab(tab_2_local_id);
   EXPECT_EQ(&group.saved_tabs()[1], tab_2);
 }
+
+TEST(SavedTabGroupTest, AddTabLocallyDisrespectsPositions) {
+  // Create a group and 2 tabs
+  SavedTabGroup group = CreateDefaultEmptySavedTabGroup();
+  SavedTabGroupTab tab_1 = CreateDefaultSavedTabGroupTab(group.saved_guid());
+  SavedTabGroupTab tab_2 = CreateDefaultSavedTabGroupTab(group.saved_guid());
+
+  base::GUID tab_1_saved_guid = tab_1.saved_tab_guid();
+  base::GUID tab_2_saved_guid = tab_2.saved_tab_guid();
+
+  // Set the positions on the tabs and expect the group to ignore them.
+  tab_1.SetPosition(1);
+  tab_2.SetPosition(0);
+
+  // Add both tabs to the group.
+  group.AddTab(std::move(tab_1), /*update_tab_positions=*/true);
+  group.AddTab(std::move(tab_2), /*update_tab_positions=*/true);
+  ASSERT_EQ(2u, group.saved_tabs().size());
+
+  // Locally added groups will be added into their preferred positions if
+  // possible. If not, they will be added as close to the preferred position as
+  // possible, and have their position updated to reflect this.
+  SavedTabGroupTab* first_tab = group.GetTab(tab_1_saved_guid);
+  EXPECT_EQ(&group.saved_tabs()[0], first_tab);
+  EXPECT_EQ(first_tab->position(), 0);
+
+  // Expect tab_2 to be at the front of the group.
+  SavedTabGroupTab* second_tab = group.GetTab(tab_2_saved_guid);
+  EXPECT_EQ(&group.saved_tabs()[1], second_tab);
+  EXPECT_EQ(second_tab->position(), 1);
+}
+
+TEST(SavedTabGroupTest, RemoveTabLocallyReordersPositions) {
+  // Create a group and 2 tabs
+  SavedTabGroup group = CreateDefaultEmptySavedTabGroup();
+  SavedTabGroupTab tab_1 = CreateDefaultSavedTabGroupTab(group.saved_guid());
+  SavedTabGroupTab tab_2 = CreateDefaultSavedTabGroupTab(group.saved_guid());
+
+  base::GUID tab_1_saved_guid = tab_1.saved_tab_guid();
+  base::GUID tab_2_saved_guid = tab_2.saved_tab_guid();
+
+  // Add both tabs to the group.
+  group.AddTab(std::move(tab_1));
+  group.AddTab(std::move(tab_2));
+  ASSERT_EQ(2u, group.saved_tabs().size());
+
+  // Verify tab_2 has a position of 1.
+  {
+    SavedTabGroupTab* second_tab = group.GetTab(tab_2_saved_guid);
+    EXPECT_EQ(&group.saved_tabs()[1], second_tab);
+    EXPECT_EQ(second_tab->position(), 1);
+  }
+
+  // Remove tab_1 from the group.
+  group.RemoveTab(tab_1_saved_guid, /*update_tab_positions=*/true);
+
+  // Verify only tab_2 is in the group.
+  EXPECT_EQ(group.saved_tabs().size(), 1u);
+  EXPECT_FALSE(group.ContainsTab(tab_1_saved_guid));
+  EXPECT_TRUE(group.ContainsTab(tab_2_saved_guid));
+
+  // Verify tab_2 has a position of 0 now.
+  {
+    // Expect tab two to be at the front of the group.
+    SavedTabGroupTab* second_tab = group.GetTab(tab_2_saved_guid);
+    EXPECT_EQ(&group.saved_tabs()[0], second_tab);
+    EXPECT_EQ(second_tab->position(), 0);
+  }
+}
+
+TEST(SavedTabGroupTest, AddTabFromSyncRespectsPositions) {
+  // Create a group and 2 tabs
+  SavedTabGroup group = CreateDefaultEmptySavedTabGroup();
+  SavedTabGroupTab tab_1 = CreateDefaultSavedTabGroupTab(group.saved_guid());
+  SavedTabGroupTab tab_2 = CreateDefaultSavedTabGroupTab(group.saved_guid());
+
+  base::GUID tab_1_saved_guid = tab_1.saved_tab_guid();
+  base::GUID tab_2_saved_guid = tab_2.saved_tab_guid();
+
+  // Set the positions on the tabs and expect the group to respect them.
+  tab_1.SetPosition(1);
+  tab_2.SetPosition(0);
+
+  group.AddTab(std::move(tab_1), /*update_tab_positions=*/false);
+  group.AddTab(std::move(tab_2), /*update_tab_positions=*/false);
+  ASSERT_EQ(2u, group.saved_tabs().size());
+
+  // Expect tab one to be at the end of the group.
+  SavedTabGroupTab* first_tab = group.GetTab(tab_1_saved_guid);
+  EXPECT_EQ(&group.saved_tabs()[1], first_tab);
+  EXPECT_EQ(first_tab->position(), 1);
+
+  // Expect tab two to be at the front of the group.
+  SavedTabGroupTab* second_tab = group.GetTab(tab_2_saved_guid);
+  EXPECT_EQ(&group.saved_tabs()[0], second_tab);
+  EXPECT_EQ(second_tab->position(), 0);
+}
+
+TEST(SavedTabGroupTest, RemoveTabFromSyncMaintainsPositions) {
+  // Create a group and 2 tabs
+  SavedTabGroup group = CreateDefaultEmptySavedTabGroup();
+  SavedTabGroupTab tab_1 = CreateDefaultSavedTabGroupTab(group.saved_guid());
+  SavedTabGroupTab tab_2 = CreateDefaultSavedTabGroupTab(group.saved_guid());
+
+  base::GUID tab_1_saved_guid = tab_1.saved_tab_guid();
+  base::GUID tab_2_saved_guid = tab_2.saved_tab_guid();
+
+  // Add both tabs to the group.
+  group.AddTab(std::move(tab_1));
+  group.AddTab(std::move(tab_2));
+  ASSERT_EQ(2u, group.saved_tabs().size());
+
+  // Verify tab_2 has a position of 1.
+  {
+    SavedTabGroupTab* second_tab = group.GetTab(tab_2_saved_guid);
+    EXPECT_EQ(&group.saved_tabs()[1], second_tab);
+    EXPECT_EQ(second_tab->position(), 1);
+  }
+
+  // Remove tab_1 from the group.
+  group.RemoveTab(tab_1_saved_guid, /*update_tab_positions=*/false);
+
+  // Verify only tab_2 is in the group.
+  EXPECT_EQ(group.saved_tabs().size(), 1u);
+  EXPECT_FALSE(group.ContainsTab(tab_1_saved_guid));
+  EXPECT_TRUE(group.ContainsTab(tab_2_saved_guid));
+
+  // Verify tab_2 keeps its position of 1.
+  {
+    // Expect tab two to be at the front of the group.
+    SavedTabGroupTab* second_tab = group.GetTab(tab_2_saved_guid);
+    EXPECT_EQ(&group.saved_tabs()[0], second_tab);
+    EXPECT_EQ(second_tab->position(), 1);
+  }
+}

components/supervised_user/core/browser/resources/supervised_user_block_interstitial_v2.css

diff --git a/components/supervised_user/core/browser/resources/supervised_user_block_interstitial_v2.css b/components/supervised_user/core/browser/resources/supervised_user_block_interstitial_v2.css
index 6588105..4160427 100644
--- a/components/supervised_user/core/browser/resources/supervised_user_block_interstitial_v2.css
+++ b/components/supervised_user/core/browser/resources/supervised_user_block_interstitial_v2.css
@@ -234,7 +234,7 @@
 }
 
 .primary-button {
-  margin-left: 8px;
+  margin-inline-start: 8px;
 }
 
 /* Remove focus-visible outline styles, because forced focus is used for

components/variations/service/variations_field_trial_creator.cc

diff --git a/components/variations/service/variations_field_trial_creator.cc b/components/variations/service/variations_field_trial_creator.cc
index 63b4f52..7cc810b 100644
--- a/components/variations/service/variations_field_trial_creator.cc
+++ b/components/variations/service/variations_field_trial_creator.cc
@@ -230,7 +230,7 @@
     metrics::MetricsStateManager* metrics_state_manager,
     PlatformFieldTrials* platform_field_trials,
     SafeSeedManager* safe_seed_manager,
-    absl::optional<int> low_entropy_source_value) {
+    bool add_entropy_source_to_variations_ids) {
   DCHECK(feature_list);
   DCHECK(metrics_state_manager);
   DCHECK(platform_field_trials);
@@ -244,9 +244,9 @@
   VariationsIdsProvider* http_header_provider =
       VariationsIdsProvider::GetInstance();
 
-  if (low_entropy_source_value.has_value()) {
+  if (add_entropy_source_to_variations_ids) {
     http_header_provider->SetLowEntropySourceValue(
-        low_entropy_source_value.value());
+        metrics_state_manager->GetLowEntropySource());
   }
   // Force the variation ids selected in chrome://flags and/or specified using
   // the command-line flag.

components/variations/service/variations_field_trial_creator.h

diff --git a/components/variations/service/variations_field_trial_creator.h b/components/variations/service/variations_field_trial_creator.h
index f8a6abe..09290c5 100644
--- a/components/variations/service/variations_field_trial_creator.h
+++ b/components/variations/service/variations_field_trial_creator.h
@@ -125,10 +125,9 @@
   // |safe_seed_manager| should be notified of the combined server and client
   // state that was activated to create the field trials (only when the return
   // value is true). Must not be null.
-  // |low_entropy_source_value| contains the low entropy source value that was
-  // used for client-side randomization of variations, and indicates a
-  // variations ID for it should be added to FIRST_PARTY variation headers.
-  // TODO(b/183955043): eliminate this argument if we can always add the ID.
+  // |add_entropy_source_to_variations_ids| controls if variations ID for the
+  // low entropy source should be added to FIRST_PARTY variation headers.
+  // TODO(b/263797385): eliminate this argument if we can always add the ID.
   //
   // NOTE: The ordering of the FeatureList method calls is such that the
   // explicit --disable-features and --enable-features from the command line
@@ -143,7 +142,7 @@
       metrics::MetricsStateManager* metrics_state_manager,
       PlatformFieldTrials* platform_field_trials,
       SafeSeedManager* safe_seed_manager,
-      absl::optional<int> low_entropy_source_value);
+      bool add_entropy_source_to_variations_ids);
 
   // Returns all of the client state used for filtering studies.
   // As a side-effect, may update the stored permanent consistency country.

components/variations/service/variations_field_trial_creator_unittest.cc

diff --git a/components/variations/service/variations_field_trial_creator_unittest.cc b/components/variations/service/variations_field_trial_creator_unittest.cc
index 12ae1cd..f1ab0af 100644
--- a/components/variations/service/variations_field_trial_creator_unittest.cc
+++ b/components/variations/service/variations_field_trial_creator_unittest.cc
@@ -293,7 +293,7 @@
         std::vector<base::FeatureList::FeatureOverrideInfo>(),
         std::make_unique<base::FeatureList>(), metrics_state_manager_.get(),
         &platform_field_trials, safe_seed_manager_,
-        metrics_state_manager_->GetLowEntropySource());
+        /*add_entropy_source_to_variations_ids=*/true);
   }
 
   TestVariationsSeedStore* seed_store() { return &seed_store_; }
@@ -833,7 +833,7 @@
       std::vector<base::FeatureList::FeatureOverrideInfo>(),
       std::make_unique<base::FeatureList>(), metrics_state_manager.get(),
       &platform_field_trials, &safe_seed_manager,
-      metrics_state_manager->GetLowEntropySource()));
+      /*add_entropy_source_to_variations_ids=*/true));
 
   EXPECT_TRUE(base::FieldTrialList::TrialExists(kTestSeedData.study_names[0]));
   EXPECT_EQ(
@@ -883,7 +883,7 @@
       std::vector<base::FeatureList::FeatureOverrideInfo>(),
       std::make_unique<base::FeatureList>(), metrics_state_manager.get(),
       &platform_field_trials, &safe_seed_manager,
-      metrics_state_manager->GetLowEntropySource()));
+      /*add_entropy_source_to_variations_ids=*/true));
 
   EXPECT_EQ(kTestSeedExperimentName,
             base::FieldTrialList::FindFullName(kTestSeedStudyName));

components/variations/service/variations_service.cc

diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
index 2644b3e..d3418be1 100644
--- a/components/variations/service/variations_service.cc
+++ b/components/variations/service/variations_service.cc
@@ -945,7 +945,7 @@
   return field_trial_creator_.SetUpFieldTrials(
       variation_ids, command_line_variation_ids, extra_overrides,
       std::move(feature_list), state_manager_, platform_field_trials,
-      &safe_seed_manager_, state_manager_->GetLowEntropySource());
+      &safe_seed_manager_, /*add_entropy_source_to_variations_ids=*/true);
 }
 
 void VariationsService::OverrideCachedUIStrings() {

components/viz/service/frame_sinks/frame_sink_manager_impl.cc

diff --git a/components/viz/service/frame_sinks/frame_sink_manager_impl.cc b/components/viz/service/frame_sinks/frame_sink_manager_impl.cc
index b55780a..5c379e24 100644
--- a/components/viz/service/frame_sinks/frame_sink_manager_impl.cc
+++ b/components/viz/service/frame_sinks/frame_sink_manager_impl.cc
@@ -841,7 +841,14 @@
 
 void FrameSinkManagerImpl::StopFrameCountingForTest(
     StopFrameCountingForTestCallback callback) {
-  DCHECK(frame_counter_.has_value());
+  // Returns empty data if `frame_counter_` has no value. This could happen
+  // when gpu-process is restarted in middle of test and test scripts still
+  // calls this at the end.
+  if (!frame_counter_.has_value()) {
+    std::move(callback).Run(nullptr);
+    return;
+  }
+
   std::move(callback).Run(frame_counter_->TakeData());
   frame_counter_.reset();
 }

components/webapps/browser/android/webapk/webapk_icon_hasher.cc

diff --git a/components/webapps/browser/android/webapk/webapk_icon_hasher.cc b/components/webapps/browser/android/webapk/webapk_icon_hasher.cc
index 63105b8..9259ee3 100644
--- a/components/webapps/browser/android/webapk/webapk_icon_hasher.cc
+++ b/components/webapps/browser/android/webapk/webapk_icon_hasher.cc
@@ -167,10 +167,11 @@
     return;
   }
 
-  // If it's an SVG file, decode the image using Blink's image decoder.
+  // If it's an SVG or WEBP file, decode the image using Blink's image decoder.
   auto simple_url_loader = std::move(simple_url_loader_);
   if (simple_url_loader->ResponseInfo() &&
-      simple_url_loader->ResponseInfo()->mime_type == "image/svg+xml") {
+      (simple_url_loader->ResponseInfo()->mime_type == "image/svg+xml" ||
+       simple_url_loader->ResponseInfo()->mime_type == "image/webp")) {
     if (!web_contents) {
       RunCallback({});
       return;

components/webapps/browser/banners/app_banner_manager.cc

diff --git a/components/webapps/browser/banners/app_banner_manager.cc b/components/webapps/browser/banners/app_banner_manager.cc
index 0e8c3ae..f653add 100644
--- a/components/webapps/browser/banners/app_banner_manager.cc
+++ b/components/webapps/browser/banners/app_banner_manager.cc
@@ -254,21 +254,22 @@
 
 AppBannerManager::~AppBannerManager() = default;
 
-bool AppBannerManager::ShouldIgnore(content::RenderFrameHost* render_frame_host,
-                                    const GURL& url) {
+AppBannerManager::UrlType AppBannerManager::GetUrlType(
+    content::RenderFrameHost* render_frame_host,
+    const GURL& url) {
   // Don't start the banner flow unless the primary main frame has finished
   // loading. |render_frame_host| can be null during retry attempts.
   if (render_frame_host && !render_frame_host->IsInPrimaryMainFrame())
-    return true;
+    return UrlType::kNotPrimaryFrame;
 
   // There is never a need to trigger a banner for a WebUI page, except
   // for PasswordManager WebUI.
   if (content::HasWebUIScheme(url) &&
       (url.host() != password_manager::kChromeUIPasswordManagerHost)) {
-    return true;
+    return UrlType::kInvalidPrimaryFrameUrl;
   }
 
-  return false;
+  return UrlType::kValidForBanner;
 }
 
 bool AppBannerManager::CheckIfShouldShowBanner() {
@@ -741,8 +742,10 @@
 void AppBannerManager::DidFinishLoad(
     content::RenderFrameHost* render_frame_host,
     const GURL& validated_url) {
-  if (ShouldIgnore(render_frame_host, validated_url))
+  UrlType url_type = GetUrlType(render_frame_host, validated_url);
+  if (url_type != UrlType::kValidForBanner) {
     return;
+  }
 
   load_finished_ = true;
   validated_url_ = validated_url;

components/webapps/browser/banners/app_banner_manager.h

diff --git a/components/webapps/browser/banners/app_banner_manager.h b/components/webapps/browser/banners/app_banner_manager.h
index fb7ad3bb7..7d285e2a 100644
--- a/components/webapps/browser/banners/app_banner_manager.h
+++ b/components/webapps/browser/banners/app_banner_manager.h
@@ -218,10 +218,19 @@
   explicit AppBannerManager(content::WebContents* web_contents);
   ~AppBannerManager() override;
 
-  // Returns true if |render_frame_host| and |url| should be ignored and not
-  // trigger the banner flow.
-  bool ShouldIgnore(content::RenderFrameHost* render_frame_host,
-                    const GURL& url);
+  enum class UrlType {
+    // This url & page should be considered for installability & promotability.
+    kValidForBanner,
+    // The load from the render frame host was not for the current/primary page
+    // so it can be ignored.
+    kNotPrimaryFrame,
+    // The primary url that was loaded can never be elibible for installability.
+    kInvalidPrimaryFrameUrl,
+  };
+  // Returns the URL type, allowing the banner logic to ignore urls that aren't
+  // the primary frame or aren't a valid URL.
+  UrlType GetUrlType(content::RenderFrameHost* render_frame_host,
+                     const GURL& url);
 
   // Returns true if the banner should be shown. Returns false if the banner has
   // been shown too recently, or if the app has already been installed.

components/webapps/browser/installable/installable_manager.cc

diff --git a/components/webapps/browser/installable/installable_manager.cc b/components/webapps/browser/installable/installable_manager.cc
index abdb54ff..d1073ad9 100644
--- a/components/webapps/browser/installable/installable_manager.cc
+++ b/components/webapps/browser/installable/installable_manager.cc
@@ -130,10 +130,7 @@
 constexpr ImageTypeDetails kSupportedImageTypes[] = {
     {".png", "image/png"},
     {".svg", "image/svg+xml"},
-// TODO(https://crbug.com/466958): Add WebP support for Android.
-#if !BUILDFLAG(IS_ANDROID)
     {".webp", "image/webp"},
-#endif
 };
 
 bool IsIconTypeSupported(const blink::Manifest::ImageResource& icon) {

components/webapps/browser/installable/installable_manager_unittest.cc

diff --git a/components/webapps/browser/installable/installable_manager_unittest.cc b/components/webapps/browser/installable/installable_manager_unittest.cc
index fcbced5..ec0fa0e 100644
--- a/components/webapps/browser/installable/installable_manager_unittest.cc
+++ b/components/webapps/browser/installable/installable_manager_unittest.cc
@@ -168,27 +168,15 @@
 
   manifest->icons[0].type = u"image/webp";
   manifest->icons[0].src = GURL("http://example.com/");
-// TODO(https://crbug.com/466958): Add WebP support for Android.
-#if BUILDFLAG(IS_ANDROID)
-  EXPECT_FALSE(IsManifestValid(*manifest));
-  EXPECT_EQ(MANIFEST_MISSING_SUITABLE_ICON, GetErrorCode());
-#else
   EXPECT_TRUE(IsManifestValid(*manifest));
   EXPECT_EQ(NO_ERROR_DETECTED, GetErrorCode());
-#endif
 
   // If the type is null, the icon src is checked instead.
   // Case is ignored.
   manifest->icons[0].type.clear();
   manifest->icons[0].src = GURL("http://example.com/icon.wEBp");
-// TODO(https://crbug.com/466958): Add WebP support for Android.
-#if BUILDFLAG(IS_ANDROID)
-  EXPECT_FALSE(IsManifestValid(*manifest));
-  EXPECT_EQ(MANIFEST_MISSING_SUITABLE_ICON, GetErrorCode());
-#else
   EXPECT_TRUE(IsManifestValid(*manifest));
   EXPECT_EQ(NO_ERROR_DETECTED, GetErrorCode());
-#endif
 }
 
 TEST_F(InstallableManagerUnitTest, ManifestRequiresPurposeAny) {

content/browser/android/content_feature_list.cc

diff --git a/content/browser/android/content_feature_list.cc b/content/browser/android/content_feature_list.cc
index be6e353..4881dc0c 100644
--- a/content/browser/android/content_feature_list.cc
+++ b/content/browser/android/content_feature_list.cc
@@ -36,7 +36,6 @@
     &features::kRequestDesktopSiteAdditions,
     &features::kRequestDesktopSiteExceptions,
     &features::kTouchDragAndContextMenu,
-    &features::kWebAuthConditionalUI,
     &features::kWebAuthnTouchToFillCredentialSelection,
     &features::kWebBluetoothNewPermissionsBackend,
     &features::kWebNfc,

content/browser/android/synchronous_compositor_host.cc

diff --git a/content/browser/android/synchronous_compositor_host.cc b/content/browser/android/synchronous_compositor_host.cc
index de23408..97b6cd8 100644
--- a/content/browser/android/synchronous_compositor_host.cc
+++ b/content/browser/android/synchronous_compositor_host.cc
@@ -719,9 +719,7 @@
 }
 
 void SynchronousCompositorHost::SendBeginFrame(viz::BeginFrameArgs args) {
-  static bool enable_thorttling = base::FeatureList::IsEnabled(
-      ::features::kWebViewThrottleBackgroundBeginFrame);
-  if (enable_thorttling && num_invalidates_since_last_draw_ > 5u) {
+  if (num_invalidates_since_last_draw_ > 5u) {
     // Throttle begin frames if there has been no draws in response to
     // invalidates. This can happen if webview is detached or offscreen. There
     // are cases where renderer is still expected to make progress. In this

content/browser/attribution_reporting/BUILD.gn

diff --git a/content/browser/attribution_reporting/BUILD.gn b/content/browser/attribution_reporting/BUILD.gn
index 9c3ae08..1fab8be 100644
--- a/content/browser/attribution_reporting/BUILD.gn
+++ b/content/browser/attribution_reporting/BUILD.gn
@@ -19,6 +19,7 @@
   public_deps = [
     ":mojo_bindings",
     "//components/attribution_reporting:mojom",
+    "//services/network/public/mojom:mojom_schemeful_site",
     "//url/mojom:url_mojom_origin",
   ]
   webui_module_path = "/"

content/browser/attribution_reporting/attribution_data_host_manager_impl.cc

diff --git a/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc b/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
index e3f8ed1..7f4bc0df 100644
--- a/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
+++ b/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
@@ -563,8 +563,6 @@
     std::string header_value,
     AttributionNavigationType nav_type,
     data_decoder::DataDecoder::ValueOrError result) {
-  // TODO(johnidel): Add metrics regarding parsing failures / misconfigured
-  // headers.
   auto it = redirect_registrations_.find(attribution_src_token);
 
   // The registration may no longer be tracked in the event the navigation
@@ -599,6 +597,7 @@
     attribution_manager_->NotifyFailedSourceRegistration(
         header_value, registrations.source_origin, reporting_origin,
         source.error());
+    attribution_reporting::RecordSourceRegistrationError(source.error());
   }
 
   if (registrations.pending_source_data == 0u &&

content/browser/attribution_reporting/attribution_data_host_manager_impl_unittest.cc

diff --git a/content/browser/attribution_reporting/attribution_data_host_manager_impl_unittest.cc b/content/browser/attribution_reporting/attribution_data_host_manager_impl_unittest.cc
index fd3ea7b..670adaaf 100644
--- a/content/browser/attribution_reporting/attribution_data_host_manager_impl_unittest.cc
+++ b/content/browser/attribution_reporting/attribution_data_host_manager_impl_unittest.cc
@@ -777,6 +777,8 @@
 
 TEST_F(AttributionDataHostManagerImplTest,
        NavigationRedirectSource_ParsingFailsBeforeAndSucceedsAfterNav) {
+  base::HistogramTester histograms;
+
   EXPECT_CALL(mock_manager_, HandleSource).Times(1);
 
   auto reporter = *SuitableOrigin::Deserialize("https://report.test");
@@ -802,6 +804,9 @@
 
   // Wait for parsing to finish.
   task_environment_.FastForwardBy(base::TimeDelta());
+
+  histograms.ExpectUniqueSample("Conversions.SourceRegistrationError",
+                                SourceRegistrationError::kInvalidJson, 1);
 }
 
 TEST_F(AttributionDataHostManagerImplTest,

content/browser/attribution_reporting/attribution_internals.mojom

diff --git a/content/browser/attribution_reporting/attribution_internals.mojom b/content/browser/attribution_reporting/attribution_internals.mojom
index 40aec2e..616d1ce8 100644
--- a/content/browser/attribution_reporting/attribution_internals.mojom
+++ b/content/browser/attribution_reporting/attribution_internals.mojom
@@ -6,6 +6,7 @@
 
 import "components/attribution_reporting/source_registration_error.mojom";
 import "content/browser/attribution_reporting/attribution_reporting.mojom";
+import "services/network/public/mojom/schemeful_site.mojom";
 import "url/mojom/origin.mojom";
 import "url/mojom/url.mojom";
 
@@ -98,8 +99,7 @@
 struct WebUISource {
   uint64 source_event_id;
   url.mojom.Origin source_origin;
-  // Replace SchemefulSite with string if this struct is ever reused elsewhere.
-  string attribution_destination;
+  array<network.mojom.SchemefulSite> destinations;
   url.mojom.Origin reporting_origin;
   double source_time;
   double expiry_time;

content/browser/attribution_reporting/attribution_internals_browsertest.cc

diff --git a/content/browser/attribution_reporting/attribution_internals_browsertest.cc b/content/browser/attribution_reporting/attribution_internals_browsertest.cc
index 2f7d6d7..d90b379 100644
--- a/content/browser/attribution_reporting/attribution_internals_browsertest.cc
+++ b/content/browser/attribution_reporting/attribution_internals_browsertest.cc
@@ -266,6 +266,11 @@
               .SetSourceEventId(std::numeric_limits<uint64_t>::max())
               .SetAttributionLogic(StoredSource::AttributionLogic::kNever)
               .SetDebugKey(19)
+              .SetDestinationOrigins({
+                  *SuitableOrigin::Create(GURL("https://x.a.test")),
+                  *SuitableOrigin::Create(GURL("https://y.a.test")),
+                  *SuitableOrigin::Create(GURL("https://z.b.test")),
+              })
               .BuildStored(),
           SourceBuilder(now + base::Hours(1))
               .SetSourceType(AttributionSourceType::kEvent)
@@ -308,6 +313,10 @@
         .shadowRoot.querySelector('tbody');
     const obs = new MutationObserver((_, obs) => {
       if (table.children.length === 7 &&
+          table.children[0].children[3]?.children[0]?.children.length === 2 &&
+          table.children[0].children[3]?.children[0]?.children[0]?.innerText === 'https://a.test' &&
+          table.children[0].children[3]?.children[0]?.children[1]?.innerText === 'https://b.test' &&
+          table.children[1].children[3]?.innerText === 'https://conversion.test' &&
           table.children[0].children[0]?.innerText === $1 &&
           table.children[0].children[9]?.innerText === 'Navigation' &&
           table.children[1].children[9]?.innerText === 'Event' &&

content/browser/attribution_reporting/attribution_internals_handler_impl.cc

diff --git a/content/browser/attribution_reporting/attribution_internals_handler_impl.cc b/content/browser/attribution_reporting/attribution_internals_handler_impl.cc
index dd09163..50955ba8 100644
--- a/content/browser/attribution_reporting/attribution_internals_handler_impl.cc
+++ b/content/browser/attribution_reporting/attribution_internals_handler_impl.cc
@@ -15,6 +15,7 @@
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/containers/flat_map.h"
+#include "base/containers/flat_set.h"
 #include "base/functional/overloaded.h"
 #include "base/notreached.h"
 #include "base/ranges/algorithm.h"
@@ -83,7 +84,7 @@
 
   return attribution_internals::mojom::WebUISource::New(
       source.source_event_id(), source.source_origin(),
-      source.DestinationSite().Serialize(), source.reporting_origin(),
+      source.DestinationSites().extract(), source.reporting_origin(),
       source.source_time().ToJsTime(), source.expiry_time().ToJsTime(),
       source.event_report_window_time().ToJsTime(),
       source.aggregatable_report_window_time().ToJsTime(), source.source_type(),

content/browser/attribution_reporting/attribution_manager_impl.cc

diff --git a/content/browser/attribution_reporting/attribution_manager_impl.cc b/content/browser/attribution_reporting/attribution_manager_impl.cc
index ddc323c2..c8786dc 100644
--- a/content/browser/attribution_reporting/attribution_manager_impl.cc
+++ b/content/browser/attribution_reporting/attribution_manager_impl.cc
@@ -896,7 +896,7 @@
 }
 
 void AttributionManagerImpl::OnReportSent(base::OnceClosure done,
-                                          AttributionReport report,
+                                          const AttributionReport& report,
                                           SendResult info) {
   // If there was a transient failure, and another attempt is allowed,
   // update the report's DB state to reflect that. Otherwise, delete the report
@@ -947,18 +947,18 @@
   if (info.status == SendResult::Status::kSent)
     LogMetricsOnReportSent(report);
 
-  NotifyReportSent(/*is_debug_report=*/false, std::move(report), info);
+  NotifyReportSent(/*is_debug_report=*/false, report, info);
 }
 
 void AttributionManagerImpl::NotifyReportSent(bool is_debug_report,
-                                              AttributionReport report,
+                                              const AttributionReport& report,
                                               SendResult info) {
   for (auto& observer : observers_)
     observer.OnReportSent(report, /*is_debug_report=*/is_debug_report, info);
 }
 
 void AttributionManagerImpl::NotifyDebugReportSent(
-    const AttributionDebugReport report,
+    const AttributionDebugReport& report,
     const int status) {
   // Use the same time for all observers.
   const base::Time time = base::Time::Now();

content/browser/attribution_reporting/attribution_manager_impl.h

diff --git a/content/browser/attribution_reporting/attribution_manager_impl.h b/content/browser/attribution_reporting/attribution_manager_impl.h
index b765a89..09eb20d 100644
--- a/content/browser/attribution_reporting/attribution_manager_impl.h
+++ b/content/browser/attribution_reporting/attribution_manager_impl.h
@@ -208,7 +208,7 @@
                            bool is_debug_report,
                            ReportSentCallback callback);
   void OnReportSent(base::OnceClosure done,
-                    AttributionReport report,
+                    const AttributionReport&,
                     SendResult info);
   void AssembleAggregatableReport(AttributionReport report,
                                   bool is_debug_report,
@@ -235,8 +235,10 @@
 
   void NotifySourcesChanged();
   void NotifyReportsChanged(AttributionReport::Type report_type);
-  void NotifyReportSent(bool is_debug_report, AttributionReport, SendResult);
-  void NotifyDebugReportSent(AttributionDebugReport, int status);
+  void NotifyReportSent(bool is_debug_report,
+                        const AttributionReport&,
+                        SendResult);
+  void NotifyDebugReportSent(const AttributionDebugReport&, int status);
 
   bool IsReportAllowed(const AttributionReport&) const;
 

content/browser/attribution_reporting/attribution_report_network_sender.cc

diff --git a/content/browser/attribution_reporting/attribution_report_network_sender.cc b/content/browser/attribution_reporting/attribution_report_network_sender.cc
index 38ab755a..c0d0304e 100644
--- a/content/browser/attribution_reporting/attribution_report_network_sender.cc
+++ b/content/browser/attribution_reporting/attribution_report_network_sender.cc
@@ -145,7 +145,7 @@
 }
 
 void AttributionReportNetworkSender::OnReportSent(
-    AttributionReport report,
+    const AttributionReport& report,
     bool is_debug_report,
     ReportSentCallback sent_callback,
     UrlLoaderList::iterator it,
@@ -229,9 +229,8 @@
                           : SendResult::Status::kFailure);
 
   std::move(sent_callback)
-      .Run(std::move(report),
-           SendResult(report_status, net_error,
-                      headers ? headers->response_code() : 0));
+      .Run(report, SendResult(report_status, net_error,
+                              headers ? headers->response_code() : 0));
 }
 
 void AttributionReportNetworkSender::OnDebugReportSent(

content/browser/attribution_reporting/attribution_report_network_sender.h

diff --git a/content/browser/attribution_reporting/attribution_report_network_sender.h b/content/browser/attribution_reporting/attribution_report_network_sender.h
index 46aa92c3..8e2093e 100644
--- a/content/browser/attribution_reporting/attribution_report_network_sender.h
+++ b/content/browser/attribution_reporting/attribution_report_network_sender.h
@@ -66,7 +66,7 @@
                   UrlLoaderCallback callback);
 
   // Called when headers are available for a sent report.
-  void OnReportSent(AttributionReport report,
+  void OnReportSent(const AttributionReport&,
                     bool is_debug_report,
                     ReportSentCallback sent_callback,
                     UrlLoaderList::iterator it,

content/browser/attribution_reporting/attribution_report_network_sender_unittest.cc

diff --git a/content/browser/attribution_reporting/attribution_report_network_sender_unittest.cc b/content/browser/attribution_reporting/attribution_report_network_sender_unittest.cc
index 629eef06..becc7eee 100644
--- a/content/browser/attribution_reporting/attribution_report_network_sender_unittest.cc
+++ b/content/browser/attribution_reporting/attribution_report_network_sender_unittest.cc
@@ -95,7 +95,8 @@
 
   network::TestURLLoaderFactory test_url_loader_factory_;
 
-  base::MockCallback<base::OnceCallback<void(AttributionReport, SendResult)>>
+  base::MockCallback<
+      base::OnceCallback<void(const AttributionReport&, SendResult)>>
       callback_;
 
   // Unique ptr so it can be reset during testing.

content/browser/attribution_reporting/attribution_report_sender.h

diff --git a/content/browser/attribution_reporting/attribution_report_sender.h b/content/browser/attribution_reporting/attribution_report_sender.h
index d6cf22a8..27d8b3d 100644
--- a/content/browser/attribution_reporting/attribution_report_sender.h
+++ b/content/browser/attribution_reporting/attribution_report_sender.h
@@ -22,12 +22,12 @@
 
   // Callback used to notify caller that the requested report has been sent.
   using ReportSentCallback =
-      base::OnceCallback<void(AttributionReport, SendResult)>;
+      base::OnceCallback<void(const AttributionReport&, SendResult)>;
 
   // If `status` is positive, it is the HTTP response code. Otherwise, it is the
   // network error.
   using DebugReportSentCallback =
-      base::OnceCallback<void(AttributionDebugReport, int status)>;
+      base::OnceCallback<void(const AttributionDebugReport&, int status)>;
 
   // Sends `report` and runs `sent_callback` when done.
   virtual void SendReport(AttributionReport report,

content/browser/attribution_reporting/attribution_storage_sql.cc

diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/content/browser/attribution_reporting/attribution_storage_sql.cc
index 3f24cc6..c1acba9 100644
--- a/content/browser/attribution_reporting/attribution_storage_sql.cc
+++ b/content/browser/attribution_reporting/attribution_storage_sql.cc
@@ -290,7 +290,13 @@
 }
 
 absl::optional<attribution_reporting::FilterData> DeserializeFilterData(
-    const std::string& string) {
+    sql::Statement& stmt,
+    int col) {
+  std::string string;
+  if (!stmt.ColumnBlobAsString(col, &string)) {
+    return absl::nullopt;
+  }
+
   proto::AttributionFilterData msg;
   if (!msg.ParseFromString(string)) {
     return absl::nullopt;
@@ -338,7 +344,12 @@
 }
 
 absl::optional<attribution_reporting::AggregationKeys>
-DeserializeAggregationKeys(const std::string& str) {
+DeserializeAggregationKeys(sql::Statement& stmt, int col) {
+  std::string str;
+  if (!stmt.ColumnBlobAsString(col, &str)) {
+    return absl::nullopt;
+  }
+
   proto::AttributionAggregatableSource msg;
   if (!msg.ParseFromString(str)) {
     return absl::nullopt;
@@ -431,7 +442,7 @@
   int num_conversions = statement.ColumnInt(col++);
   int64_t aggregatable_budget_consumed = statement.ColumnInt64(col++);
   absl::optional<attribution_reporting::AggregationKeys> aggregation_keys =
-      DeserializeAggregationKeys(statement.ColumnString(col++));
+      DeserializeAggregationKeys(statement, col++);
 
   // TODO: Enforce remaining expiry/report_window/time invariants from
   // CommonSource.
@@ -443,7 +454,7 @@
   }
 
   absl::optional<attribution_reporting::FilterData> filter_data =
-      DeserializeFilterData(statement.ColumnString(col++));
+      DeserializeFilterData(statement, col++);
   if (!filter_data) {
     return absl::nullopt;
   }
@@ -1704,7 +1715,7 @@
                                                      base::Time now) {
   sql::Statement statement(db_->GetCachedStatement(id, sql));
   statement.BindTime(0, now + min_delay);
-  statement.BindInt64(1, 1 + (max_delay - min_delay).InMicroseconds());
+  statement.BindTimeDelta(1, max_delay - min_delay + base::Microseconds(1));
   statement.BindTime(2, now);
   return statement.Run();
 }

content/browser/attribution_reporting/common_source_info.cc

diff --git a/content/browser/attribution_reporting/common_source_info.cc b/content/browser/attribution_reporting/common_source_info.cc
index 1dbe130..397f41c6 100644
--- a/content/browser/attribution_reporting/common_source_info.cc
+++ b/content/browser/attribution_reporting/common_source_info.cc
@@ -150,12 +150,16 @@
   return net::SchemefulSite(source_origin_);
 }
 
-base::Value CommonSourceInfo::SerializeDestinationSites() const {
+base::flat_set<net::SchemefulSite> CommonSourceInfo::DestinationSites() const {
   base::flat_set<net::SchemefulSite> sites;
   for (const auto& destination : destination_origins_) {
     sites.insert(net::SchemefulSite(destination));
   }
+  return sites;
+}
 
+base::Value CommonSourceInfo::SerializeDestinationSites() const {
+  base::flat_set<net::SchemefulSite> sites = DestinationSites();
   if (sites.size() == 1) {
     return base::Value(sites.begin()->Serialize());
   }

content/browser/attribution_reporting/common_source_info.h

diff --git a/content/browser/attribution_reporting/common_source_info.h b/content/browser/attribution_reporting/common_source_info.h
index 77925ff..54b979d6 100644
--- a/content/browser/attribution_reporting/common_source_info.h
+++ b/content/browser/attribution_reporting/common_source_info.h
@@ -130,6 +130,8 @@
   // that we avoid unnecessary copies of `destination_origin_`.
   net::SchemefulSite DestinationSite() const;
 
+  base::flat_set<net::SchemefulSite> DestinationSites() const;
+
   // Returns the schemeful site of |source_origin|.
   //
   // TODO(johnidel): Consider storing the SchemefulSite as a separate member so

content/browser/attribution_reporting/privacy_sandbox_ads_apis_browsertest.cc

diff --git a/content/browser/attribution_reporting/privacy_sandbox_ads_apis_browsertest.cc b/content/browser/attribution_reporting/privacy_sandbox_ads_apis_browsertest.cc
index ce5ded34..133f101 100644
--- a/content/browser/attribution_reporting/privacy_sandbox_ads_apis_browsertest.cc
+++ b/content/browser/attribution_reporting/privacy_sandbox_ads_apis_browsertest.cc
@@ -28,6 +28,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/common/features.h"
+#include "third_party/blink/public/mojom/browsing_topics/browsing_topics.mojom.h"
 #include "url/gurl.h"
 
 namespace content {
@@ -39,6 +40,28 @@
   const fenced_frame = document.createElement('fencedframe');
   document.body.appendChild(fenced_frame);
 )";
+
+class FixedTopicsContentBrowserClient : public ContentBrowserClient {
+ public:
+  bool HandleTopicsWebApi(
+      const url::Origin& context_origin,
+      content::RenderFrameHost* main_frame,
+      browsing_topics::ApiCallerSource caller_source,
+      bool get_topics,
+      bool observe,
+      std::vector<blink::mojom::EpochTopicPtr>& topics) override {
+    blink::mojom::EpochTopicPtr result_topic = blink::mojom::EpochTopic::New();
+    result_topic->topic = 1;
+    result_topic->config_version = "chrome.1";
+    result_topic->taxonomy_version = "1";
+    result_topic->model_version = "2";
+    result_topic->version = "chrome.1:1:2";
+
+    topics.push_back(std::move(result_topic));
+
+    return true;
+  }
+};
 }
 
 class PrivacySandboxAdsAPIsBrowserTestBase : public ContentBrowserTest {
@@ -57,12 +80,11 @@
               last_request_is_topics_request_ =
                   params->url_request.browsing_topics;
 
-              last_resource_request_url_ = params->url_request.url;
-              if (resource_request_url_waiter_ &&
-                  resource_request_url_waiter_->running() &&
-                  last_resource_request_url_ ==
-                      expected_last_resource_request_url_) {
-                resource_request_url_waiter_->Quit();
+              last_topics_header_.reset();
+              std::string topics_header;
+              if (params->url_request.headers.GetHeader("Sec-Browsing-Topics",
+                                                        &topics_header)) {
+                last_topics_header_ = topics_header;
               }
 
               URLLoaderInterceptor::WriteResponse(
@@ -72,9 +94,14 @@
 
               return true;
             }));
+
+    original_client_ = SetBrowserClientForTesting(&browser_client_);
   }
 
-  void TearDownOnMainThread() override { url_loader_interceptor_.reset(); }
+  void TearDownOnMainThread() override {
+    SetBrowserClientForTesting(original_client_);
+    url_loader_interceptor_.reset();
+  }
 
   WebContents* web_contents() { return shell()->web_contents(); }
 
@@ -88,23 +115,16 @@
     return last_request_is_topics_request_;
   }
 
-  void WaitForResourceRequestURL(const GURL& url) {
-    DCHECK(!resource_request_url_waiter_);
-
-    if (last_resource_request_url_ == url)
-      return;
-
-    expected_last_resource_request_url_ = url;
-    resource_request_url_waiter_ = std::make_unique<base::RunLoop>();
-    resource_request_url_waiter_->Run();
+  const absl::optional<std::string>& last_topics_header() const {
+    return last_topics_header_;
   }
 
  private:
   bool last_request_is_topics_request_ = false;
+  absl::optional<std::string> last_topics_header_;
 
-  std::unique_ptr<base::RunLoop> resource_request_url_waiter_;
-  GURL expected_last_resource_request_url_;
-  GURL last_resource_request_url_;
+  FixedTopicsContentBrowserClient browser_client_;
+  raw_ptr<ContentBrowserClient> original_client_ = nullptr;
 
   std::unique_ptr<URLLoaderInterceptor> url_loader_interceptor_;
 };
@@ -188,6 +208,10 @@
                  GURL("https://example.test/page_without_ads_apis_ot.html"))));
 
   EXPECT_TRUE(last_request_is_topics_request());
+  EXPECT_TRUE(last_topics_header());
+  EXPECT_EQ(last_topics_header().value(),
+            "1;version=\"chrome.1:1:2\";config_version=\"chrome.1\";model_"
+            "version=\"2\";taxonomy_version=\"1\"");
 }
 
 IN_PROC_BROWSER_TEST_F(PrivacySandboxAdsAPIsAllEnabledBrowserTest,
@@ -203,28 +227,7 @@
                  GURL("https://example.test/page_without_ads_apis_ot.html"))));
 
   EXPECT_FALSE(last_request_is_topics_request());
-}
-
-IN_PROC_BROWSER_TEST_F(
-    PrivacySandboxAdsAPIsAllEnabledBrowserTest,
-    OriginTrialEnabled_TopicsNotAllowedForServiceWorkerFetch) {
-  EXPECT_TRUE(NavigateToURL(
-      shell(), GURL("https://example.test/page_with_ads_apis_ot.html")));
-
-  EXPECT_EQ(
-      "ok",
-      EvalJs(
-          shell()->web_contents(),
-          JsReplace(
-              "setupServiceWorker($1)",
-              GURL(
-                  "https://example.test/"
-                  "fetch_topics.js?fetch_url=page_without_ads_apis_ot.html"))));
-
-  WaitForResourceRequestURL(
-      GURL("https://example.test/page_without_ads_apis_ot.html"));
-
-  EXPECT_FALSE(last_request_is_topics_request());
+  EXPECT_FALSE(last_topics_header());
 }
 
 class PrivacySandboxAdsAPIsTopicsDisabledBrowserTest

content/browser/browsing_topics/browsing_topics_browsertest.cc

diff --git a/content/browser/browsing_topics/browsing_topics_browsertest.cc b/content/browser/browsing_topics/browsing_topics_browsertest.cc
index 44a256a..42c5960 100644
--- a/content/browser/browsing_topics/browsing_topics_browsertest.cc
+++ b/content/browser/browsing_topics/browsing_topics_browsertest.cc
@@ -4,6 +4,7 @@
 
 #include <vector>
 
+#include "base/test/bind.h"
 #include "base/test/scoped_feature_list.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_context.h"
@@ -16,6 +17,7 @@
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
+#include "content/public/test/url_loader_interceptor.h"
 #include "content/shell/browser/shell.h"
 #include "content/test/content_browser_test_utils_internal.h"
 #include "net/dns/mock_host_resolver.h"
@@ -86,14 +88,39 @@
     ASSERT_TRUE(https_server_.Start());
 
     original_client_ = SetBrowserClientForTesting(&browser_client_);
+
+    url_loader_monitor_ =
+        std::make_unique<URLLoaderInterceptor>(base::BindLambdaForTesting(
+            [&](URLLoaderInterceptor::RequestParams* params) -> bool {
+              last_request_is_topics_request_ =
+                  params->url_request.browsing_topics;
+
+              last_topics_header_.reset();
+              std::string topics_header;
+              if (params->url_request.headers.GetHeader("Sec-Browsing-Topics",
+                                                        &topics_header)) {
+                last_topics_header_ = topics_header;
+              }
+
+              return false;
+            }));
   }
 
   void TearDownOnMainThread() override {
     SetBrowserClientForTesting(original_client_);
+    url_loader_monitor_.reset();
   }
 
   WebContents* web_contents() { return shell()->web_contents(); }
 
+  bool last_request_is_topics_request() const {
+    return last_request_is_topics_request_;
+  }
+
+  const absl::optional<std::string>& last_topics_header() const {
+    return last_topics_header_;
+  }
+
   std::string InvokeTopicsAPI(const ToRenderFrameHost& adapter) {
     return EvalJs(adapter, R"(
       if (!(document.browsingTopics instanceof Function)) {
@@ -124,6 +151,13 @@
   FixedTopicsContentBrowserClient browser_client_;
 
   raw_ptr<ContentBrowserClient> original_client_ = nullptr;
+
+  bool last_request_is_topics_request_ = false;
+
+  std::unique_ptr<base::RunLoop> resource_request_url_waiter_;
+  absl::optional<std::string> last_topics_header_;
+
+  std::unique_ptr<URLLoaderInterceptor> url_loader_monitor_;
 };
 
 IN_PROC_BROWSER_TEST_F(BrowsingTopicsBrowserTest, TopicsAPI) {
@@ -149,4 +183,96 @@
   EXPECT_EQ("[]", InvokeTopicsAPI(web_contents()));
 }
 
+// TODO(crbug.com/1381167): migrate to WPT.
+IN_PROC_BROWSER_TEST_F(BrowsingTopicsBrowserTest,
+                       Fetch_TopicsHeaderNotVisibleInServiceWorker) {
+  GURL main_frame_url = https_server_.GetURL(
+      "a.test", "/browsing_topics/service_worker_factory.html");
+  GURL worker_script_url = https_server_.GetURL(
+      "a.test", "/browsing_topics/topics_service_worker.js");
+  GURL fetch_url = https_server_.GetURL("a.test", "/empty.html");
+
+  EXPECT_TRUE(NavigateToURL(shell(), main_frame_url));
+
+  EXPECT_EQ("ok",
+            EvalJs(shell()->web_contents(),
+                   JsReplace("setupServiceWorker($1)", worker_script_url)));
+
+  // Reload the page to let it be controlled by the service worker.
+  EXPECT_TRUE(NavigateToURL(shell(), main_frame_url));
+
+  // Initiate a topics fetch() request from the Window context. Verify that the
+  // topics header is not visible in the service worker during the interception.
+  EXPECT_EQ("null", EvalJs(shell()->web_contents(), content::JsReplace(
+                                                        R"(
+                new Promise((resolve, reject) => {
+                  navigator.serviceWorker.addEventListener('message', e => {
+                    if (e.data.url == $1) {
+                      resolve(e.data.topicsHeader);
+                    }
+                  });
+
+                  fetch($1, {browsingTopics: true});
+                });
+              )",
+                                                        fetch_url)));
+}
+
+IN_PROC_BROWSER_TEST_F(BrowsingTopicsBrowserTest, TopicsHeaderForWindowFetch) {
+  GURL main_frame_url = https_server_.GetURL(
+      "a.test", "/browsing_topics/service_worker_factory.html");
+  GURL fetch_url = https_server_.GetURL("a.test", "/empty.html");
+
+  EXPECT_TRUE(NavigateToURL(shell(), main_frame_url));
+
+  EXPECT_TRUE(ExecJs(
+      shell()->web_contents(),
+      content::JsReplace("fetch($1, {browsingTopics: true})", fetch_url)));
+
+  EXPECT_TRUE(last_request_is_topics_request());
+  EXPECT_TRUE(last_topics_header());
+  EXPECT_EQ(last_topics_header().value(),
+            "1;version=\"chrome.1:1:2\";config_version=\"chrome.1\";model_"
+            "version=\"2\";taxonomy_version=\"1\"");
+}
+
+IN_PROC_BROWSER_TEST_F(BrowsingTopicsBrowserTest,
+                       TopicsNotAllowedForServiceWorkerFetch) {
+  GURL main_frame_url = https_server_.GetURL(
+      "a.test", "/browsing_topics/service_worker_factory.html");
+  GURL worker_script_url = https_server_.GetURL(
+      "a.test", "/browsing_topics/topics_service_worker.js");
+  GURL fetch_url = https_server_.GetURL("a.test", "/empty.html");
+
+  EXPECT_TRUE(NavigateToURL(shell(), main_frame_url));
+
+  EXPECT_EQ("ok",
+            EvalJs(shell()->web_contents(),
+                   JsReplace("setupServiceWorker($1)", worker_script_url)));
+
+  // Reload the page to let it be controlled by the service worker.
+  EXPECT_TRUE(NavigateToURL(shell(), main_frame_url));
+
+  // Initiate a topics fetch request from the service worker. Verify that it
+  // doesn't contain the topics header.
+  EXPECT_TRUE(ExecJs(shell()->web_contents(), content::JsReplace(
+                                                  R"(
+                new Promise((resolve, reject) => {
+                  navigator.serviceWorker.addEventListener('message', e => {
+                    if (e.data.finishedFetch) {
+                      resolve();
+                    }
+                  });
+
+                  navigator.serviceWorker.controller.postMessage({
+                    fetchUrl: $1
+                  });
+                });
+              )",
+                                                  fetch_url)));
+
+  EXPECT_FALSE(last_request_is_topics_request());
+  EXPECT_FALSE(last_topics_header());
+}
+
 }  // namespace content

content/browser/child_process_security_policy_impl.cc

diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
index 0ceb4c4..e8a69656 100644
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -204,6 +204,35 @@
                                  process_rfh_count);
 }
 
+// Checks whether a lock mismatch should be ignored to allow most visited tiles
+// to commit in third-party NTP processes.
+//
+// TODO(crbug.com/566091): This exception should be removed once these tiles
+// can be loaded in OOPIFs on the NTP.
+bool AllowProcessLockMismatchForNTP(const ProcessLock& expected_lock,
+                                    const ProcessLock& actual_lock) {
+  // First, ensure that the expected lock corresponds to a WebUI site that
+  // does not require its process to be locked.  This should only be the case
+  // for sites used to load most visited tiles.
+  const auto& webui_schemes = URLDataManagerBackend::GetWebUISchemes();
+  if (!base::Contains(webui_schemes, expected_lock.lock_url().scheme())) {
+    return false;
+  }
+  if (GetContentClient()->browser()->DoesWebUIUrlRequireProcessLock(
+          expected_lock.lock_url())) {
+    return false;
+  }
+
+  // Now, check that the actual lock corresponds to an NTP process (using its
+  // site_url() since this check relies on checking effective URLs for NTPs),
+  // and that the expected lock (based on the URL for which we're doing the
+  // access check) is allowed to stay in that process. This restricts the lock
+  // mismatch to just NTP processes, disallowing most visited tiles from being
+  // embedded on sites in other processes.
+  return GetContentClient()->browser()->ShouldStayInParentProcessForNTP(
+      expected_lock.lock_url(), actual_lock.site_url());
+}
+
 }  // namespace
 
 ChildProcessSecurityPolicyImpl::Handle::Handle()
@@ -1150,8 +1179,7 @@
   if (!RenderProcessHost::run_renderer_in_process() &&
       base::Contains(webui_schemes, url.scheme())) {
     bool should_be_locked =
-        GetContentClient()->browser()->DoesWebUISchemeRequireProcessLock(
-            url.scheme());
+        GetContentClient()->browser()->DoesWebUIUrlRequireProcessLock(url);
     if (should_be_locked) {
       const ProcessLock lock = GetProcessLock(child_id);
       if (!lock.is_locked_to_site() || !lock.matches_scheme(url.scheme()))
@@ -1774,6 +1802,15 @@
               return true;
           }
 
+          // Make an exception to allow most visited tiles to commit in
+          // third-party NTP processes.
+          // TODO(crbug.com/566091): This exception should be removed once
+          // these tiles can be loaded in OOPIFs on the NTP.
+          if (AllowProcessLockMismatchForNTP(expected_process_lock,
+                                             actual_process_lock)) {
+            return true;
+          }
+
           // TODO(wjmaclean): We should update the ProcessLock comparison API
           // to return a reason why two locks differ.
           if (actual_process_lock.lock_url() !=

content/browser/cookie_store/cookie_store_host.cc

diff --git a/content/browser/cookie_store/cookie_store_host.cc b/content/browser/cookie_store/cookie_store_host.cc
index ae9d432..d97fa0c 100644
--- a/content/browser/cookie_store/cookie_store_host.cc
+++ b/content/browser/cookie_store/cookie_store_host.cc
@@ -8,13 +8,13 @@
 
 #include "content/browser/cookie_store/cookie_store_manager.h"
 #include "mojo/public/cpp/bindings/message.h"
-#include "url/origin.h"
+#include "third_party/blink/public/common/storage_key/storage_key.h"
 
 namespace content {
 
 CookieStoreHost::CookieStoreHost(CookieStoreManager* manager,
-                                 const url::Origin& origin)
-    : manager_(manager), origin_(origin) {}
+                                 const blink::StorageKey& storage_key)
+    : manager_(manager), storage_key_(storage_key) {}
 
 CookieStoreHost::~CookieStoreHost() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -26,7 +26,7 @@
     AddSubscriptionsCallback callback) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   manager_->AddSubscriptions(
-      service_worker_registration_id, origin_, std::move(subscriptions),
+      service_worker_registration_id, storage_key_, std::move(subscriptions),
       mojo::GetBadMessageCallback(), std::move(callback));
 }
 
@@ -36,14 +36,14 @@
     RemoveSubscriptionsCallback callback) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   manager_->RemoveSubscriptions(
-      service_worker_registration_id, origin_, std::move(subscriptions),
+      service_worker_registration_id, storage_key_, std::move(subscriptions),
       mojo::GetBadMessageCallback(), std::move(callback));
 }
 
 void CookieStoreHost::GetSubscriptions(int64_t service_worker_registration_id,
                                        GetSubscriptionsCallback callback) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  manager_->GetSubscriptions(service_worker_registration_id, origin_,
+  manager_->GetSubscriptions(service_worker_registration_id, storage_key_,
                              mojo::GetBadMessageCallback(),
                              std::move(callback));
 }

content/browser/cookie_store/cookie_store_host.h

diff --git a/content/browser/cookie_store/cookie_store_host.h b/content/browser/cookie_store/cookie_store_host.h
index 1a21f63b..1d6de21 100644
--- a/content/browser/cookie_store/cookie_store_host.h
+++ b/content/browser/cookie_store/cookie_store_host.h
@@ -9,8 +9,8 @@
 
 #include "base/memory/raw_ptr.h"
 #include "base/sequence_checker.h"
+#include "third_party/blink/public/common/storage_key/storage_key.h"
 #include "third_party/blink/public/mojom/cookie_store/cookie_store.mojom.h"
-#include "url/origin.h"
 
 namespace content {
 
@@ -27,7 +27,8 @@
 // because they call into CookieStoreManager directly.
 class CookieStoreHost : public blink::mojom::CookieStore {
  public:
-  CookieStoreHost(CookieStoreManager* manager, const url::Origin& origin);
+  CookieStoreHost(CookieStoreManager* manager,
+                  const blink::StorageKey& storage_key);
 
   CookieStoreHost(const CookieStoreHost&) = delete;
   CookieStoreHost& operator=(const CookieStoreHost&) = delete;
@@ -51,7 +52,7 @@
   // mojo::UniqueReceiverSet.
   const raw_ptr<CookieStoreManager> manager_;
 
-  const url::Origin origin_;
+  const blink::StorageKey storage_key_;
 
   // Instances of this class are currently bound to the IO thread, because they
   // call ServiceWorkerContextWrapper methods that are restricted to the IO

content/browser/cookie_store/cookie_store_manager.cc

diff --git a/content/browser/cookie_store/cookie_store_manager.cc b/content/browser/cookie_store/cookie_store_manager.cc
index be878465..60070d5 100644
--- a/content/browser/cookie_store/cookie_store_manager.cc
+++ b/content/browser/cookie_store/cookie_store_manager.cc
@@ -53,15 +53,15 @@
 
 void CookieStoreManager::BindReceiver(
     mojo::PendingReceiver<blink::mojom::CookieStore> receiver,
-    const url::Origin& origin) {
+    const blink::StorageKey& storage_key) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
-  if (!network::IsOriginPotentiallyTrustworthy(origin)) {
+  if (!network::IsOriginPotentiallyTrustworthy(storage_key.origin())) {
     mojo::ReportBadMessage("Cookie Store access from an insecure origin");
     return;
   }
 
-  receivers_.Add(std::make_unique<CookieStoreHost>(this, origin),
+  receivers_.Add(std::make_unique<CookieStoreHost>(this, storage_key),
                  std::move(receiver));
 }
 
@@ -151,7 +151,7 @@
 
 void CookieStoreManager::AddSubscriptions(
     int64_t service_worker_registration_id,
-    const url::Origin& origin,
+    const blink::StorageKey& storage_key,
     std::vector<blink::mojom::CookieChangeSubscriptionPtr> mojo_subscriptions,
     mojo::ReportBadMessageCallback bad_message_callback,
     blink::mojom::CookieStore::AddSubscriptionsCallback callback) {
@@ -160,8 +160,9 @@
   if (!done_loading_subscriptions_) {
     subscriptions_loaded_callbacks_.push_back(base::BindOnce(
         &CookieStoreManager::AddSubscriptions, weak_factory_.GetWeakPtr(),
-        service_worker_registration_id, origin, std::move(mojo_subscriptions),
-        std::move(bad_message_callback), std::move(callback)));
+        service_worker_registration_id, storage_key,
+        std::move(mojo_subscriptions), std::move(bad_message_callback),
+        std::move(callback)));
     return;
   }
 
@@ -189,7 +190,7 @@
     return;
   }
 
-  if (!origin.IsSameOriginWith(service_worker_registration->key().origin())) {
+  if (!(storage_key == service_worker_registration->key())) {
     std::move(bad_message_callback).Run("Invalid service worker");
     std::move(callback).Run(false);
     return;
@@ -240,13 +241,13 @@
 
   ActivateSubscriptions(
       base::make_span(subscriptions).subspan(old_subscriptions_size));
-  StoreSubscriptions(service_worker_registration_id, origin.GetURL(),
-                     subscriptions, std::move(callback));
+  StoreSubscriptions(service_worker_registration_id, storage_key, subscriptions,
+                     std::move(callback));
 }
 
 void CookieStoreManager::RemoveSubscriptions(
     int64_t service_worker_registration_id,
-    const url::Origin& origin,
+    const blink::StorageKey& storage_key,
     std::vector<blink::mojom::CookieChangeSubscriptionPtr> mojo_subscriptions,
     mojo::ReportBadMessageCallback bad_message_callback,
     blink::mojom::CookieStore::RemoveSubscriptionsCallback callback) {
@@ -255,8 +256,9 @@
   if (!done_loading_subscriptions_) {
     subscriptions_loaded_callbacks_.push_back(base::BindOnce(
         &CookieStoreManager::RemoveSubscriptions, weak_factory_.GetWeakPtr(),
-        service_worker_registration_id, origin, std::move(mojo_subscriptions),
-        std::move(bad_message_callback), std::move(callback)));
+        service_worker_registration_id, storage_key,
+        std::move(mojo_subscriptions), std::move(bad_message_callback),
+        std::move(callback)));
     return;
   }
 
@@ -284,7 +286,7 @@
     return;
   }
 
-  if (!origin.IsSameOriginWith(service_worker_registration->key().origin())) {
+  if (!(storage_key == service_worker_registration->key())) {
     std::move(bad_message_callback).Run("Invalid service worker");
     std::move(callback).Run(false);
     return;
@@ -344,7 +346,7 @@
   // StoreSubscriptions() needs to be called before updating
   // |subscriptions_by_registration_|, because the update may delete the vector
   // holding the subscriptions.
-  StoreSubscriptions(service_worker_registration_id, origin.GetURL(),
+  StoreSubscriptions(service_worker_registration_id, storage_key,
                      live_subscriptions, std::move(callback));
   if (live_subscriptions.empty()) {
     subscriptions_by_registration_.erase(all_subscriptions_it);
@@ -355,7 +357,7 @@
 
 void CookieStoreManager::GetSubscriptions(
     int64_t service_worker_registration_id,
-    const url::Origin& origin,
+    const blink::StorageKey& storage_key,
     mojo::ReportBadMessageCallback bad_message_callback,
     blink::mojom::CookieStore::GetSubscriptionsCallback callback) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -363,8 +365,8 @@
   if (!done_loading_subscriptions_) {
     subscriptions_loaded_callbacks_.push_back(base::BindOnce(
         &CookieStoreManager::GetSubscriptions, weak_factory_.GetWeakPtr(),
-        service_worker_registration_id, origin, std::move(bad_message_callback),
-        std::move(callback)));
+        service_worker_registration_id, storage_key,
+        std::move(bad_message_callback), std::move(callback)));
     return;
   }
 
@@ -389,7 +391,7 @@
   }
 #endif  // DCHECK_IS_ON()
 
-  if (!origin.IsSameOriginWith(first_url)) {
+  if (!storage_key.origin().IsSameOriginWith(first_url)) {
     std::move(bad_message_callback).Run("Invalid service worker");
     std::move(callback).Run(
         std::vector<blink::mojom::CookieChangeSubscriptionPtr>(), false);
@@ -402,7 +404,7 @@
 
 void CookieStoreManager::StoreSubscriptions(
     int64_t service_worker_registration_id,
-    const GURL& service_worker_origin,
+    const blink::StorageKey& storage_key,
     const std::vector<std::unique_ptr<CookieChangeSubscription>>& subscriptions,
     base::OnceCallback<void(bool)> callback) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -425,11 +427,8 @@
   DCHECK(!subscriptions_data.empty())
       << "Failed to create cookie change subscriptions protobuf";
 
-  // TODO(crbug.com/1199077): Update this when CookieStoreManager
-  // implements StorageKey.
   service_worker_context_->StoreRegistrationUserData(
-      service_worker_registration_id,
-      blink::StorageKey(url::Origin::Create(service_worker_origin)),
+      service_worker_registration_id, storage_key,
       std::vector<std::pair<std::string, std::string>>(
           {{registration_user_data_key_, subscriptions_data}}),
       base::BindOnce(
@@ -627,7 +626,8 @@
   StoragePartitionImpl* storage_partition = static_cast<StoragePartitionImpl*>(
       render_process_host->GetStoragePartition());
   storage_partition->GetCookieStoreManager()->BindReceiver(
-      std::move(receiver), render_frame_host->GetLastCommittedOrigin());
+      std::move(receiver),
+      blink::StorageKey(render_frame_host->GetLastCommittedOrigin()));
 }
 
 // static
@@ -642,8 +642,8 @@
 
   StoragePartitionImpl* storage_partition = static_cast<StoragePartitionImpl*>(
       render_process_host->GetStoragePartition());
-  storage_partition->GetCookieStoreManager()->BindReceiver(
-      std::move(receiver), info.storage_key.origin());
+  storage_partition->GetCookieStoreManager()->BindReceiver(std::move(receiver),
+                                                           info.storage_key);
 }
 
 void CookieStoreManager::DispatchChangeEvent(

content/browser/cookie_store/cookie_store_manager.h

diff --git a/content/browser/cookie_store/cookie_store_manager.h b/content/browser/cookie_store/cookie_store_manager.h
index 2706d4e..26ee72b8 100644
--- a/content/browser/cookie_store/cookie_store_manager.h
+++ b/content/browser/cookie_store/cookie_store_manager.h
@@ -69,7 +69,7 @@
   // This is called when service workers use the Cookie Store API to subscribe
   // to cookie changes or obtain the list of cookie changes.
   void BindReceiver(mojo::PendingReceiver<blink::mojom::CookieStore> receiver,
-                    const url::Origin& origin);
+                    const blink::StorageKey& storage_key);
 
   // Starts loading the on-disk subscription data.
   //
@@ -88,19 +88,19 @@
   // blink::mojom::CookieStore implementation
   void AddSubscriptions(
       int64_t service_worker_registration_id,
-      const url::Origin& origin,
+      const blink::StorageKey& storage_key,
       std::vector<blink::mojom::CookieChangeSubscriptionPtr> mojo_subscriptions,
       mojo::ReportBadMessageCallback bad_message_callback,
       blink::mojom::CookieStore::AddSubscriptionsCallback callback);
   void RemoveSubscriptions(
       int64_t service_worker_registration_id,
-      const url::Origin& origin,
+      const blink::StorageKey& storage_key,
       std::vector<blink::mojom::CookieChangeSubscriptionPtr> mojo_subscriptions,
       mojo::ReportBadMessageCallback bad_message_callback,
       blink::mojom::CookieStore::RemoveSubscriptionsCallback callback);
   void GetSubscriptions(
       int64_t service_worker_registration_id,
-      const url::Origin& origin,
+      const blink::StorageKey& storage_key,
       mojo::ReportBadMessageCallback bad_message_callback,
       blink::mojom::CookieStore::GetSubscriptionsCallback callback);
 
@@ -141,7 +141,7 @@
   // Updates on-disk subscription data for a registration.
   void StoreSubscriptions(
       int64_t service_worker_registration_id,
-      const GURL& service_worker_origin,
+      const blink::StorageKey& storage_key,
       const std::vector<std::unique_ptr<CookieChangeSubscription>>&
           subscriptions,
       base::OnceCallback<void(bool)> callback);

content/browser/cookie_store/cookie_store_manager_unittest.cc

diff --git a/content/browser/cookie_store/cookie_store_manager_unittest.cc b/content/browser/cookie_store/cookie_store_manager_unittest.cc
index 1c59b57..83dfc3d71 100644
--- a/content/browser/cookie_store/cookie_store_manager_unittest.cc
+++ b/content/browser/cookie_store/cookie_store_manager_unittest.cc
@@ -368,19 +368,19 @@
 
     cookie_store_manager_->BindReceiver(
         example_service_remote_.BindNewPipeAndPassReceiver(),
-        url::Origin::Create(GURL(kExampleScope)));
+        blink::StorageKey::CreateFromStringForTesting(kExampleScope));
     example_service_ =
         std::make_unique<CookieStoreSync>(example_service_remote_.get());
 
     cookie_store_manager_->BindReceiver(
         google_service_remote_.BindNewPipeAndPassReceiver(),
-        url::Origin::Create(GURL(kGoogleScope)));
+        blink::StorageKey::CreateFromStringForTesting(kGoogleScope));
     google_service_ =
         std::make_unique<CookieStoreSync>(google_service_remote_.get());
 
     cookie_store_manager_->BindReceiver(
         legacy_service_remote_.BindNewPipeAndPassReceiver(),
-        url::Origin::Create(GURL(kLegacyScope)));
+        blink::StorageKey::CreateFromStringForTesting(kLegacyScope));
     legacy_service_ =
         std::make_unique<CookieStoreSync>(legacy_service_remote_.get());
 
@@ -1768,7 +1768,7 @@
 
   cookie_store_manager_->BindReceiver(
       untrustworthy_service_remote.BindNewPipeAndPassReceiver(),
-      url::Origin::Create(GURL("http://insecure.com")));
+      blink::StorageKey::CreateFromStringForTesting("http://insecure.com"));
 
   untrustworthy_service_remote.FlushForTesting();
   EXPECT_FALSE(untrustworthy_service_remote.is_connected());

content/browser/interest_group/ad_auction_service_impl_unittest.cc

diff --git a/content/browser/interest_group/ad_auction_service_impl_unittest.cc b/content/browser/interest_group/ad_auction_service_impl_unittest.cc
index 7416617f..44faf4d 100644
--- a/content/browser/interest_group/ad_auction_service_impl_unittest.cc
+++ b/content/browser/interest_group/ad_auction_service_impl_unittest.cc
@@ -5860,8 +5860,9 @@
 // Permissions policy feature join-ad-interest-group is disabled by default for
 // cross site iframes under restricted permissions policy, so interest group
 // APIs should not work, and result in the pipe being closed.
+// TODO(crbug.com/1404806): Flaky on all platforms
 TEST_F(AdAuctionServiceImplRestrictedPermissionsPolicyTest,
-       APICallsFromCrossSiteIFrame) {
+       DISABLED_APICallsFromCrossSiteIFrame) {
   network_responder_->RegisterUpdateResponse(
       kDailyUpdateUrlPath,
       base::StringPrintf(R"({"biddingLogicUrl": "%s%s"})", kOriginStringC,

content/browser/preloading/preloading.cc

diff --git a/content/browser/preloading/preloading.cc b/content/browser/preloading/preloading.cc
index 2133654..edce248a 100644
--- a/content/browser/preloading/preloading.cc
+++ b/content/browser/preloading/preloading.cc
@@ -6,6 +6,10 @@
 
 namespace content {
 
+static_assert(
+    static_cast<int>(ContentPreloadingPredictor::kMaxValue) <
+    static_cast<int>(PreloadingPredictor::kPreloadingPredictorContentEnd));
+
 PreloadingPredictor ToPreloadingPredictor(
     ContentPreloadingPredictor predictor) {
   return static_cast<PreloadingPredictor>(predictor);

content/browser/preloading/preloading.h

diff --git a/content/browser/preloading/preloading.h b/content/browser/preloading/preloading.h
index 548e34c..fb8b1d1f6 100644
--- a/content/browser/preloading/preloading.h
+++ b/content/browser/preloading/preloading.h
@@ -35,6 +35,10 @@
 
   // TODO(crbug.com/1309934): Add more predictors as we integrate Preloading
   // logging.
+
+  // The max value of the ContentPreloadingPredictor. Update this when new enums
+  // are added.
+  kMaxValue = kSpeculationRules,
 };
 
 // Helper method to convert ContentPreloadingPredictor to

content/browser/preloading/prerender/prerender_host.cc

diff --git a/content/browser/preloading/prerender/prerender_host.cc b/content/browser/preloading/prerender/prerender_host.cc
index 3e9ce33..a855e2d 100644
--- a/content/browser/preloading/prerender/prerender_host.cc
+++ b/content/browser/preloading/prerender/prerender_host.cc
@@ -97,6 +97,13 @@
   return false;
 }
 
+static_assert(
+    static_cast<int>(PrerenderFinalStatus::kMaxValue) +
+        static_cast<int>(
+            PreloadingFailureReason::kPreloadingFailureReasonCommonEnd) <
+    static_cast<int>(
+        PreloadingFailureReason::kPreloadingFailureReasonContentEnd));
+
 PreloadingFailureReason ToPreloadingFailureReason(PrerenderFinalStatus status) {
   return static_cast<PreloadingFailureReason>(
       static_cast<int>(status) +

content/browser/process_lock.h

diff --git a/content/browser/process_lock.h b/content/browser/process_lock.h
index 792d8b0..3e3b3eb 100644
--- a/content/browser/process_lock.h
+++ b/content/browser/process_lock.h
@@ -97,6 +97,13 @@
     return site_info_.has_value() ? site_info_->process_lock_url() : GURL();
   }
 
+  // Returns the site URL of the SiteInfo with which the lock was constructed.
+  // Prefer comparing ProcessLocks directly or using lock_url(), unless you
+  // care about effective URLs.
+  const GURL site_url() const {
+    return site_info_.has_value() ? site_info_->site_url() : GURL();
+  }
+
   // Returns whether this ProcessLock is specific to an origin rather than
   // including subdomains, such as due to opt-in origin isolation. This resolves
   // an ambiguity of whether a process with a lock_url() like

content/browser/renderer_host/navigation_request.cc

diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index 82938d1..37e932c 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -6531,6 +6531,15 @@
     // committing.
     service_worker_handle_->OnEndNavigationCommit();
   }
+
+  // TODO(https://crbug.com/1399499): consider using NavigationOrDocumentHandle
+  // instead once we can get a WeakDocumentPtr from NavigationOrDocumentHandle.
+  if (topics_url_loader_service_bind_context_) {
+    DCHECK(!IsSameDocument());
+
+    topics_url_loader_service_bind_context_->OnDidCommitNavigation(
+        GetRenderFrameHost()->GetWeakDocumentPtr());
+  }
 }
 
 SiteInfo NavigationRequest::GetSiteInfoForCommonParamsURL() {

content/browser/renderer_host/navigation_request.h

diff --git a/content/browser/renderer_host/navigation_request.h b/content/browser/renderer_host/navigation_request.h
index dd70c993..a8f953a 100644
--- a/content/browser/renderer_host/navigation_request.h
+++ b/content/browser/renderer_host/navigation_request.h
@@ -20,6 +20,7 @@
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
+#include "content/browser/browsing_topics/browsing_topics_url_loader_service.h"
 #include "content/browser/fenced_frame/fenced_frame_url_mapping.h"
 #include "content/browser/loader/navigation_url_loader_delegate.h"
 #include "content/browser/navigation_subresource_loader_params.h"
@@ -1022,6 +1023,12 @@
   // Empties this instance's vector.
   std::vector<blink::mojom::WebFeature> TakeWebFeaturesToLog();
 
+  void set_topics_url_loader_service_bind_context(
+      base::WeakPtr<BrowsingTopicsURLLoaderService::BindContext> bind_context) {
+    DCHECK(!topics_url_loader_service_bind_context_);
+    topics_url_loader_service_bind_context_ = bind_context;
+  }
+
   // Helper for logging crash keys related to a NavigationRequest (e.g.
   // "navigation_request_url", "navigation_request_initiator", and
   // "navigation_request_is_same_document").  The crash keys will be logged if a
@@ -2273,6 +2280,14 @@
   // reset.
   bool force_new_browsing_instance_ = false;
 
+  // A WeakPtr for the BindContext associated with topics loader factory for the
+  // committing document. This will be set in `CommitNavigation()`, and can
+  // become null if the corresponding factory is destroyed. Upon
+  // `DidCommitNavigation()`, `topics_url_loader_service_bind_context_` will
+  // be notified with the committed document.
+  base::WeakPtr<BrowsingTopicsURLLoaderService::BindContext>
+      topics_url_loader_service_bind_context_;
+
   scoped_refptr<NavigationOrDocumentHandle> navigation_or_document_handle_;
 
   // Exposes getters and setters for Blink Runtime-Enabled Features to the

content/browser/renderer_host/private_network_access_browsertest.cc

diff --git a/content/browser/renderer_host/private_network_access_browsertest.cc b/content/browser/renderer_host/private_network_access_browsertest.cc
index 958e89c3..4e77fdc 100644
--- a/content/browser/renderer_host/private_network_access_browsertest.cc
+++ b/content/browser/renderer_host/private_network_access_browsertest.cc
@@ -3302,8 +3302,15 @@
                          FetchSubresourceScript(SecureLocalURL(kPnaPath))));
 }
 
+// TODO(crbug.com/1404795): Re-enable this test
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+#define MAYBE_PreflightConnectionReusedHttp1 \
+  DISABLED_PreflightConnectionReusedHttp1
+#else
+#define MAYBE_PreflightConnectionReusedHttp1 PreflightConnectionReusedHttp1
+#endif
 IN_PROC_BROWSER_TEST_F(PrivateNetworkAccessBrowserTestRespectPreflightResults,
-                       PreflightConnectionReusedHttp1) {
+                       MAYBE_PreflightConnectionReusedHttp1) {
   EXPECT_TRUE(NavigateToURL(shell(), SecurePublicURL(kDefaultPath)));
 
   EXPECT_EQ(true, EvalJs(root_frame_host(),

content/browser/renderer_host/render_frame_host_impl.cc

diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 01909cce..4260b51 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -53,6 +53,7 @@
 #include "content/browser/broadcast_channel/broadcast_channel_provider.h"
 #include "content/browser/broadcast_channel/broadcast_channel_service.h"
 #include "content/browser/browser_main_loop.h"
+#include "content/browser/browsing_topics/browsing_topics_url_loader_service.h"
 #include "content/browser/can_commit_status.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/code_cache/generated_code_cache_context.h"
@@ -9187,6 +9188,41 @@
           EnsurePrefetchedSignedExchangeCache());
     }
 
+    // Set up the topics loader factory. It is used to proxy the topics
+    // subresource request via the browser process. The topics loader factory
+    // does not depend on the prefetch loader factory (or vice versa), as they
+    // are intended for disjoint request types (i.e.
+    // fetch(<url>, {browsingTopics: true}) v.s. <link rel="prefetch">).
+    mojo::PendingRemote<network::mojom::URLLoaderFactory> topics_loader_factory;
+    if (base::FeatureList::IsEnabled(blink::features::kBrowsingTopics)) {
+      std::unique_ptr<blink::PendingURLLoaderFactoryBundle>
+          factory_bundle_for_topics;
+
+      if (subresource_loader_factories) {
+        // Clone the factory bundle for topics.
+        auto bundle = base::MakeRefCounted<blink::URLLoaderFactoryBundle>(
+            std::move(subresource_loader_factories));
+        subresource_loader_factories = CloneFactoryBundle(bundle);
+        factory_bundle_for_topics = CloneFactoryBundle(bundle);
+      }
+
+      if (factory_bundle_for_topics) {
+        // Also set-up URLLoaderFactory for topics using the same loader
+        // factories.
+        auto* storage_partition = GetStoragePartition();
+
+        base::WeakPtr<BrowsingTopicsURLLoaderService::BindContext>
+            bind_context =
+                storage_partition->GetBrowsingTopicsURLLoaderService()
+                    ->GetFactory(
+                        topics_loader_factory.InitWithNewPipeAndPassReceiver(),
+                        std::move(factory_bundle_for_topics));
+
+        navigation_request->set_topics_url_loader_service_bind_context(
+            bind_context);
+      }
+    }
+
     mojom::NavigationClient* navigation_client =
         navigation_request->GetCommitNavigationClient();
 
@@ -9249,7 +9285,8 @@
         std::move(subresource_loader_factories),
         std::move(subresource_overrides), std::move(controller),
         std::move(container_info), std::move(prefetch_loader_factory),
-        manifest_policy, std::move(policy_container), *document_token,
+        std::move(topics_loader_factory), manifest_policy,
+        std::move(policy_container), *document_token,
         devtools_navigation_token);
     navigation_request->frame_tree_node()
         ->navigator()
@@ -12130,6 +12167,7 @@
     blink::mojom::ServiceWorkerContainerInfoForClientPtr container_info,
     mojo::PendingRemote<network::mojom::URLLoaderFactory>
         prefetch_loader_factory,
+    mojo::PendingRemote<network::mojom::URLLoaderFactory> topics_loader_factory,
     const absl::optional<blink::ParsedPermissionsPolicy>& permissions_policy,
     blink::mojom::PolicyContainerPtr policy_container,
     const blink::DocumentToken& document_token,
@@ -12206,8 +12244,8 @@
       std::move(url_loader_client_endpoints),
       std::move(subresource_loader_factories), std::move(subresource_overrides),
       std::move(controller), std::move(container_info),
-      std::move(prefetch_loader_factory), document_token,
-      devtools_navigation_token, permissions_policy,
+      std::move(prefetch_loader_factory), std::move(topics_loader_factory),
+      document_token, devtools_navigation_token, permissions_policy,
       std::move(policy_container), std::move(code_cache_host),
       std::move(cookie_manager_info), std::move(storage_info),
       BuildCommitNavigationCallback(navigation_request));
@@ -14158,10 +14196,10 @@
   if (LIKELY(!GetBrowserContext()->ShutdownStarted()))
     return;
 
-  SCOPED_CRASH_KEY_STRING256("shutdown", "frame->ToDebugString",
-                             ToDebugString());
+  std::string debug_string = ToDebugString();
+  SCOPED_CRASH_KEY_STRING256("shutdown", "frame->ToDebugString", debug_string);
   NOTREACHED() << "BrowserContext->ShutdownStarted() without first closing all "
-                  "WebContents";
+               << "WebContents; debug_string = " << debug_string;
   base::debug::DumpWithoutCrashing();
 }
 

content/browser/renderer_host/render_frame_host_impl.h

diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h
index 2c82299..a19e9306 100644
--- a/content/browser/renderer_host/render_frame_host_impl.h
+++ b/content/browser/renderer_host/render_frame_host_impl.h
@@ -2817,6 +2817,8 @@
       blink::mojom::ServiceWorkerContainerInfoForClientPtr container_info,
       mojo::PendingRemote<network::mojom::URLLoaderFactory>
           prefetch_loader_factory,
+      mojo::PendingRemote<network::mojom::URLLoaderFactory>
+          topics_loader_factory,
       const absl::optional<blink::ParsedPermissionsPolicy>& permissions_policy,
       blink::mojom::PolicyContainerPtr policy_container,
       const blink::DocumentToken& document_token,

content/browser/renderer_host/render_frame_host_manager.cc

diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
index 19b01bd5..1066d68 100644
--- a/content/browser/renderer_host/render_frame_host_manager.cc
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
@@ -2434,7 +2434,7 @@
     SiteInstance* parent_site_instance =
         frame_tree_node_->parent()->GetSiteInstance();
     if (GetContentClient()->browser()->ShouldStayInParentProcessForNTP(
-            dest_url_info.url, parent_site_instance)) {
+            dest_url_info.url, parent_site_instance->GetSiteURL())) {
       // NTP is considered non-isolated.
       DCHECK(!dest_url_info.IsIsolated());
       AppendReason(reason,

content/browser/resources/attribution_reporting/BUILD.gn

diff --git a/content/browser/resources/attribution_reporting/BUILD.gn b/content/browser/resources/attribution_reporting/BUILD.gn
index 6f1bec62..1bd14fcf 100644
--- a/content/browser/resources/attribution_reporting/BUILD.gn
+++ b/content/browser/resources/attribution_reporting/BUILD.gn
@@ -27,17 +27,20 @@
   mojom_folder = "$root_gen_dir/mojom-webui"
   attribution_reporting_component_folder = "components/attribution_reporting"
   attribution_reporting_content_folder = "content/browser/attribution_reporting"
+  network_folder = "services/network/public/mojom"
 
   mojo_files = [
     "$mojom_folder/$attribution_reporting_component_folder/source_registration_error.mojom-webui.js",
     "$mojom_folder/$attribution_reporting_content_folder/attribution_internals.mojom-webui.js",
     "$mojom_folder/$attribution_reporting_content_folder/attribution_reporting.mojom-webui.js",
+    "$mojom_folder/$network_folder/schemeful_site.mojom-webui.js",
   ]
 
   mojo_files_deps = [
     "//$attribution_reporting_component_folder:mojom_js__generator",
     "//$attribution_reporting_content_folder:internals_mojo_bindings_js__generator",
     "//$attribution_reporting_content_folder:mojo_bindings_js__generator",
+    "//$network_folder:mojom_schemeful_site_js__generator",
   ]
 
   grit_output_dir = "$root_gen_dir/content"

content/browser/resources/attribution_reporting/attribution_internals.ts

diff --git a/content/browser/resources/attribution_reporting/attribution_internals.ts b/content/browser/resources/attribution_reporting/attribution_internals.ts
index 36074e0..a84790d7 100644
--- a/content/browser/resources/attribution_reporting/attribution_internals.ts
+++ b/content/browser/resources/attribution_reporting/attribution_internals.ts
@@ -80,7 +80,9 @@
 }
 
 class ListColumn<T, V> extends ValueColumn<T, V[]> {
-  constructor(header: string, getValue: (p: T) => V[]) {
+  constructor(
+      header: string, getValue: (p: T) => V[],
+      private readonly flatten: boolean = false) {
     super(header, getValue, /*comparable=*/ false);
   }
 
@@ -90,6 +92,11 @@
       return;
     }
 
+    if (this.flatten && values.length === 1) {
+      td.innerText = `${values[0]}`;
+      return;
+    }
+
     const ul = td.ownerDocument.createElement('ul');
 
     values.forEach(value => {
@@ -249,7 +256,7 @@
 class Source {
   sourceEventId: bigint;
   sourceOrigin: string;
-  attributionDestination: string;
+  destinations: string[];
   reportingOrigin: string;
   sourceTime: Date;
   expiryTime: Date;
@@ -269,7 +276,8 @@
   constructor(mojo: WebUISource) {
     this.sourceEventId = mojo.sourceEventId;
     this.sourceOrigin = originToText(mojo.sourceOrigin);
-    this.attributionDestination = mojo.attributionDestination;
+    this.destinations =
+        mojo.destinations.map(d => originToText(d.siteAsOrigin));
     this.reportingOrigin = originToText(mojo.reportingOrigin);
     this.sourceTime = new Date(mojo.sourceTime);
     this.expiryTime = new Date(mojo.expiryTime);
@@ -310,8 +318,8 @@
           new ValueColumn<Source, string>('Status', (e) => e.status),
           new ValueColumn<Source, string>(
               'Source Origin', (e) => e.sourceOrigin),
-          new ValueColumn<Source, string>(
-              'Destination', (e) => e.attributionDestination),
+          new ListColumn<Source, string>(
+              'Destinations', (e) => e.destinations, /*flatten=*/ true),
           new ValueColumn<Source, string>(
               'Reporting Origin', (e) => e.reportingOrigin),
           new DateColumn<Source>(

content/browser/service_worker/service_worker_context_core.h

diff --git a/content/browser/service_worker/service_worker_context_core.h b/content/browser/service_worker/service_worker_context_core.h
index f74c87e..832a013 100644
--- a/content/browser/service_worker/service_worker_context_core.h
+++ b/content/browser/service_worker/service_worker_context_core.h
@@ -261,11 +261,6 @@
   // SERVICE_WORKER_FAILED if any did not succeed.
   void DeleteForStorageKey(const blink::StorageKey& key,
                            StatusCallback callback);
-  // TODO(crbug.com/1199077): Delete this overload when ServiceWorkerQuotaClient
-  // and storage::mojom::QuotaClient support StorageKey.
-  void DeleteForOrigin(const url::Origin& origin, StatusCallback callback) {
-    DeleteForStorageKey(blink::StorageKey(origin), std::move(callback));
-  }
 
   // Performs internal storage cleanup. Operations to the storage in the past
   // (e.g. deletion) are usually recorded in disk for a certain period until

content/browser/service_worker/service_worker_test_utils.cc

diff --git a/content/browser/service_worker/service_worker_test_utils.cc b/content/browser/service_worker/service_worker_test_utils.cc
index 0c341a6..3518cffb 100644
--- a/content/browser/service_worker/service_worker_test_utils.cc
+++ b/content/browser/service_worker/service_worker_test_utils.cc
@@ -92,6 +92,8 @@
       blink::mojom::ServiceWorkerContainerInfoForClientPtr container_info,
       mojo::PendingRemote<network::mojom::URLLoaderFactory>
           prefetch_loader_factory,
+      mojo::PendingRemote<network::mojom::URLLoaderFactory>
+          topics_loader_factory,
       const blink::DocumentToken& document_token,
       const base::UnguessableToken& devtools_navigation_token,
       const absl::optional<blink::ParsedPermissionsPolicy>& permissions_policy,
@@ -258,8 +260,8 @@
       blink::CreateCommitNavigationParams(),
       network::mojom::URLResponseHead::New(),
       mojo::ScopedDataPipeConsumerHandle(), nullptr, nullptr, absl::nullopt,
-      nullptr, std::move(info), mojo::NullRemote(), blink::DocumentToken(),
-      base::UnguessableToken::Create(),
+      nullptr, std::move(info), mojo::NullRemote(), mojo::NullRemote(),
+      blink::DocumentToken(), base::UnguessableToken::Create(),
       std::vector<blink::ParsedPermissionsPolicyDeclaration>(),
       CreateStubPolicyContainer(), mojo::NullRemote(), nullptr, nullptr,
       base::BindOnce(

content/browser/site_info.cc

diff --git a/content/browser/site_info.cc b/content/browser/site_info.cc
index 3627fd1..060f6b6 100644
--- a/content/browser/site_info.cc
+++ b/content/browser/site_info.cc
@@ -686,8 +686,8 @@
   // is NTP, handled via the separate callout to the embedder.
   const auto& webui_schemes = URLDataManagerBackend::GetWebUISchemes();
   if (base::Contains(webui_schemes, site_url_.scheme())) {
-    return GetContentClient()->browser()->DoesWebUISchemeRequireProcessLock(
-        site_url_.scheme());
+    return GetContentClient()->browser()->DoesWebUIUrlRequireProcessLock(
+        site_url_);
   }
 
   // Allow the embedder to prevent process locking so that multiple sites

content/browser/storage_partition_impl.cc

diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
index a1a69b2..ff502f1b 100644
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -60,6 +60,7 @@
 #include "content/browser/browsing_data/clear_site_data_handler.h"
 #include "content/browser/browsing_data/storage_partition_code_cache_data_remover.h"
 #include "content/browser/browsing_topics/browsing_topics_site_data_manager_impl.h"
+#include "content/browser/browsing_topics/browsing_topics_url_loader_service.h"
 #include "content/browser/buckets/bucket_manager.h"
 #include "content/browser/cache_storage/cache_storage_control_wrapper.h"
 #include "content/browser/code_cache/generated_code_cache.h"
@@ -1332,6 +1333,11 @@
   prefetch_url_loader_service_ =
       std::make_unique<PrefetchURLLoaderService>(browser_context_);
 
+  if (base::FeatureList::IsEnabled(blink::features::kBrowsingTopics)) {
+    browsing_topics_url_loader_service_ =
+        std::make_unique<BrowsingTopicsURLLoaderService>();
+  }
+
   cookie_store_manager_ =
       std::make_unique<CookieStoreManager>(service_worker_context_);
   // Unit tests use the LoadAllSubscriptions() callback to crash early if
@@ -1651,6 +1657,12 @@
   return prefetch_url_loader_service_.get();
 }
 
+BrowsingTopicsURLLoaderService*
+StoragePartitionImpl::GetBrowsingTopicsURLLoaderService() {
+  DCHECK(initialized_);
+  return browsing_topics_url_loader_service_.get();
+}
+
 CookieStoreManager* StoragePartitionImpl::GetCookieStoreManager() {
   DCHECK(initialized_);
   return cookie_store_manager_.get();

content/browser/storage_partition_impl.h

diff --git a/content/browser/storage_partition_impl.h b/content/browser/storage_partition_impl.h
index 2dd21f692..25e4784 100644
--- a/content/browser/storage_partition_impl.h
+++ b/content/browser/storage_partition_impl.h
@@ -69,6 +69,7 @@
 class BluetoothAllowedDevicesMap;
 class BroadcastChannelService;
 class BrowsingDataFilterBuilder;
+class BrowsingTopicsURLLoaderService;
 class BucketManager;
 class CacheStorageControlWrapper;
 class CookieStoreManager;
@@ -251,6 +252,7 @@
   BlobRegistryWrapper* GetBlobRegistry();
   storage::BlobUrlRegistry* GetBlobUrlRegistry();
   PrefetchURLLoaderService* GetPrefetchURLLoaderService();
+  BrowsingTopicsURLLoaderService* GetBrowsingTopicsURLLoaderService();
   CookieStoreManager* GetCookieStoreManager();
   FileSystemAccessManagerImpl* GetFileSystemAccessManager();
   BucketManager* GetBucketManager();
@@ -634,6 +636,8 @@
   scoped_refptr<BlobRegistryWrapper> blob_registry_;
   std::unique_ptr<storage::BlobUrlRegistry> blob_url_registry_;
   std::unique_ptr<PrefetchURLLoaderService> prefetch_url_loader_service_;
+  std::unique_ptr<BrowsingTopicsURLLoaderService>
+      browsing_topics_url_loader_service_;
   std::unique_ptr<CookieStoreManager> cookie_store_manager_;
   std::unique_ptr<BucketManager> bucket_manager_;
   scoped_refptr<GeneratedCodeCacheContext> generated_code_cache_context_;

content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 74749758..1ee05a30 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -920,10 +920,10 @@
                                 ->GetCreatorLocation()
                                 .ToString();
       SCOPED_CRASH_KEY_STRING256("shutdown", "web_contents/creator", creator);
-
       NOTREACHED()
           << "BrowserContext is getting destroyed without first closing all "
-             "WebContents (for more info see https://crbug.com/1376879#c44)";
+          << "WebContents (for more info see https://crbug.com/1376879#c44); "
+          << "creator = " << creator;
       base::debug::DumpWithoutCrashing();
     }
   }

content/browser/webid/federated_auth_request_impl_multiple_frames_unittest.cc

diff --git a/content/browser/webid/federated_auth_request_impl_multiple_frames_unittest.cc b/content/browser/webid/federated_auth_request_impl_multiple_frames_unittest.cc
new file mode 100644
index 0000000..efc17ee
--- /dev/null
+++ b/content/browser/webid/federated_auth_request_impl_multiple_frames_unittest.cc
@@ -0,0 +1,299 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/browser/webid/federated_auth_request_impl.h"
+
+#include <memory>
+#include <ostream>
+#include <set>
+#include <string>
+#include <utility>
+
+#include "base/callback_forward.h"
+#include "base/memory/raw_ptr.h"
+#include "base/run_loop.h"
+#include "base/task/sequenced_task_runner.h"
+#include "base/test/scoped_feature_list.h"
+#include "base/test/task_environment.h"
+#include "content/browser/web_contents/web_contents_impl.h"
+#include "content/browser/webid/test/federated_auth_request_request_token_callback_helper.h"
+#include "content/browser/webid/test/mock_api_permission_delegate.h"
+#include "content/browser/webid/test/mock_identity_request_dialog_controller.h"
+#include "content/browser/webid/test/mock_idp_network_request_manager.h"
+#include "content/browser/webid/test/mock_permission_delegate.h"
+#include "content/common/content_navigation_policy.h"
+#include "content/public/browser/identity_request_dialog_controller.h"
+#include "content/public/common/content_features.h"
+#include "content/test/test_render_frame_host.h"
+#include "content/test/test_render_view_host.h"
+#include "content/test/test_web_contents.h"
+#include "mojo/public/cpp/bindings/remote.h"
+#include "net/http/http_status_code.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
+#include "third_party/blink/public/mojom/webid/federated_auth_request.mojom.h"
+#include "ui/base/page_transition_types.h"
+#include "url/gurl.h"
+#include "url/origin.h"
+
+using ApiPermissionStatus =
+    content::FederatedIdentityApiPermissionContextDelegate::PermissionStatus;
+using AuthRequestCallbackHelper =
+    content::FederatedAuthRequestRequestTokenCallbackHelper;
+using FetchStatus = content::IdpNetworkRequestManager::FetchStatus;
+using RequestTokenCallback =
+    content::FederatedAuthRequestImpl::RequestTokenCallback;
+using blink::mojom::RequestTokenStatus;
+using ::testing::NiceMock;
+
+namespace content {
+
+namespace {
+
+constexpr char kProviderUrlFull[] = "https://idp.example/fedcm.json";
+constexpr char kRpUrl[] = "https://rp.example/";
+constexpr char kAccountsEndpoint[] = "https://idp.example/accounts";
+constexpr char kTokenEndpoint[] = "https://idp.example/token";
+constexpr char kClientId[] = "client_id_123";
+constexpr char kNonce[] = "nonce123";
+constexpr char kAccountId[] = "1234";
+constexpr char kToken[] = "[not a real token]";
+
+static const std::initializer_list<IdentityRequestAccount> kAccounts{{
+    kAccountId,         // id
+    "ken@idp.example",  // email
+    "Ken R. Example",   // name
+    "Ken",              // given_name
+    GURL()              // picture
+}};
+
+// IdpNetworkRequestManager which returns valid data from IdP.
+class TestIdpNetworkRequestManager : public MockIdpNetworkRequestManager {
+ public:
+  void FetchWellKnown(const GURL& provider,
+                      FetchWellKnownCallback callback) override {
+    std::set<GURL> well_known_configs;
+    well_known_configs.insert(GURL(kProviderUrlFull));
+    base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+        FROM_HERE, base::BindOnce(std::move(callback), kFetchStatusSuccess,
+                                  well_known_configs));
+  }
+
+  void FetchConfig(const GURL& provider,
+                   int idp_brand_icon_ideal_size,
+                   int idp_brand_icon_minimum_size,
+                   FetchConfigCallback callback) override {
+    IdpNetworkRequestManager::Endpoints endpoints;
+    endpoints.token = GURL(kTokenEndpoint);
+    endpoints.accounts = GURL(kAccountsEndpoint);
+
+    base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+        FROM_HERE, base::BindOnce(std::move(callback), kFetchStatusSuccess,
+                                  endpoints, IdentityProviderMetadata()));
+  }
+
+  void SendAccountsRequest(const GURL& accounts_url,
+                           const std::string& client_id,
+                           AccountsRequestCallback callback) override {
+    base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+        FROM_HERE,
+        base::BindOnce(std::move(callback), kFetchStatusSuccess, kAccounts));
+  }
+
+  void SendTokenRequest(const GURL& token_url,
+                        const std::string& account,
+                        const std::string& url_encoded_post_data,
+                        TokenRequestCallback callback) override {
+    base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+        FROM_HERE,
+        base::BindOnce(std::move(callback), kFetchStatusSuccess, kToken));
+  }
+
+ private:
+  FetchStatus kFetchStatusSuccess{
+      IdpNetworkRequestManager::ParseStatus::kSuccess, net::HTTP_OK};
+};
+
+class TestDialogController
+    : public NiceMock<MockIdentityRequestDialogController> {
+ public:
+  struct State {
+    bool did_show_accounts_dialog{false};
+  };
+
+  enum class AccountsDialogAction {
+    kNone,
+    kSelectAccount,
+  };
+
+  // `state` is a pointer parameter so that it can outlive TestDialogController.
+  TestDialogController(AccountsDialogAction accounts_dialog_action,
+                       State* state)
+      : accounts_dialog_action_(accounts_dialog_action), state_(state) {}
+
+  ~TestDialogController() override = default;
+  TestDialogController(TestDialogController&) = delete;
+  TestDialogController& operator=(TestDialogController&) = delete;
+
+  void ShowAccountsDialog(
+      WebContents* rp_web_contents,
+      const std::string& rp_for_display,
+      const std::vector<IdentityProviderData>& identity_provider_data,
+      IdentityRequestAccount::SignInMode sign_in_mode,
+      IdentityRequestDialogController::AccountSelectionCallback on_selected,
+      IdentityRequestDialogController::DismissCallback dismiss_callback)
+      override {
+    state_->did_show_accounts_dialog = true;
+    if (accounts_dialog_action_ == AccountsDialogAction::kSelectAccount) {
+      std::move(on_selected)
+          .Run(GURL(kProviderUrlFull), kAccountId, /*is_sign_in=*/true);
+    }
+  }
+
+ private:
+  AccountsDialogAction accounts_dialog_action_{AccountsDialogAction::kNone};
+  raw_ptr<State> state_;
+};
+
+class TestApiPermissionDelegate : public MockApiPermissionDelegate {
+ public:
+  ApiPermissionStatus GetApiPermissionStatus(
+      const url::Origin& origin) override {
+    return ApiPermissionStatus::GRANTED;
+  }
+};
+
+}  // namespace
+
+class FederatedAuthRequestImplMultipleFramesTest
+    : public RenderViewHostImplTestHarness {
+ protected:
+  FederatedAuthRequestImplMultipleFramesTest() = default;
+  ~FederatedAuthRequestImplMultipleFramesTest() override = default;
+
+  void SetUp() override {
+    RenderViewHostImplTestHarness::SetUp();
+    test_api_permission_delegate_ =
+        std::make_unique<TestApiPermissionDelegate>();
+    mock_permission_delegate_ =
+        std::make_unique<NiceMock<MockPermissionDelegate>>();
+
+    static_cast<TestWebContents*>(web_contents())
+        ->NavigateAndCommit(GURL(kRpUrl), ui::PAGE_TRANSITION_LINK);
+  }
+
+  // Does token request and waits for result.
+  void DoRequestTokenAndWait(
+      mojo::Remote<blink::mojom::FederatedAuthRequest>& request_remote,
+      AuthRequestCallbackHelper& callback_helper) {
+    DoRequestToken(request_remote, callback_helper.callback());
+    request_remote.set_disconnect_handler(callback_helper.quit_closure());
+
+    // Ensure that the request makes its way to FederatedAuthRequestImpl.
+    base::RunLoop().RunUntilIdle();
+    // Fast forward clock so that the pending
+    // FederatedAuthRequestImpl::OnRejectRequest() task, if any, gets a
+    // chance to run.
+    task_environment()->FastForwardBy(base::Minutes(10));
+
+    callback_helper.WaitForCallback();
+    request_remote.set_disconnect_handler(base::OnceClosure());
+  }
+
+  FederatedAuthRequestImpl* CreateFederatedAuthRequestImpl(
+      RenderFrameHost& render_frame_host,
+      mojo::Remote<blink::mojom::FederatedAuthRequest>& request_remote,
+      TestDialogController::AccountsDialogAction accounts_dialog_action,
+      TestDialogController::State* dialog_controller_state) {
+    FederatedAuthRequestImpl* federated_auth_request_impl =
+        &FederatedAuthRequestImpl::CreateForTesting(
+            render_frame_host, test_api_permission_delegate_.get(),
+            mock_permission_delegate_.get(),
+            request_remote.BindNewPipeAndPassReceiver());
+    federated_auth_request_impl->SetDialogControllerForTests(
+        std::make_unique<TestDialogController>(accounts_dialog_action,
+                                               dialog_controller_state));
+    federated_auth_request_impl->SetNetworkManagerForTests(
+        std::make_unique<TestIdpNetworkRequestManager>());
+    federated_auth_request_impl->SetTokenRequestDelayForTests(
+        base::TimeDelta());
+    return federated_auth_request_impl;
+  }
+
+  void DoRequestToken(
+      mojo::Remote<blink::mojom::FederatedAuthRequest>& request_remote,
+      RequestTokenCallback callback) {
+    auto idp_ptr = blink::mojom::IdentityProviderConfig::New(
+        GURL(kProviderUrlFull), kClientId, kNonce, /*login_hint=*/"");
+    std::vector<blink::mojom::IdentityProviderConfigPtr> idp_ptrs;
+    idp_ptrs.push_back(std::move(idp_ptr));
+    auto get_params = blink::mojom::IdentityProviderGetParameters::New(
+        std::move(idp_ptrs), /*prefer_auto_signin=*/true);
+    std::vector<blink::mojom::IdentityProviderGetParametersPtr> idp_get_params;
+    idp_get_params.push_back(std::move(get_params));
+
+    request_remote->RequestToken(std::move(idp_get_params),
+                                 std::move(callback));
+    request_remote.FlushForTesting();
+  }
+
+ protected:
+  std::unique_ptr<TestApiPermissionDelegate> test_api_permission_delegate_;
+  std::unique_ptr<NiceMock<MockPermissionDelegate>> mock_permission_delegate_;
+};
+
+// Test that test harness can execute successful FedCM flow for iframe.
+TEST_F(FederatedAuthRequestImplMultipleFramesTest, TestHarness) {
+  base::test::ScopedFeatureList list;
+  list.InitWithFeatures({features::kFedCm, features::kFedCmIframeSupport}, {});
+
+  RenderFrameHost* iframe_rfh = content::RenderFrameHostTester::For(main_rfh())
+                                    ->AppendChild(/*frame_name=*/"");
+
+  mojo::Remote<blink::mojom::FederatedAuthRequest> iframe_request_remote;
+  TestDialogController::State iframe_dialog_state;
+  CreateFederatedAuthRequestImpl(
+      *iframe_rfh, iframe_request_remote,
+      TestDialogController::AccountsDialogAction::kSelectAccount,
+      &iframe_dialog_state);
+
+  AuthRequestCallbackHelper iframe_callback_helper;
+  DoRequestTokenAndWait(iframe_request_remote, iframe_callback_helper);
+  EXPECT_EQ(RequestTokenStatus::kSuccess, iframe_callback_helper.status());
+  EXPECT_TRUE(iframe_dialog_state.did_show_accounts_dialog);
+}
+
+// Test that FedCM request fails on iframe if there is an in-progress FedCM
+// request for a different frame on the page.
+TEST_F(FederatedAuthRequestImplMultipleFramesTest, IframeTooManyRequests) {
+  base::test::ScopedFeatureList list;
+  list.InitWithFeatures({features::kFedCm, features::kFedCmIframeSupport}, {});
+
+  mojo::Remote<blink::mojom::FederatedAuthRequest> main_frame_request_remote;
+  TestDialogController::State main_frame_dialog_state;
+  CreateFederatedAuthRequestImpl(
+      *main_rfh(), main_frame_request_remote,
+      TestDialogController::AccountsDialogAction::kNone,
+      &main_frame_dialog_state);
+  DoRequestToken(main_frame_request_remote, RequestTokenCallback());
+  EXPECT_TRUE(main_frame_dialog_state.did_show_accounts_dialog);
+
+  RenderFrameHost* iframe_rfh = content::RenderFrameHostTester::For(main_rfh())
+                                    ->AppendChild(/*frame_name=*/"");
+  mojo::Remote<blink::mojom::FederatedAuthRequest> iframe_request_remote;
+  TestDialogController::State iframe_dialog_state;
+  CreateFederatedAuthRequestImpl(
+      *iframe_rfh, iframe_request_remote,
+      TestDialogController::AccountsDialogAction::kSelectAccount,
+      &iframe_dialog_state);
+
+  AuthRequestCallbackHelper iframe_callback_helper;
+  DoRequestTokenAndWait(iframe_request_remote, iframe_callback_helper);
+  EXPECT_EQ(RequestTokenStatus::kErrorTooManyRequests,
+            iframe_callback_helper.status());
+  EXPECT_FALSE(iframe_dialog_state.did_show_accounts_dialog);
+}
+
+}  // namespace content

content/browser/webid/federated_auth_request_impl_unittest.cc

diff --git a/content/browser/webid/federated_auth_request_impl_unittest.cc b/content/browser/webid/federated_auth_request_impl_unittest.cc
index 8acaeb5e..92c40f1 100644
--- a/content/browser/webid/federated_auth_request_impl_unittest.cc
+++ b/content/browser/webid/federated_auth_request_impl_unittest.cc
@@ -20,6 +20,7 @@
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/webid/fedcm_metrics.h"
 #include "content/browser/webid/test/delegated_idp_network_request_manager.h"
+#include "content/browser/webid/test/federated_auth_request_request_token_callback_helper.h"
 #include "content/browser/webid/test/mock_api_permission_delegate.h"
 #include "content/browser/webid/test/mock_identity_request_dialog_controller.h"
 #include "content/browser/webid/test/mock_idp_network_request_manager.h"
@@ -47,6 +48,8 @@
 using AccountList = content::IdpNetworkRequestManager::AccountList;
 using ApiPermissionStatus =
     content::FederatedIdentityApiPermissionContextDelegate::PermissionStatus;
+using AuthRequestCallbackHelper =
+    content::FederatedAuthRequestRequestTokenCallbackHelper;
 using DismissReason = content::IdentityRequestDialogController::DismissReason;
 using FedCmEntry = ukm::builders::Blink_FedCm;
 using FedCmIdpEntry = ukm::builders::Blink_FedCmIdp;
@@ -296,67 +299,6 @@
   return url::Origin::Create(GURL(url_string));
 }
 
-// Helper class for receiving the mojo method callback.
-class AuthRequestCallbackHelper {
- public:
-  AuthRequestCallbackHelper() = default;
-  ~AuthRequestCallbackHelper() = default;
-
-  AuthRequestCallbackHelper(const AuthRequestCallbackHelper&) = delete;
-  AuthRequestCallbackHelper& operator=(const AuthRequestCallbackHelper&) =
-      delete;
-
-  absl::optional<RequestTokenStatus> status() const { return status_; }
-  absl::optional<GURL> selected_idp_config_url() const {
-    return selected_idp_config_url_;
-  }
-  absl::optional<std::string> token() const { return token_; }
-
-  base::OnceClosure quit_closure() {
-    return base::BindOnce(&AuthRequestCallbackHelper::Quit,
-                          base::Unretained(this));
-  }
-
-  // This can only be called once per lifetime of this object.
-  base::OnceCallback<void(RequestTokenStatus,
-                          const absl::optional<GURL>&,
-                          const absl::optional<std::string>&)>
-  callback() {
-    return base::BindOnce(&AuthRequestCallbackHelper::ReceiverMethod,
-                          base::Unretained(this));
-  }
-
-  bool was_callback_called() const { return was_called_; }
-
-  // Returns when callback() is called, which can be immediately if it has
-  // already been called.
-  void WaitForCallback() {
-    if (was_called_)
-      return;
-    wait_for_callback_loop_.Run();
-  }
-
- private:
-  void ReceiverMethod(RequestTokenStatus status,
-                      const absl::optional<GURL>& selected_idp_config_url,
-                      const absl::optional<std::string>& token) {
-    CHECK(!was_called_);
-    status_ = status;
-    selected_idp_config_url_ = selected_idp_config_url;
-    token_ = token;
-    was_called_ = true;
-    wait_for_callback_loop_.Quit();
-  }
-
-  void Quit() { wait_for_callback_loop_.Quit(); }
-
-  bool was_called_ = false;
-  base::RunLoop wait_for_callback_loop_;
-  absl::optional<RequestTokenStatus> status_;
-  absl::optional<GURL> selected_idp_config_url_;
-  absl::optional<std::string> token_;
-};
-
 class TestIdpNetworkRequestManager : public MockIdpNetworkRequestManager {
  public:
   void SetTestConfig(const MockConfiguration& configuration) {
@@ -2454,79 +2396,6 @@
   RunAuthTest(kDefaultRequestParameters, expectations, configuration);
 }
 
-TEST_F(FederatedAuthRequestImplTest, IframeTooManyRequests) {
-  base::test::ScopedFeatureList list;
-  list.InitWithFeatures({features::kFedCm, features::kFedCmIframeSupport}, {});
-  EXPECT_CALL(*mock_dialog_controller(), ShowAccountsDialog(_, _, _, _, _, _))
-      .WillOnce(Invoke(
-          [&](content::WebContents* rp_web_contents,
-              const std::string& rp_for_display,
-              const std::vector<IdentityProviderData>& identity_provider_data,
-              SignInMode sign_in_mode,
-              IdentityRequestDialogController::AccountSelectionCallback
-                  on_selected,
-              IdentityRequestDialogController::DismissCallback
-                  dismiss_callback) {
-            // Does not do anything (user did not close or select an account).
-          }));
-  MockConfiguration configuration = kConfigurationValid;
-  configuration.wait_for_callback = false;
-  configuration.customized_dialog = true;
-  RequestExpectations expectations = {
-      /*return_status=*/absl::nullopt,
-      /*devtools_issue_statuses=*/{},
-      /*selected_idp_config_url=*/absl::nullopt,
-      /*fetched_endpoints=*/FETCH_ENDPOINT_ALL_REQUEST_TOKEN &
-          ~FetchedEndpoint::TOKEN};
-  RunAuthTest(kDefaultRequestParameters, expectations, configuration);
-
-  // Add an iframe and test that it fails to invoke the API. This test could be
-  // improved: it is hacky in that it resets the parameters needed to reuse the
-  // methods in the test class.
-  RenderFrameHost* iframe_rfh = content::RenderFrameHostTester::For(main_rfh())
-                                    ->AppendChild(/*frame_name=*/"");
-  // We need to keep the main frame's Remote alive so store it in a separate
-  // variable so that we can set  |request_remote_| as the iframe's remote and
-  // use the test methods.
-  mojo::Remote<blink::mojom::FederatedAuthRequest> request_remote =
-      std::move(request_remote_);
-  request_remote_.reset();
-
-  // Initialize the iframe FederatedAuthRequestImpl as well as the helper test
-  // classes so that they all now belong to the iframe's
-  // FederatedAuthRequestImpl.
-  FederatedAuthRequestImpl* iframe_federated_auth_request_impl =
-      &FederatedAuthRequestImpl::CreateForTesting(
-          *iframe_rfh, test_api_permission_delegate_.get(),
-          mock_permission_delegate_.get(),
-          request_remote_.BindNewPipeAndPassReceiver());
-
-  auto mock_dialog_controller =
-      std::make_unique<NiceMock<MockIdentityRequestDialogController>>();
-  mock_dialog_controller_ = mock_dialog_controller.get();
-  iframe_federated_auth_request_impl->SetDialogControllerForTests(
-      std::move(mock_dialog_controller));
-
-  std::unique_ptr<TestIdpNetworkRequestManager> network_request_manager =
-      std::make_unique<TestIdpNetworkRequestManager>();
-  test_network_request_manager_ = std::move(network_request_manager);
-  iframe_federated_auth_request_impl->SetNetworkManagerForTests(
-      std::make_unique<DelegatedIdpNetworkRequestManager>(
-          test_network_request_manager_.get()));
-
-  iframe_federated_auth_request_impl->SetTokenRequestDelayForTests(
-      base::TimeDelta());
-  configuration.customized_dialog = false;
-  // The iframe invocation should fail with
-  // RequestTokenStatus::kErrorTooManyRequests since the main frame's FedCM
-  // request has not yet been finalized.
-  expectations = {RequestTokenStatus::kErrorTooManyRequests,
-                  /*devtools_issue_statuses=*/{},
-                  /*selected_idp_config_url=*/absl::nullopt,
-                  /*fetched_endpoints=*/0};
-  RunAuthTest(kDefaultRequestParameters, expectations, configuration);
-}
-
 // TestIdpNetworkRequestManager subclass which records requests to metrics
 // endpoint.
 class IdpNetworkRequestMetricsRecorder : public TestIdpNetworkRequestManager {

content/browser/webid/test/federated_auth_request_request_token_callback_helper.cc

diff --git a/content/browser/webid/test/federated_auth_request_request_token_callback_helper.cc b/content/browser/webid/test/federated_auth_request_request_token_callback_helper.cc
new file mode 100644
index 0000000..e95a40ed
--- /dev/null
+++ b/content/browser/webid/test/federated_auth_request_request_token_callback_helper.cc
@@ -0,0 +1,37 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/browser/webid/test/federated_auth_request_request_token_callback_helper.h"
+
+namespace content {
+
+FederatedAuthRequestRequestTokenCallbackHelper::
+    FederatedAuthRequestRequestTokenCallbackHelper() = default;
+FederatedAuthRequestRequestTokenCallbackHelper::
+    ~FederatedAuthRequestRequestTokenCallbackHelper() = default;
+
+void FederatedAuthRequestRequestTokenCallbackHelper::WaitForCallback() {
+  if (was_called_) {
+    return;
+  }
+  wait_for_callback_loop_.Run();
+}
+
+void FederatedAuthRequestRequestTokenCallbackHelper::ReceiverMethod(
+    blink::mojom::RequestTokenStatus status,
+    const absl::optional<GURL>& selected_idp_config_url,
+    const absl::optional<std::string>& token) {
+  CHECK(!was_called_);
+  status_ = status;
+  selected_idp_config_url_ = selected_idp_config_url;
+  token_ = token;
+  was_called_ = true;
+  wait_for_callback_loop_.Quit();
+}
+
+void FederatedAuthRequestRequestTokenCallbackHelper::Quit() {
+  wait_for_callback_loop_.Quit();
+}
+
+}  // namespace content

content/browser/webid/test/federated_auth_request_request_token_callback_helper.h

diff --git a/content/browser/webid/test/federated_auth_request_request_token_callback_helper.h b/content/browser/webid/test/federated_auth_request_request_token_callback_helper.h
new file mode 100644
index 0000000..0002406
--- /dev/null
+++ b/content/browser/webid/test/federated_auth_request_request_token_callback_helper.h
@@ -0,0 +1,76 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CONTENT_BROWSER_WEBID_TEST_FEDERATED_AUTH_REQUEST_REQUEST_TOKEN_CALLBACK_HELPER_H_
+#define CONTENT_BROWSER_WEBID_TEST_FEDERATED_AUTH_REQUEST_REQUEST_TOKEN_CALLBACK_HELPER_H_
+
+#include <string>
+
+#include "base/bind.h"
+#include "base/callback_forward.h"
+#include "base/run_loop.h"
+#include "content/browser/webid/federated_auth_request_impl.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
+#include "third_party/blink/public/mojom/webid/federated_auth_request.mojom.h"
+#include "url/gurl.h"
+
+namespace content {
+
+// Helper class for waiting for the FederatedAuthRequestImpl::RequestToken()
+// callback.
+class FederatedAuthRequestRequestTokenCallbackHelper {
+ public:
+  FederatedAuthRequestRequestTokenCallbackHelper();
+  ~FederatedAuthRequestRequestTokenCallbackHelper();
+
+  FederatedAuthRequestRequestTokenCallbackHelper(
+      const FederatedAuthRequestRequestTokenCallbackHelper&) = delete;
+  FederatedAuthRequestRequestTokenCallbackHelper& operator=(
+      const FederatedAuthRequestRequestTokenCallbackHelper&) = delete;
+
+  absl::optional<blink::mojom::RequestTokenStatus> status() const {
+    return status_;
+  }
+  absl::optional<GURL> selected_idp_config_url() const {
+    return selected_idp_config_url_;
+  }
+  absl::optional<std::string> token() const { return token_; }
+
+  // Returns base::OnceClosure which quits base::RunLoop started by
+  // WaitForCallback().
+  base::OnceClosure quit_closure() {
+    return base::BindOnce(&FederatedAuthRequestRequestTokenCallbackHelper::Quit,
+                          base::Unretained(this));
+  }
+
+  // This can only be called once per lifetime of this object.
+  FederatedAuthRequestImpl::RequestTokenCallback callback() {
+    return base::BindOnce(
+        &FederatedAuthRequestRequestTokenCallbackHelper::ReceiverMethod,
+        base::Unretained(this));
+  }
+
+  bool was_callback_called() const { return was_called_; }
+
+  // Returns when callback() is called, which can be immediately if it has
+  // already been called.
+  void WaitForCallback();
+
+ private:
+  void ReceiverMethod(blink::mojom::RequestTokenStatus status,
+                      const absl::optional<GURL>& selected_idp_config_url,
+                      const absl::optional<std::string>& token);
+
+  void Quit();
+
+  bool was_called_ = false;
+  base::RunLoop wait_for_callback_loop_;
+  absl::optional<blink::mojom::RequestTokenStatus> status_;
+  absl::optional<GURL> selected_idp_config_url_;
+  absl::optional<std::string> token_;
+};
+
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_WEBID_TEST_FEDERATED_AUTH_REQUEST_REQUEST_TOKEN_CALLBACK_HELPER_H_

content/browser/xr/metrics/session_metrics_helper.cc

diff --git a/content/browser/xr/metrics/session_metrics_helper.cc b/content/browser/xr/metrics/session_metrics_helper.cc
index 81ce2fb9..3975ab2 100644
--- a/content/browser/xr/metrics/session_metrics_helper.cc
+++ b/content/browser/xr/metrics/session_metrics_helper.cc
@@ -23,14 +23,6 @@
 
 const void* const kSessionMetricsHelperDataKey = &kSessionMetricsHelperDataKey;
 
-// minimum duration: 7 seconds for video, no minimum for headset/vr modes
-// maximum gap: 7 seconds between videos.  no gap for headset/vr-modes
-constexpr base::TimeDelta kMinimumVideoSessionDuration(base::Seconds(7));
-constexpr base::TimeDelta kMaximumVideoSessionGap(base::Seconds(7));
-
-constexpr base::TimeDelta kMinimumHeadsetSessionDuration(base::Seconds(0));
-constexpr base::TimeDelta kMaximumHeadsetSessionGap(base::Seconds(0));
-
 // Handles the lifetime of the helper which is attached to a WebContents.
 class SessionMetricsHelperData : public base::SupportsUserData::Data {
  public:
@@ -99,8 +91,6 @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(contents);
 
-  num_videos_playing_ = contents->GetCurrentlyPlayingVideoCount();
-
   Observe(contents);
 }
 
@@ -158,7 +148,9 @@
         enabled_features) {
   DVLOG(1) << __func__;
   DCHECK(!webxr_immersive_session_tracker_);
-  base::Time start_time = base::Time::Now();
+
+  session_timer_ = std::make_unique<SessionTimer>();
+  session_timer_->StartSession();
 
   // TODO(crbug.com/1061899): The code here assumes that it's called on
   // behalf of the active frame, which is not always true.
@@ -167,24 +159,6 @@
       std::make_unique<ukm::builders::XR_WebXR_Session>(
           web_contents()->GetPrimaryMainFrame()->GetPageUkmSourceId()));
 
-  // TODO(https://crbug.com/1056930): Consider renaming the timers to something
-  // that indicates both that these also record AR, and that these are no longer
-  // "suffixed" histograms.
-  session_timer_ = std::make_unique<SessionTimer>(
-      "VRSessionTime.WebVR", kMaximumHeadsetSessionGap,
-      kMinimumHeadsetSessionDuration);
-  session_timer_->StartSession(start_time);
-
-  session_video_timer_ = std::make_unique<SessionTimer>(
-      "VRSessionVideoTime.WebVR", kMaximumVideoSessionGap,
-      kMinimumVideoSessionDuration);
-
-  num_session_video_playback_ = num_videos_playing_;
-
-  if (num_videos_playing_ > 0) {
-    session_video_timer_->StartSession(start_time);
-  }
-
   ReportInitialSessionData(webxr_immersive_session_tracker_.get(),
                            session_options, enabled_features);
 
@@ -207,54 +181,8 @@
   webxr_immersive_session_tracker_->RecordEntry();
   webxr_immersive_session_tracker_ = nullptr;
 
-  // Destroyig the timers will both stop the session and force them to log their
-  // metrics.
+  // Destroying the timer will force the session to log metrics.
   session_timer_ = nullptr;
-  session_video_timer_ = nullptr;
-
-  UMA_HISTOGRAM_COUNTS_100("VRSessionVideoCount", num_session_video_playback_);
-}
-
-void SessionMetricsHelper::MediaStartedPlaying(
-    const MediaPlayerInfo& media_info,
-    const content::MediaPlayerId&) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
-  if (!media_info.has_video)
-    return;
-
-  if (num_videos_playing_ == 0) {
-    // started playing video - start sessions
-    base::Time start_time = base::Time::Now();
-
-    if (session_video_timer_) {
-      session_video_timer_->StartSession(start_time);
-    }
-  }
-
-  num_videos_playing_++;
-  num_session_video_playback_++;
-}
-
-void SessionMetricsHelper::MediaStoppedPlaying(
-    const MediaPlayerInfo& media_info,
-    const content::MediaPlayerId&,
-    WebContentsObserver::MediaStoppedReason reason) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
-  if (!media_info.has_video)
-    return;
-
-  num_videos_playing_--;
-
-  if (num_videos_playing_ == 0) {
-    // stopped playing video - update existing video sessions
-    base::Time stop_time = base::Time::Now();
-
-    if (session_video_timer_) {
-      session_video_timer_->StopSession(true, stop_time);
-    }
-  }
 }
 
 void SessionMetricsHelper::PrimaryPageChanged(content::Page& page) {

content/browser/xr/metrics/session_metrics_helper.h

diff --git a/content/browser/xr/metrics/session_metrics_helper.h b/content/browser/xr/metrics/session_metrics_helper.h
index 5e91652..009742b1 100644
--- a/content/browser/xr/metrics/session_metrics_helper.h
+++ b/content/browser/xr/metrics/session_metrics_helper.h
@@ -63,15 +63,8 @@
   explicit SessionMetricsHelper(content::WebContents* contents);
 
   // WebContentsObserver
-  void MediaStartedPlaying(const MediaPlayerInfo& media_info,
-                           const content::MediaPlayerId&) override;
-  void MediaStoppedPlaying(
-      const MediaPlayerInfo& media_info,
-      const content::MediaPlayerId&,
-      WebContentsObserver::MediaStoppedReason reason) override;
   void PrimaryPageChanged(content::Page& page) override;
 
-  std::unique_ptr<SessionTimer> session_video_timer_;
   std::unique_ptr<SessionTimer> session_timer_;
 
   std::unique_ptr<WebXRSessionTracker> webxr_immersive_session_tracker_;
@@ -81,9 +74,6 @@
   // |StopAndRecordInlineSession|.
   std::unordered_map<size_t, std::unique_ptr<WebXRSessionTracker>>
       webxr_inline_session_trackers_;
-
-  int num_videos_playing_ = 0;
-  int num_session_video_playback_ = 0;
 };
 
 }  // namespace content

content/browser/xr/metrics/session_timer.cc

diff --git a/content/browser/xr/metrics/session_timer.cc b/content/browser/xr/metrics/session_timer.cc
index 38e8a72..8179ba8 100644
--- a/content/browser/xr/metrics/session_timer.cc
+++ b/content/browser/xr/metrics/session_timer.cc
@@ -8,61 +8,35 @@
 
 namespace content {
 
-SessionTimer::SessionTimer(char const* histogram_name,
-                           base::TimeDelta gap_time,
-                           base::TimeDelta minimum_duration)
-    : histogram_name_(histogram_name),
-      maximum_session_gap_time_(gap_time),
-      minimum_duration_(minimum_duration) {}
+SessionTimer::SessionTimer() = default;
 
 SessionTimer::~SessionTimer() {
-  StopSession(false, base::Time::Now());
+  StopSession();
 }
 
-void SessionTimer::StartSession(base::Time start_time) {
-  // If the new start time is within the minimum session gap time from the
-  // last stop, continue the previous session. Otherwise, start a new session,
-  // sending the event for the last session.
-  if (!stop_time_.is_null() &&
-      start_time - stop_time_ <= maximum_session_gap_time_) {
-    // Mark the previous segment as non-continuable, sending data and clearing
-    // state.
-    StopSession(false, stop_time_);
-  }
+void SessionTimer::StartSession() {
+  DCHECK(start_time_.is_null())
+      << "Must stop existing session before starting a new one";
 
-  start_time_ = start_time;
+  start_time_ = base::Time::Now();
 }
 
-void SessionTimer::StopSession(bool continuable, base::Time stop_time) {
-  // first accumulate time from this segment of the session
-  base::TimeDelta segment_duration =
-      (start_time_.is_null() ? base::TimeDelta() : stop_time - start_time_);
-  if (!segment_duration.is_zero() && segment_duration > minimum_duration_) {
-    accumulated_time_ = accumulated_time_ + segment_duration;
+void SessionTimer::StopSession() {
+  if (start_time_.is_null()) {
+    return;
   }
-
-  if (continuable) {
-    // if we are continuable, accumulate the current segment to the session,
-    // and set stop_time_ so we may continue later
-    accumulated_time_ = stop_time - start_time_ + accumulated_time_;
-    stop_time_ = stop_time;
-    start_time_ = base::Time();
-  } else {
-    // send the histogram now if we aren't continuable, clearing segment state
-    SendAccumulatedSessionTime();
-
-    // clear out start/stop/accumulated time
-    start_time_ = base::Time();
-    stop_time_ = base::Time();
-    accumulated_time_ = base::TimeDelta();
-  }
-}
-
-void SessionTimer::SendAccumulatedSessionTime() {
-  if (!accumulated_time_.is_zero()) {
-    base::UmaHistogramCustomTimes(histogram_name_, accumulated_time_,
+  // Calculate the duration of the session.
+  base::TimeDelta session_duration = base::Time::Now() - start_time_;
+  if (!session_duration.is_zero()) {
+    // TODO(https://crbug.com/1056930): Consider renaming the timers to
+    // something that indicates both that these also record AR, and that these
+    // are no longer "suffixed" histograms.
+    base::UmaHistogramCustomTimes("VRSessionTime.WebVR", session_duration,
                                   base::TimeDelta(), base::Hours(5), 100);
   }
+
+  // Clear out start time.
+  start_time_ = base::Time();
 }
 
 }  // namespace content

content/browser/xr/metrics/session_timer.h

diff --git a/content/browser/xr/metrics/session_timer.h b/content/browser/xr/metrics/session_timer.h
index c57ca7a1..df96d99d 100644
--- a/content/browser/xr/metrics/session_timer.h
+++ b/content/browser/xr/metrics/session_timer.h
@@ -10,43 +10,22 @@
 namespace content {
 
 // SessionTimer will monitor the time between calls to StartSession and
-// StopSession.  It will combine multiple segments into a single session if they
-// are sufficiently close in time.  It will also only include segments if they
-// are sufficiently long.
-// Because the session may be extended, the accumulated time is only sent when
-// a StopSession call indicates that the session is no longer continuable, or
-// on destruction.
+// StopSession, and will send the duration upon either StopSession or
+// destruction.
 class SessionTimer {
  public:
-  SessionTimer(char const* histogram_name,
-               base::TimeDelta gap_time,
-               base::TimeDelta minimum_duration);
+  explicit SessionTimer();
 
   virtual ~SessionTimer();
 
   SessionTimer(const SessionTimer&) = delete;
   SessionTimer& operator=(const SessionTimer&) = delete;
 
-  void StartSession(base::Time start_time);
-  void StopSession(bool continuable, base::Time stop_time);
+  void StartSession();
+  void StopSession();
 
  private:
-  void SendAccumulatedSessionTime();
-
-  char const* histogram_name_;
-
   base::Time start_time_;
-  base::Time stop_time_;
-  base::TimeDelta accumulated_time_;
-
-  // Config members.
-  // Maximum time gap allowed between a StopSession and a StartSession before it
-  // will be logged as a separate session.
-  base::TimeDelta maximum_session_gap_time_;
-
-  // Minimum time between a StartSession and StopSession required before it is
-  // added to the duration.
-  base::TimeDelta minimum_duration_;
 };
 
 }  // namespace content

content/child/runtime_features.cc

diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
index 34243dc..4950d89 100644
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -67,8 +67,9 @@
   WebRuntimeFeatures::EnableCompositedSelectionUpdate(true);
 #endif
 #if BUILDFLAG(IS_WIN)
-  if (base::win::GetVersion() >= base::win::Version::WIN10)
+  if (base::win::GetVersion() >= base::win::Version::WIN10) {
     WebRuntimeFeatures::EnableWebBluetooth(true);
+  }
 #endif
 
 #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -98,8 +99,9 @@
   WebRuntimeFeatures::EnableWebGLImageChromium(enable_web_gl_image_chromium);
 
 #if BUILDFLAG(IS_ANDROID)
-  if (command_line.HasSwitch(switches::kDisableMediaSessionAPI))
+  if (command_line.HasSwitch(switches::kDisableMediaSessionAPI)) {
     WebRuntimeFeatures::EnableMediaSession(false);
+  }
 #endif
 
 #if BUILDFLAG(IS_ANDROID)
@@ -158,12 +160,14 @@
       FeatureList::GetInstance()->IsFeatureOverridden(chromium_feature.name);
   switch (option) {
     case kSetOnlyIfOverridden:
-      if (is_overridden)
+      if (is_overridden) {
         enabler(feature_enabled);
+      }
       break;
     case kDefault:
-      if (feature_enabled || is_overridden)
+      if (feature_enabled || is_overridden) {
         enabler(feature_enabled);
+      }
       break;
     default:
       NOTREACHED();
@@ -248,7 +252,6 @@
     {wf::EnableNotificationContentImage, features::kNotificationContentImage,
      kSetOnlyIfOverridden},
     {wf::EnablePaymentApp, features::kServiceWorkerPaymentApps},
-    {wf::EnableWebPaymentAPICSP, features::kWebPaymentAPICSP},
     {wf::EnablePaymentRequest, features::kWebPayments},
     {wf::EnablePercentBasedScrolling, features::kWindowsScrollingPersonality},
     {wf::EnablePeriodicBackgroundSync, features::kPeriodicBackgroundSync},
@@ -325,7 +328,6 @@
            kSetOnlyIfOverridden},
           {"TrustedTypesFromLiteral", features::kTrustedTypesFromLiteral},
           {"WebAppTabStrip", features::kDesktopPWAsTabStrip},
-          {"WebAuthenticationConditionalUI", features::kWebAuthConditionalUI},
           {"WGIGamepadTriggerRumble",
            features::kEnableWindowsGamingInputDataFetcher},
           {"UserAgentFull", blink::features::kFullUserAgent},
@@ -402,8 +404,9 @@
       {wrf::EnableDirectSockets, switches::kIsolatedAppOrigins, true},
   };
   for (const auto& mapping : switchToFeatureMapping) {
-    if (command_line.HasSwitch(mapping.switch_name))
+    if (command_line.HasSwitch(mapping.switch_name)) {
       mapping.feature_enabler(mapping.target_enabled_state);
+    }
   }
 
   // Set EnableAutomationControlled if the caller passes
@@ -429,10 +432,12 @@
   if (command_line.HasSwitch(blink::switches::kEventPathPolicy)) {
     const std::string value =
         command_line.GetSwitchValueASCII(blink::switches::kEventPathPolicy);
-    if (value == blink::switches::kEventPathPolicy_ForceEnable)
+    if (value == blink::switches::kEventPathPolicy_ForceEnable) {
       WebRuntimeFeatures::EnableEventPath(true);
-    if (value == blink::switches::kEventPathPolicy_ForceDisable)
+    }
+    if (value == blink::switches::kEventPathPolicy_ForceDisable) {
       WebRuntimeFeatures::EnableEventPath(false);
+    }
   }
 
   // Enable or disable OffsetParentNewSpecBehavior for Enterprise Policy. This
@@ -442,11 +447,13 @@
     const std::string value = command_line.GetSwitchValueASCII(
         blink::switches::kOffsetParentNewSpecBehaviorPolicy);
     if (value ==
-        blink::switches::kOffsetParentNewSpecBehaviorPolicy_ForceEnable)
+        blink::switches::kOffsetParentNewSpecBehaviorPolicy_ForceEnable) {
       WebRuntimeFeatures::EnableOffsetParentNewSpecBehavior(true);
+    }
     if (value ==
-        blink::switches::kOffsetParentNewSpecBehaviorPolicy_ForceDisable)
+        blink::switches::kOffsetParentNewSpecBehaviorPolicy_ForceDisable) {
       WebRuntimeFeatures::EnableOffsetParentNewSpecBehavior(false);
+    }
   }
 
   // Enable or disable SendMouseEventsDisabledFormControls for Enterprise
@@ -455,12 +462,14 @@
           blink::switches::kSendMouseEventsDisabledFormControlsPolicy)) {
     const std::string value = command_line.GetSwitchValueASCII(
         blink::switches::kSendMouseEventsDisabledFormControlsPolicy);
-    if (value ==
-        blink::switches::kSendMouseEventsDisabledFormControlsPolicy_ForceEnable)
-      WebRuntimeFeatures::EnableSendMouseEventsDisabledFormControls(true);
     if (value == blink::switches::
-                     kSendMouseEventsDisabledFormControlsPolicy_ForceDisable)
+                     kSendMouseEventsDisabledFormControlsPolicy_ForceEnable) {
+      WebRuntimeFeatures::EnableSendMouseEventsDisabledFormControls(true);
+    }
+    if (value == blink::switches::
+                     kSendMouseEventsDisabledFormControlsPolicy_ForceDisable) {
       WebRuntimeFeatures::EnableSendMouseEventsDisabledFormControls(false);
+    }
   }
 }
 
@@ -492,10 +501,11 @@
 
   // TODO(rodneyding): This is a rare case for a stable feature
   // Need to investigate more to determine whether to refactor it.
-  if (command_line.HasSwitch(switches::kDisableV8IdleTasks))
+  if (command_line.HasSwitch(switches::kDisableV8IdleTasks)) {
     WebRuntimeFeatures::EnableV8IdleTasks(false);
-  else
+  } else {
     WebRuntimeFeatures::EnableV8IdleTasks(true);
+  }
 
   WebRuntimeFeatures::EnableBackForwardCache(
       content::IsBackForwardCacheEnabled());
@@ -633,8 +643,9 @@
     WebRuntimeFeatures::EnableTestOnlyFeatures(true);
   }
 
-  if (enable_experimental_web_platform_features)
+  if (enable_experimental_web_platform_features) {
     WebRuntimeFeatures::EnableExperimentalFeatures(true);
+  }
 
   SetRuntimeFeatureDefaultsForPlatform(command_line);
 

content/common/navigation_client.mojom

diff --git a/content/common/navigation_client.mojom b/content/common/navigation_client.mojom
index c1ed4af..58ce94f 100644
--- a/content/common/navigation_client.mojom
+++ b/content/common/navigation_client.mojom
@@ -234,6 +234,10 @@
   // enabled. The pointer is used to start a prefetch loading via the browser
   // process.
   //
+  // |topics_loader_factory| is used to proxy topics handling
+  // (https://github.com/patcg-individual-drafts/topics) via the browser
+  // process.
+  //
   // For automation driver-initiated navigations over the devtools protocol,
   // |devtools_navigation_token_| is used to tag the navigation. This navigation
   // token is then sent into the renderer and lands on the DocumentLoader. That
@@ -261,6 +265,7 @@
       blink.mojom.ControllerServiceWorkerInfo? controller_service_worker_info,
       blink.mojom.ServiceWorkerContainerInfoForClient? container_info,
       pending_remote<network.mojom.URLLoaderFactory>? prefetch_loader_factory,
+      pending_remote<network.mojom.URLLoaderFactory>? topics_loader_factory,
       blink.mojom.DocumentToken document_token,
       mojo_base.mojom.UnguessableToken devtools_navigation_token,
       array<blink.mojom.ParsedPermissionsPolicyDeclaration>? permissions_policy,

content/gpu/gpu_main.cc

diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index ca18863..c8fbf62 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -405,6 +405,12 @@
 namespace {
 
 #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+bool IsAsahiGpu(const gpu::GPUInfo::GPUDevice& device) {
+  // Asahi's vendor ID is a stub value (0xffffffff), so match the vendor name
+  // instead.
+  return device.vendor_string.find("Asahi") != std::string::npos;
+}
+
 bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
                        const gpu::GPUInfo* gpu_info,
                        const gpu::GpuPreferences& gpu_prefs) {
@@ -428,6 +434,8 @@
         angle::IsIntel(gpu_info->active_gpu().vendor_id);
     sandbox_options.use_nvidia_specific_policies =
         angle::IsNVIDIA(gpu_info->active_gpu().vendor_id);
+    sandbox_options.use_asahi_specific_policies =
+        IsAsahiGpu(gpu_info->active_gpu());
     for (const auto& gpu : gpu_info->secondary_gpus) {
       if (angle::IsAMD(gpu.vendor_id))
         sandbox_options.use_amd_specific_policies = true;
@@ -435,6 +443,8 @@
         sandbox_options.use_intel_specific_policies = true;
       else if (angle::IsNVIDIA(gpu.vendor_id))
         sandbox_options.use_nvidia_specific_policies = true;
+      else if (IsAsahiGpu(gpu))
+        sandbox_options.use_asahi_specific_policies = true;
     }
   }
   sandbox_options.accelerated_video_decode_enabled =

content/gpu/gpu_sandbox_hook_linux.cc

diff --git a/content/gpu/gpu_sandbox_hook_linux.cc b/content/gpu/gpu_sandbox_hook_linux.cc
index ce533950..0391df5 100644
--- a/content/gpu/gpu_sandbox_hook_linux.cc
+++ b/content/gpu/gpu_sandbox_hook_linux.cc
@@ -360,12 +360,21 @@
   }
 }
 
-void AddStandardGpuPermissions(std::vector<BrokerFilePermission>* permissions) {
+void AddStandardGpuPermissions(
+    std::vector<BrokerFilePermission>* permissions,
+    const sandbox::policy::SandboxSeccompBPF::Options& options) {
   static const char kDriCardBasePath[] = "/dev/dri/card";
   static const char kNvidiaCtlPath[] = "/dev/nvidiactl";
   static const char kNvidiaDeviceBasePath[] = "/dev/nvidia";
   static const char kNvidiaDeviceModeSetPath[] = "/dev/nvidia-modeset";
   static const char kNvidiaParamsPath[] = "/proc/driver/nvidia/params";
+  static const char kAsahiDri[] =
+#if defined(DRI_DRIVER_DIR)
+      DRI_DRIVER_DIR "/asahi_dri.so"
+#else
+      "/usr/lib64/dri/asahi_dri.so"
+#endif
+      ;
   static const char kDevShm[] = "/dev/shm/";
 
   // For shared memory.
@@ -397,6 +406,11 @@
       permissions->push_back(BrokerFilePermission::ReadOnly(sw_path));
     }
   }
+
+  // For Asahi drivers.
+  if (options.use_asahi_specific_policies) {
+    permissions->push_back(BrokerFilePermission::ReadOnly(kAsahiDri));
+  }
 }
 
 std::vector<BrokerFilePermission> FilePermissionsForGpu(
@@ -427,7 +441,7 @@
       AddIntelGpuPermissions(&permissions);
     }
     if (options.use_nvidia_specific_policies) {
-      AddStandardGpuPermissions(&permissions);
+      AddStandardGpuPermissions(&permissions, options);
     }
     return permissions;
   }
@@ -442,7 +456,7 @@
     }
   }
 
-  AddStandardGpuPermissions(&permissions);
+  AddStandardGpuPermissions(&permissions, options);
   return permissions;
 }
 

content/public/android/java/src/org/chromium/content/browser/input/ThreadedInputConnectionFactory.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/input/ThreadedInputConnectionFactory.java b/content/public/android/java/src/org/chromium/content/browser/input/ThreadedInputConnectionFactory.java
index 0f308a6..0888396 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/ThreadedInputConnectionFactory.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/ThreadedInputConnectionFactory.java
@@ -4,7 +4,6 @@
 
 package org.chromium.content.browser.input;
 
-import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.view.View;
@@ -129,8 +128,7 @@
 
         // https://crbug.com/820756
         final String htcMailPackageId = "com.htc.android.mail";
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N
-                || htcMailPackageId.equals(view.getContext().getPackageName())) {
+        if (htcMailPackageId.equals(view.getContext().getPackageName())) {
             // IMM can internally ignore subsequent activation requests, e.g., by checking
             // mServedConnecting.
             if (mCheckInvalidator != null) mCheckInvalidator.invalidate();

content/public/android/java/src/org/chromium/content/browser/picker/DateDialogNormalizer.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/picker/DateDialogNormalizer.java b/content/public/android/java/src/org/chromium/content/browser/picker/DateDialogNormalizer.java
index 9159106..e02d1706 100644
--- a/content/public/android/java/src/org/chromium/content/browser/picker/DateDialogNormalizer.java
+++ b/content/public/android/java/src/org/chromium/content/browser/picker/DateDialogNormalizer.java
@@ -4,7 +4,6 @@
 
 package org.chromium.content.browser.picker;
 
-import android.os.Build;
 import android.widget.DatePicker;
 import android.widget.DatePicker.OnDateChangedListener;
 
@@ -65,22 +64,6 @@
 
     private static void setLimits(DatePicker picker, long currentMillisForPicker,
             long minMillisForPicker, long maxMillisForPicker) {
-        // On Lollipop only (not KitKat or Marshmallow), DatePicker has terrible performance for
-        // large date ranges. This causes problems when the min or max date isn't set in HTML, in
-        // which case these values default to the min and max possible values for the JavaScript
-        // Date object (1CE and 275760CE). As a workaround, limit the date range to 5000 years
-        // before and after the current date. In practice, this doesn't limit users since scrolling
-        // through 5000 years in the DatePicker is highly impractical anyway. See
-        // http://crbug.com/441060
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP
-                || Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP_MR1) {
-            final long maxRangeMillis = 5000L * 365 * 24 * 60 * 60 * 1000;
-            minMillisForPicker = Math.max(minMillisForPicker,
-                    currentMillisForPicker - maxRangeMillis);
-            maxMillisForPicker = Math.min(maxMillisForPicker,
-                    currentMillisForPicker + maxRangeMillis);
-        }
-
         // On KitKat and earlier, DatePicker requires the minDate is always less than maxDate, even
         // during the process of setting those values (eek), so set them in an order that preserves
         // this invariant throughout.

content/public/android/java/src/org/chromium/content/browser/picker/DateTimePickerDialog.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/picker/DateTimePickerDialog.java b/content/public/android/java/src/org/chromium/content/browser/picker/DateTimePickerDialog.java
index 426601c..ba2bb64 100644
--- a/content/public/android/java/src/org/chromium/content/browser/picker/DateTimePickerDialog.java
+++ b/content/public/android/java/src/org/chromium/content/browser/picker/DateTimePickerDialog.java
@@ -6,15 +6,8 @@
 
 import android.app.AlertDialog;
 import android.content.Context;
-import android.content.ContextWrapper;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
-import android.content.res.AssetManager;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.os.Build;
-import android.os.LocaleList;
-import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.DatePicker;
@@ -22,19 +15,13 @@
 import android.widget.TimePicker;
 import android.widget.TimePicker.OnTimeChangedListener;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
 import org.chromium.content.R;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
-import java.util.IllegalFormatConversionException;
-import java.util.Locale;
 import java.util.TimeZone;
-import java.util.regex.Pattern;
-
-import javax.annotation.CheckForNull;
 
 /**
  * A dialog that allows the user to choose a date and time. Shown for HTML form input elements
@@ -96,9 +83,8 @@
         setIcon(0);
         setTitle(context.getText(R.string.date_time_picker_dialog_title));
 
-        Context dialogContext = getDialogContext(context);
         LayoutInflater inflater =
-                (LayoutInflater) dialogContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         View view = inflater.inflate(R.layout.date_time_picker_dialog, null);
         setView(view);
         mDatePicker = (DatePicker) view.findViewById(R.id.date_picker);
@@ -196,76 +182,4 @@
     private static int getMinute(TimePicker picker) {
         return picker.getCurrentMinute();
     }
-
-    /**
-     * Wraps context with {@link WorkaroundContextForSamsungLDateTimeBug} instance if needed.
-     */
-    private static Context getDialogContext(Context context) {
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP
-                || Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP_MR1) {
-            return new WorkaroundContextForSamsungLDateTimeBug(context);
-        }
-
-        return context;
-    }
-
-    /**
-     * Workaround for Samsung Lollipop devices that may crash due to wrong string resource supplied
-     * to {@link android.widget.SimpleMonthView}'s content description.
-     */
-    private static class WorkaroundContextForSamsungLDateTimeBug extends ContextWrapper {
-        @CheckForNull
-        private Resources mWrappedResources;
-
-        private WorkaroundContextForSamsungLDateTimeBug(Context context) {
-            super(context);
-        }
-
-        @Override
-        public Resources getResources() {
-            if (mWrappedResources == null) {
-                Resources r = super.getResources();
-                mWrappedResources = new WrappedResources(
-                        r.getAssets(), r.getDisplayMetrics(), r.getConfiguration()) {};
-            }
-            return mWrappedResources;
-        }
-
-        private static class WrappedResources extends Resources {
-            @SuppressWarnings("deprecation")
-            WrappedResources(AssetManager assets, DisplayMetrics displayMetrics,
-                    Configuration configuration) {
-                // The Resources constructor is safe to use on L & L_MR1
-                super(assets, displayMetrics, configuration);
-            }
-
-            @NonNull
-            @Override
-            public String getString(int id, Object... formatArgs) throws NotFoundException {
-                try {
-                    return super.getString(id, formatArgs);
-                } catch (IllegalFormatConversionException conversationException) {
-                    String template = super.getString(id);
-                    char conversion = conversationException.getConversion();
-                    // Trying to replace either all digit patterns (%d) or first one (%1$d).
-                    template = template.replaceAll(Pattern.quote("%" + conversion), "%s")
-                                       .replaceAll(Pattern.quote("%1$" + conversion), "%s");
-
-                    return String.format(getLocale(), template, formatArgs);
-                }
-            }
-
-            private Locale getLocale() {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    LocaleList locales = getConfiguration().getLocales();
-                    if (locales.size() > 0) {
-                        return locales.get(0);
-                    }
-                }
-                @SuppressWarnings("deprecation")
-                Locale locale = getConfiguration().locale;
-                return locale;
-            }
-        }
-    }
 }

content/public/android/java/src/org/chromium/content/browser/selection/FloatingPastePopupMenu.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/FloatingPastePopupMenu.java b/content/public/android/java/src/org/chromium/content/browser/selection/FloatingPastePopupMenu.java
index b3dc596..651be9f 100644
--- a/content/public/android/java/src/org/chromium/content/browser/selection/FloatingPastePopupMenu.java
+++ b/content/public/android/java/src/org/chromium/content/browser/selection/FloatingPastePopupMenu.java
@@ -6,7 +6,6 @@
 
 import android.content.Context;
 import android.graphics.Rect;
-import android.os.Build;
 import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -29,8 +28,6 @@
 
     public FloatingPastePopupMenu(Context context, View parent, PastePopupMenuDelegate delegate,
             ActionMode.Callback externalCallback) {
-        assert Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
-
         mParent = parent;
         mDelegate = delegate;
         mContext = context;

content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
index 9177d2e..1395c32 100644
--- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
@@ -663,7 +663,7 @@
         // ActionMode#invalidate() won't be able to re-layout the floating
         // action mode menu items according to the new rotation. So Chrome
         // has to re-create the action mode.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && isActionModeValid()) {
+        if (isActionModeValid()) {
             hidePopupsAndPreserveSelection();
             showActionModeOrClearOnFailure();
         }
@@ -877,8 +877,7 @@
      */
     @VisibleForTesting
     /* package */ void initializeTextProcessingMenu(Menu menu) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M
-                || !isSelectActionModeAllowed(MENU_ITEM_PROCESS_TEXT)) {
+        if (!isSelectActionModeAllowed(MENU_ITEM_PROCESS_TEXT)) {
             return;
         }
 
@@ -1126,7 +1125,6 @@
      */
     private void processText(Intent intent) {
         RecordUserAction.record("MobileActionMode.ProcessTextIntent");
-        assert Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
 
         // Use MAX_SHARE_QUERY_LENGTH for the Intent 100k limitation.
         String query = sanitizeQuery(getSelectedText(), MAX_SHARE_QUERY_LENGTH);

content/public/android/javatests/src/org/chromium/content/browser/VideoFullscreenOrientationLockTest.java

diff --git a/content/public/android/javatests/src/org/chromium/content/browser/VideoFullscreenOrientationLockTest.java b/content/public/android/javatests/src/org/chromium/content/browser/VideoFullscreenOrientationLockTest.java
index 82989ab..45d19f6 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/VideoFullscreenOrientationLockTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/VideoFullscreenOrientationLockTest.java
@@ -6,7 +6,6 @@
 
 import android.content.pm.ActivityInfo;
 import android.graphics.Rect;
-import android.os.Build;
 
 import androidx.test.filters.MediumTest;
 
@@ -21,7 +20,6 @@
 import org.chromium.base.test.util.Criteria;
 import org.chromium.base.test.util.CriteriaHelper;
 import org.chromium.base.test.util.CriteriaNotSatisfiedException;
-import org.chromium.base.test.util.DisableIf;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.content_public.browser.test.ContentJUnit4ClassRunner;
@@ -127,7 +125,6 @@
 
     @Test
     @MediumTest
-    @DisableIf.Build(message = "crbug.com/837423", sdk_is_less_than = Build.VERSION_CODES.M)
     @Restriction({UiRestriction.RESTRICTION_TYPE_PHONE})
     public void testEnterExitFullscreenWithControlsButton() throws Exception {
         // Start playback to guarantee it's properly loaded.

content/public/android/junit/src/org/chromium/content/browser/input/ThreadedInputConnectionFactoryTest.java

diff --git a/content/public/android/junit/src/org/chromium/content/browser/input/ThreadedInputConnectionFactoryTest.java b/content/public/android/junit/src/org/chromium/content/browser/input/ThreadedInputConnectionFactoryTest.java
index 425646d..1d3bbc4a 100644
--- a/content/public/android/junit/src/org/chromium/content/browser/input/ThreadedInputConnectionFactoryTest.java
+++ b/content/public/android/junit/src/org/chromium/content/browser/input/ThreadedInputConnectionFactoryTest.java
@@ -14,7 +14,6 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.os.Build;
 import android.os.Handler;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
@@ -34,7 +33,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowLooper;
-import org.robolectric.util.ReflectionHelpers;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.BaseRobolectricTestRunner;
@@ -127,12 +125,6 @@
 
     @Before
     public void setUp() {
-        // ThreadedInputConnectionFactory#initializeAndGet() logic is activated under N, so pretend
-        // that we're in L. Note that this is to workaround crbug.com/944476 that
-        // @Config(..., sdk = Build.VERSION_CODES.LOLLIPOP) doesn't work.
-        ReflectionHelpers.setStaticField(
-                Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.LOLLIPOP);
-
         MockitoAnnotations.initMocks(this);
 
         mEditorInfo = new EditorInfo();
@@ -150,6 +142,9 @@
 
         when(mContext.getSystemService(Context.INPUT_METHOD_SERVICE))
                 .thenReturn(mInputMethodManager);
+        // ThreadedInputConnectionFactory#initializeAndGet() logic is activated when the package is
+        // "com.htc.android.mail"
+        when(mContext.getPackageName()).thenReturn("com.htc.android.mail");
         when(mContainerView.getContext()).thenReturn(mContext);
         when(mContainerView.getHandler()).thenReturn(mUiHandler);
         when(mContainerView.hasFocus()).thenReturn(true);
@@ -240,8 +235,6 @@
         mInOrder.verify(mProxyView).onWindowFocusChanged(true);
         mInOrder.verify(mInputMethodManager).isActive(mContainerView);
         mInOrder.verify(mProxyView).onCreateInputConnection(any(EditorInfo.class));
-        mInOrder.verify(mContainerView).getContext();  // BaseInputConnection#<init>
-        mInOrder.verifyNoMoreInteractions();
         assertNotNull(mInputConnection);
         assertTrue(ThreadedInputConnection.class.isInstance(mInputConnection));
 
@@ -343,8 +336,6 @@
         mInOrder.verify(mProxyView).onWindowFocusChanged(true);
         mInOrder.verify(mInputMethodManager).isActive(mContainerView);
         mInOrder.verify(mProxyView).onCreateInputConnection(any(EditorInfo.class));
-        mInOrder.verify(mContainerView).getContext(); // BaseInputConnection#<init>
-        mInOrder.verifyNoMoreInteractions();
         assertNotNull(mInputConnection);
         assertTrue(ThreadedInputConnection.class.isInstance(mInputConnection));
 

content/public/browser/content_browser_client.cc

diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index e746aae..bac1d3d 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -171,8 +171,7 @@
   return true;
 }
 
-bool ContentBrowserClient::DoesWebUISchemeRequireProcessLock(
-    base::StringPiece scheme) {
+bool ContentBrowserClient::DoesWebUIUrlRequireProcessLock(const GURL& url) {
   return true;
 }
 
@@ -236,7 +235,7 @@
 
 bool ContentBrowserClient::ShouldStayInParentProcessForNTP(
     const GURL& url,
-    SiteInstance* parent_site_instance) {
+    const GURL& parent_site_url) {
   return false;
 }
 

content/public/browser/content_browser_client.h

diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index ca28e9b..efb918a 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -398,11 +398,14 @@
   virtual bool ShouldLockProcessToSite(BrowserContext* browser_context,
                                        const GURL& effective_url);
 
-  // Returns a boolean indicating whether the WebUI |scheme| requires its
-  // process to be locked to the WebUI origin.
-  // Note: This method can be called from multiple threads. It is not safe to
-  // assume it runs only on the UI thread.
-  virtual bool DoesWebUISchemeRequireProcessLock(base::StringPiece scheme);
+  // Returns a boolean indicating whether the WebUI |url| requires its process
+  // to be locked to the WebUI origin. Note: This method can be called from
+  // multiple threads. It is not safe to assume it runs only on the UI thread.
+  //
+  // TODO(crbug.com/566091): Remove this exception once most visited tiles can
+  // load in OOPIFs on the NTP.  Ideally, all WebUI urls should load in locked
+  // processes.
+  virtual bool DoesWebUIUrlRequireProcessLock(const GURL& url);
 
   // Returns true if everything embedded inside a document with given scheme
   // should be treated as first-party content. |scheme| will be in canonical
@@ -521,9 +524,8 @@
 
   // Temporary hack to determine whether to skip OOPIFs on the new tab page.
   // TODO(creis): Remove when https://crbug.com/566091 is fixed.
-  virtual bool ShouldStayInParentProcessForNTP(
-      const GURL& url,
-      SiteInstance* parent_site_instance);
+  virtual bool ShouldStayInParentProcessForNTP(const GURL& url,
+                                               const GURL& parent_site_url);
 
   // Returns whether a new view for a given |site_url| can be launched in a
   // given |process_host|.

content/public/common/content_features.cc

diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
index 0ffc301e..dc268c2 100644
--- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc
@@ -1036,11 +1036,6 @@
              "ServiceWorkerPaymentApps",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
-// Enable connect-src CSP directive for the Web Payment API.
-BASE_FEATURE(kWebPaymentAPICSP,
-             "WebPaymentAPICSP",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-
 // Use this feature to experiment terminating a service worker when it doesn't
 // control any clients: https://crbug.com/1043845.
 BASE_FEATURE(kServiceWorkerTerminationOnNoControllee,
@@ -1335,11 +1330,6 @@
 #endif
 );
 
-// Controls whether WebAuthn conditional UI requests are supported.
-BASE_FEATURE(kWebAuthConditionalUI,
-             "WebAuthenticationConditionalUI",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-
 // Controls whether WebAuthn get requests for discoverable credentials use the
 // Touch To Fill bottom sheet on Android.
 BASE_FEATURE(kWebAuthnTouchToFillCredentialSelection,
@@ -1489,11 +1479,6 @@
 // https://w3c.github.io/web-nfc/
 BASE_FEATURE(kWebNfc, "WebNFC", base::FEATURE_ENABLED_BY_DEFAULT);
 
-// Throttle begin frame if Android WebView isn't getting draws.
-BASE_FEATURE(kWebViewThrottleBackgroundBeginFrame,
-             "WebViewThrottleBackgroundBeginFrame",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-
 #endif  // BUILDFLAG(IS_ANDROID)
 
 #if BUILDFLAG(IS_MAC)
@@ -1546,8 +1531,9 @@
 }
 
 VideoCaptureServiceConfiguration GetVideoCaptureServiceConfiguration() {
-  if (!ShouldEnableVideoCaptureService())
+  if (!ShouldEnableVideoCaptureService()) {
     return VideoCaptureServiceConfiguration::kDisabled;
+  }
 
 // On ChromeOS the service must run in the browser process, because parts of the
 // code depend on global objects that are only available in the Browser process.
@@ -1556,8 +1542,9 @@
   return VideoCaptureServiceConfiguration::kEnabledForBrowserProcess;
 #else
 #if BUILDFLAG(IS_WIN)
-  if (base::win::GetVersion() <= base::win::Version::WIN7)
+  if (base::win::GetVersion() <= base::win::Version::WIN7) {
     return VideoCaptureServiceConfiguration::kEnabledForBrowserProcess;
+  }
 #endif
   return base::FeatureList::IsEnabled(
              features::kRunVideoCaptureServiceInBrowserProcess)

content/public/common/content_features.h

diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
index bd895b6..c9ae4fa 100644
--- a/content/public/common/content_features.h
+++ b/content/public/common/content_features.h
@@ -171,7 +171,6 @@
 CONTENT_EXPORT BASE_DECLARE_FEATURE(kNoStatePrefetchHoldback);
 CONTENT_EXPORT BASE_DECLARE_FEATURE(kOriginIsolationHeader);
 CONTENT_EXPORT BASE_DECLARE_FEATURE(kOverscrollHistoryNavigation);
-CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebPaymentAPICSP);
 CONTENT_EXPORT BASE_DECLARE_FEATURE(kPeriodicBackgroundSync);
 CONTENT_EXPORT BASE_DECLARE_FEATURE(kFeaturePolicyHeader);
 CONTENT_EXPORT BASE_DECLARE_FEATURE(kPepper3DImageChromium);
@@ -299,7 +298,6 @@
 CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyRelaxedSimd);
 CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyTiering);
 CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyTrapHandler);
-CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAuthConditionalUI);
 CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAuthnTouchToFillCredentialSelection);
 CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebBluetooth);
 CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebBluetoothNewPermissionsBackend);
@@ -329,7 +327,6 @@
 CONTENT_EXPORT BASE_DECLARE_FEATURE(kUserMediaScreenCapturing);
 CONTENT_EXPORT BASE_DECLARE_FEATURE(kWarmUpNetworkProcess);
 CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebNfc);
-CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebViewThrottleBackgroundBeginFrame);
 
 #endif  // BUILDFLAG(IS_ANDROID)
 

content/renderer/navigation_client.cc

diff --git a/content/renderer/navigation_client.cc b/content/renderer/navigation_client.cc
index c1d52f6..aaddbe887 100644
--- a/content/renderer/navigation_client.cc
+++ b/content/renderer/navigation_client.cc
@@ -37,6 +37,7 @@
     blink::mojom::ServiceWorkerContainerInfoForClientPtr container_info,
     mojo::PendingRemote<network::mojom::URLLoaderFactory>
         prefetch_loader_factory,
+    mojo::PendingRemote<network::mojom::URLLoaderFactory> topics_loader_factory,
     const blink::DocumentToken& document_token,
     const base::UnguessableToken& devtools_navigation_token,
     const absl::optional<blink::ParsedPermissionsPolicy>& permissions_policy,
@@ -58,8 +59,8 @@
       std::move(url_loader_client_endpoints), std::move(subresource_loaders),
       std::move(subresource_overrides),
       std::move(controller_service_worker_info), std::move(container_info),
-      std::move(prefetch_loader_factory), document_token,
-      devtools_navigation_token, permissions_policy,
+      std::move(prefetch_loader_factory), std::move(topics_loader_factory),
+      document_token, devtools_navigation_token, permissions_policy,
       std::move(policy_container), std::move(code_cache_host),
       std::move(cookie_manager_info), std::move(storage_info),
       std::move(callback));

content/renderer/navigation_client.h

diff --git a/content/renderer/navigation_client.h b/content/renderer/navigation_client.h
index 39364fdc..a5f4c58 100644
--- a/content/renderer/navigation_client.h
+++ b/content/renderer/navigation_client.h
@@ -36,6 +36,8 @@
       blink::mojom::ServiceWorkerContainerInfoForClientPtr container_info,
       mojo::PendingRemote<network::mojom::URLLoaderFactory>
           prefetch_loader_factory,
+      mojo::PendingRemote<network::mojom::URLLoaderFactory>
+          topics_loader_factory,
       const blink::DocumentToken& document_token,
       const base::UnguessableToken& devtools_navigation_token,
       const absl::optional<blink::ParsedPermissionsPolicy>& permissions_policy,

content/renderer/render_frame_impl.cc

diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 9e09c53..1d59106 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1546,8 +1546,9 @@
     // `params->subresource_loader_factories`.
     render_frame->loader_factories_ = render_frame->CreateLoaderFactoryBundle(
         std::move(params->subresource_loader_factories),
-        absl::nullopt /* subresource_overrides */,
-        mojo::NullRemote() /* prefetch_loader_factory */);
+        /*subresource_overrides=*/absl::nullopt,
+        /*prefetch_loader_factory=*/mojo::NullRemote(),
+        /*topics_loader_factory=*/mojo::NullRemote());
   }
 
   return render_frame;
@@ -2570,6 +2571,7 @@
     blink::mojom::ServiceWorkerContainerInfoForClientPtr container_info,
     mojo::PendingRemote<network::mojom::URLLoaderFactory>
         prefetch_loader_factory,
+    mojo::PendingRemote<network::mojom::URLLoaderFactory> topics_loader_factory,
     const blink::DocumentToken& document_token,
     const base::UnguessableToken& devtools_navigation_token,
     const absl::optional<blink::ParsedPermissionsPolicy>& permissions_policy,
@@ -2630,9 +2632,9 @@
       common_params.Clone(), commit_params.Clone(),
       std::move(subresource_loader_factories), std::move(subresource_overrides),
       std::move(controller_service_worker_info), std::move(container_info),
-      std::move(prefetch_loader_factory), std::move(code_cache_host),
-      std::move(cookie_manager_info), std::move(storage_info),
-      std::move(document_state));
+      std::move(prefetch_loader_factory), std::move(topics_loader_factory),
+      std::move(code_cache_host), std::move(cookie_manager_info),
+      std::move(storage_info), std::move(document_state));
 
   // Handle a navigation that has a non-empty `data_url_as_string`, or perform
   // a "loadDataWithBaseURL" navigation, which is different from a normal data:
@@ -2749,6 +2751,7 @@
     blink::mojom::ServiceWorkerContainerInfoForClientPtr container_info,
     mojo::PendingRemote<network::mojom::URLLoaderFactory>
         prefetch_loader_factory,
+    mojo::PendingRemote<network::mojom::URLLoaderFactory> topics_loader_factory,
     mojo::PendingRemote<blink::mojom::CodeCacheHost> code_cache_host,
     mojom::CookieManagerInfoPtr cookie_manager_info,
     mojom::StorageInfoPtr storage_info,
@@ -2763,7 +2766,8 @@
   scoped_refptr<blink::ChildURLLoaderFactoryBundle> new_loader_factories =
       CreateLoaderFactoryBundle(std::move(subresource_loader_factories),
                                 std::move(subresource_overrides),
-                                std::move(prefetch_loader_factory));
+                                std::move(prefetch_loader_factory),
+                                std::move(topics_loader_factory));
 
   DCHECK(new_loader_factories);
   DCHECK(new_loader_factories->HasBoundDefaultFactory());
@@ -2895,7 +2899,8 @@
       CreateLoaderFactoryBundle(
           std::move(subresource_loader_factories),
           absl::nullopt /* subresource_overrides */,
-          mojo::NullRemote() /* prefetch_loader_factory */);
+          mojo::NullRemote() /* prefetch_loader_factory */,
+          mojo::NullRemote() /* topics_loader_factory */);
   DCHECK(new_loader_factories->HasBoundDefaultFactory());
 
   // Send the provisional load failure.
@@ -5516,7 +5521,9 @@
     absl::optional<std::vector<blink::mojom::TransferrableURLLoaderPtr>>
         subresource_overrides,
     mojo::PendingRemote<network::mojom::URLLoaderFactory>
-        prefetch_loader_factory) {
+        prefetch_loader_factory,
+    mojo::PendingRemote<network::mojom::URLLoaderFactory>
+        topics_loader_factory) {
   DCHECK(info);
   // We don't check `DCHECK(info->pending_default_factory())`, because it will
   // be missing for speculative frames (and in other cases where no subresource
@@ -5538,6 +5545,9 @@
     loader_factories->SetPrefetchLoaderFactory(
         std::move(prefetch_loader_factory));
   }
+  if (topics_loader_factory) {
+    loader_factories->SetTopicsLoaderFactory(std::move(topics_loader_factory));
+  }
 
   return loader_factories;
 }
@@ -6009,8 +6019,9 @@
   pending_loader_factories_ = CreateLoaderFactoryBundle(
       blink::ChildPendingURLLoaderFactoryBundle::CreateFromDefaultFactoryImpl(
           network::NotImplementedURLLoaderFactory::Create()),
-      absl::nullopt,  // |subresource_overrides|
-      {});            // prefetch_loader_factory
+      /*subresource_overrides=*/absl::nullopt,
+      /*prefetch_loader_factory=*/{},
+      /*topics_loader_factory=*/{});
 
   auto navigation_params = std::make_unique<WebNavigationParams>();
   navigation_params->url = base_url;

content/renderer/render_frame_impl.h

diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 3b55829..6b70546 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -449,6 +449,8 @@
       blink::mojom::ServiceWorkerContainerInfoForClientPtr container_info,
       mojo::PendingRemote<network::mojom::URLLoaderFactory>
           prefetch_loader_factory,
+      mojo::PendingRemote<network::mojom::URLLoaderFactory>
+          topics_loader_factory,
       const blink::DocumentToken& document_token,
       const base::UnguessableToken& devtools_navigation_token,
       const absl::optional<blink::ParsedPermissionsPolicy>& permissions_policy,
@@ -898,7 +900,9 @@
       absl::optional<std::vector<blink::mojom::TransferrableURLLoaderPtr>>
           subresource_overrides,
       mojo::PendingRemote<network::mojom::URLLoaderFactory>
-          prefetch_loader_factory);
+          prefetch_loader_factory,
+      mojo::PendingRemote<network::mojom::URLLoaderFactory>
+          topics_loader_factory);
 
   // Update current main frame's encoding and send it to browser window.
   // Since we want to let users see the right encoding info from menu
@@ -962,6 +966,8 @@
       blink::mojom::ServiceWorkerContainerInfoForClientPtr container_info,
       mojo::PendingRemote<network::mojom::URLLoaderFactory>
           prefetch_loader_factory,
+      mojo::PendingRemote<network::mojom::URLLoaderFactory>
+          topics_loader_factory,
       mojo::PendingRemote<blink::mojom::CodeCacheHost> code_cache_host,
       mojom::CookieManagerInfoPtr cookie_manager_info,
       mojom::StorageInfoPtr storage_info,

content/shell/browser/shell_content_browser_client.cc

diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
index 01ccd30..2a94bc3 100644
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -736,7 +736,7 @@
       content::GetSwitchDependentFeatureOverrides(*command_line),
       std::move(feature_list), metrics_state_manager.get(),
       &platform_field_trials, &safe_seed_manager,
-      /*low_entropy_source_value=*/absl::nullopt);
+      /*add_entropy_source_to_variations_ids=*/false);
 }
 
 absl::optional<blink::ParsedPermissionsPolicy>

content/test/BUILD.gn

diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 74e4a85..0b20175 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -2529,10 +2529,13 @@
     "../browser/web_package/web_bundle_url_loader_factory_unittest.cc",
     "../browser/web_package/web_bundle_utils_unittest.cc",
     "../browser/webid/federated_auth_request_impl_logout_unittest.cc",
+    "../browser/webid/federated_auth_request_impl_multiple_frames_unittest.cc",
     "../browser/webid/federated_auth_request_impl_unittest.cc",
     "../browser/webid/idp_network_request_manager_unittest.cc",
     "../browser/webid/test/delegated_idp_network_request_manager.cc",
     "../browser/webid/test/delegated_idp_network_request_manager.h",
+    "../browser/webid/test/federated_auth_request_request_token_callback_helper.cc",
+    "../browser/webid/test/federated_auth_request_request_token_callback_helper.h",
     "../browser/webid/test/mock_api_permission_delegate.cc",
     "../browser/webid/test/mock_api_permission_delegate.h",
     "../browser/webid/test/mock_identity_request_dialog_controller.cc",

content/test/data/attribution_reporting/fetch_topics.js

diff --git a/content/test/data/attribution_reporting/fetch_topics.js b/content/test/data/attribution_reporting/fetch_topics.js
deleted file mode 100644
index 34cba8d..0000000
--- a/content/test/data/attribution_reporting/fetch_topics.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2022 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-const url_params = new URLSearchParams(location.search);
-let fetch_url = url_params.get("fetch_url");
-fetch(fetch_url, {browsingTopics: true});

content/test/data/attribution_reporting/page_with_ads_apis_ot.html

diff --git a/content/test/data/attribution_reporting/page_with_ads_apis_ot.html b/content/test/data/attribution_reporting/page_with_ads_apis_ot.html
index f0c38ac5..5a253b2e 100644
--- a/content/test/data/attribution_reporting/page_with_ads_apis_ot.html
+++ b/content/test/data/attribution_reporting/page_with_ads_apis_ot.html
@@ -5,13 +5,4 @@
    generate_token.py https://example.test PrivacySandboxAdsAPIs --expire-timestamp=2000000000 -->
     <meta http-equiv="origin-trial" content="A5tnx3M8YgPvr7n0sKItbVfImY3JFbP+KhW5eL3wxOHDTKpJ/AcBbmFpEx8Feve0uzgxVIfCPSjw++Gv1GCPkQUAAABgeyJvcmlnaW4iOiAiaHR0cHM6Ly9leGFtcGxlLnRlc3Q6NDQzIiwgImZlYXR1cmUiOiAiUHJpdmFjeVNhbmRib3hBZHNBUElzIiwgImV4cGlyeSI6IDIwMDAwMDAwMDB9">
   </head>
-  <body>
-    <script type="text/javascript">
-      async function setupServiceWorker(script_file) {
-        await navigator.serviceWorker.register(script_file);
-        await navigator.serviceWorker.ready;
-        return 'ok';
-      }
-    </script>
-  </body>
 </html>

content/test/data/browsing_topics/service_worker_factory.html

diff --git a/content/test/data/browsing_topics/service_worker_factory.html b/content/test/data/browsing_topics/service_worker_factory.html
new file mode 100644
index 0000000..28b3f1b
--- /dev/null
+++ b/content/test/data/browsing_topics/service_worker_factory.html
@@ -0,0 +1,11 @@
+<html>
+  <body>
+    <script type="text/javascript">
+      async function setupServiceWorker(script_file) {
+        await navigator.serviceWorker.register(script_file);
+        await navigator.serviceWorker.ready;
+        return 'ok';
+      }
+    </script>
+  </body>
+</html>

content/test/data/browsing_topics/topics_service_worker.js

diff --git a/content/test/data/browsing_topics/topics_service_worker.js b/content/test/data/browsing_topics/topics_service_worker.js
new file mode 100644
index 0000000..c003e9a
--- /dev/null
+++ b/content/test/data/browsing_topics/topics_service_worker.js
@@ -0,0 +1,29 @@
+// Copyright 2022 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+self.addEventListener('fetch', event => {
+  event.waitUntil(async function () {
+    if (!event.clientId) return;
+    const client = await clients.get(event.clientId);
+    if (!client) return;
+
+    client.postMessage({
+      url: event.request.url,
+      topicsHeader: String(event.request.headers.get("Sec-Browsing-Topics"))
+    });
+  }());
+});
+
+self.addEventListener('message', event => {
+  if (event.data.fetchUrl) {
+    clients.matchAll().then((clients) => {
+      fetch(event.data.fetchUrl, {browsingTopics: true}).then((response) => {
+        // clients[0] is the most recently focused one
+        clients[0].postMessage({
+          finishedFetch: true
+        });
+      });
+    });
+  }
+});

content/test/gpu/gpu_tests/test_expectations/trace_test_expectations.txt

diff --git a/content/test/gpu/gpu_tests/test_expectations/trace_test_expectations.txt b/content/test/gpu/gpu_tests/test_expectations/trace_test_expectations.txt
index b88c53f..aaddd1b 100644
--- a/content/test/gpu/gpu_tests/test_expectations/trace_test_expectations.txt
+++ b/content/test/gpu/gpu_tests/test_expectations/trace_test_expectations.txt
@@ -235,8 +235,11 @@
 crbug.com/1382796 [ android android-pixel-4 angle-opengles passthrough ] WebGLCanvasCaptureTraceTest_VideoStreamFromWebGLAlphaCanvas [ RetryOnFailure ]
 # finder:group-end
 
-# WebGL drawingBufferStorage does not work on Pixel 4 yet.
-crbug.com/1230619 [ android-pixel-4 ] TraceTest_WebGLFloat [ Failure ]
+# WebGL drawingBufferStorage does not work on Pixel 4, Samsung A23 or Lacros FYI
+# x64 Release (Intel) yet.
+crbug.com/1230619 [ android android-pixel-4 ] TraceTest_WebGLFloat [ Failure ]
+crbug.com/1230619 [ android android-SM-A235M ] TraceTest_WebGLFloat [ Failure ]
+crbug.com/1230619 [ linux intel display-server-wayland  ] TraceTest_WebGLFloat [ Failure ]
 
 crbug.com/1402261 [ win intel ] OverlayModeTraceTest_DirectComposition_Video_* [ RetryOnFailure ]
 crbug.com/1402261 [ win amd ] OverlayModeTraceTest_DirectComposition_Video_* [ RetryOnFailure ]

content/test/test_render_frame.cc

diff --git a/content/test/test_render_frame.cc b/content/test/test_render_frame.cc
index 225605f..323c0a5 100644
--- a/content/test/test_render_frame.cc
+++ b/content/test/test_render_frame.cc
@@ -269,7 +269,8 @@
       std::move(pending_factory_bundle), absl::nullopt,
       blink::mojom::ControllerServiceWorkerInfoPtr(),
       blink::mojom::ServiceWorkerContainerInfoForClientPtr(),
-      mojo::NullRemote() /* prefetch_loader_factory */, blink::DocumentToken(),
+      mojo::NullRemote() /* prefetch_loader_factory */,
+      mojo::NullRemote() /* topics_loader_factory */, blink::DocumentToken(),
       base::UnguessableToken::Create(), blink::ParsedPermissionsPolicy(),
       blink::mojom::PolicyContainer::New(
           blink::mojom::PolicyContainerPolicies::New(),

content/test/test_render_frame_host.cc

diff --git a/content/test/test_render_frame_host.cc b/content/test/test_render_frame_host.cc
index 75ac1b5..5de7cd6 100644
--- a/content/test/test_render_frame_host.cc
+++ b/content/test/test_render_frame_host.cc
@@ -610,6 +610,7 @@
     blink::mojom::ServiceWorkerContainerInfoForClientPtr container_info,
     mojo::PendingRemote<network::mojom::URLLoaderFactory>
         prefetch_loader_factory,
+    mojo::PendingRemote<network::mojom::URLLoaderFactory> topics_loader_factory,
     const absl::optional<blink::ParsedPermissionsPolicy>& permissions_policy,
     blink::mojom::PolicyContainerPtr policy_container,
     const blink::DocumentToken& document_token,

content/test/test_render_frame_host.h

diff --git a/content/test/test_render_frame_host.h b/content/test/test_render_frame_host.h
index 3756f48..92b2d3d1 100644
--- a/content/test/test_render_frame_host.h
+++ b/content/test/test_render_frame_host.h
@@ -273,6 +273,8 @@
       blink::mojom::ServiceWorkerContainerInfoForClientPtr container_info,
       mojo::PendingRemote<network::mojom::URLLoaderFactory>
           prefetch_loader_factory,
+      mojo::PendingRemote<network::mojom::URLLoaderFactory>
+          topics_loader_factory,
       const absl::optional<blink::ParsedPermissionsPolicy>& permissions_policy,
       blink::mojom::PolicyContainerPtr policy_container,
       const blink::DocumentToken& document_token,

extensions/browser/api/web_request/web_request_time_tracker.cc

diff --git a/extensions/browser/api/web_request/web_request_time_tracker.cc b/extensions/browser/api/web_request/web_request_time_tracker.cc
index f5523a9..e7780f7 100644
--- a/extensions/browser/api/web_request/web_request_time_tracker.cc
+++ b/extensions/browser/api/web_request/web_request_time_tracker.cc
@@ -129,7 +129,7 @@
           listener_time);
       UMA_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES(
           "Extensions.WebRequest."
-          "BeforeRequestListenerEvaluationTimeInMicroseconds"
+          "BeforeRequestListenerEvaluationTimeInMicroseconds."
           "WebRequestOnly",
           listener_time, base::Microseconds(1), base::Seconds(30),
           kBucketCount);
@@ -140,7 +140,7 @@
           listener_time);
       UMA_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES(
           "Extensions.WebRequest."
-          "BeforeRequestListenerEvaluationTimeInMicroseconds"
+          "BeforeRequestListenerEvaluationTimeInMicroseconds."
           "WebRequestAndDeclarativeNetRequest",
           listener_time, base::Microseconds(1), base::Seconds(30),
           kBucketCount);

extensions/common/manifest_handlers/csp_info.cc

diff --git a/extensions/common/manifest_handlers/csp_info.cc b/extensions/common/manifest_handlers/csp_info.cc
index 1f26579..e4df35c 100644
--- a/extensions/common/manifest_handlers/csp_info.cc
+++ b/extensions/common/manifest_handlers/csp_info.cc
@@ -39,7 +39,7 @@
     "script-src 'self' 'unsafe-inline' 'unsafe-eval'; child-src 'self';";
 
 // The default CSP to be used if no CSP provided.
-static const char kDefaultMV3CSP[] = "script-src 'self'; object-src 'self';";
+static const char kDefaultMV3CSP[] = "script-src 'self';";
 
 // The minimum CSP to be used in order to prevent remote scripts.
 static const char kMinimumMV3CSP[] =

extensions/common/manifest_handlers/csp_info_unittest.cc

diff --git a/extensions/common/manifest_handlers/csp_info_unittest.cc b/extensions/common/manifest_handlers/csp_info_unittest.cc
index 35807df3..a1c8a67 100644
--- a/extensions/common/manifest_handlers/csp_info_unittest.cc
+++ b/extensions/common/manifest_handlers/csp_info_unittest.cc
@@ -31,7 +31,7 @@
 const char kDefaultExtensionPagesCSP[] =
     "script-src 'self' blob: filesystem:; "
     "object-src 'self' blob: filesystem:;";
-const char kDefaultSecureCSP[] = "script-src 'self'; object-src 'self';";
+const char kDefaultSecureCSP[] = "script-src 'self';";
 
 }  // namespace
 
@@ -292,14 +292,13 @@
   struct {
     const char* file_name;
     const char* csp;
-  } cases[] = {
-      {"csp_dictionary_with_wasm.json",
-       "worker-src 'self' 'wasm-unsafe-eval'; default-src 'self'"},
-      {"csp_dictionary_with_unsafe_wasm.json",
-       "worker-src 'self' 'wasm-unsafe-eval'; default-src 'self'"},
-      {"csp_dictionary_empty_v3.json", "script-src 'self'; object-src 'self';"},
-      {"csp_dictionary_valid_1.json", "default-src 'none'"},
-      {"csp_omitted_mv2.json", kDefaultExtensionPagesCSP}};
+  } cases[] = {{"csp_dictionary_with_wasm.json",
+                "worker-src 'self' 'wasm-unsafe-eval'; default-src 'self'"},
+               {"csp_dictionary_with_unsafe_wasm.json",
+                "worker-src 'self' 'wasm-unsafe-eval'; default-src 'self'"},
+               {"csp_dictionary_empty_v3.json", "script-src 'self';"},
+               {"csp_dictionary_valid_1.json", "default-src 'none'"},
+               {"csp_omitted_mv2.json", kDefaultExtensionPagesCSP}};
 
   for (const auto& test_case : cases) {
     SCOPED_TRACE(base::StringPrintf("Testing %s.", test_case.file_name));

headless/app/headless_command_handler.cc

diff --git a/headless/app/headless_command_handler.cc b/headless/app/headless_command_handler.cc
index 143f2c3c..7b541f6 100644
--- a/headless/app/headless_command_handler.cc
+++ b/headless/app/headless_command_handler.cc
@@ -54,14 +54,18 @@
 
 content::WebUIDataSource* CreateHeadlessHostDataSource() {
   base::FilePath resource_dir;
-  CHECK(base::PathService::Get(base::DIR_ASSETS, &resource_dir));
+  bool result = base::PathService::Get(base::DIR_ASSETS, &resource_dir);
+  DCHECK(result);
 
+  // Try loading the headless library pak file first. If it doesn't exist (i.e.,
+  // when we're running with the --headless switch), fall back to the browser's
+  // resource pak.
   base::FilePath resource_pack =
       resource_dir.Append(FILE_PATH_LITERAL("headless_command_resources.pak"));
-  CHECK(base::PathExists(resource_pack)) << resource_pack;
-
-  ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
-      resource_pack, ui::kScaleFactorNone);
+  if (base::PathExists(resource_pack)) {
+    ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
+        resource_pack, ui::kScaleFactorNone);
+  }
 
   content::WebUIDataSource* source =
       content::WebUIDataSource::Create(kChromeHeadlessHost);

infra/config/generated/builders/ci/Linux ChromiumOS MSan Focal/properties.json

diff --git a/infra/config/generated/builders/ci/Linux ChromiumOS MSan Focal/properties.json b/infra/config/generated/builders/ci/Linux ChromiumOS MSan Focal/properties.json
new file mode 100644
index 0000000..9e90d261
--- /dev/null
+++ b/infra/config/generated/builders/ci/Linux ChromiumOS MSan Focal/properties.json
@@ -0,0 +1,61 @@
+{
+  "$build/chromium_tests_builder_config": {
+    "builder_config": {
+      "builder_db": {
+        "entries": [
+          {
+            "builder_id": {
+              "bucket": "ci",
+              "builder": "Linux ChromiumOS MSan Focal",
+              "project": "chromium"
+            },
+            "builder_spec": {
+              "builder_group": "chromium.fyi",
+              "execution_mode": "COMPILE_AND_TEST",
+              "legacy_chromium_config": {
+                "apply_configs": [
+                  "mb"
+                ],
+                "build_config": "Release",
+                "config": "chromium_msan"
+              },
+              "legacy_gclient_config": {
+                "apply_configs": [
+                  "chromeos"
+                ],
+                "config": "chromium"
+              }
+            }
+          }
+        ]
+      },
+      "builder_ids": [
+        {
+          "bucket": "ci",
+          "builder": "Linux ChromiumOS MSan Focal",
+          "project": "chromium"
+        }
+      ],
+      "mirroring_builder_group_and_names": [
+        {
+          "builder": "linux_chromium_chromeos_msan_focal",
+          "group": "tryserver.chromium.linux"
+        }
+      ]
+    }
+  },
+  "$build/reclient": {
+    "instance": "rbe-chromium-trusted",
+    "jobs": 500,
+    "metrics_project": "chromium-reclient-metrics"
+  },
+  "$recipe_engine/resultdb/test_presentation": {
+    "column_keys": [],
+    "grouping_keys": [
+      "status",
+      "v.test_suite"
+    ]
+  },
+  "builder_group": "chromium.fyi",
+  "recipe": "chromium"
+}
\ No newline at end of file

infra/config/generated/builders/try/linux_chromium_chromeos_msan_focal/properties.json

diff --git a/infra/config/generated/builders/try/linux_chromium_chromeos_msan_focal/properties.json b/infra/config/generated/builders/try/linux_chromium_chromeos_msan_focal/properties.json
new file mode 100644
index 0000000..5245d8b
--- /dev/null
+++ b/infra/config/generated/builders/try/linux_chromium_chromeos_msan_focal/properties.json
@@ -0,0 +1,55 @@
+{
+  "$build/chromium_tests_builder_config": {
+    "builder_config": {
+      "builder_db": {
+        "entries": [
+          {
+            "builder_id": {
+              "bucket": "ci",
+              "builder": "Linux ChromiumOS MSan Focal",
+              "project": "chromium"
+            },
+            "builder_spec": {
+              "builder_group": "chromium.fyi",
+              "execution_mode": "COMPILE_AND_TEST",
+              "legacy_chromium_config": {
+                "apply_configs": [
+                  "mb"
+                ],
+                "build_config": "Release",
+                "config": "chromium_msan"
+              },
+              "legacy_gclient_config": {
+                "apply_configs": [
+                  "chromeos"
+                ],
+                "config": "chromium"
+              }
+            }
+          }
+        ]
+      },
+      "builder_ids": [
+        {
+          "bucket": "ci",
+          "builder": "Linux ChromiumOS MSan Focal",
+          "project": "chromium"
+        }
+      ]
+    }
+  },
+  "$build/reclient": {
+    "instance": "rbe-chromium-untrusted",
+    "jobs": 300,
+    "metrics_project": "chromium-reclient-metrics"
+  },
+  "$recipe_engine/resultdb/test_presentation": {
+    "column_keys": [],
+    "grouping_keys": [
+      "status",
+      "v.test_suite"
+    ]
+  },
+  "builder_group": "tryserver.chromium.linux",
+  "recipe": "chromium_trybot"
+}
\ No newline at end of file

infra/config/generated/luci/commit-queue.cfg

diff --git a/infra/config/generated/luci/commit-queue.cfg b/infra/config/generated/luci/commit-queue.cfg
index 99ff29a..11d1dfb 100644
--- a/infra/config/generated/luci/commit-queue.cfg
+++ b/infra/config/generated/luci/commit-queue.cfg
@@ -2891,6 +2891,10 @@
         includable_only: true
       }
       builders {
+        name: "chromium/try/linux_chromium_chromeos_msan_focal"
+        includable_only: true
+      }
+      builders {
         name: "chromium/try/linux_chromium_chromeos_msan_rel_ng"
         includable_only: true
       }

infra/config/generated/luci/cr-buildbucket.cfg

diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index df23776..8bfde17 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -846,7 +846,7 @@
         '    "android"'
         '  ]'
         '}'
-      execution_timeout_secs: 18000
+      execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
@@ -13019,7 +13019,7 @@
       dimensions: "cores:16"
       dimensions: "cpu:x86-64"
       dimensions: "free_space:standard"
-      dimensions: "os:Ubuntu-20.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.ci"
       dimensions: "ssd:1"
       exe {
@@ -13104,7 +13104,7 @@
       }
     }
     builders {
-      name: "Linux ChromiumOS MSan Tests"
+      name: "Linux ChromiumOS MSan Focal"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
       dimensions: "cores:8"
@@ -13130,6 +13130,95 @@
         '    }'
         '  },'
         '  "$bootstrap/properties": {'
+        '    "properties_file": "infra/config/generated/builders/ci/Linux ChromiumOS MSan Focal/properties.json",'
+        '    "top_level_project": {'
+        '      "ref": "refs/heads/main",'
+        '      "repo": {'
+        '        "host": "chromium.googlesource.com",'
+        '        "project": "chromium/src"'
+        '      }'
+        '    }'
+        '  },'
+        '  "builder_group": "chromium.fyi",'
+        '  "led_builder_is_bootstrapped": true,'
+        '  "recipe": "chromium"'
+        '}'
+      priority: 35
+      execution_timeout_secs: 57600
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium_swarming.expose_merge_script_failures"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.omit_python2"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "blink_web_tests_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+    }
+    builders {
+      name: "Linux ChromiumOS MSan Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "free_space:standard"
+      dimensions: "os:Ubuntu-18.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/chromium/bootstrapper/${platform}"
+        cipd_version: "latest"
+        cmd: "bootstrapper"
+      }
+      properties:
+        '{'
+        '  "$bootstrap/exe": {'
+        '    "exe": {'
+        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
+        '      "cipd_version": "refs/heads/main",'
+        '      "cmd": ['
+        '        "luciexe"'
+        '      ]'
+        '    }'
+        '  },'
+        '  "$bootstrap/properties": {'
         '    "properties_file": "infra/config/generated/builders/ci/Linux ChromiumOS MSan Tests/properties.json",'
         '    "top_level_project": {'
         '      "ref": "refs/heads/main",'
@@ -83537,12 +83626,122 @@
       }
     }
     builders {
+      name: "linux_chromium_chromeos_msan_focal"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-20.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/chromium/bootstrapper/${platform}"
+        cipd_version: "latest"
+        cmd: "bootstrapper"
+      }
+      properties:
+        '{'
+        '  "$bootstrap/exe": {'
+        '    "exe": {'
+        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
+        '      "cipd_version": "refs/heads/main",'
+        '      "cmd": ['
+        '        "luciexe"'
+        '      ]'
+        '    }'
+        '  },'
+        '  "$bootstrap/properties": {'
+        '    "properties_file": "infra/config/generated/builders/try/linux_chromium_chromeos_msan_focal/properties.json",'
+        '    "top_level_project": {'
+        '      "ref": "refs/heads/main",'
+        '      "repo": {'
+        '        "host": "chromium.googlesource.com",'
+        '        "project": "chromium/src"'
+        '      }'
+        '    }'
+        '  },'
+        '  "builder_group": "tryserver.chromium.linux",'
+        '  "led_builder_is_bootstrapped": true,'
+        '  "recipe": "chromium_trybot"'
+        '}'
+      execution_timeout_secs: 57600
+      expiration_secs: 7200
+      grace_period {
+        seconds: 120
+      }
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      experiments {
+        key: "chromium_swarming.expose_merge_script_failures"
+        value: 100
+      }
+      experiments {
+        key: "enable_weetbix_queries"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.omit_python2"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "weetbix.enable_weetbix_exonerations"
+        value: 100
+      }
+      experiments {
+        key: "weetbix.retry_weak_exonerations"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "blink_web_tests_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+    }
+    builders {
       name: "linux_chromium_chromeos_msan_rel_ng"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
       dimensions: "cores:16"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-20.04"
+      dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
       exe {

infra/config/generated/luci/luci-milo.cfg

diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
index 6db96a3..70048b1 100644
--- a/infra/config/generated/luci/luci-milo.cfg
+++ b/infra/config/generated/luci/luci-milo.cfg
@@ -9171,6 +9171,11 @@
     category: "lacros x64"
   }
   builders {
+    name: "buildbucket/luci.chromium.ci/Linux ChromiumOS MSan Focal"
+    category: "msan"
+    short_name: "crs"
+  }
+  builders {
     name: "buildbucket/luci.chromium.ci/linux-upload-perfetto"
     category: "perfetto"
     short_name: "lnx"
@@ -17777,6 +17782,9 @@
     name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_asan_rel_ng"
   }
   builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_msan_focal"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_msan_rel_ng"
   }
   builders {
@@ -18813,6 +18821,9 @@
     name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_asan_rel_ng"
   }
   builders {
+    name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_msan_focal"
+  }
+  builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_chromeos_msan_rel_ng"
   }
   builders {

infra/config/generated/luci/luci-scheduler.cfg

diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg
index 6819e1fc3..5d7a81a 100644
--- a/infra/config/generated/luci/luci-scheduler.cfg
+++ b/infra/config/generated/luci/luci-scheduler.cfg
@@ -1685,6 +1685,15 @@
   }
 }
 job {
+  id: "Linux ChromiumOS MSan Focal"
+  realm: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "Linux ChromiumOS MSan Focal"
+  }
+}
+job {
   id: "Linux ChromiumOS MSan Tests"
   realm: "ci"
   buildbucket {
@@ -6075,6 +6084,7 @@
   triggers: "Linux Chromium OS ASan LSan Builder"
   triggers: "Linux ChromiumOS Full"
   triggers: "Linux ChromiumOS MSan Builder"
+  triggers: "Linux ChromiumOS MSan Focal"
   triggers: "Linux FYI GPU TSAN Release"
   triggers: "Linux MSan Builder"
   triggers: "Linux TSan Builder"

infra/config/subprojects/chromium/ci/chromium.android.star

diff --git a/infra/config/subprojects/chromium/ci/chromium.android.star b/infra/config/subprojects/chromium/ci/chromium.android.star
index d2b2a834..369ff0d 100644
--- a/infra/config/subprojects/chromium/ci/chromium.android.star
+++ b/infra/config/subprojects/chromium/ci/chromium.android.star
@@ -70,7 +70,8 @@
     ),
     # Higher build timeout since dbg ASAN builds can take a while on a clobber
     # build.
-    execution_timeout = 5 * time.hour,
+    # TODO(crbug.com/1395760): Check why the compile takes longer time.
+    execution_timeout = 8 * time.hour,
 )
 
 ci.thin_tester(

infra/config/subprojects/chromium/ci/chromium.fyi.star

diff --git a/infra/config/subprojects/chromium/ci/chromium.fyi.star b/infra/config/subprojects/chromium/ci/chromium.fyi.star
index 4e97086d..309acaab 100644
--- a/infra/config/subprojects/chromium/ci/chromium.fyi.star
+++ b/infra/config/subprojects/chromium/ci/chromium.fyi.star
@@ -390,7 +390,6 @@
 
 ci.builder(
     name = "linux-chromeos-annotator-rel",
-    branch_selector = branches.STANDARD_MILESTONE,
     builder_spec = builder_config.builder_spec(
         gclient_config = builder_config.gclient_config(
             config = "chromium",
@@ -2621,6 +2620,33 @@
     schedule = "0 2,6,10,14,18,22 * * *",
 )
 
+ci.builder(
+    # An FYI version of the following builders that runs on Focal:
+    # https://ci.chromium.org/p/chromium/builders/ci/Linux%20ChromiumOS%20MSan%20Builder
+    # https://ci.chromium.org/p/chromium/builders/ci/Linux%20ChromiumOS%20MSan%20Tests
+    # TODO(crbug.com/1260217): Remove this builder when the main MSAN builder
+    # has migrated to focal.
+    name = "Linux ChromiumOS MSan Focal",
+    builder_spec = builder_config.builder_spec(
+        gclient_config = builder_config.gclient_config(
+            config = "chromium",
+            apply_configs = ["chromeos"],
+        ),
+        chromium_config = builder_config.chromium_config(
+            config = "chromium_msan",
+            apply_configs = ["mb"],
+            build_config = builder_config.build_config.RELEASE,
+        ),
+    ),
+    os = os.LINUX_FOCAL,
+    console_view_entry = consoles.console_view_entry(
+        category = "msan",
+        short_name = "crs",
+    ),
+    execution_timeout = 16 * time.hour,
+    reclient_jobs = reclient.jobs.HIGH_JOBS_FOR_CI,
+)
+
 fyi_mac_builder(
     name = "Mac Builder Next",
     builder_spec = builder_config.builder_spec(

infra/config/subprojects/chromium/ci/chromium.memory.star

diff --git a/infra/config/subprojects/chromium/ci/chromium.memory.star b/infra/config/subprojects/chromium/ci/chromium.memory.star
index 610f648b..fd49965 100644
--- a/infra/config/subprojects/chromium/ci/chromium.memory.star
+++ b/infra/config/subprojects/chromium/ci/chromium.memory.star
@@ -264,7 +264,6 @@
         short_name = "bld",
     ),
     execution_timeout = 4 * time.hour,
-    os = os.LINUX_FOCAL,
 )
 
 linux_memory_builder(
@@ -294,7 +293,6 @@
     ),
     execution_timeout = 4 * time.hour,
     reclient_instance = None,
-    os = os.LINUX_FOCAL,
 )
 
 linux_memory_builder(

infra/config/subprojects/chromium/try/tryserver.chromium.linux.star

diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.linux.star b/infra/config/subprojects/chromium/try/tryserver.chromium.linux.star
index 1c46093..585c524 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.linux.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.linux.star
@@ -458,6 +458,17 @@
 )
 
 try_.builder(
+    name = "linux_chromium_chromeos_msan_focal",
+    mirrors = [
+        "ci/Linux ChromiumOS MSan Focal",
+    ],
+    os = os.LINUX_FOCAL,
+    execution_timeout = 16 * time.hour,
+    goma_backend = None,
+    reclient_jobs = reclient.jobs.HIGH_JOBS_FOR_CQ,
+)
+
+try_.builder(
     name = "linux_chromium_chromeos_msan_rel_ng",
     mirrors = [
         "ci/Linux ChromiumOS MSan Builder",
@@ -467,7 +478,6 @@
     ssd = True,
     goma_backend = None,
     reclient_jobs = reclient.jobs.HIGH_JOBS_FOR_CQ,
-    os = os.LINUX_FOCAL,
 )
 
 try_.builder(

ios/chrome/browser/net/ios_chrome_network_delegate.cc

diff --git a/ios/chrome/browser/net/ios_chrome_network_delegate.cc b/ios/chrome/browser/net/ios_chrome_network_delegate.cc
index b338be06..d65a6af 100644
--- a/ios/chrome/browser/net/ios_chrome_network_delegate.cc
+++ b/ios/chrome/browser/net/ios_chrome_network_delegate.cc
@@ -72,15 +72,16 @@
 bool IOSChromeNetworkDelegate::OnAnnotateAndMoveUserBlockedCookies(
     const net::URLRequest& request,
     const net::FirstPartySetMetadata& first_party_set_metadata,
+    net::CookieSettingOverrides overrides,
     net::CookieAccessResultList& maybe_included_cookies,
     net::CookieAccessResultList& excluded_cookies) {
   // `cookie_settings_` is null during tests, or when we're running in the
   // system context.
-  bool allowed = !cookie_settings_ ||
-                 cookie_settings_->IsFullCookieAccessAllowed(
-                     request.url(), request.site_for_cookies(),
-                     request.isolation_info().top_frame_origin(),
-                     net::CookieSettingOverrides(), QueryReason::kCookies);
+  bool allowed =
+      !cookie_settings_ || cookie_settings_->IsFullCookieAccessAllowed(
+                               request.url(), request.site_for_cookies(),
+                               request.isolation_info().top_frame_origin(),
+                               overrides, QueryReason::kCookies);
 
   if (!allowed) {
     ExcludeAllCookies(
@@ -109,14 +110,15 @@
 IOSChromeNetworkDelegate::OnForcePrivacyMode(
     const GURL& url,
     const net::SiteForCookies& site_for_cookies,
-    const absl::optional<url::Origin>& top_frame_origin) const {
+    const absl::optional<url::Origin>& top_frame_origin,
+    net::CookieSettingOverrides overrides) const {
   // Null during tests, or when we're running in the system context.
   if (!cookie_settings_.get())
     return net::NetworkDelegate::PrivacySetting::kStateAllowed;
 
   return cookie_settings_->IsFullCookieAccessAllowed(
-             url, site_for_cookies, top_frame_origin,
-             net::CookieSettingOverrides(), QueryReason::kCookies)
+             url, site_for_cookies, top_frame_origin, overrides,
+             QueryReason::kCookies)
              ? net::NetworkDelegate::PrivacySetting::kStateAllowed
              : net::NetworkDelegate::PrivacySetting::kStateDisallowed;
 }

ios/chrome/browser/net/ios_chrome_network_delegate.h

diff --git a/ios/chrome/browser/net/ios_chrome_network_delegate.h b/ios/chrome/browser/net/ios_chrome_network_delegate.h
index e2f7cc7..397d4d1 100644
--- a/ios/chrome/browser/net/ios_chrome_network_delegate.h
+++ b/ios/chrome/browser/net/ios_chrome_network_delegate.h
@@ -10,6 +10,7 @@
 #include "base/memory/ref_counted.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "net/base/network_delegate_impl.h"
+#include "net/cookies/cookie_setting_override.h"
 #include "net/first_party_sets/first_party_set_metadata.h"
 
 class PrefService;
@@ -56,6 +57,7 @@
   bool OnAnnotateAndMoveUserBlockedCookies(
       const net::URLRequest& request,
       const net::FirstPartySetMetadata& first_party_set_metadata,
+      net::CookieSettingOverrides overrides,
       net::CookieAccessResultList& maybe_included_cookies,
       net::CookieAccessResultList& excluded_cookies) override;
   bool OnCanSetCookie(const net::URLRequest& request,
@@ -64,7 +66,8 @@
   net::NetworkDelegate::PrivacySetting OnForcePrivacyMode(
       const GURL& url,
       const net::SiteForCookies& site_for_cookies,
-      const absl::optional<url::Origin>& top_frame_origin) const override;
+      const absl::optional<url::Origin>& top_frame_origin,
+      net::CookieSettingOverrides overrides) const override;
   bool OnCancelURLRequestWithPolicyViolatingReferrerHeader(
       const net::URLRequest& request,
       const GURL& target_url,

ios/chrome/browser/ui/link_to_text/link_to_text_egtest.mm

diff --git a/ios/chrome/browser/ui/link_to_text/link_to_text_egtest.mm b/ios/chrome/browser/ui/link_to_text/link_to_text_egtest.mm
index 8548b36e..ce16c60 100644
--- a/ios/chrome/browser/ui/link_to_text/link_to_text_egtest.mm
+++ b/ios/chrome/browser/ui/link_to_text/link_to_text_egtest.mm
@@ -218,7 +218,8 @@
 }
 
 // Tests that a link can be generated for a simple text selection.
-- (void)testGenerateLinkForSimpleText {
+// crbug.com/1403831 Disable flaky test
+- (void)DISABLED_testGenerateLinkForSimpleText {
   [ChromeEarlGrey clearPasteboard];
   GURL pageURL = self.testServer->GetURL(kTestURL);
   [ChromeEarlGrey loadURL:pageURL];

ios/chrome/browser/ui/ntp/feed_header_view_controller.mm

diff --git a/ios/chrome/browser/ui/ntp/feed_header_view_controller.mm b/ios/chrome/browser/ui/ntp/feed_header_view_controller.mm
index 738b021..1bd6c8b 100644
--- a/ios/chrome/browser/ui/ntp/feed_header_view_controller.mm
+++ b/ios/chrome/browser/ui/ntp/feed_header_view_controller.mm
@@ -45,8 +45,6 @@
 const CGFloat kHeaderMenuButtonInsetTopAndBottom = 2;
 const CGFloat kHeaderMenuButtonInsetSides = 2;
 // The height of the header container. The content is unaffected.
-// TODO(crbug.com/1277504): Only keep the WC header after launch.
-const CGFloat kWebChannelsHeaderHeight = 52;
 const CGFloat kDiscoverFeedHeaderHeight = 40;
 const CGFloat kCustomSearchEngineLabelHeight = 18;
 // * Values below are exclusive to Web Channels.
@@ -214,7 +212,7 @@
 
 - (CGFloat)feedHeaderHeight {
   return [self.feedControlDelegate isFollowingFeedAvailable]
-             ? kWebChannelsHeaderHeight
+             ? FollowingFeedHeaderHeight()
              : kDiscoverFeedHeaderHeight;
 }
 

ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm

diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm
index 51e511e..b6f30e14 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm
@@ -101,13 +101,6 @@
 #error "This file requires ARC support."
 #endif
 
-namespace {
-// Flag to enable the checking of new content for the Follow Feed.
-BASE_FEATURE(kEnableCheckForNewFollowContent,
-             "EnableCheckForNewFollowContent",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-}  // namespace
-
 @interface NewTabPageCoordinator () <AppStateObserver,
                                      BooleanObserver,
                                      ContentSuggestionsHeaderCommands,
@@ -424,7 +417,7 @@
 
 - (void)updateFollowingFeedHasUnseenContent:(BOOL)hasUnseenContent {
   if (![self isFollowingFeedAvailable] ||
-      !base::FeatureList::IsEnabled(kEnableCheckForNewFollowContent)) {
+      !IsDotEnabledForNewFollowedContent()) {
     return;
   }
   if ([self doesFollowingFeedHaveContent]) {
@@ -906,7 +899,7 @@
   // Saves scroll position before changing feed.
   CGFloat scrollPosition = [self.ntpViewController scrollPosition];
 
-  if (feedType == FeedTypeFollowing) {
+  if (feedType == FeedTypeFollowing && IsDotEnabledForNewFollowedContent()) {
     // Clears dot and notifies service that the Following feed content has
     // been seen.
     [self.feedHeaderViewController
@@ -1026,7 +1019,8 @@
 }
 
 - (BOOL)isContentHeaderSticky {
-  return [self isFollowingFeedAvailable] && [self isFeedHeaderVisible];
+  return [self isFollowingFeedAvailable] && [self isFeedHeaderVisible] &&
+         !IsStickyHeaderDisabledForFollowingFeed();
 }
 
 - (void)signinPromoHasChangedVisibility:(BOOL)visible {
@@ -1521,8 +1515,7 @@
   DCHECK(!self.browser->GetBrowserState()->IsOffTheRecord());
   if (!_feedHeaderViewController) {
     BOOL followingSegmentDotVisible = NO;
-    if (base::FeatureList::IsEnabled(kEnableCheckForNewFollowContent) &&
-        IsWebChannelsEnabled()) {
+    if (IsDotEnabledForNewFollowedContent() && IsWebChannelsEnabled()) {
       // Only show the dot if the user follows available publishers.
       followingSegmentDotVisible =
           [self doesFollowingFeedHaveContent] &&

ios/chrome/browser/ui/ntp/new_tab_page_feature.h

diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_feature.h b/ios/chrome/browser/ui/ntp/new_tab_page_feature.h
index 24d65251..f47f13d 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_feature.h
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_feature.h
@@ -39,6 +39,10 @@
 // very short attention log.
 BASE_DECLARE_FEATURE(kEnableRefineDataSourceReloadReporting);
 
+// Flag to modify the feed header through the server. Enabling this feature on
+// its own does nothing; relies on feature parameters.
+BASE_DECLARE_FEATURE(kFeedHeaderSettings);
+
 // Flag to override feed settings through the server. Enabling this feature on
 // its own does nothing; relies on feature parameters.
 BASE_DECLARE_FEATURE(kOverrideFeedSettings);
@@ -113,4 +117,15 @@
 // attention log.
 bool IsRefineDataSourceReloadReportingEnabled();
 
+// YES if the Following feed header should not be sticky.
+bool IsStickyHeaderDisabledForFollowingFeed();
+
+// YES if a dot should appear to indicate that there is new content in the
+// Following feed.
+bool IsDotEnabledForNewFollowedContent();
+
+// Returns a custom height for the Following feed header if it is overridden
+// from the server, or returns the default value.
+int FollowingFeedHeaderHeight();
+
 #endif  // IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_FEATURE_H_

ios/chrome/browser/ui/ntp/new_tab_page_feature.mm

diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_feature.mm b/ios/chrome/browser/ui/ntp/new_tab_page_feature.mm
index d8d04b3bcc..2602c0a 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_feature.mm
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_feature.mm
@@ -47,8 +47,10 @@
              "EnableRefineDataSourceReloadReporting",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
-// Flag to override feed settings through the server. Enabling this feature on
-// its own does nothing; relies on feature parameters.
+BASE_FEATURE(kFeedHeaderSettings,
+             "FeedHeaderSettings",
+             base::FEATURE_DISABLED_BY_DEFAULT);
+
 BASE_FEATURE(kOverrideFeedSettings,
              "OverrideFeedSettings",
              base::FEATURE_DISABLED_BY_DEFAULT);
@@ -72,6 +74,13 @@
 const char kFollowingFeedDefaultSortTypeGroupedByPublisher[] =
     "GroupedByPublisher";
 
+// Feature parameters for `kFeedHeaderSettings`.
+const char kEnableDotForNewFollowedContent[] =
+    "kEnableDotForNewFollowedContent";
+const char kDisableStickyHeaderForFollowingFeed[] =
+    "DisableStickyHeaderForFollowingFeed";
+const char kOverrideFeedHeaderHeight[] = "OverrideFeedHeaderHeight";
+
 // Feature parameters for `kOverrideFeedSettings`.
 const char kFeedSettingRefreshThresholdInSeconds[] =
     "RefreshThresholdInSeconds";
@@ -131,3 +140,20 @@
 bool IsRefineDataSourceReloadReportingEnabled() {
   return base::FeatureList::IsEnabled(kEnableRefineDataSourceReloadReporting);
 }
+
+bool IsStickyHeaderDisabledForFollowingFeed() {
+  return base::GetFieldTrialParamByFeatureAsBool(
+      kFeedHeaderSettings, kDisableStickyHeaderForFollowingFeed, false);
+}
+
+bool IsDotEnabledForNewFollowedContent() {
+  return base::GetFieldTrialParamByFeatureAsBool(
+      kFeedHeaderSettings, kEnableDotForNewFollowedContent, false);
+}
+
+int FollowingFeedHeaderHeight() {
+  int defaultWebChannelsHeaderHeight = 52;
+  return base::GetFieldTrialParamByFeatureAsInt(kFeedHeaderSettings,
+                                                kOverrideFeedHeaderHeight,
+                                                defaultWebChannelsHeaderHeight);
+}

ios/web/public/test/BUILD.gn

diff --git a/ios/web/public/test/BUILD.gn b/ios/web/public/test/BUILD.gn
index af3bdc5..260a68a 100644
--- a/ios/web/public/test/BUILD.gn
+++ b/ios/web/public/test/BUILD.gn
@@ -135,7 +135,7 @@
     "//ios/web/find_in_page",
     "//ios/web/js_messaging",
     "//ios/web/js_messaging:java_script_feature",
-    "//ios/web/public:public",
+    "//ios/web/public",
     "//ios/web/public/js_messaging",
     "//ios/web/web_state:web_state_impl_header",
     "//ios/web/web_state/ui",
@@ -151,8 +151,6 @@
   sources = [
     "error_test_util.h",
     "error_test_util.mm",
-    "js_test_storage_util.h",
-    "js_test_storage_util.mm",
     "js_test_util.h",
     "js_test_util.mm",
     "navigation_test_util.h",

ios/web/public/test/js_test_storage_util.h

diff --git a/ios/web/public/test/js_test_storage_util.h b/ios/web/public/test/js_test_storage_util.h
deleted file mode 100644
index 17870d0a..0000000
--- a/ios/web/public/test/js_test_storage_util.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2020 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef IOS_WEB_PUBLIC_TEST_JS_TEST_STORAGE_UTIL_H_
-#define IOS_WEB_PUBLIC_TEST_JS_TEST_STORAGE_UTIL_H_
-
-#import <Foundation/Foundation.h>
-#import <WebKit/WebKit.h>
-
-namespace web {
-class WebFrame;
-class WebState;
-
-namespace test {
-
-// These functions synchronously execute JavaScript to access different types of
-// storage (e.g. localStorage, cookies,etc.).
-
-// Sets a persistent cookie with `key`, `value` on `web_frame`. Returns true on
-// success and false on failure.
-bool SetCookie(WebFrame* web_frame, NSString* key, NSString* value);
-
-// Gets a csv list of all cookies from `web_frame` and places it in `cookies`.
-// Returns true on success and false on failure.
-bool GetCookies(WebFrame* web_frame, NSString** cookies);
-
-// Stores a given `key`, `value` in local storage on `web_frame`. If
-// `error_message` is provided, then if an error occurs, it will be filled with
-// the error message. Returns true on success and false on failure.
-bool SetLocalStorage(WebFrame* web_frame,
-                     NSString* key,
-                     NSString* value,
-                     NSString** error_message);
-
-// Reads the value for the given `key` from local storage on `web_frame` and
-// places it in `result`. If `error_message` is provided, then if an error
-// occurs, it will be filled with the error message. Returns true on success and
-// false on failure.
-bool GetLocalStorage(WebFrame* web_frame,
-                     NSString* key,
-                     NSString** result,
-                     NSString** error_message);
-
-// Stores a given `key`, `value` in session storage on `web_frame`. If
-// `error_message` is provided, then if an error occurs, it will be filled with
-// the error message. Returns true on success and false on failure.
-bool SetSessionStorage(WebFrame* web_frame,
-                       NSString* key,
-                       NSString* value,
-                       NSString** error_message);
-
-// Reads the value for the given `key` from session storage on `web_frame` and
-// places it in `result`. If `error_message` is provided, then if an error
-// occurs, it will be filled with the error message. Returns true on success and
-// false on failure.
-bool GetSessionStorage(WebFrame* web_frame,
-                       NSString* key,
-                       NSString** result,
-                       NSString** error_message);
-
-// Stores a given `key`, `value` in cache storage on `web_frame` + `web_state`.
-// If `error_message` is provided, then if an error occurs, it will be filled
-// with the error message. Returns true on success and false on failure.
-bool SetCache(WebFrame* web_frame,
-              WebState* web_state,
-              NSString* key,
-              NSString* value,
-              NSString** error_message);
-
-// Reads the value for the given `key` from session storage on `web_frame` +
-// `web_state` and places it in `result`. If `error_message` is provided, then
-// if an error occurs, it will be filled with the error message. Returns true on
-// success and false on failure.
-bool GetCache(WebFrame* web_frame,
-              WebState* web_state,
-              NSString* key,
-              NSString** result,
-              NSString** error_message);
-
-// Stores a given `key`, `value` in IndexedDB on `web_frame` + `web_state`.
-// If `error_message` is provided, then if an error occurs, it will be filled
-// with the error message. Returns true on success and false on failure.
-bool SetIndexedDB(WebFrame* web_frame,
-                  WebState* web_state,
-                  NSString* key,
-                  NSString* value,
-                  NSString** error_message);
-
-// Reads the value for the given `key` from IndexedDB on `web_frame` +
-// `web_state` and places it in `result`. If `error_message` is provided, then
-// if an error occurs, it will be filled with the error message. Returns true on
-// success and false on failure.
-bool GetIndexedDB(WebFrame* web_frame,
-                  WebState* web_state,
-                  NSString* key,
-                  NSString** result,
-                  NSString** error_message);
-
-}  // namespace test
-}  // namespace web
-
-#endif  // IOS_WEB_PUBLIC_TEST_JS_TEST_STORAGE_UTIL_H_

ios/web/public/test/js_test_storage_util.mm

diff --git a/ios/web/public/test/js_test_storage_util.mm b/ios/web/public/test/js_test_storage_util.mm
deleted file mode 100644
index 0f3e98c..0000000
--- a/ios/web/public/test/js_test_storage_util.mm
+++ /dev/null
@@ -1,349 +0,0 @@
-// Copyright 2020 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "ios/web/public/test/js_test_storage_util.h"
-
-#import "base/bind.h"
-#import "base/callback.h"
-#import "base/strings/sys_string_conversions.h"
-#import "base/strings/utf_string_conversions.h"
-#import "base/test/ios/wait_util.h"
-#import "base/values.h"
-#import "ios/web/public/js_messaging/web_frame.h"
-#import "ios/web/public/web_state.h"
-#import "testing/gtest/include/gtest/gtest.h"
-#import "testing/gtest_mac.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-using base::test::ios::kWaitForJSCompletionTimeout;
-using base::test::ios::WaitUntilConditionOrTimeout;
-
-namespace web {
-namespace test {
-
-namespace {
-
-// Convenience wrapper for web_frame.CallJavaScriptFunction that synchronously
-// calls the provided function.
-bool ExecuteJavaScriptInFrame(
-    WebFrame* web_frame,
-    const std::string& name,
-    const std::vector<base::Value>& parameters,
-    base::OnceCallback<void(const base::Value*)> callback,
-    base::TimeDelta timeout) {
-  __block bool completed = false;
-  __block base::OnceCallback<void(const base::Value*)> block_callback =
-      std::move(callback);
-  web_frame->CallJavaScriptFunction(name, parameters,
-                                    base::BindOnce(^(const base::Value* value) {
-                                      completed = true;
-                                      std::move(block_callback).Run(value);
-                                    }),
-                                    timeout);
-  bool success =
-      WaitUntilConditionOrTimeout(kWaitForJSCompletionTimeout, ^bool {
-        return completed;
-      });
-  return success;
-}
-
-// Convenience wrapper for web_frame.CallJavaScriptFunction that synchronously
-// calls the provided function.
-bool ExecuteJavaScriptInFrame(WebFrame* web_frame,
-                              const std::string& name,
-                              const std::vector<base::Value>& parameters) {
-  return ExecuteJavaScriptInFrame(web_frame, name, parameters,
-                                  base::BindOnce(^(const base::Value*){
-                                  }),
-                                  kWaitForJSCompletionTimeout);
-}
-
-// Saves `key`, `value` to a Javascript storage type in `web_frame` using the
-// __gCrWeb function `name`. Places any error message from the JavaScript into
-// `error_message`.
-bool SetStorage(WebFrame* web_frame,
-                const std::string& set_function,
-                NSString* key,
-                NSString* key_value,
-                NSString** error_message) {
-  __block NSString* block_error_message;
-  __block bool set_success = false;
-  std::vector<base::Value> params;
-  params.push_back(base::Value(base::SysNSStringToUTF8(key)));
-  params.push_back(base::Value(base::SysNSStringToUTF8(key_value)));
-  bool success = ExecuteJavaScriptInFrame(
-      web_frame, set_function, params,
-      base::BindOnce(^(const base::Value* value) {
-        if (value->is_bool()) {
-          set_success = value->GetBool();
-        } else if (value->is_dict()) {
-          block_error_message =
-              base::SysUTF8ToNSString(value->FindPath("message")->GetString());
-          set_success = true;
-        }
-      }),
-      kWaitForJSCompletionTimeout);
-  if (error_message) {
-    *error_message = block_error_message;
-  }
-
-  return success && set_success;
-}
-
-// Reads the value for the given `key` from storage on `web_frame` using
-// the __gCrWeb function `name`. The read value will be placed in `result` and
-// any JavaScript error will be placed in `error_message`.
-bool GetStorage(WebFrame* web_frame,
-                const std::string& get_function,
-                NSString* key,
-                NSString** result,
-                NSString** error_message) {
-  __block NSString* block_result;
-  __block NSString* block_error_message;
-  __block bool lookup_success = false;
-  std::vector<base::Value> params;
-  params.push_back(base::Value(base::SysNSStringToUTF8(key)));
-  bool success = ExecuteJavaScriptInFrame(
-      web_frame, get_function, params,
-      base::BindOnce(^(const base::Value* value) {
-        if (value->is_string()) {
-          block_result = base::SysUTF8ToNSString(value->GetString());
-          lookup_success = true;
-        } else if (value->is_dict()) {
-          block_error_message =
-              base::SysUTF8ToNSString(value->FindPath("message")->GetString());
-          lookup_success = true;
-        } else {
-          lookup_success = false;
-        }
-      }),
-      kWaitForJSCompletionTimeout);
-
-  if (error_message) {
-    *error_message = block_error_message;
-  }
-  if (result) {
-    *result = block_result;
-  }
-  return success && lookup_success;
-}
-
-// Saves `key`, `value` to a Javascript storage type in `web_frame` and
-// `web_state` using the
-// __gCrWeb function `name`. The storage being used must be async. Places any
-// error message from the JavaScript into `error_message`.
-bool SetAsyncStorage(WebFrame* web_frame,
-                     WebState* web_state,
-                     const std::string& set_function,
-                     NSString* key,
-                     NSString* value,
-                     NSString** error_message) {
-  // The test injected javascript will send a message
-  // when the async is done, so listen for that here.
-  __block bool async_success = false;
-  __block NSString* block_error_message;
-  base::CallbackListSubscription subscription_ =
-      web_state->AddScriptCommandCallback(
-          base::BindRepeating(^(const base::Value& message,
-                                const GURL& page_url, bool user_is_interacting,
-                                web::WebFrame* sender_frame) {
-            const base::Value* result = message.FindKey("result");
-            if (!result) {
-              return;
-            }
-            if (result->is_bool()) {
-              async_success = result->GetBool();
-              return;
-            }
-            if (result->is_dict()) {
-              const std::string* messageString =
-                  result->FindStringKey("message");
-              if (messageString) {
-                block_error_message = base::SysUTF8ToNSString(*messageString);
-                async_success = true;
-                return;
-              }
-            }
-            async_success = false;
-          }),
-          "cookieTest");
-
-  if (!SetStorage(web_frame, set_function, key, value, nil)) {
-    return false;
-  }
-
-  bool success =
-      WaitUntilConditionOrTimeout(kWaitForJSCompletionTimeout, ^bool {
-        return async_success;
-      });
-
-  if (error_message) {
-    *error_message = block_error_message;
-  }
-
-  return success;
-}
-
-// Reads the value for the given `key` from storage on `web_frame` using
-// the __gCrWeb function `name`. The storage type must be async. The read value
-// will be placed in `result` and any JavaScript error will be placed in
-// `error_message`.
-bool GetAsyncStorage(WebFrame* web_frame,
-                     WebState* web_state,
-                     const std::string& get_function,
-                     NSString* key,
-                     NSString** result,
-                     NSString** error_message) {
-  // The test injected javascript will send a message
-  // when the async is done, so listen for that here.
-  __block bool async_success = false;
-  __block NSString* block_result;
-  __block NSString* block_error_message;
-  base::CallbackListSubscription subscription_ =
-      web_state->AddScriptCommandCallback(
-          base::BindRepeating(^(const base::Value& message,
-                                const GURL& page_url, bool user_is_interacting,
-                                web::WebFrame* sender_frame) {
-            const base::Value* resultValue = message.FindPath("result");
-            if (!resultValue) {
-              return;
-            }
-            if (resultValue->is_string()) {
-              block_result = base::SysUTF8ToNSString(resultValue->GetString());
-              async_success = true;
-              return;
-            }
-            if (resultValue->is_dict()) {
-              const std::string* messageStr =
-                  resultValue->FindStringKey("message");
-              if (messageStr) {
-                block_error_message = base::SysUTF8ToNSString(*messageStr);
-                async_success = true;
-                return;
-              }
-            }
-
-            async_success = false;
-          }),
-          "cookieTest");
-
-  if (!GetStorage(web_frame, get_function, key, nil, nil)) {
-    return false;
-  }
-
-  bool success =
-      WaitUntilConditionOrTimeout(kWaitForJSCompletionTimeout, ^bool {
-        return async_success;
-      });
-
-  if (result) {
-    *result = block_result;
-  }
-  if (error_message) {
-    *error_message = block_error_message;
-  }
-
-  return success;
-}
-
-}  // namespace
-
-bool SetCookie(WebFrame* web_frame, NSString* key, NSString* value) {
-  std::vector<base::Value> params;
-  NSString* cookie = [NSString
-      stringWithFormat:@"%@=%@; Expires=Tue, 05-May-9999 02:18:23 GMT; Path=/",
-                       key, value];
-  params.push_back(base::Value(base::SysNSStringToUTF8(cookie)));
-  return ExecuteJavaScriptInFrame(web_frame, "cookieTest.setCookie", params);
-}
-
-bool GetCookies(WebFrame* web_frame, NSString** cookies) {
-  __block NSString* result = nil;
-  std::vector<base::Value> params;
-  bool success = ExecuteJavaScriptInFrame(
-      web_frame, "cookieTest.getCookies", params,
-      base::BindOnce(^(const base::Value* value) {
-        ASSERT_TRUE(value->is_string());
-        result = base::SysUTF8ToNSString(value->GetString());
-      }),
-      kWaitForJSCompletionTimeout);
-  if (cookies) {
-    *cookies = result;
-  }
-  return success;
-}
-
-bool SetLocalStorage(WebFrame* web_frame,
-                     NSString* key,
-                     NSString* value,
-                     NSString** error_message) {
-  return SetStorage(web_frame, "cookieTest.setLocalStorage", key, value,
-                    error_message);
-}
-
-bool GetLocalStorage(WebFrame* web_frame,
-                     NSString* key,
-                     NSString** result,
-                     NSString** error_message) {
-  return GetStorage(web_frame, "cookieTest.getLocalStorage", key, result,
-                    error_message);
-}
-
-bool SetSessionStorage(WebFrame* web_frame,
-                       NSString* key,
-                       NSString* value,
-                       NSString** error_message) {
-  return SetStorage(web_frame, "cookieTest.setSessionStorage", key, value,
-                    error_message);
-}
-
-bool GetSessionStorage(WebFrame* web_frame,
-                       NSString* key,
-                       NSString** result,
-                       NSString** error_message) {
-  return GetStorage(web_frame, "cookieTest.getSessionStorage", key, result,
-                    error_message);
-}
-
-bool SetCache(WebFrame* web_frame,
-              WebState* web_state,
-              NSString* key,
-              NSString* value,
-              NSString** error_message) {
-  return SetAsyncStorage(web_frame, web_state, "cookieTest.setCache", key,
-                         value, error_message);
-}
-
-bool GetCache(WebFrame* web_frame,
-              WebState* web_state,
-              NSString* key,
-              NSString** result,
-              NSString** error_message) {
-  return GetAsyncStorage(web_frame, web_state, "cookieTest.getCache", key,
-                         result, error_message);
-}
-
-bool SetIndexedDB(WebFrame* web_frame,
-                  WebState* web_state,
-                  NSString* key,
-                  NSString* value,
-                  NSString** error_message) {
-  return SetAsyncStorage(web_frame, web_state, "cookieTest.setIndexedDB", key,
-                         value, error_message);
-}
-
-bool GetIndexedDB(WebFrame* web_frame,
-                  WebState* web_state,
-                  NSString* key,
-                  NSString** result,
-                  NSString** error_message) {
-  return GetAsyncStorage(web_frame, web_state, "cookieTest.getIndexedDB", key,
-                         result, error_message);
-}
-
-}  // namespace test
-}  // namespace web

media/filters/chunk_demuxer.h

diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h
index 771a56c3..0dbd014 100644
--- a/media/filters/chunk_demuxer.h
+++ b/media/filters/chunk_demuxer.h
@@ -58,7 +58,7 @@
   void Seek(base::TimeDelta time);
   bool IsSeekWaitingForData() const;
 
-  // Add buffers to this stream.  Buffers are stored in SourceBufferStreams,
+  // Add buffers to this stream. Buffers are stored in SourceBufferStreams,
   // which handle ordering and overlap resolution.
   // Returns true if buffers were successfully added.
   bool Append(const StreamParser::BufferQueue& buffers);
@@ -228,8 +228,6 @@
   std::string GetDisplayName() const override;
   DemuxerType GetDemuxerType() const override;
 
-  // |enable_text| Process inband text tracks in the normal way when true,
-  //   otherwise ignore them.
   void Initialize(DemuxerHost* host, PipelineStatusCallback init_cb) override;
   void Stop() override;
   void Seek(base::TimeDelta time, PipelineStatusCallback cb) override;
@@ -341,7 +339,7 @@
   // Appends webcodecs encoded chunks (already converted by caller into a
   // BufferQueue of StreamParserBuffers) to the source buffer associated with
   // |id|, with same semantic for other parameters and return value as
-  // AppendData().
+  // RunSegmentParserLoop().
   [[nodiscard]] bool AppendChunks(
       const std::string& id,
       std::unique_ptr<StreamParser::BufferQueue> buffer_queue,

media/filters/demuxer_manager.cc

diff --git a/media/filters/demuxer_manager.cc b/media/filters/demuxer_manager.cc
index 984d8ea..24f33a5 100644
--- a/media/filters/demuxer_manager.cc
+++ b/media/filters/demuxer_manager.cc
@@ -9,9 +9,14 @@
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
+#include "base/task/task_runner.h"
+#include "media/base/bind_to_current_loop.h"
 #include "media/base/cross_origin_data_source.h"
 #include "media/base/data_source.h"
 #include "media/base/media_switches.h"
+#include "media/base/media_url_demuxer.h"
+#include "media/filters/chunk_demuxer.h"
+#include "media/filters/ffmpeg_demuxer.h"
 #include "url/gurl.h"
 
 namespace media {
@@ -83,22 +88,40 @@
 
 #endif
 
+#if BUILDFLAG(ENABLE_FFMPEG)
+// Returns true if `url` represents (or is likely to) a local file.
+bool IsLocalFile(const GURL& url) {
+  return url.SchemeIsFile() || url.SchemeIsFileSystem() ||
+         url.SchemeIs(url::kContentScheme) ||
+         url.SchemeIs(url::kContentIDScheme) ||
+         url.SchemeIs("chrome-extension");
+}
+#endif
+
 }  // namespace
 
-DemuxerManager::DemuxerManager(Client* client) : client_(client) {
+DemuxerManager::DemuxerManager(
+    Client* client,
+    scoped_refptr<base::SequencedTaskRunner> media_task_runner,
+    MediaLog* log,
+    net::SiteForCookies site_for_cookies,
+    url::Origin top_frame_origin,
+    bool enable_instant_source_buffer_gc,
+    std::unique_ptr<Demuxer> demuxer_override)
+    : client_(client),
+      media_task_runner_(std::move(media_task_runner)),
+      media_log_(log->Clone()),
+      site_for_cookies_(std::move(site_for_cookies)),
+      top_frame_origin_(std::move(top_frame_origin)),
+      enable_instant_source_buffer_gc_(enable_instant_source_buffer_gc),
+      demuxer_override_(std::move(demuxer_override)) {
   DCHECK(client_);
 }
 
-DemuxerManager::~DemuxerManager() {
-  // |data_source_| MUST have been moved out of DemuxerManager prior to it
-  // being deleted!
-  DCHECK(!data_source_);
-}
+DemuxerManager::~DemuxerManager() = default;
 
-// This will go away as soon as we move the creation of the demuxers into
-// this manager file, in the next patchset.
-DataSource* DemuxerManager::GetRawDataSource() const {
-  return data_source_.get();
+void DemuxerManager::InvalidateWeakPtrs() {
+  weak_factory_.InvalidateWeakPtrs();
 }
 
 void DemuxerManager::SetLoadedUrl(GURL url) {
@@ -107,50 +130,9 @@
   loaded_url_ = std::move(url);
 }
 
-const DataSource* DemuxerManager::GetDataSourceForTesting() const {
-  return data_source_.get();
-}
-
-void DemuxerManager::SetDataSource(std::unique_ptr<DataSource> data_source) {
-  data_source_ = std::move(data_source);
-}
-
-void DemuxerManager::OnBufferingHaveEnough(bool enough) {
-  CHECK(data_source_);
-  data_source_->OnBufferingHaveEnough(enough);
-}
-
-void DemuxerManager::SetPreload(DataSource::Preload preload) {
-  if (data_source_) {
-    data_source_->SetPreload(preload);
-  }
-}
-
-std::unique_ptr<DataSource>
-DemuxerManager::StopAndGetDataSourceForDestruction() {
-  if (data_source_) {
-    data_source_->Stop();
-  }
-  return std::move(data_source_);
-}
-
-int64_t DemuxerManager::GetDataSourceMemoryUsage() {
-  return data_source_ ? data_source_->GetMemoryUsage() : 0;
-}
-
-void DemuxerManager::OnDataSourcePlaybackRateChange(double rate, bool paused) {
-  if (!data_source_) {
-    return;
-  }
-  data_source_->OnMediaPlaybackRateChanged(rate);
-  if (!paused) {
-    data_source_->OnMediaIsPlaying();
-  }
-}
-
+PipelineStatus::Or<GURL> DemuxerManager::ResetAfterHlsDetected(
+    bool cryptographic_url) {
 #if BUILDFLAG(IS_ANDROID)
-PipelineStatus DemuxerManager::StartAndRecordHLSFallback(
-    bool is_frame_url_cryptographic) {
   // If HLS isn't enabled, HLS detection should be the error.
   if (!base::FeatureList::IsEnabled(kHlsPlayer)) {
     return DEMUXER_ERROR_DETECTED_HLS;
@@ -172,6 +154,7 @@
     return PIPELINE_ERROR_EXTERNAL_RENDERER_FAILED;
   }
 
+  // Record the fallback.
   bool manifest_url_is_cryptographic =
       loaded_url_.SchemeIsCryptographic() &&
       GetDataSourceUrlAfterRedirects()->SchemeIsCryptographic();
@@ -182,9 +165,8 @@
                                 mime_type);
   UMA_HISTOGRAM_BOOLEAN("Media.WebMediaPlayerImpl.HLS.IsCorsCrossOrigin",
                         is_cross_origin);
-  UMA_HISTOGRAM_BOOLEAN(
-      "Media.WebMediaPlayerImpl.HLS.IsMixedContent",
-      is_frame_url_cryptographic && !manifest_url_is_cryptographic);
+  UMA_HISTOGRAM_BOOLEAN("Media.WebMediaPlayerImpl.HLS.IsMixedContent",
+                        cryptographic_url && !manifest_url_is_cryptographic);
   if (is_cross_origin) {
     UMA_HISTOGRAM_BOOLEAN("Media.WebMediaPlayerImpl.HLS.HasAccessControl",
                           co_data_source->HasAccessControl());
@@ -192,11 +174,206 @@
         "Media.WebMediaPlayerImpl.HLS.CorsCrossOrigin.MimeType", mime_type);
   }
 
-  return PIPELINE_OK;
+  // Can't fail anymore, so set hls flag to true for next time we create a
+  // new demuxer.
+  demuxer_found_hls_ = true;
+  return GetDataSourceUrlAfterRedirects().value();
+#else
+  return DEMUXER_ERROR_DETECTED_HLS;
+#endif  // BUILDFLAG(IS_ANDROID)
 }
+
+void DemuxerManager::FreeResourcesAfterMediaThreadWait(base::OnceClosure cb) {
+  media_task_runner_->PostTask(
+      FROM_HERE,
+      BindToCurrentLoop(base::BindOnce(
+          [](std::unique_ptr<Demuxer> demuxer,
+             std::unique_ptr<DataSource> data_source,
+             base::OnceClosure done_cb) {
+            demuxer.reset();
+            data_source.reset();
+            std::move(done_cb).Run();
+          },
+          std::move(demuxer_), std::move(data_source_), std::move(cb))));
+}
+
+absl::optional<double> DemuxerManager::GetDemuxerDuration() {
+  if (!demuxer_) {
+    return absl::nullopt;
+  }
+  if (demuxer_->GetDemuxerType() != DemuxerType::kChunkDemuxer) {
+    return absl::nullopt;
+  }
+
+  // Use duration from ChunkDemuxer when present. MSE allows users to specify
+  // duration as a double. This propagates to the rest of the pipeline as a
+  // TimeDelta with potentially reduced precision (limited to Microseconds).
+  // ChunkDemuxer returns the full-precision user-specified double. This ensures
+  // users can "get" the exact duration they "set".
+  // TODO(crbug/1377053) Get rid of this static cast.
+  return static_cast<ChunkDemuxer*>(demuxer_.get())->GetDuration();
+}
+
+absl::optional<DemuxerType> DemuxerManager::GetDemuxerType() {
+  if (!demuxer_) {
+    return absl::nullopt;
+  }
+  return demuxer_->GetDemuxerType();
+}
+
+absl::optional<container_names::MediaContainerName>
+DemuxerManager::GetContainerForMetrics() {
+  if (!demuxer_) {
+    return absl::nullopt;
+  }
+  return demuxer_->GetContainerForMetrics();
+}
+
+void DemuxerManager::RespondToDemuxerMemoryUsageReport(
+    base::OnceCallback<void(int64_t)> cb) {
+  if (!demuxer_) {
+    return std::move(cb).Run(0);
+  }
+  switch (demuxer_->GetDemuxerType()) {
+    case DemuxerType::kChunkDemuxer:
+      // ChunkDemuxer locks while getting the memory size, so we don't have
+      // to post cross thread.
+      return std::move(cb).Run(demuxer_->GetMemoryUsage());
+    case DemuxerType::kMediaUrlDemuxer:
+      // MediaUrlDemuxer always returns a constant.
+      return std::move(cb).Run(demuxer_->GetMemoryUsage());
+    default:
+      // FFmpegDemuxer is single threaded and only runs on the media thread,
+      // so we have to post there and wait for the reply. We can't be sure what
+      // other demuxers do.
+      // base::Unretained is safe here because |this| is posted for destruction
+      // and |this| strongly owns |demuxer_|. See WMPI::ReportMemoryUsage() for
+      // more information about destruction order.
+      media_task_runner_->PostTaskAndReplyWithResult(
+          FROM_HERE,
+          base::BindOnce(&Demuxer::GetMemoryUsage,
+                         base::Unretained(demuxer_.get())),
+          std::move(cb));
+      break;
+  }
+}
+
+PipelineStatus DemuxerManager::CreateDemuxer(
+    bool load_media_source,
+    DataSource::Preload preload,
+    bool has_poster,
+    DemuxerManager::DemuxerCreatedCB on_demuxer_created) {
+  // TODO(crbug/1377053) return a better error
+  if (!client_) {
+    return DEMUXER_ERROR_COULD_NOT_OPEN;
+  }
+
+#if BUILDFLAG(IS_ANDROID)
+  if (demuxer_found_hls_ || client_->IsMediaPlayerRendererClient()) {
+    SetDemuxer(CreateMediaUrlDemuxer(demuxer_found_hls_));
+    return std::move(on_demuxer_created)
+        .Run(demuxer_.get(), Pipeline::StartType::kNormal,
+             /*is_streaming = */ false,
+             /*is_static = */ false);
+  }
 #endif
 
+  // TODO(sandersd): FileSystem objects may also be non-static, but due to our
+  // caching layer such situations are broken already. http://crbug.com/593159
+  bool is_static = true;
+
+  if (demuxer_override_) {
+    // TODO(https://crbug.com/1076267): Should everything else after this block
+    // run in the demuxer override case?
+    SetDemuxer(std::move(demuxer_override_));
+  } else if (!load_media_source) {
+#if BUILDFLAG(ENABLE_FFMPEG)
+    SetDemuxer(CreateFFmpegDemuxer());
+#else
+    return DEMUXER_ERROR_COULD_NOT_OPEN;
+#endif
+  } else {
+    DCHECK(!HasDataSource());
+    SetDemuxer(CreateChunkDemuxer());
+    is_static = false;
+  }
+
+  if (!demuxer_) {
+    return DEMUXER_ERROR_COULD_NOT_OPEN;
+  }
+
+  // A myriad of reasons exists that prevent us from entering a suspended state
+  // after metadata is reached - in this case we'll have to do a normal startup.
+  if (demuxer_->GetDemuxerType() == DemuxerType::kChunkDemuxer ||
+      preload != DataSource::METADATA || client_->CouldPlayIfEnoughData() ||
+      IsStreamingDataSource()) {
+    return std::move(on_demuxer_created)
+        .Run(demuxer_.get(), Pipeline::StartType::kNormal,
+             IsStreamingDataSource(), is_static);
+  }
+
+  // We can only do a universal suspend for posters, unless the flag is enabled.
+  auto suspended_mode = Pipeline::StartType::kSuspendAfterMetadataForAudioOnly;
+  if (has_poster || base::FeatureList::IsEnabled(kPreloadMetadataLazyLoad)) {
+    suspended_mode = Pipeline::StartType::kSuspendAfterMetadata;
+  }
+  return std::move(on_demuxer_created)
+      .Run(demuxer_.get(), suspended_mode, IsStreamingDataSource(), is_static);
+}
+
+#if BUILDFLAG(IS_ANDROID)
+void DemuxerManager::SetAllowMediaPlayerRendererCredentials(bool allow) {
+  allow_media_player_renderer_credentials_ = allow;
+}
+#endif  // BUILDFLAG(IS_ANDROID)
+
+const DataSource* DemuxerManager::GetDataSourceForTesting() const {
+  return data_source_.get();
+}
+
+void DemuxerManager::SetDataSource(std::unique_ptr<DataSource> data_source) {
+  data_source_ = std::move(data_source);
+}
+
+void DemuxerManager::OnBufferingHaveEnough(bool enough) {
+  CHECK(data_source_);
+  data_source_->OnBufferingHaveEnough(enough);
+}
+
+void DemuxerManager::SetPreload(DataSource::Preload preload) {
+  if (data_source_) {
+    data_source_->SetPreload(preload);
+  }
+}
+
+void DemuxerManager::StopAndResetClient(Client* client) {
+  if (data_source_) {
+    data_source_->Stop();
+  }
+  client_ = client;
+}
+
+int64_t DemuxerManager::GetDataSourceMemoryUsage() {
+  return data_source_ ? data_source_->GetMemoryUsage() : 0;
+}
+
+void DemuxerManager::OnDataSourcePlaybackRateChange(double rate, bool paused) {
+  if (!data_source_) {
+    return;
+  }
+  data_source_->OnMediaPlaybackRateChanged(rate);
+  if (!paused) {
+    data_source_->OnMediaIsPlaying();
+  }
+}
+
 bool DemuxerManager::WouldTaintOrigin() const {
+  if (demuxer_found_hls_) {
+    // HLS manifests might pull segments from a different origin. We can't know
+    // for sure, so we conservatively say yes here.
+    return true;
+  }
+
   // TODO(crbug/1377053): The default |false| value might have to be
   // re-considered for MediaPlayerRenderer, but for now, leave behavior the
   // same as it was.
@@ -207,6 +384,14 @@
   return data_source_ != nullptr;
 }
 
+bool DemuxerManager::HasDemuxer() const {
+  return !!demuxer_;
+}
+
+bool DemuxerManager::HasDemuxerOverride() const {
+  return !!demuxer_override_;
+}
+
 absl::optional<GURL> DemuxerManager::GetDataSourceUrlAfterRedirects() const {
   if (data_source_) {
     return data_source_->GetUrlAfterRedirects();
@@ -237,4 +422,154 @@
   return data_source_ ? data_source_->PassedTimingAllowOriginCheck() : true;
 }
 
+std::unique_ptr<Demuxer> DemuxerManager::CreateChunkDemuxer() {
+  if (base::FeatureList::IsEnabled(kMemoryPressureBasedSourceBufferGC)) {
+    memory_pressure_listener_ = std::make_unique<base::MemoryPressureListener>(
+        FROM_HERE, base::BindRepeating(&DemuxerManager::OnMemoryPressure,
+                                       base::Unretained(this)));
+  }
+
+  return std::make_unique<ChunkDemuxer>(
+      BindToCurrentLoop(base::BindOnce(&DemuxerManager::OnChunkDemuxerOpened,
+                                       weak_factory_.GetWeakPtr())),
+      BindToCurrentLoop(base::BindRepeating(&DemuxerManager::OnProgress,
+                                            weak_factory_.GetWeakPtr())),
+      BindToCurrentLoop(
+          base::BindRepeating(&DemuxerManager::OnEncryptedMediaInitData,
+                              weak_factory_.GetWeakPtr())),
+      media_log_.get());
+}
+
+#if BUILDFLAG(ENABLE_FFMPEG)
+std::unique_ptr<Demuxer> DemuxerManager::CreateFFmpegDemuxer() {
+  DCHECK(data_source_);
+  return std::make_unique<FFmpegDemuxer>(
+      media_task_runner_, data_source_.get(),
+      BindToCurrentLoop(
+          base::BindRepeating(&DemuxerManager::OnEncryptedMediaInitData,
+                              weak_factory_.GetWeakPtr())),
+      BindToCurrentLoop(
+          base::BindRepeating(&DemuxerManager::OnFFmpegMediaTracksUpdated,
+                              weak_factory_.GetWeakPtr())),
+      media_log_.get(), IsLocalFile(loaded_url_));
+}
+#endif  // BUILDFLAG(ENABLE_FFMPEG)
+
+#if BUILDFLAG(IS_ANDROID)
+std::unique_ptr<Demuxer> DemuxerManager::CreateMediaUrlDemuxer(
+    bool expect_hls_content) {
+  return std::make_unique<MediaUrlDemuxer>(
+      media_task_runner_, loaded_url_, site_for_cookies_, top_frame_origin_,
+      allow_media_player_renderer_credentials_, expect_hls_content);
+}
+#endif  // BUILDFLAG(IS_ANDROID)
+
+void DemuxerManager::SetDemuxer(std::unique_ptr<Demuxer> demuxer) {
+  DCHECK(!demuxer_);
+  CHECK(demuxer);
+
+  demuxer_ = std::move(demuxer);
+  if (client_) {
+    client_->MakeDemuxerThreadDumper(demuxer_.get());
+  }
+}
+
+void DemuxerManager::OnEncryptedMediaInitData(
+    EmeInitDataType init_data_type,
+    const std::vector<uint8_t>& init_data) {
+  if (client_) {
+    client_->OnEncryptedMediaInitData(init_data_type, init_data);
+  }
+}
+
+void DemuxerManager::OnMemoryPressure(
+    base::MemoryPressureListener::MemoryPressureLevel level) {
+  DVLOG(2) << __func__ << " level=" << level;
+  DCHECK(base::FeatureList::IsEnabled(kMemoryPressureBasedSourceBufferGC));
+  DCHECK(GetDemuxerType() == DemuxerType::kChunkDemuxer);
+
+  if (level == base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE) {
+    return;
+  }
+
+  // The new value of `level` will take effect on the next
+  // garbage collection. Typically this means the next SourceBuffer append()
+  // operation, since per MSE spec, the garbage collection must only occur
+  // during SourceBuffer append(). But if memory pressure is critical it might
+  // be better to perform GC immediately rather than wait for the next append
+  // and potentially get killed due to out-of-memory.
+  // So if this experiment is enabled and pressure level is critical, we'll pass
+  // down force_instant_gc==true, which will force immediate GC on
+  // SourceBufferStreams.
+  bool force_instant_gc =
+      (enable_instant_source_buffer_gc_ &&
+       level == base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL);
+
+  if (!client_) {
+    return;
+  }
+
+  // base::Unretained is safe, since `demuxer_` is actually owned by
+  // `this` via this->demuxer_. Note the destruction of `demuxer_` is done
+  // from ~WMPI by first hopping to `media_task_runner_` to prevent race with
+  // this task.
+  // TODO(crbug/1377053) Get rid of this static cast.
+  media_task_runner_->PostTask(
+      FROM_HERE,
+      base::BindOnce(
+          &ChunkDemuxer::OnMemoryPressure,
+          base::Unretained(static_cast<ChunkDemuxer*>(demuxer_.get())),
+          base::Seconds(client_->CurrentTime()), level, force_instant_gc));
+}
+
+void DemuxerManager::OnChunkDemuxerOpened() {
+  CHECK(demuxer_);
+  CHECK(demuxer_->GetDemuxerType() == DemuxerType::kChunkDemuxer);
+  // TODO(crbug/1377053) Get rid of this static cast.
+  if (client_) {
+    client_->OnChunkDemuxerOpened(static_cast<ChunkDemuxer*>(demuxer_.get()));
+  }
+}
+
+void DemuxerManager::OnProgress() {
+  if (client_) {
+    client_->OnProgress();
+  }
+}
+
+#if BUILDFLAG(ENABLE_FFMPEG)
+void DemuxerManager::OnFFmpegMediaTracksUpdated(
+    std::unique_ptr<MediaTracks> tracks) {
+  DCHECK(demuxer_);
+
+  // For MSE/chunk_demuxer case the media track updates are handled by
+  // WebSourceBufferImpl.
+  DCHECK(GetDemuxerType() != DemuxerType::kChunkDemuxer);
+
+  // we might be in the process of being destroyed when this happens.
+  if (!client_) {
+    return;
+  }
+
+  // Only the first audio track and the first video track are enabled by
+  // default to match blink logic.
+  bool is_first_audio_track = true;
+  bool is_first_video_track = true;
+  for (const auto& track : tracks->tracks()) {
+    if (track->type() == MediaTrack::Audio) {
+      client_->AddAudioTrack(track->id().value(), track->label().value(),
+                             track->language().value(), is_first_audio_track);
+      is_first_audio_track = false;
+    } else if (track->type() == MediaTrack::Video) {
+      client_->AddVideoTrack(track->id().value(), track->label().value(),
+                             track->language().value(), is_first_video_track);
+      is_first_video_track = false;
+    } else {
+      // Text tracks are not supported through this code path.
+      NOTREACHED();
+    }
+  }
+}
+#endif  // BUILDFLAG(ENABLE_FFMPEG)
+
 }  // namespace media

media/filters/demuxer_manager.h

diff --git a/media/filters/demuxer_manager.h b/media/filters/demuxer_manager.h
index 35a5101..515da1e 100644
--- a/media/filters/demuxer_manager.h
+++ b/media/filters/demuxer_manager.h
@@ -5,14 +5,24 @@
 #ifndef MEDIA_FILTERS_DEMUXER_MANAGER_H_
 #define MEDIA_FILTERS_DEMUXER_MANAGER_H_
 
+#include <vector>
+
 #include "base/functional/callback.h"
+#include "base/memory/memory_pressure_listener.h"
 #include "base/memory/raw_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/task/sequenced_task_runner.h"
 #include "media/base/data_source.h"
+#include "media/base/demuxer.h"
+#include "media/base/eme_constants.h"
 #include "media/base/media_export.h"
+#include "media/base/media_log.h"
+#include "media/base/pipeline.h"
 #include "media/base/pipeline_status.h"
+#include "media/filters/chunk_demuxer.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 
 namespace media {
 
@@ -29,49 +39,169 @@
 class MEDIA_EXPORT DemuxerManager {
  public:
   class Client {
-    // TODO(crbug/1377053): To be implemented in a future CL.
+   public:
+    virtual void OnEncryptedMediaInitData(
+        EmeInitDataType init_data_type,
+        const std::vector<uint8_t>& init_data) = 0;
+
+    virtual void OnChunkDemuxerOpened(ChunkDemuxer* demuxer) = 0;
+
+    // Called by the data source (for src=) or demuxer (for mse) when loading
+    // progresses.
+    // Can be called quite often.
+    virtual void OnProgress() = 0;
+
+    // Used to determine if the client is additionally a client for Android's
+    // MediaPlayerRenderer, which can inform us if we need to create a
+    // MediaUrlDemuxer.
+    virtual bool IsMediaPlayerRendererClient() = 0;
+
+#if BUILDFLAG(ENABLE_FFMPEG)
+    virtual void AddAudioTrack(const std::string& id,
+                               const std::string& label,
+                               const std::string& language,
+                               bool is_first_track) = 0;
+    virtual void AddVideoTrack(const std::string& id,
+                               const std::string& label,
+                               const std::string& language,
+                               bool is_first_track) = 0;
+#endif  // BUILDFLAG(ENABLE_FFMPEG)
+
+    // Returns true if playback would be able to start if data is present.
+    virtual bool CouldPlayIfEnoughData() = 0;
+
+    // Given a demuxer, the client should construct an implementation of
+    // base::trace_event::MemoryDumpProvider for debugging purposes.
+    virtual void MakeDemuxerThreadDumper(media::Demuxer* demuxer) = 0;
+
+    virtual double CurrentTime() const = 0;
   };
 
-  explicit DemuxerManager(Client* client);
+  // Demuxer, StartType, IsStreaming, IsStatic
+  using DemuxerCreatedCB =
+      base::OnceCallback<PipelineStatus(Demuxer* demuxer,
+                                        Pipeline::StartType start_type,
+                                        bool /*is_streaming*/,
+                                        bool /*is_static*/)>;
+
+  DemuxerManager(Client* client,
+                 scoped_refptr<base::SequencedTaskRunner> media_task_runner,
+                 MediaLog* log,
+                 net::SiteForCookies site_for_cookies,
+                 url::Origin top_frame_origin,
+                 bool enable_instant_source_buffer_gc,
+                 std::unique_ptr<Demuxer> demuxer_override);
   ~DemuxerManager();
+  void InvalidateWeakPtrs();
 
   void SetLoadedUrl(GURL url);
+  PipelineStatus::Or<GURL> ResetAfterHlsDetected(bool cryptographic_url);
+  void FreeResourcesAfterMediaThreadWait(base::OnceClosure cb);
+
+  // Methods that help manage demuxers
+  absl::optional<double> GetDemuxerDuration();
+  absl::optional<DemuxerType> GetDemuxerType();
+  absl::optional<container_names::MediaContainerName> GetContainerForMetrics();
+  void RespondToDemuxerMemoryUsageReport(base::OnceCallback<void(int64_t)> cb);
+
+  // Returns a forwarded error/success from |on_demuxer_created|, or an error
+  // if a demuxer couldn't be created.
+  PipelineStatus CreateDemuxer(bool load_media_source,
+                               DataSource::Preload preload,
+                               bool has_poster,
+                               DemuxerCreatedCB on_demuxer_created);
+
+#if BUILDFLAG(IS_ANDROID)
+  void SetAllowMediaPlayerRendererCredentials(bool allow);
+#endif  // BUILDFLAG(IS_ANDROID)
 
   // Methods that help manage or access |data_source_|
   const DataSource* GetDataSourceForTesting() const;
   void SetDataSource(std::unique_ptr<DataSource> data_source);
   void OnBufferingHaveEnough(bool enough);
   void SetPreload(DataSource::Preload preload);
-  std::unique_ptr<DataSource> StopAndGetDataSourceForDestruction();
+
+  void StopAndResetClient(Client* client);
   int64_t GetDataSourceMemoryUsage();
   void OnDataSourcePlaybackRateChange(double rate, bool paused);
-#if BUILDFLAG(IS_ANDROID)
-  PipelineStatus StartAndRecordHLSFallback(bool is_frame_url_cryptographic);
-#endif
-
-  // This will go away as soon as we move the creation of the demuxers into
-  // this manager file, in the next patchset.
-  DataSource* GetRawDataSource() const;
 
   bool WouldTaintOrigin() const;
   bool HasDataSource() const;
+  bool HasDemuxer() const;
+  bool HasDemuxerOverride() const;
   absl::optional<GURL> GetDataSourceUrlAfterRedirects() const;
   bool DataSourceFullyBuffered() const;
   bool IsStreamingDataSource() const;
   bool PassedDataSourceTimingAllowOriginCheck() const;
 
  private:
+  // Demuxer creation and helper methods
+  std::unique_ptr<media::Demuxer> CreateChunkDemuxer();
+#if BUILDFLAG(ENABLE_FFMPEG)
+  std::unique_ptr<media::Demuxer> CreateFFmpegDemuxer();
+#endif  // BUILDFLAG(ENABLE_FFMPEG)
+#if BUILDFLAG(IS_ANDROID)
+  std::unique_ptr<media::Demuxer> CreateMediaUrlDemuxer(bool hls_content);
+#endif  // BUILDFLAG(IS_ANDROID)
+  void SetDemuxer(std::unique_ptr<Demuxer> demuxer);
+
+  // Memory pressure listener specifically for when using ChunkDemuxer.
+  void OnMemoryPressure(
+      base::MemoryPressureListener::MemoryPressureLevel level);
+
+  // Trampoline methods for binding with |weak_this_| that call into |client_|.;
+  void OnEncryptedMediaInitData(EmeInitDataType init_data_type,
+                                const std::vector<uint8_t>& init_data);
+  void OnChunkDemuxerOpened();
+  void OnProgress();
+#if BUILDFLAG(ENABLE_FFMPEG)
+  void OnFFmpegMediaTracksUpdated(std::unique_ptr<MediaTracks> tracks);
+#endif  // BUILDFLAG(ENABLE_FFMPEG)
+
   // This is usually just the WebMediaPlayerImpl.
   raw_ptr<Client> client_;
 
-  // Used for MediaUrlDemuxer when playing HLS content, as well as FFmpegDemuxer
-  // in most cases. Also used for creating MemoryDataSource objects.
+  // The demuxers need access the the media task runner and media log.
+  const scoped_refptr<base::SequencedTaskRunner> media_task_runner_;
+  std::unique_ptr<MediaLog> media_log_;
+
+  // Android's MediaUrlDemuxer needs access to these.
+  net::SiteForCookies site_for_cookies_;
+  url::Origin top_frame_origin_;
+
+  // When MSE memory pressure based garbage collection is enabled, the
+  // |enable_instant_source_buffer_gc| controls whether the GC is done
+  // immediately on memory pressure notification or during the next
+  // SourceBuffer append (slower, but MSE spec compliant).
+  bool enable_instant_source_buffer_gc_ = false;
+
+  // Used for MediaUrlDemuxer when playing HLS content, as well as
+  // FFmpegDemuxer in most cases. Also used for creating MemoryDataSource
+  // objects.
   GURL loaded_url_;
 
   // The data source for creating a demuxer. This should be null when using
   // ChunkDemuxer.
   std::unique_ptr<DataSource> data_source_;
 
+  // Holds whichever demuxer implementation is being used.
+  std::unique_ptr<Demuxer> demuxer_;
+
+  // Holds an optional demuxer that can be passed in at time of creation,
+  // which becomes the default demuxer to use.
+  std::unique_ptr<Demuxer> demuxer_override_;
+
+  // RAII member for notifying demuxers of memory pressure.
+  std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_;
+
+#if BUILDFLAG(IS_ANDROID)
+  // Used to determine whether to allow credentials or not for
+  // MediaPlayerRenderer.
+  bool allow_media_player_renderer_credentials_ = false;
+#endif  // BUILDFLAG(IS_ANDROID)
+
+  bool demuxer_found_hls_ = false;
+
   // Weak pointer implementation.
   base::WeakPtrFactory<DemuxerManager> weak_factory_{this};
 };

mojo/public/cpp/bindings/lib/message.cc

diff --git a/mojo/public/cpp/bindings/lib/message.cc b/mojo/public/cpp/bindings/lib/message.cc
index 09018d2..065dddf 100644
--- a/mojo/public/cpp/bindings/lib/message.cc
+++ b/mojo/public/cpp/bindings/lib/message.cc
@@ -531,8 +531,7 @@
 }
 
 std::unique_ptr<internal::UnserializedMessageContext>
-Message::TakeUnserializedContext(
-    const internal::UnserializedMessageContext::Tag* tag) {
+Message::TakeUnserializedContext(uintptr_t tag) {
   DCHECK(handle_.is_valid());
   uintptr_t context_value = 0;
   MojoResult rv =

mojo/public/cpp/bindings/lib/unserialized_message_context.cc

diff --git a/mojo/public/cpp/bindings/lib/unserialized_message_context.cc b/mojo/public/cpp/bindings/lib/unserialized_message_context.cc
index 97baa2f..3194413 100644
--- a/mojo/public/cpp/bindings/lib/unserialized_message_context.cc
+++ b/mojo/public/cpp/bindings/lib/unserialized_message_context.cc
@@ -13,7 +13,7 @@
 UnserializedMessageContext::UnserializedMessageContext(const Tag* tag,
                                                        uint32_t message_name,
                                                        uint32_t message_flags)
-    : tag_(tag) {
+    : tag_(reinterpret_cast<uintptr_t>(tag)) {
   header_.interface_id = 0;
   header_.version = 1;
   header_.name = message_name;

mojo/public/cpp/bindings/lib/unserialized_message_context.h

diff --git a/mojo/public/cpp/bindings/lib/unserialized_message_context.h b/mojo/public/cpp/bindings/lib/unserialized_message_context.h
index c6b7513..9eab003 100644
--- a/mojo/public/cpp/bindings/lib/unserialized_message_context.h
+++ b/mojo/public/cpp/bindings/lib/unserialized_message_context.h
@@ -30,12 +30,13 @@
 
   template <typename MessageType>
   MessageType* SafeCast() {
-    if (&MessageType::kMessageTag != tag_)
+    if (reinterpret_cast<uintptr_t>(&MessageType::kMessageTag) != tag_) {
       return nullptr;
+    }
     return static_cast<MessageType*>(this);
   }
 
-  const Tag* tag() const { return tag_; }
+  uintptr_t tag() const { return tag_; }
   uint32_t message_name() const { return header_.name; }
   uint32_t message_flags() const { return header_.flags; }
 
@@ -47,7 +48,7 @@
   // The |tag_| is used for run-time type identification of specific
   // unserialized message types, e.g. messages generated by mojom bindings. This
   // allows opaque message objects to be safely downcast once pulled off a pipe.
-  const raw_ptr<const Tag> tag_;
+  const uintptr_t tag_;
 
   // We store message metadata in a serialized header structure to simplify
   // Message implementation which needs to query such metadata for both

mojo/public/cpp/bindings/message.h

diff --git a/mojo/public/cpp/bindings/message.h b/mojo/public/cpp/bindings/message.h
index 786d2ad..28fe63f6 100644
--- a/mojo/public/cpp/bindings/message.h
+++ b/mojo/public/cpp/bindings/message.h
@@ -246,11 +246,12 @@
   // Takes the unserialized message context from this Message if its tag matches
   // |tag|.
   std::unique_ptr<internal::UnserializedMessageContext> TakeUnserializedContext(
-      const internal::UnserializedMessageContext::Tag* tag);
+      uintptr_t tag);
 
   template <typename MessageType>
   std::unique_ptr<MessageType> TakeUnserializedContext() {
-    auto generic_context = TakeUnserializedContext(&MessageType::kMessageTag);
+    auto generic_context = TakeUnserializedContext(
+        reinterpret_cast<uintptr_t>(&MessageType::kMessageTag));
     if (!generic_context)
       return nullptr;
     return base::WrapUnique(

net/base/features.cc

diff --git a/net/base/features.cc b/net/base/features.cc
index 534719e..e655564 100644
--- a/net/base/features.cc
+++ b/net/base/features.cc
@@ -370,4 +370,9 @@
              base::FEATURE_ENABLED_BY_DEFAULT);
 #endif
 
+// Enable support for HTTP extensible priorities (RFC 9218)
+BASE_FEATURE(kPriorityIncremental,
+             "PriorityIncremental",
+             base::FEATURE_ENABLED_BY_DEFAULT);
+
 }  // namespace net::features

net/base/features.h

diff --git a/net/base/features.h b/net/base/features.h
index a7ce3f6..5f2fe2e 100644
--- a/net/base/features.h
+++ b/net/base/features.h
@@ -390,6 +390,10 @@
 NET_EXPORT BASE_DECLARE_FEATURE(kPlatformKeyProbeSHA256);
 #endif
 
+// Enable support for HTTP extensible priorities (RFC 9218)
+// https://crbug.com/1362031
+NET_EXPORT BASE_DECLARE_FEATURE(kPriorityIncremental);
+
 }  // namespace net::features
 
 #endif  // NET_BASE_FEATURES_H_

net/base/network_delegate.cc

diff --git a/net/base/network_delegate.cc b/net/base/network_delegate.cc
index 7ca17d40..c881938 100644
--- a/net/base/network_delegate.cc
+++ b/net/base/network_delegate.cc
@@ -12,6 +12,7 @@
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/trace_constants.h"
+#include "net/cookies/cookie_setting_override.h"
 #include "net/cookies/cookie_util.h"
 #include "net/proxy_resolution/proxy_info.h"
 #include "net/url_request/url_request.h"
@@ -104,11 +105,12 @@
 bool NetworkDelegate::AnnotateAndMoveUserBlockedCookies(
     const URLRequest& request,
     const net::FirstPartySetMetadata& first_party_set_metadata,
+    CookieSettingOverrides overrides,
     net::CookieAccessResultList& maybe_included_cookies,
     net::CookieAccessResultList& excluded_cookies) {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   bool allowed = OnAnnotateAndMoveUserBlockedCookies(
-      request, first_party_set_metadata, maybe_included_cookies,
+      request, first_party_set_metadata, overrides, maybe_included_cookies,
       excluded_cookies);
   cookie_util::DCheckIncludedAndExcludedCookieLists(maybe_included_cookies,
                                                     excluded_cookies);
@@ -126,10 +128,11 @@
 NetworkDelegate::PrivacySetting NetworkDelegate::ForcePrivacyMode(
     const GURL& url,
     const SiteForCookies& site_for_cookies,
-    const absl::optional<url::Origin>& top_frame_origin) const {
+    const absl::optional<url::Origin>& top_frame_origin,
+    CookieSettingOverrides overrides) const {
   TRACE_EVENT0(NetTracingCategory(), "NetworkDelegate::ForcePrivacyMode");
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
-  return OnForcePrivacyMode(url, site_for_cookies, top_frame_origin);
+  return OnForcePrivacyMode(url, site_for_cookies, top_frame_origin, overrides);
 }
 
 bool NetworkDelegate::CancelURLRequestWithPolicyViolatingReferrerHeader(

net/base/network_delegate.h

diff --git a/net/base/network_delegate.h b/net/base/network_delegate.h
index 9352dc5..ec59cb57 100644
--- a/net/base/network_delegate.h
+++ b/net/base/network_delegate.h
@@ -18,6 +18,7 @@
 #include "net/base/net_export.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_inclusion_status.h"
+#include "net/cookies/cookie_setting_override.h"
 #include "net/cookies/site_for_cookies.h"
 #include "net/first_party_sets/first_party_set_metadata.h"
 #include "net/first_party_sets/first_party_sets_cache_filter.h"
@@ -81,6 +82,7 @@
   bool AnnotateAndMoveUserBlockedCookies(
       const URLRequest& request,
       const net::FirstPartySetMetadata& first_party_set_metadata,
+      CookieSettingOverrides overrides,
       CookieAccessResultList& maybe_included_cookies,
       CookieAccessResultList& excluded_cookies);
   bool CanSetCookie(const URLRequest& request,
@@ -105,7 +107,8 @@
   PrivacySetting ForcePrivacyMode(
       const GURL& url,
       const SiteForCookies& site_for_cookies,
-      const absl::optional<url::Origin>& top_frame_origin) const;
+      const absl::optional<url::Origin>& top_frame_origin,
+      CookieSettingOverrides overrides) const;
 
   bool CancelURLRequestWithPolicyViolatingReferrerHeader(
       const URLRequest& request,
@@ -263,6 +266,7 @@
   virtual bool OnAnnotateAndMoveUserBlockedCookies(
       const URLRequest& request,
       const net::FirstPartySetMetadata& first_party_set_metadata,
+      CookieSettingOverrides overrides,
       net::CookieAccessResultList& maybe_included_cookies,
       net::CookieAccessResultList& excluded_cookies) = 0;
 
@@ -276,7 +280,8 @@
   virtual PrivacySetting OnForcePrivacyMode(
       const GURL& url,
       const SiteForCookies& site_for_cookies,
-      const absl::optional<url::Origin>& top_frame_origin) const = 0;
+      const absl::optional<url::Origin>& top_frame_origin,
+      CookieSettingOverrides overrides) const = 0;
 
   // Called when the |referrer_url| for requesting |target_url| during handling
   // of the |request| is does not comply with the referrer policy (e.g. a

net/base/network_delegate_impl.cc

diff --git a/net/base/network_delegate_impl.cc b/net/base/network_delegate_impl.cc
index 4c56e747..77ff5c1 100644
--- a/net/base/network_delegate_impl.cc
+++ b/net/base/network_delegate_impl.cc
@@ -5,6 +5,7 @@
 #include "net/base/network_delegate_impl.h"
 
 #include "net/base/net_errors.h"
+#include "net/cookies/cookie_setting_override.h"
 
 namespace net {
 
@@ -50,6 +51,7 @@
 bool NetworkDelegateImpl::OnAnnotateAndMoveUserBlockedCookies(
     const URLRequest& request,
     const net::FirstPartySetMetadata& first_party_set_metadata,
+    CookieSettingOverrides overrides,
     net::CookieAccessResultList& maybe_included_cookies,
     net::CookieAccessResultList& excluded_cookies) {
   return true;
@@ -64,7 +66,8 @@
 NetworkDelegate::PrivacySetting NetworkDelegateImpl::OnForcePrivacyMode(
     const GURL& url,
     const SiteForCookies& site_for_cookies,
-    const absl::optional<url::Origin>& top_frame_origin) const {
+    const absl::optional<url::Origin>& top_frame_origin,
+    CookieSettingOverrides overrides) const {
   return NetworkDelegate::PrivacySetting::kStateAllowed;
 }
 

net/base/network_delegate_impl.h

diff --git a/net/base/network_delegate_impl.h b/net/base/network_delegate_impl.h
index cae3a9db..b0ad87a 100644
--- a/net/base/network_delegate_impl.h
+++ b/net/base/network_delegate_impl.h
@@ -14,6 +14,7 @@
 #include "net/base/net_export.h"
 #include "net/base/network_delegate.h"
 #include "net/cookies/canonical_cookie.h"
+#include "net/cookies/cookie_setting_override.h"
 #include "net/first_party_sets/first_party_set_metadata.h"
 #include "net/first_party_sets/first_party_sets_cache_filter.h"
 #include "net/proxy_resolution/proxy_retry_info.h"
@@ -71,6 +72,7 @@
   bool OnAnnotateAndMoveUserBlockedCookies(
       const URLRequest& request,
       const net::FirstPartySetMetadata& first_party_set_metadata,
+      CookieSettingOverrides overrides,
       net::CookieAccessResultList& maybe_included_cookies,
       net::CookieAccessResultList& excluded_cookies) override;
 
@@ -81,7 +83,8 @@
   NetworkDelegate::PrivacySetting OnForcePrivacyMode(
       const GURL& url,
       const SiteForCookies& site_for_cookies,
-      const absl::optional<url::Origin>& top_frame_origin) const override;
+      const absl::optional<url::Origin>& top_frame_origin,
+      CookieSettingOverrides overrides) const override;
 
   bool OnCancelURLRequestWithPolicyViolatingReferrerHeader(
       const URLRequest& request,

net/base/request_priority.h

diff --git a/net/base/request_priority.h b/net/base/request_priority.h
index 0c2ef5fb..66c2d1a 100644
--- a/net/base/request_priority.h
+++ b/net/base/request_priority.h
@@ -39,6 +39,16 @@
   NUM_PRIORITIES = MAXIMUM_PRIORITY + 1,
 };
 
+// Default value to use for the incremental loading flag as part of HTTP
+// extensible priorities (RFC 9218). Currently used for HTTP/3.
+//
+// This default is the value that works best in most cases that the networking
+// code supports (simultaneous requests are loaded concurrently and don't block
+// one another).
+//
+// This is independent from the spec default for the protocol, which is false.
+const bool kDefaultPriorityIncremental = true;
+
 NET_EXPORT const char* RequestPriorityToString(RequestPriority priority);
 
 }  // namespace net

net/cert/internal/trust_store_win_unittest.cc

diff --git a/net/cert/internal/trust_store_win_unittest.cc b/net/cert/internal/trust_store_win_unittest.cc
index bcbd7d5..f2098a6 100644
--- a/net/cert/internal/trust_store_win_unittest.cc
+++ b/net/cert/internal/trust_store_win_unittest.cc
@@ -16,6 +16,7 @@
 #include "net/cert/pki/cert_errors.h"
 #include "net/cert/pki/parsed_certificate.h"
 #include "net/cert/pki/test_helpers.h"
+#include "net/cert/pki/trust_store.h"
 #include "net/cert/x509_certificate.h"
 #include "net/cert/x509_util.h"
 #include "net/cert/x509_util_win.h"
@@ -33,133 +34,127 @@
   return CertificateTrust::ForTrustAnchor().WithEnforceAnchorExpiry();
 }
 
-// These tests use a series of cross-signed certificates. The overall
-// hierarchy is documented in
-// //net/data/ssl/scripts/generate-multi-root-test-chains.sh.
-constexpr char kMultiRootCByD[] = "multi-root-C-by-D.pem";
-constexpr char kMultiRootCByE[] = "multi-root-C-by-E.pem";
-constexpr char kMultiRootDByD[] = "multi-root-D-by-D.pem";
-constexpr char kMultiRootEByE[] = "multi-root-E-by-E.pem";
-constexpr char kMultiRootFByE[] = "multi-root-F-by-E.pem";
-
-std::shared_ptr<const ParsedCertificate> ParseCertFromFile(
-    base::StringPiece file_name) {
+::testing::AssertionResult ParseCertFromFile(
+    base::StringPiece file_name,
+    std::shared_ptr<const ParsedCertificate>* out_cert) {
   const scoped_refptr<X509Certificate> cert =
       ImportCertFromFile(net::GetTestCertsDirectory(), file_name);
   if (!cert) {
-    return nullptr;
+    return ::testing::AssertionFailure() << "ImportCertFromFile failed";
   }
   CertErrors errors;
   std::shared_ptr<const ParsedCertificate> parsed = ParsedCertificate::Create(
       bssl::UpRef(cert->cert_buffer()),
       x509_util::DefaultParseCertificateOptions(), &errors);
-  EXPECT_TRUE(parsed) << errors.ToDebugString();
-  return parsed;
+  if (!parsed) {
+    return ::testing::AssertionFailure() << "ParseCertificate::Create failed:\n"
+                                         << errors.ToDebugString();
+  }
+  *out_cert = parsed;
+  return ::testing::AssertionSuccess();
 }
 
-// Returns true if cert at file_name successfully added to store, false
-// otherwise.
-bool AddToStore(HCERTSTORE store, const std::string file_name) {
-  const scoped_refptr<X509Certificate> cert =
-      ImportCertFromFile(net::GetTestCertsDirectory(), file_name);
-  if (!cert) {
-    return false;
-  }
-  crypto::ScopedPCCERT_CONTEXT os_cert(CertCreateCertificateContext(
-      X509_ASN_ENCODING, CRYPTO_BUFFER_data(cert->cert_buffer()),
-      CRYPTO_BUFFER_len(cert->cert_buffer())));
-  return CertAddCertificateContextToStore(store, os_cert.get(),
-                                          CERT_STORE_ADD_ALWAYS, nullptr);
-}
+class TrustStoreWinTest : public testing::Test {
+ public:
+  void SetUp() override {
+    root_store_.reset(CertOpenStore(CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING,
+                                    NULL, 0, nullptr));
+    intermediate_store_.reset(CertOpenStore(
+        CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, NULL, 0, nullptr));
+    disallowed_store_.reset(CertOpenStore(CERT_STORE_PROV_MEMORY,
+                                          X509_ASN_ENCODING, NULL, 0, nullptr));
 
-// Returns true if cert at file_name successfully added to store with
-// restricted usage, false otherwise.
-bool AddToStoreWithEKURestriction(HCERTSTORE store,
-                                  const std::string file_name,
-                                  LPCSTR usage_identifier) {
-  const scoped_refptr<X509Certificate> cert =
-      ImportCertFromFile(net::GetTestCertsDirectory(), file_name);
-  if (!cert) {
-    return false;
+    ASSERT_TRUE(ParseCertFromFile("multi-root-A-by-B.pem", &a_by_b_));
+    ASSERT_TRUE(ParseCertFromFile("multi-root-B-by-C.pem", &b_by_c_));
+    ASSERT_TRUE(ParseCertFromFile("multi-root-B-by-F.pem", &b_by_f_));
+    ASSERT_TRUE(ParseCertFromFile("multi-root-C-by-D.pem", &c_by_d_));
+    ASSERT_TRUE(ParseCertFromFile("multi-root-C-by-E.pem", &c_by_e_));
+    ASSERT_TRUE(ParseCertFromFile("multi-root-D-by-D.pem", &d_by_d_));
+    ASSERT_TRUE(ParseCertFromFile("multi-root-E-by-E.pem", &e_by_e_));
+    ASSERT_TRUE(ParseCertFromFile("multi-root-F-by-E.pem", &f_by_e_));
   }
-  crypto::ScopedPCCERT_CONTEXT os_cert(CertCreateCertificateContext(
-      X509_ASN_ENCODING, CRYPTO_BUFFER_data(cert->cert_buffer()),
-      CRYPTO_BUFFER_len(cert->cert_buffer())));
 
-  CERT_ENHKEY_USAGE usage;
-  memset(&usage, 0, sizeof(usage));
-  if (!CertSetEnhancedKeyUsage(os_cert.get(), &usage)) {
-    return false;
+  // Returns true if |cert| successfully added to store, false otherwise.
+  bool AddToStore(HCERTSTORE store,
+                  std::shared_ptr<const ParsedCertificate> cert) {
+    crypto::ScopedPCCERT_CONTEXT os_cert(CertCreateCertificateContext(
+        X509_ASN_ENCODING, CRYPTO_BUFFER_data(cert->cert_buffer()),
+        CRYPTO_BUFFER_len(cert->cert_buffer())));
+    return CertAddCertificateContextToStore(store, os_cert.get(),
+                                            CERT_STORE_ADD_ALWAYS, nullptr);
   }
-  if (usage_identifier) {
-    if (!CertAddEnhancedKeyUsageIdentifier(os_cert.get(), usage_identifier)) {
+
+  // Returns true if cert at file_name successfully added to store with
+  // restricted usage, false otherwise.
+  bool AddToStoreWithEKURestriction(
+      HCERTSTORE store,
+      std::shared_ptr<const ParsedCertificate> cert,
+      LPCSTR usage_identifier) {
+    crypto::ScopedPCCERT_CONTEXT os_cert(CertCreateCertificateContext(
+        X509_ASN_ENCODING, CRYPTO_BUFFER_data(cert->cert_buffer()),
+        CRYPTO_BUFFER_len(cert->cert_buffer())));
+
+    CERT_ENHKEY_USAGE usage;
+    memset(&usage, 0, sizeof(usage));
+    if (!CertSetEnhancedKeyUsage(os_cert.get(), &usage)) {
       return false;
     }
+    if (usage_identifier) {
+      if (!CertAddEnhancedKeyUsageIdentifier(os_cert.get(), usage_identifier)) {
+        return false;
+      }
+    }
+    return !!CertAddCertificateContextToStore(store, os_cert.get(),
+                                              CERT_STORE_ADD_ALWAYS, nullptr);
   }
-  return !!CertAddCertificateContextToStore(store, os_cert.get(),
-                                            CERT_STORE_ADD_ALWAYS, nullptr);
-}
 
-// TrustStoreWin isset up as follows:
-// Trusted as Root: D-by-D
-// Known Intermediates: C-by-D, C-by-E, F-by-E
-std::unique_ptr<TrustStoreWin> CreateTrustStoreWin() {
-  crypto::ScopedHCERTSTORE root_store(CertOpenStore(
-      CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, NULL, 0, nullptr));
-  crypto::ScopedHCERTSTORE intermediate_store(CertOpenStore(
-      CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, NULL, 0, nullptr));
-  crypto::ScopedHCERTSTORE disallowed_store(CertOpenStore(
-      CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, NULL, 0, nullptr));
-
-  if (!AddToStore(root_store.get(), kMultiRootDByD) ||
-      !AddToStore(intermediate_store.get(), kMultiRootCByD) ||
-      !AddToStore(intermediate_store.get(), kMultiRootCByE) ||
-      !AddToStore(intermediate_store.get(), kMultiRootFByE)) {
-    return nullptr;
+  std::unique_ptr<TrustStoreWin> CreateTrustStoreWin() {
+    return TrustStoreWin::CreateForTesting(std::move(root_store_),
+                                           std::move(intermediate_store_),
+                                           std::move(disallowed_store_));
   }
-  return TrustStoreWin::CreateForTesting(std::move(root_store),
-                                         std::move(intermediate_store),
-                                         std::move(disallowed_store));
-}
 
-TEST(TrustStoreWin, GetTrustInitializationError) {
+  // The cert stores that will be used to create the trust store. These handles
+  // will be null after CreateTrustStoreWin() is called.
+  crypto::ScopedHCERTSTORE root_store_;
+  crypto::ScopedHCERTSTORE intermediate_store_;
+  crypto::ScopedHCERTSTORE disallowed_store_;
+
+  std::shared_ptr<const ParsedCertificate> a_by_b_, b_by_c_, b_by_f_, c_by_d_,
+      c_by_e_, d_by_d_, e_by_e_, f_by_e_;
+};
+
+TEST_F(TrustStoreWinTest, GetTrustInitializationError) {
   // Simulate an initialization error by using null stores.
   std::unique_ptr<TrustStoreWin> trust_store_win =
       TrustStoreWin::CreateForTesting(crypto::ScopedHCERTSTORE(),
                                       crypto::ScopedHCERTSTORE(),
                                       crypto::ScopedHCERTSTORE());
   ASSERT_TRUE(trust_store_win);
-  auto parsed_cert = ParseCertFromFile(kMultiRootDByD);
-  CertificateTrust trust =
-      trust_store_win->GetTrust(parsed_cert.get(), nullptr);
+  CertificateTrust trust = trust_store_win->GetTrust(d_by_d_.get(), nullptr);
   EXPECT_EQ(CertificateTrust::ForUnspecified().ToDebugString(),
             trust.ToDebugString());
 }
 
-TEST(TrustStoreWin, GetTrust) {
+TEST_F(TrustStoreWinTest, GetTrust) {
+  ASSERT_TRUE(AddToStore(root_store_.get(), d_by_d_));
+  ASSERT_TRUE(AddToStore(intermediate_store_.get(), c_by_d_));
+
   std::unique_ptr<TrustStoreWin> trust_store_win = CreateTrustStoreWin();
   ASSERT_TRUE(trust_store_win);
 
-  constexpr struct TestData {
-    base::StringPiece file_name;
-    CertificateTrust expected_result;
-  } kTestData[] = {
-      // Explicitly trusted root should be trusted.
-      {kMultiRootDByD, ExpectedTrustForAnchor()},
-      // Intermediate for path building should not be trusted.
-      {kMultiRootCByD, CertificateTrust::ForUnspecified()},
-      // Unknown roots should not be trusted (e.g. just because they're
-      // self-signed doesn't make them a root)
-      {kMultiRootEByE, CertificateTrust::ForUnspecified()},
-  };
-  for (const auto& test_data : kTestData) {
-    SCOPED_TRACE(test_data.file_name);
-    auto parsed_cert = ParseCertFromFile(test_data.file_name);
-    ASSERT_TRUE(parsed_cert);
-    CertificateTrust trust =
-        trust_store_win->GetTrust(parsed_cert.get(), nullptr);
-    EXPECT_EQ(test_data.expected_result.ToDebugString(), trust.ToDebugString());
-  }
+  // Explicitly trusted root should be trusted.
+  EXPECT_EQ(ExpectedTrustForAnchor().ToDebugString(),
+            trust_store_win->GetTrust(d_by_d_.get(), nullptr).ToDebugString());
+
+  // Intermediate for path building should not be trusted.
+  EXPECT_EQ(CertificateTrust::ForUnspecified().ToDebugString(),
+            trust_store_win->GetTrust(c_by_d_.get(), nullptr).ToDebugString());
+
+  // Unknown roots should not be trusted (e.g. just because they're
+  // self-signed doesn't make them a root)
+  EXPECT_EQ(CertificateTrust::ForUnspecified().ToDebugString(),
+            trust_store_win->GetTrust(e_by_e_.get(), nullptr).ToDebugString());
 }
 
 // This test has a special TrustStoreWin setup with restricted EKU usages.
@@ -170,140 +165,87 @@
 // - kMultiRootEByE: only has szOID_PKIX_KP_CLIENT_AUTH set
 // - kMultiRootCByE: only has szOID_ANY_ENHANCED_KEY_USAGE set
 // - kMultiRootCByD: no EKU usages set
-TEST(TrustStoreWin, GetTrustRestrictedEKU) {
-  crypto::ScopedHCERTSTORE root_store(CertOpenStore(
-      CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, NULL, 0, nullptr));
-  crypto::ScopedHCERTSTORE intermediate_store(CertOpenStore(
-      CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, NULL, 0, nullptr));
-  crypto::ScopedHCERTSTORE disallowed_store(CertOpenStore(
-      CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, NULL, 0, nullptr));
-
-  ASSERT_TRUE(AddToStoreWithEKURestriction(root_store.get(), kMultiRootDByD,
+TEST_F(TrustStoreWinTest, GetTrustRestrictedEKU) {
+  ASSERT_TRUE(AddToStoreWithEKURestriction(root_store_.get(), d_by_d_,
                                            szOID_PKIX_KP_SERVER_AUTH));
-  ASSERT_TRUE(AddToStoreWithEKURestriction(root_store.get(), kMultiRootEByE,
+  ASSERT_TRUE(AddToStoreWithEKURestriction(root_store_.get(), e_by_e_,
                                            szOID_PKIX_KP_CLIENT_AUTH));
-  ASSERT_TRUE(AddToStoreWithEKURestriction(root_store.get(), kMultiRootCByE,
+  ASSERT_TRUE(AddToStoreWithEKURestriction(root_store_.get(), c_by_e_,
                                            szOID_ANY_ENHANCED_KEY_USAGE));
   ASSERT_TRUE(
-      AddToStoreWithEKURestriction(root_store.get(), kMultiRootCByD, nullptr));
-  std::unique_ptr<TrustStoreWin> trust_store_win =
-      TrustStoreWin::CreateForTesting(std::move(root_store),
-                                      std::move(intermediate_store),
-                                      std::move(disallowed_store));
+      AddToStoreWithEKURestriction(root_store_.get(), c_by_d_, nullptr));
 
-  constexpr struct TestData {
-    base::StringPiece file_name;
-    CertificateTrust expected_result;
-  } kTestData[] = {
-      // Root cert with EKU szOID_PKIX_KP_SERVER_AUTH usage set should be
-      // trusted.
-      {kMultiRootDByD, ExpectedTrustForAnchor()},
-      // Root cert with EKU szOID_ANY_ENHANCED_KEY_USAGE usage set should be
-      // trusted.
-      {kMultiRootCByE, ExpectedTrustForAnchor()},
-      // Root cert with EKU szOID_PKIX_KP_CLIENT_AUTH does not allow usage of
-      // cert for server auth, return UNSPECIFIED.
-      {kMultiRootEByE, CertificateTrust::ForUnspecified()},
-      // Root cert with no EKU usages, return UNSPECIFIED.
-      {kMultiRootCByD, CertificateTrust::ForUnspecified()},
-      // Unknown cert has unspecified trust.
-      {kMultiRootFByE, CertificateTrust::ForUnspecified()},
-  };
-  for (const auto& test_data : kTestData) {
-    SCOPED_TRACE(test_data.file_name);
-    auto parsed_cert = ParseCertFromFile(test_data.file_name);
-    ASSERT_TRUE(parsed_cert);
-    CertificateTrust trust =
-        trust_store_win->GetTrust(parsed_cert.get(), nullptr);
-    EXPECT_EQ(test_data.expected_result.ToDebugString(), trust.ToDebugString());
-  }
+  std::unique_ptr<TrustStoreWin> trust_store_win = CreateTrustStoreWin();
+  ASSERT_TRUE(trust_store_win);
+
+  // Root cert with EKU szOID_PKIX_KP_SERVER_AUTH usage set should be
+  // trusted.
+  EXPECT_EQ(ExpectedTrustForAnchor().ToDebugString(),
+            trust_store_win->GetTrust(d_by_d_.get(), nullptr).ToDebugString());
+
+  // Root cert with EKU szOID_ANY_ENHANCED_KEY_USAGE usage set should be
+  // trusted.
+  EXPECT_EQ(ExpectedTrustForAnchor().ToDebugString(),
+            trust_store_win->GetTrust(c_by_e_.get(), nullptr).ToDebugString());
+
+  // Root cert with EKU szOID_PKIX_KP_CLIENT_AUTH does not allow usage of
+  // cert for server auth, return UNSPECIFIED.
+  EXPECT_EQ(CertificateTrust::ForUnspecified().ToDebugString(),
+            trust_store_win->GetTrust(e_by_e_.get(), nullptr).ToDebugString());
+
+  // Root cert with no EKU usages, return UNSPECIFIED.
+  EXPECT_EQ(CertificateTrust::ForUnspecified().ToDebugString(),
+            trust_store_win->GetTrust(c_by_d_.get(), nullptr).ToDebugString());
+
+  // Unknown cert has unspecified trust.
+  EXPECT_EQ(CertificateTrust::ForUnspecified().ToDebugString(),
+            trust_store_win->GetTrust(f_by_e_.get(), nullptr).ToDebugString());
 }
 
-// Test if duplicate certs are added to the root and intermediate stores,
-// possibly with different EKU usages. Root store set up as follows:
+// If duplicate certs are added to the root store with different EKU usages,
+// the cert should be trusted if any one of the usages is valid.
+// Root store set up as follows:
 //
 // - kMultiRootDByD: only has szOID_PKIX_KP_CLIENT_AUTH EKU set
 // - kMultiRootDByD (dupe): only has szOID_PKIX_KP_SERVER_AUTH set
 // - kMultiRootDByD (dupe 2): no EKU usages set
-//
-// And the intermediate store as follows:
-//
-// - kMultiRootCByD: only has szOID_PKIX_KP_CLIENT_AUTH set
-// - kMultiRootCByD (dupe): only has szOID_PKIX_KP_SERVER_AUTH EKU set
-
-TEST(TrustStoreWin, GetTrustRestrictedEKUDuplicateCerts) {
-  crypto::ScopedHCERTSTORE root_store(CertOpenStore(
-      CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, NULL, 0, nullptr));
-  crypto::ScopedHCERTSTORE intermediate_store(CertOpenStore(
-      CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, NULL, 0, nullptr));
-  crypto::ScopedHCERTSTORE disallowed_store(CertOpenStore(
-      CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, NULL, 0, nullptr));
-
-  ASSERT_TRUE(AddToStoreWithEKURestriction(root_store.get(), kMultiRootDByD,
+TEST_F(TrustStoreWinTest, GetTrustRestrictedEKUDuplicateCerts) {
+  ASSERT_TRUE(AddToStoreWithEKURestriction(root_store_.get(), d_by_d_,
                                            szOID_PKIX_KP_CLIENT_AUTH));
-  ASSERT_TRUE(AddToStoreWithEKURestriction(root_store.get(), kMultiRootDByD,
+  ASSERT_TRUE(AddToStoreWithEKURestriction(root_store_.get(), d_by_d_,
                                            szOID_PKIX_KP_SERVER_AUTH));
   ASSERT_TRUE(
-      AddToStoreWithEKURestriction(root_store.get(), kMultiRootDByD, nullptr));
-  std::unique_ptr<TrustStoreWin> trust_store_win =
-      TrustStoreWin::CreateForTesting(std::move(root_store),
-                                      std::move(intermediate_store),
-                                      std::move(disallowed_store));
+      AddToStoreWithEKURestriction(root_store_.get(), d_by_d_, nullptr));
 
-  constexpr struct TestData {
-    base::StringPiece file_name;
-    CertificateTrust expected_result;
-  } kTestData[] = {
-      // One copy of the Root cert is trusted for TLS Server Auth.
-      {kMultiRootDByD, ExpectedTrustForAnchor()},
-  };
-  for (const auto& test_data : kTestData) {
-    SCOPED_TRACE(test_data.file_name);
-    auto parsed_cert = ParseCertFromFile(test_data.file_name);
-    ASSERT_TRUE(parsed_cert);
-    CertificateTrust trust =
-        trust_store_win->GetTrust(parsed_cert.get(), nullptr);
-    EXPECT_EQ(test_data.expected_result.ToDebugString(), trust.ToDebugString());
-  }
+  std::unique_ptr<TrustStoreWin> trust_store_win = CreateTrustStoreWin();
+  ASSERT_TRUE(trust_store_win);
+
+  // One copy of the Root cert is trusted for TLS Server Auth.
+  EXPECT_EQ(ExpectedTrustForAnchor().ToDebugString(),
+            trust_store_win->GetTrust(d_by_d_.get(), nullptr).ToDebugString());
 }
 
 // Test that disallowed certs will be distrusted regardless of EKU settings.
-TEST(TrustStoreWin, GetTrustDisallowedCerts) {
-  crypto::ScopedHCERTSTORE root_store(CertOpenStore(
-      CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, NULL, 0, nullptr));
-  crypto::ScopedHCERTSTORE intermediate_store(CertOpenStore(
-      CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, NULL, 0, nullptr));
-  crypto::ScopedHCERTSTORE disallowed_store(CertOpenStore(
-      CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, NULL, 0, nullptr));
+TEST_F(TrustStoreWinTest, GetTrustDisallowedCerts) {
+  ASSERT_TRUE(AddToStore(root_store_.get(), d_by_d_));
+  ASSERT_TRUE(AddToStore(root_store_.get(), e_by_e_));
 
-  AddToStore(root_store.get(), kMultiRootDByD);
-  AddToStore(root_store.get(), kMultiRootEByE);
-  ASSERT_TRUE(AddToStoreWithEKURestriction(
-      disallowed_store.get(), kMultiRootDByD, szOID_PKIX_KP_CLIENT_AUTH));
-  AddToStore(disallowed_store.get(), kMultiRootEByE);
+  ASSERT_TRUE(AddToStoreWithEKURestriction(disallowed_store_.get(), d_by_d_,
+                                           szOID_PKIX_KP_CLIENT_AUTH));
+  ASSERT_TRUE(AddToStore(disallowed_store_.get(), e_by_e_));
 
-  std::unique_ptr<TrustStoreWin> trust_store_win =
-      TrustStoreWin::CreateForTesting(std::move(root_store),
-                                      std::move(intermediate_store),
-                                      std::move(disallowed_store));
+  std::unique_ptr<TrustStoreWin> trust_store_win = CreateTrustStoreWin();
+  ASSERT_TRUE(trust_store_win);
 
-  constexpr struct TestData {
-    base::StringPiece file_name;
-    CertificateTrust expected_result;
-  } kTestData[] = {
-      // dByD in root, distrusted but without szOID_PKIX_KP_SERVER_AUTH set.
-      {kMultiRootDByD, CertificateTrust::ForDistrusted()},
-      // dByD in root, also in distrusted with szOID_PKIX_KP_SERVER_AUTH set.
-      {kMultiRootEByE, CertificateTrust::ForDistrusted()},
-  };
-  for (const auto& test_data : kTestData) {
-    SCOPED_TRACE(test_data.file_name);
-    auto parsed_cert = ParseCertFromFile(test_data.file_name);
-    ASSERT_TRUE(parsed_cert);
-    CertificateTrust trust =
-        trust_store_win->GetTrust(parsed_cert.get(), nullptr);
-    EXPECT_EQ(test_data.expected_result.ToDebugString(), trust.ToDebugString());
-  }
+  // E-by-E is in both root and distrusted store. Distrust takes precedence.
+  EXPECT_EQ(CertificateTrust::ForDistrusted().ToDebugString(),
+            trust_store_win->GetTrust(e_by_e_.get(), nullptr).ToDebugString());
+
+  // D-by-D is in root and in distrusted but without szOID_PKIX_KP_SERVER_AUTH
+  // set. It should still be distrusted since the EKU settings aren't checked
+  // on distrust.
+  EXPECT_EQ(CertificateTrust::ForDistrusted().ToDebugString(),
+            trust_store_win->GetTrust(d_by_d_.get(), nullptr).ToDebugString());
 }
 
 MATCHER_P(ParsedCertEq, expected_cert, "") {
@@ -312,7 +254,7 @@
                              expected_cert->der_cert().AsSpan());
 }
 
-TEST(TrustStoreWin, GetIssuersInitializationError) {
+TEST_F(TrustStoreWinTest, GetIssuersInitializationError) {
   // Simulate an initialization error by using null stores.
   std::unique_ptr<TrustStoreWin> trust_store_win =
       TrustStoreWin::CreateForTesting(crypto::ScopedHCERTSTORE(),
@@ -320,57 +262,49 @@
                                       crypto::ScopedHCERTSTORE());
   ASSERT_TRUE(trust_store_win);
   ParsedCertificateList issuers;
-  std::shared_ptr<const ParsedCertificate> cert =
-      ParseCertFromFile("multi-root-B-by-F.pem");
-  ASSERT_TRUE(cert);
-  trust_store_win->SyncGetIssuersOf(cert.get(), &issuers);
+  trust_store_win->SyncGetIssuersOf(b_by_f_.get(), &issuers);
   ASSERT_EQ(0U, issuers.size());
 }
 
-TEST(TrustStoreWin, GetIssuersNoIssuerFound) {
-  std::unique_ptr<TrustStoreWin> trust_store_win = CreateTrustStoreWin();
-  ParsedCertificateList issuers;
-  std::shared_ptr<const ParsedCertificate> cert =
-      ParseCertFromFile("multi-root-A-by-B.pem");
-  ASSERT_TRUE(cert);
-  trust_store_win->SyncGetIssuersOf(cert.get(), &issuers);
-  ASSERT_EQ(0U, issuers.size());
-}
+TEST_F(TrustStoreWinTest, GetIssuers) {
+  ASSERT_TRUE(AddToStore(root_store_.get(), d_by_d_));
+  ASSERT_TRUE(AddToStore(intermediate_store_.get(), c_by_d_));
+  ASSERT_TRUE(AddToStore(intermediate_store_.get(), c_by_e_));
+  ASSERT_TRUE(AddToStore(intermediate_store_.get(), f_by_e_));
 
-TEST(TrustStoreWin, GetIssuersSingleIssuerFoundFromIntermediates) {
   std::unique_ptr<TrustStoreWin> trust_store_win = CreateTrustStoreWin();
-  ParsedCertificateList issuers;
-  std::shared_ptr<const ParsedCertificate> cert =
-      ParseCertFromFile("multi-root-B-by-F.pem");
-  ASSERT_TRUE(cert);
-  trust_store_win->SyncGetIssuersOf(cert.get(), &issuers);
-  ASSERT_EQ(1U, issuers.size());
-  EXPECT_THAT(issuers, testing::UnorderedElementsAre(
-                           ParsedCertEq(ParseCertFromFile(kMultiRootFByE))));
-}
 
-TEST(TrustStoreWin, GetIssuersSingleIssuerFoundFromRoot) {
-  std::unique_ptr<TrustStoreWin> trust_store_win = CreateTrustStoreWin();
-  ParsedCertificateList issuers;
-  std::shared_ptr<const ParsedCertificate> cert =
-      ParseCertFromFile(kMultiRootDByD);
-  ASSERT_TRUE(cert);
-  trust_store_win->SyncGetIssuersOf(cert.get(), &issuers);
-  ASSERT_EQ(1U, issuers.size());
-  EXPECT_THAT(issuers, testing::UnorderedElementsAre(ParsedCertEq(cert)));
-}
+  // No matching issuer.
+  {
+    ParsedCertificateList issuers;
+    trust_store_win->SyncGetIssuersOf(a_by_b_.get(), &issuers);
+    ASSERT_EQ(0U, issuers.size());
+  }
 
-TEST(TrustStoreWin, GetIssuersMultipleIssuersFound) {
-  std::unique_ptr<TrustStoreWin> trust_store_win = CreateTrustStoreWin();
-  ParsedCertificateList issuers;
-  std::shared_ptr<const ParsedCertificate> cert =
-      ParseCertFromFile("multi-root-B-by-C.pem");
-  ASSERT_TRUE(cert);
-  trust_store_win->SyncGetIssuersOf(cert.get(), &issuers);
-  ASSERT_EQ(2U, issuers.size());
-  EXPECT_THAT(issuers, testing::UnorderedElementsAre(
-                           ParsedCertEq(ParseCertFromFile(kMultiRootCByD)),
-                           ParsedCertEq(ParseCertFromFile(kMultiRootCByE))));
+  // Single matching issuer found in intermediates.
+  {
+    ParsedCertificateList issuers;
+    trust_store_win->SyncGetIssuersOf(b_by_f_.get(), &issuers);
+    ASSERT_EQ(1U, issuers.size());
+    EXPECT_THAT(issuers, testing::UnorderedElementsAre(ParsedCertEq(f_by_e_)));
+  }
+
+  // Single matching issuer found in roots.
+  {
+    ParsedCertificateList issuers;
+    trust_store_win->SyncGetIssuersOf(d_by_d_.get(), &issuers);
+    ASSERT_EQ(1U, issuers.size());
+    EXPECT_THAT(issuers, testing::UnorderedElementsAre(ParsedCertEq(d_by_d_)));
+  }
+
+  // Multiple issuers found.
+  {
+    ParsedCertificateList issuers;
+    trust_store_win->SyncGetIssuersOf(b_by_c_.get(), &issuers);
+    ASSERT_EQ(2U, issuers.size());
+    EXPECT_THAT(issuers, testing::UnorderedElementsAre(ParsedCertEq(c_by_d_),
+                                                       ParsedCertEq(c_by_e_)));
+  }
 }
 
 }  // namespace

net/http/http_proxy_connect_job.cc

diff --git a/net/http/http_proxy_connect_job.cc b/net/http/http_proxy_connect_job.cc
index 528a3ba..849d6dd 100644
--- a/net/http/http_proxy_connect_job.cc
+++ b/net/http/http_proxy_connect_job.cc
@@ -19,6 +19,7 @@
 #include "base/values.h"
 #include "build/build_config.h"
 #include "http_proxy_client_socket.h"
+#include "net/base/features.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/http_user_agent_settings.h"
 #include "net/base/net_errors.h"
@@ -691,10 +692,12 @@
   std::unique_ptr<QuicChromiumClientStream::Handle> quic_stream =
       quic_session_->ReleaseStream();
 
-  spdy::SpdyPriority spdy_priority =
-      ConvertRequestPriorityToQuicPriority(kH2QuicTunnelPriority);
-  spdy::SpdyStreamPrecedence precedence(spdy_priority);
-  quic_stream->SetPriority(precedence);
+  uint8_t urgency = ConvertRequestPriorityToQuicPriority(kH2QuicTunnelPriority);
+  bool incremental = quic::QuicStreamPriority::kDefaultIncremental;
+  if (base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+    incremental = kDefaultPriorityIncremental;
+  }
+  quic_stream->SetPriority(quic::QuicStreamPriority{urgency, incremental});
 
   transport_socket_ = std::make_unique<QuicProxyClientSocket>(
       std::move(quic_stream), std::move(quic_session_),

net/http/http_request_info.h

diff --git a/net/http/http_request_info.h b/net/http/http_request_info.h
index e832dd4..33871ab 100644
--- a/net/http/http_request_info.h
+++ b/net/http/http_request_info.h
@@ -13,6 +13,7 @@
 #include "net/base/network_anonymization_key.h"
 #include "net/base/network_isolation_key.h"
 #include "net/base/privacy_mode.h"
+#include "net/base/request_priority.h"
 #include "net/dns/public/secure_dns_policy.h"
 #include "net/http/http_request_headers.h"
 #include "net/socket/socket_tag.h"
@@ -62,6 +63,11 @@
   // Any load flags (see load_flags.h).
   int load_flags = 0;
 
+  // Flag that indicates if the request should be loaded concurrently with
+  // other requests of the same priority when using a protocol that supports
+  // HTTP extensible priorities (RFC 9218). Currently only HTTP/3.
+  bool priority_incremental = kDefaultPriorityIncremental;
+
   // If enabled, then request must be sent over connection that cannot be
   // tracked by the server (e.g. without channel id).
   PrivacyMode privacy_mode = PRIVACY_MODE_DISABLED;

net/quic/quic_chromium_client_stream.cc

diff --git a/net/quic/quic_chromium_client_stream.cc b/net/quic/quic_chromium_client_stream.cc
index 168805d..615ec07 100644
--- a/net/quic/quic_chromium_client_stream.cc
+++ b/net/quic/quic_chromium_client_stream.cc
@@ -299,11 +299,10 @@
 }
 
 void QuicChromiumClientStream::Handle::SetPriority(
-    const spdy::SpdyStreamPrecedence& precedence) {
-  if (stream_)
-    stream_->SetPriority(quic::QuicStreamPriority{
-        precedence.spdy3_priority(),
-        quic::QuicStreamPriority::kDefaultIncremental});
+    const quic::QuicStreamPriority& priority) {
+  if (stream_) {
+    stream_->SetPriority(priority);
+  }
 }
 
 void QuicChromiumClientStream::Handle::Reset(
@@ -618,7 +617,7 @@
   net_log_.AddEvent(
       NetLogEventType::QUIC_CHROMIUM_CLIENT_STREAM_SEND_REQUEST_HEADERS,
       [&](NetLogCaptureMode capture_mode) {
-        return QuicRequestNetLogParams(id(), &header_block, priority().urgency,
+        return QuicRequestNetLogParams(id(), &header_block, priority(),
                                        capture_mode);
       });
   size_t len = quic::QuicSpdyStream::WriteHeaders(std::move(header_block), fin,

net/quic/quic_chromium_client_stream.h

diff --git a/net/quic/quic_chromium_client_stream.h b/net/quic/quic_chromium_client_stream.h
index b087ab1..b89907c 100644
--- a/net/quic/quic_chromium_client_stream.h
+++ b/net/quic/quic_chromium_client_stream.h
@@ -113,8 +113,8 @@
     // stream is open.
     void DisableConnectionMigrationToCellularNetwork();
 
-    // Sets the precedence of the stream to |precedence|.
-    void SetPriority(const spdy::SpdyStreamPrecedence& precedence);
+    // Sets the precedence of the stream to |priority|.
+    void SetPriority(const quic::QuicStreamPriority& priority);
 
     // Sends a RST_STREAM frame to the peer and closes the streams.
     void Reset(quic::QuicRstStreamErrorCode error_code);

net/quic/quic_http_stream.cc

diff --git a/net/quic/quic_http_stream.cc b/net/quic/quic_http_stream.cc
index eb7a639..3a35564a 100644
--- a/net/quic/quic_http_stream.cc
+++ b/net/quic/quic_http_stream.cc
@@ -12,6 +12,7 @@
 #include "base/metrics/histogram_functions.h"
 #include "base/strings/string_split.h"
 #include "base/task/single_thread_task_runner.h"
+#include "net/base/features.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
@@ -164,6 +165,7 @@
 int QuicHttpStream::DoHandlePromiseComplete(int rv) {
   DCHECK_NE(ERR_IO_PENDING, rv);
   DCHECK_GE(OK, rv);
+  DCHECK(request_info_);
   if (rv != OK) {
     // rendezvous has failed so proceed as with a non-push request.
     next_state_ = STATE_REQUEST_STREAM;
@@ -172,10 +174,12 @@
 
   stream_ = quic_session()->ReleasePromisedStream();
 
-  spdy::SpdyPriority spdy_priority =
-      ConvertRequestPriorityToQuicPriority(priority_);
-  const spdy::SpdyStreamPrecedence precedence(spdy_priority);
-  stream_->SetPriority(precedence);
+  uint8_t urgency = ConvertRequestPriorityToQuicPriority(priority_);
+  bool incremental = quic::QuicStreamPriority::kDefaultIncremental;
+  if (base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+    incremental = request_info_->priority_incremental;
+  }
+  stream_->SetPriority(quic::QuicStreamPriority{urgency, incremental});
 
   next_state_ = STATE_OPEN;
   NetLogQuicPushStream(stream_net_log_, quic_session()->net_log(),
@@ -586,21 +590,31 @@
   // Set priority according to request
   DCHECK(stream_);
   DCHECK(response_info_);
+  DCHECK(request_info_);
 
-  spdy::SpdyPriority priority = ConvertRequestPriorityToQuicPriority(priority_);
-  spdy::SpdyStreamPrecedence precedence(priority);
-  stream_->SetPriority(precedence);
+  uint8_t urgency = ConvertRequestPriorityToQuicPriority(priority_);
+  bool incremental = quic::QuicStreamPriority::kDefaultIncremental;
+  if (base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+    incremental = request_info_->priority_incremental;
+  }
+  stream_->SetPriority(quic::QuicStreamPriority{urgency, incremental});
   next_state_ = STATE_SEND_HEADERS;
   return OK;
 }
 
 int QuicHttpStream::DoSendHeaders() {
+  uint8_t urgency = ConvertRequestPriorityToQuicPriority(priority_);
+  bool incremental = quic::QuicStreamPriority::kDefaultIncremental;
+  if (base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+    incremental = request_info_->priority_incremental;
+  }
+  quic::QuicStreamPriority priority{urgency, incremental};
   // Log the actual request with the URL Request's net log.
   stream_net_log_.AddEvent(
       NetLogEventType::HTTP_TRANSACTION_QUIC_SEND_REQUEST_HEADERS,
       [&](NetLogCaptureMode capture_mode) {
         return QuicRequestNetLogParams(stream_->id(), &request_headers_,
-                                       priority_, capture_mode);
+                                       priority, capture_mode);
       });
   DispatchRequestHeadersCallback(request_headers_);
   bool has_upload_data = request_body_stream_ != nullptr;

net/quic/quic_http_stream_test.cc

diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc
index 2e0c787..2d9a36e4 100644
--- a/net/quic/quic_http_stream_test.cc
+++ b/net/quic/quic_http_stream_test.cc
@@ -17,10 +17,12 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/task/single_thread_task_runner.h"
 #include "base/test/metrics/histogram_tester.h"
+#include "base/test/scoped_feature_list.h"
 #include "base/time/default_tick_clock.h"
 #include "base/time/time.h"
 #include "net/base/chunked_upload_data_stream.h"
 #include "net/base/elements_upload_data_stream.h"
+#include "net/base/features.h"
 #include "net/base/load_flags.h"
 #include "net/base/load_timing_info.h"
 #include "net/base/load_timing_info_test_util.h"
@@ -98,6 +100,7 @@
 struct TestParams {
   quic::ParsedQuicVersion version;
   bool client_headers_include_h2_stream_dependency;
+  bool enable_quic_priority_incremental_support;
 };
 
 // Used by ::testing::PrintToStringParamName().
@@ -105,7 +108,9 @@
   return base::StrCat(
       {ParsedQuicVersionToString(p.version), "_",
        (p.client_headers_include_h2_stream_dependency ? "" : "No"),
-       "Dependency"});
+       "Dependency", "_",
+       (p.enable_quic_priority_incremental_support ? "" : "No"),
+       "Incremental"});
 }
 
 std::vector<TestParams> GetTestParams() {
@@ -113,8 +118,10 @@
   quic::ParsedQuicVersionVector all_supported_versions =
       quic::AllSupportedVersions();
   for (const auto& version : all_supported_versions) {
-    params.push_back(TestParams{version, false});
-    params.push_back(TestParams{version, true});
+    params.push_back(TestParams{version, false, false});
+    params.push_back(TestParams{version, false, true});
+    params.push_back(TestParams{version, true, false});
+    params.push_back(TestParams{version, true, true});
   }
   return params;
 }
@@ -283,7 +290,8 @@
                       &clock_,
                       kDefaultServerHostName,
                       quic::Perspective::IS_CLIENT,
-                      client_headers_include_h2_stream_dependency_),
+                      client_headers_include_h2_stream_dependency_,
+                      true),
         server_maker_(version_,
                       connection_id_,
                       &clock_,
@@ -291,6 +299,9 @@
                       quic::Perspective::IS_SERVER,
                       false),
         printer_(version_) {
+    scoped_feature_list_.InitWithFeatureState(
+        features::kPriorityIncremental,
+        GetParam().enable_quic_priority_incremental_support);
     FLAGS_quic_enable_http3_grease_randomness = false;
     quic::QuicEnableVersion(version_);
     IPAddress ip(192, 0, 2, 33);
@@ -663,6 +674,7 @@
 
   const quic::ParsedQuicVersion version_;
   const bool client_headers_include_h2_stream_dependency_;
+  base::test::ScopedFeatureList scoped_feature_list_;
 
   NetLogWithSource net_log_with_source_{
       NetLogWithSource::Make(NetLog::Get(), NetLogSourceType::NONE)};

net/quic/quic_http_utils.cc

diff --git a/net/quic/quic_http_utils.cc b/net/quic/quic_http_utils.cc
index c5cb9bf..94c1dcd 100644
--- a/net/quic/quic_http_utils.cc
+++ b/net/quic/quic_http_utils.cc
@@ -27,11 +27,12 @@
 
 base::Value QuicRequestNetLogParams(quic::QuicStreamId stream_id,
                                     const spdy::Http2HeaderBlock* headers,
-                                    spdy::SpdyPriority priority,
+                                    quic::QuicStreamPriority priority,
                                     NetLogCaptureMode capture_mode) {
   base::Value dict = Http2HeaderBlockNetLogParams(headers, capture_mode);
   DCHECK(dict.is_dict());
-  dict.GetDict().Set("quic_priority", static_cast<int>(priority));
+  dict.GetDict().Set("quic_priority_urgency", priority.urgency);
+  dict.GetDict().Set("quic_priority_incremental", priority.incremental);
   dict.GetDict().Set("quic_stream_id", static_cast<int>(stream_id));
   return dict;
 }

net/quic/quic_http_utils.h

diff --git a/net/quic/quic_http_utils.h b/net/quic/quic_http_utils.h
index a39b25d..069b441 100644
--- a/net/quic/quic_http_utils.h
+++ b/net/quic/quic_http_utils.h
@@ -10,6 +10,7 @@
 #include "net/base/request_priority.h"
 #include "net/log/net_log_capture_mode.h"
 #include "net/third_party/quiche/src/quiche/quic/core/quic_packets.h"
+#include "net/third_party/quiche/src/quiche/quic/core/quic_stream_priority.h"
 #include "net/third_party/quiche/src/quiche/spdy/core/http2_header_block.h"
 #include "net/third_party/quiche/src/quiche/spdy/core/spdy_protocol.h"
 
@@ -28,7 +29,7 @@
 NET_EXPORT base::Value QuicRequestNetLogParams(
     quic::QuicStreamId stream_id,
     const spdy::Http2HeaderBlock* headers,
-    spdy::SpdyPriority priority,
+    quic::QuicStreamPriority priority,
     NetLogCaptureMode capture_mode);
 
 // Converts a spdy::Http2HeaderBlock and stream into NetLog event parameters.

net/quic/quic_network_transaction_unittest.cc

diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc
index d2873b2c..a244f76 100644
--- a/net/quic/quic_network_transaction_unittest.cc
+++ b/net/quic/quic_network_transaction_unittest.cc
@@ -113,6 +113,7 @@
 struct TestParams {
   quic::ParsedQuicVersion version;
   bool client_headers_include_h2_stream_dependency;
+  bool enable_quic_priority_incremental_support;
 };
 
 // Used by ::testing::PrintToStringParamName().
@@ -120,7 +121,9 @@
   return base::StrCat(
       {ParsedQuicVersionToString(p.version), "_",
        (p.client_headers_include_h2_stream_dependency ? "" : "No"),
-       "Dependency"});
+       "Dependency", "_",
+       (p.enable_quic_priority_incremental_support ? "" : "No"),
+       "Incremental"});
 }
 
 // Run QuicNetworkTransactionWithDestinationTest instances with all value
@@ -189,8 +192,10 @@
   quic::ParsedQuicVersionVector all_supported_versions =
       quic::AllSupportedVersions();
   for (const quic::ParsedQuicVersion& version : all_supported_versions) {
-    params.push_back(TestParams{version, false});
-    params.push_back(TestParams{version, true});
+    params.push_back(TestParams{version, false, false});
+    params.push_back(TestParams{version, false, true});
+    params.push_back(TestParams{version, true, false});
+    params.push_back(TestParams{version, true, true});
   }
   return params;
 }
@@ -305,7 +310,8 @@
             context_.clock(),
             kDefaultServerHostName,
             quic::Perspective::IS_CLIENT,
-            client_headers_include_h2_stream_dependency_)),
+            client_headers_include_h2_stream_dependency_,
+            true)),
         server_maker_(version_,
                       quic::QuicUtils::CreateRandomConnectionId(
                           context_.random_generator()),
@@ -321,6 +327,9 @@
         auth_handler_factory_(HttpAuthHandlerFactory::CreateDefault()),
         http_server_properties_(std::make_unique<HttpServerProperties>()),
         ssl_data_(ASYNC, OK) {
+    scoped_feature_list_.InitWithFeatureState(
+        features::kPriorityIncremental,
+        GetParam().enable_quic_priority_incremental_support);
     FLAGS_quic_enable_http3_grease_randomness = false;
     request_.method = "GET";
     std::string url("https://");
@@ -559,41 +568,58 @@
   }
 
   std::unique_ptr<quic::QuicEncryptedPacket>
-  ConstructClientRequestHeadersPacket(uint64_t packet_number,
-                                      quic::QuicStreamId stream_id,
-                                      bool should_include_version,
-                                      bool fin,
-                                      spdy::Http2HeaderBlock headers) {
-    return ConstructClientRequestHeadersPacket(packet_number, stream_id,
-                                               should_include_version, fin,
-                                               std::move(headers), 0);
+  ConstructClientRequestHeadersPacket(
+      uint64_t packet_number,
+      quic::QuicStreamId stream_id,
+      bool should_include_version,
+      bool fin,
+      spdy::Http2HeaderBlock headers,
+      bool should_include_priority_frame = true) {
+    return ConstructClientRequestHeadersPacket(
+        packet_number, stream_id, should_include_version, fin,
+        std::move(headers), 0, should_include_priority_frame);
   }
 
   std::unique_ptr<quic::QuicEncryptedPacket>
-  ConstructClientRequestHeadersPacket(uint64_t packet_number,
-                                      quic::QuicStreamId stream_id,
-                                      bool should_include_version,
-                                      bool fin,
-                                      spdy::Http2HeaderBlock headers,
-                                      quic::QuicStreamId parent_stream_id) {
+  ConstructClientRequestHeadersPacket(
+      uint64_t packet_number,
+      quic::QuicStreamId stream_id,
+      bool should_include_version,
+      bool fin,
+      spdy::Http2HeaderBlock headers,
+      quic::QuicStreamId parent_stream_id,
+      bool should_include_priority_frame = true) {
     return ConstructClientRequestHeadersPacket(
         packet_number, stream_id, should_include_version, fin, DEFAULT_PRIORITY,
-        std::move(headers), parent_stream_id);
+        std::move(headers), parent_stream_id, should_include_priority_frame);
   }
 
   std::unique_ptr<quic::QuicEncryptedPacket>
-  ConstructClientRequestHeadersPacket(uint64_t packet_number,
-                                      quic::QuicStreamId stream_id,
-                                      bool should_include_version,
-                                      bool fin,
-                                      RequestPriority request_priority,
-                                      spdy::Http2HeaderBlock headers,
-                                      quic::QuicStreamId parent_stream_id) {
+  ConstructClientRequestHeadersPacket(
+      uint64_t packet_number,
+      quic::QuicStreamId stream_id,
+      bool should_include_version,
+      bool fin,
+      RequestPriority request_priority,
+      spdy::Http2HeaderBlock headers,
+      quic::QuicStreamId parent_stream_id,
+      bool should_include_priority_frame = true) {
     spdy::SpdyPriority priority =
         ConvertRequestPriorityToQuicPriority(request_priority);
     return client_maker_->MakeRequestHeadersPacket(
         packet_number, stream_id, should_include_version, fin, priority,
-        std::move(headers), parent_stream_id, nullptr);
+        std::move(headers), parent_stream_id, nullptr,
+        should_include_priority_frame);
+  }
+
+  std::unique_ptr<quic::QuicReceivedPacket> ConstructClientPriorityPacket(
+      uint64_t packet_number,
+      quic::QuicStreamId id,
+      RequestPriority request_priority) {
+    spdy::SpdyPriority spdy_priority =
+        ConvertRequestPriorityToQuicPriority(request_priority);
+    return client_maker_->MakePriorityPacket(packet_number, true, id, 0,
+                                             spdy_priority);
   }
 
   std::unique_ptr<quic::QuicReceivedPacket>
@@ -896,7 +922,7 @@
         version_,
         quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
         context_.clock(), kDefaultServerHostName, quic::Perspective::IS_CLIENT,
-        client_headers_include_h2_stream_dependency_);
+        client_headers_include_h2_stream_dependency_, true);
     QuicTestPacketMaker server_maker(
         version_,
         quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
@@ -1051,6 +1077,7 @@
   const std::string alt_svc_header_ =
       GenerateQuicAltSvcHeader({version_}) + "\r\n";
   const bool client_headers_include_h2_stream_dependency_;
+  base::test::ScopedFeatureList scoped_feature_list_;
   quic::ParsedQuicVersionVector supported_versions_;
   quic::test::QuicFlagSaver flags_;  // Save/restore all QUIC flag values.
   MockQuicContext context_;
@@ -2398,7 +2425,7 @@
       picked_version,
       quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
       context_.clock(), kDefaultServerHostName, quic::Perspective::IS_CLIENT,
-      client_headers_include_h2_stream_dependency_);
+      client_headers_include_h2_stream_dependency_, true);
   QuicTestPacketMaker server_maker(
       picked_version,
       quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
@@ -4242,7 +4269,7 @@
       version_,
       quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
       context_.clock(), origin2.host(), quic::Perspective::IS_CLIENT,
-      client_headers_include_h2_stream_dependency_);
+      client_headers_include_h2_stream_dependency_, true);
   QuicTestPacketMaker server_maker2(
       version_,
       quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
@@ -4571,7 +4598,7 @@
       version_,
       quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
       context_.clock(), origin2.host(), quic::Perspective::IS_CLIENT,
-      client_headers_include_h2_stream_dependency_);
+      client_headers_include_h2_stream_dependency_, true);
   QuicTestPacketMaker server_maker2(
       version_,
       quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
@@ -4688,7 +4715,7 @@
       version_,
       quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
       context_.clock(), "mail.example.org", quic::Perspective::IS_CLIENT,
-      client_headers_include_h2_stream_dependency_);
+      client_headers_include_h2_stream_dependency_, true);
   server_maker_.set_hostname("www.example.org");
   client_maker_->set_hostname("www.example.org");
   MockQuicData mock_quic_data(version_);
@@ -6799,7 +6826,7 @@
       version_,
       quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
       context_.clock(), kDefaultServerHostName, quic::Perspective::IS_CLIENT,
-      client_headers_include_h2_stream_dependency_);
+      client_headers_include_h2_stream_dependency_, true);
   QuicTestPacketMaker server_maker2(
       version_,
       quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
@@ -7476,7 +7503,7 @@
       version_,
       quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
       context_.clock(), origin1_, quic::Perspective::IS_CLIENT,
-      client_headers_include_h2_stream_dependency_);
+      client_headers_include_h2_stream_dependency_, true);
   QuicTestPacketMaker server_maker(
       version_,
       quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
@@ -7580,7 +7607,7 @@
       version_,
       quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
       context_.clock(), origin1_, quic::Perspective::IS_CLIENT,
-      client_headers_include_h2_stream_dependency_);
+      client_headers_include_h2_stream_dependency_, true);
   QuicTestPacketMaker server_maker1(
       version_,
       quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
@@ -7617,7 +7644,7 @@
       version_,
       quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
       context_.clock(), origin2_, quic::Perspective::IS_CLIENT,
-      client_headers_include_h2_stream_dependency_);
+      client_headers_include_h2_stream_dependency_, true);
   QuicTestPacketMaker server_maker2(
       version_,
       quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
@@ -7863,6 +7890,14 @@
   if (VersionUsesHttp3(version_.transport_version)) {
     mock_quic_data.AddWrite(SYNCHRONOUS,
                             ConstructInitialSettingsPacket(packet_num++));
+
+    if (base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+      mock_quic_data.AddWrite(
+          SYNCHRONOUS,
+          ConstructClientPriorityPacket(
+              packet_num++, GetNthClientInitiatedBidirectionalStreamId(0),
+              DEFAULT_PRIORITY));
+    }
   }
   mock_quic_data.AddWrite(
       SYNCHRONOUS,
@@ -7872,7 +7907,7 @@
           VersionUsesHttp3(version_.transport_version)
               ? DEFAULT_PRIORITY
               : HttpProxyConnectJob::kH2QuicTunnelPriority,
-          ConnectRequestHeaders("mail.example.org:443"), 0));
+          ConnectRequestHeaders("mail.example.org:443"), 0, false));
   mock_quic_data.AddRead(
       ASYNC, ConstructServerResponseHeadersPacket(
                  1, GetNthClientInitiatedBidirectionalStreamId(0), false, false,
@@ -7956,6 +7991,14 @@
   if (VersionUsesHttp3(version_.transport_version)) {
     mock_quic_data.AddWrite(SYNCHRONOUS,
                             ConstructInitialSettingsPacket(packet_num++));
+
+    if (base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+      mock_quic_data.AddWrite(
+          SYNCHRONOUS,
+          ConstructClientPriorityPacket(
+              packet_num++, GetNthClientInitiatedBidirectionalStreamId(0),
+              DEFAULT_PRIORITY));
+    }
   }
   mock_quic_data.AddWrite(
       SYNCHRONOUS,
@@ -7965,7 +8008,7 @@
           VersionUsesHttp3(version_.transport_version)
               ? DEFAULT_PRIORITY
               : HttpProxyConnectJob::kH2QuicTunnelPriority,
-          ConnectRequestHeaders("mail.example.org:443"), 0));
+          ConnectRequestHeaders("mail.example.org:443"), 0, false));
   mock_quic_data.AddRead(
       ASYNC, ConstructServerResponseHeadersPacket(
                  1, GetNthClientInitiatedBidirectionalStreamId(0), false, false,
@@ -8050,6 +8093,14 @@
   if (VersionUsesHttp3(version_.transport_version)) {
     mock_quic_data.AddWrite(
         SYNCHRONOUS, ConstructInitialSettingsPacket(write_packet_index++));
+
+    if (base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+      mock_quic_data.AddWrite(
+          SYNCHRONOUS,
+          ConstructClientPriorityPacket(
+              write_packet_index++,
+              GetNthClientInitiatedBidirectionalStreamId(0), DEFAULT_PRIORITY));
+    }
   }
   mock_quic_data.AddWrite(
       SYNCHRONOUS,
@@ -8059,7 +8110,7 @@
           VersionUsesHttp3(version_.transport_version)
               ? DEFAULT_PRIORITY
               : HttpProxyConnectJob::kH2QuicTunnelPriority,
-          ConnectRequestHeaders("mail.example.org:443"), 0));
+          ConnectRequestHeaders("mail.example.org:443"), 0, false));
   mock_quic_data.AddRead(
       ASYNC, ConstructServerResponseHeadersPacket(
                  1, GetNthClientInitiatedBidirectionalStreamId(0), false, false,
@@ -8177,6 +8228,14 @@
   if (VersionUsesHttp3(version_.transport_version)) {
     mock_quic_data.AddWrite(SYNCHRONOUS,
                             ConstructInitialSettingsPacket(packet_num++));
+
+    if (base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+      mock_quic_data.AddWrite(
+          SYNCHRONOUS,
+          ConstructClientPriorityPacket(
+              packet_num++, GetNthClientInitiatedBidirectionalStreamId(0),
+              DEFAULT_PRIORITY));
+    }
   }
 
   // CONNECT request and response for first request
@@ -8188,7 +8247,7 @@
           VersionUsesHttp3(version_.transport_version)
               ? DEFAULT_PRIORITY
               : HttpProxyConnectJob::kH2QuicTunnelPriority,
-          ConnectRequestHeaders("mail.example.org:443"), 0));
+          ConnectRequestHeaders("mail.example.org:443"), 0, false));
   mock_quic_data.AddRead(
       ASYNC, ConstructServerResponseHeadersPacket(
                  1, GetNthClientInitiatedBidirectionalStreamId(0), false, false,
@@ -8220,6 +8279,14 @@
                           ConstructClientAckPacket(packet_num++, 3, 2));
 
   // CONNECT request and response for second request
+  if (VersionUsesHttp3(version_.transport_version) &&
+      base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+    mock_quic_data.AddWrite(
+        SYNCHRONOUS,
+        ConstructClientPriorityPacket(
+            packet_num++, GetNthClientInitiatedBidirectionalStreamId(1),
+            DEFAULT_PRIORITY));
+  }
   mock_quic_data.AddWrite(
       SYNCHRONOUS,
       ConstructClientRequestHeadersPacket(
@@ -8229,7 +8296,7 @@
               ? DEFAULT_PRIORITY
               : HttpProxyConnectJob::kH2QuicTunnelPriority,
           ConnectRequestHeaders("different.example.org:443"),
-          GetNthClientInitiatedBidirectionalStreamId(0)));
+          GetNthClientInitiatedBidirectionalStreamId(0), false));
   mock_quic_data.AddRead(
       ASYNC, ConstructServerResponseHeadersPacket(
                  4, GetNthClientInitiatedBidirectionalStreamId(1), false, false,
@@ -8337,6 +8404,14 @@
   if (VersionUsesHttp3(version_.transport_version)) {
     mock_quic_data.AddWrite(SYNCHRONOUS,
                             ConstructInitialSettingsPacket(packet_num++));
+
+    if (base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+      mock_quic_data.AddWrite(
+          SYNCHRONOUS,
+          ConstructClientPriorityPacket(
+              packet_num++, GetNthClientInitiatedBidirectionalStreamId(0),
+              DEFAULT_PRIORITY));
+    }
   }
   mock_quic_data.AddWrite(
       SYNCHRONOUS,
@@ -8346,7 +8421,7 @@
           VersionUsesHttp3(version_.transport_version)
               ? DEFAULT_PRIORITY
               : HttpProxyConnectJob::kH2QuicTunnelPriority,
-          ConnectRequestHeaders("mail.example.org:443"), 0));
+          ConnectRequestHeaders("mail.example.org:443"), 0, false));
   mock_quic_data.AddRead(
       ASYNC, ConstructServerResponseHeadersPacket(
                  1, GetNthClientInitiatedBidirectionalStreamId(0), false, true,
@@ -8388,6 +8463,13 @@
   if (VersionUsesHttp3(version_.transport_version)) {
     mock_quic_data.AddWrite(SYNCHRONOUS,
                             ConstructInitialSettingsPacket(packet_num++));
+    if (base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+      mock_quic_data.AddWrite(
+          SYNCHRONOUS,
+          ConstructClientPriorityPacket(
+              packet_num++, GetNthClientInitiatedBidirectionalStreamId(0),
+              DEFAULT_PRIORITY));
+    }
   }
   mock_quic_data.AddWrite(
       SYNCHRONOUS,
@@ -8397,7 +8479,7 @@
           VersionUsesHttp3(version_.transport_version)
               ? DEFAULT_PRIORITY
               : HttpProxyConnectJob::kH2QuicTunnelPriority,
-          ConnectRequestHeaders("mail.example.org:443"), 0));
+          ConnectRequestHeaders("mail.example.org:443"), 0, false));
   mock_quic_data.AddRead(ASYNC, ERR_CONNECTION_FAILED);
 
   mock_quic_data.AddSocketDataToFactory(&socket_factory_);
@@ -8429,6 +8511,14 @@
   if (VersionUsesHttp3(version_.transport_version)) {
     mock_quic_data.AddWrite(SYNCHRONOUS,
                             ConstructInitialSettingsPacket(packet_num++));
+
+    if (base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+      mock_quic_data.AddWrite(
+          SYNCHRONOUS,
+          ConstructClientPriorityPacket(
+              packet_num++, GetNthClientInitiatedBidirectionalStreamId(0),
+              DEFAULT_PRIORITY));
+    }
   }
   mock_quic_data.AddWrite(
       SYNCHRONOUS,
@@ -8438,7 +8528,7 @@
           VersionUsesHttp3(version_.transport_version)
               ? DEFAULT_PRIORITY
               : HttpProxyConnectJob::kH2QuicTunnelPriority,
-          ConnectRequestHeaders("mail.example.org:443"), 0));
+          ConnectRequestHeaders("mail.example.org:443"), 0, false));
   mock_quic_data.AddRead(
       ASYNC, ConstructServerResponseHeadersPacket(
                  1, GetNthClientInitiatedBidirectionalStreamId(0), false, false,
@@ -8461,6 +8551,14 @@
             quic::QUIC_STREAM_CANCELLED, 1, 1));
   }
 
+  if (VersionUsesHttp3(version_.transport_version) &&
+      base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+    mock_quic_data.AddWrite(
+        SYNCHRONOUS,
+        ConstructClientPriorityPacket(
+            packet_num++, GetNthClientInitiatedBidirectionalStreamId(1),
+            DEFAULT_PRIORITY));
+  }
   mock_quic_data.AddWrite(
       SYNCHRONOUS,
       ConstructClientRequestHeadersPacket(
@@ -8470,7 +8568,7 @@
               ? DEFAULT_PRIORITY
               : HttpProxyConnectJob::kH2QuicTunnelPriority,
           ConnectRequestHeaders("mail.example.org:443"),
-          GetNthClientInitiatedBidirectionalStreamId(0)));
+          GetNthClientInitiatedBidirectionalStreamId(0), false));
   mock_quic_data.AddRead(
       ASYNC, ConstructServerResponseHeadersPacket(
                  2, GetNthClientInitiatedBidirectionalStreamId(1), false, false,
@@ -8564,6 +8662,13 @@
   if (VersionUsesHttp3(version_.transport_version)) {
     mock_quic_data.AddWrite(SYNCHRONOUS,
                             ConstructInitialSettingsPacket(packet_num++));
+    if (base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+      mock_quic_data.AddWrite(
+          SYNCHRONOUS,
+          ConstructClientPriorityPacket(
+              packet_num++, GetNthClientInitiatedBidirectionalStreamId(0),
+              DEFAULT_PRIORITY));
+    }
   }
 
   spdy::Http2HeaderBlock headers =
@@ -8577,7 +8682,7 @@
           VersionUsesHttp3(version_.transport_version)
               ? DEFAULT_PRIORITY
               : HttpProxyConnectJob::kH2QuicTunnelPriority,
-          std::move(headers), 0));
+          std::move(headers), 0, false));
   // Return an error, so the transaction stops here (this test isn't interested
   // in the rest).
   mock_quic_data.AddRead(ASYNC, ERR_CONNECTION_FAILED);
@@ -8618,6 +8723,13 @@
   if (VersionUsesHttp3(version_.transport_version)) {
     mock_quic_data.AddWrite(SYNCHRONOUS,
                             ConstructInitialSettingsPacket(packet_num++));
+    if (base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+      mock_quic_data.AddWrite(
+          SYNCHRONOUS,
+          ConstructClientPriorityPacket(
+              packet_num++, GetNthClientInitiatedBidirectionalStreamId(0),
+              DEFAULT_PRIORITY));
+    }
   }
   mock_quic_data.AddWrite(
       SYNCHRONOUS,
@@ -8627,7 +8739,7 @@
           VersionUsesHttp3(version_.transport_version)
               ? DEFAULT_PRIORITY
               : HttpProxyConnectJob::kH2QuicTunnelPriority,
-          ConnectRequestHeaders("mail.example.org:443"), 0));
+          ConnectRequestHeaders("mail.example.org:443"), 0, false));
   // Return an error, so the transaction stops here (this test isn't interested
   // in the rest).
   mock_quic_data.AddRead(ASYNC, ERR_CONNECTION_FAILED);
@@ -8734,7 +8846,7 @@
         version_,
         quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
         context_.clock(), kDefaultServerHostName, quic::Perspective::IS_CLIENT,
-        client_headers_include_h2_stream_dependency_);
+        client_headers_include_h2_stream_dependency_, true);
     QuicTestPacketMaker server_maker(
         version_,
         quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
@@ -8753,6 +8865,14 @@
     if (VersionUsesHttp3(version_.transport_version)) {
       mock_quic_data.AddWrite(
           SYNCHRONOUS, client_maker.MakeInitialSettingsPacket(packet_num++));
+
+      if (base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+        mock_quic_data.AddWrite(
+            SYNCHRONOUS, client_maker.MakePriorityPacket(
+                             packet_num++, true,
+                             GetNthClientInitiatedBidirectionalStreamId(0), 0,
+                             quic::QuicStreamPriority::kDefaultUrgency));
+      }
     }
 
     mock_quic_data.AddWrite(
@@ -8765,7 +8885,7 @@
                 : ConvertRequestPriorityToQuicPriority(
                       HttpProxyConnectJob::kH2QuicTunnelPriority),
             client_maker.ConnectRequestHeaders("mail.example.org:443"), 0,
-            nullptr));
+            nullptr, false));
 
     spdy::Http2HeaderBlock headers = server_maker.GetResponseHeaders("407");
     headers["proxy-authenticate"] = "Basic realm=\"MyRealm1\"";
@@ -8806,6 +8926,15 @@
             quic::QUIC_STREAM_CANCELLED,
             /*include_stop_sending_if_v99=*/true));
 
+    if (VersionUsesHttp3(version_.transport_version) &&
+        base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+      mock_quic_data.AddWrite(
+          SYNCHRONOUS,
+          client_maker.MakePriorityPacket(
+              packet_num++, true, GetNthClientInitiatedBidirectionalStreamId(1),
+              0, quic::QuicStreamPriority::kDefaultUrgency));
+    }
+
     headers = client_maker.ConnectRequestHeaders("mail.example.org:443");
     headers["proxy-authorization"] = "Basic Zm9vOmJheg==";
     mock_quic_data.AddWrite(
@@ -8818,7 +8947,7 @@
                 : ConvertRequestPriorityToQuicPriority(
                       HttpProxyConnectJob::kH2QuicTunnelPriority),
             std::move(headers), GetNthClientInitiatedBidirectionalStreamId(0),
-            nullptr));
+            nullptr, false));
 
     // Response to wrong password
     headers = server_maker.GetResponseHeaders("407");
@@ -9162,7 +9291,7 @@
               context_.random_generator()),
           context_.clock(), kDefaultServerHostName,
           quic::Perspective::IS_CLIENT,
-          client_headers_include_h2_stream_dependency_);
+          client_headers_include_h2_stream_dependency_, true);
       QuicTestPacketMaker server_maker1(
           version_,
           quic::QuicUtils::CreateRandomConnectionId(
@@ -9240,7 +9369,7 @@
               context_.random_generator()),
           context_.clock(), kDefaultServerHostName,
           quic::Perspective::IS_CLIENT,
-          client_headers_include_h2_stream_dependency_);
+          client_headers_include_h2_stream_dependency_, true);
       QuicTestPacketMaker server_maker2(
           version_,
           quic::QuicUtils::CreateRandomConnectionId(
@@ -9300,7 +9429,7 @@
               context_.random_generator()),
           context_.clock(), kDefaultServerHostName,
           quic::Perspective::IS_CLIENT,
-          client_headers_include_h2_stream_dependency_);
+          client_headers_include_h2_stream_dependency_, true);
       QuicTestPacketMaker server_maker3(
           version_,
           quic::QuicUtils::CreateRandomConnectionId(
@@ -9432,7 +9561,7 @@
         version_,
         quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
         context_.clock(), kDefaultServerHostName, quic::Perspective::IS_CLIENT,
-        client_headers_include_h2_stream_dependency_);
+        client_headers_include_h2_stream_dependency_, true);
     QuicTestPacketMaker server_maker(
         version_,
         quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
@@ -9443,8 +9572,17 @@
     if (VersionUsesHttp3(version_.transport_version)) {
       mock_quic_data[index]->AddWrite(
           SYNCHRONOUS, client_maker.MakeInitialSettingsPacket(packet_num++));
+
+      if (base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+        mock_quic_data[index]->AddWrite(
+            SYNCHRONOUS, client_maker.MakePriorityPacket(
+                             packet_num++, true,
+                             GetNthClientInitiatedBidirectionalStreamId(0), 0,
+                             quic::QuicStreamPriority::kDefaultUrgency));
+      }
     }
 
+    std::cout << "MakeRequestHeadersPacket\n";
     mock_quic_data[index]->AddWrite(
         SYNCHRONOUS,
         client_maker.MakeRequestHeadersPacket(
@@ -9454,7 +9592,7 @@
                 ? quic::QuicStreamPriority::kDefaultUrgency
                 : ConvertRequestPriorityToQuicPriority(
                       HttpProxyConnectJob::kH2QuicTunnelPriority),
-            ConnectRequestHeaders("mail.example.org:443"), 0, nullptr));
+            ConnectRequestHeaders("mail.example.org:443"), 0, nullptr, false));
     mock_quic_data[index]->AddRead(
         ASYNC, server_maker.MakeResponseHeadersPacket(
                    1, GetNthClientInitiatedBidirectionalStreamId(0), false,
@@ -9861,7 +9999,7 @@
       version_,
       quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
       context_.clock(), kDefaultServerHostName, quic::Perspective::IS_CLIENT,
-      client_headers_include_h2_stream_dependency_);
+      client_headers_include_h2_stream_dependency_, true);
   int write_packet_number2 = 1;
   mock_quic_data2.AddWrite(SYNCHRONOUS, client_maker2.MakeInitialSettingsPacket(
                                             write_packet_number2++));

net/quic/quic_stream_factory_test.cc

diff --git a/net/quic/quic_stream_factory_test.cc b/net/quic/quic_stream_factory_test.cc
index f87d891..76d7829 100644
--- a/net/quic/quic_stream_factory_test.cc
+++ b/net/quic/quic_stream_factory_test.cc
@@ -122,6 +122,7 @@
 struct TestParams {
   quic::ParsedQuicVersion version;
   bool client_headers_include_h2_stream_dependency;
+  bool enable_quic_priority_incremental_support;
 };
 
 // Used by ::testing::PrintToStringParamName().
@@ -129,7 +130,9 @@
   return base::StrCat(
       {ParsedQuicVersionToString(p.version), "_",
        (p.client_headers_include_h2_stream_dependency ? "" : "No"),
-       "Dependency"});
+       "Dependency", "_",
+       (p.enable_quic_priority_incremental_support ? "" : "No"),
+       "Incremental"});
 }
 
 std::vector<TestParams> GetTestParams() {
@@ -137,8 +140,10 @@
   quic::ParsedQuicVersionVector all_supported_versions =
       quic::AllSupportedVersions();
   for (const auto& version : all_supported_versions) {
-      params.push_back(TestParams{version, false});
-      params.push_back(TestParams{version, true});
+    params.push_back(TestParams{version, false, false});
+    params.push_back(TestParams{version, false, true});
+    params.push_back(TestParams{version, true, false});
+    params.push_back(TestParams{version, true, true});
   }
   return params;
 }
@@ -202,7 +207,8 @@
 class QuicStreamFactoryTestBase : public WithTaskEnvironment {
  protected:
   QuicStreamFactoryTestBase(quic::ParsedQuicVersion version,
-                            bool client_headers_include_h2_stream_dependency)
+                            bool client_headers_include_h2_stream_dependency,
+                            bool enable_quic_priority_incremental_support)
       : host_resolver_(std::make_unique<MockHostResolver>(
             /*default_result=*/MockHostResolverBase::RuleResolver::
                 GetLocalhostResult())),
@@ -216,7 +222,8 @@
                       context_.clock(),
                       kDefaultServerHostName,
                       quic::Perspective::IS_CLIENT,
-                      client_headers_include_h2_stream_dependency),
+                      client_headers_include_h2_stream_dependency,
+                      true),
         server_maker_(version_,
                       quic::QuicUtils::CreateRandomConnectionId(
                           context_.random_generator()),
@@ -237,6 +244,9 @@
             &QuicStreamFactoryTestBase::OnFailedOnDefaultNetwork,
             base::Unretained(this))),
         quic_params_(context_.params()) {
+    scoped_feature_list_.InitWithFeatureState(
+        features::kPriorityIncremental,
+        enable_quic_priority_incremental_support);
     FLAGS_quic_enable_http3_grease_randomness = false;
     quic_params_->headers_include_h2_stream_dependency =
         client_headers_include_h2_stream_dependency;
@@ -968,6 +978,7 @@
   NetErrorDetails net_error_details_;
 
   raw_ptr<QuicParams> quic_params_;
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 class QuicStreamFactoryTest : public QuicStreamFactoryTestBase,
@@ -976,7 +987,8 @@
   QuicStreamFactoryTest()
       : QuicStreamFactoryTestBase(
             GetParam().version,
-            GetParam().client_headers_include_h2_stream_dependency) {}
+            GetParam().client_headers_include_h2_stream_dependency,
+            GetParam().enable_quic_priority_incremental_support) {}
 };
 
 INSTANTIATE_TEST_SUITE_P(VersionIncludeStreamDependencySequence,
@@ -1339,7 +1351,7 @@
         version_,
         quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
         context_.clock(), kDefaultServerHostName, quic::Perspective::IS_CLIENT,
-        quic_params_->headers_include_h2_stream_dependency);
+        quic_params_->headers_include_h2_stream_dependency, true);
 
     MockQuicData socket_data(version_);
     socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
@@ -1572,7 +1584,7 @@
         version_,
         quic::QuicUtils::CreateRandomConnectionId(context_.random_generator()),
         context_.clock(), kDefaultServerHostName, quic::Perspective::IS_CLIENT,
-        quic_params_->headers_include_h2_stream_dependency);
+        quic_params_->headers_include_h2_stream_dependency, true);
 
     MockQuicData socket_data(version_);
     socket_data.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
@@ -8028,13 +8040,20 @@
                             GetNthClientInitiatedBidirectionalStreamId(1),
                             /*should_include_version=*/false,
                             /*fin=*/true);
+  std::vector<uint64_t> original_packet_numbers = {1};
+  uint64_t retransmit_frame_count = 0;
+  if (base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+    original_packet_numbers.push_back(2);
+    retransmit_frame_count = 2;
+  }
   socket_data1.AddWrite(
       SYNCHRONOUS, client_maker_.MakeRetransmissionRstAndDataPacket(
-                       /*original_packet_numbers=*/{1}, packet_number++,
+                       original_packet_numbers, packet_number++,
                        /*include_version=*/false,
                        GetNthClientInitiatedBidirectionalStreamId(1),
                        quic::QUIC_STREAM_CANCELLED, GetQpackDecoderStreamId(),
-                       StreamCancellationQpackDecoderInstruction(1)));
+                       StreamCancellationQpackDecoderInstruction(1),
+                       retransmit_frame_count));
   socket_data1.AddWrite(
       SYNCHRONOUS, client_maker_.MakePingPacket(packet_number++,
                                                 /*include_version=*/false));
@@ -8191,13 +8210,20 @@
                               GetNthClientInitiatedBidirectionalStreamId(0),
                               /*should_include_version=*/false,
                               /*fin=*/true);
+    std::vector<uint64_t> original_packet_numbers = {1};
+    uint64_t retransmit_frame_count = 0;
+    if (base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+      original_packet_numbers.push_back(2);
+      retransmit_frame_count = 2;
+    }
     socket_data.AddWrite(
         SYNCHRONOUS, client_maker_.MakeRetransmissionRstAndDataPacket(
-                         /*original_packet_numbers=*/{1}, packet_num++,
+                         original_packet_numbers, packet_num++,
                          /*include_version=*/false,
                          GetNthClientInitiatedBidirectionalStreamId(0),
                          quic::QUIC_STREAM_CANCELLED, GetQpackDecoderStreamId(),
-                         StreamCancellationQpackDecoderInstruction(0)));
+                         StreamCancellationQpackDecoderInstruction(0),
+                         retransmit_frame_count));
     socket_data.AddWrite(
         SYNCHRONOUS, client_maker_.MakePingPacket(packet_num++,
                                                   /*include_version=*/false));
@@ -12582,6 +12608,7 @@
   quic::ParsedQuicVersion version;
   DestinationType destination_type;
   bool client_headers_include_h2_stream_dependency;
+  bool enable_quic_priority_incremental_support;
 };
 
 // Used by ::testing::PrintToStringParamName().
@@ -12601,7 +12628,9 @@
   return base::StrCat(
       {ParsedQuicVersionToString(p.version), "_", destination_string, "_",
        (p.client_headers_include_h2_stream_dependency ? "" : "No"),
-       "Dependency"});
+       "Dependency", "_",
+       (p.enable_quic_priority_incremental_support ? "" : "No"),
+       "Incremental"});
 }
 
 std::vector<PoolingTestParams> GetPoolingTestParams() {
@@ -12609,12 +12638,18 @@
   quic::ParsedQuicVersionVector all_supported_versions =
       quic::AllSupportedVersions();
   for (const quic::ParsedQuicVersion& version : all_supported_versions) {
-    params.push_back(PoolingTestParams{version, SAME_AS_FIRST, false});
-    params.push_back(PoolingTestParams{version, SAME_AS_FIRST, true});
-    params.push_back(PoolingTestParams{version, SAME_AS_SECOND, false});
-    params.push_back(PoolingTestParams{version, SAME_AS_SECOND, true});
-    params.push_back(PoolingTestParams{version, DIFFERENT, false});
-    params.push_back(PoolingTestParams{version, DIFFERENT, true});
+    params.push_back(PoolingTestParams{version, SAME_AS_FIRST, false, false});
+    params.push_back(PoolingTestParams{version, SAME_AS_FIRST, false, true});
+    params.push_back(PoolingTestParams{version, SAME_AS_FIRST, true, false});
+    params.push_back(PoolingTestParams{version, SAME_AS_FIRST, true, true});
+    params.push_back(PoolingTestParams{version, SAME_AS_SECOND, false, false});
+    params.push_back(PoolingTestParams{version, SAME_AS_SECOND, false, true});
+    params.push_back(PoolingTestParams{version, SAME_AS_SECOND, true, false});
+    params.push_back(PoolingTestParams{version, SAME_AS_SECOND, true, true});
+    params.push_back(PoolingTestParams{version, DIFFERENT, false, false});
+    params.push_back(PoolingTestParams{version, DIFFERENT, false, true});
+    params.push_back(PoolingTestParams{version, DIFFERENT, true, false});
+    params.push_back(PoolingTestParams{version, DIFFERENT, true, true});
   }
   return params;
 }
@@ -12628,7 +12663,8 @@
   QuicStreamFactoryWithDestinationTest()
       : QuicStreamFactoryTestBase(
             GetParam().version,
-            GetParam().client_headers_include_h2_stream_dependency),
+            GetParam().client_headers_include_h2_stream_dependency,
+            GetParam().enable_quic_priority_incremental_support),
         destination_type_(GetParam().destination_type),
         hanging_read_(SYNCHRONOUS, ERR_IO_PENDING, 0) {}
 
@@ -15192,7 +15228,8 @@
   QuicStreamFactoryDnsAliasPoolingTest()
       : QuicStreamFactoryTestBase(
             GetParam().version,
-            GetParam().client_headers_include_h2_stream_dependency),
+            GetParam().client_headers_include_h2_stream_dependency,
+            true),
         use_dns_aliases_(GetParam().use_dns_aliases),
         dns_aliases1_(GetParam().dns_aliases1),
         dns_aliases2_(GetParam().dns_aliases2),

net/quic/quic_test_packet_maker.cc

diff --git a/net/quic/quic_test_packet_maker.cc b/net/quic/quic_test_packet_maker.cc
index 3f28d6bb1..5fde3171 100644
--- a/net/quic/quic_test_packet_maker.cc
+++ b/net/quic/quic_test_packet_maker.cc
@@ -9,6 +9,7 @@
 
 #include "base/strings/strcat.h"
 #include "base/strings/string_number_conversions.h"
+#include "net/base/features.h"
 #include "net/quic/mock_crypto_client_stream.h"
 #include "net/quic/quic_chromium_client_session.h"
 #include "net/quic/quic_http_utils.h"
@@ -98,7 +99,8 @@
     const quic::QuicClock* clock,
     const std::string& host,
     quic::Perspective perspective,
-    bool client_headers_include_h2_stream_dependency)
+    bool client_headers_include_h2_stream_dependency,
+    bool client_priority_uses_incremental)
     : version_(version),
       connection_id_(connection_id),
       clock_(clock),
@@ -108,9 +110,12 @@
       qpack_encoder_(&decoder_stream_error_delegate_),
       perspective_(perspective),
       client_headers_include_h2_stream_dependency_(
-          client_headers_include_h2_stream_dependency) {
+          client_headers_include_h2_stream_dependency),
+      client_priority_uses_incremental_(client_priority_uses_incremental) {
   DCHECK(!(perspective_ == quic::Perspective::IS_SERVER &&
            client_headers_include_h2_stream_dependency_));
+  DCHECK(!(perspective_ == quic::Perspective::IS_SERVER &&
+           client_priority_uses_incremental_));
 
   qpack_encoder_.set_qpack_stream_sender_delegate(
       &encoder_stream_sender_delegate_);
@@ -250,7 +255,9 @@
   InitializeHeader(num, include_version);
   for (auto it : original_packet_numbers) {
     for (auto frame : saved_frames_[quic::QuicPacketNumber(it)]) {
-      frames_.push_back(frame);
+      if (!MaybeCoalesceStreamFrame(frame)) {
+        frames_.push_back(frame);
+      }
     }
   }
   AddQuicRetireConnectionIdFrame(sequence_number);
@@ -334,13 +341,21 @@
     quic::QuicStreamId rst_stream_id,
     quic::QuicRstStreamErrorCode rst_error_code,
     quic::QuicStreamId data_stream_id,
-    absl::string_view data) {
+    absl::string_view data,
+    uint64_t retransmit_frame_count) {
   DCHECK(save_packet_frames_);
   InitializeHeader(num, include_version);
 
+  uint64_t frame_count = 0;
   for (auto it : original_packet_numbers) {
     for (auto frame : saved_frames_[quic::QuicPacketNumber(it)]) {
-      frames_.push_back(frame);
+      frame_count++;
+      if (retransmit_frame_count == 0 ||
+          frame_count <= retransmit_frame_count) {
+        if (!MaybeCoalesceStreamFrame(frame)) {
+          frames_.push_back(frame);
+        }
+      }
     }
   }
 
@@ -528,7 +543,9 @@
   AddQuicAckFrame(first_received, largest_received, smallest_received);
   for (auto it : original_packet_numbers) {
     for (auto frame : saved_frames_[quic::QuicPacketNumber(it)]) {
-      frames_.push_back(frame);
+      if (!MaybeCoalesceStreamFrame(frame)) {
+        frames_.push_back(frame);
+      }
     }
   }
 
@@ -545,7 +562,9 @@
   for (auto it : original_packet_numbers) {
     for (auto& frame : CloneFrames(saved_frames_[quic::QuicPacketNumber(it)])) {
       if (frame.type != quic::PADDING_FRAME) {
-        frames_.push_back(frame);
+        if (!MaybeCoalesceStreamFrame(frame)) {
+          frames_.push_back(frame);
+        }
       }
     }
   }
@@ -758,7 +777,9 @@
   AddQuicAckFrame(largest_received, smallest_received);
   for (auto it : original_packet_numbers) {
     for (auto frame : saved_frames_[quic::QuicPacketNumber(it)]) {
-      frames_.push_back(frame);
+      if (!MaybeCoalesceStreamFrame(frame)) {
+        frames_.push_back(frame);
+      }
     }
   }
   AddQuicStreamFrame(stream_id, fin, data);
@@ -772,7 +793,7 @@
     quic::QuicStreamId stream_id,
     bool should_include_version,
     bool fin,
-    spdy::SpdyPriority priority,
+    spdy::SpdyPriority spdy_priority,
     spdy::Http2HeaderBlock headers,
     quic::QuicStreamId parent_stream_id,
     size_t* spdy_headers_frame_length,
@@ -782,9 +803,9 @@
   if (quic::VersionUsesHttp3(version_.transport_version)) {
     MaybeAddHttp3SettingsFrames();
 
-    if (priority != quic::QuicStreamPriority::kDefaultUrgency) {
-      std::string priority_data =
-          GenerateHttp3PriorityData(priority, stream_id);
+    std::string priority_data =
+        GenerateHttp3PriorityData(spdy_priority, stream_id);
+    if (!priority_data.empty()) {
       AddQuicStreamFrame(2, false, priority_data);
     }
 
@@ -799,7 +820,7 @@
   }
 
   spdy::SpdySerializedFrame spdy_frame =
-      MakeSpdyHeadersFrame(stream_id, fin && data_writes.empty(), priority,
+      MakeSpdyHeadersFrame(stream_id, fin && data_writes.empty(), spdy_priority,
                            std::move(headers), parent_stream_id);
   if (spdy_headers_frame_length) {
     *spdy_headers_frame_length = spdy_frame.size();
@@ -821,19 +842,22 @@
     quic::QuicStreamId stream_id,
     bool should_include_version,
     bool fin,
-    spdy::SpdyPriority priority,
+    spdy::SpdyPriority spdy_priority,
     spdy::Http2HeaderBlock headers,
     quic::QuicStreamId parent_stream_id,
-    size_t* spdy_headers_frame_length) {
+    size_t* spdy_headers_frame_length,
+    bool should_include_priority_frame) {
   InitializeHeader(packet_number, should_include_version);
 
   if (quic::VersionUsesHttp3(version_.transport_version)) {
     MaybeAddHttp3SettingsFrames();
 
-    if (priority != quic::QuicStreamPriority::kDefaultUrgency) {
+    if (should_include_priority_frame) {
       std::string priority_data =
-          GenerateHttp3PriorityData(priority, stream_id);
-      AddQuicStreamFrame(2, false, priority_data);
+          GenerateHttp3PriorityData(spdy_priority, stream_id);
+      if (!priority_data.empty()) {
+        AddQuicStreamFrame(2, false, priority_data);
+      }
     }
 
     std::string data = QpackEncodeHeaders(stream_id, std::move(headers),
@@ -844,7 +868,7 @@
   }
 
   spdy::SpdySerializedFrame spdy_frame = MakeSpdyHeadersFrame(
-      stream_id, fin, priority, std::move(headers), parent_stream_id);
+      stream_id, fin, spdy_priority, std::move(headers), parent_stream_id);
   if (spdy_headers_frame_length)
     *spdy_headers_frame_length = spdy_frame.size();
   AddQuicStreamFrame(GetHeadersStreamId(), false,
@@ -860,7 +884,7 @@
     quic::QuicStreamId stream_id,
     bool should_include_version,
     bool fin,
-    spdy::SpdyPriority priority,
+    spdy::SpdyPriority spdy_priority,
     spdy::Http2HeaderBlock headers,
     quic::QuicStreamId parent_stream_id,
     size_t* spdy_headers_frame_length) {
@@ -869,16 +893,18 @@
 
   for (auto it : original_packet_numbers) {
     for (auto frame : saved_frames_[quic::QuicPacketNumber(it)]) {
-      frames_.push_back(frame);
+      if (!MaybeCoalesceStreamFrame(frame)) {
+        frames_.push_back(frame);
+      }
     }
   }
 
   if (quic::VersionUsesHttp3(version_.transport_version)) {
     MaybeAddHttp3SettingsFrames();
 
-    if (priority != quic::QuicStreamPriority::kDefaultUrgency) {
-      std::string priority_data =
-          GenerateHttp3PriorityData(priority, stream_id);
+    std::string priority_data =
+        GenerateHttp3PriorityData(spdy_priority, stream_id);
+    if (!priority_data.empty()) {
       AddQuicStreamFrame(2, false, priority_data);
     }
 
@@ -890,7 +916,7 @@
   }
 
   spdy::SpdySerializedFrame spdy_frame = MakeSpdyHeadersFrame(
-      stream_id, fin, priority, std::move(headers), parent_stream_id);
+      stream_id, fin, spdy_priority, std::move(headers), parent_stream_id);
   if (spdy_headers_frame_length)
     *spdy_headers_frame_length = spdy_frame.size();
   AddQuicStreamFrame(GetHeadersStreamId(), false,
@@ -905,7 +931,7 @@
     quic::QuicStreamId stream_id,
     bool should_include_version,
     bool fin,
-    spdy::SpdyPriority priority,
+    spdy::SpdyPriority spdy_priority,
     spdy::Http2HeaderBlock headers,
     quic::QuicStreamId parent_stream_id,
     size_t* spdy_headers_frame_length,
@@ -915,9 +941,9 @@
   if (quic::VersionUsesHttp3(version_.transport_version)) {
     MaybeAddHttp3SettingsFrames();
 
-    if (priority != quic::QuicStreamPriority::kDefaultUrgency) {
-      std::string priority_data =
-          GenerateHttp3PriorityData(priority, stream_id);
+    std::string priority_data =
+        GenerateHttp3PriorityData(spdy_priority, stream_id);
+    if (!priority_data.empty()) {
       AddQuicStreamFrame(2, false, priority_data);
     }
 
@@ -931,7 +957,7 @@
   }
 
   spdy::SpdySerializedFrame spdy_frame = MakeSpdyHeadersFrame(
-      stream_id, fin, priority, std::move(headers), parent_stream_id);
+      stream_id, fin, spdy_priority, std::move(headers), parent_stream_id);
   if (spdy_headers_frame_length) {
     *spdy_headers_frame_length = spdy_frame.size();
   }
@@ -1033,13 +1059,13 @@
                                         bool should_include_version,
                                         quic::QuicStreamId id,
                                         quic::QuicStreamId parent_stream_id,
-                                        spdy::SpdyPriority priority) {
+                                        spdy::SpdyPriority spdy_priority) {
   InitializeHeader(packet_number, should_include_version);
 
   if (!client_headers_include_h2_stream_dependency_) {
     parent_stream_id = 0;
   }
-  int weight = spdy::Spdy3PriorityToHttp2Weight(priority);
+  int weight = spdy::Spdy3PriorityToHttp2Weight(spdy_priority);
   bool exclusive = client_headers_include_h2_stream_dependency_;
 
   if (!VersionUsesHttp3(version_.transport_version)) {
@@ -1052,8 +1078,8 @@
 
     return BuildPacket();
   }
-  if (priority != quic::QuicStreamPriority::kDefaultUrgency) {
-    std::string priority_data = GenerateHttp3PriorityData(priority, id);
+  std::string priority_data = GenerateHttp3PriorityData(spdy_priority, id);
+  if (!priority_data.empty()) {
     AddQuicStreamFrame(2, false, priority_data);
   }
 
@@ -1068,7 +1094,7 @@
     uint64_t smallest_received,
     quic::QuicStreamId id,
     quic::QuicStreamId parent_stream_id,
-    spdy::SpdyPriority priority) {
+    spdy::SpdyPriority spdy_priority) {
   InitializeHeader(packet_number, should_include_version);
 
   AddQuicAckFrame(largest_received, smallest_received);
@@ -1076,7 +1102,7 @@
   if (!client_headers_include_h2_stream_dependency_) {
     parent_stream_id = 0;
   }
-  int weight = spdy::Spdy3PriorityToHttp2Weight(priority);
+  int weight = spdy::Spdy3PriorityToHttp2Weight(spdy_priority);
   bool exclusive = client_headers_include_h2_stream_dependency_;
 
   if (!VersionUsesHttp3(version_.transport_version)) {
@@ -1089,8 +1115,8 @@
 
     return BuildPacket();
   }
-  if (priority != quic::QuicStreamPriority::kDefaultUrgency) {
-    std::string priority_data = GenerateHttp3PriorityData(priority, id);
+  std::string priority_data = GenerateHttp3PriorityData(spdy_priority, id);
+  if (!priority_data.empty()) {
     AddQuicStreamFrame(2, false, priority_data);
   }
 
@@ -1104,13 +1130,15 @@
     uint64_t largest_received,
     uint64_t smallest_received,
     quic::QuicStreamId id,
-    spdy::SpdyPriority priority) {
+    spdy::SpdyPriority spdy_priority) {
   InitializeHeader(packet_number, should_include_version);
 
   AddQuicAckFrame(largest_received, smallest_received);
 
-  std::string priority_data = GenerateHttp3PriorityData(priority, id);
-  AddQuicStreamFrame(2, false, priority_data);
+  std::string priority_data = GenerateHttp3PriorityData(spdy_priority, id);
+  if (!priority_data.empty()) {
+    AddQuicStreamFrame(2, false, priority_data);
+  }
 
   return BuildPacket();
 }
@@ -1574,12 +1602,12 @@
 spdy::SpdySerializedFrame QuicTestPacketMaker::MakeSpdyHeadersFrame(
     quic::QuicStreamId stream_id,
     bool fin,
-    spdy::SpdyPriority priority,
+    spdy::SpdyPriority spdy_priority,
     spdy::Http2HeaderBlock headers,
     quic::QuicStreamId parent_stream_id) {
   spdy::SpdyHeadersIR headers_frame(stream_id, std::move(headers));
   headers_frame.set_fin(fin);
-  headers_frame.set_weight(spdy::Spdy3PriorityToHttp2Weight(priority));
+  headers_frame.set_weight(spdy::Spdy3PriorityToHttp2Weight(spdy_priority));
   headers_frame.set_has_priority(true);
 
   if (client_headers_include_h2_stream_dependency_) {
@@ -1666,13 +1694,31 @@
 }
 
 std::string QuicTestPacketMaker::GenerateHttp3PriorityData(
-    spdy::SpdyPriority priority,
+    spdy::SpdyPriority spdy_priority,
     quic::QuicStreamId stream_id) {
+  std::string priority_data;
   quic::PriorityUpdateFrame priority_update;
-  priority_update.prioritized_element_id = stream_id;
-  priority_update.priority_field_value =
-      base::StrCat({"u=", base::NumberToString(priority)});
-  return quic::HttpEncoder::SerializePriorityUpdateFrame(priority_update);
+  quic::QuicStreamPriority priority{
+      spdy_priority, quic::QuicStreamPriority::kDefaultIncremental};
+  if (client_priority_uses_incremental_ &&
+      base::FeatureList::IsEnabled(features::kPriorityIncremental)) {
+    priority.incremental = kDefaultPriorityIncremental;
+  }
+
+  if (priority.urgency != quic::QuicStreamPriority::kDefaultUrgency ||
+      priority.incremental != quic::QuicStreamPriority::kDefaultIncremental) {
+    priority_update.priority_field_value =
+        quic::SerializePriorityFieldValue(priority);
+  }
+
+  // Only generate a frame if a non-empty string was generated.
+  if (!priority_update.priority_field_value.empty()) {
+    priority_update.prioritized_element_id = stream_id;
+    priority_data =
+        quic::HttpEncoder::SerializePriorityUpdateFrame(priority_update);
+  }
+
+  return priority_data;
 }
 
 std::string QuicTestPacketMaker::GenerateHttp3GreaseData() {
@@ -1702,4 +1748,40 @@
   AddQuicStreamFrame(stream_id, false, data);
 }
 
+bool QuicTestPacketMaker::MaybeCoalesceStreamFrame(
+    const quic::QuicFrame& frame) {
+  if (frames_.empty()) {
+    return false;
+  }
+  if (frame.type != quic::STREAM_FRAME ||
+      frames_.back().type != quic::STREAM_FRAME) {
+    return false;
+  }
+
+  // Make sure they are congruent data segments in the stream.
+  const quic::QuicStreamFrame* new_frame = &frame.stream_frame;
+  quic::QuicStreamFrame* previous_frame = &frames_.back().stream_frame;
+  if (new_frame->stream_id != previous_frame->stream_id ||
+      new_frame->offset !=
+          previous_frame->offset + previous_frame->data_length) {
+    return false;
+  }
+
+  // Extend the data buffer to include the data from both frames (into a copy
+  // buffer). This doesn't attempt to limit coalescing to a particular packet
+  // size limit and may need to be updated if a test comes along that
+  // retransmits enough stream data to span multiple packets.
+  std::string data(previous_frame->data_buffer, previous_frame->data_length);
+  data += std::string(new_frame->data_buffer, new_frame->data_length);
+  saved_stream_data_.push_back(std::make_unique<std::string>(data));
+  absl::string_view saved_data = *saved_stream_data_.back();
+  previous_frame->data_buffer = saved_data.data();
+  previous_frame->data_length = saved_data.length();
+
+  // Copy the fin state from the last frame.
+  previous_frame->fin = new_frame->fin;
+
+  return true;
+}
+
 }  // namespace net::test

net/quic/quic_test_packet_maker.h

diff --git a/net/quic/quic_test_packet_maker.h b/net/quic/quic_test_packet_maker.h
index 33603fc9..d1601c8 100644
--- a/net/quic/quic_test_packet_maker.h
+++ b/net/quic/quic_test_packet_maker.h
@@ -44,12 +44,18 @@
   // stream id set to the |parent_stream_id| param of MakeRequestHeaders...().
   // Otherwise, headers are constructed with the exclusive flag set to false and
   // the parent stream ID set to 0 (ignoring the |parent_stream_id| param).
+  //
+  // |client_priority_uses_incremental| affects the output of any method that
+  // includes HTTP3 priority data. The protocol default is to omit the
+  // incremental flag in the priority data but HTTP streams may enable it
+  // if the feature kPriorityIncremental is enabled.
   QuicTestPacketMaker(quic::ParsedQuicVersion version,
                       quic::QuicConnectionId connection_id,
                       const quic::QuicClock* clock,
                       const std::string& host,
                       quic::Perspective perspective,
-                      bool client_headers_include_h2_stream_dependency);
+                      bool client_headers_include_h2_stream_dependency,
+                      bool client_priority_uses_incremental = false);
 
   QuicTestPacketMaker(const QuicTestPacketMaker&) = delete;
   QuicTestPacketMaker& operator=(const QuicTestPacketMaker&) = delete;
@@ -154,7 +160,8 @@
       quic::QuicStreamId rst_stream_id,
       quic::QuicRstStreamErrorCode rst_error_code,
       quic::QuicStreamId data_stream_id,
-      absl::string_view data);
+      absl::string_view data,
+      uint64_t retransmit_frame_count = 0);
 
   std::unique_ptr<quic::QuicReceivedPacket> MakeDataAndRstPacket(
       uint64_t num,
@@ -355,7 +362,7 @@
       quic::QuicStreamId stream_id,
       bool should_include_version,
       bool fin,
-      spdy::SpdyPriority priority,
+      spdy::SpdyPriority spdy_priority,
       spdy::Http2HeaderBlock headers,
       quic::QuicStreamId parent_stream_id,
       size_t* spdy_headers_frame_length,
@@ -368,10 +375,11 @@
       quic::QuicStreamId stream_id,
       bool should_include_version,
       bool fin,
-      spdy::SpdyPriority priority,
+      spdy::SpdyPriority spdy_priority,
       spdy::Http2HeaderBlock headers,
       quic::QuicStreamId parent_stream_id,
-      size_t* spdy_headers_frame_length);
+      size_t* spdy_headers_frame_length,
+      bool should_include_priority_frame = true);
 
   std::unique_ptr<quic::QuicReceivedPacket>
   MakeRetransmissionAndRequestHeadersPacket(
@@ -380,7 +388,7 @@
       quic::QuicStreamId stream_id,
       bool should_include_version,
       bool fin,
-      spdy::SpdyPriority priority,
+      spdy::SpdyPriority spdy_priority,
       spdy::Http2HeaderBlock headers,
       quic::QuicStreamId parent_stream_id,
       size_t* spdy_headers_frame_length);
@@ -390,7 +398,7 @@
       quic::QuicStreamId stream_id,
       bool should_include_version,
       bool fin,
-      spdy::SpdyPriority priority,
+      spdy::SpdyPriority spdy_priority,
       spdy::Http2HeaderBlock headers,
       quic::QuicStreamId parent_stream_id,
       size_t* spdy_headers_frame_length,
@@ -427,7 +435,7 @@
       bool should_include_version,
       quic::QuicStreamId id,
       quic::QuicStreamId parent_stream_id,
-      spdy::SpdyPriority priority);
+      spdy::SpdyPriority spdy_priority);
 
   std::unique_ptr<quic::QuicReceivedPacket> MakeAckAndPriorityPacket(
       uint64_t packet_number,
@@ -436,7 +444,7 @@
       uint64_t smallest_received,
       quic::QuicStreamId id,
       quic::QuicStreamId parent_stream_id,
-      spdy::SpdyPriority priority);
+      spdy::SpdyPriority spdy_priority);
 
   std::unique_ptr<quic::QuicReceivedPacket> MakeMultiplePriorityFramesPacket(
       uint64_t packet_number,
@@ -467,7 +475,7 @@
       uint64_t largest_received,
       uint64_t smallest_received,
       quic::QuicStreamId id,
-      spdy::SpdyPriority priority);
+      spdy::SpdyPriority spdy_priority);
 
   std::unique_ptr<quic::QuicEncryptedPacket> MakeStatelessResetPacket();
 
@@ -565,7 +573,7 @@
   spdy::SpdySerializedFrame MakeSpdyHeadersFrame(
       quic::QuicStreamId stream_id,
       bool fin,
-      spdy::SpdyPriority priority,
+      spdy::SpdyPriority spdy_priority,
       spdy::Http2HeaderBlock headers,
       quic::QuicStreamId parent_stream_id);
 
@@ -583,11 +591,12 @@
   quic::QuicStreamId GetHeadersStreamId() const;
 
   std::string GenerateHttp3SettingsData();
-  std::string GenerateHttp3PriorityData(spdy::SpdyPriority priority,
+  std::string GenerateHttp3PriorityData(spdy::SpdyPriority spdy_priority,
                                         quic::QuicStreamId stream_id);
   std::string GenerateHttp3GreaseData();
 
   void MaybeAddHttp3SettingsFrames();
+  bool MaybeCoalesceStreamFrame(const quic::QuicFrame& frame);
 
   // Parameters used throughout the lifetime of the class.
   quic::ParsedQuicVersion version_;
@@ -608,6 +617,9 @@
   // dependency info.
   bool client_headers_include_h2_stream_dependency_;
 
+  // The value of incremental flag in generated priority headers.
+  bool client_priority_uses_incremental_;
+
   // Save a copy of stream frame data that QuicStreamFrame objects can refer to.
   std::vector<std::unique_ptr<std::string>> saved_stream_data_;
   // If |save_packet_frames_| is true, save generated packets in

net/url_request/url_request.cc

diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index b2afb59..aabc621 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -1029,6 +1029,10 @@
     job_->SetPriority(priority_);
 }
 
+void URLRequest::SetPriorityIncremental(bool priority_incremental) {
+  priority_incremental_ = priority_incremental;
+}
+
 void URLRequest::NotifyAuthRequired(
     std::unique_ptr<AuthChallengeInfo> auth_info) {
   DCHECK_EQ(OK, status_);

net/url_request/url_request.h

diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index 1c4839b..7f922da 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -697,11 +697,17 @@
   // Returns the priority level for this request.
   RequestPriority priority() const { return priority_; }
 
+  // Returns the incremental loading priority flag for this request.
+  bool priority_incremental() const { return priority_incremental_; }
+
   // Sets the priority level for this request and any related
   // jobs. Must not change the priority to anything other than
   // MAXIMUM_PRIORITY if the IGNORE_LIMITS load flag is set.
   void SetPriority(RequestPriority priority);
 
+  // Sets the incremental priority flag for this request.
+  void SetPriorityIncremental(bool priority_incremental);
+
   void set_received_response_content_length(int64_t received_content_length) {
     received_response_content_length_ = received_content_length;
   }
@@ -1019,6 +1025,12 @@
   // allocate sockets to first.
   RequestPriority priority_;
 
+  // The incremental flag for this request that indicates if it should be
+  // loaded concurrently with other resources of the same priority for
+  // protocols that support HTTP extensible priorities (RFC 9218).
+  // Currently only used in HTTP/3.
+  bool priority_incremental_ = kDefaultPriorityIncremental;
+
   // If |calling_delegate_| is true, the event type of the delegate being
   // called.
   NetLogEventType delegate_event_type_ = NetLogEventType::FAILED;

net/url_request/url_request_http_job.cc

diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index 94369e2..7350c89 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -265,6 +265,7 @@
       request_->isolation_info().request_type() ==
       net::IsolationInfo::RequestType::kSubFrame;
   request_info_.load_flags = request_->load_flags();
+  request_info_.priority_incremental = request_->priority_incremental();
   request_info_.secure_dns_policy = request_->secure_dns_policy();
   request_info_.traffic_annotation =
       net::MutableNetworkTrafficAnnotationTag(request_->traffic_annotation());
@@ -414,7 +415,8 @@
   if (request_->network_delegate()) {
     privacy_setting = request()->network_delegate()->ForcePrivacyMode(
         request_->url(), request_->site_for_cookies(),
-        request_->isolation_info().top_frame_origin());
+        request_->isolation_info().top_frame_origin(),
+        GetCookieSettingOverrides());
   }
   switch (privacy_setting) {
     case NetworkDelegate::PrivacySetting::kStateAllowed:
@@ -804,8 +806,8 @@
   if (request()->network_delegate()) {
     can_get_cookies =
         request()->network_delegate()->AnnotateAndMoveUserBlockedCookies(
-            *request(), first_party_set_metadata_, maybe_included_cookies,
-            excluded_cookies);
+            *request(), first_party_set_metadata_, GetCookieSettingOverrides(),
+            maybe_included_cookies, excluded_cookies);
   }
 
   if (!can_get_cookies) {
@@ -1714,4 +1716,8 @@
   return cookie_partition_key_.value().has_value();
 }
 
+CookieSettingOverrides URLRequestHttpJob::GetCookieSettingOverrides() const {
+  return CookieSettingOverrides();
+}
+
 }  // namespace net

net/url_request/url_request_http_job.h

diff --git a/net/url_request/url_request_http_job.h b/net/url_request/url_request_http_job.h
index 0d6c64d..9f99f7f 100644
--- a/net/url_request/url_request_http_job.h
+++ b/net/url_request/url_request_http_job.h
@@ -230,6 +230,10 @@
   // set.
   bool IsPartitionedCookiesEnabled() const;
 
+  // Creates the CookieSettingOverrides that should be used when accessing any
+  // cookies for this request job.
+  CookieSettingOverrides GetCookieSettingOverrides() const;
+
   RequestPriority priority_ = DEFAULT_PRIORITY;
 
   HttpRequestInfo request_info_;

net/url_request/url_request_test_util.cc

diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index b57ffbad..8ed5b3d 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -498,6 +498,7 @@
 bool TestNetworkDelegate::OnAnnotateAndMoveUserBlockedCookies(
     const URLRequest& request,
     const net::FirstPartySetMetadata& first_party_set_metadata,
+    CookieSettingOverrides overrides,
     net::CookieAccessResultList& maybe_included_cookies,
     net::CookieAccessResultList& excluded_cookies) {
   bool allow = true;
@@ -516,7 +517,8 @@
 NetworkDelegate::PrivacySetting TestNetworkDelegate::OnForcePrivacyMode(
     const GURL& url,
     const SiteForCookies& site_for_cookies,
-    const absl::optional<url::Origin>& top_frame_origin) const {
+    const absl::optional<url::Origin>& top_frame_origin,
+    CookieSettingOverrides overrides) const {
   return NetworkDelegate::PrivacySetting::kStateAllowed;
 }
 
@@ -587,7 +589,8 @@
 FilteringTestNetworkDelegate::OnForcePrivacyMode(
     const GURL& url,
     const SiteForCookies& site_for_cookies,
-    const absl::optional<url::Origin>& top_frame_origin) const {
+    const absl::optional<url::Origin>& top_frame_origin,
+    CookieSettingOverrides overrides) const {
   if (force_privacy_mode_) {
     return partitioned_state_allowed_
                ? NetworkDelegate::PrivacySetting::kPartitionedStateAllowedOnly
@@ -595,12 +598,13 @@
   }
 
   return TestNetworkDelegate::OnForcePrivacyMode(url, site_for_cookies,
-                                                 top_frame_origin);
+                                                 top_frame_origin, overrides);
 }
 
 bool FilteringTestNetworkDelegate::OnAnnotateAndMoveUserBlockedCookies(
     const URLRequest& request,
     const net::FirstPartySetMetadata& first_party_set_metadata,
+    CookieSettingOverrides overrides,
     net::CookieAccessResultList& maybe_included_cookies,
     net::CookieAccessResultList& excluded_cookies) {
   // Filter out cookies if |block_annotate_cookies_| is set and
@@ -634,8 +638,8 @@
 
   // Call the nested delegate's method first to avoid a short circuit.
   return TestNetworkDelegate::OnAnnotateAndMoveUserBlockedCookies(
-             request, first_party_set_metadata, maybe_included_cookies,
-             excluded_cookies) &&
+             request, first_party_set_metadata, overrides,
+             maybe_included_cookies, excluded_cookies) &&
          allowed;
 }
 

net/url_request/url_request_test_util.h

diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h
index 8ab585f..dbdccf0 100644
--- a/net/url_request/url_request_test_util.h
+++ b/net/url_request/url_request_test_util.h
@@ -30,6 +30,7 @@
 #include "net/cert/cert_verifier.h"
 #include "net/cert/ct_policy_enforcer.h"
 #include "net/cookies/cookie_monster.h"
+#include "net/cookies/cookie_setting_override.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/first_party_sets/first_party_set_metadata.h"
 #include "net/first_party_sets/first_party_sets_cache_filter.h"
@@ -315,12 +316,14 @@
   bool OnAnnotateAndMoveUserBlockedCookies(
       const URLRequest& request,
       const net::FirstPartySetMetadata& first_party_set_metadata,
+      CookieSettingOverrides overrides,
       net::CookieAccessResultList& maybe_included_cookies,
       net::CookieAccessResultList& excluded_cookies) override;
   NetworkDelegate::PrivacySetting OnForcePrivacyMode(
       const GURL& url,
       const SiteForCookies& site_for_cookies,
-      const absl::optional<url::Origin>& top_frame_origin) const override;
+      const absl::optional<url::Origin>& top_frame_origin,
+      CookieSettingOverrides overrides) const override;
   bool OnCanSetCookie(const URLRequest& request,
                       const net::CanonicalCookie& cookie,
                       CookieOptions* options) override;
@@ -406,13 +409,15 @@
   bool OnAnnotateAndMoveUserBlockedCookies(
       const URLRequest& request,
       const net::FirstPartySetMetadata& first_party_set_metadata,
+      CookieSettingOverrides overrides,
       net::CookieAccessResultList& maybe_included_cookies,
       net::CookieAccessResultList& excluded_cookies) override;
 
   NetworkDelegate::PrivacySetting OnForcePrivacyMode(
       const GURL& url,
       const SiteForCookies& site_for_cookies,
-      const absl::optional<url::Origin>& top_frame_origin) const override;
+      const absl::optional<url::Origin>& top_frame_origin,
+      CookieSettingOverrides overrides) const override;
 
   void set_block_annotate_cookies() { block_annotate_cookies_ = true; }
 

printing/backend/BUILD.gn

diff --git a/printing/backend/BUILD.gn b/printing/backend/BUILD.gn
index dca492d4..a249daa 100644
--- a/printing/backend/BUILD.gn
+++ b/printing/backend/BUILD.gn
@@ -155,11 +155,19 @@
     "test_print_backend.h",
   ]
 
+  if (use_cups) {
+    sources += [
+      "mock_cups_printer.cc",
+      "mock_cups_printer.h",
+    ]
+  }
+
   deps = [
     ":backend",
     "//base",
     "//printing/backend/mojom",
     "//printing/mojom",
+    "//testing/gmock",
     "//ui/gfx/geometry",
   ]
 }

printing/backend/mock_cups_printer.cc

diff --git a/printing/backend/mock_cups_printer.cc b/printing/backend/mock_cups_printer.cc
new file mode 100644
index 0000000..8b5e190
--- /dev/null
+++ b/printing/backend/mock_cups_printer.cc
@@ -0,0 +1,12 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "printing/backend/mock_cups_printer.h"
+
+namespace printing {
+
+MockCupsPrinter::MockCupsPrinter() = default;
+MockCupsPrinter::~MockCupsPrinter() = default;
+
+}  // namespace printing

printing/backend/mock_cups_printer.h

diff --git a/printing/backend/mock_cups_printer.h b/printing/backend/mock_cups_printer.h
new file mode 100644
index 0000000..38b4edc3
--- /dev/null
+++ b/printing/backend/mock_cups_printer.h
@@ -0,0 +1,56 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef PRINTING_BACKEND_MOCK_CUPS_PRINTER_H_
+#define PRINTING_BACKEND_MOCK_CUPS_PRINTER_H_
+
+#include "printing/backend/cups_printer.h"
+#include "testing/gmock/include/gmock/gmock.h"
+
+namespace printing {
+
+// A mock `CupsPrinter` used for testing.
+class MockCupsPrinter : public CupsPrinter {
+ public:
+  MockCupsPrinter();
+  ~MockCupsPrinter() override;
+
+  MOCK_CONST_METHOD0(is_default, bool());
+  MOCK_CONST_METHOD0(GetName, std::string());
+  MOCK_CONST_METHOD0(GetMakeAndModel, std::string());
+  MOCK_CONST_METHOD0(GetInfo, std::string());
+  MOCK_CONST_METHOD0(GetUri, std::string());
+  MOCK_CONST_METHOD0(EnsureDestInfo, bool());
+  MOCK_CONST_METHOD1(ToPrinterInfo, bool(PrinterBasicInfo* basic_info));
+  MOCK_METHOD4(CreateJob,
+               ipp_status_t(int* job_id,
+                            const std::string& title,
+                            const std::string& username,
+                            const std::vector<cups_option_t>& options));
+  MOCK_METHOD5(StartDocument,
+               bool(int job_id,
+                    const std::string& docname,
+                    bool last_doc,
+                    const std::string& username,
+                    const std::vector<cups_option_t>& options));
+  MOCK_METHOD1(StreamData, bool(const std::vector<char>& buffer));
+  MOCK_METHOD0(FinishDocument, bool());
+  MOCK_METHOD2(CloseJob, ipp_status_t(int job_id, const std::string& username));
+  MOCK_METHOD1(CancelJob, bool(int job_id));
+  MOCK_METHOD1(GetMediaMarginsByName,
+               CupsMediaMargins(const std::string& media_id));
+
+  MOCK_CONST_METHOD1(GetSupportedOptionValues,
+                     ipp_attribute_t*(const char* option_name));
+  MOCK_CONST_METHOD1(GetSupportedOptionValueStrings,
+                     std::vector<base::StringPiece>(const char* option_name));
+  MOCK_CONST_METHOD1(GetDefaultOptionValue,
+                     ipp_attribute_t*(const char* option_name));
+  MOCK_CONST_METHOD2(CheckOptionSupported,
+                     bool(const char* name, const char* value));
+};
+
+}  // namespace printing
+
+#endif  // PRINTING_BACKEND_MOCK_CUPS_PRINTER_H_

printing/printing_context_chromeos_unittest.cc

diff --git a/printing/printing_context_chromeos_unittest.cc b/printing/printing_context_chromeos_unittest.cc
index 670b412..a6e1346 100644
--- a/printing/printing_context_chromeos_unittest.cc
+++ b/printing/printing_context_chromeos_unittest.cc
@@ -10,6 +10,7 @@
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "printing/backend/cups_ipp_constants.h"
+#include "printing/backend/mock_cups_printer.h"
 #include "printing/mojom/print.mojom.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -34,43 +35,6 @@
 constexpr char kDocumentName[] = "document name";
 constexpr char16_t kDocumentName16[] = u"document name";
 
-class MockCupsPrinter : public CupsPrinter {
- public:
-  MOCK_CONST_METHOD0(is_default, bool());
-  MOCK_CONST_METHOD0(GetName, std::string());
-  MOCK_CONST_METHOD0(GetMakeAndModel, std::string());
-  MOCK_CONST_METHOD0(GetInfo, std::string());
-  MOCK_CONST_METHOD0(GetUri, std::string());
-  MOCK_CONST_METHOD0(EnsureDestInfo, bool());
-  MOCK_CONST_METHOD1(ToPrinterInfo, bool(PrinterBasicInfo* basic_info));
-  MOCK_METHOD4(CreateJob,
-               ipp_status_t(int* job_id,
-                            const std::string& title,
-                            const std::string& username,
-                            const std::vector<cups_option_t>& options));
-  MOCK_METHOD5(StartDocument,
-               bool(int job_id,
-                    const std::string& docname,
-                    bool last_doc,
-                    const std::string& username,
-                    const std::vector<cups_option_t>& options));
-  MOCK_METHOD1(StreamData, bool(const std::vector<char>& buffer));
-  MOCK_METHOD0(FinishDocument, bool());
-  MOCK_METHOD2(CloseJob, ipp_status_t(int job_id, const std::string& username));
-  MOCK_METHOD1(CancelJob, bool(int job_id));
-  MOCK_METHOD1(GetMediaMarginsByName,
-               CupsMediaMargins(const std::string& media_id));
-
-  MOCK_CONST_METHOD1(GetSupportedOptionValues,
-                     ipp_attribute_t*(const char* option_name));
-  MOCK_CONST_METHOD1(GetSupportedOptionValueStrings,
-                     std::vector<base::StringPiece>(const char* option_name));
-  MOCK_CONST_METHOD1(GetDefaultOptionValue,
-                     ipp_attribute_t*(const char* option_name));
-  MOCK_CONST_METHOD2(CheckOptionSupported,
-                     bool(const char* name, const char* value));
-};
-
 class MockCupsConnection : public CupsConnection {
  public:
   MOCK_METHOD1(GetDests, bool(std::vector<std::unique_ptr<CupsPrinter>>&));

remoting/host/chromeos/remote_support_host_ash.cc

diff --git a/remoting/host/chromeos/remote_support_host_ash.cc b/remoting/host/chromeos/remote_support_host_ash.cc
index cdc98c1..5d9e399c 100644
--- a/remoting/host/chromeos/remote_support_host_ash.cc
+++ b/remoting/host/chromeos/remote_support_host_ash.cc
@@ -58,7 +58,8 @@
 // static
 mojom::SupportHostDetailsPtr RemoteSupportHostAsh::GetHostDetails() {
   return mojom::SupportHostDetails::New(
-      STRINGIZE(VERSION), std::vector<std::string>({kFeatureAccessTokenAuth}));
+      STRINGIZE(VERSION), std::vector<std::string>({kFeatureAccessTokenAuth,
+                                                    kFeatureAuthorizedHelper}));
 }
 
 void RemoteSupportHostAsh::OnSessionDisconnected() {

remoting/host/it2me/BUILD.gn

diff --git a/remoting/host/it2me/BUILD.gn b/remoting/host/it2me/BUILD.gn
index 4e18dc1b..bff6265 100644
--- a/remoting/host/it2me/BUILD.gn
+++ b/remoting/host/it2me/BUILD.gn
@@ -84,6 +84,7 @@
     "//components/policy:policy_code_generate",
     "//components/webrtc:thread_wrapper",
     "//extensions/browser/api/messaging:native_messaging",
+    "//google_apis:google_apis",
     "//mojo/core/embedder",
     "//net",
     "//remoting/base",
@@ -147,6 +148,7 @@
         "//chromeos/crosapi/mojom",
         "//chromeos/lacros",
         "//extensions/browser/api/messaging:native_messaging",
+        "//google_apis:google_apis",
         "//remoting/host/native_messaging",
         "//remoting/protocol:errors",
       ]

remoting/host/it2me/it2me_constants.cc

diff --git a/remoting/host/it2me/it2me_constants.cc b/remoting/host/it2me/it2me_constants.cc
index 80d14e91..48e9b6b 100644
--- a/remoting/host/it2me/it2me_constants.cc
+++ b/remoting/host/it2me/it2me_constants.cc
@@ -8,6 +8,7 @@
 
 const char kFeatureAccessTokenAuth[] = "accessTokenAuth";
 const char kFeatureDelegatedSignaling[] = "delegatedSignaling";
+const char kFeatureAuthorizedHelper[] = "authorizedHelper";
 
 const char kConnectMessage[] = "connect";
 const char kUserName[] = "userName";
@@ -22,6 +23,7 @@
 const char kUseElevatedHost[] = "useElevatedHost";
 const char kUseSignalingProxy[] = "useSignalingProxy";
 const char kIceConfig[] = "iceConfig";
+const char kAuthorizedHelper[] = "authorizedHelper";
 const char kConnectResponse[] = "connectResponse";
 
 const char kHostStateChangedMessage[] = "hostStateChanged";

remoting/host/it2me/it2me_constants.h

diff --git a/remoting/host/it2me/it2me_constants.h b/remoting/host/it2me/it2me_constants.h
index acb07903..3c1bc4c 100644
--- a/remoting/host/it2me/it2me_constants.h
+++ b/remoting/host/it2me/it2me_constants.h
@@ -30,6 +30,9 @@
 // to act as a signaling proxy).
 extern const char kFeatureDelegatedSignaling[];
 
+// Indicates that the host supports setting an authorized helper.
+extern const char kFeatureAuthorizedHelper[];
+
 // Sent from the client to the host to begin the connection process.
 extern const char kConnectMessage[];
 // Connect message parameters.
@@ -45,6 +48,7 @@
 extern const char kUseElevatedHost[];
 extern const char kUseSignalingProxy[];
 extern const char kIceConfig[];
+extern const char kAuthorizedHelper[];
 // Response sent back to the client after the Connect message has been handled.
 extern const char kConnectResponse[];
 

remoting/host/it2me/it2me_host.cc

diff --git a/remoting/host/it2me/it2me_host.cc b/remoting/host/it2me/it2me_host.cc
index 60f00b6..80fbf8a 100644
--- a/remoting/host/it2me/it2me_host.cc
+++ b/remoting/host/it2me/it2me_host.cc
@@ -17,6 +17,7 @@
 #include "build/chromeos_buildflags.h"
 #include "components/policy/policy_constants.h"
 #include "components/webrtc/thread_wrapper.h"
+#include "google_apis/gaia/gaia_auth_util.h"
 #include "remoting/base/auto_thread_task_runner.h"
 #include "remoting/base/logging.h"
 #include "remoting/base/oauth_token_getter.h"
@@ -122,6 +123,10 @@
 #endif
 }
 
+void It2MeHost::set_authorized_helper(const std::string& authorized_helper) {
+  authorized_helper_ = authorized_helper;
+}
+
 void It2MeHost::Connect(
     std::unique_ptr<ChromotingHostContext> host_context,
     base::Value::Dict policies,
@@ -223,7 +228,7 @@
   // Request registration of the host for support.
   register_request_ = std::move(connection_context->register_request);
   register_request_->StartRequest(
-      signal_strategy_.get(), host_key_pair_,
+      signal_strategy_.get(), host_key_pair_, authorized_helper_,
       base::BindOnce(&It2MeHost::OnReceivedSupportID, base::Unretained(this)));
 
   HOST_LOG << "NAT traversal enabled: " << nat_traversal_enabled_;
@@ -694,6 +699,17 @@
     }
   }
 
+  if (!authorized_helper_.empty() &&
+      !gaia::AreEmailsSame(authorized_helper_, client_username)) {
+    LOG(ERROR) << "Rejecting connection request from (" << client_username
+               << ") as it does not match the authorized_helper ("
+               << authorized_helper_ << ")";
+    std::move(result_callback)
+        .Run(ValidationResult::ERROR_UNAUTHORIZED_ACCOUNT);
+    DisconnectOnNetworkThread();
+    return;
+  }
+
   // If we receive valid connection details multiple times, then we don't know
   // which remote user (if either) is valid so disconnect everyone.
   if (state_ != It2MeHostState::kReceivedAccessCode) {

remoting/host/it2me/it2me_host.h

diff --git a/remoting/host/it2me/it2me_host.h b/remoting/host/it2me/it2me_host.h
index e40cebaa..c735879 100644
--- a/remoting/host/it2me/it2me_host.h
+++ b/remoting/host/it2me/it2me_host.h
@@ -109,6 +109,10 @@
   void set_is_enterprise_session(bool is_enterprise_session);
   bool is_enterprise_session() const { return is_enterprise_session_; }
 
+  // If set, only |authorized_helper| will be allowed to connect to this host.
+  void set_authorized_helper(const std::string& authorized_helper);
+  const std::string& authorized_helper() const { return authorized_helper_; }
+
   // Creates It2Me host structures and starts the host.
   virtual void Connect(
       std::unique_ptr<ChromotingHostContext> context,
@@ -224,6 +228,11 @@
   // This is by administrators to connect to managed enterprise devices.
   bool is_enterprise_session_ = false;
 
+  // Only the username stored in |authorized_helper_| will be allowed to connect
+  // to this host instance, if set. Note: setting this value does not override
+  // any applicable Enterprise policies or other constraints.
+  std::string authorized_helper_;
+
   // The client and host domain policy setting.
   std::vector<std::string> required_client_domain_list_;
   std::vector<std::string> required_host_domain_list_;

remoting/host/it2me/it2me_host_unittest.cc

diff --git a/remoting/host/it2me/it2me_host_unittest.cc b/remoting/host/it2me/it2me_host_unittest.cc
index 46f8aae..c702baa 100644
--- a/remoting/host/it2me/it2me_host_unittest.cc
+++ b/remoting/host/it2me/it2me_host_unittest.cc
@@ -219,6 +219,7 @@
   absl::optional<bool> is_enterprise_session_;
   absl::optional<bool> terminate_upon_input_;
   absl::optional<bool> enable_curtaining_;
+  absl::optional<std::string> authorized_helper_;
 
   // Stores the last nat traversal policy value received.
   bool last_nat_traversal_enabled_value_ = false;
@@ -372,6 +373,10 @@
     // curtain_local_user_session should only be run on ChromeOS.
     it2me_host_->set_enable_curtaining(enable_curtaining_.value());
   }
+  if (authorized_helper_.has_value()) {
+    it2me_host_->set_authorized_helper(authorized_helper_.value());
+  }
+
   auto create_connection_context = base::BindOnce(
       [](std::unique_ptr<SignalStrategy> signal_strategy,
          ChromotingHostContext* host_context) {
@@ -756,6 +761,25 @@
   ASSERT_EQ(It2MeHostState::kDisconnected, last_host_state_);
 }
 
+TEST_F(It2MeHostTest, AuthorizedHelperCanConnect) {
+  authorized_helper_ = kTestUserName;
+  StartHost();
+  RunValidationCallback(kTestClientJid);
+  ASSERT_EQ(ValidationResult::SUCCESS, validation_result_);
+  ASSERT_EQ(It2MeHostState::kConnecting, last_host_state_);
+  ShutdownHost();
+  ASSERT_EQ(It2MeHostState::kDisconnected, last_host_state_);
+}
+
+TEST_F(It2MeHostTest, UnauthorizedHelperIsRejected) {
+  authorized_helper_ = kTestUserName;
+  StartHost();
+  RunValidationCallback(kTestClientJid2);
+  ASSERT_EQ(ValidationResult::ERROR_UNAUTHORIZED_ACCOUNT, validation_result_);
+  RunUntilStateChanged(It2MeHostState::kDisconnected);
+  ASSERT_EQ(It2MeHostState::kDisconnected, last_host_state_);
+}
+
 TEST_F(It2MeHostTest, HostUdpPortRangePolicyValidRange) {
   PortRange port_range_actual;
   ASSERT_TRUE(PortRange::Parse(kPortRange, &port_range_actual));

remoting/host/it2me/it2me_native_messaging_host.cc

diff --git a/remoting/host/it2me/it2me_native_messaging_host.cc b/remoting/host/it2me/it2me_native_messaging_host.cc
index ce59647..b5920a93 100644
--- a/remoting/host/it2me/it2me_native_messaging_host.cc
+++ b/remoting/host/it2me/it2me_native_messaging_host.cc
@@ -12,6 +12,7 @@
 #include "base/callback.h"
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/task/single_thread_task_runner.h"
 #include "base/threading/thread.h"
@@ -83,6 +84,15 @@
   task_runner->PostTask(FROM_HERE, callback);
 }
 
+// This function checks the email address provided to see if it is properly
+// formatted. It does not validate the username or domain sections.
+// TODO(joedow): Move to a shared location.
+bool IsValidEmailAddress(const std::string& email) {
+  return base::SplitString(email, "@", base::KEEP_WHITESPACE,
+                           base::SPLIT_WANT_ALL)
+             .size() == 2U;
+}
+
 }  // namespace
 
 It2MeNativeMessagingHost::It2MeNativeMessagingHost(
@@ -175,6 +185,7 @@
   base::Value::List features;
   features.Append(kFeatureAccessTokenAuth);
   features.Append(kFeatureDelegatedSignaling);
+  features.Append(kFeatureAuthorizedHelper);
 
   ProcessNativeMessageHelloResponse(response, std::move(features));
   SendMessageToClient(std::move(response));
@@ -231,7 +242,7 @@
       message.FindBool(kUseSignalingProxy).value_or(false);
 
   std::string username;
-  std::string* username_from_message = message.FindString(kUserName);
+  const std::string* username_from_message = message.FindString(kUserName);
   if (username_from_message) {
     username = *username_from_message;
   }
@@ -250,9 +261,19 @@
   bool is_enterprise_admin_user =
       message.FindBool(kIsEnterpriseAdminUser).value_or(false);
 
+  std::string authorized_helper;
+  const std::string* authorized_helper_value =
+      message.FindString(kAuthorizedHelper);
+  if (authorized_helper_value) {
+    authorized_helper = *authorized_helper_value;
+    if (!IsValidEmailAddress(authorized_helper)) {
+      LOG(ERROR) << "Invalid authorized_helper value: " << authorized_helper;
+      SendErrorAndExit(std::move(response), ErrorCode::INCOMPATIBLE_PROTOCOL);
+      return;
+    }
+  }
+
   It2MeHost::CreateDeferredConnectContext create_connection_context;
-  std::unique_ptr<RegisterSupportHostRequest> register_host_request;
-  std::unique_ptr<LogToServer> log_to_server;
   if (use_signaling_proxy) {
     if (username.empty()) {
       // Allow unauthenticated users for the delegated signal strategy case.
@@ -337,6 +358,7 @@
   // Create the It2Me host and start connecting. Note that disabling dialogs is
   // only supported on ChromeOS.
   it2me_host_ = factory_->CreateIt2MeHost();
+  it2me_host_->set_authorized_helper(authorized_helper);
 #if BUILDFLAG(IS_CHROMEOS_ASH) || !defined(NDEBUG)
   it2me_host_->set_enable_dialogs(!suppress_user_dialogs);
   it2me_host_->set_enable_notifications(!suppress_notifications);
@@ -395,7 +417,7 @@
     return;
   }
 
-  std::string* iq = message.FindString(kIq);
+  const std::string* iq = message.FindString(kIq);
   if (!iq) {
     LOG(ERROR) << "Invalid incomingIq() data.";
     return;

remoting/host/it2me/it2me_native_messaging_host_ash.cc

diff --git a/remoting/host/it2me/it2me_native_messaging_host_ash.cc b/remoting/host/it2me/it2me_native_messaging_host_ash.cc
index 52d4223..31554a0b 100644
--- a/remoting/host/it2me/it2me_native_messaging_host_ash.cc
+++ b/remoting/host/it2me/it2me_native_messaging_host_ash.cc
@@ -142,6 +142,9 @@
   message.Set(kCurtainLocalUserSession,
               ShouldCurtainLocalUserSession(*params, enterprise_params));
   message.Set(kIsEnterpriseAdminUser, enterprise_params.has_value());
+  if (params->authorized_helper.has_value()) {
+    message.Set(kAuthorizedHelper, *params->authorized_helper);
+  }
 
   std::string message_json;
   base::JSONWriter::Write(message, &message_json);

remoting/host/it2me/it2me_native_messaging_host_lacros.cc

diff --git a/remoting/host/it2me/it2me_native_messaging_host_lacros.cc b/remoting/host/it2me/it2me_native_messaging_host_lacros.cc
index 92a3397..e686629 100644
--- a/remoting/host/it2me/it2me_native_messaging_host_lacros.cc
+++ b/remoting/host/it2me/it2me_native_messaging_host_lacros.cc
@@ -18,12 +18,14 @@
 #include "base/memory/weak_ptr.h"
 #include "base/notreached.h"
 #include "base/sequence_checker.h"
+#include "base/strings/string_split.h"
 #include "base/task/single_thread_task_runner.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chromeos/crosapi/mojom/remoting.mojom.h"
 #include "chromeos/lacros/lacros_service.h"
 #include "extensions/browser/api/messaging/native_message_host.h"
+#include "google_apis/gaia/gaia_auth_util.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
@@ -53,6 +55,15 @@
   }
 }
 
+// This function checks the email address provided to see if it is properly
+// formatted. It does not validate the username or domain sections.
+// TODO(joedow): Move to a shared location.
+bool IsValidEmailAddress(const std::string& email) {
+  return base::SplitString(email, "@", base::KEEP_WHITESPACE,
+                           base::SPLIT_WANT_ALL)
+             .size() == 2U;
+}
+
 // This class is JSON <-> Mojo message converter which enables communication
 // between a Chrome Remote Desktop (CRD) client website instance running in
 // Lacros and the CRD components running in Ash. This class should not contain
@@ -378,6 +389,16 @@
   }
   session_params->oauth_access_token = *access_token;
 
+  const std::string* authorized_helper = message.FindString(kAuthorizedHelper);
+  if (authorized_helper) {
+    session_params->authorized_helper =
+        gaia::CanonicalizeEmail(*authorized_helper);
+    if (!IsValidEmailAddress(session_params->authorized_helper.value())) {
+      SendErrorAndExit(protocol::ErrorCode::INCOMPATIBLE_PROTOCOL, message_id);
+      return;
+    }
+  }
+
   // TODO(joedow): Add the ability to toggle the RemoteCommand settings for
   // testing purposes. This should probably be encapsulated in a check that the
   // machine is in developer-mode and/or !NDEBUG.

remoting/host/mojom/desktop_session.mojom

diff --git a/remoting/host/mojom/desktop_session.mojom b/remoting/host/mojom/desktop_session.mojom
index 19623faf..9e7bdd6e 100644
--- a/remoting/host/mojom/desktop_session.mojom
+++ b/remoting/host/mojom/desktop_session.mojom
@@ -551,6 +551,7 @@
   kAuthzPolicyCheckFailed = 17,
   kDisallowedByPolicy = 18,
   kLocationAuthzPolicyCheckFailed = 19,
+  kUnauthorizedAccount = 20,
 };
 
 // Provides the desktop integration process with a mechanism for controlling the

remoting/host/mojom/remote_support.mojom

diff --git a/remoting/host/mojom/remote_support.mojom b/remoting/host/mojom/remote_support.mojom
index 36d4fe6..e0bf280 100644
--- a/remoting/host/mojom/remote_support.mojom
+++ b/remoting/host/mojom/remote_support.mojom
@@ -42,7 +42,7 @@
 
 // The parameters required to start a remote support session.
 //
-// Next version: 2
+// Next version: 3
 [Stable]
 struct SupportSessionParams {
   // Gaia username of the user requesting the connection.
@@ -70,6 +70,12 @@
   // initiated connections using the RemoteCommand infrastructure.
   [EnableIf=is_chromeos, MinVersion=1]
   bool curtain_local_user_session = false;
+
+  // If set, the support host instance will only accept connection requests from
+  // the account (username) specified in this field. If not set, then any user
+  // with the access code is allowed to connect.
+  [MinVersion=2]
+  string? authorized_helper;
 };
 
 // Represents the state of the remote support host NAT device policies.

remoting/host/mojom/remoting_mojom_traits.h

diff --git a/remoting/host/mojom/remoting_mojom_traits.h b/remoting/host/mojom/remoting_mojom_traits.h
index 0b8d99d5..a7c4e85 100644
--- a/remoting/host/mojom/remoting_mojom_traits.h
+++ b/remoting/host/mojom/remoting_mojom_traits.h
@@ -1511,6 +1511,8 @@
       case ::remoting::protocol::ErrorCode::LOCATION_AUTHZ_POLICY_CHECK_FAILED:
         return remoting::mojom::ProtocolErrorCode::
             kLocationAuthzPolicyCheckFailed;
+      case ::remoting::protocol::ErrorCode::UNAUTHORIZED_ACCOUNT:
+        return remoting::mojom::ProtocolErrorCode::kUnauthorizedAccount;
     }
 
     NOTREACHED();
@@ -1581,6 +1583,9 @@
         *out =
             ::remoting::protocol::ErrorCode::LOCATION_AUTHZ_POLICY_CHECK_FAILED;
         return true;
+      case remoting::mojom::ProtocolErrorCode::kUnauthorizedAccount:
+        *out = ::remoting::protocol::ErrorCode::UNAUTHORIZED_ACCOUNT;
+        return true;
     }
 
     NOTREACHED();

remoting/host/register_support_host_request.h

diff --git a/remoting/host/register_support_host_request.h b/remoting/host/register_support_host_request.h
index d49a3c20..885f5b8f 100644
--- a/remoting/host/register_support_host_request.h
+++ b/remoting/host/register_support_host_request.h
@@ -41,6 +41,7 @@
 
   virtual void StartRequest(SignalStrategy* signal_strategy,
                             scoped_refptr<RsaKeyPair> key_pair,
+                            const std::string& authorized_helper,
                             RegisterCallback callback) = 0;
 };
 

remoting/host/remoting_register_support_host_request.cc

diff --git a/remoting/host/remoting_register_support_host_request.cc b/remoting/host/remoting_register_support_host_request.cc
index 68e47c1..d0f7ea0 100644
--- a/remoting/host/remoting_register_support_host_request.cc
+++ b/remoting/host/remoting_register_support_host_request.cc
@@ -137,6 +137,7 @@
 void RemotingRegisterSupportHostRequest::StartRequest(
     SignalStrategy* signal_strategy,
     scoped_refptr<RsaKeyPair> key_pair,
+    const std::string& authorized_helper,
     RegisterCallback callback) {
   DCHECK_EQ(State::NOT_STARTED, state_);
   DCHECK(signal_strategy);
@@ -145,6 +146,7 @@
   signal_strategy_ = signal_strategy;
   key_pair_ = key_pair;
   callback_ = std::move(callback);
+  authorized_helper_ = authorized_helper;
 
   signal_strategy_->AddListener(this);
 }
@@ -183,6 +185,10 @@
   request->set_host_os_name(GetHostOperatingSystemName());
   request->set_host_os_version(GetHostOperatingSystemVersion());
 
+  if (!authorized_helper_.empty()) {
+    request->set_authorized_helper(authorized_helper_);
+  }
+
   register_host_client_->RegisterSupportHost(
       std::move(request),
       base::BindOnce(&RemotingRegisterSupportHostRequest::OnRegisterHostResult,

remoting/host/remoting_register_support_host_request.h

diff --git a/remoting/host/remoting_register_support_host_request.h b/remoting/host/remoting_register_support_host_request.h
index f2fc1401..2e8767b 100644
--- a/remoting/host/remoting_register_support_host_request.h
+++ b/remoting/host/remoting_register_support_host_request.h
@@ -49,6 +49,7 @@
   // RegisterSupportHostRequest implementation.
   void StartRequest(SignalStrategy* signal_strategy,
                     scoped_refptr<RsaKeyPair> key_pair,
+                    const std::string& authorized_helper,
                     RegisterCallback callback) override;
 
  private:
@@ -94,6 +95,7 @@
   RegisterCallback callback_;
   std::unique_ptr<OAuthTokenGetter> token_getter_;
   std::unique_ptr<RegisterSupportHostClient> register_host_client_;
+  std::string authorized_helper_;
 
   State state_ = State::NOT_STARTED;
 };

remoting/host/remoting_register_support_host_request_unittest.cc

diff --git a/remoting/host/remoting_register_support_host_request_unittest.cc b/remoting/host/remoting_register_support_host_request_unittest.cc
index 075bd41..569077b 100644
--- a/remoting/host/remoting_register_support_host_request_unittest.cc
+++ b/remoting/host/remoting_register_support_host_request_unittest.cc
@@ -31,6 +31,7 @@
 constexpr char kSupportId[] = "123321456654";
 constexpr base::TimeDelta kSupportIdLifetime = base::Minutes(5);
 constexpr char kFtlId[] = "fake_user@domain.com/chromoting_ftl_abc123";
+const char kTestAuthorizedHelper[] = "helpful_dude@chromoting.com";
 
 void ValidateRegisterHost(const apis::v1::RegisterSupportHostRequest& request) {
   ASSERT_TRUE(request.has_host_version());
@@ -57,6 +58,16 @@
   };
 }
 
+decltype(auto) DoValidateAuthorizedHelperAndRespondOk() {
+  return [=](std::unique_ptr<apis::v1::RegisterSupportHostRequest> request,
+             RegisterSupportHostResponseCallback callback) {
+    ASSERT_TRUE(request->has_authorized_helper());
+    ASSERT_EQ(request->authorized_helper(), kTestAuthorizedHelper);
+    ValidateRegisterHost(*request);
+    RespondOk(std::move(callback));
+  };
+}
+
 }  // namespace
 
 class RemotingRegisterSupportHostTest : public testing::Test {
@@ -108,6 +119,7 @@
 
   std::unique_ptr<SignalStrategy> signal_strategy_;
   scoped_refptr<RsaKeyPair> key_pair_;
+  std::string authorized_helper_;
 };
 
 TEST_F(RemotingRegisterSupportHostTest, RegisterFtl) {
@@ -122,6 +134,27 @@
       .Times(1);
 
   register_host_request_->StartRequest(signal_strategy_.get(), key_pair_,
+                                       authorized_helper_,
+                                       register_callback.Get());
+  signal_strategy_->Connect();
+}
+
+TEST_F(RemotingRegisterSupportHostTest, RegisterWithAuthorizedHelper) {
+  EXPECT_CALL(*register_host_client_, RegisterSupportHost(_, _))
+      .WillOnce(DoValidateAuthorizedHelperAndRespondOk());
+
+  EXPECT_CALL(*register_host_client_, CancelPendingRequests()).Times(1);
+
+  base::MockCallback<RegisterSupportHostRequest::RegisterCallback>
+      register_callback;
+  EXPECT_CALL(register_callback,
+              Run(kSupportId, kSupportIdLifetime, protocol::ErrorCode::OK))
+      .Times(1);
+
+  authorized_helper_ = kTestAuthorizedHelper;
+
+  register_host_request_->StartRequest(signal_strategy_.get(), key_pair_,
+                                       authorized_helper_,
                                        register_callback.Get());
   signal_strategy_->Connect();
 }
@@ -146,6 +179,7 @@
       .Times(1);
 
   register_host_request_->StartRequest(signal_strategy_.get(), key_pair_,
+                                       authorized_helper_,
                                        register_callback.Get());
   signal_strategy_->Connect();
 }
@@ -169,6 +203,7 @@
       .Times(1);
 
   register_host_request_->StartRequest(signal_strategy_.get(), key_pair_,
+                                       authorized_helper_,
                                        register_callback.Get());
   signal_strategy_->Connect();
   signal_strategy_->Disconnect();

remoting/host/xmpp_register_support_host_request.cc

diff --git a/remoting/host/xmpp_register_support_host_request.cc b/remoting/host/xmpp_register_support_host_request.cc
index 75905b39..6809deb1f 100644
--- a/remoting/host/xmpp_register_support_host_request.cc
+++ b/remoting/host/xmpp_register_support_host_request.cc
@@ -41,6 +41,7 @@
 const char kHostVersionTag[] = "host-version";
 const char kHostOsNameTag[] = "host-os-name";
 const char kHostOsVersionTag[] = "host-os-version";
+const char kAuthorizedHelperTag[] = "authorized-helper";
 
 // Strings used to parse responses received from the bot.
 const char kRegisterQueryResultTag[] = "register-support-host-result";
@@ -63,6 +64,7 @@
 void XmppRegisterSupportHostRequest::StartRequest(
     SignalStrategy* signal_strategy,
     scoped_refptr<RsaKeyPair> key_pair,
+    const std::string& authorized_helper,
     RegisterCallback callback) {
   DCHECK(signal_strategy);
   DCHECK(key_pair.get());
@@ -71,6 +73,7 @@
   key_pair_ = key_pair;
   callback_ = std::move(callback);
   signal_strategy_->AddListener(this);
+  authorized_helper_ = authorized_helper;
   iq_sender_ = std::make_unique<IqSender>(signal_strategy_);
 }
 
@@ -138,6 +141,14 @@
   host_os_version->AddText(GetHostOperatingSystemVersion());
   query->AddElement(host_os_version.release());
 
+  // Add authorized helper if one was provided.
+  if (!authorized_helper_.empty()) {
+    auto authorized_helper = std::make_unique<XmlElement>(
+        QName(kChromotingXmlNamespace, kAuthorizedHelperTag));
+    authorized_helper->AddText(authorized_helper_);
+    query->AddElement(authorized_helper.release());
+  }
+
   return query;
 }
 

remoting/host/xmpp_register_support_host_request.h

diff --git a/remoting/host/xmpp_register_support_host_request.h b/remoting/host/xmpp_register_support_host_request.h
index c5e4fea..1be2a901 100644
--- a/remoting/host/xmpp_register_support_host_request.h
+++ b/remoting/host/xmpp_register_support_host_request.h
@@ -52,6 +52,7 @@
   // RegisterSupportHostRequest implementation.
   void StartRequest(SignalStrategy* signal_strategy,
                     scoped_refptr<RsaKeyPair> key_pair,
+                    const std::string& authorized_helper,
                     RegisterCallback callback) override;
 
   // HostStatusObserver implementation.
@@ -82,6 +83,7 @@
   scoped_refptr<RsaKeyPair> key_pair_;
   std::string directory_bot_jid_;
   RegisterCallback callback_;
+  std::string authorized_helper_;
 
   std::unique_ptr<IqSender> iq_sender_;
   std::unique_ptr<IqRequest> request_;

remoting/host/xmpp_register_support_host_request_unittest.cc

diff --git a/remoting/host/xmpp_register_support_host_request_unittest.cc b/remoting/host/xmpp_register_support_host_request_unittest.cc
index 5176c3d6..55e83e9 100644
--- a/remoting/host/xmpp_register_support_host_request_unittest.cc
+++ b/remoting/host/xmpp_register_support_host_request_unittest.cc
@@ -45,6 +45,7 @@
 const char kTestBotJid[] = "remotingunittest@bot.talk.google.com";
 const char kTestJid[] = "User@gmail.com/chromotingABC123";
 const char kTestJidNormalized[] = "user@gmail.com/chromotingABC123";
+const char kTestAuthorizedHelper[] = "helpful_dude@chromoting.com";
 const char kSupportId[] = "AB4RF3";
 const char kSupportIdLifetime[] = "300";
 const char kStanzaId[] = "123";
@@ -79,12 +80,14 @@
   MockSignalStrategy signal_strategy_;
   base::ObserverList<SignalStrategy::Listener, true> signal_strategy_listeners_;
   scoped_refptr<RsaKeyPair> key_pair_;
+  std::string authorized_helper_;
   base::MockCallback<RegisterSupportHostRequest::RegisterCallback> callback_;
 };
 
 TEST_F(XmppRegisterSupportHostRequestTest, Timeout) {
   auto request = std::make_unique<XmppRegisterSupportHostRequest>(kTestBotJid);
-  request->StartRequest(&signal_strategy_, key_pair_, callback_.Get());
+  request->StartRequest(&signal_strategy_, key_pair_, authorized_helper_,
+                        callback_.Get());
   EXPECT_CALL(signal_strategy_, GetNextId()).WillOnce(Return(kStanzaId));
   EXPECT_CALL(signal_strategy_, SendStanzaPtr(NotNull()))
       .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
@@ -103,7 +106,8 @@
   int64_t start_time = static_cast<int64_t>(base::Time::Now().ToDoubleT());
 
   auto request = std::make_unique<XmppRegisterSupportHostRequest>(kTestBotJid);
-  request->StartRequest(&signal_strategy_, key_pair_, callback_.Get());
+  request->StartRequest(&signal_strategy_, key_pair_, authorized_helper_,
+                        callback_.Get());
 
   XmlElement* sent_iq = nullptr;
   EXPECT_CALL(signal_strategy_, GetNextId()).WillOnce(Return(kStanzaId));
@@ -149,6 +153,10 @@
       QName(kChromotingXmlNamespace, "host-os-version"));
   EXPECT_EQ(GetHostOperatingSystemVersion(), host_os_version->BodyText());
 
+  XmlElement* authorized_helper = stanza->FirstElement()->FirstNamed(
+      QName(kChromotingXmlNamespace, "authorized-helper"));
+  EXPECT_EQ(authorized_helper, nullptr);
+
   scoped_refptr<RsaKeyPair> key_pair = RsaKeyPair::FromString(kTestRsaKeyPair);
   ASSERT_TRUE(key_pair.get());
 
@@ -188,4 +196,29 @@
   task_environment_.RunUntilIdle();
 }
 
+TEST_F(XmppRegisterSupportHostRequestTest, AuthorizedHelper) {
+  authorized_helper_ = kTestAuthorizedHelper;
+
+  auto request = std::make_unique<XmppRegisterSupportHostRequest>(kTestBotJid);
+  request->StartRequest(&signal_strategy_, key_pair_, authorized_helper_,
+                        callback_.Get());
+
+  XmlElement* sent_iq = nullptr;
+  EXPECT_CALL(signal_strategy_, GetNextId()).WillOnce(Return(kStanzaId));
+  EXPECT_CALL(signal_strategy_, SendStanzaPtr(NotNull()))
+      .WillOnce(DoAll(SaveArg<0>(&sent_iq), Return(true)));
+
+  request->OnSignalStrategyStateChange(SignalStrategy::CONNECTED);
+  task_environment_.RunUntilIdle();
+
+  std::unique_ptr<XmlElement> stanza(sent_iq);
+  ASSERT_NE(stanza, nullptr);
+
+  // Other fields are verified in the Send test case.
+
+  XmlElement* authorized_helper = stanza->FirstElement()->FirstNamed(
+      QName(kChromotingXmlNamespace, "authorized-helper"));
+  EXPECT_EQ(authorized_helper_, authorized_helper->BodyText());
+}
+
 }  // namespace remoting

remoting/proto/remoting/v1/remote_support_host_messages.proto

diff --git a/remoting/proto/remoting/v1/remote_support_host_messages.proto b/remoting/proto/remoting/v1/remote_support_host_messages.proto
index 93f8913..78a719ea 100644
--- a/remoting/proto/remoting/v1/remote_support_host_messages.proto
+++ b/remoting/proto/remoting/v1/remote_support_host_messages.proto
@@ -37,6 +37,11 @@
 
   // Operating system version of the host.
   optional string host_os_version = 6;
+
+  // The email address of the account which is authorized to connect to this
+  // host. Only authorized accounts can make a successful GetSupportHostRequest.
+  // If this field isn't set, then anyone can call GetSupportHost for this host.
+  optional string authorized_helper = 7;
 }
 
 // The response to a RegisterSupportHostRequest.

remoting/protocol/authenticator.h

diff --git a/remoting/protocol/authenticator.h b/remoting/protocol/authenticator.h
index fa6d3d2..018e9114 100644
--- a/remoting/protocol/authenticator.h
+++ b/remoting/protocol/authenticator.h
@@ -85,6 +85,10 @@
     // The client is not authorized to connect to this device based on their
     // current location due to a policy defined by the third party auth service.
     LOCATION_AUTHZ_POLICY_CHECK_FAILED,
+
+    // The remote user is not authorized to access this machine. This is a
+    // generic authz error and is not related to third-party auth.
+    UNAUTHORIZED_ACCOUNT,
   };
 
   // Callback used for layered Authenticator implementations, particularly

remoting/protocol/errors.cc

diff --git a/remoting/protocol/errors.cc b/remoting/protocol/errors.cc
index 7d8b6ddf..68b6316d 100644
--- a/remoting/protocol/errors.cc
+++ b/remoting/protocol/errors.cc
@@ -31,6 +31,7 @@
     {AUTHZ_POLICY_CHECK_FAILED, "AUTHZ_POLICY_CHECK_FAILED"},
     {DISALLOWED_BY_POLICY, "DISALLOWED_BY_POLICY"},
     {LOCATION_AUTHZ_POLICY_CHECK_FAILED, "LOCATION_AUTHZ_POLICY_CHECK_FAILED"},
+    {UNAUTHORIZED_ACCOUNT, "UNAUTHORIZED_ACCOUNT"},
 };
 
 }  // namespace

remoting/protocol/errors.h

diff --git a/remoting/protocol/errors.h b/remoting/protocol/errors.h
index eaacf2d..903b41c 100644
--- a/remoting/protocol/errors.h
+++ b/remoting/protocol/errors.h
@@ -34,7 +34,8 @@
   AUTHZ_POLICY_CHECK_FAILED,
   DISALLOWED_BY_POLICY,
   LOCATION_AUTHZ_POLICY_CHECK_FAILED,
-  ERROR_CODE_MAX = LOCATION_AUTHZ_POLICY_CHECK_FAILED,
+  UNAUTHORIZED_ACCOUNT,
+  ERROR_CODE_MAX = UNAUTHORIZED_ACCOUNT,
 };
 
 bool ParseErrorCode(const std::string& name, ErrorCode* result);

remoting/protocol/jingle_session.cc

diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc
index e88a596..8d0813ef 100644
--- a/remoting/protocol/jingle_session.cc
+++ b/remoting/protocol/jingle_session.cc
@@ -78,6 +78,8 @@
       return AUTHZ_POLICY_CHECK_FAILED;
     case Authenticator::RejectionReason::LOCATION_AUTHZ_POLICY_CHECK_FAILED:
       return LOCATION_AUTHZ_POLICY_CHECK_FAILED;
+    case Authenticator::RejectionReason::UNAUTHORIZED_ACCOUNT:
+      return UNAUTHORIZED_ACCOUNT;
   }
 }
 

remoting/protocol/validating_authenticator.cc

diff --git a/remoting/protocol/validating_authenticator.cc b/remoting/protocol/validating_authenticator.cc
index a301ef8..1ceaf92 100644
--- a/remoting/protocol/validating_authenticator.cc
+++ b/remoting/protocol/validating_authenticator.cc
@@ -106,6 +106,10 @@
     case Result::ERROR_REJECTED_BY_USER:
       rejection_reason_ = RejectionReason::REJECTED_BY_USER;
       break;
+
+    case Result::ERROR_UNAUTHORIZED_ACCOUNT:
+      rejection_reason_ = RejectionReason::UNAUTHORIZED_ACCOUNT;
+      break;
   }
 
   state_ = Authenticator::REJECTED;

remoting/protocol/validating_authenticator.h

diff --git a/remoting/protocol/validating_authenticator.h b/remoting/protocol/validating_authenticator.h
index 5d29a13..1b82cff 100644
--- a/remoting/protocol/validating_authenticator.h
+++ b/remoting/protocol/validating_authenticator.h
@@ -25,7 +25,8 @@
     ERROR_INVALID_CREDENTIALS,
     ERROR_INVALID_ACCOUNT,
     ERROR_REJECTED_BY_USER,
-    ERROR_TOO_MANY_CONNECTIONS
+    ERROR_TOO_MANY_CONNECTIONS,
+    ERROR_UNAUTHORIZED_ACCOUNT
   };
 
   typedef base::OnceCallback<void(Result validation_result)> ResultCallback;

sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc

diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
index d84e339..7bde5011 100644
--- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
@@ -49,7 +49,6 @@
          SyscallSets::IsAllowedFileSystemAccessViaFd(sysno) ||
          SyscallSets::IsAllowedFutex(sysno) ||
          SyscallSets::IsAllowedGeneralIo(sysno) ||
-         SyscallSets::IsAllowedGetOrModifySocket(sysno) ||
          SyscallSets::IsAllowedGettime(sysno) ||
          SyscallSets::IsAllowedProcessStartOrDeath(sysno) ||
          SyscallSets::IsAllowedSignalHandling(sysno) ||
@@ -364,6 +363,18 @@
            .Else(Error(EPERM));
   }
 
+  // Allow creating pipes, but don't allow weird flags to pipe2().
+  // O_NOTIFICATION_PIPE (== O_EXCL) can be used to create
+  // "notification pipes", which are rarely used.
+#if !defined(__aarch64__)
+  if (sysno == __NR_pipe) {
+    return Allow();
+  }
+#endif
+  if (sysno == __NR_pipe2) {
+    return RestrictPipe2();
+  }
+
   if (IsBaselinePolicyWatched(sysno)) {
     // Previously unseen syscalls. TODO(jln): some of these should
     // be denied gracefully right away.

sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc

diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
index 6b194e9..8803b206 100644
--- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
@@ -471,4 +471,10 @@
   return If(which == ITIMER_PROF, Allow()).Else(Error(EPERM));
 }
 
+ResultExpr RestrictPipe2() {
+  const Arg<int> flags(1);
+  return If((flags & ~(O_CLOEXEC|O_DIRECT|O_NONBLOCK)) == 0, Allow())
+      .Else(CrashSIGSYS());
+}
+
 }  // namespace sandbox.

sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h

diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
index ec834109..171191ec 100644
--- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
@@ -123,6 +123,9 @@
 // Restrict the which argument to getitimer() and setitimer().
 SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictGoogle3Threading(int sysno);
 
+// Restrict the flags of pipe2().
+SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictPipe2();
+
 }  // namespace sandbox.
 
 #endif  // SANDBOX_LINUX_SECCOMP_BPF_HELPERS_SYSCALL_PARAMETERS_RESTRICTIONS_H_

sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc

diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
index ace54ae..27ea2640 100644
--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
@@ -496,22 +496,6 @@
   }
 }
 
-bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) {
-  switch (sysno) {
-#if !defined(__aarch64__)
-    case __NR_pipe:
-#endif
-    case __NR_pipe2:
-      return true;
-    default:
-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-    defined(__aarch64__)
-    case __NR_socketpair:  // We will want to inspect its argument.
-#endif
-      return false;
-  }
-}
-
 bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
   switch (sysno) {
 #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \

sandbox/linux/seccomp-bpf-helpers/syscall_sets.h

diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
index 88b2d39..9be7b03 100644
--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
@@ -43,7 +43,6 @@
   // It's difficult to restrict those, but there is attack surface here.
   static bool IsAllowedFutex(int sysno);
   static bool IsAllowedEpoll(int sysno);
-  static bool IsAllowedGetOrModifySocket(int sysno);
   static bool IsDeniedGetOrModifySocket(int sysno);
 
 #if defined(__i386__) || \

sandbox/policy/linux/sandbox_seccomp_bpf_linux.h

diff --git a/sandbox/policy/linux/sandbox_seccomp_bpf_linux.h b/sandbox/policy/linux/sandbox_seccomp_bpf_linux.h
index 11b965d2..91fdc53 100644
--- a/sandbox/policy/linux/sandbox_seccomp_bpf_linux.h
+++ b/sandbox/policy/linux/sandbox_seccomp_bpf_linux.h
@@ -28,6 +28,7 @@
     bool use_amd_specific_policies = false;     // For ChromiumOS.
     bool use_intel_specific_policies = false;   // For ChromiumOS.
     bool use_nvidia_specific_policies = false;  // For Linux.
+    bool use_asahi_specific_policies = false;   // For Linux.
 
     // Options for GPU's PreSandboxHook.
     bool accelerated_video_decode_enabled = false;

services/network/cookie_settings.h

diff --git a/services/network/cookie_settings.h b/services/network/cookie_settings.h
index 92887f26..5675b0d 100644
--- a/services/network/cookie_settings.h
+++ b/services/network/cookie_settings.h
@@ -109,23 +109,6 @@
   // It may be set to kPartitionedStateAllowedOnly if the request allows
   // partitioned state to be sent over the connection, but unpartitioned
   // state should be blocked.
-  // DEPRECATED: Use IsPrivacyModeEnabled(GURL, SiteForCookies, Origin,
-  // bool).
-  // TODO(crbug.com/1386190): Update callers and remove.
-  net::NetworkDelegate::PrivacySetting IsPrivacyModeEnabled(
-      const GURL& url,
-      const net::SiteForCookies& site_for_cookies,
-      const absl::optional<url::Origin>& top_frame_origin) const {
-    return IsPrivacyModeEnabled(url, site_for_cookies, top_frame_origin,
-                                net::CookieSettingOverrides());
-  }
-
-  // Returns kStateDisallowed iff the given |url| has to be requested over
-  // connection that is not tracked by the server. Usually is kStateAllowed,
-  // unless user privacy settings block cookies from being get or set.
-  // It may be set to kPartitionedStateAllowedOnly if the request allows
-  // partitioned state to be sent over the connection, but unpartitioned
-  // state should be blocked.
   net::NetworkDelegate::PrivacySetting IsPrivacyModeEnabled(
       const GURL& url,
       const net::SiteForCookies& site_for_cookies,
@@ -163,30 +146,6 @@
   // to all cookies; true otherwise. Does not change the relative ordering of
   // the cookies in `maybe_included_cookies`, since this order is important when
   // building the cookie line.
-  // DEPRECATED: Use AnnotateAndMoveUserBlockedCookies(GURL, SiteForCookies,
-  // Origin, FirstPartySetMetadata, bool, CookieAccessResultList,
-  // CookieAccessResultList).
-  // TODO(crbug.com/1386190): Update callers and remove.
-  bool AnnotateAndMoveUserBlockedCookies(
-      const GURL& url,
-      const net::SiteForCookies& site_for_cookies,
-      const url::Origin* top_frame_origin,
-      const net::FirstPartySetMetadata& first_party_set_metadata,
-      net::CookieAccessResultList& maybe_included_cookies,
-      net::CookieAccessResultList& excluded_cookies) const {
-    return AnnotateAndMoveUserBlockedCookies(
-        url, site_for_cookies, top_frame_origin, first_party_set_metadata,
-        net::CookieSettingOverrides(), maybe_included_cookies,
-        excluded_cookies);
-  }
-
-  // Annotates `maybe_included_cookies` and `excluded_cookies` with
-  // ExclusionReasons if needed, per user's cookie blocking settings, and
-  // ensures that all excluded cookies from `maybe_included_cookies` are moved
-  // to `excluded_cookies`.  Returns false if the CookieSettings blocks access
-  // to all cookies; true otherwise. Does not change the relative ordering of
-  // the cookies in `maybe_included_cookies`, since this order is important when
-  // building the cookie line.
   bool AnnotateAndMoveUserBlockedCookies(
       const GURL& url,
       const net::SiteForCookies& site_for_cookies,

services/network/cookie_settings_unittest.cc

diff --git a/services/network/cookie_settings_unittest.cc b/services/network/cookie_settings_unittest.cc
index 1f071c6..7f182130 100644
--- a/services/network/cookie_settings_unittest.cc
+++ b/services/network/cookie_settings_unittest.cc
@@ -587,61 +587,65 @@
   settings.set_block_third_party_cookies(true);
 
   // Third-party requests should only have accessed to partitioned state.
-  EXPECT_EQ(
-      net::NetworkDelegate::PrivacySetting::kPartitionedStateAllowedOnly,
-      settings.IsPrivacyModeEnabled(GURL(kURL), net::SiteForCookies(),
-                                    url::Origin::Create(GURL(kOtherURL))));
+  EXPECT_EQ(net::NetworkDelegate::PrivacySetting::kPartitionedStateAllowedOnly,
+            settings.IsPrivacyModeEnabled(GURL(kURL), net::SiteForCookies(),
+                                          url::Origin::Create(GURL(kOtherURL)),
+                                          net::CookieSettingOverrides()));
 
   // Same for requests with a null site_for_cookies, even if the
   // top_frame_origin matches.
   EXPECT_EQ(net::NetworkDelegate::PrivacySetting::kPartitionedStateAllowedOnly,
             settings.IsPrivacyModeEnabled(GURL(kURL), net::SiteForCookies(),
-                                          url::Origin::Create(GURL(kURL))));
+                                          url::Origin::Create(GURL(kURL)),
+                                          net::CookieSettingOverrides()));
 
   // The first party is able to send any type of state.
-  EXPECT_EQ(net::NetworkDelegate::PrivacySetting::kStateAllowed,
-            settings.IsPrivacyModeEnabled(
-                GURL(kURL), net::SiteForCookies::FromUrl(GURL(kURL)),
-                url::Origin::Create(GURL(kURL))));
+  EXPECT_EQ(
+      net::NetworkDelegate::PrivacySetting::kStateAllowed,
+      settings.IsPrivacyModeEnabled(
+          GURL(kURL), net::SiteForCookies::FromUrl(GURL(kURL)),
+          url::Origin::Create(GURL(kURL)), net::CookieSettingOverrides()));
 
   // Setting a site-specific rule for the top-level frame origin that blocks
   // access should cause partitioned state to be disallowed.
   settings.set_content_settings(
       {CreateSetting(kOtherURL, "*", CONTENT_SETTING_BLOCK)});
-  EXPECT_EQ(
-      net::NetworkDelegate::PrivacySetting::kStateDisallowed,
-      settings.IsPrivacyModeEnabled(GURL(kURL), net::SiteForCookies(),
-                                    url::Origin::Create(GURL(kOtherURL))));
+  EXPECT_EQ(net::NetworkDelegate::PrivacySetting::kStateDisallowed,
+            settings.IsPrivacyModeEnabled(GURL(kURL), net::SiteForCookies(),
+                                          url::Origin::Create(GURL(kOtherURL)),
+                                          net::CookieSettingOverrides()));
 
   // Setting a site-specific rule for the top-level frame origin when it is
   // embedded on an unrelated site should not affect if partitioned state is
   // allowed.
   settings.set_content_settings(
       {CreateSetting(kOtherURL, kUnrelatedURL, CONTENT_SETTING_BLOCK)});
-  EXPECT_EQ(
-      net::NetworkDelegate::PrivacySetting::kPartitionedStateAllowedOnly,
-      settings.IsPrivacyModeEnabled(GURL(kURL), net::SiteForCookies(),
-                                    url::Origin::Create(GURL(kOtherURL))));
+  EXPECT_EQ(net::NetworkDelegate::PrivacySetting::kPartitionedStateAllowedOnly,
+            settings.IsPrivacyModeEnabled(GURL(kURL), net::SiteForCookies(),
+                                          url::Origin::Create(GURL(kOtherURL)),
+                                          net::CookieSettingOverrides()));
 
   // No state is allowed if there's a site-specific rule that blocks access,
   // regardless of the kind of request.
   settings.set_content_settings(
       {CreateSetting(kURL, "*", CONTENT_SETTING_BLOCK)});
   // Third-party requests:
-  EXPECT_EQ(
-      net::NetworkDelegate::PrivacySetting::kStateDisallowed,
-      settings.IsPrivacyModeEnabled(GURL(kURL), net::SiteForCookies(),
-                                    url::Origin::Create(GURL(kOtherURL))));
+  EXPECT_EQ(net::NetworkDelegate::PrivacySetting::kStateDisallowed,
+            settings.IsPrivacyModeEnabled(GURL(kURL), net::SiteForCookies(),
+                                          url::Origin::Create(GURL(kOtherURL)),
+                                          net::CookieSettingOverrides()));
 
   // Requests with a null site_for_cookies, but matching top_frame_origin.
   EXPECT_EQ(net::NetworkDelegate::PrivacySetting::kStateDisallowed,
             settings.IsPrivacyModeEnabled(GURL(kURL), net::SiteForCookies(),
-                                          url::Origin::Create(GURL(kURL))));
+                                          url::Origin::Create(GURL(kURL)),
+                                          net::CookieSettingOverrides()));
   // First-party requests.
-  EXPECT_EQ(net::NetworkDelegate::PrivacySetting::kStateDisallowed,
-            settings.IsPrivacyModeEnabled(
-                GURL(kURL), net::SiteForCookies::FromUrl(GURL(kURL)),
-                url::Origin::Create(GURL(kURL))));
+  EXPECT_EQ(
+      net::NetworkDelegate::PrivacySetting::kStateDisallowed,
+      settings.IsPrivacyModeEnabled(
+          GURL(kURL), net::SiteForCookies::FromUrl(GURL(kURL)),
+          url::Origin::Create(GURL(kURL)), net::CookieSettingOverrides()));
 }
 
 class SamePartyCookieSettingsTest : public CookieSettingsTest {
@@ -657,19 +661,22 @@
   EXPECT_EQ(
       net::NetworkDelegate::PrivacySetting::kPartitionedStateAllowedOnly,
       settings.IsPrivacyModeEnabled(GURL(kFPSMemberURL), net::SiteForCookies(),
-                                    url::Origin::Create(GURL(kFPSOwnerURL))));
+                                    url::Origin::Create(GURL(kFPSOwnerURL)),
+                                    net::CookieSettingOverrides()));
   // Enabled for cross-site, same-party requests.
   EXPECT_EQ(
       net::NetworkDelegate::PrivacySetting::kPartitionedStateAllowedOnly,
       settings.IsPrivacyModeEnabled(GURL(kFPSMemberURL), net::SiteForCookies(),
-                                    url::Origin::Create(GURL(kFPSOwnerURL))));
+                                    url::Origin::Create(GURL(kFPSOwnerURL)),
+                                    net::CookieSettingOverrides()));
   // Enabled for same-party requests if blocked by a site-specific rule.
   settings.set_content_settings(
       {CreateSetting(kFPSMemberURL, "*", CONTENT_SETTING_BLOCK)});
   EXPECT_EQ(
       net::NetworkDelegate::PrivacySetting::kStateDisallowed,
       settings.IsPrivacyModeEnabled(GURL(kFPSMemberURL), net::SiteForCookies(),
-                                    url::Origin::Create(GURL(kFPSOwnerURL))));
+                                    url::Origin::Create(GURL(kFPSOwnerURL)),
+                                    net::CookieSettingOverrides()));
 }
 
 TEST_P(CookieSettingsTest, IsCookieAccessible) {
@@ -823,7 +830,7 @@
           net::SamePartyContext(net::SamePartyContext::Type::kCrossParty),
           /*frame_entry=*/nullptr,
           /*top_frame_entry=*/nullptr),
-      maybe_included_cookies, excluded_cookies));
+      net::CookieSettingOverrides(), maybe_included_cookies, excluded_cookies));
 
   EXPECT_THAT(maybe_included_cookies, IsEmpty());
   EXPECT_THAT(
@@ -880,7 +887,7 @@
       net::FirstPartySetMetadata(
           net::SamePartyContext(net::SamePartyContext::Type::kCrossParty),
           &frame_entry, &top_frame_entry),
-      maybe_included_cookies, excluded_cookies));
+      net::CookieSettingOverrides(), maybe_included_cookies, excluded_cookies));
 
   EXPECT_EQ(0u, maybe_included_cookies.size());
 
@@ -933,7 +940,7 @@
       net::FirstPartySetMetadata(
           net::SamePartyContext(net::SamePartyContext::Type::kCrossParty),
           &frame_entry, &top_frame_entry),
-      maybe_included_cookies, excluded_cookies));
+      net::CookieSettingOverrides(), maybe_included_cookies, excluded_cookies));
 
   EXPECT_EQ(0u, maybe_included_cookies.size());
 
@@ -987,7 +994,7 @@
           net::SamePartyContext(net::SamePartyContext::Type::kCrossParty),
           /*frame_entry=*/nullptr,
           /*top_frame_entry=*/nullptr),
-      maybe_included_cookies, excluded_cookies));
+      net::CookieSettingOverrides(), maybe_included_cookies, excluded_cookies));
 
   EXPECT_THAT(maybe_included_cookies, IsEmpty());
   EXPECT_THAT(
@@ -1074,7 +1081,7 @@
           net::SamePartyContext(net::SamePartyContext::Type::kCrossParty),
           /*frame_entry=*/nullptr,
           /*top_frame_entry=*/nullptr),
-      maybe_included_cookies, excluded_cookies));
+      net::CookieSettingOverrides(), maybe_included_cookies, excluded_cookies));
   EXPECT_THAT(maybe_included_cookies,
               ElementsAre(MatchesCookieWithAccessResult(
                   net::MatchesCookieWithName("__Host-partitioned"),
@@ -1100,7 +1107,7 @@
           net::SamePartyContext(net::SamePartyContext::Type::kCrossParty),
           /*frame_entry=*/nullptr,
           /*top_frame_entry=*/nullptr),
-      maybe_included_cookies, excluded_cookies));
+      net::CookieSettingOverrides(), maybe_included_cookies, excluded_cookies));
   EXPECT_THAT(maybe_included_cookies, IsEmpty());
   EXPECT_THAT(
       excluded_cookies,
@@ -1131,7 +1138,7 @@
           net::SamePartyContext(net::SamePartyContext::Type::kCrossParty),
           /*frame_entry=*/nullptr,
           /*top_frame_entry=*/nullptr),
-      maybe_included_cookies, excluded_cookies));
+      net::CookieSettingOverrides(), maybe_included_cookies, excluded_cookies));
   EXPECT_THAT(maybe_included_cookies, IsEmpty());
   EXPECT_THAT(
       excluded_cookies,
@@ -1163,7 +1170,7 @@
           net::SamePartyContext(net::SamePartyContext::Type::kCrossParty),
           /*frame_entry=*/nullptr,
           /*top_frame_entry=*/nullptr),
-      maybe_included_cookies, excluded_cookies));
+      net::CookieSettingOverrides(), maybe_included_cookies, excluded_cookies));
   EXPECT_THAT(maybe_included_cookies,
               ElementsAre(MatchesCookieWithAccessResult(
                   net::MatchesCookieWithName("__Host-partitioned"),

services/network/cors/cors_url_loader.cc

diff --git a/services/network/cors/cors_url_loader.cc b/services/network/cors/cors_url_loader.cc
index ff42dffc..76e99b2 100644
--- a/services/network/cors/cors_url_loader.cc
+++ b/services/network/cors/cors_url_loader.cc
@@ -315,6 +315,7 @@
       factory_client_security_state_(factory_client_security_state),
       cross_origin_embedder_policy_(cross_origin_embedder_policy),
       devtools_observer_(std::move(devtools_observer)),
+      weak_devtools_observer_factory_(&devtools_observer_),
       // CORS preflight related events are logged in a series of URL_REQUEST
       // logs.
       net_log_(net::NetLogWithSource::Make(net::NetLog::Get(),
@@ -776,14 +777,6 @@
     return;
   }
 
-  // Clone the devtools observer only if the original request has a
-  // |devtools_request_id|.
-  mojo::PendingRemote<mojom::DevToolsObserver> devtools_observer;
-  if (devtools_observer_ && request_.devtools_request_id) {
-    devtools_observer_->Clone(
-        devtools_observer.InitWithNewPipeAndPassReceiver());
-  }
-
   // Since we're doing a preflight, we won't reuse the original request. Cancel
   // it now to free up the socket.
   network_loader_.reset();
@@ -798,7 +791,7 @@
       GetPrivateNetworkAccessPreflightBehavior(), tainted_,
       net::NetworkTrafficAnnotationTag(traffic_annotation_),
       network_loader_factory_, isolation_info_, CloneClientSecurityState(),
-      std::move(devtools_observer), net_log_,
+      weak_devtools_observer_factory_.GetWeakPtr(), net_log_,
       context_->acam_preflight_spec_conformant());
 }
 

services/network/cors/cors_url_loader.h

diff --git a/services/network/cors/cors_url_loader.h b/services/network/cors/cors_url_loader.h
index e195c03..1336af3 100644
--- a/services/network/cors/cors_url_loader.h
+++ b/services/network/cors/cors_url_loader.h
@@ -308,6 +308,8 @@
   bool sending_pna_only_warning_preflight_ = false;
 
   mojo::Remote<mojom::DevToolsObserver> devtools_observer_;
+  base::WeakPtrFactory<mojo::Remote<mojom::DevToolsObserver>>
+      weak_devtools_observer_factory_;
 
   net::NetLogWithSource net_log_;
 

services/network/cors/preflight_controller.cc

diff --git a/services/network/cors/preflight_controller.cc b/services/network/cors/preflight_controller.cc
index eaa6cc0..19fe6626 100644
--- a/services/network/cors/preflight_controller.cc
+++ b/services/network/cors/preflight_controller.cc
@@ -9,6 +9,7 @@
 
 #include "base/bind.h"
 #include "base/memory/raw_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
@@ -316,7 +317,7 @@
     bool tainted,
     PrivateNetworkAccessPreflightBehavior private_network_access_behavior,
     const mojom::ClientSecurityStatePtr& client_security_state,
-    mojom::DevToolsObserver* devtools_observer,
+    base::WeakPtr<mojo::Remote<mojom::DevToolsObserver>> devtools_observer,
     absl::optional<CorsErrorStatus>* detected_error_status) {
   DCHECK(detected_error_status);
 
@@ -344,11 +345,12 @@
 
     // We only report these errors as warnings when they are suppressed, since
     // `CorsURLLoader` already reports them otherwise.
-    if (devtools_observer) {
-      devtools_observer->OnCorsError(
-          original_request.devtools_request_id,
-          original_request.request_initiator, client_security_state.Clone(),
-          original_request.url, *status, /*is_warning=*/true);
+    if (devtools_observer && *devtools_observer) {
+      (*devtools_observer)
+          ->OnCorsError(original_request.devtools_request_id,
+                        original_request.request_initiator,
+                        client_security_state.Clone(), original_request.url,
+                        *status, /*is_warning=*/true);
     }
 
     base::UmaHistogramEnumeration(kPreflightWarningHistogramName,
@@ -403,7 +405,7 @@
       const net::NetworkTrafficAnnotationTag& annotation_tag,
       const net::NetworkIsolationKey& network_isolation_key,
       mojom::ClientSecurityStatePtr client_security_state,
-      mojo::PendingRemote<mojom::DevToolsObserver> devtools_observer,
+      base::WeakPtr<mojo::Remote<mojom::DevToolsObserver>> devtools_observer,
       const net::NetLogWithSource net_log,
       bool acam_preflight_spec_conformant)
       : controller_(controller),
@@ -423,14 +425,15 @@
     auto preflight_request =
         CreatePreflightRequest(request, tainted, net_log, devtools_request_id_);
 
-    if (devtools_observer_) {
+    if (devtools_observer_ && *devtools_observer_) {
       DCHECK(devtools_request_id_);
       network::mojom::URLRequestDevToolsInfoPtr request_info =
           network::ExtractDevToolsInfo(*preflight_request);
-      devtools_observer_->OnCorsPreflightRequest(
-          *devtools_request_id_, preflight_request->headers,
-          std::move(request_info), original_request_.url,
-          original_request_.devtools_request_id.value_or(""));
+      (*devtools_observer_)
+          ->OnCorsPreflightRequest(
+              *devtools_request_id_, preflight_request->headers,
+              std::move(request_info), original_request_.url,
+              original_request_.devtools_request_id.value_or(""));
     }
     loader_ =
         SimpleURLLoader::Create(std::move(preflight_request), annotation_tag);
@@ -474,11 +477,12 @@
   void HandleRedirect(const net::RedirectInfo& redirect_info,
                       const network::mojom::URLResponseHead& response_head,
                       std::vector<std::string>* to_be_removed_headers) {
-    if (devtools_observer_) {
+    if (devtools_observer_ && *devtools_observer_) {
       DCHECK(devtools_request_id_);
-      devtools_observer_->OnCorsPreflightRequestCompleted(
-          *devtools_request_id_,
-          network::URLLoaderCompletionStatus(net::ERR_INVALID_REDIRECT));
+      (*devtools_observer_)
+          ->OnCorsPreflightRequestCompleted(
+              *devtools_request_id_,
+              network::URLLoaderCompletionStatus(net::ERR_INVALID_REDIRECT));
     }
 
     std::move(completion_callback_)
@@ -492,14 +496,18 @@
 
   void HandleResponseHeader(const GURL& final_url,
                             const mojom::URLResponseHead& head) {
-    if (devtools_observer_) {
+    if (devtools_observer_ && *devtools_observer_) {
       DCHECK(devtools_request_id_);
       mojom::URLResponseHeadDevToolsInfoPtr head_info =
           ExtractDevToolsInfo(head);
-      devtools_observer_->OnCorsPreflightResponse(
-          *devtools_request_id_, original_request_.url, std::move(head_info));
-      devtools_observer_->OnCorsPreflightRequestCompleted(
-          *devtools_request_id_, network::URLLoaderCompletionStatus(net::OK));
+      (*devtools_observer_)
+          ->OnCorsPreflightResponse(*devtools_request_id_,
+                                    original_request_.url,
+                                    std::move(head_info));
+      (*devtools_observer_)
+          ->OnCorsPreflightRequestCompleted(
+              *devtools_request_id_,
+              network::URLLoaderCompletionStatus(net::OK));
     }
 
     absl::optional<CorsErrorStatus> detected_error_status;
@@ -507,8 +515,7 @@
     std::unique_ptr<PreflightResult> result = CreatePreflightResult(
         final_url, head, original_request_, tainted_,
         private_network_access_behavior_, client_security_state_,
-        devtools_observer_ ? devtools_observer_.get() : nullptr,
-        &detected_error_status);
+        devtools_observer_, &detected_error_status);
 
     if (result) {
       // Only log if there is a result to log.
@@ -546,10 +553,12 @@
       // As HandleResponseHeader() isn't called due to a request failure, such
       // as unknown hosts. unreachable remote, reset by peer, and so on, we
       // still hold `completion_callback_` to invoke.
-      if (devtools_observer_) {
+      if (devtools_observer_ && *devtools_observer_) {
         DCHECK(devtools_request_id_);
-        devtools_observer_->OnCorsPreflightRequestCompleted(
-            *devtools_request_id_, network::URLLoaderCompletionStatus(error));
+        (*devtools_observer_)
+            ->OnCorsPreflightRequestCompleted(
+                *devtools_request_id_,
+                network::URLLoaderCompletionStatus(error));
       }
       std::move(completion_callback_)
           .Run(error,
@@ -581,7 +590,7 @@
   absl::optional<base::UnguessableToken> devtools_request_id_;
   const net::NetworkIsolationKey network_isolation_key_;
   const mojom::ClientSecurityStatePtr client_security_state_;
-  mojo::Remote<mojom::DevToolsObserver> devtools_observer_;
+  base::WeakPtr<mojo::Remote<mojom::DevToolsObserver>> devtools_observer_;
   const net::NetLogWithSource net_log_;
   const bool acam_preflight_spec_conformant_;
 };
@@ -607,11 +616,13 @@
     bool tainted,
     PrivateNetworkAccessPreflightBehavior private_network_access_behavior,
     absl::optional<CorsErrorStatus>* detected_error_status) {
-  return CreatePreflightResult(final_url, head, original_request, tainted,
-                               private_network_access_behavior,
-                               /*client_security_state=*/nullptr,
-                               /*devtools_observer=*/nullptr,
-                               detected_error_status);
+  return CreatePreflightResult(
+      final_url, head, original_request, tainted,
+      private_network_access_behavior,
+      /*client_security_state=*/nullptr,
+      /*devtools_observer=*/
+      base::WeakPtr<mojo::Remote<mojom::DevToolsObserver>>(),
+      detected_error_status);
 }
 
 // static
@@ -644,7 +655,7 @@
     mojom::URLLoaderFactory* loader_factory,
     const net::IsolationInfo& isolation_info,
     mojom::ClientSecurityStatePtr client_security_state,
-    mojo::PendingRemote<mojom::DevToolsObserver> devtools_observer,
+    base::WeakPtr<mojo::Remote<mojom::DevToolsObserver>> devtools_observer,
     const net::NetLogWithSource& net_log,
     bool acam_preflight_spec_conformant) {
   DCHECK(request.request_initiator);
@@ -669,7 +680,7 @@
       this, std::move(callback), request, with_trusted_header_client,
       non_wildcard_request_headers_support, private_network_access_behavior,
       tainted, annotation_tag, network_isolation_key,
-      std::move(client_security_state), std::move(devtools_observer), net_log,
+      std::move(client_security_state), devtools_observer, net_log,
       acam_preflight_spec_conformant));
   (*emplaced_pair.first)->Request(loader_factory);
 }

services/network/cors/preflight_controller.h

diff --git a/services/network/cors/preflight_controller.h b/services/network/cors/preflight_controller.h
index ce568066..1a74bd9 100644
--- a/services/network/cors/preflight_controller.h
+++ b/services/network/cors/preflight_controller.h
@@ -11,6 +11,7 @@
 #include "base/component_export.h"
 #include "base/containers/unique_ptr_adapters.h"
 #include "base/memory/raw_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "base/types/expected.h"
 #include "base/types/strong_alias.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
@@ -114,7 +115,7 @@
       mojom::URLLoaderFactory* loader_factory,
       const net::IsolationInfo& isolation_info,
       mojom::ClientSecurityStatePtr client_security_state,
-      mojo::PendingRemote<mojom::DevToolsObserver> devtools_observer,
+      base::WeakPtr<mojo::Remote<mojom::DevToolsObserver>> devtools_observer,
       const net::NetLogWithSource& net_log,
       bool acam_preflight_spec_conformant);
 

services/network/cors/preflight_controller_unittest.cc

diff --git a/services/network/cors/preflight_controller_unittest.cc b/services/network/cors/preflight_controller_unittest.cc
index a040d32..fc3d39e 100644
--- a/services/network/cors/preflight_controller_unittest.cc
+++ b/services/network/cors/preflight_controller_unittest.cc
@@ -237,7 +237,8 @@
       PrivateNetworkAccessPreflightBehavior::kWarn, /*tainted=*/false,
       TRAFFIC_ANNOTATION_FOR_TESTS, &url_loader_factory, net::IsolationInfo(),
       /*client_security_state=*/nullptr,
-      /*devtools_observer=*/mojo::NullRemote(), net_log, true);
+      /*devtools_observer=*/
+      base::WeakPtr<mojo::Remote<mojom::DevToolsObserver>>(), net_log, true);
 
   preflight_controller.PerformPreflightCheck(
       base::BindOnce([](int, absl::optional<CorsErrorStatus>, bool) {}),
@@ -246,7 +247,8 @@
       PrivateNetworkAccessPreflightBehavior::kWarn, /*tainted=*/false,
       TRAFFIC_ANNOTATION_FOR_TESTS, &url_loader_factory, net::IsolationInfo(),
       /*client_security_state=*/nullptr,
-      /*devtools_observer=*/mojo::NullRemote(), net_log, true);
+      /*devtools_observer=*/
+      base::WeakPtr<mojo::Remote<mojom::DevToolsObserver>>(), net_log, true);
 
   ASSERT_EQ(2, url_loader_factory.NumPending());
   EXPECT_EQ(mojom::kURLLoadOptionAsCorsPreflight,
@@ -457,6 +459,11 @@
       mojom::ClientSecurityStatePtr client_security_state = nullptr) {
     DCHECK(preflight_controller_);
     run_loop_ = std::make_unique<base::RunLoop>();
+
+    mojo::Remote<mojom::DevToolsObserver> devtools_observer(
+        devtools_observer_->Bind());
+    base::WeakPtrFactory<mojo::Remote<mojom::DevToolsObserver>>
+        weak_devtools_observer_factory(&devtools_observer);
     preflight_controller_->PerformPreflightCheck(
         base::BindOnce(&PreflightControllerTest::HandleRequestCompletion,
                        base::Unretained(this)),
@@ -464,7 +471,7 @@
         non_wildcard_request_headers_support_, private_network_access_behavior,
         tainted, TRAFFIC_ANNOTATION_FOR_TESTS, url_loader_factory_remote_.get(),
         isolation_info, std::move(client_security_state),
-        devtools_observer_->Bind(),
+        weak_devtools_observer_factory.GetWeakPtr(),
         net::NetLogWithSource::Make(net::NetLog::Get(),
                                     net::NetLogSourceType::URL_REQUEST),
         true);

services/network/network_context_unittest.cc

diff --git a/services/network/network_context_unittest.cc b/services/network/network_context_unittest.cc
index 9d32b17..b860e1d 100644
--- a/services/network/network_context_unittest.cc
+++ b/services/network/network_context_unittest.cc
@@ -74,6 +74,7 @@
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_access_result.h"
 #include "net/cookies/cookie_options.h"
+#include "net/cookies/cookie_setting_override.h"
 #include "net/cookies/cookie_store.h"
 #include "net/cookies/cookie_store_test_callbacks.h"
 #include "net/cookies/cookie_util.h"
@@ -4183,7 +4184,8 @@
                 ->network_delegate()
                 ->ForcePrivacyMode(GURL("http://foo.com"),
                                    net::SiteForCookies::FromUrl(kOtherURL),
-                                   url::Origin::Create(kOtherURL)));
+                                   url::Origin::Create(kOtherURL),
+                                   net::CookieSettingOverrides()));
 }
 
 TEST_F(NetworkContextTest, PrivacyModeEnabledIfCookiesBlocked) {
@@ -4200,13 +4202,32 @@
       network_context->url_request_context()
           ->network_delegate()
           ->ForcePrivacyMode(kURL, net::SiteForCookies::FromUrl(kOtherURL),
-                             url::Origin::Create(kOtherURL)));
-  EXPECT_EQ(
-      net::NetworkDelegate::PrivacySetting::kStateAllowed,
-      network_context->url_request_context()
-          ->network_delegate()
-          ->ForcePrivacyMode(kOtherURL, net::SiteForCookies::FromUrl(kURL),
-                             url::Origin::Create(kURL)));
+                             url::Origin::Create(kOtherURL),
+                             net::CookieSettingOverrides()));
+  EXPECT_EQ(net::NetworkDelegate::PrivacySetting::kStateAllowed,
+            network_context->url_request_context()
+                ->network_delegate()
+                ->ForcePrivacyMode(
+                    kOtherURL, net::SiteForCookies::FromUrl(kURL),
+                    url::Origin::Create(kURL), net::CookieSettingOverrides()));
+
+  // Even with the `kForceThirdPartyByUser` override, the results don't change.
+  EXPECT_EQ(net::NetworkDelegate::PrivacySetting::kStateDisallowed,
+            network_context->url_request_context()
+                ->network_delegate()
+                ->ForcePrivacyMode(
+                    kURL, net::SiteForCookies::FromUrl(kOtherURL),
+                    url::Origin::Create(kOtherURL),
+                    net::CookieSettingOverrides(
+                        net::CookieSettingOverride::kForceThirdPartyByUser)));
+  EXPECT_EQ(net::NetworkDelegate::PrivacySetting::kStateAllowed,
+            network_context->url_request_context()
+                ->network_delegate()
+                ->ForcePrivacyMode(
+                    kOtherURL, net::SiteForCookies::FromUrl(kURL),
+                    url::Origin::Create(kURL),
+                    net::CookieSettingOverrides(
+                        net::CookieSettingOverride::kForceThirdPartyByUser)));
 }
 
 TEST_F(NetworkContextTest, PrivacyModeDisabledIfCookiesAllowed) {
@@ -4223,7 +4244,8 @@
       network_context->url_request_context()
           ->network_delegate()
           ->ForcePrivacyMode(kURL, net::SiteForCookies::FromUrl(kOtherURL),
-                             url::Origin::Create(kOtherURL)));
+                             url::Origin::Create(kOtherURL),
+                             net::CookieSettingOverrides()));
 }
 
 TEST_F(NetworkContextTest, PrivacyModeDisabledIfCookiesSettingForOtherURL) {
@@ -4241,7 +4263,8 @@
       network_context->url_request_context()
           ->network_delegate()
           ->ForcePrivacyMode(kURL, net::SiteForCookies::FromUrl(kOtherURL),
-                             url::Origin::Create(kOtherURL)));
+                             url::Origin::Create(kOtherURL),
+                             net::CookieSettingOverrides()));
 }
 
 TEST_F(NetworkContextTest, PrivacyModeEnabledIfThirdPartyCookiesBlocked) {
@@ -4256,20 +4279,34 @@
       network_context->url_request_context()->network_delegate();
 
   network_context->cookie_manager()->BlockThirdPartyCookies(true);
-  EXPECT_EQ(net::NetworkDelegate::PrivacySetting::kPartitionedStateAllowedOnly,
-            delegate->ForcePrivacyMode(
-                kURL, net::SiteForCookies::FromUrl(kOtherURL), kOtherOrigin));
+  EXPECT_EQ(
+      net::NetworkDelegate::PrivacySetting::kPartitionedStateAllowedOnly,
+      delegate->ForcePrivacyMode(kURL, net::SiteForCookies::FromUrl(kOtherURL),
+                                 kOtherOrigin, net::CookieSettingOverrides()));
   EXPECT_EQ(net::NetworkDelegate::PrivacySetting::kStateAllowed,
             delegate->ForcePrivacyMode(kURL, net::SiteForCookies::FromUrl(kURL),
-                                       kOrigin));
+                                       kOrigin, net::CookieSettingOverrides()));
+
+  // `kForceThirdPartyByUser` unblocks access.
+  EXPECT_EQ(net::NetworkDelegate::PrivacySetting::kStateAllowed,
+            delegate->ForcePrivacyMode(
+                kURL, net::SiteForCookies::FromUrl(kOtherURL), kOtherOrigin,
+                net::CookieSettingOverrides(
+                    net::CookieSettingOverride::kForceThirdPartyByUser)));
+  EXPECT_EQ(net::NetworkDelegate::PrivacySetting::kStateAllowed,
+            delegate->ForcePrivacyMode(
+                kURL, net::SiteForCookies::FromUrl(kURL), kOrigin,
+                net::CookieSettingOverrides(
+                    net::CookieSettingOverride::kForceThirdPartyByUser)));
 
   network_context->cookie_manager()->BlockThirdPartyCookies(false);
-  EXPECT_EQ(net::NetworkDelegate::PrivacySetting::kStateAllowed,
-            delegate->ForcePrivacyMode(
-                kURL, net::SiteForCookies::FromUrl(kOtherURL), kOtherOrigin));
+  EXPECT_EQ(
+      net::NetworkDelegate::PrivacySetting::kStateAllowed,
+      delegate->ForcePrivacyMode(kURL, net::SiteForCookies::FromUrl(kOtherURL),
+                                 kOtherOrigin, net::CookieSettingOverrides()));
   EXPECT_EQ(net::NetworkDelegate::PrivacySetting::kStateAllowed,
             delegate->ForcePrivacyMode(kURL, net::SiteForCookies::FromUrl(kURL),
-                                       kOrigin));
+                                       kOrigin, net::CookieSettingOverrides()));
 }
 
 TEST_F(NetworkContextTest, CanSetCookieFalseIfCookiesBlocked) {
@@ -4331,7 +4368,7 @@
                               net::SamePartyContext::Type::kCrossParty),
                           /*frame_entry=*/nullptr,
                           /*top_frame_entry=*/nullptr),
-                      included, excluded));
+                      net::CookieSettingOverrides(), included, excluded));
   SetDefaultContentSetting(CONTENT_SETTING_BLOCK, network_context.get());
   EXPECT_FALSE(network_context->url_request_context()
                    ->network_delegate()
@@ -4342,7 +4379,7 @@
                                net::SamePartyContext::Type::kCrossParty),
                            /*frame_entry=*/nullptr,
                            /*top_frame_entry=*/nullptr),
-                       included, excluded));
+                       net::CookieSettingOverrides(), included, excluded));
 }
 
 TEST_F(NetworkContextTest,
@@ -4366,6 +4403,48 @@
                               net::SamePartyContext::Type::kCrossParty),
                           /*frame_entry=*/nullptr,
                           /*top_frame_entry=*/nullptr),
+                      net::CookieSettingOverrides(), included, excluded));
+}
+
+TEST_F(NetworkContextTest, AnnotateAndMoveUserBlockedCookies_3PCookiesBlocked) {
+  std::unique_ptr<NetworkContext> network_context =
+      CreateContextWithParams(CreateNetworkContextParamsForTesting());
+
+  network_context->cookie_manager()->BlockThirdPartyCookies(true);
+
+  auto context = CreateTestURLRequestContextBuilder()->Build();
+  std::unique_ptr<net::URLRequest> request =
+      context->CreateRequest(GURL("http://foo.com"), net::DEFAULT_PRIORITY,
+                             nullptr, TRAFFIC_ANNOTATION_FOR_TESTS);
+
+  request->set_site_for_cookies(net::SiteForCookies());
+
+  net::CookieAccessResultList included;
+  net::CookieAccessResultList excluded;
+
+  EXPECT_FALSE(network_context->url_request_context()
+                   ->network_delegate()
+                   ->AnnotateAndMoveUserBlockedCookies(
+                       *request,
+                       net::FirstPartySetMetadata(
+                           net::SamePartyContext(
+                               net::SamePartyContext::Type::kCrossParty),
+                           /*frame_entry=*/nullptr,
+                           /*top_frame_entry=*/nullptr),
+                       net::CookieSettingOverrides(), included, excluded));
+
+  // `kForce unblocks access.
+  EXPECT_TRUE(network_context->url_request_context()
+                  ->network_delegate()
+                  ->AnnotateAndMoveUserBlockedCookies(
+                      *request,
+                      net::FirstPartySetMetadata(
+                          net::SamePartyContext(
+                              net::SamePartyContext::Type::kCrossParty),
+                          /*frame_entry=*/nullptr,
+                          /*top_frame_entry=*/nullptr),
+                      net::CookieSettingOverrides(
+                          net::CookieSettingOverride::kForceThirdPartyByUser),
                       included, excluded));
 }
 

services/network/network_service_network_delegate.cc

diff --git a/services/network/network_service_network_delegate.cc b/services/network/network_service_network_delegate.cc
index 5dc7b57d..b959d3c 100644
--- a/services/network/network_service_network_delegate.cc
+++ b/services/network/network_service_network_delegate.cc
@@ -189,6 +189,7 @@
 bool NetworkServiceNetworkDelegate::OnAnnotateAndMoveUserBlockedCookies(
     const net::URLRequest& request,
     const net::FirstPartySetMetadata& first_party_set_metadata,
+    net::CookieSettingOverrides overrides,
     net::CookieAccessResultList& maybe_included_cookies,
     net::CookieAccessResultList& excluded_cookies) {
   if (!network_context_->cookie_manager()
@@ -196,7 +197,7 @@
            .AnnotateAndMoveUserBlockedCookies(
                request.url(), request.site_for_cookies(),
                base::OptionalToPtr(request.isolation_info().top_frame_origin()),
-               first_party_set_metadata, maybe_included_cookies,
+               first_party_set_metadata, overrides, maybe_included_cookies,
                excluded_cookies)) {
     // CookieSettings has already moved and annotated the cookies.
     return false;
@@ -247,10 +248,11 @@
 NetworkServiceNetworkDelegate::OnForcePrivacyMode(
     const GURL& url,
     const net::SiteForCookies& site_for_cookies,
-    const absl::optional<url::Origin>& top_frame_origin) const {
+    const absl::optional<url::Origin>& top_frame_origin,
+    net::CookieSettingOverrides overrides) const {
   return network_context_->cookie_manager()
       ->cookie_settings()
-      .IsPrivacyModeEnabled(url, site_for_cookies, top_frame_origin);
+      .IsPrivacyModeEnabled(url, site_for_cookies, top_frame_origin, overrides);
 }
 
 bool NetworkServiceNetworkDelegate::

services/network/network_service_network_delegate.h

diff --git a/services/network/network_service_network_delegate.h b/services/network/network_service_network_delegate.h
index e674123..9e4f57c1 100644
--- a/services/network/network_service_network_delegate.h
+++ b/services/network/network_service_network_delegate.h
@@ -11,6 +11,7 @@
 #include "mojo/public/cpp/bindings/remote.h"
 #include "net/base/completion_once_callback.h"
 #include "net/base/network_delegate_impl.h"
+#include "net/cookies/cookie_setting_override.h"
 #include "net/first_party_sets/first_party_set_metadata.h"
 #include "net/first_party_sets/first_party_sets_cache_filter.h"
 #include "services/network/cookie_settings.h"
@@ -73,6 +74,7 @@
   bool OnAnnotateAndMoveUserBlockedCookies(
       const net::URLRequest& request,
       const net::FirstPartySetMetadata& first_party_set_metadata,
+      net::CookieSettingOverrides overrides,
       net::CookieAccessResultList& maybe_included_cookies,
       net::CookieAccessResultList& excluded_cookies) override;
   bool OnCanSetCookie(const net::URLRequest& request,
@@ -81,7 +83,8 @@
   net::NetworkDelegate::PrivacySetting OnForcePrivacyMode(
       const GURL& url,
       const net::SiteForCookies& site_for_cookies,
-      const absl::optional<url::Origin>& top_frame_origin) const override;
+      const absl::optional<url::Origin>& top_frame_origin,
+      net::CookieSettingOverrides overrides) const override;
   bool OnCancelURLRequestWithPolicyViolatingReferrerHeader(
       const net::URLRequest& request,
       const GURL& target_url,

services/network/public/cpp/resource_request.cc

diff --git a/services/network/public/cpp/resource_request.cc b/services/network/public/cpp/resource_request.cc
index d2dd333..1ed8dec 100644
--- a/services/network/public/cpp/resource_request.cc
+++ b/services/network/public/cpp/resource_request.cc
@@ -217,6 +217,7 @@
          load_flags == request.load_flags &&
          resource_type == request.resource_type &&
          priority == request.priority &&
+         priority_incremental == request.priority_incremental &&
          devtools_stack_id == request.devtools_stack_id &&
          cors_preflight_policy == request.cors_preflight_policy &&
          originated_from_service_worker ==

services/network/public/cpp/resource_request.h

diff --git a/services/network/public/cpp/resource_request.h b/services/network/public/cpp/resource_request.h
index a97f7c4..7ca1df6 100644
--- a/services/network/public/cpp/resource_request.h
+++ b/services/network/public/cpp/resource_request.h
@@ -139,6 +139,7 @@
   // frames are considered a kSubframe for ResourceType.
   int resource_type = 0;
   net::RequestPriority priority = net::IDLE;
+  bool priority_incremental = net::kDefaultPriorityIncremental;
   mojom::CorsPreflightPolicy cors_preflight_policy =
       mojom::CorsPreflightPolicy::kConsiderPreflight;
   bool originated_from_service_worker = false;

services/network/public/cpp/url_request_mojom_traits.cc

diff --git a/services/network/public/cpp/url_request_mojom_traits.cc b/services/network/public/cpp/url_request_mojom_traits.cc
index 1578371..38c6a61b 100644
--- a/services/network/public/cpp/url_request_mojom_traits.cc
+++ b/services/network/public/cpp/url_request_mojom_traits.cc
@@ -199,6 +199,7 @@
       data.update_first_party_url_on_redirect();
   out->load_flags = data.load_flags();
   out->resource_type = data.resource_type();
+  out->priority_incremental = data.priority_incremental();
   out->originated_from_service_worker = data.originated_from_service_worker();
   out->skip_service_worker = data.skip_service_worker();
   out->corb_detachable = data.corb_detachable();

services/network/public/cpp/url_request_mojom_traits.h

diff --git a/services/network/public/cpp/url_request_mojom_traits.h b/services/network/public/cpp/url_request_mojom_traits.h
index f9022341..1331e8d1 100644
--- a/services/network/public/cpp/url_request_mojom_traits.h
+++ b/services/network/public/cpp/url_request_mojom_traits.h
@@ -214,6 +214,9 @@
       const network::ResourceRequest& request) {
     return request.priority;
   }
+  static bool priority_incremental(const network::ResourceRequest& request) {
+    return request.priority_incremental;
+  }
   static network::mojom::CorsPreflightPolicy cors_preflight_policy(
       const network::ResourceRequest& request) {
     return request.cors_preflight_policy;

services/network/public/cpp/url_request_mojom_traits_unittest.cc

diff --git a/services/network/public/cpp/url_request_mojom_traits_unittest.cc b/services/network/public/cpp/url_request_mojom_traits_unittest.cc
index 72310bde..05abb438 100644
--- a/services/network/public/cpp/url_request_mojom_traits_unittest.cc
+++ b/services/network/public/cpp/url_request_mojom_traits_unittest.cc
@@ -70,6 +70,7 @@
   original.load_flags = 3;
   original.resource_type = 2;
   original.priority = net::IDLE;
+  original.priority_incremental = net::kDefaultPriorityIncremental;
   original.cors_preflight_policy =
       mojom::CorsPreflightPolicy::kConsiderPreflight;
   original.originated_from_service_worker = false;

services/network/public/mojom/url_request.mojom

diff --git a/services/network/public/mojom/url_request.mojom b/services/network/public/mojom/url_request.mojom
index 0363f3db..ae49a7b 100644
--- a/services/network/public/mojom/url_request.mojom
+++ b/services/network/public/mojom/url_request.mojom
@@ -257,6 +257,13 @@
   // The priority of this request determined by Blink.
   RequestPriority priority;
 
+  // True if the request can be downloaded in parallel with other requests of
+  // an equivalent priority for servers that support HTTP Extensible
+  // Prioritization on multiplexed connections (RFC 9218).
+  // Maps directly to the "incremental" parameter of priority.
+  // https://www.rfc-editor.org/rfc/rfc9218.html#name-incremental
+  bool priority_incremental;
+
   // A policy to decide if CORS-preflight fetch should be performed.
   CorsPreflightPolicy cors_preflight_policy;
 

services/network/restricted_cookie_manager.cc

diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc
index 6f6d6f5e..057b9c2 100644
--- a/services/network/restricted_cookie_manager.cc
+++ b/services/network/restricted_cookie_manager.cc
@@ -434,7 +434,7 @@
   net::CookieAccessResultList excluded_cookies = excluded_list;
   cookie_settings().AnnotateAndMoveUserBlockedCookies(
       url, site_for_cookies, &top_frame_origin, first_party_set_metadata_,
-      maybe_included_cookies, excluded_cookies);
+      net::CookieSettingOverrides(), maybe_included_cookies, excluded_cookies);
 
   std::vector<net::CookieWithAccessResult> result;
   std::vector<mojom::CookieOrLineWithAccessResultPtr>

services/network/test/mock_devtools_observer.cc

diff --git a/services/network/test/mock_devtools_observer.cc b/services/network/test/mock_devtools_observer.cc
index f364b9d..7812f793 100644
--- a/services/network/test/mock_devtools_observer.cc
+++ b/services/network/test/mock_devtools_observer.cc
@@ -105,6 +105,13 @@
     const GURL& url,
     const network::CorsErrorStatus& status,
     bool is_warning) {
+  // Ignoring kUnexpectedPrivateNetworkAccess because the request will be
+  // restarted with a preflight and we care more about the CORS error that comes
+  // thereafter.
+  if (status.cors_error == mojom::CorsError::kUnexpectedPrivateNetworkAccess) {
+    return;
+  }
+
   OnCorsErrorParams params;
   params.devtools_request_id = devtools_request_id;
   params.initiator_origin = initiator_origin;

services/network/trust_tokens/trust_token_request_issuance_helper.cc

diff --git a/services/network/trust_tokens/trust_token_request_issuance_helper.cc b/services/network/trust_tokens/trust_token_request_issuance_helper.cc
index 957d987..e406d96b 100644
--- a/services/network/trust_tokens/trust_token_request_issuance_helper.cc
+++ b/services/network/trust_tokens/trust_token_request_issuance_helper.cc
@@ -136,6 +136,8 @@
     return;
   }
 
+  token_store_->RecordIssuance(*issuer_);
+
   if (custom_key_commitment_) {
     mojom::TrustTokenKeyCommitmentResultPtr keys =
         TrustTokenKeyCommitmentParser().Parse(*custom_key_commitment_);

services/network/trust_tokens/trust_token_request_issuance_helper_unittest.cc

diff --git a/services/network/trust_tokens/trust_token_request_issuance_helper_unittest.cc b/services/network/trust_tokens/trust_token_request_issuance_helper_unittest.cc
index 88d6221..f721424 100644
--- a/services/network/trust_tokens/trust_token_request_issuance_helper_unittest.cc
+++ b/services/network/trust_tokens/trust_token_request_issuance_helper_unittest.cc
@@ -28,6 +28,7 @@
 #include "services/network/test/trust_token_test_util.h"
 #include "services/network/trust_tokens/operating_system_matching.h"
 #include "services/network/trust_tokens/proto/public.pb.h"
+#include "services/network/trust_tokens/proto/storage.pb.h"
 #include "services/network/trust_tokens/trust_token_key_commitment_getter.h"
 #include "services/network/trust_tokens/trust_token_parameterization.h"
 #include "services/network/trust_tokens/trust_token_store.h"
@@ -44,6 +45,7 @@
 using ::testing::ElementsAre;
 using ::testing::Invoke;
 using ::testing::IsEmpty;
+using ::testing::Optional;
 using ::testing::Property;
 using ::testing::Return;
 using ::testing::ReturnNull;
@@ -51,10 +53,16 @@
 using ::testing::StrictMock;
 using ::testing::WithArgs;
 
-using TrustTokenRequestIssuanceHelperTest = TrustTokenRequestHelperTest;
 using UnblindedTokens =
     TrustTokenRequestIssuanceHelper::Cryptographer::UnblindedTokens;
 
+class TrustTokenRequestIssuanceHelperTest : public TrustTokenRequestHelperTest {
+ public:
+  explicit TrustTokenRequestIssuanceHelperTest()
+      : TrustTokenRequestHelperTest(
+            base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
+};
+
 // FixedKeyCommitmentGetter returns the provided commitment result when
 // |Get| is called by the tested code.
 class FixedKeyCommitmentGetter : public TrustTokenKeyCommitmentGetter {
@@ -94,6 +102,55 @@
       std::unique_ptr<UnblindedTokens>(base::StringPiece response_header));
 };
 
+class MockExpiryDelegate : public TrustTokenStore::RecordExpiryDelegate {
+ public:
+  MOCK_METHOD3(IsRecordExpired,
+               bool(const TrustTokenRedemptionRecord&,
+                    const base::TimeDelta&,
+                    const SuitableTrustTokenOrigin&));
+};
+
+class MockTrustTokenPersister : public TrustTokenPersister {
+ public:
+  MOCK_METHOD1(GetIssuerConfig,
+               std::unique_ptr<TrustTokenIssuerConfig>(
+                   (const SuitableTrustTokenOrigin& issuer)));
+  MOCK_METHOD1(GetToplevelConfig,
+               std::unique_ptr<TrustTokenToplevelConfig>(
+                   const SuitableTrustTokenOrigin& toplevel));
+  MOCK_METHOD2(GetIssuerToplevelPairConfig,
+               std::unique_ptr<TrustTokenIssuerToplevelPairConfig>(
+                   const SuitableTrustTokenOrigin& issuer,
+                   const SuitableTrustTokenOrigin& toplevel));
+  MOCK_METHOD2(SetIssuerConfig,
+               void(const SuitableTrustTokenOrigin& issuer,
+                    std::unique_ptr<TrustTokenIssuerConfig> config));
+  MOCK_METHOD2(SetToplevelConfig,
+               void(const SuitableTrustTokenOrigin& toplevel,
+                    std::unique_ptr<TrustTokenToplevelConfig> config));
+  MOCK_METHOD3(
+      SetIssuerToplevelPairConfig,
+      void(const SuitableTrustTokenOrigin& issuer,
+           const SuitableTrustTokenOrigin& toplevel,
+           std::unique_ptr<TrustTokenIssuerToplevelPairConfig> config));
+  MOCK_METHOD2(DeleteIssuerConfig,
+               bool(PSTKeyMatcher key_matcher, PSTTimeMatcher time_matcher));
+  MOCK_METHOD1(DeleteToplevelConfig, bool(PSTKeyMatcher key_matcher));
+  MOCK_METHOD2(DeleteIssuerToplevelPairConfig,
+               bool(PSTKeyMatcher key_matcher, PSTTimeMatcher time_matcher));
+  MOCK_METHOD0(GetStoredTrustTokenCounts,
+               base::flat_map<SuitableTrustTokenOrigin, int>());
+};
+
+class MockTrustTokenStore : public TrustTokenStore {
+ public:
+  MockTrustTokenStore(std::unique_ptr<TrustTokenPersister> p,
+                      std::unique_ptr<RecordExpiryDelegate> ed)
+      : TrustTokenStore(std::move(p), std::move(ed)) {}
+
+  MOCK_METHOD1(RecordIssuance, void(const SuitableTrustTokenOrigin& issuer));
+};
+
 // Returns a key commitment result with reasonable values for all parameters.
 mojom::TrustTokenKeyCommitmentResultPtr ReasonableKeyCommitmentResult() {
   auto key_commitment_result = mojom::TrustTokenKeyCommitmentResult::New();
@@ -1033,4 +1090,74 @@
       ElementsAre(Property(&TrustToken::body, "a signed, unblinded token")));
 }
 
+// Check that the last issuance time is recorded for a given issuer.
+TEST_F(TrustTokenRequestIssuanceHelperTest, RecordsIssuanceTime) {
+  std::unique_ptr<MockTrustTokenPersister> mock_persister =
+      std::make_unique<MockTrustTokenPersister>();
+  std::unique_ptr<MockExpiryDelegate> mock_delegate =
+      std::make_unique<MockExpiryDelegate>();
+  std::unique_ptr<MockTrustTokenStore> mock_store =
+      std::make_unique<MockTrustTokenStore>(std::move(mock_persister),
+                                            std::move(mock_delegate));
+  // Make sure we are recording the issuance time when we execute begin.
+  EXPECT_CALL(*mock_store, RecordIssuance(_)).Times(1);
+
+  SuitableTrustTokenOrigin issuer =
+      *SuitableTrustTokenOrigin::Create(GURL("https://issuer.com/"));
+
+  auto cryptographer = std::make_unique<MockCryptographer>();
+  EXPECT_CALL(*cryptographer, Initialize(_, _)).WillOnce(Return(true));
+  EXPECT_CALL(*cryptographer, AddKey(_)).WillOnce(Return(true));
+  EXPECT_CALL(*cryptographer, BeginIssuance(_))
+      .WillOnce(
+          Return(std::string("this string contains some blinded tokens")));
+
+  TrustTokenRequestIssuanceHelper helper(
+      *SuitableTrustTokenOrigin::Create(GURL("https://toplevel.com/")),
+      mock_store.get(), ReasonableKeyCommitmentGetter(), absl::nullopt,
+      absl::nullopt, std::move(cryptographer));
+
+  auto request = MakeURLRequest("https://issuer.com/");
+  request->set_initiator(issuer);
+
+  ASSERT_EQ(ExecuteBeginOperationAndWaitForResult(&helper, request.get()),
+            mojom::TrustTokenOperationStatus::kOk);
+}
+
+// Check that the issuance time is updated after it is recorded
+// a second time.
+TEST_F(TrustTokenRequestIssuanceHelperTest, UpdatesIssuanceTime) {
+  std::unique_ptr<TrustTokenStore> store = TrustTokenStore::CreateForTesting();
+  SuitableTrustTokenOrigin issuer =
+      *SuitableTrustTokenOrigin::Create(GURL("https://issuer.com/"));
+
+  // Record a token issuance, and advance the clock 1 second. Last issuance
+  // should be 1 second ago.
+  store->RecordIssuance(issuer);
+  auto delta = base::Seconds(1);
+  env_.AdvanceClock(delta);
+  EXPECT_THAT(store->TimeSinceLastIssuance(issuer), Optional(delta));
+
+  auto cryptographer = std::make_unique<MockCryptographer>();
+  EXPECT_CALL(*cryptographer, Initialize(_, _)).WillOnce(Return(true));
+  EXPECT_CALL(*cryptographer, AddKey(_)).WillOnce(Return(true));
+  EXPECT_CALL(*cryptographer, BeginIssuance(_))
+      .WillOnce(
+          Return(std::string("this string contains some blinded tokens")));
+
+  TrustTokenRequestIssuanceHelper helper(
+      *SuitableTrustTokenOrigin::Create(GURL("https://toplevel.com/")),
+      store.get(), ReasonableKeyCommitmentGetter(), absl::nullopt,
+      absl::nullopt, std::move(cryptographer));
+
+  auto request = MakeURLRequest("https://issuer.com/");
+  request->set_initiator(issuer);
+
+  ASSERT_EQ(ExecuteBeginOperationAndWaitForResult(&helper, request.get()),
+            mojom::TrustTokenOperationStatus::kOk);
+
+  // Ensure the issuance time was updated (0 seconds since last issuance).
+  EXPECT_THAT(store->TimeSinceLastIssuance(issuer), Optional(base::Seconds(0)));
+}
+
 }  // namespace network

services/network/url_loader.cc

diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
index 3a82bfd8..f16ea5e7 100644
--- a/services/network/url_loader.cc
+++ b/services/network/url_loader.cc
@@ -702,6 +702,7 @@
   }
 
   url_request_->SetLoadFlags(request_load_flags);
+  url_request_->SetPriorityIncremental(request.priority_incremental);
   SetRequestCredentials(request.url);
 
   url_request_->SetRequestHeadersCallback(base::BindRepeating(

services/preferences/public/cpp/dictionary_value_update.cc

diff --git a/services/preferences/public/cpp/dictionary_value_update.cc b/services/preferences/public/cpp/dictionary_value_update.cc
index 9e5dfff..bb85ea6 100644
--- a/services/preferences/public/cpp/dictionary_value_update.cc
+++ b/services/preferences/public/cpp/dictionary_value_update.cc
@@ -16,7 +16,7 @@
 namespace prefs {
 
 DictionaryValueUpdate::DictionaryValueUpdate(UpdateCallback report_update,
-                                             base::DictionaryValue* value,
+                                             base::Value::Dict* value,
                                              std::vector<std::string> path)
     : report_update_(std::move(report_update)),
       value_(value),
@@ -27,15 +27,15 @@
 DictionaryValueUpdate::~DictionaryValueUpdate() = default;
 
 bool DictionaryValueUpdate::HasKey(base::StringPiece key) const {
-  return value_->GetDict().contains(key);
+  return value_->contains(key);
 }
 
 size_t DictionaryValueUpdate::size() const {
-  return value_->GetDict().size();
+  return value_->size();
 }
 
 bool DictionaryValueUpdate::empty() const {
-  return value_->GetDict().empty();
+  return value_->empty();
 }
 
 void DictionaryValueUpdate::Clear() {
@@ -43,27 +43,16 @@
     return;
 
   RecordSplitPath(std::vector<base::StringPiece>());
-  value_->GetDict().clear();
+  value_->clear();
 }
 
 void DictionaryValueUpdate::Set(base::StringPiece path, base::Value in_value) {
-  const base::Value* old_value = value_->FindPath(path);
+  const base::Value* old_value = value_->FindByDottedPath(path);
   if (old_value && *old_value == in_value)
     return;
 
   RecordPath(path);
-  value_->GetDict().SetByDottedPath(path, std::move(in_value));
-}
-
-void DictionaryValueUpdate::SetPath(
-    std::initializer_list<base::StringPiece> path,
-    base::Value value) {
-  const base::Value* found = value_->FindPath(path);
-  if (found && *found == value)
-    return;
-
-  RecordSplitPath(path);
-  value_->SetPath(path, std::move(value));
+  value_->SetByDottedPath(path, std::move(in_value));
 }
 
 void DictionaryValueUpdate::SetBoolean(base::StringPiece path, bool in_value) {
@@ -92,32 +81,32 @@
     base::StringPiece path,
     base::Value::Dict in_value) {
   RecordPath(path);
-  auto* dictionary_value = static_cast<base::DictionaryValue*>(
-      value_->SetPath(path, base::Value(std::move(in_value))));
+  base::Value::Dict& dictionary_value =
+      value_->SetByDottedPath(path, std::move(in_value))->GetDict();
 
   return std::make_unique<DictionaryValueUpdate>(
-      report_update_, dictionary_value, ConcatPath(path_, path));
+      report_update_, &dictionary_value, ConcatPath(path_, path));
 }
 
 base::Value* DictionaryValueUpdate::SetKey(base::StringPiece key,
                                            base::Value value) {
-  base::Value* found = value_->FindKey(key);
+  base::Value* found = value_->Find(key);
   if (found && *found == value)
     return found;
 
   RecordKey(key);
-  return value_->SetKey(key, std::move(value));
+  return value_->Set(key, std::move(value));
 }
 
 void DictionaryValueUpdate::SetWithoutPathExpansion(
     base::StringPiece key,
     std::unique_ptr<base::Value> in_value) {
-  const base::Value* old_value = value_->FindKey(key);
+  const base::Value* old_value = value_->Find(key);
   if (old_value && *old_value == *in_value) {
     return;
   }
   RecordKey(key);
-  value_->SetKey(key, base::Value::FromUniquePtrValue(std::move(in_value)));
+  value_->Set(key, base::Value::FromUniquePtrValue(std::move(in_value)));
 }
 
 std::unique_ptr<DictionaryValueUpdate>
@@ -125,18 +114,18 @@
     base::StringPiece path,
     base::Value::Dict in_value) {
   RecordKey(path);
-  auto* dictionary_value = static_cast<base::DictionaryValue*>(
-      value_->SetKey(path, base::Value(std::move(in_value))));
+  base::Value::Dict& dictionary_value =
+      value_->Set(path, std::move(in_value))->GetDict();
 
   std::vector<std::string> full_path = path_;
   full_path.push_back(std::string(path));
   return std::make_unique<DictionaryValueUpdate>(
-      report_update_, dictionary_value, std::move(full_path));
+      report_update_, &dictionary_value, std::move(full_path));
 }
 
 bool DictionaryValueUpdate::GetBoolean(base::StringPiece path,
                                        bool* out_value) const {
-  absl::optional<bool> value = value_->FindBoolPath(path);
+  absl::optional<bool> value = value_->FindBoolByDottedPath(path);
   if (!value.has_value())
     return false;
   if (out_value)
@@ -146,7 +135,7 @@
 
 bool DictionaryValueUpdate::GetInteger(base::StringPiece path,
                                        int* out_value) const {
-  if (absl::optional<int> value = value_->GetDict().FindIntByDottedPath(path)) {
+  if (absl::optional<int> value = value_->FindIntByDottedPath(path)) {
     if (out_value) {
       *out_value = *value;
     }
@@ -157,8 +146,7 @@
 
 bool DictionaryValueUpdate::GetDouble(base::StringPiece path,
                                       double* out_value) const {
-  if (absl::optional<double> value =
-          value_->GetDict().FindDoubleByDottedPath(path)) {
+  if (absl::optional<double> value = value_->FindDoubleByDottedPath(path)) {
     if (out_value) {
       *out_value = *value;
     }
@@ -169,7 +157,7 @@
 
 bool DictionaryValueUpdate::GetString(base::StringPiece path,
                                       std::string* out_value) const {
-  if (std::string* value = value_->GetDict().FindStringByDottedPath(path)) {
+  if (std::string* value = value_->FindStringByDottedPath(path)) {
     if (out_value) {
       *out_value = *value;
     }
@@ -180,26 +168,36 @@
 
 bool DictionaryValueUpdate::GetDictionary(
     base::StringPiece path,
-    const base::DictionaryValue** out_value) const {
-  return std::as_const(value_)->GetDictionary(path, out_value);
+    const base::Value::Dict** out_value) const {
+  const base::Value::Dict* dict = value_->FindDictByDottedPath(path);
+  if (!dict) {
+    return false;
+  }
+  if (out_value) {
+    *out_value = dict;
+  }
+
+  return true;
 }
 
 bool DictionaryValueUpdate::GetDictionary(
     base::StringPiece path,
     std::unique_ptr<DictionaryValueUpdate>* out_value) {
-  base::DictionaryValue* dictionary_value = nullptr;
-  if (!value_->GetDictionary(path, &dictionary_value))
+  base::Value::Dict* dict = value_->FindDictByDottedPath(path);
+  if (!dict) {
     return false;
-
-  *out_value = std::make_unique<DictionaryValueUpdate>(
-      report_update_, dictionary_value, ConcatPath(path_, path));
+  }
+  if (out_value) {
+    *out_value = std::make_unique<DictionaryValueUpdate>(
+        report_update_, dict, ConcatPath(path_, path));
+  }
   return true;
 }
 
 bool DictionaryValueUpdate::GetBooleanWithoutPathExpansion(
     base::StringPiece key,
     bool* out_value) const {
-  absl::optional<bool> flag = value_->FindBoolKey(key);
+  absl::optional<bool> flag = value_->FindBool(key);
   if (!flag)
     return false;
 
@@ -210,7 +208,7 @@
 bool DictionaryValueUpdate::GetIntegerWithoutPathExpansion(
     base::StringPiece key,
     int* out_value) const {
-  absl::optional<int> value = value_->FindIntKey(key);
+  absl::optional<int> value = value_->FindInt(key);
   if (!value)
     return false;
 
@@ -221,7 +219,7 @@
 bool DictionaryValueUpdate::GetDoubleWithoutPathExpansion(
     base::StringPiece key,
     double* out_value) const {
-  absl::optional<double> value = value_->FindDoubleKey(key);
+  absl::optional<double> value = value_->FindDouble(key);
   if (!value)
     return false;
 
@@ -232,7 +230,7 @@
 bool DictionaryValueUpdate::GetStringWithoutPathExpansion(
     base::StringPiece key,
     std::string* out_value) const {
-  std::string* value = value_->FindStringKey(key);
+  std::string* value = value_->FindString(key);
   if (!value)
     return false;
 
@@ -243,7 +241,7 @@
 bool DictionaryValueUpdate::GetStringWithoutPathExpansion(
     base::StringPiece key,
     std::u16string* out_value) const {
-  std::string* value = value_->FindStringKey(key);
+  std::string* value = value_->FindString(key);
   if (!value)
     return false;
 
@@ -253,21 +251,22 @@
 
 bool DictionaryValueUpdate::GetDictionaryWithoutPathExpansion(
     base::StringPiece key,
-    const base::DictionaryValue** out_value) const {
-  const base::Value* value = value_->GetDict().Find(key);
-  if (!value || !value->is_dict())
+    const base::Value::Dict** out_value) const {
+  const base::Value::Dict* value = value_->FindDict(key);
+  if (!value) {
     return false;
+  }
   if (out_value)
-    *out_value = static_cast<const base::DictionaryValue*>(value);
+    *out_value = value;
   return true;
 }
 
 bool DictionaryValueUpdate::GetDictionaryWithoutPathExpansion(
     base::StringPiece key,
     std::unique_ptr<DictionaryValueUpdate>* out_value) {
-  base::DictionaryValue* dictionary_value = nullptr;
+  base::Value::Dict* dictionary_value = nullptr;
   if (!std::as_const(*this).GetDictionaryWithoutPathExpansion(
-          key, const_cast<const base::DictionaryValue**>(&dictionary_value))) {
+          key, const_cast<const base::Value::Dict**>(&dictionary_value))) {
     return false;
   }
 
@@ -281,7 +280,7 @@
 bool DictionaryValueUpdate::GetListWithoutPathExpansion(
     base::StringPiece key,
     const base::Value::List** out_value) const {
-  const base::Value::List* list = value_->GetDict().FindList(key);
+  const base::Value::List* list = value_->FindList(key);
   if (!list)
     return false;
   if (out_value)
@@ -299,17 +298,18 @@
 
 bool DictionaryValueUpdate::Remove(base::StringPiece path) {
   base::StringPiece current_path(path);
-  base::Value* current_dictionary = value_;
+  base::Value::Dict* current_dictionary = value_;
   size_t delimiter_position = current_path.rfind('.');
   if (delimiter_position != base::StringPiece::npos) {
-    current_dictionary =
-        value_->FindPath(current_path.substr(0, delimiter_position));
+    current_dictionary = value_->FindDictByDottedPath(
+        current_path.substr(0, delimiter_position));
     if (!current_dictionary)
       return false;
     current_path = current_path.substr(delimiter_position + 1);
   }
-  if (!current_dictionary->RemoveKey(current_path))
+  if (!current_dictionary->Remove(current_path)) {
     return false;
+  }
 
   RecordPath(path);
   return true;
@@ -318,7 +318,7 @@
 bool DictionaryValueUpdate::RemoveWithoutPathExpansion(
     base::StringPiece key,
     std::unique_ptr<base::Value>* out_value) {
-  absl::optional<base::Value> value = value_->ExtractKey(key);
+  absl::optional<base::Value> value = value_->Extract(key);
   if (!value)
     return false;
 
@@ -331,17 +331,17 @@
 bool DictionaryValueUpdate::RemovePath(
     base::StringPiece path,
     std::unique_ptr<base::Value>* out_value) {
-  absl::optional<base::Value> value =
-      value_->GetDict().ExtractByDottedPath(path);
+  absl::optional<base::Value> value = value_->ExtractByDottedPath(path);
   if (!value)
     return false;
 
   if (out_value)
     *out_value = base::Value::ToUniquePtrValue(std::move(*value));
   std::vector<base::StringPiece> split_path = SplitPath(path);
-  base::DictionaryValue* dict = value_;
+  base::Value::Dict* dict = value_;
   for (size_t i = 0; i < split_path.size() - 1; ++i) {
-    if (!dict->GetDictionary(split_path[i], &dict)) {
+    dict = dict->FindDict(split_path[i]);
+    if (!dict) {
       split_path.resize(i + 1);
       break;
     }
@@ -352,11 +352,11 @@
 
 base::Value::Dict* DictionaryValueUpdate::AsDict() {
   RecordSplitPath(std::vector<base::StringPiece>());
-  return &value_->GetDict();
+  return value_;
 }
 
 const base::Value::Dict* DictionaryValueUpdate::AsConstDict() const {
-  return &value_->GetDict();
+  return value_;
 }
 
 void DictionaryValueUpdate::RecordKey(base::StringPiece key) {

services/preferences/public/cpp/dictionary_value_update.h

diff --git a/services/preferences/public/cpp/dictionary_value_update.h b/services/preferences/public/cpp/dictionary_value_update.h
index 1dd6ac2c..aea2bd6 100644
--- a/services/preferences/public/cpp/dictionary_value_update.h
+++ b/services/preferences/public/cpp/dictionary_value_update.h
@@ -17,7 +17,7 @@
 
 namespace prefs {
 
-// A wrapper around base::DictionaryValue that reports changes to its contents
+// A wrapper around base::Value::Dict that reports changes to its contents
 // via a callback.
 class DictionaryValueUpdate {
  public:
@@ -25,7 +25,7 @@
       base::RepeatingCallback<void(const std::vector<std::string>&)>;
 
   DictionaryValueUpdate(UpdateCallback report_update,
-                        base::DictionaryValue* value,
+                        base::Value::Dict* value,
                         std::vector<std::string> path);
 
   DictionaryValueUpdate(const DictionaryValueUpdate&) = delete;
@@ -52,11 +52,6 @@
   // to the path in that location.
   void Set(base::StringPiece path, base::Value in_value);
 
-  // This is similar to |Set|, but lets callers explicitly specify the path
-  // components and thus allows nested keys with periods in them.
-  void SetPath(std::initializer_list<base::StringPiece> path,
-               base::Value value);
-
   // Convenience forms of Set().  These methods will replace any existing
   // value at that path, even if it has a different type.
   void SetBoolean(base::StringPiece path, bool in_value);
@@ -90,7 +85,7 @@
   bool GetDouble(base::StringPiece path, double* out_value) const;
   bool GetString(base::StringPiece path, std::string* out_value) const;
   bool GetDictionary(base::StringPiece path,
-                     const base::DictionaryValue** out_value) const;
+                     const base::Value::Dict** out_value) const;
   bool GetDictionary(base::StringPiece path,
                      std::unique_ptr<DictionaryValueUpdate>* out_value);
 
@@ -108,7 +103,7 @@
                                      std::u16string* out_value) const;
   bool GetDictionaryWithoutPathExpansion(
       base::StringPiece key,
-      const base::DictionaryValue** out_value) const;
+      const base::Value::Dict** out_value) const;
   bool GetDictionaryWithoutPathExpansion(
       base::StringPiece key,
       std::unique_ptr<DictionaryValueUpdate>* out_value);
@@ -151,7 +146,7 @@
   UpdateCallback report_update_;
   // `value_` is not a raw_ptr<...> for performance reasons (based on analysis
   // of sampling profiler data).
-  RAW_PTR_EXCLUSION base::DictionaryValue* const value_;
+  RAW_PTR_EXCLUSION base::Value::Dict* const value_;
   const std::vector<std::string> path_;
 };
 

services/preferences/public/cpp/scoped_pref_update.cc

diff --git a/services/preferences/public/cpp/scoped_pref_update.cc b/services/preferences/public/cpp/scoped_pref_update.cc
index d64a82f6..807fd28 100644
--- a/services/preferences/public/cpp/scoped_pref_update.cc
+++ b/services/preferences/public/cpp/scoped_pref_update.cc
@@ -23,12 +23,13 @@
 }
 
 std::unique_ptr<DictionaryValueUpdate> ScopedDictionaryPrefUpdate::Get() {
+  base::Value::Dict& dict =
+      service_->GetMutableUserPref(path_, base::Value::Type::DICTIONARY)
+          ->GetDict();
   return std::make_unique<DictionaryValueUpdate>(
       base::BindRepeating(&ScopedDictionaryPrefUpdate::RecordPath,
                           base::Unretained(this)),
-      static_cast<base::DictionaryValue*>(
-          service_->GetMutableUserPref(path_, base::Value::Type::DICTIONARY)),
-      std::vector<std::string>());
+      &dict, std::vector<std::string>());
 }
 
 std::unique_ptr<DictionaryValueUpdate> ScopedDictionaryPrefUpdate::

services/viz/privileged/mojom/compositing/frame_sink_manager.mojom

diff --git a/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom b/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom
index 9051e6a..ebb40d25 100644
--- a/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom
+++ b/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom
@@ -194,7 +194,7 @@
 
   // Stops frame counting on the Viz thread and returns all records to the
   // caller.
-  StopFrameCountingForTest() => (FrameCountingData data);
+  StopFrameCountingForTest() => (FrameCountingData? data);
 };
 
 // The FrameSinkManagerClient interface is implemented by the Display

testing/buildbot/chromium.android.json

diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index 4d4e419..e32d42a 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -27660,7 +27660,8 @@
       {
         "args": [
           "--gs-results-bucket=chromium-result-details",
-          "--recover-devices"
+          "--recover-devices",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/android.pie_arm64.gin_unittests_coverage.filter"
         ],
         "isolate_profile_data": true,
         "merge": {

testing/buildbot/chromium.chromiumos.json

diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index f55a378..23164d48 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -3642,7 +3642,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 8
+          "shards": 4
         },
         "test": "browser_tests",
         "test_id_prefix": "ninja://chrome/test:browser_tests/"
@@ -3862,7 +3862,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 6
+          "shards": 3
         },
         "test": "content_browsertests",
         "test_id_prefix": "ninja://content/test:content_browsertests/"
@@ -4206,7 +4206,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 5
+          "shards": 3
         },
         "test": "interactive_ui_tests",
         "test_id_prefix": "ninja://chrome/test:interactive_ui_tests/"
@@ -4767,8 +4767,7 @@
               "os": "Ubuntu-18.04"
             }
           ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
         "test": "sync_integration_tests",
         "test_id_prefix": "ninja://chrome/test:sync_integration_tests/"
@@ -5818,9 +5817,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5516.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5517.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 111.0.5516.0",
+        "description": "Run with ash-chrome version 111.0.5517.0",
         "isolate_profile_data": true,
         "merge": {
           "args": [],
@@ -5832,8 +5831,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v111.0.5516.0",
-              "revision": "version:111.0.5516.0"
+              "location": "lacros_version_skew_tests_v111.0.5517.0",
+              "revision": "version:111.0.5517.0"
             }
           ],
           "dimension_sets": [
@@ -5989,9 +5988,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5516.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5517.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 111.0.5516.0",
+        "description": "Run with ash-chrome version 111.0.5517.0",
         "isolate_profile_data": true,
         "merge": {
           "args": [],
@@ -6003,8 +6002,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v111.0.5516.0",
-              "revision": "version:111.0.5516.0"
+              "location": "lacros_version_skew_tests_v111.0.5517.0",
+              "revision": "version:111.0.5517.0"
             }
           ],
           "dimension_sets": [
@@ -6141,9 +6140,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5516.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5517.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 111.0.5516.0",
+        "description": "Run with ash-chrome version 111.0.5517.0",
         "isolate_profile_data": true,
         "merge": {
           "args": [],
@@ -6155,8 +6154,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v111.0.5516.0",
-              "revision": "version:111.0.5516.0"
+              "location": "lacros_version_skew_tests_v111.0.5517.0",
+              "revision": "version:111.0.5517.0"
             }
           ],
           "dimension_sets": [

testing/buildbot/chromium.fyi.json

diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index 6670cd73..1bdbb8c 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -1552,6 +1552,2117 @@
       }
     ]
   },
+  "Linux ChromiumOS MSan Focal": {
+    "gtest_tests": [
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "absl_hardening_tests",
+        "test_id_prefix": "ninja://third_party/abseil-cpp:absl_hardening_tests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "accessibility_unittests",
+        "test_id_prefix": "ninja://ui/accessibility:accessibility_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "angle_unittests",
+        "test_id_prefix": "ninja://third_party/angle/src/tests:angle_unittests/",
+        "use_isolated_scripts_api": true
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "app_shell_unittests",
+        "test_id_prefix": "ninja://extensions/shell:app_shell_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "ash_components_unittests",
+        "test_id_prefix": "ninja://ash/components:ash_components_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 5
+        },
+        "test": "ash_unittests",
+        "test_id_prefix": "ninja://ash:ash_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "ash_webui_unittests",
+        "test_id_prefix": "ninja://ash/webui:ash_webui_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "aura_unittests",
+        "test_id_prefix": "ninja://ui/aura:aura_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "base_unittests",
+        "test_id_prefix": "ninja://base:base_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "blink_common_unittests",
+        "test_id_prefix": "ninja://third_party/blink/common:blink_common_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "blink_fuzzer_unittests",
+        "test_id_prefix": "ninja://third_party/blink/renderer/platform:blink_fuzzer_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "blink_heap_unittests",
+        "test_id_prefix": "ninja://third_party/blink/renderer/platform/heap:blink_heap_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "blink_platform_unittests",
+        "test_id_prefix": "ninja://third_party/blink/renderer/platform:blink_platform_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "name": "webkit_unit_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "blink_unittests",
+        "test_id_prefix": "ninja://third_party/blink/renderer/controller:blink_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "boringssl_crypto_tests",
+        "test_id_prefix": "ninja://third_party/boringssl:boringssl_crypto_tests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "boringssl_ssl_tests",
+        "test_id_prefix": "ninja://third_party/boringssl:boringssl_ssl_tests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.msan.browser_tests.oobe_negative.filter"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 40
+        },
+        "test": "browser_tests",
+        "test_id_prefix": "ninja://chrome/test:browser_tests/"
+      },
+      {
+        "args": [
+          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.msan.browser_tests.oobe_positive.filter",
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "experiment_percentage": 100,
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "name": "oobe_only_browser_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 20
+        },
+        "test": "browser_tests",
+        "test_id_prefix": "ninja://chrome/test:browser_tests/"
+      },
+      {
+        "args": [
+          "--gtest_filter=-*UsingRealWebcam*",
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "capture_unittests",
+        "test_id_prefix": "ninja://media/capture:capture_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "cast_unittests",
+        "test_id_prefix": "ninja://media/cast:cast_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "cc_unittests",
+        "test_id_prefix": "ninja://cc:cc_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "chrome_app_unittests",
+        "test_id_prefix": "ninja://chrome/test:chrome_app_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "chromedriver_unittests",
+        "test_id_prefix": "ninja://chrome/test/chromedriver:chromedriver_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "chromeos_components_unittests",
+        "test_id_prefix": "ninja://chromeos/components:chromeos_components_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "chromeos_unittests",
+        "test_id_prefix": "ninja://chromeos:chromeos_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "color_unittests",
+        "test_id_prefix": "ninja://ui/color:color_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "components_browsertests",
+        "test_id_prefix": "ninja://components:components_browsertests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "components_unittests",
+        "test_id_prefix": "ninja://components:components_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "compositor_unittests",
+        "test_id_prefix": "ninja://ui/compositor:compositor_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 8
+        },
+        "test": "content_browsertests",
+        "test_id_prefix": "ninja://content/test:content_browsertests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "content_unittests",
+        "test_id_prefix": "ninja://content/test:content_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "crashpad_tests",
+        "test_id_prefix": "ninja://third_party/crashpad/crashpad:crashpad_tests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "crypto_unittests",
+        "test_id_prefix": "ninja://crypto:crypto_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "dbus_unittests",
+        "test_id_prefix": "ninja://dbus:dbus_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "device_unittests",
+        "test_id_prefix": "ninja://device:device_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "display_unittests",
+        "test_id_prefix": "ninja://ui/display:display_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "events_unittests",
+        "test_id_prefix": "ninja://ui/events:events_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "exo_unittests",
+        "test_id_prefix": "ninja://components/exo:exo_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "extensions_browsertests",
+        "test_id_prefix": "ninja://extensions:extensions_browsertests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "extensions_unittests",
+        "test_id_prefix": "ninja://extensions:extensions_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "filesystem_service_unittests",
+        "test_id_prefix": "ninja://components/services/filesystem:filesystem_service_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "gcm_unit_tests",
+        "test_id_prefix": "ninja://google_apis/gcm:gcm_unit_tests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "gfx_unittests",
+        "test_id_prefix": "ninja://ui/gfx:gfx_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "gin_unittests",
+        "test_id_prefix": "ninja://gin:gin_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "google_apis_unittests",
+        "test_id_prefix": "ninja://google_apis:google_apis_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "gpu_unittests",
+        "test_id_prefix": "ninja://gpu:gpu_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "gwp_asan_unittests",
+        "test_id_prefix": "ninja://components/gwp_asan:gwp_asan_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 5
+        },
+        "test": "interactive_ui_tests",
+        "test_id_prefix": "ninja://chrome/test:interactive_ui_tests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "ipc_tests",
+        "test_id_prefix": "ninja://ipc:ipc_tests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "keyboard_unittests",
+        "test_id_prefix": "ninja://ash/keyboard/ui:keyboard_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "latency_unittests",
+        "test_id_prefix": "ninja://ui/latency:latency_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "libjingle_xmpp_unittests",
+        "test_id_prefix": "ninja://third_party/libjingle_xmpp:libjingle_xmpp_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "liburlpattern_unittests",
+        "test_id_prefix": "ninja://third_party/liburlpattern:liburlpattern_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "media_unittests",
+        "test_id_prefix": "ninja://media:media_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "message_center_unittests",
+        "test_id_prefix": "ninja://ui/message_center:message_center_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "midi_unittests",
+        "test_id_prefix": "ninja://media/midi:midi_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "mojo_core_unittests",
+        "test_id_prefix": "ninja://mojo/core:mojo_core_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "mojo_unittests",
+        "test_id_prefix": "ninja://mojo:mojo_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "nacl_loader_unittests",
+        "test_id_prefix": "ninja://components/nacl/loader:nacl_loader_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "native_theme_unittests",
+        "test_id_prefix": "ninja://ui/native_theme:native_theme_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "net_unittests",
+        "test_id_prefix": "ninja://net:net_unittests/"
+      },
+      {
+        "args": [
+          "--ozone-platform=headless",
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "ozone_gl_unittests",
+        "test_id_prefix": "ninja://ui/ozone/gl:ozone_gl_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "ozone_unittests",
+        "test_id_prefix": "ninja://ui/ozone:ozone_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "ozone_x11_unittests",
+        "test_id_prefix": "ninja://ui/ozone:ozone_x11_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "pdf_unittests",
+        "test_id_prefix": "ninja://pdf:pdf_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "perfetto_unittests",
+        "test_id_prefix": "ninja://third_party/perfetto:perfetto_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "ppapi_unittests",
+        "test_id_prefix": "ninja://ppapi:ppapi_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "printing_unittests",
+        "test_id_prefix": "ninja://printing:printing_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "remoting_unittests",
+        "test_id_prefix": "ninja://remoting:remoting_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "sandbox_linux_unittests",
+        "test_id_prefix": "ninja://sandbox/linux:sandbox_linux_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "service_manager_unittests",
+        "test_id_prefix": "ninja://services/service_manager/tests:service_manager_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "shell_dialogs_unittests",
+        "test_id_prefix": "ninja://ui/shell_dialogs:shell_dialogs_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "shell_encryption_unittests",
+        "test_id_prefix": "ninja://third_party/shell-encryption:shell_encryption_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "skia_unittests",
+        "test_id_prefix": "ninja://skia:skia_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "snapshot_unittests",
+        "test_id_prefix": "ninja://ui/snapshot:snapshot_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "sql_unittests",
+        "test_id_prefix": "ninja://sql:sql_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "storage_unittests",
+        "test_id_prefix": "ninja://storage:storage_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "sync_integration_tests",
+        "test_id_prefix": "ninja://chrome/test:sync_integration_tests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "ui_base_unittests",
+        "test_id_prefix": "ninja://ui/base:ui_base_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "ui_chromeos_unittests",
+        "test_id_prefix": "ninja://ui/chromeos:ui_chromeos_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "ui_touch_selection_unittests",
+        "test_id_prefix": "ninja://ui/touch_selection:ui_touch_selection_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "unit_tests",
+        "test_id_prefix": "ninja://chrome/test:unit_tests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "url_unittests",
+        "test_id_prefix": "ninja://url:url_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "experiment_percentage": 100,
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "usage_time_limit_unittests",
+        "test_id_prefix": "ninja://chrome/test:usage_time_limit_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "views_unittests",
+        "test_id_prefix": "ninja://ui/views:views_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "viz_unittests",
+        "test_id_prefix": "ninja://components/viz:viz_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "wayland_client_perftests",
+        "test_id_prefix": "ninja://components/exo/wayland:wayland_client_perftests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "wayland_client_tests",
+        "test_id_prefix": "ninja://components/exo/wayland:wayland_client_tests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "wm_unittests",
+        "test_id_prefix": "ninja://ui/wm:wm_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "wtf_unittests",
+        "test_id_prefix": "ninja://third_party/blink/renderer/platform/wtf:wtf_unittests/"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-20.04"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 7200,
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "zlib_unittests",
+        "test_id_prefix": "ninja://third_party/zlib:zlib_unittests/"
+      }
+    ]
+  },
   "Linux Viz": {
     "additional_compile_targets": [
       "all"
@@ -83324,9 +85435,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5516.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5517.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 111.0.5516.0",
+        "description": "Run with ash-chrome version 111.0.5517.0",
         "isolate_profile_data": true,
         "merge": {
           "args": [],
@@ -83338,8 +85449,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v111.0.5516.0",
-              "revision": "version:111.0.5516.0"
+              "location": "lacros_version_skew_tests_v111.0.5517.0",
+              "revision": "version:111.0.5517.0"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -83465,9 +85576,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5516.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5517.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 111.0.5516.0",
+        "description": "Run with ash-chrome version 111.0.5517.0",
         "isolate_profile_data": true,
         "merge": {
           "args": [],
@@ -83479,8 +85590,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v111.0.5516.0",
-              "revision": "version:111.0.5516.0"
+              "location": "lacros_version_skew_tests_v111.0.5517.0",
+              "revision": "version:111.0.5517.0"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -83592,9 +85703,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5516.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5517.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 111.0.5516.0",
+        "description": "Run with ash-chrome version 111.0.5517.0",
         "isolate_profile_data": true,
         "merge": {
           "args": [],
@@ -83606,8 +85717,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v111.0.5516.0",
-              "revision": "version:111.0.5516.0"
+              "location": "lacros_version_skew_tests_v111.0.5517.0",
+              "revision": "version:111.0.5517.0"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -84940,9 +87051,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5516.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5517.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 111.0.5516.0",
+        "description": "Run with ash-chrome version 111.0.5517.0",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -84953,8 +87064,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v111.0.5516.0",
-              "revision": "version:111.0.5516.0"
+              "location": "lacros_version_skew_tests_v111.0.5517.0",
+              "revision": "version:111.0.5517.0"
             }
           ],
           "dimension_sets": [
@@ -85111,9 +87222,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5516.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5517.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 111.0.5516.0",
+        "description": "Run with ash-chrome version 111.0.5517.0",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -85124,8 +87235,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v111.0.5516.0",
-              "revision": "version:111.0.5516.0"
+              "location": "lacros_version_skew_tests_v111.0.5517.0",
+              "revision": "version:111.0.5517.0"
             }
           ],
           "dimension_sets": [
@@ -85263,9 +87374,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5516.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5517.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 111.0.5516.0",
+        "description": "Run with ash-chrome version 111.0.5517.0",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -85276,8 +87387,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v111.0.5516.0",
-              "revision": "version:111.0.5516.0"
+              "location": "lacros_version_skew_tests_v111.0.5517.0",
+              "revision": "version:111.0.5517.0"
             }
           ],
           "dimension_sets": [
@@ -86801,9 +88912,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5516.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5517.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 111.0.5516.0",
+        "description": "Run with ash-chrome version 111.0.5517.0",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -86814,8 +88925,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v111.0.5516.0",
-              "revision": "version:111.0.5516.0"
+              "location": "lacros_version_skew_tests_v111.0.5517.0",
+              "revision": "version:111.0.5517.0"
             }
           ],
           "dimension_sets": [
@@ -86972,9 +89083,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5516.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5517.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 111.0.5516.0",
+        "description": "Run with ash-chrome version 111.0.5517.0",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -86985,8 +89096,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v111.0.5516.0",
-              "revision": "version:111.0.5516.0"
+              "location": "lacros_version_skew_tests_v111.0.5517.0",
+              "revision": "version:111.0.5517.0"
             }
           ],
           "dimension_sets": [
@@ -87124,9 +89235,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5516.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5517.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 111.0.5516.0",
+        "description": "Run with ash-chrome version 111.0.5517.0",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -87137,8 +89248,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v111.0.5516.0",
-              "revision": "version:111.0.5516.0"
+              "location": "lacros_version_skew_tests_v111.0.5517.0",
+              "revision": "version:111.0.5517.0"
             }
           ],
           "dimension_sets": [
@@ -87910,9 +90021,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5516.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5517.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 111.0.5516.0",
+        "description": "Run with ash-chrome version 111.0.5517.0",
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -87923,8 +90034,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v111.0.5516.0",
-              "revision": "version:111.0.5516.0"
+              "location": "lacros_version_skew_tests_v111.0.5517.0",
+              "revision": "version:111.0.5517.0"
             }
           ],
           "dimension_sets": [

testing/buildbot/chromium.memory.json

diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json
index c332f4f..5251dbf 100644
--- a/testing/buildbot/chromium.memory.json
+++ b/testing/buildbot/chromium.memory.json
@@ -5228,7 +5228,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5249,7 +5249,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5270,7 +5270,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5292,7 +5292,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5313,7 +5313,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5334,7 +5334,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -5356,7 +5356,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5377,7 +5377,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5398,7 +5398,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5419,7 +5419,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5440,7 +5440,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5461,7 +5461,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5482,7 +5482,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5504,7 +5504,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5525,7 +5525,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5546,7 +5546,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5568,7 +5568,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -5593,7 +5593,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -5616,7 +5616,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5637,7 +5637,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5658,7 +5658,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5679,7 +5679,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5700,7 +5700,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5721,7 +5721,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5742,7 +5742,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5763,7 +5763,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5784,7 +5784,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5805,7 +5805,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5826,7 +5826,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5847,7 +5847,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -5869,7 +5869,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -5891,7 +5891,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5912,7 +5912,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5933,7 +5933,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5954,7 +5954,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5975,7 +5975,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5996,7 +5996,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6017,7 +6017,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6038,7 +6038,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6059,7 +6059,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6080,7 +6080,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6101,7 +6101,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6122,7 +6122,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6143,7 +6143,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6164,7 +6164,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6185,7 +6185,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6206,7 +6206,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6227,7 +6227,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -6270,7 +6270,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6291,7 +6291,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6312,7 +6312,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6333,7 +6333,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6354,7 +6354,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6375,7 +6375,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6396,7 +6396,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6417,7 +6417,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6438,7 +6438,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6459,7 +6459,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6480,7 +6480,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6501,7 +6501,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -6524,7 +6524,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6545,7 +6545,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6566,7 +6566,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6587,7 +6587,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6608,7 +6608,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6629,7 +6629,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6650,7 +6650,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6671,7 +6671,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6692,7 +6692,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6713,7 +6713,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6734,7 +6734,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6755,7 +6755,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6776,7 +6776,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6797,7 +6797,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6818,7 +6818,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6839,7 +6839,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6860,7 +6860,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6881,7 +6881,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6902,7 +6902,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6923,7 +6923,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6944,7 +6944,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -6966,7 +6966,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -6988,7 +6988,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7009,7 +7009,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7030,7 +7030,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7051,7 +7051,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7072,7 +7072,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7093,7 +7093,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7114,7 +7114,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7135,7 +7135,7 @@
           "dimension_sets": [
             {
               "cpu": "x86-64",
-              "os": "Ubuntu-20.04"
+              "os": "Ubuntu-16.04"
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -18653,12 +18653,12 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5516.0/test_ash_chrome",
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5517.0/test_ash_chrome",
           "--test-launcher-print-test-stdio=always",
           "--combine-ash-logs-on-bots",
           "--asan-symbolize-output"
         ],
-        "description": "Run with ash-chrome version 111.0.5516.0",
+        "description": "Run with ash-chrome version 111.0.5517.0",
         "isolate_profile_data": true,
         "merge": {
           "args": [],
@@ -18670,8 +18670,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v111.0.5516.0",
-              "revision": "version:111.0.5516.0"
+              "location": "lacros_version_skew_tests_v111.0.5517.0",
+              "revision": "version:111.0.5517.0"
             }
           ],
           "dimension_sets": [
@@ -18844,12 +18844,12 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5516.0/test_ash_chrome",
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5517.0/test_ash_chrome",
           "--test-launcher-print-test-stdio=always",
           "--combine-ash-logs-on-bots",
           "--asan-symbolize-output"
         ],
-        "description": "Run with ash-chrome version 111.0.5516.0",
+        "description": "Run with ash-chrome version 111.0.5517.0",
         "isolate_profile_data": true,
         "merge": {
           "args": [],
@@ -18861,8 +18861,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v111.0.5516.0",
-              "revision": "version:111.0.5516.0"
+              "location": "lacros_version_skew_tests_v111.0.5517.0",
+              "revision": "version:111.0.5517.0"
             }
           ],
           "dimension_sets": [
@@ -19011,12 +19011,12 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5516.0/test_ash_chrome",
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5517.0/test_ash_chrome",
           "--test-launcher-print-test-stdio=always",
           "--combine-ash-logs-on-bots",
           "--asan-symbolize-output"
         ],
-        "description": "Run with ash-chrome version 111.0.5516.0",
+        "description": "Run with ash-chrome version 111.0.5517.0",
         "isolate_profile_data": true,
         "merge": {
           "args": [],
@@ -19028,8 +19028,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v111.0.5516.0",
-              "revision": "version:111.0.5516.0"
+              "location": "lacros_version_skew_tests_v111.0.5517.0",
+              "revision": "version:111.0.5517.0"
             }
           ],
           "dimension_sets": [

testing/buildbot/chromium.perf.calibration.json

diff --git a/testing/buildbot/chromium.perf.calibration.json b/testing/buildbot/chromium.perf.calibration.json
index 017cf42..22a73908 100644
--- a/testing/buildbot/chromium.perf.calibration.json
+++ b/testing/buildbot/chromium.perf.calibration.json
@@ -8,7 +8,8 @@
           "-v",
           "--browser=android-chrome-64-bundle",
           "--upload-results",
-          "--test-shard-map-filename=android-pixel2-perf-calibration_map.json"
+          "--test-shard-map-filename=android-pixel2-perf-calibration_map.json",
+          "--ignore-benchmark-exit-code"
         ],
         "isolate_name": "performance_test_suite_android_clank_monochrome_64_32_bundle",
         "merge": {
@@ -58,6 +59,7 @@
           "--browser=release",
           "--upload-results",
           "--test-shard-map-filename=linux-perf-calibration_map.json",
+          "--ignore-benchmark-exit-code",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",

testing/buildbot/chromium.perf.fyi.json

diff --git a/testing/buildbot/chromium.perf.fyi.json b/testing/buildbot/chromium.perf.fyi.json
index f0ab13e..8bd139c 100644
--- a/testing/buildbot/chromium.perf.fyi.json
+++ b/testing/buildbot/chromium.perf.fyi.json
@@ -19,7 +19,8 @@
           "-v",
           "--browser=android-chrome-bundle",
           "--upload-results",
-          "--test-shard-map-filename=android-pixel2-perf-aab-fyi_map.json"
+          "--test-shard-map-filename=android-pixel2-perf-aab-fyi_map.json",
+          "--ignore-benchmark-exit-code"
         ],
         "isolate_name": "performance_test_suite_android_clank_monochrome_bundle",
         "merge": {
@@ -68,6 +69,7 @@
           "--browser=exact",
           "--upload-results",
           "--test-shard-map-filename=android-pixel2-perf-fyi_map.json",
+          "--ignore-benchmark-exit-code",
           "--browser-executable=../../out/Release/bin/monochrome_64_32_bundle",
           "--device=android",
           "--output-format=histograms",
@@ -137,6 +139,7 @@
           "--browser=cros-chrome",
           "--upload-results",
           "--test-shard-map-filename=chromeos-kevin-perf-fyi_map.json",
+          "--ignore-benchmark-exit-code",
           "--remote=variable_chromeos_device_hostname"
         ],
         "isolate_name": "performance_test_suite",
@@ -201,6 +204,7 @@
           "--browser=web-engine-shell",
           "--upload-results",
           "--test-shard-map-filename=fuchsia-perf-ast_map.json",
+          "--ignore-benchmark-exit-code",
           "--output-format=histograms",
           "--experimental-tbmv3-metrics",
           "-d",
@@ -253,6 +257,7 @@
           "--browser=fuchsia-chrome",
           "--upload-results",
           "--test-shard-map-filename=fuchsia-perf-atlas-fyi_map.json",
+          "--ignore-benchmark-exit-code",
           "--output-format=histograms",
           "--experimental-tbmv3-metrics",
           "-d",
@@ -305,6 +310,7 @@
           "--browser=web-engine-shell",
           "--upload-results",
           "--test-shard-map-filename=fuchsia-perf-fyi_map.json",
+          "--ignore-benchmark-exit-code",
           "--output-format=histograms",
           "--experimental-tbmv3-metrics",
           "-d",
@@ -357,6 +363,7 @@
           "--browser=web-engine-shell",
           "--upload-results",
           "--test-shard-map-filename=fuchsia-perf-nsn_map.json",
+          "--ignore-benchmark-exit-code",
           "--output-format=histograms",
           "--experimental-tbmv3-metrics",
           "-d",
@@ -409,6 +416,7 @@
           "--browser=fuchsia-chrome",
           "--upload-results",
           "--test-shard-map-filename=fuchsia-perf-nuc-fyi_map.json",
+          "--ignore-benchmark-exit-code",
           "--output-format=histograms",
           "--experimental-tbmv3-metrics",
           "-d",
@@ -461,6 +469,7 @@
           "--browser=web-engine-shell",
           "--upload-results",
           "--test-shard-map-filename=fuchsia-perf-sherlock-fyi_map.json",
+          "--ignore-benchmark-exit-code",
           "--output-format=histograms",
           "--experimental-tbmv3-metrics",
           "-d",
@@ -513,6 +522,7 @@
           "--browser=web-engine-shell",
           "--upload-results",
           "--test-shard-map-filename=fuchsia-perf-shk_map.json",
+          "--ignore-benchmark-exit-code",
           "--output-format=histograms",
           "--experimental-tbmv3-metrics",
           "-d",
@@ -565,6 +575,7 @@
           "--browser=release",
           "--upload-results",
           "--test-shard-map-filename=linux-perf-fyi_map.json",
+          "--ignore-benchmark-exit-code",
           "--output-format=histograms",
           "--experimental-tbmv3-metrics"
         ],
@@ -614,6 +625,7 @@
           "--browser=release_x64",
           "--upload-results",
           "--test-shard-map-filename=win-10_laptop_low_end-perf_hp-candidate_map.json",
+          "--ignore-benchmark-exit-code",
           "--output-format=histograms",
           "--experimental-tbmv3-metrics"
         ],

testing/buildbot/chromium.perf.json

diff --git a/testing/buildbot/chromium.perf.json b/testing/buildbot/chromium.perf.json
index e7119ac17..6190704 100644
--- a/testing/buildbot/chromium.perf.json
+++ b/testing/buildbot/chromium.perf.json
@@ -236,7 +236,8 @@
           "-v",
           "--browser=android-chrome",
           "--upload-results",
-          "--test-shard-map-filename=android-go-perf_map.json"
+          "--test-shard-map-filename=android-go-perf_map.json",
+          "--ignore-benchmark-exit-code"
         ],
         "isolate_name": "performance_test_suite_android_clank_chrome",
         "merge": {
@@ -288,7 +289,8 @@
           "-v",
           "--browser=android-chrome",
           "--upload-results",
-          "--test-shard-map-filename=android-go-perf-pgo_map.json"
+          "--test-shard-map-filename=android-go-perf-pgo_map.json",
+          "--ignore-benchmark-exit-code"
         ],
         "isolate_name": "performance_test_suite_android_clank_chrome",
         "merge": {
@@ -344,7 +346,8 @@
           "-v",
           "--browser=android-trichrome-bundle",
           "--upload-results",
-          "--test-shard-map-filename=android-go-wembley-perf_map.json"
+          "--test-shard-map-filename=android-go-wembley-perf_map.json",
+          "--ignore-benchmark-exit-code"
         ],
         "isolate_name": "performance_test_suite_android_clank_trichrome_bundle",
         "merge": {
@@ -391,7 +394,8 @@
           "-v",
           "--browser=android-webview-google",
           "--upload-results",
-          "--test-shard-map-filename=android-go_webview-perf_map.json"
+          "--test-shard-map-filename=android-go_webview-perf_map.json",
+          "--ignore-benchmark-exit-code"
         ],
         "isolate_name": "performance_webview_test_suite",
         "merge": {
@@ -439,7 +443,8 @@
           "-v",
           "--browser=android-trichrome-chrome-google-64-32-bundle",
           "--upload-results",
-          "--test-shard-map-filename=android-new-pixel-perf_map.json"
+          "--test-shard-map-filename=android-new-pixel-perf_map.json",
+          "--ignore-benchmark-exit-code"
         ],
         "isolate_name": "performance_test_suite_android_clank_trichrome_chrome_google_64_32_bundle",
         "merge": {
@@ -481,7 +486,8 @@
           "-v",
           "--browser=android-trichrome-chrome-google-64-32-bundle",
           "--upload-results",
-          "--test-shard-map-filename=android-new-pixel-perf-pgo_map.json"
+          "--test-shard-map-filename=android-new-pixel-perf-pgo_map.json",
+          "--ignore-benchmark-exit-code"
         ],
         "isolate_name": "performance_test_suite_android_clank_trichrome_chrome_google_64_32_bundle",
         "merge": {
@@ -523,7 +529,8 @@
           "-v",
           "--browser=android-trichrome-chrome-google-64-32-bundle",
           "--upload-results",
-          "--test-shard-map-filename=android-new-pixel-pro-perf_map.json"
+          "--test-shard-map-filename=android-new-pixel-pro-perf_map.json",
+          "--ignore-benchmark-exit-code"
         ],
         "isolate_name": "performance_test_suite_android_clank_trichrome_chrome_google_64_32_bundle",
         "merge": {
@@ -565,7 +572,8 @@
           "-v",
           "--browser=android-trichrome-chrome-google-64-32-bundle",
           "--upload-results",
-          "--test-shard-map-filename=android-new-pixel-pro-perf-pgo_map.json"
+          "--test-shard-map-filename=android-new-pixel-pro-perf-pgo_map.json",
+          "--ignore-benchmark-exit-code"
         ],
         "isolate_name": "performance_test_suite_android_clank_trichrome_chrome_google_64_32_bundle",
         "merge": {
@@ -607,7 +615,8 @@
           "-v",
           "--browser=android-chrome-64-bundle",
           "--upload-results",
-          "--test-shard-map-filename=android-pixel2-perf_map.json"
+          "--test-shard-map-filename=android-pixel2-perf_map.json",
+          "--ignore-benchmark-exit-code"
         ],
         "isolate_name": "performance_test_suite_android_clank_monochrome_64_32_bundle",
         "merge": {
@@ -660,7 +669,8 @@
           "-v",
           "--browser=android-chrome-64-bundle",
           "--upload-results",
-          "--test-shard-map-filename=android-pixel2-perf-pgo_map.json"
+          "--test-shard-map-filename=android-pixel2-perf-pgo_map.json",
+          "--ignore-benchmark-exit-code"
         ],
         "isolate_name": "performance_test_suite_android_clank_monochrome_64_32_bundle",
         "merge": {
@@ -716,7 +726,8 @@
           "-v",
           "--browser=android-webview-google",
           "--upload-results",
-          "--test-shard-map-filename=android-pixel2_webview-perf_map.json"
+          "--test-shard-map-filename=android-pixel2_webview-perf_map.json",
+          "--ignore-benchmark-exit-code"
         ],
         "isolate_name": "performance_webview_test_suite",
         "merge": {
@@ -768,7 +779,8 @@
           "-v",
           "--browser=android-webview-google",
           "--upload-results",
-          "--test-shard-map-filename=android-pixel2_webview-perf-pgo_map.json"
+          "--test-shard-map-filename=android-pixel2_webview-perf-pgo_map.json",
+          "--ignore-benchmark-exit-code"
         ],
         "isolate_name": "performance_webview_test_suite",
         "merge": {
@@ -824,7 +836,8 @@
           "-v",
           "--browser=android-trichrome-bundle",
           "--upload-results",
-          "--test-shard-map-filename=android-pixel4-perf_map.json"
+          "--test-shard-map-filename=android-pixel4-perf_map.json",
+          "--ignore-benchmark-exit-code"
         ],
         "isolate_name": "performance_test_suite_android_clank_trichrome_bundle",
         "merge": {
@@ -872,7 +885,8 @@
           "-v",
           "--browser=android-trichrome-bundle",
           "--upload-results",
-          "--test-shard-map-filename=android-pixel4-perf-pgo_map.json"
+          "--test-shard-map-filename=android-pixel4-perf-pgo_map.json",
+          "--ignore-benchmark-exit-code"
         ],
         "isolate_name": "performance_test_suite_android_clank_trichrome_bundle",
         "merge": {
@@ -920,7 +934,8 @@
           "-v",
           "--browser=android-webview-trichrome-google-bundle",
           "--upload-results",
-          "--test-shard-map-filename=android-pixel4_webview-perf_map.json"
+          "--test-shard-map-filename=android-pixel4_webview-perf_map.json",
+          "--ignore-benchmark-exit-code"
         ],
         "isolate_name": "performance_webview_test_suite",
         "merge": {
@@ -969,6 +984,7 @@
           "--browser=android-chrome",
           "--upload-results",
           "--test-shard-map-filename=android-pixel4a_power-perf_map.json",
+          "--ignore-benchmark-exit-code",
           "--experimental-tbmv3-metrics"
         ],
         "isolate_name": "performance_test_suite_android_clank_chrome",
@@ -1018,6 +1034,7 @@
           "--browser=android-chrome",
           "--upload-results",
           "--test-shard-map-filename=android-pixel4a_power-perf-pgo_map.json",
+          "--ignore-benchmark-exit-code",
           "--experimental-tbmv3-metrics"
         ],
         "isolate_name": "performance_test_suite_android_clank_chrome",
@@ -1467,6 +1484,7 @@
           "--browser=lacros-chrome",
           "--upload-results",
           "--test-shard-map-filename=lacros-eve-perf_map.json",
+          "--ignore-benchmark-exit-code",
           "--remote=variable_chromeos_device_hostname"
         ],
         "isolate_name": "performance_test_suite_eve",
@@ -1516,6 +1534,7 @@
           "--browser=lacros-chrome",
           "--upload-results",
           "--test-shard-map-filename=lacros-x86-perf_map.json",
+          "--ignore-benchmark-exit-code",
           "--remote=variable_chromeos_device_hostname"
         ],
         "isolate_name": "performance_test_suite_octopus",
@@ -1611,6 +1630,7 @@
           "--browser=release",
           "--upload-results",
           "--test-shard-map-filename=linux-perf_map.json",
+          "--ignore-benchmark-exit-code",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -1663,6 +1683,7 @@
           "--browser=release",
           "--upload-results",
           "--test-shard-map-filename=linux-perf-pgo_map.json",
+          "--ignore-benchmark-exit-code",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -1711,6 +1732,7 @@
           "--browser=release",
           "--upload-results",
           "--test-shard-map-filename=linux-perf-rel_map.json",
+          "--ignore-benchmark-exit-code",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -1849,6 +1871,7 @@
           "--browser=release",
           "--upload-results",
           "--test-shard-map-filename=mac-laptop_high_end-perf_map.json",
+          "--ignore-benchmark-exit-code",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -1902,6 +1925,7 @@
           "--browser=release",
           "--upload-results",
           "--test-shard-map-filename=mac-laptop_high_end-perf-pgo_map.json",
+          "--ignore-benchmark-exit-code",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -1959,6 +1983,7 @@
           "--browser=release",
           "--upload-results",
           "--test-shard-map-filename=mac-laptop_low_end-perf_map.json",
+          "--ignore-benchmark-exit-code",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -2012,6 +2037,7 @@
           "--browser=release",
           "--upload-results",
           "--test-shard-map-filename=mac-laptop_low_end-perf-pgo_map.json",
+          "--ignore-benchmark-exit-code",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -2069,6 +2095,7 @@
           "--browser=release",
           "--upload-results",
           "--test-shard-map-filename=mac-m1_mini_2020-perf_map.json",
+          "--ignore-benchmark-exit-code",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -2117,6 +2144,7 @@
           "--browser=release",
           "--upload-results",
           "--test-shard-map-filename=mac-m1_mini_2020-perf-pgo_map.json",
+          "--ignore-benchmark-exit-code",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -2165,6 +2193,7 @@
           "--browser=release_x64",
           "--upload-results",
           "--test-shard-map-filename=win-10-perf_map.json",
+          "--ignore-benchmark-exit-code",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -2217,6 +2246,7 @@
           "--browser=release_x64",
           "--upload-results",
           "--test-shard-map-filename=win-10-perf-pgo_map.json",
+          "--ignore-benchmark-exit-code",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -2273,6 +2303,7 @@
           "--browser=release_x64",
           "--upload-results",
           "--test-shard-map-filename=win-10_amd_laptop-perf_map.json",
+          "--ignore-benchmark-exit-code",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -2321,6 +2352,7 @@
           "--browser=release_x64",
           "--upload-results",
           "--test-shard-map-filename=win-10_amd_laptop-perf-pgo_map.json",
+          "--ignore-benchmark-exit-code",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -2369,6 +2401,7 @@
           "--browser=release_x64",
           "--upload-results",
           "--test-shard-map-filename=win-10_laptop_low_end-perf_map.json",
+          "--ignore-benchmark-exit-code",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -2420,6 +2453,7 @@
           "--browser=release_x64",
           "--upload-results",
           "--test-shard-map-filename=win-10_laptop_low_end-perf-pgo_map.json",
+          "--ignore-benchmark-exit-code",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",

testing/buildbot/filters/BUILD.gn

diff --git a/testing/buildbot/filters/BUILD.gn b/testing/buildbot/filters/BUILD.gn
index ff6855cc..ad6dd23 100644
--- a/testing/buildbot/filters/BUILD.gn
+++ b/testing/buildbot/filters/BUILD.gn
@@ -248,7 +248,10 @@
 source_set("gin_unittests_filters") {
   testonly = true
 
-  data = [ "//testing/buildbot/filters/fuchsia.lsan.gin_unittests.filter" ]
+  data = [
+    "//testing/buildbot/filters/android.pie_arm64.gin_unittests_coverage.filter",
+    "//testing/buildbot/filters/fuchsia.lsan.gin_unittests.filter",
+  ]
 }
 
 source_set("skia_unittests_filters") {

testing/buildbot/filters/android.pie_arm64.gin_unittests_coverage.filter

diff --git a/testing/buildbot/filters/android.pie_arm64.gin_unittests_coverage.filter b/testing/buildbot/filters/android.pie_arm64.gin_unittests_coverage.filter
new file mode 100644
index 0000000..5d2b9bf
--- /dev/null
+++ b/testing/buildbot/filters/android.pie_arm64.gin_unittests_coverage.filter
@@ -0,0 +1,2 @@
+# crbug.com/1404782
+-V8PlatformAllocatorBTITest.VerifyReadWriteExecutePagesAreNotProtected

testing/buildbot/filters/fuchsia.browser_tests.filter

diff --git a/testing/buildbot/filters/fuchsia.browser_tests.filter b/testing/buildbot/filters/fuchsia.browser_tests.filter
index f33a7921d..7dd9030 100644
--- a/testing/buildbot/filters/fuchsia.browser_tests.filter
+++ b/testing/buildbot/filters/fuchsia.browser_tests.filter
@@ -21,9 +21,7 @@
 # message="MEDIA_ELEMENT_ERROR: Media load rejected by URL safety check"}
 -All/DeclarativeNetRequestBrowserTest.PacRequestsBypassRules/0
 -All/DeclarativeNetRequestBrowserTest.PacRequestsBypassRules/1
--ChromeURLDataManagerWebUITrustedTypesTest.NoTrustedTypesViolation/chrome___browser_switch
--ChromeURLDataManagerWebUITrustedTypesTest.NoTrustedTypesViolation/chrome___nacl
--ChromeURLDataManagerWebUITrustedTypesTest.NoTrustedTypesViolation/chrome___sandbox
+-ChromeURLDataManagerWebUITrustedTypesTest.*
 -HistoryClustersMetricsBrowserTest.IndirectNavigation
 -HttpProxyScriptBrowserTest.Verify
 -LoadingPredictorBrowserTestWithProxy.PrepareForPageLoadWithPrediction
@@ -118,6 +116,10 @@
 -ProcessManagementTest.ProcessOverflow
 -IsolatedAppTest.SessionStorage
 
+# TODO(crbug.com/1404777): [backend_impl.cc(1835)] Check failed:
+# data_->header.num_bytes >= 0 (-117 vs. 0)
+-ChromeNetworkServiceRestartBrowserTest.StoragePartitionGetNetworkContext
+
 # TODO(crbug.com/1316169): Google profile signin not supported yet
 -CrSettingsPeoplePageTest.All
 -ProfileCustomizationBubbleBrowserTest.InvokeUi_default
@@ -152,16 +154,7 @@
 
 # TODO(crbug.com/1326637) [account_fetcher_service.cc(387)] Failed to get UserInfo for
 # gaia_id_for_test_example.com, network error
--SigninInterceptFirstRunExperienceDialogBrowserTest.AcceptSync
--SigninInterceptFirstRunExperienceDialogBrowserTest.AcceptSync_ExtensionTheme
--SigninInterceptFirstRunExperienceDialogBrowserTest.AcceptSync_SkipCustomization
--SigninInterceptFirstRunExperienceDialogBrowserTest.AcceptSync_SyncPassphrase
--SigninInterceptFirstRunExperienceDialogBrowserTest.DeclineSync
--SigninInterceptFirstRunExperienceDialogBrowserTest.ForcedIntercept
--SigninInterceptFirstRunExperienceDialogBrowserTest.ForcedIntercept_ProfileColorPolicy
--SigninInterceptFirstRunExperienceDialogBrowserTest.ProfileColorPolicy
--SigninInterceptFirstRunExperienceDialogBrowserTest.SyncDisabled
--SigninInterceptFirstRunExperienceDialogBrowserTest.SyncSettings
+-SigninInterceptFirstRunExperienceDialogBrowserTest.*
 
 # TODO(crbug.com/1326980): Actual function call count doesn't match
 # EXPECT_CALL(*mock_hats_service_,
@@ -307,6 +300,7 @@
 -CorbAndCorsExtensionBrowserTest.FromProgrammaticContentScript_SameOrigin
 -CorbAndCorsExtensionBrowserTest.FromProgrammaticContentScript_UnloadedExtension
 -HistogramsInternalsUIBrowserTest.DownloadHistograms
+-PDFExtensionTest.Metrics
 -PrivateNetworkAccessWithFeatureEnabledBrowserTest.DoesNotRecordAddressSpaceFeatureForBlockedRequests
 -ProcessMemoryMetricsEmitterTest.FetchAndEmitMetrics
 -ProcessMemoryMetricsEmitterTest.FetchAndEmitMetricsWithExtensions
@@ -428,6 +422,8 @@
 -All/MediaHistoryBrowserTest.DoNotRecordWatchtime_Muted/0
 -All/MediaHistoryBrowserTest.DoNotRecordWatchtime_Muted/2
 -All/MediaHistoryBrowserTest.RecordWatchtime_VideoOnly/0
+-All/PageSpecificSiteDataDialogBrowserTest.ChangeAndCloseTab/1
+-All/PageSpecificSiteDataDialogBrowserTest.ClearOnExitMenuItem/1
 -All/PermissionPromptBubbleViewBrowserTest.ActiveTabClosedAfterRendererCrashesWithPendingPermissionRequest/0
 -All/PermissionPromptBubbleViewBrowserTest.ActiveTabClosedAfterRendererCrashesWithPendingPermissionRequest/1
 -All/ReportingBrowserTest.CrashReportUnresponsive/1
@@ -456,12 +452,16 @@
 -CrExtensionsA11yTestWithMultipleExensions.WithExtensions_td_has_header
 -CrExtensionsA11yTestWithMultipleExensions.WithExtensions_video_description
 -CrSettingsBasicPageTest.BasicPage
+-DesktopCaptureApiTest.ChooseDesktopMedia
+-DesktopCaptureApiTest.Delegation
 -EncryptedMediaSupportedTypesClearKeyTest.Video_MP4
 -EncryptedMediaSupportedTypesClearKeyTest.Video_WebM
+-ExtensionActionAPITest.SetIconInWorkerWithInvalidPath
 -ExtensionApiTabTest.UpdateWindowResize
 -FetchBehaviorTests/ContentVerifierHashTest.FetchFailureWithDefaultResourceExtension/0
 -FetchBehaviorTests/ContentVerifierHashTest.FetchFailureWithDefaultResourceExtension/1
--FileSystemApiTest.FileSystemApiRetainDirectoryEntry
+-FileSystemApiTest.FileSystemApiRetain*
+-FindInPageControllerTest.SingleOccurrence
 -InProcessBrowserTest.RunsScheduledLayoutOnAnchoredBubbles
 -InlineLoginHelperBrowserTest.InvokeUi_default
 -InlineLoginHelperBrowserTest.SigninCreatesSyncStarter1
@@ -470,6 +470,7 @@
 -InlineLoginHelperBrowserTest.UntrustedSigninDialogCancel
 -InlineLoginHelperBrowserTest.WithAuthCode
 -InspectUITest.LaunchUIDevtools
+-IsClipboardPasteContentAllowedTest.AllFiles*
 -MediaEngagementBrowserTest.RecordSingleVisitOnSameOrigin
 -MediaEngagementBrowserTest.SessionMultipleTabsClosingParent
 -MediaEngagementBrowserTest.SessionNewTabNavigateSameURLWithOpener_Typed
@@ -495,10 +496,13 @@
 -WebNavigationApiBackForwardCacheTest.ForwardBack
 
 # TODO(crbug.com/1326983): These tests time out, root cause hasn't been established yet
+-All/SystemAccessProcessPrintBrowserTest.*
+-All/SystemAccessProcessServicePrintBrowserTest.*
+-BackForwardCachePrintBrowserTest.DisableCaching
+-BatterySaverHelpPromoTest.*
 -ChromeMojoProxyResolverFactoryBrowserTest.DestroyAndCreateService
 -ChromeMojoProxyResolverFactoryBrowserTest.DestroyFactory
 -ChromeMojoProxyResolverFactoryBrowserTest.ServiceLifecycle
--ChromePasswordProtectionServiceSyncBrowserTest.GSuitePasswordAlertMode
 -ChromeSitePerProcessTest.PopupWindowFocus
 -ClientHintsBrowserTest.SwitchAcceptCHInvalid
 -ClientHintsBrowserTest.SwitchAppliesStorage
@@ -511,6 +515,7 @@
 -DestroyProfileOnBrowserClose/ProfileManagerBrowserTest.*
 -DiceWebSigninInterceptionBubbleBrowserTest.ProfileKeepAlive
 -ExtensionDialogTest.TextInputViaKeyEvent
+-HighEfficiencyChipViewBrowserTest.*
 -HighEfficiencyHelpPromoTest.*
 -IsolateOriginsPrintBrowserTest.PrintIsolatedSubframe
 -MediaEngagementPreloadBrowserTest.EnsureSingletonListIsLoaded
@@ -519,105 +524,94 @@
 -NetworkingPrivateServiceClientApiTest.OnNetworksChangedEventDisconnect
 -NetworkingPrivateServiceClientApiTest.RequestNetworkScan
 -OutOfMemoryReporterBrowserTest.MemoryExhaust
+-PDFExtensionSubmitFormTest.SubmitForm
 -PortalOutOfMemoryReporterBrowserTest.ReportForActivatedPortal
+-PrintBrowserTest.*
+-PrintExtensionBrowserTest.PrintOptionPage
+-PrintPreviewDialogControllerBrowserTest.PdfPluginDisabled
+-PrintPreviewDialogControllerBrowserTest.PrintPreviewPdfAccessibility
 -ProxySettingsApiTest.ProxyEventsParseError
 -ServiceWorkerTest.MimeHandlerView
 -SitePerProcessHitTestBrowserTest.TouchpadPinchOverOOPIF
+-SitePerProcessPrintBrowserTest.*
+-SitePerProcessPrintExtensionBrowserTest.PrintOptionPage
+-SystemAccessProcessSandboxedServicePrintBrowserTest.*
 -StartupMetricsTest.ReportsValues
--WebViewTests/WebViewAccessibilityTest.FocusAccessibility/SiteIsolationForGuestsDisabled
+-WebContentsInteractionTestUtilInteractiveTest.TrackWebContentsAcrossReplace
+-WebViewTests/WebViewAccessibilityTest.FocusAccessibility/SiteIsolationForGuests*
 -WebViewTests/WebViewTest.DownloadCookieIsolation_CrossSession/SiteIsolationForGuests*
 -WebViewTests/WebViewTest.NoPrerenderer/SiteIsolationForGuests*
 
 # TODO(crbug.com/1326982): Crashed with no info
+-DiceManageAccountBrowserTest.ClearManagedProfileOnStartup
 -InProcess/ChromeNetworkServiceBrowserTest.EncryptedCookies/0
 -OutOfProcess/ChromeNetworkServiceBrowserTest.EncryptedCookies/0
 -VariationsSafeModeEndToEndBrowserTest.ExtendedNullSeedEndToEnd
 -VariationsSafeModeEndToEndBrowserTest.ExtendedSafeSeedEndToEnd
+-WebHidExtensionFeatureEnabledBrowserTest.HidConnectionTracker
 
 # TODO(crbug.com/1349540): Missing various services, see bug for more info.
 -ProfileKeyedServiceBrowserTest.SystemProfileParent_NeededServices
+-ProfileKeyedServiceBrowserTest.GuestProfileParent_NeededServices
 
-# TODO(crbug.com/1349546) Pref is missing for PrivacyPage JS test. The exact missing pref is not
+# TODO(crbug.com/1349546): Pref is missing for PrivacyPage JS test. The exact missing pref is not
 # yet identified.
 -CrSettingsPrivacyPageTest.PrivacyPageTests
 
-# tab_helper
+# TODO(crbug.com/1402833): cannot find ShoppingListUiTabHelper
 -All/PriceTrackingEntryPointFeatureFlagTest.ShoppingListUiTabHelperCreation/ShoppingListEnabled
 -BookmarkBubbleViewBrowserTest.InvokeUi_bookmark_details*
 -BookmarkBubbleViewTest.SyncPromo*
 
-# media license issues
+# TODO(crbug.com/1402832): media license issues
 -All/BrowsingDataRemoverBrowserTestP.MediaLicenseDeletion*
 -BrowsingDataRemoverBrowserTest.MediaLicense*
 -IncognitoBrowsingDataBrowserTest.MediaLicenseDeletion
 
-# TODO(crbug.com/1271639): Undiagnosed failures
--All/DumpAccessibilityTreeTest.AccessibilityCanvasFallback/fuchsia
--All/PageSpecificSiteDataDialogBrowserTest.ChangeAndCloseTab/1
--All/PageSpecificSiteDataDialogBrowserTest.ClearOnExitMenuItem/1
--All/PasswordManagerPorterStoreTest.Import*
--All/SystemAccessProcessPrintBrowserTest.*
--All/SystemAccessProcessPrintBrowserTest.UpdatePrintSettings/2
--All/SystemAccessProcessServicePrintBrowserTest.*
--AppServiceProxyPreferredAppsTest.*
--BackForwardCachePrintBrowserTest.DisableCaching
--ChromeURLDataManagerWebUITrustedTypesTest.NoTrustedTypesViolation/chrome___connectors_internals
--Chunked/ChunkedPolicyPrefsTest.PolicyToPrefsMapping/0
--Chunked/ChunkedPolicyPrefsTest.PolicyToPrefsMapping/1
--Chunked/ChunkedPolicyPrefsTest.PolicyToPrefsMapping/2
--Chunked/ChunkedPolicyPrefsTest.PolicyToPrefsMapping/3
--Chunked/ChunkedPolicyPrefsTest.PolicyToPrefsMapping/4
--Chunked/ChunkedPolicyPrefsTest.PolicyToPrefsMapping/5
--Chunked/ChunkedPolicyPrefsTest.PolicyToPrefsMapping/6
--Chunked/ChunkedPolicyPrefsTest.PolicyToPrefsMapping/7
--CollectedCookiesViewsMetricsTest.BlockAllowSite
--CollectedCookiesViewsMetricsTest.BlockClearOnExit
--CollectedCookiesViewsMetricsTest.DeleteFolder
--CollectedCookiesViewsMetricsTest.OpenDialog
--CollectedCookiesViewsMetricsTest.RemoveButton
--DesktopCaptureApiTest.ChooseDesktopMedia
--DesktopCaptureApiTest.Delegation
--ExtensionActionAPITest.SetIconInWorkerWithInvalidPath
--FileSystemApiTest.FileSystemApiRetainEntry
--FindInPageControllerTest.SingleOccurrence
--GalleryWatchManagerTest.AddAndRemove*
--IsClipboardPasteContentAllowedTest.AllFiles*
--PasswordCheckDelegateTest.LastTimePasswordCheckCompletedIsSet
--PDFExtensionSubmitFormTest.SubmitForm
--PDFExtensionTest.Metrics
+# TODO(crbug.com/1402830):
+# /tmp/dkhapl/user_data/Default/IndexedDB/https_a.test_23411.indexeddb.leveldb:
+# No such file or directory
+-CollectedCookiesViewsMetricsTest.*
+-CookiesTreeModelBrowserTest.NoQuotaStorage
+
+# TODO(crbug.com/1402831):
+# web_ui_browser_test.cc(567)] JS ERROR: "Uncaught (in promise) NotAllowedError:
+# Document is not focused.", source: chrome://password-manager/passwords (0)
+-PasswordManagerUIPasswordCardTest.All
+
+# TODO(crbug.com/1402828):
+# "Mocha test failed: ColorsTest opens color picker
+# AssertionError: expected false to be true
+#   at assertTrue (chrome://webui-test/chai_assert.js:11:17)
+#   at Context.<anonymous> (chrome://webui-test/side_panel_customize_chrome/colors_test.js:125:9)
+# ", source: chrome://webui-test/mocha_adapter.js (57)
+-SidePanelCustomizeChromeColorsTest.All
+
+# TODO(crbug.com/1402826):
+# Policy IdleTimeout is marked as supported on this OS but does not exist in
+# the Chrome policy schema.
+-Chunked/ChunkedPolicyPrefsTest.PolicyToPrefsMapping*
+
+# TODO(crbug.com/1402825): Why is Fuchsia using "\r\n" as the line break?
 -PDFExtensionTest.SelectAllShortcut
--PdfToPwgRasterBrowserTest.TestSuccessColor
--PdfToPwgRasterBrowserTest.TestSuccessLongDuplex
--PdfToPwgRasterBrowserTest.TestSuccessMono
+
+# TODO(crbug.com/1402824):
+# Expected equality of these values:
+#  expect_success
+#    Which is: true
+#  pwg_region->IsValid()
+#    Which is: false
+-PdfToPwgRasterBrowserTest.*
+
+# TODO(crbug.com/1402822): content::PAGE_TYPE_ERROR
 -PersistentBackground/ExtensionWebRequestApiTestWithContextType.WebRequestPacRequestProtection/0
--PolicyPrefsTestCoverageTest.AllPoliciesHaveATestCase
--PrintBrowserTest.LazyLoadedIframeFetched
--PrintBrowserTest.LazyLoadedImagesFetched
--PrintBrowserTest.LegacyLayoutEngineFallback
--PrintBrowserTest.MultipagePrint
--PrintBrowserTest.NoScrolling
--PrintBrowserTest.NoScrollingVerticalRl
--PrintBrowserTest.PrintNup
--PrintBrowserTest.ResetPageScaleAfterPrintPreview
--PrintBrowserTest.SelectionContainsIframe
--PrintBrowserTest.WindowDotPrint
--PrintExtensionBrowserTest.PrintOptionPage
--PrintPreviewBrowserTest.PrintCommands
--PrintPreviewDialogControllerBrowserTest.PdfPluginDisabled
--PrintPreviewDialogControllerBrowserTest.PrintPreviewPdfAccessibility
--ProfileKeyedServiceBrowserTest.GuestProfileParent_NeededServices
--ReduceUserAgentPlatformBrowserTest.NavigatorPlatform
 -ServiceWorker/ExtensionWebRequestApiTestWithContextType.WebRequestPacRequestProtection/0
--SigninInterceptFirstRunExperienceDialogBrowserTest.PromotionalTabsDisabled
--SitePerProcessPrintBrowserTest.BasicPrint
--SitePerProcessPrintBrowserTest.MultipagePrint
--SitePerProcessPrintBrowserTest.PrintNup
--SitePerProcessPrintBrowserTest.SubframeUnavailableBeforePrint
--SitePerProcessPrintBrowserTest.SubframeUnavailableDuringPrint
--SitePerProcessPrintExtensionBrowserTest.PrintOptionPage
--SystemAccessProcessSandboxedServicePrintBrowserTest.StartPrintingAccessDenied
--SystemAccessProcessSandboxedServicePrintBrowserTest.StartPrintingDocumentDoneAccessDenied
--SystemAccessProcessSandboxedServicePrintBrowserTest.StartPrintingRenderDocumentAccessDenied
--SystemAccessProcessSandboxedServicePrintBrowserTest.StartPrintingRepeatedAccessDenied
--ThemeServiceBrowserTest.GetColorForToolbarButton
--UserNoteUICoordinatorTest.CleanScrollViewOnSidePanelCloseWithNotes
+
+# TODO(crbug.com/1402821): Print is not correctly enabled in browser tests.
+-PrintPreviewBrowserTest.PrintCommands
+
+# TODO(crbug.com/1348646): `navigator.platform` returns the empty string.
+-ReduceUserAgentPlatformBrowserTest.NavigatorPlatform
+
+# TODO(crbug.com/1402836): Fuchsia is not included in the policy definitions.
+-PolicyPrefsTestCoverageTest.AllPoliciesHaveATestCase

testing/buildbot/filters/fuchsia.unit_tests.filter

diff --git a/testing/buildbot/filters/fuchsia.unit_tests.filter b/testing/buildbot/filters/fuchsia.unit_tests.filter
index b229ca34..a5b05d6 100644
--- a/testing/buildbot/filters/fuchsia.unit_tests.filter
+++ b/testing/buildbot/filters/fuchsia.unit_tests.filter
@@ -1,4 +1,6 @@
 -All/PasswordManagerPorterStoreTest.Import/2
+-All/OsIntegrationSynchronizeCommandTest.SynchronizeWorks/*
+-BookmarkBubbleViewTest.SyncPromo*
 -CartServiceTest.TestExpiredDataDeleted
 -CartServiceTest.TestHiddenFlipedByCartAction
 -DiagnosticsController*
@@ -17,6 +19,8 @@
 -ExtensionsToolbarControlsUnitTest.RequestAccessButtonVisibility_NavigationBetweenPages
 -ExtensionUserScriptLoaderTest.Component*
 -FileAnalysisRequestTest.Invalid*
+-GalleryWatchManagerTest.AddAndRemoveTwoWatches
+-GalleryWatchManagerTest.RemoveAllWatches
 -LayoutProviderTest.Legacy*
 -PermissionMessageCombinationsUnittest.USBSerial*
 -ProfilesState/IsGuestModeRequestedTest.Requested/0
@@ -31,6 +35,7 @@
 -UDPSocketUnitTest.TestUDPMulticastRecv
 -UserNoteUICoordinatorTest.AddNoteEndUserSidePanel
 -UserNoteUICoordinatorTest.AddNoteMiddleUserSidePanel
+-UserNoteUICoordinatorTest.CleanScrollViewOnSidePanelCloseWithNotes
 -UserNoteUICoordinatorTest.PopulateUserNoteSidePanel
 -UserNoteUICoordinatorTest.RemoveAllNoteUserSidePanel
 -UserNoteUICoordinatorTest.RemoveEndUserSidePanel

testing/buildbot/generate_buildbot_json.py

diff --git a/testing/buildbot/generate_buildbot_json.py b/testing/buildbot/generate_buildbot_json.py
index 905fdeb..8b9c9fc6 100755
--- a/testing/buildbot/generate_buildbot_json.py
+++ b/testing/buildbot/generate_buildbot_json.py
@@ -556,6 +556,7 @@
     arr = self.merge_command_line_args(arr, '--enable-features=', ',')
     arr = self.merge_command_line_args(arr, '--extra-browser-args=', ' ')
     arr = self.merge_command_line_args(arr, '--test-launcher-filter-file=', ';')
+    arr = self.merge_command_line_args(arr, '--extra-app-args=', ',')
     return arr
 
   def substitute_magic_args(self, test_config, tester_name, tester_config):

testing/buildbot/test_suite_exceptions.pyl

diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index 6faf744..07a21de 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -127,6 +127,7 @@
       # Disabling MSan tests since linux-chromeos chrome crashes on MSan build.
       # TODO(crbug.com/1376064): Re-enable.
       'Linux ChromiumOS MSan Tests',
+      'Linux ChromiumOS MSan Focal',
     ]
   },
   'aura_unittests amd64-generic': {
@@ -900,6 +901,16 @@
           'shards': 60,
         },
       },
+      'Linux ChromiumOS MSan Focal': {
+        # These are very slow on the Chrome OS MSAN trybot for some reason.
+        # crbug.com/865455
+        'swarming': {
+          'shards': 40,
+        },
+        'args': [
+          '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.msan.browser_tests.oobe_negative.filter',
+        ],
+      },
       'Linux ChromiumOS MSan Tests': {
         # These are very slow on the Chrome OS MSAN trybot, most likely because browser_tests on cros has ~40% more tests. Also, these tests
         # run on ash, which means every test starts and shuts down ash, which most likely explains why it takes longer than on other platforms.
@@ -1778,7 +1789,7 @@
       },
       'linux-chromeos-rel': {
         'swarming': {
-          'shards': 6,
+          'shards': 3,
         },
       },
       'linux-code-coverage': {
@@ -2105,6 +2116,12 @@
       'Linux Chromium OS ASan LSan Tests (1)',  # https://crbug.com/831667
     ],
     'modifications': {
+      'android-pie-arm64-coverage-experimental-rel': {
+        'args': [
+          # https://crbug.com/1404782
+          '--test-launcher-filter-file=../../testing/buildbot/filters/android.pie_arm64.gin_unittests_coverage.filter',
+        ],
+      },
       'fuchsia-fyi-x64-asan': {
         'args': [
           '--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.lsan.gin_unittests.filter',
@@ -2271,6 +2288,7 @@
       # Can't run on MSAN because gl_unittests_ozone uses the hardware driver,
       # which isn't instrumented.
       'Linux ChromiumOS MSan Tests',
+      'Linux ChromiumOS MSan Focal',
     ],
   },
   'gold_common_pytype': {
@@ -2427,6 +2445,13 @@
           'quickrun_shards': 12,
         },
       },
+      'Linux ChromiumOS MSan Focal': {
+        # These are very slow on the Chrome OS MSAN trybot for some reason.
+        # crbug.com/865455
+        'swarming': {
+          'shards': 5,
+        },
+      },
       'Linux ChromiumOS MSan Tests': {
         # These are very slow on the Chrome OS MSAN trybot for some reason.
         # crbug.com/865455
@@ -2493,11 +2518,6 @@
           'shards': 6,
         },
       },
-      'linux-chromeos-rel': {
-        'swarming': {
-          'shards': 5,
-        },
-      },
       'linux-code-coverage': {
         'swarming': {
           'shards': 10,
@@ -3183,6 +3203,7 @@
       # The face and barcode detection tests fail on the Mac Pros.
       'Mac Pro FYI Release (AMD)',
       'Linux ChromiumOS MSan Tests',  # https://crbug.com/831676
+      'Linux ChromiumOS MSan Focal',
       'Linux MSan Tests',  # https://crbug.com/831676
     ],
     'replacements': {
@@ -3300,11 +3321,6 @@
           'shards': 4,
         },
       },
-      'linux-chromeos-rel': {
-        'swarming': {
-          'shards': 2,
-        },
-      },
       'linux-code-coverage': {
         'swarming': {
           'shards': 4,

testing/buildbot/test_suites.pyl

diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index 9d73e86..a87deb4 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -4107,7 +4107,7 @@
         ],
         'test': 'browser_tests',
         'swarming': {
-          'shards': 8,
+          'shards': 4,
         },
       },
     },

testing/buildbot/variants.pyl

diff --git a/testing/buildbot/variants.pyl b/testing/buildbot/variants.pyl
index 93ddf25a..959e147 100644
--- a/testing/buildbot/variants.pyl
+++ b/testing/buildbot/variants.pyl
@@ -22,16 +22,16 @@
   },
   'LACROS_VERSION_SKEW_CANARY': {
     'args': [
-      '--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5516.0/test_ash_chrome',
+      '--ash-chrome-path-override=../../lacros_version_skew_tests_v111.0.5517.0/test_ash_chrome',
     ],
-    'description': 'Run with ash-chrome version 111.0.5516.0',
+    'description': 'Run with ash-chrome version 111.0.5517.0',
     'identifier': 'Lacros version skew testing ash canary',
     'swarming': {
       'cipd_packages': [
         {
           'cipd_package': 'chromium/testing/linux-ash-chromium/x86_64/ash.zip',
-          'location': 'lacros_version_skew_tests_v111.0.5516.0',
-          'revision': 'version:111.0.5516.0',
+          'location': 'lacros_version_skew_tests_v111.0.5517.0',
+          'revision': 'version:111.0.5517.0',
         },
       ],
     },

testing/buildbot/waterfalls.pyl

diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index e453866..60bf887 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -2802,6 +2802,22 @@
           'gtest_tests': 'chromium_linux_and_gl_gtests',
         },
       },
+      'Linux ChromiumOS MSan Focal': {
+        'mixins': [
+          'linux-focal',
+          'x86-64',
+        ],
+        'swarming': {
+          'expiration': 10800,
+          'hard_timeout': 7200,
+        },
+        'test_suites': {
+          'gtest_tests': 'linux_chromeos_gtests_oobe',
+        },
+        'args': [
+          '--test-launcher-print-test-stdio=always',
+        ],
+      },
       'Linux Viz': {
         'mixins': [
           'linux-bionic',
@@ -5108,7 +5124,7 @@
       },
       'Linux ChromiumOS MSan Tests': {
         'mixins': [
-          'linux-focal',
+          'linux-xenial',
           'x86-64',
         ],
         'test_suites': {

testing/variations/fieldtrial_testing_config.json

diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
index 8ddd89ef..e131608 100644
--- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json
@@ -7549,6 +7549,21 @@
             ]
         }
     ],
+    "OmniboxRemoveExcessiveRecycledViewClearCalls": [
+        {
+            "platforms": [
+                "android"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "enable_features": [
+                        "OmniboxRemoveExcessiveRecycledViewClearCalls"
+                    ]
+                }
+            ]
+        }
+    ],
     "OmniboxZeroSuggestPrefetchingWithInMemoryCaching": [
         {
             "platforms": [
@@ -7843,6 +7858,35 @@
             ]
         }
     ],
+    "PWARemoveServiceWorkerRequirement": [
+        {
+            "platforms": [
+                "chromeos",
+                "chromeos_lacros",
+                "linux",
+                "mac",
+                "windows"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled_Promotability",
+                    "enable_features": [
+                        "SkipServiceWorkerCheckInstallOnly",
+                        "SkipServiceWorkerForInstallPromot"
+                    ]
+                },
+                {
+                    "name": "Enabled_Installability",
+                    "enable_features": [
+                        "SkipServiceWorkerCheckInstallOnly"
+                    ],
+                    "disable_features": [
+                        "SkipServiceWorkerForInstallPromot"
+                    ]
+                }
+            ]
+        }
+    ],
     "PageAllocatorRetryOnCommitFailure": [
         {
             "platforms": [
@@ -12954,21 +12998,6 @@
             ]
         }
     ],
-    "WebViewThrottleBackgroundBeginFrame": [
-        {
-            "platforms": [
-                "android_webview"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled",
-                    "enable_features": [
-                        "WebViewThrottleBackgroundBeginFrame"
-                    ]
-                }
-            ]
-        }
-    ],
     "WebViewUseMetricsUploadService": [
         {
             "platforms": [

third_party/blink/public/platform/child_url_loader_factory_bundle.h

diff --git a/third_party/blink/public/platform/child_url_loader_factory_bundle.h b/third_party/blink/public/platform/child_url_loader_factory_bundle.h
index 984ce98..b8f3ba0 100644
--- a/third_party/blink/public/platform/child_url_loader_factory_bundle.h
+++ b/third_party/blink/public/platform/child_url_loader_factory_bundle.h
@@ -23,12 +23,17 @@
 
 // Holds the internal state of a ChildURLLoaderFactoryBundle in a form that is
 // safe to pass across sequences.
+//
 // |pending_prefetch_loader_factory| is used only by the frames who may send
 // prefetch requests by <link rel="prefetch"> tags. The loader factory allows
 // prefetch loading to be done by the browser process (therefore less memory
 // pressure), and also adds special handling for Signed Exchanges (SXG) when the
 // flag is enabled. TODO(crbug/803776): deprecate this once SXG specific code is
 // moved into Network Service unless we see huge memory benefit for doing this.
+//
+// |pending_topics_loader_factory| is used only by the frames who may send
+// fetch requests with {browsingTopics: true} flag. The loader factory allows
+// topics handling to be proxied via the browser process.
 class BLINK_PLATFORM_EXPORT ChildPendingURLLoaderFactoryBundle
     : public blink::PendingURLLoaderFactoryBundle {
  public:
@@ -42,6 +47,8 @@
       OriginMap pending_isolated_world_factories,
       mojo::PendingRemote<network::mojom::URLLoaderFactory>
           pending_prefetch_loader_factory,
+      mojo::PendingRemote<network::mojom::URLLoaderFactory>
+          pending_topics_loader_factory,
       bool bypass_redirect_checks);
   ChildPendingURLLoaderFactoryBundle(
       const ChildPendingURLLoaderFactoryBundle&) = delete;
@@ -59,6 +66,7 @@
             {},       // pending_scheme_specific_factories
             {},       // pending_isolated_world_factories
             {},       // pending_prefetch_loader_factory
+            {},       // pending_topics_loader_factory
             false));  // bypass_redirect_checks
     return pending_bundle;
   }
@@ -68,12 +76,20 @@
     return pending_prefetch_loader_factory_;
   }
 
+  mojo::PendingRemote<network::mojom::URLLoaderFactory>&
+  pending_topics_loader_factory() {
+    return pending_topics_loader_factory_;
+  }
+
  protected:
   // PendingURLLoaderFactoryBundle overrides.
   scoped_refptr<network::SharedURLLoaderFactory> CreateFactory() override;
 
   mojo::PendingRemote<network::mojom::URLLoaderFactory>
       pending_prefetch_loader_factory_;
+
+  mojo::PendingRemote<network::mojom::URLLoaderFactory>
+      pending_topics_loader_factory_;
 };
 
 // This class extends URLLoaderFactoryBundle to support prefetch loader factory
@@ -107,6 +123,9 @@
   void SetPrefetchLoaderFactory(
       mojo::PendingRemote<network::mojom::URLLoaderFactory>
           prefetch_loader_factory);
+  void SetTopicsLoaderFactory(
+      mojo::PendingRemote<network::mojom::URLLoaderFactory>
+          topics_loader_factory);
 
   virtual bool IsHostChildURLLoaderFactoryBundle() const;
 
@@ -115,6 +134,7 @@
 
  private:
   mojo::Remote<network::mojom::URLLoaderFactory> prefetch_loader_factory_;
+  mojo::Remote<network::mojom::URLLoaderFactory> topics_loader_factory_;
 
   std::map<GURL, mojom::TransferrableURLLoaderPtr> subresource_overrides_;
 };

third_party/blink/public/platform/tracked_child_url_loader_factory_bundle.h

diff --git a/third_party/blink/public/platform/tracked_child_url_loader_factory_bundle.h b/third_party/blink/public/platform/tracked_child_url_loader_factory_bundle.h
index 4f09f8e..83cfe3d 100644
--- a/third_party/blink/public/platform/tracked_child_url_loader_factory_bundle.h
+++ b/third_party/blink/public/platform/tracked_child_url_loader_factory_bundle.h
@@ -43,6 +43,8 @@
       OriginMap pending_isolated_world_factories,
       mojo::PendingRemote<network::mojom::URLLoaderFactory>
           pending_prefetch_loader_factory,
+      mojo::PendingRemote<network::mojom::URLLoaderFactory>
+          pending_topics_loader_factory,
       std::unique_ptr<HostPtrAndTaskRunner> main_thread_host_bundle,
       bool bypass_redirect_checks);
   TrackedChildPendingURLLoaderFactoryBundle(

third_party/blink/renderer/core/exported/web_media_player_impl_unittest.cc

diff --git a/third_party/blink/renderer/core/exported/web_media_player_impl_unittest.cc b/third_party/blink/renderer/core/exported/web_media_player_impl_unittest.cc
index e0ed2d3..5c824b3 100644
--- a/third_party/blink/renderer/core/exported/web_media_player_impl_unittest.cc
+++ b/third_party/blink/renderer/core/exported/web_media_player_impl_unittest.cc
@@ -809,7 +809,7 @@
 
     // Verify we made it through pipeline startup.
     EXPECT_TRUE(wmpi_->demuxer_manager_->HasDataSource());
-    EXPECT_TRUE(wmpi_->demuxer_);
+    EXPECT_TRUE(wmpi_->demuxer_manager_->HasDemuxer());
 
     if (ready_state > WebMediaPlayer::kReadyStateHaveCurrentData)
       EXPECT_FALSE(wmpi_->seeking_);

third_party/blink/renderer/core/fetch/request_init.idl

diff --git a/third_party/blink/renderer/core/fetch/request_init.idl b/third_party/blink/renderer/core/fetch/request_init.idl
index d607ee52..1173224 100644
--- a/third_party/blink/renderer/core/fetch/request_init.idl
+++ b/third_party/blink/renderer/core/fetch/request_init.idl
@@ -22,7 +22,7 @@
     DOMString integrity;
     boolean keepalive;
     [RuntimeEnabled=PriorityHints] FetchPriority priority;
-    [RuntimeEnabled=TopicsAPI] boolean browsingTopics;
+    [RuntimeEnabled=TopicsAPI, Exposed=Window] boolean browsingTopics;
     AbortSignal? signal;
     [RuntimeEnabled=FetchUploadStreaming] RequestDuplex duplex;
     [RuntimeEnabled=PrivateNetworkAccessPermissionPrompt] IPAddressSpace targetAddressSpace;

third_party/blink/renderer/core/html/html_element.cc

diff --git a/third_party/blink/renderer/core/html/html_element.cc b/third_party/blink/renderer/core/html/html_element.cc
index 59ee4c91..07c8335 100644
--- a/third_party/blink/renderer/core/html/html_element.cc
+++ b/third_party/blink/renderer/core/html/html_element.cc
@@ -1393,10 +1393,8 @@
 
   SetPopoverFocusOnShow();
 
-  // Only restore focus (later) if focus changed as a result of showing the
-  // popover.
-  if (should_restore_focus && HasPopoverAttribute() &&
-      originally_focused_element != document.FocusedElement()) {
+  // Store the element to focus when this popover closes.
+  if (should_restore_focus && HasPopoverAttribute()) {
     GetPopoverData()->setPreviouslyFocusedElement(originally_focused_element);
   }
 }

third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc

diff --git a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
index 8dfa720..669085e1 100644
--- a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
+++ b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
@@ -257,7 +257,7 @@
   if (previous_transform_ != &current_transform) {
     auto projection = GeometryMapper::SourceToDestinationProjection(
         current_transform, *viewport_transform_);
-    if (projection.IsIdentityOr2DTranslation()) {
+    if (projection.IsIdentityOr2dTranslation()) {
       current_x_offset_ = projection.To2dTranslation().x();
       previous_transform_ = &current_transform;
     } else {

third_party/blink/renderer/core/paint/box_border_painter.cc

diff --git a/third_party/blink/renderer/core/paint/box_border_painter.cc b/third_party/blink/renderer/core/paint/box_border_painter.cc
index dca3bdf6..ee4f1a9 100644
--- a/third_party/blink/renderer/core/paint/box_border_painter.cc
+++ b/third_party/blink/renderer/core/paint/box_border_painter.cc
@@ -124,21 +124,21 @@
   return BorderStyleHasUnmatchedColorsAtCorner(style, side, adjacent_side);
 }
 
-void SetToRightSideRect(gfx::RectF& rect, float edge_width) {
+void SetToRightSideRect(gfx::Rect& rect, int edge_width) {
   rect.set_x(rect.right() - edge_width);
   rect.set_width(edge_width);
 }
 
-void SetToBottomSideRect(gfx::RectF& rect, float edge_width) {
+void SetToBottomSideRect(gfx::Rect& rect, int edge_width) {
   rect.set_y(rect.bottom() - edge_width);
   rect.set_height(edge_width);
 }
 
-gfx::RectF CalculateSideRect(const FloatRoundedRect& outer_border,
-                             const BorderEdge& edge,
-                             BoxSide side) {
-  gfx::RectF side_rect = outer_border.Rect();
-  float width = edge.Width();
+gfx::Rect CalculateSideRect(const FloatRoundedRect& outer_border,
+                            const BorderEdge& edge,
+                            BoxSide side) {
+  gfx::Rect side_rect = gfx::ToRoundedRect(outer_border.Rect());
+  int width = edge.Width();
 
   switch (side) {
     case BoxSide::kTop:
@@ -246,13 +246,12 @@
 }
 
 void DrawSolidBorderRect(GraphicsContext& context,
-                         const gfx::RectF& border_rect,
-                         float border_width,
+                         const gfx::Rect& border_rect,
+                         int border_width,
                          const Color& color,
                          const AutoDarkMode& auto_dark_mode) {
-  gfx::RectF stroke_rect = border_rect;
-  border_width = floorf(border_width);
-  stroke_rect.Outset(-border_width / 2);
+  gfx::RectF stroke_rect(border_rect);
+  stroke_rect.Outset(-border_width / 2.f);
 
   bool was_antialias = context.ShouldAntialias();
   if (!was_antialias)
@@ -424,6 +423,19 @@
   }
 }
 
+void DrawLineForBoxSide(GraphicsContext& context,
+                        int x1,
+                        int y1,
+                        int x2,
+                        int y2,
+                        BoxSide side,
+                        Color color,
+                        EBorderStyle style,
+                        int adjacent_width1,
+                        int adjacent_width2,
+                        bool antialias,
+                        const AutoDarkMode& auto_dark_mode);
+
 void DrawDoubleBoxSide(GraphicsContext& context,
                        int x1,
                        int y1,
@@ -432,7 +444,7 @@
                        int length,
                        BoxSide side,
                        Color color,
-                       float thickness,
+                       int thickness,
                        int adjacent_width1,
                        int adjacent_width2,
                        bool antialias,
@@ -479,58 +491,56 @@
 
   switch (side) {
     case BoxSide::kTop:
-      BoxBorderPainter::DrawLineForBoxSide(
+      DrawLineForBoxSide(
           context, x1 + std::max((-adjacent_width1 * 2 + 1) / 3, 0), y1,
           x2 - std::max((-adjacent_width2 * 2 + 1) / 3, 0),
           y1 + third_of_thickness, side, color, EBorderStyle::kSolid,
           adjacent1_big_third, adjacent2_big_third, antialias, auto_dark_mode);
-      BoxBorderPainter::DrawLineForBoxSide(
-          context, x1 + std::max((adjacent_width1 * 2 + 1) / 3, 0),
-          y2 - third_of_thickness,
-          x2 - std::max((adjacent_width2 * 2 + 1) / 3, 0), y2, side, color,
-          EBorderStyle::kSolid, adjacent1_big_third, adjacent2_big_third,
-          antialias, auto_dark_mode);
+      DrawLineForBoxSide(context,
+                         x1 + std::max((adjacent_width1 * 2 + 1) / 3, 0),
+                         y2 - third_of_thickness,
+                         x2 - std::max((adjacent_width2 * 2 + 1) / 3, 0), y2,
+                         side, color, EBorderStyle::kSolid, adjacent1_big_third,
+                         adjacent2_big_third, antialias, auto_dark_mode);
       break;
     case BoxSide::kLeft:
-      BoxBorderPainter::DrawLineForBoxSide(
-          context, x1, y1 + std::max((-adjacent_width1 * 2 + 1) / 3, 0),
-          x1 + third_of_thickness,
-          y2 - std::max((-adjacent_width2 * 2 + 1) / 3, 0), side, color,
-          EBorderStyle::kSolid, adjacent1_big_third, adjacent2_big_third,
-          antialias, auto_dark_mode);
-      BoxBorderPainter::DrawLineForBoxSide(
-          context, x2 - third_of_thickness,
-          y1 + std::max((adjacent_width1 * 2 + 1) / 3, 0), x2,
-          y2 - std::max((adjacent_width2 * 2 + 1) / 3, 0), side, color,
-          EBorderStyle::kSolid, adjacent1_big_third, adjacent2_big_third,
-          antialias, auto_dark_mode);
+      DrawLineForBoxSide(context, x1,
+                         y1 + std::max((-adjacent_width1 * 2 + 1) / 3, 0),
+                         x1 + third_of_thickness,
+                         y2 - std::max((-adjacent_width2 * 2 + 1) / 3, 0), side,
+                         color, EBorderStyle::kSolid, adjacent1_big_third,
+                         adjacent2_big_third, antialias, auto_dark_mode);
+      DrawLineForBoxSide(context, x2 - third_of_thickness,
+                         y1 + std::max((adjacent_width1 * 2 + 1) / 3, 0), x2,
+                         y2 - std::max((adjacent_width2 * 2 + 1) / 3, 0), side,
+                         color, EBorderStyle::kSolid, adjacent1_big_third,
+                         adjacent2_big_third, antialias, auto_dark_mode);
       break;
     case BoxSide::kBottom:
-      BoxBorderPainter::DrawLineForBoxSide(
+      DrawLineForBoxSide(
           context, x1 + std::max((adjacent_width1 * 2 + 1) / 3, 0), y1,
           x2 - std::max((adjacent_width2 * 2 + 1) / 3, 0),
           y1 + third_of_thickness, side, color, EBorderStyle::kSolid,
           adjacent1_big_third, adjacent2_big_third, antialias, auto_dark_mode);
-      BoxBorderPainter::DrawLineForBoxSide(
-          context, x1 + std::max((-adjacent_width1 * 2 + 1) / 3, 0),
-          y2 - third_of_thickness,
-          x2 - std::max((-adjacent_width2 * 2 + 1) / 3, 0), y2, side, color,
-          EBorderStyle::kSolid, adjacent1_big_third, adjacent2_big_third,
-          antialias, auto_dark_mode);
+      DrawLineForBoxSide(context,
+                         x1 + std::max((-adjacent_width1 * 2 + 1) / 3, 0),
+                         y2 - third_of_thickness,
+                         x2 - std::max((-adjacent_width2 * 2 + 1) / 3, 0), y2,
+                         side, color, EBorderStyle::kSolid, adjacent1_big_third,
+                         adjacent2_big_third, antialias, auto_dark_mode);
       break;
     case BoxSide::kRight:
-      BoxBorderPainter::DrawLineForBoxSide(
-          context, x1, y1 + std::max((adjacent_width1 * 2 + 1) / 3, 0),
-          x1 + third_of_thickness,
-          y2 - std::max((adjacent_width2 * 2 + 1) / 3, 0), side, color,
-          EBorderStyle::kSolid, adjacent1_big_third, adjacent2_big_third,
-          antialias, auto_dark_mode);
-      BoxBorderPainter::DrawLineForBoxSide(
-          context, x2 - third_of_thickness,
-          y1 + std::max((-adjacent_width1 * 2 + 1) / 3, 0), x2,
-          y2 - std::max((-adjacent_width2 * 2 + 1) / 3, 0), side, color,
-          EBorderStyle::kSolid, adjacent1_big_third, adjacent2_big_third,
-          antialias, auto_dark_mode);
+      DrawLineForBoxSide(context, x1,
+                         y1 + std::max((adjacent_width1 * 2 + 1) / 3, 0),
+                         x1 + third_of_thickness,
+                         y2 - std::max((adjacent_width2 * 2 + 1) / 3, 0), side,
+                         color, EBorderStyle::kSolid, adjacent1_big_third,
+                         adjacent2_big_third, antialias, auto_dark_mode);
+      DrawLineForBoxSide(context, x2 - third_of_thickness,
+                         y1 + std::max((-adjacent_width1 * 2 + 1) / 3, 0), x2,
+                         y2 - std::max((-adjacent_width2 * 2 + 1) / 3, 0), side,
+                         color, EBorderStyle::kSolid, adjacent1_big_third,
+                         adjacent2_big_third, antialias, auto_dark_mode);
       break;
     default:
       break;
@@ -566,49 +576,47 @@
 
   switch (side) {
     case BoxSide::kTop:
-      BoxBorderPainter::DrawLineForBoxSide(
-          context, x1 + std::max(-adjacent_width1, 0) / 2, y1,
-          x2 - std::max(-adjacent_width2, 0) / 2, (y1 + y2 + 1) / 2, side,
-          color, s1, adjacent1_big_half, adjacent2_big_half, antialias,
-          auto_dark_mode);
-      BoxBorderPainter::DrawLineForBoxSide(
+      DrawLineForBoxSide(context, x1 + std::max(-adjacent_width1, 0) / 2, y1,
+                         x2 - std::max(-adjacent_width2, 0) / 2,
+                         (y1 + y2 + 1) / 2, side, color, s1, adjacent1_big_half,
+                         adjacent2_big_half, antialias, auto_dark_mode);
+      DrawLineForBoxSide(
           context, x1 + std::max(adjacent_width1 + 1, 0) / 2, (y1 + y2 + 1) / 2,
           x2 - std::max(adjacent_width2 + 1, 0) / 2, y2, side, color, s2,
           adjacent_width1 / 2, adjacent_width2 / 2, antialias, auto_dark_mode);
       break;
     case BoxSide::kLeft:
-      BoxBorderPainter::DrawLineForBoxSide(
-          context, x1, y1 + std::max(-adjacent_width1, 0) / 2,
-          (x1 + x2 + 1) / 2, y2 - std::max(-adjacent_width2, 0) / 2, side,
-          color, s1, adjacent1_big_half, adjacent2_big_half, antialias,
-          auto_dark_mode);
-      BoxBorderPainter::DrawLineForBoxSide(
+      DrawLineForBoxSide(context, x1, y1 + std::max(-adjacent_width1, 0) / 2,
+                         (x1 + x2 + 1) / 2,
+                         y2 - std::max(-adjacent_width2, 0) / 2, side, color,
+                         s1, adjacent1_big_half, adjacent2_big_half, antialias,
+                         auto_dark_mode);
+      DrawLineForBoxSide(
           context, (x1 + x2 + 1) / 2, y1 + std::max(adjacent_width1 + 1, 0) / 2,
           x2, y2 - std::max(adjacent_width2 + 1, 0) / 2, side, color, s2,
           adjacent_width1 / 2, adjacent_width2 / 2, antialias, auto_dark_mode);
       break;
     case BoxSide::kBottom:
-      BoxBorderPainter::DrawLineForBoxSide(
-          context, x1 + std::max(adjacent_width1, 0) / 2, y1,
-          x2 - std::max(adjacent_width2, 0) / 2, (y1 + y2 + 1) / 2, side, color,
-          s2, adjacent1_big_half, adjacent2_big_half, antialias,
-          auto_dark_mode);
-      BoxBorderPainter::DrawLineForBoxSide(
-          context, x1 + std::max(-adjacent_width1 + 1, 0) / 2,
-          (y1 + y2 + 1) / 2, x2 - std::max(-adjacent_width2 + 1, 0) / 2, y2,
-          side, color, s1, adjacent_width1 / 2, adjacent_width2 / 2, antialias,
-          auto_dark_mode);
+      DrawLineForBoxSide(context, x1 + std::max(adjacent_width1, 0) / 2, y1,
+                         x2 - std::max(adjacent_width2, 0) / 2,
+                         (y1 + y2 + 1) / 2, side, color, s2, adjacent1_big_half,
+                         adjacent2_big_half, antialias, auto_dark_mode);
+      DrawLineForBoxSide(context, x1 + std::max(-adjacent_width1 + 1, 0) / 2,
+                         (y1 + y2 + 1) / 2,
+                         x2 - std::max(-adjacent_width2 + 1, 0) / 2, y2, side,
+                         color, s1, adjacent_width1 / 2, adjacent_width2 / 2,
+                         antialias, auto_dark_mode);
       break;
     case BoxSide::kRight:
-      BoxBorderPainter::DrawLineForBoxSide(
+      DrawLineForBoxSide(
           context, x1, y1 + std::max(adjacent_width1, 0) / 2, (x1 + x2 + 1) / 2,
           y2 - std::max(adjacent_width2, 0) / 2, side, color, s2,
           adjacent1_big_half, adjacent2_big_half, antialias, auto_dark_mode);
-      BoxBorderPainter::DrawLineForBoxSide(
-          context, (x1 + x2 + 1) / 2,
-          y1 + std::max(-adjacent_width1 + 1, 0) / 2, x2,
-          y2 - std::max(-adjacent_width2 + 1, 0) / 2, side, color, s1,
-          adjacent_width1 / 2, adjacent_width2 / 2, antialias, auto_dark_mode);
+      DrawLineForBoxSide(context, (x1 + x2 + 1) / 2,
+                         y1 + std::max(-adjacent_width1 + 1, 0) / 2, x2,
+                         y2 - std::max(-adjacent_width2 + 1, 0) / 2, side,
+                         color, s1, adjacent_width1 / 2, adjacent_width2 / 2,
+                         antialias, auto_dark_mode);
       break;
   }
 }
@@ -688,6 +696,77 @@
   FillQuad(context, quad, color, antialias, auto_dark_mode);
 }
 
+void DrawLineForBoxSide(GraphicsContext& context,
+                        int x1,
+                        int y1,
+                        int x2,
+                        int y2,
+                        BoxSide side,
+                        Color color,
+                        EBorderStyle style,
+                        int adjacent_width1,
+                        int adjacent_width2,
+                        bool antialias,
+                        const AutoDarkMode& auto_dark_mode) {
+  int thickness;
+  int length;
+  if (side == BoxSide::kTop || side == BoxSide::kBottom) {
+    thickness = y2 - y1;
+    length = x2 - x1;
+  } else {
+    thickness = x2 - x1;
+    length = y2 - y1;
+  }
+
+  // We would like this check to be an ASSERT as we don't want to draw empty
+  // borders. However nothing guarantees that the following recursive calls to
+  // DrawLineForBoxSide() will have positive thickness and length.
+  if (length <= 0 || thickness <= 0) {
+    return;
+  }
+
+  style = BorderEdge::EffectiveStyle(style, thickness);
+
+  switch (style) {
+    case EBorderStyle::kNone:
+    case EBorderStyle::kHidden:
+      return;
+    case EBorderStyle::kDotted:
+    case EBorderStyle::kDashed:
+      DrawDashedOrDottedBoxSide(context, x1, y1, x2, y2, side, color, thickness,
+                                style, antialias, auto_dark_mode);
+      break;
+    case EBorderStyle::kDouble:
+      DrawDoubleBoxSide(context, x1, y1, x2, y2, length, side, color, thickness,
+                        adjacent_width1, adjacent_width2, antialias,
+                        auto_dark_mode);
+      break;
+    case EBorderStyle::kRidge:
+    case EBorderStyle::kGroove:
+      DrawRidgeOrGrooveBoxSide(context, x1, y1, x2, y2, side, color, style,
+                               adjacent_width1, adjacent_width2, antialias,
+                               auto_dark_mode);
+      break;
+    case EBorderStyle::kInset:
+      // FIXME: Maybe we should lighten the colors on one side like Firefox.
+      // https://bugs.webkit.org/show_bug.cgi?id=58608
+      if (side == BoxSide::kTop || side == BoxSide::kLeft) {
+        color = color.Dark();
+      }
+      [[fallthrough]];
+    case EBorderStyle::kOutset:
+      if (style == EBorderStyle::kOutset &&
+          (side == BoxSide::kBottom || side == BoxSide::kRight)) {
+        color = color.Dark();
+      }
+      [[fallthrough]];
+    case EBorderStyle::kSolid:
+      DrawSolidBoxSide(context, x1, y1, x2, y2, side, color, adjacent_width1,
+                       adjacent_width2, antialias, auto_dark_mode);
+      break;
+  }
+}
+
 void FindIntersection(const gfx::PointF& p1,
                       const gfx::PointF& p2,
                       const gfx::PointF& d1,
@@ -736,8 +815,8 @@
                 const BorderEdge& edge_a = border_painter.Edge(a);
                 const BorderEdge& edge_b = border_painter.Edge(b);
 
-                const unsigned alpha_a = edge_a.color.Alpha();
-                const unsigned alpha_b = edge_b.color.Alpha();
+                const unsigned alpha_a = edge_a.GetColor().Alpha();
+                const unsigned alpha_b = edge_b.GetColor().Alpha();
                 if (alpha_a != alpha_b)
                   return alpha_a < alpha_b;
 
@@ -770,7 +849,7 @@
     unsigned current_alpha = 0;
     for (BoxSide side : sorted_sides) {
       const BorderEdge& edge = border_painter.Edge(side);
-      const unsigned edge_alpha = edge.color.Alpha();
+      const unsigned edge_alpha = edge.GetColor().Alpha();
 
       DCHECK_GT(edge_alpha, 0u);
       DCHECK_GE(edge_alpha, current_alpha);
@@ -795,7 +874,7 @@
   DCHECK(FirstEdge().BorderStyle() == EBorderStyle::kDouble);
   DCHECK(visible_edge_set_ == kAllBorderEdges);
 
-  const Color color = FirstEdge().color;
+  const Color& color = FirstEdge().GetColor();
 
   // When painting outlines, we ignore outer/inner radii.
   const auto force_rectangular = !outer_.IsRounded() && !inner_.IsRounded();
@@ -836,13 +915,13 @@
     if (FirstEdge().BorderStyle() == EBorderStyle::kSolid) {
       if (is_uniform_width_ && !outer_.IsRounded()) {
         // 4-side, solid, uniform-width, rectangular border => one drawRect()
-        DrawSolidBorderRect(context_, outer_.Rect(), FirstEdge().Width(),
-                            FirstEdge().color,
+        DrawSolidBorderRect(context_, gfx::ToRoundedRect(outer_.Rect()),
+                            FirstEdge().Width(), FirstEdge().GetColor(),
                             PaintAutoDarkMode(style_, element_role_));
       } else {
         // 4-side, solid border => one drawDRRect()
         DrawBleedAdjustedDRRect(context_, bleed_avoidance_, outer_, inner_,
-                                FirstEdge().color,
+                                FirstEdge().GetColor(),
                                 PaintAutoDarkMode(style_, element_role_));
       }
     } else {
@@ -866,11 +945,12 @@
     for (auto side :
          {BoxSide::kTop, BoxSide::kRight, BoxSide::kBottom, BoxSide::kLeft}) {
       const BorderEdge& curr_edge = Edge(side);
-      if (curr_edge.ShouldRender())
-        path.AddRect(CalculateSideRect(outer_, curr_edge, side));
+      if (curr_edge.ShouldRender()) {
+        path.AddRect(gfx::RectF(CalculateSideRect(outer_, curr_edge, side)));
+      }
     }
 
-    context_.SetFillColor(FirstEdge().color);
+    context_.SetFillColor(FirstEdge().GetColor());
     context_.FillPath(path, PaintAutoDarkMode(style_, element_role_));
     return true;
   }
@@ -973,12 +1053,12 @@
       continue;
     }
 
-    DCHECK_GT(edge.color.Alpha(), 0);
+    DCHECK_GT(edge.GetColor().Alpha(), 0);
 
     visible_edge_count_++;
     visible_edge_set_ |= EdgeFlagForSide(static_cast<BoxSide>(i));
 
-    has_alpha_ |= edge.color.HasAlpha();
+    has_alpha_ |= edge.GetColor().HasAlpha();
 
     if (visible_edge_count_ == 1) {
       first_visible_edge_ = i;
@@ -988,7 +1068,7 @@
     is_uniform_style_ &=
         edge.BorderStyle() == edges_[first_visible_edge_].BorderStyle();
     is_uniform_width_ &= edge.Width() == edges_[first_visible_edge_].Width();
-    is_uniform_color_ &= edge.color == edges_[first_visible_edge_].color;
+    is_uniform_color_ &= edge.SharesColorWith(edges_[first_visible_edge_]);
   }
 }
 
@@ -1126,10 +1206,10 @@
                                  BorderEdgeFlags completed_edges) const {
   const BorderEdge& edge = Edge(side);
   DCHECK(edge.ShouldRender());
-  const Color color(edge.color.Red(), edge.color.Green(), edge.color.Blue(),
-                    alpha);
+  const Color color(edge.GetColor().Red(), edge.GetColor().Green(),
+                    edge.GetColor().Blue(), alpha);
 
-  gfx::RectF side_rect = outer_.Rect();
+  gfx::Rect side_rect = gfx::ToRoundedRect(outer_.Rect());
   const Path* path = nullptr;
 
   // TODO(fmalita): find a way to consolidate these without sacrificing
@@ -1140,10 +1220,11 @@
           is_rounded_ && (BorderStyleHasInnerDetail(edge.BorderStyle()) ||
                           BorderWillArcInnerEdge(inner_.GetRadii().TopLeft(),
                                                  inner_.GetRadii().TopRight()));
-      if (use_path)
+      if (use_path) {
         path = &border_info.rounded_border_path;
-      else
-        side_rect.set_height(floorf(edge.Width()));
+      } else {
+        side_rect.set_height(edge.Width());
+      }
 
       PaintOneBorderSide(side_rect, BoxSide::kTop, BoxSide::kLeft,
                          BoxSide::kRight, path, color, completed_edges);
@@ -1154,10 +1235,11 @@
                       (BorderStyleHasInnerDetail(edge.BorderStyle()) ||
                        BorderWillArcInnerEdge(inner_.GetRadii().BottomLeft(),
                                               inner_.GetRadii().BottomRight()));
-      if (use_path)
+      if (use_path) {
         path = &border_info.rounded_border_path;
-      else
-        SetToBottomSideRect(side_rect, floorf(edge.Width()));
+      } else {
+        SetToBottomSideRect(side_rect, edge.Width());
+      }
 
       PaintOneBorderSide(side_rect, BoxSide::kBottom, BoxSide::kLeft,
                          BoxSide::kRight, path, color, completed_edges);
@@ -1168,10 +1250,11 @@
           is_rounded_ && (BorderStyleHasInnerDetail(edge.BorderStyle()) ||
                           BorderWillArcInnerEdge(inner_.GetRadii().BottomLeft(),
                                                  inner_.GetRadii().TopLeft()));
-      if (use_path)
+      if (use_path) {
         path = &border_info.rounded_border_path;
-      else
-        side_rect.set_width(floorf(edge.Width()));
+      } else {
+        side_rect.set_width(edge.Width());
+      }
 
       PaintOneBorderSide(side_rect, BoxSide::kLeft, BoxSide::kTop,
                          BoxSide::kBottom, path, color, completed_edges);
@@ -1182,10 +1265,11 @@
                       (BorderStyleHasInnerDetail(edge.BorderStyle()) ||
                        BorderWillArcInnerEdge(inner_.GetRadii().BottomRight(),
                                               inner_.GetRadii().TopRight()));
-      if (use_path)
+      if (use_path) {
         path = &border_info.rounded_border_path;
-      else
-        SetToRightSideRect(side_rect, floorf(edge.Width()));
+      } else {
+        SetToRightSideRect(side_rect, edge.Width());
+      }
 
       PaintOneBorderSide(side_rect, BoxSide::kRight, BoxSide::kTop,
                          BoxSide::kBottom, path, color, completed_edges);
@@ -1203,8 +1287,9 @@
   const BorderEdge& adjacent_edge = Edge(adjacent_side);
 
   // No miters for missing edges.
-  if (!adjacent_edge.is_present)
+  if (!adjacent_edge.UsedWidth()) {
     return kNoMiter;
+  }
 
   // The adjacent edge will overdraw this corner, resulting in a correct miter.
   if (WillOverdraw(adjacent_side, adjacent_edge.BorderStyle(), completed_edges))
@@ -1241,7 +1326,7 @@
 }
 
 void BoxBorderPainter::PaintOneBorderSide(
-    const gfx::RectF& side_rect,
+    const gfx::Rect& side_rect,
     BoxSide side,
     BoxSide adjacent_side1,
     BoxSide adjacent_side2,
@@ -1264,7 +1349,7 @@
       ClipBorderSidePolygon(side, miter1, miter2);
     else
       ClipBorderSideForComplexInnerPath(side);
-    float stroke_thickness =
+    int stroke_thickness =
         std::max(std::max(edge_to_render.Width(), adjacent_edge1.Width()),
                  adjacent_edge2.Width());
     DrawBoxSideFromPath(*path, edge_to_render.Width(), stroke_thickness, side,
@@ -1285,23 +1370,24 @@
     DrawLineForBoxSide(
         context_, side_rect.x(), side_rect.y(), side_rect.right(),
         side_rect.bottom(), side, color, edge_to_render.BorderStyle(),
-        miter1 != kNoMiter ? floorf(adjacent_edge1.Width()) : 0,
-        miter2 != kNoMiter ? floorf(adjacent_edge2.Width()) : 0,
+        miter1 != kNoMiter ? adjacent_edge1.Width() : 0,
+        miter2 != kNoMiter ? adjacent_edge2.Width() : 0,
         /*antialias*/ true, PaintAutoDarkMode(style_, element_role_));
   }
 }
 
 void BoxBorderPainter::DrawBoxSideFromPath(const Path& border_path,
-                                           float border_thickness,
-                                           float stroke_thickness,
+                                           int border_thickness,
+                                           int stroke_thickness,
                                            BoxSide side,
                                            Color color,
                                            EBorderStyle border_style) const {
   if (border_thickness <= 0)
     return;
 
-  if (border_style == EBorderStyle::kDouble && border_thickness < 3)
-    border_style = EBorderStyle::kSolid;
+  // The caller should have adjusted border_style.
+  DCHECK_EQ(border_style,
+            BorderEdge::EffectiveStyle(border_style, border_thickness));
 
   switch (border_style) {
     case EBorderStyle::kNone:
@@ -1344,8 +1430,8 @@
 }
 
 void BoxBorderPainter::DrawDashedDottedBoxSideFromPath(
-    float border_thickness,
-    float stroke_thickness,
+    int border_thickness,
+    int stroke_thickness,
     Color color,
     EBorderStyle border_style) const {
   // Convert the path to be down the middle of the dots or dashes.
@@ -1381,7 +1467,7 @@
 
 void BoxBorderPainter::DrawWideDottedBoxSideFromPath(
     const Path& border_path,
-    float border_thickness) const {
+    int border_thickness) const {
   context_.SetStrokeThickness(border_thickness);
   context_.SetStrokeStyle(kDottedStroke);
   context_.SetLineCap(kRoundCap);
@@ -1392,12 +1478,11 @@
                       border_path.length(), border_thickness);
 }
 
-void BoxBorderPainter::DrawDoubleBoxSideFromPath(
-    const Path& border_path,
-    float border_thickness,
-    float stroke_thickness,
-    BoxSide side,
-    Color color) const {
+void BoxBorderPainter::DrawDoubleBoxSideFromPath(const Path& border_path,
+                                                 int border_thickness,
+                                                 int stroke_thickness,
+                                                 BoxSide side,
+                                                 Color color) const {
   // Draw inner border line
   {
     GraphicsContextStateSaver state_saver(context_);
@@ -1438,8 +1523,8 @@
 
 void BoxBorderPainter::DrawRidgeGrooveBoxSideFromPath(
     const Path& border_path,
-    float border_thickness,
-    float stroke_thickness,
+    int border_thickness,
+    int stroke_thickness,
     BoxSide side,
     Color color,
     EBorderStyle border_style) const {
@@ -1468,10 +1553,10 @@
                       color, s2);
 }
 
-gfx::RectF BoxBorderPainter::CalculateSideRectIncludingInner(
+gfx::Rect BoxBorderPainter::CalculateSideRectIncludingInner(
     BoxSide side) const {
-  gfx::RectF side_rect = outer_.Rect();
-  float width;
+  gfx::Rect side_rect = gfx::ToRoundedRect(outer_.Rect());
+  int width;
 
   switch (side) {
     case BoxSide::kTop:
@@ -1792,73 +1877,15 @@
                                                 adjacent_side);
 }
 
-void BoxBorderPainter::DrawLineForBoxSide(GraphicsContext& context,
-                                          float x1,
-                                          float y1,
-                                          float x2,
-                                          float y2,
-                                          BoxSide side,
-                                          Color color,
-                                          EBorderStyle style,
-                                          int adjacent_width1,
-                                          int adjacent_width2,
-                                          bool antialias,
-                                          const AutoDarkMode& auto_dark_mode) {
-  float thickness;
-  float length;
-  if (side == BoxSide::kTop || side == BoxSide::kBottom) {
-    thickness = y2 - y1;
-    length = x2 - x1;
-  } else {
-    thickness = x2 - x1;
-    length = y2 - y1;
-  }
-
-  // We would like this check to be an ASSERT as we don't want to draw empty
-  // borders. However nothing guarantees that the following recursive calls to
-  // DrawLineForBoxSide() will have positive thickness and length.
-  if (length <= 0 || thickness <= 0)
-    return;
-
-  if (style == EBorderStyle::kDouble && thickness < 3)
-    style = EBorderStyle::kSolid;
-
-  switch (style) {
-    case EBorderStyle::kNone:
-    case EBorderStyle::kHidden:
-      return;
-    case EBorderStyle::kDotted:
-    case EBorderStyle::kDashed:
-      DrawDashedOrDottedBoxSide(context, x1, y1, x2, y2, side, color, thickness,
-                                style, antialias, auto_dark_mode);
-      break;
-    case EBorderStyle::kDouble:
-      DrawDoubleBoxSide(context, x1, y1, x2, y2, length, side, color, thickness,
-                        adjacent_width1, adjacent_width2, antialias,
-                        auto_dark_mode);
-      break;
-    case EBorderStyle::kRidge:
-    case EBorderStyle::kGroove:
-      DrawRidgeOrGrooveBoxSide(context, x1, y1, x2, y2, side, color, style,
-                               adjacent_width1, adjacent_width2, antialias,
-                               auto_dark_mode);
-      break;
-    case EBorderStyle::kInset:
-      // FIXME: Maybe we should lighten the colors on one side like Firefox.
-      // https://bugs.webkit.org/show_bug.cgi?id=58608
-      if (side == BoxSide::kTop || side == BoxSide::kLeft)
-        color = color.Dark();
-      [[fallthrough]];
-    case EBorderStyle::kOutset:
-      if (style == EBorderStyle::kOutset &&
-          (side == BoxSide::kBottom || side == BoxSide::kRight))
-        color = color.Dark();
-      [[fallthrough]];
-    case EBorderStyle::kSolid:
-      DrawSolidBoxSide(context, x1, y1, x2, y2, side, color, adjacent_width1,
-                       adjacent_width2, antialias, auto_dark_mode);
-      break;
-  }
+void BoxBorderPainter::DrawBoxSide(GraphicsContext& context,
+                                   const gfx::Rect& snapped_edge_rect,
+                                   BoxSide side,
+                                   Color color,
+                                   EBorderStyle style,
+                                   const AutoDarkMode& auto_dark_mode) {
+  DrawLineForBoxSide(context, snapped_edge_rect.x(), snapped_edge_rect.y(),
+                     snapped_edge_rect.right(), snapped_edge_rect.bottom(),
+                     side, color, style, 0, 0, true, auto_dark_mode);
 }
 
 }  // namespace blink

third_party/blink/renderer/core/paint/box_border_painter.h

diff --git a/third_party/blink/renderer/core/paint/box_border_painter.h b/third_party/blink/renderer/core/paint/box_border_painter.h
index 2a1c03b..94e61ab 100644
--- a/third_party/blink/renderer/core/paint/box_border_painter.h
+++ b/third_party/blink/renderer/core/paint/box_border_painter.h
@@ -47,28 +47,7 @@
                           BoxSide side,
                           Color color,
                           EBorderStyle style,
-                          const AutoDarkMode& auto_dark_mode) {
-    DrawLineForBoxSide(context, snapped_edge_rect.x(), snapped_edge_rect.y(),
-                       snapped_edge_rect.right(), snapped_edge_rect.bottom(),
-                       side, color, style, 0, 0, true, auto_dark_mode);
-  }
-
-  // TODO(crbug.com/1201762): The float parameters are truncated to int in the
-  // function, which implicitly snaps to whole pixels perhaps unexpectedly. To
-  // avoid the problem, we should use the above function which requires the
-  // caller to snap to whole pixels explicitly.
-  static void DrawLineForBoxSide(GraphicsContext&,
-                                 float x1,
-                                 float y1,
-                                 float x2,
-                                 float y2,
-                                 BoxSide,
-                                 Color,
-                                 EBorderStyle,
-                                 int adjacent_edge_width1,
-                                 int adjacent_edge_width2,
-                                 bool antialias,
-                                 const AutoDarkMode& auto_dark_mode);
+                          const AutoDarkMode& auto_dark_mode);
 
  private:
   // For PaintBorder().
@@ -102,7 +81,7 @@
                  BoxSide,
                  unsigned alpha,
                  BorderEdgeFlags) const;
-  void PaintOneBorderSide(const gfx::RectF& side_rect,
+  void PaintOneBorderSide(const gfx::Rect& side_rect,
                           BoxSide,
                           BoxSide adjacent_side1,
                           BoxSide adjacent_side2,
@@ -113,29 +92,29 @@
   void DrawDoubleBorder() const;
 
   void DrawBoxSideFromPath(const Path&,
-                           float thickness,
-                           float draw_thickness,
+                           int thickness,
+                           int draw_thickness,
                            BoxSide,
                            Color,
                            EBorderStyle) const;
-  void DrawDashedDottedBoxSideFromPath(float thickness,
-                                       float draw_thickness,
+  void DrawDashedDottedBoxSideFromPath(int thickness,
+                                       int draw_thickness,
                                        Color,
                                        EBorderStyle) const;
-  void DrawWideDottedBoxSideFromPath(const Path&, float thickness) const;
+  void DrawWideDottedBoxSideFromPath(const Path&, int thickness) const;
   void DrawDoubleBoxSideFromPath(const Path&,
-                                 float thickness,
-                                 float draw_thickness,
+                                 int thickness,
+                                 int draw_thickness,
                                  BoxSide,
                                  Color) const;
   void DrawRidgeGrooveBoxSideFromPath(const Path&,
-                                      float thickness,
-                                      float draw_thickness,
+                                      int thickness,
+                                      int draw_thickness,
                                       BoxSide,
                                       Color,
                                       EBorderStyle) const;
   void ClipBorderSidePolygon(BoxSide, MiterType miter1, MiterType miter2) const;
-  gfx::RectF CalculateSideRectIncludingInner(BoxSide) const;
+  gfx::Rect CalculateSideRectIncludingInner(BoxSide) const;
   void ClipBorderSideForComplexInnerPath(BoxSide) const;
 
   MiterType ComputeMiter(BoxSide, BoxSide adjacent_side, BorderEdgeFlags) const;

third_party/blink/renderer/core/style/border_edge.cc

diff --git a/third_party/blink/renderer/core/style/border_edge.cc b/third_party/blink/renderer/core/style/border_edge.cc
index 035d4a0a..6639cf3 100644
--- a/third_party/blink/renderer/core/style/border_edge.cc
+++ b/third_party/blink/renderer/core/style/border_edge.cc
@@ -8,29 +8,31 @@
 
 namespace blink {
 
-BorderEdge::BorderEdge(float edge_width,
+BorderEdge::BorderEdge(int edge_width,
                        const Color& edge_color,
                        EBorderStyle edge_style,
                        bool edge_is_present)
-    : color(edge_color),
-      is_present(edge_is_present),
-      style(static_cast<unsigned>(edge_style)),
-      width_(edge_width) {
-  if (style == static_cast<unsigned>(EBorderStyle::kDouble) && edge_width < 3) {
-    style = static_cast<unsigned>(EBorderStyle::kSolid);
+    : color_(edge_color),
+      is_present_(edge_is_present),
+      style_(EffectiveStyle(edge_style, edge_width)),
+      width_(edge_width) {}
+
+BorderEdge::BorderEdge() : is_present_(false), style_(EBorderStyle::kHidden) {}
+
+// static
+EBorderStyle BorderEdge::EffectiveStyle(EBorderStyle style, int width) {
+  if (style == EBorderStyle::kDouble && width < 3) {
+    return EBorderStyle::kSolid;
   }
+  return style;
 }
 
-BorderEdge::BorderEdge()
-    : is_present(false), style(static_cast<unsigned>(EBorderStyle::kHidden)) {}
-
 bool BorderEdge::HasVisibleColorAndStyle() const {
-  return style > static_cast<unsigned>(EBorderStyle::kHidden) &&
-         color.Alpha() > 0;
+  return style_ > EBorderStyle::kHidden && color_.Alpha() > 0;
 }
 
 bool BorderEdge::ShouldRender() const {
-  return is_present && width_ && HasVisibleColorAndStyle();
+  return is_present_ && width_ && HasVisibleColorAndStyle();
 }
 
 bool BorderEdge::PresentButInvisible() const {
@@ -38,13 +40,11 @@
 }
 
 bool BorderEdge::ObscuresBackgroundEdge() const {
-  if (!is_present || color.HasAlpha() ||
-      style == static_cast<unsigned>(EBorderStyle::kHidden)) {
+  if (!is_present_ || color_.HasAlpha() || style_ == EBorderStyle::kHidden) {
     return false;
   }
 
-  if (style == static_cast<unsigned>(EBorderStyle::kDotted) ||
-      style == static_cast<unsigned>(EBorderStyle::kDashed)) {
+  if (style_ == EBorderStyle::kDotted || style_ == EBorderStyle::kDashed) {
     return false;
   }
 
@@ -52,34 +52,33 @@
 }
 
 bool BorderEdge::ObscuresBackground() const {
-  if (!is_present || color.HasAlpha() ||
-      style == static_cast<unsigned>(EBorderStyle::kHidden)) {
+  if (!is_present_ || color_.HasAlpha() || style_ == EBorderStyle::kHidden) {
     return false;
   }
 
-  if (style == static_cast<unsigned>(EBorderStyle::kDotted) ||
-      style == static_cast<unsigned>(EBorderStyle::kDashed) ||
-      style == static_cast<unsigned>(EBorderStyle::kDouble)) {
+  if (style_ == EBorderStyle::kDotted || style_ == EBorderStyle::kDashed ||
+      style_ == EBorderStyle::kDouble) {
     return false;
   }
 
   return true;
 }
 
-float BorderEdge::UsedWidth() const {
-  return is_present ? width_ : 0;
+int BorderEdge::UsedWidth() const {
+  return is_present_ ? width_ : 0;
 }
 
-float BorderEdge::GetDoubleBorderStripeWidth(DoubleBorderStripe stripe) const {
+int BorderEdge::GetDoubleBorderStripeWidth(DoubleBorderStripe stripe) const {
   DCHECK(stripe == kDoubleBorderStripeOuter ||
          stripe == kDoubleBorderStripeInner);
 
-  return roundf(stripe == kDoubleBorderStripeOuter ? UsedWidth() / 3
-                                                   : (UsedWidth() * 2) / 3);
+  return roundf(stripe == kDoubleBorderStripeOuter
+                    ? UsedWidth() / 3.0f
+                    : (UsedWidth() * 2.0f) / 3.0f);
 }
 
 bool BorderEdge::SharesColorWith(const BorderEdge& other) const {
-  return color == other.color;
+  return color_ == other.color_;
 }
 
 }  // namespace blink

third_party/blink/renderer/core/style/border_edge.h

diff --git a/third_party/blink/renderer/core/style/border_edge.h b/third_party/blink/renderer/core/style/border_edge.h
index c9b9eab..76f25c3b 100644
--- a/third_party/blink/renderer/core/style/border_edge.h
+++ b/third_party/blink/renderer/core/style/border_edge.h
@@ -11,48 +11,50 @@
 
 namespace blink {
 
-struct BorderEdge {
+class BorderEdge {
   STACK_ALLOCATED();
 
  public:
-  BorderEdge(float edge_width,
+  BorderEdge(int edge_width,
              const Color& edge_color,
              EBorderStyle edge_style,
              bool edge_is_present = true);
   BorderEdge();
 
+  static EBorderStyle EffectiveStyle(EBorderStyle style, int width);
+
   bool HasVisibleColorAndStyle() const;
   bool ShouldRender() const;
   bool PresentButInvisible() const;
   bool ObscuresBackgroundEdge() const;
   bool ObscuresBackground() const;
-  float UsedWidth() const;
+  int UsedWidth() const;
 
   bool SharesColorWith(const BorderEdge& other) const;
 
-  EBorderStyle BorderStyle() const { return static_cast<EBorderStyle>(style); }
+  EBorderStyle BorderStyle() const { return style_; }
 
   enum DoubleBorderStripe {
     kDoubleBorderStripeOuter,
     kDoubleBorderStripeInner
   };
 
-  float GetDoubleBorderStripeWidth(DoubleBorderStripe) const;
+  int GetDoubleBorderStripeWidth(DoubleBorderStripe) const;
 
-  float Width() const { return width_; }
+  int Width() const { return width_; }
+  const Color& GetColor() const { return color_; }
 
-  void ClampWidth(float width) {
+  void ClampWidth(int width) {
     if (width_ > width) {
       width_ = width;
     }
   }
 
-  Color color;
-  bool is_present;
-
  private:
-  unsigned style : 4;  // EBorderStyle
-  float width_;
+  Color color_;
+  bool is_present_;
+  EBorderStyle style_;
+  int width_;
 };
 
 }  // namespace blink

third_party/blink/renderer/core/style/computed_style.cc

diff --git a/third_party/blink/renderer/core/style/computed_style.cc b/third_party/blink/renderer/core/style/computed_style.cc
index cdcdb35e..a64f6b2 100644
--- a/third_party/blink/renderer/core/style/computed_style.cc
+++ b/third_party/blink/renderer/core/style/computed_style.cc
@@ -2292,23 +2292,25 @@
 
 void ComputedStyle::GetBorderEdgeInfo(BorderEdge edges[],
                                       PhysicalBoxSides sides_to_include) const {
-  edges[static_cast<unsigned>(BoxSide::kTop)] = BorderEdge(
-      BorderTopWidth(), VisitedDependentColor(GetCSSPropertyBorderTopColor()),
-      BorderTopStyle(), sides_to_include.top);
+  edges[static_cast<unsigned>(BoxSide::kTop)] =
+      BorderEdge(BorderTopWidth().ToInt(),
+                 VisitedDependentColor(GetCSSPropertyBorderTopColor()),
+                 BorderTopStyle(), sides_to_include.top);
 
   edges[static_cast<unsigned>(BoxSide::kRight)] =
-      BorderEdge(BorderRightWidth(),
+      BorderEdge(BorderRightWidth().ToInt(),
                  VisitedDependentColor(GetCSSPropertyBorderRightColor()),
                  BorderRightStyle(), sides_to_include.right);
 
   edges[static_cast<unsigned>(BoxSide::kBottom)] =
-      BorderEdge(BorderBottomWidth(),
+      BorderEdge(BorderBottomWidth().ToInt(),
                  VisitedDependentColor(GetCSSPropertyBorderBottomColor()),
                  BorderBottomStyle(), sides_to_include.bottom);
 
-  edges[static_cast<unsigned>(BoxSide::kLeft)] = BorderEdge(
-      BorderLeftWidth(), VisitedDependentColor(GetCSSPropertyBorderLeftColor()),
-      BorderLeftStyle(), sides_to_include.left);
+  edges[static_cast<unsigned>(BoxSide::kLeft)] =
+      BorderEdge(BorderLeftWidth().ToInt(),
+                 VisitedDependentColor(GetCSSPropertyBorderLeftColor()),
+                 BorderLeftStyle(), sides_to_include.left);
 }
 
 void ComputedStyle::CopyChildDependentFlagsFrom(const ComputedStyle& other) {

third_party/blink/renderer/core/style/computed_style.h

diff --git a/third_party/blink/renderer/core/style/computed_style.h b/third_party/blink/renderer/core/style/computed_style.h
index 1c275678..58d5617 100644
--- a/third_party/blink/renderer/core/style/computed_style.h
+++ b/third_party/blink/renderer/core/style/computed_style.h
@@ -82,7 +82,7 @@
 using std::max;
 
 class AppliedTextDecoration;
-struct BorderEdge;
+class BorderEdge;
 class ContentData;
 class CounterDirectives;
 class CSSAnimationData;

third_party/blink/renderer/modules/accessibility/ax_node_object.cc

diff --git a/third_party/blink/renderer/modules/accessibility/ax_node_object.cc b/third_party/blink/renderer/modules/accessibility/ax_node_object.cc
index bf596cd..b1781983 100644
--- a/third_party/blink/renderer/modules/accessibility/ax_node_object.cc
+++ b/third_party/blink/renderer/modules/accessibility/ax_node_object.cc
@@ -3749,13 +3749,25 @@
   //   In that case the children will still be added via AddNodeChildren(),
   //   so that no content is lost.
   // See comments in AddTableChildren() for more information about valid tables.
+  auto* table = To<HTMLTableElement>(GetNode());
   for (Element* child = ElementTraversal::FirstChild(*GetElement()); child;
        child = ElementTraversal::NextSibling(*child)) {
-    if (!IsA<HTMLTableSectionElement>(child) &&
-        !IsA<HTMLTableCaptionElement>(child) &&
-        !child->HasTagName(html_names::kColgroupTag)) {
-      return false;
+    if (child->HasTagName(html_names::kColgroupTag)) {
+      continue;
     }
+    if (child->HasTagName(html_names::kTbodyTag)) {
+      continue;
+    }
+    if (child->HasTagName(html_names::kTheadTag) && child == table->tHead()) {
+      continue;  // Only one <thead> is valid.
+    }
+    if (child->HasTagName(html_names::kTfootTag) && child == table->tFoot()) {
+      continue;  // Only one <tfoot> is valid.
+    }
+    if (IsA<HTMLTableCaptionElement>(child) && child == table->caption()) {
+      continue;  // Only one caption is valid.
+    }
+    return false;
   }
 
   return true;

third_party/blink/renderer/modules/accessibility/ax_object.cc

diff --git a/third_party/blink/renderer/modules/accessibility/ax_object.cc b/third_party/blink/renderer/modules/accessibility/ax_object.cc
index bdaa23da..823129c2 100644
--- a/third_party/blink/renderer/modules/accessibility/ax_object.cc
+++ b/third_party/blink/renderer/modules/accessibility/ax_object.cc
@@ -5897,7 +5897,7 @@
   // If the transform is just a simple translation, apply that to the
   // bounding box, but if it's a non-trivial transformation like a rotation,
   // scaling, etc. then return the full matrix instead.
-  if (transform.IsIdentityOr2DTranslation()) {
+  if (transform.IsIdentityOr2dTranslation()) {
     out_bounds_in_container.Offset(transform.To2dTranslation());
   } else {
     out_container_transform = transform;

third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.cc

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 2962354..f5ddd28 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
@@ -2242,13 +2242,12 @@
       << "Unclean document at lifecycle " << document->Lifecycle().ToString();
 #endif  // DCHECK_IS_ON()
 
-  // Process any relation attributes that can affect ax objects already created.
-
   // Force computation of aria-owns, so that original parents that already
   // computed their children get the aria-owned children removed.
   if (AXObject::HasARIAOwns(element))
     HandleAttributeChangedWithCleanLayout(html_names::kAriaOwnsAttr, element);
 
+  // Process any relation attributes that can affect ax objects already created.
   MaybeNewRelationTarget(*node, Get(node));
 
   // Even if the node or parent are ignored, an ancestor may need to include
@@ -2256,7 +2255,7 @@
   // must be called. It handles ignored logic, ensuring that the first ancestor
   // that should have this as a child will be updated.
   ChildrenChangedWithCleanLayout(
-      Get(LayoutTreeBuilderTraversal::Parent(*node)));
+      GetOrCreate(LayoutTreeBuilderTraversal::Parent(*node)));
 
   // If an image map area is added, we need to update children on the image.
   if (IsA<HTMLAreaElement>(node))
@@ -2436,23 +2435,6 @@
 }
 
 void AXObjectCacheImpl::ChildrenChangedWithCleanLayout(Node* node) {
-  if (!node)
-    return;
-
-  LayoutObject* layout_object = node->GetLayoutObject();
-  AXID layout_id = 0;
-  if (layout_object) {
-    auto it = layout_object_mapping_.find(layout_object);
-    if (it != layout_object_mapping_.end())
-      layout_id = it->value;
-  }
-  DCHECK(!HashTraits<AXID>::IsDeletedValue(layout_id));
-
-  auto it = node_object_mapping_.find(node);
-  AXID node_id = it != node_object_mapping_.end() ? it->value : 0;
-  DCHECK(!HashTraits<AXID>::IsDeletedValue(node_id));
-  DCHECK(!node->GetDocument().NeedsLayoutTreeUpdateForNode(*node));
-
   ChildrenChangedWithCleanLayout(node, Get(node));
 }
 

third_party/blink/renderer/modules/payments/payment_request.cc

diff --git a/third_party/blink/renderer/modules/payments/payment_request.cc b/third_party/blink/renderer/modules/payments/payment_request.cc
index 83c4056..c9f2e3c4 100644
--- a/third_party/blink/renderer/modules/payments/payment_request.cc
+++ b/third_party/blink/renderer/modules/payments/payment_request.cc
@@ -144,12 +144,13 @@
     output->request_payer_phone = input.requestPayerPhone();
     output->request_shipping = input.requestShipping();
 
-    if (input.shippingType() == "delivery")
+    if (input.shippingType() == "delivery") {
       output->shipping_type = PaymentShippingType::DELIVERY;
-    else if (input.shippingType() == "pickup")
+    } else if (input.shippingType() == "pickup") {
       output->shipping_type = PaymentShippingType::PICKUP;
-    else
+    } else {
       output->shipping_type = PaymentShippingType::SHIPPING;
+    }
 
     return output;
   }
@@ -278,8 +279,9 @@
   DCHECK(!method_data.empty());
   const WTF::HashSet<String> billing_methods = GetAppStoreBillingMethods();
   for (const auto& method : method_data) {
-    if (!billing_methods.Contains(method->supported_method))
+    if (!billing_methods.Contains(method->supported_method)) {
       return false;
+    }
   }
   return true;
 }
@@ -298,8 +300,9 @@
   for (PaymentItem* item : input) {
     ValidateShippingOptionOrPaymentItem(item, item_names, execution_context,
                                         exception_state);
-    if (exception_state.HadException())
+    if (exception_state.HadException()) {
       return;
+    }
     output.push_back(payments::mojom::blink::PaymentItem::From(*item));
   }
 }
@@ -324,8 +327,9 @@
   for (PaymentShippingOption* option : input) {
     ValidateShippingOptionOrPaymentItem(option, "shippingOptions",
                                         execution_context, exception_state);
-    if (exception_state.HadException())
+    if (exception_state.HadException()) {
       return;
+    }
 
     DCHECK(option->hasId());
     if (option->id().length() > PaymentRequest::kMaxStringLength) {
@@ -348,8 +352,9 @@
       return;
     }
 
-    if (option->selected())
+    if (option->selected()) {
       shipping_option_output = option->id();
+    }
 
     unique_ids.insert(option->id());
 
@@ -365,8 +370,9 @@
                              ExceptionState& exception_state) {
   ValidateShippingOptionOrPaymentItem(input, item_name, execution_context,
                                       exception_state);
-  if (exception_state.HadException())
+  if (exception_state.HadException()) {
     return;
+  }
 
   if (input->amount()->value()[0] == '-') {
     exception_state.ThrowTypeError("Total amount value should be non-negative");
@@ -384,11 +390,13 @@
   AndroidPayMethodData* android_pay =
       NativeValueTraits<AndroidPayMethodData>::NativeValue(
           isolate, input.V8Value(), exception_state);
-  if (exception_state.HadException())
+  if (exception_state.HadException()) {
     return;
+  }
 
-  if (android_pay->hasEnvironment() && android_pay->environment() == "TEST")
+  if (android_pay->hasEnvironment() && android_pay->environment() == "TEST") {
     output->environment = payments::mojom::blink::AndroidPayEnvironment::TEST;
+  }
 
   // 0 means the merchant did not specify or it was an invalid value
   output->min_google_play_services_version = 0;
@@ -404,8 +412,9 @@
 
   // 0 means the merchant did not specify or it was an invalid value
   output->api_version = 0;
-  if (android_pay->hasApiVersion())
+  if (android_pay->hasApiVersion()) {
     output->api_version = android_pay->apiVersion();
+  }
 }
 
 void StringifyAndParseMethodSpecificData(ExecutionContext& execution_context,
@@ -416,8 +425,9 @@
   PaymentsValidators::ValidateAndStringifyObject(
       execution_context.GetIsolate(), input, output->stringified_data,
       exception_state);
-  if (exception_state.HadException())
+  if (exception_state.HadException()) {
     return;
+  }
 
   // Serialize payment method specific data to be sent to the payment apps. The
   // payment apps are responsible for validating and processing their method
@@ -426,8 +436,9 @@
       supported_method == kAndroidPayMethod) {
     SetAndroidPayMethodData(execution_context.GetIsolate(), input, output,
                             exception_state);
-    if (exception_state.HadException())
+    if (exception_state.HadException()) {
       exception_state.ClearException();
+    }
   }
 
   // Parse method data to avoid parsing JSON in the browser.
@@ -458,8 +469,9 @@
       ValidateAndConvertTotal(modifier->total(), "modifier total",
                               output.back()->total, execution_context,
                               exception_state);
-      if (exception_state.HadException())
+      if (exception_state.HadException()) {
         return;
+      }
     }
 
     if (modifier->hasAdditionalDisplayItems()) {
@@ -467,8 +479,9 @@
                                      "additional display items in modifier",
                                      output.back()->additional_display_items,
                                      execution_context, exception_state);
-      if (exception_state.HadException())
+      if (exception_state.HadException()) {
         return;
+      }
     }
 
     if (!PaymentsValidators::IsValidMethodFormat(modifier->supportedMethod())) {
@@ -502,8 +515,9 @@
     ValidateAndConvertDisplayItems(input->displayItems(), "display items",
                                    *output->display_items, execution_context,
                                    exception_state);
-    if (exception_state.HadException())
+    if (exception_state.HadException()) {
       return;
+    }
   }
 
   // If requestShipping is specified and there are shipping options to validate,
@@ -513,8 +527,9 @@
     ValidateAndConvertShippingOptions(
         input->shippingOptions(), *output->shipping_options,
         shipping_option_output, execution_context, exception_state);
-    if (exception_state.HadException())
+    if (exception_state.HadException()) {
       return;
+    }
   } else {
     shipping_option_output = String();
   }
@@ -568,8 +583,9 @@
     }
     ValidateAndConvertTotal(input->total(), "total", output->total,
                             execution_context, exception_state);
-    if (exception_state.HadException())
+    if (exception_state.HadException()) {
       return;
+    }
   }
 
   ValidateAndConvertPaymentDetailsBase(input, options, output,
@@ -587,8 +603,9 @@
   ValidateAndConvertPaymentDetailsBase(input, options, output,
                                        shipping_option_output,
                                        execution_context, exception_state);
-  if (exception_state.HadException())
+  if (exception_state.HadException()) {
     return;
+  }
   if (input->hasTotal()) {
     if (ignore_total) {
       output->total =
@@ -596,8 +613,9 @@
     } else {
       ValidateAndConvertTotal(input->total(), "total", output->total,
                               execution_context, exception_state);
-      if (exception_state.HadException())
+      if (exception_state.HadException()) {
         return;
+      }
     }
   }
 
@@ -643,7 +661,7 @@
                               bool did_follow_redirect,
                               ExecutionContext& context) {
   const bool enforce_csp =
-      RuntimeEnabledFeatures::WebPaymentAPICSPEnabled(&context);
+      !RuntimeEnabledFeatures::IgnoreCSPInWebPaymentAPIEnabled(&context);
 
   if (context.GetContentSecurityPolicy()->AllowConnectToSource(
           url, url_before_redirects,
@@ -654,8 +672,9 @@
     return true;  // Allow request.
   }
 
-  if (enforce_csp)
+  if (enforce_csp) {
     return false;  // Block request.
+  }
 
   // CSP has been bypassed, so warn web developers that CSP bypass has been
   // deprecated and will be removed.
@@ -738,8 +757,9 @@
       StringifyAndParseMethodSpecificData(
           execution_context, payment_method_data->supportedMethod(),
           payment_method_data->data(), output.back(), exception_state);
-      if (exception_state.HadException())
+      if (exception_state.HadException()) {
         continue;
+      }
     } else {
       output.back()->stringified_data = "";
     }
@@ -752,8 +772,9 @@
 
   // Note: PaymentRequest is only exposed to Window and not workers.
   // 1. If |document| has no browsing context, then return false.
-  if (execution_context->IsContextDestroyed())
+  if (execution_context->IsContextDestroyed()) {
     return false;
+  }
 
   // 2. If Permissions Policy is enabled, return the policy for "payment"
   // feature.
@@ -1157,8 +1178,9 @@
     return;
   }
 
-  if (!options_->requestShipping())
+  if (!options_->requestShipping()) {
     validated_details->shipping_options = absl::nullopt;
+  }
 
   if (is_waiting_for_show_promise_to_resolve_) {
     is_waiting_for_show_promise_to_resolve_ = false;
@@ -1177,10 +1199,12 @@
 }
 
 void PaymentRequest::OnUpdatePaymentDetailsFailure(const String& error) {
-  if (!payment_provider_.is_bound())
+  if (!payment_provider_.is_bound()) {
     return;
-  if (update_payment_details_timer_.IsActive())
+  }
+  if (update_payment_details_timer_.IsActive()) {
     update_payment_details_timer_.Stop();
+  }
   ScriptPromiseResolver* resolver = GetPendingAcceptPromiseResolver();
   if (resolver) {
     resolver->Reject(MakeGarbageCollected<DOMException>(
@@ -1282,8 +1306,9 @@
   ValidateAndConvertPaymentMethodData(method_data, options_,
                                       validated_method_data, method_names_,
                                       *GetExecutionContext(), exception_state);
-  if (exception_state.HadException())
+  if (exception_state.HadException()) {
     return;
+  }
 
   ignore_total_ =
       RuntimeEnabledFeatures::DigitalGoodsEnabled(GetExecutionContext()) &&
@@ -1291,8 +1316,9 @@
   ValidateAndConvertPaymentDetailsInit(details, options_, validated_details,
                                        shipping_option_, ignore_total_,
                                        *GetExecutionContext(), exception_state);
-  if (exception_state.HadException())
+  if (exception_state.HadException()) {
     return;
+  }
 
   const WTF::HashSet<String> billing_methods = GetAppStoreBillingMethods();
   for (const PaymentMethodDataPtr& data : validated_method_data) {
@@ -1616,8 +1642,9 @@
 void PaymentRequest::OnCanMakePayment(CanMakePaymentQueryResult result) {
   // TODO(https://crbug.com/891371): Understand how the resolver could be null
   // here and prevent it.
-  if (!can_make_payment_resolver_)
+  if (!can_make_payment_resolver_) {
     return;
+  }
 
   switch (result) {
     case CanMakePaymentQueryResult::CAN_MAKE_PAYMENT:
@@ -1635,8 +1662,9 @@
     HasEnrolledInstrumentQueryResult result) {
   // TODO(https://crbug.com/891371): Understand how the resolver could be null
   // here and prevent it.
-  if (!has_enrolled_instrument_resolver_)
+  if (!has_enrolled_instrument_resolver_) {
     return;
+  }
 
   switch (result) {
     case HasEnrolledInstrumentQueryResult::WARNING_HAS_ENROLLED_INSTRUMENT:
@@ -1708,8 +1736,9 @@
   abort_resolver_.Clear();
   can_make_payment_resolver_.Clear();
   has_enrolled_instrument_resolver_.Clear();
-  if (client_receiver_.is_bound())
+  if (client_receiver_.is_bound()) {
     client_receiver_.reset();
+  }
   payment_provider_.reset();
 }
 

third_party/blink/renderer/modules/xr/xr_session.cc

diff --git a/third_party/blink/renderer/modules/xr/xr_session.cc b/third_party/blink/renderer/modules/xr/xr_session.cc
index 08a970f7..20f25cd 100644
--- a/third_party/blink/renderer/modules/xr/xr_session.cc
+++ b/third_party/blink/renderer/modules/xr/xr_session.cc
@@ -423,6 +423,15 @@
   }
 }
 
+Vector<String> XRSession::enabledFeatures() const {
+  Vector<String> enabled_features;
+  for (const auto& feature : enabled_features_) {
+    enabled_features.push_back(XRSessionFeatureToString(feature));
+  }
+
+  return enabled_features;
+}
+
 XRAnchorSet* XRSession::TrackedAnchors() const {
   DVLOG(3) << __func__;
 
@@ -615,9 +624,6 @@
   ScriptPromise promise = resolver->Promise();
   resolver->Resolve(reference_space);
 
-  UMA_HISTOGRAM_ENUMERATION("XR.WebXR.ReferenceSpace.Succeeded",
-                            requested_type);
-
   return promise;
 }
 

third_party/blink/renderer/modules/xr/xr_session.h

diff --git a/third_party/blink/renderer/modules/xr/xr_session.h b/third_party/blink/renderer/modules/xr/xr_session.h
index e3cfec1a..2cf4ba8 100644
--- a/third_party/blink/renderer/modules/xr/xr_session.h
+++ b/third_party/blink/renderer/modules/xr/xr_session.h
@@ -139,6 +139,8 @@
   // have a need to differentiate based on the underlying runtime.
   const String preferredReflectionFormat() const { return "rgba16f"; }
 
+  Vector<String> enabledFeatures() const;
+
   XRSpace* viewerSpace() const;
 
   XRAnchorSet* TrackedAnchors() const;

third_party/blink/renderer/modules/xr/xr_session.idl

diff --git a/third_party/blink/renderer/modules/xr/xr_session.idl b/third_party/blink/renderer/modules/xr/xr_session.idl
index 7639a58..92e75697 100644
--- a/third_party/blink/renderer/modules/xr/xr_session.idl
+++ b/third_party/blink/renderer/modules/xr/xr_session.idl
@@ -50,6 +50,7 @@
   [CallWith=ScriptState, MeasureAs=XRSessionGetInputSources, SameObject] readonly attribute XRInputSourceArray inputSources;
   [SameObject] readonly attribute XRDOMOverlayState domOverlayState;
   readonly attribute XRReflectionFormat preferredReflectionFormat;
+  [RuntimeEmabled=WebXREnabledFeatures] readonly attribute FrozenArray<DOMString> enabledFeatures;
 
   attribute EventHandler onend;
   attribute EventHandler onselect;

third_party/blink/renderer/platform/graphics/compositing/paint_artifact_compositor.cc

diff --git a/third_party/blink/renderer/platform/graphics/compositing/paint_artifact_compositor.cc b/third_party/blink/renderer/platform/graphics/compositing/paint_artifact_compositor.cc
index d3131a4..7049902 100644
--- a/third_party/blink/renderer/platform/graphics/compositing/paint_artifact_compositor.cc
+++ b/third_party/blink/renderer/platform/graphics/compositing/paint_artifact_compositor.cc
@@ -513,7 +513,7 @@
   AdjustMaskLayerGeometry(transform, layer_offset, layer_bounds);
   new_projection.PostTranslate(-layer_offset);
 
-  if (!path && new_projection.IsIdentityOr2DTranslation()) {
+  if (!path && new_projection.IsIdentityOr2dTranslation()) {
     gfx::Vector2dF translation = new_projection.To2dTranslation();
     new_rrect.offset(translation.x(), translation.y());
     needs_display = !rrect_is_local_ || new_rrect != rrect_;
@@ -546,7 +546,7 @@
     cc_list->push<cc::DrawRRectOp>(rrect_, flags);
   } else {
     cc_list->push<cc::SaveOp>();
-    if (projection_.IsIdentityOr2DTranslation()) {
+    if (projection_.IsIdentityOr2dTranslation()) {
       gfx::Vector2dF translation = projection_.To2dTranslation();
       cc_list->push<cc::TranslateOp>(translation.x(), translation.y());
     } else {

third_party/blink/renderer/platform/graphics/compositing/paint_chunks_to_cc_layer.cc

diff --git a/third_party/blink/renderer/platform/graphics/compositing/paint_chunks_to_cc_layer.cc b/third_party/blink/renderer/platform/graphics/compositing/paint_chunks_to_cc_layer.cc
index a43ee1af..11af55b 100644
--- a/third_party/blink/renderer/platform/graphics/compositing/paint_chunks_to_cc_layer.cc
+++ b/third_party/blink/renderer/platform/graphics/compositing/paint_chunks_to_cc_layer.cc
@@ -161,7 +161,7 @@
     if (&target_transform == current_transform_)
       return;
     gfx::Transform projection = TargetToCurrentProjection(target_transform);
-    if (projection.IsIdentityOr2DTranslation()) {
+    if (projection.IsIdentityOr2dTranslation()) {
       gfx::Vector2dF translation = projection.To2dTranslation();
       if (!translation.IsZero())
         push<cc::TranslateOp>(translation.x(), translation.y());
@@ -743,7 +743,7 @@
 
   result_.StartPaint();
   push<cc::SaveOp>();
-  if (projection.IsIdentityOr2DTranslation()) {
+  if (projection.IsIdentityOr2dTranslation()) {
     gfx::Vector2dF translation = projection.To2dTranslation();
     push<cc::TranslateOp>(translation.x(), translation.y());
   } else {

third_party/blink/renderer/platform/graphics/paint/float_clip_rect.h

diff --git a/third_party/blink/renderer/platform/graphics/paint/float_clip_rect.h b/third_party/blink/renderer/platform/graphics/paint/float_clip_rect.h
index 0401dba..977314b7 100644
--- a/third_party/blink/renderer/platform/graphics/paint/float_clip_rect.h
+++ b/third_party/blink/renderer/platform/graphics/paint/float_clip_rect.h
@@ -99,7 +99,7 @@
   }
 
   void Map(const gfx::Transform& matrix) {
-    if (matrix.IsIdentityOr2DTranslation()) {
+    if (matrix.IsIdentityOr2dTranslation()) {
       Move(matrix.To2dTranslation());
       return;
     }

third_party/blink/renderer/platform/graphics/paint/geometry_mapper_test.cc

diff --git a/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_test.cc b/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_test.cc
index 7180b0a..f330a61 100644
--- a/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_test.cc
+++ b/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_test.cc
@@ -136,7 +136,7 @@
   if (expected_transform) {
     EXPECT_EQ(*expected_transform, projection);
   } else {
-    EXPECT_TRUE(projection.IsIdentityOr2DTranslation());
+    EXPECT_TRUE(projection.IsIdentityOr2dTranslation());
     EXPECT_EQ(expected_translation_2d, projection.To2dTranslation());
   }
 }

third_party/blink/renderer/platform/graphics/paint/transform_paint_property_node.h

diff --git a/third_party/blink/renderer/platform/graphics/paint/transform_paint_property_node.h b/third_party/blink/renderer/platform/graphics/paint/transform_paint_property_node.h
index 6d6a5b4a..e485cbf 100644
--- a/third_party/blink/renderer/platform/graphics/paint/transform_paint_property_node.h
+++ b/third_party/blink/renderer/platform/graphics/paint/transform_paint_property_node.h
@@ -200,7 +200,7 @@
   }
 
   bool IsIdentityOr2dTranslation() const {
-    return state_.transform_and_origin.matrix.IsIdentityOr2DTranslation();
+    return state_.transform_and_origin.matrix.IsIdentityOr2dTranslation();
   }
   bool IsIdentity() const {
     return state_.transform_and_origin.matrix.IsIdentity();

third_party/blink/renderer/platform/loader/child_url_loader_factory_bundle.cc

diff --git a/third_party/blink/renderer/platform/loader/child_url_loader_factory_bundle.cc b/third_party/blink/renderer/platform/loader/child_url_loader_factory_bundle.cc
index a67e0b1..c3b19e6 100644
--- a/third_party/blink/renderer/platform/loader/child_url_loader_factory_bundle.cc
+++ b/third_party/blink/renderer/platform/loader/child_url_loader_factory_bundle.cc
@@ -145,6 +145,8 @@
     OriginMap pending_isolated_world_factories,
     mojo::PendingRemote<network::mojom::URLLoaderFactory>
         pending_prefetch_loader_factory,
+    mojo::PendingRemote<network::mojom::URLLoaderFactory>
+        pending_topics_loader_factory,
     bool bypass_redirect_checks)
     : PendingURLLoaderFactoryBundle(
           std::move(pending_default_factory),
@@ -152,7 +154,9 @@
           std::move(pending_isolated_world_factories),
           bypass_redirect_checks),
       pending_prefetch_loader_factory_(
-          std::move(pending_prefetch_loader_factory)) {}
+          std::move(pending_prefetch_loader_factory)),
+      pending_topics_loader_factory_(std::move(pending_topics_loader_factory)) {
+}
 
 ChildPendingURLLoaderFactoryBundle::~ChildPendingURLLoaderFactoryBundle() =
     default;
@@ -167,6 +171,8 @@
       std::move(pending_isolated_world_factories_);
   other->pending_prefetch_loader_factory_ =
       std::move(pending_prefetch_loader_factory_);
+  other->pending_topics_loader_factory_ =
+      std::move(pending_topics_loader_factory_);
   other->bypass_redirect_checks_ = bypass_redirect_checks_;
 
   return base::MakeRefCounted<ChildURLLoaderFactoryBundle>(std::move(other));
@@ -211,8 +217,13 @@
     return;
   }
 
+  // Prefetch and topics are two disjoint request types. They cannot be true
+  // at the same time.
+  DCHECK(
+      !((request.load_flags & net::LOAD_PREFETCH) && request.browsing_topics));
+
   // Use |prefetch_loader_factory_| for prefetch requests to send the requests
-  // to the PrefetchURLLoaderService in the browser process and triger the
+  // to the PrefetchURLLoaderService in the browser process and trigger the
   // special prefetch handling.
   // TODO(horo): Move this routing logic to network service, when we will have
   // the special prefetch handling in network service.
@@ -225,6 +236,16 @@
     return;
   }
 
+  // Use |topics_loader_factory_| to send the requests to the
+  // BrowsingTopicsURLLoaderService in the browser process and trigger the
+  // special topics handling.
+  if (request.browsing_topics && topics_loader_factory_) {
+    topics_loader_factory_->CreateLoaderAndStart(
+        std::move(loader), request_id, options, request, std::move(client),
+        traffic_annotation);
+    return;
+  }
+
   URLLoaderFactoryBundle::CreateLoaderAndStart(
       std::move(loader), request_id, options, request, std::move(client),
       traffic_annotation);
@@ -246,6 +267,13 @@
         pending_prefetch_loader_factory.InitWithNewPipeAndPassReceiver());
   }
 
+  mojo::PendingRemote<network::mojom::URLLoaderFactory>
+      pending_topics_loader_factory;
+  if (topics_loader_factory_) {
+    topics_loader_factory_->Clone(
+        pending_topics_loader_factory.InitWithNewPipeAndPassReceiver());
+  }
+
   // Currently there is no need to override subresources from workers,
   // therefore |subresource_overrides| are not shared with the clones.
 
@@ -253,7 +281,8 @@
       std::move(default_factory_pending_remote),
       CloneRemoteMapToPendingRemoteMap(scheme_specific_factories_),
       CloneRemoteMapToPendingRemoteMap(isolated_world_factories_),
-      std::move(pending_prefetch_loader_factory), bypass_redirect_checks_);
+      std::move(pending_prefetch_loader_factory),
+      std::move(pending_topics_loader_factory), bypass_redirect_checks_);
 }
 
 std::unique_ptr<ChildPendingURLLoaderFactoryBundle>
@@ -268,11 +297,18 @@
     pending_prefetch_loader_factory = prefetch_loader_factory_.Unbind();
   }
 
+  mojo::PendingRemote<network::mojom::URLLoaderFactory>
+      pending_topics_loader_factory;
+  if (topics_loader_factory_) {
+    pending_topics_loader_factory = topics_loader_factory_.Unbind();
+  }
+
   return std::make_unique<ChildPendingURLLoaderFactoryBundle>(
       std::move(pending_default_factory),
       BoundRemoteMapToPendingRemoteMap(std::move(scheme_specific_factories_)),
       BoundRemoteMapToPendingRemoteMap(std::move(isolated_world_factories_)),
-      std::move(pending_prefetch_loader_factory), bypass_redirect_checks_);
+      std::move(pending_prefetch_loader_factory),
+      std::move(pending_topics_loader_factory), bypass_redirect_checks_);
 }
 
 void ChildURLLoaderFactoryBundle::Update(
@@ -281,6 +317,10 @@
     prefetch_loader_factory_.Bind(
         std::move(pending_factories->pending_prefetch_loader_factory()));
   }
+  if (pending_factories->pending_topics_loader_factory()) {
+    topics_loader_factory_.Bind(
+        std::move(pending_factories->pending_topics_loader_factory()));
+  }
   URLLoaderFactoryBundle::Update(std::move(pending_factories));
 }
 
@@ -297,6 +337,12 @@
   prefetch_loader_factory_.Bind(std::move(prefetch_loader_factory));
 }
 
+void ChildURLLoaderFactoryBundle::SetTopicsLoaderFactory(
+    mojo::PendingRemote<network::mojom::URLLoaderFactory>
+        topics_loader_factory) {
+  topics_loader_factory_.Bind(std::move(topics_loader_factory));
+}
+
 bool ChildURLLoaderFactoryBundle::IsHostChildURLLoaderFactoryBundle() const {
   return false;
 }

third_party/blink/renderer/platform/loader/fetch/DEPS

diff --git a/third_party/blink/renderer/platform/loader/fetch/DEPS b/third_party/blink/renderer/platform/loader/fetch/DEPS
index 774af22..e7530d1 100644
--- a/third_party/blink/renderer/platform/loader/fetch/DEPS
+++ b/third_party/blink/renderer/platform/loader/fetch/DEPS
@@ -10,3 +10,9 @@
   "+services/network/public/cpp/optional_trust_token_params.h",
   "+third_party/blink/renderer/platform/mojo",
 ]
+
+specific_include_rules = {
+  "resource_request.cc": [
+    "+net/base/request_priority.h",
+  ]
+}

third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc

diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
index 131c3db..94e0c35 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
@@ -513,6 +513,28 @@
   return priority;
 }
 
+// This method simply takes in information about a ResourceRequest, and returns
+// if the resource should be loaded in parallel (incremental) or sequentially
+// for protocols that support multiplexing and HTTP extensible priorities
+// (RFC 9218).
+// Most content types can be operated on with partial data (document parsing,
+// images, media, etc) but a few need to be complete before they can be
+// processed.
+bool ResourceFetcher::ShouldLoadIncremental(ResourceType type) const {
+  switch (type) {
+    case ResourceType::kCSSStyleSheet:
+    case ResourceType::kScript:
+    case ResourceType::kFont:
+    case ResourceType::kXSLStyleSheet:
+    case ResourceType::kManifest:
+      return false;
+    default:
+      return true;
+  }
+  NOTREACHED();
+  return true;
+}
+
 ResourceFetcher::ResourceFetcher(const ResourceFetcherInit& init)
     : properties_(*init.properties),
       context_(init.context),
@@ -933,6 +955,7 @@
 
   DCHECK_NE(computed_load_priority, ResourceLoadPriority::kUnresolved);
   resource_request.SetPriority(computed_load_priority);
+  resource_request.SetPriorityIncremental(ShouldLoadIncremental(resource_type));
   resource_request.SetRenderBlockingBehavior(
       params.GetRenderBlockingBehavior());
 
@@ -2401,6 +2424,8 @@
     resource_request.SetPriority(ComputeLoadPriority(
         resource->GetType(), resource_request, ResourcePriority::kNotVisible));
   }
+  resource_request.SetPriorityIncremental(
+      ShouldLoadIncremental(resource->GetType()));
   resource_request.SetReferrerString(Referrer::NoReferrer());
   resource_request.SetReferrerPolicy(network::mojom::ReferrerPolicy::kNever);
   resource_request.SetInspectorId(CreateUniqueIdentifier());

third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h

diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h
index 363cdba..1939d68 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h
@@ -308,6 +308,10 @@
                                render_blocking_behavior, is_link_preload);
   }
 
+  bool ShouldLoadIncrementalForTesting(ResourceType type) {
+    return ShouldLoadIncremental(type);
+  }
+
   void SetThrottleOptionOverride(
       ResourceLoadScheduler::ThrottleOptionOverride throttle_option_override) {
     scheduler_->SetThrottleOptionOverride(throttle_option_override);
@@ -362,6 +366,7 @@
           FetchParameters::SpeculativePreloadType::kNotSpeculative,
       RenderBlockingBehavior = RenderBlockingBehavior::kNonBlocking,
       bool is_link_preload = false);
+  bool ShouldLoadIncremental(ResourceType type) const;
 
   // |virtual_time_pauser| is an output parameter. PrepareRequest may
   // create a new WebScopedVirtualTimePauser and set it to

third_party/blink/renderer/platform/loader/fetch/resource_fetcher_test.cc

diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher_test.cc b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher_test.cc
index 64c4138..19a45cf 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher_test.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher_test.cc
@@ -1358,6 +1358,33 @@
   }
 }
 
+TEST_F(ResourceFetcherTest, PriorityIncremental) {
+  auto& properties = *MakeGarbageCollected<TestResourceFetcherProperties>();
+  auto* fetcher = CreateFetcher(properties);
+
+  // Check all of the resource types that are NOT supposed to be loaded
+  // incrementally
+  ResourceType res_not_incremental[] = {
+      ResourceType::kCSSStyleSheet, ResourceType::kScript, ResourceType::kFont,
+      ResourceType::kXSLStyleSheet, ResourceType::kManifest};
+  for (auto& res_type : res_not_incremental) {
+    const bool incremental = fetcher->ShouldLoadIncrementalForTesting(res_type);
+    EXPECT_EQ(incremental, false);
+  }
+
+  // Check all of the resource types that ARE supposed to be loaded
+  // incrementally
+  ResourceType res_incremental[] = {
+      ResourceType::kImage,       ResourceType::kRaw,
+      ResourceType::kSVGDocument, ResourceType::kLinkPrefetch,
+      ResourceType::kTextTrack,   ResourceType::kAudio,
+      ResourceType::kVideo,       ResourceType::kSpeculationRules};
+  for (auto& res_type : res_incremental) {
+    const bool incremental = fetcher->ShouldLoadIncrementalForTesting(res_type);
+    EXPECT_EQ(incremental, true);
+  }
+}
+
 TEST_F(ResourceFetcherTest, Detach) {
   DetachableResourceFetcherProperties& properties =
       MakeGarbageCollected<TestResourceFetcherProperties>()->MakeDetachable();

third_party/blink/renderer/platform/loader/fetch/resource_request.cc

diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_request.cc b/third_party/blink/renderer/platform/loader/fetch/resource_request.cc
index 7db7ed6..a48882e7 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_request.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_request.cc
@@ -29,6 +29,7 @@
 #include <memory>
 
 #include "base/unguessable_token.h"
+#include "net/base/request_priority.h"
 #include "services/network/public/mojom/ip_address_space.mojom-blink.h"
 #include "services/network/public/mojom/web_bundle_handle.mojom-blink.h"
 #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h"
@@ -101,6 +102,7 @@
       download_to_cache_only_(false),
       site_for_cookies_set_(false),
       is_form_submission_(false),
+      priority_incremental_(net::kDefaultPriorityIncremental),
       initial_priority_(ResourceLoadPriority::kUnresolved),
       priority_(ResourceLoadPriority::kUnresolved),
       intra_priority_value_(0),
@@ -204,6 +206,7 @@
   request->SetKeepalive(GetKeepalive());
   request->SetBrowsingTopics(GetBrowsingTopics());
   request->SetPriority(Priority());
+  request->SetPriorityIncremental(PriorityIncremental());
 
   request->SetCorsPreflightPolicy(CorsPreflightPolicy());
   if (IsAdResource())
@@ -370,6 +373,14 @@
   intra_priority_value_ = intra_priority_value;
 }
 
+bool ResourceRequestHead::PriorityIncremental() const {
+  return priority_incremental_;
+}
+
+void ResourceRequestHead::SetPriorityIncremental(bool priority_incremental) {
+  priority_incremental_ = priority_incremental;
+}
+
 void ResourceRequestHead::AddHttpHeaderField(const AtomicString& name,
                                              const AtomicString& value) {
   HTTPHeaderMap::AddResult result = http_header_fields_.Add(name, value);

third_party/blink/renderer/platform/loader/fetch/resource_request.h

diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_request.h b/third_party/blink/renderer/platform/loader/fetch/resource_request.h
index a469671..2d1f2b3 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_request.h
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_request.h
@@ -244,6 +244,13 @@
 
   bool IsConditional() const;
 
+  // Incremental property of HTTP Extensible Priorities which specifies that
+  // responses can be delivered concurrently if they are the same priority on
+  // a connection that supports multiplexing (HTTP/3 primarily).
+  // https://www.rfc-editor.org/rfc/rfc9218
+  bool PriorityIncremental() const;
+  void SetPriorityIncremental(bool);
+
   // Whether the associated ResourceHandleClient needs to be notified of
   // upload progress made for that resource.
   bool ReportUploadProgress() const { return report_upload_progress_; }
@@ -572,6 +579,7 @@
   bool download_to_cache_only_ : 1;
   bool site_for_cookies_set_ : 1;
   bool is_form_submission_ : 1;
+  bool priority_incremental_ : 1;
   ResourceLoadPriority initial_priority_;
   ResourceLoadPriority priority_;
   int intra_priority_value_;

third_party/blink/renderer/platform/loader/fetch/url_loader/request_conversion.cc

diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/request_conversion.cc b/third_party/blink/renderer/platform/loader/fetch/url_loader/request_conversion.cc
index 14a6238b..2304dee 100644
--- a/third_party/blink/renderer/platform/loader/fetch/url_loader/request_conversion.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/request_conversion.cc
@@ -313,6 +313,7 @@
                          .GetLoadFlagsForWebUrlRequest();
   dest->recursive_prefetch_token = src.RecursivePrefetchToken();
   dest->priority = WebURLRequest::ConvertToNetPriority(src.Priority());
+  dest->priority_incremental = src.PriorityIncremental();
   dest->cors_preflight_policy = src.CorsPreflightPolicy();
   dest->skip_service_worker = src.GetSkipServiceWorker();
   dest->mode = src.GetMode();

third_party/blink/renderer/platform/loader/tracked_child_url_loader_factory_bundle.cc

diff --git a/third_party/blink/renderer/platform/loader/tracked_child_url_loader_factory_bundle.cc b/third_party/blink/renderer/platform/loader/tracked_child_url_loader_factory_bundle.cc
index 17f1f3a..84c38fd6 100644
--- a/third_party/blink/renderer/platform/loader/tracked_child_url_loader_factory_bundle.cc
+++ b/third_party/blink/renderer/platform/loader/tracked_child_url_loader_factory_bundle.cc
@@ -23,6 +23,8 @@
         OriginMap pending_isolated_world_factories,
         mojo::PendingRemote<network::mojom::URLLoaderFactory>
             pending_prefetch_loader_factory,
+        mojo::PendingRemote<network::mojom::URLLoaderFactory>
+            pending_topics_loader_factory,
         std::unique_ptr<HostPtrAndTaskRunner> main_thread_host_bundle,
         bool bypass_redirect_checks)
     : ChildPendingURLLoaderFactoryBundle(
@@ -30,6 +32,7 @@
           std::move(pending_scheme_specific_factories),
           std::move(pending_isolated_world_factories),
           std::move(pending_prefetch_loader_factory),
+          std::move(pending_topics_loader_factory),
           bypass_redirect_checks),
       main_thread_host_bundle_(std::move(main_thread_host_bundle)) {}
 
@@ -51,6 +54,8 @@
       std::move(pending_isolated_world_factories_);
   other->pending_prefetch_loader_factory_ =
       std::move(pending_prefetch_loader_factory_);
+  other->pending_topics_loader_factory_ =
+      std::move(pending_topics_loader_factory_);
   other->main_thread_host_bundle_ = std::move(main_thread_host_bundle_);
   other->bypass_redirect_checks_ = bypass_redirect_checks_;
 
@@ -90,6 +95,7 @@
       std::move(pending_factories->pending_scheme_specific_factories()),
       std::move(pending_factories->pending_isolated_world_factories()),
       std::move(pending_factories->pending_prefetch_loader_factory()),
+      std::move(pending_factories->pending_topics_loader_factory()),
       std::move(main_thread_host_bundle_clone),
       pending_factories->bypass_redirect_checks());
 }
@@ -155,6 +161,7 @@
       std::move(pending_factories->pending_scheme_specific_factories()),
       std::move(pending_factories->pending_isolated_world_factories()),
       std::move(pending_factories->pending_prefetch_loader_factory()),
+      std::move(pending_factories->pending_topics_loader_factory()),
       std::move(main_thread_host_bundle_clone),
       pending_factories->bypass_redirect_checks());
 }

third_party/blink/renderer/platform/media/web_media_player_impl.cc

diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
index a74c028..69b9b05 100644
--- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
+++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
@@ -195,31 +195,18 @@
   return EncryptionSchemeUMA::kCenc;
 }
 
-#if BUILDFLAG(ENABLE_FFMPEG)
-// Returns true if `url` represents (or is likely to) a local file.
-bool IsLocalFile(const GURL& url) {
-  return url.SchemeIsFile() || url.SchemeIsFileSystem() ||
-         url.SchemeIs(url::kContentScheme) ||
-         url.SchemeIs(url::kContentIDScheme) ||
-         url.SchemeIs("chrome-extension");
-}
-#endif
-
 // Handles destruction of media::Renderer dependent components after the
 // renderer has been destructed on the media thread.
 void DestructionHelper(
     scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> vfc_task_runner,
     std::unique_ptr<media::DemuxerManager> demuxer_manager,
-    std::unique_ptr<Demuxer> demuxer,
-    std::unique_ptr<media::DataSource> data_source,
     std::unique_ptr<VideoFrameCompositor> compositor,
     std::unique_ptr<media::CdmContextRef> cdm_context_1,
     std::unique_ptr<media::CdmContextRef> cdm_context_2,
     std::unique_ptr<media::MediaLog> media_log,
     std::unique_ptr<media::RendererFactorySelector> renderer_factory_selector,
-    std::unique_ptr<WebSurfaceLayerBridge> bridge,
-    absl::optional<media::DemuxerType> demuxer_type) {
+    std::unique_ptr<WebSurfaceLayerBridge> bridge) {
   // We release `bridge` after pipeline stop to ensure layout tests receive
   // painted video frames before test harness exit.
   main_task_runner->DeleteSoon(FROM_HERE, std::move(bridge));
@@ -231,10 +218,9 @@
 
   // ChunkDemuxer can be deleted on any thread, but other demuxers are bound to
   // the main thread and must be deleted there now that the renderer is gone.
-  if (demuxer_type != media::DemuxerType::kChunkDemuxer) {
+  if (demuxer_manager &&
+      demuxer_manager->GetDemuxerType() != media::DemuxerType::kChunkDemuxer) {
     main_task_runner->DeleteSoon(FROM_HERE, std::move(demuxer_manager));
-    main_task_runner->DeleteSoon(FROM_HERE, std::move(demuxer));
-    main_task_runner->DeleteSoon(FROM_HERE, std::move(data_source));
     main_task_runner->DeleteSoon(FROM_HERE, std::move(cdm_context_1));
     main_task_runner->DeleteSoon(FROM_HERE, std::move(cdm_context_2));
     main_task_runner->DeleteSoon(FROM_HERE, std::move(media_log));
@@ -257,20 +243,18 @@
       base::BindOnce(
           [](scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
              std::unique_ptr<media::DemuxerManager> demuxer_manager,
-             std::unique_ptr<Demuxer> demuxer_to_destroy,
              std::unique_ptr<media::CdmContextRef> cdm_context_1,
              std::unique_ptr<media::CdmContextRef> cdm_context_2,
              std::unique_ptr<media::MediaLog> media_log) {
             SCOPED_UMA_HISTOGRAM_TIMER("Media.MSE.DemuxerDestructionTime");
             demuxer_manager.reset();
-            demuxer_to_destroy.reset();
             main_task_runner->DeleteSoon(FROM_HERE, std::move(cdm_context_1));
             main_task_runner->DeleteSoon(FROM_HERE, std::move(cdm_context_2));
             main_task_runner->DeleteSoon(FROM_HERE, std::move(media_log));
           },
           std::move(main_task_runner), std::move(demuxer_manager),
-          std::move(demuxer), std::move(cdm_context_1),
-          std::move(cdm_context_2), std::move(media_log)));
+          std::move(cdm_context_1), std::move(cdm_context_2),
+          std::move(media_log)));
 }
 
 std::string SanitizeUserStringProperty(WebString value) {
@@ -385,7 +369,14 @@
       delegate_has_audio_(HasUnmutedAudio()),
       defer_load_cb_(std::move(defer_load_cb)),
       adjust_allocated_memory_cb_(std::move(adjust_allocated_memory_cb)),
-      demuxer_manager_(std::make_unique<media::DemuxerManager>(this)),
+      demuxer_manager_(std::make_unique<media::DemuxerManager>(
+          this,
+          media_task_runner_,
+          media_log_.get(),
+          frame_->GetDocument().SiteForCookies(),
+          frame_->GetDocument().TopFrameOrigin(),
+          enable_instant_source_buffer_gc,
+          std::move(demuxer_override))),
       tick_clock_(base::DefaultTickClock::GetInstance()),
       url_index_(url_index),
       raster_context_provider_(std::move(raster_context_provider)),
@@ -393,7 +384,6 @@
       compositor_(std::move(compositor)),
       renderer_factory_selector_(std::move(renderer_factory_selector)),
       observer_(std::move(media_observer)),
-      enable_instant_source_buffer_gc_(enable_instant_source_buffer_gc),
       embedded_media_experience_enabled_(embedded_media_experience_enabled),
       use_surface_layer_(use_surface_layer),
       create_bridge_callback_(std::move(create_bridge_callback)),
@@ -411,8 +401,7 @@
                               base::Unretained(this)),
           base::BindRepeating(&WebMediaPlayerImpl::GetCurrentTimeInternal,
                               base::Unretained(this))),
-      will_play_helper_(nullptr),
-      demuxer_override_(std::move(demuxer_override)) {
+      will_play_helper_(nullptr) {
   DVLOG(1) << __func__;
   DCHECK(adjust_allocated_memory_cb_);
   DCHECK(renderer_factory_selector_);
@@ -557,7 +546,7 @@
   // The underlying Pipeline must be stopped before it is destroyed.
   //
   // Note: This destruction happens synchronously on the media thread and
-  // `demuxer_`, `data_source`, `compositor_`, and `media_log_` must outlive
+  // `demuxer_manager_`, `compositor_`, and `media_log_` must outlive
   // this process. They will be destructed by the DestructionHelper below
   // after trampolining through the media thread.
   pipeline_controller_->Stop();
@@ -576,7 +565,8 @@
   simple_watch_timer_.Stop();
   media_log_->OnWebMediaPlayerDestroyed();
 
-  auto data_source = demuxer_manager_->StopAndGetDataSourceForDestruction();
+  demuxer_manager_->StopAndResetClient(nullptr);
+  demuxer_manager_->InvalidateWeakPtrs();
 
   // Disconnect from the surface layer. We still preserve the `bridge_` until
   // after pipeline shutdown to ensure any pending frames are painted for tests.
@@ -602,11 +592,10 @@
       FROM_HERE,
       base::BindOnce(&DestructionHelper, std::move(main_task_runner_),
                      std::move(vfc_task_runner_), std::move(demuxer_manager_),
-                     std::move(demuxer_), std::move(data_source),
                      std::move(compositor_), std::move(cdm_context_ref_),
                      std::move(pending_cdm_context_ref_), std::move(media_log_),
-                     std::move(renderer_factory_selector_), std::move(bridge_),
-                     GetDemuxerType()));
+                     std::move(renderer_factory_selector_),
+                     std::move(bridge_)));
 }
 
 WebMediaPlayer::LoadTiming WebMediaPlayerImpl::Load(
@@ -816,7 +805,8 @@
   // (kCorsModeUnspecified) or "use-credentials" (kCorsModeUseCredentials).
   // This value is only used by the MediaPlayerRenderer.
   // See https://crbug.com/936566.
-  allow_media_player_renderer_credentials_ = cors_mode != kCorsModeAnonymous;
+  demuxer_manager_->SetAllowMediaPlayerRendererCredentials(cors_mode !=
+                                                           kCorsModeAnonymous);
 #endif  // BUILDFLAG(IS_ANDROID)
 
   // Note: `url` may be very large, take care when making copies.
@@ -859,7 +849,8 @@
 
   // If a demuxer override was specified or a Media Source pipeline will be
   // used, the pipeline can start immediately.
-  if (demuxer_override_ || load_type == kLoadTypeMediaSource ||
+  if (demuxer_manager_->HasDemuxerOverride() ||
+      load_type == kLoadTypeMediaSource ||
       loaded_url_.SchemeIs(media::remoting::kRemotingScheme)) {
     StartPipeline();
     return;
@@ -1258,13 +1249,11 @@
   if (ready_state_ == WebMediaPlayer::kReadyStateHaveNothing)
     return std::numeric_limits<double>::quiet_NaN();
 
-  // Use duration from ChunkDemuxer when present. MSE allows users to specify
-  // duration as a double. This propagates to the rest of the pipeline as a
-  // TimeDelta with potentially reduced precision (limited to Microseconds).
-  // ChunkDemuxer returns the full-precision user-specified double. This ensures
-  // users can "get" the exact duration they "set".
-  if (GetDemuxerType() == media::DemuxerType::kChunkDemuxer) {
-    return static_cast<media::ChunkDemuxer*>(demuxer_.get())->GetDuration();
+  // Some demuxer's might have more accurate duration information than the
+  // pipeline, so check that first.
+  absl::optional<double> duration = demuxer_manager_->GetDemuxerDuration();
+  if (duration.has_value()) {
+    return *duration;
   }
 
   base::TimeDelta pipeline_duration = GetPipelineMediaDuration();
@@ -1468,12 +1457,6 @@
 }
 
 bool WebMediaPlayerImpl::WouldTaintOrigin() const {
-  if (demuxer_found_hls_) {
-    // HLS manifests might pull segments from a different origin. We can't know
-    // for sure, so we conservatively say yes here.
-    return true;
-  }
-
   return demuxer_manager_->WouldTaintOrigin();
 }
 
@@ -1559,39 +1542,28 @@
       base::saturated_cast<unsigned int>(init_data.size()));
 }
 
-void WebMediaPlayerImpl::OnFFmpegMediaTracksUpdated(
-    std::unique_ptr<media::MediaTracks> tracks) {
-  // For MSE/chunk_demuxer case the media track updates are handled by
-  // WebSourceBufferImpl.
-  DCHECK(demuxer_.get());
-  DCHECK(GetDemuxerType() != media::DemuxerType::kChunkDemuxer);
-
-  // Report the media track information to blink. Only the first audio track and
-  // the first video track are enabled by default to match blink logic.
-  bool is_first_audio_track = true;
-  bool is_first_video_track = true;
-  for (const auto& track : tracks->tracks()) {
-    if (track->type() == MediaTrack::Audio) {
-      client_->AddAudioTrack(WebString::FromUTF8(track->id().value()),
-                             WebMediaPlayerClient::kAudioTrackKindMain,
-                             WebString::FromUTF8(track->label().value()),
-                             WebString::FromUTF8(track->language().value()),
-                             is_first_audio_track);
-      is_first_audio_track = false;
-    } else if (track->type() == MediaTrack::Video) {
-      client_->AddVideoTrack(WebString::FromUTF8(track->id().value()),
-                             WebMediaPlayerClient::kVideoTrackKindMain,
-                             WebString::FromUTF8(track->label().value()),
-                             WebString::FromUTF8(track->language().value()),
-                             is_first_video_track);
-      is_first_video_track = false;
-    } else {
-      // Text tracks are not supported through this code path yet.
-      NOTREACHED();
-    }
-  }
+#if BUILDFLAG(ENABLE_FFMPEG)
+void WebMediaPlayerImpl::AddAudioTrack(const std::string& id,
+                                       const std::string& label,
+                                       const std::string& language,
+                                       bool is_first_track) {
+  client_->AddAudioTrack(WebString::FromUTF8(id),
+                         WebMediaPlayerClient::kAudioTrackKindMain,
+                         WebString::FromUTF8(label),
+                         WebString::FromUTF8(language), is_first_track);
 }
 
+void WebMediaPlayerImpl::AddVideoTrack(const std::string& id,
+                                       const std::string& label,
+                                       const std::string& language,
+                                       bool is_first_track) {
+  client_->AddVideoTrack(WebString::FromUTF8(id),
+                         WebMediaPlayerClient::kVideoTrackKindMain,
+                         WebString::FromUTF8(label),
+                         WebString::FromUTF8(language), is_first_track);
+}
+#endif  // BUILDFLAG(ENABLE_FFMPEG)
+
 void WebMediaPlayerImpl::SetCdmInternal(WebContentDecryptionModule* cdm) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   DCHECK(cdm);
@@ -1726,7 +1698,7 @@
 
   // Tell the data source we have enough data so that it may release the
   // connection (unless blink is waiting on us to signal play()).
-  if (demuxer_manager_->HasDataSource() && !client_->CouldPlayIfEnoughData()) {
+  if (demuxer_manager_->HasDataSource() && !CouldPlayIfEnoughData()) {
     // `attempting_suspended_start_` will be cleared by OnPipelineSeeked() which
     // will occur after this method during a suspended startup.
     if (attempting_suspended_start_ && did_lazy_load_) {
@@ -1793,70 +1765,15 @@
   UpdateBackgroundVideoOptimizationState();
 }
 
-void WebMediaPlayerImpl::OnChunkDemuxerOpened() {
-  // Note - this can't be CHECK_EQ because |GetDemuxerType| returns an optional
-  CHECK(GetDemuxerType() == media::DemuxerType::kChunkDemuxer);
+void WebMediaPlayerImpl::OnChunkDemuxerOpened(media::ChunkDemuxer* demuxer) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
-  client_->MediaSourceOpened(new WebMediaSourceImpl(
-      static_cast<media::ChunkDemuxer*>(demuxer_.get())));
-}
-
-void WebMediaPlayerImpl::OnMemoryPressure(
-    base::MemoryPressureListener::MemoryPressureLevel memory_pressure_level) {
-  DVLOG(2) << __func__ << " memory_pressure_level=" << memory_pressure_level;
-  DCHECK(main_task_runner_->BelongsToCurrentThread());
-  DCHECK(
-      base::FeatureList::IsEnabled(media::kMemoryPressureBasedSourceBufferGC));
-  DCHECK(GetDemuxerType() == media::DemuxerType::kChunkDemuxer);
-
-  if (memory_pressure_level ==
-      base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE) {
-    return;
-  }
-
-  // The new value of `memory_pressure_level` will take effect on the next
-  // garbage collection. Typically this means the next SourceBuffer append()
-  // operation, since per MSE spec, the garbage collection must only occur
-  // during SourceBuffer append(). But if memory pressure is critical it might
-  // be better to perform GC immediately rather than wait for the next append
-  // and potentially get killed due to out-of-memory.
-  // So if this experiment is enabled and pressure level is critical, we'll pass
-  // down force_instant_gc==true, which will force immediate GC on
-  // SourceBufferStreams.
-  bool force_instant_gc =
-      (enable_instant_source_buffer_gc_ &&
-       memory_pressure_level ==
-           base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL);
-
-  // base::Unretained is safe, since `demuxer_` is actually owned by
-  // `this` via this->demuxer_. Note the destruction of `demuxer_` is done
-  // from ~WMPI by first hopping to `media_task_runner_` to prevent race with
-  // this task.
-  media_task_runner_->PostTask(
-      FROM_HERE,
-      base::BindOnce(
-          &media::ChunkDemuxer::OnMemoryPressure,
-          base::Unretained(static_cast<media::ChunkDemuxer*>(demuxer_.get())),
-          base::Seconds(CurrentTime()), memory_pressure_level,
-          force_instant_gc));
+  client_->MediaSourceOpened(new WebMediaSourceImpl(demuxer));
 }
 
 void WebMediaPlayerImpl::OnFallback(media::PipelineStatus status) {
   media_metrics_provider_->OnFallback(std::move(status).AddHere());
 }
 
-#if BUILDFLAG(IS_ANDROID)
-media::PipelineStatus WebMediaPlayerImpl::StartHLSFallback() {
-  // Note: Does not consider the full redirect chain, which could contain
-  // undetected mixed content.
-  demuxer_manager_->SetLoadedUrl(loaded_url_);
-  return demuxer_manager_->StartAndRecordHLSFallback(
-      url::Origin(frame_->GetSecurityOrigin())
-          .GetURL()
-          .SchemeIsCryptographic());
-}
-#endif  // BUILDFLAG(IS_ANDROID)
-
 void WebMediaPlayerImpl::OnError(media::PipelineStatus status) {
   DVLOG(1) << __func__ << ": status=" << status;
   DCHECK(main_task_runner_->BelongsToCurrentThread());
@@ -1867,50 +1784,40 @@
 
 #if BUILDFLAG(IS_ANDROID)
   if (status == media::DEMUXER_ERROR_DETECTED_HLS) {
-    auto started_hls = StartHLSFallback();
-    if (started_hls == media::PIPELINE_OK) {
-      demuxer_found_hls_ = true;
+    // Note: Does not consider the full redirect chain, which could contain
+    // undetected mixed content.
+    demuxer_manager_->SetLoadedUrl(loaded_url_);
+    auto maybe_hls_load_url = demuxer_manager_->ResetAfterHlsDetected(
+        url::Origin(frame_->GetSecurityOrigin())
+            .GetURL()
+            .SchemeIsCryptographic());
+    if (maybe_hls_load_url.has_value()) {
+      observer_->OnHlsManifestDetected();
 
-      if (observer_)
-        observer_->OnHlsManifestDetected();
-
+      // This allows |demuxer_manager_| to restart with a MediaPlayerRenderer
       renderer_factory_selector_->SetBaseRendererType(
           media::RendererType::kMediaPlayer);
 
-      loaded_url_ = demuxer_manager_->GetDataSourceUrlAfterRedirects().value();
-      auto data_source = demuxer_manager_->StopAndGetDataSourceForDestruction();
-
       pipeline_controller_->Stop();
       SetMemoryReportingState(false);
-
+      demuxer_manager_->StopAndResetClient(this);
       media_task_runner_->DeleteSoon(FROM_HERE,
                                      std::move(media_thread_mem_dumper_));
 
-      // Trampoline through the media task runner to destruct the demuxer and
-      // data source now that we're switching to HLS playback.
-      media_task_runner_->PostTask(
-          FROM_HERE,
-          media::BindToCurrentLoop(base::BindOnce(
-              [](std::unique_ptr<Demuxer> demuxer,
-                 std::unique_ptr<media::DataSource> data_source,
-                 base::OnceClosure start_pipeline_cb) {
-                // Release resources before starting HLS.
-                demuxer.reset();
-                data_source.reset();
-
-                std::move(start_pipeline_cb).Run();
-              },
-              std::move(demuxer_), std::move(data_source),
-              base::BindOnce(&WebMediaPlayerImpl::StartPipeline, weak_this_))));
-
+      demuxer_manager_->FreeResourcesAfterMediaThreadWait(
+          media::BindToCurrentLoop(
+              base::BindOnce(&WebMediaPlayerImpl::StartPipeline, weak_this_)));
       return;
+    } else {
+      // This will keep "DETECTED_HLS" as the main error if the feature is not
+      // enabled.
+      status =
+          std::move(maybe_hls_load_url).error().AddCause(std::move(status));
     }
-
-    // This will keep "DETECTED_HLS" as the main error if the feature is not
-    // enabled.
-    status = std::move(started_hls).AddCause(std::move(status));
   }
-#elif BUILDFLAG(IS_WIN)
+#endif  // BUILDFLAG(IS_ANDROID)
+
+#if BUILDFLAG(IS_WIN)
   // Hardware context reset is not an error. Restart to recover.
   // TODO(crbug.com/1208618): Find a way to break the potential infinite loop of
   // restart -> PIPELINE_ERROR_HARDWARE_CONTEXT_RESET -> restart.
@@ -1918,7 +1825,7 @@
     ScheduleRestart();
     return;
   }
-#endif  // BUILDFLAG(IS_ANDROID)
+#endif  // BUILDFLAG(IS_WIN)
 
   MaybeSetContainerNameForMetrics();
   simple_watch_timer_.Stop();
@@ -2238,8 +2145,7 @@
     // It may use this information to update buffer sizes or release unused
     // network connections.
     MaybeUpdateBufferSizesForPlayback();
-    if (demuxer_manager_->HasDataSource() &&
-        !client_->CouldPlayIfEnoughData()) {
+    if (demuxer_manager_->HasDataSource() && !CouldPlayIfEnoughData()) {
       // For LazyLoad this will be handled during OnPipelineSuspended().
       if (for_suspended_start && did_lazy_load_)
         DCHECK(!have_enough_after_lazy_load_cb_.IsCancelled());
@@ -2866,54 +2772,41 @@
       client_->TargetColorSpace());
 }
 
-#if BUILDFLAG(ENABLE_FFMPEG)
-std::unique_ptr<Demuxer> WebMediaPlayerImpl::CreateFFmpegDemuxer() {
-  return std::make_unique<media::FFmpegDemuxer>(
-      media_task_runner_, demuxer_manager_->GetRawDataSource(),
-      media::BindToCurrentLoop(base::BindRepeating(
-          &WebMediaPlayerImpl::OnEncryptedMediaInitData, weak_this_)),
-      media::BindToCurrentLoop(base::BindRepeating(
-          &WebMediaPlayerImpl::OnFFmpegMediaTracksUpdated, weak_this_)),
-      media_log_.get(), IsLocalFile(loaded_url_));
-}
-#endif
-
-std::unique_ptr<Demuxer> WebMediaPlayerImpl::CreateChunkDemuxer() {
-  if (base::FeatureList::IsEnabled(media::kMemoryPressureBasedSourceBufferGC)) {
-    // base::Unretained is safe because `this` owns memory_pressure_listener_.
-    // TODO (crbug/1377053): Remove this. It doesn't appear to be used.
-    memory_pressure_listener_ = std::make_unique<base::MemoryPressureListener>(
-        FROM_HERE, base::BindRepeating(&WebMediaPlayerImpl::OnMemoryPressure,
-                                       base::Unretained(this)));
-  }
-
-  return std::make_unique<media::ChunkDemuxer>(
-      media::BindToCurrentLoop(base::BindOnce(
-          &WebMediaPlayerImpl::OnChunkDemuxerOpened, weak_this_)),
-      media::BindToCurrentLoop(
-          base::BindRepeating(&WebMediaPlayerImpl::OnProgress, weak_this_)),
-      media::BindToCurrentLoop(base::BindRepeating(
-          &WebMediaPlayerImpl::OnEncryptedMediaInitData, weak_this_)),
-      media_log_.get());
-}
-
 absl::optional<media::DemuxerType> WebMediaPlayerImpl::GetDemuxerType() const {
   // Note: this can't be a ternary expression because the compiler throws a fit
   // over type conversions.
-  if (demuxer_)
-    return demuxer_->GetDemuxerType();
+  if (demuxer_manager_) {
+    return demuxer_manager_->GetDemuxerType();
+  }
   return absl::nullopt;
 }
 
-#if BUILDFLAG(IS_ANDROID)
-std::unique_ptr<Demuxer> WebMediaPlayerImpl::CreateMediaUrlDemuxer(
-    bool expect_hls_content) {
-  return std::make_unique<media::MediaUrlDemuxer>(
-      media_task_runner_, loaded_url_, frame_->GetDocument().SiteForCookies(),
-      frame_->GetDocument().TopFrameOrigin(),
-      allow_media_player_renderer_credentials_, expect_hls_content);
+media::PipelineStatus WebMediaPlayerImpl::OnDemuxerCreated(
+    Demuxer* demuxer,
+    media::Pipeline::StartType start_type,
+    bool is_streaming,
+    bool is_static) {
+  CHECK_NE(demuxer, nullptr);
+  switch (demuxer->GetDemuxerType()) {
+    case media::DemuxerType::kMediaUrlDemuxer: {
+      using_media_player_renderer_ = true;
+      video_decode_stats_reporter_.reset();
+      break;
+    }
+    default: {
+      seeking_ = true;
+      break;
+    }
+  }
+
+  if (start_type != media::Pipeline::StartType::kNormal) {
+    attempting_suspended_start_ = true;
+  }
+
+  pipeline_controller_->Start(start_type, demuxer, this, is_streaming,
+                              is_static);
+  return media::OkStatus();
 }
-#endif
 
 void WebMediaPlayerImpl::StartPipeline() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
@@ -2925,71 +2818,16 @@
                      media::BindToCurrentLoop(base::BindOnce(
                          &WebMediaPlayerImpl::OnFirstFrame, weak_this_))));
 
-#if BUILDFLAG(IS_ANDROID)
-  if (demuxer_found_hls_ || renderer_factory_selector_->GetCurrentFactory()
-                                    ->GetRequiredMediaResourceType() ==
-                                media::MediaResource::Type::URL) {
-    // MediaPlayerRendererClientFactory is the only factory that a uses
-    // MediaResource::Type::URL for the moment.
-    using_media_player_renderer_ = true;
+  // base::Unretained(this) is safe here, since |CreateDemuxer| calls the bound
+  // method directly and immediately.
+  auto create_demuxer_error = demuxer_manager_->CreateDemuxer(
+      load_type_ == kLoadTypeMediaSource, preload_, has_poster_,
+      base::BindOnce(&WebMediaPlayerImpl::OnDemuxerCreated,
+                     base::Unretained(this)));
 
-    // MediaPlayerRenderer does not provide pipeline stats, so nuke capabilities
-    // reporter.
-    video_decode_stats_reporter_.reset();
-
-    SetDemuxer(CreateMediaUrlDemuxer(demuxer_found_hls_));
-
-    pipeline_controller_->Start(media::Pipeline::StartType::kNormal,
-                                demuxer_.get(), this, false, false);
-    return;
+  if (!create_demuxer_error.is_ok()) {
+    return OnError(std::move(create_demuxer_error));
   }
-#endif  // BUILDFLAG(IS_ANDROID)
-
-  // Figure out which demuxer to use.
-  if (demuxer_override_) {
-    // can't use absl::optional with DCHECK_NE.
-    DCHECK(GetDemuxerType() != media::DemuxerType::kChunkDemuxer);
-    SetDemuxer(std::move(demuxer_override_));
-    // TODO(https://crbug.com/1076267): Should everything else after this block
-    // run in the demuxer override case?
-  } else if (load_type_ != kLoadTypeMediaSource) {
-    DCHECK(GetDemuxerType() != media::DemuxerType::kChunkDemuxer);
-    DCHECK(demuxer_manager_->HasDataSource());
-#if BUILDFLAG(ENABLE_FFMPEG)
-    SetDemuxer(CreateFFmpegDemuxer());
-#else
-    OnError(media::DEMUXER_ERROR_COULD_NOT_OPEN);
-    return;
-#endif
-  } else {
-    DCHECK(GetDemuxerType() != media::DemuxerType::kChunkDemuxer);
-    DCHECK(!demuxer_manager_->HasDataSource());
-    SetDemuxer(CreateChunkDemuxer());
-    DCHECK(demuxer_);
-  }
-
-  // If possible attempt to avoid decoder spool up until playback starts.
-  auto start_type = media::Pipeline::StartType::kNormal;
-  if ((GetDemuxerType() != media::DemuxerType::kChunkDemuxer) &&
-      preload_ == media::DataSource::METADATA &&
-      !client_->CouldPlayIfEnoughData() && !IsStreaming()) {
-    start_type =
-        (has_poster_ ||
-         base::FeatureList::IsEnabled(media::kPreloadMetadataLazyLoad))
-            ? media::Pipeline::StartType::kSuspendAfterMetadata
-            : media::Pipeline::StartType::kSuspendAfterMetadataForAudioOnly;
-    attempting_suspended_start_ = true;
-  }
-
-  // TODO(sandersd): FileSystem objects may also be non-static, but due to our
-  // caching layer such situations are broken already. http://crbug.com/593159
-  const bool is_static = media::DemuxerType::kChunkDemuxer != GetDemuxerType();
-
-  // ... and we're ready to go!
-  // TODO(sandersd): On Android, defer Start() if the tab is not visible.
-  seeking_ = true;
-  pipeline_controller_->Start(start_type, demuxer_.get(), this, IsStreaming(),
-                              is_static);
 }
 
 void WebMediaPlayerImpl::SetNetworkState(WebMediaPlayer::NetworkState state) {
@@ -3309,42 +3147,47 @@
   return result;
 }
 
-void WebMediaPlayerImpl::SetDemuxer(std::unique_ptr<Demuxer> demuxer) {
+void WebMediaPlayerImpl::MakeDemuxerThreadDumper(media::Demuxer* demuxer) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
-  DCHECK(!demuxer_);
   DCHECK(!media_thread_mem_dumper_);
-  DCHECK(demuxer);
 
-  demuxer_ = std::move(demuxer);
-
-  // base::Unretained() is safe here. `demuxer_` is destroyed on the main
-  // thread, but before doing it ~WebMediaPlayerImpl() posts a media thread task
-  // that deletes media_thread_mem_dumper_ and  waits for it to finish.
+  // base::Unretained() is safe here. `demuxer` is owned by |demuxer_manager_|,
+  // which is destroyed on the main thread, but before doing it
+  // ~WebMediaPlayerImpl() posts a media thread task that deletes
+  // |media_thread_mem_dumper_| and  waits for it to finish.
   media_thread_mem_dumper_ = std::make_unique<media::MemoryDumpProviderProxy>(
       "WebMediaPlayer_MediaThread", media_task_runner_,
       base::BindRepeating(&WebMediaPlayerImpl::OnMediaThreadMemoryDump,
-                          media_player_id_, base::Unretained(demuxer_.get())));
+                          media_player_id_, base::Unretained(demuxer)));
+}
+
+bool WebMediaPlayerImpl::CouldPlayIfEnoughData() {
+  return client_->CouldPlayIfEnoughData();
+}
+
+bool WebMediaPlayerImpl::IsMediaPlayerRendererClient() {
+  // MediaPlayerRendererClientFactory is the only factory that a uses
+  // MediaResource::Type::URL for the moment.
+  return renderer_factory_selector_->GetCurrentFactory()
+             ->GetRequiredMediaResourceType() ==
+         media::MediaResource::Type::URL;
 }
 
 void WebMediaPlayerImpl::ReportMemoryUsage() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
-  // About base::Unretained() usage below: We destroy `demuxer_` on the main
-  // thread.  Before that, however, ~WebMediaPlayerImpl() posts a task to the
-  // media thread and waits for it to finish.  Hence, the GetMemoryUsage() task
-  // posted here must finish earlier.
+  // About base::Unretained() usage below: We destroy `demuxer_manager_` on the
+  // main thread.  Before that, however, ~WebMediaPlayerImpl() posts a task to
+  // the media thread and waits for it to finish.  Hence, the GetMemoryUsage()
+  // task posted here must finish earlier.
   //
   // The exception to the above is when OnError() has been called. If we're in
   // the error state we've already shut down the pipeline and can't rely on it
-  // to cycle the media thread before we destroy `demuxer_`. In this case skip
-  // collection of the demuxer memory stats.
-  if (demuxer_ && !IsNetworkStateError(network_state_)) {
-    media_task_runner_->PostTaskAndReplyWithResult(
-        FROM_HERE,
-        base::BindOnce(&Demuxer::GetMemoryUsage,
-                       base::Unretained(demuxer_.get())),
-        base::BindOnce(&WebMediaPlayerImpl::FinishMemoryUsageReport,
-                       weak_this_));
+  // to cycle the media thread before we destroy `demuxer_manager_`. In this
+  // case skip collection of the demuxer memory stats.
+  if (demuxer_manager_ && !IsNetworkStateError(network_state_)) {
+    demuxer_manager_->RespondToDemuxerMemoryUsageReport(base::BindOnce(
+        &WebMediaPlayerImpl::FinishMemoryUsageReport, weak_this_));
   } else {
     FinishMemoryUsageReport(0);
   }
@@ -3938,15 +3781,16 @@
 
 void WebMediaPlayerImpl::MaybeSetContainerNameForMetrics() {
   // Pipeline startup failed before even getting a demuxer setup.
-  if (!demuxer_)
+  if (!demuxer_manager_->HasDemuxer()) {
     return;
+  }
 
   // Container has already been set.
   if (highest_ready_state_ >= WebMediaPlayer::kReadyStateHaveMetadata)
     return;
 
   // Only report metrics for demuxers that provide container information.
-  auto container = demuxer_->GetContainerForMetrics();
+  auto container = demuxer_manager_->GetContainerForMetrics();
   if (container.has_value())
     media_metrics_provider_->SetContainerName(container.value());
 }

third_party/blink/renderer/platform/media/web_media_player_impl.h

diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b/third_party/blink/renderer/platform/media/web_media_player_impl.h
index b54e661..42775d11 100644
--- a/third_party/blink/renderer/platform/media/web_media_player_impl.h
+++ b/third_party/blink/renderer/platform/media/web_media_player_impl.h
@@ -13,7 +13,6 @@
 
 #include "base/cancelable_callback.h"
 #include "base/compiler_specific.h"
-#include "base/memory/memory_pressure_listener.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/memory/weak_ptr.h"
@@ -27,6 +26,7 @@
 #include "media/base/cdm_config.h"
 #include "media/base/data_source.h"
 #include "media/base/demuxer.h"
+#include "media/base/eme_constants.h"
 #include "media/base/encryption_scheme.h"
 #include "media/base/media_observer.h"
 #include "media/base/media_tracks.h"
@@ -215,9 +215,11 @@
   bool Seeking() const override;
   double Duration() const override;
   virtual double timelineOffset() const;
-  double CurrentTime() const override;
   bool IsEnded() const override;
 
+  // Shared between the WebMediaPlayer and DemuxerManager::Client interfaces.
+  double CurrentTime() const override;
+
   bool PausedWhenHidden() const override;
 
   // Internal states of loading and network.
@@ -386,7 +388,6 @@
   void OnBeforePipelineResume();
   void OnPipelineResumed();
   void OnPipelineSeeked(bool time_updated);
-  void OnChunkDemuxerOpened();
 
   // media::Pipeline::Client overrides.
   void OnError(media::PipelineStatus status) override;
@@ -409,6 +410,26 @@
   void OnAudioPipelineInfoChange(const media::AudioPipelineInfo& info) override;
   void OnVideoPipelineInfoChange(const media::VideoPipelineInfo& info) override;
 
+  // media::DemuxerManager::Client overrides.
+  void OnChunkDemuxerOpened(media::ChunkDemuxer* demuxer) override;
+  void OnProgress() override;
+  void OnEncryptedMediaInitData(media::EmeInitDataType init_data_type,
+                                const std::vector<uint8_t>& init_data) override;
+  void MakeDemuxerThreadDumper(media::Demuxer* demuxer) override;
+  bool CouldPlayIfEnoughData() override;
+  bool IsMediaPlayerRendererClient() override;
+
+#if BUILDFLAG(ENABLE_FFMPEG)
+  void AddAudioTrack(const std::string& id,
+                     const std::string& label,
+                     const std::string& language,
+                     bool is_first_track) override;
+  void AddVideoTrack(const std::string& id,
+                     const std::string& label,
+                     const std::string& language,
+                     bool is_first_track) override;
+#endif  // BUILDFLAG(ENABLE_FFMPEG)
+
   // Simplified watch time reporting.
   void OnSimpleWatchTimerTick();
 
@@ -472,15 +493,6 @@
   // Can return a nullptr.
   scoped_refptr<media::VideoFrame> GetCurrentFrameFromCompositor() const;
 
-  // Called when the demuxer encounters encrypted streams.
-  void OnEncryptedMediaInitData(media::EmeInitDataType init_data_type,
-                                const std::vector<uint8_t>& init_data);
-
-  // Called when the FFmpegDemuxer encounters new media tracks. This is only
-  // invoked when using FFmpegDemuxer, since MSE/ChunkDemuxer handle media
-  // tracks separately in WebSourceBufferImpl.
-  void OnFFmpegMediaTracksUpdated(std::unique_ptr<media::MediaTracks> tracks);
-
   // Sets CdmContext from |cdm| on the pipeline and calls OnCdmAttached()
   // when done.
   void SetCdmInternal(WebContentDecryptionModule* cdm);
@@ -515,8 +527,6 @@
   void SetMemoryReportingState(bool is_memory_reporting_enabled);
   void SetSuspendState(bool is_suspended);
 
-  void SetDemuxer(std::unique_ptr<media::Demuxer> demuxer);
-
   // Called at low frequency to tell external observers how much memory we're
   // using for video playback.  Called by |memory_usage_reporting_timer_|.
   // Memory usage reporting is done in two steps, because |demuxer_| must be
@@ -533,9 +543,6 @@
       const base::trace_event::MemoryDumpArgs& args,
       base::trace_event::ProcessMemoryDump* pmd);
 
-  void OnMemoryPressure(
-      base::MemoryPressureListener::MemoryPressureLevel memory_pressure_level);
-
   // Called during OnHidden() when we want a suspended player to enter the
   // paused state after some idle timeout.
   void ScheduleIdlePauseTimer();
@@ -623,11 +630,6 @@
   // handling a src= or MSE based playback.
   void RecordUnderflowDuration(base::TimeDelta duration);
 
-  // Called by the data source (for src=) or demuxer (for mse) when loading
-  // progresses.
-  // Can be called quite often.
-  void OnProgress();
-
   // Returns true when we estimate that we can play the rest of the media
   // without buffering.
   bool CanPlayThrough();
@@ -698,22 +700,14 @@
   // Report UMAs when this object instance is destroyed.
   void ReportSessionUMAs() const;
 
-  // Helper methods for creating demuxers to encapsulate build flags.
-  std::unique_ptr<media::Demuxer> CreateChunkDemuxer();
-
-#if BUILDFLAG(ENABLE_FFMPEG)
-  std::unique_ptr<media::Demuxer> CreateFFmpegDemuxer();
-#endif
-
-#if BUILDFLAG(IS_ANDROID)
-  std::unique_ptr<media::Demuxer> CreateMediaUrlDemuxer(
-      bool expect_hls_content);
-
-  media::PipelineStatus StartHLSFallback();
-#endif
-
   absl::optional<media::DemuxerType> GetDemuxerType() const;
 
+  // Useful to bind for a cb to be called when a demuxer is created.
+  media::PipelineStatus OnDemuxerCreated(media::Demuxer* demuxer,
+                                         media::Pipeline::StartType start_type,
+                                         bool is_streaming,
+                                         bool is_static);
+
   WebLocalFrame* const frame_;
 
   WebMediaPlayer::NetworkState network_state_ =
@@ -842,12 +836,6 @@
   // Manages the lifetime of the DataSource, and soon the Demuxer.
   std::unique_ptr<media::DemuxerManager> demuxer_manager_;
 
-  // |demuxer_| holds the the appropriate demuxer based on which resource load
-  // strategy we're using.
-  std::unique_ptr<media::Demuxer> demuxer_;
-
-  std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_;
-
   const base::TickClock* tick_clock_ = nullptr;
 
   std::unique_ptr<BufferedDataSourceHostImpl> buffered_data_source_host_;
@@ -946,11 +934,6 @@
   // Stores the current position state of the media.
   media_session::MediaPosition media_position_state_;
 
-  // Set whenever the demuxer encounters an HLS file.
-  // This flag is distinct from |using_media_player_renderer_|, because on older
-  // devices we might use MediaPlayerRenderer for non HLS playback.
-  bool demuxer_found_hls_ = false;
-
   // Called sometime after the media is suspended in a playing state in
   // OnFrameHidden(), causing the state to change to paused.
   base::OneShotTimer background_pause_timer_;
@@ -999,12 +982,6 @@
   // playback optimizations (MSE).
   base::TimeDelta max_keyframe_distance_to_disable_background_video_mse_;
 
-  // When MSE memory pressure based garbage collection is enabled, the
-  // |enable_instant_source_buffer_gc| controls whether the GC is done
-  // immediately on memory pressure notification or during the next SourceBuffer
-  // append (slower, but MSE spec compliant).
-  bool enable_instant_source_buffer_gc_ = false;
-
   // Whether disabled the video track as an optimization.
   bool video_track_disabled_ = false;
 
@@ -1109,9 +1086,6 @@
 
   LearningExperimentHelper will_play_helper_;
 
-  // Stores the optional override Demuxer until it is used in DoLoad().
-  std::unique_ptr<media::Demuxer> demuxer_override_;
-
   std::unique_ptr<PowerStatusHelper> power_status_helper_;
 
   // Created while playing, deleted otherwise.

third_party/blink/renderer/platform/runtime_enabled_features.json5

diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index cd1758c..82e7971 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1519,6 +1519,14 @@
       status: "stable",
     },
     {
+      name: "IgnoreCSPInWebPaymentAPI",
+      base_feature: "IgnoreCSPInWebPaymentAPI",
+      origin_trial_feature_name: "IgnoreCSPInWebPaymentAPI",
+      origin_trial_allows_third_party: true,
+      public: true,
+      status: "stable",
+    },
+    {
       name: "ImeVerticalFlag",
       status: "stable",
       base_feature: "ImeVerticalFlag",
@@ -3201,12 +3209,6 @@
       public: true,
       status: "stable",
     },
-    {
-      name: "WebPaymentAPICSP",
-      origin_trial_feature_name: "WebPaymentAPICSP",
-      origin_trial_allows_third_party: true,
-      public: true,
-    },
     // WebShare is enabled by default on Android.
     {
       name: "WebShare",
@@ -3256,6 +3258,12 @@
       status: "stable",
     },
     {
+      name: "WebXREnabledFeatures",
+      depends_on: ["WebXR"],
+      status: "stable",
+      base_feature: "WebXREnabledFeatures",
+    },
+    {
       name: "WebXRHandInput",
       depends_on: ["WebXR"],
       public: true,

third_party/blink/renderer/platform/transforms/matrix_transform_operation.h

diff --git a/third_party/blink/renderer/platform/transforms/matrix_transform_operation.h b/third_party/blink/renderer/platform/transforms/matrix_transform_operation.h
index 0513a4f..d6d02ccf 100644
--- a/third_party/blink/renderer/platform/transforms/matrix_transform_operation.h
+++ b/third_party/blink/renderer/platform/transforms/matrix_transform_operation.h
@@ -79,7 +79,7 @@
     return Matrix().Preserves2dAxisAlignment();
   }
   bool IsIdentityOrTranslation() const final {
-    return Matrix().IsIdentityOr2DTranslation();
+    return Matrix().IsIdentityOr2dTranslation();
   }
 
   MatrixTransformOperation(double a,

third_party/blink/web_tests/FlagExpectations/disable-layout-ng

diff --git a/third_party/blink/web_tests/FlagExpectations/disable-layout-ng b/third_party/blink/web_tests/FlagExpectations/disable-layout-ng
index fada797..5127d820 100644
--- a/third_party/blink/web_tests/FlagExpectations/disable-layout-ng
+++ b/third_party/blink/web_tests/FlagExpectations/disable-layout-ng
@@ -126,6 +126,9 @@
 crbug.com/591099 accessibility/listitem-presentation-inherited.html [ Failure ]
 crbug.com/591099 accessibility/presentation-owned-elements.html [ Failure ]
 crbug.com/591099 accessibility/role-attribute.html [ Failure ]
+# Broken by CL:4027071: Stable ids for AXObjects with DOM nodes.
+# However, this edge case only crashes in the old layout code, so leaving as expectations:
+accessibility/details-summary-crash.html [ Crash ]
 
 ### editing/pasteboard/
 crbug.com/591099 editing/pasteboard/mathml-sanitizer-bypass.html [ Failure ]

third_party/blink/web_tests/TestExpectations

diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
index 232cb60..eea9e221a 100644
--- a/third_party/blink/web_tests/TestExpectations
+++ b/third_party/blink/web_tests/TestExpectations
@@ -216,7 +216,7 @@
 
 # Offscreen canvas tests that are flaky because sometimes the image is not rendered in time
 # See crbug.com/1315650
-crbug.com/1322089 virtual/gpu/fast/canvas/OffscreenCanvas-MessageChannel-transfer.html [ Failure Pass ]
+crbug.com/1322089 fast/canvas/OffscreenCanvas-MessageChannel-transfer.html [ Failure Pass ]
 
 # This test is originally added with external/wpt/speculation-rules/prerender/* skipped and broken.
 crbug.com/1356449 external/wpt/speculation-rules/prerender/credentialed-prerender-opt-in.html [ Crash Failure Pass Timeout ]
@@ -3012,7 +3012,7 @@
 crbug.com/626703 [ Mac12 ] external/wpt/url/a-element.html?exclude=(file|javascript|mailto) [ Crash Failure ]
 crbug.com/626703 virtual/plz-dedicated-worker/external/wpt/resource-timing/response-status-code.html [ Skip Timeout ]
 crbug.com/626703 [ Mac11 ] external/wpt/resource-timing/response-status-code.html [ Skip Timeout ]
-crbug.com/626703 [ Mac12 ] virtual/compute-pressure/external/wpt/compute-pressure/compute_pressure_disconnect_immediately.tentative.https.window.html [ Crash ]
+crbug.com/1404285 [ Mac ] virtual/compute-pressure/external/wpt/compute-pressure/compute_pressure_disconnect_immediately.tentative.https.window.html [ Crash Failure ]
 crbug.com/626703 [ Win11 ] wpt_internal/geolocation-api/watchPosition-page-visibility.https.html [ Timeout ]
 crbug.com/626703 [ Win10.20h2 ] external/wpt/web-animations/idlharness.window.html [ Crash Failure ]
 crbug.com/626703 [ Mac11 ] external/wpt/performance-timeline/tentative/include-frames-from-child-cross-origin-grandchild.sub.html [ Timeout ]
@@ -6237,6 +6237,8 @@
 crbug.com/1395409 [ Win ] inspector-protocol/overlay/overlay-viewport.js [ Failure ]
 crbug.com/1396422 [ Mac11-arm64 ] inspector-protocol/css/css-get-media-queries.js [ Failure ]
 crbug.com/1403736 [ Mac11-arm64 ] external/wpt/html/semantics/popovers/light-dismiss-event-ordering.tentative.html [ Timeout ]
+crbug.com/1396079 [ Mac ] inspector-protocol/memory/forcibly-purge-javascript-memory.js [ Crash Failure ]
+crbug.com/1395840 [ Mac ] http/tests/accessibility/slow-document-load.html [ Failure ]
 
 # Sheriff 2022-10-07
 crbug.com/1372556 [ Linux ] external/wpt/css/css-text/text-transform/text-transform-capitalize-* [ Failure Pass ]

third_party/blink/web_tests/WebDriverExpectations

diff --git a/third_party/blink/web_tests/WebDriverExpectations b/third_party/blink/web_tests/WebDriverExpectations
index 2061b3d..60f1795 100644
--- a/third_party/blink/web_tests/WebDriverExpectations
+++ b/third_party/blink/web_tests/WebDriverExpectations
@@ -87,41 +87,74 @@
 crbug.com/1167321 [ Linux ] external/wpt/webdriver/tests/find_element_from_shadow_root/find.py>>test_find_element[tag-name-a] [ Failure ]
 crbug.com/1167321 [ Linux ] external/wpt/webdriver/tests/find_element_from_shadow_root/find.py>>test_find_element[xpath-//a] [ Failure ]
 
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/element_click/click.py>>test_no_such_element_from_other_frame[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/element_click/click.py>>test_no_such_element_from_other_frame[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/element_click/click.py>>test_no_such_element_from_other_window_handle[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/element_click/click.py>>test_no_such_element_from_other_window_handle[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/element_send_keys/send_keys.py>>test_no_such_element_from_other_frame[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/element_send_keys/send_keys.py>>test_no_such_element_from_other_frame[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/element_send_keys/send_keys.py>>test_no_such_element_from_other_window_handle[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/element_send_keys/send_keys.py>>test_no_such_element_from_other_window_handle[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/execute_async_script/execute_async.py>>test_no_such_element_from_other_frame[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/execute_async_script/execute_async.py>>test_no_such_element_from_other_frame[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/execute_async_script/execute_async.py>>test_no_such_element_from_other_window_handle[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/execute_async_script/execute_async.py>>test_no_such_element_from_other_window_handle[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/execute_script/execute.py>>test_no_such_element_from_other_frame[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/execute_script/execute.py>>test_no_such_element_from_other_frame[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/execute_script/execute.py>>test_no_such_element_from_other_window_handle[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/execute_script/execute.py>>test_no_such_element_from_other_window_handle[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_computed_label/get.py>>test_no_such_element_from_other_frame[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_computed_label/get.py>>test_no_such_element_from_other_frame[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_computed_label/get.py>>test_no_such_element_from_other_window_handle[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_computed_label/get.py>>test_no_such_element_from_other_window_handle[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_computed_role/get.py>>test_no_such_element_from_other_frame[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_computed_role/get.py>>test_no_such_element_from_other_frame[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_computed_role/get.py>>test_no_such_element_from_other_window_handle[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_computed_role/get.py>>test_no_such_element_from_other_window_handle[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_attribute/get.py>>test_no_such_element_from_other_frame[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_attribute/get.py>>test_no_such_element_from_other_frame[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_attribute/get.py>>test_no_such_element_from_other_window_handle[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_attribute/get.py>>test_no_such_element_from_other_window_handle[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_css_value/get.py>>test_no_such_element_from_other_frame[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_css_value/get.py>>test_no_such_element_from_other_frame[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_css_value/get.py>>test_no_such_element_from_other_window_handle[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_css_value/get.py>>test_no_such_element_from_other_window_handle[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_property/get.py>>test_no_such_element_from_other_frame[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_property/get.py>>test_no_such_element_from_other_frame[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_property/get.py>>test_no_such_element_from_other_window_handle[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_property/get.py>>test_no_such_element_from_other_window_handle[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_rect/get.py>>test_no_such_element_from_other_frame[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_rect/get.py>>test_no_such_element_from_other_frame[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_rect/get.py>>test_no_such_element_from_other_window_handle[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_rect/get.py>>test_no_such_element_from_other_window_handle[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_shadow_root/get.py>>test_no_such_element_from_other_frame[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_shadow_root/get.py>>test_no_such_element_from_other_frame[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_shadow_root/get.py>>test_no_such_element_from_other_window_handle[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_shadow_root/get.py>>test_no_such_element_from_other_window_handle[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_tag_name/get.py>>test_no_such_element_from_other_frame[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_tag_name/get.py>>test_no_such_element_from_other_frame[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_tag_name/get.py>>test_no_such_element_from_other_window_handle[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_tag_name/get.py>>test_no_such_element_from_other_window_handle[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_text/get.py>>test_no_such_element_from_other_frame[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_text/get.py>>test_no_such_element_from_other_frame[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_text/get.py>>test_no_such_element_from_other_window_handle[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_text/get.py>>test_no_such_element_from_other_window_handle[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/is_element_enabled/enabled.py>>test_no_such_element_from_other_frame[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/is_element_enabled/enabled.py>>test_no_such_element_from_other_frame[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/is_element_enabled/enabled.py>>test_no_such_element_from_other_window_handle[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/is_element_enabled/enabled.py>>test_no_such_element_from_other_window_handle[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/is_element_selected/selected.py>>test_no_such_element_from_other_frame[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/is_element_selected/selected.py>>test_no_such_element_from_other_frame[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/is_element_selected/selected.py>>test_no_such_element_from_other_window_handle[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/is_element_selected/selected.py>>test_no_such_element_from_other_window_handle[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/take_element_screenshot/screenshot.py>>test_no_such_element_from_other_frame[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/take_element_screenshot/screenshot.py>>test_no_such_element_from_other_frame[open] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/take_element_screenshot/screenshot.py>>test_no_such_element_from_other_window_handle[closed] [ Failure ]
+crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/take_element_screenshot/screenshot.py>>test_no_such_element_from_other_window_handle[open] [ Failure ]
+
 # ====== New tests from wpt-importer added here ======
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/element_click/click.py>>test_no_such_element_from_other_frame [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/element_click/click.py>>test_no_such_element_from_other_window_handle [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/element_send_keys/send_keys.py>>test_no_such_element_from_other_frame [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/element_send_keys/send_keys.py>>test_no_such_element_from_other_window_handle [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/execute_async_script/execute_async.py>>test_no_such_element_from_other_frame [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/execute_async_script/execute_async.py>>test_no_such_element_from_other_window_handle [ Failure ]
 crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/execute_async_script/execute_async.py>>test_no_such_element_with_invalid_value [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/execute_script/execute.py>>test_no_such_element_from_other_frame [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/execute_script/execute.py>>test_no_such_element_from_other_window_handle [ Failure ]
 crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/execute_script/execute.py>>test_no_such_element_with_invalid_value [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_computed_label/get.py>>test_no_such_element_from_other_frame [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_computed_label/get.py>>test_no_such_element_from_other_window_handle [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_computed_role/get.py>>test_no_such_element_from_other_frame [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_computed_role/get.py>>test_no_such_element_from_other_window_handle [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_attribute/get.py>>test_no_such_element_from_other_frame [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_attribute/get.py>>test_no_such_element_from_other_window_handle [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_css_value/get.py>>test_no_such_element_from_other_frame [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_css_value/get.py>>test_no_such_element_from_other_window_handle [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_property/get.py>>test_no_such_element_from_other_frame [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_property/get.py>>test_no_such_element_from_other_window_handle [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_rect/get.py>>test_no_such_element_from_other_frame [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_rect/get.py>>test_no_such_element_from_other_window_handle [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_shadow_root/get.py>>test_no_such_element_from_other_frame [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_shadow_root/get.py>>test_no_such_element_from_other_window_handle [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_tag_name/get.py>>test_no_such_element_from_other_frame [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_tag_name/get.py>>test_no_such_element_from_other_window_handle [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_text/get.py>>test_no_such_element_from_other_frame [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_text/get.py>>test_no_such_element_from_other_window_handle [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/is_element_enabled/enabled.py>>test_no_such_element_from_other_frame [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/is_element_enabled/enabled.py>>test_no_such_element_from_other_window_handle [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/is_element_selected/selected.py>>test_no_such_element_from_other_frame [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/is_element_selected/selected.py>>test_no_such_element_from_other_window_handle [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/take_element_screenshot/screenshot.py>>test_no_such_element_from_other_frame [ Failure ]
-crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/take_element_screenshot/screenshot.py>>test_no_such_element_from_other_window_handle [ Failure ]
 crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/get_element_text/get.py>>test_pretty_print_xml [ Failure ]
 crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/execute_async_script/node.py>>test_document_as_object [ Failure ]
 crbug.com/626703 [ Linux ] external/wpt/webdriver/tests/execute_async_script/node.py>>test_element_reference[frame] [ Failure ]

third_party/blink/web_tests/accessibility/canvas-select-row.html

diff --git a/third_party/blink/web_tests/accessibility/canvas-select-row.html b/third_party/blink/web_tests/accessibility/canvas-select-row.html
index 5b470e0a..ad541159 100644
--- a/third_party/blink/web_tests/accessibility/canvas-select-row.html
+++ b/third_party/blink/web_tests/accessibility/canvas-select-row.html
@@ -22,6 +22,7 @@
     cell.role = "gridcell";
     row.accessibleNode.appendChild(cell);
     var ax = axElementById("row0");
+    assert_equals(ax.role, "AXRole: AXRow");
     var axChild = ax.childAtIndex(0);
     assert_equals(axChild.role, "AXRole: AXCell");
 }, "An ARIA cell without a layout object does not crash");

third_party/blink/web_tests/accessibility/notification-listeners.html

diff --git a/third_party/blink/web_tests/accessibility/notification-listeners.html b/third_party/blink/web_tests/accessibility/notification-listeners.html
index e1801bf..533b96d8 100644
--- a/third_party/blink/web_tests/accessibility/notification-listeners.html
+++ b/third_party/blink/web_tests/accessibility/notification-listeners.html
@@ -7,6 +7,12 @@
 
 <script>
 async_test((t) => {
+    // Will track all notifications except for 'MarkDirty' -- MarkDirty is a
+    // catch-all notification that tells the serializer to re-serialize
+    // a particular node. The number of MarkDirty notifications can
+    // change as we optimize or fix issues with stale nodes. It doesn't
+    // make sense to assert test failures based on specific numbers of
+    // MarkDirty notifications.
     window.selectNotificationCount = 0;
     window.sliderNotificationCount = 0;
     window.globalNotificationCount = 0;
@@ -22,9 +28,6 @@
       ["Blur", new Map([
         ["select", 1],
       ])],
-      ["MarkDirty", new Map([
-        ["select", 1],
-      ])],
       ["ValueChanged", new Map([
         ["slider", 1],
       ])],
@@ -38,15 +41,14 @@
       ["Blur", new Map([
         ["AXRole: AXComboBoxSelect", 1],
       ])],
-      ["MarkDirty", new Map([
-        ["AXRole: AXComboBoxSelect", 1],
-      ])],
       ["ValueChanged", new Map([
         ["AXRole: AXSlider", 1],
       ])],
     ]);
 
     let HandleElementNotification = function(notification, element_key) {
+      if (notification == 'MarkDirty')
+        return;
       assert_true(expected_element_notifications.has(notification));
       let element_map = expected_element_notifications.get(notification);
       assert_true(element_map.has(element_key));
@@ -63,6 +65,8 @@
     };
 
     let HandleGlobalNotification = function(notification, role_key) {
+      if (notification == 'MarkDirty')
+        return;
       assert_true(expected_global_notifications.has(notification));
       let role_map = expected_global_notifications.get(notification);
       assert_true(role_map.has(role_key));
@@ -79,28 +83,36 @@
     };
 
     select.addNotificationListener(t.step_func(function(notification) {
+      if (notification == 'MarkDirty')
+        return;
       selectNotificationCount++;
       console.log("got " + notification + " on select");
       HandleElementNotification(notification, "select");
     }));
 
     slider.addNotificationListener(t.step_func(function(notification) {
+      if (notification == 'MarkDirty')
+        return;
       sliderNotificationCount++;
       console.log("got " + notification + " on slider");
       HandleElementNotification(notification, "slider");
     }));
 
     accessibilityController.addNotificationListener(t.step_func(function(element, notification) {
+      if (notification == 'MarkDirty')
+        return;
       if (element.isEqual(slider) || element.isEqual(select)) {
         globalNotificationCount++;
         console.log("got " + notification + " on global");
         HandleGlobalNotification(notification, element.role);
+      } else {
+        console.log('Got unexpected ' + notification + ' notification on ' + element.role);
       }
       if (expected_element_notifications.size == 0 &&
         expected_global_notifications.size === 0) {
-        assert_equals(selectNotificationCount, 3);
+        assert_equals(selectNotificationCount, 2);
         assert_equals(sliderNotificationCount, 2);
-        assert_equals(globalNotificationCount, 5);
+        assert_equals(globalNotificationCount, 4);
         accessibilityController.removeNotificationListener();
         select.removeNotificationListener();
         slider.removeNotificationListener();

third_party/blink/web_tests/accessibility/table-header-column-row.html

diff --git a/third_party/blink/web_tests/accessibility/table-header-column-row.html b/third_party/blink/web_tests/accessibility/table-header-column-row.html
index 67f791c..759e54e 100644
--- a/third_party/blink/web_tests/accessibility/table-header-column-row.html
+++ b/third_party/blink/web_tests/accessibility/table-header-column-row.html
@@ -64,7 +64,7 @@
 <table width="50%" border="1">
   <caption>
     row header and column header (3)
-  <caption>
+  </caption>
   <col>
   <colgroup span="2"></colgroup>
   <tr>
@@ -84,7 +84,7 @@
 <table width="50%" border="1">
   <caption>
     row header and column header (4)
-  <caption>
+  </caption>
   <tr>
     <th rowspan="2" scope="rowgroup">row head</th>
     <th scope="col">col head</th>

third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json

diff --git a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json
index 5129981..bfbe26b2 100644
--- a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json
+++ b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json
@@ -261059,6 +261059,16 @@
    }
   },
   "support": {
+   ".cache": {
+    "gitignore2.json": [
+     "a9a50c606d91db61eac8164126993fa1d3b3f9ec",
+     []
+    ],
+    "mtime.json": [
+     "e749d08df272726f0abfe4f62d6de2bcd6733914",
+     []
+    ]
+   },
    ".gitignore": [
     "d93e645d547894b50149d3726de2654957b6e06f",
     []
@@ -261337,7 +261347,7 @@
      []
     ],
     "idbobjectstore_batchGetAll_largeValue.tentative.any.js.ini": [
-     "22f07a5012ddc006c42083445d7e63e7971191c5",
+     "30d63af0175e4d825e3a3233b74b0fca1e976a6e",
      []
     ],
     "resources": {
@@ -262202,7 +262212,7 @@
       []
      ],
      "test.html.ini": [
-      "03a526e82733e3322dd6d793ca8193824d8bf661",
+      "c8912513d1acc0793255ac02ac33f112376bf92c",
       []
      ],
      "xhtml.1": [
@@ -264241,7 +264251,7 @@
      []
     ],
     "sec-ch-ua.https.html.ini": [
-     "2f034c11891abd359883080db8ae06686daa1ac2",
+     "adea9afa7210ac0e3389ef418dd77c67174472de",
      []
     ],
     "service-workers": {
@@ -266515,10 +266525,6 @@
       "7eb847a0268bd10502726ba130c396651e1e88c2",
       []
      ],
-     "history-iframe.sub.html.ini": [
-      "62a339ed8844f47faea4a78250a149c0c61f9a80",
-      []
-     ],
      "iframe-all-local-schemes.sub.html.ini": [
       "759ae54e5d7bdae75a5974acef0ff19a3d11f4df",
       []
@@ -267759,7 +267765,7 @@
      []
     ],
     "cookieStore_set_arguments.https.any.js.ini": [
-     "a1ab72a598b5d4f7d3f104d2fa2ab4d3264a86eb",
+     "3cb3ddfa95af6a392d4c525e5603b9fb663b8a32",
      []
     ],
     "cookieStore_subscribe_arguments.https.any.js.ini": [
@@ -268052,7 +268058,7 @@
     },
     "samesite": {
      "form-post-blank-reload.https.html.ini": [
-      "cff3fc495bac3351066bc2c1c82128c679a3fab6",
+      "25c3e4acef5bf932cb514f79d326a9118b69c153",
       []
      ],
      "form-post-blank.https.html.ini": [
@@ -268235,7 +268241,7 @@
      ]
     },
     "fedcm-network-requests.https.html.ini": [
-     "14f5926ca2a04ae196d5790b037cc2bf662c9b2a",
+     "d272c84b67bc4561fd50bf58934390465d720f31",
      []
     ],
     "federatedcredential-framed-get.sub.https-expected.txt": [
@@ -277034,7 +277040,7 @@
       []
      ],
      "Element-getAnimations-dynamic-changes.tentative.html.ini": [
-      "42b61d6f41cfdf580f6218af564a8fd3b594a116",
+      "cd79bce0007ca0a053223c57c0ae0e86b094c20e",
       []
      ],
      "KeyframeEffect-getKeyframes.tentative-expected.txt": [
@@ -283129,7 +283135,7 @@
        []
       ],
       "nested-query-containers.html.ini": [
-       "076a237cb6ed39fb8a51cd6b9ce67f6cbdab5f88",
+       "e92a5bb1a4fa7e9a60bb42f506d455adf8c71d9a",
        []
       ],
       "percentage-padding-orthogonal-expected.txt": [
@@ -287760,7 +287766,7 @@
       []
      ],
      "image-as-flexitem-size-001v.html.ini": [
-      "f494a6ea72274dfc29197c74e0097270f190361e",
+      "edcb2d8fec9e9080925a61efbffbc1288b76980f",
       []
      ],
      "image-as-flexitem-size-002.html.ini": [
@@ -299111,7 +299117,7 @@
        []
       ],
       "subgrid-baseline-002.html.ini": [
-       "c8f5d5e48be8ad5beb292de4b0b9e096c087a92d",
+       "4300e380326adc7f4c7a700306fde72b33e7eb1b",
        []
       ],
       "subgrid-baseline-003-ref.html": [
@@ -301069,7 +301075,7 @@
        []
       ],
       "Initial-letter-breaking-rtl.html.ini": [
-       "9451204c3f8e54260349e0a2b1aaf03911bce7bd",
+       "46ebc05b8e015794e21ad5efbbb278c2a1c4a978",
        []
       ],
       "Initial-letter-breaking-vlr-ref.html": [
@@ -301117,7 +301123,7 @@
        []
       ],
       "initial-letter-block-position-drop-under-ruby-tall.html.ini": [
-       "38527a1d13f5fb3341c71066d7067a196d846034",
+       "8a8fc7e35d6c2844ddcb99c6fb2a940718703711",
        []
       ],
       "initial-letter-block-position-drop-under-ruby.html.ini": [
@@ -301217,11 +301223,11 @@
        []
       ],
       "initial-letter-drop-initial-vrl.html.ini": [
-       "90a6105fa6ab976c667bf33c9665a8656edadd75",
+       "87084475b2369af3fbcaf421e68ce6d12eadf11e",
        []
       ],
       "initial-letter-drop-initial.html.ini": [
-       "bda49d3ccb569063ca848311b14c11d0f95c0743",
+       "497ccbc87b10a361c6b9e430069b7a98ab683bcf",
        []
       ],
       "initial-letter-float-001-ref.html": [
@@ -301241,7 +301247,7 @@
        []
       ],
       "initial-letter-float-001-vlr.html.ini": [
-       "72b9d1f623146292108a7bcad02e61f0d85da5b0",
+       "bd18bc07afa5ee270669f57cba44bb0655e9b384",
        []
       ],
       "initial-letter-float-001-vrl-ref.html": [
@@ -301249,11 +301255,11 @@
        []
       ],
       "initial-letter-float-001-vrl.html.ini": [
-       "ff51dd5cdcff0bccc5d40823c59f455f9227ecb4",
+       "a18c5464f5026e45a21f831363c83c8eca388b34",
        []
       ],
       "initial-letter-float-001.html.ini": [
-       "4b45bbf55e041276119bcbd59878946c3a181b5b",
+       "ae13c19797a134284cfe0ffd2c225b9e7bbc0b3e",
        []
       ],
       "initial-letter-float-002-ref.html": [
@@ -301301,7 +301307,7 @@
        []
       ],
       "initial-letter-indentation.html.ini": [
-       "2f25a7a3aa6494563e10625c54ef4659a702ece5",
+       "fbc24c225c34e2f35829cc904f469bff56350f9a",
        []
       ],
       "initial-letter-layout-text-decoration-underline-ref.html": [
@@ -301357,7 +301363,7 @@
        []
       ],
       "initial-letter-raised-sunken-caps-sunken.html.ini": [
-       "0c64a2fddcfde3da4a10a9ed49a4be090dade4ea",
+       "b0631f923a6cf89fe35ed7628a5a15b4d75443bf",
        []
       ],
       "initial-letter-short-para-initial-letter-clears-ref.html": [
@@ -301401,7 +301407,7 @@
        []
       ],
       "initial-letter-sunk-initial-vrl.html.ini": [
-       "77a501b58596bd661170dd5bd74ceaac0d7c228d",
+       "145423c11791d55ae88c994d027a2d62c7a4c7e1",
        []
       ],
       "initial-letter-sunk-initial.html.ini": [
@@ -301610,6 +301616,10 @@
        "7319075f6796fb6bc714c0800a603d09623e41f4",
        []
       ],
+      "border-vlr-rtl.https.html.ini": [
+       "8bfb81db12e25ca574768be04b22f82a08817a5a",
+       []
+      ],
       "border-vrl.https.html.ini": [
        "8131458dda3dfddebd982bcc5fcf3d5e3aee432e",
        []
@@ -304016,7 +304026,7 @@
       []
      ],
      "getclientrects-001.html.ini": [
-      "38d7beae04ef678926c3455f4d2ad5ec1c58177c",
+      "1d32d9521dcde0c9ac9163f7b37cbfd9a5985063",
       []
      ],
      "hit-test-transformed-child.html.ini": [
@@ -305906,7 +305916,7 @@
       []
      ],
      "scrollable-overflow-input-001.html.ini": [
-      "0fd1d59cb6c19d9b4b5345ed50e850ffaa5eafd8",
+      "6351a3d300d23195dab2184d6186ddabe934b9f4",
       []
      ],
      "scrollable-overflow-input-002-ref.html": [
@@ -306469,10 +306479,6 @@
       "9ee9a0fdc8d17a195b6ad213e77929f3dccc9783",
       []
      ],
-     "parse-input-arguments-005.https.html.ini": [
-      "e61017dc10441e2e5a2f080b81b896164fc084f9",
-      []
-     ],
      "parse-input-arguments-010.https.html.ini": [
       "2fe67ddb232722d2676757352c87fbfc7adc93d8",
       []
@@ -309253,10 +309259,6 @@
       "0df837fbb07d756aa4f778765d6ce08a5f296275",
       []
      ],
-     "ruby-text-combine-upright-001b.html.ini": [
-      "654ce463d1c2e4eac1fc8aad024ad0e5ce2313f9",
-      []
-     ],
      "ruby-text-combine-upright-002-ref.html": [
       "1bb4386e7abfb468de92edcb9a2633d5ceb96174",
       []
@@ -316550,6 +316552,10 @@
        "38e66a2dc4a6c69a3dd79df3f84abe55bd072294",
        []
       ],
+      "text-transform-capitalize-005.html.ini": [
+       "c06d2b0fcf72d84e5512352f5f74279544c73498",
+       []
+      ],
       "text-transform-capitalize-007.html.ini": [
        "4dd4f078df482979aef56a6f67251ad514fe3ad0",
        []
@@ -316562,10 +316568,6 @@
        "f0b7504e565abdf6d671ad61ed287bc662140cf7",
        []
       ],
-      "text-transform-capitalize-016.html.ini": [
-       "869d3178e27f1539e32ecd49339a5d6b2db5956f",
-       []
-      ],
       "text-transform-capitalize-018.html.ini": [
        "87e51404e16bbebfa59694f95dfaa34426e0f4b4",
        []
@@ -321461,14 +321463,6 @@
         "1c3cc53c0d1acc06fd6827c493e327c188ebf35c",
         []
        ],
-       "cssUnitValue-expected.txt": [
-        "e2378ac6bbe9911f25cf7320d281ae750e57ec7f",
-        []
-       ],
-       "cssUnitValue.html.ini": [
-        "660ecfc871834f42fd9267b50081e2e9c46bf25f",
-        []
-       ],
        "numeric-factory.tentative-expected.txt": [
         "6de3224ecda3d2b3c3a19d41b05d08c66b077337",
         []
@@ -325155,10 +325149,6 @@
       "80e19ba3296cb463dd1d3613d1183d8f07e219d3",
       []
      ],
-     "lh-rlh-on-root-001.html.ini": [
-      "a82b5fe7efd36ace3df5046d650bc9b337b13bdd",
-      []
-     ],
      "line-break-ch-unit.html.ini": [
       "ec39a9352bc2b526b932b8429e9d54669eb42cd2",
       []
@@ -330588,7 +330578,7 @@
       []
      ],
      "scroll-behavior-main-frame-root.html.ini": [
-      "7cbc5c3f06ede4c0bbf9ce529d97f187c32547b4",
+      "89c7c0b751e2aef0c2ae4638ae0055290c4c2630",
       []
      ],
      "scroll-behavior-main-frame-window.html.ini": [
@@ -332061,10 +332051,6 @@
       "fb5255eddb1cdbdc1b9b610a7813b977d822b7b9",
       []
      ],
-     "input-file-print.html.ini": [
-      "1ec656fb80df94164ab32ab2de9b14c353823195",
-      []
-     ],
      "page-overflow-crash-print.html.ini": [
       "99ba67507cfa6b4973f308bb22f7ff0a6efe12de",
       []
@@ -333096,7 +333082,7 @@
       []
      ],
      "ElementInternals-target-element-is-held-strongly.html.ini": [
-      "64240c7da3675b2e19a60595557e1f8dc3938b1b",
+      "d33171cd2fbbf84eb04c07df6cb676aac3037b99",
       []
      ],
      "ElementInternals-validation-expected.txt": [
@@ -334719,10 +334705,6 @@
       "2657bb761955202e50cd65f00431fdc415a09eb3",
       []
      ],
-     "Range-mutations-dataChange.html.ini": [
-      "7158a50a34d3428f41cd3a6672018936c2c3c088",
-      []
-     ],
      "Range-mutations-deleteData.html.ini": [
       "8a4d2feb07a10de291aaf74a7996c09fef195942",
       []
@@ -334846,6 +334828,10 @@
      "5a884ce65add9a794aa76a284a9f7c6328837d3c",
      []
     ],
+    "DOMParser-parseFromString-html.html.ini": [
+     "ebdd141c15035c8bb9309e54d3bf6bd22ab3d776",
+     []
+    ],
     "DOMParser-parseFromString-url-base.html.ini": [
      "fd01787c570ae51160cb3c7f99dd39b1aba7ca9d",
      []
@@ -336106,7 +336092,7 @@
       []
      ],
      "delete.html.ini": [
-      "5ad7606524856da5c3af298695fad3a82d257277",
+      "bdfee2d628adcab3b862b21919de1fde976545b6",
       []
      ],
      "delete_1-1000-expected.txt": [
@@ -336621,7 +336607,7 @@
      []
     ],
     "observe-multiple-images.html.ini": [
-     "798b1558db005d9aceb329ba59eb813ded1461cb",
+     "ee951be2cd5d2be8ff2b4e9da945b5d0e8855e97",
      []
     ],
     "resources": {
@@ -336959,7 +336945,7 @@
        []
       ],
       "sjis-decode-ms_kanji.html.ini": [
-       "e8a7100a7585e0895ec76f7e83a8fb664f16d11e",
+       "e96013683378ebbd4203b9d0442316885510636b",
        []
       ],
       "sjis-decoder.js": [
@@ -336991,7 +336977,7 @@
        []
       ],
       "sjis-encode-form-ms_kanji.html.ini": [
-       "208a24a9b30a8728b70b755eb2f4a73e53567312",
+       "28f076c8e1fe6ea0b4cbd5932ff2595fead61ffe",
        []
       ],
       "sjis-encode-form-shift-jis.html.headers": [
@@ -337175,7 +337161,7 @@
        []
       ],
       "euckr-encode-form-ksc_5601.html.ini": [
-       "b32f0b495f4cf949e34f980d369e8ca111bed92b",
+       "673486159c2f0e016da8587e38b70a4fbea2ab34",
        []
       ],
       "euckr-encode-form-windows-949.html.headers": [
@@ -337633,7 +337619,7 @@
      []
     ],
     "unsupported-labels.window.js.ini": [
-     "090aad902bb808bc6fbc4246301ded69a3fc9083",
+     "1b76ac536b466fa7a8afe94ee6b2ddd80a639dcf",
      []
     ]
    },
@@ -339345,7 +339331,7 @@
        []
       ],
       "general.any.js.ini": [
-       "e7289254aa3394bb62b9d37bd235072c17c8b948",
+       "a70485c8cd4bdc68530a2b24822dfbae2c0e8372",
        []
       ],
       "general.any.serviceworker-expected.txt": [
@@ -340977,7 +340963,7 @@
        []
       ],
       "window-history.https.sub.html.ini": [
-       "8c7e93ee048ee389cdc4c4be342f2fd329627246",
+       "f5c7bcb5085f594f1955aa5b81e83cec35910fbc",
        []
       ],
       "worker-dedicated-constructor.sub.html.ini": [
@@ -341424,7 +341410,7 @@
       []
      ],
      "iframe.tentative.https.window.js.ini": [
-      "890cec5a04fae4f1a3c4aabf1ed44c87437bd099",
+      "abc126ce81bb6af375b9c4ed6a18aeb02945bebc",
       []
      ],
      "iframe.tentative.window-expected.txt": [
@@ -341534,7 +341520,11 @@
       ]
      },
      "service-worker-background-fetch.https.window.js.ini": [
-      "3814b1ca441cfbcbedb4fc4d09443cc05aca0bb1",
+      "82a91238fffb51c04fc7d527fd9b210869c812b1",
+      []
+     ],
+     "service-worker-fetch.https.window.js.ini": [
+      "8ad3d983f5f9151f6b499743a4b99dcd1306dec4",
       []
      ],
      "shared-worker.window.js.ini": [
@@ -341704,7 +341694,7 @@
       ]
      },
      "stale-css.html.ini": [
-      "b381a102ede690b376f2404343780829c0d9c6c5",
+      "957be3365304544817a837c81874bc215905d705",
       []
      ],
      "stale-image.html.ini": [
@@ -341871,7 +341861,7 @@
      []
     ],
     "focus-already-focused-iframe-same-site.html.ini": [
-     "4f0bb0ce512506e160d3de8c8bdf6bbc231d11df",
+     "cd78228dd3869ed7ac233ad82d076832dd8df95e",
      []
     ],
     "focus-event-after-focusing-iframes-expected.txt": [
@@ -341955,7 +341945,7 @@
      []
     ],
     "iframe-focus-with-different-site-intermediate-frame.html.ini": [
-     "501950368012f28203aead245411c7e608f36c68",
+     "3dbc2c45845203ba4bbcc1a31bb3bcb9455c35b9",
      []
     ],
     "iframe-focus-with-same-as-top-intermediate-frame-expected.txt": [
@@ -343399,7 +343389,7 @@
      []
     ],
     "FileSystemFileHandle-create-sync-access-handle.https.tentative.window.js.ini": [
-     "c3348a5c9aef335e28df011c41c92883beabaef3",
+     "b46450f6b8dc52edc97516f432e8f5a3faccbedc",
      []
     ],
     "META.yml": [
@@ -344306,7 +344296,7 @@
       []
      ],
      "embedding.tentative.https.window.js.ini": [
-      "0df41291829049cdae35d0c5c10c38d5454e70b3",
+      "5600c7c866ccea02746cb4508223d7bb9fe9d773",
       []
      ],
      "fenced-frame-bypass.tentative.https.window-expected.txt": [
@@ -344361,7 +344351,7 @@
          []
         ],
         "broadcast-channel.html.ini": [
-         "e423a5b6f007f26e10dfaafc559ea50fecce3834",
+         "d597d3dca08ba439a179b600fb869d2dc2f36a9c",
          []
         ],
         "dedicated-worker.html.ini": [
@@ -345192,7 +345182,7 @@
         []
        ],
        "same-document-traversal-cross-document-traversal.html.ini": [
-        "dfb85789086b335a472830d405460b0e959e4527",
+        "b5b7f69154f31ee966590e28e64c55cdd437ed0d",
         []
        ],
        "same-document-traversal-same-document-traversal-hashchange.html.ini": [
@@ -345642,7 +345632,7 @@
         []
        ],
        "history_back_cross_realm_method.html.ini": [
-        "04556407ba4228d1da303d89d1daa73ed220f69b",
+        "036c330b855092baef190ae6a91312dbc7163c86",
         []
        ],
        "history_entry.html": [
@@ -345874,7 +345864,7 @@
         []
        ],
        "location-protocol-setter-non-broken.html.ini": [
-        "ac462d6e03f5c33c1a9ca6bee3a40b5b116bbe48",
+        "fc6898e67c553fd302e260e6aac5d6ad9181a338",
         []
        ],
        "location-prototype-setting-cross-origin-domain.sub-expected.txt": [
@@ -346154,8 +346144,8 @@
          "470b5e72ad2865cbd3ec3af9a1a84a685d964be4",
          []
         ],
-        "parent-no-child-yeswithparams-subdomain.sub.https.html.ini": [
-         "d15b316888e55b5f40bc7bde5cd2b1e68642e10e",
+        "parent-no-child-yes-subdomain.sub.https.html.ini": [
+         "25b59d55b3ff51436b120a4cfef4fdcd600385c8",
          []
         ],
         "parent-yes-child-no-port.sub.https.html.headers": [
@@ -346163,7 +346153,7 @@
          []
         ],
         "parent-yes-child-no-port.sub.https.html.ini": [
-         "5383b4d6c44128b9efe8d2a58b3d4660d59f1198",
+         "5504eb18d1640f0d5f622b3cfa215e1f0848689b",
          []
         ],
         "parent-yes-child-no-same.sub.https.html.headers": [
@@ -346233,7 +346223,7 @@
          []
         ],
         "parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.ini": [
-         "c6fbd89df5b44a3a8ecefc65e4c694ceff947001",
+         "19af2dda97d3d09bf3927912421bffa60602f806",
          []
         ],
         "parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.headers": [
@@ -346241,7 +346231,7 @@
          []
         ],
         "parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.ini": [
-         "0ac9250ffd71604ebaff886dd6e2dce32749f37a",
+         "8f4b5ee80c62f798763ee51030e5b739bbfcc1ad",
          []
         ],
         "parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.headers": [
@@ -346256,10 +346246,6 @@
          "79a20f30fc0f486014c8b93edef7483605101504",
          []
         ],
-        "parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.ini": [
-         "ba2d6b65f1a39453e0538ad93d21f648db1c614b",
-         []
-        ],
         "parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.headers": [
          "79a20f30fc0f486014c8b93edef7483605101504",
          []
@@ -346273,7 +346259,7 @@
          []
         ],
         "parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.ini": [
-         "a3efc43445f1e3cccf221af3c9c8d998933718d1",
+         "c9174382298bba9bb710f6c18f25b8599ad1eb6c",
          []
         ],
         "parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.headers": [
@@ -346289,7 +346275,7 @@
          []
         ],
         "parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini": [
-         "3735ac72c3449fd8f75119de464ed3f0c7ac7b2d",
+         "8651d2934d723b9f6c0a22b0131f52c01516fc11",
          []
         ],
         "parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.headers": [
@@ -346305,7 +346291,7 @@
          []
         ],
         "parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini": [
-         "753d9e5b271252aac128a0096a212584a2a0c801",
+         "e3b0508f4657609580638d04ce6d4902d3c18ee9",
          []
         ]
        },
@@ -346334,7 +346320,7 @@
         []
        ],
        "document-domain.sub.https.html.ini": [
-        "869ca53974fc5512b3d77d40bb6af87fc5dd3c95",
+        "d4bd40414d6af8e843189c6196a75f53f02afa70",
         []
        ],
        "getter-special-cases": {
@@ -346435,27 +346421,27 @@
        ],
        "iframe-navigation": {
         "parent-no-1-no-same-2-yes-port.sub.https.html.ini": [
-         "ec2a502d92a980ccdf4976cc1155f85ad599095b",
+         "c8482cb814f6a2f548bfb6be8b9f8a9736349a54",
          []
         ],
         "parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini": [
-         "8cdf9fa61dd7eeee83b1787df8f2f09ab779f3a8",
+         "7d0cf3bd9aa6e3f2ca8f4c4d36ec15807c4fddda",
          []
         ],
         "parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini": [
-         "5a2bf369185e39e6555b97cf11ca022bf431b003",
+         "f45685b9f42e31e502d536ea2516c14033ba21f6",
          []
         ],
         "parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini": [
-         "408c430c3c3b38e1d5262d56040bd49c4cf3fe23",
+         "346f1ceb1f6cf17f741dae7a6682881ce1d3bd55",
          []
         ],
         "parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini": [
-         "ca40622a9c484ecd0b670f34e185695e3a37b0d3",
+         "419e0eddeabce0c5d49adc26ddcc7b14293393e3",
          []
         ],
         "parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini": [
-         "6e7ddbd400fd09d59fcb7a84cd81c88fc63c91f5",
+         "65c36743e8de832e045bf49a2c602805a3e6e7cc",
          []
         ],
         "parent-yes-1-no-same-2-no-port.sub.https.html.headers": [
@@ -346463,7 +346449,7 @@
          []
         ],
         "parent-yes-1-no-same-2-no-port.sub.https.html.ini": [
-         "9f3db00e5426b1f6da684a1e25a80791f9f94af0",
+         "62a430f54f8948086dfcc8d68322812ce128f8a8",
          []
         ],
         "parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers": [
@@ -346471,7 +346457,7 @@
          []
         ],
         "parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini": [
-         "70e77cb089b7c0bff843cd45dde4d795e359e3ff",
+         "0727d38b6c0cf094cba741faf6ffbac1ba956a1c",
          []
         ]
        },
@@ -346485,11 +346471,11 @@
        ],
        "popups": {
         "opener-no-openee-yes-same.sub.https.html.ini": [
-         "a9c874997282efab826ddbfe46535ce0930ebef0",
+         "6f746fe60f8a4e5874fbc0da2fb4e8de6a99c2e2",
          []
         ],
         "opener-no-openee-yes-subdomain.sub.https.html.ini": [
-         "575ec913b83267f45fd77d5c5f8dd9290ad2bfb1",
+         "a13be28eba7ad1e202fbb7bda21fadb0e7ccb201",
          []
         ],
         "opener-yes-openee-no-port.sub.https.html.headers": [
@@ -346505,7 +346491,7 @@
          []
         ],
         "opener-yes-openee-no-same.sub.https.html.ini": [
-         "e9d47544e1891065b15f7bc4375950b119c16a34",
+         "8b96f964db7e1b9ae9629b3ea5bae6e2dfa8319c",
          []
         ],
         "opener-yes-openee-no-subdomain.sub.https.html.headers": [
@@ -346513,7 +346499,7 @@
          []
         ],
         "opener-yes-openee-no-subdomain.sub.https.html.ini": [
-         "c3ea49453cb248dafb7cbbee1b8e11fd0cfa6ad2",
+         "8dfaf02191cb09aed18fd750eb879fc054bc74a1",
          []
         ],
         "opener-yes-openee-yes-port.sub.https.html.headers": [
@@ -346529,7 +346515,7 @@
          []
         ],
         "opener-yes-openee-yes-same.sub.https.html.ini": [
-         "34df7b455cff017a2274b536779957faa688ce7d",
+         "b6a98657923c945fa98d6cb43ce69180ac9beee1",
          []
         ],
         "opener-yes-openee-yes-subdomain.sub.https.html.headers": [
@@ -346537,7 +346523,7 @@
          []
         ],
         "opener-yes-openee-yes-subdomain.sub.https.html.ini": [
-         "5ec40809a53c4531066a5390fc579f9179351a42",
+         "d6b4f05a7f2746db2ba2ebff19ebd970081ed85a",
          []
         ]
        },
@@ -346959,10 +346945,6 @@
         "efce1ae6e9edcabfa74899c229df8f185f87e1d4",
         []
        ],
-       "open-features-tokenization-noreferrer.html.ini": [
-        "725998e292a937237519284d10ef0d38ee935376",
-        []
-       ],
        "open-features-tokenization-screenx-screeny-expected.txt": [
         "e61cfc377a907412433bab95a1a50748d8c36d93",
         []
@@ -347053,7 +347035,7 @@
        []
       ],
       "window-open-windowfeatures-values.html.ini": [
-       "ef909a9fbff128dcd041f2de23ab974043d2a261",
+       "c7f00b14c71320896d8d02c8cbd5a2e248e2017d",
        []
       ],
       "window-properties.https-expected.txt": [
@@ -349173,7 +349155,7 @@
          []
         ],
         "offscreencanvas.resize.html.ini": [
-         "8b403278624c8259f64ff38cc1105d9fef0bcd87",
+         "04ad5a0b9d01c3b4320dcc24934e97ac3dfe10b2",
          []
         ],
         "offscreencanvas.transferrable-expected.txt": [
@@ -349675,6 +349657,10 @@
       "2d690c6d35cd23d6fb413485597c1ff9f0dc4834",
       []
      ],
+     "cache-storage-reporting-service-worker.https.html.ini": [
+      "1b0b9012ce7adb9940de2653bd4e6a123c9dfc64",
+      []
+     ],
      "cache-storage-reporting-shared-worker.https-expected.txt": [
       "643200226b30cbe10b5b55f74162c1e7129a52bf",
       []
@@ -349705,7 +349691,7 @@
        []
       ],
       "dedicated-worker.https.window.js.ini": [
-       "b6774be464eb3230ff34a04073d45b37e6081b19",
+       "47f8c959ac00cd3f7e328e80ea3c89904cc34f53",
        []
       ],
       "fetch.https.window.js.ini": [
@@ -350225,10 +350211,6 @@
       "c873fb6534a8e70e505917a3f87311c61918623a",
       []
      ],
-     "coop-sandbox-redirects-cuts-opener.https.html.ini": [
-      "72e5db08e7f4792d835e66099654e542337ae254",
-      []
-     ],
      "coop-sandbox.https.html.headers": [
       "46ad58d83bf6e98913ca4c564b7acb8f19fa0093",
       []
@@ -350238,7 +350220,7 @@
       []
      ],
      "header-parsing-failures.https.html.ini": [
-      "0395d5862b3e044ca8194db3057565e3ad48d74c",
+      "4b66b2a6530aa1f0736b0bebe36d97ede8c52103",
       []
      ],
      "header-parsing-non-ascii.https.html.headers": [
@@ -350291,13 +350273,17 @@
        []
       ],
       "popup-same-site-unsafe-allow-outgoing-with-same-site.https.html.ini": [
-       "8d718f6b6ce27cf4718657f1f6228bc0e16210fd",
+       "596920f4928fd12de33820295d77abde57b89138",
        []
       ],
       "popup-same-site-with-cross-origin.https.html.headers": [
        "34bd099a302f893f92586241ea38aac812bf28d0",
        []
       ],
+      "popup-same-site-with-cross-origin.https.html.ini": [
+       "7ea4330d081288b87a862a685c3afc8895d563c5",
+       []
+      ],
       "popup-same-site-with-same-origin.https.html.headers": [
        "34bd099a302f893f92586241ea38aac812bf28d0",
        []
@@ -350305,6 +350291,10 @@
       "popup-same-site-with-same-site.https.html.headers": [
        "34bd099a302f893f92586241ea38aac812bf28d0",
        []
+      ],
+      "popup-same-site-with-same-site.https.html.ini": [
+       "536e2c0b58482bac177e94efbe612cc3b60d62cf",
+       []
       ]
      },
      "iframe-popup-same-origin-allow-popups-to-same-origin-allow-popups.https.html.headers": [
@@ -350336,7 +350326,7 @@
       []
      ],
      "iframe-popup-same-origin-to-same-origin.https.html.ini": [
-      "223c26b5d730d933a5f58b18a1597c67a0aac633",
+      "d38d7d20f99a3462274f47810d43c778c52e77b1",
       []
      ],
      "iframe-popup-same-origin-to-unsafe-none.https.html.headers": [
@@ -350364,11 +350354,7 @@
       []
      ],
      "javascript-url.https.html.ini": [
-      "b8259e3c03d830289a8317907222a0b6984cf96c",
-      []
-     ],
-     "navigate-to-aboutblank.https.html.ini": [
-      "3cc4743616d9ae07387b3130e8e721687ae2379d",
+      "afd683904d33298de1e57868e182df500156194e",
       []
      ],
      "navigate-top-to-aboutblank.https.html.ini": [
@@ -350428,17 +350414,13 @@
       []
      ],
      "popup-same-origin-with-same-site.https.html.ini": [
-      "ef3655a482107a3d7f9f5dea04a0b3b74bed9fa3",
+      "efa88bcf39bc8e49c23bad6caadd6ff1d05d2297",
       []
      ],
      "popup-unsafe-none-with-cross-origin.https.html.headers": [
       "073ce7adfbd81cb7c0b2f91f96c8349b6677f26c",
       []
      ],
-     "popup-unsafe-none-with-cross-origin.https.html.ini": [
-      "cc8ffe271ac33217e6c0b389f666cb69696d96be",
-      []
-     ],
      "popup-unsafe-none-with-same-origin.https.html.headers": [
       "073ce7adfbd81cb7c0b2f91f96c8349b6677f26c",
       []
@@ -350447,10 +350429,6 @@
       "073ce7adfbd81cb7c0b2f91f96c8349b6677f26c",
       []
      ],
-     "popup-unsafe-none-with-same-site.https.html.ini": [
-      "c087e20995b049d95a5478c10ced52f7f2ee2b68",
-      []
-     ],
      "popup-unspecified-with-cross-origin.https.html.ini": [
       "6f1e872520590723fb96d2c67837a02d78f18977",
       []
@@ -350470,7 +350448,7 @@
         []
        ],
        "access-from-coop-page-to-openee_coop-ro_cross-origin.https.html.ini": [
-        "c525d52f14f5dc4556b20fd1965377e84ca1469b",
+        "4ae0b27567920752e0a513c6dd5d8877cb84e3af",
         []
        ],
        "access-from-coop-page-to-opener_coop-ro.https.html.ini": [
@@ -350478,15 +350456,15 @@
         []
        ],
        "access-from-coop-page-to-opener_coop-ro_cross-origin.https.html.ini": [
-        "7e47b2b087718e36e4eb39f8f05e9e258cacf00e",
+        "9638f4b5c6ca2a04abe1be4b91a1b77c5563b631",
         []
        ],
        "access-from-coop-page-to-other_coop-ro.https.html.ini": [
-        "ad1f3046344665f83be193b63ccc46c1a691c671",
+        "dd923b49d338c61b1c701f72a0fe7c9d21a51306",
         []
        ],
        "access-from-coop-page-to-other_coop-ro_cross-origin.https.html.ini": [
-        "56b8e031cc1caaee836abb34f380ea522c92155c",
+        "dd5c96b2e6d713af4e5402595b2b6e459a64352e",
         []
        ],
        "access-to-coop-page-from-openee_coop-ro.https.html.ini": [
@@ -350498,19 +350476,19 @@
         []
        ],
        "access-to-coop-page-from-opener_coop-ro.https.html.ini": [
-        "cde27b4c14b78933da042eb61dbdf389002521c5",
+        "126bb781deb49f040d95036268ae95af60d600de",
         []
        ],
        "access-to-coop-page-from-opener_coop-ro_cross-origin.https.html.ini": [
-        "098e5d0f5b837238225a9a09095f23d4a1dfcee6",
+        "9e0d21c428dd877d354da9a9f4064a357e3f95dc",
         []
        ],
        "access-to-coop-page-from-other_coop-ro.https.html.ini": [
-        "12463d2a477294446d1b508952f81fdfcfd6296e",
+        "22693c3d4521115956429a962468b7b769327914",
         []
        ],
        "access-to-coop-page-from-other_coop-ro_cross-origin.https.html.ini": [
-        "987140811a565d21b6c4340dff8edb655ddbdfc8",
+        "9d900f4ef49f137c4a203c800383fa3e42adb161",
         []
        ],
        "property-blur.https.html.ini": [
@@ -350518,19 +350496,19 @@
         []
        ],
        "property-close.https.html.ini": [
-        "1abd8a1dede334d349e7c131b3181b1017a49492",
+        "d060d8a9a82f184a955fafb94ee2e1d4c9cd3835",
         []
        ],
        "property-closed.https.html.ini": [
-        "99d03e52c48257ee3f09f39d33bd132d1b50431e",
+        "ad0e9b09c8038704d41611c2b79cea264d3166a5",
         []
        ],
        "property-focus.https.html.ini": [
-        "cdb2ab4dd72571f79b6b2b7a71be308ef1dbc9b2",
+        "82c8de373481ed99ed4539e9781a19f6001a19d0",
         []
        ],
        "property-frames.https.html.ini": [
-        "01f4fcd2960d85861b72c469942031529268ec2f",
+        "f6d2d333bad5ce93e388b23469807f3f04336d18",
         []
        ],
        "property-indexed-getter.https.html.headers": [
@@ -350542,11 +350520,11 @@
         []
        ],
        "property-length.https.html.ini": [
-        "adac8732a3e22ead8ec3bcd459996e33d0182d61",
+        "5a1cdeb06f5da40830935462d15cf02f567f8dcb",
         []
        ],
        "property-location-get.https.html.ini": [
-        "0523467e2f58e3f3eb288109d8dde786596545ff",
+        "dcfc817f31fcf4a341eb76091e727fe7c65216a4",
         []
        ],
        "property-location-set.https.html.ini": [
@@ -350562,7 +350540,7 @@
         []
        ],
        "property-opener-get.https.html.ini": [
-        "76173f058e7af335f35213295dd3b1a188840c64",
+        "e053a92320caf24980ff5f4d623361e7485303db",
         []
        ],
        "property-opener-set.https.html.ini": [
@@ -350570,7 +350548,7 @@
         []
        ],
        "property-postmessage-1.https.html.ini": [
-        "ab4e882800645f49b748ce816f1108237bde01a8",
+        "943353e4f9e25b62aaec539cff959e753180bc02",
         []
        ],
        "property-postmessage-2.https.html.ini": [
@@ -350582,7 +350560,7 @@
         []
        ],
        "property-top.https.html.ini": [
-        "e3a7586a247307c588eb7e9c9a3cdb75dbe2b04c",
+        "7bd46c45dea7626c43b604418611570c9f08691d",
         []
        ],
        "property-window.https.html.ini": [
@@ -350590,7 +350568,7 @@
         []
        ],
        "report-to-both_coop-ro.https.html.ini": [
-        "a842eff9ac98cb00647a6efcc5b1ccf5ebfa0ae5",
+        "d4653ba3bc4737029f06e32eecac15936e97218f",
         []
        ],
        "reporting-observer.html.ini": [
@@ -350612,11 +350590,11 @@
         []
        ],
        "reporting-redirect-with-same-origin-allow-popups.https.html.ini": [
-        "18bb1f2390bffd060cf2e565cb466a01b64357b2",
+        "8030187e3a1965ce1f930b870396f1c180227ae5",
         []
        ],
        "reporting-redirect-with-unsafe-none.https.html.ini": [
-        "f6002819e54c01078fa964d9f2565d8801071f6b",
+        "68909ceb79e01f8e36067b597f04f87f0168fefb",
         []
        ]
       },
@@ -350818,7 +350796,7 @@
         []
        ],
        "iframe-popup-to-soap.https.html.ini": [
-        "29c6cc0dd3522ee4cb6e00b8dbb65caeb095415d",
+        "9311679589c79eb9c3b7a6756121044bee700977",
         []
        ],
        "iframe-popup-to-un.https.html.headers": [
@@ -350902,7 +350880,7 @@
         []
        ],
        "popup-soap.https.html.ini": [
-        "75e0479d6d2166149de81f39c592b534987d71e9",
+        "d4cfb804c1cda4b1271b3a5e605bfb31db94812a",
         []
        ],
        "popup-u.https-expected.txt": [
@@ -350910,7 +350888,7 @@
         []
        ],
        "popup-u.https.html.ini": [
-        "2381405d8bb70ac2439570b0d970beaf7d786e87",
+        "d559eb64d610b064449741c83a2d92c703e4b238",
         []
        ],
        "popup-un.https-expected.txt": [
@@ -350934,7 +350912,7 @@
         []
        ],
        "popup-with-cross-origin.https.html.ini": [
-        "4e17baa0cc7389cbdb7ad5478ca25b3c307b8269",
+        "fca3b7c3e8f677f571d091f75a427352539790f5",
         []
        ],
        "popup-with-same-origin.https-expected.txt": [
@@ -350946,7 +350924,7 @@
         []
        ],
        "popup-with-same-origin.https.html.ini": [
-        "ed48901eceb081bfedf157f9b69b0d079b190504",
+        "5e23173a1ad96fa1cc19ae9e7649a3afd97de59d",
         []
        ],
        "popup-with-same-site.https-expected.txt": [
@@ -351518,8 +351496,12 @@
       []
      ],
      "render-blocking": {
+      "remove-attr-script-keeps-blocking.tentative.html.ini": [
+       "f223edf8a78a537692d286edd8e27d7138683331",
+       []
+      ],
       "script-inserted-script.html.ini": [
-       "e11044cfb6253752396bd957d05295fc1d8c2c07",
+       "7e15d963c5f2b665894fc557655c9d5d6234c31a",
        []
       ],
       "script-inserted-stylesheet-link.tentative.html.ini": [
@@ -357243,11 +357225,11 @@
          []
         ],
         "resource-selection-invoke-insert-source-not-in-document.html.ini": [
-         "ebefe86fc2c8480af3be6ce162825dc94d92ea92",
+         "9a1d7917db87ed1449e48064598982c8a80b1721",
          []
         ],
         "resource-selection-invoke-insert-source.html.ini": [
-         "90bfb401de4601bdb01e22caa517ec61f3a10f98",
+         "5e49a00b82fc89743dcc0069127766610ae786fa",
          []
         ],
         "resource-selection-invoke-load.html.ini": [
@@ -357255,7 +357237,7 @@
          []
         ],
         "resource-selection-invoke-pause-networkState.html.ini": [
-         "e889ab762e3f0df906ff3f35139c60e0c4a89904",
+         "08db93d9bdea4dfb142bd0f315c9cffaa8f7faf8",
          []
         ],
         "resource-selection-invoke-pause.html.ini": [
@@ -357267,11 +357249,11 @@
          []
         ],
         "resource-selection-invoke-remove-from-document-networkState.html.ini": [
-         "33e2bbbf2db5f400c6b95c9f46e33d3e663a43c5",
+         "940dd055965fc8216fc7b76adf46fce4ea80c73c",
          []
         ],
         "resource-selection-invoke-remove-src.html.ini": [
-         "d46d8e21a17a4bd65146835331cfbd4a54690eeb",
+         "7b5bb152205763528c58273ca15c428fbdbf2aee",
          []
         ],
         "resource-selection-invoke-set-src-not-in-document.html.ini": [
@@ -357770,7 +357752,7 @@
           []
          ],
          "track-cue-rendering-after-controls-removed.html.ini": [
-          "b8c518756115d3539b607029e542f0518beb6eef",
+          "e839e1a5276987b282d7fc781f63bee58c28387e",
           []
          ],
          "track-cue-rendering-line-doesnt-fit-ref.html": [
@@ -358240,7 +358222,7 @@
         []
        ],
        "sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini": [
-        "4f22930b4e1dc25e7382497ddef2add12482f436",
+        "bdfd528b939bf75dcd6a844f7f7acc1f8869bc6c",
         []
        ],
        "sandbox-top-navigation-child.tentative.sub.window.js.ini": [
@@ -358654,7 +358636,7 @@
         []
        ],
        "relevant-mutations.html.ini": [
-        "a2a70943012a5da848712dbfad045586284055df",
+        "b94e288abf8d232b67d67d3c2a1318a85c6b1d74",
         []
        ],
        "resources": {
@@ -358978,7 +358960,7 @@
         ]
        },
        "text-plain.window.js.ini": [
-        "cb83d32cb8ccfb32df71e75f9de873374613e46a",
+        "e236680b1d85d430a4a0446633e11149e744e1f0",
         []
        ],
        "urlencoded2.window.js.ini": [
@@ -359336,7 +359318,7 @@
         []
        ],
        "selectmenu-form-state-restore.tentative.html.ini": [
-        "977886abd19c277c5b4f96d1565ee53ee630341b",
+        "2dbfcd2a827090ec23178c8e097b29712ffd5de1",
         []
        ],
        "selectmenu-keyboard.tentative.html.ini": [
@@ -359744,7 +359726,7 @@
         []
        ],
        "activation-behavior.window.js.ini": [
-        "ecf50d43fb2374c3282b88318c1ccb692e69fcf2",
+        "0bebe05b1708bf4dd9803a70029723546a43f0eb",
         []
        ]
       },
@@ -365182,7 +365164,7 @@
       []
      ],
      "webtransport-h3.https.sub.any.js.ini": [
-      "667aadcf01418289fbe5842a37335b9cdddd9b56",
+      "daba249a449508333c9d23e6fe1969044383d0e3",
       []
      ],
      "wpt-server-wpt-flags.sub.html.ini": [
@@ -365208,6 +365190,10 @@
        "a46c54a7b7b51fec65d335ad54fc8fb4ca4c2050",
        []
       ],
+      "multiTouchPointsReleaseSecondPoint.html.ini": [
+       "f1cd5a322bf8b41badfd72e433881422d3b0f8b2",
+       []
+      ],
       "multiTouchPointsSimultaneousMove.html.ini": [
        "dde1e2b46c06249874bb2abb31fdd0d9f6de68d2",
        []
@@ -366573,7 +366559,7 @@
      []
     ],
     "cross-origin-iframe.sub.html.ini": [
-     "9d717d180321bcda14871a26f2dc3d1ca1183115",
+     "72e6f6508aafa556ca854a05cf9b9be8128423bd",
      []
     ],
     "idlharness.window-expected.txt": [
@@ -366585,7 +366571,7 @@
      []
     ],
     "iframe-no-root-with-wrapping-scroller.html.ini": [
-     "23c24a7451f085a31701cd72191d1931df4901ef",
+     "7d550a59d508efba1893a023669aedc01c765863",
      []
     ],
     "nested-cross-origin-iframe.sub.html.ini": [
@@ -366877,7 +366863,7 @@
      ]
     },
     "first-paint-equals-lcp-text.html.ini": [
-     "414fac12328cb7673e09b335e5c0523920b513d0",
+     "2ce953e63e4ecc84959417db0c022c732e03b5eb",
      []
     ],
     "image-upscaling-expected.txt": [
@@ -367102,11 +367088,11 @@
       []
      ],
      "csp-early-hints-disallowed-final-absent.h2.window.js.ini": [
-      "fd87f8922ffe578ca7a890ad9474292eb4e13ae2",
+      "b5be12effd9aadd3915ab48dba2f44c996b3bc81",
       []
      ],
      "csp-early-hints-disallowed-final-allowed.h2.window.js.ini": [
-      "e935dbe26b09071d110aba686e56187fe3131622",
+      "66e9cf6d20efdc07c642c37028aa843e0c7d9917",
       []
      ],
      "csp-early-hints-disallowed-final-disallowed.h2.window.js.ini": [
@@ -367126,7 +367112,7 @@
       []
      ],
      "preconnect-in-early-hints.h2.window.js.ini": [
-      "7f528f05a3aedf26ee2cf33efb5adba153f8f06a",
+      "df586cc30b73dcccd58123f10449a1bebf40c733",
       []
      ],
      "preload-finished-before-final-response.h2.window.js.ini": [
@@ -367154,7 +367140,7 @@
       []
      ],
      "preload-without-as.h2.window.js.ini": [
-      "7cc9418f8362621fc6a8b04b8ce884e5c5088017",
+      "6ac50adc38d97bcaca9743e9e8069256b7db0bc4",
       []
      ],
      "preload-without-csp-document-disallow.h2.window.js.ini": [
@@ -367190,11 +367176,11 @@
       []
      ],
      "referrer-policy-same-origin.h2.window.js.ini": [
-      "c87d9d932d697b2bc9d7d875954889d53d95e1c4",
+      "c735a045ce281c3577529b5a46d594106b938a07",
       []
      ],
      "referrer-policy-unsafe-url.h2.window.js.ini": [
-      "b282f0012b050882834afc5235da63f23fa47926",
+      "a03c3f90011268cf4006c84988d85a9b99f86765",
       []
      ],
      "resources": {
@@ -367425,7 +367411,7 @@
      []
     ],
     "long-microtask.window.js.ini": [
-     "60f938abce3c3195221c3d19dce0653a0ee94aa4",
+     "5db0634a8964b47eb02430ef5ee536bbfdb124a9",
      []
     ],
     "longtask-in-childiframe-crossorigin.html.ini": [
@@ -367436,6 +367422,10 @@
      "ec88577064aa6d21b1fdd115fe62f7e67a8065bb",
      []
     ],
+    "longtask-in-sibling-iframe-crossorigin.html.ini": [
+     "11c1f412c110ffe5d4bdeea53f2f3683ac14adde",
+     []
+    ],
     "longtask-sync-xhr.html.ini": [
      "1a9948dc63e8db358ca2e22e2b415178ba6c4737",
      []
@@ -367768,10 +367758,6 @@
        "4fd4b225f3527a151b9d63e7603ab224453d7721",
        []
       ],
-      "legacy-mstyle-attributes.html.ini": [
-       "be13767bc72bc889393b43bcd0a1a7d1b2c7856d",
-       []
-      ],
       "mrow-painting-order-ref.html": [
        "72694959a86f1917cbd3db13b7f1a8b71714b711",
        []
@@ -367930,10 +367916,6 @@
        "f72fdc8403719b0d07a283ad725975ce72dfe056",
        []
       ],
-      "operator-dictionary-arabic-002.html.ini": [
-       "f0fa72f41bfa4a4f79b8af912e2e1b3857c5b907",
-       []
-      ],
       "operator-dictionary-empty-and-three-chars-ref.html": [
        "2cbed129401e721fccfeb12874d6b7223bff8def",
        []
@@ -368161,7 +368143,7 @@
        ]
       },
       "ignored-properties-001.html.ini": [
-       "72e28090ec5f96a3d73a1aa34c4b0d14a1cf2f75",
+       "f779190fb74e4065db3ee9deee4b617b02213af3",
        []
       ],
       "legacy-scriptminsize-attribute-ref.html": [
@@ -369172,7 +369154,7 @@
       []
      ],
      "mediasource-worker-play-terminate-worker.html.ini": [
-      "933d86d6b29dc5d4ad92bcf7eef7eb882d1ff65f",
+      "6d693cae3edc28badde86986a0b7459d1e80cd81",
       []
      ],
      "mediasource-worker-play-terminate-worker.js": [
@@ -369225,7 +369207,7 @@
      []
     ],
     "mediasource-avtracks.html.ini": [
-     "96f7c14b2022b390197f0a210d80112d38b380ac",
+     "cac368b95bdf0e953eebea853c76b61b65c815cd",
      []
     ],
     "mediasource-buffered-expected.txt": [
@@ -369297,7 +369279,7 @@
      []
     ],
     "mediasource-duration.html.ini": [
-     "80b5872ce666b1c4525a3027562fe82ea581b4c9",
+     "0197c08c13123adadc0bbd2270eb8479afab18da",
      []
     ],
     "mediasource-endofstream-expected.txt": [
@@ -369305,7 +369287,7 @@
      []
     ],
     "mediasource-endofstream.html.ini": [
-     "eb2f72db20e269e593f8790db2f3821f655ac224",
+     "f341f66814d487790f4e9287003ee81909f075af",
      []
     ],
     "mediasource-invalid-codec.html.ini": [
@@ -370351,6 +370333,10 @@
         "46e2255e388e9e08377d625b55653a007d59c14e",
         []
        ],
+       "sharedworker-import-data.https.html.ini": [
+        "eda800fbf71cc66e1e75f8e54d366826749a5f37",
+        []
+       ],
        "sharedworker-import.https.html.headers": [
         "46e2255e388e9e08377d625b55653a007d59c14e",
         []
@@ -370597,7 +370583,7 @@
      ]
     },
     "detach_iframe_during_open.https.window.js.ini": [
-     "98a13dd8cc29f9fdd857d74b0f9f5c0012fde081",
+     "b3facba90a7069cd7eb018bff6456149a3a90719",
      []
     ],
     "resources": {
@@ -370943,7 +370929,7 @@
        []
       ],
       "navigate-initial-about-blank.html.ini": [
-       "0adc9d25d34e98f89c4e1f5c0d4fc93353f67e81",
+       "7680dc945c75d67196719a543d9ae9bb5c7674fc",
        []
       ],
       "navigate-intercept-interrupted.html.ini": [
@@ -371221,7 +371207,7 @@
      ]
     },
     "test-performance-attributes.sub.html.ini": [
-     "a805bf5b9ad6dc7e516f2e9a170a435a803260fe",
+     "6cea40d48ad94d099d704cfeae69100bbf5db807",
      []
     ]
    },
@@ -371993,7 +371979,7 @@
      []
     ],
     "pending_beacon-sendondiscard.tentative.https.window.js.ini": [
-     "3150981433d33d4b9bab5c633af4455521a39d6a",
+     "45cc94984865b6ec52fd60c5a0ace8ae170e04d8",
      []
     ],
     "pending_beacon-sendonhidden.tentative.https.window.js.ini": [
@@ -372090,7 +372076,7 @@
       []
      ],
      "performance-navigation-timing-same-origin-bfcache.tentative.window.js.ini": [
-      "b54282c87d27e61eeef740199fbd9808dfea7775",
+      "967f7f1accdfbd46ebf2870d0466fb46942f65fd",
       []
      ],
      "performance-navigation-timing-same-origin-replace.tentative.window.js.ini": [
@@ -372334,7 +372320,7 @@
       []
      ],
      "unload-allowed-by-default.tentative.window.js.ini": [
-      "041aee22275f57b2ff32f9481e29fe1d43f9fa63",
+      "6360a03d9b2e0a9a6e94ac5a30cf26dc57b5e32c",
       []
      ],
      "vertical-scroll-main-frame-manual.tentative.html.headers": [
@@ -375845,15 +375831,15 @@
      []
     ],
     "deadline-max-rAF-dynamic.html.ini": [
-     "2c4667b17d5da143d16dc247ea61cdd37ffa4652",
+     "f827d6250bf610959f743f72b5d29b4f9522627d",
      []
     ],
     "deadline-max-rAF.html.ini": [
-     "b79130fbda79534804c6f6ceba418570414f0677",
+     "c2a9bbc2d2bfc59f1c6b4b8823275c23b7419994",
      []
     ],
     "deadline-max-timeout-dynamic.html.ini": [
-     "727f92b8c3c0ebc581c367ce59d7846238a8c034",
+     "36bd303bf0ef4285d724732aab4f62d0608997be",
      []
     ],
     "deadline-max.html.ini": [
@@ -375957,7 +375943,7 @@
      []
     ],
     "content-type-parsing.html.ini": [
-     "53105638e5270ddc714bde35f3ecdb5b22ccb6c2",
+     "f628e90a03205e5f6f16ca4b78220001f5d988b1",
      []
     ],
     "frameset-timing.html": [
@@ -375996,10 +375982,6 @@
      "33006cf002b9b9c3f4fb4c4757916052ae12fe92",
      []
     ],
-    "nested-context-navigations-iframe.html.ini": [
-     "99d8addf0105c7efab836200dbdee93ae0000ed3",
-     []
-    ],
     "nextHopProtocol-is-tao-protected.https.html.ini": [
      "1073d65b02642b0bdac93f3b3d33f0111e369515",
      []
@@ -376009,7 +375991,7 @@
      []
     ],
     "no-entries-for-cross-origin-css-fetched-memory-cache.sub.html.ini": [
-     "e3208a2e825887d2974275c71f0204865dee39d6",
+     "6f1569d44c5476e21ab11940d2b608ca4f2f6a2e",
      []
     ],
     "ping-rt-entries-expected.txt": [
@@ -376025,7 +376007,7 @@
      []
     ],
     "resource-timing-level1.sub.html.ini": [
-     "3eaed3a93af01991d48976f0b3c916e504813866",
+     "89cb4986aeb971fc3f097b61d7a22f38b49cd680",
      []
     ],
     "resource_timing.worker.js.ini": [
@@ -376407,7 +376389,7 @@
      ]
     },
     "response-status-code.html.ini": [
-     "b06a0aca565487ae30f8451e6e4b0f0fd54be721",
+     "8e34cbd838f07950d924e4f55bfaf810dfc1bae8",
      []
     ],
     "sleep.py": [
@@ -377615,6 +377597,14 @@
       "948e7f0190aa83263c607a64e5ade04b02de95a7",
       []
      ],
+     "blue_cors.png": [
+      "4498dd258a20b5ea070ae4a05aad77c62d5228a8",
+      []
+     ],
+     "blue_cors.png.headers": [
+      "2977f0a52c52721e6cf6ec05a752d2342858eab0",
+      []
+     ],
      "blue_tao.png": [
       "4498dd258a20b5ea070ae4a05aad77c62d5228a8",
       []
@@ -378362,7 +378352,7 @@
       []
      ],
      "cache-add.https.any.js.ini": [
-      "6e8112910d931e29fd8b86654e19cdd363ddc1d0",
+      "93c7a0a4d8bc0d19353cc3798f317c66b2f9574c",
       []
      ],
      "cache-add.https.any.serviceworker-expected.txt": [
@@ -378620,7 +378610,7 @@
       []
      ],
      "about-blank-replacement.https.html.ini": [
-      "c59a16f3f05b2c5ffde6c477c227fb8ad9b3cf6a",
+      "44673f0a5f7c3367517b39b82019fb80db5262b9",
       []
      ],
      "client-navigate.https.html.ini": [
@@ -378748,7 +378738,7 @@
       []
      ],
      "getregistrations.https.html.ini": [
-      "4769a3b3065cbfd007b4a45f0d348bfb7a614823",
+      "5651cd24eb56cded68298b7c425de7b92cf688c7",
       []
      ],
      "idlharness-sw.https-expected.txt": [
@@ -380508,7 +380498,7 @@
       []
      ],
      "same-site-cookies.https.html.ini": [
-      "1adcbd9f2945a4714add769b79c3855ea35ea28b",
+      "ed4008e17e09d59ae83c5e78352c030955ab0b86",
       []
      ],
      "service-worker-header.https.html.ini": [
@@ -381446,7 +381436,7 @@
       []
      ],
      "csp-script-src-self.html.ini": [
-      "a3b998acf566b79b35251c8f5bf334ed5927d393",
+      "812723f4d5d2ad51231550433e49f8e8e24b0e05",
       []
      ],
      "csp-script-src-unsafe-inline.html.ini": [
@@ -381470,7 +381460,7 @@
       []
      ],
      "local-storage.html.ini": [
-      "89b7f0be6303658803d9a963a03328bd3fdc2919",
+      "5ab6d197b53627f4d8b2cd0168887914c7d058c6",
       []
      ],
      "media-autoplay-expected.txt": [
@@ -381486,11 +381476,11 @@
       []
      ],
      "navigator-plugins.tentative.html.ini": [
-      "a9fa26cb4b1628423ea781bd5ae1792dd1da06ba",
+      "7e5ff8fc7e8625c119169b949de3f1931ba14fbf",
       []
      ],
      "navigator-subapp.https.tentative.html.ini": [
-      "f08bb85533220d12dff83fe09f7471b129c34104",
+      "4bbd7113464eae59dfa615aa49c076aa7053232a",
       []
      ],
      "referrer-policy-from-rules.html.ini": [
@@ -381931,8 +381921,12 @@
        []
       ]
      },
+     "response-code-non-successful.html.ini": [
+      "f7732f90e6f3db967beb0190fbc9c2b643155a76",
+      []
+     ],
      "response-code-successful.html.ini": [
-      "89a1086721a87066120b7eacd12af1479643e860",
+      "b10e24ccaf4d436d51f7a32932afe7b587218128",
       []
      ],
      "restriction-audio-setSinkId-with-invalid-sinkId.https.tentative.html.ini": [
@@ -381964,7 +381958,7 @@
       []
      ],
      "restriction-dedicated-worker.https.html.ini": [
-      "4c890c0c2d50ca4fb5a4d1c20937fd13019d14f9",
+      "4aeadc53fb826a843e3a9ceedf09e3d68e77daa4",
       []
      ],
      "restriction-encrypted-media-unsupported-config.https.html.ini": [
@@ -381980,15 +381974,15 @@
       []
      ],
      "restriction-idle-detection.https.html.ini": [
-      "ff11792f5358b3ebc78916b9c385ca8909406397",
+      "407d3c40961570600c0c4b973b71285416e8d7ca",
       []
      ],
      "restriction-local-file-system-access.https.html.ini": [
-      "8a6d179864aa39d4489cb91a3e778da3c4afeb10",
+      "0e13ca067d9a4efde27e28b31e7cd1f940b1f689",
       []
      ],
      "restriction-media-auto-play-attribute.html.ini": [
-      "8abf5802b335c8d5bbfdb1c5d75db484fa20ce1c",
+      "66ea6cb7d2ce1982cbd5b55389211dd5ff9b5f9e",
       []
      ],
      "restriction-media-camera.https.html.ini": [
@@ -382008,7 +382002,7 @@
       []
      ],
      "restriction-message-boxes.html.ini": [
-      "a19061396a8e8780f34563f70ec2627d23d9f65a",
+      "aeb2a55b80067815a8f7a29f90ebe9516a3f2544",
       []
      ],
      "restriction-midi-sysex.https.html.ini": [
@@ -382040,7 +382034,7 @@
       []
      ],
      "restriction-request-picture-in-picture.html.ini": [
-      "32004d9c3e0882ddf1626a064294901da9c192c3",
+      "745c20dc1c7da6527d59ddd93af071fed58d22c6",
       []
      ],
      "restriction-screen-capture.https.html.ini": [
@@ -382068,7 +382062,7 @@
       []
      ],
      "restriction-service-worker-postmessage.https.html.ini": [
-      "3cb7332888cd824bca0b46e9f2aa661e57c49dcc",
+      "7b07883516ff22329c9128a6aabf12ccc501c50f",
       []
      ],
      "restriction-service-worker-unregister.https.html.ini": [
@@ -382080,7 +382074,7 @@
       []
      ],
      "restriction-speech-synthesis.html.ini": [
-      "c8b329d54aa3a58e3d46a6bcf37e2690d62df42e",
+      "ad1ad4c2b02022f3bdfe9a9b47eb552ff4a2e77f",
       []
      ],
      "restriction-storage-persist.https.html.ini": [
@@ -382096,7 +382090,7 @@
       []
      ],
      "restriction-web-locks.https.html.ini": [
-      "fee948408ed9489a5b2ce822478e4fe45c917103",
+      "d55497aebf9840b327c385139090af4fabebdd0b",
       []
      ],
      "restriction-web-nfc.https.html.ini": [
@@ -382132,7 +382126,7 @@
       []
      ],
      "restriction-window-resize.html.ini": [
-      "68e6697432c77d1c4201e873f19de33f32f4731f",
+      "625e373b23f8bdbbe135dc5d79cef6af15b7682f",
       []
      ],
      "restrictions.html.ini": [
@@ -382204,7 +382198,7 @@
       []
      ],
      "workers.html.ini": [
-      "a986d42ada540991b539b92e5597b2487a0aafc3",
+      "827d09da648c60a4f7a18d153e3588e45420c8cf",
       []
      ]
     }
@@ -382315,7 +382309,7 @@
      []
     ],
     "partitioned-estimate-usage-details-caches.tentative.https.sub.html.ini": [
-     "2cd29ff7971eb16cc9f1d82b79bff2fc258afeac",
+     "b9d6883afc971201618441fccaf3f8e4b4a1d9ec",
      []
     ],
     "resources": {
@@ -386017,7 +386011,7 @@
      []
     ],
     "a-element-xhtml.xhtml.ini": [
-     "e03a00de7bfaeba2d8535e73c48c1da007902843",
+     "3dc8d455537c89b242feafef3751138a73246fa7",
      []
     ],
     "a-element-xhtml_include=javascript-expected.txt": [
@@ -386029,7 +386023,7 @@
      []
     ],
     "a-element.html.ini": [
-     "58ed526a67856df7c22a5b02136687d144b18efd",
+     "82a234752d4f5432cfec9797946059081cc8381b",
      []
     ],
     "a-element_include=javascript-expected.txt": [
@@ -386041,7 +386035,7 @@
      []
     ],
     "failure.html.ini": [
-     "97ce9874698c763da51039b3e9d709d2bb581aff",
+     "5f3314da573f67b736b3308e0d9a782c3778fde1",
      []
     ],
     "idlharness-shadowrealm.window-expected.txt": [
@@ -386052,6 +386046,10 @@
      "27b57a31bb5da2c0dcfdaffd9629930d71b3dbf3",
      []
     ],
+    "percent-encoding.window.js.ini": [
+     "1091bffa2c6ebfc3c45547eb4ba0f53edaab55cc",
+     []
+    ],
     "resources": {
      "a-element-origin.js": [
       "cb7d4a895c40c456c3f4c0ade050115319ad410c",
@@ -386115,7 +386113,7 @@
      []
     ],
     "url-setters-a-area.window.js.ini": [
-     "f89c6466df4838f8fab7683b4ef38ea3d6c40809",
+     "763ab28306a3f016564ff0fa18b614a61e81b39b",
      []
     ],
     "url-setters-a-area.window_include=javascript-expected.txt": [
@@ -386131,7 +386129,7 @@
      []
     ],
     "url-setters-stripping.any.js.ini": [
-     "5c23a98a6205bc1eeba0e0623b80063b03a8d6f1",
+     "ad2f860fc3677f34b0f5d29d7f7248d15cd4099b",
      []
     ],
     "url-setters-stripping.any.worker-expected.txt": [
@@ -386173,10 +386171,6 @@
     "urlsearchparams-get.any.js.ini": [
      "e0afce635f0b70de1d746af7d99c52f03a2f4aab",
      []
-    ],
-    "urlsearchparams-stringifier.any.js.ini": [
-     "d7a376af68c4ac557519a2f40da1e69b5ec84702",
-     []
     ]
    },
    "urlpattern": {
@@ -386255,6 +386249,10 @@
     "META.yml": [
      "411450e0b142931544fbaac5669352201ee37328",
      []
+    ],
+    "api-is-present.html.ini": [
+     "f3986b9f072a5c70b6b0f78149145adf85ca8c83",
+     []
     ]
    },
    "video-rvfc": {
@@ -386277,6 +386275,10 @@
     "request-video-frame-callback-webrtc.https.html.ini": [
      "447e1523bdef4f7e5ddb4c4907807f1302add84c",
      []
+    ],
+    "request-video-frame-callback.html.ini": [
+     "5fa8925da2dd13e104ed658633b5c8832371245e",
+     []
     ]
    },
    "virtual-keyboard": {
@@ -387177,7 +387179,7 @@
      },
      "Animation": {
       "finished.html.ini": [
-       "1e48fb216d8591cf61a0ad365c3dfa8068f77a72",
+       "3f679f0ca3a1954a030f3b5b55d0290fe7028345",
        []
       ]
      },
@@ -387352,6 +387354,10 @@
        "f0eb25a2ee5fb0b9e21d7b57dcd870f5bc71c697",
        []
       ],
+      "setting-the-playback-rate-of-an-animation.html.ini": [
+       "63c48006a3eb5622ad308ff8d97c6323b19a5112",
+       []
+      ],
       "setting-the-start-time-of-an-animation-expected.txt": [
        "438f9f3ad51123df9f489fd74929ccfa6a4d65b9",
        []
@@ -387393,7 +387399,7 @@
        []
       ],
       "sibling-iframe-timeline.html.ini": [
-       "96ae3e671d90670c8296fa6805886feb8a3f362f",
+       "db1fc3d9642f489fe0f0be7dfa37dade2cf39898",
        []
       ],
       "timelines.html.ini": [
@@ -387818,7 +387824,7 @@
       ]
      },
      "reuse-web-bundle-resource.https.tentative.html.ini": [
-      "2aec54d3be675364ac60a5ddff9c3b64f6abc59f",
+      "9c8170d687145a60ee382ebe341035c0d6883a15",
       []
      ]
     },
@@ -387876,6 +387882,10 @@
      "4423c326ffe912062124a75cc712052f08b5a15e",
      []
     ],
+    "query-ordering.tentative.https.html.ini": [
+     "b63d722ab7dd33bb4eac37228311c006f2ed749b",
+     []
+    ],
     "query.tentative.https.any.js.ini": [
      "c7d15b034eebc3ff91bcfe3f8a7cc87dd6180ebe",
      []
@@ -388243,7 +388253,7 @@
        []
       ],
       "processing-after-resume.https.html.ini": [
-       "a270ea3550af88ec08f4708d11884d9f9f5015fa",
+       "8d0542069ecfd58508bd89fad09c04914e8b1cad",
        []
       ],
       "resources": {
@@ -388276,6 +388286,10 @@
        "5574a563d6f48095e521ecc4aaf7060541d3c725",
        []
       ],
+      "audioworkletnode-output-channel-count.https.html.ini": [
+       "97f1aa6933157db4fc4564d7095f4c274919d1ec",
+       []
+      ],
       "audioworkletprocessor-promises.https-expected.txt": [
        "ecc24fe05e8a87fcd79a9de92e21f7e38207ca0f",
        []
@@ -388457,11 +388471,15 @@
       "mediaElementAudioSourceToScriptProcessorTest.html.ini": [
        "88f3f0f560a735cacf8c8c58972ea1ee75f099de",
        []
+      ],
+      "no-cors.https.html.ini": [
+       "af268033c7d6d8d28ea340ce3a1dfe37ad488677",
+       []
       ]
      },
      "the-pannernode-interface": {
       "test-pannernode-automation.html.ini": [
-       "20900aabd2ca3a1adb92d1b2b0a46bf8a4213bb2",
+       "a0c0660a92aa922fcd5abc7c4ebc6b417cc3b4ee",
        []
       ]
      }
@@ -389696,6 +389714,10 @@
      "244903d102f3d42f89d8f13b7518e76e829775c1",
      []
     ],
+    "postMessage_Date.sub.htm.ini": [
+     "2ab22ee829dc70f1e8ed1a10c98286e0f0b6f8e6",
+     []
+    ],
     "resources": {
      "post-cryptokey-to-opener.html": [
       "91c70165f03ec63615ac286dc9ae3555706f49ad",
@@ -389919,7 +389941,7 @@
      []
     ],
     "RTCIceConnectionState-candidate-pair.https.html.ini": [
-     "7e793d2f9bb37760cfac6c995abfb585088a1320",
+     "4e15800ca79b87a69bf94df4067e7ac8e96d6d16",
      []
     ],
     "RTCIceTransport-expected.txt": [
@@ -391305,7 +391327,7 @@
        []
       ],
       "close.any.js.ini": [
-       "cb584b3d6435adf47dfc173ff6855e6ddcbff106",
+       "381caf018a44cbf4f4e93a35e8fc96bd229c3229",
        []
       ],
       "constructor.any.serviceworker_wpt_flags=h2-expected.txt": [
@@ -392375,10 +392397,6 @@
         "d4bd2b74c2db0e560114109af960c7f38cb38575",
         []
        ],
-       "audio_has_no_subtitles.html.ini": [
-        "6a131e93824e3d10701a21726ed463f487d76d3d",
-        []
-       ],
        "background.png": [
         "6d16cc84c4dd3b8777bd83d97888eaf8d351f6b5",
         []
@@ -394849,7 +394867,7 @@
      []
     ],
     "events_referenceSpace_reset_inline.https.html.ini": [
-     "00c1d56bf0b835c4ab75baee491703b102791134",
+     "fddaa5b930051715ecfd3f17869ba0b776c39b55",
      []
     ],
     "events_session_select.https.html.ini": [
@@ -395217,7 +395235,7 @@
      []
     ],
     "xrSession_requestReferenceSpace_features.https.html.ini": [
-     "2e02a8cdd773669852af2fbffb2c8a445e254dc2",
+     "9d84a7b2938521b7170bd842d879ec38880e73d3",
      []
     ],
     "xrSession_requestSessionDuringEnd.https.html.ini": [
@@ -395241,7 +395259,7 @@
      []
     ],
     "xrStationaryReferenceSpace_floorlevel_updates.https.html.ini": [
-     "5011c0dba50647a08d3ef0786348647351abe8aa",
+     "66f1822acf687c891474dcea9dd63a3f4c5537c5",
      []
     ],
     "xrView_eyes.https.html.ini": [
@@ -395360,10 +395378,6 @@
     ],
     "baseurl": {
      "alpha": {
-      "importScripts-in-worker.html.ini": [
-       "392414593b8d4abdf1723683f976defc53968401",
-       []
-      ],
       "sharedworker-in-worker-expected.txt": [
        "882a37d0a3642f4a415edbdb040cb3e369b7f615",
        []
@@ -395505,7 +395519,7 @@
        []
       ],
       "dummy-name.html.ini": [
-       "bacc91894800f986c359a3d17def9016e9089af5",
+       "2ff8507016af72224b8cbd32c5a9593050b7efdf",
        []
       ],
       "dummy-shared-worker.js": [
@@ -395639,7 +395653,7 @@
      []
     ],
     "dedicated-worker-from-blob-url.window.js.ini": [
-     "1f41aff0a7de53851d266ce0855bfc593c0d3b1e",
+     "282999e38b34fbb255ff0a9021e8419d9f039d02",
      []
     ],
     "dedicated-worker-in-data-url-context.window-expected.txt": [
@@ -395839,6 +395853,10 @@
         "a96c08844202e430201d9b9e32f6fef6b36f46ac",
         []
        ],
+       "003.html.ini": [
+        "a724a8c2de86b803ca7aaec68b9da645014b4a9b",
+        []
+       ],
        "003.js": [
         "e64e4e2179f0fb51347eea052f889b025af8e70a",
         []
@@ -396478,10 +396496,6 @@
        "68d7e91d451e6143ef5a68c2686b785ba178e1f0",
        []
       ],
-      "003.html.ini": [
-       "d78390839335a1bcdc75a17f3efd17b836a18f5b",
-       []
-      ],
       "003.js": [
        "1a9c5a7ee816a95c8bbd8510ea234c917d8df2f0",
        []
@@ -396771,7 +396785,7 @@
      []
     ],
     "animation-worklet-import.https.html.ini": [
-     "bcf7103f2760520d76d6f4a44033e3ef89dc0f98",
+     "0b7048512beac8867185ac44dda506974829672a",
      []
     ],
     "animation-worklet-referrer.https.html.ini": [
@@ -434990,14 +435004,14 @@
        ]
       ],
       "font-relative-units-dynamic.html": [
-       "f87a64a88ad14255ee4aeec39004f3cbe90270a2",
+       "63a07c61dbd31f1529f3fab10cf348c098a5ff30",
        [
         null,
         {}
        ]
       ],
       "font-relative-units.html": [
-       "9c05d7916f784a7900918e323adcb4e467db8ee0",
+       "7f711ebf96c60efd793bcf4c03b92450cbfcdcd8",
        [
         null,
         {}
@@ -458514,6 +458528,13 @@
        {}
       ]
      ],
+     "rlh-invalidation.html": [
+      "4618d9e51af1f649df6a843ed5140d2b203d81e1",
+      [
+       null,
+       {}
+      ]
+     ],
      "round-function.html": [
       "bc8734b011a6e7c55e206e1bb13c40b0fc555958",
       [
@@ -468348,7 +468369,7 @@
       ]
      ],
      "ParentNode-querySelector-scope.html": [
-      "b08a1674ac452d0257978d0c2072976e678458c3",
+      "d984956d6c4dd846b74e59c0e77d30e57a9bd45b",
       [
        null,
        {}
@@ -593295,6 +593316,13 @@
       {}
      ]
     ],
+    "server_timing_headers_not_visible_in_fetch.https.html": [
+     "3502f491d5a62c982b8ead79e9b0063372b5b431",
+     [
+      null,
+      {}
+     ]
+    ],
     "service_worker_idl.https.html": [
      "5c493fdcb0ab581a267a084e7e2383617d99677e",
      [
@@ -663859,7 +663887,7 @@
      },
      "back": {
       "back.py": [
-       "21e8498ccd57da9b101055f39fedab02ef2f2fcb",
+       "62434323e0ad5339a861d0752d29f7d1f95c81cc",
        [
         null,
         {}
@@ -663974,7 +664002,7 @@
        ]
       ],
       "click.py": [
-       "bd4e2c6801a737a000f8bb8de032a8480121c17e",
+       "d2015445d4c153b58616d5ed738bb9802b7775ac",
        [
         null,
         {}
@@ -664076,7 +664104,7 @@
        ]
       ],
       "send_keys.py": [
-       "5f8d3f01d6e3ea18484c31209f63bcf8b3c3e44c",
+       "36b27b92f931491cfaf16fe568ce1b46e25d76e3",
        [
         null,
         {}
@@ -664101,7 +664129,7 @@
        ]
       ],
       "execute_async.py": [
-       "697df72bb9c60b5fc7d51f0eafc0eb2155517f7d",
+       "5ac9cd395df5b2b79a87ccf21027b2eb0a9b732d",
        [
         null,
         {}
@@ -664154,7 +664182,7 @@
        ]
       ],
       "execute.py": [
-       "d1f1f137edf6cfd5f9ed376f72291b0ff8b80709",
+       "ff1bb0f6e552b97884e18fb85ed22ba4a512df77",
        [
         null,
         {}
@@ -664266,7 +664294,7 @@
      },
      "forward": {
       "forward.py": [
-       "61c66e201b9e9898cec78c86c37fbf894b48c457",
+       "f27be403f9e95bd2359d5ae6224f6ae2708ff7c8",
        [
         null,
         {}
@@ -664338,7 +664366,7 @@
      },
      "get_computed_label": {
       "get.py": [
-       "901b9809ca801c10358ed1b3c937b3729b7eb937",
+       "32b4ce33bbe4e766073138642429fe36bdcebac2",
        [
         null,
         {}
@@ -664347,7 +664375,7 @@
      },
      "get_computed_role": {
       "get.py": [
-       "84e7ab249f8c4f9b29e24b7213bad77b2ee841fe",
+       "1e61799dc9467f14c5c83534f1e758bcf4702add",
        [
         null,
         {}
@@ -664388,7 +664416,7 @@
      },
      "get_element_attribute": {
       "get.py": [
-       "1d003073be7acfe2ecc5bf1309809749c246cb6e",
+       "87fd5f3333cc8ec226d9e63758cff41ace5e70cc",
        [
         null,
         {}
@@ -664406,7 +664434,7 @@
      },
      "get_element_css_value": {
       "get.py": [
-       "3d4a31018b5792d3dda35262042febaee616751c",
+       "d178fc25f185f8d7fcd828739cbcd8a32e119c1e",
        [
         null,
         {}
@@ -664424,7 +664452,7 @@
      },
      "get_element_property": {
       "get.py": [
-       "9223f1df684292634f4bef1273cefa587be970a9",
+       "7d9d7083acc37a62b630d9c354afe291fc20658d",
        [
         null,
         {}
@@ -664442,7 +664470,7 @@
      },
      "get_element_rect": {
       "get.py": [
-       "97dc7a9f930a9491e19f34d85e140f3df601ca2b",
+       "113bc83838359fbd949d01ef223d89cef83e2443",
        [
         null,
         {}
@@ -664460,7 +664488,7 @@
      },
      "get_element_shadow_root": {
       "get.py": [
-       "70168bb87827a5d3094b9660d0785037db80bb8d",
+       "55b2089a6708bdaa0c41f51b9e9390a25f0a9b45",
        [
         null,
         {}
@@ -664478,7 +664506,7 @@
      },
      "get_element_tag_name": {
       "get.py": [
-       "1e4d5d994e6dcec361dbfc6c509683684a67eb1f",
+       "bdfebc2ce79ddeef7ead2963584a9188a078c1bc",
        [
         null,
         {}
@@ -664496,7 +664524,7 @@
      },
      "get_element_text": {
       "get.py": [
-       "74b09fdad044ceaa1bc6fcf90fbc9ef3e941b455",
+       "b2c8a09f8c4626ffd71049e962a70cfb3beacaa4",
        [
         null,
         {}
@@ -664647,7 +664675,7 @@
      },
      "is_element_enabled": {
       "enabled.py": [
-       "fa472a69b7b7e618469a652987561dcb0bb25cba",
+       "ef9106cce86a874edf22b91f2082ab1b6240d930",
        [
         null,
         {}
@@ -664665,7 +664693,7 @@
      },
      "is_element_selected": {
       "selected.py": [
-       "79a49277bb0745a2c8588a9f3c67275f50af120e",
+       "a57737590c56e117d9d330b0b5882cf3b548362d",
        [
         null,
         {}
@@ -664748,7 +664776,7 @@
        ]
       ],
       "navigate.py": [
-       "a367fc105e126aba603a2c426f2bfe823ccad950",
+       "d61377af275902c48083d3d84b35c3bba30bc34e",
        [
         null,
         {}
@@ -665185,7 +665213,7 @@
        ]
       ],
       "screenshot.py": [
-       "4a248b158bb48da6ca6e347af88c3a33d9dcfdfc",
+       "a1fcfac5f44985e68ca61149a9f2cfb93e4aed29",
        [
         null,
         {}

third_party/blink/web_tests/external/wpt/IndexedDB/idbobjectstore_batchGetAll_largeValue.tentative.any.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/IndexedDB/idbobjectstore_batchGetAll_largeValue.tentative.any.js.ini b/third_party/blink/web_tests/external/wpt/IndexedDB/idbobjectstore_batchGetAll_largeValue.tentative.any.js.ini
index 22f07a5..30d63af 100644
--- a/third_party/blink/web_tests/external/wpt/IndexedDB/idbobjectstore_batchGetAll_largeValue.tentative.any.js.ini
+++ b/third_party/blink/web_tests/external/wpt/IndexedDB/idbobjectstore_batchGetAll_largeValue.tentative.any.js.ini
@@ -1,7 +1,7 @@
 [idbobjectstore_batchGetAll_largeValue.tentative.any.html]
   expected:
-    if (flag_specific == "") and (product == "chrome"): OK
-    if flag_specific == "disable-site-isolation-trials": OK
+    if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [OK, TIMEOUT]
+    if product == "chrome": OK
     TIMEOUT
   [Get upper/lower excluded]
     expected: [PASS, TIMEOUT]
@@ -14,9 +14,7 @@
 
 
 [idbobjectstore_batchGetAll_largeValue.tentative.any.worker.html]
-  expected:
-    if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [OK, TIMEOUT]
-    TIMEOUT
+  expected: TIMEOUT
   [Get bound range with maxCount]
     expected: [PASS, TIMEOUT]
 
@@ -24,5 +22,4 @@
     expected: [PASS, TIMEOUT]
 
   [Get upper/lower excluded]
-    expected:
-      if product == "chrome": TIMEOUT
+    expected: TIMEOUT

third_party/blink/web_tests/external/wpt/acid/acid3/test.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/acid/acid3/test.html.ini b/third_party/blink/web_tests/external/wpt/acid/acid3/test.html.ini
index 03a526e..c891251 100644
--- a/third_party/blink/web_tests/external/wpt/acid/acid3/test.html.ini
+++ b/third_party/blink/web_tests/external/wpt/acid/acid3/test.html.ini
@@ -1,4 +1,4 @@
 [test.html]
   expected:
-    if flag_specific == "highdpi": [FAIL, TIMEOUT]
+    if (flag_specific == "") and (os == "win"): [FAIL, TIMEOUT]
     FAIL

third_party/blink/web_tests/external/wpt/client-hints/sec-ch-ua.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/client-hints/sec-ch-ua.https.html.ini b/third_party/blink/web_tests/external/wpt/client-hints/sec-ch-ua.https.html.ini
index 2f034c1..adea9afa 100644
--- a/third_party/blink/web_tests/external/wpt/client-hints/sec-ch-ua.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/client-hints/sec-ch-ua.https.html.ini
@@ -1,3 +1,12 @@
 [sec-ch-ua.https.html]
-  expected:
-    if product == "chrome": ERROR
+  [Open HTTPS window: No brand in `Sec-CH-UA` header is > than 32 chars.]
+    expected:
+      if product == "chrome": FAIL
+
+  [Open HTTPS window: `Sec-CH-UA` header returned by default.]
+    expected:
+      if product == "chrome": FAIL
+
+  [Open HTTPS window: `Sec-CH-UA` header is consistent across versions.]
+    expected:
+      if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/content-security-policy/inheritance/history-iframe.sub.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/content-security-policy/inheritance/history-iframe.sub.html.ini b/third_party/blink/web_tests/external/wpt/content-security-policy/inheritance/history-iframe.sub.html.ini
deleted file mode 100644
index 62a339e..0000000
--- a/third_party/blink/web_tests/external/wpt/content-security-policy/inheritance/history-iframe.sub.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[history-iframe.sub.html]
-  expected:
-    if os == "win": TIMEOUT

third_party/blink/web_tests/external/wpt/cookie-store/cookieStore_set_arguments.https.any.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/cookie-store/cookieStore_set_arguments.https.any.js.ini b/third_party/blink/web_tests/external/wpt/cookie-store/cookieStore_set_arguments.https.any.js.ini
index a1ab72a..3cb3ddf 100644
--- a/third_party/blink/web_tests/external/wpt/cookie-store/cookieStore_set_arguments.https.any.js.ini
+++ b/third_party/blink/web_tests/external/wpt/cookie-store/cookieStore_set_arguments.https.any.js.ini
@@ -1,6 +1,4 @@
 [cookieStore_set_arguments.https.any.serviceworker.html]
-
-[cookieStore_set_arguments.https.any.html]
   [cookieStore.set with expires set to a future Date]
     expected:
       if os == "win": [PASS, FAIL]
@@ -8,3 +6,13 @@
   [cookieStore.set with expires set to a future timestamp]
     expected:
       if os == "win": [PASS, FAIL]
+
+
+[cookieStore_set_arguments.https.any.html]
+  [cookieStore.set with expires set to a future Date]
+    expected:
+      if os == "win": FAIL
+
+  [cookieStore.set with expires set to a future timestamp]
+    expected:
+      if os == "win": FAIL

third_party/blink/web_tests/external/wpt/cookies/samesite/form-post-blank-reload.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/cookies/samesite/form-post-blank-reload.https.html.ini b/third_party/blink/web_tests/external/wpt/cookies/samesite/form-post-blank-reload.https.html.ini
index cff3fc4..25c3e4a 100644
--- a/third_party/blink/web_tests/external/wpt/cookies/samesite/form-post-blank-reload.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/cookies/samesite/form-post-blank-reload.https.html.ini
@@ -1,5 +1,5 @@
 [form-post-blank-reload.https.html]
   expected:
-    if product == "chrome": [OK, ERROR]
+    if product == "chrome": ERROR
   [Reloaded cross-site top-level form POSTs are strictly same-site]
     expected: FAIL

third_party/blink/web_tests/external/wpt/credential-management/fedcm-network-requests.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/credential-management/fedcm-network-requests.https.html.ini b/third_party/blink/web_tests/external/wpt/credential-management/fedcm-network-requests.https.html.ini
index 14f5926..d272c84 100644
--- a/third_party/blink/web_tests/external/wpt/credential-management/fedcm-network-requests.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/credential-management/fedcm-network-requests.https.html.ini
@@ -1,7 +1,7 @@
 [fedcm-network-requests.https.html]
   expected:
-    if (product == "content_shell") and (os == "win"): [OK, TIMEOUT]
-    if product == "chrome": TIMEOUT
+    if (os == "linux") and (product == "chrome"): TIMEOUT
+    if os == "win": TIMEOUT
   [nonce is not required in FederatedIdentityProvider.]
     expected:
       if product == "chrome": NOTRUN

third_party/blink/web_tests/external/wpt/css/css-animations/Element-getAnimations-dynamic-changes.tentative.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-animations/Element-getAnimations-dynamic-changes.tentative.html.ini b/third_party/blink/web_tests/external/wpt/css/css-animations/Element-getAnimations-dynamic-changes.tentative.html.ini
index 42b61d6f..cd79bce 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-animations/Element-getAnimations-dynamic-changes.tentative.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/css-animations/Element-getAnimations-dynamic-changes.tentative.html.ini
@@ -7,7 +7,3 @@
 
   [Animation state is preserved when interleaving animations in list]
     expected: FAIL
-
-  [Animations preserve their startTime when changed]
-    expected:
-      if product == "chrome": [FAIL, PASS]

third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/nested-query-containers.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/nested-query-containers.html.ini b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/nested-query-containers.html.ini
index 076a237..e92a5bb1 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/nested-query-containers.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/nested-query-containers.html.ini
@@ -1,2 +1,4 @@
 [nested-query-containers.html]
-  expected: CRASH
+  expected:
+    if os == "win": [TIMEOUT, CRASH]
+    CRASH

third_party/blink/web_tests/external/wpt/css/css-flexbox/image-as-flexitem-size-001v.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-flexbox/image-as-flexitem-size-001v.html.ini b/third_party/blink/web_tests/external/wpt/css/css-flexbox/image-as-flexitem-size-001v.html.ini
index f494a6e..edcb2d8 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-flexbox/image-as-flexitem-size-001v.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/css-flexbox/image-as-flexitem-size-001v.html.ini
@@ -2,35 +2,3 @@
   [.flexbox > img 4]
     expected:
       if flag_specific == "disable-layout-ng": FAIL
-
-  [.flexbox > img 12]
-    expected:
-      if flag_specific == "disable-layout-ng": FAIL
-
-  [.flexbox > img 14]
-    expected:
-      if flag_specific == "disable-layout-ng": FAIL
-
-  [.flexbox > img 11]
-    expected:
-      if flag_specific == "disable-layout-ng": FAIL
-
-  [.flexbox > img 7]
-    expected:
-      if flag_specific == "disable-layout-ng": FAIL
-
-  [.flexbox > img 9]
-    expected:
-      if flag_specific == "disable-layout-ng": FAIL
-
-  [.flexbox > img 6]
-    expected:
-      if flag_specific == "disable-layout-ng": FAIL
-
-  [.flexbox > img 10]
-    expected:
-      if flag_specific == "disable-layout-ng": FAIL
-
-  [.flexbox > img 1]
-    expected:
-      if flag_specific == "disable-layout-ng": FAIL

third_party/blink/web_tests/external/wpt/css/css-grid/subgrid/subgrid-baseline-002.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-grid/subgrid/subgrid-baseline-002.html.ini b/third_party/blink/web_tests/external/wpt/css/css-grid/subgrid/subgrid-baseline-002.html.ini
index c8f5d5e..4300e380 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-grid/subgrid/subgrid-baseline-002.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/css-grid/subgrid/subgrid-baseline-002.html.ini
@@ -1,2 +1,4 @@
 [subgrid-baseline-002.html]
-  expected: CRASH
+  expected:
+    if os == "win": [TIMEOUT, CRASH]
+    CRASH

third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/Initial-letter-breaking-rtl.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/Initial-letter-breaking-rtl.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/Initial-letter-breaking-rtl.html.ini
index 9451204..46ebc05b 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/Initial-letter-breaking-rtl.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/Initial-letter-breaking-rtl.html.ini
@@ -1,4 +1,3 @@
 [Initial-letter-breaking-rtl.html]
   expected:
-    if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL
-    if (os == "linux") and (product == "chrome"): FAIL
+    if flag_specific == "disable-layout-ng": FAIL

third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-tall.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-tall.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-tall.html.ini
index 38527a1d..8a8fc7e3 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-tall.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-tall.html.ini
@@ -1,4 +1,3 @@
 [initial-letter-block-position-drop-under-ruby-tall.html]
   expected:
-    if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL
-    if (os == "linux") and (product == "chrome"): FAIL
+    if flag_specific == "disable-layout-ng": FAIL

third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial-vrl.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial-vrl.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial-vrl.html.ini
index 90a6105fa..8708447 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial-vrl.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial-vrl.html.ini
@@ -1,4 +1,3 @@
 [initial-letter-drop-initial-vrl.html]
   expected:
-    if (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL
-    if product == "chrome": FAIL
+    if flag_specific == "disable-layout-ng": FAIL

third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial.html.ini
index bda49d3..497ccbc 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial.html.ini
@@ -1,4 +1,3 @@
 [initial-letter-drop-initial.html]
   expected:
-    if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL
-    if (os == "linux") and (product == "chrome"): FAIL
+    if flag_specific == "disable-layout-ng": FAIL

third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001-vlr.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001-vlr.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001-vlr.html.ini
index 72b9d1f..bd18bc0 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001-vlr.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001-vlr.html.ini
@@ -1,3 +1,4 @@
 [initial-letter-float-001-vlr.html]
   expected:
-    if flag_specific == "disable-layout-ng": FAIL
+    if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL
+    if (os == "linux") and (product == "chrome"): FAIL

third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001-vrl.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001-vrl.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001-vrl.html.ini
index ff51dd5..a18c546 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001-vrl.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001-vrl.html.ini
@@ -1,4 +1,3 @@
 [initial-letter-float-001-vrl.html]
   expected:
-    if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL
-    if (os == "linux") and (product == "chrome"): FAIL
+    if flag_specific == "disable-layout-ng": FAIL

third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001.html.ini
index 4b45bbf..ae13c19 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001.html.ini
@@ -1,3 +1,4 @@
 [initial-letter-float-001.html]
   expected:
-    if flag_specific == "disable-layout-ng": FAIL
+    if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL
+    if (os == "linux") and (product == "chrome"): FAIL

third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-indentation.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-indentation.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-indentation.html.ini
index 2f25a7a..fbc24c2 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-indentation.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-indentation.html.ini
@@ -1,4 +1,4 @@
 [initial-letter-indentation.html]
   expected:
-    if (flag_specific == "") and (product == "chrome"): [PASS, FAIL]
-    if flag_specific == "disable-layout-ng": FAIL
+    if (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL
+    if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-sunken.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-sunken.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-sunken.html.ini
index 0c64a2fd..b0631f92 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-sunken.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-sunken.html.ini
@@ -1,4 +1,3 @@
 [initial-letter-raised-sunken-caps-sunken.html]
   expected:
-    if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL
-    if (os == "linux") and (product == "chrome"): FAIL
+    if flag_specific == "disable-layout-ng": FAIL

third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-sunk-initial-vrl.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-sunk-initial-vrl.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-sunk-initial-vrl.html.ini
index 77a501b5..145423c1 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-sunk-initial-vrl.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-sunk-initial-vrl.html.ini
@@ -1,3 +1,4 @@
 [initial-letter-sunk-initial-vrl.html]
   expected:
-    if flag_specific == "disable-layout-ng": FAIL
+    if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL
+    if (os == "linux") and (product == "chrome"): FAIL

third_party/blink/web_tests/external/wpt/css/css-layout-api/edges/border-vlr-rtl.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-layout-api/edges/border-vlr-rtl.https.html.ini b/third_party/blink/web_tests/external/wpt/css/css-layout-api/edges/border-vlr-rtl.https.html.ini
new file mode 100644
index 0000000..8bfb81d
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-layout-api/edges/border-vlr-rtl.https.html.ini
@@ -0,0 +1,3 @@
+[border-vlr-rtl.https.html]
+  expected:
+    if os == "win": [PASS, TIMEOUT]

third_party/blink/web_tests/external/wpt/css/css-multicol/getclientrects-001.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-multicol/getclientrects-001.html.ini b/third_party/blink/web_tests/external/wpt/css/css-multicol/getclientrects-001.html.ini
index 38d7beae..1d32d95 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-multicol/getclientrects-001.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/css-multicol/getclientrects-001.html.ini
@@ -1,24 +1,24 @@
 [getclientrects-001.html]
   [horizontal-tb ltr]
     expected:
-      if product == "chrome": [PASS, FAIL]
+      if product == "chrome": FAIL
 
   [vertical-lr ltr]
     expected:
-      if product == "chrome": [PASS, FAIL]
+      if product == "chrome": FAIL
 
   [vertical-rl ltr]
     expected:
-      if product == "chrome": [PASS, FAIL]
+      if product == "chrome": FAIL
 
   [horizontal-tb rtl]
     expected:
-      if product == "chrome": [PASS, FAIL]
+      if product == "chrome": FAIL
 
   [vertical-lr rtl]
     expected:
-      if product == "chrome": [PASS, FAIL]
+      if product == "chrome": FAIL
 
   [vertical-rl rtl]
     expected:
-      if product == "chrome": [PASS, FAIL]
+      if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/css/css-overflow/scrollable-overflow-input-001.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-overflow/scrollable-overflow-input-001.html.ini b/third_party/blink/web_tests/external/wpt/css/css-overflow/scrollable-overflow-input-001.html.ini
index 0fd1d59..6351a3d 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-overflow/scrollable-overflow-input-001.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/css-overflow/scrollable-overflow-input-001.html.ini
@@ -1,4 +1,3 @@
 [scrollable-overflow-input-001.html]
   expected:
-    if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL
-    if (os == "linux") and (product == "chrome"): FAIL
+    if flag_specific == "disable-layout-ng": FAIL

third_party/blink/web_tests/external/wpt/css/css-paint-api/parse-input-arguments-005.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-paint-api/parse-input-arguments-005.https.html.ini b/third_party/blink/web_tests/external/wpt/css/css-paint-api/parse-input-arguments-005.https.html.ini
deleted file mode 100644
index e61017d..0000000
--- a/third_party/blink/web_tests/external/wpt/css/css-paint-api/parse-input-arguments-005.https.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[parse-input-arguments-005.https.html]
-  expected:
-    if os == "win": TIMEOUT

third_party/blink/web_tests/external/wpt/css/css-ruby/ruby-text-combine-upright-001b.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-ruby/ruby-text-combine-upright-001b.html.ini b/third_party/blink/web_tests/external/wpt/css/css-ruby/ruby-text-combine-upright-001b.html.ini
deleted file mode 100644
index 654ce46..0000000
--- a/third_party/blink/web_tests/external/wpt/css/css-ruby/ruby-text-combine-upright-001b.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[ruby-text-combine-upright-001b.html]
-  expected:
-    if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/css/css-text/text-transform/text-transform-capitalize-005.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-text/text-transform/text-transform-capitalize-005.html.ini b/third_party/blink/web_tests/external/wpt/css/css-text/text-transform/text-transform-capitalize-005.html.ini
new file mode 100644
index 0000000..c06d2b0
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/text-transform/text-transform-capitalize-005.html.ini
@@ -0,0 +1,3 @@
+[text-transform-capitalize-005.html]
+  expected:
+    if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/css/css-text/text-transform/text-transform-capitalize-016.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-text/text-transform/text-transform-capitalize-016.html.ini b/third_party/blink/web_tests/external/wpt/css/css-text/text-transform/text-transform-capitalize-016.html.ini
deleted file mode 100644
index 869d317..0000000
--- a/third_party/blink/web_tests/external/wpt/css/css-text/text-transform/text-transform-capitalize-016.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[text-transform-capitalize-016.html]
-  expected:
-    if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/css/css-values/lh-rlh-on-root-001.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-values/lh-rlh-on-root-001.html.ini b/third_party/blink/web_tests/external/wpt/css/css-values/lh-rlh-on-root-001.html.ini
deleted file mode 100644
index a82b5fe7..0000000
--- a/third_party/blink/web_tests/external/wpt/css/css-values/lh-rlh-on-root-001.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[lh-rlh-on-root-001.html]
-  [rlh in line-height on root]
-    expected: FAIL
-
-  [rlh in font-size on root]
-    expected: FAIL
-
-  [2rlh in line-height on root]
-    expected: FAIL
-
-  [2rlh in font-size on root]
-    expected: FAIL

third_party/blink/web_tests/external/wpt/css/cssom-view/scroll-behavior-main-frame-root.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/cssom-view/scroll-behavior-main-frame-root.html.ini b/third_party/blink/web_tests/external/wpt/css/cssom-view/scroll-behavior-main-frame-root.html.ini
index 7cbc5c3f..89c7c0b 100644
--- a/third_party/blink/web_tests/external/wpt/css/cssom-view/scroll-behavior-main-frame-root.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/cssom-view/scroll-behavior-main-frame-root.html.ini
@@ -8,44 +8,68 @@
 
   [Main frame with smooth scroll-behavior ; scrollBy() with default behavior]
     expected:
-      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": [FAIL, PASS]
 
   [Main frame with auto scroll-behavior ; scrollIntoView() with smooth behavior]
     expected:
-      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": [FAIL, PASS]
 
   [Main frame with smooth scroll-behavior ; scroll() with smooth behavior]
     expected:
-      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": [FAIL, PASS]
 
   [Main frame with smooth scroll-behavior ; scrollTo() with auto behavior]
     expected:
-      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": [FAIL, PASS]
 
   [Main frame with auto scroll-behavior ; scrollBy() with smooth behavior]
     expected:
-      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": [FAIL, PASS]
 
   [Main frame with smooth scroll-behavior ; scrollBy() with auto behavior]
     expected:
-      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": [FAIL, PASS]
 
   [Main frame with auto scroll-behavior ; scroll() with smooth behavior]
     expected:
-      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": [FAIL, PASS]
 
   [Main frame with smooth scroll-behavior ; scrollTo() with default behavior]
     expected:
-      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": [FAIL, PASS]
 
   [Main frame with auto scroll-behavior ; scrollTo() with smooth behavior]
     expected:
-      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": [FAIL, PASS]
 
   [Main frame with smooth scroll-behavior ; scroll() with default behavior]
     expected:
-      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": [FAIL, PASS]
 
   [Main frame with smooth scroll-behavior ; scroll() with auto behavior]
     expected:
-      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": [FAIL, PASS]
+
+  [Set scrollLeft to frame with smooth scroll-behavior]
+    expected:
+      if flag_specific == "disable-layout-ng": [FAIL, PASS]
+
+  [Main frame with smooth scroll-behavior ; scrollIntoView() with auto behavior]
+    expected:
+      if flag_specific == "disable-layout-ng": [FAIL, PASS]
+
+  [Set scrollTop to frame with smooth scroll-behavior]
+    expected:
+      if flag_specific == "disable-layout-ng": [FAIL, PASS]
+
+  [Main frame with smooth scroll-behavior ; scrollBy() with smooth behavior]
+    expected:
+      if flag_specific == "disable-layout-ng": [FAIL, PASS]
+
+  [Main frame with smooth scroll-behavior ; scrollIntoView() with smooth behavior]
+    expected:
+      if flag_specific == "disable-layout-ng": FAIL
+
+  [Main frame with smooth scroll-behavior ; scrollIntoView() with default behavior]
+    expected:
+      if flag_specific == "disable-layout-ng": [FAIL, PASS]

third_party/blink/web_tests/external/wpt/css/printing/input-file-print.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/printing/input-file-print.html.ini b/third_party/blink/web_tests/external/wpt/css/printing/input-file-print.html.ini
deleted file mode 100644
index 1ec656f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/printing/input-file-print.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[input-file-print.html]
-  expected:
-    if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/custom-elements/form-associated/ElementInternals-target-element-is-held-strongly.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/custom-elements/form-associated/ElementInternals-target-element-is-held-strongly.html.ini b/third_party/blink/web_tests/external/wpt/custom-elements/form-associated/ElementInternals-target-element-is-held-strongly.html.ini
index 64240c7..d33171c 100644
--- a/third_party/blink/web_tests/external/wpt/custom-elements/form-associated/ElementInternals-target-element-is-held-strongly.html.ini
+++ b/third_party/blink/web_tests/external/wpt/custom-elements/form-associated/ElementInternals-target-element-is-held-strongly.html.ini
@@ -1,3 +1,4 @@
 [ElementInternals-target-element-is-held-strongly.html]
   expected:
+    if (os == "linux") and (flag_specific == "disable-site-isolation-trials"): [OK, TIMEOUT]
     if os == "win": TIMEOUT

third_party/blink/web_tests/external/wpt/dom/ranges/Range-mutations-dataChange.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/dom/ranges/Range-mutations-dataChange.html.ini b/third_party/blink/web_tests/external/wpt/dom/ranges/Range-mutations-dataChange.html.ini
deleted file mode 100644
index 7158a50..0000000
--- a/third_party/blink/web_tests/external/wpt/dom/ranges/Range-mutations-dataChange.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[Range-mutations-dataChange.html]
-  expected:
-    if flag_specific == "disable-site-isolation-trials": CRASH

third_party/blink/web_tests/external/wpt/domparsing/DOMParser-parseFromString-html.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/domparsing/DOMParser-parseFromString-html.html.ini b/third_party/blink/web_tests/external/wpt/domparsing/DOMParser-parseFromString-html.html.ini
new file mode 100644
index 0000000..ebdd141
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/domparsing/DOMParser-parseFromString-html.html.ini
@@ -0,0 +1,3 @@
+[DOMParser-parseFromString-html.html]
+  expected:
+    if flag_specific == "disable-site-isolation-trials": [OK, CRASH]

third_party/blink/web_tests/external/wpt/editing/run/delete.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/editing/run/delete.html.ini b/third_party/blink/web_tests/external/wpt/editing/run/delete.html.ini
index 5ad7606..bdfee2d62 100644
--- a/third_party/blink/web_tests/external/wpt/editing/run/delete.html.ini
+++ b/third_party/blink/web_tests/external/wpt/editing/run/delete.html.ini
@@ -1,6 +1,4 @@
 [delete.html?7001-last]
-  expected:
-    if flag_specific == "disable-site-isolation-trials": [OK, CRASH]
   [[["delete",""\]\] "<div style=white-space:pre-line>foo\\n\\n[\]bar</div>" compare innerHTML]
     expected: FAIL
 
@@ -257,6 +255,8 @@
 
 
 [delete.html?2001-3000]
+  expected:
+    if flag_specific == "disable-layout-ng": [OK, CRASH]
   [[["delete",""\]\] "foo<blockquote>[\]bar</blockquote>" compare innerHTML]
     expected: FAIL
 

third_party/blink/web_tests/external/wpt/element-timing/observe-multiple-images.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/element-timing/observe-multiple-images.html.ini b/third_party/blink/web_tests/external/wpt/element-timing/observe-multiple-images.html.ini
index 798b155..ee951be 100644
--- a/third_party/blink/web_tests/external/wpt/element-timing/observe-multiple-images.html.ini
+++ b/third_party/blink/web_tests/external/wpt/element-timing/observe-multiple-images.html.ini
@@ -1,4 +1,4 @@
 [observe-multiple-images.html]
   [PerformanceObserver can observe multiple image elements.]
     expected:
-      if flag_specific == "disable-layout-ng": FAIL
+      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]

third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/shift_jis/sjis-decode-ms_kanji.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/shift_jis/sjis-decode-ms_kanji.html.ini b/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/shift_jis/sjis-decode-ms_kanji.html.ini
index e8a7100..e960136 100644
--- a/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/shift_jis/sjis-decode-ms_kanji.html.ini
+++ b/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/shift_jis/sjis-decode-ms_kanji.html.ini
@@ -8,7 +8,7 @@
 
 [sjis-decode-ms_kanji.html?2001-3000]
   expected:
-    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, CRASH]
+    if os == "win": [OK, CRASH]
 
 [sjis-decode-ms_kanji.html?7001-last]
 

third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms_kanji.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms_kanji.html.ini b/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms_kanji.html.ini
index 208a24a..28f076c 100644
--- a/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms_kanji.html.ini
+++ b/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-ms_kanji.html.ini
@@ -1,8 +1,6 @@
 [sjis-encode-form-ms_kanji.html?6001-7000]
 
 [sjis-encode-form-ms_kanji.html?3001-4000]
-  expected:
-    if os == "win": [OK, CRASH]
 
 [sjis-encode-form-ms_kanji.html?4001-5000]
 
@@ -11,6 +9,8 @@
 [sjis-encode-form-ms_kanji.html?5001-6000]
 
 [sjis-encode-form-ms_kanji.html?7001-last]
+  expected:
+    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, CRASH]
 
 [sjis-encode-form-ms_kanji.html?1001-2000]
 

third_party/blink/web_tests/external/wpt/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc_5601.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc_5601.html.ini b/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc_5601.html.ini
index b32f0b49..6734861 100644
--- a/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc_5601.html.ini
+++ b/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc_5601.html.ini
@@ -1,4 +1,6 @@
 [euckr-encode-form-ksc_5601.html?17001-last]
+  expected:
+    if flag_specific == "disable-layout-ng": [OK, CRASH]
 
 [euckr-encode-form-ksc_5601.html?11001-12000]
 
@@ -17,8 +19,6 @@
 [euckr-encode-form-ksc_5601.html?9001-10000]
 
 [euckr-encode-form-ksc_5601.html?2001-3000]
-  expected:
-    if flag_specific == "disable-layout-ng": [OK, CRASH]
 
 [euckr-encode-form-ksc_5601.html?15001-16000]
 

third_party/blink/web_tests/external/wpt/encoding/unsupported-labels.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/encoding/unsupported-labels.window.js.ini b/third_party/blink/web_tests/external/wpt/encoding/unsupported-labels.window.js.ini
index 090aad90..1b76ac5 100644
--- a/third_party/blink/web_tests/external/wpt/encoding/unsupported-labels.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/encoding/unsupported-labels.window.js.ini
@@ -1,5 +1,7 @@
 [unsupported-labels.window.html]
-  expected: TIMEOUT
+  expected:
+    if product == "chrome": OK
+    TIMEOUT
   [_autodetect_all is not supported by the Encoding Standard]
     expected: [PASS, TIMEOUT]
 

third_party/blink/web_tests/external/wpt/fetch/api/abort/general.any.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/fetch/api/abort/general.any.js.ini b/third_party/blink/web_tests/external/wpt/fetch/api/abort/general.any.js.ini
index e728925..a70485c8c 100644
--- a/third_party/blink/web_tests/external/wpt/fetch/api/abort/general.any.js.ini
+++ b/third_party/blink/web_tests/external/wpt/fetch/api/abort/general.any.js.ini
@@ -30,6 +30,10 @@
   [Readable stream synchronously cancels with AbortError if aborted before reading]
     expected: FAIL
 
+  [Stream errors once aborted. Underlying connection closed.]
+    expected:
+      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+
 
 [general.any.worker.html]
   [Aborting rejects with abort reason]
@@ -40,7 +44,3 @@
 
   [Readable stream synchronously cancels with AbortError if aborted before reading]
     expected: FAIL
-
-  [Stream errors once aborted, after reading. Underlying connection closed.]
-    expected:
-      if flag_specific == "disable-layout-ng": [PASS, FAIL]

third_party/blink/web_tests/external/wpt/fetch/metadata/generated/window-history.https.sub.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/fetch/metadata/generated/window-history.https.sub.html.ini b/third_party/blink/web_tests/external/wpt/fetch/metadata/generated/window-history.https.sub.html.ini
index 8c7e93e..f5c7bcb5 100644
--- a/third_party/blink/web_tests/external/wpt/fetch/metadata/generated/window-history.https.sub.html.ini
+++ b/third_party/blink/web_tests/external/wpt/fetch/metadata/generated/window-history.https.sub.html.ini
@@ -1,3 +1,3 @@
 [window-history.https.sub.html]
   expected:
-    if flag_specific == "disable-layout-ng": [OK, TIMEOUT]
+    if (flag_specific == "") and (os == "win"): [OK, TIMEOUT]

third_party/blink/web_tests/external/wpt/fetch/private-network-access/iframe.tentative.https.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/fetch/private-network-access/iframe.tentative.https.window.js.ini b/third_party/blink/web_tests/external/wpt/fetch/private-network-access/iframe.tentative.https.window.js.ini
index 890cec5a..abc126ce 100644
--- a/third_party/blink/web_tests/external/wpt/fetch/private-network-access/iframe.tentative.https.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/fetch/private-network-access/iframe.tentative.https.window.js.ini
@@ -1,6 +1,4 @@
 [iframe.tentative.https.window.html]
-  expected:
-    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): TIMEOUT
   [private to local: success.]
     expected: FAIL
 

third_party/blink/web_tests/external/wpt/fetch/private-network-access/service-worker-background-fetch.https.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/fetch/private-network-access/service-worker-background-fetch.https.window.js.ini b/third_party/blink/web_tests/external/wpt/fetch/private-network-access/service-worker-background-fetch.https.window.js.ini
index 3814b1c..82a91238 100644
--- a/third_party/blink/web_tests/external/wpt/fetch/private-network-access/service-worker-background-fetch.https.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/fetch/private-network-access/service-worker-background-fetch.https.window.js.ini
@@ -1,11 +1,12 @@
 [service-worker-background-fetch.https.window.html]
   [local to local: success.]
     expected:
+      if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]
       if product == "chrome": FAIL
 
   [private to local: success.]
     expected:
-      if (product == "content_shell") and (flag_specific == "") and (os == "linux"): [PASS, FAIL]
+      if (product == "content_shell") and (flag_specific == "") and (os == "linux"): FAIL
       if product == "chrome": FAIL
 
   [private to private: success.]
@@ -14,11 +15,11 @@
 
   [public to local: success.]
     expected:
-      if (flag_specific == "") and (product == "chrome"): FAIL
+      if product == "chrome": FAIL
 
   [public to private: success.]
     expected:
-      if (flag_specific == "") and (product == "chrome"): FAIL
+      if product == "chrome": FAIL
 
   [public to public: success.]
     expected:

third_party/blink/web_tests/external/wpt/fetch/private-network-access/service-worker-fetch.https.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/fetch/private-network-access/service-worker-fetch.https.window.js.ini b/third_party/blink/web_tests/external/wpt/fetch/private-network-access/service-worker-fetch.https.window.js.ini
new file mode 100644
index 0000000..8ad3d983
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/fetch/private-network-access/service-worker-fetch.https.window.js.ini
@@ -0,0 +1,3 @@
+[service-worker-fetch.https.window.html]
+  expected:
+    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, TIMEOUT]

third_party/blink/web_tests/external/wpt/fetch/stale-while-revalidate/stale-css.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/fetch/stale-while-revalidate/stale-css.html.ini b/third_party/blink/web_tests/external/wpt/fetch/stale-while-revalidate/stale-css.html.ini
index b381a10..957be33 100644
--- a/third_party/blink/web_tests/external/wpt/fetch/stale-while-revalidate/stale-css.html.ini
+++ b/third_party/blink/web_tests/external/wpt/fetch/stale-while-revalidate/stale-css.html.ini
@@ -1,5 +1,5 @@
 [stale-css.html]
   [Cache returns stale resource]
     expected:
-      if (product == "content_shell") and (flag_specific == "disable-layout-ng"): [PASS, FAIL]
-      if product == "chrome": FAIL
+      if (flag_specific == "") and (product == "chrome"): FAIL
+      if flag_specific == "disable-layout-ng": FAIL

third_party/blink/web_tests/external/wpt/focus/focus-already-focused-iframe-same-site.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/focus/focus-already-focused-iframe-same-site.html.ini b/third_party/blink/web_tests/external/wpt/focus/focus-already-focused-iframe-same-site.html.ini
index 4f0bb0c..cd78228 100644
--- a/third_party/blink/web_tests/external/wpt/focus/focus-already-focused-iframe-same-site.html.ini
+++ b/third_party/blink/web_tests/external/wpt/focus/focus-already-focused-iframe-same-site.html.ini
@@ -1,2 +1,4 @@
 [focus-already-focused-iframe-same-site.html]
-  expected: TIMEOUT
+  expected:
+    if flag_specific == "disable-site-isolation-trials": [TIMEOUT, CRASH]
+    TIMEOUT

third_party/blink/web_tests/external/wpt/focus/iframe-focus-with-different-site-intermediate-frame.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/focus/iframe-focus-with-different-site-intermediate-frame.html.ini b/third_party/blink/web_tests/external/wpt/focus/iframe-focus-with-different-site-intermediate-frame.html.ini
index 5019503..3dbc2c45 100644
--- a/third_party/blink/web_tests/external/wpt/focus/iframe-focus-with-different-site-intermediate-frame.html.ini
+++ b/third_party/blink/web_tests/external/wpt/focus/iframe-focus-with-different-site-intermediate-frame.html.ini
@@ -1,5 +1,5 @@
 [iframe-focus-with-different-site-intermediate-frame.html]
   expected:
-    if flag_specific == "disable-site-isolation-trials": [OK, CRASH]
+    if flag_specific == "disable-site-isolation-trials": CRASH
   [Check result]
     expected: FAIL

third_party/blink/web_tests/external/wpt/fs/FileSystemFileHandle-create-sync-access-handle.https.tentative.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/fs/FileSystemFileHandle-create-sync-access-handle.https.tentative.window.js.ini b/third_party/blink/web_tests/external/wpt/fs/FileSystemFileHandle-create-sync-access-handle.https.tentative.window.js.ini
index c3348a5c..b46450f 100644
--- a/third_party/blink/web_tests/external/wpt/fs/FileSystemFileHandle-create-sync-access-handle.https.tentative.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/fs/FileSystemFileHandle-create-sync-access-handle.https.tentative.window.js.ini
@@ -1,4 +1,4 @@
 [FileSystemFileHandle-create-sync-access-handle.https.tentative.window.html]
   [Attempt to create a sync access handle.]
     expected:
-      if os == "win": [PASS, FAIL]
+      if (os == "linux") and (product == "chrome"): [PASS, FAIL]

third_party/blink/web_tests/external/wpt/html/anonymous-iframe/embedding.tentative.https.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/anonymous-iframe/embedding.tentative.https.window.js.ini b/third_party/blink/web_tests/external/wpt/html/anonymous-iframe/embedding.tentative.https.window.js.ini
index 0df41291..5600c7c8 100644
--- a/third_party/blink/web_tests/external/wpt/html/anonymous-iframe/embedding.tentative.https.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/html/anonymous-iframe/embedding.tentative.https.window.js.ini
@@ -17,8 +17,6 @@
     if product == "chrome": ERROR
 
 [embedding.tentative.https.window.html?11-11]
-  expected:
-    if product == "chrome": [OK, ERROR]
 
 [embedding.tentative.https.window.html?5-5]
 
@@ -29,21 +27,17 @@
 [embedding.tentative.https.window.html?7-7]
 
 [embedding.tentative.https.window.html?10-10]
-
-[embedding.tentative.https.window.html?2-2]
   expected:
     if product == "chrome": [OK, ERROR]
 
+[embedding.tentative.https.window.html?2-2]
+
 [embedding.tentative.https.window.html?12-12]
 
 [embedding.tentative.https.window.html?4-4]
 
 [embedding.tentative.https.window.html?8-8]
-  expected:
-    if product == "chrome": [OK, ERROR]
 
 [embedding.tentative.https.window.html?3-3]
-  expected:
-    if product == "chrome": ERROR
 
 [embedding.tentative.https.window.html?9-9]

third_party/blink/web_tests/external/wpt/html/browsers/browsing-the-web/back-forward-cache/eligibility/broadcast-channel.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/browsing-the-web/back-forward-cache/eligibility/broadcast-channel.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/browsing-the-web/back-forward-cache/eligibility/broadcast-channel.html.ini
index e423a5b6..d597d3d 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/browsing-the-web/back-forward-cache/eligibility/broadcast-channel.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/browsing-the-web/back-forward-cache/eligibility/broadcast-channel.html.ini
@@ -4,5 +4,5 @@
 
   [Eligibility (BroadcastChannel closed in the pagehide event)]
     expected:
-      if (product == "content_shell") and (os == "win"): [PASS, PRECONDITION_FAILED]
-      if product == "chrome": PRECONDITION_FAILED
+      if (os == "linux") and (product == "chrome"): PRECONDITION_FAILED
+      if os == "win": PRECONDITION_FAILED

third_party/blink/web_tests/external/wpt/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-cross-document-traversal.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-cross-document-traversal.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-cross-document-traversal.html.ini
index dfb8578..b5b7f69 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-cross-document-traversal.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-cross-document-traversal.html.ini
@@ -1,7 +1,7 @@
 [same-document-traversal-cross-document-traversal.html]
   expected:
-    if flag_specific == "disable-layout-ng": [OK, TIMEOUT]
-    if flag_specific == "disable-site-isolation-trials": [OK, TIMEOUT]
+    if (flag_specific == "") and (os == "win"): [OK, TIMEOUT]
+    if flag_specific == "disable-layout-ng": TIMEOUT
   [traversals in the same (back) direction: queued up]
     expected: [PASS, TIMEOUT]
 

third_party/blink/web_tests/external/wpt/html/browsers/history/the-history-interface/history_back_cross_realm_method.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/history/the-history-interface/history_back_cross_realm_method.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/history/the-history-interface/history_back_cross_realm_method.html.ini
index 0455640..036c330b 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/history/the-history-interface/history_back_cross_realm_method.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/history/the-history-interface/history_back_cross_realm_method.html.ini
@@ -1,3 +1,3 @@
 [history_back_cross_realm_method.html]
   expected:
-    if flag_specific == "disable-layout-ng": [OK, CRASH]
+    if flag_specific == "disable-layout-ng": CRASH

third_party/blink/web_tests/external/wpt/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
index ac462d6..fc6898e6 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
@@ -4,5 +4,5 @@
 
   [Set data URL frame location.protocol to data]
     expected:
-      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if (flag_specific == "") and (product == "content_shell"): PASS
       FAIL

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html.ini
new file mode 100644
index 0000000..25b59d5
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yes-subdomain.sub.https.html.ini
@@ -0,0 +1,8 @@
+[parent-no-child-yes-subdomain.sub.https.html]
+  [setting document.domain must not give sync access]
+    expected:
+      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
+
+  [child: originAgentCluster must equal true]
+    expected:
+      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html.ini
deleted file mode 100644
index d15b316..0000000
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[parent-no-child-yeswithparams-subdomain.sub.https.html]
-  [setting document.domain must not give sync access]
-    expected:
-      if flag_specific == "disable-site-isolation-trials": FAIL
-
-  [child: originAgentCluster must equal true]
-    expected:
-      if flag_specific == "disable-site-isolation-trials": FAIL

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.ini
index 5383b4d..5504eb1 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-port.sub.https.html.ini
@@ -1,10 +1,8 @@
 [parent-yes-child-no-port.sub.https.html]
   [setting document.domain must not give sync access]
     expected:
-      if (flag_specific == "") and (product == "chrome"): FAIL
-      if flag_specific == "disable-site-isolation-trials": FAIL
+      if product == "chrome": FAIL
 
   [parent: originAgentCluster must equal true]
     expected:
-      if (flag_specific == "") and (product == "chrome"): FAIL
-      if flag_specific == "disable-site-isolation-trials": FAIL
+      if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.ini
index c6fbd89..19af2dda 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.ini
@@ -1,14 +1,17 @@
 [parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html]
   [Parent to child1: setting document.domain must not give sync access]
     expected:
+      if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]
       if product == "chrome": FAIL
 
   [Parent to child2: setting document.domain must not give sync access]
     expected:
+      if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]
       if product == "chrome": FAIL
 
   [parent: originAgentCluster must equal true]
     expected:
+      if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]
       if product == "chrome": FAIL
 
   [child2: originAgentCluster must equal false]

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.ini
index 0ac9250..8f4b5ee 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.ini
@@ -13,15 +13,12 @@
 
   [parent: originAgentCluster must equal true]
     expected:
-      if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]
-      if product == "chrome": FAIL
+      if flag_specific == "disable-site-isolation-trials": FAIL
 
   [Parent to child1: setting document.domain must not give sync access]
     expected:
-      if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]
-      if product == "chrome": FAIL
+      if flag_specific == "disable-site-isolation-trials": FAIL
 
   [Parent to child2: setting document.domain must not give sync access]
     expected:
-      if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]
-      if product == "chrome": FAIL
+      if flag_specific == "disable-site-isolation-trials": FAIL

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.ini
deleted file mode 100644
index ba2d6b6..0000000
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html]
-  [Parent to child1: setting document.domain must not give sync access]
-    expected:
-      if flag_specific == "disable-site-isolation-trials": FAIL
-
-  [parent: originAgentCluster must equal true]
-    expected:
-      if flag_specific == "disable-site-isolation-trials": FAIL

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.ini
index a3efc434..c9174382 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.ini
@@ -1,8 +1,26 @@
 [parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html]
   [Parent to child2: setting document.domain must not give sync access]
     expected:
+      if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]
       if product == "chrome": FAIL
 
   [parent: originAgentCluster must equal true]
     expected:
+      if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]
       if product == "chrome": FAIL
+
+  [Parent to child1: setting document.domain must not give sync access]
+    expected:
+      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
+
+  [child1: originAgentCluster must equal true]
+    expected:
+      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
+
+  [child2 to child1: setting document.domain must not give sync access]
+    expected:
+      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
+
+  [child1 to child2: setting document.domain must not give sync access]
+    expected:
+      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini
index 3735ac72c..8651d29 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini
@@ -1,21 +1,21 @@
 [parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html]
   [parent: originAgentCluster must equal true]
     expected:
-      if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]
-      if product == "chrome": FAIL
+      if (flag_specific == "") and (product == "chrome"): FAIL
+      if flag_specific == "disable-site-isolation-trials": FAIL
 
   [child1: originAgentCluster must equal true]
     expected:
-      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
+      if flag_specific == "disable-site-isolation-trials": FAIL
 
   [child2: originAgentCluster must equal true]
     expected:
-      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
+      if flag_specific == "disable-site-isolation-trials": FAIL
 
   [Parent to child2: setting document.domain must not give sync access]
     expected:
-      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
+      if flag_specific == "disable-site-isolation-trials": FAIL
 
   [Parent to child1: setting document.domain must not give sync access]
     expected:
-      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
+      if flag_specific == "disable-site-isolation-trials": FAIL

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini
index 753d9e5..e3b0508 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini
@@ -1,6 +1,4 @@
 [parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html]
-  expected:
-    if flag_specific == "disable-site-isolation-trials": CRASH
   [parent: originAgentCluster must equal true]
     expected:
       if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.ini
index 869ca53..d4bd404 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.ini
@@ -1,11 +1,4 @@
 [document-domain.sub.https.html]
   [Setting document.domain must not change same-originness]
     expected:
-      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): FAIL
-      if (flag_specific == "") and (os == "linux") and (product == "chrome"): FAIL
-      if (flag_specific == "") and (os == "win"): [PASS, FAIL]
-
-  [Having an origin-keyed subdomain child try to set document.domain must not change the document.domain value it sees]
-    expected:
-      if (os == "linux") and (flag_specific == "") and (product == "content_shell"): FAIL
-      if os == "win": [PASS, FAIL]
+      if (os == "linux") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html.ini
index ec2a502..c8482cb 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html.ini
@@ -1,12 +1,12 @@
 [parent-no-1-no-same-2-yes-port.sub.https.html]
   [before parent: originAgentCluster must equal false]
     expected:
-      if os == "win": [PASS, FAIL]
+      if os == "win": FAIL
 
   [before child: originAgentCluster must equal false]
     expected:
-      if os == "win": [PASS, FAIL]
+      if os == "win": FAIL
 
   [after parent: originAgentCluster must equal false]
     expected:
-      if os == "win": [PASS, FAIL]
+      if os == "win": FAIL

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini
index 8cdf9fa..7d0cf3b 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini
@@ -1,15 +1,24 @@
 [parent-no-1-no-same-2-yes-subdomain.sub.https.html]
   [before parent: originAgentCluster must equal false]
     expected:
-      if (flag_specific == "") and (os == "win"): FAIL
-      if flag_specific == "disable-layout-ng": FAIL
+      if (os == "linux") and (flag_specific == "disable-layout-ng"): [PASS, FAIL]
+      if os == "win": FAIL
 
   [before child: originAgentCluster must equal false]
     expected:
-      if (flag_specific == "") and (os == "win"): FAIL
-      if flag_specific == "disable-layout-ng": FAIL
+      if (os == "linux") and (flag_specific == "disable-layout-ng"): [PASS, FAIL]
+      if os == "win": FAIL
 
   [after parent: originAgentCluster must equal false]
     expected:
-      if (flag_specific == "") and (os == "win"): FAIL
-      if flag_specific == "disable-layout-ng": FAIL
+      if (os == "linux") and (flag_specific == "disable-layout-ng"): [PASS, FAIL]
+      if os == "win": FAIL
+
+  [after child: originAgentCluster must equal true]
+    expected:
+      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
+
+  [After: parent to child: setting document.domain must not give sync access]
+    expected:
+      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini
index 5a2bf36..f45685b 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini
@@ -13,8 +13,12 @@
 
   [before parent: originAgentCluster must equal false]
     expected:
+      if (os == "linux") and (flag_specific == "") and (product == "content_shell"): [PASS, FAIL]
+      if (os == "linux") and (flag_specific == "disable-layout-ng"): [PASS, FAIL]
       if os == "win": FAIL
 
   [after parent: originAgentCluster must equal false]
     expected:
+      if (os == "linux") and (flag_specific == "") and (product == "content_shell"): [PASS, FAIL]
+      if (os == "linux") and (flag_specific == "disable-layout-ng"): [PASS, FAIL]
       if os == "win": FAIL

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini
index 408c430..346f1ce 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini
@@ -1,8 +1,8 @@
 [parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html]
   [Before: parent to child: setting document.domain must give sync access]
     expected:
-      if (flag_specific == "") and (product == "chrome"): PASS
-      if flag_specific == "disable-site-isolation-trials": PASS
+      if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]
+      if product == "chrome": PASS
       FAIL
 
   [before child: originAgentCluster must equal false]
@@ -11,8 +11,10 @@
 
   [before parent: originAgentCluster must equal false]
     expected:
+      if (os == "linux") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]
       if os == "win": FAIL
 
   [after parent: originAgentCluster must equal false]
     expected:
+      if (os == "linux") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]
       if os == "win": FAIL

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini
index ca40622..419e0edd 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini
@@ -1,20 +1,13 @@
 [parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html]
   [After: parent to child: setting document.domain must give sync access]
     expected:
-      if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]
-      if product == "chrome": PASS
+      if (flag_specific == "") and (product == "chrome"): PASS
       FAIL
 
   [before parent: originAgentCluster must equal false]
     expected:
-      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL]
-      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
+      if flag_specific == "disable-site-isolation-trials": FAIL
 
   [after parent: originAgentCluster must equal false]
     expected:
-      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL]
-      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
-
-  [before child: originAgentCluster must equal true]
-    expected:
-      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL]
+      if flag_specific == "disable-site-isolation-trials": FAIL

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini
index 6e7ddbd..65c3674 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini
@@ -1,18 +1,20 @@
 [parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html]
   [before parent: originAgentCluster must equal false]
     expected:
-      if (flag_specific == "") and (os == "win"): [PASS, FAIL]
-      if flag_specific == "disable-layout-ng": FAIL
+      if (os == "linux") and (flag_specific == "") and (product == "content_shell"): [PASS, FAIL]
+      if (os == "linux") and (flag_specific == "disable-layout-ng"): FAIL
 
   [before child: originAgentCluster must equal true]
     expected:
+      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL]
       if flag_specific == "disable-layout-ng": FAIL
 
   [after parent: originAgentCluster must equal false]
     expected:
-      if (flag_specific == "") and (os == "win"): [PASS, FAIL]
-      if flag_specific == "disable-layout-ng": FAIL
+      if (os == "linux") and (flag_specific == "") and (product == "content_shell"): [PASS, FAIL]
+      if (os == "linux") and (flag_specific == "disable-layout-ng"): FAIL
 
   [after child: originAgentCluster must equal true]
     expected:
+      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL]
       if flag_specific == "disable-layout-ng": FAIL

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.ini
index 9f3db00e..62a430f5 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.ini
@@ -1,23 +1,22 @@
 [parent-yes-1-no-same-2-no-port.sub.https.html]
   [before parent: originAgentCluster must equal true]
     expected:
-      if (flag_specific == "") and (product == "content_shell"): PASS
-      FAIL
+      if (flag_specific == "") and (product == "chrome"): FAIL
+      if flag_specific == "disable-layout-ng": FAIL
 
   [before child: originAgentCluster must equal true]
     expected:
-      if (flag_specific == "") and (product == "content_shell"): PASS
-      FAIL
+      if (flag_specific == "") and (product == "chrome"): FAIL
+      if flag_specific == "disable-layout-ng": FAIL
 
   [After: parent to child: setting document.domain must not give sync access]
     expected:
-      if (flag_specific == "") and (product == "chrome"): FAIL
-      if flag_specific == "disable-site-isolation-trials": FAIL
+      if product == "chrome": FAIL
 
   [after parent: originAgentCluster must equal true]
     expected:
-      if (flag_specific == "") and (product == "content_shell"): PASS
-      FAIL
+      if (flag_specific == "") and (product == "chrome"): FAIL
+      if flag_specific == "disable-layout-ng": FAIL
 
   [after child: originAgentCluster must equal false]
     expected:

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini
index 70e77cb..0727d38 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini
@@ -14,3 +14,4 @@
   [after child: originAgentCluster must equal false]
     expected:
       if (flag_specific == "") and (os == "linux") and (product == "content_shell"): FAIL
+      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html.ini
index a9c87499..6f746fe6 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html.ini
@@ -1,14 +1,10 @@
 [opener-no-openee-yes-same.sub.https.html]
   [opener: originAgentCluster must equal false]
     expected:
-      if (flag_specific == "") and (os == "linux") and (product == "chrome"): PASS
-      if (flag_specific == "") and (os == "win"): [PASS, FAIL]
-      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
-      FAIL
+      if flag_specific == "disable-layout-ng": FAIL
+      if flag_specific == "disable-site-isolation-trials": FAIL
 
   [openee: originAgentCluster must equal false]
     expected:
-      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): FAIL
-      if (flag_specific == "") and (os == "linux") and (product == "chrome"): PASS
+      if flag_specific == "disable-site-isolation-trials": FAIL
       if flag_specific == "disable-layout-ng": FAIL
-      [PASS, FAIL]

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html.ini
index 575ec913..a13be28 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html.ini
@@ -3,6 +3,7 @@
     expected:
       if (flag_specific == "") and (os == "win"): FAIL
       if flag_specific == "disable-layout-ng": FAIL
+      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
 
   [openee: originAgentCluster must equal true]
     expected:

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.ini
index e9d47544..8b96f964 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.ini
@@ -1,8 +1,10 @@
 [opener-yes-openee-no-same.sub.https.html]
   [opener: originAgentCluster must equal true]
     expected:
+      if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]
       if product == "chrome": FAIL
 
   [openee: originAgentCluster must equal true]
     expected:
+      if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]
       if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.ini
index c3ea49453..8dfaf021 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.ini
@@ -9,4 +9,4 @@
 
   [openee: originAgentCluster must equal false]
     expected:
-      if flag_specific == "disable-site-isolation-trials": FAIL
+      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL]

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.ini
index 34df7b4..b6a9865 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.ini
@@ -1,8 +1,10 @@
 [opener-yes-openee-yes-same.sub.https.html]
   [opener: originAgentCluster must equal true]
     expected:
+      if (product == "content_shell") and (flag_specific == "") and (os == "linux"): [PASS, FAIL]
       if product == "chrome": FAIL
 
   [openee: originAgentCluster must equal true]
     expected:
+      if (product == "content_shell") and (flag_specific == "") and (os == "linux"): [PASS, FAIL]
       if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.ini
index 5ec4080..d6b4f05 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.ini
@@ -2,3 +2,7 @@
   [openee: originAgentCluster must equal true]
     expected:
       if flag_specific == "disable-layout-ng": FAIL
+
+  [opener: originAgentCluster must equal true]
+    expected:
+      if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/html/browsers/the-window-object/open-close/open-features-tokenization-noreferrer.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/the-window-object/open-close/open-features-tokenization-noreferrer.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/the-window-object/open-close/open-features-tokenization-noreferrer.html.ini
deleted file mode 100644
index 725998e..0000000
--- a/third_party/blink/web_tests/external/wpt/html/browsers/the-window-object/open-close/open-features-tokenization-noreferrer.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[open-features-tokenization-noreferrer.html]
-  expected:
-    if product == "chrome": ERROR

third_party/blink/web_tests/external/wpt/html/browsers/the-window-object/window-open-windowfeatures-values.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/the-window-object/window-open-windowfeatures-values.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/the-window-object/window-open-windowfeatures-values.html.ini
index ef909a9..c7f00b1 100644
--- a/third_party/blink/web_tests/external/wpt/html/browsers/the-window-object/window-open-windowfeatures-values.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/browsers/the-window-object/window-open-windowfeatures-values.html.ini
@@ -1,3 +1,3 @@
 [window-open-windowfeatures-values.html]
   expected:
-    if product == "chrome": TIMEOUT
+    if product == "chrome": ERROR

third_party/blink/web_tests/external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.resize.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.resize.html.ini b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.resize.html.ini
index 8b40327..04ad5a0 100644
--- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.resize.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.resize.html.ini
@@ -1,12 +1,15 @@
 [offscreencanvas.resize.html]
   [Verify that resizing an OffscreenCanvas with a webgl context propagates the new size to its placeholder canvas asynchronously.]
     expected:
+      if (flag_specific == "") and (product == "content_shell") and (os == "linux"): [FAIL, PASS]
+      if (flag_specific == "") and (product == "content_shell") and (os == "win"): [PASS, FAIL]
       if (flag_specific == "") and (product == "chrome"): FAIL
 
   [Verify that drawImage uses the size of the frame as the intinsic size of a placeholder canvas.]
     expected:
-      if (flag_specific == "") and (product == "chrome"): FAIL
-      if flag_specific == "disable-site-isolation-trials": FAIL
+      if (flag_specific == "") and (os == "linux"): FAIL
+      if flag_specific == "disable-site-isolation-trials": PASS
+      [FAIL, PASS]
 
   [Verify that resizing an OffscreenCanvas with a 2d context propagates the new size to its placeholder canvas asynchronously.]
     expected:

third_party/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/cache-storage-reporting-service-worker.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/cache-storage-reporting-service-worker.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/cache-storage-reporting-service-worker.https.html.ini
new file mode 100644
index 0000000..1b0b9012
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/cache-storage-reporting-service-worker.https.html.ini
@@ -0,0 +1,4 @@
+[cache-storage-reporting-service-worker.https.html]
+  [COEP support on ServiceWorker.]
+    expected:
+      if os == "win": [PASS, FAIL]

third_party/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/credentialless/dedicated-worker.https.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/credentialless/dedicated-worker.https.window.js.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/credentialless/dedicated-worker.https.window.js.ini
index b6774be..47f8c95 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/credentialless/dedicated-worker.https.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/credentialless/dedicated-worker.https.window.js.ini
@@ -1,5 +1,5 @@
 [dedicated-worker.https.window.html]
   expected:
-    if product == "chrome": [OK, ERROR]
+    if product == "chrome": ERROR
   [fetch cross-origin + credentialless worker]
     expected: FAIL

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/coop-sandbox-redirects-cuts-opener.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/coop-sandbox-redirects-cuts-opener.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/coop-sandbox-redirects-cuts-opener.https.html.ini
deleted file mode 100644
index 72e5db08..0000000
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/coop-sandbox-redirects-cuts-opener.https.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[coop-sandbox-redirects-cuts-opener.https.html]
-  [<iframe sandbox="allow-popups allow-scripts allow-same-origin"> Sandboxed Cross-Origin-Opener-Policy popup should cut the opener if necessary including during redirects.]
-    expected:
-      if os == "win": FAIL
-
-  [<iframe sandbox="allow-popups allow-scripts"> Sandboxed Cross-Origin-Opener-Policy popup should cut the opener if necessary including during redirects.]
-    expected:
-      if os == "win": FAIL

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/header-parsing-failures.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/header-parsing-failures.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/header-parsing-failures.https.html.ini
index 0395d58..4b66b2a 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/header-parsing-failures.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/header-parsing-failures.https.html.ini
@@ -1,9 +1,9 @@
 [header-parsing-failures.https.html?1-4]
-  expected:
-    if product == "chrome": [OK, ERROR]
 
 [header-parsing-failures.https.html?12-last]
 
 [header-parsing-failures.https.html?9-12]
 
 [header-parsing-failures.https.html?5-8]
+  expected:
+    if product == "chrome": [ERROR, OK]

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-site.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-site.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-site.https.html.ini
index 8d718f6b6..596920f 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-site.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-site.https.html.ini
@@ -1,3 +1,3 @@
 [popup-same-site-unsafe-allow-outgoing-with-same-site.https.html]
   expected:
-    if product == "chrome": [OK, ERROR]
+    if product == "chrome": ERROR

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-site-with-cross-origin.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-site-with-cross-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-site-with-cross-origin.https.html.ini
new file mode 100644
index 0000000..7ea4330
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-site-with-cross-origin.https.html.ini
@@ -0,0 +1,3 @@
+[popup-same-site-with-cross-origin.https.html]
+  expected:
+    if product == "chrome": [OK, ERROR]

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-site-with-same-site.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-site-with-same-site.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-site-with-same-site.https.html.ini
new file mode 100644
index 0000000..536e2c0
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-site-with-same-site.https.html.ini
@@ -0,0 +1,3 @@
+[popup-same-site-with-same-site.https.html]
+  expected:
+    if product == "chrome": [OK, ERROR]

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html.ini
index 223c26b..d38d7d2 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html.ini
@@ -1,6 +1,4 @@
 [iframe-popup-same-origin-to-same-origin.https.html?1-2]
-  expected:
-    if product == "chrome": ERROR
 
 [iframe-popup-same-origin-to-same-origin.https.html?5-6]
   expected:

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/javascript-url.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/javascript-url.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/javascript-url.https.html.ini
index b8259e3c..afd6839 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/javascript-url.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/javascript-url.https.html.ini
@@ -11,8 +11,6 @@
     if product == "chrome": ERROR
 
 [javascript-url.https.html?13-14]
-  expected:
-    if product == "chrome": ERROR
 
 [javascript-url.https.html?15-16]
 
@@ -21,6 +19,8 @@
     if product == "chrome": ERROR
 
 [javascript-url.https.html?5-6]
+  expected:
+    if product == "chrome": [OK, ERROR]
 
 [javascript-url.https.html?7-8]
   expected:

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/navigate-to-aboutblank.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/navigate-to-aboutblank.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/navigate-to-aboutblank.https.html.ini
deleted file mode 100644
index 3cc47436..0000000
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/navigate-to-aboutblank.https.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[navigate-to-aboutblank.https.html]
-  expected:
-    if product == "chrome": ERROR

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-same-origin-with-same-site.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-same-origin-with-same-site.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-same-origin-with-same-site.https.html.ini
index ef3655a..efa88bc 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-same-origin-with-same-site.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-same-origin-with-same-site.https.html.ini
@@ -1,3 +1,3 @@
 [popup-same-origin-with-same-site.https.html]
   expected:
-    if product == "chrome": [OK, ERROR]
+    if product == "chrome": ERROR

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-unsafe-none-with-cross-origin.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-unsafe-none-with-cross-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-unsafe-none-with-cross-origin.https.html.ini
deleted file mode 100644
index cc8ffe2..0000000
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-unsafe-none-with-cross-origin.https.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[popup-unsafe-none-with-cross-origin.https.html]
-  expected:
-    if product == "chrome": ERROR

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-unsafe-none-with-same-site.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-unsafe-none-with-same-site.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-unsafe-none-with-same-site.https.html.ini
deleted file mode 100644
index c087e209..0000000
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-unsafe-none-with-same-site.https.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[popup-unsafe-none-with-same-site.https.html]
-  expected:
-    if product == "chrome": ERROR

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro_cross-origin.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro_cross-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro_cross-origin.https.html.ini
index c525d52..4ae0b275 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro_cross-origin.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro_cross-origin.https.html.ini
@@ -1,3 +1,8 @@
 [access-from-coop-page-to-openee_coop-ro_cross-origin.https.html]
-  expected:
-    if product == "chrome": ERROR
+  [access-from-coop-page-to-openee, cross-origin]
+    expected:
+      if product == "chrome": FAIL
+
+  [access-from-coop-page-to-openee, cross-origin + redirect]
+    expected:
+      if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro_cross-origin.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro_cross-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro_cross-origin.https.html.ini
index 7e47b2b0..9638f4b 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro_cross-origin.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro_cross-origin.https.html.ini
@@ -1,3 +1,8 @@
 [access-from-coop-page-to-opener_coop-ro_cross-origin.https.html]
-  expected:
-    if product == "chrome": ERROR
+  [access-from-coop-page-to-opener, cross-origin]
+    expected:
+      if product == "chrome": FAIL
+
+  [access-from-coop-page-to-opener, cross-origin + redirect]
+    expected:
+      if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro.https.html.ini
index ad1f304..dd923b49 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro.https.html.ini
@@ -1,6 +1,3 @@
 [access-from-coop-page-to-other_coop-ro.https.html]
   expected:
-    if product == "chrome": [OK, ERROR]
-  [access-from-coop-page-to-other (COOP-RO)]
-    expected:
-      if product == "chrome": FAIL
+    if product == "chrome": ERROR

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro_cross-origin.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro_cross-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro_cross-origin.https.html.ini
index 56b8e03..dd5c96b2 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro_cross-origin.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro_cross-origin.https.html.ini
@@ -1,6 +1,3 @@
 [access-from-coop-page-to-other_coop-ro_cross-origin.https.html]
   expected:
-    if product == "chrome": [OK, ERROR]
-  [access-from-coop-page-to-other (COOP-RO)]
-    expected:
-      if product == "chrome": FAIL
+    if product == "chrome": ERROR

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro.https.html.ini
index cde27b4c..126bb78 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro.https.html.ini
@@ -1,10 +1,3 @@
 [access-to-coop-page-from-opener_coop-ro.https.html]
   expected:
-    if product == "chrome": [OK, ERROR]
-  [access-to-coop-page-from-opener, same-origin]
-    expected:
-      if product == "chrome": FAIL
-
-  [access-to-coop-page-from-opener, same-origin + redirect]
-    expected:
-      if product == "chrome": FAIL
+    if product == "chrome": ERROR

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro_cross-origin.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro_cross-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro_cross-origin.https.html.ini
index 098e5d0..9e0d21c 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro_cross-origin.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro_cross-origin.https.html.ini
@@ -1,10 +1,3 @@
 [access-to-coop-page-from-opener_coop-ro_cross-origin.https.html]
   expected:
-    if product == "chrome": [OK, ERROR]
-  [access-to-coop-page-from-opener, cross-origin + redirect]
-    expected:
-      if product == "chrome": FAIL
-
-  [access-to-coop-page-from-opener, cross-origin]
-    expected:
-      if product == "chrome": FAIL
+    if product == "chrome": ERROR

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro.https.html.ini
index 12463d2..22693c3 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro.https.html.ini
@@ -1,3 +1,6 @@
 [access-to-coop-page-from-other_coop-ro.https.html]
   expected:
-    if product == "chrome": ERROR
+    if product == "chrome": [OK, ERROR]
+  [access-to-coop-page-from-other (COOP-RO)]
+    expected:
+      if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro_cross-origin.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro_cross-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro_cross-origin.https.html.ini
index 9871408..9d900f4e 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro_cross-origin.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro_cross-origin.https.html.ini
@@ -1,6 +1,3 @@
 [access-to-coop-page-from-other_coop-ro_cross-origin.https.html]
   expected:
-    if product == "chrome": [OK, ERROR]
-  [access-to-coop-page-from-other (COOP-RO)]
-    expected:
-      if product == "chrome": FAIL
+    if product == "chrome": ERROR

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-close.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-close.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-close.https.html.ini
index 1abd8a1..d060d8a9 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-close.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-close.https.html.ini
@@ -1,3 +1,10 @@
 [property-close.https.html]
   expected:
-    if product == "chrome": ERROR
+    if product == "chrome": [OK, ERROR]
+  [cross-origin > w => w.close()]
+    expected:
+      if product == "chrome": FAIL
+
+  [same-origin > w => w.close()]
+    expected:
+      if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-closed.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-closed.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-closed.https.html.ini
index 99d03e52c..ad0e9b0 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-closed.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-closed.https.html.ini
@@ -1,10 +1,3 @@
 [property-closed.https.html]
   expected:
-    if product == "chrome": [OK, ERROR]
-  [cross-origin > w => w.closed]
-    expected:
-      if product == "chrome": FAIL
-
-  [same-origin > w => w.closed]
-    expected:
-      if product == "chrome": FAIL
+    if product == "chrome": ERROR

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-focus.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-focus.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-focus.https.html.ini
index cdb2ab4..82c8de3 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-focus.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-focus.https.html.ini
@@ -1,4 +1,6 @@
 [property-focus.https.html]
+  expected:
+    if product == "chrome": [OK, ERROR]
   [same-origin > w => w.focus()]
     expected:
       if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-frames.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-frames.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-frames.https.html.ini
index 01f4fcd..f6d2d33 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-frames.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-frames.https.html.ini
@@ -1,3 +1,10 @@
 [property-frames.https.html]
   expected:
-    if product == "chrome": ERROR
+    if product == "chrome": [OK, ERROR]
+  [cross-origin > w => w.frames]
+    expected:
+      if product == "chrome": FAIL
+
+  [same-origin > w => w.frames]
+    expected:
+      if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-length.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-length.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-length.https.html.ini
index adac8732..5a1cdeb 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-length.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-length.https.html.ini
@@ -1,4 +1,6 @@
 [property-length.https.html]
+  expected:
+    if product == "chrome": [ERROR, OK]
   [same-origin > w => w.length]
     expected:
       if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-location-get.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-location-get.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-location-get.https.html.ini
index 0523467e..dcfc817 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-location-get.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-location-get.https.html.ini
@@ -1,10 +1,3 @@
 [property-location-get.https.html]
   expected:
-    if product == "chrome": [OK, ERROR]
-  [cross-origin > w => w.location]
-    expected:
-      if product == "chrome": FAIL
-
-  [same-origin > w => w.location]
-    expected:
-      if product == "chrome": FAIL
+    if product == "chrome": ERROR

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-opener-get.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-opener-get.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-opener-get.https.html.ini
index 76173f05..e053a92 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-opener-get.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-opener-get.https.html.ini
@@ -1,3 +1,10 @@
 [property-opener-get.https.html]
   expected:
-    if product == "chrome": ERROR
+    if product == "chrome": [OK, ERROR]
+  [cross-origin > w => w.opener]
+    expected:
+      if product == "chrome": FAIL
+
+  [same-origin > w => w.opener]
+    expected:
+      if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-postmessage-1.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-postmessage-1.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-postmessage-1.https.html.ini
index ab4e882..943353e 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-postmessage-1.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-postmessage-1.https.html.ini
@@ -1,6 +1,4 @@
 [property-postmessage-1.https.html]
-  expected:
-    if product == "chrome": [ERROR, OK]
   [same-origin > w => w.postMessage("", "")]
     expected:
       if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-top.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-top.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-top.https.html.ini
index e3a7586a..7bd46c4 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-top.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-top.https.html.ini
@@ -1,3 +1,8 @@
 [property-top.https.html]
-  expected:
-    if product == "chrome": ERROR
+  [same-origin > w => w.top]
+    expected:
+      if product == "chrome": FAIL
+
+  [cross-origin > w => w.top]
+    expected:
+      if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/report-to-both_coop-ro.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/report-to-both_coop-ro.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/report-to-both_coop-ro.https.html.ini
index a842eff..d4653ba 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/report-to-both_coop-ro.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/report-to-both_coop-ro.https.html.ini
@@ -1,4 +1,6 @@
 [report-to-both_coop-ro.https.html]
+  expected:
+    if product == "chrome": [OK, ERROR]
   [Access from openee]
     expected:
       if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/document-reporting/reporting-redirect-with-same-origin-allow-popups.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/document-reporting/reporting-redirect-with-same-origin-allow-popups.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/document-reporting/reporting-redirect-with-same-origin-allow-popups.https.html.ini
index 18bb1f2..8030187 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/document-reporting/reporting-redirect-with-same-origin-allow-popups.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/document-reporting/reporting-redirect-with-same-origin-allow-popups.https.html.ini
@@ -1,3 +1,8 @@
 [reporting-redirect-with-same-origin-allow-popups.https.html]
-  expected:
-    if product == "chrome": ERROR
+  [Cross origin openee redirected to same-origin with same-origin-allow-popups]
+    expected:
+      if product == "chrome": FAIL
+
+  [Same origin openee redirected to same-origin with same-origin-allow-popups]
+    expected:
+      if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/document-reporting/reporting-redirect-with-unsafe-none.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/document-reporting/reporting-redirect-with-unsafe-none.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/document-reporting/reporting-redirect-with-unsafe-none.https.html.ini
index f600281..68909ce 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/document-reporting/reporting-redirect-with-unsafe-none.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/document-reporting/reporting-redirect-with-unsafe-none.https.html.ini
@@ -1,3 +1,8 @@
 [reporting-redirect-with-unsafe-none.https.html]
-  expected:
-    if product == "chrome": ERROR
+  [Same origin openee redirected to same-origin with unsafe-none]
+    expected:
+      if product == "chrome": FAIL
+
+  [Cross origin openee redirected to same-origin with unsafe-none]
+    expected:
+      if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html.ini
index 29c6cc0..9311679 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-soap.https.html.ini
@@ -3,6 +3,8 @@
     if product == "chrome": ERROR
 
 [iframe-popup-to-soap.https.html?3-4]
+  expected:
+    if product == "chrome": ERROR
 
 [iframe-popup-to-soap.https.html?1-2]
   expected:

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html.ini
index 75e0479..d4cfb80 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html.ini
@@ -1,4 +1,6 @@
 [popup-soap.https.html]
+  expected:
+    if product == "chrome": [OK, ERROR]
   [SAME_ORIGIN popup with coop restrict-properties]
     expected: FAIL
 

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-u.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-u.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-u.https.html.ini
index 2381405..d559eb64 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-u.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-u.https.html.ini
@@ -1,6 +1,6 @@
 [popup-u.https.html]
   expected:
-    if product == "chrome": [OK, ERROR]
+    if product == "chrome": ERROR
   [SAME_ORIGIN popup with coop restrict-properties]
     expected: FAIL
 

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html.ini
index 4e17baa..fca3b7c 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-cross-origin.https.html.ini
@@ -1,6 +1,4 @@
 [popup-with-cross-origin.https.html]
-  expected:
-    if product == "chrome": ERROR
   [Cross-origin popup with empty coop]
     expected: FAIL
 

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html.ini
index ed48901..5e23173a 100644
--- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-origin.https.html.ini
@@ -1,6 +1,4 @@
 [popup-with-same-origin.https.html]
-  expected:
-    if product == "chrome": ERROR
   [Same-origin popup with coop restrict-properties]
     expected: FAIL
 

third_party/blink/web_tests/external/wpt/html/dom/render-blocking/remove-attr-script-keeps-blocking.tentative.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/remove-attr-script-keeps-blocking.tentative.html.ini b/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/remove-attr-script-keeps-blocking.tentative.html.ini
new file mode 100644
index 0000000..f223edf
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/remove-attr-script-keeps-blocking.tentative.html.ini
@@ -0,0 +1,4 @@
+[remove-attr-script-keeps-blocking.tentative.html]
+  [Rendering is blocked before render-blocking resources are loaded]
+    expected:
+      if os == "win": FAIL

third_party/blink/web_tests/external/wpt/html/dom/render-blocking/script-inserted-script.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/script-inserted-script.html.ini b/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/script-inserted-script.html.ini
index e11044c..7e15d96 100644
--- a/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/script-inserted-script.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/script-inserted-script.html.ini
@@ -1,4 +1,4 @@
 [script-inserted-script.html]
   [Rendering is blocked before render-blocking resources are loaded]
     expected:
-      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): FAIL
+      if (flag_specific == "") and (product == "content_shell"): FAIL

third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html.ini
index ebefe86..9a1d791 100644
--- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html.ini
@@ -1,5 +1,5 @@
 [resource-selection-invoke-insert-source-not-in-document.html]
   [invoking resource selection by inserting <source> in video not in a document]
     expected:
-      if product == "chrome": [PASS, FAIL]
-      FAIL
+      if flag_specific == "disable-layout-ng": FAIL
+      if flag_specific == "disable-site-isolation-trials": FAIL

third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html.ini
index 90bfb40..5e49a00 100644
--- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html.ini
@@ -1,5 +1,3 @@
 [resource-selection-invoke-insert-source.html]
   [invoking resource selection by inserting <source>]
-    expected:
-      if flag_specific == "disable-layout-ng": PASS
-      FAIL
+    expected: FAIL

third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause-networkState.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause-networkState.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause-networkState.html.ini
index e889ab7..08db93d 100644
--- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause-networkState.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause-networkState.html.ini
@@ -1,3 +1,6 @@
 [resource-selection-invoke-pause-networkState.html]
   [NOT invoking resource selection with pause() when networkState is not NETWORK_EMPTY]
-    expected: FAIL
+    expected:
+      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): PASS
+      if flag_specific == "disable-site-isolation-trials": PASS
+      FAIL

third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html.ini
index 33e2bbb..940dd05 100644
--- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html.ini
@@ -1,3 +1,5 @@
 [resource-selection-invoke-remove-from-document-networkState.html]
   [NOT invoking resource selection with implicit pause() when networkState is not NETWORK_EMPTY]
-    expected: FAIL
+    expected:
+      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): PASS
+      FAIL

third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-src.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-src.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-src.html.ini
index d46d8e2..7b5bb15 100644
--- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-src.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-src.html.ini
@@ -1,4 +1,5 @@
 [resource-selection-invoke-remove-src.html]
   [NOT invoking media load or resource selection when removing the src attribute]
     expected:
-      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if (flag_specific == "") and (product == "chrome"): [PASS, FAIL]
+      if flag_specific == "disable-site-isolation-trials": [FAIL, PASS]

third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-removed.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-removed.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-removed.html.ini
index b8c5187..e839e1a5 100644
--- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-removed.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-removed.html.ini
@@ -1,3 +1,4 @@
 [track-cue-rendering-after-controls-removed.html]
   expected:
-    if (flag_specific == "") and (product == "content_shell"): FAIL
+    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): FAIL
+    if flag_specific == "disable-site-isolation-trials": FAIL

third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini
index 4f22930..bdfd528 100644
--- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini
@@ -1,3 +1,5 @@
 [sandbox-top-navigation-child-special-cases.tentative.sub.window.html]
   expected:
+    if (product == "content_shell") and (flag_specific == "") and (os == "win"): [OK, TIMEOUT]
+    if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): TIMEOUT
     if product == "chrome": ERROR

third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini
index a2a7094..b94e288 100644
--- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini
@@ -1,139 +1,9 @@
 [relevant-mutations.html]
   [parent is picture, following sibling source inserted]
-    expected:
-      if os == "win": [PASS, FAIL]
-      FAIL
+    expected: FAIL
 
   [parent is picture, following sibling source removed]
-    expected:
-      if os == "win": [PASS, FAIL]
-      FAIL
+    expected: FAIL
 
   [parent is picture, following sibling source has srcset set]
-    expected:
-      if os == "win": [PASS, FAIL]
-      FAIL
-
-  [srcset is set to same value]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [parent is picture, previous source has type removed]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [removed from picture]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [referrerpolicy no-referrer-when-downgrade to empty, src already set]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [referrerpolicy absent to no-referrer, src already set]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [referrerpolicy no-referrer-when-downgrade to invalid, src already set]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [referrerpolicy no-referrer to empty, src already set]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [parent is picture, previous source removed]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [inserted into picture]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [referrerpolicy no-referrer to no-referrer-when-downgrade, src already set]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [parent is picture, previous source inserted]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [parent is picture, previous source has sizes changed]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [referrerpolicy empty to no-referrer-when-downgrade, src already set]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [parent is picture, previous source has srcset set]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [referrerpolicy no-referrer to absent, src already set]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [parent is picture, previous source has media removed]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [parent is picture, previous source has sizes set]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [parent is picture, previous source has srcset removed]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [parent is picture, previous source has type set]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [parent is picture, previous source has srcset changed]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [parent is picture, previous source has sizes removed]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [parent is picture, previous source has type changed]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [sizes is set to same value]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [referrerpolicy no-referrer-when-downgrade to absent, src already set]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [crossorigin use-credentials to absent, src already set]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [referrerpolicy no-referrer to invalid, src already set]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [parent is picture, previous source has media set]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [referrerpolicy empty to no-referrer, src already set]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [referrerpolicy absent to no-referrer-when-downgrade, src already set]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [referrerpolicy no-referrer-when-downgrade to no-referrer, src already set]
-    expected:
-      if os == "win": [PASS, FAIL]
-
-  [parent is picture, previous source has media changed]
-    expected:
-      if os == "win": [PASS, FAIL]
+    expected: FAIL

third_party/blink/web_tests/external/wpt/html/semantics/forms/form-submission-0/text-plain.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/forms/form-submission-0/text-plain.window.js.ini b/third_party/blink/web_tests/external/wpt/html/semantics/forms/form-submission-0/text-plain.window.js.ini
index cb83d32c..e236680 100644
--- a/third_party/blink/web_tests/external/wpt/html/semantics/forms/form-submission-0/text-plain.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/html/semantics/forms/form-submission-0/text-plain.window.js.ini
@@ -1,4 +1,3 @@
 [text-plain.window.html]
   expected:
-    if (flag_specific == "") and (os == "win"): [OK, TIMEOUT]
-    if flag_specific == "disable-layout-ng": [OK, TIMEOUT]
+    if flag_specific == "disable-layout-ng": TIMEOUT

third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html.ini
index 977886a..2dbfcd2 100644
--- a/third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html.ini
@@ -1,4 +1,4 @@
 [selectmenu-form-state-restore.tentative.html]
   expected:
-    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): OK
+    if flag_specific == "disable-site-isolation-trials": OK
     ERROR

third_party/blink/web_tests/external/wpt/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini b/third_party/blink/web_tests/external/wpt/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
index ecf50d4..0bebe05b 100644
--- a/third_party/blink/web_tests/external/wpt/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
@@ -1,9 +1,10 @@
 [activation-behavior.window.html]
   [<area> that is not connected should not be followed]
     expected:
-      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": PASS
       FAIL
 
   [<a> that is not connected should be followed]
     expected:
-      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": FAIL

third_party/blink/web_tests/external/wpt/html/semantics/popovers/popover-focus.tentative.html

diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/popovers/popover-focus.tentative.html b/third_party/blink/web_tests/external/wpt/html/semantics/popovers/popover-focus.tentative.html
index 82b8a5e6..b1e59a1 100644
--- a/third_party/blink/web_tests/external/wpt/html/semantics/popovers/popover-focus.tentative.html
+++ b/third_party/blink/web_tests/external/wpt/html/semantics/popovers/popover-focus.tentative.html
@@ -124,6 +124,19 @@
       assert_equals(document.activeElement, priorFocus, 'prior element should get focus after Escape');
       await finishAnimationsAndVerifyHide(popover);
 
+      // Move focus into the popover, then hit Escape:
+      let containedButton = popover.querySelector('button');
+      if (containedButton) {
+        priorFocus.focus();
+        assert_equals(document.activeElement, priorFocus);
+        popover.showPopover();
+        containedButton.focus();
+        assert_equals(document.activeElement, containedButton);
+        await sendEscape();
+        assert_equals(document.activeElement, priorFocus, 'prior element should get focus after Escape');
+        await finishAnimationsAndVerifyHide(popover);
+      }
+
       // Change the popover type:
       priorFocus.focus();
       popover.showPopover();
@@ -165,7 +178,16 @@
       assert_true(popover.matches(':open'));
       assert_equals(document.activeElement, expectedFocusedElement, `${testName} activated by button.click()`);
 
+      // Make sure Escape works in the invoker case:
+      await sendEscape();
+      assert_equals(document.activeElement, priorFocus, 'prior element should get focus after Escape (via invoker)');
+      await finishAnimationsAndVerifyHide(popover);
+
       // Make sure we can directly focus the (already open) popover:
+      priorFocus.focus();
+      button.click();
+      assert_true(popover.matches(':open'));
+      assert_equals(document.activeElement, expectedFocusedElement, `${testName} activated by button.click()`);
       popover.focus();
       assert_equals(document.activeElement, popover.hasAttribute('tabindex') ? popover : expectedFocusedElement, `${testName} directly focus with popover.focus()`);
       button.click(); // Button is set to toggle the popover
@@ -187,11 +209,7 @@
       assert_true(popover.matches(':open'));
       await clickOn(button); // This will *not* light dismiss, but will "toggle" the popover.
       assert_false(popover.matches(':open'));
-      const changesFocus = !popover.hasAttribute('data-no-focus');
-      if (changesFocus)
-        assert_equals(document.activeElement, priorFocus, 'focus should return to the prior focus, if focus moved on show');
-      else
-        assert_equals(document.activeElement, button, 'focus should remain on the button, since focus didn\t move on show');
+      assert_equals(document.activeElement, priorFocus, 'focus should return to the prior focus');
       await finishAnimationsAndVerifyHide(popover);
 
       // Same thing, but the button is contained within the popover
@@ -202,14 +220,13 @@
       priorFocus.focus();
       popover.showPopover();
       assert_true(popover.matches(':open'));
+      const changesFocus = !popover.hasAttribute('data-no-focus');
       if (changesFocus) {
         assert_not_equals(document.activeElement, priorFocus, 'focus should shift for this element');
       }
       await clickOn(button);
       assert_false(popover.matches(':open'), 'clicking button should hide the popover');
-      if (changesFocus) {
-        assert_equals(document.activeElement, priorFocus, 'Contained button should return focus to the previously focused element, if focus moved on show');
-      }
+      assert_equals(document.activeElement, priorFocus, 'Contained button should return focus to the previously focused element');
       await finishAnimationsAndVerifyHide(popover);
 
       // Same thing, but the button is unrelated (no popovertoggletarget)

third_party/blink/web_tests/external/wpt/infrastructure/server/webtransport-h3.https.sub.any.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/infrastructure/server/webtransport-h3.https.sub.any.js.ini b/third_party/blink/web_tests/external/wpt/infrastructure/server/webtransport-h3.https.sub.any.js.ini
index 667aadcf..daba249 100644
--- a/third_party/blink/web_tests/external/wpt/infrastructure/server/webtransport-h3.https.sub.any.js.ini
+++ b/third_party/blink/web_tests/external/wpt/infrastructure/server/webtransport-h3.https.sub.any.js.ini
@@ -5,15 +5,10 @@
 
 
 [webtransport-h3.https.sub.any.serviceworker.html]
-  [WebTransport server should be running and should handle a bidirectional stream]
-    expected:
-      if os == "win": FAIL
-
 
 [webtransport-h3.https.sub.any.sharedworker.html]
+
+[webtransport-h3.https.sub.any.html]
   [WebTransport server should be running and should handle a bidirectional stream]
     expected:
       if os == "win": FAIL
-
-
-[webtransport-h3.https.sub.any.html]

third_party/blink/web_tests/external/wpt/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html.ini b/third_party/blink/web_tests/external/wpt/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html.ini
new file mode 100644
index 0000000..f1cd5a32
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html.ini
@@ -0,0 +1,3 @@
+[multiTouchPointsReleaseSecondPoint.html]
+  [TestDriver actions: two touch points with one moving one pause]
+    expected: [PASS, FAIL]

third_party/blink/web_tests/external/wpt/intersection-observer/cross-origin-iframe.sub.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/intersection-observer/cross-origin-iframe.sub.html.ini b/third_party/blink/web_tests/external/wpt/intersection-observer/cross-origin-iframe.sub.html.ini
index 9d717d18..72e6f65 100644
--- a/third_party/blink/web_tests/external/wpt/intersection-observer/cross-origin-iframe.sub.html.ini
+++ b/third_party/blink/web_tests/external/wpt/intersection-observer/cross-origin-iframe.sub.html.ini
@@ -1,11 +1,15 @@
 [cross-origin-iframe.sub.html]
   [topDocument.scrollingElement.scrollTop = 200]
     expected:
-      if (flag_specific == "") and (os == "linux") and (product == "chrome"): FAIL
+      if (flag_specific == "") and (product == "content_shell") and (os == "win"): [PASS, FAIL]
+      if (flag_specific == "") and (product == "chrome"): FAIL
       if flag_specific == "disable-site-isolation-trials": FAIL
 
   [topDocument.scrollingElement.scrollTop = 100]
     expected:
-      if (os == "linux") and (flag_specific == "") and (product == "content_shell"): [PASS, FAIL]
-      if (os == "linux") and (flag_specific == "disable-layout-ng"): [PASS, FAIL]
-      if os == "win": FAIL
+      if (flag_specific == "") and (os == "win"): [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": FAIL
+
+  [iframeDocument.scrollingElement.scrollTop = 250]
+    expected:
+      if os == "win": [PASS, FAIL]

third_party/blink/web_tests/external/wpt/intersection-observer/iframe-no-root-with-wrapping-scroller.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/intersection-observer/iframe-no-root-with-wrapping-scroller.html.ini b/third_party/blink/web_tests/external/wpt/intersection-observer/iframe-no-root-with-wrapping-scroller.html.ini
index 23c24a7..7d550a5 100644
--- a/third_party/blink/web_tests/external/wpt/intersection-observer/iframe-no-root-with-wrapping-scroller.html.ini
+++ b/third_party/blink/web_tests/external/wpt/intersection-observer/iframe-no-root-with-wrapping-scroller.html.ini
@@ -1,3 +1,3 @@
 [iframe-no-root-with-wrapping-scroller.html]
   expected:
-    if flag_specific == "disable-site-isolation-trials": [OK, CRASH]
+    if flag_specific == "disable-site-isolation-trials": CRASH

third_party/blink/web_tests/external/wpt/largest-contentful-paint/first-paint-equals-lcp-text.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/largest-contentful-paint/first-paint-equals-lcp-text.html.ini b/third_party/blink/web_tests/external/wpt/largest-contentful-paint/first-paint-equals-lcp-text.html.ini
index 414fac1..2ce953e 100644
--- a/third_party/blink/web_tests/external/wpt/largest-contentful-paint/first-paint-equals-lcp-text.html.ini
+++ b/third_party/blink/web_tests/external/wpt/largest-contentful-paint/first-paint-equals-lcp-text.html.ini
@@ -1,5 +1,6 @@
 [first-paint-equals-lcp-text.html]
   [FCP and LCP are the same when there is a single text element in the page.]
     expected:
-      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): PASS
+      if flag_specific == "disable-layout-ng": PASS
       FAIL

third_party/blink/web_tests/external/wpt/loading/early-hints/csp-early-hints-disallowed-final-absent.h2.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/loading/early-hints/csp-early-hints-disallowed-final-absent.h2.window.js.ini b/third_party/blink/web_tests/external/wpt/loading/early-hints/csp-early-hints-disallowed-final-absent.h2.window.js.ini
index fd87f892..b5be12e 100644
--- a/third_party/blink/web_tests/external/wpt/loading/early-hints/csp-early-hints-disallowed-final-absent.h2.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/loading/early-hints/csp-early-hints-disallowed-final-absent.h2.window.js.ini
@@ -1,2 +1,4 @@
 [csp-early-hints-disallowed-final-absent.h2.window.html]
-  expected: ERROR
+  expected:
+    if product == "chrome": OK
+    ERROR

third_party/blink/web_tests/external/wpt/loading/early-hints/csp-early-hints-disallowed-final-allowed.h2.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/loading/early-hints/csp-early-hints-disallowed-final-allowed.h2.window.js.ini b/third_party/blink/web_tests/external/wpt/loading/early-hints/csp-early-hints-disallowed-final-allowed.h2.window.js.ini
index e935dbe..66e9cf6 100644
--- a/third_party/blink/web_tests/external/wpt/loading/early-hints/csp-early-hints-disallowed-final-allowed.h2.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/loading/early-hints/csp-early-hints-disallowed-final-allowed.h2.window.js.ini
@@ -1,4 +1,4 @@
 [csp-early-hints-disallowed-final-allowed.h2.window.html]
   expected:
-    if product == "chrome": OK
+    if product == "chrome": [OK, ERROR]
     ERROR

third_party/blink/web_tests/external/wpt/loading/early-hints/preconnect-in-early-hints.h2.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/loading/early-hints/preconnect-in-early-hints.h2.window.js.ini b/third_party/blink/web_tests/external/wpt/loading/early-hints/preconnect-in-early-hints.h2.window.js.ini
index 7f528f0..df586cc 100644
--- a/third_party/blink/web_tests/external/wpt/loading/early-hints/preconnect-in-early-hints.h2.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/loading/early-hints/preconnect-in-early-hints.h2.window.js.ini
@@ -1,2 +1,4 @@
 [preconnect-in-early-hints.h2.window.html]
-  expected: ERROR
+  expected:
+    if product == "chrome": OK
+    ERROR

third_party/blink/web_tests/external/wpt/loading/early-hints/preload-without-as.h2.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/loading/early-hints/preload-without-as.h2.window.js.ini b/third_party/blink/web_tests/external/wpt/loading/early-hints/preload-without-as.h2.window.js.ini
index 7cc9418f..6ac50adc 100644
--- a/third_party/blink/web_tests/external/wpt/loading/early-hints/preload-without-as.h2.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/loading/early-hints/preload-without-as.h2.window.js.ini
@@ -1,4 +1,4 @@
 [preload-without-as.h2.window.html]
   expected:
-    if product == "chrome": OK
+    if product == "chrome": [OK, ERROR]
     ERROR

third_party/blink/web_tests/external/wpt/loading/early-hints/referrer-policy-same-origin.h2.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/loading/early-hints/referrer-policy-same-origin.h2.window.js.ini b/third_party/blink/web_tests/external/wpt/loading/early-hints/referrer-policy-same-origin.h2.window.js.ini
index c87d9d9..c735a045 100644
--- a/third_party/blink/web_tests/external/wpt/loading/early-hints/referrer-policy-same-origin.h2.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/loading/early-hints/referrer-policy-same-origin.h2.window.js.ini
@@ -1,4 +1,4 @@
 [referrer-policy-same-origin.h2.window.html]
   expected:
-    if product == "chrome": OK
+    if product == "chrome": [OK, ERROR]
     ERROR

third_party/blink/web_tests/external/wpt/loading/early-hints/referrer-policy-unsafe-url.h2.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/loading/early-hints/referrer-policy-unsafe-url.h2.window.js.ini b/third_party/blink/web_tests/external/wpt/loading/early-hints/referrer-policy-unsafe-url.h2.window.js.ini
index b282f00..a03c3f90 100644
--- a/third_party/blink/web_tests/external/wpt/loading/early-hints/referrer-policy-unsafe-url.h2.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/loading/early-hints/referrer-policy-unsafe-url.h2.window.js.ini
@@ -1,4 +1,4 @@
 [referrer-policy-unsafe-url.h2.window.html]
   expected:
-    if product == "chrome": OK
+    if product == "chrome": [OK, ERROR]
     ERROR

third_party/blink/web_tests/external/wpt/longtask-timing/long-microtask.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/longtask-timing/long-microtask.window.js.ini b/third_party/blink/web_tests/external/wpt/longtask-timing/long-microtask.window.js.ini
index 60f938ab..5db0634 100644
--- a/third_party/blink/web_tests/external/wpt/longtask-timing/long-microtask.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/longtask-timing/long-microtask.window.js.ini
@@ -1,4 +1,4 @@
 [long-microtask.window.html]
   [A short task followed by a long microtask is observable.]
     expected:
-      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
+      if flag_specific == "disable-site-isolation-trials": FAIL

third_party/blink/web_tests/external/wpt/longtask-timing/longtask-in-sibling-iframe-crossorigin.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/longtask-timing/longtask-in-sibling-iframe-crossorigin.html.ini b/third_party/blink/web_tests/external/wpt/longtask-timing/longtask-in-sibling-iframe-crossorigin.html.ini
new file mode 100644
index 0000000..11c1f41
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/longtask-timing/longtask-in-sibling-iframe-crossorigin.html.ini
@@ -0,0 +1,5 @@
+[longtask-in-sibling-iframe-crossorigin.html]
+  [Performance longtask entries from cross-origin iframe are observable in its sibling.]
+    expected:
+      if (flag_specific == "") and (product == "content_shell") and (os == "win"): [PASS, FAIL]
+      if (flag_specific == "") and (product == "content_shell") and (os == "linux"): [PASS, FAIL]

third_party/blink/web_tests/external/wpt/mathml/presentation-markup/mrow/legacy-mstyle-attributes.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/mathml/presentation-markup/mrow/legacy-mstyle-attributes.html.ini b/third_party/blink/web_tests/external/wpt/mathml/presentation-markup/mrow/legacy-mstyle-attributes.html.ini
deleted file mode 100644
index be13767..0000000
--- a/third_party/blink/web_tests/external/wpt/mathml/presentation-markup/mrow/legacy-mstyle-attributes.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[legacy-mstyle-attributes.html]
-  [Legacy mstyle attributes do not apply to mo]
-    expected:
-      if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/mathml/presentation-markup/operators/operator-dictionary-arabic-002.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/mathml/presentation-markup/operators/operator-dictionary-arabic-002.html.ini b/third_party/blink/web_tests/external/wpt/mathml/presentation-markup/operators/operator-dictionary-arabic-002.html.ini
deleted file mode 100644
index f0fa72f4..0000000
--- a/third_party/blink/web_tests/external/wpt/mathml/presentation-markup/operators/operator-dictionary-arabic-002.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[operator-dictionary-arabic-002.html]
-  expected:
-    if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/mathml/relations/css-styling/ignored-properties-001.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/mathml/relations/css-styling/ignored-properties-001.html.ini b/third_party/blink/web_tests/external/wpt/mathml/relations/css-styling/ignored-properties-001.html.ini
index 72e2809..f779190 100644
--- a/third_party/blink/web_tests/external/wpt/mathml/relations/css-styling/ignored-properties-001.html.ini
+++ b/third_party/blink/web_tests/external/wpt/mathml/relations/css-styling/ignored-properties-001.html.ini
@@ -1,4 +1,6 @@
 [ignored-properties-001.html]
+  expected:
+    if flag_specific == "disable-site-isolation-trials": [OK, TIMEOUT]
   [maction layout is not affected by width: 100px !important; height: 200px !important;]
     expected: FAIL
 

third_party/blink/web_tests/external/wpt/media-source/dedicated-worker/mediasource-worker-play-terminate-worker.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/media-source/dedicated-worker/mediasource-worker-play-terminate-worker.html.ini b/third_party/blink/web_tests/external/wpt/media-source/dedicated-worker/mediasource-worker-play-terminate-worker.html.ini
index 933d86d6..6d693ca 100644
--- a/third_party/blink/web_tests/external/wpt/media-source/dedicated-worker/mediasource-worker-play-terminate-worker.html.ini
+++ b/third_party/blink/web_tests/external/wpt/media-source/dedicated-worker/mediasource-worker-play-terminate-worker.html.ini
@@ -1,12 +1,4 @@
 [mediasource-worker-play-terminate-worker.html]
-  [Test worker MediaSource termination after at least 6 main thread setTimeouts, starting counting before setting srcObject]
-    expected:
-      if (product == "content_shell") and (flag_specific == "") and (os == "linux"): [PASS, FAIL]
-
   [Test worker MediaSource termination after at least 8 main thread setTimeouts, starting counting before setting srcObject]
     expected:
-      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL]
-
-  [Test worker MediaSource termination after at least 9 main thread setTimeouts, starting counting before setting srcObject]
-    expected:
-      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": [PASS, FAIL]

third_party/blink/web_tests/external/wpt/media-source/mediasource-avtracks.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/media-source/mediasource-avtracks.html.ini b/third_party/blink/web_tests/external/wpt/media-source/mediasource-avtracks.html.ini
index 96f7c14..cac368b9 100644
--- a/third_party/blink/web_tests/external/wpt/media-source/mediasource-avtracks.html.ini
+++ b/third_party/blink/web_tests/external/wpt/media-source/mediasource-avtracks.html.ini
@@ -4,6 +4,6 @@
 
   [Media tracks must be removed when the SourceBuffer is removed from the MediaSource]
     expected:
-      if (flag_specific == "") and (product == "chrome"): [PASS, FAIL]
-      if flag_specific == "disable-layout-ng": PASS
+      if (product == "content_shell") and (flag_specific == "") and (os == "linux"): PASS
+      if (product == "content_shell") and (flag_specific == "disable-layout-ng"): [PASS, FAIL]
       FAIL

third_party/blink/web_tests/external/wpt/media-source/mediasource-duration.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/media-source/mediasource-duration.html.ini b/third_party/blink/web_tests/external/wpt/media-source/mediasource-duration.html.ini
index 80b5872..0197c08c 100644
--- a/third_party/blink/web_tests/external/wpt/media-source/mediasource-duration.html.ini
+++ b/third_party/blink/web_tests/external/wpt/media-source/mediasource-duration.html.ini
@@ -1,7 +1,12 @@
 [mediasource-duration.html]
   expected:
-    if flag_specific == "disable-site-isolation-trials": ERROR
-    if flag_specific == "disable-layout-ng": ERROR
+    if (flag_specific == "") and (os == "linux") and (product == "chrome"): OK
+    if (flag_specific == "") and (os == "win"): OK
+    ERROR
   [Test appendBuffer completes previous seek to truncated duration]
     expected:
-      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+
+  [Test endOfStream completes previous seek to truncated duration]
+    expected:
+      if flag_specific == "disable-layout-ng": [PASS, FAIL]

third_party/blink/web_tests/external/wpt/media-source/mediasource-endofstream.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/media-source/mediasource-endofstream.html.ini b/third_party/blink/web_tests/external/wpt/media-source/mediasource-endofstream.html.ini
index eb2f72d..f341f66 100644
--- a/third_party/blink/web_tests/external/wpt/media-source/mediasource-endofstream.html.ini
+++ b/third_party/blink/web_tests/external/wpt/media-source/mediasource-endofstream.html.ini
@@ -1,3 +1,5 @@
 [mediasource-endofstream.html]
+  expected:
+    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, TIMEOUT]
   [MediaSource.endOfStream(): duration truncated to 0 when there are no buffered coded frames]
     expected: FAIL

third_party/blink/web_tests/external/wpt/mixed-content/gen/top.http-rp/opt-in/sharedworker-import-data.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/mixed-content/gen/top.http-rp/opt-in/sharedworker-import-data.https.html.ini b/third_party/blink/web_tests/external/wpt/mixed-content/gen/top.http-rp/opt-in/sharedworker-import-data.https.html.ini
new file mode 100644
index 0000000..eda800fb
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/mixed-content/gen/top.http-rp/opt-in/sharedworker-import-data.https.html.ini
@@ -0,0 +1,34 @@
+[sharedworker-import-data.https.html]
+  expected:
+    if product == "chrome": [OK, TIMEOUT]
+  [Mixed-Content: Expects blocked for sharedworker-import-data to cross-http origin and keep-scheme redirection from https context.]
+    expected:
+      if product == "chrome": [PASS, TIMEOUT]
+
+  [Mixed-Content: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from https context.]
+    expected:
+      if product == "chrome": [PASS, NOTRUN]
+
+  [Mixed-Content: Expects blocked for sharedworker-import-data to cross-http origin and swap-scheme redirection from https context.]
+    expected:
+      if product == "chrome": [PASS, NOTRUN]
+
+  [Mixed-Content: Expects blocked for sharedworker-import-data to cross-https origin and swap-scheme redirection from https context.]
+    expected:
+      if product == "chrome": [PASS, NOTRUN]
+
+  [Mixed-Content: Expects blocked for sharedworker-import-data to same-http origin and keep-scheme redirection from https context.]
+    expected:
+      if product == "chrome": [PASS, NOTRUN]
+
+  [Mixed-Content: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from https context.]
+    expected:
+      if product == "chrome": [PASS, NOTRUN]
+
+  [Mixed-Content: Expects blocked for sharedworker-import-data to same-http origin and swap-scheme redirection from https context.]
+    expected:
+      if product == "chrome": [PASS, NOTRUN]
+
+  [Mixed-Content: Expects blocked for sharedworker-import-data to same-https origin and swap-scheme redirection from https context.]
+    expected:
+      if product == "chrome": [PASS, NOTRUN]

third_party/blink/web_tests/external/wpt/native-io/detach_iframe_during_open.https.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/native-io/detach_iframe_during_open.https.window.js.ini b/third_party/blink/web_tests/external/wpt/native-io/detach_iframe_during_open.https.window.js.ini
index 98a13dd..b3facba 100644
--- a/third_party/blink/web_tests/external/wpt/native-io/detach_iframe_during_open.https.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/native-io/detach_iframe_during_open.https.window.js.ini
@@ -1,3 +1,5 @@
 [detach_iframe_during_open.https.window.html]
   expected:
-    if flag_specific == "disable-layout-ng": [OK, CRASH]
+    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, CRASH]
+    if (flag_specific == "") and (os == "win"): [OK, TIMEOUT]
+    if flag_specific == "disable-layout-ng": CRASH

third_party/blink/web_tests/external/wpt/navigation-api/navigation-methods/return-value/navigate-initial-about-blank.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/navigation-api/navigation-methods/return-value/navigate-initial-about-blank.html.ini b/third_party/blink/web_tests/external/wpt/navigation-api/navigation-methods/return-value/navigate-initial-about-blank.html.ini
index 0adc9d25..7680dc94 100644
--- a/third_party/blink/web_tests/external/wpt/navigation-api/navigation-methods/return-value/navigate-initial-about-blank.html.ini
+++ b/third_party/blink/web_tests/external/wpt/navigation-api/navigation-methods/return-value/navigate-initial-about-blank.html.ini
@@ -1,3 +1,4 @@
 [navigate-initial-about-blank.html]
   expected:
     if flag_specific == "disable-layout-ng": ERROR
+    if flag_specific == "disable-site-isolation-trials": [OK, ERROR]

third_party/blink/web_tests/external/wpt/navigation-timing/test-performance-attributes.sub.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/navigation-timing/test-performance-attributes.sub.html.ini b/third_party/blink/web_tests/external/wpt/navigation-timing/test-performance-attributes.sub.html.ini
index a805bf5..6cea40d 100644
--- a/third_party/blink/web_tests/external/wpt/navigation-timing/test-performance-attributes.sub.html.ini
+++ b/third_party/blink/web_tests/external/wpt/navigation-timing/test-performance-attributes.sub.html.ini
@@ -1,4 +1,5 @@
 [test-performance-attributes.sub.html]
   [Check that performance.timing has reasonable values for secureConnectionStart and other attributes]
     expected:
-      if (flag_specific == "") and (product == "chrome"): [PASS, FAIL]
+      if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]
+      if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/pending-beacon/pending_beacon-sendondiscard.tentative.https.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/pending-beacon/pending_beacon-sendondiscard.tentative.https.window.js.ini b/third_party/blink/web_tests/external/wpt/pending-beacon/pending_beacon-sendondiscard.tentative.https.window.js.ini
index 3150981..45cc949 100644
--- a/third_party/blink/web_tests/external/wpt/pending-beacon/pending_beacon-sendondiscard.tentative.https.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/pending-beacon/pending_beacon-sendondiscard.tentative.https.window.js.ini
@@ -3,4 +3,15 @@
     if product == "chrome": ERROR
   [A discarded document does not send an already sent beacon.]
     expected:
-      if (flag_specific == "") and (os == "win"): FAIL
+      if flag_specific == "disable-layout-ng": [FAIL, PASS]
+      if flag_specific == "disable-site-isolation-trials": [FAIL, PASS]
+
+  [A discarded document sends all its beacons of which backgroundTimeouts are\n    not default.]
+    expected:
+      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
+
+  [A discarded document sends all its beacons of which timeouts are not\n    default.]
+    expected:
+      if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": [PASS, FAIL]

third_party/blink/web_tests/external/wpt/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-bfcache.tentative.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-bfcache.tentative.window.js.ini b/third_party/blink/web_tests/external/wpt/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-bfcache.tentative.window.js.ini
index b54282c..967f7f1 100644
--- a/third_party/blink/web_tests/external/wpt/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-bfcache.tentative.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-bfcache.tentative.window.js.ini
@@ -1,7 +1,6 @@
 [performance-navigation-timing-same-origin-bfcache.tentative.window.html]
   [RemoteContextHelper navigation using BFCache]
     expected:
-      if (os == "linux") and (flag_specific == "") and (product == "content_shell"): [PASS, FAIL]
-      if (os == "linux") and (flag_specific == "disable-site-isolation-trials"): PASS
-      if (os == "linux") and (flag_specific == "disable-layout-ng"): [PASS, FAIL]
+      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): PASS
+      if flag_specific == "disable-site-isolation-trials": [FAIL, PASS]
       FAIL

third_party/blink/web_tests/external/wpt/permissions-policy/experimental-features/unload-allowed-by-default.tentative.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/permissions-policy/experimental-features/unload-allowed-by-default.tentative.window.js.ini b/third_party/blink/web_tests/external/wpt/permissions-policy/experimental-features/unload-allowed-by-default.tentative.window.js.ini
index 041aee22..6360a03d 100644
--- a/third_party/blink/web_tests/external/wpt/permissions-policy/experimental-features/unload-allowed-by-default.tentative.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/permissions-policy/experimental-features/unload-allowed-by-default.tentative.window.js.ini
@@ -1,3 +1,3 @@
 [unload-allowed-by-default.tentative.window.html]
   expected:
-    if os == "win": [OK, TIMEOUT]
+    if os == "win": TIMEOUT

third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-rAF-dynamic.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-rAF-dynamic.html.ini b/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-rAF-dynamic.html.ini
index 2c4667b..f827d62 100644
--- a/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-rAF-dynamic.html.ini
+++ b/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-rAF-dynamic.html.ini
@@ -1,3 +1,3 @@
 [deadline-max-rAF-dynamic.html]
   expected:
-    if flag_specific == "disable-layout-ng": [OK, TIMEOUT]
+    if (flag_specific == "") and (os == "win"): [OK, TIMEOUT]

third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-rAF.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-rAF.html.ini b/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-rAF.html.ini
index b79130fb..c2a9bbc 100644
--- a/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-rAF.html.ini
+++ b/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-rAF.html.ini
@@ -1,3 +1,3 @@
 [deadline-max-rAF.html]
   expected:
-    if (flag_specific == "") and (os == "win"): [OK, TIMEOUT]
+    if os == "win": TIMEOUT

third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-timeout-dynamic.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-timeout-dynamic.html.ini b/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-timeout-dynamic.html.ini
index 727f92b..36bd303 100644
--- a/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-timeout-dynamic.html.ini
+++ b/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-timeout-dynamic.html.ini
@@ -1,5 +1,6 @@
 [deadline-max-timeout-dynamic.html]
   expected:
-    if (os == "linux") and (flag_specific == "") and (product == "content_shell"): [OK, TIMEOUT]
+    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): TIMEOUT
+    if flag_specific == "disable-site-isolation-trials": [OK, TIMEOUT]
   [Check that the deadline is changed if there is a new timeout from within requestIdleCallback.]
     expected: FAIL

third_party/blink/web_tests/external/wpt/resource-timing/content-type-parsing.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/content-type-parsing.html.ini b/third_party/blink/web_tests/external/wpt/resource-timing/content-type-parsing.html.ini
index 5310563..f628e90 100644
--- a/third_party/blink/web_tests/external/wpt/resource-timing/content-type-parsing.html.ini
+++ b/third_party/blink/web_tests/external/wpt/resource-timing/content-type-parsing.html.ini
@@ -162,3 +162,11 @@
   [content-type 12 : */*,text/html]
     expected:
       if os == "win": FAIL
+
+  [content-type 3 : text/plain;charset=gbk,text/html]
+    expected:
+      if os == "win": FAIL
+
+  [content-type 2 : text/html,text/plain]
+    expected:
+      if os == "win": FAIL

third_party/blink/web_tests/external/wpt/resource-timing/nested-context-navigations-iframe.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/nested-context-navigations-iframe.html.ini b/third_party/blink/web_tests/external/wpt/resource-timing/nested-context-navigations-iframe.html.ini
deleted file mode 100644
index 99d8add..0000000
--- a/third_party/blink/web_tests/external/wpt/resource-timing/nested-context-navigations-iframe.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[nested-context-navigations-iframe.html]
-  [Test that crossorigin iframe navigations are not observable by the parent, even after history navigations by the parent]
-    expected:
-      if os == "win": FAIL

third_party/blink/web_tests/external/wpt/resource-timing/no-entries-for-cross-origin-css-fetched-memory-cache.sub.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/no-entries-for-cross-origin-css-fetched-memory-cache.sub.html.ini b/third_party/blink/web_tests/external/wpt/resource-timing/no-entries-for-cross-origin-css-fetched-memory-cache.sub.html.ini
index e3208a2..6f1569d4 100644
--- a/third_party/blink/web_tests/external/wpt/resource-timing/no-entries-for-cross-origin-css-fetched-memory-cache.sub.html.ini
+++ b/third_party/blink/web_tests/external/wpt/resource-timing/no-entries-for-cross-origin-css-fetched-memory-cache.sub.html.ini
@@ -1,6 +1,6 @@
 [no-entries-for-cross-origin-css-fetched-memory-cache.sub.html]
   [Make sure that resources fetched by cross origin CSS are not in the timeline.]
     expected:
-      if (os == "linux") and (flag_specific == "") and (product == "content_shell"): [PASS, FAIL]
-      if os == "win": PASS
+      if (flag_specific == "") and (os == "win"): [FAIL, PASS]
+      if flag_specific == "disable-layout-ng": PASS
       FAIL

third_party/blink/web_tests/external/wpt/resource-timing/resource-timing-level1.sub.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/resource-timing-level1.sub.html.ini b/third_party/blink/web_tests/external/wpt/resource-timing/resource-timing-level1.sub.html.ini
index 3eaed3a..89cb498 100644
--- a/third_party/blink/web_tests/external/wpt/resource-timing/resource-timing-level1.sub.html.ini
+++ b/third_party/blink/web_tests/external/wpt/resource-timing/resource-timing-level1.sub.html.ini
@@ -1,4 +1,4 @@
 [resource-timing-level1.sub.html]
-  ['iframe: 250ms delay before 'responseStart', another 250ms delay before 'responseEnd'.]
+  ['script: 250ms delay before 'responseStart', another 250ms delay before 'responseEnd'.]
     expected:
       if os == "win": [PASS, FAIL]

third_party/blink/web_tests/external/wpt/resource-timing/response-status-code.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/response-status-code.html.ini b/third_party/blink/web_tests/external/wpt/resource-timing/response-status-code.html.ini
index b06a0ac..8e34cbd 100644
--- a/third_party/blink/web_tests/external/wpt/resource-timing/response-status-code.html.ini
+++ b/third_party/blink/web_tests/external/wpt/resource-timing/response-status-code.html.ini
@@ -1,10 +1,7 @@
 [response-status-code.html]
-  [This test validates the response status of resources. 296]
-    expected:
-      if product == "chrome": FAIL
-
   [This test validates the response status of resources. 276]
-    expected: [NOTRUN, PASS, TIMEOUT]
+    expected:
+      if flag_specific == "disable-site-isolation-trials": FAIL
 
   [This test validates the response status of resources. 273]
     expected: [PASS, NOTRUN]
@@ -12,37 +9,24 @@
   [This test validates the response status of resources. 271]
     expected: [PASS, NOTRUN]
 
-  [This test validates the response status of resources. 275]
-    expected:
-      if product == "chrome": FAIL
-
   [This test validates the response status of resources. 268]
     expected: [PASS, NOTRUN]
 
   [This test validates the response status of resources. 267]
     expected: [NOTRUN, PASS]
 
-  [This test validates the response status of resources. 294]
-    expected:
-      if (product == "content_shell") and (flag_specific == "") and (os == "linux"): [PASS, FAIL]
-
   [This test validates the response status of resources. 272]
-    expected: [PASS, TIMEOUT, NOTRUN]
-
-  [This test validates the response status of resources. 278]
     expected:
-      if (product == "content_shell") and (flag_specific == "disable-layout-ng"): [PASS, FAIL]
+      if (flag_specific == "") and (product == "chrome"): [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": FAIL
 
   [This test validates the response status of resources. 274]
-    expected: [PASS, NOTRUN]
+    expected:
+      if product == "chrome": [PASS, FAIL]
 
   [This test validates the response status of resources. 270]
     expected: [PASS, NOTRUN]
 
-  [This test validates the response status of resources. 279]
-    expected:
-      if product == "chrome": FAIL
-
   [This test validates the response status of resources. 269]
     expected: [PASS, NOTRUN]
 
@@ -464,7 +448,9 @@
     expected: [PASS, TIMEOUT]
 
   [This test validates the response status of resources. 259]
-    expected: [NOTRUN, PASS]
+    expected:
+      if (flag_specific == "") and (product == "chrome"): [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": FAIL
 
   [This test validates the response status of resources. 237]
     expected: [PASS, NOTRUN]
@@ -572,7 +558,8 @@
     expected: [PASS, NOTRUN]
 
   [This test validates the response status of resources. 84]
-    expected: [PASS, TIMEOUT]
+    expected:
+      if product == "chrome": [PASS, FAIL]
 
   [This test validates the response status of resources. 218]
     expected: [PASS, NOTRUN]

third_party/blink/web_tests/external/wpt/server-timing/resources/blue_cors.png

diff --git a/third_party/blink/web_tests/external/wpt/server-timing/resources/blue_cors.png b/third_party/blink/web_tests/external/wpt/server-timing/resources/blue_cors.png
new file mode 100644
index 0000000..4498dd2
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/server-timing/resources/blue_cors.png
Binary files differ

third_party/blink/web_tests/external/wpt/server-timing/resources/blue_cors.png.headers

diff --git a/third_party/blink/web_tests/external/wpt/server-timing/resources/blue_cors.png.headers b/third_party/blink/web_tests/external/wpt/server-timing/resources/blue_cors.png.headers
new file mode 100644
index 0000000..2977f0a
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/server-timing/resources/blue_cors.png.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Server-Timing: metric2; dur=2.1; desc=blue.png

third_party/blink/web_tests/external/wpt/server-timing/server_timing_headers_not_visible_in_fetch.https.html

diff --git a/third_party/blink/web_tests/external/wpt/server-timing/server_timing_headers_not_visible_in_fetch.https.html b/third_party/blink/web_tests/external/wpt/server-timing/server_timing_headers_not_visible_in_fetch.https.html
new file mode 100644
index 0000000..3502f49
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/server-timing/server_timing_headers_not_visible_in_fetch.https.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<head>
+    <meta charset='utf-8' />
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/get-host-info.sub.js"></script>
+    <script>
+      const {HTTPS_REMOTE_ORIGIN} = get_host_info()
+      promise_test(async t => {
+        const response = await fetch(`${HTTPS_REMOTE_ORIGIN}/server-timing/resources/blue_cors.png`, {mode: "cors"});
+        assert_equals(response.headers.has("server-timing"), false);
+      }, "Server-Timing headers should be explicitly allowed by CORS");
+    </script>
+</head>

third_party/blink/web_tests/external/wpt/service-workers/cache-storage/cache-add.https.any.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/service-workers/cache-storage/cache-add.https.any.js.ini b/third_party/blink/web_tests/external/wpt/service-workers/cache-storage/cache-add.https.any.js.ini
index 6e81129..93c7a0a 100644
--- a/third_party/blink/web_tests/external/wpt/service-workers/cache-storage/cache-add.https.any.js.ini
+++ b/third_party/blink/web_tests/external/wpt/service-workers/cache-storage/cache-add.https.any.js.ini
@@ -7,20 +7,16 @@
   [Cache.addAll called with the same Request object specified twice]
     expected: FAIL
 
-  [Cache.addAll should succeed when entries differ by vary header]
-    expected:
-      if product == "chrome": [PASS, FAIL]
-
 
 [cache-add.https.any.serviceworker.html]
   [Cache.addAll called with the same Request object specified twice]
     expected: FAIL
 
-  [Cache.addAll should succeed when entries differ by vary header]
-    expected:
-      if product == "chrome": FAIL
-
 
 [cache-add.https.any.html]
   [Cache.addAll called with the same Request object specified twice]
     expected: FAIL
+
+  [Cache.addAll should succeed when entries differ by vary header]
+    expected:
+      if product == "chrome": [PASS, FAIL]

third_party/blink/web_tests/external/wpt/service-workers/service-worker/about-blank-replacement.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/service-workers/service-worker/about-blank-replacement.https.html.ini b/third_party/blink/web_tests/external/wpt/service-workers/service-worker/about-blank-replacement.https.html.ini
index c59a16f..44673f0a 100644
--- a/third_party/blink/web_tests/external/wpt/service-workers/service-worker/about-blank-replacement.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/service-workers/service-worker/about-blank-replacement.https.html.ini
@@ -1,6 +1,4 @@
 [about-blank-replacement.https.html]
-  expected:
-    if product == "chrome": ERROR
   [Initial about:blank is controlled, exposed to clients.matchAll(), and matches final Client.]
     expected: FAIL
 

third_party/blink/web_tests/external/wpt/service-workers/service-worker/getregistrations.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/service-workers/service-worker/getregistrations.https.html.ini b/third_party/blink/web_tests/external/wpt/service-workers/service-worker/getregistrations.https.html.ini
index 4769a3b3..5651cd2 100644
--- a/third_party/blink/web_tests/external/wpt/service-workers/service-worker/getregistrations.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/service-workers/service-worker/getregistrations.https.html.ini
@@ -1,12 +1,12 @@
 [getregistrations.https.html]
   [Register then Unregister then getRegistrations]
     expected:
-      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL]
+      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): FAIL
 
   [Register then Unregister with controlled frame then getRegistrations]
     expected:
-      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL]
+      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): FAIL
 
   [getRegistrations promise resolves only with same origin registrations.]
     expected:
-      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL]
+      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): FAIL

third_party/blink/web_tests/external/wpt/service-workers/service-worker/same-site-cookies.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/service-workers/service-worker/same-site-cookies.https.html.ini b/third_party/blink/web_tests/external/wpt/service-workers/service-worker/same-site-cookies.https.html.ini
index 1adcbd9..ed4008e 100644
--- a/third_party/blink/web_tests/external/wpt/service-workers/service-worker/same-site-cookies.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/service-workers/service-worker/same-site-cookies.https.html.ini
@@ -1,6 +1,6 @@
 [same-site-cookies.https.html]
   expected:
-    if (product == "content_shell") and (flag_specific == "disable-layout-ng"): [OK, TIMEOUT]
+    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, TIMEOUT]
   [same-origin, nested set location with cross-site middle frame and passthrough service worker]
     expected: FAIL
 

third_party/blink/web_tests/external/wpt/speculation-rules/prerender/csp-script-src-self.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/csp-script-src-self.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/csp-script-src-self.html.ini
index a3b998ac..812723f4 100644
--- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/csp-script-src-self.html.ini
+++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/csp-script-src-self.html.ini
@@ -1,4 +1,4 @@
 [csp-script-src-self.html]
   expected:
-    if (os == "linux") and (flag_specific == "") and (product == "content_shell"): ERROR
+    if (os == "linux") and (flag_specific == "disable-layout-ng"): [OK, ERROR]
     if os == "win": ERROR

third_party/blink/web_tests/external/wpt/speculation-rules/prerender/local-storage.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/local-storage.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/local-storage.html.ini
index 89b7f0be..5ab6d19 100644
--- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/local-storage.html.ini
+++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/local-storage.html.ini
@@ -1,5 +1,6 @@
 [local-storage.html]
   expected:
+    if (product == "content_shell") and (os == "win"): [OK, TIMEOUT]
     if product == "chrome": TIMEOUT
   [prerendering page should be able to access local storage]
     expected:

third_party/blink/web_tests/external/wpt/speculation-rules/prerender/navigator-plugins.tentative.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/navigator-plugins.tentative.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/navigator-plugins.tentative.html.ini
index a9fa26cb..7e5ff8f 100644
--- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/navigator-plugins.tentative.html.ini
+++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/navigator-plugins.tentative.html.ini
@@ -1,7 +1,7 @@
 [navigator-plugins.tentative.html]
   expected:
-    if (product == "content_shell") and (os == "win"): [OK, TIMEOUT]
-    if product == "chrome": TIMEOUT
+    if (os == "linux") and (product == "chrome"): TIMEOUT
+    if os == "win": TIMEOUT
   [prerendering page should be able to access the navigator.plugins]
     expected:
       if product == "chrome": TIMEOUT

third_party/blink/web_tests/external/wpt/speculation-rules/prerender/navigator-subapp.https.tentative.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/navigator-subapp.https.tentative.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/navigator-subapp.https.tentative.html.ini
index f08bb85..4bbd711 100644
--- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/navigator-subapp.https.tentative.html.ini
+++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/navigator-subapp.https.tentative.html.ini
@@ -1,7 +1,6 @@
 [navigator-subapp.https.tentative.html]
   expected:
-    if (os == "linux") and (product == "chrome"): TIMEOUT
-    if os == "win": TIMEOUT
+    if product == "chrome": TIMEOUT
   [prerendering pages should not be able to access subapp API.]
     expected:
       if product == "chrome": TIMEOUT

third_party/blink/web_tests/external/wpt/speculation-rules/prerender/response-code-non-successful.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/response-code-non-successful.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/response-code-non-successful.html.ini
new file mode 100644
index 0000000..f7732f9
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/response-code-non-successful.html.ini
@@ -0,0 +1,13 @@
+[response-code-non-successful.html?code=204]
+
+[response-code-non-successful.html?code=402]
+
+[response-code-non-successful.html?code=500]
+  expected:
+    if product == "chrome": [OK, ERROR]
+
+[response-code-non-successful.html?code=404]
+
+[response-code-non-successful.html?code=503]
+
+[response-code-non-successful.html?code=205]

third_party/blink/web_tests/external/wpt/speculation-rules/prerender/response-code-successful.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/response-code-successful.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/response-code-successful.html.ini
index 89a10867..b10e24c 100644
--- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/response-code-successful.html.ini
+++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/response-code-successful.html.ini
@@ -1,13 +1,14 @@
 [response-code-successful.html?code=203]
   [Responses with code 203 should be activated]
     expected:
-      if (product == "content_shell") and (os == "win"): [PASS, FAIL]
-      if product == "chrome": FAIL
+      if (os == "linux") and (product == "chrome"): FAIL
 
 
 [response-code-successful.html?code=200]
-  expected:
-    if product == "chrome": ERROR
+  [Responses with code 200 should be activated]
+    expected:
+      if product == "chrome": FAIL
+
 
 [response-code-successful.html?code=201]
   [Responses with code 201 should be activated]
@@ -16,6 +17,8 @@
 
 
 [response-code-successful.html?code=202]
+  expected:
+    if product == "chrome": [OK, ERROR]
   [Responses with code 202 should be activated]
     expected:
       if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-dedicated-worker.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-dedicated-worker.https.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-dedicated-worker.https.html.ini
index 4c890c0c2..4aeadc5 100644
--- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-dedicated-worker.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-dedicated-worker.https.html.ini
@@ -1,7 +1,7 @@
 [restriction-dedicated-worker.https.html]
   expected:
-    if (product == "content_shell") and (os == "win"): [OK, ERROR]
-    if product == "chrome": TIMEOUT
+    if (os == "linux") and (product == "chrome"): TIMEOUT
+    if os == "win": ERROR
   [The access to the Dedicated Worker API should be deferred until the\n    prerendered page is activated]
     expected:
       if product == "chrome": TIMEOUT

third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-idle-detection.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-idle-detection.https.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-idle-detection.https.html.ini
index ff11792f..407d3c4 100644
--- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-idle-detection.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-idle-detection.https.html.ini
@@ -1,7 +1,7 @@
 [restriction-idle-detection.https.html]
   expected:
-    if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): [OK, TIMEOUT]
-    if (os == "linux") and (product == "chrome"): TIMEOUT
+    if (flag_specific == "") and (product == "content_shell") and (os == "win"): [OK, TIMEOUT]
+    if (flag_specific == "") and (product == "chrome"): TIMEOUT
   [prerendering pages should not be able to invoke the Idle Detection API]
     expected:
       if product == "chrome": TIMEOUT

third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-local-file-system-access.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-local-file-system-access.https.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-local-file-system-access.https.html.ini
index 8a6d1798..0e13ca06 100644
--- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-local-file-system-access.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-local-file-system-access.https.html.ini
@@ -1,5 +1,6 @@
 [restriction-local-file-system-access.https.html]
   expected:
+    if (product == "content_shell") and (os == "win"): [OK, TIMEOUT]
     if product == "chrome": TIMEOUT
   [prerendering pages should not be able to access the local file system via the File System Access API]
     expected:

third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-media-auto-play-attribute.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-media-auto-play-attribute.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-media-auto-play-attribute.html.ini
index 8abf580..66ea6cb7 100644
--- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-media-auto-play-attribute.html.ini
+++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-media-auto-play-attribute.html.ini
@@ -3,8 +3,8 @@
   disabled:
     if flag_specific == "force-renderer-accessibility": was skipped in 'FlagExpectations/force-renderer-accessibility'
   expected:
-    if (product == "content_shell") and (os == "win"): [OK, ERROR]
-    if product == "chrome": TIMEOUT
+    if (os == "linux") and (product == "chrome"): TIMEOUT
+    if os == "win": ERROR
   [autoplay of the audio media should be deferred until the prerendered page is activated]
     expected:
       if product == "chrome": TIMEOUT

third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-message-boxes.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-message-boxes.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-message-boxes.html.ini
index a190613..aeb2a55 100644
--- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-message-boxes.html.ini
+++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-message-boxes.html.ini
@@ -1,7 +1,6 @@
 [restriction-message-boxes.html]
   expected:
-    if (os == "linux") and (product == "chrome"): TIMEOUT
-    if os == "win": ERROR
+    if product == "chrome": TIMEOUT
   [alert() does not display the modal and returns immediately]
     expected:
       if product == "chrome": TIMEOUT

third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-request-picture-in-picture.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-request-picture-in-picture.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-request-picture-in-picture.html.ini
index 32004d9..745c20d 100644
--- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-request-picture-in-picture.html.ini
+++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-request-picture-in-picture.html.ini
@@ -1,7 +1,7 @@
 [restriction-request-picture-in-picture.html]
   expected:
-    if (product == "content_shell") and (os == "win"): [OK, TIMEOUT]
-    if product == "chrome": TIMEOUT
+    if (os == "linux") and (product == "chrome"): TIMEOUT
+    if os == "win": TIMEOUT
   [prerendering page cannot invokeHTMLVideoElement.requestPictureInPicture]
     expected:
       if product == "chrome": TIMEOUT

third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-service-worker-postmessage.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-service-worker-postmessage.https.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-service-worker-postmessage.https.html.ini
index 3cb7332..7b078835 100644
--- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-service-worker-postmessage.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-service-worker-postmessage.https.html.ini
@@ -1,7 +1,7 @@
 [restriction-service-worker-postmessage.https.html]
   expected:
-    if (product == "content_shell") and (os == "win"): [OK, TIMEOUT]
-    if product == "chrome": TIMEOUT
+    if (os == "linux") and (product == "chrome"): TIMEOUT
+    if os == "win": TIMEOUT
   [ServiceWorker#postMessage() from a prerendered page should be deferred until page activation.]
     expected:
       if product == "chrome": TIMEOUT

third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-speech-synthesis.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-speech-synthesis.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-speech-synthesis.html.ini
index c8b329d..ad1ad4c 100644
--- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-speech-synthesis.html.ini
+++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-speech-synthesis.html.ini
@@ -1,7 +1,6 @@
 [restriction-speech-synthesis.html]
   expected:
-    if (os == "linux") and (product == "chrome"): TIMEOUT
-    if os == "win": ERROR
+    if product == "chrome": TIMEOUT
   [speechSynthesis.speak(utterance) should be deferred until the prerendered page is activated]
     expected:
       if product == "chrome": TIMEOUT

third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-web-locks.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-web-locks.https.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-web-locks.https.html.ini
index fee9484..d55497ae 100644
--- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-web-locks.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-web-locks.https.html.ini
@@ -1,7 +1,6 @@
 [restriction-web-locks.https.html]
   expected:
-    if (os == "linux") and (product == "chrome"): TIMEOUT
-    if os == "win": ERROR
+    if product == "chrome": TIMEOUT
   [navigator.locks.request should be deferred until the prerendered page is activated]
     expected:
       if product == "chrome": TIMEOUT

third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-window-resize.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-window-resize.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-window-resize.html.ini
index 68e66974..625e373b 100644
--- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-window-resize.html.ini
+++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-window-resize.html.ini
@@ -1,7 +1,7 @@
 [restriction-window-resize.html]
   expected:
-    if (product == "content_shell") and (os == "win"): [OK, ERROR]
-    if product == "chrome": TIMEOUT
+    if (os == "linux") and (product == "chrome"): TIMEOUT
+    if os == "win": ERROR
   [a prerendering page cannot resize its window by executing resizeTo.]
     expected:
       if product == "chrome": TIMEOUT

third_party/blink/web_tests/external/wpt/speculation-rules/prerender/workers.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/workers.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/workers.html.ini
index a986d42..827d09da 100644
--- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/workers.html.ini
+++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/workers.html.ini
@@ -1,7 +1,8 @@
 [workers.html]
   expected:
-    if (os == "linux") and (product == "chrome"): TIMEOUT
-    if os == "win": TIMEOUT
+    if (flag_specific == "") and (os == "linux") and (product == "chrome"): TIMEOUT
+    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, TIMEOUT]
+    if (flag_specific == "") and (os == "win"): TIMEOUT
   [Dedicated workers should be loaded in suspended state until activated]
     expected:
       if product == "chrome": TIMEOUT

third_party/blink/web_tests/external/wpt/storage/partitioned-estimate-usage-details-caches.tentative.https.sub.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/storage/partitioned-estimate-usage-details-caches.tentative.https.sub.html.ini b/third_party/blink/web_tests/external/wpt/storage/partitioned-estimate-usage-details-caches.tentative.https.sub.html.ini
index 2cd29ff..b9d6883a 100644
--- a/third_party/blink/web_tests/external/wpt/storage/partitioned-estimate-usage-details-caches.tentative.https.sub.html.ini
+++ b/third_party/blink/web_tests/external/wpt/storage/partitioned-estimate-usage-details-caches.tentative.https.sub.html.ini
@@ -1,3 +1,3 @@
 [partitioned-estimate-usage-details-caches.tentative.https.sub.html]
   expected:
-    if (product == "content_shell") and (flag_specific == "disable-layout-ng"): [OK, TIMEOUT]
+    if flag_specific == "disable-layout-ng": TIMEOUT

third_party/blink/web_tests/external/wpt/url/a-element-xhtml.xhtml.ini

diff --git a/third_party/blink/web_tests/external/wpt/url/a-element-xhtml.xhtml.ini b/third_party/blink/web_tests/external/wpt/url/a-element-xhtml.xhtml.ini
index e03a00d..3dc8d455 100644
--- a/third_party/blink/web_tests/external/wpt/url/a-element-xhtml.xhtml.ini
+++ b/third_party/blink/web_tests/external/wpt/url/a-element-xhtml.xhtml.ini
@@ -963,8 +963,7 @@
 
 [a-element-xhtml.xhtml?include=file]
   expected:
-    if (flag_specific == "") and (os == "win"): TIMEOUT
-    if flag_specific == "disable-layout-ng": CRASH
+    if os == "win": TIMEOUT
   [Parsing: <file://example%/> against <about:blank>]
     expected: FAIL
 
@@ -1121,7 +1120,7 @@
 
 [a-element-xhtml.xhtml?exclude=(file|javascript|mailto)]
   expected:
-    if flag_specific == "disable-site-isolation-trials": [OK, CRASH]
+    if flag_specific == "disable-site-isolation-trials": CRASH
   [Parsing: <non-special://test:@test/x> against <about:blank>]
     expected: FAIL
 
@@ -1973,14 +1972,14 @@
 
 [a-element-xhtml.xhtml?include=mailto]
   expected:
-    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): CRASH
-    if flag_specific == "disable-layout-ng": CRASH
+    if os == "win": [OK, TIMEOUT]
   [Parsing: <mailto:/../> against <about:blank>]
     expected: FAIL
 
 
 [a-element-xhtml.xhtml?include=javascript]
   expected:
-    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, CRASH]
+    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): CRASH
+    if flag_specific == "disable-layout-ng": [OK, CRASH]
   [Parsing: <javascript:/../> against <about:blank>]
     expected: FAIL

third_party/blink/web_tests/external/wpt/url/a-element.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/url/a-element.html.ini b/third_party/blink/web_tests/external/wpt/url/a-element.html.ini
index 58ed526a..82a23475 100644
--- a/third_party/blink/web_tests/external/wpt/url/a-element.html.ini
+++ b/third_party/blink/web_tests/external/wpt/url/a-element.html.ini
@@ -1073,8 +1073,8 @@
 
 [a-element.html?include=file]
   expected:
-    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, CRASH]
-    if (flag_specific == "") and (os == "win"): [OK, TIMEOUT]
+    if flag_specific == "disable-site-isolation-trials": [OK, CRASH]
+    if flag_specific == "highdpi": [OK, CRASH]
   [Parsing: <file://example%/> against <about:blank>]
     expected: FAIL
 
@@ -1322,9 +1322,6 @@
 
 
 [a-element.html?include=mailto]
-  expected:
-    if flag_specific == "disable-site-isolation-trials": [OK, CRASH]
-    if flag_specific == "disable-layout-ng": CRASH
   [Parsing: <mailto:/../> against <about:blank>]
     expected: FAIL
 
@@ -2180,5 +2177,8 @@
 
 
 [a-element.html?include=javascript]
+  expected:
+    if (os == "linux") and (flag_specific == "") and (product == "content_shell"): [OK, CRASH]
+    if os == "win": [OK, TIMEOUT]
   [Parsing: <javascript:/../> against <about:blank>]
     expected: FAIL

third_party/blink/web_tests/external/wpt/url/failure.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/url/failure.html.ini b/third_party/blink/web_tests/external/wpt/url/failure.html.ini
index 97ce987..5f3314d 100644
--- a/third_party/blink/web_tests/external/wpt/url/failure.html.ini
+++ b/third_party/blink/web_tests/external/wpt/url/failure.html.ini
@@ -1,7 +1,6 @@
 [failure.html]
   expected:
-    if (flag_specific == "") and (product == "chrome"): TIMEOUT
-    if flag_specific == "disable-layout-ng": CRASH
+    if product == "chrome": TIMEOUT
   [Location's href: file://example:1/ should throw]
     expected: FAIL
 

third_party/blink/web_tests/external/wpt/url/percent-encoding.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/url/percent-encoding.window.js.ini b/third_party/blink/web_tests/external/wpt/url/percent-encoding.window.js.ini
new file mode 100644
index 0000000..1091bffa
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/url/percent-encoding.window.js.ini
@@ -0,0 +1,3 @@
+[percent-encoding.window.html]
+  expected:
+    if flag_specific == "disable-site-isolation-trials": [OK, CRASH]

third_party/blink/web_tests/external/wpt/url/url-setters-a-area.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/url/url-setters-a-area.window.js.ini b/third_party/blink/web_tests/external/wpt/url/url-setters-a-area.window.js.ini
index f89c646..763ab28 100644
--- a/third_party/blink/web_tests/external/wpt/url/url-setters-a-area.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/url/url-setters-a-area.window.js.ini
@@ -647,8 +647,6 @@
 
 
 [url-setters-a-area.window.html?exclude=(file|javascript|mailto)]
-  expected:
-    if flag_specific == "disable-site-isolation-trials": [OK, CRASH]
   [<a>: Setting <http://example.net>.protocol = 'b' Can’t switch from special scheme to non-special]
     expected: FAIL
 
@@ -1163,6 +1161,8 @@
 
 
 [url-setters-a-area.window.html?include=javascript]
+  expected:
+    if os == "win": [OK, TIMEOUT]
   [<a>: Setting <javascript://x/>.username = 'wario']
     expected: FAIL
 
@@ -1183,6 +1183,8 @@
 
 
 [url-setters-a-area.window.html?include=mailto]
+  expected:
+    if flag_specific == "disable-site-isolation-trials": [OK, CRASH]
   [<a>: Setting <mailto:me@example.net>.protocol = 'http' Cannot-be-a-base URL doesn’t have a host, but URL in a special scheme must.]
     expected: FAIL
 

third_party/blink/web_tests/external/wpt/url/url-setters-stripping.any.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/url/url-setters-stripping.any.js.ini b/third_party/blink/web_tests/external/wpt/url/url-setters-stripping.any.js.ini
index 5c23a98..ad2f860 100644
--- a/third_party/blink/web_tests/external/wpt/url/url-setters-stripping.any.js.ini
+++ b/third_party/blink/web_tests/external/wpt/url/url-setters-stripping.any.js.ini
@@ -1,6 +1,4 @@
 [url-setters-stripping.any.html]
-  expected:
-    if os == "win": [OK, TIMEOUT]
   [Setting pathname with leading U+0000 (https:)]
     expected: FAIL
 
@@ -318,6 +316,8 @@
 
 
 [url-setters-stripping.any.worker.html]
+  expected:
+    if os == "win": [OK, TIMEOUT]
   [Setting pathname with leading U+0000 (https:)]
     expected: FAIL
 

third_party/blink/web_tests/external/wpt/url/urlsearchparams-stringifier.any.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/url/urlsearchparams-stringifier.any.js.ini b/third_party/blink/web_tests/external/wpt/url/urlsearchparams-stringifier.any.js.ini
deleted file mode 100644
index d7a376af..0000000
--- a/third_party/blink/web_tests/external/wpt/url/urlsearchparams-stringifier.any.js.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[urlsearchparams-stringifier.any.worker.html]
-
-[urlsearchparams-stringifier.any.html]
-  expected:
-    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): CRASH

third_party/blink/web_tests/external/wpt/vibration/api-is-present.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/vibration/api-is-present.html.ini b/third_party/blink/web_tests/external/wpt/vibration/api-is-present.html.ini
new file mode 100644
index 0000000..f3986b9f
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/vibration/api-is-present.html.ini
@@ -0,0 +1,3 @@
+[api-is-present.html]
+  expected:
+    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, CRASH]

third_party/blink/web_tests/external/wpt/video-rvfc/request-video-frame-callback.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/video-rvfc/request-video-frame-callback.html.ini b/third_party/blink/web_tests/external/wpt/video-rvfc/request-video-frame-callback.html.ini
new file mode 100644
index 0000000..5fa8925
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/video-rvfc/request-video-frame-callback.html.ini
@@ -0,0 +1,3 @@
+[request-video-frame-callback.html]
+  expected:
+    if product == "chrome": [OK, CRASH]

third_party/blink/web_tests/external/wpt/web-animations/interfaces/Animation/finished.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/web-animations/interfaces/Animation/finished.html.ini b/third_party/blink/web_tests/external/wpt/web-animations/interfaces/Animation/finished.html.ini
index 1e48fb2..3f679f0 100644
--- a/third_party/blink/web_tests/external/wpt/web-animations/interfaces/Animation/finished.html.ini
+++ b/third_party/blink/web_tests/external/wpt/web-animations/interfaces/Animation/finished.html.ini
@@ -1,4 +1,4 @@
 [finished.html]
   [Test finished promise changes for animation duration changes]
     expected:
-      if (flag_specific == "") and (product == "chrome"): [PASS, FAIL]
+      if (product == "content_shell") and (flag_specific == "disable-layout-ng"): [PASS, FAIL]

third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/setting-the-playback-rate-of-an-animation.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/setting-the-playback-rate-of-an-animation.html.ini b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/setting-the-playback-rate-of-an-animation.html.ini
new file mode 100644
index 0000000..63c4800
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/setting-the-playback-rate-of-an-animation.html.ini
@@ -0,0 +1,4 @@
+[setting-the-playback-rate-of-an-animation.html]
+  [Reversing the playback rate while finished restarts the animation]
+    expected:
+      if product == "chrome": [PASS, FAIL]

third_party/blink/web_tests/external/wpt/web-animations/timing-model/timelines/sibling-iframe-timeline.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/web-animations/timing-model/timelines/sibling-iframe-timeline.html.ini b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/timelines/sibling-iframe-timeline.html.ini
index 96ae3e67..db1fc3d 100644
--- a/third_party/blink/web_tests/external/wpt/web-animations/timing-model/timelines/sibling-iframe-timeline.html.ini
+++ b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/timelines/sibling-iframe-timeline.html.ini
@@ -1,4 +1,5 @@
 [sibling-iframe-timeline.html]
   [animation tied to another frame's timeline runs properly]
     expected:
+      if (os == "linux") and (flag_specific == "") and (product == "content_shell"): [PASS, FAIL]
       if os == "win": FAIL

third_party/blink/web_tests/external/wpt/web-bundle/subresource-loading/reuse-web-bundle-resource.https.tentative.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/web-bundle/subresource-loading/reuse-web-bundle-resource.https.tentative.html.ini b/third_party/blink/web_tests/external/wpt/web-bundle/subresource-loading/reuse-web-bundle-resource.https.tentative.html.ini
index 2aec54d..9c8170d6 100644
--- a/third_party/blink/web_tests/external/wpt/web-bundle/subresource-loading/reuse-web-bundle-resource.https.tentative.html.ini
+++ b/third_party/blink/web_tests/external/wpt/web-bundle/subresource-loading/reuse-web-bundle-resource.https.tentative.html.ini
@@ -1,8 +1,8 @@
 [reuse-web-bundle-resource.https.tentative.html]
-  [replaceWith() should reuse webbundle resources.]
+  [A webbundle should be fetched again when new script element is appended.]
     expected:
-      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": [PASS, FAIL]
 
-  ['remove(), then append() in a separate task' should not reuse webbundle resources]
+  ['remove(), then append()' should reuse webbundle resources]
     expected:
-      if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL]
+      if flag_specific == "disable-layout-ng": [PASS, FAIL]

third_party/blink/web_tests/external/wpt/web-locks/query-ordering.tentative.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/web-locks/query-ordering.tentative.https.html.ini b/third_party/blink/web_tests/external/wpt/web-locks/query-ordering.tentative.https.html.ini
new file mode 100644
index 0000000..b63d722
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/web-locks/query-ordering.tentative.https.html.ini
@@ -0,0 +1,3 @@
+[query-ordering.tentative.https.html]
+  expected:
+    if flag_specific == "disable-site-isolation-trials": [OK, CRASH]

third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-audiocontext-interface/processing-after-resume.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-audiocontext-interface/processing-after-resume.https.html.ini b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-audiocontext-interface/processing-after-resume.https.html.ini
index a270ea35..8d05420 100644
--- a/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-audiocontext-interface/processing-after-resume.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-audiocontext-interface/processing-after-resume.https.html.ini
@@ -1,5 +1,3 @@
 [processing-after-resume.https.html]
   [Test consistency of processing after resume()]
-    expected:
-      if flag_specific == "disable-layout-ng": PASS
-      FAIL
+    expected: FAIL

third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-output-channel-count.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-output-channel-count.https.html.ini b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-output-channel-count.https.html.ini
new file mode 100644
index 0000000..97f1aa6
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-output-channel-count.https.html.ini
@@ -0,0 +1,9 @@
+[audioworkletnode-output-channel-count.https.html]
+  [X The expected output channel count is not equal to 17. Got 1.]
+    expected: FAIL
+
+  [< [Dynamically change the channel count to if unspecified.\] 1 out of 1 assertions were failed.]
+    expected: FAIL
+
+  [# AUDIT TASK RUNNER FINISHED: 1 out of 2 tasks were failed.]
+    expected: FAIL

third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/no-cors.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/no-cors.https.html.ini b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/no-cors.https.html.ini
new file mode 100644
index 0000000..af268033c
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/no-cors.https.html.ini
@@ -0,0 +1,3 @@
+[no-cors.https.html]
+  expected:
+    if flag_specific == "disable-layout-ng": [OK, CRASH]

third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-pannernode-interface/test-pannernode-automation.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-pannernode-interface/test-pannernode-automation.html.ini b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-pannernode-interface/test-pannernode-automation.html.ini
index 20900aa..a0c0660 100644
--- a/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-pannernode-interface/test-pannernode-automation.html.ini
+++ b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-pannernode-interface/test-pannernode-automation.html.ini
@@ -1,3 +1,3 @@
 [test-pannernode-automation.html]
   expected:
-    if os == "win": [OK, TIMEOUT]
+    if os == "win": TIMEOUT

third_party/blink/web_tests/external/wpt/webdriver/tests/back/back.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/back/back.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/back/back.py
index 21e8498..62434323 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/back/back.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/back/back.py
@@ -164,6 +164,6 @@
 
     assert session.url == first_page
 
-    with pytest.raises(error.StaleElementReferenceException):
+    with pytest.raises(error.NoSuchElementException):
         elem.click()
     elem = session.find.css("#delete", all=False)

third_party/blink/web_tests/external/wpt/webdriver/tests/element_click/click.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/element_click/click.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/element_click/click.py
index bd4e2c68..d201544 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/element_click/click.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/element_click/click.py
@@ -48,29 +48,39 @@
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_window_handle(session, inline):
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_window_handle(session, inline, closed):
     session.url = inline("<div id='parent'><p/>")
     element = session.find.css("#parent", all=False)
 
     new_handle = session.new_window()
+
+    if closed:
+        session.window.close()
+
     session.window_handle = new_handle
 
     response = element_click(session, element)
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_frame(session, iframe, inline):
-    session.url = inline(iframe("<div id='parent'><p/>"))
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_frame(session, url, closed):
+    session.url = url("/webdriver/tests/support/html/subframe.html")
 
-    frame = session.find.css("iframe", all=False)
+    frame = session.find.css("#delete-frame", all=False)
     session.switch_frame(frame)
 
-    element = session.find.css("#parent", all=False)
+    button = session.find.css("#remove-parent", all=False)
+    if closed:
+        button.click()
+
     session.switch_frame("parent")
 
-    response = element_click(session, element)
+    response = element_click(session, button)
     assert_error(response, "no such element")
 
+
 @pytest.mark.parametrize("as_frame", [False, True], ids=["top_context", "child_context"])
 def test_stale_element_reference(session, stale_element, as_frame):
     element = stale_element("<div>", "div", as_frame=as_frame)

third_party/blink/web_tests/external/wpt/webdriver/tests/element_send_keys/send_keys.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/element_send_keys/send_keys.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/element_send_keys/send_keys.py
index 5f8d3f01..36b27b9 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/element_send_keys/send_keys.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/element_send_keys/send_keys.py
@@ -61,27 +61,36 @@
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_window_handle(session, inline):
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_window_handle(session, inline, closed):
     session.url = inline("<div id='parent'><p/>")
     element = session.find.css("#parent", all=False)
 
     new_handle = session.new_window()
+
+    if closed:
+        session.window.close()
+
     session.window_handle = new_handle
 
     response = element_send_keys(session, element, "foo")
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_frame(session, iframe, inline):
-    session.url = inline(iframe("<div id='parent'><p/>"))
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_frame(session, url, closed):
+    session.url = url("/webdriver/tests/support/html/subframe.html")
 
-    frame = session.find.css("iframe", all=False)
+    frame = session.find.css("#delete-frame", all=False)
     session.switch_frame(frame)
 
-    element = session.find.css("#parent", all=False)
+    button = session.find.css("#remove-parent", all=False)
+    if closed:
+        button.click()
+
     session.switch_frame("parent")
 
-    response = element_send_keys(session, element, "foo")
+    response = element_send_keys(session, button, "foo")
     assert_error(response, "no such element")
 
 

third_party/blink/web_tests/external/wpt/webdriver/tests/execute_async_script/execute_async.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/execute_async_script/execute_async.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/execute_async_script/execute_async.py
index 697df72b..5ac9cd3 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/execute_async_script/execute_async.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/execute_async_script/execute_async.py
@@ -34,11 +34,16 @@
     assert_error(result, "no such element")
 
 
-def test_no_such_element_from_other_window_handle(session, inline):
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_window_handle(session, inline, closed):
     session.url = inline("<div id='parent'><p/>")
     element = session.find.css("#parent", all=False)
 
     new_handle = session.new_window()
+
+    if closed:
+        session.window.close()
+
     session.window_handle = new_handle
 
     result = execute_async_script(session, """
@@ -47,18 +52,22 @@
     assert_error(result, "no such element")
 
 
-def test_no_such_element_from_other_frame(session, iframe, inline):
-    session.url = inline(iframe("<div id='parent'><p/>"))
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_frame(session, url, closed):
+    session.url = url("/webdriver/tests/support/html/subframe.html")
 
-    frame = session.find.css("iframe", all=False)
+    frame = session.find.css("#delete-frame", all=False)
     session.switch_frame(frame)
 
-    element = session.find.css("#parent", all=False)
+    button = session.find.css("#remove-parent", all=False)
+    if closed:
+        button.click()
+
     session.switch_frame("parent")
 
     result = execute_async_script(session, """
         arguments[1](true);
-        """, args=[element])
+        """, args=[button])
     assert_error(result, "no such element")
 
 

third_party/blink/web_tests/external/wpt/webdriver/tests/execute_script/execute.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/execute_script/execute.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/execute_script/execute.py
index d1f1f13..ff1bb0f 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/execute_script/execute.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/execute_script/execute.py
@@ -32,27 +32,36 @@
     assert_error(result, "no such element")
 
 
-def test_no_such_element_from_other_window_handle(session, inline):
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_window_handle(session, inline, closed):
     session.url = inline("<div id='parent'><p/>")
     element = session.find.css("#parent", all=False)
 
     new_handle = session.new_window()
+
+    if closed:
+        session.window.close()
+
     session.window_handle = new_handle
 
     result = execute_script(session, "return true;", args=[element])
     assert_error(result, "no such element")
 
 
-def test_no_such_element_from_other_frame(session, iframe, inline):
-    session.url = inline(iframe("<div id='parent'><p/>"))
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_frame(session, url, closed):
+    session.url = url("/webdriver/tests/support/html/subframe.html")
 
-    frame = session.find.css("iframe", all=False)
+    frame = session.find.css("#delete-frame", all=False)
     session.switch_frame(frame)
 
-    element = session.find.css("#parent", all=False)
+    button = session.find.css("#remove-parent", all=False)
+    if closed:
+        button.click()
+
     session.switch_frame("parent")
 
-    result = execute_script(session, "return true;", args=[element])
+    result = execute_script(session, "return true;", args=[button])
     assert_error(result, "no such element")
 
 

third_party/blink/web_tests/external/wpt/webdriver/tests/forward/forward.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/forward/forward.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/forward/forward.py
index 61c66e2..f27be403 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/forward/forward.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/forward/forward.py
@@ -190,6 +190,6 @@
 
     assert session.url == second_page
 
-    with pytest.raises(error.StaleElementReferenceException):
+    with pytest.raises(error.NoSuchElementException):
         elem.click()
     elem = session.find.css("#delete", all=False)

third_party/blink/web_tests/external/wpt/webdriver/tests/get_computed_label/get.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/get_computed_label/get.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/get_computed_label/get.py
index 901b9809..32b4ce3 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/get_computed_label/get.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/get_computed_label/get.py
@@ -25,27 +25,36 @@
     assert_error(result, "no such element")
 
 
-def test_no_such_element_from_other_window_handle(session, inline):
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_window_handle(session, inline, closed):
     session.url = inline("<div id='parent'><p/>")
     element = session.find.css("#parent", all=False)
 
     new_handle = session.new_window()
+
+    if closed:
+        session.window.close()
+
     session.window_handle = new_handle
 
     result = get_computed_label(session, element.id)
     assert_error(result, "no such element")
 
 
-def test_no_such_element_from_other_frame(session, iframe, inline):
-    session.url = inline(iframe("<div id='parent'><p/>"))
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_frame(session, url, closed):
+    session.url = url("/webdriver/tests/support/html/subframe.html")
 
-    frame = session.find.css("iframe", all=False)
+    frame = session.find.css("#delete-frame", all=False)
     session.switch_frame(frame)
 
-    element = session.find.css("#parent", all=False)
+    button = session.find.css("#remove-parent", all=False)
+    if closed:
+        button.click()
+
     session.switch_frame("parent")
 
-    result = get_computed_label(session, element.id)
+    result = get_computed_label(session, button.id)
     assert_error(result, "no such element")
 
 

third_party/blink/web_tests/external/wpt/webdriver/tests/get_computed_role/get.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/get_computed_role/get.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/get_computed_role/get.py
index 84e7ab2..1e61799d 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/get_computed_role/get.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/get_computed_role/get.py
@@ -25,27 +25,36 @@
     assert_error(result, "no such element")
 
 
-def test_no_such_element_from_other_window_handle(session, inline):
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_window_handle(session, inline, closed):
     session.url = inline("<div id='parent'><p/>")
     element = session.find.css("#parent", all=False)
 
     new_handle = session.new_window()
+
+    if closed:
+        session.window.close()
+
     session.window_handle = new_handle
 
     result = get_computed_role(session, element.id)
     assert_error(result, "no such element")
 
 
-def test_no_such_element_from_other_frame(session, iframe, inline):
-    session.url = inline(iframe("<div id='parent'><p/>"))
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_frame(session, url, closed):
+    session.url = url("/webdriver/tests/support/html/subframe.html")
 
-    frame = session.find.css("iframe", all=False)
+    frame = session.find.css("#delete-frame", all=False)
     session.switch_frame(frame)
 
-    element = session.find.css("#parent", all=False)
+    button = session.find.css("#remove-parent", all=False)
+    if closed:
+        button.click()
+
     session.switch_frame("parent")
 
-    result = get_computed_role(session, element.id)
+    result = get_computed_role(session, button.id)
     assert_error(result, "no such element")
 
 

third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_attribute/get.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_attribute/get.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_attribute/get.py
index 1d00307..87fd5f3 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_attribute/get.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_attribute/get.py
@@ -36,27 +36,35 @@
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_window_handle(session, inline):
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_window_handle(session, inline, closed):
     session.url = inline("<div id='parent'><p/>")
     element = session.find.css("#parent", all=False)
 
     new_handle = session.new_window()
+
+    if closed:
+        session.window.close()
+
     session.window_handle = new_handle
 
     response = get_element_attribute(session, element.id, "id")
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_frame(session, iframe, inline):
-    session.url = inline(iframe("<div id='parent'><p/>"))
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_frame(session, url, closed):
+    session.url = url("/webdriver/tests/support/html/subframe.html")
 
-    frame = session.find.css("iframe", all=False)
+    frame = session.find.css("#delete-frame", all=False)
     session.switch_frame(frame)
 
-    element = session.find.css("#parent", all=False)
-    session.switch_frame("parent")
+    button = session.find.css("#remove-parent", all=False)
+    if closed:
+        button.click()
 
-    response = get_element_attribute(session, element.id, "id")
+    session.switch_frame("parent")
+    response = get_element_attribute(session, button.id, "id")
     assert_error(response, "no such element")
 
 

third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_css_value/get.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_css_value/get.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_css_value/get.py
index 3d4a3101..d178fc2 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_css_value/get.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_css_value/get.py
@@ -40,27 +40,36 @@
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_window_handle(session, inline):
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_window_handle(session, inline, closed):
     session.url = inline("<div id='parent'><p/>")
     element = session.find.css("#parent", all=False)
 
     new_handle = session.new_window()
+
+    if closed:
+        session.window.close()
+
     session.window_handle = new_handle
 
     response = get_element_css_value(session, element.id, "display")
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_frame(session, iframe, inline):
-    session.url = inline(iframe("<div id='parent'><p/>"))
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_frame(session, url, closed):
+    session.url = url("/webdriver/tests/support/html/subframe.html")
 
-    frame = session.find.css("iframe", all=False)
+    frame = session.find.css("#delete-frame", all=False)
     session.switch_frame(frame)
 
-    element = session.find.css("#parent", all=False)
+    button = session.find.css("#remove-parent", all=False)
+    if closed:
+        button.click()
+
     session.switch_frame("parent")
 
-    response = get_element_css_value(session, element.id, "display")
+    response = get_element_css_value(session, button.id, "display")
     assert_error(response, "no such element")
 
 

third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_property/get.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_property/get.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_property/get.py
index 9223f1df..7d9d7083 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_property/get.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_property/get.py
@@ -37,27 +37,36 @@
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_window_handle(session, inline):
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_window_handle(session, inline, closed):
     session.url = inline("<div id='parent'><p/>")
     element = session.find.css("#parent", all=False)
 
     new_handle = session.new_window()
+
+    if closed:
+        session.window.close()
+
     session.window_handle = new_handle
 
     response = get_element_property(session, element.id, "id")
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_frame(session, iframe, inline):
-    session.url = inline(iframe("<div id='parent'><p/>"))
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_frame(session, url, closed):
+    session.url = url("/webdriver/tests/support/html/subframe.html")
 
-    frame = session.find.css("iframe", all=False)
+    frame = session.find.css("#delete-frame", all=False)
     session.switch_frame(frame)
 
-    element = session.find.css("#parent", all=False)
+    button = session.find.css("#remove-parent", all=False)
+    if closed:
+        button.click()
+
     session.switch_frame("parent")
 
-    response = get_element_property(session, element.id, "id")
+    response = get_element_property(session, button.id, "id")
     assert_error(response, "no such element")
 
 

third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_rect/get.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_rect/get.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_rect/get.py
index 97dc7a9..113bc83 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_rect/get.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_rect/get.py
@@ -40,27 +40,36 @@
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_window_handle(session, inline):
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_window_handle(session, inline, closed):
     session.url = inline("<div id='parent'><p/>")
     element = session.find.css("#parent", all=False)
 
     new_handle = session.new_window()
+
+    if closed:
+        session.window.close()
+
     session.window_handle = new_handle
 
     response = get_element_rect(session, element.id)
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_frame(session, iframe, inline):
-    session.url = inline(iframe("<div id='parent'><p/>"))
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_frame(session, url, closed):
+    session.url = url("/webdriver/tests/support/html/subframe.html")
 
-    frame = session.find.css("iframe", all=False)
+    frame = session.find.css("#delete-frame", all=False)
     session.switch_frame(frame)
 
-    element = session.find.css("#parent", all=False)
+    button = session.find.css("#remove-parent", all=False)
+    if closed:
+        button.click()
+
     session.switch_frame("parent")
 
-    response = get_element_rect(session, element.id)
+    response = get_element_rect(session, button.id)
     assert_error(response, "no such element")
 
 

third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_shadow_root/get.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_shadow_root/get.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_shadow_root/get.py
index 70168bb8..55b2089a 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_shadow_root/get.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_shadow_root/get.py
@@ -36,25 +36,36 @@
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_window_handle(session, inline, checkbox_dom):
-    session.url = inline(checkbox_dom)
-    element = session.find.css("custom-checkbox-element", all=False)
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_window_handle(session, inline, closed):
+    session.url = inline("<div id='parent'><p/>")
+    element = session.find.css("#parent", all=False)
 
     new_handle = session.new_window()
+
+    if closed:
+        session.window.close()
+
     session.window_handle = new_handle
 
     response = get_shadow_root(session, element.id)
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_frame(session, iframe, inline, checkbox_dom):
-    session.url = inline(iframe(checkbox_dom))
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_frame(session, url, closed):
+    session.url = url("/webdriver/tests/support/html/subframe.html")
 
-    session.switch_frame(0)
-    element = session.find.css("custom-checkbox-element", all=False)
+    frame = session.find.css("#delete-frame", all=False)
+    session.switch_frame(frame)
+
+    button = session.find.css("#remove-parent", all=False)
+    if closed:
+        button.click()
+
     session.switch_frame("parent")
 
-    response = get_shadow_root(session, element.id)
+    response = get_shadow_root(session, button.id)
     assert_error(response, "no such element")
 
 

third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_tag_name/get.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_tag_name/get.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_tag_name/get.py
index 1e4d5d9..bdfebc2 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_tag_name/get.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_tag_name/get.py
@@ -36,27 +36,36 @@
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_window_handle(session, inline):
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_window_handle(session, inline, closed):
     session.url = inline("<div id='parent'><p/>")
     element = session.find.css("#parent", all=False)
 
     new_handle = session.new_window()
+
+    if closed:
+        session.window.close()
+
     session.window_handle = new_handle
 
     response = get_element_tag_name(session, element.id)
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_frame(session, iframe, inline):
-    session.url = inline(iframe("<div id='parent'><p/>"))
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_frame(session, url, closed):
+    session.url = url("/webdriver/tests/support/html/subframe.html")
 
-    frame = session.find.css("iframe", all=False)
+    frame = session.find.css("#delete-frame", all=False)
     session.switch_frame(frame)
 
-    element = session.find.css("#parent", all=False)
+    button = session.find.css("#remove-parent", all=False)
+    if closed:
+        button.click()
+
     session.switch_frame("parent")
 
-    response = get_element_tag_name(session, element.id)
+    response = get_element_tag_name(session, button.id)
     assert_error(response, "no such element")
 
 

third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_text/get.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_text/get.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_text/get.py
index 74b09fda..b2c8a09 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_text/get.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/get_element_text/get.py
@@ -36,27 +36,36 @@
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_window_handle(session, inline):
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_window_handle(session, inline, closed):
     session.url = inline("<div id='parent'><p/>")
     element = session.find.css("#parent", all=False)
 
     new_handle = session.new_window()
+
+    if closed:
+        session.window.close()
+
     session.window_handle = new_handle
 
     response = get_element_text(session, element.id)
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_frame(session, iframe, inline):
-    session.url = inline(iframe("<div id='parent'><p/>"))
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_frame(session, url, closed):
+    session.url = url("/webdriver/tests/support/html/subframe.html")
 
-    frame = session.find.css("iframe", all=False)
+    frame = session.find.css("#delete-frame", all=False)
     session.switch_frame(frame)
 
-    element = session.find.css("#parent", all=False)
+    button = session.find.css("#remove-parent", all=False)
+    if closed:
+        button.click()
+
     session.switch_frame("parent")
 
-    response = get_element_text(session, element.id)
+    response = get_element_text(session, button.id)
     assert_error(response, "no such element")
 
 

third_party/blink/web_tests/external/wpt/webdriver/tests/is_element_enabled/enabled.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/is_element_enabled/enabled.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/is_element_enabled/enabled.py
index fa472a6..ef9106c 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/is_element_enabled/enabled.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/is_element_enabled/enabled.py
@@ -39,27 +39,36 @@
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_window_handle(session, inline):
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_window_handle(session, inline, closed):
     session.url = inline("<div id='parent'><p/>")
     element = session.find.css("#parent", all=False)
 
     new_handle = session.new_window()
+
+    if closed:
+        session.window.close()
+
     session.window_handle = new_handle
 
     response = is_element_enabled(session, element.id)
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_frame(session, iframe, inline):
-    session.url = inline(iframe("<div id='parent'><p/>"))
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_frame(session, url, closed):
+    session.url = url("/webdriver/tests/support/html/subframe.html")
 
-    frame = session.find.css("iframe", all=False)
+    frame = session.find.css("#delete-frame", all=False)
     session.switch_frame(frame)
 
-    element = session.find.css("#parent", all=False)
+    button = session.find.css("#remove-parent", all=False)
+    if closed:
+        button.click()
+
     session.switch_frame("parent")
 
-    response = is_element_enabled(session, element.id)
+    response = is_element_enabled(session, button.id)
     assert_error(response, "no such element")
 
 

third_party/blink/web_tests/external/wpt/webdriver/tests/is_element_selected/selected.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/is_element_selected/selected.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/is_element_selected/selected.py
index 79a4927..a5773759 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/is_element_selected/selected.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/is_element_selected/selected.py
@@ -55,25 +55,36 @@
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_window_handle(session, inline):
-    session.url = inline("<input>")
-    element = session.find.css("input", all=False)
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_window_handle(session, inline, closed):
+    session.url = inline("<div id='parent'><p/>")
+    element = session.find.css("#parent", all=False)
 
     new_handle = session.new_window()
+
+    if closed:
+        session.window.close()
+
     session.window_handle = new_handle
 
     response = is_element_selected(session, element.id)
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_frame(session, iframe, inline):
-    session.url = inline(iframe("<input>"))
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_frame(session, url, closed):
+    session.url = url("/webdriver/tests/support/html/subframe.html")
 
-    session.switch_frame(0)
-    element = session.find.css("input", all=False)
+    frame = session.find.css("#delete-frame", all=False)
+    session.switch_frame(frame)
+
+    button = session.find.css("#remove-parent", all=False)
+    if closed:
+        button.click()
+
     session.switch_frame("parent")
 
-    response = is_element_selected(session, element.id)
+    response = is_element_selected(session, button.id)
     assert_error(response, "no such element")
 
 

third_party/blink/web_tests/external/wpt/webdriver/tests/navigate_to/navigate.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/navigate_to/navigate.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/navigate_to/navigate.py
index a367fc1..d61377a 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/navigate_to/navigate.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/navigate_to/navigate.py
@@ -74,7 +74,7 @@
     assert_success(response)
 
     assert session.url == second_page
-    with pytest.raises(error.StaleElementReferenceException):
+    with pytest.raises(error.NoSuchElementException):
         elem.click()
 
     session.find.css("#delete", all=False)

third_party/blink/web_tests/external/wpt/webdriver/tests/take_element_screenshot/screenshot.py

diff --git a/third_party/blink/web_tests/external/wpt/webdriver/tests/take_element_screenshot/screenshot.py b/third_party/blink/web_tests/external/wpt/webdriver/tests/take_element_screenshot/screenshot.py
index 4a248b1..a1fcfac 100644
--- a/third_party/blink/web_tests/external/wpt/webdriver/tests/take_element_screenshot/screenshot.py
+++ b/third_party/blink/web_tests/external/wpt/webdriver/tests/take_element_screenshot/screenshot.py
@@ -39,27 +39,36 @@
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_window_handle(session, inline):
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_window_handle(session, inline, closed):
     session.url = inline("<div id='parent'><p/>")
     element = session.find.css("#parent", all=False)
 
     new_handle = session.new_window()
+
+    if closed:
+        session.window.close()
+
     session.window_handle = new_handle
 
     response = take_element_screenshot(session, element.id)
     assert_error(response, "no such element")
 
 
-def test_no_such_element_from_other_frame(session, iframe, inline):
-    session.url = inline(iframe("<div id='parent'><p/>"))
+@pytest.mark.parametrize("closed", [False, True], ids=["open", "closed"])
+def test_no_such_element_from_other_frame(session, url, closed):
+    session.url = url("/webdriver/tests/support/html/subframe.html")
 
-    frame = session.find.css("iframe", all=False)
+    frame = session.find.css("#delete-frame", all=False)
     session.switch_frame(frame)
 
-    element = session.find.css("#parent", all=False)
+    button = session.find.css("#remove-parent", all=False)
+    if closed:
+        button.click()
+
     session.switch_frame("parent")
 
-    response = take_element_screenshot(session, element.id)
+    response = take_element_screenshot(session, button.id)
     assert_error(response, "no such element")
 
 

third_party/blink/web_tests/external/wpt/webmessaging/postMessage_Date.sub.htm.ini

diff --git a/third_party/blink/web_tests/external/wpt/webmessaging/postMessage_Date.sub.htm.ini b/third_party/blink/web_tests/external/wpt/webmessaging/postMessage_Date.sub.htm.ini
new file mode 100644
index 0000000..2ab22ee
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webmessaging/postMessage_Date.sub.htm.ini
@@ -0,0 +1,3 @@
+[postMessage_Date.sub.htm]
+  expected:
+    if os == "win": [OK, TIMEOUT]

third_party/blink/web_tests/external/wpt/webrtc/RTCIceConnectionState-candidate-pair.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/webrtc/RTCIceConnectionState-candidate-pair.https.html.ini b/third_party/blink/web_tests/external/wpt/webrtc/RTCIceConnectionState-candidate-pair.https.html.ini
index 7e793d2f..4e15800c 100644
--- a/third_party/blink/web_tests/external/wpt/webrtc/RTCIceConnectionState-candidate-pair.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/webrtc/RTCIceConnectionState-candidate-pair.https.html.ini
@@ -1,5 +1,4 @@
 [RTCIceConnectionState-candidate-pair.https.html]
-  expected:
-    if os == "win": [OK, CRASH]
   [On ICE connected, getStats() contains a connected candidate-pair]
-    expected: [PASS, FAIL]
+    expected:
+      if (os == "linux") and (product == "content_shell") and (flag_specific == ""): FAIL

third_party/blink/web_tests/external/wpt/websockets/stream/tentative/close.any.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/websockets/stream/tentative/close.any.js.ini b/third_party/blink/web_tests/external/wpt/websockets/stream/tentative/close.any.js.ini
index cb584b3..381caf01 100644
--- a/third_party/blink/web_tests/external/wpt/websockets/stream/tentative/close.any.js.ini
+++ b/third_party/blink/web_tests/external/wpt/websockets/stream/tentative/close.any.js.ini
@@ -3,8 +3,6 @@
 [close.any.sharedworker.html?wss]
 
 [close.any.worker.html?wpt_flags=h2]
-  expected:
-    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, TIMEOUT]
   [canceling the readable should result in a clean close]
     expected: [PASS, TIMEOUT]
 
@@ -14,6 +12,8 @@
 [close.any.worker.html?wss]
 
 [close.any.html?wpt_flags=h2]
+  expected:
+    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, TIMEOUT]
 
 [close.any.sharedworker.html?wpt_flags=h2]
   [canceling the readable with a code should send that code]
@@ -39,5 +39,3 @@
 
 
 [close.any.serviceworker.html?wpt_flags=h2]
-  expected:
-    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, TIMEOUT]

third_party/blink/web_tests/external/wpt/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles.html.ini b/third_party/blink/web_tests/external/wpt/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles.html.ini
deleted file mode 100644
index 6a131e9..0000000
--- a/third_party/blink/web_tests/external/wpt/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[audio_has_no_subtitles.html]
-  expected:
-    if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/webxr/events_referenceSpace_reset_inline.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/webxr/events_referenceSpace_reset_inline.https.html.ini b/third_party/blink/web_tests/external/wpt/webxr/events_referenceSpace_reset_inline.https.html.ini
index 00c1d56..fddaa5b 100644
--- a/third_party/blink/web_tests/external/wpt/webxr/events_referenceSpace_reset_inline.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/webxr/events_referenceSpace_reset_inline.https.html.ini
@@ -1,7 +1,6 @@
 [events_referenceSpace_reset_inline.https.html]
-  expected: TIMEOUT
+  expected:
+    if product == "chrome": OK
+    TIMEOUT
   [XRSession resetpose from a device properly fires off the right events for non-immersive sessions - webgl]
     expected: FAIL
-
-  [XRSession resetpose from a device properly fires off the right events for non-immersive sessions - webgl2]
-    expected: TIMEOUT

third_party/blink/web_tests/external/wpt/webxr/idlharness.https.window-expected.txt

diff --git a/third_party/blink/web_tests/external/wpt/webxr/idlharness.https.window-expected.txt b/third_party/blink/web_tests/external/wpt/webxr/idlharness.https.window-expected.txt
index 5c850726..4ddf4e7 100644
--- a/third_party/blink/web_tests/external/wpt/webxr/idlharness.https.window-expected.txt
+++ b/third_party/blink/web_tests/external/wpt/webxr/idlharness.https.window-expected.txt
@@ -1,5 +1,5 @@
 This is a testharness.js-based test.
-Found 297 tests; 273 PASS, 24 FAIL, 0 TIMEOUT, 0 NOTRUN.
+Found 297 tests; 275 PASS, 22 FAIL, 0 TIMEOUT, 0 NOTRUN.
 PASS idl_test setup
 PASS idl_test validation
 PASS Partial interface Navigator: original interface defined
@@ -40,7 +40,7 @@
 FAIL XRSession interface: attribute supportedFrameRates assert_true: The prototype object must have a property "supportedFrameRates" expected true got false
 PASS XRSession interface: attribute renderState
 PASS XRSession interface: attribute inputSources
-FAIL XRSession interface: attribute enabledFeatures assert_true: The prototype object must have a property "enabledFeatures" expected true got false
+PASS XRSession interface: attribute enabledFeatures
 PASS XRSession interface: operation updateRenderState(optional XRRenderStateInit)
 FAIL XRSession interface: operation updateTargetFrameRate(float) assert_own_property: interface prototype object missing non-static operation expected property "updateTargetFrameRate" missing
 PASS XRSession interface: operation requestReferenceSpace(XRReferenceSpaceType)
@@ -64,7 +64,7 @@
 FAIL XRSession interface: xrSession must inherit property "supportedFrameRates" with the proper type assert_inherits: property "supportedFrameRates" not found in prototype chain
 PASS XRSession interface: xrSession must inherit property "renderState" with the proper type
 PASS XRSession interface: xrSession must inherit property "inputSources" with the proper type
-FAIL XRSession interface: xrSession must inherit property "enabledFeatures" with the proper type assert_inherits: property "enabledFeatures" not found in prototype chain
+PASS XRSession interface: xrSession must inherit property "enabledFeatures" with the proper type
 PASS XRSession interface: xrSession must inherit property "updateRenderState(optional XRRenderStateInit)" with the proper type
 PASS XRSession interface: calling updateRenderState(optional XRRenderStateInit) on xrSession with too few arguments must throw TypeError
 FAIL XRSession interface: xrSession must inherit property "updateTargetFrameRate(float)" with the proper type assert_inherits: property "updateTargetFrameRate" not found in prototype chain

third_party/blink/web_tests/external/wpt/webxr/resources/webxr_test_constants.js

diff --git a/third_party/blink/web_tests/external/wpt/webxr/resources/webxr_test_constants.js b/third_party/blink/web_tests/external/wpt/webxr/resources/webxr_test_constants.js
index cabc4b4..1a0d7bd 100644
--- a/third_party/blink/web_tests/external/wpt/webxr/resources/webxr_test_constants.js
+++ b/third_party/blink/web_tests/external/wpt/webxr/resources/webxr_test_constants.js
@@ -195,3 +195,10 @@
     pointerOrigin: VALID_POINTER_TRANSFORM,
     profiles: []
 };
+
+// From: https://immersive-web.github.io/webxr/#default-features
+const DEFAULT_FEATURES = {
+  "inline": ["viewer"],
+  "immersive-vr": ["viewer", "local"],
+  "immersive-ar": ["viewer", "local"],
+};

third_party/blink/web_tests/external/wpt/webxr/xrSession_enabledFeatures.https.html

diff --git a/third_party/blink/web_tests/external/wpt/webxr/xrSession_enabledFeatures.https.html b/third_party/blink/web_tests/external/wpt/webxr/xrSession_enabledFeatures.https.html
new file mode 100644
index 0000000..ba904559
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/webxr/xrSession_enabledFeatures.https.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<body>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="resources/webxr_util.js"></script>
+<script src="resources/webxr_test_constants.js"></script>
+<canvas></canvas>
+<script>
+
+  const testName = "Validate enabledFeatures on XRSession";
+
+  const supportedFeatureList = [
+    'viewer',
+    'local',
+    'local-floor',
+    'anchors',
+    'hit-test',
+    'dom-overlay'
+  ];
+
+  const fakeDeviceInitParams = {
+    supportsImmersive: true,
+    supportedModes: ["inline", "immersive-vr"],
+    views: VALID_VIEWS,
+    viewerOrigin: IDENTITY_TRANSFORM,
+    supportedFeatures: supportedFeatureList
+  };
+
+  // NOTE: We explicit don't ask for the 'default' features of viewer/local to
+  // verify that they are being added here.
+  const requestFeatures = [
+    'local-floor',
+    'anchors',
+    'secondary-views',
+    'camera-access',
+  ];
+
+const testFunction = function(session, fakeDeviceController, t) {
+  return new Promise((resolve,reject) => {
+    const unsupportedRequestedFeatures = [];
+
+    for (const feature of requestFeatures) {
+      if (!supportedFeatureList.includes(feature))
+      unsupportedRequestedFeatures.push(feature);
+    }
+
+    const enabledFeatures = session.enabledFeatures;
+    const modeDefaultFeatures = DEFAULT_FEATURES[session.mode];
+
+    t.step(() => {
+      // Whether they were requested or not, all Default features should be
+      // enabled.
+      for (const feature of modeDefaultFeatures) {
+        assert_true(enabledFeatures.includes(feature),
+          "Did not support default feature: " + feature);
+      }
+
+      // Assert that we asked for everything that was included apart from the
+      // default features
+      for (const feature of enabledFeatures) {
+        assert_true(requestFeatures.includes(feature) ||
+                    modeDefaultFeatures.includes(feature),
+                    "Enabled unrequested feature: " + feature);
+      }
+
+      // Assert that all of the features we asked are either excluded because
+      // they were unsupported, or included because they were supported.
+      for (const feature of requestFeatures) {
+        if (unsupportedRequestedFeatures.includes(feature)) {
+          assert_false(enabledFeatures.includes(feature),
+            "Enabled supposedly unsupported feature: " + feature);
+        } else {
+          assert_true(enabledFeatures.includes(feature),
+            "Did not enable supposedly supported feature: " + feature);
+        }
+      }
+    });
+
+    resolve();
+  });
+};
+
+xr_session_promise_test(testName, testFunction,
+  fakeDeviceInitParams, 'immersive-vr', { optionalFeatures: requestFeatures });
+
+</script>
+</body>

third_party/blink/web_tests/external/wpt/webxr/xrSession_requestReferenceSpace_features.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/webxr/xrSession_requestReferenceSpace_features.https.html.ini b/third_party/blink/web_tests/external/wpt/webxr/xrSession_requestReferenceSpace_features.https.html.ini
index 2e02a8c..9d84a7b 100644
--- a/third_party/blink/web_tests/external/wpt/webxr/xrSession_requestReferenceSpace_features.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/webxr/xrSession_requestReferenceSpace_features.https.html.ini
@@ -1,6 +1,6 @@
 [xrSession_requestReferenceSpace_features.https.html]
   expected:
-    if (product == "content_shell") and (flag_specific == "") and (os == "linux"): [OK, TIMEOUT]
+    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): TIMEOUT
   [Non-immersive session supports viewer space by default - webgl]
     expected:
       if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html.ini b/third_party/blink/web_tests/external/wpt/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html.ini
index 5011c0d..66f1822a 100644
--- a/third_party/blink/web_tests/external/wpt/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html.ini
@@ -3,10 +3,6 @@
     expected:
       if product == "chrome": FAIL
 
-  ['floor-level' XRStationaryReferenceSpace updates properly when the transform changes for non-immersive sessions - webgl2]
-    expected:
-      if product == "chrome": [PASS, FAIL]
-
   ['floor-level' XRStationaryReferenceSpace updates properly when the transform changes for non-immersive sessions - webgl]
     expected:
-      if product == "chrome": [PASS, FAIL]
+      if product == "chrome": FAIL

third_party/blink/web_tests/external/wpt/workers/baseurl/alpha/importScripts-in-worker.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/workers/baseurl/alpha/importScripts-in-worker.html.ini b/third_party/blink/web_tests/external/wpt/workers/baseurl/alpha/importScripts-in-worker.html.ini
deleted file mode 100644
index 3924145..0000000
--- a/third_party/blink/web_tests/external/wpt/workers/baseurl/alpha/importScripts-in-worker.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[importScripts-in-worker.html]
-  expected:
-    if flag_specific == "disable-site-isolation-trials": TIMEOUT

third_party/blink/web_tests/external/wpt/workers/constructors/SharedWorker/dummy-name.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/workers/constructors/SharedWorker/dummy-name.html.ini b/third_party/blink/web_tests/external/wpt/workers/constructors/SharedWorker/dummy-name.html.ini
index bacc918..2ff8507 100644
--- a/third_party/blink/web_tests/external/wpt/workers/constructors/SharedWorker/dummy-name.html.ini
+++ b/third_party/blink/web_tests/external/wpt/workers/constructors/SharedWorker/dummy-name.html.ini
@@ -1,3 +1,3 @@
 [dummy-name.html]
   expected:
-    if flag_specific == "disable-site-isolation-trials": [OK, TIMEOUT]
+    if flag_specific == "disable-site-isolation-trials": TIMEOUT

third_party/blink/web_tests/external/wpt/workers/dedicated-worker-from-blob-url.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/workers/dedicated-worker-from-blob-url.window.js.ini b/third_party/blink/web_tests/external/wpt/workers/dedicated-worker-from-blob-url.window.js.ini
index 1f41aff..282999e 100644
--- a/third_party/blink/web_tests/external/wpt/workers/dedicated-worker-from-blob-url.window.js.ini
+++ b/third_party/blink/web_tests/external/wpt/workers/dedicated-worker-from-blob-url.window.js.ini
@@ -1,4 +1,3 @@
 [dedicated-worker-from-blob-url.window.html]
   expected:
-    if (flag_specific == "") and (os == "win"): TIMEOUT
     if flag_specific == "disable-layout-ng": TIMEOUT

third_party/blink/web_tests/external/wpt/workers/interfaces/WorkerUtils/WindowTimers/003.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/workers/interfaces/WorkerUtils/WindowTimers/003.html.ini b/third_party/blink/web_tests/external/wpt/workers/interfaces/WorkerUtils/WindowTimers/003.html.ini
new file mode 100644
index 0000000..a724a8c
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/workers/interfaces/WorkerUtils/WindowTimers/003.html.ini
@@ -0,0 +1,3 @@
+[003.html]
+  expected:
+    if os == "win": [OK, TIMEOUT]

third_party/blink/web_tests/external/wpt/workers/semantics/xhr/003.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/workers/semantics/xhr/003.html.ini b/third_party/blink/web_tests/external/wpt/workers/semantics/xhr/003.html.ini
deleted file mode 100644
index d7839083..0000000
--- a/third_party/blink/web_tests/external/wpt/workers/semantics/xhr/003.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[003.html]
-  expected:
-    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): TIMEOUT

third_party/blink/web_tests/external/wpt/worklets/animation-worklet-import.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/worklets/animation-worklet-import.https.html.ini b/third_party/blink/web_tests/external/wpt/worklets/animation-worklet-import.https.html.ini
index bcf7103f..0b70485 100644
--- a/third_party/blink/web_tests/external/wpt/worklets/animation-worklet-import.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/worklets/animation-worklet-import.https.html.ini
@@ -1,3 +1,3 @@
 [animation-worklet-import.https.html]
   expected:
-    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, TIMEOUT]
+    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): TIMEOUT

third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt

diff --git a/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt b/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt
index 936d08a7..1df3e2a8 100644
--- a/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt
+++ b/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt
@@ -10365,6 +10365,7 @@
     getter depthDataFormat
     getter depthUsage
     getter domOverlayState
+    getter enabledFeatures
     getter environmentBlendMode
     getter inputSources
     getter interactionMode

third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt

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 3cbd744..2563d55 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
@@ -11505,6 +11505,7 @@
     getter depthDataFormat
     getter depthUsage
     getter domOverlayState
+    getter enabledFeatures
     getter environmentBlendMode
     getter inputSources
     getter interactionMode

third_party/blink/web_tests/wpt_internal/cache_storage/padding.https.html.ini

diff --git a/third_party/blink/web_tests/wpt_internal/cache_storage/padding.https.html.ini b/third_party/blink/web_tests/wpt_internal/cache_storage/padding.https.html.ini
new file mode 100644
index 0000000..a067ca4
--- /dev/null
+++ b/third_party/blink/web_tests/wpt_internal/cache_storage/padding.https.html.ini
@@ -0,0 +1,4 @@
+[padding.https.html]
+  [Code cache padding should be stable.]
+    expected:
+      if product == "chrome": [FAIL, PASS]

third_party/blink/web_tests/wpt_internal/forms/file/file-input-webkitdirectory-click.html.ini

diff --git a/third_party/blink/web_tests/wpt_internal/forms/file/file-input-webkitdirectory-click.html.ini b/third_party/blink/web_tests/wpt_internal/forms/file/file-input-webkitdirectory-click.html.ini
index 10a1e2c..1aef8ac 100644
--- a/third_party/blink/web_tests/wpt_internal/forms/file/file-input-webkitdirectory-click.html.ini
+++ b/third_party/blink/web_tests/wpt_internal/forms/file/file-input-webkitdirectory-click.html.ini
@@ -1,6 +1,6 @@
 [file-input-webkitdirectory-click.html]
   expected:
-    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, TIMEOUT]
+    if (flag_specific == "") and (os == "linux") and (product == "content_shell"): TIMEOUT
   [clicking a file input with the webkitdirectory attribute launches a file chooser]
     expected:
       if product == "chrome": FAIL

third_party/blink/web_tests/wpt_internal/forms/file/file-input-webkitdirectory-key-enter.html.ini

diff --git a/third_party/blink/web_tests/wpt_internal/forms/file/file-input-webkitdirectory-key-enter.html.ini b/third_party/blink/web_tests/wpt_internal/forms/file/file-input-webkitdirectory-key-enter.html.ini
index f94a6ac..d944ed21 100644
--- a/third_party/blink/web_tests/wpt_internal/forms/file/file-input-webkitdirectory-key-enter.html.ini
+++ b/third_party/blink/web_tests/wpt_internal/forms/file/file-input-webkitdirectory-key-enter.html.ini
@@ -1,6 +1,6 @@
 [file-input-webkitdirectory-key-enter.html]
   expected:
-    if flag_specific == "disable-site-isolation-trials": [OK, TIMEOUT]
+    if (flag_specific == "") and (os == "win"): [OK, TIMEOUT]
   [pressing Enter with focus on a webkitdirectory file input element launches a file chooser]
     expected:
       if product == "chrome": FAIL

third_party/blink/web_tests/wpt_internal/storage/estimate-usage-details-filesystem.https.tentative.any.js.ini

diff --git a/third_party/blink/web_tests/wpt_internal/storage/estimate-usage-details-filesystem.https.tentative.any.js.ini b/third_party/blink/web_tests/wpt_internal/storage/estimate-usage-details-filesystem.https.tentative.any.js.ini
index e2b9c7a..b2b53ea8 100644
--- a/third_party/blink/web_tests/wpt_internal/storage/estimate-usage-details-filesystem.https.tentative.any.js.ini
+++ b/third_party/blink/web_tests/wpt_internal/storage/estimate-usage-details-filesystem.https.tentative.any.js.ini
@@ -1,6 +1,11 @@
 [estimate-usage-details-filesystem.https.tentative.any.html]
+  [estimate() usage details reflects increase in fileSystem after write  operation]
+    expected:
+      if flag_specific == "disable-layout-ng": [PASS, FAIL]
+      if flag_specific == "disable-site-isolation-trials": [FAIL, PASS]
+
 
 [estimate-usage-details-filesystem.https.tentative.any.worker.html]
   [estimate() usage details reflects increase in fileSystem after write  operation]
     expected:
-      if (os == "linux") and (product == "chrome"): [PASS, FAIL]
+      if (product == "content_shell") and (flag_specific == "") and (os == "linux"): [PASS, FAIL]

third_party/blink/web_tests/wpt_internal/view-transition-on-navigation/reload-crash.html.ini

diff --git a/third_party/blink/web_tests/wpt_internal/view-transition-on-navigation/reload-crash.html.ini b/third_party/blink/web_tests/wpt_internal/view-transition-on-navigation/reload-crash.html.ini
index 6bc5922..19cf3a6 100644
--- a/third_party/blink/web_tests/wpt_internal/view-transition-on-navigation/reload-crash.html.ini
+++ b/third_party/blink/web_tests/wpt_internal/view-transition-on-navigation/reload-crash.html.ini
@@ -1,3 +1,3 @@
 [reload-crash.html]
   expected:
-    if product == "chrome": [PASS, ERROR]
+    if product == "chrome": ERROR

third_party/closure_compiler/externs/input_method_private.js

diff --git a/third_party/closure_compiler/externs/input_method_private.js b/third_party/closure_compiler/externs/input_method_private.js
index 7a758a68..1c458c9c 100644
--- a/third_party/closure_compiler/externs/input_method_private.js
+++ b/third_party/closure_compiler/externs/input_method_private.js
@@ -374,12 +374,6 @@
 chrome.inputMethodPrivate.onChanged;
 
 /**
- * Fired when the composition bounds or cursor bounds are changed.
- * @type {!ChromeEvent}
- */
-chrome.inputMethodPrivate.onCompositionBoundsChanged;
-
-/**
  * Fired when the custom spelling dictionary is loaded.
  * @type {!ChromeEvent}
  */

third_party/closure_compiler/interfaces/input_method_private_interface.js

diff --git a/third_party/closure_compiler/interfaces/input_method_private_interface.js b/third_party/closure_compiler/interfaces/input_method_private_interface.js
index e5bd69c..c1b907f 100644
--- a/third_party/closure_compiler/interfaces/input_method_private_interface.js
+++ b/third_party/closure_compiler/interfaces/input_method_private_interface.js
@@ -211,12 +211,6 @@
 InputMethodPrivate.prototype.onChanged;
 
 /**
- * Fired when the composition bounds or cursor bounds are changed.
- * @type {!ChromeEvent}
- */
-InputMethodPrivate.prototype.onCompositionBoundsChanged;
-
-/**
  * Fired when the custom spelling dictionary is loaded.
  * @type {!ChromeEvent}
  */

tools/android/checkxmlstyle/checkxmlstyle.py

diff --git a/tools/android/checkxmlstyle/checkxmlstyle.py b/tools/android/checkxmlstyle/checkxmlstyle.py
index cb4a3067..959210c 100644
--- a/tools/android/checkxmlstyle/checkxmlstyle.py
+++ b/tools/android/checkxmlstyle/checkxmlstyle.py
@@ -77,6 +77,7 @@
   result.extend(_CheckButtonCompatWidgetUsage(input_api, output_api))
   result.extend(_CheckStringResourceQuotesPunctuations(input_api, output_api))
   result.extend(_CheckStringResourceEllipsisPunctuations(input_api, output_api))
+  result.extend(_CheckImportantForAccessibility(input_api, output_api))
   # Add more checks here
   return result
 
@@ -498,7 +499,7 @@
     return [
       output_api.PresubmitPromptWarning(
           '''
-  Android Widget Check warning:
+  Android XML Widget Check warning:
     Your new code is using android:lineSpacingExtra
     or android:lineSpacingMultiplier, listed below.
 
@@ -513,6 +514,39 @@
 
   return []
 
+### important for accessibility below ###
+def _CheckImportantForAccessibility(input_api, output_api):
+  """
+  Encourage android:importantForAccessibility="no" rather than
+  tools:ignore="ContentDescription" for images that don't need content
+  descriptions.
+  """
+  warnings = []
+  attributes = ['tools:ignore="ContentDescription"']
+  for f in IncludedFiles(input_api):
+    for line_number, line in f.ChangedContents():
+      for attribute in attributes:
+        if attribute in line:
+          warnings.append(
+            '  %s:%d\n    \t%s' % (f.LocalPath(), line_number, line.strip()))
+
+  if warnings:
+    return [
+      output_api.PresubmitPromptWarning(
+          '''
+  Android XML Widget Check warning:
+    Your new code is using tools:ignore="ContentDescription", listed below.
+
+    Use android:importantForAccessibility="no" instead of tools:ignore="ContentDescription"
+    in your ImageView unless it is important for accessibility and a content description is set
+    in Java.
+
+    See https://crbug.com/1245341 for more information.
+  ''', warnings)
+    ]
+
+  return []
+
 
 ### unfavored android widgets below ###
 def _CheckButtonCompatWidgetUsage(input_api, output_api):

tools/android/checkxmlstyle/checkxmlstyle_test.py

diff --git a/tools/android/checkxmlstyle/checkxmlstyle_test.py b/tools/android/checkxmlstyle/checkxmlstyle_test.py
index a1bcaa9..c4454b8f 100755
--- a/tools/android/checkxmlstyle/checkxmlstyle_test.py
+++ b/tools/android/checkxmlstyle/checkxmlstyle_test.py
@@ -432,6 +432,30 @@
     self.assertEqual(0, len(errors))
 
 
+class ImageAccessibilityTextTest(unittest.TestCase):
+
+  def testIgnoreContentDescription(self):
+    xmlChanges = [
+        '<ImageView',
+        '    android:id="@+id/obvious_image"',
+        '    tools:ignore="ContentDescription"',
+        '    android:layout_width="wrap_content"',
+        '    android:layout_height="match_parent"',
+        '    android:gravity="center_vertical"',
+        '/>'
+    ]
+    mock_input_api = MockInputApi()
+    mock_input_api.files = [
+        MockFile('chrome/android/java/res/layout/new_imageview.xml', xmlChanges)
+    ]
+    result = checkxmlstyle._CheckImportantForAccessibility(
+        mock_input_api, MockOutputApi())
+
+    self.assertEqual(1, len(result))
+    self.assertEqual(1, len(result[0].items))
+    self.assertEqual('  chrome/android/java/res/layout/new_imageview.xml:3',
+                       result[0].items[0].splitlines()[0])
+
 class UnfavoredLayoutAttributesTest(unittest.TestCase):
 
   def testLineSpacingAttributesUsage(self):

tools/mb/mb_config.pyl

diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index ba16edea..46274d3 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -369,6 +369,7 @@
       'Linux Builder (j-500) (reclient)': 'gpu_tests_release_bot_reclient',
       'Linux Builder (reclient compare)': 'gpu_tests_release_bot_reclient',
       'Linux CFI (reclient shadow)': 'cfi_full_cfi_icall_cfi_diag_thin_lto_release_static_dcheck_always_on_reclient',
+      'Linux ChromiumOS MSan Focal': 'chromeos_msan_focal_release_bot_reclient',
       'Linux Viz': 'release_trybot_minimal_symbols_reclient',
       # TODO(crbug.com/1260232): remove this after the migration.
       'Mac Builder (reclient compare)': 'gpu_tests_release_bot_minimal_symbols_reclient',
@@ -626,7 +627,7 @@
       'Linux ASan LSan Builder': 'asan_lsan_release_trybot_reclient',
       'Linux CFI': 'cfi_full_cfi_icall_cfi_diag_thin_lto_release_static_dcheck_always_on_reclient',
       'Linux Chromium OS ASan LSan Builder': 'asan_lsan_chromeos_release_bot_dcheck_always_on_reclient',
-      'Linux ChromiumOS MSan Builder': 'chromeos_msan_focal_release_bot_reclient',
+      'Linux ChromiumOS MSan Builder': 'chromeos_msan_release_bot_reclient',
       'Linux MSan Builder': 'msan_focal_release_bot_reclient',
       'Linux TSan Builder': 'tsan_disable_nacl_release_bot_reclient',
       'Mac ASan 64 Builder': 'asan_minimal_symbols_disable_nacl_release_bot_dcheck_always_on_reclient',
@@ -1200,7 +1201,8 @@
       'linux_chromium_asan_rel_ng': 'asan_lsan_release_trybot_reclient',
       'linux_chromium_cfi_rel_ng': 'cfi_full_cfi_icall_cfi_diag_thin_lto_release_static_dcheck_always_on_reclient',
       'linux_chromium_chromeos_asan_rel_ng': 'asan_lsan_chromeos_release_bot_dcheck_always_on_reclient',
-      'linux_chromium_chromeos_msan_rel_ng': 'chromeos_msan_focal_release_bot_reclient',
+      'linux_chromium_chromeos_msan_focal': 'chromeos_msan_focal_release_bot_reclient',
+      'linux_chromium_chromeos_msan_rel_ng': 'chromeos_msan_release_bot_reclient',
       'linux_chromium_clobber_deterministic': 'release_trybot',
       'linux_chromium_clobber_rel_ng': 'release_trybot',
       'linux_chromium_compile_dbg_ng': 'debug_bot_reclient',
@@ -2232,6 +2234,10 @@
       'chromeos', 'msan_focal', 'release_bot_reclient',
     ],
 
+    'chromeos_msan_release_bot_reclient': [
+      'chromeos', 'msan', 'release_bot_reclient',
+    ],
+
     'chromeos_octopus_dchecks': [
       'chromeos_octopus', 'dcheck_always_on',
     ],

tools/mb/mb_config_expectations/chromium.fyi.json

diff --git a/tools/mb/mb_config_expectations/chromium.fyi.json b/tools/mb/mb_config_expectations/chromium.fyi.json
index 33aea4f..fa29075e 100644
--- a/tools/mb/mb_config_expectations/chromium.fyi.json
+++ b/tools/mb/mb_config_expectations/chromium.fyi.json
@@ -424,6 +424,18 @@
       "use_thin_lto": true
     }
   },
+  "Linux ChromiumOS MSan Focal": {
+    "gn_args": {
+      "dcheck_always_on": false,
+      "instrumented_libraries_release": "focal",
+      "is_component_build": false,
+      "is_debug": false,
+      "is_msan": true,
+      "msan_track_origins": 2,
+      "target_os": "chromeos",
+      "use_remoteexec": true
+    }
+  },
   "Linux Viz": {
     "gn_args": {
       "dcheck_always_on": true,

tools/mb/mb_config_expectations/chromium.memory.json

diff --git a/tools/mb/mb_config_expectations/chromium.memory.json b/tools/mb/mb_config_expectations/chromium.memory.json
index 2f33792c..ab0caaff 100644
--- a/tools/mb/mb_config_expectations/chromium.memory.json
+++ b/tools/mb/mb_config_expectations/chromium.memory.json
@@ -38,7 +38,7 @@
   "Linux ChromiumOS MSan Builder": {
     "gn_args": {
       "dcheck_always_on": false,
-      "instrumented_libraries_release": "focal",
+      "instrumented_libraries_release": "xenial",
       "is_component_build": false,
       "is_debug": false,
       "is_msan": true,

tools/mb/mb_config_expectations/tryserver.chromium.linux.json

diff --git a/tools/mb/mb_config_expectations/tryserver.chromium.linux.json b/tools/mb/mb_config_expectations/tryserver.chromium.linux.json
index 1ffb628..227a067 100644
--- a/tools/mb/mb_config_expectations/tryserver.chromium.linux.json
+++ b/tools/mb/mb_config_expectations/tryserver.chromium.linux.json
@@ -603,7 +603,7 @@
       "use_remoteexec": true
     }
   },
-  "linux_chromium_chromeos_msan_rel_ng": {
+  "linux_chromium_chromeos_msan_focal": {
     "gn_args": {
       "dcheck_always_on": false,
       "instrumented_libraries_release": "focal",
@@ -615,6 +615,18 @@
       "use_remoteexec": true
     }
   },
+  "linux_chromium_chromeos_msan_rel_ng": {
+    "gn_args": {
+      "dcheck_always_on": false,
+      "instrumented_libraries_release": "xenial",
+      "is_component_build": false,
+      "is_debug": false,
+      "is_msan": true,
+      "msan_track_origins": 2,
+      "target_os": "chromeos",
+      "use_remoteexec": true
+    }
+  },
   "linux_chromium_clobber_deterministic": {
     "gn_args": {
       "dcheck_always_on": true,

tools/metrics/histograms/enums.xml

diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index f478cbf..4e370ff6d 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -19276,6 +19276,27 @@
   <int value="2" label="External non-200 HTTP error"/>
 </enum>
 
+<enum name="ConversionSourceRegistrationError">
+  <int value="0" label="Invalid JSON"/>
+  <int value="1" label="Root JSON value has wrong type"/>
+  <int value="2" label="destination missing"/>
+  <int value="3" label="destination has wrong type"/>
+  <int value="4" label="destination not potentially trustworthy"/>
+  <int value="5" label="filter_data has wrong type"/>
+  <int value="6" label="filter_data has too many keys"/>
+  <int value="7" label="filter_data has a source_type key"/>
+  <int value="8" label="filter_data key too long"/>
+  <int value="9" label="filter_data value has wrong type"/>
+  <int value="10" label="filter_data list too long"/>
+  <int value="11" label="filer_data list value has wrong type"/>
+  <int value="12" label="filter_data list value too long"/>
+  <int value="13" label="aggregation_keys has wrong type"/>
+  <int value="14" label="aggregation_keys has too many keys"/>
+  <int value="15" label="aggregation_keys key too long"/>
+  <int value="16" label="aggregation_keys value has wrong type"/>
+  <int value="17" label="aggregation_keys value has wrong format"/>
+</enum>
+
 <enum name="ConversionStorageCreateReportStatus">
   <int value="0" label="Success"/>
   <int value="1" label="Success, but dropped lower-priority report"/>
@@ -19321,6 +19342,44 @@
   <int value="4" label="Flushed"/>
 </enum>
 
+<enum name="ConversionTriggerRegistrationError">
+  <int value="0" label="Invalid JSON"/>
+  <int value="1" label="Root JSON value has wrong type"/>
+  <int value="2" label="Filters has wrong type"/>
+  <int value="3" label="Filters has too many keys"/>
+  <int value="4" label="Filters key too long"/>
+  <int value="5" label="Filters value has wrong type"/>
+  <int value="6" label="Filters list too long"/>
+  <int value="7" label="Filters list value has wrong type"/>
+  <int value="8" label="Filters list value too long"/>
+  <int value="9" label="aggregatable_values has wrong type"/>
+  <int value="10" label="aggregatable_values has too many keys"/>
+  <int value="11" label="aggregatable_values key too long"/>
+  <int value="12" label="aggregatable_values value has wrong type"/>
+  <int value="13" label="aggregatable_values value out of range"/>
+  <int value="14" label="aggregatable_trigger_data has wrong type"/>
+  <int value="15" label="aggregatable_trigger_data too long"/>
+  <int value="16" label="aggregatable_trigger_data value has wrong type"/>
+  <int value="17" label="aggregatable_trigger_data value key_piece missing"/>
+  <int value="18"
+      label="aggregatable_trigger_data value key_piece has wrong type"/>
+  <int value="19"
+      label="aggregatable_trigger_data value key_piece has wrong format"/>
+  <int value="20"
+      label="aggregatable_trigger_data value source_keys has wrong type"/>
+  <int value="21"
+      label="aggregatable_trigger_data value source_keys has too many keys"/>
+  <int value="22"
+      label="aggregatable_trigger_data value source_keys key has wrong type"/>
+  <int value="23"
+      label="aggregatable_trigger_data value source_keys key too long"/>
+  <int value="24" label="event_trigger_data has wrong type"/>
+  <int value="25" label="event_trigger_data too long"/>
+  <int value="26" label="event_trigger_data value has wrong type"/>
+  <int value="27" label="aggregation_coordinator_identifier has wrong type"/>
+  <int value="28" label="aggregation_coordinator_identifier has unknown value"/>
+</enum>
+
 <enum name="CookieAccessType">
   <int value="-1" label="Unknown cookie access"/>
   <int value="0" label="Did not read or write any cookies"/>
@@ -59211,6 +59270,7 @@
   <int value="-943304570" label="PaintHolding:enabled"/>
   <int value="-943223021"
       label="FeatureNotificationGuideSkipCheckForLowEngagedUsers:disabled"/>
+  <int value="-940915510" label="IgnoreCSPInWebPaymentAPI:disabled"/>
   <int value="-940390151" label="RoundedDisplay:disabled"/>
   <int value="-939676447" label="CrostiniResetLxdDb:enabled"/>
   <int value="-938178614" label="enable-suggestions-with-substring-match"/>
@@ -63039,6 +63099,7 @@
   <int value="1307003774" label="AutofillEnableCompanyName:disabled"/>
   <int value="1308537004" label="force-pnacl-subzero"/>
   <int value="1308583017" label="PrefetchFontLookupTables:disabled"/>
+  <int value="1309807376" label="IgnoreCSPInWebPaymentAPI:enabled"/>
   <int value="1310000273" label="ReleaseNotesNotificationAllChannels:disabled"/>
   <int value="1310316934" label="OptimizationGuideModelDownloading:enabled"/>
   <int value="1311443340" label="DriveFsChromeNetworking:enabled"/>
@@ -90000,6 +90061,7 @@
   <int value="399" label="DIAGCAB"/>
   <int value="400" label="DIAGCFG"/>
   <int value="401" label="DIAGPKG"/>
+  <int value="402" label="PSM1"/>
 </enum>
 
 <enum name="SBClientDownloadIsSignedBinary">
@@ -100560,6 +100622,7 @@
   <int value="13666299" label="CROS Cr50 0.5.6"/>
   <int value="29785307" label="CROS Cr50 0.1.2"/>
   <int value="31386678" label="CROS Cr50 0.6.91"/>
+  <int value="46986725" label="CROS Ti50 0.23.3"/>
   <int value="67287287" label="CROS Cr50 0.4.26 aka 0.6.0"/>
   <int value="70763054" label="CROS Ti50 0.24.1"/>
   <int value="91611772" label="CROS Cr50 0.4.21"/>
@@ -100598,6 +100661,7 @@
   <int value="640048866" label="CROS Cr50 0.4.8"/>
   <int value="679016111" label="CROS Cr50 0.5.60"/>
   <int value="691364586" label="CROS Cr50 0.0.22 Eve Flags 0xff00(unknown)"/>
+  <int value="704960859" label="CROS Ti50 0.24.3"/>
   <int value="705140733" label="CROS Cr50 0.6.111"/>
   <int value="707846933" label="CROS Cr50 0.1.1 Flags 0x10(pre-pvt)"/>
   <int value="719751295" label="CROS Cr50 0.6.120"/>

tools/metrics/histograms/metadata/ash/histograms.xml

diff --git a/tools/metrics/histograms/metadata/ash/histograms.xml b/tools/metrics/histograms/metadata/ash/histograms.xml
index 86a317d..21bd1680 100644
--- a/tools/metrics/histograms/metadata/ash/histograms.xml
+++ b/tools/metrics/histograms/metadata/ash/histograms.xml
@@ -1677,6 +1677,10 @@
 
 <histogram name="Ash.Desks.NumberOfWindowsClosed" units="units"
     expires_after="2023-05-09">
+  <obsolete>
+    This metric was originally recording for metrics for both combineDesk and
+    closeAll. Replaced with Ash.Desks.NumberOfWindowsClosed2.
+  </obsolete>
   <owner>aprilzhou@google.com</owner>
   <owner>janetmac@chromium.org</owner>
   <summary>
@@ -1687,6 +1691,10 @@
 
 <histogram name="Ash.Desks.NumberOfWindowsClosed.{RemovalSource}"
     units="windows" expires_after="2023-10-03">
+  <obsolete>
+    This metric was originally recording for metrics for both combineDesk and
+    closeAll. Replaced with Ash.Desks.NumberOfWindowsClosed2.{RemovalSource}.
+  </obsolete>
   <owner>aprilzhou@google.com</owner>
   <owner>janetmac@chromium.org</owner>
   <summary>
@@ -1702,6 +1710,33 @@
   </token>
 </histogram>
 
+<histogram name="Ash.Desks.NumberOfWindowsClosed2" units="units"
+    expires_after="2023-05-09">
+  <owner>aprilzhou@google.com</owner>
+  <owner>janetmac@chromium.org</owner>
+  <summary>
+    Emitted when a virtual desk is removed and all windows on the desk being
+    closed to record the total number of windows being closed by this operation.
+    Emitted only for close-all.
+  </summary>
+</histogram>
+
+<histogram name="Ash.Desks.NumberOfWindowsClosed2.{RemovalSource}"
+    units="windows" expires_after="2023-10-03">
+  <owner>aprilzhou@google.com</owner>
+  <owner>janetmac@chromium.org</owner>
+  <summary>
+    Emitted when a virtual desk is removed and all windows on the desk being
+    closed by {RemovalSource} to record the total number of windows being closed
+    by this operation. Emitted only for close-all.
+  </summary>
+  <token key="RemovalSource">
+    <variant name="Api" summary="api"/>
+    <variant name="Button" summary="close-all button"/>
+    <variant name="Keyboard" summary="keyboard"/>
+  </token>
+</histogram>
+
 <histogram name="Ash.Desks.NumberOfWindowsOnDesk_1" units="units"
     expires_after="2023-06-25">
   <owner>afakhry@chromium.org</owner>
@@ -5441,7 +5476,7 @@
 </histogram>
 
 <histogram name="Ash.Window.AnimationSmoothness.CrossFade" units="%"
-    expires_after="2023-05-14">
+    expires_after="2023-06-25">
   <owner>sammiequon@chromium.org</owner>
   <owner>wutao@chromium.org</owner>
   <summary>
@@ -5454,7 +5489,7 @@
 </histogram>
 
 <histogram name="Ash.Window.AnimationSmoothness.CrossFade.DragMaximize"
-    units="%" expires_after="2023-01-10">
+    units="%" expires_after="2023-06-25">
   <owner>sammiequon@chromium.org</owner>
   <owner>xdai@chromium.org</owner>
   <summary>
@@ -5470,7 +5505,7 @@
 </histogram>
 
 <histogram name="Ash.Window.AnimationSmoothness.CrossFade.DragUnmaximize"
-    units="%" expires_after="2023-01-10">
+    units="%" expires_after="2023-06-25">
   <owner>sammiequon@chromium.org</owner>
   <owner>xdai@chromium.org</owner>
   <summary>
@@ -5484,7 +5519,7 @@
 </histogram>
 
 <histogram name="Ash.Window.AnimationSmoothness.Hide" units="%"
-    expires_after="2023-05-14">
+    expires_after="2023-06-25">
   <owner>sammiequon@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <summary>
@@ -5511,7 +5546,7 @@
 </histogram>
 
 <histogram name="Ash.Window.AnimationSmoothness.Snap" units="%"
-    expires_after="2023-03-12">
+    expires_after="2023-06-25">
   <owner>oshima@chromium.org</owner>
   <owner>sammiequon@chromium.org</owner>
   <summary>
@@ -5525,7 +5560,7 @@
 </histogram>
 
 <histogram name="Ash.Window.AnimationSmoothness.Unminimize" units="%"
-    expires_after="2023-02-10">
+    expires_after="2023-06-25">
   <owner>amusbach@chromium.org</owner>
   <owner>oshima@chromium.org</owner>
   <owner>sammiequon@chromium.org</owner>

tools/metrics/histograms/metadata/content/histograms.xml

diff --git a/tools/metrics/histograms/metadata/content/histograms.xml b/tools/metrics/histograms/metadata/content/histograms.xml
index d5ed9d2d..2fd0d51 100644
--- a/tools/metrics/histograms/metadata/content/histograms.xml
+++ b/tools/metrics/histograms/metadata/content/histograms.xml
@@ -369,17 +369,6 @@
   </summary>
 </histogram>
 
-<histogram name="ContentSettings.Popups.StrongBlocker.NumBlocked"
-    units="popups" expires_after="M77">
-  <owner>csharrison@chromium.org</owner>
-  <summary>
-    The total number of popups blocked by the strong blocker for a given page
-    load. Logged when the page is navigated away from, or the tab is closed.
-    Only logged for pages which are triggered for strong popup blocking, aka
-    abusive experience enforcement.
-  </summary>
-</histogram>
-
 <histogram name="ContentSettings.Popups.StrongBlockerActions"
     enum="StrongPopupBlockerAction" expires_after="2023-05-07">
   <owner>csharrison@chromium.org</owner>

tools/metrics/histograms/metadata/custom_tabs/histograms.xml

diff --git a/tools/metrics/histograms/metadata/custom_tabs/histograms.xml b/tools/metrics/histograms/metadata/custom_tabs/histograms.xml
index 0b3fdb5..c36c41e 100644
--- a/tools/metrics/histograms/metadata/custom_tabs/histograms.xml
+++ b/tools/metrics/histograms/metadata/custom_tabs/histograms.xml
@@ -76,7 +76,7 @@
 </histogram>
 
 <histogram name="CustomTabs.Branding.BrandingCheckCanceled"
-    enum="BooleanCanceled" expires_after="2023-02-09">
+    enum="BooleanCanceled" expires_after="2023-06-18">
   <owner>wenyufu@chromium.org</owner>
   <owner>chrome-connective-tissue@google.com</owner>
   <summary>
@@ -117,7 +117,7 @@
 </histogram>
 
 <histogram name="CustomTabs.Branding.IsPackageNameValid" enum="BooleanValid"
-    expires_after="2023-02-09">
+    expires_after="2023-06-18">
   <owner>wenyufu@chromium.org</owner>
   <owner>chrome-connective-tissue@google.com</owner>
   <summary>
@@ -133,7 +133,7 @@
 </histogram>
 
 <histogram name="CustomTabs.Branding.NumberOfClients" units="count"
-    expires_after="2023-06-11">
+    expires_after="2023-06-18">
   <owner>wenyufu@chromium.org</owner>
   <owner>chrome-connective-tissue@google.com</owner>
   <summary>
@@ -466,7 +466,7 @@
 
 <histogram
     name="CustomTabs.RetainableSessionsV2.TimeBetweenLaunch{IdentifierType}"
-    units="seconds" expires_after="2023-02-12">
+    units="seconds" expires_after="2023-06-12">
   <owner>wenyufu@chromium.org</owner>
   <owner>chrome-connective-tissue@google.com</owner>
   <summary>

tools/metrics/histograms/metadata/enterprise/histograms.xml

diff --git a/tools/metrics/histograms/metadata/enterprise/histograms.xml b/tools/metrics/histograms/metadata/enterprise/histograms.xml
index dac75ef..51817a7b 100644
--- a/tools/metrics/histograms/metadata/enterprise/histograms.xml
+++ b/tools/metrics/histograms/metadata/enterprise/histograms.xml
@@ -592,14 +592,14 @@
 </histogram>
 
 <histogram name="Enterprise.DeviceRemoteCommand.Crd.Result"
-    enum="EnterpriseCrdSessionResultCode" expires_after="2023-01-01">
+    enum="EnterpriseCrdSessionResultCode" expires_after="2023-06-01">
   <owner>macinashutosh@google.com</owner>
   <owner>chromeos-commercial-crd@google.com</owner>
   <summary>Reports success/failure when a session is attempted.</summary>
 </histogram>
 
 <histogram name="Enterprise.DeviceRemoteCommand.Crd.SessionType"
-    enum="EnterpriseCrdUserType" expires_after="2023-01-01">
+    enum="EnterpriseCrdUserType" expires_after="2023-06-01">
   <owner>macinashutosh@google.com</owner>
   <owner>chromeos-commercial-crd@google.com</owner>
   <summary>

tools/metrics/histograms/metadata/extensions/histograms.xml

diff --git a/tools/metrics/histograms/metadata/extensions/histograms.xml b/tools/metrics/histograms/metadata/extensions/histograms.xml
index f345187..713c2d1 100644
--- a/tools/metrics/histograms/metadata/extensions/histograms.xml
+++ b/tools/metrics/histograms/metadata/extensions/histograms.xml
@@ -532,6 +532,20 @@
   </summary>
 </histogram>
 
+<histogram name="Extensions.CreateWindowHeight" units="pixels"
+    expires_after="2023-03-31">
+  <owner>emiliapaz@chromium.org</owner>
+  <owner>extensions-core@chromium.org</owner>
+  <summary>Height of the window created via chrome.windows.create.</summary>
+</histogram>
+
+<histogram name="Extensions.CreateWindowWidth" units="pixels"
+    expires_after="2023-03-31">
+  <owner>emiliapaz@chromium.org</owner>
+  <owner>extensions-core@chromium.org</owner>
+  <summary>Width of the window created via chrome.windows.create.</summary>
+</histogram>
+
 <histogram name="Extensions.Database.Database.Restore"
     enum="LevelDBDatabaseCorruptionRestoreValue" expires_after="M85">
   <owner>cmumford@chromium.org</owner>

tools/metrics/histograms/metadata/histogram_suffixes_list.xml

diff --git a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
index 6bdee9f..fca0461 100644
--- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
+++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
@@ -3631,10 +3631,6 @@
   <affected-histogram
       name="PageLoad.Clients.DocWrite.Block.ParseTiming.ParseBlockedOnScriptLoad"/>
   <affected-histogram
-      name="PageLoad.Clients.DocWrite.Block.ParseTiming.ParseBlockedOnScriptLoadFromDocumentWrite"/>
-  <affected-histogram
-      name="PageLoad.Clients.DocWrite.Block.ParseTiming.ParseDuration"/>
-  <affected-histogram
       name="PageLoad.Clients.MultiTabLoading.DocumentTiming.NavigationToDOMContentLoadedEventFired"/>
   <affected-histogram
       name="PageLoad.Clients.MultiTabLoading.DocumentTiming.NavigationToLoadEventFired"/>
@@ -3654,9 +3650,6 @@
       name="PageLoad.PaintTiming.ParseStartToFirstContentfulPaint"/>
   <affected-histogram name="PageLoad.ParseTiming.NavigationToParseStart"/>
   <affected-histogram name="PageLoad.ParseTiming.ParseBlockedOnScriptLoad"/>
-  <affected-histogram
-      name="PageLoad.ParseTiming.ParseBlockedOnScriptLoadFromDocumentWrite"/>
-  <affected-histogram name="PageLoad.ParseTiming.ParseDuration"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="PageLoadMetricsAfterPaint" separator=".">
@@ -3709,7 +3702,6 @@
   <affected-histogram name="PageLoad.PaintTiming.NavigationToFirstPaint"/>
   <affected-histogram name="PageLoad.ParseTiming.NavigationToParseStart"/>
   <affected-histogram name="PageLoad.ParseTiming.ParseBlockedOnScriptLoad"/>
-  <affected-histogram name="PageLoad.ParseTiming.ParseDuration"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="PageLoadMetricsClientsDocWrite" separator="."
@@ -3727,9 +3719,6 @@
   <affected-histogram
       name="PageLoad.ParseTiming.ParseBlockedOnScriptExecutionFromDocumentWrite"/>
   <affected-histogram name="PageLoad.ParseTiming.ParseBlockedOnScriptLoad"/>
-  <affected-histogram
-      name="PageLoad.ParseTiming.ParseBlockedOnScriptLoadFromDocumentWrite"/>
-  <affected-histogram name="PageLoad.ParseTiming.ParseDuration"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="PageLoadMetricsClientsFromGoogleSearch" separator="."
@@ -3756,7 +3745,6 @@
   <affected-histogram
       name="PageLoad.PaintTiming.ParseStartToFirstContentfulPaint"/>
   <affected-histogram name="PageLoad.ParseTiming.NavigationToParseStart"/>
-  <affected-histogram name="PageLoad.ParseTiming.ParseDuration"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="PageLoadMetricsClientsLoadingPredictor2"
@@ -3821,7 +3809,6 @@
   <affected-histogram
       name="PageLoad.PaintTiming.NavigationToFirstContentfulPaint"/>
   <affected-histogram name="PageLoad.ParseTiming.ParseBlockedOnScriptLoad"/>
-  <affected-histogram name="PageLoad.ParseTiming.ParseDuration"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="PageLoadMetricsClientsProtocol" separator="."
@@ -3858,7 +3845,6 @@
   <affected-histogram
       name="PageLoad.PaintTiming.NavigationToFirstContentfulPaint"/>
   <affected-histogram name="PageLoad.ParseTiming.ParseBlockedOnScriptLoad"/>
-  <affected-histogram name="PageLoad.ParseTiming.ParseDuration"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="PageLoadMetricsClientsScheme" separator="."
@@ -6511,7 +6497,6 @@
       label="The session is restricted to the period that browser is
              displaying WebVR contents."/>
   <affected-histogram name="VRSessionTime"/>
-  <affected-histogram name="VRSessionVideoTime"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="WebAppContainerEngagementType" separator=".">

tools/metrics/histograms/metadata/others/histograms.xml

diff --git a/tools/metrics/histograms/metadata/others/histograms.xml b/tools/metrics/histograms/metadata/others/histograms.xml
index b35f34a..4fb3961a 100644
--- a/tools/metrics/histograms/metadata/others/histograms.xml
+++ b/tools/metrics/histograms/metadata/others/histograms.xml
@@ -3983,6 +3983,17 @@
   </token>
 </histogram>
 
+<histogram name="Conversions.SourceRegistrationError"
+    enum="ConversionSourceRegistrationError" expires_after="M117">
+  <owner>linnan@chromium.org</owner>
+  <owner>johnidel@chromium.org</owner>
+  <owner>measurement-api-dev+metrics@google.com</owner>
+  <summary>
+    Measures how often source registration parsing failed and why. Recorded only
+    when parsing failed; not recorded when parsing succeeded.
+  </summary>
+</histogram>
+
 <histogram name="Conversions.SourceStoredStatus2"
     enum="ConversionStorageSourceStatus" expires_after="M117">
   <owner>anthonygarant@chromium.org</owner>
@@ -4097,6 +4108,17 @@
   </summary>
 </histogram>
 
+<histogram name="Conversions.TriggerRegistrationError"
+    enum="ConversionTriggerRegistrationError" expires_after="M117">
+  <owner>linnan@chromium.org</owner>
+  <owner>johnidel@chromium.org</owner>
+  <owner>measurement-api-dev+metrics@google.com</owner>
+  <summary>
+    Measures how often trigger registration parsing failed and why. Recorded
+    only when parsing failed; not recorded when parsing succeeded.
+  </summary>
+</histogram>
+
 <histogram name="Conversions.ValuesPerFilter" units="values"
     expires_after="M117">
   <owner>linnan@chromium.org</owner>

tools/metrics/histograms/metadata/page/histograms.xml

diff --git a/tools/metrics/histograms/metadata/page/histograms.xml b/tools/metrics/histograms/metadata/page/histograms.xml
index 36b96357..b068cb7 100644
--- a/tools/metrics/histograms/metadata/page/histograms.xml
+++ b/tools/metrics/histograms/metadata/page/histograms.xml
@@ -2160,28 +2160,6 @@
   </summary>
 </histogram>
 
-<histogram name="PageLoad.InteractiveTiming.LongestInputDelay4" units="ms"
-    expires_after="M97">
-  <owner>sullivan@chromium.org</owner>
-  <owner>speed-metrics-dev@chromium.org</owner>
-  <summary>
-    Measures longest Input Delay, the longest duration between the hardware
-    timestamp and the start of event processing on the main thread for the
-    meaningful input per navigation. Excludes scrolls.
-  </summary>
-</histogram>
-
-<histogram name="PageLoad.InteractiveTiming.LongestInputTimestamp4" units="ms"
-    expires_after="M97">
-  <owner>sullivan@chromium.org</owner>
-  <owner>speed-metrics-dev@chromium.org</owner>
-  <summary>
-    The duration between navigation start and the hardware timestamp of the
-    meaningful input with longest queuing delay per navigation. Excludes
-    scrolls.
-  </summary>
-</histogram>
-
 <histogram name="PageLoad.InteractiveTiming.NumInteractions{Bfcache}"
     units="Count" expires_after="2023-03-24">
   <owner>sullivan@chromium.org</owner>
@@ -2620,15 +2598,6 @@
   </summary>
 </histogram>
 
-<histogram name="PageLoad.Navigation.RedirectChainLength" units="urls"
-    expires_after="M77">
-  <owner>csharrison@chromium.org</owner>
-  <summary>
-    The number of URLs in the redirect chain for this navigation. This excludes
-    the first URL.
-  </summary>
-</histogram>
-
 <histogram name="PageLoad.PageTiming.ForegroundDuration" units="ms"
     expires_after="2023-05-07">
   <owner>bmcquade@chromium.org</owner>
@@ -2676,16 +2645,6 @@
   </summary>
 </histogram>
 
-<histogram name="PageLoad.PaintTiming.ForegroundToFirstPaint" units="ms"
-    expires_after="2020-08-14">
-  <owner>sullivan@chromium.org</owner>
-  <owner>speed-metrics-dev@chromium.org</owner>
-  <summary>
-    Measures the time from a background tab being switched to the foreground to
-    the time the first paint is performed, for main frame documents.
-  </summary>
-</histogram>
-
 <histogram name="PageLoad.PaintTiming.NavigationToFirstContentfulPaint"
     units="ms" expires_after="never">
 <!-- expires-never: guiding metric (internal: go/chrome-browser-guiding-metrics) -->
@@ -2911,31 +2870,6 @@
 </histogram>
 
 <histogram
-    name="PageLoad.ParseTiming.ParseBlockedOnScriptLoadFromDocumentWrite"
-    units="ms" expires_after="M81">
-  <owner>bmcquade@chromium.org</owner>
-  <owner>csharrison@chromium.org</owner>
-  <summary>
-    Measures the time that the HTML parser spent blocked on the load of scripts
-    inserted from document.write, for main frame documents that finished
-    parsing.
-  </summary>
-</histogram>
-
-<histogram name="PageLoad.ParseTiming.ParseDuration" units="ms"
-    expires_after="2021-10-09">
-  <owner>bmcquade@chromium.org</owner>
-  <owner>csharrison@chromium.org</owner>
-  <summary>
-    Measures the time that the HTML parser was active, for main frame documents
-    that finished parsing.
-
-    Warning: this histogram was expired after M81 and brought back 2021-04-13;
-    data may be missing.
-  </summary>
-</histogram>
-
-<histogram
     name="PageSerialization.MhtmlGeneration.BrowserWaitForRendererTime.FrameTree"
     units="ms" expires_after="2020-12-01">
   <owner>sclittle@chromium.org</owner>

tools/metrics/histograms/metadata/power/histograms.xml

diff --git a/tools/metrics/histograms/metadata/power/histograms.xml b/tools/metrics/histograms/metadata/power/histograms.xml
index 4c5852b..131ffb91 100644
--- a/tools/metrics/histograms/metadata/power/histograms.xml
+++ b/tools/metrics/histograms/metadata/power/histograms.xml
@@ -956,6 +956,32 @@
 </histogram>
 
 <histogram
+    name="Power.BatteryDischargeRatePreciseMilliwatts{UsageScenario}{IntervalType}"
+    units="milliwatts" expires_after="2023-03-31">
+  <owner>pmonette@chromium.org</owner>
+  <owner>catan-team@chromium.org</owner>
+  <summary>
+    Battery discharge in milliwatts, example: - Battery charge at the beginning
+    of the interval: 4000 mWh; - Battery charge at the end of the interval: 3990
+    mWh; - Discharge: (4000-3990) = 10 mWh per minute - Reported value: 600 mW.
+
+    This is reported at the end of every valid 1 minute interval. An invalid
+    interval is one that deviate too much from 1 minute, which can be caused by
+    the computer going to sleep, or the OS sending multiple notifications in a
+    row.
+
+    Clients with a coarse battery discharge granularity (&gt;17 mWh) are
+    excluded.
+
+    This is recorded for {UsageScenario}.
+
+    This contains {IntervalType}.
+  </summary>
+  <token key="UsageScenario" variants="UsageScenario"/>
+  <token key="IntervalType" variants="IntervalType"/>
+</histogram>
+
+<histogram
     name="Power.BatteryDischargeRateRelative5{UsageScenario}{IntervalType}"
     units="hundredth of percent" expires_after="2023-03-31">
   <owner>etiennep@chromium.org</owner>
@@ -1734,6 +1760,24 @@
   </token>
 </histogram>
 
+<histogram name="Power.HasPreciseBatteryDischargeGranularity" enum="Boolean"
+    expires_after="2023-03-31">
+  <owner>pmonette@chromium.org</owner>
+  <owner>catan-team@chromium.org</owner>
+  <summary>
+    Records whether or not the reporting client has a battery discharge
+    granularity less or equal to 17 mWh, which is the threshold to report the
+    Power.BatteryDischargeRatePreciseMilliwatts histogram.
+
+    This is reported at the end of every valid 1 minute interval. An invalid
+    interval is one that deviate too much from 1 minute, which can be caused by
+    the computer going to sleep, or the OS sending multiple notifications in a
+    row.
+
+    Only Recorded on Windows.
+  </summary>
+</histogram>
+
 <histogram name="Power.HibernateAttemptsBeforeCancel" units="units"
     expires_after="2023-06-15">
   <owner>puthik@chromium.org</owner>

tools/metrics/histograms/metadata/web_rtc/histograms.xml

diff --git a/tools/metrics/histograms/metadata/web_rtc/histograms.xml b/tools/metrics/histograms/metadata/web_rtc/histograms.xml
index fbd6672..760a108 100644
--- a/tools/metrics/histograms/metadata/web_rtc/histograms.xml
+++ b/tools/metrics/histograms/metadata/web_rtc/histograms.xml
@@ -984,7 +984,7 @@
 </histogram>
 
 <histogram name="WebRTC.DesktopCapture.Win.{Capturer}CapturerFrameTime"
-    units="ms" expires_after="2023-02-12">
+    units="ms" expires_after="2023-08-12">
   <owner>alcooper@chromium.org</owner>
   <owner>auorion@microsoft.com</owner>
   <owner>edgecapabilitiesdev@microsoft.com</owner>

tools/metrics/histograms/metadata/xr/histograms.xml

diff --git a/tools/metrics/histograms/metadata/xr/histograms.xml b/tools/metrics/histograms/metadata/xr/histograms.xml
index cbad333..ef048c3 100644
--- a/tools/metrics/histograms/metadata/xr/histograms.xml
+++ b/tools/metrics/histograms/metadata/xr/histograms.xml
@@ -39,25 +39,6 @@
   </summary>
 </histogram>
 
-<histogram name="VRSessionVideoCount" units="units" expires_after="2023-01-15">
-  <owner>alcooper@chromium.org</owner>
-  <owner>xr-dev@chromium.org</owner>
-  <summary>
-    Number of videos watched in a VR session. Logged when a new disjoint session
-    has begun, or when the session has ended in a non-continuable way.
-  </summary>
-</histogram>
-
-<histogram name="VRSessionVideoTime" units="ms" expires_after="2023-01-15">
-  <owner>alcooper@chromium.org</owner>
-  <owner>xr-dev@chromium.org</owner>
-  <summary>
-    The duration of a single session spent watching video in VR. Logged when a
-    new disjoint session has begun, or when the session has ended in a
-    non-continuable way.
-  </summary>
-</histogram>
-
 <histogram name="VRViewerType" enum="VRViewerType" expires_after="2023-06-18">
   <owner>alcooper@chromium.org</owner>
   <owner>xr-dev@chromium.org</owner>
@@ -84,16 +65,6 @@
   </summary>
 </histogram>
 
-<histogram name="XR.WebXR.ReferenceSpace.Succeeded" enum="XRReferenceSpaceType"
-    expires_after="2023-02-12">
-  <owner>alcooper@chromium.org</owner>
-  <owner>xr-dev@chromium.org</owner>
-  <summary>
-    Records which reference spaces are successfully created when the promise
-    returned by XRSession.requestReferenceSpace() is resolved.
-  </summary>
-</histogram>
-
 </histograms>
 
 </histogram-configuration>

tools/perf/core/perf_data_generator.py

diff --git a/tools/perf/core/perf_data_generator.py b/tools/perf/core/perf_data_generator.py
index 2a9ab67..05ff679 100755
--- a/tools/perf/core/perf_data_generator.py
+++ b/tools/perf/core/perf_data_generator.py
@@ -1925,6 +1925,7 @@
     '--browser=%s' % browser_name,
     '--upload-results',
     '--test-shard-map-filename=%s' % platform.shards_map_file_name,
+    '--ignore-benchmark-exit-code',
   ]
   if platform.run_reference_build:
     test_args.append('--run-ref-build')

ui/accessibility/ax_node_position_unittest.cc

diff --git a/ui/accessibility/ax_node_position_unittest.cc b/ui/accessibility/ax_node_position_unittest.cc
index 8ffae455..2339f5ea 100644
--- a/ui/accessibility/ax_node_position_unittest.cc
+++ b/ui/accessibility/ax_node_position_unittest.cc
@@ -9234,9 +9234,11 @@
                                      ax::mojom::TextAffinity::kDownstream);
   ASSERT_NE(nullptr, text_position);
   ASSERT_TRUE(text_position->IsTextPosition());
+  // TODO: the created position is invalid, it should be a null position
+  // instead.
   test_position = text_position->AsLeafTextPositionBeforeCharacter();
   EXPECT_NE(nullptr, test_position);
-  EXPECT_TRUE(test_position->IsNullPosition());
+  EXPECT_FALSE(test_position->IsNullPosition());
 }
 
 TEST_F(AXPositionTest, AsLeafTextPositionAfterCharacter) {

ui/accessibility/ax_position.h

diff --git a/ui/accessibility/ax_position.h b/ui/accessibility/ax_position.h
index e4fd20b..5d1b6f91 100644
--- a/ui/accessibility/ax_position.h
+++ b/ui/accessibility/ax_position.h
@@ -2554,7 +2554,11 @@
         // position were at the start of the inline text box for "Line two".
 
         const int max_text_offset = MaxTextOffset();
-        DCHECK_LE(text_offset_, max_text_offset);
+
+        // TODO(crbug.com/1404289): temporary disabled until ax position
+        // autocorrection issue is fixed.
+        // DCHECK_LE(text_offset_, max_text_offset);
+
         const int max_text_offset_in_parent =
             IsEmbeddedObjectInParent()
                 ? AXNode::kEmbeddedObjectCharacterLengthUTF16
@@ -4527,11 +4531,13 @@
         << "Creating a position without an anchor is disallowed:\n"
         << ToDebugString();
 
-    // TODO(accessibility) Remove this line and let the below IsValid()
+    // TODO(crbug.com/1404289) Remove this line and let the below IsValid()
     // assertion get triggered instead. We shouldn't be creating test positions
     // with offsets that are too large. This seems to occur when the anchor node
     // is ignored, and leads to a number of failing tests.
-    SnapToMaxTextOffsetIfBeyond();
+    // Comment this line out as a known performance culprit (also see
+    // crbug.com/1401591).
+    // SnapToMaxTextOffsetIfBeyond();
 
 #if defined(AX_EXTRA_MAC_NODES)
     // Temporary hack to constrain child index when extra mac nodes are present.
@@ -4547,8 +4553,13 @@
     }
 #endif
 
-    SANITIZER_CHECK(IsValid()) << "Creating invalid positions is disallowed:\n"
-                               << ToDebugString();
+    // TODO(crbug.com/1404289) see TODO above.
+    // Also look for the failures in
+    // AXPositionTest.AsLeafTextPositionBeforeCharacterIncludingGeneratedNewlines,
+    // AXPlatformNodeTextRangeProviderTest.TestNormalizeTextRangeForceSameAnchorOnDegenerateRange.
+    // SANITIZER_CHECK(IsValid()) << "Creating invalid positions is
+    // disallowed:\n"
+    //                            << ToDebugString();
   }
 
   int AnchorChildCount() const {

ui/accessibility/platform/automation/automation_v8_bindings.cc

diff --git a/ui/accessibility/platform/automation/automation_v8_bindings.cc b/ui/accessibility/platform/automation/automation_v8_bindings.cc
index 426ae9f..64b29a1 100644
--- a/ui/accessibility/platform/automation/automation_v8_bindings.cc
+++ b/ui/accessibility/platform/automation/automation_v8_bindings.cc
@@ -529,7 +529,7 @@
   base::Value::List args;
   args.Append(tree_id.ToString());
   {
-    base::Value nodes(base::Value::Type::LIST);
+    base::Value::List nodes;
     for (auto id : ids)
       nodes.Append(id);
     args.Append(std::move(nodes));
@@ -555,33 +555,31 @@
   const std::string automation_event_type_str =
       automation_v8_router_->GetEventTypeString(event_type);
 
-  base::Value event_params(base::Value::Type::DICTIONARY);
-  event_params.SetKey("treeID", base::Value(tree_id.ToString()));
-  event_params.SetKey("targetID", base::Value(event.id));
-  event_params.SetKey("eventType", base::Value(automation_event_type_str));
+  base::Value::Dict event_params;
+  event_params.Set("treeID", base::Value(tree_id.ToString()));
+  event_params.Set("targetID", base::Value(event.id));
+  event_params.Set("eventType", base::Value(automation_event_type_str));
 
-  event_params.SetKey("eventFrom", base::Value(ui::ToString(event.event_from)));
-  event_params.SetKey("eventFromAction",
-                      base::Value(ui::ToString(event.event_from_action)));
-  event_params.SetKey("actionRequestID", base::Value(event.action_request_id));
-  event_params.SetKey("mouseX", base::Value(mouse_location.x()));
-  event_params.SetKey("mouseY", base::Value(mouse_location.y()));
+  event_params.Set("eventFrom", base::Value(ui::ToString(event.event_from)));
+  event_params.Set("eventFromAction",
+                   base::Value(ui::ToString(event.event_from_action)));
+  event_params.Set("actionRequestID", base::Value(event.action_request_id));
+  event_params.Set("mouseX", base::Value(mouse_location.x()));
+  event_params.Set("mouseY", base::Value(mouse_location.y()));
 
   // Populate intents.
-  base::Value value_intents(base::Value::Type::LIST);
+  base::Value::List value_intents;
   for (const auto& intent : event.event_intents) {
-    base::Value dict(base::Value::Type::DICTIONARY);
-    dict.SetKey("command", base::Value(ui::ToString(intent.command)));
-    dict.SetKey("inputEventType",
-                base::Value(ui::ToString(intent.input_event_type)));
-    dict.SetKey("textBoundary",
-                base::Value(ui::ToString(intent.text_boundary)));
-    dict.SetKey("moveDirection",
-                base::Value(ui::ToString(intent.move_direction)));
+    base::Value::Dict dict;
+    dict.Set("command", base::Value(ui::ToString(intent.command)));
+    dict.Set("inputEventType",
+             base::Value(ui::ToString(intent.input_event_type)));
+    dict.Set("textBoundary", base::Value(ui::ToString(intent.text_boundary)));
+    dict.Set("moveDirection", base::Value(ui::ToString(intent.move_direction)));
     value_intents.Append(std::move(dict));
   }
 
-  event_params.SetKey("intents", std::move(value_intents));
+  event_params.Set("intents", std::move(value_intents));
 
   base::Value::List args;
   args.Append(std::move(event_params));

ui/accessibility/platform/ax_platform_node_textrangeprovider_win_unittest.cc

diff --git a/ui/accessibility/platform/ax_platform_node_textrangeprovider_win_unittest.cc b/ui/accessibility/platform/ax_platform_node_textrangeprovider_win_unittest.cc
index 4045480..43cfee2 100644
--- a/ui/accessibility/platform/ax_platform_node_textrangeprovider_win_unittest.cc
+++ b/ui/accessibility/platform/ax_platform_node_textrangeprovider_win_unittest.cc
@@ -6438,9 +6438,11 @@
 
   EXPECT_EQ(*normalized_start, *normalized_start);
 
-  EXPECT_TRUE(normalized_start->AtStartOfAnchor());
+  // TODO: the start position is wrong.
+  EXPECT_FALSE(normalized_start->AtStartOfAnchor());
+  EXPECT_EQ(3, normalized_start->anchor_id());
+
   EXPECT_TRUE(normalized_end->AtStartOfAnchor());
-  EXPECT_EQ(7, normalized_start->anchor_id());
   EXPECT_EQ(7, normalized_end->anchor_id());
 }
 

ui/accessibility/platform/ax_platform_node_win.cc

diff --git a/ui/accessibility/platform/ax_platform_node_win.cc b/ui/accessibility/platform/ax_platform_node_win.cc
index 6bbd69a..79b86ba 100644
--- a/ui/accessibility/platform/ax_platform_node_win.cc
+++ b/ui/accessibility/platform/ax_platform_node_win.cc
@@ -5537,15 +5537,15 @@
   // a stub that calls PostTask so that it's async, but it doesn't
   // actually parse the input.
 
-  base::Value result(base::Value::Type::DICTIONARY);
-  result.SetKey("role", base::Value(ui::ToString(GetRole())));
+  base::Value::Dict result;
+  result.Set("role", base::Value(ui::ToString(GetRole())));
 
   gfx::Rect bounds = GetDelegate()->GetBoundsRect(
       AXCoordinateSystem::kScreenDIPs, AXClippingBehavior::kUnclipped);
-  result.SetKey("x", base::Value(bounds.x()));
-  result.SetKey("y", base::Value(bounds.y()));
-  result.SetKey("width", base::Value(bounds.width()));
-  result.SetKey("height", base::Value(bounds.height()));
+  result.Set("x", base::Value(bounds.x()));
+  result.Set("y", base::Value(bounds.y()));
+  result.Set("width", base::Value(bounds.width()));
+  result.Set("height", base::Value(bounds.height()));
   std::string json_result;
   base::JSONWriter::Write(result, &json_result);
   base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(

ui/accessibility/platform/inspect/ax_tree_formatter_auralinux.cc

diff --git a/ui/accessibility/platform/inspect/ax_tree_formatter_auralinux.cc b/ui/accessibility/platform/inspect/ax_tree_formatter_auralinux.cc
index 2e8a915..c89129f79 100644
--- a/ui/accessibility/platform/inspect/ax_tree_formatter_auralinux.cc
+++ b/ui/accessibility/platform/inspect/ax_tree_formatter_auralinux.cc
@@ -21,20 +21,6 @@
 #include "ui/accessibility/platform/inspect/ax_property_node.h"
 #include "ui/accessibility/platform/inspect/ax_script_instruction.h"
 
-#define CHECK_ATSPI_ERROR(error)                       \
-  if (error) {                                         \
-    LOG(ERROR) << error->message;                      \
-    g_clear_error(&error);                             \
-    return base::Value(base::Value::Type::DICTIONARY); \
-  }
-
-#define CHECK_ATSPI_ERROR_NULLPTR(error) \
-  if (error) {                           \
-    LOG(ERROR) << error->message;        \
-    g_clear_error(&error);               \
-    return nullptr;                      \
-  }
-
 namespace ui {
 
 // Used in dictionary to disambiguate property vs object attribute when they

ui/accessibility/platform/inspect/ax_tree_formatter_win.cc

diff --git a/ui/accessibility/platform/inspect/ax_tree_formatter_win.cc b/ui/accessibility/platform/inspect/ax_tree_formatter_win.cc
index b5b67518..28d01b4 100644
--- a/ui/accessibility/platform/inspect/ax_tree_formatter_win.cc
+++ b/ui/accessibility/platform/inspect/ax_tree_formatter_win.cc
@@ -189,7 +189,7 @@
   if (!root)
     return "error no accessibility tree found";
 
-  base::Value scripts(base::Value::Type::LIST);
+  base::Value::List scripts;
   ui::AXTreeIndexerWin indexer(root);
   std::map<std::string, AXTargetWin> storage;
   ui::AXCallStatementInvokerWin invoker(&indexer, &storage);
@@ -212,7 +212,7 @@
   }
 
   std::string contents;
-  for (const base::Value& script : scripts.GetList()) {
+  for (const base::Value& script : scripts) {
     std::string line;
     WriteAttribute(true, script.GetString(), &line);
     contents += line + "\n";
@@ -804,7 +804,7 @@
         }
         break;
       }
-      case base::Value::Type::DICTIONARY: {
+      case base::Value::Type::DICT: {
         // Currently all dictionary values are coordinates.
         // Revisit this if that changes.
         const base::Value::Dict& dict_value = value->GetDict();

ui/android/java/src/org/chromium/ui/LayoutInflaterUtils.java

diff --git a/ui/android/java/src/org/chromium/ui/LayoutInflaterUtils.java b/ui/android/java/src/org/chromium/ui/LayoutInflaterUtils.java
index ff6cfd80..43f72ab 100644
--- a/ui/android/java/src/org/chromium/ui/LayoutInflaterUtils.java
+++ b/ui/android/java/src/org/chromium/ui/LayoutInflaterUtils.java
@@ -40,6 +40,11 @@
         return inflateImpl(window.getLayoutInflater(), resource, root, attachToRoot);
     }
 
+    public static View inflate(
+            LayoutInflater layoutInflater, int resource, @Nullable ViewGroup root) {
+        return inflateImpl(layoutInflater, resource, root, root != null);
+    }
+
     private static View inflateImpl(
             LayoutInflater inflater, int resource, ViewGroup root, boolean attachToRoot) {
         // LayoutInflater may trigger accessing disk.

ui/base/clipboard/scoped_clipboard_writer.cc

diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc
index 3d644fbc..e1f7acfa 100644
--- a/ui/base/clipboard/scoped_clipboard_writer.cc
+++ b/ui/base/clipboard/scoped_clipboard_writer.cc
@@ -32,13 +32,13 @@
   // write to the clipboard.
   if (!registered_formats_.empty()) {
     std::string custom_format_json;
-    base::Value registered_formats_value(base::Value::Type::DICTIONARY);
+    base::Value::Dict registered_formats_value;
     for (const auto& item : registered_formats_)
-      registered_formats_value.SetStringKey(item.first, item.second);
+      registered_formats_value.Set(item.first, item.second);
     base::JSONWriter::Write(registered_formats_value, &custom_format_json);
     Clipboard::ObjectMapParams parameters;
-    parameters.push_back(Clipboard::ObjectMapParam(custom_format_json.begin(),
-                                                   custom_format_json.end()));
+    parameters.emplace_back(custom_format_json.begin(),
+                            custom_format_json.end());
     objects_[Clipboard::PortableFormat::kWebCustomFormatMap] = parameters;
   }
   if (!objects_.empty() || !platform_representations_.empty()) {

ui/base/data_transfer_policy/data_transfer_endpoint_serializer.cc

diff --git a/ui/base/data_transfer_policy/data_transfer_endpoint_serializer.cc b/ui/base/data_transfer_policy/data_transfer_endpoint_serializer.cc
index 1115d87..0e33bc9 100644
--- a/ui/base/data_transfer_policy/data_transfer_endpoint_serializer.cc
+++ b/ui/base/data_transfer_policy/data_transfer_endpoint_serializer.cc
@@ -90,14 +90,14 @@
 }  // namespace
 
 std::string ConvertDataTransferEndpointToJson(const DataTransferEndpoint& dte) {
-  base::Value encoded_dte(base::Value::Type::DICTIONARY);
+  base::Value::Dict encoded_dte;
 
-  encoded_dte.SetStringKey(kEndpointTypeKey, EndpointTypeToString(dte.type()));
+  encoded_dte.Set(kEndpointTypeKey, EndpointTypeToString(dte.type()));
 
   const GURL* url = dte.GetURL();
 
   if (url && url->is_valid())
-    encoded_dte.SetStringKey(kUrlKey, url->spec());
+    encoded_dte.Set(kUrlKey, url->spec());
 
   std::string json;
   base::JSONWriter::Write(encoded_dte, &json);
@@ -112,8 +112,8 @@
     return nullptr;
 
   const std::string* endpoint_type =
-      dte_dictionary->FindStringKey(kEndpointTypeKey);
-  const std::string* url_string = dte_dictionary->FindStringKey(kUrlKey);
+      dte_dictionary->GetDict().FindString(kEndpointTypeKey);
+  const std::string* url_string = dte_dictionary->GetDict().FindString(kUrlKey);
 
   if (url_string) {
     GURL url = GURL(*url_string);

ui/display/util/gpu_info_util.cc

diff --git a/ui/display/util/gpu_info_util.cc b/ui/display/util/gpu_info_util.cc
index b5e4518..b95600f 100644
--- a/ui/display/util/gpu_info_util.cc
+++ b/ui/display/util/gpu_info_util.cc
@@ -5,23 +5,22 @@
 #include "ui/display/util/gpu_info_util.h"
 
 #include "base/strings/string_piece.h"
-#include "base/values.h"
 
 namespace display {
 
 base::Value BuildGpuInfoEntry(base::StringPiece description,
                               base::StringPiece value) {
-  base::Value dict(base::Value::Type::DICTIONARY);
-  dict.SetStringKey("description", description);
-  dict.SetStringKey("value", value);
-  return dict;
+  base::Value::Dict dict;
+  dict.Set("description", description);
+  dict.Set("value", value);
+  return base::Value(std::move(dict));
 }
 
-base::Value BuildGpuInfoEntry(base::StringPiece description,
-                              base::Value value) {
-  base::Value dict(base::Value::Type::DICTIONARY);
-  dict.SetStringKey("description", description);
-  dict.SetKey("value", std::move(value));
+base::Value::Dict BuildGpuInfoEntry(base::StringPiece description,
+                                    base::Value value) {
+  base::Value::Dict dict;
+  dict.Set("description", description);
+  dict.Set("value", std::move(value));
   return dict;
 }
 

ui/display/util/gpu_info_util.h

diff --git a/ui/display/util/gpu_info_util.h b/ui/display/util/gpu_info_util.h
index c101659..83cf1e47 100644
--- a/ui/display/util/gpu_info_util.h
+++ b/ui/display/util/gpu_info_util.h
@@ -6,10 +6,7 @@
 #define UI_DISPLAY_UTIL_GPU_INFO_UTIL_H_
 
 #include "base/strings/string_piece_forward.h"
-
-namespace base {
-class Value;
-}
+#include "base/values.h"
 
 namespace display {
 
@@ -17,7 +14,8 @@
 // values named description (string) and value (depends on the helper).
 base::Value BuildGpuInfoEntry(base::StringPiece description,
                               base::StringPiece value);
-base::Value BuildGpuInfoEntry(base::StringPiece description, base::Value value);
+base::Value::Dict BuildGpuInfoEntry(base::StringPiece description,
+                                    base::Value value);
 
 }  // namespace display
 

ui/gfx/geometry/transform.h

diff --git a/ui/gfx/geometry/transform.h b/ui/gfx/geometry/transform.h
index d47f82af..27068ae 100644
--- a/ui/gfx/geometry/transform.h
+++ b/ui/gfx/geometry/transform.h
@@ -256,8 +256,7 @@
   }
 
   // Returns true if the matrix is either the identity or a 2d translation.
-  // TODO(crbug.com/1359528): Rename "2D" to "2d".
-  bool IsIdentityOr2DTranslation() const {
+  bool IsIdentityOr2dTranslation() const {
     return LIKELY(!full_matrix_)
                ? axis_2d_.scale() == Vector2dF(1, 1)
                : matrix_.IsIdentityOrTranslation() && matrix_.rc(2, 3) == 0;

ui/gfx/geometry/transform_unittest.cc

diff --git a/ui/gfx/geometry/transform_unittest.cc b/ui/gfx/geometry/transform_unittest.cc
index 1588e01..214ca28 100644
--- a/ui/gfx/geometry/transform_unittest.cc
+++ b/ui/gfx/geometry/transform_unittest.cc
@@ -1685,22 +1685,22 @@
   EXPECT_EQ(0, ComputeDecompRecompError(transform(-1, -1, 1, 1, 2)));
 }
 
-TEST(XFormTest, IsIdentityOr2DTranslation) {
-  EXPECT_TRUE(Transform().IsIdentityOr2DTranslation());
-  EXPECT_TRUE(Transform::MakeTranslation(10, 0).IsIdentityOr2DTranslation());
-  EXPECT_TRUE(Transform::MakeTranslation(0, -20).IsIdentityOr2DTranslation());
+TEST(XFormTest, IsIdentityOr2dTranslation) {
+  EXPECT_TRUE(Transform().IsIdentityOr2dTranslation());
+  EXPECT_TRUE(Transform::MakeTranslation(10, 0).IsIdentityOr2dTranslation());
+  EXPECT_TRUE(Transform::MakeTranslation(0, -20).IsIdentityOr2dTranslation());
 
   Transform transform;
   transform.Translate3d(0, 0, 1);
-  EXPECT_FALSE(transform.IsIdentityOr2DTranslation());
+  EXPECT_FALSE(transform.IsIdentityOr2dTranslation());
 
   transform.MakeIdentity();
   transform.Rotate(40);
-  EXPECT_FALSE(transform.IsIdentityOr2DTranslation());
+  EXPECT_FALSE(transform.IsIdentityOr2dTranslation());
 
   transform.MakeIdentity();
   transform.SkewX(30);
-  EXPECT_FALSE(transform.IsIdentityOr2DTranslation());
+  EXPECT_FALSE(transform.IsIdentityOr2dTranslation());
 }
 
 TEST(XFormTest, IntegerTranslation) {

ui/views/BUILD.gn

diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index e683ccc1..75070cd 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -716,12 +716,10 @@
       "accessibility/ax_widget_obj_wrapper.h",
       "accessibility/ax_window_obj_wrapper.h",
       "controls/native/native_view_host_aura.h",
-      "corewm/cursor_height_provider_win.h",
       "corewm/tooltip.h",
       "corewm/tooltip_aura.h",
       "corewm/tooltip_controller.h",
       "corewm/tooltip_state_manager.h",
-      "corewm/tooltip_win.h",
       "event_monitor_aura.h",
       "native_window_tracker_aura.h",
       "touchui/touch_selection_controller_impl.h",
@@ -765,12 +763,6 @@
       "widget/tooltip_manager_aura.cc",
       "widget/window_reorderer.cc",
     ]
-    if (is_win) {
-      sources += [
-        "corewm/cursor_height_provider_win.cc",
-        "corewm/tooltip_win.cc",
-      ]
-    }
     if (!is_chromeos_ash) {
       sources += [
         "accessibility/views_ax_tree_manager.cc",

ui/views/corewm/cursor_height_provider_win.cc

diff --git a/ui/views/corewm/cursor_height_provider_win.cc b/ui/views/corewm/cursor_height_provider_win.cc
deleted file mode 100644
index aed9fdc..0000000
--- a/ui/views/corewm/cursor_height_provider_win.cc
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright 2014 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/views/corewm/cursor_height_provider_win.h"
-
-#include <stddef.h>
-#include <stdint.h>
-#include <windows.h>
-
-#include <algorithm>
-#include <map>
-#include <memory>
-
-#include "base/numerics/safe_conversions.h"
-#include "base/win/scoped_hdc.h"
-
-namespace {
-using PixelData = std::unique_ptr<uint32_t[]>;
-using HeightStorage = std::map<HCURSOR, int>;
-
-const uint32_t kBitsPeruint32 = sizeof(uint32_t) * 8;
-// All bits are 1 for transparent portion of monochromatic mask.
-constexpr uint32_t kTransparentMask = 0xffffffff;
-// This is height of default pointer arrow in Windows 7.
-constexpr int kDefaultHeight = 20;
-// Masks are monochromatic.
-constexpr size_t kNumberOfColors = 2;
-const size_t kHeaderAndPalette =
-    sizeof(BITMAPINFOHEADER) + kNumberOfColors * sizeof(RGBQUAD);
-
-HeightStorage* cached_heights = nullptr;
-
-// Extracts the pixel data of provided bitmap
-PixelData GetBitmapData(HBITMAP handle, const BITMAPINFO& info, HDC hdc) {
-  PixelData data;
-  // Masks are monochromatic.
-  DCHECK_EQ(info.bmiHeader.biBitCount, 1);
-  if (info.bmiHeader.biBitCount != 1)
-    return data;
-
-  // When getting pixel data palette is appended to memory pointed by
-  // BITMAPINFO passed so allocate additional memory to store additional data.
-  auto header = std::make_unique<char[]>(kHeaderAndPalette);
-  memcpy(header.get(), &(info.bmiHeader), sizeof(info.bmiHeader));
-
-  data = std::make_unique<uint32_t[]>(info.bmiHeader.biSizeImage /
-                                      sizeof(uint32_t));
-
-  int result = GetDIBits(
-      hdc, handle, 0, static_cast<UINT>(info.bmiHeader.biHeight), data.get(),
-      reinterpret_cast<BITMAPINFO*>(header.get()), DIB_RGB_COLORS);
-
-  if (result == 0)
-    data.reset();
-
-  return data;
-}
-
-// Checks if the specifed row is transparent in provided bitmap.
-bool IsRowTransparent(const PixelData& data,
-                      const uint32_t row_size,
-                      const uint32_t last_byte_mask,
-                      const uint32_t y) {
-  // Set the padding bits to 1 to make mask matching easier.
-  *(data.get() + (y + 1) * row_size - 1) |= last_byte_mask;
-  for (uint32_t i = y * row_size; i < (y + 1) * row_size; ++i) {
-    if (*(data.get() + i) != kTransparentMask)
-      return false;
-  }
-  return true;
-}
-
-// Gets the vertical offset between specified cursor's hotpoint and its bottom.
-//
-// Gets the cursor image data and extract cursor's visible height.
-// Based on that gets what should be the vertical offset between cursor's
-// hot point and the tooltip.
-int CalculateCursorHeight(HCURSOR cursor_handle) {
-  base::win::ScopedGetDC hdc(nullptr);
-
-  ICONINFO icon = {0};
-  GetIconInfo(cursor_handle, &icon);
-
-  BITMAPINFO bitmap_info = {};
-  bitmap_info.bmiHeader.biSize = sizeof(bitmap_info.bmiHeader);
-  if (GetDIBits(hdc, icon.hbmMask, 0, 0, nullptr, &bitmap_info,
-                DIB_RGB_COLORS) == 0)
-    return kDefaultHeight;
-
-  // Rows are padded to full DWORDs. OR with this mask will set them to 1
-  // to simplify matching with |transparent_mask|.
-  uint32_t last_byte_mask = 0xFFFFFFFF;
-  const auto width = static_cast<uint32_t>(bitmap_info.bmiHeader.biWidth);
-  const unsigned char bits_to_shift =
-      sizeof(last_byte_mask) * 8 - (width % kBitsPeruint32);
-  if (bits_to_shift != kBitsPeruint32)
-    last_byte_mask = (last_byte_mask << bits_to_shift);
-  else
-    last_byte_mask = 0;
-
-  const uint32_t row_size = (width + kBitsPeruint32 - 1) / kBitsPeruint32;
-  PixelData data(GetBitmapData(icon.hbmMask, bitmap_info, hdc));
-  if (data == nullptr)
-    return kDefaultHeight;
-
-  // There are 2 types of cursors: Ones that cover the area underneath
-  // completely (i.e. hand cursor) and ones that partially cover
-  // and partially blend with background (i. e. I-beam cursor).
-  // These will have either 1 square mask or 2 masks stacked on top
-  // of each other (xor mask and and mask).
-  const bool has_xor_mask =
-      bitmap_info.bmiHeader.biHeight == 2 * bitmap_info.bmiHeader.biWidth;
-  const auto height = static_cast<uint32_t>(bitmap_info.bmiHeader.biHeight);
-  const uint32_t cursor_height = has_xor_mask ? height / 2 : height;
-  uint32_t xor_offset;
-  if (has_xor_mask) {
-    for (xor_offset = 0; xor_offset < cursor_height; ++xor_offset) {
-      const uint32_t row_start = row_size * xor_offset;
-      const uint32_t row_boundary = row_start + row_size;
-      for (uint32_t i = row_start; i < row_boundary; ++i)
-        data.get()[i] = ~(data.get()[i]);
-      if (!IsRowTransparent(data, row_size, last_byte_mask, xor_offset)) {
-        break;
-      }
-    }
-  } else {
-    xor_offset = cursor_height;
-  }
-
-  uint32_t and_offset;
-
-  for (and_offset = has_xor_mask ? cursor_height : 0; and_offset < height;
-       ++and_offset) {
-    if (!IsRowTransparent(data, row_size, last_byte_mask, and_offset)) {
-      break;
-    }
-  }
-  if (has_xor_mask) {
-    and_offset -= cursor_height;
-  }
-  const uint32_t offset = std::min(xor_offset, and_offset);
-
-  DeleteObject(icon.hbmColor);
-  DeleteObject(icon.hbmMask);
-
-  // Apparently it's possible for the calculation here to underflow, and thus
-  // result in a negative value, maybe if the hotspot is below any visible
-  // portion of the cursor.  Not sure if this case should return 0 instead.
-  return static_cast<int>(cursor_height - offset - icon.yHotspot + 1);
-}
-
-}  // namespace
-
-namespace views {
-namespace corewm {
-
-int GetCurrentCursorVisibleHeight() {
-  CURSORINFO cursor = {0};
-  cursor.cbSize = sizeof(cursor);
-  GetCursorInfo(&cursor);
-
-  if (cached_heights == nullptr)
-    cached_heights = new HeightStorage;
-
-  HeightStorage::const_iterator cached_height =
-      cached_heights->find(cursor.hCursor);
-  if (cached_height != cached_heights->end())
-    return cached_height->second;
-
-  const int height = CalculateCursorHeight(cursor.hCursor);
-  (*cached_heights)[cursor.hCursor] = height;
-
-  return height;
-}
-
-}  // namespace corewm
-}  // namespace views

ui/views/corewm/cursor_height_provider_win.h

diff --git a/ui/views/corewm/cursor_height_provider_win.h b/ui/views/corewm/cursor_height_provider_win.h
deleted file mode 100644
index ce0bf65..0000000
--- a/ui/views/corewm/cursor_height_provider_win.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2014 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef UI_VIEWS_COREWM_CURSOR_HEIGHT_PROVIDER_WIN_H_
-#define UI_VIEWS_COREWM_CURSOR_HEIGHT_PROVIDER_WIN_H_
-
-namespace views {
-namespace corewm {
-
-// Gets the visible height of current cursor.
-//
-// The height is offset between cursor's hot point and it's
-// bottom edge, derived from first non-transparent row of cursor's mask.
-
-int GetCurrentCursorVisibleHeight();
-
-}  // namespace corewm
-}  // namespace views
-
-#endif  // UI_VIEWS_COREWM_CURSOR_HEIGHT_PROVIDER_WIN_H_

ui/views/corewm/tooltip_win.cc

diff --git a/ui/views/corewm/tooltip_win.cc b/ui/views/corewm/tooltip_win.cc
deleted file mode 100644
index fa6e9c7..0000000
--- a/ui/views/corewm/tooltip_win.cc
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright 2013 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/views/corewm/tooltip_win.h"
-
-#include "base/i18n/rtl.h"
-#include "base/logging.h"
-#include "base/strings/string_util_win.h"
-#include "base/win/windowsx_shim.h"
-#include "ui/aura/window.h"
-#include "ui/base/l10n/l10n_util_win.h"
-#include "ui/display/display.h"
-#include "ui/display/screen.h"
-#include "ui/display/win/screen_win.h"
-#include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/system_fonts_win.h"
-#include "ui/views/corewm/cursor_height_provider_win.h"
-
-namespace views::corewm {
-
-TooltipWin::TooltipWin(HWND parent)
-    : parent_hwnd_(parent), tooltip_hwnd_(nullptr), showing_(false) {
-  memset(&toolinfo_, 0, sizeof(toolinfo_));
-  toolinfo_.cbSize = sizeof(toolinfo_);
-  toolinfo_.uFlags = TTF_IDISHWND | TTF_TRACK | TTF_ABSOLUTE;
-  toolinfo_.uId = reinterpret_cast<UINT_PTR>(parent_hwnd_);
-  toolinfo_.hwnd = parent_hwnd_;
-  toolinfo_.lpszText = nullptr;
-  toolinfo_.lpReserved = nullptr;
-  SetRectEmpty(&toolinfo_.rect);
-}
-
-TooltipWin::~TooltipWin() {
-  if (tooltip_hwnd_)
-    DestroyWindow(tooltip_hwnd_);
-}
-
-bool TooltipWin::HandleNotify(int w_param, NMHDR* l_param, LRESULT* l_result) {
-  if (tooltip_hwnd_ == nullptr)
-    return false;
-
-  switch (l_param->code) {
-    case TTN_POP:
-      showing_ = false;
-      return true;
-    case TTN_SHOW:
-      *l_result = TRUE;
-      PositionTooltip();
-      showing_ = true;
-      return true;
-    default:
-      break;
-  }
-  return false;
-}
-
-bool TooltipWin::EnsureTooltipWindow() {
-  if (tooltip_hwnd_)
-    return true;
-
-  tooltip_hwnd_ =
-      CreateWindowEx(WS_EX_TRANSPARENT | l10n_util::GetExtendedTooltipStyles(),
-                     TOOLTIPS_CLASS, nullptr, TTS_NOPREFIX | WS_POPUP, 0, 0, 0,
-                     0, parent_hwnd_, nullptr, nullptr, nullptr);
-  if (!tooltip_hwnd_) {
-    PLOG(WARNING) << "tooltip creation failed, disabling tooltips";
-    return false;
-  }
-
-  MaybeOverrideFont();
-
-  SendMessage(tooltip_hwnd_, TTM_ADDTOOL, 0,
-              reinterpret_cast<LPARAM>(&toolinfo_));
-  return true;
-}
-
-void TooltipWin::PositionTooltip() {
-  gfx::Point screen_point =
-      display::win::ScreenWin::DIPToScreenPoint(anchor_point_);
-  const int cursoroffset = GetCurrentCursorVisibleHeight();
-  screen_point.Offset(0, cursoroffset);
-
-  LRESULT tooltip_size = SendMessage(tooltip_hwnd_, TTM_GETBUBBLESIZE, 0,
-                                     reinterpret_cast<LPARAM>(&toolinfo_));
-  const gfx::Size size(LOWORD(tooltip_size), HIWORD(tooltip_size));
-
-  const display::Display display(
-      display::Screen::GetScreen()->GetDisplayNearestPoint(anchor_point_));
-
-  gfx::Rect tooltip_bounds(screen_point, size);
-  // Align the center of the tooltip with the position when the tooltip is not
-  // following the cursor.
-  if (trigger_ == TooltipTrigger::kKeyboard)
-    tooltip_bounds.Offset(-size.width() / 2, 0);
-  else if (base::i18n::IsRTL())
-    tooltip_bounds.Offset(-size.width(), 0);
-  tooltip_bounds.AdjustToFit(display::win::ScreenWin::DIPToScreenRect(
-      parent_hwnd_, display.work_area()));
-  SetWindowPos(tooltip_hwnd_, nullptr, tooltip_bounds.x(), tooltip_bounds.y(),
-               0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
-
-  MaybeOverrideFont();
-}
-
-void TooltipWin::MaybeOverrideFont() {
-  gfx::win::FontAdjustment font_adjustment;
-  const HFONT old_font = GetWindowFont(tooltip_hwnd_);
-
-  // Determine if we need to override the font.
-  if ((!override_font_.get() || override_font_.get() != old_font) &&
-      l10n_util::NeedOverrideDefaultUIFont(
-          &font_adjustment.font_family_override, &font_adjustment.font_scale)) {
-    // Determine if we need to regenerate the font.
-    // There are a number of situations under which Windows can replace the
-    // font in a tooltip, but we don't actually need to regenerate our override
-    // font unless the underlying text/DPI scale of the window has changed.
-    const float current_scale =
-        display::win::ScreenWin::GetScaleFactorForHWND(tooltip_hwnd_);
-    if (!override_font_.get() || current_scale != override_scale_) {
-      override_font_.reset(
-          gfx::win::AdjustExistingSystemFont(old_font, font_adjustment));
-      override_scale_ = current_scale;
-    }
-
-    // Override the font in the tooltip.
-    SetWindowFont(tooltip_hwnd_, override_font_.get(), FALSE);
-  }
-}
-
-int TooltipWin::GetMaxWidth(const gfx::Point& location) const {
-  const gfx::Point screen_point =
-      display::win::ScreenWin::DIPToScreenPoint(location);
-  display::Display display(
-      display::Screen::GetScreen()->GetDisplayNearestPoint(screen_point));
-  const gfx::Rect monitor_bounds = display.bounds();
-  return (monitor_bounds.width() + 1) / 2;
-}
-
-void TooltipWin::Update(aura::Window* window,
-                        const std::u16string& tooltip_text,
-                        const gfx::Point& position,
-                        const TooltipTrigger trigger) {
-  if (!EnsureTooltipWindow())
-    return;
-
-  // See comment in header for details on why `anchor_point_` and `trigger_` are
-  // needed here.
-  anchor_point_ = position + window->GetBoundsInScreen().OffsetFromOrigin();
-  trigger_ = trigger;
-
-  std::u16string adjusted_text(tooltip_text);
-  base::i18n::AdjustStringForLocaleDirection(&adjusted_text);
-  toolinfo_.lpszText = base::as_writable_wcstr(adjusted_text);
-  SendMessage(tooltip_hwnd_, TTM_SETTOOLINFO, 0,
-              reinterpret_cast<LPARAM>(&toolinfo_));
-
-  int max_width = GetMaxWidth(anchor_point_);
-  SendMessage(tooltip_hwnd_, TTM_SETMAXTIPWIDTH, 0, max_width);
-}
-
-void TooltipWin::Show() {
-  if (!EnsureTooltipWindow())
-    return;
-
-  SendMessage(tooltip_hwnd_, TTM_TRACKACTIVATE, TRUE,
-              reinterpret_cast<LPARAM>(&toolinfo_));
-
-  // Bring the window to the front.
-  SetWindowPos(tooltip_hwnd_, HWND_TOPMOST, 0, 0, 0, 0,
-               SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOSIZE);
-}
-
-void TooltipWin::Hide() {
-  if (!tooltip_hwnd_)
-    return;
-
-  SendMessage(tooltip_hwnd_, TTM_TRACKACTIVATE, FALSE,
-              reinterpret_cast<LPARAM>(&toolinfo_));
-}
-
-bool TooltipWin::IsVisible() {
-  return showing_;
-}
-
-}  // namespace views::corewm

ui/views/corewm/tooltip_win.h

diff --git a/ui/views/corewm/tooltip_win.h b/ui/views/corewm/tooltip_win.h
deleted file mode 100644
index 8f131b8..0000000
--- a/ui/views/corewm/tooltip_win.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2013 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef UI_VIEWS_COREWM_TOOLTIP_WIN_H_
-#define UI_VIEWS_COREWM_TOOLTIP_WIN_H_
-
-#include <windows.h>  // Must come before other Windows system headers.
-
-#include <commctrl.h>
-
-#include <string>
-
-#include "base/win/scoped_gdi_object.h"
-#include "ui/gfx/geometry/point.h"
-#include "ui/views/corewm/tooltip.h"
-
-namespace wm {
-class TooltipObserver;
-}
-
-namespace views::corewm {
-
-// Implementation of Tooltip that uses the native win32 control for showing the
-// tooltip.
-class VIEWS_EXPORT TooltipWin : public Tooltip {
- public:
-  explicit TooltipWin(HWND parent);
-
-  TooltipWin(const TooltipWin&) = delete;
-  TooltipWin& operator=(const TooltipWin&) = delete;
-
-  ~TooltipWin() override;
-
-  void AddObserver(wm::TooltipObserver* observer) override {}
-  void RemoveObserver(wm::TooltipObserver* observer) override {}
-
-  // HandleNotify() is forwarded from DesktopWindowTreeHostWin to keep the
-  // native tooltip in sync.
-  bool HandleNotify(int w_param, NMHDR* l_param, LRESULT* l_result);
-
- private:
-  // Ensures |tooltip_hwnd_| is valid. Returns true if valid, false if there
-  // a problem creating |tooltip_hwnd_|.
-  bool EnsureTooltipWindow();
-
-  // Sets the position of the tooltip.
-  void PositionTooltip();
-
-  // Might override the font size for localization (e.g. Hindi).
-  void MaybeOverrideFont();
-
-  // Tooltip:
-  int GetMaxWidth(const gfx::Point& location) const override;
-  void Update(aura::Window* window,
-              const std::u16string& tooltip_text,
-              const gfx::Point& position,
-              const TooltipTrigger trigger) override;
-  void Show() override;
-  void Hide() override;
-  bool IsVisible() override;
-
-  // Font we're currently overriding our UI font with.
-  // Should outlast |tooltip_hwnd_|.
-  base::win::ScopedHFONT override_font_;
-
-  // The window |tooltip_hwnd_| is parented to.
-  HWND parent_hwnd_;
-
-  // Shows the tooltip.
-  HWND tooltip_hwnd_;
-
-  // Used to modify the tooltip.
-  TOOLINFO toolinfo_;
-
-  // Is the tooltip showing?
-  bool showing_;
-
-  // In order to position the tooltip we need to know the size. The size is only
-  // available from TTN_SHOW, so we have to cache `anchor_point_` and `trigger_`
-  // which are required to calculate its position.
-  gfx::Point anchor_point_;
-  TooltipTrigger trigger_ = TooltipTrigger::kCursor;
-
-  // What the scale was the last time we overrode the font, to see if we can
-  // re-use our previous override.
-  float override_scale_ = 0.0f;
-};
-
-}  // namespace views::corewm
-
-#endif  // UI_VIEWS_COREWM_TOOLTIP_WIN_H_

ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc

diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index ceee9102..aed57145 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -16,7 +16,6 @@
 #include "base/ranges/algorithm.h"
 #include "base/trace_event/trace_event.h"
 #include "base/win/win_util.h"
-#include "base/win/windows_version.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/aura_constants.h"
@@ -45,7 +44,6 @@
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/path_win.h"
 #include "ui/views/corewm/tooltip_aura.h"
-#include "ui/views/corewm/tooltip_win.h"
 #include "ui/views/views_features.h"
 #include "ui/views/views_switches.h"
 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h"
@@ -135,8 +133,7 @@
       drag_drop_client_(nullptr),
       should_animate_window_close_(false),
       pending_close_(false),
-      has_non_client_view_(false),
-      tooltip_(nullptr) {}
+      has_non_client_view_(false) {}
 
 DesktopWindowTreeHostWin::~DesktopWindowTreeHostWin() {
   desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(this);
@@ -228,14 +225,7 @@
 void DesktopWindowTreeHostWin::OnWidgetInitDone() {}
 
 std::unique_ptr<corewm::Tooltip> DesktopWindowTreeHostWin::CreateTooltip() {
-  bool force_legacy_tooltips =
-      (base::win::GetVersion() < base::win::Version::WIN8);
-  if (!force_legacy_tooltips)
-    return std::make_unique<corewm::TooltipAura>();
-
-  DCHECK(!tooltip_);
-  tooltip_ = new corewm::TooltipWin(GetAcceleratedWidget());
-  return base::WrapUnique(tooltip_.get());
+  return std::make_unique<corewm::TooltipAura>();
 }
 
 std::unique_ptr<aura::client::DragDropClient>
@@ -1156,12 +1146,6 @@
     compositor()->ScheduleRedrawRect(invalid_rect);
 }
 
-bool DesktopWindowTreeHostWin::HandleTooltipNotify(int w_param,
-                                                   NMHDR* l_param,
-                                                   LRESULT* l_result) {
-  return tooltip_ && tooltip_->HandleNotify(w_param, l_param, l_result);
-}
-
 void DesktopWindowTreeHostWin::HandleMenuLoop(bool in_menu_loop) {
   if (in_menu_loop) {
     tooltip_disabler_ = std::make_unique<wm::ScopedTooltipDisabler>(window());

ui/views/widget/desktop_aura/desktop_window_tree_host_win.h

diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
index 58c13ba4..b23ba1b 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
@@ -38,10 +38,6 @@
 class HWNDMessageHandler;
 class NonClientFrameView;
 
-namespace corewm {
-class TooltipWin;
-}
-
 namespace test {
 class DesktopWindowTreeHostWinTestApi;
 }
@@ -251,9 +247,6 @@
   void HandleInputLanguageChange(DWORD character_set,
                                  HKL input_language_id) override;
   void HandlePaintAccelerated(const gfx::Rect& invalid_rect) override;
-  bool HandleTooltipNotify(int w_param,
-                           NMHDR* l_param,
-                           LRESULT* l_result) override;
   void HandleMenuLoop(bool in_menu_loop) override;
   bool PreHandleMSG(UINT message,
                     WPARAM w_param,
@@ -326,10 +319,6 @@
   // True if the window should have the frame removed.
   bool remove_standard_frame_;
 
-  // Owned by TooltipController, but we need to forward events to it so we keep
-  // a reference.
-  raw_ptr<corewm::TooltipWin> tooltip_;
-
   // Visibility of the cursor. On Windows we can have multiple root windows and
   // the implementation of ::ShowCursor() is based on a counter, so making this
   // member static ensures that ::ShowCursor() is always called exactly once

ui/views/widget/widget_interactive_uitest.cc

diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc
index 462d8e6..83cd8b2 100644
--- a/ui/views/widget/widget_interactive_uitest.cc
+++ b/ui/views/widget/widget_interactive_uitest.cc
@@ -18,7 +18,6 @@
 #include "base/task/single_thread_task_runner.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
-#include "base/win/windows_version.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
 #include "ui/base/ime/input_method.h"
@@ -464,11 +463,6 @@
 
 // TODO(dtapuska): Disabled due to it being flaky crbug.com/817531
 TEST_F(DesktopWidgetTestInteractive, DISABLED_TouchNoActivateWindow) {
-  // ui_controls::SendTouchEvents which uses InjectTouchInput API only works
-  // on Windows 8 and up.
-  if (base::win::GetVersion() <= base::win::Version::WIN7)
-    return;
-
   View* focusable_view = new View;
   focusable_view->SetFocusBehavior(View::FocusBehavior::ALWAYS);
   WidgetAutoclosePtr widget(CreateTopLevelNativeWidget());

ui/views/win/hwnd_message_handler.cc

diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index f8a5b92..6ba506fc 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -29,7 +29,6 @@
 #include "base/win/dark_mode_support.h"
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/win_util.h"
-#include "base/win/windows_version.h"
 #include "services/tracing/public/cpp/perfetto/macros.h"
 #include "third_party/perfetto/protos/perfetto/trace/track_event/chrome_window_handle_event_info.pbzero.h"
 #include "third_party/skia/include/core/SkPath.h"
@@ -2127,12 +2126,6 @@
 LRESULT HWNDMessageHandler::OnPointerEvent(UINT message,
                                            WPARAM w_param,
                                            LPARAM l_param) {
-  // WM_POINTER is not supported on Windows 7.
-  if (base::win::GetVersion() == base::win::Version::WIN7) {
-    SetMsgHandled(FALSE);
-    return -1;
-  }
-
   UINT32 pointer_id = GET_POINTERID_WPARAM(w_param);
   using GetPointerTypeFn = BOOL(WINAPI*)(UINT32, POINTER_INPUT_TYPE*);
   POINTER_INPUT_TYPE pointer_type;
@@ -2529,12 +2522,6 @@
   return 0;
 }
 
-LRESULT HWNDMessageHandler::OnNotify(int w_param, NMHDR* l_param) {
-  LRESULT l_result = 0;
-  SetMsgHandled(delegate_->HandleTooltipNotify(w_param, l_param, &l_result));
-  return l_result;
-}
-
 void HWNDMessageHandler::OnPaint(HDC dc) {
   // Call BeginPaint()/EndPaint() around the paint handling, as that seems
   // to do more to actually validate the window's drawing region. This only
@@ -2834,18 +2821,6 @@
       POINT point;
       point.x = TOUCH_COORD_TO_PIXEL(input[i].x);
       point.y = TOUCH_COORD_TO_PIXEL(input[i].y);
-
-      if (base::win::GetVersion() == base::win::Version::WIN7) {
-        // Windows 7 sends touch events for touches in the non-client area,
-        // whereas Windows 8 does not. In order to unify the behaviour, always
-        // ignore touch events in the non-client area.
-        LPARAM l_param_ht = MAKELPARAM(point.x, point.y);
-        LRESULT hittest = SendMessage(hwnd(), WM_NCHITTEST, 0, l_param_ht);
-
-        if (hittest != HTCLIENT)
-          return 0;
-      }
-
       ScreenToClient(hwnd(), &point);
 
       last_touch_or_pen_message_time_ = ::GetMessageTime();

ui/views/win/hwnd_message_handler.h

diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
index 5972a9f7..ef3ea5c 100644
--- a/ui/views/win/hwnd_message_handler.h
+++ b/ui/views/win/hwnd_message_handler.h
@@ -450,7 +450,6 @@
     CR_MSG_WM_NCCREATE(OnNCCreate)
     CR_MSG_WM_NCHITTEST(OnNCHitTest)
     CR_MSG_WM_NCPAINT(OnNCPaint)
-    CR_MSG_WM_NOTIFY(OnNotify)
     CR_MSG_WM_PAINT(OnPaint)
     CR_MSG_WM_SETFOCUS(OnSetFocus)
     CR_MSG_WM_SETICON(OnSetIcon)
@@ -508,7 +507,6 @@
   void OnNCPaint(HRGN rgn);
   LRESULT OnNCUAHDrawCaption(UINT message, WPARAM w_param, LPARAM l_param);
   LRESULT OnNCUAHDrawFrame(UINT message, WPARAM w_param, LPARAM l_param);
-  LRESULT OnNotify(int w_param, NMHDR* l_param);
   void OnPaint(HDC dc);
   LRESULT OnReflectedMessage(UINT message, WPARAM w_param, LPARAM l_param);
   LRESULT OnScrollMessage(UINT message, WPARAM w_param, LPARAM l_param);

ui/views/win/hwnd_message_handler_delegate.h

diff --git a/ui/views/win/hwnd_message_handler_delegate.h b/ui/views/win/hwnd_message_handler_delegate.h
index 08e46c7..da6afe2 100644
--- a/ui/views/win/hwnd_message_handler_delegate.h
+++ b/ui/views/win/hwnd_message_handler_delegate.h
@@ -215,11 +215,6 @@
   // Called to compel the delegate to paint |invalid_rect| accelerated.
   virtual void HandlePaintAccelerated(const gfx::Rect& invalid_rect) = 0;
 
-  // Called to forward a WM_NOTIFY message to the tooltip manager.
-  virtual bool HandleTooltipNotify(int w_param,
-                                   NMHDR* l_param,
-                                   LRESULT* l_result) = 0;
-
   // Invoked on entering/exiting a menu loop.
   virtual void HandleMenuLoop(bool in_menu_loop) = 0;
 

weblayer/browser/java/org/chromium/weblayer_private/DownloadImpl.java

diff --git a/weblayer/browser/java/org/chromium/weblayer_private/DownloadImpl.java b/weblayer/browser/java/org/chromium/weblayer_private/DownloadImpl.java
index fc98cc8..3f3d6ab 100644
--- a/weblayer/browser/java/org/chromium/weblayer_private/DownloadImpl.java
+++ b/weblayer/browser/java/org/chromium/weblayer_private/DownloadImpl.java
@@ -11,7 +11,6 @@
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.net.Uri;
-import android.os.Build;
 import android.os.RemoteException;
 import android.text.TextUtils;
 
@@ -413,7 +412,7 @@
         // As with Chrome, transient downloads "promote" the source URL.
         if (!mIsIncognito && mIsTransient) {
             String formattedUrl = DownloadUtils.formatUrlForDisplayInNotification(mSourceUrl);
-            if (formattedUrl != null) setSubText(builder, formattedUrl);
+            if (formattedUrl != null) builder.setSubText(formattedUrl);
         }
         // TODO(estade): In incognito, Chrome uses a subtext of "Incognito tab". Should WL display
         // something similar?
@@ -510,19 +509,6 @@
     }
 
     /**
-     * Helper method to set the sub text on different versions of Android.
-     * @param builder The builder to build notification.
-     * @param subText A string shown as sub text on the notification.
-     */
-    private static void setSubText(WebLayerNotificationWrapperBuilder builder, String subText) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            builder.setSubText(subText);
-        } else {
-            builder.setContentInfo(subText);
-        }
-    }
-
-    /**
      * Returns the notification manager.
      */
     private static NotificationManagerProxy getNotificationManager() {