diff --git a/AUTHORS b/AUTHORS
index 24d9c48..1693be8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -794,6 +794,7 @@
 Miran Karic <miran.karic@imgtec.com>
 Mirela Budaes <mbudaes@adobe.com>
 Mirela Budaes <mbudaes@gmail.com>
+Mitchell Cohen <mitchell@agilebits.com>
 Miyoung Shin <myid.shin@navercorp.com>
 Mohamed I. Hammad <ibraaaa@gmail.com>
 Mohamed Mansour <m0.interactive@gmail.com>
diff --git a/BUILD.gn b/BUILD.gn
index 082b2830..4e4fe49 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -531,7 +531,7 @@
   }
 
   # TODO(GYP): Figure out which of these should (and can) build
-  # for chromeos/ios.
+  # for Chrome OS, iOS, and Fuchsia.
   if (!is_chromeos_ash && !is_ios && !is_fuchsia) {
     deps += [
       "//base:build_utf8_validator_tables",
diff --git a/DEPS b/DEPS
index e790dea..42541da 100644
--- a/DEPS
+++ b/DEPS
@@ -234,11 +234,11 @@
   # 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': 'c4712cc704e84048c9b0b62d6bfac66dcacec81c',
+  'skia_revision': '6dc45289aec01479497f1336dc4ef1dcddce000b',
   # 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': '002b2ce54709408c3fc76c7a54d9388c7d0a0315',
+  'v8_revision': 'c6a11f421bbd372f62e8da9396daa20553acb946',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ANGLE
   # and whatever else without interference from each other.
@@ -309,7 +309,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling devtools-frontend
   # and whatever else without interference from each other.
-  'devtools_frontend_revision': 'eb4f16164fed8f7bd469f99a5912fb77b1954891',
+  'devtools_frontend_revision': 'd36fbdeda77f2da669933f3bce0cbe25622d9bb9',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libprotobuf-mutator
   # and whatever else without interference from each other.
@@ -349,7 +349,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': 'e7efad03259a6cc1643d9bc545c16bb9f3ddc1e4',
+  'dawn_revision': '56ff53088bc4002b9b217b9181dd32bbe46a974f',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
@@ -708,7 +708,7 @@
       'packages': [
         {
           'package': 'chromium/rts/model/linux-amd64',
-          'version': 'P8kKEOoOgkEgqbK8vjlwWzDYKDidYV9KBjyo6X2i2NEC',
+          'version': '53t4mVtzHz5Vg0ctcbaT56ZUMajV2eMHL0Q9lIJR_7wC',
         },
       ],
       'dep_type': 'cipd',
@@ -719,7 +719,7 @@
       'packages': [
         {
           'package': 'chromium/rts/model/mac-amd64',
-          'version': '18P8W4cBBGMUitkyuDSai-jXbI_k6oupZDhRAIsFW-MC',
+          'version': 'Avk24cG4urcL3edNsCSTQQP23BsN1OLYRuLY1pgzXYAC',
         },
       ],
       'dep_type': 'cipd',
@@ -730,7 +730,7 @@
       'packages': [
         {
           'package': 'chromium/rts/model/windows-amd64',
-          'version': '3Sn1GqIcPprOERl7ukCyZcxtNc4iLyZzOqAA3bsOZa8C',
+          'version': 't82je0uaeo5wsqIhsTZaMmvDoxORG65aBxFeYPOvgUgC',
         },
       ],
       'dep_type': 'cipd',
@@ -791,7 +791,7 @@
     'packages': [
       {
           'package': 'chromium/third_party/androidx',
-          'version': 'kOGHSX2ia0dsRAm8DcdBlff2C07mTWt9YaieS6a5K74C',
+          'version': '8psIPDigEQ4L6gV80_7FCGGuyGy_ExaUlGBytDFeHX8C',
       },
     ],
     'condition': 'checkout_android',
@@ -922,7 +922,7 @@
 
   'src/third_party/barhopper': {
       'url': 'https://chrome-internal.googlesource.com/chrome/deps/barhopper.git' + '@' + 'b619dfad3ef48aa15d3a647442c3c40f3a967146',
-      'condition': 'checkout_src_internal and checkout_chromeos',
+      'condition': 'checkout_src_internal',
   },
 
   'src/third_party/cast_core/prebuilts': {
@@ -1413,7 +1413,7 @@
   },
 
   'src/third_party/perfetto':
-    Var('android_git') + '/platform/external/perfetto.git' + '@' + '4a9b683ccbbb7f1d3d16645671e960dae6a8a352',
+    Var('android_git') + '/platform/external/perfetto.git' + '@' + 'aeff6922a9050e54917dc30880d248c15a68272e',
 
   'src/third_party/perl': {
       'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3',
@@ -1634,7 +1634,7 @@
     Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '770facab6251abd3a78c7685b6ca4200c0a49f81',
 
   'src/third_party/webrtc':
-    Var('webrtc_git') + '/src.git' + '@' + 'b5dcbbf9a6f62b9ab575336b893d259d7b855fce',
+    Var('webrtc_git') + '/src.git' + '@' + '4ad09762daa973d289c5414aeb86bc51ddc51270',
 
   'src/third_party/libgifcodec':
      Var('skia_git') + '/libgifcodec' + '@'+  Var('libgifcodec_revision'),
@@ -1692,7 +1692,7 @@
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@1536e7572e52d4b7592eb0933c8eb763e70c44ba',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@c76e6bbbd900b809fc72d588732b7e4281e33cbf',
     'condition': 'checkout_src_internal',
   },
 
@@ -1711,7 +1711,7 @@
     'packages': [
       {
         'package': 'chromeos_internal/apps/help_app/app',
-        'version': 'cq6iUJRfVnml1cxQUmVfrWG3Xmn_vJv_9iztYY4RANQC',
+        'version': 'KpzoOEa3d2MjouQiu7arIPPvPnnDpuQQl_wksQngBqMC',
       },
     ],
     'condition': 'checkout_chromeos and checkout_src_internal',
@@ -1722,7 +1722,7 @@
     'packages': [
       {
         'package': 'chromeos_internal/apps/media_app/app',
-        'version': 'lBRSNyxFH3nZGA2khGqpob0AFtAdc9z40YhkDIF2IMkC',
+        'version': 'iT8SJAVLrO_-Nlr2q3EYPF7_KaGpRSGd4cvqTyAlLIkC',
       },
     ],
     'condition': 'checkout_chromeos and checkout_src_internal',
diff --git a/android_webview/tools/cts_utils_test.py b/android_webview/tools/cts_utils_test.py
index a6f3e7e0..b5a2f3f 100755
--- a/android_webview/tools/cts_utils_test.py
+++ b/android_webview/tools/cts_utils_test.py
@@ -381,25 +381,25 @@
       configFile.writelines(CONFIG_DATA['json'])
       configFile.flush()
       cts_config = cts_utils.CTSConfig(configFile.name)
-    self.assertEquals(['platform1', 'platform2'], cts_config.get_platforms())
-    self.assertEquals(['arch1', 'arch2'], cts_config.get_archs('platform1'))
-    self.assertEquals(['arch1', 'arch2'], cts_config.get_archs('platform2'))
-    self.assertEquals('arch1/platform1/file1.zip',
-                      cts_config.get_cipd_zip('platform1', 'arch1'))
-    self.assertEquals('arch2/platform1/file3.zip',
-                      cts_config.get_cipd_zip('platform1', 'arch2'))
-    self.assertEquals('arch1/platform2/file2.zip',
-                      cts_config.get_cipd_zip('platform2', 'arch1'))
-    self.assertEquals('arch2/platform2/file4.zip',
-                      cts_config.get_cipd_zip('platform2', 'arch2'))
-    self.assertEquals('https://a1.p1/f1.zip',
-                      cts_config.get_origin('platform1', 'arch1'))
-    self.assertEquals('https://a2.p1/f3.zip',
-                      cts_config.get_origin('platform1', 'arch2'))
-    self.assertEquals('https://a1.p2/f2.zip',
-                      cts_config.get_origin('platform2', 'arch1'))
-    self.assertEquals('https://a2.p2/f4.zip',
-                      cts_config.get_origin('platform2', 'arch2'))
+    self.assertEqual(['platform1', 'platform2'], cts_config.get_platforms())
+    self.assertEqual(['arch1', 'arch2'], cts_config.get_archs('platform1'))
+    self.assertEqual(['arch1', 'arch2'], cts_config.get_archs('platform2'))
+    self.assertEqual('arch1/platform1/file1.zip',
+                     cts_config.get_cipd_zip('platform1', 'arch1'))
+    self.assertEqual('arch2/platform1/file3.zip',
+                     cts_config.get_cipd_zip('platform1', 'arch2'))
+    self.assertEqual('arch1/platform2/file2.zip',
+                     cts_config.get_cipd_zip('platform2', 'arch1'))
+    self.assertEqual('arch2/platform2/file4.zip',
+                     cts_config.get_cipd_zip('platform2', 'arch2'))
+    self.assertEqual('https://a1.p1/f1.zip',
+                     cts_config.get_origin('platform1', 'arch1'))
+    self.assertEqual('https://a2.p1/f3.zip',
+                     cts_config.get_origin('platform1', 'arch2'))
+    self.assertEqual('https://a1.p2/f2.zip',
+                     cts_config.get_origin('platform2', 'arch1'))
+    self.assertEqual('https://a2.p2/f4.zip',
+                     cts_config.get_origin('platform2', 'arch2'))
     self.assertTrue(['p1/test.apk'], cts_config.get_apks('platform1'))
     self.assertTrue(['p2/test1.apk', 'p2/test2.apk'],
                     cts_config.get_apks('platform2'))
@@ -415,9 +415,9 @@
       cts_utils.filterzip('downloaded.zip', ['a/b/one.apk', 'a/b/two.apk'],
                           'filtered.zip')
       zf = zipfile.ZipFile('filtered.zip', 'r')
-      self.assertEquals(2, len(zf.namelist()))
-      self.assertEquals(b'abc', zf.read('a/b/one.apk'))
-      self.assertEquals(b'def', zf.read('a/b/two.apk'))
+      self.assertEqual(2, len(zf.namelist()))
+      self.assertEqual(b'abc', zf.read('a/b/one.apk'))
+      self.assertEqual(b'def', zf.read('a/b/two.apk'))
 
   @patch('cts_utils.filterzip')
   def testFilterCTS(self, filterzip_mock):  # pylint: disable=no-self-use
@@ -440,9 +440,9 @@
       writefile(CIPD_DATA['yaml'], 'cipd.yaml')
       version = cts_utils.update_cipd_package('cipd.yaml')
       uploaded = fake_cipd.get_package(CIPD_DATA['package'], version)
-      self.assertEquals(CIPD_DATA['package'], uploaded['package'])
+      self.assertEqual(CIPD_DATA['package'], uploaded['package'])
       uploaded_files = [e['file'] for e in uploaded['data']]
-      self.assertEquals(4, len(uploaded_files))
+      self.assertEqual(4, len(uploaded_files))
       for i in range(1, 5):
         self.assertTrue(CIPD_DATA['file' + str(i)] in uploaded_files)
 
@@ -451,18 +451,17 @@
          cts_utils.chdir(tempDir):
       setup_fake_repo('.')
       helper = cts_utils.ChromiumRepoHelper(root_dir='.')
-      self.assertEquals(DEPS_DATA['revision'], helper.get_cipd_dependency_rev())
+      self.assertEqual(DEPS_DATA['revision'], helper.get_cipd_dependency_rev())
 
-      self.assertEquals(
-          os.path.join(tempDir, 'a', 'b'), helper.rebase('a', 'b'))
+      self.assertEqual(os.path.join(tempDir, 'a', 'b'), helper.rebase('a', 'b'))
 
       helper.update_cts_cipd_rev('newversion')
-      self.assertEquals('newversion', helper.get_cipd_dependency_rev())
+      self.assertEqual('newversion', helper.get_cipd_dependency_rev())
       expected_deps = DEPS_DATA['template'] % (CIPD_DATA['package'],
                                                'newversion')
-      self.assertEquals(expected_deps, readfile(_CIPD_REFERRERS[0]))
+      self.assertEqual(expected_deps, readfile(_CIPD_REFERRERS[0]))
       expected_suites = SUITES_DATA['template'] % ('newversion', 'newversion')
-      self.assertEquals(expected_suites, readfile(_CIPD_REFERRERS[1]))
+      self.assertEqual(expected_suites, readfile(_CIPD_REFERRERS[1]))
 
       writefile('#deps not referring to cts cipd', _CIPD_REFERRERS[0])
       with self.assertRaises(Exception):
diff --git a/android_webview/tools/run_cts.py b/android_webview/tools/run_cts.py
index 43e1c310..6f5b99d8 100755
--- a/android_webview/tools/run_cts.py
+++ b/android_webview/tools/run_cts.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython
+#!/usr/bin/env vpython3
 #
 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
@@ -143,7 +143,7 @@
 
 def MergeTestResults(existing_results_json, additional_results_json):
   """Appends results in additional_results_json to existing_results_json."""
-  for k, v in additional_results_json.iteritems():
+  for k, v in additional_results_json.items():
     if k not in existing_results_json:
       existing_results_json[k] = v
     else:
diff --git a/android_webview/tools/run_simpleperf_test.py b/android_webview/tools/run_simpleperf_test.py
index 5edcf0c..a36e908 100755
--- a/android_webview/tools/run_simpleperf_test.py
+++ b/android_webview/tools/run_simpleperf_test.py
@@ -98,7 +98,7 @@
     # saved as [(str1 + '\n'), (str2 + '\n'), ...].
     actual_lines = [args[0][:-1] for (args, _) in
                     handle.write.call_args_list]
-    self.assertEquals(expected_lines, actual_lines)
+    self.assertEqual(expected_lines, actual_lines)
 
   def setUp(self):
     self.tmp_dir = '/tmp' # the actual directory won't be used in this test.
@@ -116,9 +116,9 @@
   def testStackAddressInterpreter(self, mock_open):
     StackAddressInterpreter.RunStackScript = mock.Mock(
         return_value=_EXAMPLE_STACK_SCRIPT_OUTPUT)
-    self.assertEquals(_EXAMPLE_INTERPRETER_OUTPUT,
-                      self.stack_address_interpreter.Interpret(
-                          _ADDRESSES, _WEBVIEW_LIB_PATH))
+    self.assertEqual(
+        _EXAMPLE_INTERPRETER_OUTPUT,
+        self.stack_address_interpreter.Interpret(_ADDRESSES, _WEBVIEW_LIB_PATH))
     self._AssertFileLines(mock_open, _EXAMPLE_STACK_SCRIPT_INPUT)
 
   @mock.patch('run_simpleperf.open', new_callable=mock.mock_open)
@@ -126,22 +126,22 @@
     self.args.show_file_line = True
     StackAddressInterpreter.RunStackScript = mock.Mock(
         return_value=_EXAMPLE_STACK_SCRIPT_OUTPUT)
-    self.assertEquals(_EXAMPLE_INTERPRETER_OUTPUT_WITH_FILE_NAME_LINE,
-                      self.stack_address_interpreter.Interpret(
-                          _ADDRESSES, _WEBVIEW_LIB_PATH))
+    self.assertEqual(
+        _EXAMPLE_INTERPRETER_OUTPUT_WITH_FILE_NAME_LINE,
+        self.stack_address_interpreter.Interpret(_ADDRESSES, _WEBVIEW_LIB_PATH))
     self._AssertFileLines(mock_open, _EXAMPLE_STACK_SCRIPT_INPUT)
 
   def testSimplePerfRunner_CollectAddresses(self):
     addresses = self.simple_perf_runner.CollectAddresses(
         _MOCK_ORIGINAL_REPORT, 'libwebviewchromium.so')
-    self.assertEquals(set(_MOCK_ADDRESSES), addresses)
+    self.assertEqual(set(_MOCK_ADDRESSES), addresses)
 
   def testSimplePerfRunner_ReplaceAddresses(self):
     postprocessed_report = (
         self.simple_perf_runner.ReplaceAddressesWithFunctionInfos(
             _MOCK_ORIGINAL_REPORT, _MOCK_ADDRESS_FUNCTION_NAME_PAIRS,
             'libwebviewchromium.so'))
-    self.assertEquals(_MOCK_FINAL_REPORT, postprocessed_report)
+    self.assertEqual(_MOCK_FINAL_REPORT, postprocessed_report)
 
   @mock.patch('run_simpleperf.open', new_callable=mock.mock_open)
   def testSimplePerfRunner_Run(self, mock_open):
diff --git a/android_webview/tools/update_cts_test.py b/android_webview/tools/update_cts_test.py
index ff90ff3..e0df703 100755
--- a/android_webview/tools/update_cts_test.py
+++ b/android_webview/tools/update_cts_test.py
@@ -125,8 +125,8 @@
          tempfile_ext.NamedTemporaryDirectory() as repoRoot:
       cts_utils_test.setup_fake_repo(repoRoot)
       cts_updater = update_cts.UpdateCTS(workDir, repoRoot)
-      self.assertEquals(
-          os.path.join(workDir, 'downloaded'), cts_updater.download_dir)
+      self.assertEqual(os.path.join(workDir, 'downloaded'),
+                       cts_updater.download_dir)
 
       cts_updater.download_cts(platforms=['platform1'])
       download_mock.assert_has_calls([
@@ -135,7 +135,7 @@
           call(CONFIG_DATA['origin12'],
                os.path.join(cts_updater.download_dir, CONFIG_DATA['base12']))
       ])
-      self.assertEquals(2, download_mock.call_count)
+      self.assertEqual(2, download_mock.call_count)
 
   @patch('cts_utils.download')
   def testDownloadCTS_allPlatforms(self, download_mock):
@@ -155,7 +155,7 @@
           call(CONFIG_DATA['origin22'],
                os.path.join(cts_updater.download_dir, CONFIG_DATA['base22']))
       ])
-      self.assertEquals(4, download_mock.call_count)
+      self.assertEqual(4, download_mock.call_count)
 
   def testFilterCTS(self):
     with tempfile_ext.NamedTemporaryDirectory() as workDir,\
@@ -164,7 +164,7 @@
       cts_utils_test.setup_fake_repo(repoRoot)
       cts_updater = update_cts.UpdateCTS('.', repoRoot)
       expected_download_dir = os.path.abspath('downloaded')
-      self.assertEquals(expected_download_dir, cts_updater.download_dir)
+      self.assertEqual(expected_download_dir, cts_updater.download_dir)
       os.makedirs(expected_download_dir)
       with cts_utils.chdir('downloaded'):
         generate_zip_file(CONFIG_DATA['base11'], CONFIG_DATA['apk1'],
@@ -173,7 +173,7 @@
                           'not/a/webview/apk')
       cts_updater.filter_downloaded_cts()
       with cts_utils.chdir('filtered'):
-        self.assertEquals(2, len(os.listdir('.')))
+        self.assertEqual(2, len(os.listdir('.')))
         verify_zip_file(CONFIG_DATA['base11'], CONFIG_DATA['apk1'])
         verify_zip_file(CONFIG_DATA['base12'], CONFIG_DATA['apk1'])
 
@@ -227,12 +227,12 @@
       cts_updater.stage_cipd_update()
       self.assertTrue(os.path.isdir('staged'))
       with cts_utils.chdir('staged'):
-        self.assertEquals('n1', cts_utils_test.readfile(CONFIG_DATA['file11']))
-        self.assertEquals('n3', cts_utils_test.readfile(CONFIG_DATA['file12']))
-        self.assertEquals('o2', cts_utils_test.readfile(CONFIG_DATA['file21']))
-        self.assertEquals('o4', cts_utils_test.readfile(CONFIG_DATA['file22']))
-        self.assertEquals(CIPD_DATA['yaml'],
-                          cts_utils_test.readfile('cipd.yaml'))
+        self.assertEqual('n1', cts_utils_test.readfile(CONFIG_DATA['file11']))
+        self.assertEqual('n3', cts_utils_test.readfile(CONFIG_DATA['file12']))
+        self.assertEqual('o2', cts_utils_test.readfile(CONFIG_DATA['file21']))
+        self.assertEqual('o4', cts_utils_test.readfile(CONFIG_DATA['file22']))
+        self.assertEqual(CIPD_DATA['yaml'],
+                         cts_utils_test.readfile('cipd.yaml'))
 
   @patch('cts_utils.update_cipd_package')
   def testCommitStagedCIPD(self, update_mock):
@@ -258,8 +258,8 @@
       cts_updater.commit_staged_cipd()
       update_mock.assert_called_with(
           os.path.join(workDir, 'staged', 'cipd.yaml'))
-      self.assertEquals('newcipdversion',
-                        cts_utils_test.readfile('cipd_version.txt'))
+      self.assertEqual('newcipdversion',
+                       cts_utils_test.readfile('cipd_version.txt'))
 
   @patch('devil.utils.cmd_helper.RunCmd')
   @patch('devil.utils.cmd_helper.GetCmdOutput')
@@ -379,7 +379,7 @@
 
       latest_version = fake_cipd.get_latest_version(
           'chromium/android_webview/tools/cts_archive')
-      self.assertNotEquals(DEPS_DATA['revision'], latest_version)
+      self.assertNotEqual(DEPS_DATA['revision'], latest_version)
       self._assertCIPDVersionUpdated(repoRoot, latest_version)
 
       repo_cipd_yaml = os.path.join(repoRoot, cts_utils.TOOLS_DIR,
@@ -405,10 +405,10 @@
         AssertionError: If contents of DEPS and test suite files were not
           expected.
       """
-    self.assertEquals(
+    self.assertEqual(
         DEPS_DATA['template'] % (CIPD_DATA['package'], new_version),
         cts_utils_test.readfile(os.path.join(repo_root, 'DEPS')))
-    self.assertEquals(
+    self.assertEqual(
         cts_utils_test.SUITES_DATA['template'] % (new_version, new_version),
         cts_utils_test.readfile(
             os.path.join(repo_root, 'testing', 'buildbot', 'test_suites.pyl')))
diff --git a/ash/constants/ash_switches.cc b/ash/constants/ash_switches.cc
index 30e7c5b5..9ea5d1f1 100644
--- a/ash/constants/ash_switches.cc
+++ b/ash/constants/ash_switches.cc
@@ -316,9 +316,8 @@
 // Time in seconds before a derelict machines starts demo mode.
 const char kDerelictIdleTimeout[] = "derelict-idle-timeout";
 
-// Prevents any CPU restrictions being set on the ARC container. Only meant to
-// be used by tests as some tests may time out if the ARC container is
-// throttled.
+// Prevents any CPU restrictions being set on ARC[VM]. Only meant to be used by
+// tests as some tests may time out if the ARC container is throttled.
 const char kDisableArcCpuRestriction[] = "disable-arc-cpu-restriction";
 
 // Disables android user data wipe on opt out.
diff --git a/ash/system/bluetooth/bluetooth_device_status_ui_handler_unittest.cc b/ash/system/bluetooth/bluetooth_device_status_ui_handler_unittest.cc
index f2bf9e5..afa2557 100644
--- a/ash/system/bluetooth/bluetooth_device_status_ui_handler_unittest.cc
+++ b/ash/system/bluetooth/bluetooth_device_status_ui_handler_unittest.cc
@@ -49,35 +49,28 @@
     return *device_status_ui_handler_;
   }
 
-  void SetPairedDevices(
-      std::vector<PairedBluetoothDevicePropertiesPtr> paired_devices) {
-    fake_device_status_notifier()->SetNewlyPairedDevices(
-        std::move(paired_devices));
+  void SetPairedDevice(PairedBluetoothDevicePropertiesPtr paired_device) {
+    fake_device_status_notifier()->SetNewlyPairedDevice(
+        std::move(paired_device));
     base::RunLoop().RunUntilIdle();
   }
 
-  void SetConnectedDevices(
-      std::vector<PairedBluetoothDevicePropertiesPtr> paired_devices) {
-    fake_device_status_notifier()->SetConnectedDevices(
-        std::move(paired_devices));
+  void SetConnectedDevice(PairedBluetoothDevicePropertiesPtr paired_device) {
+    fake_device_status_notifier()->SetConnectedDevice(std::move(paired_device));
     base::RunLoop().RunUntilIdle();
   }
 
-  void SetDisconnectedDevices(
-      std::vector<PairedBluetoothDevicePropertiesPtr> paired_devices) {
-    fake_device_status_notifier()->SetDisconnectedDevices(
-        std::move(paired_devices));
+  void SetDisconnectedDevice(PairedBluetoothDevicePropertiesPtr paired_device) {
+    fake_device_status_notifier()->SetDisconnectedDevice(
+        std::move(paired_device));
     base::RunLoop().RunUntilIdle();
   }
 
-  std::vector<PairedBluetoothDevicePropertiesPtr> GetPairedDevices() {
+  PairedBluetoothDevicePropertiesPtr GetPairedDevice() {
     auto paired_device = PairedBluetoothDeviceProperties::New();
     paired_device->nickname = "Beats X";
     paired_device->device_properties = BluetoothDeviceProperties::New();
-
-    std::vector<PairedBluetoothDevicePropertiesPtr> paired_devices;
-    paired_devices.push_back(std::move(paired_device));
-    return paired_devices;
+    return paired_device;
   }
 
  private:
@@ -95,17 +88,17 @@
 
 TEST_F(BluetoothDeviceStatusUiHandlerTest, PairedDevice) {
   EXPECT_CALL(device_status_ui_handler(), ShowToast);
-  SetPairedDevices(GetPairedDevices());
+  SetPairedDevice(GetPairedDevice());
 }
 
 TEST_F(BluetoothDeviceStatusUiHandlerTest, ConnectedDevice) {
   EXPECT_CALL(device_status_ui_handler(), ShowToast);
-  SetConnectedDevices(GetPairedDevices());
+  SetConnectedDevice(GetPairedDevice());
 }
 
 TEST_F(BluetoothDeviceStatusUiHandlerTest, DisconnectedDevice) {
   EXPECT_CALL(device_status_ui_handler(), ShowToast);
-  SetDisconnectedDevices(GetPairedDevices());
+  SetDisconnectedDevice(GetPairedDevice());
 }
 
 }  // namespace ash
\ No newline at end of file
diff --git a/base/BUILD.gn b/base/BUILD.gn
index df6293d..eaa02b7 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -104,7 +104,12 @@
     # but they're not backwards compatible. Use base::CPU::has_mte()
     # beforehand to confirm or use indirect functions (ifuncs) to select
     # an MTE-specific implementation at dynamic link-time.
-    cflags = [ "-march=armv8-a+memtag" ]
+    cflags = [
+      "-Xclang",
+      "-target-feature",
+      "-Xclang",
+      "+mte",
+    ]
   }
 }
 
diff --git a/base/mac/foundation_util.h b/base/mac/foundation_util.h
index 25fd5e8..29fd05c4 100644
--- a/base/mac/foundation_util.h
+++ b/base/mac/foundation_util.h
@@ -354,6 +354,10 @@
 // Converts |str| to a FilePath. Returns an empty path if |str| is nil.
 BASE_EXPORT FilePath NSStringToFilePath(NSString* str);
 
+// Converts |url| to a FilePath. Returns an empty path if |url| is nil or if
+// |url| is not of scheme "file".
+BASE_EXPORT FilePath NSURLToFilePath(NSURL* url);
+
 // Converts a non-null |path| to a CFURLRef. |path| must not be empty.
 //
 // This function only uses manually-owned resources, so it does not depend on an
diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
index 8981882..6e5d76dc 100644
--- a/base/mac/foundation_util.mm
+++ b/base/mac/foundation_util.mm
@@ -460,6 +460,12 @@
   return FilePath([str fileSystemRepresentation]);
 }
 
+FilePath NSURLToFilePath(NSURL* url) {
+  if (![url isFileURL])
+    return FilePath();
+  return NSStringToFilePath([url path]);
+}
+
 base::ScopedCFTypeRef<CFURLRef> FilePathToCFURL(const FilePath& path) {
   DCHECK(!path.empty());
 
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 35d9e606..b5c7318eb 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -269,8 +269,7 @@
     }
 
     # Whether java assertions and Preconditions checks are enabled.
-    enable_java_asserts =
-        dcheck_always_on || android_channel == "canary" || !is_official_build
+    enable_java_asserts = dcheck_always_on || !is_official_build
 
     # Reduce build time by using d8 incremental build.
     enable_incremental_d8 = true
diff --git a/chrome/VERSION b/chrome/VERSION
index d1b24a2..7305287 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
 MAJOR=98
 MINOR=0
-BUILD=4743
+BUILD=4744
 PATCH=0
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index fd91d6a..5527ef4 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -1743,7 +1743,7 @@
         "javatests/src/org/chromium/chrome/browser/vr/EmulatedVrController.java",
         "javatests/src/org/chromium/chrome/browser/vr/TestVrShellDelegate.java",
         "javatests/src/org/chromium/chrome/browser/vr/VrDaydreamReadyModuleInstallTest.java",
-        "javatests/src/org/chromium/chrome/browser/vr/VrInstallUpdateMessageTest.java",
+        "javatests/src/org/chromium/chrome/browser/vr/VrInstallUpdateInfoBarTest.java",
         "javatests/src/org/chromium/chrome/browser/vr/WebXrVrDeviceTest.java",
         "javatests/src/org/chromium/chrome/browser/vr/WebXrVrInputTest.java",
         "javatests/src/org/chromium/chrome/browser/vr/WebXrVrPermissionTest.java",
@@ -1762,7 +1762,7 @@
         "javatests/src/org/chromium/chrome/browser/vr/rules/WebappActivityVrTestRule.java",
         "javatests/src/org/chromium/chrome/browser/vr/util/NativeUiUtils.java",
         "javatests/src/org/chromium/chrome/browser/vr/util/RenderTestUtils.java",
-        "javatests/src/org/chromium/chrome/browser/vr/util/VrMessageUtils.java",
+        "javatests/src/org/chromium/chrome/browser/vr/util/VrInfoBarUtils.java",
         "javatests/src/org/chromium/chrome/browser/vr/util/VrShellDelegateUtils.java",
         "javatests/src/org/chromium/chrome/browser/vr/util/VrTestRuleUtils.java",
         "javatests/src/org/chromium/chrome/browser/vr/util/VrTransitionUtils.java",
@@ -1776,9 +1776,6 @@
             "//components/browser_ui/site_settings/android:java",
             "//components/content_settings/android:content_settings_enums_java",
             "//components/infobars/android:java",
-            "//components/messages/android:java",
-            "//components/messages/android/internal:java",
-            "//components/messages/android/test:test_support_java",
             "//chrome/browser/profiles/android:java",
             "//chrome/browser/settings:java",
             "//chrome/browser/tabmodel:java",
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/MessageService.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/MessageService.java
index e912da7..ec2237e 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/MessageService.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/MessageService.java
@@ -7,6 +7,7 @@
 import androidx.annotation.IntDef;
 
 import org.chromium.base.ObserverList;
+import org.chromium.base.metrics.RecordHistogram;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -29,6 +30,28 @@
         int ALL = 4;
     }
 
+    /**
+     * The reason why we disable the message in grid tab switcher and no longer show it.
+     *
+     * Needs to stay in sync with GridTabSwitcherMessageDisableReason in enums.xml. These values
+     * are persisted to logs. Entries should not be renumbered and numeric values should never be
+     * reused.
+     */
+    @IntDef({MessageDisableReason.UNKNOWN, MessageDisableReason.MESSAGE_ACCEPTED,
+            MessageDisableReason.MESSAGE_DISMISSED, MessageDisableReason.MESSAGE_IGNORED})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface MessageDisableReason {
+        int UNKNOWN = 0;
+        // User accepts the message by tapping the primary button on it.
+        int MESSAGE_ACCEPTED = 1;
+        // User dismisses the message by tapping the close button on it.
+        int MESSAGE_DISMISSED = 2;
+        // We no longer show the message because the message is ignored by users many times.
+        int MESSAGE_IGNORED = 3;
+        // Always update MAX_VALUE to match the last item in the list.
+        int MAX_VALUE = 3;
+    }
+
     // This identifier is used to serve messages that have no subtype, such as IPH. If one message
     // type has multiple subtypes such as PRICE_MESSAGE, its service needs to define its own
     // identifiers which should be used when creating the message card view model.
@@ -104,4 +127,15 @@
             observer.messageInvalidate(mMessageType);
         }
     }
+
+    /**
+     * Log metrics related to the message disable reason.
+     * @param messageType the message type or identifier.
+     * @param reason the message disable reason.
+     */
+    void logMessageDisableMetrics(String messageType, @MessageDisableReason int reason) {
+        RecordHistogram.recordEnumeratedHistogram(
+                String.format("GridTabSwitcher.%s.DisableReason", messageType), reason,
+                MessageDisableReason.MAX_VALUE + 1);
+    }
 }
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/PriceMessageService.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/PriceMessageService.java
index 973889b..17e30a8 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/PriceMessageService.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/PriceMessageService.java
@@ -20,6 +20,9 @@
  * One of the concrete {@link MessageService} that only serves {@link MessageType#PRICE_MESSAGE}.
  */
 public class PriceMessageService extends MessageService {
+    private static final String WELCOME_MESSAGE_METRICS_IDENTIFIER = "PriceWelcomeMessageCard";
+    private static final String ALERTS_MESSAGE_METRICS_IDENTIFIER = "PriceAlertsMessageCard";
+
     // PRICE_WELCOME and PRICE_ALERTS are added to {@link TabListModel} at a different time and the
     // insertion positions are different as well. Right now PRICE_WELCOME is added via {@link
     // TabSwitcherCoordinator#appendNextMessage}, while PRICE_ALERTS is added via {@link
@@ -168,33 +171,43 @@
         mNotificationManager = notificationManager;
     }
 
-    void preparePriceMessage(@PriceMessageType int type, @Nullable PriceTabData priceTabData) {
+    /**
+     * @return Whether the message is successfully prepared.
+     */
+    boolean preparePriceMessage(@PriceMessageType int type, @Nullable PriceTabData priceTabData) {
         assert (type == PriceMessageType.PRICE_WELCOME
                 && PriceTrackingUtilities.isPriceWelcomeMessageCardEnabled())
                 || (type == PriceMessageType.PRICE_ALERTS
                         && PriceTrackingUtilities.isPriceAlertsMessageCardEnabled());
+        if (type == PriceMessageType.PRICE_WELCOME) {
+            PriceTrackingUtilities.increasePriceWelcomeMessageCardShowCount();
+            if (PriceTrackingUtilities.getPriceWelcomeMessageCardShowCount()
+                    > MAX_PRICE_MESSAGE_SHOW_COUNT * PREPARE_MESSAGE_TIMES_ENTERING_TAB_SWITCHER) {
+                logMessageDisableMetrics(
+                        WELCOME_MESSAGE_METRICS_IDENTIFIER, MessageDisableReason.MESSAGE_IGNORED);
+                PriceTrackingUtilities.disablePriceWelcomeMessageCard();
+                return false;
+            }
+            // When PriceWelcomeMessageCard is available, it takes priority over
+            // PriceAlertsMessageCard.
+            PriceTrackingUtilities.decreasePriceAlertsMessageCardShowCount();
+        } else if (type == PriceMessageType.PRICE_ALERTS) {
+            PriceTrackingUtilities.increasePriceAlertsMessageCardShowCount();
+            if (PriceTrackingUtilities.getPriceAlertsMessageCardShowCount()
+                    > MAX_PRICE_MESSAGE_SHOW_COUNT * PREPARE_MESSAGE_TIMES_ENTERING_TAB_SWITCHER) {
+                logMessageDisableMetrics(
+                        ALERTS_MESSAGE_METRICS_IDENTIFIER, MessageDisableReason.MESSAGE_IGNORED);
+                PriceTrackingUtilities.disablePriceAlertsMessageCard();
+                return false;
+            }
+        }
         // To avoid the confusion of different-type stale messages, invalidateMessage every time
         // before preparing new messages.
         invalidateMessage();
         mPriceTabData = priceTabData;
         sendAvailabilityNotification(new PriceMessageData(
                 type, mPriceTabData, () -> review(type), (int messageType) -> dismiss(type)));
-        if (type == PriceMessageType.PRICE_WELCOME) {
-            // When PriceWelcomeMessageCard is available, it takes priority over
-            // PriceAlertsMessageCard.
-            PriceTrackingUtilities.decreasePriceAlertsMessageCardShowCount();
-            PriceTrackingUtilities.increasePriceWelcomeMessageCardShowCount();
-            if (PriceTrackingUtilities.getPriceWelcomeMessageCardShowCount()
-                    >= MAX_PRICE_MESSAGE_SHOW_COUNT * PREPARE_MESSAGE_TIMES_ENTERING_TAB_SWITCHER) {
-                PriceTrackingUtilities.disablePriceWelcomeMessageCard();
-            }
-        } else if (type == PriceMessageType.PRICE_ALERTS) {
-            PriceTrackingUtilities.increasePriceAlertsMessageCardShowCount();
-            if (PriceTrackingUtilities.getPriceAlertsMessageCardShowCount()
-                    >= MAX_PRICE_MESSAGE_SHOW_COUNT * PREPARE_MESSAGE_TIMES_ENTERING_TAB_SWITCHER) {
-                PriceTrackingUtilities.disablePriceAlertsMessageCard();
-            }
-        }
+        return true;
     }
 
     int getBindingTabId() {
@@ -215,6 +228,8 @@
                     mPriceWelcomeMessageProvider.getTabIndexFromTabId(mPriceTabData.bindingTabId);
             mPriceWelcomeMessageReviewActionProvider.scrollToTab(bindingTabIndex);
             mPriceWelcomeMessageProvider.showPriceDropTooltip(bindingTabIndex);
+            logMessageDisableMetrics(
+                    WELCOME_MESSAGE_METRICS_IDENTIFIER, MessageDisableReason.MESSAGE_ACCEPTED);
             PriceTrackingUtilities.disablePriceWelcomeMessageCard();
             mPriceTabData = null;
             RecordUserAction.record("Commerce.PriceWelcomeMessageCard.Reviewed");
@@ -224,6 +239,8 @@
             } else {
                 mNotificationManager.launchNotificationSettings();
             }
+            logMessageDisableMetrics(
+                    ALERTS_MESSAGE_METRICS_IDENTIFIER, MessageDisableReason.MESSAGE_ACCEPTED);
             PriceTrackingUtilities.disablePriceAlertsMessageCard();
             RecordUserAction.record("Commerce.PriceAlertsMessageCard.Reviewed");
         }
@@ -232,10 +249,14 @@
     @VisibleForTesting
     public void dismiss(@PriceMessageType int type) {
         if (type == PriceMessageType.PRICE_WELCOME) {
+            logMessageDisableMetrics(
+                    WELCOME_MESSAGE_METRICS_IDENTIFIER, MessageDisableReason.MESSAGE_DISMISSED);
             PriceTrackingUtilities.disablePriceWelcomeMessageCard();
             mPriceTabData = null;
             RecordUserAction.record("Commerce.PriceWelcomeMessageCard.Dismissed");
         } else if (type == PriceMessageType.PRICE_ALERTS) {
+            logMessageDisableMetrics(
+                    ALERTS_MESSAGE_METRICS_IDENTIFIER, MessageDisableReason.MESSAGE_DISMISSED);
             PriceTrackingUtilities.disablePriceAlertsMessageCard();
             RecordUserAction.record("Commerce.PriceAlertsMessageCard.Dismissed");
         }
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherCoordinator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherCoordinator.java
index 941f91ef..e0160a6 100644
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherCoordinator.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherCoordinator.java
@@ -576,13 +576,16 @@
                         MessageService.MessageType.PRICE_MESSAGE, PriceMessageType.PRICE_WELCOME)) {
             return;
         }
-        mPriceMessageService.preparePriceMessage(PriceMessageType.PRICE_WELCOME, priceTabData);
-        appendNextMessage(MessageService.MessageType.PRICE_MESSAGE);
-        // To make the message card in view when user enters tab switcher, we should scroll to
-        // current tab with 0 offset. See {@link TabSwitcherMediator#setInitialScrollIndexOffset}
-        // for more details.
-        mMediator.scrollToTab(
-                mTabModelSelector.getTabModelFilterProvider().getCurrentTabModelFilter().index());
+        if (mPriceMessageService.preparePriceMessage(
+                    PriceMessageType.PRICE_WELCOME, priceTabData)) {
+            appendNextMessage(MessageService.MessageType.PRICE_MESSAGE);
+            // To make the message card in view when user enters tab switcher, we should scroll to
+            // current tab with 0 offset. See {@link
+            // TabSwitcherMediator#setInitialScrollIndexOffset} for more details.
+            mMediator.scrollToTab(mTabModelSelector.getTabModelFilterProvider()
+                                          .getCurrentTabModelFilter()
+                                          .index());
+        }
     }
 
     private void appendMessagesTo(int index) {
diff --git a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/PriceAlertsMessageCardTest.java b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/PriceAlertsMessageCardTest.java
index a20afa5a..ee34299 100644
--- a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/PriceAlertsMessageCardTest.java
+++ b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/PriceAlertsMessageCardTest.java
@@ -47,6 +47,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.CriteriaHelper;
 import org.chromium.base.test.util.Feature;
@@ -56,6 +57,7 @@
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManager;
+import org.chromium.chrome.browser.tasks.tab_management.MessageService.MessageDisableReason;
 import org.chromium.chrome.tab_ui.R;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
@@ -83,6 +85,8 @@
             "force-fieldtrial-params=Study.Group:enable_price_notification/true";
     private static final String ACTION_APP_NOTIFICATION_SETTINGS =
             "android.settings.APP_NOTIFICATION_SETTINGS";
+    private static final String METRICS_IDENTIFIER =
+            "GridTabSwitcher.PriceAlertsMessageCard.DisableReason";
     private MockNotificationManagerProxy mMockNotificationManager;
     private PriceDropNotificationManager mPriceDropNotificationManager;
 
@@ -221,6 +225,9 @@
         assertNotNull(mPriceDropNotificationManager.getNotificationChannel());
         assertEquals(NotificationManager.IMPORTANCE_LOW,
                 mPriceDropNotificationManager.getNotificationChannel().getImportance());
+        assertEquals(1,
+                RecordHistogram.getHistogramValueCountForTesting(
+                        METRICS_IDENTIFIER, MessageDisableReason.MESSAGE_ACCEPTED));
         assertFalse(PriceTrackingUtilities.isPriceAlertsMessageCardEnabled());
         onView(withId(R.id.large_message_card_item)).check(doesNotExist());
     }
@@ -244,6 +251,9 @@
         } else {
             intended(hasAction(Settings.ACTION_APP_NOTIFICATION_SETTINGS));
         }
+        assertEquals(1,
+                RecordHistogram.getHistogramValueCountForTesting(
+                        METRICS_IDENTIFIER, MessageDisableReason.MESSAGE_ACCEPTED));
         assertFalse(PriceTrackingUtilities.isPriceAlertsMessageCardEnabled());
     }
 
@@ -260,6 +270,9 @@
 
         onView(allOf(withId(R.id.close_button), withParent(withId(R.id.large_message_card_view))))
                 .perform(click());
+        assertEquals(1,
+                RecordHistogram.getHistogramValueCountForTesting(
+                        METRICS_IDENTIFIER, MessageDisableReason.MESSAGE_DISMISSED));
         assertFalse(PriceTrackingUtilities.isPriceAlertsMessageCardEnabled());
         onView(withId(R.id.large_message_card_item)).check(doesNotExist());
     }
@@ -282,6 +295,9 @@
         onView(allOf(withId(R.id.tab_list_view), withParent(withId(R.id.compositor_view_holder))))
                 .perform(RecyclerViewActions.actionOnItemAtPosition(
                         1, getSwipeToDismissAction(true)));
+        assertEquals(1,
+                RecordHistogram.getHistogramValueCountForTesting(
+                        METRICS_IDENTIFIER, MessageDisableReason.MESSAGE_DISMISSED));
         assertFalse(PriceTrackingUtilities.isPriceAlertsMessageCardEnabled());
         onView(withId(R.id.large_message_card_item)).check(doesNotExist());
     }
@@ -319,16 +335,19 @@
         mMockNotificationManager.setNotificationsEnabled(false);
 
         for (int i = 0; i < 10; i++) {
-            assertTrue(PriceTrackingUtilities.isPriceAlertsMessageCardEnabled());
             enterTabSwitcher(cta);
             CriteriaHelper.pollUiThread(TabSwitcherCoordinator::hasAppendedMessagesForTesting);
             onView(withId(R.id.large_message_card_item)).check(matches(isDisplayed()));
+            assertTrue(PriceTrackingUtilities.isPriceAlertsMessageCardEnabled());
             clickFirstCardFromTabSwitcher(cta);
         }
 
-        assertFalse(PriceTrackingUtilities.isPriceAlertsMessageCardEnabled());
         enterTabSwitcher(cta);
         onView(withId(R.id.large_message_card_item)).check(doesNotExist());
+        assertEquals(1,
+                RecordHistogram.getHistogramValueCountForTesting(
+                        METRICS_IDENTIFIER, MessageDisableReason.MESSAGE_IGNORED));
+        assertFalse(PriceTrackingUtilities.isPriceAlertsMessageCardEnabled());
     }
 
     @Test
diff --git a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/PriceMessageServiceUnitTest.java b/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/PriceMessageServiceUnitTest.java
index a12dec1..246b18a5 100644
--- a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/PriceMessageServiceUnitTest.java
+++ b/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/PriceMessageServiceUnitTest.java
@@ -116,18 +116,20 @@
     @Test
     public void testPrepareMessage_PriceWelcome_ExceedMaxShowCount() {
         PriceTrackingUtilities.SHARED_PREFERENCES_MANAGER.writeInt(
-                PriceTrackingUtilities.PRICE_WELCOME_MESSAGE_CARD_SHOW_COUNT, MAX_SHOW_COUNT - 1);
+                PriceTrackingUtilities.PRICE_WELCOME_MESSAGE_CARD_SHOW_COUNT, MAX_SHOW_COUNT);
         mMessageService.preparePriceMessage(PriceMessageType.PRICE_WELCOME, mPriceTabData);
-        assertEquals(MAX_SHOW_COUNT, PriceTrackingUtilities.getPriceWelcomeMessageCardShowCount());
+        assertEquals(
+                MAX_SHOW_COUNT + 1, PriceTrackingUtilities.getPriceWelcomeMessageCardShowCount());
         assertFalse(PriceTrackingUtilities.isPriceWelcomeMessageCardEnabled());
     }
 
     @Test
     public void testPrepareMessage_PriceAlerts_ExceedMaxShowCount() {
         PriceTrackingUtilities.SHARED_PREFERENCES_MANAGER.writeInt(
-                PriceTrackingUtilities.PRICE_ALERTS_MESSAGE_CARD_SHOW_COUNT, MAX_SHOW_COUNT - 1);
+                PriceTrackingUtilities.PRICE_ALERTS_MESSAGE_CARD_SHOW_COUNT, MAX_SHOW_COUNT);
         mMessageService.preparePriceMessage(PriceMessageType.PRICE_ALERTS, null);
-        assertEquals(MAX_SHOW_COUNT, PriceTrackingUtilities.getPriceAlertsMessageCardShowCount());
+        assertEquals(
+                MAX_SHOW_COUNT + 1, PriceTrackingUtilities.getPriceAlertsMessageCardShowCount());
         assertFalse(PriceTrackingUtilities.isPriceAlertsMessageCardEnabled());
     }
 
diff --git a/chrome/android/features/vr/BUILD.gn b/chrome/android/features/vr/BUILD.gn
index 8961852f..ee2523d 100644
--- a/chrome/android/features/vr/BUILD.gn
+++ b/chrome/android/features/vr/BUILD.gn
@@ -89,7 +89,6 @@
     "//components/embedder_support/android:content_view_java",
     "//components/external_intents/android:java",
     "//components/infobars/core:infobar_enums_java",
-    "//components/messages/android:java",
     "//components/page_info/android:java",
     "//components/policy/android:policy_java",
     "//content/public/android:content_java",
diff --git a/chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrCoreInstallUtils.java b/chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrCoreInstallUtils.java
index a8d8f43c..3b0c5bce 100644
--- a/chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrCoreInstallUtils.java
+++ b/chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrCoreInstallUtils.java
@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.vr;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 
@@ -18,16 +17,10 @@
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;
-import org.chromium.chrome.vr.R;
-import org.chromium.components.messages.DismissReason;
-import org.chromium.components.messages.MessageBannerProperties;
-import org.chromium.components.messages.MessageDispatcher;
-import org.chromium.components.messages.MessageDispatcherProvider;
-import org.chromium.components.messages.MessageIdentifier;
-import org.chromium.components.messages.MessageScopeType;
+import org.chromium.chrome.browser.infobar.InfoBarIdentifier;
+import org.chromium.chrome.browser.ui.messages.infobar.SimpleConfirmInfoBarBuilder;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.base.WindowAndroid;
-import org.chromium.ui.modelutil.PropertyModel;
 
 /**
  * Manages logic around VrCore Installation and Versioning
@@ -185,52 +178,50 @@
         @VrCoreVersionChecker.VrCoreCompatibility
         int vrCoreCompatibility = getVrCoreVersionChecker().getVrCoreCompatibility();
 
-        String messageTitle;
+        String infobarText;
         String buttonText;
-        Context context = ContextUtils.getApplicationContext();
 
         if (vrCoreCompatibility == VrCoreVersionChecker.VrCoreCompatibility.VR_NOT_AVAILABLE) {
             // Supported, but not installed. Ask user to install instead of upgrade.
-            messageTitle = context.getString(R.string.vr_services_check_message_install_title);
-            buttonText = context.getString(org.chromium.chrome.R.string.install);
+            infobarText = ContextUtils.getApplicationContext().getString(
+                    org.chromium.chrome.vr.R.string.vr_services_check_infobar_install_text);
+            buttonText = ContextUtils.getApplicationContext().getString(
+                    org.chromium.chrome.vr.R.string.vr_services_check_infobar_install_button);
         } else if (vrCoreCompatibility == VrCoreVersionChecker.VrCoreCompatibility.VR_OUT_OF_DATE) {
-            messageTitle = context.getString(R.string.vr_services_check_message_update_title);
-            buttonText = context.getString(org.chromium.chrome.R.string.update);
+            infobarText = ContextUtils.getApplicationContext().getString(
+                    org.chromium.chrome.vr.R.string.vr_services_check_infobar_update_text);
+            buttonText = ContextUtils.getApplicationContext().getString(
+                    org.chromium.chrome.vr.R.string.vr_services_check_infobar_update_button);
         } else {
             Log.e(TAG, "Unknown VrCore compatibility: " + vrCoreCompatibility);
             return;
         }
 
-        MessageDispatcher messageDispatcher =
-                MessageDispatcherProvider.from(webContents.getTopLevelNativeWindow());
-        if (messageDispatcher == null) return;
-        PropertyModel message =
-                new PropertyModel.Builder(MessageBannerProperties.ALL_KEYS)
-                        .with(MessageBannerProperties.MESSAGE_IDENTIFIER,
-                                MessageIdentifier.VR_SERVICES_UPGRADE)
-                        .with(MessageBannerProperties.TITLE, messageTitle)
-                        .with(MessageBannerProperties.DESCRIPTION,
-                                context.getString(org.chromium.chrome.vr.R.string
-                                                          .vr_services_check_message_description))
-                        .with(MessageBannerProperties.ICON_RESOURCE_ID,
-                                org.chromium.chrome.vr.R.drawable.vr_services)
-                        .with(MessageBannerProperties.PRIMARY_BUTTON_TEXT, buttonText)
-                        .with(MessageBannerProperties.ON_PRIMARY_ACTION,
-                                () -> {
-                                    assert sRequestInstallInstance == null;
-                                    sRequestInstallInstance = VrCoreInstallUtils.this;
-                                    activity.startActivityForResult(
-                                            new Intent(Intent.ACTION_VIEW,
-                                                    Uri.parse(VR_CORE_MARKET_URI)),
-                                            VR_SERVICES_UPDATE_RESULT);
-                                })
-                        .with(MessageBannerProperties.ON_DISMISSED, this::onMessageDismissed)
-                        .build();
-        messageDispatcher.enqueueMessage(message, webContents, MessageScopeType.NAVIGATION, false);
-    }
+        SimpleConfirmInfoBarBuilder.Listener listener = new SimpleConfirmInfoBarBuilder.Listener() {
+            @Override
+            public void onInfoBarDismissed() {
+                maybeNotifyNativeOnInstallResult(false);
+            }
 
-    private void onMessageDismissed(@DismissReason int dismissReason) {
-        maybeNotifyNativeOnInstallResult(false);
+            @Override
+            public boolean onInfoBarButtonClicked(boolean isPrimary) {
+                assert sRequestInstallInstance == null;
+                sRequestInstallInstance = VrCoreInstallUtils.this;
+                activity.startActivityForResult(
+                        new Intent(Intent.ACTION_VIEW, Uri.parse(VR_CORE_MARKET_URI)),
+                        VR_SERVICES_UPDATE_RESULT);
+                return false;
+            }
+
+            @Override
+            public boolean onInfoBarLinkClicked() {
+                return false;
+            }
+        };
+        SimpleConfirmInfoBarBuilder.create(webContents, listener,
+                InfoBarIdentifier.VR_SERVICES_UPGRADE_ANDROID, activity,
+                org.chromium.chrome.vr.R.drawable.vr_services, infobarText, buttonText, null, null,
+                true);
     }
 
     private void onVrCoreMaybeUpdated() {
diff --git a/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd b/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd
index 762ede9..b86491e 100644
--- a/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd
+++ b/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd
@@ -176,15 +176,18 @@
           Provide feedback
         </message>
 
-        <!-- VR services check message -->
-        <message name="IDS_VR_SERVICES_CHECK_MESSAGE_INSTALL_TITLE" desc="Title to be displayed in the VR Services check message. When a WebVR page is loaded if the VR services that are needed to display WebVR don't exist a message will be shown to the user prompting them to install VR services.">
-          Install Google VR Services?
+        <!-- VR services check infobar -->
+        <message name="IDS_VR_SERVICES_CHECK_INFOBAR_INSTALL_TEXT" desc="Text to be displayed in the VR Services check infobar. When a WebVR page is loaded if the VR services that are needed to display WebVR don't exist an infobar will be shown to the user prompting them to install VR services.">
+          To view virtual reality content, install Google VR Services
         </message>
-        <message name="IDS_VR_SERVICES_CHECK_MESSAGE_UPDATE_TITLE" desc="Title to be displayed in the VR Services check message. When a WebVR page is loaded if the VR services that are needed to display WebVR are out of date a message will be shown to the user prompting them to update VR services.">
-          Update Google VR Services?
+        <message name="IDS_VR_SERVICES_CHECK_INFOBAR_UPDATE_TEXT" desc="Text to be displayed in the VR Services check infobar. When a WebVR page is loaded if the VR services that are needed to display WebVR are out of date an infobar will be shown to the user prompting them to update VR services.">
+          To view virtual reality content, update Google VR Services
         </message>
-        <message name="IDS_VR_SERVICES_CHECK_MESSAGE_DESCRIPTION" desc="Text to be displayed in the VR Services check message description.">
-          View virtual reality content
+        <message name="IDS_VR_SERVICES_CHECK_INFOBAR_INSTALL_BUTTON" desc="Text to be displayed in the VR Services check infobar confirm button for installing.">
+          Install
+        </message>
+        <message name="IDS_VR_SERVICES_CHECK_INFOBAR_UPDATE_BUTTON" desc="Text to be displayed in the VR Services check infobar confirm button for updating.">
+          Update
         </message>
     </messages>
   </release>
diff --git a/chrome/android/features/vr/java/strings/android_chrome_vr_strings_grd/IDS_VR_SERVICES_CHECK_MESSAGE_DESCRIPTION.png.sha1 b/chrome/android/features/vr/java/strings/android_chrome_vr_strings_grd/IDS_VR_SERVICES_CHECK_MESSAGE_DESCRIPTION.png.sha1
deleted file mode 100644
index 227c9b3..0000000
--- a/chrome/android/features/vr/java/strings/android_chrome_vr_strings_grd/IDS_VR_SERVICES_CHECK_MESSAGE_DESCRIPTION.png.sha1
+++ /dev/null
@@ -1 +0,0 @@
-786cf32997830688a4de4555ef74a34a2ab4cbe6
\ No newline at end of file
diff --git a/chrome/android/features/vr/java/strings/android_chrome_vr_strings_grd/IDS_VR_SERVICES_CHECK_MESSAGE_INSTALL_TITLE.png.sha1 b/chrome/android/features/vr/java/strings/android_chrome_vr_strings_grd/IDS_VR_SERVICES_CHECK_MESSAGE_INSTALL_TITLE.png.sha1
deleted file mode 100644
index 227c9b3..0000000
--- a/chrome/android/features/vr/java/strings/android_chrome_vr_strings_grd/IDS_VR_SERVICES_CHECK_MESSAGE_INSTALL_TITLE.png.sha1
+++ /dev/null
@@ -1 +0,0 @@
-786cf32997830688a4de4555ef74a34a2ab4cbe6
\ No newline at end of file
diff --git a/chrome/android/features/vr/java/strings/android_chrome_vr_strings_grd/IDS_VR_SERVICES_CHECK_MESSAGE_UPDATE_TITLE.png.sha1 b/chrome/android/features/vr/java/strings/android_chrome_vr_strings_grd/IDS_VR_SERVICES_CHECK_MESSAGE_UPDATE_TITLE.png.sha1
deleted file mode 100644
index 6b95b0d..0000000
--- a/chrome/android/features/vr/java/strings/android_chrome_vr_strings_grd/IDS_VR_SERVICES_CHECK_MESSAGE_UPDATE_TITLE.png.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f49a69885e0f11fd68f3aad172d0bdc7f1457914
\ No newline at end of file
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/LogoLoadHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/LogoLoadHelper.java
index 456254a..ac588cf 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/LogoLoadHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/LogoLoadHelper.java
@@ -64,10 +64,13 @@
                 assert profile != null : "Unexpectedly null profile from TabModel.";
                 loadSearchProviderLogo();
             }));
-        } else if (startSurfaceState == StartSurfaceState.NOT_SHOWN
-                || startSurfaceState == StartSurfaceState.SHOWN_TABSWITCHER
-                || startSurfaceState == StartSurfaceState.DISABLED) {
-            destroy();
+        } else if ((startSurfaceState == StartSurfaceState.NOT_SHOWN
+                           || startSurfaceState == StartSurfaceState.SHOWN_TABSWITCHER
+                           || startSurfaceState == StartSurfaceState.DISABLED)
+                && mLogoDelegate != null) {
+            // Destroy |mLogoDelegate| when hiding Start surface homepage to save memory.
+            mLogoDelegate.destroy();
+            mLogoDelegate = null;
         }
     }
 
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr/VrInstallUpdateInfoBarTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr/VrInstallUpdateInfoBarTest.java
new file mode 100644
index 0000000..bf4b6ff
--- /dev/null
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr/VrInstallUpdateInfoBarTest.java
@@ -0,0 +1,180 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.chrome.browser.vr;
+
+import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_SVR;
+
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.test.filters.MediumTest;
+
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.junit.runner.RunWith;
+
+import org.chromium.base.ContextUtils;
+import org.chromium.base.test.params.ParameterAnnotations.ClassParameter;
+import org.chromium.base.test.params.ParameterAnnotations.UseRunnerDelegate;
+import org.chromium.base.test.params.ParameterSet;
+import org.chromium.base.test.params.ParameterizedRunner;
+import org.chromium.base.test.util.CommandLineFlags;
+import org.chromium.base.test.util.Restriction;
+import org.chromium.chrome.R;
+import org.chromium.chrome.browser.flags.ChromeSwitches;
+import org.chromium.chrome.browser.vr.mock.MockVrCoreVersionChecker;
+import org.chromium.chrome.browser.vr.rules.XrActivityRestriction;
+import org.chromium.chrome.browser.vr.util.VrInfoBarUtils;
+import org.chromium.chrome.browser.vr.util.VrTestRuleUtils;
+import org.chromium.chrome.test.ChromeActivityTestRule;
+import org.chromium.chrome.test.ChromeJUnit4RunnerDelegate;
+import org.chromium.content_public.browser.test.util.TestThreadUtils;
+
+import java.util.List;
+import java.util.concurrent.Callable;
+
+/**
+ * End-to-end tests for the InfoBar that prompts the user to update or install
+ * VrCore (VR Services) when attempting to use a VR feature with an outdated
+ * or entirely missing version or other VR-related update prompts.
+ */
+@RunWith(ParameterizedRunner.class)
+@UseRunnerDelegate(ChromeJUnit4RunnerDelegate.class)
+@CommandLineFlags.
+Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE, "enable-features=LogJsConsoleMessages"})
+@Restriction(RESTRICTION_TYPE_SVR)
+public class VrInstallUpdateInfoBarTest {
+    @ClassParameter
+    private static List<ParameterSet> sClassParams =
+            VrTestRuleUtils.generateDefaultTestRuleParameters();
+    @Rule
+    public RuleChain mRuleChain;
+
+    private ChromeActivityTestRule mVrTestRule;
+
+    public VrInstallUpdateInfoBarTest(Callable<ChromeActivityTestRule> callable) throws Exception {
+        mVrTestRule = callable.call();
+        mRuleChain = VrTestRuleUtils.wrapRuleInActivityRestrictionRule(mVrTestRule);
+    }
+
+    /**
+     * Creates and sets a MockVrCoreVersionCheckerImpl as the VrShellDelegate's VrCoreVersionChecker
+     * instance.
+     *
+     * @param compatibility An int corresponding to a VrCoreCompatibility value that the mock
+     *        version checker will return.
+     * @return The MockVrCoreVersionCheckerImpl that was set as VrShellDelegate's
+     *        VrCoreVersionChecker instance.
+     */
+    private static MockVrCoreVersionChecker setVrCoreCompatibility(int compatibility) {
+        final MockVrCoreVersionChecker mockChecker = new MockVrCoreVersionChecker();
+        mockChecker.setMockReturnValue(compatibility);
+        TestThreadUtils.runOnUiThreadBlocking(
+                () -> { VrCoreInstallUtils.overrideVrCoreVersionChecker(mockChecker); });
+        Assert.assertEquals("Overriding VrCoreVersionChecker failed", compatibility,
+                mockChecker.getLastReturnValue());
+        return mockChecker;
+    }
+
+    /**
+     * Helper function to run the tests checking for the upgrade/install InfoBar being present since
+     * all that differs is the value returned by VrCoreVersionChecker and a couple asserts.
+     *
+     * @param checkerReturnCompatibility The compatibility to have the VrCoreVersionChecker return.
+     */
+    private void infoBarTestHelper(final int checkerReturnCompatibility) {
+        VrCoreInstallUtils vrCoreInstallUtils = VrCoreInstallUtils.create(0);
+        setVrCoreCompatibility(checkerReturnCompatibility);
+        TestThreadUtils.runOnUiThreadBlocking(() -> {
+            vrCoreInstallUtils.requestInstallVrCore(
+                    mVrTestRule.getActivity().getCurrentWebContents());
+        });
+        View decorView = mVrTestRule.getActivity().getWindow().getDecorView();
+        if (checkerReturnCompatibility == VrCoreVersionChecker.VrCoreCompatibility.VR_READY) {
+            VrInfoBarUtils.expectInfoBarPresent(mVrTestRule, false);
+        } else if (checkerReturnCompatibility
+                        == VrCoreVersionChecker.VrCoreCompatibility.VR_OUT_OF_DATE
+                || checkerReturnCompatibility
+                        == VrCoreVersionChecker.VrCoreCompatibility.VR_NOT_AVAILABLE) {
+            // Out of date and missing cases are the same, but with different text
+            String expectedMessage;
+            String expectedButton;
+            if (checkerReturnCompatibility
+                    == VrCoreVersionChecker.VrCoreCompatibility.VR_OUT_OF_DATE) {
+                expectedMessage = ContextUtils.getApplicationContext().getString(
+                        org.chromium.chrome.vr.R.string.vr_services_check_infobar_update_text);
+                expectedButton = ContextUtils.getApplicationContext().getString(
+                        org.chromium.chrome.vr.R.string.vr_services_check_infobar_update_button);
+            } else {
+                expectedMessage = ContextUtils.getApplicationContext().getString(
+                        org.chromium.chrome.vr.R.string.vr_services_check_infobar_install_text);
+                expectedButton = ContextUtils.getApplicationContext().getString(
+                        org.chromium.chrome.vr.R.string.vr_services_check_infobar_install_button);
+            }
+            VrInfoBarUtils.expectInfoBarPresent(mVrTestRule, true);
+            TextView tempView = (TextView) decorView.findViewById(R.id.infobar_message);
+            Assert.assertEquals("VR install/update infobar text did not match expectation",
+                    expectedMessage, tempView.getText().toString());
+            tempView = (TextView) decorView.findViewById(R.id.button_primary);
+            Assert.assertEquals("VR install/update button text did not match expectation",
+                    expectedButton, tempView.getText().toString());
+        } else if (checkerReturnCompatibility
+                == VrCoreVersionChecker.VrCoreCompatibility.VR_NOT_SUPPORTED) {
+            VrInfoBarUtils.expectInfoBarPresent(mVrTestRule, false);
+        } else {
+            Assert.fail("Invalid VrCoreVersionChecker compatibility: "
+                    + String.valueOf(checkerReturnCompatibility));
+        }
+        VrCoreInstallUtils.overrideVrCoreVersionChecker(null);
+    }
+
+    /**
+     * Tests that the upgrade/install VR Services InfoBar is not present when VR Services is
+     * installed and up to date.
+     */
+    @Test
+    @MediumTest
+    @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
+    public void testInfoBarNotPresentWhenVrServicesCurrent() {
+        infoBarTestHelper(VrCoreVersionChecker.VrCoreCompatibility.VR_READY);
+    }
+
+    /**
+     * Tests that the upgrade VR Services InfoBar is present when VR Services is outdated.
+     */
+    @Test
+    @MediumTest
+    @XrActivityRestriction({XrActivityRestriction.SupportedActivity.CTA,
+            XrActivityRestriction.SupportedActivity.CCT})
+    public void
+    testInfoBarPresentWhenVrServicesOutdated() {
+        infoBarTestHelper(VrCoreVersionChecker.VrCoreCompatibility.VR_OUT_OF_DATE);
+    }
+
+    /**
+     * Tests that the install VR Services InfoBar is present when VR Services is missing.
+     */
+    @Test
+    @MediumTest
+    @XrActivityRestriction({XrActivityRestriction.SupportedActivity.CTA,
+            XrActivityRestriction.SupportedActivity.CCT})
+    public void
+    testInfoBarPresentWhenVrServicesMissing() {
+        infoBarTestHelper(VrCoreVersionChecker.VrCoreCompatibility.VR_NOT_AVAILABLE);
+    }
+
+    /**
+     * Tests that the install VR Services InfoBar is not present when VR is not supported on the
+     * device.
+     */
+    @Test
+    @MediumTest
+    @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
+    public void testInfoBarNotPresentWhenVrServicesNotSupported() {
+        infoBarTestHelper(VrCoreVersionChecker.VrCoreCompatibility.VR_NOT_SUPPORTED);
+    }
+}
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr/VrInstallUpdateMessageTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr/VrInstallUpdateMessageTest.java
deleted file mode 100644
index 11b2347..0000000
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr/VrInstallUpdateMessageTest.java
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.vr;
-
-import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_SVR;
-
-import android.content.Context;
-
-import androidx.test.filters.MediumTest;
-
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.runner.RunWith;
-
-import org.chromium.base.ContextUtils;
-import org.chromium.base.test.params.ParameterAnnotations.ClassParameter;
-import org.chromium.base.test.params.ParameterAnnotations.UseRunnerDelegate;
-import org.chromium.base.test.params.ParameterSet;
-import org.chromium.base.test.params.ParameterizedRunner;
-import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.Restriction;
-import org.chromium.chrome.browser.flags.ChromeSwitches;
-import org.chromium.chrome.browser.vr.mock.MockVrCoreVersionChecker;
-import org.chromium.chrome.browser.vr.rules.XrActivityRestriction;
-import org.chromium.chrome.browser.vr.util.VrMessageUtils;
-import org.chromium.chrome.browser.vr.util.VrTestRuleUtils;
-import org.chromium.chrome.test.ChromeActivityTestRule;
-import org.chromium.chrome.test.ChromeJUnit4RunnerDelegate;
-import org.chromium.chrome.vr.R;
-import org.chromium.components.messages.MessageBannerProperties;
-import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.modelutil.PropertyModel;
-
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-
-/**
- * End-to-end tests for the message that prompts the user to update or install
- * VrCore (VR Services) when attempting to use a VR feature with an outdated
- * or entirely missing version or other VR-related update prompts.
- */
-@RunWith(ParameterizedRunner.class)
-@UseRunnerDelegate(ChromeJUnit4RunnerDelegate.class)
-@CommandLineFlags.
-Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE, "enable-features=LogJsConsoleMessages"})
-@Restriction(RESTRICTION_TYPE_SVR)
-public class VrInstallUpdateMessageTest {
-    @ClassParameter
-    private static List<ParameterSet> sClassParams =
-            VrTestRuleUtils.generateDefaultTestRuleParameters();
-    @Rule
-    public RuleChain mRuleChain;
-
-    private ChromeActivityTestRule mVrTestRule;
-
-    public VrInstallUpdateMessageTest(Callable<ChromeActivityTestRule> callable) throws Exception {
-        mVrTestRule = callable.call();
-        mRuleChain = VrTestRuleUtils.wrapRuleInActivityRestrictionRule(mVrTestRule);
-    }
-
-    /**
-     * Creates and sets a MockVrCoreVersionCheckerImpl as the VrShellDelegate's VrCoreVersionChecker
-     * instance.
-     *
-     * @param compatibility An int corresponding to a VrCoreCompatibility value that the mock
-     *        version checker will return.
-     * @return The MockVrCoreVersionCheckerImpl that was set as VrShellDelegate's
-     *        VrCoreVersionChecker instance.
-     */
-    private static MockVrCoreVersionChecker setVrCoreCompatibility(int compatibility) {
-        final MockVrCoreVersionChecker mockChecker = new MockVrCoreVersionChecker();
-        mockChecker.setMockReturnValue(compatibility);
-        TestThreadUtils.runOnUiThreadBlocking(
-                () -> { VrCoreInstallUtils.overrideVrCoreVersionChecker(mockChecker); });
-        Assert.assertEquals("Overriding VrCoreVersionChecker failed", compatibility,
-                mockChecker.getLastReturnValue());
-        return mockChecker;
-    }
-
-    /**
-     * Helper function to run the tests checking for the upgrade/install message being present since
-     * all that differs is the value returned by VrCoreVersionChecker and a couple asserts.
-     *
-     * @param checkerReturnCompatibility The compatibility to have the VrCoreVersionChecker return.
-     */
-    private void messageTestHelper(final int checkerReturnCompatibility) throws ExecutionException {
-        VrCoreInstallUtils vrCoreInstallUtils = VrCoreInstallUtils.create(0);
-        setVrCoreCompatibility(checkerReturnCompatibility);
-        TestThreadUtils.runOnUiThreadBlocking(() -> {
-            vrCoreInstallUtils.requestInstallVrCore(
-                    mVrTestRule.getActivity().getCurrentWebContents());
-        });
-        if (checkerReturnCompatibility == VrCoreVersionChecker.VrCoreCompatibility.VR_READY) {
-            VrMessageUtils.expectMessagePresent(mVrTestRule, false);
-        } else if (checkerReturnCompatibility
-                        == VrCoreVersionChecker.VrCoreCompatibility.VR_OUT_OF_DATE
-                || checkerReturnCompatibility
-                        == VrCoreVersionChecker.VrCoreCompatibility.VR_NOT_AVAILABLE) {
-            // Out of date and missing cases are the same, but with different text
-            String expectedTitle;
-            String expectedButton;
-            Context context = ContextUtils.getApplicationContext();
-            if (checkerReturnCompatibility
-                    == VrCoreVersionChecker.VrCoreCompatibility.VR_OUT_OF_DATE) {
-                expectedTitle = context.getString(R.string.vr_services_check_message_update_title);
-                expectedButton = context.getString(org.chromium.chrome.R.string.update);
-            } else {
-                expectedTitle = context.getString(R.string.vr_services_check_message_install_title);
-                expectedButton = context.getString(org.chromium.chrome.R.string.install);
-            }
-            PropertyModel message = VrMessageUtils.getVrInstallUpdateMessage(mVrTestRule);
-            Assert.assertNotNull("VR install/update message should be present.", message);
-
-            Assert.assertEquals("VR install/update message text did not match expectation.",
-                    expectedTitle, message.get(MessageBannerProperties.TITLE));
-            Assert.assertEquals("VR install/update message description did not match expectation.",
-                    context.getString(R.string.vr_services_check_message_description),
-                    message.get(MessageBannerProperties.DESCRIPTION));
-            Assert.assertEquals("VR install/update message button text did not match expectation.",
-                    expectedButton, message.get(MessageBannerProperties.PRIMARY_BUTTON_TEXT));
-        } else if (checkerReturnCompatibility
-                == VrCoreVersionChecker.VrCoreCompatibility.VR_NOT_SUPPORTED) {
-            VrMessageUtils.expectMessagePresent(mVrTestRule, false);
-        } else {
-            Assert.fail(
-                    "Invalid VrCoreVersionChecker compatibility: " + checkerReturnCompatibility);
-        }
-        VrCoreInstallUtils.overrideVrCoreVersionChecker(null);
-    }
-
-    /**
-     * Tests that the upgrade/install VR Services message is not present when VR Services is
-     * installed and up to date.
-     */
-    @Test
-    @MediumTest
-    @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
-    public void testMessageNotPresentWhenVrServicesCurrent() throws ExecutionException {
-        messageTestHelper(VrCoreVersionChecker.VrCoreCompatibility.VR_READY);
-    }
-
-    /**
-     * Tests that the upgrade VR Services message is present when VR Services is outdated.
-     */
-    @Test
-    @MediumTest
-    @XrActivityRestriction({XrActivityRestriction.SupportedActivity.CTA,
-            XrActivityRestriction.SupportedActivity.CCT})
-    public void
-    testMessagePresentWhenVrServicesOutdated() throws ExecutionException {
-        messageTestHelper(VrCoreVersionChecker.VrCoreCompatibility.VR_OUT_OF_DATE);
-    }
-
-    /**
-     * Tests that the install VR Services message is present when VR Services is missing.
-     */
-    @Test
-    @MediumTest
-    @XrActivityRestriction({XrActivityRestriction.SupportedActivity.CTA,
-            XrActivityRestriction.SupportedActivity.CCT})
-    public void
-    testMessagePresentWhenVrServicesMissing() throws ExecutionException {
-        messageTestHelper(VrCoreVersionChecker.VrCoreCompatibility.VR_NOT_AVAILABLE);
-    }
-
-    /**
-     * Tests that the install VR Services message is not present when VR is not supported on the
-     * device.
-     */
-    @Test
-    @MediumTest
-    @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
-    public void testMessageNotPresentWhenVrServicesNotSupported() throws ExecutionException {
-        messageTestHelper(VrCoreVersionChecker.VrCoreCompatibility.VR_NOT_SUPPORTED);
-    }
-}
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr/util/VrInfoBarUtils.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr/util/VrInfoBarUtils.java
new file mode 100644
index 0000000..ffa6599
--- /dev/null
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr/util/VrInfoBarUtils.java
@@ -0,0 +1,96 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.chrome.browser.vr.util;
+
+import static org.chromium.chrome.browser.vr.XrTestFramework.POLL_CHECK_INTERVAL_SHORT_MS;
+import static org.chromium.chrome.browser.vr.XrTestFramework.POLL_TIMEOUT_SHORT_MS;
+
+import androidx.annotation.IntDef;
+
+import org.chromium.base.test.util.CriteriaHelper;
+import org.chromium.chrome.test.ChromeActivityTestRule;
+import org.chromium.chrome.test.util.InfoBarUtil;
+import org.chromium.components.infobars.InfoBar;
+import org.chromium.content_public.browser.test.util.TestThreadUtils;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.List;
+
+/**
+ * Class containing utility functions for interacting with InfoBars at
+ * a high level.
+ */
+public class VrInfoBarUtils {
+    @IntDef({Button.PRIMARY, Button.SECONDARY})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Button {
+        int PRIMARY = 0;
+        int SECONDARY = 1;
+    }
+
+    /**
+     * Determines whether InfoBars are present in the current activity.
+     *
+     * @param rule The ChromeActivityTestRule to get the InfoBars from.
+     * @return True if there are any InfoBars present, false otherwise.
+     */
+    @SuppressWarnings("unchecked")
+    public static boolean isInfoBarPresent(ChromeActivityTestRule rule) {
+        List<InfoBar> infoBars = rule.getInfoBars();
+        return infoBars != null && !infoBars.isEmpty();
+    }
+
+    /**
+     * Clicks on either the primary or secondary button of the first InfoBar
+     * in the activity.
+     *
+     * @param button Which button to click.
+     * @param rule The ChromeActivityTestRule to get the InfoBars from.
+     */
+    @SuppressWarnings("unchecked")
+    public static void clickInfoBarButton(final @Button int button, ChromeActivityTestRule rule) {
+        if (!isInfoBarPresent(rule)) return;
+        final List<InfoBar> infoBars = rule.getInfoBars();
+        TestThreadUtils.runOnUiThreadBlocking(() -> {
+            switch (button) {
+                case Button.PRIMARY:
+                    InfoBarUtil.clickPrimaryButton(infoBars.get(0));
+                    break;
+                default:
+                    InfoBarUtil.clickSecondaryButton(infoBars.get(0));
+            }
+        });
+        InfoBarUtil.waitUntilNoInfoBarsExist(rule.getInfoBars());
+    }
+
+    /**
+     * Clicks on the close button of the first InfoBar in the activity.
+     *
+     * @param rule The ChromeActivityTestRule to get the InfoBars from.
+     */
+    @SuppressWarnings("unchecked")
+    public static void clickInfobarCloseButton(ChromeActivityTestRule rule) {
+        if (!isInfoBarPresent(rule)) return;
+        final List<InfoBar> infoBars = rule.getInfoBars();
+        TestThreadUtils.runOnUiThreadBlocking(
+                () -> { InfoBarUtil.clickCloseButton(infoBars.get(0)); });
+        InfoBarUtil.waitUntilNoInfoBarsExist(rule.getInfoBars());
+    }
+
+    /**
+     * Determines is there is any InfoBar present in the given View hierarchy.
+     *
+     * @param rule The ChromeActivityTestRule to get the InfoBars from.
+     * @param present Whether an InfoBar should be present.
+     */
+    public static void expectInfoBarPresent(
+            final ChromeActivityTestRule rule, final boolean present) {
+        CriteriaHelper.pollUiThread(()
+                                            -> { return isInfoBarPresent(rule) == present; },
+                "InfoBar bar did not " + (present ? "appear" : "disappear"), POLL_TIMEOUT_SHORT_MS,
+                POLL_CHECK_INTERVAL_SHORT_MS);
+    }
+}
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr/util/VrMessageUtils.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr/util/VrMessageUtils.java
deleted file mode 100644
index 9087150..0000000
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr/util/VrMessageUtils.java
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2021 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.vr.util;
-
-import static org.chromium.chrome.browser.vr.XrTestFramework.POLL_CHECK_INTERVAL_SHORT_MS;
-import static org.chromium.chrome.browser.vr.XrTestFramework.POLL_TIMEOUT_SHORT_MS;
-
-import org.chromium.base.test.util.CriteriaHelper;
-import org.chromium.chrome.test.ChromeActivityTestRule;
-import org.chromium.components.messages.MessageDispatcher;
-import org.chromium.components.messages.MessageDispatcherProvider;
-import org.chromium.components.messages.MessageIdentifier;
-import org.chromium.components.messages.MessageStateHandler;
-import org.chromium.components.messages.MessagesTestHelper;
-import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.ui.modelutil.PropertyModel;
-
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-
-/**
- * Class containing utility functions for interacting with messages at
- * a high level.
- */
-public class VrMessageUtils {
-    /**
-     * Determines whether messages are present in the current activity.
-     *
-     * @param rule The ChromeActivityTestRule to get the messages from.
-     * @return True if there are any messages present, false otherwise.
-     */
-    @SuppressWarnings("unchecked")
-    public static boolean isMessagePresent(ChromeActivityTestRule rule) throws ExecutionException {
-        return getVrInstallUpdateMessage(rule) != null;
-    }
-
-    /**
-     * Determines is there is any message present in the given View hierarchy.
-     *
-     * @param rule The ChromeActivityTestRule to get the messages from.
-     * @param present Whether a message should be present.
-     */
-    public static void expectMessagePresent(
-            final ChromeActivityTestRule rule, final boolean present) {
-        CriteriaHelper.pollUiThread(()
-                                            -> isMessagePresent(rule) == present,
-                "Message did not " + (present ? "appear" : "disappear"), POLL_TIMEOUT_SHORT_MS,
-                POLL_CHECK_INTERVAL_SHORT_MS);
-    }
-
-    /**
-     * Returns the {@link PropertyModel} of an enqueued VR install/update message.
-     *
-     * @param rule The ChromeActivityTestRule to get the messages from.
-     * @return The {@link PropertyModel} of an enqueued VR install/update message, null if the
-     *         message is not present.
-     */
-    public static PropertyModel getVrInstallUpdateMessage(ChromeActivityTestRule rule)
-            throws ExecutionException {
-        MessageDispatcher messageDispatcher = TestThreadUtils.runOnUiThreadBlocking(
-                () -> MessageDispatcherProvider.from(rule.getActivity().getWindowAndroid()));
-        List<MessageStateHandler> messages = MessagesTestHelper.getEnqueuedMessages(
-                messageDispatcher, MessageIdentifier.VR_SERVICES_UPGRADE);
-        return messages == null || messages.isEmpty()
-                ? null
-                : MessagesTestHelper.getCurrentMessage(messages.get(0));
-    }
-}
diff --git a/chrome/android/profiles/newest.txt b/chrome/android/profiles/newest.txt
index 380f80dd..20ddc20 100644
--- a/chrome/android/profiles/newest.txt
+++ b/chrome/android/profiles/newest.txt
@@ -1 +1 @@
-chromeos-chrome-amd64-97.0.4692.36_rc-r1-merged.afdo.bz2
+chromeos-chrome-amd64-98.0.4729.0_rc-r2-merged.afdo.bz2
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 87727e3f..197b1f0 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -614,6 +614,11 @@
   ash::InitializeFeatureListDependentDBus();
 #endif
 
+#if BUILDFLAG(IS_CHROMEOS_LACROS)
+  // Initialize D-Bus clients that depend on feature list.
+  chromeos::LacrosInitializeFeatureListDependentDBus();
+#endif
+
 #if defined(OS_ANDROID)
   chrome_content_browser_client_->startup_data()->CreateProfilePrefService();
   net::NetworkChangeNotifier::SetFactory(
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 9ceec0a..326d59b2 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -9668,6 +9668,19 @@
         <message name="IDS_EDIT_TEXT_REPLACEMENT_MAC" desc="The Mac menu item for toggling text replacement in the edit menu.">
           Text Replacement
         </message>
+        <!-- Edit::Transformations submenu -->
+        <message name="IDS_EDIT_TRANSFORMATIONS_MAC" desc="The Mac menu item for the transformations submenu in the edit menu.">
+          Transformations
+        </message>
+        <message name="IDS_EDIT_MAKE_UPPERCASE_MAC" desc="The Mac menu item for making the selected text uppercase in the edit menu.">
+          Make Uppercase
+        </message>
+        <message name="IDS_EDIT_MAKE_LOWERCASE_MAC" desc="The Mac menu item for making the selected text lowercase in the edit menu.">
+          Make Lowercase
+        </message>
+        <message name="IDS_EDIT_CAPITALIZE_MAC" desc="The Mac menu item for capitalizing the selected text in the edit menu.">
+          Capitalize
+        </message>
         <!-- View menu -->
         <message name="IDS_BOOKMARK_BAR_ALWAYS_SHOW_MAC" desc="The Mac menu item for having bookmark bar always visible in the view menu.">
           Always Show Bookmarks Bar
diff --git a/chrome/app/generated_resources_grd/IDS_EDIT_CAPITALIZE_MAC.png.sha1 b/chrome/app/generated_resources_grd/IDS_EDIT_CAPITALIZE_MAC.png.sha1
new file mode 100644
index 0000000..ab88688
--- /dev/null
+++ b/chrome/app/generated_resources_grd/IDS_EDIT_CAPITALIZE_MAC.png.sha1
@@ -0,0 +1 @@
+d2a584c6d7b6f2129eefa5110755ba42ea3ac69f
\ No newline at end of file
diff --git a/chrome/app/generated_resources_grd/IDS_EDIT_MAKE_LOWERCASE_MAC.png.sha1 b/chrome/app/generated_resources_grd/IDS_EDIT_MAKE_LOWERCASE_MAC.png.sha1
new file mode 100644
index 0000000..ab88688
--- /dev/null
+++ b/chrome/app/generated_resources_grd/IDS_EDIT_MAKE_LOWERCASE_MAC.png.sha1
@@ -0,0 +1 @@
+d2a584c6d7b6f2129eefa5110755ba42ea3ac69f
\ No newline at end of file
diff --git a/chrome/app/generated_resources_grd/IDS_EDIT_MAKE_UPPERCASE_MAC.png.sha1 b/chrome/app/generated_resources_grd/IDS_EDIT_MAKE_UPPERCASE_MAC.png.sha1
new file mode 100644
index 0000000..ab88688
--- /dev/null
+++ b/chrome/app/generated_resources_grd/IDS_EDIT_MAKE_UPPERCASE_MAC.png.sha1
@@ -0,0 +1 @@
+d2a584c6d7b6f2129eefa5110755ba42ea3ac69f
\ No newline at end of file
diff --git a/chrome/app/generated_resources_grd/IDS_EDIT_TRANSFORMATIONS_MAC.png.sha1 b/chrome/app/generated_resources_grd/IDS_EDIT_TRANSFORMATIONS_MAC.png.sha1
new file mode 100644
index 0000000..ab88688
--- /dev/null
+++ b/chrome/app/generated_resources_grd/IDS_EDIT_TRANSFORMATIONS_MAC.png.sha1
@@ -0,0 +1 @@
+d2a584c6d7b6f2129eefa5110755ba42ea3ac69f
\ No newline at end of file
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index b4b3763..5cb4d976 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1399,8 +1399,7 @@
     {ntp_features::kNtpChromeCartModuleAbandonedCartDiscountUseUtmParam,
      "true"},
     {"partner-merchant-pattern",
-     "(electronicexpress.com|zazzle.com|wish.com|homesquare.com|iherb.com|"
-     "zappos.com)"}};
+     "(electronicexpress.com|zazzle.com|wish.com|homesquare.com|iherb.com)"}};
 const FeatureEntry::FeatureParam kNtpChromeCartModuleHeuristicsImprovement[] = {
     {ntp_features::kNtpChromeCartModuleHeuristicsImprovementParam, "true"}};
 const FeatureEntry::FeatureParam kNtpChromeCartModuleRBDAndCouponDiscount[] = {
@@ -3652,7 +3651,7 @@
      flag_descriptions::kEnableNavigationPredictorDescription,
      kOsCrOS | kOsLinux,
      FEATURE_VALUE_TYPE(blink::features::kNavigationPredictor)},
-#endif  // BUILDFLAG(IS_CHROMEOS) || OS_LINUX
+#endif  // defined(OS_CHROMEOS) || defined(OS_LINUX)
     {"enable-preconnect-to-search",
      flag_descriptions::kEnablePreconnectToSearchName,
      flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll,
@@ -5670,6 +5669,13 @@
      flag_descriptions::kSkiaRendererDescription, kOsAll,
      FEATURE_VALUE_TYPE(features::kUseSkiaRenderer)},
 
+#if defined(OS_CHROMEOS)
+    {"bluetooth-advertisement-monitoring",
+     flag_descriptions::kBluetoothAdvertisementMonitoringName,
+     flag_descriptions::kBluetoothAdvertisementMonitoringDescription, kOsCrOS,
+     FEATURE_VALUE_TYPE(chromeos::features::kBluetoothAdvertisementMonitoring)},
+#endif  // defined(OS_CHROMEOS)
+
 #if BUILDFLAG(IS_CHROMEOS_ASH)
     {"allow-disable-mouse-acceleration",
      flag_descriptions::kAllowDisableMouseAccelerationName,
@@ -5694,11 +5700,6 @@
      flag_descriptions::kAllowTouchpadHapticClickSettingsDescription, kOsCrOS,
      FEATURE_VALUE_TYPE(features::kAllowTouchpadHapticClickSettings)},
 
-    {"bluetooth-advertisement-monitoring",
-     flag_descriptions::kBluetoothAdvertisementMonitoringName,
-     flag_descriptions::kBluetoothAdvertisementMonitoringDescription, kOsCrOS,
-     FEATURE_VALUE_TYPE(chromeos::features::kBluetoothAdvertisementMonitoring)},
-
     {"enable-neural-stylus-palm-rejection",
      flag_descriptions::kEnableNeuralStylusPalmRejectionName,
      flag_descriptions::kEnableNeuralStylusPalmRejectionDescription, kOsCrOS,
diff --git a/chrome/browser/apps/app_service/app_service_proxy_unittest.cc b/chrome/browser/apps/app_service/app_service_proxy_unittest.cc
index ae8114f2..cc908ff 100644
--- a/chrome/browser/apps/app_service/app_service_proxy_unittest.cc
+++ b/chrome/browser/apps/app_service/app_service_proxy_unittest.cc
@@ -514,6 +514,6 @@
             proxy()->PreferredApps().FindPreferredAppForUrl(kTestUrl3));
 }
 
-#endif  // !BUILDFLAG(OS_CHROMEOS_LACROS)
+#endif  // !BUILDFLAG(IS_CHROMEOS_LACROS)
 
 }  // namespace apps
diff --git a/chrome/browser/ash/login/screens/consolidated_consent_screen_browsertest.cc b/chrome/browser/ash/login/screens/consolidated_consent_screen_browsertest.cc
index 7c1787de..cc117d7 100644
--- a/chrome/browser/ash/login/screens/consolidated_consent_screen_browsertest.cc
+++ b/chrome/browser/ash/login/screens/consolidated_consent_screen_browsertest.cc
@@ -6,7 +6,9 @@
 
 #include "ash/constants/ash_features.h"
 #include "ash/constants/ash_switches.h"
+#include "chrome/browser/ash/arc/session/arc_service_launcher.h"
 #include "chrome/browser/ash/login/oobe_screen.h"
+#include "chrome/browser/ash/login/test/fake_arc_tos_mixin.h"
 #include "chrome/browser/ash/login/test/fake_eula_mixin.h"
 #include "chrome/browser/ash/login/test/js_checker.h"
 #include "chrome/browser/ash/login/test/login_manager_mixin.h"
@@ -18,6 +20,7 @@
 #include "chrome/browser/ash/login/wizard_controller.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/webui/chromeos/login/consolidated_consent_screen_handler.h"
 #include "content/public/test/browser_test.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
@@ -36,6 +39,12 @@
                                                  "googleEulaLinkArcDisabled"};
 const test::UIPath kCrosEulaLinkArcDisabled = {kConsolidatedConsentId,
                                                "crosEulaLinkArcDisabled"};
+const test::UIPath kGoogleEulaLink = {kConsolidatedConsentId, "googleEulaLink"};
+const test::UIPath kCrosEulaLink = {kConsolidatedConsentId, "crosEulaLink"};
+const test::UIPath kArcTosLink = {kConsolidatedConsentId, "arcTosLink"};
+const test::UIPath kPrivacyPolicyLink = {kConsolidatedConsentId,
+                                         "privacyPolicyLink"};
+
 const test::UIPath kUsageStats = {kConsolidatedConsentId, "usageStats"};
 const test::UIPath kUsageStatsToggle = {kConsolidatedConsentId, "usageOptin"};
 const test::UIPath kUsageLearnMoreLink = {kConsolidatedConsentId,
@@ -44,9 +53,32 @@
                                            "usageLearnMorePopUp"};
 const test::UIPath kUsageLearnMorePopUpClose = {
     kConsolidatedConsentId, "usageLearnMorePopUp", "closeButton"};
+
 const test::UIPath kBackup = {kConsolidatedConsentId, "backup"};
+const test::UIPath kBackupToggle = {kConsolidatedConsentId, "backupOptIn"};
+const test::UIPath kBackupLearnMoreLink = {kConsolidatedConsentId,
+                                           "backupLearnMore"};
+const test::UIPath kBackupLearnMorePopUp = {kConsolidatedConsentId,
+                                            "backupLearnMorePopUp"};
+const test::UIPath kBackupLearnMorePopUpClose = {
+    kConsolidatedConsentId, "backupLearnMorePopUp", "closeButton"};
+
 const test::UIPath kLocation = {kConsolidatedConsentId, "location"};
+const test::UIPath kLocationToggle = {kConsolidatedConsentId, "locationOptIn"};
+const test::UIPath kLocationLearnMoreLink = {kConsolidatedConsentId,
+                                             "locationLearnMore"};
+const test::UIPath kLocationLearnMorePopUp = {kConsolidatedConsentId,
+                                              "locationLearnMorePopUp"};
+const test::UIPath kLocationLearnMorePopUpClose = {
+    kConsolidatedConsentId, "locationLearnMorePopUp", "closeButton"};
+
 const test::UIPath kFooter = {kConsolidatedConsentId, "footer"};
+const test::UIPath kFooterLearnMoreLink = {kConsolidatedConsentId,
+                                           "footerLearnMore"};
+const test::UIPath kFooterLearnMorePopUp = {kConsolidatedConsentId,
+                                            "footerLearnMorePopUp"};
+const test::UIPath kFooterLearnMorePopUpClose = {
+    kConsolidatedConsentId, "footerLearnMorePopUp", "closeButton"};
 const test::UIPath kAcceptButton = {kConsolidatedConsentId, "acceptButton"};
 
 // Google EUlA Dialog
@@ -64,6 +96,21 @@
 const test::UIPath kCrosEulaOkButton = {kConsolidatedConsentId,
                                         "crosEulaOkButton"};
 
+// ARC ToS Dialog
+const test::UIPath kArcTosDialog = {kConsolidatedConsentId, "arcTosDialog"};
+const test::UIPath kArcTosWebview = {kConsolidatedConsentId, "arcTosWebview"};
+const test::UIPath kArcTosOkButton = {kConsolidatedConsentId, "arcTosOkButton"};
+
+// Privacy Policy Dialog
+const test::UIPath kPrivacyPolicyDialog = {kConsolidatedConsentId,
+                                           "privacyPolicyDialog"};
+const test::UIPath kPrivacyPolicyWebview = {kConsolidatedConsentId,
+                                            "privacyPolicyWebview"};
+const test::UIPath kPrivacyPolicyOkButton = {kConsolidatedConsentId,
+                                             "privacyOkButton"};
+
+}  // namespace
+
 // Regular user flow with ARC not enabled
 class ConsolidatedConsentScreenTest : public OobeBaseTest {
  public:
@@ -184,10 +231,118 @@
   test::OobeJS().CreateVisibilityWaiter(true, kLoadedDialog)->Wait();
 
   test::OobeJS().ClickOnPath(kUsageLearnMoreLink);
-  test::OobeJS().ExpectAttributeEQ("open", kUsageLearnMorePopUp, true);
+  test::OobeJS().ExpectDialogOpen(kUsageLearnMorePopUp);
   test::OobeJS().ClickOnPath(kUsageLearnMorePopUpClose);
-  test::OobeJS().ExpectAttributeEQ("open", kUsageLearnMorePopUp, false);
+  test::OobeJS().ExpectDialogClosed(kUsageLearnMorePopUp);
 }
 
-}  // namespace
+class ConsolidatedConsentScreenArcEnabledTest
+    : public ConsolidatedConsentScreenTest {
+ public:
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    command_line->AppendSwitchASCII(switches::kArcAvailability,
+                                    "officially-supported");
+    ConsolidatedConsentScreenTest::SetUpCommandLine(command_line);
+  }
+
+  void SetUpOnMainThread() override {
+    // Enable ARC for testing.
+    arc::ArcServiceLauncher::Get()->ResetForTesting();
+    ConsolidatedConsentScreenTest::SetUpOnMainThread();
+  }
+
+  FakeArcTosMixin fake_arc_tos_{&mixin_host_, embedded_test_server()};
+};
+
+// For regular users with ARC enavled, all opt-ins are visible and the toggles
+// are enabled.
+IN_PROC_BROWSER_TEST_F(ConsolidatedConsentScreenArcEnabledTest,
+                       OptinsVisiblity) {
+  LoginAsRegularUser();
+  OobeScreenWaiter(ConsolidatedConsentScreenView::kScreenId).Wait();
+  test::OobeJS().CreateVisibilityWaiter(true, kLoadedDialog)->Wait();
+
+  test::OobeJS().ExpectVisiblePath(kUsageStats);
+  test::OobeJS().ExpectEnabledPath(kUsageStatsToggle);
+  test::OobeJS().ExpectVisiblePath(kBackup);
+  test::OobeJS().ExpectEnabledPath(kBackupToggle);
+  test::OobeJS().ExpectVisiblePath(kLocation);
+  test::OobeJS().ExpectEnabledPath(kLocationToggle);
+
+  test::OobeJS().ExpectVisiblePath(kFooter);
+}
+
+// Make sure that EULA links in the terms description for the ARC Enabled
+// shows the correct dialogs.
+IN_PROC_BROWSER_TEST_F(ConsolidatedConsentScreenArcEnabledTest, EULA) {
+  LoginAsRegularUser();
+  OobeScreenWaiter(ConsolidatedConsentScreenView::kScreenId).Wait();
+  test::OobeJS().CreateVisibilityWaiter(true, kLoadedDialog)->Wait();
+
+  test::OobeJS().ClickOnPath(kGoogleEulaLink);
+  test::OobeJS().CreateVisibilityWaiter(true, kGoogleEulaDialog)->Wait();
+  test::OobeJS().ClickOnPath(kGoogleEulaOkButton);
+  test::OobeJS().CreateVisibilityWaiter(true, kLoadedDialog)->Wait();
+
+  test::OobeJS().ClickOnPath(kCrosEulaLink);
+  test::OobeJS().CreateVisibilityWaiter(true, kCrosEulaDialog)->Wait();
+  test::OobeJS().ClickOnPath(kCrosEulaOkButton);
+  test::OobeJS().CreateVisibilityWaiter(true, kLoadedDialog)->Wait();
+}
+
+IN_PROC_BROWSER_TEST_F(ConsolidatedConsentScreenArcEnabledTest, ArcToS) {
+  LoginAsRegularUser();
+  OobeScreenWaiter(ConsolidatedConsentScreenView::kScreenId).Wait();
+  test::OobeJS().CreateVisibilityWaiter(true, kLoadedDialog)->Wait();
+
+  test::OobeJS().ClickOnPath(kArcTosLink);
+  test::OobeJS().CreateVisibilityWaiter(true, kArcTosDialog)->Wait();
+
+  const std::string webview_contents = test::GetWebViewContents(kArcTosWebview);
+  EXPECT_TRUE(webview_contents.find(fake_arc_tos_.GetArcTosContent()) !=
+              std::string::npos);
+
+  test::OobeJS().ClickOnPath(kArcTosOkButton);
+  test::OobeJS().CreateVisibilityWaiter(true, kLoadedDialog)->Wait();
+}
+
+IN_PROC_BROWSER_TEST_F(ConsolidatedConsentScreenArcEnabledTest, PrivacyPolicy) {
+  LoginAsRegularUser();
+  OobeScreenWaiter(ConsolidatedConsentScreenView::kScreenId).Wait();
+  test::OobeJS().CreateVisibilityWaiter(true, kLoadedDialog)->Wait();
+
+  test::OobeJS().ClickOnPath(kPrivacyPolicyLink);
+  test::OobeJS().CreateVisibilityWaiter(true, kPrivacyPolicyDialog)->Wait();
+
+  const std::string webview_contents =
+      test::GetWebViewContents(kPrivacyPolicyWebview);
+  EXPECT_TRUE(webview_contents.find(fake_arc_tos_.GetPrivacyPolicyContent()) !=
+              std::string::npos);
+
+  test::OobeJS().ClickOnPath(kPrivacyPolicyOkButton);
+  test::OobeJS().CreateVisibilityWaiter(true, kLoadedDialog)->Wait();
+}
+
+IN_PROC_BROWSER_TEST_F(ConsolidatedConsentScreenArcEnabledTest,
+                       ArcLearnMoreLinks) {
+  LoginAsRegularUser();
+  OobeScreenWaiter(ConsolidatedConsentScreenView::kScreenId).Wait();
+  test::OobeJS().CreateVisibilityWaiter(true, kLoadedDialog)->Wait();
+
+  test::OobeJS().ClickOnPath(kBackupLearnMoreLink);
+  test::OobeJS().ExpectDialogOpen(kBackupLearnMorePopUp);
+  test::OobeJS().ClickOnPath(kBackupLearnMorePopUpClose);
+  test::OobeJS().ExpectDialogClosed(kBackupLearnMorePopUp);
+
+  test::OobeJS().ClickOnPath(kLocationLearnMoreLink);
+  test::OobeJS().ExpectDialogOpen(kLocationLearnMorePopUp);
+  test::OobeJS().ClickOnPath(kLocationLearnMorePopUpClose);
+  test::OobeJS().ExpectDialogClosed(kLocationLearnMorePopUp);
+
+  test::OobeJS().ClickOnPath(kFooterLearnMoreLink);
+  test::OobeJS().ExpectDialogOpen(kFooterLearnMorePopUp);
+  test::OobeJS().ClickOnPath(kFooterLearnMorePopUpClose);
+  test::OobeJS().ExpectDialogClosed(kFooterLearnMorePopUp);
+}
+
 }  // namespace ash
diff --git a/chrome/browser/ash/login/screens/hid_detection_screen.cc b/chrome/browser/ash/login/screens/hid_detection_screen.cc
index 2da3791..bba2782 100644
--- a/chrome/browser/ash/login/screens/hid_detection_screen.cc
+++ b/chrome/browser/ash/login/screens/hid_detection_screen.cc
@@ -8,6 +8,7 @@
 #include <utility>
 
 #include "ash/constants/ash_switches.h"
+#include "ash/constants/devicetype.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
@@ -80,6 +81,26 @@
   }
 }
 
+bool HIDDetectionScreen::CanShowScreen() {
+  if (StartupUtils::IsHIDDetectionScreenDisabledForTests() ||
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableHIDDetectionOnOOBEForTesting)) {
+    // Store the flag inside the local state so it persists restart for the
+    // autoupdate tests.
+    StartupUtils::DisableHIDDetectionScreenForTests();
+    return false;
+  }
+
+  switch (ash::GetDeviceType()) {
+    case DeviceType::kChromebase:
+    case DeviceType::kChromebit:
+    case DeviceType::kChromebox:
+      return true;
+    default:
+      return false;
+  }
+}
+
 HIDDetectionScreen::HIDDetectionScreen(HIDDetectionView* view,
                                        const ScreenExitCallback& exit_callback)
     : BaseScreen(HIDDetectionView::kScreenId, OobeScreenPriority::DEFAULT),
@@ -146,12 +167,8 @@
 }
 
 bool HIDDetectionScreen::MaybeSkip(WizardContext* context) {
-  if (StartupUtils::IsHIDDetectionScreenDisabledForTests() ||
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableHIDDetectionOnOOBEForTesting)) {
-    // Store the flag inside the local state so it persists restart for the
-    // autoupdate tests.
-    StartupUtils::DisableHIDDetectionScreenForTests();
+  if (!CanShowScreen()) {
+    // TODO(https://crbug.com/1275960): Introduce Result::SKIPPED.
     Exit(Result::SKIPPED_FOR_TESTS);
     return true;
   }
diff --git a/chrome/browser/ash/login/screens/hid_detection_screen.h b/chrome/browser/ash/login/screens/hid_detection_screen.h
index d519e81..8b393ff 100644
--- a/chrome/browser/ash/login/screens/hid_detection_screen.h
+++ b/chrome/browser/ash/login/screens/hid_detection_screen.h
@@ -16,7 +16,6 @@
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ash/login/demo_mode/demo_mode_detector.h"
 #include "chrome/browser/ash/login/screens/base_screen.h"
-#include "third_party/abseil-cpp/absl/types/optional.h"
 // TODO(https://crbug.com/1164001): move to forward declaration.
 #include "chrome/browser/ash/login/wizard_context.h"
 // TODO(https://crbug.com/1164001): move to forward declaration.
@@ -57,6 +56,11 @@
 
   static std::string GetResultString(Result result);
 
+  // The HID detection screen is only allowed for form factors without built-in
+  // inputs: Chromebases, Chromebits, and Chromeboxes (crbug.com/965765).
+  // Also different testing flags might forcefully skip the screen
+  static bool CanShowScreen();
+
   // This method is called when the view is being destroyed.
   void OnViewDestroyed(HIDDetectionView* view);
 
diff --git a/chrome/browser/ash/login/screens/hid_detection_screen_browsertest.cc b/chrome/browser/ash/login/screens/hid_detection_screen_browsertest.cc
index a72cf51..2687813 100644
--- a/chrome/browser/ash/login/screens/hid_detection_screen_browsertest.cc
+++ b/chrome/browser/ash/login/screens/hid_detection_screen_browsertest.cc
@@ -55,15 +55,17 @@
   ~HIDDetectionScreenChromeboxTest() override = default;
 
   void SetUpOnMainThread() override {
-    ASSERT_TRUE(WizardController::default_controller());
+    if (HIDDetectionScreen::CanShowScreen()) {
+      ASSERT_TRUE(WizardController::default_controller());
 
-    hid_detection_screen_ = static_cast<HIDDetectionScreen*>(
-        WizardController::default_controller()->GetScreen(
-            HIDDetectionView::kScreenId));
-    ASSERT_TRUE(hid_detection_screen_);
-    ASSERT_TRUE(hid_detection_screen_->view_);
+      hid_detection_screen_ = static_cast<HIDDetectionScreen*>(
+          WizardController::default_controller()->GetScreen(
+              HIDDetectionView::kScreenId));
+      ASSERT_TRUE(hid_detection_screen_);
+      ASSERT_TRUE(hid_detection_screen_->view_);
 
-    hid_detection_screen()->SetAdapterInitialPoweredForTesting(false);
+      hid_detection_screen()->SetAdapterInitialPoweredForTesting(false);
+    }
     OobeBaseTest::SetUpOnMainThread();
   }
 
@@ -285,7 +287,8 @@
   OobeScreenWaiter(chromeos::WelcomeView::kScreenId).Wait();
 
   EXPECT_TRUE(StartupUtils::IsHIDDetectionScreenDisabledForTests());
-  EXPECT_EQ(GetExitResult(), HIDDetectionScreen::Result::SKIPPED_FOR_TESTS);
+  EXPECT_FALSE(WizardController::default_controller()->HasScreen(
+      HIDDetectionView::kScreenId));
 }
 
 IN_PROC_BROWSER_TEST_F(HIDDetectionScreenDisabledAfterRestartTest,
@@ -293,7 +296,8 @@
   OobeScreenWaiter(chromeos::WelcomeView::kScreenId).Wait();
   // The pref should persist restart.
   EXPECT_TRUE(StartupUtils::IsHIDDetectionScreenDisabledForTests());
-  EXPECT_EQ(GetExitResult(), HIDDetectionScreen::Result::SKIPPED_FOR_TESTS);
+  EXPECT_FALSE(WizardController::default_controller()->HasScreen(
+      HIDDetectionView::kScreenId));
 }
 
 class HIDDetectionScreenChromebookTest : public OobeBaseTest {
diff --git a/chrome/browser/ash/login/test/js_checker.cc b/chrome/browser/ash/login/test/js_checker.cc
index d140590..7cd851b 100644
--- a/chrome/browser/ash/login/test/js_checker.cc
+++ b/chrome/browser/ash/login/test/js_checker.cc
@@ -435,6 +435,16 @@
   EXPECT_TRUE(std::string::npos != message.find(content));
 }
 
+void JSChecker::ExpectDialogOpen(
+    std::initializer_list<base::StringPiece> element_ids) {
+  ExpectAttributeEQ("open", element_ids, true);
+}
+
+void JSChecker::ExpectDialogClosed(
+    std::initializer_list<base::StringPiece> element_ids) {
+  ExpectAttributeEQ("open", element_ids, false);
+}
+
 void JSChecker::ExpectElementValue(
     const std::string& value,
     std::initializer_list<base::StringPiece> element_ids) {
diff --git a/chrome/browser/ash/login/test/js_checker.h b/chrome/browser/ash/login/test/js_checker.h
index b37a100..1fcb32f 100644
--- a/chrome/browser/ash/login/test/js_checker.h
+++ b/chrome/browser/ash/login/test/js_checker.h
@@ -196,6 +196,10 @@
   void ExpectElementValue(const std::string& value,
                           std::initializer_list<base::StringPiece> element_ids);
 
+  // Expects that the indicated modal dialog is open or closed.
+  void ExpectDialogOpen(std::initializer_list<base::StringPiece> element_ids);
+  void ExpectDialogClosed(std::initializer_list<base::StringPiece> element_ids);
+
   // Fires a native 'click' event on the indicated UI element. Prefer using
   // native 'click' event as it works on both polymer and native UI elements.
   void ClickOnPath(std::initializer_list<base::StringPiece> element_ids);
diff --git a/chrome/browser/ash/login/wizard_controller.cc b/chrome/browser/ash/login/wizard_controller.cc
index 92b4505..1fd41efb 100644
--- a/chrome/browser/ash/login/wizard_controller.cc
+++ b/chrome/browser/ash/login/wizard_controller.cc
@@ -26,7 +26,6 @@
 #include "ash/components/timezone/timezone_request.h"
 #include "ash/constants/ash_features.h"
 #include "ash/constants/ash_switches.h"
-#include "ash/constants/devicetype.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
@@ -256,19 +255,6 @@
     chromeos::WrongHWIDScreenView::kScreenId,
 };
 
-// The HID detection screen is only allowed for form factors without built-in
-// inputs: Chromebases, Chromebits, and Chromeboxes (crbug.com/965765).
-bool CanShowHIDDetectionScreen() {
-  switch (GetDeviceType()) {
-    case DeviceType::kChromebase:
-    case DeviceType::kChromebit:
-    case DeviceType::kChromebox:
-      return true;
-    default:
-      return false;
-  }
-}
-
 bool IsResumableOobeScreen(OobeScreenId screen_id) {
   for (const auto& resumable_screen : kResumableOobeScreens) {
     if (screen_id == resumable_screen)
@@ -458,10 +444,12 @@
       is_enterprise_managed ||
       !user_manager::UserManager::Get()->GetUsers().empty();
   // Do not show the HID Detection screen if device is owned.
-  if (!device_is_owned && CanShowHIDDetectionScreen() &&
+  if (!device_is_owned && HIDDetectionScreen::CanShowScreen() &&
       first_screen == OobeScreen::SCREEN_UNKNOWN) {
     // Temp logs for crbug/1274589
     VLOG(1) << "CheckIsScreenRequired";
+    // TODO(https://crbug.com/1275960): Move logic into
+    // HIDDetectionScreen::MaybeSkip.
     GetScreen<HIDDetectionScreen>()->CheckIsScreenRequired(
         base::BindOnce(&WizardController::OnHIDScreenNecessityCheck,
                        weak_factory_.GetWeakPtr()));
@@ -622,7 +610,7 @@
   append(std::make_unique<LacrosDataMigrationScreen>(
       oobe_ui->GetView<LacrosDataMigrationScreenHandler>()));
 
-  if (CanShowHIDDetectionScreen()) {
+  if (HIDDetectionScreen::CanShowScreen()) {
     append(std::make_unique<HIDDetectionScreen>(
         oobe_ui->GetView<HIDDetectionScreenHandler>(),
         base::BindRepeating(&WizardController::OnHidDetectionScreenExit,
diff --git a/chrome/browser/ash/policy/dlp/dlp_confidential_contents.cc b/chrome/browser/ash/policy/dlp/dlp_confidential_contents.cc
index 4cb3dbe..c4a5508 100644
--- a/chrome/browser/ash/policy/dlp/dlp_confidential_contents.cc
+++ b/chrome/browser/ash/policy/dlp/dlp_confidential_contents.cc
@@ -4,14 +4,28 @@
 
 #include "chrome/browser/ash/policy/dlp/dlp_confidential_contents.h"
 
+#include <memory>
 #include <vector>
 
 #include "base/containers/cxx20_erase_vector.h"
+#include "base/time/time.h"
+#include "chrome/browser/chromeos/policy/dlp/dlp_rules_manager.h"
 #include "chrome/browser/favicon/favicon_utils.h"
+#include "content/public/browser/browser_task_traits.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 
 namespace policy {
 
+// The maximum number of entries that can be kept in the
+// DlpConfidentialContentsCache.
+// TODO(crbug.com/1275926): determine the value to use
+static constexpr int kDefaultCacheSizeLimit = 100;
+
+// The default timeout after which the entries are evicted from the
+// DlpConfidentialContentsCache.
+static constexpr base::TimeDelta kDefaultCacheTimeout = base::Days(7);
+
 DlpConfidentialContent::DlpConfidentialContent(
     content::WebContents* web_contents)
     : icon(favicon::TabFaviconFromWebContents(web_contents).AsImageSkia()),
@@ -73,6 +87,10 @@
   contents_.insert(DlpConfidentialContent(web_contents));
 }
 
+void DlpConfidentialContents::Add(const DlpConfidentialContent& content) {
+  contents_.insert(content);
+}
+
 void DlpConfidentialContents::ClearAndAdd(content::WebContents* web_contents) {
   contents_.clear();
   Add(web_contents);
@@ -108,4 +126,102 @@
   });
 }
 
+DlpConfidentialContentsCache::Entry::Entry(
+    const DlpConfidentialContent& content,
+    DlpRulesManager::Restriction restriction,
+    base::TimeTicks timestamp)
+    : content(content), restriction(restriction), created_at(timestamp) {}
+
+DlpConfidentialContentsCache::Entry::~Entry() = default;
+
+DlpConfidentialContentsCache::DlpConfidentialContentsCache()
+    : cache_size_limit_(kDefaultCacheSizeLimit),
+      task_runner_(
+          content::GetUIThreadTaskRunner(content::BrowserTaskTraits())) {}
+
+DlpConfidentialContentsCache::~DlpConfidentialContentsCache() = default;
+
+void DlpConfidentialContentsCache::Cache(
+    const DlpConfidentialContent& content,
+    DlpRulesManager::Restriction restriction) {
+  if (Contains(content, restriction)) {
+    return;
+  }
+
+  auto entry =
+      std::make_unique<Entry>(content, restriction, base::TimeTicks::Now());
+  StartEvictionTimer(entry.get());
+  entries_.push_front(std::move(entry));
+
+  if (entries_.size() > cache_size_limit_) {
+    entries_.pop_back();
+  }
+}
+
+bool DlpConfidentialContentsCache::Contains(
+    content::WebContents* web_contents,
+    DlpRulesManager::Restriction restriction) const {
+  const GURL url = web_contents->GetLastCommittedURL();
+  return std::find_if(entries_.begin(), entries_.end(),
+                      [&](const std::unique_ptr<Entry>& entry) {
+                        return entry->restriction == restriction &&
+                               entry->content.url.EqualsIgnoringRef(url);
+                      }) != entries_.end();
+}
+
+bool DlpConfidentialContentsCache::Contains(
+    const DlpConfidentialContent& content,
+    DlpRulesManager::Restriction restriction) const {
+  return std::find_if(
+             entries_.begin(), entries_.end(),
+             [&](const std::unique_ptr<Entry>& entry) {
+               return entry->restriction == restriction &&
+                      entry->content.url.EqualsIgnoringRef(content.url);
+             }) != entries_.end();
+}
+
+int DlpConfidentialContentsCache::GetSizeForTesting() const {
+  return entries_.size();
+}
+
+DlpConfidentialContents
+DlpConfidentialContentsCache::GetDlpConfidentialContentsForRestriction(
+    DlpRulesManager::Restriction restriction) {
+  DlpConfidentialContents contents;
+  for (auto& entry : entries_) {
+    if (entry->restriction == restriction)
+      contents.Add(entry->content);
+  }
+  return contents;
+}
+
+// static
+base::TimeDelta DlpConfidentialContentsCache::GetCacheTimeout() {
+  return kDefaultCacheTimeout;
+}
+
+void DlpConfidentialContentsCache::SetCacheSizeLimitForTesting(int limit) {
+  cache_size_limit_ = limit;
+}
+
+void DlpConfidentialContentsCache::SetTaskRunnerForTesting(
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
+  task_runner_ = task_runner;
+}
+
+void DlpConfidentialContentsCache::StartEvictionTimer(Entry* entry) {
+  entry->eviction_timer.SetTaskRunner(task_runner_);
+  entry->eviction_timer.Start(
+      FROM_HERE, GetCacheTimeout(),
+      base::BindOnce(&DlpConfidentialContentsCache::OnEvictionTimerUp,
+                     base::Unretained(this), entry->content));
+}
+
+void DlpConfidentialContentsCache::OnEvictionTimerUp(
+    const DlpConfidentialContent& content) {
+  entries_.remove_if([&](const std::unique_ptr<Entry>& entry) {
+    return entry.get()->content == content;
+  });
+}
+
 }  // namespace policy
diff --git a/chrome/browser/ash/policy/dlp/dlp_confidential_contents.h b/chrome/browser/ash/policy/dlp/dlp_confidential_contents.h
index 3540c329..d50357fc 100644
--- a/chrome/browser/ash/policy/dlp/dlp_confidential_contents.h
+++ b/chrome/browser/ash/policy/dlp/dlp_confidential_contents.h
@@ -5,10 +5,15 @@
 #ifndef CHROME_BROWSER_ASH_POLICY_DLP_DLP_CONFIDENTIAL_CONTENTS_H_
 #define CHROME_BROWSER_ASH_POLICY_DLP_DLP_CONFIDENTIAL_CONTENTS_H_
 
+#include <list>
 #include <string>
 #include <vector>
 
 #include "base/containers/flat_set.h"
+#include "base/task/single_thread_task_runner.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
+#include "chrome/browser/chromeos/policy/dlp/dlp_rules_manager.h"
 #include "ui/gfx/image/image_skia.h"
 #include "url/gurl.h"
 
@@ -45,8 +50,8 @@
   GURL url;
 };
 
-// Provides basic functions for storing and working with confidential contents.
-// TODO(crbug.com/1264803): Limit the size
+// Provides basic functions for storing and working with DLP confidential
+// contents.
 class DlpConfidentialContents {
  public:
   DlpConfidentialContents();
@@ -63,6 +68,8 @@
   // underlying container.
   void Add(content::WebContents* web_contents);
 
+  void Add(const DlpConfidentialContent& content);
+
   // Removes all stored confidential content, if there was any, and adds
   // |web_contents| converted to a DlpConfidentialContent.
   void ClearAndAdd(content::WebContents* web_contents);
@@ -89,6 +96,83 @@
   base::flat_set<DlpConfidentialContent> contents_;
 };
 
+// Used to avoid warning the user for an action and content that they already
+// acknowledged and bypassed a warning for, by caching these contents for a
+// certain amount of time.
+//
+// Automatically evicts entries after a timeout.
+// If the number of cached entries exceeds a predefined limits, evicts the
+// oldest entry from the cache.
+class DlpConfidentialContentsCache {
+ public:
+  DlpConfidentialContentsCache();
+  DlpConfidentialContentsCache(const DlpConfidentialContentsCache& other) =
+      delete;
+  DlpConfidentialContentsCache& operator=(
+      const DlpConfidentialContentsCache& other) = delete;
+  ~DlpConfidentialContentsCache();
+
+  // Creates and stores an entry from |web_contents| and |restriction|.
+  void Cache(const DlpConfidentialContent& content,
+             DlpRulesManager::Restriction restriction);
+
+  // Returns true if there is a cached entry corresponding to |web_contents| and
+  // |restriction|.
+  bool Contains(content::WebContents* web_contents,
+                DlpRulesManager::Restriction restriction) const;
+
+  // Returns true if there is a cached entry corresponding to |content| and
+  // |restriction|.
+  bool Contains(const DlpConfidentialContent& content,
+                DlpRulesManager::Restriction restriction) const;
+
+  // Returns the number of cached entries, useful for testing.
+  int GetSizeForTesting() const;
+
+  // Returns DlpConfidentialContents for the given |restriction|.
+  // Used to pass the list of allowed contents when creating a warning dialog.
+  DlpConfidentialContents GetDlpConfidentialContentsForRestriction(
+      DlpRulesManager::Restriction restriction);
+
+  // Returns the duration for which the entries are kept in the cache.
+  static base::TimeDelta GetCacheTimeout();
+
+  // Used only in tests to set a different size limit.
+  void SetCacheSizeLimitForTesting(int limit);
+
+  // Used only in tests to inject a task runner for time control.
+  void SetTaskRunnerForTesting(
+      scoped_refptr<base::SingleThreadTaskRunner> task_runner);
+
+ private:
+  struct Entry {
+    Entry() = delete;
+    Entry(const DlpConfidentialContent& content,
+          DlpRulesManager::Restriction restriction,
+          base::TimeTicks timestamp);
+    Entry(const Entry& other) = delete;
+    Entry& operator=(const Entry& other) = delete;
+    ~Entry();
+
+    DlpConfidentialContent content;
+    DlpRulesManager::Restriction restriction;
+    base::TimeTicks created_at;
+    base::OneShotTimer eviction_timer;
+  };
+
+  // Starts the |entry|'s eviction timer.
+  void StartEvictionTimer(Entry* entry);
+
+  // Evicts an entry corresponding to |content| if it exists, no-op otherwise.
+  void OnEvictionTimerUp(const DlpConfidentialContent& content);
+
+  std::list<std::unique_ptr<Entry>> entries_;
+  int cache_size_limit_;
+
+  // Used to evict cache entries after the timeout.
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
+};
+
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_ASH_POLICY_DLP_DLP_CONFIDENTIAL_CONTENTS_H_
diff --git a/chrome/browser/ash/policy/dlp/dlp_confidential_contents_unittest.cc b/chrome/browser/ash/policy/dlp/dlp_confidential_contents_unittest.cc
index 45a892d..47a4f5f9 100644
--- a/chrome/browser/ash/policy/dlp/dlp_confidential_contents_unittest.cc
+++ b/chrome/browser/ash/policy/dlp/dlp_confidential_contents_unittest.cc
@@ -6,6 +6,8 @@
 
 #include <string>
 
+#include "base/test/test_mock_time_task_runner.h"
+#include "chrome/browser/chromeos/policy/dlp/dlp_rules_manager.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_task_environment.h"
@@ -16,6 +18,9 @@
 
 namespace policy {
 
+constexpr DlpRulesManager::Restriction kRestriction =
+    DlpRulesManager::Restriction::kPrinting;
+
 class DlpConfidentialContentsTest : public testing::Test {
  public:
   const std::u16string title1 = u"Example1";
@@ -45,6 +50,11 @@
     return web_contents;
   }
 
+  DlpConfidentialContent CreateConfidentialContent(const std::u16string& title,
+                                                   const GURL& url) {
+    return DlpConfidentialContent(CreateWebContents(title, url).get());
+  }
+
  private:
   content::BrowserTaskEnvironment task_environment_;
   content::RenderViewHostTestEnabler render_view_host_test_enabler_;
@@ -161,4 +171,48 @@
   EXPECT_EQ(contents.GetContents().size(), 2);
 }
 
+TEST_F(DlpConfidentialContentsTest, CacheEvictsAfterTimeout) {
+  scoped_refptr<base::TestMockTimeTaskRunner> task_runner =
+      base::MakeRefCounted<base::TestMockTimeTaskRunner>();
+  DlpConfidentialContentsCache cache;
+  cache.SetTaskRunnerForTesting(task_runner);
+
+  DlpConfidentialContent content = CreateConfidentialContent(title1, url1);
+
+  cache.Cache(content, kRestriction);
+  EXPECT_TRUE(cache.Contains(content, kRestriction));
+  task_runner->FastForwardBy(DlpConfidentialContentsCache::GetCacheTimeout());
+  EXPECT_FALSE(cache.Contains(content, kRestriction));
+}
+
+TEST_F(DlpConfidentialContentsTest, CacheEvictsWhenFull) {
+  scoped_refptr<base::TestMockTimeTaskRunner> task_runner =
+      base::MakeRefCounted<base::TestMockTimeTaskRunner>();
+  DlpConfidentialContentsCache cache;
+  cache.SetTaskRunnerForTesting(task_runner);
+  cache.SetCacheSizeLimitForTesting(1);
+
+  DlpConfidentialContent content1 = CreateConfidentialContent(title1, url1);
+  DlpConfidentialContent content2 = CreateConfidentialContent(title2, url2);
+
+  cache.Cache(content1, kRestriction);
+  EXPECT_TRUE(cache.Contains(content1, kRestriction));
+  cache.Cache(content2, kRestriction);
+  EXPECT_FALSE(cache.Contains(content1, kRestriction));
+  EXPECT_TRUE(cache.Contains(content2, kRestriction));
+}
+
+TEST_F(DlpConfidentialContentsTest, CacheRemovesDuplicates) {
+  scoped_refptr<base::TestMockTimeTaskRunner> task_runner =
+      base::MakeRefCounted<base::TestMockTimeTaskRunner>();
+  DlpConfidentialContentsCache cache;
+  cache.SetTaskRunnerForTesting(task_runner);
+
+  DlpConfidentialContent content = CreateConfidentialContent(title1, url1);
+
+  cache.Cache(content, kRestriction);
+  cache.Cache(content, kRestriction);
+  EXPECT_EQ(cache.GetSizeForTesting(), 1);
+}
+
 }  // namespace policy
diff --git a/chrome/browser/ash/policy/dlp/dlp_content_manager.cc b/chrome/browser/ash/policy/dlp/dlp_content_manager.cc
index a086aa8..2bde82e 100644
--- a/chrome/browser/ash/policy/dlp/dlp_content_manager.cc
+++ b/chrome/browser/ash/policy/dlp/dlp_content_manager.cc
@@ -187,7 +187,7 @@
 
   if (IsWarn(restriction_info)) {
     // Check if the contents were already allowed and don't warn in that case.
-    if (user_allowed_contents_[DlpRulesManager::Restriction::kPrinting]
+    if (GetUserAllowedContents(DlpRulesManager::Restriction::kPrinting)
             .Contains(web_contents)) {
       ReportWarningProceededEvent(restriction_info.url,
                                   DlpRulesManager::Restriction::kPrinting,
@@ -247,7 +247,7 @@
     // Check which of the contents were already allowed and don't warn for
     // those.
     info.confidential_contents.DifferenceWith(
-        user_allowed_contents_[DlpRulesManager::Restriction::kScreenShare]);
+        GetUserAllowedContents(DlpRulesManager::Restriction::kScreenShare));
     if (info.confidential_contents.IsEmpty()) {
       // The user already allowed all the visible content.
       std::move(callback).Run(true);
@@ -284,8 +284,7 @@
       !running_video_capture_info_->confidential_contents.IsEmpty()) {
     warn_notifier_->ShowDlpVideoCaptureWarningDialog(
         std::move(callback),
-        DlpConfidentialContents(
-            running_video_capture_info_->confidential_contents));
+        running_video_capture_info_->confidential_contents);
   } else {
     std::move(callback).Run(/*proceed=*/true);
   }
@@ -731,7 +730,7 @@
     // those that the user was already warned about and has allowed the screen
     // capture to proceed.
     info.confidential_contents.DifferenceWith(
-        user_allowed_contents_[DlpRulesManager::Restriction::kScreenshot]);
+        GetUserAllowedContents(DlpRulesManager::Restriction::kScreenshot));
     running_video_capture_info_->confidential_contents.UnionWith(
         info.confidential_contents);
     return;
@@ -756,7 +755,7 @@
       // Check which of the contents were already allowed and don't warn for
       // those.
       info.confidential_contents.DifferenceWith(
-          user_allowed_contents_[DlpRulesManager::Restriction::kScreenShare]);
+          GetUserAllowedContents(DlpRulesManager::Restriction::kScreenShare));
       if (info.confidential_contents.IsEmpty()) {
         // The user already allowed all the visible content.
         if (!screen_share.IsRunning()) {
@@ -832,7 +831,7 @@
     // Check which of the contents were already allowed and don't warn for
     // those.
     info.confidential_contents.DifferenceWith(
-        user_allowed_contents_[DlpRulesManager::Restriction::kScreenshot]);
+        GetUserAllowedContents(DlpRulesManager::Restriction::kScreenshot));
     if (info.confidential_contents.IsEmpty()) {
       // The user already allowed all the visible content.
       std::move(callback).Run(true);
@@ -858,7 +857,7 @@
     bool should_proceed) {
   if (should_proceed) {
     screen_share.Resume();
-    user_allowed_contents_[DlpRulesManager::Restriction::kScreenShare]
+    GetUserAllowedContents(DlpRulesManager::Restriction::kScreenShare)
         .UnionWith(confidential_contents);
   } else {
     // TODO(crbug.com/1259605): stop instead of pause.
@@ -873,7 +872,7 @@
     OnDlpRestrictionCheckedCallback callback,
     bool should_proceed) {
   if (should_proceed) {
-    user_allowed_contents_[restriction].UnionWith(confidential_contents);
+    GetUserAllowedContents(restriction).UnionWith(confidential_contents);
   }
   std::move(callback).Run(should_proceed);
 }
@@ -898,6 +897,11 @@
   }
 }
 
+DlpConfidentialContents& DlpContentManager::GetUserAllowedContents(
+    DlpRulesManager::Restriction restriction) {
+  return user_allowed_contents_[restriction];
+}
+
 // ScopedDlpContentManagerForTesting
 ScopedDlpContentManagerForTesting::ScopedDlpContentManagerForTesting(
     DlpContentManager* test_dlp_content_manager) {
diff --git a/chrome/browser/ash/policy/dlp/dlp_content_manager.h b/chrome/browser/ash/policy/dlp/dlp_content_manager.h
index 7f0a41e..30508609 100644
--- a/chrome/browser/ash/policy/dlp/dlp_content_manager.h
+++ b/chrome/browser/ash/policy/dlp/dlp_content_manager.h
@@ -19,6 +19,7 @@
 #include "chrome/browser/ash/policy/dlp/dlp_window_observer.h"
 #include "chrome/browser/chromeos/policy/dlp/dlp_content_observer.h"
 #include "chrome/browser/chromeos/policy/dlp/dlp_content_restriction_set.h"
+#include "chrome/browser/chromeos/policy/dlp/dlp_rules_manager.h"
 #include "chrome/browser/ui/ash/screenshot_area.h"
 #include "content/public/browser/desktop_media_id.h"
 #include "content/public/browser/media_stream_request.h"
@@ -331,6 +332,10 @@
   void ReportWarningEvent(const RestrictionLevelAndUrl& restriction_info,
                           DlpRulesManager::Restriction restriction);
 
+  // Returns the set of cached user allowed contents for given |restriction|.
+  DlpConfidentialContents& GetUserAllowedContents(
+      DlpRulesManager::Restriction restriction);
+
   // Map from currently known confidential WebContents to the restrictions.
   base::flat_map<content::WebContents*, DlpContentRestrictionSet>
       confidential_web_contents_;
@@ -350,7 +355,7 @@
 
   // Keeps track of the contents for which the user allowed the action after
   // being shown a warning for each type of restriction.
-  // TODO(crbug.com/1264803): Limit the size
+  // TODO(crbug.com/1264803): Change to DlpConfidentialContentsCache
   base::flat_map<DlpRulesManager::Restriction, DlpConfidentialContents>
       user_allowed_contents_;
 
diff --git a/chrome/browser/ash/policy/dlp/dlp_warn_dialog.cc b/chrome/browser/ash/policy/dlp/dlp_warn_dialog.cc
index 14a083f..dfc58f6 100644
--- a/chrome/browser/ash/policy/dlp/dlp_warn_dialog.cc
+++ b/chrome/browser/ash/policy/dlp/dlp_warn_dialog.cc
@@ -9,6 +9,7 @@
 #include <utility>
 
 #include "ash/public/cpp/style/color_provider.h"
+#include "chrome/browser/ash/policy/dlp/dlp_confidential_contents.h"
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/vector_icons/vector_icons.h"
diff --git a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc
index f5f2425..328e3b4e 100644
--- a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc
+++ b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc
@@ -541,7 +541,10 @@
     DeviceManagementStatus dm_status,
     int net_error,
     const em::DeviceManagementResponse& response) {
-  VLOG(1) << "Account check response received. DM Status: " << dm_status;
+  // TODO(crbug.com/1271134): Logging as "WARNING" to make sure it's preserved
+  // in the logs.
+  LOG(WARNING) << "Account check response received. DM Status: " << dm_status;
+
   fetch_request_job_.reset();
   std::string user_id;
   bool fetch_succeeded = false;
diff --git a/chrome/browser/ash/policy/enrollment/enrollment_handler.cc b/chrome/browser/ash/policy/enrollment/enrollment_handler.cc
index 74b6cee2..dc09017 100644
--- a/chrome/browser/ash/policy/enrollment/enrollment_handler.cc
+++ b/chrome/browser/ash/policy/enrollment/enrollment_handler.cc
@@ -128,8 +128,10 @@
     }
   }
 
-  VLOG(1) << (block_devmode ? "Blocking" : "Allowing")
-          << " dev mode by device policy";
+  // TODO(crbug.com/1271134): Logging as "WARNING" to make sure it's preserved
+  // in the logs.
+  LOG(WARNING) << (block_devmode ? "Blocking" : "Allowing")
+               << " dev mode by device policy";
 
   return block_devmode;
 }
@@ -287,7 +289,9 @@
   CHECK_EQ(STEP_PENDING, enrollment_step_);
 
   if (enrollment_config_.skip_state_keys_request()) {
-    VLOG(1) << "Skipping state keys request.";
+    // TODO(crbug.com/1271134): Logging as "WARNING" to make sure it's preserved
+    // in the logs.
+    LOG(WARNING) << "Skipping state keys request.";
     SetStep(STEP_LOADING_STORE);
     StartRegistration();
     return;
@@ -308,7 +312,7 @@
     return;
   }
 
-  VLOG(1) << "Requesting state keys.";
+  LOG(WARNING) << "Requesting state keys.";
   state_keys_broker_->RequestStateKeys(
       base::BindOnce(&EnrollmentHandler::HandleStateKeysResult,
                      weak_ptr_factory_.GetWeakPtr()));
@@ -449,7 +453,9 @@
     }
   }
 
-  VLOG(1) << "State keys generated.";
+  // TODO(crbug.com/1271134): Logging as "WARNING" to make sure it's preserved
+  // in the logs.
+  LOG(WARNING) << "State keys generated.";
   SetStep(STEP_LOADING_STORE);
   StartRegistration();
 }
@@ -461,7 +467,12 @@
     // after the CloudPolicyStore has initialized.
     return;
   }
-  VLOG(1) << "Start registration, config mode = " << enrollment_config_.mode;
+
+  // TODO(crbug.com/1271134): Logging as "WARNING" to make sure it's preserved
+  // in the logs.
+  LOG(WARNING) << "Start registration, config mode = "
+               << enrollment_config_.mode;
+
   SetStep(STEP_REGISTRATION);
   if (enrollment_config_.is_mode_attestation()) {
     StartAttestationBasedEnrollmentFlow();
@@ -844,7 +855,11 @@
 
 void EnrollmentHandler::SetStep(EnrollmentStep step) {
   DCHECK_LE(enrollment_step_, step);
-  VLOG(1) << "Step: " << step;
+
+  // TODO(crbug.com/1271134): Logging as "WARNING" to make sure it's preserved
+  // in the logs.
+  LOG(WARNING) << "Step: " << step;
+
   enrollment_step_ = step;
 }
 
diff --git a/chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.cc b/chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.cc
index 42cc78d..10f8ce9 100644
--- a/chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.cc
+++ b/chrome/browser/ash/policy/enrollment/enrollment_requisition_manager.cc
@@ -103,7 +103,10 @@
 // static
 void EnrollmentRequisitionManager::SetDeviceRequisition(
     const std::string& requisition) {
-  VLOG(1) << "SetDeviceRequisition " << requisition;
+  // TODO(crbug.com/1271134): Logging as "WARNING" to make sure it's preserved
+  // in the logs.
+  LOG(WARNING) << "SetDeviceRequisition " << requisition;
+
   auto* local_state = g_browser_process->local_state();
   if (requisition.empty()) {
     local_state->ClearPref(prefs::kDeviceEnrollmentRequisition);
diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc
index 28a01dd..073e6ed5 100644
--- a/chrome/browser/chrome_browser_main_linux.cc
+++ b/chrome/browser/chrome_browser_main_linux.cc
@@ -30,6 +30,10 @@
 #include "chrome/installer/util/google_update_settings.h"
 #endif
 
+#if BUILDFLAG(IS_CHROMEOS_LACROS)
+#include "chromeos/lacros/dbus/lacros_dbus_thread_manager.h"
+#endif
+
 #if defined(USE_DBUS) && !defined(OS_CHROMEOS)
 #include "chrome/browser/dbus_memory_pressure_evaluator_linux.h"
 #endif
@@ -82,9 +86,12 @@
 }
 
 void ChromeBrowserMainPartsLinux::PostCreateMainMessageLoop() {
-#if !BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+  // No-op: Ash and Lacros Bluetooth DBusManager initialization depend on
+  // FeatureList, and is done elsewhere.
+#else
   bluez::BluezDBusManager::Initialize(nullptr /* system_bus */);
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop();
 }
@@ -105,13 +112,15 @@
 
   ChromeBrowserMainPartsPosix::PostBrowserStart();
 }
-#endif
+#endif  // defined(USE_DBUS) && !defined(OS_CHROMEOS)
 
 void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
-#if !BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+  // No-op; per PostBrowserStart() comment, this is done elsewhere.
+#else
   bluez::BluezDBusManager::Shutdown();
   bluez::BluezDBusThreadManager::Shutdown();
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   ChromeBrowserMainPartsPosix::PostDestroyThreads();
 }
diff --git a/chrome/browser/chromeos/extensions/default_app_order.cc b/chrome/browser/chromeos/extensions/default_app_order.cc
index ae634cd..28caa0f 100644
--- a/chrome/browser/chromeos/extensions/default_app_order.cc
+++ b/chrome/browser/chromeos/extensions/default_app_order.cc
@@ -239,11 +239,11 @@
         std::string app_id = i.GetString();
         app_ids_.push_back(app_id);
       } else if (i.GetAsDictionary(&dict)) {
-        bool flag = false;
-        if (dict->GetBoolean(kOemAppsFolderAttr, &flag) && flag) {
+        if (dict->FindBoolPath(kOemAppsFolderAttr).value_or(false)) {
           oem_apps_folder_name_ = GetLocaleSpecificStringImpl(
               dict, locale, kLocalizedContentAttr, kNameAttr);
-        } else if (dict->GetBoolean(kImportDefaultOrderAttr, &flag) && flag) {
+        } else if (dict->FindBoolPath(kImportDefaultOrderAttr)
+                       .value_or(false)) {
           GetDefault(&app_ids_);
         } else {
           LOG(ERROR) << "Invalid syntax in default_app_order.json";
diff --git a/chrome/browser/chromeos/extensions/external_cache_impl_unittest.cc b/chrome/browser/chromeos/extensions/external_cache_impl_unittest.cc
index 68acdc44..59f9bbc 100644
--- a/chrome/browser/chromeos/extensions/external_cache_impl_unittest.cc
+++ b/chrome/browser/chromeos/extensions/external_cache_impl_unittest.cc
@@ -28,10 +28,13 @@
 #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
 #include "services/network/public/mojom/url_loader_factory.mojom.h"
 #include "services/network/test/test_url_loader_factory.h"
+#include "testing/gmock/include/gmock/gmock-matchers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
+using ::testing::Optional;
+
 const char kTestExtensionId1[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
 const char kTestExtensionId2[] = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
 const char kTestExtensionId3[] = "cccccccccccccccccccccccccccccccc";
@@ -173,10 +176,9 @@
             nullptr);
   EXPECT_NE(entry1->FindKey(extensions::ExternalProviderImpl::kExternalVersion),
             nullptr);
-  bool from_webstore = false;
-  EXPECT_TRUE(entry1->GetBoolean(
-      extensions::ExternalProviderImpl::kIsFromWebstore, &from_webstore));
-  EXPECT_TRUE(from_webstore);
+  EXPECT_THAT(
+      entry1->FindBoolKey(extensions::ExternalProviderImpl::kIsFromWebstore),
+      Optional(true));
 
   // File in cache not from Webstore.
   const base::DictionaryValue* entry3 = NULL;
@@ -216,10 +218,9 @@
             nullptr);
   EXPECT_NE(entry2->FindKey(extensions::ExternalProviderImpl::kExternalVersion),
             nullptr);
-  from_webstore = false;
-  EXPECT_TRUE(entry2->GetBoolean(
-      extensions::ExternalProviderImpl::kIsFromWebstore, &from_webstore));
-  EXPECT_TRUE(from_webstore);
+  EXPECT_THAT(
+      entry2->FindBoolKey(extensions::ExternalProviderImpl::kIsFromWebstore),
+      Optional(true));
   EXPECT_TRUE(
       base::PathExists(GetExtensionFile(cache_dir, kTestExtensionId2, "2")));
 
diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/ImplicitPriceDropSubscriptionsManager.java b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/ImplicitPriceDropSubscriptionsManager.java
index 54aff89..05bc258 100644
--- a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/ImplicitPriceDropSubscriptionsManager.java
+++ b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/ImplicitPriceDropSubscriptionsManager.java
@@ -8,6 +8,7 @@
 
 import androidx.annotation.VisibleForTesting;
 
+import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.lifecycle.PauseResumeWithNativeObserver;
 import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
@@ -22,6 +23,7 @@
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModelObserver;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
+import org.chromium.chrome.browser.tasks.tab_management.PriceTrackingUtilities;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -98,21 +100,23 @@
     @VisibleForTesting
     void initializeSubscriptions() {
         if (!shouldInitializeSubscriptions()) return;
+        // TODO(crbug.com/1271234): Cleanup the usage of PriceDropNotificationManager. When user
+        // turns off price notification, we still subscribe for tabs. Now we call this method only
+        // to record notification opt-in metrics.
+        mPriceDropNotificationManager.canPostNotificationWithMetricsRecorded();
         Map<String, Tab> urlTabMapping = new HashMap<>();
         TabModel normalTabModel = mTabModelSelector.getModel(false);
         for (int index = 0; index < normalTabModel.getCount(); index++) {
             Tab tab = normalTabModel.getTabAt(index);
-            if (!hasOfferId(tab) || !isStaleTab(tab)) {
-                continue;
+            boolean tabEligible = hasOfferId(tab) && isStaleTab(tab);
+            RecordHistogram.recordBooleanHistogram(
+                    "Commerce.Subscriptions.TabEligible", tabEligible);
+            if (tabEligible) {
+                urlTabMapping.put(tab.getOriginalUrl().getSpec(), tab);
             }
-            urlTabMapping.put(tab.getOriginalUrl().getSpec(), tab);
         }
         List<CommerceSubscription> subscriptions = new ArrayList<>();
         for (Tab tab : urlTabMapping.values()) {
-            if (!hasOfferId(tab)) {
-                continue;
-            }
-
             CommerceSubscription subscription =
                     new CommerceSubscription(CommerceSubscriptionType.PRICE_TRACK,
                             ShoppingPersistedTabData.from(tab).getMainOfferId(),
@@ -157,7 +161,7 @@
     }
 
     private boolean shouldInitializeSubscriptions() {
-        if ((!mPriceDropNotificationManager.canPostNotificationWithMetricsRecorded())
+        if ((!PriceTrackingUtilities.isPriceDropNotificationEligible())
                 || (System.currentTimeMillis()
                                 - mSharedPreferencesManager.readLong(
                                         CHROME_MANAGED_SUBSCRIPTIONS_TIMESTAMP, -1)
diff --git a/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/ImplicitPriceDropSubscriptionsManagerUnitTest.java b/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/ImplicitPriceDropSubscriptionsManagerUnitTest.java
index 173becc..e02183a 100644
--- a/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/ImplicitPriceDropSubscriptionsManagerUnitTest.java
+++ b/chrome/browser/commerce/subscriptions/test/android/java/src/org/chromium/chrome/browser/subscriptions/ImplicitPriceDropSubscriptionsManagerUnitTest.java
@@ -32,6 +32,8 @@
 import org.chromium.base.Callback;
 import org.chromium.base.FeatureList;
 import org.chromium.base.UserDataHost;
+import org.chromium.base.metrics.RecordHistogram;
+import org.chromium.base.metrics.test.ShadowRecordHistogram;
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
@@ -61,7 +63,7 @@
  * Tests for {@link ImplicitPriceDropSubscriptionsManager}.
  */
 @RunWith(BaseRobolectricTestRunner.class)
-@Config(manifest = Config.NONE)
+@Config(manifest = Config.NONE, shadows = {ShadowRecordHistogram.class})
 public class ImplicitPriceDropSubscriptionsManagerUnitTest {
     @Rule
     public TestRule mProcessor = new Features.JUnitProcessor();
@@ -74,6 +76,7 @@
     private static final int POSITION2 = 1;
     private static final String OFFER1_ID = "offer_foo";
     private static final String OFFER2_ID = "offer_bar";
+    private static final String TAB_ELIGIBLE_HISTOGRAM = "Commerce.Subscriptions.TabEligible";
 
     @Mock
     TabModel mTabModel;
@@ -110,6 +113,7 @@
 
     @Before
     public void setUp() {
+        ShadowRecordHistogram.reset();
         MockitoAnnotations.initMocks(this);
         mTab1 = prepareTab(
                 TAB1_ID, URL1, POSITION1, mCriticalPersistedTabData1, mShoppingPersistedTabData1);
@@ -181,6 +185,7 @@
 
         mImplicitSubscriptionsManager.initializeSubscriptions();
 
+        verifyEligibleSubscriptionMetrics(2, 2);
         verify(mSubscriptionsManager)
                 .subscribe(eq(new ArrayList<>(Arrays.asList(mSubscription1, mSubscription2))),
                         any(Callback.class));
@@ -196,6 +201,7 @@
 
         mImplicitSubscriptionsManager.initializeSubscriptions();
 
+        verifyEligibleSubscriptionMetrics(0, 0);
         verify(mSubscriptionsManager, times(0)).subscribe(any(List.class), any(Callback.class));
     }
 
@@ -208,6 +214,7 @@
 
         mImplicitSubscriptionsManager.initializeSubscriptions();
 
+        verifyEligibleSubscriptionMetrics(2, 2);
         verify(mSubscriptionsManager)
                 .subscribe(eq(new ArrayList<>(Arrays.asList(mSubscription2))), any(Callback.class));
     }
@@ -218,6 +225,7 @@
 
         mImplicitSubscriptionsManager.initializeSubscriptions();
 
+        verifyEligibleSubscriptionMetrics(1, 2);
         verify(mSubscriptionsManager)
                 .subscribe(eq(new ArrayList<>(Arrays.asList(mSubscription2))), any(Callback.class));
     }
@@ -232,6 +240,7 @@
 
         mImplicitSubscriptionsManager.initializeSubscriptions();
 
+        verifyEligibleSubscriptionMetrics(1, 2);
         verify(mSubscriptionsManager)
                 .subscribe(eq(new ArrayList<>(Arrays.asList(mSubscription2))), any(Callback.class));
     }
@@ -242,6 +251,7 @@
 
         mImplicitSubscriptionsManager.initializeSubscriptions();
 
+        verifyEligibleSubscriptionMetrics(1, 2);
         verify(mSubscriptionsManager)
                 .subscribe(eq(new ArrayList<>(Arrays.asList(mSubscription2))), any(Callback.class));
     }
@@ -254,13 +264,28 @@
 
         mImplicitSubscriptionsManager.initializeSubscriptions();
 
+        verifyEligibleSubscriptionMetrics(0, 0);
         verify(mSubscriptionsManager, times(0)).subscribe(any(List.class), any(Callback.class));
     }
 
     @Test
+    public void testInitialSubscription_NotificationDisabled() {
+        mMockNotificationManager.setNotificationsEnabled(false);
+
+        mImplicitSubscriptionsManager.initializeSubscriptions();
+
+        // We still subscribe for tabs when user turns off notifications.
+        verifyEligibleSubscriptionMetrics(2, 2);
+        verify(mSubscriptionsManager)
+                .subscribe(eq(new ArrayList<>(Arrays.asList(mSubscription1, mSubscription2))),
+                        any(Callback.class));
+    }
+
+    @Test
     public void testInitialSubscription_OnResume() {
         mPauseResumeWithNativeObserverCaptor.getValue().onResumeWithNative();
 
+        verifyEligibleSubscriptionMetrics(2, 2);
         verify(mSubscriptionsManager)
                 .subscribe(eq(new ArrayList<>(Arrays.asList(mSubscription1, mSubscription2))),
                         any(Callback.class));
@@ -323,4 +348,11 @@
         doReturn(userDataHost).when(tab).getUserDataHost();
         return tab;
     }
+
+    private void verifyEligibleSubscriptionMetrics(int eligibleCount, int totalCount) {
+        assertThat(RecordHistogram.getHistogramValueCountForTesting(TAB_ELIGIBLE_HISTOGRAM, 1),
+                equalTo(eligibleCount));
+        assertThat(RecordHistogram.getHistogramTotalCountForTesting(TAB_ELIGIBLE_HISTOGRAM),
+                equalTo(totalCount));
+    }
 }
diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
index 553e97d7..a5c9cb3 100644
--- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
+++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
@@ -87,6 +87,8 @@
     std::string text,
     BinaryUploadService::ContentAnalysisCallback callback)
     : Request(std::move(callback), analysis_url) {
+  data_.size = text.size();
+
   // Only remember strings less than the maximum allowed.
   if (text.size() < BinaryUploadService::kMaxUploadSizeBytes) {
     data_.contents = std::move(text);
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/BUILD.gn b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/BUILD.gn
index f3d3077..d0c9564dd 100644
--- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/BUILD.gn
+++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/BUILD.gn
@@ -46,6 +46,7 @@
   public_deps = [
     ":browser",
     "//components/enterprise",
+    "//components/policy/proto",
     "//testing/gmock",
   ]
 }
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.cc
index 2dbacc57..8293585d 100644
--- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.cc
+++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.cc
@@ -95,9 +95,14 @@
                                    std::move(callback)));
 }
 
-bool DeviceTrustKeyManagerImpl::IsFullyInitialized() const {
-  return state_ == InitializationState::kDefault && key_pair_ &&
-         key_pair_->key();
+absl::optional<DeviceTrustKeyManagerImpl::KeyMetadata>
+DeviceTrustKeyManagerImpl::GetLoadedKeyMetadata() const {
+  if (!IsFullyInitialized()) {
+    return absl::nullopt;
+  }
+
+  return DeviceTrustKeyManagerImpl::KeyMetadata{key_pair_->trust_level(),
+                                                key_pair_->key()->Algorithm()};
 }
 
 void DeviceTrustKeyManagerImpl::AddPendingRequest(
@@ -211,4 +216,9 @@
   }
 }
 
+bool DeviceTrustKeyManagerImpl::IsFullyInitialized() const {
+  return state_ == InitializationState::kDefault && key_pair_ &&
+         key_pair_->key();
+}
+
 }  // namespace enterprise_connectors
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h
index 96e9194..f652582 100644
--- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h
+++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h
@@ -39,7 +39,7 @@
   void ExportPublicKeyAsync(ExportPublicKeyCallback callback) override;
   void SignStringAsync(const std::string& str,
                        SignStringCallback callback) override;
-  bool IsFullyInitialized() const override;
+  absl::optional<KeyMetadata> GetLoadedKeyMetadata() const override;
 
  private:
   enum class InitializationState { kDefault, kLoadingKey, kRotatingKey };
@@ -74,6 +74,8 @@
   void ResumeExportPublicKey(ExportPublicKeyCallback callback);
   void ResumeSignString(const std::string& str, SignStringCallback callback);
 
+  bool IsFullyInitialized() const;
+
   // Owned instance in charge of creating and launching key rotation commands.
   std::unique_ptr<KeyRotationLauncher> key_rotation_launcher_;
 
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/mock_device_trust_key_manager.h b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/mock_device_trust_key_manager.h
index c4dbd92..527dc662 100644
--- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/mock_device_trust_key_manager.h
+++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/mock_device_trust_key_manager.h
@@ -31,7 +31,10 @@
                base::OnceCallback<void(absl::optional<std::vector<uint8_t>>)>),
               (override));
 
-  MOCK_METHOD(bool, IsFullyInitialized, (), (const, override));
+  MOCK_METHOD(absl::optional<MockDeviceTrustKeyManager::KeyMetadata>,
+              GetLoadedKeyMetadata,
+              (),
+              (const, override));
 };
 
 }  // namespace test
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index c7626be..b20c834 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -4124,13 +4124,6 @@
     "Enable chrome://audio that is designed for debugging ChromeOS audio "
     "issues";
 
-const char kBluetoothAdvertisementMonitoringName[] =
-    "Bluetooth Advertisement Monitoring";
-const char kBluetoothAdvertisementMonitoringDescription[] =
-    "Advertisement monitoring allows applications to register low energy "
-    "scanners that filter low energy advertisements in a power-efficient "
-    "manner.";
-
 const char kBluetoothFixA2dpPacketSizeName[] = "Bluetooth fix A2DP packet size";
 const char kBluetoothFixA2dpPacketSizeDescription[] =
     "Fixes Bluetooth A2DP packet size to a smaller default value to improve "
@@ -5247,6 +5240,13 @@
     "chrome://flags/#enable-migrate-default-chrome-app-to-web-apps-non-gsuite) "
     "are ignored for managed Chrome OS users unless this feature is enabled.";
 
+const char kBluetoothAdvertisementMonitoringName[] =
+    "Bluetooth Advertisement Monitoring";
+const char kBluetoothAdvertisementMonitoringDescription[] =
+    "Advertisement monitoring allows applications to register low energy "
+    "scanners that filter low energy advertisements in a power-efficient "
+    "manner.";
+
 const char kDefaultCalculatorWebAppName[] = "Default install Calculator PWA";
 const char kDefaultCalculatorWebAppDescription[] =
     "Enable default installing of the calculator PWA instead of the deprecated "
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 920d582..e03ec56 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -2377,9 +2377,6 @@
 extern const char kAudioUrlName[];
 extern const char kAudioUrlDescription[];
 
-extern const char kBluetoothAdvertisementMonitoringName[];
-extern const char kBluetoothAdvertisementMonitoringDescription[];
-
 extern const char kBluetoothFixA2dpPacketSizeName[];
 extern const char kBluetoothFixA2dpPacketSizeDescription[];
 
@@ -3035,6 +3032,9 @@
 extern const char
     kAllowDefaultWebAppMigrationForChromeOsManagedUsersDescription[];
 
+extern const char kBluetoothAdvertisementMonitoringName[];
+extern const char kBluetoothAdvertisementMonitoringDescription[];
+
 extern const char kDefaultCalculatorWebAppName[];
 extern const char kDefaultCalculatorWebAppDescription[];
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/chrome/browser/media/webrtc/display_media_access_handler.cc b/chrome/browser/media/webrtc/display_media_access_handler.cc
index 2d43714..3d858ae2 100644
--- a/chrome/browser/media/webrtc/display_media_access_handler.cc
+++ b/chrome/browser/media/webrtc/display_media_access_handler.cc
@@ -143,7 +143,8 @@
   // which might be confusing for the users. See https://crbug.com/1407733 for
   // details.
   // TODO(emircan): Remove this once Mac UI doesn't use a window.
-  if (web_contents->GetVisibility() != content::Visibility::VISIBLE) {
+  if (web_contents->GetVisibility() != content::Visibility::VISIBLE &&
+      request.request_type != blink::MEDIA_DEVICE_UPDATE) {
     LOG(ERROR) << "Do not allow getDisplayMedia() on a backgrounded page.";
     std::move(callback).Run(
         blink::MediaStreamDevices(),
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/BUILD.gn b/chrome/browser/resources/chromeos/accessibility/accessibility_common/BUILD.gn
index 50e8cf01..6d3f231 100644
--- a/chrome/browser/resources/chromeos/accessibility/accessibility_common/BUILD.gn
+++ b/chrome/browser/resources/chromeos/accessibility/accessibility_common/BUILD.gn
@@ -43,17 +43,17 @@
     "dictation/earcons/audio_initiate.wav",
     "dictation/earcons/null_selection.wav",
     "dictation/input_controller.js",
-    "dictation/input_text_strategy.js",
     "dictation/macros/input_text_view_macro.js",
     "dictation/macros/list_commands_macro.js",
     "dictation/macros/macro.js",
     "dictation/macros/macro_names.js",
     "dictation/macros/repeatable_key_press_macro.js",
     "dictation/metrics_utils.js",
-    "dictation/parse_strategy.js",
-    "dictation/pumpkin_parse_strategy.js",
-    "dictation/simple_parse_strategy.js",
-    "dictation/speech_parser.js",
+    "dictation/parse/input_text_strategy.js",
+    "dictation/parse/parse_strategy.js",
+    "dictation/parse/pumpkin_parse_strategy.js",
+    "dictation/parse/simple_parse_strategy.js",
+    "dictation/parse/speech_parser.js",
     "magnifier/magnifier.js",
   ]
   rewrite_rules = [
@@ -63,14 +63,14 @@
 }
 
 if (enable_pumpkin_for_dictation) {
-  pumpkin_output_dir = "$accessibility_common_dir/dictation/pumpkin"
+  pumpkin_output_dir = "$accessibility_common_dir/dictation/parse/pumpkin"
 
   action("unzip_pumpkin_files") {
-    script = "dictation/pumpkin/unzip_pumpkin.py"
-    sources = [ "dictation/pumpkin/pumpkin_files.zip" ]
+    script = "dictation/parse/pumpkin/unzip_pumpkin.py"
+    sources = [ "dictation/parse/pumpkin/pumpkin_files.zip" ]
     args = [
-      "--output-dir=resources/chromeos/accessibility/accessibility_common/dictation/pumpkin",
-      rebase_path("dictation/pumpkin/pumpkin_files.zip", root_build_dir),
+      "--output-dir=resources/chromeos/accessibility/accessibility_common/dictation/parse/pumpkin",
+      rebase_path("dictation/parse/pumpkin/pumpkin_files.zip", root_build_dir),
     ]
     outputs = [
       "$pumpkin_output_dir/js_pumpkin_tagger_bin.js",
@@ -84,12 +84,13 @@
 
 copy("pumpkin_availability_files") {
   if (enable_pumpkin_for_dictation) {
-    sources = [ "dictation/pumpkin/include_pumpkin.js" ]
+    sources = [ "dictation/parse/pumpkin/include_pumpkin.js" ]
   } else {
-    sources = [ "dictation/pumpkin/exclude_pumpkin.js" ]
+    sources = [ "dictation/parse/pumpkin/exclude_pumpkin.js" ]
   }
-  outputs =
-      [ "$accessibility_common_dir/dictation/pumpkin/pumpkin_availability.js" ]
+  outputs = [
+    "$accessibility_common_dir/dictation/parse/pumpkin/pumpkin_availability.js",
+  ]
 }
 
 source_set("browser_tests") {
@@ -194,14 +195,14 @@
 js_library("dictation") {
   sources = [ "dictation/dictation.js" ]
   deps = [
-    ":dictation_commands",
     ":dictation_input_controller",
     ":dictation_metrics",
+    ":speech_parsing",
   ]
   externs_list = [
     "$externs_path/accessibility_private.js",
     "$externs_path/speech_recognition_private.js",
-    "dictation/pumpkin/pumpkin_tagger_externs.js",
+    "dictation/parse/pumpkin/pumpkin_tagger_externs.js",
   ]
 }
 
@@ -228,18 +229,18 @@
   ]
 }
 
-js_library("dictation_commands") {
+js_library("speech_parsing") {
   sources = [
-    "dictation/input_text_strategy.js",
-    "dictation/parse_strategy.js",
-    "dictation/pumpkin_parse_strategy.js",
-    "dictation/simple_parse_strategy.js",
-    "dictation/speech_parser.js",
+    "dictation/parse/input_text_strategy.js",
+    "dictation/parse/parse_strategy.js",
+    "dictation/parse/pumpkin_parse_strategy.js",
+    "dictation/parse/simple_parse_strategy.js",
+    "dictation/parse/speech_parser.js",
   ]
   if (enable_pumpkin_for_dictation) {
-    sources += [ "dictation/pumpkin/include_pumpkin.js" ]
+    sources += [ "dictation/parse/pumpkin/include_pumpkin.js" ]
   } else {
-    sources += [ "dictation/pumpkin/exclude_pumpkin.js" ]
+    sources += [ "dictation/parse/pumpkin/exclude_pumpkin.js" ]
   }
   deps = [
     ":dictation_input_controller",
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/dictation.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/dictation.js
index 3de7180..64223ee 100644
--- a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/dictation.js
+++ b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/dictation.js
@@ -6,7 +6,7 @@
 import {Macro} from './macros/macro.js';
 import {MacroName} from './macros/macro_names.js';
 import {MetricsUtils} from './metrics_utils.js';
-import {SpeechParser} from './speech_parser.js';
+import {SpeechParser} from './parse/speech_parser.js';
 
 const ErrorEvent = chrome.speechRecognitionPrivate.SpeechRecognitionErrorEvent;
 const ResultEvent =
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/input_text_strategy.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/input_text_strategy.js
deleted file mode 100644
index b389743..0000000
--- a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/input_text_strategy.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2021 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import {InputController} from './input_controller.js';
-import {InputTextViewMacro} from './macros/input_text_view_macro.js';
-import {ParseStrategy} from './parse_strategy.js';
-
-/** A parsing strategy that tells text to be input as-is. */
-export class InputTextStrategy extends ParseStrategy {
-  /** @param {!InputController} inputController */
-  constructor(inputController) {
-    super(inputController, false);
-  }
-
-  /** @override */
-  async parse(text) {
-    return new InputTextViewMacro(text, this.getInputController());
-  }
-}
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/input_text_strategy.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/input_text_strategy.js
new file mode 100644
index 0000000..66f26e4
--- /dev/null
+++ b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/input_text_strategy.js
@@ -0,0 +1,20 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import {InputController} from './../input_controller.js';
+import {InputTextViewMacro} from './../macros/input_text_view_macro.js';
+import {ParseStrategy} from './parse_strategy.js';
+
+/** A parsing strategy that tells text to be input as-is. */
+export class InputTextStrategy extends ParseStrategy {
+  /** @param {!InputController} inputController */
+  constructor(inputController) {
+    super(inputController, false);
+  }
+
+  /** @override */
+  async parse(text) {
+    return new InputTextViewMacro(text, this.getInputController());
+  }
+}
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/parse_strategy.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/parse_strategy.js
new file mode 100644
index 0000000..f2762ef
--- /dev/null
+++ b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/parse_strategy.js
@@ -0,0 +1,45 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/**
+ * @fileoverview Defines a base class that represents a strategy for parsing
+ * text and converting it into a macro.
+ */
+
+import {InputController} from './../input_controller.js';
+import {Macro} from './../macros/macro.js';
+
+/**
+ * Represents a strategy for parsing speech input and converting it into a
+ * Macro.
+ */
+export class ParseStrategy {
+  /**
+   * @param {!InputController} inputController
+   * @param {boolean} isRTLLocale
+   */
+  constructor(inputController, isRTLLocale) {
+    /** @private {!InputController} */
+    this.inputController_ = inputController;
+    /** @private {boolean} */
+    this.isRTLLocale_ = isRTLLocale;
+  }
+
+  /** @return {!InputController} */
+  getInputController() {
+    return this.inputController_;
+  }
+
+  /** @return {boolean} */
+  getIsRTLLocale() {
+    return this.isRTLLocale_;
+  }
+
+  /**
+   * Accepts text, parses it, and returns a Macro.
+   * @param {string} text
+   * @return {!Promise<?Macro>}
+   */
+  async parse(text) {}
+}
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/pumpkin/exclude_pumpkin.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/pumpkin/exclude_pumpkin.js
similarity index 100%
rename from chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/pumpkin/exclude_pumpkin.js
rename to chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/pumpkin/exclude_pumpkin.js
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/pumpkin/include_pumpkin.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/pumpkin/include_pumpkin.js
similarity index 100%
rename from chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/pumpkin/include_pumpkin.js
rename to chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/pumpkin/include_pumpkin.js
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/pumpkin/pumpkin_files.zip b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/pumpkin/pumpkin_files.zip
similarity index 100%
rename from chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/pumpkin/pumpkin_files.zip
rename to chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/pumpkin/pumpkin_files.zip
Binary files differ
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/pumpkin/pumpkin_tagger_externs.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/pumpkin/pumpkin_tagger_externs.js
similarity index 100%
rename from chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/pumpkin/pumpkin_tagger_externs.js
rename to chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/pumpkin/pumpkin_tagger_externs.js
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/pumpkin/unzip_pumpkin.py b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/pumpkin/unzip_pumpkin.py
similarity index 100%
rename from chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/pumpkin/unzip_pumpkin.py
rename to chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/pumpkin/unzip_pumpkin.py
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/pumpkin_parse_strategy.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/pumpkin_parse_strategy.js
new file mode 100644
index 0000000..25a2674
--- /dev/null
+++ b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/pumpkin_parse_strategy.js
@@ -0,0 +1,259 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/**
+ * @fileoverview Defines a strategy for parsing text that utilizes the pumpkin
+ * semantic parser.
+ */
+
+import {InputController} from './../input_controller.js';
+import {InputTextViewMacro} from './../macros/input_text_view_macro.js';
+import {ListCommandsMacro} from './../macros/list_commands_macro.js';
+import {Macro} from './../macros/macro.js';
+import {MacroName} from './../macros/macro_names.js';
+import * as RepeatableKeyPressMacro from './../macros/repeatable_key_press_macro.js';
+import {ParseStrategy} from './parse_strategy.js';
+// PumpkinAvailability is based on the gn argument enable_pumpkin_for_dictation,
+// and pumpkin_availability.js is copied from either include_pumpkin.js
+// or exclude_pumpkin.js in the BUILD rule.
+import {PumpkinAvailability} from './pumpkin/pumpkin_availability.js';
+
+/** A parsing strategy that utilizes the Pumpkin semantic parser. */
+export class PumpkinParseStrategy extends ParseStrategy {
+  /**
+   * @param {!InputController} inputController
+   * @param {boolean} isRTLLocale
+   * @param {string} locale
+   * @return {!Promise<!PumpkinParseStrategy>}
+   */
+  static async create(inputController, isRTLLocale, locale) {
+    const instance = new PumpkinParseStrategy(inputController, isRTLLocale);
+    if (PumpkinAvailability.usePumpkin(locale)) {
+      await instance.initPumpkin_(PumpkinAvailability.LOCALES[locale]);
+    }
+
+    return instance;
+  }
+
+  /**
+   * @param {!InputController} inputController
+   * @param {boolean} isRTLLocale
+   * @private
+   */
+  constructor(inputController, isRTLLocale) {
+    super(inputController, isRTLLocale);
+
+    /** @private {speech.pumpkin.api.js.PumpkinTagger.PumpkinTagger} */
+    this.pumpkinTagger_ = null;
+
+    /** @private {?Promise} */
+    this.pumpkinLoadingPromise_ = null;
+  }
+
+  /**
+   * Initializes Pumpkin by loading the required scripts and creating the
+   * PumpkinTagger object.
+   * @param {string} locale The locale in which to init Pumpkin actions.
+   * @return {!Promise<undefined>}
+   * @private
+   */
+  async initPumpkin_(locale) {
+    if (this.pumpkinLoadingPromise_) {
+      // Already initializing.
+      return;
+    }
+
+    this.pumpkinLoadingPromise_ =
+        new Promise(async (pumpkinLoadResolve, pumpkinLoadReject) => {
+          // Check for objects defined by the Pumpkin WASM.
+          if (!goog || !goog['global'] || !goog['global']['Module']) {
+            await this.loadPumpkinScripts_();
+          }
+          const success = await this.createPumpkinTagger_(locale);
+          if (success) {
+            pumpkinLoadResolve();
+          } else {
+            pumpkinLoadReject();
+          }
+        });
+  }
+
+  /**
+   * Creates a PumpkinTagger from a config and action frame file for a
+   * particular locale.
+   * @param {string} locale The locale in which to init Pumpkin actions.
+   * @return {!Promise<boolean>} Whether the tagger was created successfully.
+   * @private
+   */
+  async createPumpkinTagger_(locale) {
+    const pumpkinTagger =
+        new speech.pumpkin.api.js.PumpkinTagger.PumpkinTagger();
+    try {
+      const path = `dictation/pumpkin/${locale}/`;
+      let success = await pumpkinTagger.initializeFromPumpkinConfig(
+          `${path}pumpkin_config.binarypb`);
+      if (!success) {
+        console.warn('Failed to load PumpkinTagger from PumpkinConfig.');
+        return false;
+      }
+      success =
+          await pumpkinTagger.loadActionFrame(`${path}action_config.binarypb`);
+      if (!success) {
+        console.warn('Failed to load Pumpkin ActionConfig.');
+        return false;
+      }
+    } catch (e) {
+      console.warn('Error initializing PumpkinTagger', e);
+      return false;
+    }
+    this.pumpkinTagger_ = pumpkinTagger;
+    return true;
+  }
+
+  /**
+   * Loads the Pumpkin scripts javascript in to the document.
+   * @return {!Promise<undefined>}
+   * @private
+   */
+  async loadPumpkinScripts_() {
+    const pumpkinTaggerScript =
+        /** @type {!HTMLScriptElement} */ (document.createElement('script'));
+    pumpkinTaggerScript.src = 'dictation/pumpkin/js_pumpkin_tagger_bin.js';
+    const taggerLoadPromise = new Promise((resolve, reject) => {
+      pumpkinTaggerScript.addEventListener('load', () => {
+        resolve();
+      });
+    });
+    document.head.appendChild(pumpkinTaggerScript);
+    await taggerLoadPromise;
+
+    const wasmModuleScript =
+        /** @type {!HTMLScriptElement} */ (document.createElement('script'));
+    wasmModuleScript.src = 'dictation/pumpkin/tagger_wasm_main.js';
+    const moduleLoadPromise = new Promise((resolve, reject) => {
+      goog['global']['Module'] = {
+        onRuntimeInitialized() {
+          resolve();
+        }
+      };
+    });
+    document.head.appendChild(wasmModuleScript);
+    await moduleLoadPromise;
+  }
+
+  /**
+   * In Android Voice Access, Pumpkin Hypotheses will be converted to UserIntent
+   * protos before being passed to Macros.
+   * @param {proto.speech.pumpkin.HypothesisResult.ObjectFormat} hypothesis
+   * @return {?Macro} The macro matching the hypothesis if one can be found.
+   * @private
+   */
+  macroFromPumpkinHypothesis_(hypothesis) {
+    const numArgs = hypothesis.actionArgumentList.length;
+    if (!numArgs) {
+      return null;
+    }
+    let repeat = 1;
+    let text = '';
+    let tag = '';
+    for (let i = 0; i < numArgs; i++) {
+      const argument = hypothesis.actionArgumentList[i];
+      // See Variable Argument Placeholders in voiceaccess.patterns_template.
+      if (argument.name ===
+          PumpkinParseStrategy.HypothesisArgumentName.SEM_TAG) {
+        tag = MacroName[argument.value];
+      } else if (
+          argument.name ===
+          PumpkinParseStrategy.HypothesisArgumentName.NUM_ARG) {
+        repeat = argument.value;
+      } else if (
+          argument.name ===
+          PumpkinParseStrategy.HypothesisArgumentName.OPEN_ENDED_TEXT) {
+        text = argument.value;
+      }
+    }
+    switch (tag) {
+      case MacroName.INPUT_TEXT_VIEW:
+        return new InputTextViewMacro(text, this.getInputController());
+      case MacroName.DELETE_PREV_CHAR:
+        return new RepeatableKeyPressMacro.DeletePreviousCharacterMacro(repeat);
+      case MacroName.NAV_PREV_CHAR:
+        return new RepeatableKeyPressMacro.NavPreviousCharMacro(
+            this.getIsRTLLocale(), repeat);
+      case MacroName.NAV_NEXT_CHAR:
+        return new RepeatableKeyPressMacro.NavNextCharMacro(
+            this.getIsRTLLocale(), repeat);
+      case MacroName.NAV_PREV_LINE:
+        return new RepeatableKeyPressMacro.NavPreviousLineMacro(repeat);
+      case MacroName.NAV_NEXT_LINE:
+        return new RepeatableKeyPressMacro.NavNextLineMacro(repeat);
+      case MacroName.COPY_SELECTED_TEXT:
+        return new RepeatableKeyPressMacro.CopySelectedTextMacro();
+      case MacroName.PASTE_TEXT:
+        return new RepeatableKeyPressMacro.PasteTextMacro();
+      case MacroName.CUT_SELECTED_TEXT:
+        return new RepeatableKeyPressMacro.CutSelectedTextMacro();
+      case MacroName.UNDO_TEXT_EDIT:
+        return new RepeatableKeyPressMacro.UndoTextEditMacro();
+      case MacroName.REDO_ACTION:
+        return new RepeatableKeyPressMacro.RedoActionMacro();
+      case MacroName.SELECT_ALL_TEXT:
+        return new RepeatableKeyPressMacro.SelectAllTextMacro();
+      case MacroName.UNSELECT_TEXT:
+        return new RepeatableKeyPressMacro.UnselectTextMacro(
+            this.getIsRTLLocale());
+      case MacroName.LIST_COMMANDS:
+        return new ListCommandsMacro();
+      default:
+        // Every hypothesis is guaranteed to include a semantic tag due to the
+        // way Voice Access set up its grammars. Not all tags are supported in
+        // Dictation yet.
+        console.log('Unsupported Pumpkin action: ', tag);
+        return null;
+    }
+  }
+
+  /** @override */
+  async parse(text) {
+    // Pumpkin load requires several async calls. If the request to parse
+    // comes before load is complete, wait for load. This happens during
+    // browser tests which may be fast enough to start sending speech text
+    // before callbacks with user prefs have completed.
+    if (this.pumpkinLoadingPromise_) {
+      await this.pumpkinLoadingPromise_;
+    }
+
+    // Try to get results from Pumpkin.
+    // TODO(crbug.com/1264544): Could increase the hypotheses count from 1
+    // when we are ready to implement disambiguation.
+    if (this.pumpkinTagger_) {
+      // Try to get results from Pumpkin.
+      // TODO(crbug.com/1264544): Could increase the hypotheses count from 1
+      // when we are ready to implement disambiguation.
+      const taggerResults =
+          this.pumpkinTagger_.tagAndGetNBestHypotheses(text, 1);
+      if (taggerResults && taggerResults.hypothesisList.length > 0) {
+        const macro =
+            this.macroFromPumpkinHypothesis_(taggerResults.hypothesisList[0]);
+        if (macro) {
+          return macro;
+        }
+      }
+    }
+
+    return null;
+  }
+}
+
+/**
+ * PumpkinTagger Hypothesis argument names. These should match the variable
+ * argument placeholders in voiceaccess.patterns_template and the static strings
+ * defined in voiceaccess/utils/PumpkinUtils.java in google3.
+ * @enum {string}
+ */
+PumpkinParseStrategy.HypothesisArgumentName = {
+  SEM_TAG: 'SEM_TAG',
+  NUM_ARG: 'NUM_ARG',
+  OPEN_ENDED_TEXT: 'OPEN_ENDED_TEXT',
+};
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/simple_parse_strategy.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/simple_parse_strategy.js
new file mode 100644
index 0000000..878067a0
--- /dev/null
+++ b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/simple_parse_strategy.js
@@ -0,0 +1,212 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/**
+ * @fileoverview Defines a simple strategy for parsing text and converting
+ * it into a Macro.
+ */
+
+import {InputController} from './../input_controller.js';
+import {InputTextViewMacro, NewLineMacro} from './../macros/input_text_view_macro.js';
+import {ListCommandsMacro} from './../macros/list_commands_macro.js';
+import {Macro} from './../macros/macro.js';
+import {MacroName} from './../macros/macro_names.js';
+import * as RepeatableKeyPressMacro from './../macros/repeatable_key_press_macro.js';
+import {ParseStrategy} from './parse_strategy.js';
+
+/**
+ * @typedef {{
+ *   messageId: string,
+ *   build: Function,
+ * }}
+ */
+let MacroData;
+
+/**
+ * SimpleMacroFactory converts spoken strings into Macros using string matching.
+ */
+class SimpleMacroFactory {
+  /**
+   * @param {!MacroName} macroName
+   * @param {!InputController} inputController
+   * @param {boolean} isRTLLocale
+   */
+  constructor(macroName, inputController, isRTLLocale) {
+    /** @private {!MacroName} */
+    this.macroName_ = macroName;
+    /** @private {!InputController} */
+    this.inputController_ = inputController;
+    /** @private {boolean} */
+    this.isRTLLocale_ = isRTLLocale;
+
+    if (!SimpleMacroFactory.getData_()[this.macroName_]) {
+      throw new Error(
+          'Macro is not supported by SimpleMacroFactory: ' + this.macroName_);
+    }
+
+    /** @private {string} */
+    this.commandString_ = chrome.i18n.getMessage(
+        SimpleMacroFactory.getData_()[this.macroName_].messageId);
+  }
+
+  /** @return {Macro} */
+  createMacro() {
+    const args = [];
+    switch (this.macroName_) {
+      case MacroName.NAV_PREV_CHAR:
+      case MacroName.NAV_NEXT_CHAR:
+      case MacroName.UNSELECT_TEXT:
+        args.push(this.isRTLLocale_);
+        break;
+      case MacroName.NEW_LINE:
+        args.push(this.inputController_);
+        break;
+    }
+
+    const data = SimpleMacroFactory.getData_();
+    return new data[this.macroName_].build(...args);
+  }
+
+  /**
+   * Checks whether a string matches `commandString_`, ignoring case and
+   * whitespace.
+   * @param {string} text
+   * @return {boolean}
+   */
+  matchesMacro(text) {
+    return text.trim().toLowerCase() === this.commandString_;
+  }
+
+  // TODO(crbug.com/1216111): Create a factory for InputTextViewMacro and remove
+  // this method.
+  /**
+   * Checks whether a string matches a request to type a command, i.e. for the
+   * command 'delete', it would match 'type delete', ignoring case and
+   * whitespace.
+   * @param {string} text
+   * @return {boolean}
+   */
+  matchesInputTextViewMacro(text) {
+    const expected = chrome.i18n.getMessage(
+        'dictation_command_input_text_view', this.commandString_);
+    return text.trim().toLowerCase() === expected;
+  }
+
+  /** @return {string} */
+  getCommandString() {
+    return this.commandString_;
+  }
+
+  /**
+   * @return {Object<MacroName, MacroData>}
+   * @private
+   */
+  static getData_() {
+    return {
+      [MacroName.DELETE_PREV_CHAR]: {
+        messageId: 'dictation_command_delete_prev_char',
+        build: RepeatableKeyPressMacro.DeletePreviousCharacterMacro
+      },
+      [MacroName.NAV_PREV_CHAR]: {
+        messageId: 'dictation_command_nav_prev_char',
+        build: RepeatableKeyPressMacro.NavPreviousCharMacro
+      },
+      [MacroName.NAV_NEXT_CHAR]: {
+        messageId: 'dictation_command_nav_next_char',
+        build: RepeatableKeyPressMacro.NavNextCharMacro
+      },
+      [MacroName.NAV_PREV_LINE]: {
+        messageId: 'dictation_command_nav_prev_line',
+        build: RepeatableKeyPressMacro.NavPreviousLineMacro
+      },
+      [MacroName.NAV_NEXT_LINE]: {
+        messageId: 'dictation_command_nav_next_line',
+        build: RepeatableKeyPressMacro.NavNextLineMacro
+      },
+      [MacroName.COPY_SELECTED_TEXT]: {
+        messageId: 'dictation_command_copy_selected_text',
+        build: RepeatableKeyPressMacro.CopySelectedTextMacro
+      },
+      [MacroName.PASTE_TEXT]: {
+        messageId: 'dictation_command_paste_text',
+        build: RepeatableKeyPressMacro.PasteTextMacro
+      },
+      [MacroName.CUT_SELECTED_TEXT]: {
+        messageId: 'dictation_command_cut_selected_text',
+        build: RepeatableKeyPressMacro.CutSelectedTextMacro
+      },
+      [MacroName.UNDO_TEXT_EDIT]: {
+        messageId: 'dictation_command_undo_text_edit',
+        build: RepeatableKeyPressMacro.UndoTextEditMacro
+      },
+      [MacroName.REDO_ACTION]: {
+        messageId: 'dictation_command_redo_action',
+        build: RepeatableKeyPressMacro.RedoActionMacro
+      },
+      [MacroName.SELECT_ALL_TEXT]: {
+        messageId: 'dictation_command_select_all_text',
+        build: RepeatableKeyPressMacro.SelectAllTextMacro
+      },
+      [MacroName.UNSELECT_TEXT]: {
+        messageId: 'dictation_command_unselect_text',
+        build: RepeatableKeyPressMacro.UnselectTextMacro
+      },
+      [MacroName.LIST_COMMANDS]: {
+        messageId: 'dictation_command_list_commands',
+        build: ListCommandsMacro
+      },
+      [MacroName.NEW_LINE]:
+          {messageId: 'dictation_command_new_line', build: NewLineMacro},
+    };
+  }
+}
+
+/** A parsing strategy that utilizes SimpleMacroFactory. */
+export class SimpleParseStrategy extends ParseStrategy {
+  /**
+   * @param {!InputController} inputController
+   * @param {boolean} isRTLLocale
+   */
+  constructor(inputController, isRTLLocale) {
+    super(inputController, isRTLLocale);
+
+    /**
+     * Map of macro names to a factory for that macro.
+     * @private {!Map<MacroName, !SimpleMacroFactory>}
+     */
+    this.macroFactoryMap_ = new Map();
+
+    this.initialize_();
+  }
+
+  /** @private */
+  initialize_() {
+    for (const key in MacroName) {
+      const name = MacroName[key];
+      if (name === MacroName.INPUT_TEXT_VIEW || name === MacroName.UNSPECIFID) {
+        continue;
+      }
+
+      this.macroFactoryMap_.set(
+          name,
+          new SimpleMacroFactory(
+              name, this.getInputController(), this.getIsRTLLocale()));
+    }
+  }
+
+  /** @override */
+  async parse(text) {
+    for (const [name, factory] of this.macroFactoryMap_) {
+      if (factory.matchesMacro(text)) {
+        return factory.createMacro();
+      } else if (factory.matchesInputTextViewMacro(text)) {
+        text = factory.getCommandString();
+        break;
+      }
+    }
+
+    // The command is simply to input the given text.
+    return new InputTextViewMacro(text, this.getInputController());
+  }
+}
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/speech_parser.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/speech_parser.js
new file mode 100644
index 0000000..16c0545e
--- /dev/null
+++ b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/speech_parser.js
@@ -0,0 +1,85 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/**
+ * @fileoverview Handles speech parsing for dictation.
+ */
+
+import {InputController} from './../input_controller.js';
+import {Macro} from './../macros/macro.js';
+import {InputTextStrategy} from './input_text_strategy.js';
+import {ParseStrategy} from './parse_strategy.js';
+// PumpkinAvailability is based on the gn argument enable_pumpkin_for_dictation,
+// and pumpkin_availability.js is copied from either include_pumpkin.js
+// or exclude_pumpkin.js in the BUILD rule.
+import {PumpkinAvailability} from './pumpkin/pumpkin_availability.js';
+import {PumpkinParseStrategy} from './pumpkin_parse_strategy.js';
+import {SimpleParseStrategy} from './simple_parse_strategy.js';
+
+/** SpeechParser handles parsing spoken transcripts into Macros. */
+export class SpeechParser {
+  /** @param {!InputController} inputController to interact with the IME. */
+  constructor(inputController) {
+    /** @private {boolean} */
+    this.isRTLLocale_ = false;
+
+    /** @private {!InputController} */
+    this.inputController_ = inputController;
+
+    /** @private {ParseStrategy} */
+    this.inputTextStrategy_ = new InputTextStrategy(this.inputController_);
+
+    /** @private {?ParseStrategy} */
+    this.simpleParseStrategy_ = null;
+
+    /** @private {?ParseStrategy} */
+    this.pumpkinParseStrategy_ = null;
+  }
+
+  /**
+   * Enables commands.
+   * @param {string} locale The Dictation recognition locale. Only some locales
+   *     are supported by Pumpkin.
+   */
+  async setCommandsEnabled(locale) {
+    this.isRTLLocale_ = SpeechParser.RTLLocales.has(locale);
+
+    // Initialize additional parsing strategies.
+    this.simpleParseStrategy_ =
+        new SimpleParseStrategy(this.inputController_, this.isRTLLocale_);
+    this.pumpkinParseStrategy_ = await PumpkinParseStrategy.create(
+        this.inputController_, this.isRTLLocale_, locale);
+  }
+
+  /**
+   * Parses user text to produce a macro command. Async to allow pumpkin to
+   * complete loading if needed.
+   * @param {string} text The text to parse.
+   * @return {Promise<Macro>}
+   */
+  async parse(text) {
+    // Try pumpkin parsing first.
+    if (this.pumpkinParseStrategy_) {
+      const macro = await this.pumpkinParseStrategy_.parse(text);
+      if (macro) {
+        return macro;
+      }
+    }
+
+    // Fall-back to simple parsing.
+    if (this.simpleParseStrategy_) {
+      return await this.simpleParseStrategy_.parse(text);
+    }
+
+    // Input text as-is as a catch-all.
+    return await this.inputTextStrategy_.parse(text);
+  }
+}
+
+// All RTL locales from Dictation::GetAllSupportedLocales.
+SpeechParser.RTLLocales = new Set([
+  'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG', 'ar-IL', 'ar-IQ', 'ar-JO',
+  'ar-KW', 'ar-LB', 'ar-MA', 'ar-OM', 'ar-PS', 'ar-QA', 'ar-SA',
+  'ar-TN', 'ar-YE', 'fa-IR', 'iw-IL', 'ur-IN', 'ur-PK'
+]);
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse_strategy.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse_strategy.js
deleted file mode 100644
index 123a0d9..0000000
--- a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse_strategy.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-/**
- * @fileoverview Defines a base class that represents a strategy for parsing
- * text and converting it into a macro.
- */
-
-import {InputController} from './input_controller.js';
-import {Macro} from './macros/macro.js';
-
-/**
- * Represents a strategy for parsing speech input and converting it into a
- * Macro.
- */
-export class ParseStrategy {
-  /**
-   * @param {!InputController} inputController
-   * @param {boolean} isRTLLocale
-   */
-  constructor(inputController, isRTLLocale) {
-    /** @private {!InputController} */
-    this.inputController_ = inputController;
-    /** @private {boolean} */
-    this.isRTLLocale_ = isRTLLocale;
-  }
-
-  /** @return {!InputController} */
-  getInputController() {
-    return this.inputController_;
-  }
-
-  /** @return {boolean} */
-  getIsRTLLocale() {
-    return this.isRTLLocale_;
-  }
-
-  /**
-   * Accepts text, parses it, and returns a Macro.
-   * @param {string} text
-   * @return {!Promise<?Macro>}
-   */
-  async parse(text) {}
-}
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/pumpkin_parse_strategy.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/pumpkin_parse_strategy.js
deleted file mode 100644
index 1b085c4..0000000
--- a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/pumpkin_parse_strategy.js
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright 2021 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-/**
- * @fileoverview Defines a strategy for parsing text that utilizes the pumpkin
- * semantic parser.
- */
-
-import {InputController} from './input_controller.js';
-import {InputTextViewMacro} from './macros/input_text_view_macro.js';
-import {ListCommandsMacro} from './macros/list_commands_macro.js';
-import {Macro} from './macros/macro.js';
-import {MacroName} from './macros/macro_names.js';
-import * as RepeatableKeyPressMacro from './macros/repeatable_key_press_macro.js';
-import {ParseStrategy} from './parse_strategy.js';
-// PumpkinAvailability is based on the gn argument enable_pumpkin_for_dictation,
-// and pumpkin_availability.js is copied from either include_pumpkin.js
-// or exclude_pumpkin.js in the BUILD rule.
-import {PumpkinAvailability} from './pumpkin/pumpkin_availability.js';
-
-/** A parsing strategy that utilizes the Pumpkin semantic parser. */
-export class PumpkinParseStrategy extends ParseStrategy {
-  /**
-   * @param {!InputController} inputController
-   * @param {boolean} isRTLLocale
-   * @param {string} locale
-   * @return {!Promise<!PumpkinParseStrategy>}
-   */
-  static async create(inputController, isRTLLocale, locale) {
-    const instance = new PumpkinParseStrategy(inputController, isRTLLocale);
-    if (PumpkinAvailability.usePumpkin(locale)) {
-      await instance.initPumpkin_(PumpkinAvailability.LOCALES[locale]);
-    }
-
-    return instance;
-  }
-
-  /**
-   * @param {!InputController} inputController
-   * @param {boolean} isRTLLocale
-   * @private
-   */
-  constructor(inputController, isRTLLocale) {
-    super(inputController, isRTLLocale);
-
-    /** @private {speech.pumpkin.api.js.PumpkinTagger.PumpkinTagger} */
-    this.pumpkinTagger_ = null;
-
-    /** @private {?Promise} */
-    this.pumpkinLoadingPromise_ = null;
-  }
-
-  /**
-   * Initializes Pumpkin by loading the required scripts and creating the
-   * PumpkinTagger object.
-   * @param {string} locale The locale in which to init Pumpkin actions.
-   * @return {!Promise<undefined>}
-   * @private
-   */
-  async initPumpkin_(locale) {
-    if (this.pumpkinLoadingPromise_) {
-      // Already initializing.
-      return;
-    }
-
-    this.pumpkinLoadingPromise_ =
-        new Promise(async (pumpkinLoadResolve, pumpkinLoadReject) => {
-          // Check for objects defined by the Pumpkin WASM.
-          if (!goog || !goog['global'] || !goog['global']['Module']) {
-            await this.loadPumpkinScripts_();
-          }
-          const success = await this.createPumpkinTagger_(locale);
-          if (success) {
-            pumpkinLoadResolve();
-          } else {
-            pumpkinLoadReject();
-          }
-        });
-  }
-
-  /**
-   * Creates a PumpkinTagger from a config and action frame file for a
-   * particular locale.
-   * @param {string} locale The locale in which to init Pumpkin actions.
-   * @return {!Promise<boolean>} Whether the tagger was created successfully.
-   * @private
-   */
-  async createPumpkinTagger_(locale) {
-    const pumpkinTagger =
-        new speech.pumpkin.api.js.PumpkinTagger.PumpkinTagger();
-    try {
-      const path = `dictation/pumpkin/${locale}/`;
-      let success = await pumpkinTagger.initializeFromPumpkinConfig(
-          `${path}pumpkin_config.binarypb`);
-      if (!success) {
-        console.warn('Failed to load PumpkinTagger from PumpkinConfig.');
-        return false;
-      }
-      success =
-          await pumpkinTagger.loadActionFrame(`${path}action_config.binarypb`);
-      if (!success) {
-        console.warn('Failed to load Pumpkin ActionConfig.');
-        return false;
-      }
-    } catch (e) {
-      console.warn('Error initializing PumpkinTagger', e);
-      return false;
-    }
-    this.pumpkinTagger_ = pumpkinTagger;
-    return true;
-  }
-
-  /**
-   * Loads the Pumpkin scripts javascript in to the document.
-   * @return {!Promise<undefined>}
-   * @private
-   */
-  async loadPumpkinScripts_() {
-    const pumpkinTaggerScript =
-        /** @type {!HTMLScriptElement} */ (document.createElement('script'));
-    pumpkinTaggerScript.src = 'dictation/pumpkin/js_pumpkin_tagger_bin.js';
-    const taggerLoadPromise = new Promise((resolve, reject) => {
-      pumpkinTaggerScript.addEventListener('load', () => {
-        resolve();
-      });
-    });
-    document.head.appendChild(pumpkinTaggerScript);
-    await taggerLoadPromise;
-
-    const wasmModuleScript =
-        /** @type {!HTMLScriptElement} */ (document.createElement('script'));
-    wasmModuleScript.src = 'dictation/pumpkin/tagger_wasm_main.js';
-    const moduleLoadPromise = new Promise((resolve, reject) => {
-      goog['global']['Module'] = {
-        onRuntimeInitialized() {
-          resolve();
-        }
-      };
-    });
-    document.head.appendChild(wasmModuleScript);
-    await moduleLoadPromise;
-  }
-
-  /**
-   * In Android Voice Access, Pumpkin Hypotheses will be converted to UserIntent
-   * protos before being passed to Macros.
-   * @param {proto.speech.pumpkin.HypothesisResult.ObjectFormat} hypothesis
-   * @return {?Macro} The macro matching the hypothesis if one can be found.
-   * @private
-   */
-  macroFromPumpkinHypothesis_(hypothesis) {
-    const numArgs = hypothesis.actionArgumentList.length;
-    if (!numArgs) {
-      return null;
-    }
-    let repeat = 1;
-    let text = '';
-    let tag = '';
-    for (let i = 0; i < numArgs; i++) {
-      const argument = hypothesis.actionArgumentList[i];
-      // See Variable Argument Placeholders in voiceaccess.patterns_template.
-      if (argument.name ===
-          PumpkinParseStrategy.HypothesisArgumentName.SEM_TAG) {
-        tag = MacroName[argument.value];
-      } else if (
-          argument.name ===
-          PumpkinParseStrategy.HypothesisArgumentName.NUM_ARG) {
-        repeat = argument.value;
-      } else if (
-          argument.name ===
-          PumpkinParseStrategy.HypothesisArgumentName.OPEN_ENDED_TEXT) {
-        text = argument.value;
-      }
-    }
-    switch (tag) {
-      case MacroName.INPUT_TEXT_VIEW:
-        return new InputTextViewMacro(text, this.getInputController());
-      case MacroName.DELETE_PREV_CHAR:
-        return new RepeatableKeyPressMacro.DeletePreviousCharacterMacro(repeat);
-      case MacroName.NAV_PREV_CHAR:
-        return new RepeatableKeyPressMacro.NavPreviousCharMacro(
-            this.getIsRTLLocale(), repeat);
-      case MacroName.NAV_NEXT_CHAR:
-        return new RepeatableKeyPressMacro.NavNextCharMacro(
-            this.getIsRTLLocale(), repeat);
-      case MacroName.NAV_PREV_LINE:
-        return new RepeatableKeyPressMacro.NavPreviousLineMacro(repeat);
-      case MacroName.NAV_NEXT_LINE:
-        return new RepeatableKeyPressMacro.NavNextLineMacro(repeat);
-      case MacroName.COPY_SELECTED_TEXT:
-        return new RepeatableKeyPressMacro.CopySelectedTextMacro();
-      case MacroName.PASTE_TEXT:
-        return new RepeatableKeyPressMacro.PasteTextMacro();
-      case MacroName.CUT_SELECTED_TEXT:
-        return new RepeatableKeyPressMacro.CutSelectedTextMacro();
-      case MacroName.UNDO_TEXT_EDIT:
-        return new RepeatableKeyPressMacro.UndoTextEditMacro();
-      case MacroName.REDO_ACTION:
-        return new RepeatableKeyPressMacro.RedoActionMacro();
-      case MacroName.SELECT_ALL_TEXT:
-        return new RepeatableKeyPressMacro.SelectAllTextMacro();
-      case MacroName.UNSELECT_TEXT:
-        return new RepeatableKeyPressMacro.UnselectTextMacro(
-            this.getIsRTLLocale());
-      case MacroName.LIST_COMMANDS:
-        return new ListCommandsMacro();
-      default:
-        // Every hypothesis is guaranteed to include a semantic tag due to the
-        // way Voice Access set up its grammars. Not all tags are supported in
-        // Dictation yet.
-        console.log('Unsupported Pumpkin action: ', tag);
-        return null;
-    }
-  }
-
-  /** @override */
-  async parse(text) {
-    // Pumpkin load requires several async calls. If the request to parse
-    // comes before load is complete, wait for load. This happens during
-    // browser tests which may be fast enough to start sending speech text
-    // before callbacks with user prefs have completed.
-    if (this.pumpkinLoadingPromise_) {
-      await this.pumpkinLoadingPromise_;
-    }
-
-    // Try to get results from Pumpkin.
-    // TODO(crbug.com/1264544): Could increase the hypotheses count from 1
-    // when we are ready to implement disambiguation.
-    if (this.pumpkinTagger_) {
-      // Try to get results from Pumpkin.
-      // TODO(crbug.com/1264544): Could increase the hypotheses count from 1
-      // when we are ready to implement disambiguation.
-      const taggerResults =
-          this.pumpkinTagger_.tagAndGetNBestHypotheses(text, 1);
-      if (taggerResults && taggerResults.hypothesisList.length > 0) {
-        const macro =
-            this.macroFromPumpkinHypothesis_(taggerResults.hypothesisList[0]);
-        if (macro) {
-          return macro;
-        }
-      }
-    }
-
-    return null;
-  }
-}
-
-/**
- * PumpkinTagger Hypothesis argument names. These should match the variable
- * argument placeholders in voiceaccess.patterns_template and the static strings
- * defined in voiceaccess/utils/PumpkinUtils.java in google3.
- * @enum {string}
- */
-PumpkinParseStrategy.HypothesisArgumentName = {
-  SEM_TAG: 'SEM_TAG',
-  NUM_ARG: 'NUM_ARG',
-  OPEN_ENDED_TEXT: 'OPEN_ENDED_TEXT',
-};
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/simple_parse_strategy.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/simple_parse_strategy.js
deleted file mode 100644
index 8785f141..0000000
--- a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/simple_parse_strategy.js
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright 2021 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-/**
- * @fileoverview Defines a simple strategy for parsing text and converting
- * it into a Macro.
- */
-
-import {InputController} from './input_controller.js';
-import {InputTextViewMacro, NewLineMacro} from './macros/input_text_view_macro.js';
-import {ListCommandsMacro} from './macros/list_commands_macro.js';
-import {Macro} from './macros/macro.js';
-import {MacroName} from './macros/macro_names.js';
-import * as RepeatableKeyPressMacro from './macros/repeatable_key_press_macro.js';
-import {ParseStrategy} from './parse_strategy.js';
-
-/**
- * @typedef {{
- *   messageId: string,
- *   build: Function,
- * }}
- */
-let MacroData;
-
-/**
- * SimpleMacroFactory converts spoken strings into Macros using string matching.
- */
-class SimpleMacroFactory {
-  /**
-   * @param {!MacroName} macroName
-   * @param {!InputController} inputController
-   * @param {boolean} isRTLLocale
-   */
-  constructor(macroName, inputController, isRTLLocale) {
-    /** @private {!MacroName} */
-    this.macroName_ = macroName;
-    /** @private {!InputController} */
-    this.inputController_ = inputController;
-    /** @private {boolean} */
-    this.isRTLLocale_ = isRTLLocale;
-
-    if (!SimpleMacroFactory.getData_()[this.macroName_]) {
-      throw new Error(
-          'Macro is not supported by SimpleMacroFactory: ' + this.macroName_);
-    }
-
-    /** @private {string} */
-    this.commandString_ = chrome.i18n.getMessage(
-        SimpleMacroFactory.getData_()[this.macroName_].messageId);
-  }
-
-  /** @return {Macro} */
-  createMacro() {
-    const args = [];
-    switch (this.macroName_) {
-      case MacroName.NAV_PREV_CHAR:
-      case MacroName.NAV_NEXT_CHAR:
-      case MacroName.UNSELECT_TEXT:
-        args.push(this.isRTLLocale_);
-        break;
-      case MacroName.NEW_LINE:
-        args.push(this.inputController_);
-        break;
-    }
-
-    const data = SimpleMacroFactory.getData_();
-    return new data[this.macroName_].build(...args);
-  }
-
-  /**
-   * Checks whether a string matches `commandString_`, ignoring case and
-   * whitespace.
-   * @param {string} text
-   * @return {boolean}
-   */
-  matchesMacro(text) {
-    return text.trim().toLowerCase() === this.commandString_;
-  }
-
-  // TODO(crbug.com/1216111): Create a factory for InputTextViewMacro and remove
-  // this method.
-  /**
-   * Checks whether a string matches a request to type a command, i.e. for the
-   * command 'delete', it would match 'type delete', ignoring case and
-   * whitespace.
-   * @param {string} text
-   * @return {boolean}
-   */
-  matchesInputTextViewMacro(text) {
-    const expected = chrome.i18n.getMessage(
-        'dictation_command_input_text_view', this.commandString_);
-    return text.trim().toLowerCase() === expected;
-  }
-
-  /** @return {string} */
-  getCommandString() {
-    return this.commandString_;
-  }
-
-  /**
-   * @return {Object<MacroName, MacroData>}
-   * @private
-   */
-  static getData_() {
-    return {
-      [MacroName.DELETE_PREV_CHAR]: {
-        messageId: 'dictation_command_delete_prev_char',
-        build: RepeatableKeyPressMacro.DeletePreviousCharacterMacro
-      },
-      [MacroName.NAV_PREV_CHAR]: {
-        messageId: 'dictation_command_nav_prev_char',
-        build: RepeatableKeyPressMacro.NavPreviousCharMacro
-      },
-      [MacroName.NAV_NEXT_CHAR]: {
-        messageId: 'dictation_command_nav_next_char',
-        build: RepeatableKeyPressMacro.NavNextCharMacro
-      },
-      [MacroName.NAV_PREV_LINE]: {
-        messageId: 'dictation_command_nav_prev_line',
-        build: RepeatableKeyPressMacro.NavPreviousLineMacro
-      },
-      [MacroName.NAV_NEXT_LINE]: {
-        messageId: 'dictation_command_nav_next_line',
-        build: RepeatableKeyPressMacro.NavNextLineMacro
-      },
-      [MacroName.COPY_SELECTED_TEXT]: {
-        messageId: 'dictation_command_copy_selected_text',
-        build: RepeatableKeyPressMacro.CopySelectedTextMacro
-      },
-      [MacroName.PASTE_TEXT]: {
-        messageId: 'dictation_command_paste_text',
-        build: RepeatableKeyPressMacro.PasteTextMacro
-      },
-      [MacroName.CUT_SELECTED_TEXT]: {
-        messageId: 'dictation_command_cut_selected_text',
-        build: RepeatableKeyPressMacro.CutSelectedTextMacro
-      },
-      [MacroName.UNDO_TEXT_EDIT]: {
-        messageId: 'dictation_command_undo_text_edit',
-        build: RepeatableKeyPressMacro.UndoTextEditMacro
-      },
-      [MacroName.REDO_ACTION]: {
-        messageId: 'dictation_command_redo_action',
-        build: RepeatableKeyPressMacro.RedoActionMacro
-      },
-      [MacroName.SELECT_ALL_TEXT]: {
-        messageId: 'dictation_command_select_all_text',
-        build: RepeatableKeyPressMacro.SelectAllTextMacro
-      },
-      [MacroName.UNSELECT_TEXT]: {
-        messageId: 'dictation_command_unselect_text',
-        build: RepeatableKeyPressMacro.UnselectTextMacro
-      },
-      [MacroName.LIST_COMMANDS]: {
-        messageId: 'dictation_command_list_commands',
-        build: ListCommandsMacro
-      },
-      [MacroName.NEW_LINE]:
-          {messageId: 'dictation_command_new_line', build: NewLineMacro},
-    };
-  }
-}
-
-/** A parsing strategy that utilizes SimpleMacroFactory. */
-export class SimpleParseStrategy extends ParseStrategy {
-  /**
-   * @param {!InputController} inputController
-   * @param {boolean} isRTLLocale
-   */
-  constructor(inputController, isRTLLocale) {
-    super(inputController, isRTLLocale);
-
-    /**
-     * Map of macro names to a factory for that macro.
-     * @private {!Map<MacroName, !SimpleMacroFactory>}
-     */
-    this.macroFactoryMap_ = new Map();
-
-    this.initialize_();
-  }
-
-  /** @private */
-  initialize_() {
-    for (const key in MacroName) {
-      const name = MacroName[key];
-      if (name === MacroName.INPUT_TEXT_VIEW || name === MacroName.UNSPECIFID) {
-        continue;
-      }
-
-      this.macroFactoryMap_.set(
-          name,
-          new SimpleMacroFactory(
-              name, this.getInputController(), this.getIsRTLLocale()));
-    }
-  }
-
-  /** @override */
-  async parse(text) {
-    for (const [name, factory] of this.macroFactoryMap_) {
-      if (factory.matchesMacro(text)) {
-        return factory.createMacro();
-      } else if (factory.matchesInputTextViewMacro(text)) {
-        text = factory.getCommandString();
-        break;
-      }
-    }
-
-    // The command is simply to input the given text.
-    return new InputTextViewMacro(text, this.getInputController());
-  }
-}
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/speech_parser.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/speech_parser.js
deleted file mode 100644
index 2695103..0000000
--- a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/speech_parser.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2021 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-/**
- * @fileoverview Handles speech parsing for dictation.
- */
-
-import {InputController} from './input_controller.js';
-import {InputTextStrategy} from './input_text_strategy.js';
-import {Macro} from './macros/macro.js';
-import {ParseStrategy} from './parse_strategy.js';
-// PumpkinAvailability is based on the gn argument enable_pumpkin_for_dictation,
-// and pumpkin_availability.js is copied from either include_pumpkin.js
-// or exclude_pumpkin.js in the BUILD rule.
-import {PumpkinAvailability} from './pumpkin/pumpkin_availability.js';
-import {PumpkinParseStrategy} from './pumpkin_parse_strategy.js';
-import {SimpleParseStrategy} from './simple_parse_strategy.js';
-
-/** SpeechParser handles parsing spoken transcripts into Macros. */
-export class SpeechParser {
-  /** @param {!InputController} inputController to interact with the IME. */
-  constructor(inputController) {
-    /** @private {boolean} */
-    this.isRTLLocale_ = false;
-
-    /** @private {!InputController} */
-    this.inputController_ = inputController;
-
-    /** @private {ParseStrategy} */
-    this.inputTextStrategy_ = new InputTextStrategy(this.inputController_);
-
-    /** @private {?ParseStrategy} */
-    this.simpleParseStrategy_ = null;
-
-    /** @private {?ParseStrategy} */
-    this.pumpkinParseStrategy_ = null;
-  }
-
-  /**
-   * Enables commands.
-   * @param {string} locale The Dictation recognition locale. Only some locales
-   *     are supported by Pumpkin.
-   */
-  async setCommandsEnabled(locale) {
-    this.isRTLLocale_ = SpeechParser.RTLLocales.has(locale);
-
-    // Initialize additional parsing strategies.
-    this.simpleParseStrategy_ =
-        new SimpleParseStrategy(this.inputController_, this.isRTLLocale_);
-    this.pumpkinParseStrategy_ = await PumpkinParseStrategy.create(
-        this.inputController_, this.isRTLLocale_, locale);
-  }
-
-  /**
-   * Parses user text to produce a macro command. Async to allow pumpkin to
-   * complete loading if needed.
-   * @param {string} text The text to parse.
-   * @return {Promise<Macro>}
-   */
-  async parse(text) {
-    // Try pumpkin parsing first.
-    if (this.pumpkinParseStrategy_) {
-      const macro = await this.pumpkinParseStrategy_.parse(text);
-      if (macro) {
-        return macro;
-      }
-    }
-
-    // Fall-back to simple parsing.
-    if (this.simpleParseStrategy_) {
-      return await this.simpleParseStrategy_.parse(text);
-    }
-
-    // Input text as-is as a catch-all.
-    return await this.inputTextStrategy_.parse(text);
-  }
-}
-
-// All RTL locales from Dictation::GetAllSupportedLocales.
-SpeechParser.RTLLocales = new Set([
-  'ar-AE', 'ar-BH', 'ar-DZ', 'ar-EG', 'ar-IL', 'ar-IQ', 'ar-JO',
-  'ar-KW', 'ar-LB', 'ar-MA', 'ar-OM', 'ar-PS', 'ar-QA', 'ar-SA',
-  'ar-TN', 'ar-YE', 'fa-IR', 'iw-IL', 'ur-IN', 'ur-PK'
-]);
diff --git a/chrome/browser/resources/chromeos/login/screens/common/consolidated_consent.html b/chrome/browser/resources/chromeos/login/screens/common/consolidated_consent.html
index 75bb5ea..578da90 100644
--- a/chrome/browser/resources/chromeos/login/screens/common/consolidated_consent.html
+++ b/chrome/browser/resources/chromeos/login/screens/common/consolidated_consent.html
@@ -150,7 +150,7 @@
         </webview>
       </div>
       <div slot="bottom-buttons">
-        <oobe-text-button id="ArcTosOkButton"
+        <oobe-text-button id="arcTosOkButton"
             class="focus-on-show" inverse on-click="onTermsStepOkClick_"
             text-key="consolidatedConsentOK"></oobe-text-button>
       </div>
@@ -294,7 +294,7 @@
               [[i18nDynamic(locale, 'consolidatedConsentFooterChild')]]
             </span>
           </span>
-          <a id="footerLearMore"
+          <a id="footerLearnMore"
               on-click="onFooterLearnMoreClick_"
               class="oobe-local-link" is="action-link"
               aria-describedby="footerText">
diff --git a/chrome/browser/resources/connectors_internals/zero_trust_connector.html b/chrome/browser/resources/connectors_internals/zero_trust_connector.html
index 6cdaed2..37d1100 100644
--- a/chrome/browser/resources/connectors_internals/zero_trust_connector.html
+++ b/chrome/browser/resources/connectors_internals/zero_trust_connector.html
@@ -18,6 +18,10 @@
 <div id="key-manager-row">
   Key Manager Initialized: <span id="key-manager-state" class="bold"></span>
 </div>
+<div id="key-metadata-row">
+  Trust Level: <span id="key-trust-level" class="bold"></span>
+  Key Type: <span id="key-type" class="bold"></span>
+</div>
 <div>
   Signals:
   <pre id="signals"></pre>
diff --git a/chrome/browser/resources/connectors_internals/zero_trust_connector.ts b/chrome/browser/resources/connectors_internals/zero_trust_connector.ts
index 0b91bc3..d369656 100644
--- a/chrome/browser/resources/connectors_internals/zero_trust_connector.ts
+++ b/chrome/browser/resources/connectors_internals/zero_trust_connector.ts
@@ -4,7 +4,19 @@
 
 import {CustomElement} from 'chrome://resources/js/custom_element.js';
 
-import {KeyManagerInitializedValue, PageHandler, PageHandlerInterface, ZeroTrustState} from './connectors_internals.mojom-webui.js';
+import {KeyInfo, KeyManagerInitializedValue, KeyTrustLevel, KeyType, PageHandler, PageHandlerInterface, ZeroTrustState} from './connectors_internals.mojom-webui.js';
+
+const TrustLevelStringMap = {
+  [KeyTrustLevel.UNSPECIFIED]: 'Unspecified',
+  [KeyTrustLevel.TPM]: 'TPM',
+  [KeyTrustLevel.OS]: 'OS'
+};
+
+const KeyTypeStringMap = {
+  [KeyType.UNKNOWN]: 'Unknown',
+  [KeyType.RSA]: 'RSA',
+  [KeyType.EC]: 'EC'
+};
 
 export class ZeroTrustConnectorElement extends CustomElement {
   static get is() {
@@ -24,21 +36,34 @@
     }
   }
 
-  private _keyManagerInitialized: string = '';
-  public set keyManagerInitialized(val: KeyManagerInitializedValue) {
-    const rowEl = (this.$('#key-manager-row') as HTMLElement);
-    const stateEl = (this.$('#key-manager-state') as HTMLElement);
+  public set keyInfo(keyInfo: KeyInfo) {
+    const initRowEl = (this.$('#key-manager-row') as HTMLElement);
+    const initStateEl = (this.$('#key-manager-state') as HTMLElement);
 
-    if (val === KeyManagerInitializedValue.UNSUPPORTED) {
-      this._keyManagerInitialized = 'unsupported';
-      this.hideElement(rowEl);
+    const metadataRowEl = (this.$('#key-metadata-row') as HTMLElement);
+    const trustLevelStateEl = (this.$('#key-trust-level') as HTMLElement);
+    const keyTypeStateEl = (this.$('#key-type') as HTMLElement);
+
+    const initializedValue = keyInfo.isKeyManagerInitialized;
+    if (initializedValue === KeyManagerInitializedValue.UNSUPPORTED) {
+      this.hideElement(initRowEl);
+      this.hideElement(metadataRowEl);
     } else {
-      this._keyManagerInitialized =
-          val === KeyManagerInitializedValue.KEY_LOADED ? 'true' : 'false';
-      this.showElement(rowEl);
-    }
+      const keyLoaded =
+          initializedValue === KeyManagerInitializedValue.KEY_LOADED;
+      initStateEl.innerText = keyLoaded ? 'true' : 'false';
+      this.showElement(initRowEl);
 
-    stateEl.innerText = this._keyManagerInitialized;
+      if (keyLoaded) {
+        trustLevelStateEl.innerText =
+            this.trustLevelToString(keyInfo.trustLevel);
+        keyTypeStateEl.innerText = this.keyTypeToString(keyInfo.keyType);
+
+        this.showElement(metadataRowEl);
+      } else {
+        this.hideElement(metadataRowEl);
+      }
+    }
   }
 
   private _signalsString: string = '';
@@ -85,7 +110,7 @@
 
     this.enabledString = `${state.isEnabled}`;
 
-    this.keyManagerInitialized = state.isKeyManagerInitialized;
+    this.keyInfo = state.keyInfo;
 
     // Pretty print the dictionary as a JSON string.
     this.signalsString = JSON.stringify(state.signalsDictionary, null, 2);
@@ -113,6 +138,14 @@
   private hideElement(element: HTMLElement) {
     element?.classList.add('hidden');
   }
+
+  private trustLevelToString(trustLevel: KeyTrustLevel): string {
+    return TrustLevelStringMap[trustLevel] || 'invalid';
+  }
+
+  private keyTypeToString(keyType: KeyType): string {
+    return KeyTypeStringMap[keyType] || 'invalid';
+  }
 }
 
 customElements.define(ZeroTrustConnectorElement.is, ZeroTrustConnectorElement);
\ No newline at end of file
diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc b/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
index 597d9586..2322061 100644
--- a/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
+++ b/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
@@ -370,6 +370,15 @@
     return;
   }
 
+  if (!request->IsAuthRequest() && data.size == 0) {
+    // A size of 0 implies an edge case like an empty file being uploaded. In
+    // such a case, the file doesn't need to scan so the request can simply
+    // finish early.
+    FinishRequest(request, Result::SUCCESS,
+                  enterprise_connectors::ContentAnalysisResponse());
+    return;
+  }
+
   std::string metadata;
   request->SerializeToString(&metadata);
   base::Base64Encode(metadata, &metadata);
diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service_unittest.cc b/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service_unittest.cc
index 0bb92064f..06d04c6 100644
--- a/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service_unittest.cc
+++ b/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service_unittest.cc
@@ -11,6 +11,7 @@
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/memory/raw_ptr.h"
 #include "base/test/bind.h"
 #include "base/test/scoped_command_line.h"
@@ -21,6 +22,7 @@
 #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h"
 #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h"
 #include "chrome/browser/safe_browsing/cloud_content_scanning/binary_fcm_service.h"
+#include "chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.h"
 #include "chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/enterprise/common/proto/connectors.pb.h"
@@ -232,6 +234,7 @@
             Invoke([](BinaryUploadService::Request::DataCallback callback) {
               BinaryUploadService::Request::Data data;
               data.contents = "contents";
+              data.size = data.contents.size();
               std::move(callback).Run(BinaryUploadService::Result::SUCCESS,
                                       data);
             }));
@@ -907,4 +910,31 @@
   }
 }
 
+TEST_F(BinaryUploadServiceTest, EmptyFileRequest) {
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+  base::FilePath file_path = temp_dir.GetPath().AppendASCII("normal.doc");
+  base::File file(file_path, base::File::FLAG_CREATE | base::File::FLAG_WRITE);
+
+  ExpectInstanceID("valid id");
+  ExpectNetworkResponse(true, enterprise_connectors::ContentAnalysisResponse());
+
+  base::RunLoop run_loop;
+  std::unique_ptr<FileAnalysisRequest> request =
+      std::make_unique<FileAnalysisRequest>(
+          enterprise_connectors::AnalysisSettings(), file_path,
+          file_path.BaseName(), "fake/mimetype", false,
+          base::BindLambdaForTesting(
+              [&run_loop](
+                  BinaryUploadService::Result result,
+                  enterprise_connectors::ContentAnalysisResponse response) {
+                ASSERT_EQ(BinaryUploadService::Result::SUCCESS, result);
+                run_loop.Quit();
+              }));
+  request->set_device_token("fake_device_token");
+
+  UploadForDeepScanning(std::move(request));
+  run_loop.Run();
+}
+
 }  // namespace safe_browsing
diff --git a/chrome/browser/signin/identity_manager_factory.cc b/chrome/browser/signin/identity_manager_factory.cc
index 3fa73700..cac771b 100644
--- a/chrome/browser/signin/identity_manager_factory.cc
+++ b/chrome/browser/signin/identity_manager_factory.cc
@@ -19,12 +19,13 @@
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/pref_registry/pref_registry_syncable.h"
+#include "components/signin/public/base/signin_buildflags.h"
 #include "components/signin/public/identity_manager/identity_manager.h"
 #include "components/signin/public/identity_manager/identity_manager_builder.h"
 #include "components/signin/public/webdata/token_web_data.h"
 #include "content/public/browser/network_service_instance.h"
 
-#if !defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/web_data_service_factory.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
@@ -58,7 +59,7 @@
     : BrowserContextKeyedServiceFactory(
           "IdentityManager",
           BrowserContextDependencyManager::GetInstance()) {
-#if !defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
   DependsOn(WebDataServiceFactory::GetInstance());
 #endif
 #if BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -123,7 +124,7 @@
   params.profile_path = profile->GetPath();
   params.signin_client = ChromeSigninClientFactory::GetForProfile(profile);
 
-#if !defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
   params.delete_signin_cookies_on_exit =
       signin::SettingsDeleteSigninCookiesOnExit(
           CookieSettingsFactory::GetForProfile(profile).get());
diff --git a/chrome/browser/supervised_user/supervised_user_navigation_observer.cc b/chrome/browser/supervised_user/supervised_user_navigation_observer.cc
index ae56b5a..0f128bec 100644
--- a/chrome/browser/supervised_user/supervised_user_navigation_observer.cc
+++ b/chrome/browser/supervised_user/supervised_user_navigation_observer.cc
@@ -30,14 +30,6 @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 
-namespace {
-
-bool IsMainFrame(content::RenderFrameHost* render_frame_host) {
-  return !render_frame_host->GetParent();
-}
-
-}  // namespace
-
 using content::NavigationEntry;
 
 SupervisedUserNavigationObserver::~SupervisedUserNavigationObserver() {
@@ -145,7 +137,7 @@
 void SupervisedUserNavigationObserver::DidFinishLoad(
     content::RenderFrameHost* render_frame_host,
     const GURL& validated_url) {
-  if (IsMainFrame(render_frame_host)) {
+  if (render_frame_host->IsInPrimaryMainFrame()) {
     bool main_frame_blocked =
         base::Contains(supervised_user_interstitials_,
                        render_frame_host->GetFrameTreeNodeId());
@@ -179,7 +171,6 @@
 
   MaybeUpdateRequestedHosts();
 
-
   // Iframe filtering has been enabled.
   web_contents()->ForEachFrame(
       base::BindRepeating(&SupervisedUserNavigationObserver::FilterRenderFrame,
@@ -260,7 +251,7 @@
   // if an interstitial error page is not being shown but it should be shown,
   // then reloading will trigger the navigation throttle to show the error page.
   if (is_showing_interstitial != should_show_interstitial) {
-    if (IsMainFrame(render_frame_host)) {
+    if (render_frame_host->IsInPrimaryMainFrame()) {
       web_contents()->GetController().Reload(content::ReloadType::NORMAL,
                                              /* check_for_repost */ false);
       return;
@@ -297,7 +288,8 @@
   // If the RenderFrameHost belongs to the main frame, return. This is because
   // the main frame is already filtered in
   // |SupervisedUserNavigationObserver::OnURLFilterChanged|.
-  if (!render_frame_host->IsRenderFrameLive() || IsMainFrame(render_frame_host))
+  if (!render_frame_host->IsRenderFrameLive() ||
+      render_frame_host->IsInPrimaryMainFrame())
     return;
 
   const GURL& last_committed_url = render_frame_host->GetLastCommittedURL();
@@ -314,7 +306,7 @@
   auto id = render_frame_host->GetFrameTreeNodeId();
 
   // Request can come only from the main frame.
-  if (!IsMainFrame(render_frame_host))
+  if (!render_frame_host->IsInPrimaryMainFrame())
     return;
 
   if (base::Contains(supervised_user_interstitials_, id))
diff --git a/chrome/browser/supervised_user/supervised_user_navigation_throttle.cc b/chrome/browser/supervised_user/supervised_user_navigation_throttle.cc
index 756dea8a..cdb29bb8 100644
--- a/chrome/browser/supervised_user/supervised_user_navigation_throttle.cc
+++ b/chrome/browser/supervised_user/supervised_user_navigation_throttle.cc
@@ -163,7 +163,7 @@
           navigation_handle()->GetWebContents()->GetOutermostWebContents());
   bool got_result = false;
 
-  if (navigation_handle()->IsInMainFrame()) {
+  if (navigation_handle()->IsInPrimaryMainFrame()) {
     got_result = url_filter_->GetFilteringBehaviorForURLWithAsyncChecks(
         url,
         base::BindOnce(&SupervisedUserNavigationThrottle::OnCheckDone,
@@ -253,7 +253,7 @@
     RecordFilterResultEvent(true, behavior, reason, uncertain, transition);
   }
 
-  if (navigation_handle()->IsInMainFrame()) {
+  if (navigation_handle()->IsInPrimaryMainFrame()) {
     // Update navigation observer about the navigation state of the main frame.
     auto* navigation_observer =
         SupervisedUserNavigationObserver::FromWebContents(
diff --git a/chrome/browser/supervised_user/supervised_user_navigation_throttle_browsertest.cc b/chrome/browser/supervised_user/supervised_user_navigation_throttle_browsertest.cc
index ec2a2b35..671d51b4 100644
--- a/chrome/browser/supervised_user/supervised_user_navigation_throttle_browsertest.cc
+++ b/chrome/browser/supervised_user/supervised_user_navigation_throttle_browsertest.cc
@@ -43,6 +43,7 @@
 #include "content/public/common/page_type.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
+#include "content/public/test/fenced_frame_test_util.h"
 #include "content/public/test/prerender_test_util.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
@@ -1036,3 +1037,56 @@
   // the user isn't supervised.
   EXPECT_FALSE(IsInterstitialBeingShownInMainFrame(browser()));
 }
+
+class SupervisedUserNavigationThrottleFencedFramesTest
+    : public SupervisedUserNavigationThrottleTest {
+ public:
+  SupervisedUserNavigationThrottleFencedFramesTest() = default;
+  ~SupervisedUserNavigationThrottleFencedFramesTest() override = default;
+  SupervisedUserNavigationThrottleFencedFramesTest(
+      const SupervisedUserNavigationThrottleFencedFramesTest&) = delete;
+
+  SupervisedUserNavigationThrottleFencedFramesTest& operator=(
+      const SupervisedUserNavigationThrottleFencedFramesTest&) = delete;
+
+  content::test::FencedFrameTestHelper& fenced_frame_test_helper() {
+    return fenced_frame_helper_;
+  }
+
+ private:
+  content::test::FencedFrameTestHelper fenced_frame_helper_;
+};
+
+IN_PROC_BROWSER_TEST_F(SupervisedUserNavigationThrottleFencedFramesTest,
+                       BlockFencedFrame) {
+  BlockHost(kIframeHost2);
+  const GURL kInitialUrl = embedded_test_server()->GetURL(
+      kExampleHost, "/supervised_user/simple.html");
+  ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), kInitialUrl));
+
+  // Same origin fenced frame is not blocked, and therefore must be allowed.
+  const GURL kSameOriginFencedFrameUrl = embedded_test_server()->GetURL(
+      kExampleHost, "/supervised_user/fenced_frame.html");
+  content::RenderFrameHost* rfh_same_origin =
+      fenced_frame_test_helper().CreateFencedFrame(
+          web_contents()->GetMainFrame(), kSameOriginFencedFrameUrl);
+  EXPECT_TRUE(rfh_same_origin);
+
+  // Host1 is not blocked, and therefore must be allowed.
+  const GURL kHost1FencedFrameUrl = embedded_test_server()->GetURL(
+      kIframeHost1, "/supervised_user/fenced_frame.html");
+  content::RenderFrameHost* rfh_host1 =
+      fenced_frame_test_helper().CreateFencedFrame(
+          web_contents()->GetMainFrame(), kHost1FencedFrameUrl);
+  EXPECT_TRUE(rfh_host1);
+
+  // Host2 is blocked, and therefore should result in a interstitial being
+  // shown, which is validated by the expectation of net::Error::ERR_FAILED.
+  const GURL kHost2FencedFrameUrl = embedded_test_server()->GetURL(
+      kIframeHost2, "/supervised_user/fenced_frame.html");
+  content::RenderFrameHost* rfh_host2 =
+      fenced_frame_test_helper().CreateFencedFrame(
+          web_contents()->GetMainFrame(), kHost2FencedFrameUrl,
+          net::Error::ERR_FAILED);
+  EXPECT_TRUE(rfh_host2);
+}
diff --git a/chrome/browser/ui/ash/desks_templates/desks_templates_client_browsertest.cc b/chrome/browser/ui/ash/desks_templates/desks_templates_client_browsertest.cc
index c57789c..60b816c 100644
--- a/chrome/browser/ui/ash/desks_templates/desks_templates_client_browsertest.cc
+++ b/chrome/browser/ui/ash/desks_templates/desks_templates_client_browsertest.cc
@@ -1060,6 +1060,71 @@
             browser_window->parent());
 }
 
+// Tests that launching a template that contains a system web app works as
+// expected.
+IN_PROC_BROWSER_TEST_F(DesksTemplatesClientTest,
+                       NativeUILaunchTemplateWithSystemWebApp) {
+  // Create the settings app, which is a system web app.
+  CreateSettingsSystemWebApp(browser()->profile());
+
+  aura::Window* settings_window = FindBrowserWindow(kSettingsWindowId);
+  ASSERT_TRUE(settings_window);
+  const std::u16string settings_title = settings_window->GetTitle();
+
+  // Enter overview and save the current desk as a template.
+  ash::ToggleOverview();
+  ash::WaitForOverviewEnterAnimation();
+  views::Button* save_desk_as_template_button =
+      ash::GetSaveDeskAsTemplateButton();
+  ASSERT_TRUE(save_desk_as_template_button);
+  ClickButton(save_desk_as_template_button);
+
+  // Exit overview and close the settings window. We'll need to verify if it
+  // reopens later.
+  ash::ToggleOverview();
+  ash::WaitForOverviewExitAnimation();
+
+  views::Widget* settings_widget =
+      views::Widget::GetWidgetForNativeWindow(settings_window);
+  settings_widget->CloseNow();
+  ASSERT_FALSE(FindBrowserWindow(kSettingsWindowId));
+
+  // Enter overview, head over to the desks templates grid and launch the
+  // template.
+  ash::ToggleOverview();
+  ash::WaitForOverviewEnterAnimation();
+  views::Button* zero_state_templates_button =
+      ash::GetZeroStateDesksTemplatesButton();
+  ASSERT_TRUE(zero_state_templates_button);
+  ClickButton(zero_state_templates_button);
+
+  ash::WaitForDesksTemplatesUI();
+  views::Button* template_item = ash::GetTemplateItemButton(/*index=*/0);
+  ASSERT_TRUE(template_item);
+  ClickButton(template_item);
+
+  // Clicking the button is a two part, both async process. We need to wait for
+  // the template to be fetched from the model, and then wait for the desk
+  // animation to be launched.
+  // TODO(dandersson): Remove this when the desk is no longer activated on
+  // template launch.
+  ash::WaitForDesksTemplatesUI();
+  ash::DeskSwitchAnimationWaiter waiter;
+  waiter.Wait();
+
+  for (auto* browser : *BrowserList::GetInstance()) {
+    aura::Window* window = browser->window()->GetNativeWindow();
+    if (window->GetTitle() == settings_title) {
+      settings_window = window;
+      break;
+    }
+  }
+  ASSERT_TRUE(settings_window);
+  EXPECT_EQ(ash::Shell::GetContainer(settings_window->GetRootWindow(),
+                                     ash::kShellWindowId_DeskContainerB),
+            settings_window->parent());
+}
+
 // TODO(crbug.com/1273532): Add more tests:
 // - Deleting templates.
 // - Launching templates with uninstalled apps.
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 5ae65ab..970a4c8 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1878,6 +1878,13 @@
   FileSelectHelper::EnumerateDirectory(web_contents, std::move(listener), path);
 }
 
+bool Browser::CanEnterFullscreenModeForTab(
+    content::RenderFrameHost* requesting_frame,
+    const blink::mojom::FullscreenOptions& options) {
+  return exclusive_access_manager_->fullscreen_controller()
+      ->CanEnterFullscreenModeForTab(requesting_frame, options.display_id);
+}
+
 void Browser::EnterFullscreenModeForTab(
     content::RenderFrameHost* requesting_frame,
     const blink::mojom::FullscreenOptions& options) {
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 3c4525ae..10e4e20 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -849,6 +849,9 @@
   void EnumerateDirectory(content::WebContents* web_contents,
                           scoped_refptr<content::FileSelectListener> listener,
                           const base::FilePath& path) override;
+  bool CanEnterFullscreenModeForTab(
+      content::RenderFrameHost* requesting_frame,
+      const blink::mojom::FullscreenOptions& options) override;
   void EnterFullscreenModeForTab(
       content::RenderFrameHost* requesting_frame,
       const blink::mojom::FullscreenOptions& options) override;
diff --git a/chrome/browser/ui/cocoa/main_menu_builder.mm b/chrome/browser/ui/cocoa/main_menu_builder.mm
index 9f57038..2ba95aa4 100644
--- a/chrome/browser/ui/cocoa/main_menu_builder.mm
+++ b/chrome/browser/ui/cocoa/main_menu_builder.mm
@@ -219,6 +219,14 @@
                       Item(IDS_EDIT_TEXT_REPLACEMENT_MAC)
                           .action(@selector(toggleAutomaticTextReplacement:)),
                 }),
+                Item(IDS_EDIT_TRANSFORMATIONS_MAC).submenu({
+                  Item(IDS_EDIT_MAKE_UPPERCASE_MAC)
+                      .action(@selector(uppercaseWord:)),
+                  Item(IDS_EDIT_MAKE_LOWERCASE_MAC)
+                      .action(@selector(lowercaseWord:)),
+                  Item(IDS_EDIT_CAPITALIZE_MAC)
+                      .action(@selector(capitalizeWord:)),
+                }),
                 Item(IDS_SPEECH_MAC).tag(50158).submenu({
                   Item(IDS_SPEECH_START_SPEAKING_MAC)
                       .action(@selector(startSpeaking:)),
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
index 391865d..cf2a4ef 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
@@ -47,6 +47,14 @@
 const char kFullscreenBubbleReshowsHistogramName[] =
     "ExclusiveAccess.BubbleReshowsPerSession.Fullscreen";
 
+bool IsAnotherScreen(WebContents* web_contents, const int64_t display_id) {
+  if (display_id == display::kInvalidDisplayId)
+    return false;
+  auto* screen = display::Screen::GetScreen();
+  auto display = screen->GetDisplayNearestView(web_contents->GetNativeView());
+  return display_id != display.id();
+}
+
 }  // namespace
 
 FullscreenController::FullscreenController(ExclusiveAccessManager* manager)
@@ -118,34 +126,38 @@
   return state_prior_to_tab_fullscreen_ == STATE_NORMAL;
 }
 
-void FullscreenController::EnterFullscreenModeForTab(
+bool FullscreenController::CanEnterFullscreenModeForTab(
     content::RenderFrameHost* requesting_frame,
     const int64_t display_id) {
   DCHECK(requesting_frame);
   auto* web_contents = WebContents::FromRenderFrameHost(requesting_frame);
   DCHECK(web_contents);
 
-  if (MaybeToggleFullscreenWithinTab(web_contents, true)) {
-    // During tab capture of fullscreen-within-tab views, the browser window
-    // fullscreen state is unchanged, so return now.
-    return;
-  }
-
-  auto* screen = display::Screen::GetScreen();
-  bool requesting_another_screen = false;
-  auto display = screen->GetDisplayNearestView(web_contents->GetNativeView());
-  requesting_another_screen =
-      display_id != display.id() && display_id != display::kInvalidDisplayId;
   if ((web_contents !=
            exclusive_access_manager()->context()->GetActiveWebContents() ||
        IsWindowFullscreenForTabOrPending()) &&
-      !requesting_another_screen) {
-    // TODO(enne): this early out (and other early outs in this function)
-    // could cause requestFullscreen promises to hang.  If we are in this
-    // function, the renderer expects a visual property update to call
-    // blink::FullscreenController::DidEnterFullscreen to resolve promises.
-    // This needs to be refactored to send more explicit/nuanced feedback
-    // to the renderer, rather than just silently dropping these requests.
+      !IsAnotherScreen(web_contents, display_id))
+    return false;
+
+  return true;
+}
+
+void FullscreenController::EnterFullscreenModeForTab(
+    content::RenderFrameHost* requesting_frame,
+    const int64_t display_id) {
+  DCHECK(requesting_frame);
+  // This function should never fail. Any possible failures must be checked in
+  // |CanEnterFullscreenModeForTab()| instead. Silently dropping the request
+  // could cause requestFullscreen promises to hang. If we are in this function,
+  // the renderer expects a visual property update to call
+  // |blink::FullscreenController::DidEnterFullscreen| to resolve promises.
+  DCHECK(CanEnterFullscreenModeForTab(requesting_frame, display_id));
+  auto* web_contents = WebContents::FromRenderFrameHost(requesting_frame);
+  DCHECK(web_contents);
+
+  if (MaybeToggleFullscreenWithinTab(web_contents, true)) {
+    // During tab capture of fullscreen-within-tab views, the browser window
+    // fullscreen state is unchanged, so return now.
     return;
   }
 
@@ -159,7 +171,8 @@
   // UI style.
   exclusive_access_context->UpdateUIForTabFullscreen();
 
-  if (!exclusive_access_context->IsFullscreen() || requesting_another_screen) {
+  if (!exclusive_access_context->IsFullscreen() ||
+      IsAnotherScreen(web_contents, display_id)) {
     // Normal -> Tab Fullscreen.
     state_prior_to_tab_fullscreen_ = STATE_NORMAL;
     EnterFullscreenModeInternal(TAB, requesting_frame, display_id);
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.h b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
index 6cfeb5a..112cf0b2a 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.h
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
@@ -106,12 +106,20 @@
   // previously in user-initiated fullscreen).
   bool IsFullscreenCausedByTab() const;
 
+  // Returns whether entering fullscreen with |EnterFullscreenModeForTab()| is
+  // allowed.
+  bool CanEnterFullscreenModeForTab(
+      content::RenderFrameHost* requesting_frame,
+      const int64_t display_id = display::kInvalidDisplayId);
+
   // Enter tab-initiated fullscreen mode. FullscreenController decides whether
   // to also fullscreen the browser window. See 'FullscreenWithinTab Note'.
   // |requesting_frame| is the specific content frame requesting fullscreen.
   // If the Window Placement experiment is enabled, fullscreen may be requested
   // on a particular display. In that case, |display_id| is the display's id;
   // otherwise, display::kInvalidDisplayId indicates no display is specified.
+  //
+  // |CanEnterFullscreenModeForTab()| must return true on entry.
   void EnterFullscreenModeForTab(
       content::RenderFrameHost* requesting_frame,
       const int64_t display_id = display::kInvalidDisplayId);
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.cc
index 1d2c84c85..d7d901e 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.cc
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.cc
@@ -277,8 +277,11 @@
       content::WebContents* const active_tab =
           GetBrowser()->tab_strip_model()->GetActiveWebContents();
       if (event == TAB_FULLSCREEN_TRUE) {
-        GetFullscreenController()->EnterFullscreenModeForTab(
-            active_tab->GetMainFrame());
+        if (GetFullscreenController()->CanEnterFullscreenModeForTab(
+                active_tab->GetMainFrame())) {
+          GetFullscreenController()->EnterFullscreenModeForTab(
+              active_tab->GetMainFrame());
+        }
       } else {
         GetFullscreenController()->ExitFullscreenModeForTab(active_tab);
       }
diff --git a/chrome/browser/ui/hats/hats_service.cc b/chrome/browser/ui/hats/hats_service.cc
index 81858a9..74fd1210 100644
--- a/chrome/browser/ui/hats/hats_service.cc
+++ b/chrome/browser/ui/hats/hats_service.cc
@@ -268,7 +268,9 @@
     content::NavigationHandle* navigation_handle) {
   if (!require_same_origin_ || !navigation_handle ||
       !navigation_handle->IsInPrimaryMainFrame() ||
-      navigation_handle->IsSameOrigin()) {
+      navigation_handle->IsSameDocument() ||
+      (navigation_handle->HasCommitted() &&
+       navigation_handle->IsSameOrigin())) {
     return;
   }
 
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view.cc b/chrome/browser/ui/views/profiles/profile_menu_view.cc
index 7d45817..bf3f3f73 100644
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
@@ -293,18 +293,19 @@
       chrome::ShowSettingsSubPage(browser(), chrome::kSignOutSubPage);
       break;
     case AvatarSyncErrorType::kUnrecoverableError:
-      // GetPrimaryAccountMutator() might return nullptr on some platforms.
-      if (auto* account_mutator =
-              IdentityManagerFactory::GetForProfile(browser()->profile())
-                  ->GetPrimaryAccountMutator()) {
-        account_mutator->RevokeSyncConsent(
-            signin_metrics::USER_CLICKED_SIGNOUT_SETTINGS,
-            signin_metrics::SignoutDelete::kIgnoreMetric);
-        Hide();
-        browser()->signin_view_controller()->ShowSignin(
-            profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN,
-            signin_metrics::AccessPoint::ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN);
-      }
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
+      IdentityManagerFactory::GetForProfile(browser()->profile())
+          ->GetPrimaryAccountMutator()
+          ->RevokeSyncConsent(signin_metrics::USER_CLICKED_SIGNOUT_SETTINGS,
+                              signin_metrics::SignoutDelete::kIgnoreMetric);
+      Hide();
+      browser()->signin_view_controller()->ShowSignin(
+          profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN,
+          signin_metrics::AccessPoint::ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN);
+#else
+      // TODO(https://crbug.com/1260291): Add support for Lacros.
+      NOTIMPLEMENTED();
+#endif
       break;
     case AvatarSyncErrorType::kAuthError:
       Hide();
@@ -345,7 +346,7 @@
       signin_metrics::AccessPoint::ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN);
 }
 
-#if !BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
 void ProfileMenuView::OnSignoutButtonClicked() {
   RecordClick(ActionableItem::kSignoutButton);
   if (!perform_menu_actions())
@@ -356,15 +357,22 @@
       signin_metrics::SourceForRefreshTokenOperation::
           kUserMenu_SignOutAllAccounts);
 }
+#endif
 
+#if !BUILDFLAG(IS_CHROMEOS_ASH)
 void ProfileMenuView::OnSigninButtonClicked() {
   RecordClick(ActionableItem::kSigninButton);
+#if BUILDFLAG(IS_CHROMEOS_LACROS)
+  // TODO(https://crbug.com/1260291): Add support for Lacros.
+  NOTIMPLEMENTED();
+#else
   if (!perform_menu_actions())
     return;
   Hide();
   browser()->signin_view_controller()->ShowSignin(
       profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN,
       signin_metrics::AccessPoint::ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN);
+#endif
 }
 
 void ProfileMenuView::OnOtherProfileSelected(
@@ -610,7 +618,7 @@
     }
   }
 
-#if !BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
   const bool has_primary_account =
       !profile->IsGuestSession() &&
       identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync);
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view.h b/chrome/browser/ui/views/profiles/profile_menu_view.h
index 542ec3e..2d2924e 100644
--- a/chrome/browser/ui/views/profiles/profile_menu_view.h
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.h
@@ -19,6 +19,7 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/profiles/profile_menu_view_base.h"
 #include "components/signin/core/browser/signin_header_helper.h"
+#include "components/signin/public/base/signin_buildflags.h"
 #include "ui/views/controls/styled_label.h"
 
 namespace views {
@@ -64,8 +65,10 @@
   void OnSyncErrorButtonClicked(AvatarSyncErrorType error);
   void OnSigninAccountButtonClicked(AccountInfo account);
   void OnCookiesClearedOnExitLinkClicked();
-#if !BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
   void OnSignoutButtonClicked();
+#endif
+#if !BUILDFLAG(IS_CHROMEOS_ASH)
   void OnSigninButtonClicked();
   void OnOtherProfileSelected(const base::FilePath& profile_path);
   void OnAddNewProfileButtonClicked();
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
index 798af7a..04449ec 100644
--- a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
@@ -903,7 +903,6 @@
   browser()->profile()->GetPrefs()->SetBoolean(
       prefs::kSigninAllowedOnNextStartup, false);
 }
-#endif  // !BUILDFLAG(IS_CHROMEOS_LACROS)
 
 // List of actionable items in the correct order as they appear in the menu.
 // If a new button is added to the menu, it should also be added to this list.
@@ -936,6 +935,7 @@
 
   RunTest();
 }
+#endif  // !BUILDFLAG(IS_CHROMEOS_LACROS)
 
 // List of actionable items in the correct order as they appear in the menu.
 // If a new button is added to the menu, it should also be added to this list.
diff --git a/chrome/browser/ui/web_applications/create_shortcut_browsertest.cc b/chrome/browser/ui/web_applications/create_shortcut_browsertest.cc
index aed2ac1..5e3fa1a1 100644
--- a/chrome/browser/ui/web_applications/create_shortcut_browsertest.cc
+++ b/chrome/browser/ui/web_applications/create_shortcut_browsertest.cc
@@ -20,6 +20,7 @@
 #include "chrome/browser/web_applications/test/web_app_test_observers.h"
 #include "chrome/browser/web_applications/web_app_constants.h"
 #include "chrome/browser/web_applications/web_app_id.h"
+#include "chrome/browser/web_applications/web_app_install_manager.h"
 #include "chrome/browser/web_applications/web_app_prefs_utils.h"
 #include "chrome/browser/web_applications/web_app_provider.h"
 #include "chrome/browser/web_applications/web_app_registrar.h"
@@ -234,6 +235,13 @@
   EXPECT_EQ(registrar().GetAppShortName(app_id), GetInstallableAppName());
   // Shortcut apps to PWAs should launch in a tab.
   EXPECT_EQ(registrar().GetAppUserDisplayMode(app_id), DisplayMode::kBrowser);
+  // TODO(crbug.com/1275945): We need to wait a bit longer for the
+  // WebAppInstallTask to complete before starting another install.
+  // Move the install/update/uninstall events out of
+  // AppRegistrarObserver and into a WebAppInstallManagerObserver
+  // interface so they can be guaranteed to fire after the
+  // WebAppInstallTask's lifetime has ended.
+  base::RunLoop().RunUntilIdle();
 
   InstallShortcutAppForCurrentUrl(/*open_as_window=*/true);
   // Re-install with enabling open_as_window should update user display mode.
@@ -241,4 +249,17 @@
             DisplayMode::kStandalone);
 }
 
+IN_PROC_BROWSER_TEST_F(CreateShortcutBrowserTest, OpenShortcutWindowOnlyOnce) {
+  base::UserActionTester user_action_tester;
+  NavigateToURLAndWait(browser(), GetInstallableAppURL());
+
+  WebAppTestInstallObserver observer(profile());
+  // The "Create shortcut" call is executed twice, but the dialog
+  // must be shown only once.
+  ASSERT_TRUE(chrome::ExecuteCommand(browser(), IDC_CREATE_SHORTCUT));
+  ASSERT_TRUE(chrome::ExecuteCommand(browser(), IDC_CREATE_SHORTCUT));
+
+  EXPECT_EQ(1u, provider().install_manager().GetInstallTaskCountForTesting());
+}
+
 }  // namespace web_app
diff --git a/chrome/browser/ui/web_applications/web_app_dialog_utils.cc b/chrome/browser/ui/web_applications/web_app_dialog_utils.cc
index 98019cd3..f5c50af 100644
--- a/chrome/browser/ui/web_applications/web_app_dialog_utils.cc
+++ b/chrome/browser/ui/web_applications/web_app_dialog_utils.cc
@@ -102,6 +102,9 @@
   auto* provider = WebAppProvider::GetForWebContents(web_contents);
   DCHECK(provider);
 
+  if (provider->install_manager().IsInstallingForWebContents(web_contents))
+    return;
+
   webapps::WebappInstallSource install_source =
       webapps::InstallableMetrics::GetInstallSource(
           web_contents, force_shortcut_app
diff --git a/chrome/browser/ui/webui/chromeos/login/consolidated_consent_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/consolidated_consent_screen_handler.cc
index b801354..468244f 100644
--- a/chrome/browser/ui/webui/chromeos/login/consolidated_consent_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/consolidated_consent_screen_handler.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/chromeos/login/consolidated_consent_screen_handler.h"
 
+#include "ash/constants/ash_switches.h"
+#include "base/command_line.h"
 #include "chrome/browser/ash/login/oobe_screen.h"
 #include "chrome/browser/ash/login/screens/consolidated_consent_screen.h"
 #include "chrome/grit/chromium_strings.h"
@@ -107,6 +109,13 @@
                IDS_CONSOLIDATED_CONSENT_ARC_TITLE);
   builder->Add("consolidatedConsentPrivacyTitle",
                IDS_CONSOLIDATED_CONSENT_PRIVACY_POLICY_TITLE);
+
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kArcTosHostForTests)) {
+    builder->Add("consolidatedConsentArcTosHostNameForTesting",
+                 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+                     switches::kArcTosHostForTests));
+  }
 }
 
 void ConsolidatedConsentScreenHandler::Initialize() {}
diff --git a/chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom b/chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom
index eddc9ad..c15a6f7 100644
--- a/chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom
+++ b/chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom
@@ -12,12 +12,40 @@
   NO_KEY = 2,
 };
 
+// Trust level of the signing key which is equivalent to the key provider type.
+enum KeyTrustLevel {
+  UNSPECIFIED = 0,
+  TPM = 1,
+  OS = 2,
+};
+
+// Type of the signing key, equivalent to the algorithm used for its generation.
+enum KeyType {
+  UNKNOWN = 0,
+  RSA = 1,
+  EC = 2,
+};
+
+struct KeyInfo {
+  // Whether the key manager has loaded a key successfully.
+  KeyManagerInitializedValue is_key_manager_initialized;
+
+  // Loaded key's trust level, will be UNSPECIFIED if
+  // `is_key_manager_initialized` is not KEY_LOADED.
+  KeyTrustLevel trust_level;
+
+
+  // Key's algorithm, will be UNKNOWN if `is_key_manager_initialized` is not
+  // KEY_LOADED.
+  KeyType key_type;
+};
+
 struct ZeroTrustState {
   // Whether the connector is enabled or not.
   bool is_enabled;
 
-  // Whether the key manager has loaded a key successfully.
-  KeyManagerInitializedValue is_key_manager_initialized;
+  // Information around the state of the device trust signing key.
+  KeyInfo key_info;
 
   // Dictionary containing device signals.
   map<string, string> signals_dictionary;
diff --git a/chrome/browser/ui/webui/connectors_internals/connectors_internals_page_handler.cc b/chrome/browser/ui/webui/connectors_internals/connectors_internals_page_handler.cc
index 7bf2649..155e223 100644
--- a/chrome/browser/ui/webui/connectors_internals/connectors_internals_page_handler.cc
+++ b/chrome/browser/ui/webui/connectors_internals/connectors_internals_page_handler.cc
@@ -15,36 +15,8 @@
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 
-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/policy/chrome_browser_policy_connector.h"
-#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
-#include "components/enterprise/browser/device_trust/device_trust_key_manager.h"
-#endif  // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
-
 namespace enterprise_connectors {
 
-namespace {
-
-connectors_internals::mojom::KeyManagerInitializedValue
-IsKeyManagerInitialized() {
-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
-  auto* key_manager = g_browser_process->browser_policy_connector()
-                          ->chrome_browser_cloud_management_controller()
-                          ->GetDeviceTrustKeyManager();
-  if (key_manager) {
-    return key_manager->IsFullyInitialized()
-               ? connectors_internals::mojom::KeyManagerInitializedValue::
-                     KEY_LOADED
-               : connectors_internals::mojom::KeyManagerInitializedValue::
-                     NO_KEY;
-  }
-#endif  // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
-  return connectors_internals::mojom::KeyManagerInitializedValue::UNSUPPORTED;
-}
-
-}  // namespace
-
 ConnectorsInternalsPageHandler::ConnectorsInternalsPageHandler(
     mojo::PendingReceiver<connectors_internals::mojom::PageHandler> receiver,
     Profile* profile)
@@ -63,7 +35,11 @@
   if (!device_trust_service) {
     auto state = connectors_internals::mojom::ZeroTrustState::New(
         false,
-        connectors_internals::mojom::KeyManagerInitializedValue::UNSUPPORTED,
+        connectors_internals::mojom::KeyInfo::New(
+            connectors_internals::mojom::KeyManagerInitializedValue::
+                UNSUPPORTED,
+            connectors_internals::mojom::KeyTrustLevel::UNSPECIFIED,
+            connectors_internals::mojom::KeyType::UNKNOWN),
         base::flat_map<std::string, std::string>());
     std::move(callback).Run(std::move(state));
     return;
@@ -82,7 +58,7 @@
     bool is_device_trust_enabled,
     std::unique_ptr<SignalsType> signals) {
   auto state = connectors_internals::mojom::ZeroTrustState::New(
-      is_device_trust_enabled, IsKeyManagerInitialized(),
+      is_device_trust_enabled, utils::GetKeyInfo(),
       utils::SignalsToMap(std::move(signals)));
   std::move(callback).Run(std::move(state));
 }
diff --git a/chrome/browser/ui/webui/connectors_internals/zero_trust_utils.cc b/chrome/browser/ui/webui/connectors_internals/zero_trust_utils.cc
index 6d27e66..7e0a3f7c 100644
--- a/chrome/browser/ui/webui/connectors_internals/zero_trust_utils.cc
+++ b/chrome/browser/ui/webui/connectors_internals/zero_trust_utils.cc
@@ -7,6 +7,18 @@
 #include "base/containers/span.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
+#include "build/build_config.h"
+
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/policy/chrome_browser_policy_connector.h"
+#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
+#include "components/enterprise/browser/device_trust/device_trust_key_manager.h"
+#include "components/policy/proto/device_management_backend.pb.h"
+#include "crypto/signature_verifier.h"
+
+using BPKUR = enterprise_management::BrowserPublicKeyUploadRequest;
+#endif  // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
 
 namespace enterprise_connectors {
 namespace utils {
@@ -54,6 +66,34 @@
       std::vector<base::StringPiece>(values.begin(), values.end()), ", ");
 }
 
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
+
+connectors_internals::mojom::KeyTrustLevel ParseTrustLevel(
+    BPKUR::KeyTrustLevel trust_level) {
+  switch (trust_level) {
+    case BPKUR::CHROME_BROWSER_TPM_KEY:
+      return connectors_internals::mojom::KeyTrustLevel::TPM;
+    case BPKUR::CHROME_BROWSER_OS_KEY:
+      return connectors_internals::mojom::KeyTrustLevel::OS;
+    default:
+      return connectors_internals::mojom::KeyTrustLevel::UNSPECIFIED;
+  }
+}
+
+connectors_internals::mojom::KeyType AlgorithmToType(
+    crypto::SignatureVerifier::SignatureAlgorithm algorithm) {
+  switch (algorithm) {
+    case crypto::SignatureVerifier::RSA_PKCS1_SHA1:
+    case crypto::SignatureVerifier::RSA_PKCS1_SHA256:
+    case crypto::SignatureVerifier::RSA_PSS_SHA256:
+      return connectors_internals::mojom::KeyType::RSA;
+    case crypto::SignatureVerifier::ECDSA_SHA256:
+      return connectors_internals::mojom::KeyType::EC;
+  }
+}
+
+#endif  // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
+
 }  // namespace
 
 base::flat_map<std::string, std::string> SignalsToMap(
@@ -130,5 +170,31 @@
   return map;
 }
 
+connectors_internals::mojom::KeyInfoPtr GetKeyInfo() {
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
+  auto* key_manager = g_browser_process->browser_policy_connector()
+                          ->chrome_browser_cloud_management_controller()
+                          ->GetDeviceTrustKeyManager();
+  if (key_manager) {
+    auto metadata = key_manager->GetLoadedKeyMetadata();
+    if (metadata) {
+      return connectors_internals::mojom::KeyInfo::New(
+          connectors_internals::mojom::KeyManagerInitializedValue::KEY_LOADED,
+          ParseTrustLevel(metadata->trust_level),
+          AlgorithmToType(metadata->algorithm));
+    } else {
+      return connectors_internals::mojom::KeyInfo::New(
+          connectors_internals::mojom::KeyManagerInitializedValue::NO_KEY,
+          connectors_internals::mojom::KeyTrustLevel::UNSPECIFIED,
+          connectors_internals::mojom::KeyType::UNKNOWN);
+    }
+  }
+#endif  // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
+  return connectors_internals::mojom::KeyInfo::New(
+      connectors_internals::mojom::KeyManagerInitializedValue::UNSUPPORTED,
+      connectors_internals::mojom::KeyTrustLevel::UNSPECIFIED,
+      connectors_internals::mojom::KeyType::UNKNOWN);
+}
+
 }  // namespace utils
 }  // namespace enterprise_connectors
diff --git a/chrome/browser/ui/webui/connectors_internals/zero_trust_utils.h b/chrome/browser/ui/webui/connectors_internals/zero_trust_utils.h
index c8f16f05..a62d064 100644
--- a/chrome/browser/ui/webui/connectors_internals/zero_trust_utils.h
+++ b/chrome/browser/ui/webui/connectors_internals/zero_trust_utils.h
@@ -10,6 +10,7 @@
 
 #include "base/containers/flat_map.h"
 #include "chrome/browser/enterprise/connectors/device_trust/attestation/common/signals_type.h"
+#include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h"
 
 namespace enterprise_connectors {
 namespace utils {
@@ -18,6 +19,10 @@
 base::flat_map<std::string, std::string> SignalsToMap(
     std::unique_ptr<SignalsType> signals);
 
+// Retrieves the KeyInfo containing any information about the currently loaded
+// key.
+connectors_internals::mojom::KeyInfoPtr GetKeyInfo();
+
 }  // namespace utils
 }  // namespace enterprise_connectors
 
diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc
index fdcd8fe..8be21e6 100644
--- a/chrome/browser/ui/webui/settings/people_handler.cc
+++ b/chrome/browser/ui/webui/settings/people_handler.cc
@@ -263,15 +263,17 @@
                                          base::Unretained(this)));
 #else
   web_ui()->RegisterDeprecatedMessageCallback(
+      "SyncSetupStartSignIn",
+      base::BindRepeating(&PeopleHandler::HandleStartSignin,
+                          base::Unretained(this)));
+#endif
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
+  web_ui()->RegisterDeprecatedMessageCallback(
       "SyncSetupSignout", base::BindRepeating(&PeopleHandler::HandleSignout,
                                               base::Unretained(this)));
   web_ui()->RegisterDeprecatedMessageCallback(
       "SyncSetupPauseSync", base::BindRepeating(&PeopleHandler::HandlePauseSync,
                                                 base::Unretained(this)));
-  web_ui()->RegisterDeprecatedMessageCallback(
-      "SyncSetupStartSignIn",
-      base::BindRepeating(&PeopleHandler::HandleStartSignin,
-                          base::Unretained(this)));
 #endif
   web_ui()->RegisterDeprecatedMessageCallback(
       "SyncSetupGetStoredAccounts",
@@ -325,6 +327,7 @@
 
 void PeopleHandler::DisplayGaiaLoginInNewTabOrWindow(
     signin_metrics::AccessPoint access_point) {
+#if !BUILDFLAG(IS_CHROMEOS_LACROS)
   Browser* browser =
       chrome::FindBrowserWithWebContents(web_ui()->GetWebContents());
   if (!browser)
@@ -356,8 +359,12 @@
     browser->window()->ShowAvatarBubbleFromAvatarButton(
         BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN, access_point, false);
   }
-}
+#else
+  // TODO(https://crbug.com/1260291): Add support for Lacros.
+  NOTIMPLEMENTED();
 #endif
+}
+#endif  // !BUILDFLAG(IS_CHROMEOS_ASH)
 
 void PeopleHandler::OnDidClosePage(const base::ListValue* args) {
   // Don't mark setup as complete if "didAbort" is true, or if authentication
@@ -609,7 +616,9 @@
 
   DisplayGaiaLogin(signin_metrics::AccessPoint::ACCESS_POINT_SETTINGS);
 }
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
 void PeopleHandler::HandleSignout(const base::ListValue* args) {
   bool delete_profile = false;
   if (args->GetList()[0].is_bool())
@@ -667,7 +676,7 @@
       ->InvalidateRefreshTokenForPrimaryAccount(
           signin_metrics::SourceForRefreshTokenOperation::kSettings_PauseSync);
 }
-#endif
+#endif  // BUILDFLAG(ENABLE_DICE_SUPPORT)
 
 void PeopleHandler::HandleStartKeyRetrieval(const base::ListValue* args) {
   Browser* browser =
diff --git a/chrome/browser/ui/webui/settings/people_handler.h b/chrome/browser/ui/webui/settings/people_handler.h
index 306fd67..de88939 100644
--- a/chrome/browser/ui/webui/settings/people_handler.h
+++ b/chrome/browser/ui/webui/settings/people_handler.h
@@ -165,9 +165,10 @@
   void HandleAttemptUserExit(const base::ListValue* args);
   void HandleTurnOnSync(const base::ListValue* args);
   void HandleTurnOffSync(const base::ListValue* args);
-#endif
-#if !BUILDFLAG(IS_CHROMEOS_ASH)
+#else
   void HandleStartSignin(const base::ListValue* args);
+#endif
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
   void HandleSignout(const base::ListValue* args);
   void HandlePauseSync(const base::ListValue* args);
 #endif
diff --git a/chrome/browser/ui/webui/signin/profile_picker_handler_unittest.cc b/chrome/browser/ui/webui/signin/profile_picker_handler_unittest.cc
index 1b48bef..24fbe99e 100644
--- a/chrome/browser/ui/webui/signin/profile_picker_handler_unittest.cc
+++ b/chrome/browser/ui/webui/signin/profile_picker_handler_unittest.cc
@@ -369,6 +369,58 @@
   // TODO(https://crbug/1226050): Test all other fields.
 }
 
+TEST_F(ProfilePickerHandlerTest, ProfilePickerObservesAvailableAccounts) {
+  // AccountProfileMapper only allows available accounts if there are
+  // multiple profiles.
+  CreateTestingProfile("Primary");
+  CreateTestingProfile("Secondary");
+
+  // Add some available accounts into the facade.
+  const std::string kGaiaId1 = "some_gaia_id1";
+  const std::string kGaiaId2 = "some_gaia_id2";
+  account_manager::Account account1{
+      account_manager::AccountKey{kGaiaId1,
+                                  account_manager::AccountType::kGaia},
+      "example1@gmail.com"};
+  account_manager::Account account2{
+      account_manager::AccountKey{kGaiaId2,
+                                  account_manager::AccountType::kGaia},
+      "example2@gmail.com"};
+  CompleteFacadeGetAccounts({account1, account2});
+
+  // Send message to the handler.
+  base::ListValue empty_args;
+  web_ui()->HandleReceivedMessage("getAvailableAccounts", &empty_args);
+
+  // Check that the handler replied.
+  ASSERT_TRUE(!web_ui()->call_data().empty());
+  LOG(INFO) << web_ui()->call_data().size();
+  const content::TestWebUI::CallData& data1 = *web_ui()->call_data().back();
+  EXPECT_EQ("cr.webUIListenerCallback", data1.function_name());
+  EXPECT_EQ("available-accounts-changed", data1.arg1()->GetString());
+  EXPECT_EQ(data1.arg2()->GetList().size(), 2u);
+
+  // Add another account.
+  const std::string kGaiaId = "some_gaia_id3";
+  account_manager::Account new_account{
+      account_manager::AccountKey{kGaiaId, account_manager::AccountType::kGaia},
+      "example3@gmail.com"};
+  profile_manager()
+      ->profile_manager()
+      ->GetAccountProfileMapper()
+      ->OnAccountUpserted(new_account);
+  CompleteFacadeGetAccounts({account1, account2, new_account});
+
+  // Check that the profile picker handler picked up the new account, and
+  // forwarded it to the Web UI.
+  ASSERT_TRUE(!web_ui()->call_data().empty());
+  LOG(INFO) << web_ui()->call_data().size();
+  const content::TestWebUI::CallData& data2 = *web_ui()->call_data().back();
+  EXPECT_EQ("cr.webUIListenerCallback", data2.function_name());
+  EXPECT_EQ("available-accounts-changed", data2.arg1()->GetString());
+  EXPECT_EQ(data2.arg2()->GetList().size(), 3u);
+}
+
 TEST_F(ProfilePickerHandlerTest, CreateProfileExistingAccount) {
   // Lacros always expects a default profile.
   CreateTestingProfile("Default");
diff --git a/chrome/browser/web_applications/web_app_install_manager.cc b/chrome/browser/web_applications/web_app_install_manager.cc
index 2a7f4f6..c5dc6b5 100644
--- a/chrome/browser/web_applications/web_app_install_manager.cc
+++ b/chrome/browser/web_applications/web_app_install_manager.cc
@@ -12,6 +12,7 @@
 #include "base/callback_helpers.h"
 #include "base/feature_list.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/ranges/algorithm.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
@@ -79,6 +80,18 @@
   web_contents_.reset();
 }
 
+bool WebAppInstallManager::IsInstallingForWebContents(
+    const content::WebContents* web_contents) const {
+  return base::ranges::any_of(
+      tasks_, [web_contents](const std::unique_ptr<WebAppInstallTask>& task) {
+        return task->GetInstallingWebContents() == web_contents;
+      });
+}
+
+std::size_t WebAppInstallManager::GetInstallTaskCountForTesting() const {
+  return tasks_.size();
+}
+
 void WebAppInstallManager::SetSubsystems(
     WebAppRegistrar* registrar,
     OsIntegrationManager* os_integration_manager,
diff --git a/chrome/browser/web_applications/web_app_install_manager.h b/chrome/browser/web_applications/web_app_install_manager.h
index 81dcf1d..5d3e100 100644
--- a/chrome/browser/web_applications/web_app_install_manager.h
+++ b/chrome/browser/web_applications/web_app_install_manager.h
@@ -118,6 +118,14 @@
       webapps::WebappInstallSource install_source,
       OnceInstallCallback callback);
 
+  // Returns whether the an installation is already running with the
+  // same web contents.
+  bool IsInstallingForWebContents(
+      const content::WebContents* web_contents) const;
+
+  // Returns the number of running web app installations.
+  std::size_t GetInstallTaskCountForTesting() const;
+
   // For the new USS-based system only. SyncInstallDelegate:
   void InstallWebAppsAfterSync(std::vector<WebApp*> web_apps,
                                RepeatingInstallCallback callback) override;
diff --git a/chrome/browser/web_applications/web_app_install_task.cc b/chrome/browser/web_applications/web_app_install_task.cc
index f3dd5ca..41c92d228 100644
--- a/chrome/browser/web_applications/web_app_install_task.cc
+++ b/chrome/browser/web_applications/web_app_install_task.cc
@@ -167,6 +167,7 @@
   CheckInstallPreconditions();
 
   Observe(contents);
+  installing_web_contents_ = contents;
   dialog_callback_ = std::move(dialog_callback);
   install_callback_ = std::move(install_callback);
   install_source_ = install_source;
@@ -193,6 +194,7 @@
   CheckInstallPreconditions();
 
   Observe(contents);
+  installing_web_contents_ = contents;
   dialog_callback_ = std::move(dialog_callback);
   install_callback_ = std::move(install_callback);
   install_source_ = install_source;
@@ -213,6 +215,7 @@
   CheckInstallPreconditions();
 
   Observe(contents);
+  installing_web_contents_ = contents;
   if (ShouldStopInstall())
     return;
 
@@ -236,6 +239,7 @@
   CheckInstallPreconditions();
 
   Observe(contents);
+  installing_web_contents_ = contents;
   if (ShouldStopInstall())
     return;
 
@@ -311,6 +315,7 @@
   CheckInstallPreconditions();
 
   Observe(contents);
+  installing_web_contents_ = contents;
   SetInstallParams(install_params);
   install_callback_ = std::move(install_callback);
   install_source_ = install_source;
@@ -354,6 +359,10 @@
   return web_contents;
 }
 
+content::WebContents* WebAppInstallTask::GetInstallingWebContents() {
+  return installing_web_contents_;
+}
+
 base::WeakPtr<WebAppInstallTask> WebAppInstallTask::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
@@ -722,6 +731,7 @@
   CheckInstallPreconditions();
 
   Observe(web_contents);
+  installing_web_contents_ = web_contents;
   if (ShouldStopInstall())
     return;
 
diff --git a/chrome/browser/web_applications/web_app_install_task.h b/chrome/browser/web_applications/web_app_install_task.h
index ed4195b..9cf78194 100644
--- a/chrome/browser/web_applications/web_app_install_task.h
+++ b/chrome/browser/web_applications/web_app_install_task.h
@@ -152,6 +152,12 @@
   static std::unique_ptr<content::WebContents> CreateWebContents(
       Profile* profile);
 
+  // Returns the pre-existing web contents the installation was
+  // initiated with.
+  // This is different to web_contents which is created
+  // specifically for the install task.
+  content::WebContents* GetInstallingWebContents();
+
   base::WeakPtr<WebAppInstallTask> GetWeakPtr();
 
   // WebContentsObserver:
@@ -298,6 +304,7 @@
   std::unique_ptr<WebAppDataRetriever> data_retriever_;
   std::unique_ptr<WebApplicationInfo> web_application_info_;
   std::unique_ptr<content::WebContents> web_contents_;
+  content::WebContents* installing_web_contents_ = nullptr;
 
   raw_ptr<OsIntegrationManager> os_integration_manager_;
   raw_ptr<WebAppInstallFinalizer> install_finalizer_;
diff --git a/chrome/build/linux.pgo.txt b/chrome/build/linux.pgo.txt
index 93962d15f..aa9626c23 100644
--- a/chrome/build/linux.pgo.txt
+++ b/chrome/build/linux.pgo.txt
@@ -1 +1 @@
-chrome-linux-main-1638424727-cc4abcbaa6d6f719cf576b0f31fbb06dc7a47384.profdata
+chrome-linux-main-1638446252-3fe98c53b7a5cda8ca8deefaae9b18d09a47ea58.profdata
diff --git a/chrome/build/mac.pgo.txt b/chrome/build/mac.pgo.txt
index 17eb6d8b0..d449a0a0 100644
--- a/chrome/build/mac.pgo.txt
+++ b/chrome/build/mac.pgo.txt
@@ -1 +1 @@
-chrome-mac-main-1638424727-e543122b252b2427021248b8a00b5a79d00c9226.profdata
+chrome-mac-main-1638446252-8ce4f35303b4e97d2c48f63f1667c58b9eefac00.profdata
diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt
index d973396..5c38c92 100644
--- a/chrome/build/win32.pgo.txt
+++ b/chrome/build/win32.pgo.txt
@@ -1 +1 @@
-chrome-win32-main-1638435459-08470302edc9b0deb5090dd94da8ee2b4f91b2e0.profdata
+chrome-win32-main-1638455949-d08b57a4076d70796fb1d033540a88a1fcdd2c3b.profdata
diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt
index bccbfad..a602a565 100644
--- a/chrome/build/win64.pgo.txt
+++ b/chrome/build/win64.pgo.txt
@@ -1 +1 @@
-chrome-win64-main-1638435459-a88f41c48e44138bef39d3a2960379e4b334f97e.profdata
+chrome-win64-main-1638455949-0f734013df0454a4d823d7a5d1132c6cf2dc3b79.profdata
diff --git a/chrome/common/mac/app_mode_chrome_locator.mm b/chrome/common/mac/app_mode_chrome_locator.mm
index d477d5c..897d710 100644
--- a/chrome/common/mac/app_mode_chrome_locator.mm
+++ b/chrome/common/mac/app_mode_chrome_locator.mm
@@ -55,11 +55,22 @@
 }  // namespace
 
 bool FindBundleById(NSString* bundle_id, base::FilePath* out_bundle) {
+  // Prefer running instances to non-running instances found in the filesystem.
+  // https://crbug.com/1273666#c18
+  NSArray<NSRunningApplication*>* runningApplications =
+      [NSRunningApplication runningApplicationsWithBundleIdentifier:bundle_id];
+  if ([runningApplications count] > 0) {
+    NSRunningApplication* runningApplication =
+        [runningApplications objectAtIndex:0];
+    *out_bundle = base::mac::NSURLToFilePath([runningApplication bundleURL]);
+    DCHECK(!out_bundle->empty());
+    return true;
+  }
+
   NSWorkspace* ws = [NSWorkspace sharedWorkspace];
   NSString *bundlePath = [ws absolutePathForAppBundleWithIdentifier:bundle_id];
   if (!bundlePath)
     return false;
-
   *out_bundle = base::mac::NSStringToFilePath(bundlePath);
   return true;
 }
diff --git a/chrome/renderer/cart/commerce_hint_agent.cc b/chrome/renderer/cart/commerce_hint_agent.cc
index 63f4c36..ad2411d3 100644
--- a/chrome/renderer/cart/commerce_hint_agent.cc
+++ b/chrome/renderer/cart/commerce_hint_agent.cc
@@ -494,9 +494,6 @@
         GetProductIdFromRequest(url.spec().substr(0, kLengthLimit), nullptr);
   } else if (navigation_url.host() == kGStoreHost) {
     is_add_to_cart = url.spec().find("O2JPA") != std::string::npos;
-  } else if (url.DomainIs("zappos.com")) {
-    is_add_to_cart = url.spec().find("mobileapi/v1/cart?displayRewards=true") !=
-                     std::string::npos;
   } else {
     is_add_to_cart = CommerceHintAgent::IsAddToCart(url.path_piece());
   }
diff --git a/chrome/renderer/resources/cart/cart_domain_product_id_regex.json b/chrome/renderer/resources/cart/cart_domain_product_id_regex.json
index 1c387d2..0a9e1c2c 100644
--- a/chrome/renderer/resources/cart/cart_domain_product_id_regex.json
+++ b/chrome/renderer/resources/cart/cart_domain_product_id_regex.json
@@ -5,6 +5,5 @@
 "www.homesquare.com": "(images.cymax.com/Images/\\d+/(\\w+)-)"},
 "product_element":
 {"www.electronicexpress.com": "<a href=\"#modal-(\\w+)",
-"checkout.iherb.com": "product id: ([\\w|-]+)",
-"www.zappos.com": "<dd class=\"sT-z\">(\\w+)"}
+"checkout.iherb.com": "product id: ([\\w|-]+)"}
 }
diff --git a/chrome/renderer/supervised_user/supervised_user_error_page_controller.cc b/chrome/renderer/supervised_user/supervised_user_error_page_controller.cc
index 83e2b51..d75dae1 100644
--- a/chrome/renderer/supervised_user/supervised_user_error_page_controller.cc
+++ b/chrome/renderer/supervised_user/supervised_user_error_page_controller.cc
@@ -17,6 +17,14 @@
 #include "v8/include/v8-context.h"
 #include "v8/include/v8-microtask-queue.h"
 
+namespace {
+
+bool IsOutermostMainFrame(content::RenderFrame* render_frame) {
+  return render_frame->IsMainFrame() && !render_frame->IsInFencedFrameTree();
+}
+
+}  // namespace
+
 gin::WrapperInfo SupervisedUserErrorPageController::kWrapperInfo = {
     gin::kEmbedderNativeGin};
 
@@ -84,9 +92,11 @@
 
 void SupervisedUserErrorPageController::OnRequestUrlAccessRemote(bool success) {
   std::string result = success ? "true" : "false";
-  std::string in_main_frame = render_frame_->IsMainFrame() ? "true" : "false";
-  std::string js = base::StringPrintf("setRequestStatus(%s, %s)",
-                                      result.c_str(), in_main_frame.c_str());
+  std::string is_outermost_main_frame =
+      IsOutermostMainFrame(render_frame_) ? "true" : "false";
+  std::string js =
+      base::StringPrintf("setRequestStatus(%s, %s)", result.c_str(),
+                         is_outermost_main_frame.c_str());
   render_frame_->ExecuteJavaScript(base::ASCIIToUTF16(js));
 }
 
diff --git a/chrome/test/data/supervised_user/fenced_frame.html b/chrome/test/data/supervised_user/fenced_frame.html
new file mode 100644
index 0000000..2e91d23
--- /dev/null
+++ b/chrome/test/data/supervised_user/fenced_frame.html
@@ -0,0 +1,7 @@
+<html>
+<head>
+  <title>fenced frame</title>
+</head>
+<body>
+</body>
+</html>
diff --git a/chrome/test/data/supervised_user/fenced_frame.html.mock-http-headers b/chrome/test/data/supervised_user/fenced_frame.html.mock-http-headers
new file mode 100644
index 0000000..263e89c4
--- /dev/null
+++ b/chrome/test/data/supervised_user/fenced_frame.html.mock-http-headers
@@ -0,0 +1,2 @@
+HTTP/1.1 200 OK
+Supports-Loading-Mode: fenced-frame
\ No newline at end of file
diff --git a/chromeos/lacros/dbus/DEPS b/chromeos/lacros/dbus/DEPS
index 6f06cc5a..a772d43 100644
--- a/chromeos/lacros/dbus/DEPS
+++ b/chromeos/lacros/dbus/DEPS
@@ -3,4 +3,5 @@
   "-content",
 
   "+dbus",
+  "+device/bluetooth",
 ]
diff --git a/chromeos/lacros/dbus/lacros_dbus_helper.cc b/chromeos/lacros/dbus/lacros_dbus_helper.cc
index e54f539f..8fb0624 100644
--- a/chromeos/lacros/dbus/lacros_dbus_helper.cc
+++ b/chromeos/lacros/dbus/lacros_dbus_helper.cc
@@ -4,10 +4,14 @@
 
 #include "chromeos/lacros/dbus/lacros_dbus_helper.h"
 
+#include "base/feature_list.h"
 #include "chromeos/dbus/init/initialize_dbus_client.h"
 #include "chromeos/dbus/missive/missive_client.h"
 #include "chromeos/dbus/permission_broker/permission_broker_client.h"
 #include "chromeos/lacros/dbus/lacros_dbus_thread_manager.h"
+#include "device/bluetooth/dbus/bluez_dbus_manager.h"
+#include "device/bluetooth/floss/floss_dbus_manager.h"
+#include "device/bluetooth/floss/floss_features.h"
 
 namespace chromeos {
 
@@ -26,8 +30,23 @@
   InitializeDBusClient<MissiveClient>(bus);
 }
 
+void LacrosInitializeFeatureListDependentDBus() {
+  dbus::Bus* bus = LacrosDBusThreadManager::Get()->GetSystemBus();
+  if (base::FeatureList::IsEnabled(floss::features::kFlossEnabled)) {
+    InitializeDBusClient<floss::FlossDBusManager>(bus);
+  } else {
+    InitializeDBusClient<bluez::BluezDBusManager>(bus);
+  }
+}
+
 void LacrosShutdownDBus() {
   // Shut down D-Bus clients in reverse order of initialization.
+  if (base::FeatureList::IsEnabled(floss::features::kFlossEnabled)) {
+    floss::FlossDBusManager::Shutdown();
+  } else {
+    bluez::BluezDBusManager::Shutdown();
+  }
+
   MissiveClient::Shutdown();
 
   PermissionBrokerClient::Shutdown();
diff --git a/chromeos/lacros/dbus/lacros_dbus_helper.h b/chromeos/lacros/dbus/lacros_dbus_helper.h
index 09ad6432..5bad8c0 100644
--- a/chromeos/lacros/dbus/lacros_dbus_helper.h
+++ b/chromeos/lacros/dbus/lacros_dbus_helper.h
@@ -12,6 +12,11 @@
 // Initializes the D-Bus thread manager and Chrome DBus services for Lacros.
 COMPONENT_EXPORT(CHROMEOS_LACROS) void LacrosInitializeDBus();
 
+// D-Bus clients may depend on feature list. This initializes only those clients
+// in Lacros, and must be called after feature list initialization.
+COMPONENT_EXPORT(CHROMEOS_LACROS)
+void LacrosInitializeFeatureListDependentDBus();
+
 // Shuts down the D-Bus thread manager and Chrome DBus services for Lacros.
 COMPONENT_EXPORT(CHROMEOS_LACROS) void LacrosShutdownDBus();
 
diff --git a/chromeos/network/metrics/network_metrics_helper.cc b/chromeos/network/metrics/network_metrics_helper.cc
index dbcfd0a..d8449f17 100644
--- a/chromeos/network/metrics/network_metrics_helper.cc
+++ b/chromeos/network/metrics/network_metrics_helper.cc
@@ -6,6 +6,7 @@
 
 #include "base/metrics/histogram_functions.h"
 #include "chromeos/network/metrics/shill_connect_result.h"
+#include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
 
 namespace chromeos {
@@ -15,6 +16,10 @@
 const char kNetworkMetricsPrefix[] = "Network.";
 const char kAllConnectionResultSuffix[] = ".ConnectionResult.All";
 
+chromeos::NetworkStateHandler* GetNetworkStateHandler() {
+  return NetworkHandler::Get()->network_state_handler();
+}
+
 const std::vector<std::string> GetCellularNetworkTypeHistogams(
     const NetworkState* network_state) {
   const std::string kCellularPrefix = "Cellular";
@@ -81,20 +86,13 @@
 
 }  // namespace
 
-NetworkMetricsHelper::NetworkMetricsHelper() = default;
-
-NetworkMetricsHelper::~NetworkMetricsHelper() = default;
-
-void NetworkMetricsHelper::Init(NetworkStateHandler* network_state_handler) {
-  network_state_handler_ = network_state_handler;
-}
-
+// static
 void NetworkMetricsHelper::LogAllConnectionResult(
     const std::string& guid,
     const absl::optional<std::string>& shill_error) {
-  DCHECK(network_state_handler_);
+  DCHECK(GetNetworkStateHandler());
   const NetworkState* network_state =
-      network_state_handler_->GetNetworkStateFromGuid(guid);
+      GetNetworkStateHandler()->GetNetworkStateFromGuid(guid);
 
   ShillConnectResult connect_result =
       shill_error.has_value() ? ShillErrorToConnectResult(*shill_error)
@@ -107,4 +105,8 @@
   }
 }
 
+NetworkMetricsHelper::NetworkMetricsHelper() = default;
+
+NetworkMetricsHelper::~NetworkMetricsHelper() = default;
+
 }  // namespace chromeos
\ No newline at end of file
diff --git a/chromeos/network/metrics/network_metrics_helper.h b/chromeos/network/metrics/network_metrics_helper.h
index 8894cddf..8f7c7af 100644
--- a/chromeos/network/metrics/network_metrics_helper.h
+++ b/chromeos/network/metrics/network_metrics_helper.h
@@ -15,19 +15,14 @@
 // network types and their variants.
 class COMPONENT_EXPORT(CHROMEOS_NETWORK) NetworkMetricsHelper {
  public:
-  NetworkMetricsHelper();
-  ~NetworkMetricsHelper();
-
-  void Init(NetworkStateHandler* network_state_handler);
-
   // Logs connection result for network with given |guid|. If |shill_error| has
   // no value, a connection success is logged.
-  void LogAllConnectionResult(
+  static void LogAllConnectionResult(
       const std::string& guid,
       const absl::optional<std::string>& shill_error = absl::nullopt);
 
- private:
-  NetworkStateHandler* network_state_handler_;
+  NetworkMetricsHelper();
+  ~NetworkMetricsHelper();
 };
 
 }  // namespace chromeos
diff --git a/chromeos/network/metrics/network_metrics_helper_unittest.cc b/chromeos/network/metrics/network_metrics_helper_unittest.cc
index eff4913..c64f7cbf 100644
--- a/chromeos/network/metrics/network_metrics_helper_unittest.cc
+++ b/chromeos/network/metrics/network_metrics_helper_unittest.cc
@@ -9,7 +9,10 @@
 #include "base/run_loop.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/task_environment.h"
-#include "chromeos/network/network_state_test_helper.h"
+#include "chromeos/dbus/shill/shill_service_client.h"
+#include "chromeos/network/cellular_esim_profile_handler_impl.h"
+#include "chromeos/network/network_handler_test_helper.h"
+#include "components/prefs/testing_pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
@@ -43,37 +46,43 @@
   ~NetworkMetricsHelperTest() override = default;
 
   void SetUp() override {
-    network_metrics_helper_.reset(new NetworkMetricsHelper());
-    network_metrics_helper_->Init(
-        network_state_test_helper_.network_state_handler());
+    network_handler_test_helper_ = std::make_unique<NetworkHandlerTestHelper>();
     histogram_tester_ = std::make_unique<base::HistogramTester>();
-    shill_service_client_ = network_state_test_helper_.service_test();
+
+    shill_service_client_ = ShillServiceClient::Get()->GetTestInterface();
+    shill_service_client_->ClearServices();
+    base::RunLoop().RunUntilIdle();
+
+    CellularESimProfileHandlerImpl::RegisterLocalStatePrefs(
+        local_state_.registry());
+    chromeos::NetworkHandler::Get()->InitializePrefServices(&profile_prefs_,
+                                                            &local_state_);
   }
 
   void TearDown() override {
-    network_state_test_helper_.ClearServices();
-    network_metrics_helper_.reset();
+    shill_service_client_->ClearServices();
+    network_handler_test_helper_.reset();
   }
 
  protected:
   base::test::TaskEnvironment task_environment_;
   std::unique_ptr<base::HistogramTester> histogram_tester_;
-  NetworkStateTestHelper network_state_test_helper_{
-      false /* use_default_devices_and_services */};
+  std::unique_ptr<NetworkHandlerTestHelper> network_handler_test_helper_;
   ShillServiceClient::TestInterface* shill_service_client_;
-  std::unique_ptr<NetworkMetricsHelper> network_metrics_helper_;
+  TestingPrefServiceSimple profile_prefs_;
+  TestingPrefServiceSimple local_state_;
 };
 
 TEST_F(NetworkMetricsHelperTest, LogAllConnectionResultCellularESim) {
   shill_service_client_->AddService(kTestServicePath, kTestGuid, kTestName,
                                     shill::kTypeCellular, shill::kStateIdle,
-                                    true);
+                                    /*add_to_visible=*/true);
   shill_service_client_->SetServiceProperty(
-      kTestServicePath, shill::kEidProperty, base::Value(kTestGuid));
+      kTestServicePath, shill::kEidProperty, base::Value("eid"));
   base::RunLoop().RunUntilIdle();
 
-  network_metrics_helper_->LogAllConnectionResult(kTestGuid,
-                                                  shill::kErrorNotRegistered);
+  NetworkMetricsHelper::LogAllConnectionResult(kTestGuid,
+                                               shill::kErrorNotRegistered);
   histogram_tester_->ExpectTotalCount(kCellularConnectResultAllHistogram, 1);
   histogram_tester_->ExpectTotalCount(kCellularESimConnectResultAllHistogram,
                                       1);
@@ -84,11 +93,11 @@
 TEST_F(NetworkMetricsHelperTest, LogAllConnectionResultCellularPSim) {
   shill_service_client_->AddService(kTestServicePath, kTestGuid, kTestName,
                                     shill::kTypeCellular, shill::kStateIdle,
-                                    true);
+                                    /*add_to_visible=*/true);
   base::RunLoop().RunUntilIdle();
 
-  network_metrics_helper_->LogAllConnectionResult(kTestGuid,
-                                                  shill::kErrorNotRegistered);
+  NetworkMetricsHelper::LogAllConnectionResult(kTestGuid,
+                                               shill::kErrorNotRegistered);
   histogram_tester_->ExpectTotalCount(kCellularConnectResultAllHistogram, 1);
   histogram_tester_->ExpectTotalCount(kCellularPSimConnectResultAllHistogram,
                                       1);
diff --git a/chromeos/network/network_handler.cc b/chromeos/network/network_handler.cc
index 9ad3500..036224f5 100644
--- a/chromeos/network/network_handler.cc
+++ b/chromeos/network/network_handler.cc
@@ -17,7 +17,6 @@
 #include "chromeos/network/client_cert_resolver.h"
 #include "chromeos/network/geolocation_handler.h"
 #include "chromeos/network/managed_network_configuration_handler_impl.h"
-#include "chromeos/network/metrics/network_metrics_helper.h"
 #include "chromeos/network/network_activation_handler_impl.h"
 #include "chromeos/network/network_cert_loader.h"
 #include "chromeos/network/network_cert_migrator.h"
@@ -57,10 +56,6 @@
   if (features::IsESimPolicyEnabled()) {
     cellular_policy_handler_.reset(new CellularPolicyHandler());
   }
-  // TODO(b/207589664): Pass |network_metrics_helper_| to ConnectionInfoLogger
-  // or instantiate |network_metrics_helper_| within ConnectionInfoLogger
-  // instead of here.
-  network_metrics_helper_.reset(new NetworkMetricsHelper());
   cellular_metrics_logger_.reset(new CellularMetricsLogger());
   if (NetworkCertLoader::IsInitialized()) {
     network_cert_migrator_.reset(new NetworkCertMigrator());
@@ -114,7 +109,6 @@
         cellular_esim_installer_.get(), network_profile_handler_.get(),
         managed_network_configuration_handler_.get());
   }
-  network_metrics_helper_->Init(network_state_handler_.get());
   cellular_metrics_logger_->Init(network_state_handler_.get(),
                                  network_connection_handler_.get(),
                                  cellular_esim_profile_handler_.get());
diff --git a/chromeos/network/network_handler.h b/chromeos/network/network_handler.h
index 4bef886..185fe05 100644
--- a/chromeos/network/network_handler.h
+++ b/chromeos/network/network_handler.h
@@ -35,7 +35,6 @@
 class NetworkDeviceHandler;
 class NetworkDeviceHandlerImpl;
 class NetworkMetadataStore;
-class NetworkMetricsHelper;
 class NetworkProfileHandler;
 class NetworkStateHandler;
 class NetworkSmsHandler;
@@ -134,7 +133,6 @@
       cellular_esim_uninstall_handler_;
   std::unique_ptr<CellularPolicyHandler> cellular_policy_handler_;
   std::unique_ptr<CellularMetricsLogger> cellular_metrics_logger_;
-  std::unique_ptr<NetworkMetricsHelper> network_metrics_helper_;
   std::unique_ptr<NetworkCertMigrator> network_cert_migrator_;
   std::unique_ptr<ClientCertResolver> client_cert_resolver_;
   std::unique_ptr<AutoConnectHandler> auto_connect_handler_;
diff --git a/chromeos/profiles/atom.afdo.newest.txt b/chromeos/profiles/atom.afdo.newest.txt
index f384a5b6..614083f 100644
--- a/chromeos/profiles/atom.afdo.newest.txt
+++ b/chromeos/profiles/atom.afdo.newest.txt
@@ -1 +1 @@
-chromeos-chrome-amd64-atom-97-4692.27-1638188563-benchmark-97.0.4692.36-r1-redacted.afdo.xz
+chromeos-chrome-amd64-atom-98-4692.27-1638182350-benchmark-98.0.4729.0-r2-redacted.afdo.xz
diff --git a/chromeos/profiles/bigcore.afdo.newest.txt b/chromeos/profiles/bigcore.afdo.newest.txt
index a93b0fb1..0d61707 100644
--- a/chromeos/profiles/bigcore.afdo.newest.txt
+++ b/chromeos/profiles/bigcore.afdo.newest.txt
@@ -1 +1 @@
-chromeos-chrome-amd64-bigcore-97-4692.27-1638184659-benchmark-97.0.4692.36-r1-redacted.afdo.xz
+chromeos-chrome-amd64-bigcore-98-4692.27-1638190072-benchmark-98.0.4729.0-r2-redacted.afdo.xz
diff --git a/chromeos/services/bluetooth_config/bluetooth_device_status_notifier.cc b/chromeos/services/bluetooth_config/bluetooth_device_status_notifier.cc
index ef0e5567..d2a8ea6 100644
--- a/chromeos/services/bluetooth_config/bluetooth_device_status_notifier.cc
+++ b/chromeos/services/bluetooth_config/bluetooth_device_status_notifier.cc
@@ -16,30 +16,24 @@
   observers_.Add(std::move(observer));
 }
 
-void BluetoothDeviceStatusNotifier::NotifyDevicesNewlyPaired(
-    const std::vector<mojom::PairedBluetoothDevicePropertiesPtr>& devices) {
+void BluetoothDeviceStatusNotifier::NotifyDeviceNewlyPaired(
+    const mojom::PairedBluetoothDevicePropertiesPtr& device) {
   for (auto& observer : observers_) {
-    for (auto& device : devices) {
-      observer->OnDevicePaired(mojo::Clone(device));
-    }
+    observer->OnDevicePaired(mojo::Clone(device));
   }
 }
 
-void BluetoothDeviceStatusNotifier::NotifyDevicesNewlyConnected(
-    const std::vector<mojom::PairedBluetoothDevicePropertiesPtr>& devices) {
+void BluetoothDeviceStatusNotifier::NotifyDeviceNewlyConnected(
+    const mojom::PairedBluetoothDevicePropertiesPtr& device) {
   for (auto& observer : observers_) {
-    for (auto& device : devices) {
-      observer->OnDeviceConnected(mojo::Clone(device));
-    }
+    observer->OnDeviceConnected(mojo::Clone(device));
   }
 }
 
-void BluetoothDeviceStatusNotifier::NotifyDevicesNewlyDisconnected(
-    const std::vector<mojom::PairedBluetoothDevicePropertiesPtr>& devices) {
+void BluetoothDeviceStatusNotifier::NotifyDeviceNewlyDisconnected(
+    const mojom::PairedBluetoothDevicePropertiesPtr& device) {
   for (auto& observer : observers_) {
-    for (auto& device : devices) {
-      observer->OnDeviceDisconnected(mojo::Clone(device));
-    }
+    observer->OnDeviceDisconnected(mojo::Clone(device));
   }
 }
 
diff --git a/chromeos/services/bluetooth_config/bluetooth_device_status_notifier.h b/chromeos/services/bluetooth_config/bluetooth_device_status_notifier.h
index 5a21ddd1..4c779b6 100644
--- a/chromeos/services/bluetooth_config/bluetooth_device_status_notifier.h
+++ b/chromeos/services/bluetooth_config/bluetooth_device_status_notifier.h
@@ -29,20 +29,20 @@
  protected:
   BluetoothDeviceStatusNotifier();
 
-  // Notifies all observers for each device that is newly paired. Should be
+  // Notifies all observers for a device that is newly paired. Should be
   // called by derived types to notify observers of device pairings.
-  void NotifyDevicesNewlyPaired(
-      const std::vector<mojom::PairedBluetoothDevicePropertiesPtr>& devices);
+  void NotifyDeviceNewlyPaired(
+      const mojom::PairedBluetoothDevicePropertiesPtr& device);
 
-  // Notifies all observers for each device that is connected. Should be
+  // Notifies all observers for a device that is connected. Should be
   // called by derived types to notify observers of device connection.
-  void NotifyDevicesNewlyConnected(
-      const std::vector<mojom::PairedBluetoothDevicePropertiesPtr>& properties);
+  void NotifyDeviceNewlyConnected(
+      const mojom::PairedBluetoothDevicePropertiesPtr& device);
 
-  // Notifies all observers for each device that is disconnected. Should be
+  // Notifies all observers for a device that is disconnected. Should be
   // called by derived types to notify observers of device disconnection.
-  void NotifyDevicesNewlyDisconnected(
-      const std::vector<mojom::PairedBluetoothDevicePropertiesPtr>& properties);
+  void NotifyDeviceNewlyDisconnected(
+      const mojom::PairedBluetoothDevicePropertiesPtr& device);
 
  private:
   friend class BluetoothDeviceStatusNotifierImplTest;
diff --git a/chromeos/services/bluetooth_config/bluetooth_device_status_notifier_impl.cc b/chromeos/services/bluetooth_config/bluetooth_device_status_notifier_impl.cc
index f408870..be60fa6 100644
--- a/chromeos/services/bluetooth_config/bluetooth_device_status_notifier_impl.cc
+++ b/chromeos/services/bluetooth_config/bluetooth_device_status_notifier_impl.cc
@@ -37,13 +37,6 @@
     return;
   }
 
-  // TODO(b/208469977): Remove vectors and notify observers immediately.
-  std::vector<mojom::PairedBluetoothDevicePropertiesPtr> newly_paired_devices;
-  std::vector<mojom::PairedBluetoothDevicePropertiesPtr>
-      newly_disconnected_devices;
-  std::vector<mojom::PairedBluetoothDevicePropertiesPtr>
-      newly_connected_devices;
-
   // Store old map in a temporary map, this is done so if a device is unpaired
   // |devices_id_to_properties_map_| will always contain only currently paired
   // devices.
@@ -62,7 +55,7 @@
     // Check if device is not in previous map. If it is not, this means a new
     // paired device was found.
     if (it == previous_devices_id_to_properties_map.end()) {
-      newly_paired_devices.push_back(device.Clone());
+      NotifyDeviceNewlyPaired(device);
       continue;
     }
 
@@ -71,7 +64,7 @@
             mojom::DeviceConnectionState::kConnected &&
         device->device_properties->connection_state ==
             mojom::DeviceConnectionState::kNotConnected) {
-      newly_disconnected_devices.push_back(device.Clone());
+      NotifyDeviceNewlyDisconnected(device);
       continue;
     }
 
@@ -80,14 +73,10 @@
             mojom::DeviceConnectionState::kConnected &&
         device->device_properties->connection_state ==
             mojom::DeviceConnectionState::kConnected) {
-      newly_connected_devices.push_back(device.Clone());
+      NotifyDeviceNewlyConnected(device);
       continue;
     }
   }
-
-  NotifyDevicesNewlyPaired(newly_paired_devices);
-  NotifyDevicesNewlyDisconnected(newly_disconnected_devices);
-  NotifyDevicesNewlyConnected(newly_connected_devices);
 }
 
 }  // namespace bluetooth_config
diff --git a/chromeos/services/bluetooth_config/fake_bluetooth_device_status_notifier.cc b/chromeos/services/bluetooth_config/fake_bluetooth_device_status_notifier.cc
index d7bd6135..3a17a5d 100644
--- a/chromeos/services/bluetooth_config/fake_bluetooth_device_status_notifier.cc
+++ b/chromeos/services/bluetooth_config/fake_bluetooth_device_status_notifier.cc
@@ -13,19 +13,19 @@
 FakeBluetoothDeviceStatusNotifier::~FakeBluetoothDeviceStatusNotifier() =
     default;
 
-void FakeBluetoothDeviceStatusNotifier::SetNewlyPairedDevices(
-    const std::vector<mojom::PairedBluetoothDevicePropertiesPtr>& devices) {
-  NotifyDevicesNewlyPaired(devices);
+void FakeBluetoothDeviceStatusNotifier::SetNewlyPairedDevice(
+    const mojom::PairedBluetoothDevicePropertiesPtr& device) {
+  NotifyDeviceNewlyPaired(device);
 }
 
-void FakeBluetoothDeviceStatusNotifier::SetConnectedDevices(
-    const std::vector<mojom::PairedBluetoothDevicePropertiesPtr>& devices) {
-  NotifyDevicesNewlyConnected(devices);
+void FakeBluetoothDeviceStatusNotifier::SetConnectedDevice(
+    const mojom::PairedBluetoothDevicePropertiesPtr& device) {
+  NotifyDeviceNewlyConnected(device);
 }
 
-void FakeBluetoothDeviceStatusNotifier::SetDisconnectedDevices(
-    const std::vector<mojom::PairedBluetoothDevicePropertiesPtr>& devices) {
-  NotifyDevicesNewlyDisconnected(devices);
+void FakeBluetoothDeviceStatusNotifier::SetDisconnectedDevice(
+    const mojom::PairedBluetoothDevicePropertiesPtr& device) {
+  NotifyDeviceNewlyDisconnected(device);
 }
 
 }  // namespace bluetooth_config
diff --git a/chromeos/services/bluetooth_config/fake_bluetooth_device_status_notifier.h b/chromeos/services/bluetooth_config/fake_bluetooth_device_status_notifier.h
index c884b12..83f9ba4a 100644
--- a/chromeos/services/bluetooth_config/fake_bluetooth_device_status_notifier.h
+++ b/chromeos/services/bluetooth_config/fake_bluetooth_device_status_notifier.h
@@ -17,14 +17,14 @@
   FakeBluetoothDeviceStatusNotifier();
   ~FakeBluetoothDeviceStatusNotifier() override;
 
-  void SetNewlyPairedDevices(
-      const std::vector<mojom::PairedBluetoothDevicePropertiesPtr>& devices);
+  void SetNewlyPairedDevice(
+      const mojom::PairedBluetoothDevicePropertiesPtr& device);
 
-  void SetConnectedDevices(
-      const std::vector<mojom::PairedBluetoothDevicePropertiesPtr>& devices);
+  void SetConnectedDevice(
+      const mojom::PairedBluetoothDevicePropertiesPtr& device);
 
-  void SetDisconnectedDevices(
-      const std::vector<mojom::PairedBluetoothDevicePropertiesPtr>& devices);
+  void SetDisconnectedDevice(
+      const mojom::PairedBluetoothDevicePropertiesPtr& device);
 };
 
 }  // namespace bluetooth_config
diff --git a/components/OWNERS b/components/OWNERS
index 30f9fcb..fd9ced8 100644
--- a/components/OWNERS
+++ b/components/OWNERS
@@ -17,6 +17,7 @@
 per-file content_creation_strings.grdp=file://components/content_creation/OWNERS
 per-file crash_strings.grdp=file://components/crash/OWNERS
 per-file dom_distiller_strings.grdp=file://components/dom_distiller/OWNERS
+per-file enterprise_strings.grdp=file://components/enterprise/OWNERS
 per-file error_page_strings.grdp=file://components/error_page/OWNERS
 per-file fullscreen_control_strings.grdp=file://components/fullscreen_control/OWNERS
 per-file heavy_ad_intervention_strings.grdp=file://components/heavy_ad_intervention/OWNERS
diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc
index 0ab4a16..6aaad59 100644
--- a/components/autofill/content/renderer/autofill_agent.cc
+++ b/components/autofill/content/renderer/autofill_agent.cc
@@ -552,10 +552,13 @@
       ReplaceElementIfNowInvalid(form);
 
     query_node_autofill_state_ = element_.GetAutofillState();
-    form_util::FillOrPreviewForm(form, element_, action);
+    bool filled_some_fields =
+        !form_util::FillOrPreviewForm(form, element_, action).empty();
 
     if (!element_.Form().IsNull())
       UpdateLastInteractedForm(element_.Form());
+    else
+      formless_elements_were_autofilled_ |= filled_some_fields;
 
     // TODO(crbug.com/1198811): Inform the BrowserAutofillManager about the
     // fields that were actually filled. It's possible that the form has changed
@@ -1271,10 +1274,11 @@
     } else if (provisionally_saved_form_.has_value()) {
       return absl::make_optional(provisionally_saved_form_.value());
     }
-  } else if (formless_elements_user_edited_.size() != 0 &&
-             !form_util::IsSomeControlElementVisible(
-                 render_frame()->GetWebFrame(),
-                 formless_elements_user_edited_)) {
+  } else if (formless_elements_were_autofilled_ ||
+             (formless_elements_user_edited_.size() != 0 &&
+              !form_util::IsSomeControlElementVisible(
+                  render_frame()->GetWebFrame(),
+                  formless_elements_user_edited_))) {
     // we check if all the elements the user has interacted with are gone,
     // to decide if submission has occurred, and use the
     // provisionally_saved_form_ saved in OnProvisionallySaveForm() if fail to
@@ -1297,6 +1301,7 @@
   last_interacted_form_.Reset();
   last_clicked_form_control_element_for_testing_ = {};
   formless_elements_user_edited_.clear();
+  formless_elements_were_autofilled_ = false;
   provisionally_saved_form_.reset();
 }
 
diff --git a/components/autofill/content/renderer/autofill_agent.h b/components/autofill/content/renderer/autofill_agent.h
index 68429c4..dbf99129 100644
--- a/components/autofill/content/renderer/autofill_agent.h
+++ b/components/autofill/content/renderer/autofill_agent.h
@@ -330,7 +330,10 @@
 
   // When dealing with an unowned form, we keep track of the unowned fields
   // the user has modified so we can determine when submission occurs.
+  // An additional sufficient condition for the form submission detection is
+  // that the form has been autofilled.
   std::set<FieldRendererId> formless_elements_user_edited_;
+  bool formless_elements_were_autofilled_ = false;
 
   // The form user interacted, it is used if last_interacted_form_ or formless
   // form can't be converted to FormData at the time of form submission.
diff --git a/components/autofill/core/browser/browser_autofill_manager.cc b/components/autofill/core/browser/browser_autofill_manager.cc
index 857fe45..6adc223 100644
--- a/components/autofill/core/browser/browser_autofill_manager.cc
+++ b/components/autofill/core/browser/browser_autofill_manager.cc
@@ -1724,6 +1724,14 @@
       continue;
     }
 
+    // Do not override prefilled field values.
+    if (base::FeatureList::IsEnabled(
+            features::kAutofillPreventOverridingPrefilledValues) &&
+        !form_structure->field(i)->value.empty()) {
+      buffer << Tr{} << field_number << "Skipped: value is prefilled";
+      continue;
+    }
+
     if (form_structure->field(i)->only_fill_when_focused() &&
         !form_structure->field(i)->SameFieldAs(field)) {
       buffer << Tr{} << field_number << "Skipped: only fill when focused";
diff --git a/components/autofill/core/browser/browser_autofill_manager_unittest.cc b/components/autofill/core/browser/browser_autofill_manager_unittest.cc
index 82ac67f..69ce35fb6 100644
--- a/components/autofill/core/browser/browser_autofill_manager_unittest.cc
+++ b/components/autofill/core/browser/browser_autofill_manager_unittest.cc
@@ -9430,6 +9430,50 @@
   EXPECT_FALSE(external_delegate_->on_suggestions_returned_seen());
 }
 
+// Test that the Autofill does not override field values that were already
+// prefilled.
+TEST_F(BrowserAutofillManagerTest, PreventOverridingOfPrefilledValues) {
+  base::test::ScopedFeatureList features;
+  features.InitAndEnableFeature(
+      autofill::features::kAutofillPreventOverridingPrefilledValues);
+  // Set up our form data.
+  FormData form;
+  form.name = u"MyForm";
+  form.url = GURL("https://myform.com/form.html");
+  form.action = GURL("about:blank");
+  FormFieldData field;
+  test::CreateTestFormField("Name", "name", "Test Name", "text", &field);
+  form.fields.push_back(field);
+  test::CreateTestFormField("City", "city", "Test City", "text", &field);
+  form.fields.push_back(field);
+  test::CreateTestFormField("Country", "country", "Test Country", "text",
+                            &field);
+  form.fields.push_back(field);
+  std::vector<FormData> forms(1, form);
+  FormsSeen(forms);
+
+  const char guid[] = "00000000-0000-0000-0000-000000000001";
+  int response_page_id = 0;
+  FormData response_data;
+  FillAutofillFormDataAndSaveResults(kDefaultPageID, form, form.fields[0],
+                                     MakeFrontendID(std::string(), guid),
+                                     &response_page_id, &response_data);
+  EXPECT_EQ(response_data.fields[0].value, u"Test Name");
+  EXPECT_EQ(response_data.fields[1].value, u"Test City");
+  EXPECT_EQ(response_data.fields[2].value, u"Test Country");
+
+  features.Reset();
+  features.InitAndDisableFeature(
+      autofill::features::kAutofillPreventOverridingPrefilledValues);
+
+  FillAutofillFormDataAndSaveResults(kDefaultPageID, form, form.fields[0],
+                                     MakeFrontendID(std::string(), guid),
+                                     &response_page_id, &response_data);
+  EXPECT_EQ(response_data.fields[0].value, u"Elvis Aaron Presley");
+  EXPECT_EQ(response_data.fields[1].value, u"Memphis");
+  EXPECT_EQ(response_data.fields[2].value, u"United States");
+}
+
 // Desktop only tests.
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 class BrowserAutofillManagerTestForVirtualCardOption
diff --git a/components/autofill/core/browser/form_structure.cc b/components/autofill/core/browser/form_structure.cc
index b53a8ec..06febbac 100644
--- a/components/autofill/core/browser/form_structure.cc
+++ b/components/autofill/core/browser/form_structure.cc
@@ -1261,6 +1261,7 @@
   bool card_form = base::Contains(form_types, FormType::kCreditCardForm);
   bool address_form = base::Contains(form_types, FormType::kAddressForm);
 
+  ServerFieldTypeSet autofilled_field_types;
   size_t num_detected_field_types = 0;
   size_t num_edited_autofilled_fields = 0;
   size_t num_of_accepted_autofilled_fields = 0;
@@ -1273,6 +1274,10 @@
   // A perfectly filled form is submitted as it was filled from Autofill without
   // subsequent changes.
   bool perfect_filling = true;
+  // Contain the frames across which the fields are distributed.
+  base::flat_set<LocalFrameToken> frames_of_detected_fields;
+  base::flat_set<LocalFrameToken> frames_of_detected_credit_card_fields;
+  base::flat_set<LocalFrameToken> frames_of_autofilled_credit_card_fields;
 
   // Determine the correct suffix for the metric, depending on whether or
   // not a submission was observed.
@@ -1282,10 +1287,12 @@
 
   for (size_t i = 0; i < field_count(); ++i) {
     auto* const field = this->field(i);
+    AutofillType type = field->Type();
+
     if (IsUPIVirtualPaymentAddress(field->value)) {
       has_upi_vpa_field = true;
       AutofillMetrics::LogUserHappinessMetric(
-          AutofillMetrics::USER_DID_ENTER_UPI_VPA, field->Type().group(),
+          AutofillMetrics::USER_DID_ENTER_UPI_VPA, type.group(),
           security_state::SecurityLevel::SECURITY_LEVEL_COUNT,
           data_util::DetermineGroups(*this));
     }
@@ -1304,7 +1311,7 @@
     if (field->previously_autofilled())
       num_edited_autofilled_fields++;
 
-    if (field->Type().html_type() == HTML_TYPE_ONE_TIME_CODE)
+    if (type.html_type() == HTML_TYPE_ONE_TIME_CODE)
       has_observed_one_time_code_field = true;
 
     // The form was not perfectly filled if a non-empty field was not
@@ -1333,6 +1340,16 @@
     else if (!field->only_fill_when_focused())
       did_autofill_all_possible_fields = false;
 
+    autofilled_field_types.insert(type.GetStorableType());
+
+    // Keep track of the frames of detected and autofilled (credit card) fields.
+    frames_of_detected_fields.insert(field->host_frame);
+    if (type.group() == FieldTypeGroup::kCreditCard) {
+      frames_of_detected_credit_card_fields.insert(field->host_frame);
+      if (field->is_autofilled)
+        frames_of_autofilled_credit_card_fields.insert(field->host_frame);
+    }
+
     // If the form was submitted, record if field types have been filled and
     // subsequently edited by the user.
     if (observed_submission) {
@@ -1344,7 +1361,7 @@
         // record the source of the autofilled value between
         // |AlternativeStateNameMap| or the profile value.
         if (field->is_autofilled &&
-            field->Type().GetStorableType() == ADDRESS_HOME_STATE) {
+            type.GetStorableType() == ADDRESS_HOME_STATE) {
           AutofillMetrics::
               LogAutofillingSourceForStateSelectionFieldAtSubmission(
                   field->state_is_a_matching_type()
@@ -1448,6 +1465,18 @@
                                                    perfect_filling);
       }
     }
+
+    AutofillMetrics::LogNumberOfFramesWithDetectedFields(
+        frames_of_detected_fields.size());
+    AutofillMetrics::LogNumberOfFramesWithDetectedCreditCardFields(
+        frames_of_detected_credit_card_fields.size());
+    AutofillMetrics::LogNumberOfFramesWithAutofilledCreditCardFields(
+        frames_of_autofilled_credit_card_fields.size());
+
+    if (card_form) {
+      AutofillMetrics::LogCreditCardNumberFills(autofilled_field_types);
+      AutofillMetrics::LogCreditCardSeamlessFills(autofilled_field_types);
+    }
   }
 }
 
diff --git a/components/autofill/core/browser/metrics/autofill_metrics.cc b/components/autofill/core/browser/metrics/autofill_metrics.cc
index b64395e..d87792d 100644
--- a/components/autofill/core/browser/metrics/autofill_metrics.cc
+++ b/components/autofill/core/browser/metrics/autofill_metrics.cc
@@ -23,6 +23,7 @@
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/data_model/autofill_offer_data.h"
 #include "components/autofill/core/browser/data_model/credit_card.h"
+#include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/browser/form_types.h"
 #include "components/autofill/core/common/autofill_clock.h"
@@ -2396,6 +2397,71 @@
 }
 
 // static
+void AutofillMetrics::LogNumberOfFramesWithDetectedFields(size_t num_frames) {
+  if (num_frames == 0)
+    return;
+  base::UmaHistogramCounts100(
+      "Autofill.Iframes.NumberOfFramesWithDetectedFields", num_frames);
+}
+
+// static
+void AutofillMetrics::LogNumberOfFramesWithDetectedCreditCardFields(
+    size_t num_frames) {
+  if (num_frames == 0)
+    return;
+  base::UmaHistogramCounts100(
+      "Autofill.Iframes.NumberOfFramesWithDetectedCreditCardFields",
+      num_frames);
+}
+
+// static
+void AutofillMetrics::LogNumberOfFramesWithAutofilledCreditCardFields(
+    size_t num_frames) {
+  if (num_frames == 0)
+    return;
+  base::UmaHistogramCounts100(
+      "Autofill.Iframes.NumberOfFramesWithAutofilledCreditCardFields",
+      num_frames);
+}
+
+// static
+void AutofillMetrics::LogCreditCardSeamlessFills(
+    const ServerFieldTypeSet& autofilled_types) {
+  bool name = autofilled_types.contains(CREDIT_CARD_NAME_FULL) ||
+              (autofilled_types.contains(CREDIT_CARD_NAME_FIRST) &&
+               autofilled_types.contains(CREDIT_CARD_NAME_LAST));
+  bool number = autofilled_types.contains(CREDIT_CARD_NUMBER);
+  bool exp = autofilled_types.contains(CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR) ||
+             autofilled_types.contains(CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR) ||
+             (autofilled_types.contains(CREDIT_CARD_EXP_MONTH) &&
+              (autofilled_types.contains(CREDIT_CARD_EXP_2_DIGIT_YEAR) ||
+               autofilled_types.contains(CREDIT_CARD_EXP_4_DIGIT_YEAR)));
+  bool cvc = autofilled_types.contains(CREDIT_CARD_VERIFICATION_CODE);
+  CreditCardSeamlessFillMetric emit;
+  if (name && number && exp && cvc) {
+    emit = CreditCardSeamlessFillMetric::kFullFill;
+  } else if (!name && number && exp && cvc) {
+    emit = CreditCardSeamlessFillMetric::kOptionalNameMissing;
+  } else if (name && number && exp && !cvc) {
+    emit = CreditCardSeamlessFillMetric::kOptionalCvcMissing;
+  } else if (!name && number && exp && !cvc) {
+    emit = CreditCardSeamlessFillMetric::kOptionalNameAndCvcMissing;
+  } else if (name && number && !exp && cvc) {
+    emit = CreditCardSeamlessFillMetric::kFullFillButExpDateMissing;
+  } else {
+    emit = CreditCardSeamlessFillMetric::kPartialFill;
+  }
+  base::UmaHistogramEnumeration("Autofill.CreditCard.SeamlessFills", emit);
+}
+
+// static
+void AutofillMetrics::LogCreditCardNumberFills(
+    const ServerFieldTypeSet& autofilled_types) {
+  bool emit = autofilled_types.contains(CREDIT_CARD_NUMBER);
+  base::UmaHistogramBoolean("Autofill.CreditCard.NumberFills", emit);
+}
+
+// static
 void AutofillMetrics::LogDetermineHeuristicTypesTiming(
     const base::TimeDelta& duration) {
   UMA_HISTOGRAM_TIMES("Autofill.Timing.DetermineHeuristicTypes", duration);
diff --git a/components/autofill/core/browser/metrics/autofill_metrics.h b/components/autofill/core/browser/metrics/autofill_metrics.h
index a56c1ae..3503797 100644
--- a/components/autofill/core/browser/metrics/autofill_metrics.h
+++ b/components/autofill/core/browser/metrics/autofill_metrics.h
@@ -1173,6 +1173,34 @@
     kMaxValue = kOtpMismatchError,
   };
 
+  // Emits a value that indicates which fields of a credit card form were
+  // filled:
+  //
+  // +-------------------------------------------------------------+
+  // |                            | Name | Number | Exp Date | CVC |
+  // |----------------------------+------+--------+----------+-----|
+  // | kFullFill                  |  X   |   X    |    X     |  X  |
+  // +----------------------------+------+--------+----------+-----+
+  // | kOptionalNameMissing       |      |   X    |    X     |  X  |
+  // +----------------------------+------+--------+----------+-----+
+  // | kOptionalCvcMissing        |  X   |   X    |    X     |     |
+  // +----------------------------+------+--------+----------+-----+
+  // | kOptionalNameAndCvcMissing |      |   X    |    X     |     |
+  // +----------------------------+------+--------+----------+-----+
+  // | kFullFillButExpDateMissing |  X   |   X    |          |  X  |
+  // +----------------------------+------+--------+----------+-----+
+  // | kPartialFill               |           otherwise            |
+  // +-------------------------------------------------------------+
+  enum class CreditCardSeamlessFillMetric {
+    kFullFill = 0,
+    kOptionalNameMissing = 1,
+    kOptionalCvcMissing = 2,
+    kOptionalNameAndCvcMissing = 3,
+    kFullFillButExpDateMissing = 4,
+    kPartialFill = 5,
+    kMaxValue = kPartialFill,
+  };
+
   // Utility to log URL keyed form interaction events.
   class FormInteractionsUkmLogger {
    public:
@@ -1732,6 +1760,23 @@
   // If |is_address| an address was filled, otherwise it was a credit card.
   static void LogAutofillPerfectFilling(bool is_address, bool perfect_filling);
 
+  // Log across how many frames the detected and/or autofilled [credit card]
+  // fields of a submitted form are distributed.
+  static void LogNumberOfFramesWithDetectedFields(size_t num_frames);
+  static void LogNumberOfFramesWithDetectedCreditCardFields(size_t num_frames);
+  static void LogNumberOfFramesWithAutofilledCreditCardFields(
+      size_t num_frames);
+
+  // Logs the Autofill.CreditCard.SeamlessFills metric. See the enum for
+  // details. Note that this function does not check whether the form contains a
+  // credit card field.
+  static void LogCreditCardSeamlessFills(
+      const ServerFieldTypeSet& autofilled_types);
+
+  // Logs the Autofill.CreditCard.NumberFills metric.
+  static void LogCreditCardNumberFills(
+      const ServerFieldTypeSet& autofilled_types);
+
   // This should be called when determining the heuristic types for a form's
   // fields.
   static void LogDetermineHeuristicTypesTiming(const base::TimeDelta& duration);
diff --git a/components/autofill/core/common/autofill_features.cc b/components/autofill/core/common/autofill_features.cc
index 2acfb96f..ad9ce94 100644
--- a/components/autofill/core/common/autofill_features.cc
+++ b/components/autofill/core/common/autofill_features.cc
@@ -281,6 +281,13 @@
         "fields",
         50};
 
+// When enabled, Autofill would not override the field values that were either
+// filled by Autofill or on page load.
+// TODO(crbug/1275649): Remove once experiment is finished.
+extern const base::Feature kAutofillPreventOverridingPrefilledValues{
+    "AutofillPreventOverridingPrefilledValues",
+    base::FEATURE_DISABLED_BY_DEFAULT};
+
 // When enabled, Autofill will load remote patterns via the component updater.
 // TODO(crbug/1121990): Remove once launched.
 extern const base::Feature kAutofillParsingPatternsFromRemote{
diff --git a/components/autofill/core/common/autofill_features.h b/components/autofill/core/common/autofill_features.h
index 00a98356..348106d 100644
--- a/components/autofill/core/common/autofill_features.h
+++ b/components/autofill/core/common/autofill_features.h
@@ -118,6 +118,8 @@
 COMPONENT_EXPORT(AUTOFILL)
 extern const base::Feature kAutofillParsingPatternsLanguageDependent;
 COMPONENT_EXPORT(AUTOFILL)
+extern const base::Feature kAutofillPreventOverridingPrefilledValues;
+COMPONENT_EXPORT(AUTOFILL)
 extern const base::Feature kAutofillProbableFormSubmissionInBrowser;
 COMPONENT_EXPORT(AUTOFILL)
 extern const base::Feature kAutofillProfileClientValidation;
diff --git a/components/certificate_transparency/data/log_list.json b/components/certificate_transparency/data/log_list.json
index df189ce1..08b108ef 100644
--- a/components/certificate_transparency/data/log_list.json
+++ b/components/certificate_transparency/data/log_list.json
@@ -1,6 +1,6 @@
 {
-  "version": "4.45",
-  "log_list_timestamp": "2021-12-01T01:34:20Z",
+  "version": "4.46",
+  "log_list_timestamp": "2021-12-02T01:35:11Z",
   "operators": [
     {
       "name": "Google",
diff --git a/components/components_strings.grd b/components/components_strings.grd
index cc221ec..5f3971e0 100644
--- a/components/components_strings.grd
+++ b/components/components_strings.grd
@@ -386,10 +386,10 @@
       <message name="IDS_MENU" desc="The accessible name for the Menu. This is used as the aria-roledescription for context menus.">
         Menu
       </message>
-      <message name="IDS_INSTALL" desc="Text to be displayed when an action will trigger an installation (of a component, app from the Play Store, etc.)." formatter_data="android_java">
+      <message name="IDS_INSTALL" desc="Text to be displayed when an action will trigger an installation (of a component, app from the Play Store, etc.).">
         Install
       </message>
-      <message name="IDS_UPDATE" desc="Text to be displayed when an action will trigger an update of an existing item (e.g. a component, app from the Play Store, etc.)." formatter_data="android_java">
+      <message name="IDS_UPDATE" desc="Text to be displayed when an action will trigger an update of an existing item (e.g. a component, app from the Play Store, etc.).">
         Update
       </message>
       <if expr="is_android">
diff --git a/components/enterprise/DEPS b/components/enterprise/DEPS
index 3e60fb7..5e16a50 100644
--- a/components/enterprise/DEPS
+++ b/components/enterprise/DEPS
@@ -6,6 +6,7 @@
   "+components/strings/grit",
   "+components/version_info",
   "+crypto/sha2.h",
+  "+crypto/signature_verifier.h",
   "+net",
   "+services/network/public",
   "+third_party/protobuf"
diff --git a/components/enterprise/browser/device_trust/device_trust_key_manager.h b/components/enterprise/browser/device_trust/device_trust_key_manager.h
index 3d51dc7..c7c6cc1 100644
--- a/components/enterprise/browser/device_trust/device_trust_key_manager.h
+++ b/components/enterprise/browser/device_trust/device_trust_key_manager.h
@@ -9,6 +9,8 @@
 #include <vector>
 
 #include "base/callback.h"
+#include "components/policy/proto/device_management_backend.pb.h"
+#include "crypto/signature_verifier.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace enterprise_connectors {
@@ -19,6 +21,12 @@
  public:
   virtual ~DeviceTrustKeyManager() = default;
 
+  struct KeyMetadata {
+    enterprise_management::BrowserPublicKeyUploadRequest::KeyTrustLevel
+        trust_level;
+    crypto::SignatureVerifier::SignatureAlgorithm algorithm;
+  };
+
   // Starts the initialization of the manager which includes trying to load the
   // signing key, or kicking off its creation. This function is idempotent, so
   // only the initial call matters (subsequent calls will be ignored).
@@ -40,9 +48,9 @@
       base::OnceCallback<void(absl::optional<std::vector<uint8_t>>)>
           callback) = 0;
 
-  // Returns true if the manager has loaded a key successfully and is ready
-  // to handle client requests.
-  virtual bool IsFullyInitialized() const = 0;
+  // Returns KeyMetadata for the currently loaded key. If no key is loaded,
+  // returns absl::nullopt.
+  virtual absl::optional<KeyMetadata> GetLoadedKeyMetadata() const = 0;
 };
 
 }  // namespace enterprise_connectors
diff --git a/components/infobars/core/infobar_delegate.h b/components/infobars/core/infobar_delegate.h
index 5d89e301..663060f 100644
--- a/components/infobars/core/infobar_delegate.h
+++ b/components/infobars/core/infobar_delegate.h
@@ -142,7 +142,7 @@
     OFFLINE_PAGE_INFOBAR_DELEGATE_ANDROID = 71,
     SEARCH_GEOLOCATION_DISCLOSURE_INFOBAR_DELEGATE_ANDROID = 72,
     AUTOMATION_INFOBAR_DELEGATE = 73,
-    // Removed: VR_SERVICES_UPGRADE_ANDROID = 74,
+    VR_SERVICES_UPGRADE_ANDROID = 74,
     READER_MODE_INFOBAR_ANDROID = 75,
     VR_FEEDBACK_INFOBAR_ANDROID = 76,
     FRAMEBUST_BLOCK_INFOBAR_ANDROID = 77,
diff --git a/components/messages/android/internal/java/src/org/chromium/components/messages/MessagesMetrics.java b/components/messages/android/internal/java/src/org/chromium/components/messages/MessagesMetrics.java
index 2ffbfc3..d3084c0 100644
--- a/components/messages/android/internal/java/src/org/chromium/components/messages/MessagesMetrics.java
+++ b/components/messages/android/internal/java/src/org/chromium/components/messages/MessagesMetrics.java
@@ -128,8 +128,6 @@
                 return "AutoDarkWebContents";
             case MessageIdentifier.TAILORED_SECURITY_ENABLED:
                 return "TailoredSecurityEnabled";
-            case MessageIdentifier.VR_SERVICES_UPGRADE:
-                return "VrServicesUpgrade";
             default:
                 return "Unknown";
         }
diff --git a/components/messages/android/message_enums.h b/components/messages/android/message_enums.h
index 377e7e747..4f5dc19f 100644
--- a/components/messages/android/message_enums.h
+++ b/components/messages/android/message_enums.h
@@ -96,7 +96,6 @@
   AUTO_DARK_WEB_CONTENTS = 21,
   TEST_MESSAGE = 22,
   TAILORED_SECURITY_ENABLED = 23,
-  VR_SERVICES_UPGRADE = 24,
 
   // Insert new values before this line.
   COUNT
diff --git a/components/password_manager/core/browser/built_in_backend_to_android_backend_migrator.cc b/components/password_manager/core/browser/built_in_backend_to_android_backend_migrator.cc
index c4f574b37..ed3a1bb 100644
--- a/components/password_manager/core/browser/built_in_backend_to_android_backend_migrator.cc
+++ b/components/password_manager/core/browser/built_in_backend_to_android_backend_migrator.cc
@@ -20,7 +20,9 @@
 
 namespace {
 
-struct IsLess {
+constexpr base::TimeDelta kMigrationThreshold = base::Days(1);
+
+struct IsPasswordLess {
   bool operator()(const PasswordForm* lhs, const PasswordForm* rhs) const {
     return PasswordFormUniqueKey(*lhs) < PasswordFormUniqueKey(*rhs);
   }
@@ -35,6 +37,12 @@
       std::move(callback));
 }
 
+bool IsInitialMigrationNeeded(PrefService* prefs) {
+  return features::kMigrationVersion.Get() >
+         prefs->GetInteger(
+             prefs::kCurrentMigrationVersionToGoogleMobileServices);
+}
+
 }  // namespace
 
 struct BuiltInBackendToAndroidBackendMigrator::BackendAndLoginsResults {
@@ -45,10 +53,13 @@
     return absl::holds_alternative<PasswordStoreBackendError>(logins_result);
   }
 
-  base::flat_set<const PasswordForm*, IsLess> GetLogins() {
+  // Converts std::vector<std::unique_ptr<PasswordForms>> into
+  // base::flat_set<const PasswordForm*> for quick look up comparing only
+  // primary keys.
+  base::flat_set<const PasswordForm*, IsPasswordLess> GetLogins() {
     DCHECK(!HasError());
 
-    return base::MakeFlatSet<const PasswordForm*, IsLess>(
+    return base::MakeFlatSet<const PasswordForm*, IsPasswordLess>(
         absl::get<LoginsResult>(logins_result), {},
         &std::unique_ptr<PasswordForm>::get);
   }
@@ -80,27 +91,30 @@
     ~BuiltInBackendToAndroidBackendMigrator() = default;
 
 void BuiltInBackendToAndroidBackendMigrator::StartMigrationIfNecessary() {
-  bool is_initial_migration_needed =
-      features::kMigrationVersion.Get() >
-      prefs_->GetInteger(prefs::kCurrentMigrationVersionToGoogleMobileServices);
-
   // For syncing users, we don't need to move passwords between the built-in
   // and the Android backends, since both backends should be able to
   // retrieve the same passwords from the sync server.
-  if (is_syncing_passwords_callback_.Run()) {
-    if (is_initial_migration_needed) {
-      // TODO:(crbug.com/1252443) Drop metadata and only then update pref.
-      UpdateMigrationVersionInPref();
-    }
+  if (is_syncing_passwords_callback_.Run() &&
+      IsInitialMigrationNeeded(prefs_)) {
+    // TODO:(crbug.com/1252443) Drop metadata and only then update pref.
+    UpdateMigrationVersionInPref();
     return;
   }
 
-  // For non-syncing user migrate password from |built_in_backend_| to
-  // |android_backend_|.
-  if (is_initial_migration_needed) {
+  // Don't try to migrate passwords if there was an attempt earlier today.
+  base::TimeDelta time_passed_since_last_migration_attempt =
+      base::Time::Now() -
+      base::Time::FromTimeT(prefs_->GetDouble(
+          password_manager::prefs::kTimeOfLastMigrationAttempt));
+  if (time_passed_since_last_migration_attempt < kMigrationThreshold)
+    return;
+
+  // Manually migrate passwords between backends if initial or rolling migration
+  // is needed. Even for syncing users we still should do rolling migration to
+  // ensure deletions aren’t resurrected.
+  if (IsInitialMigrationNeeded(prefs_) ||
+      base::FeatureList::IsEnabled(features::kUnifiedPasswordManagerAndroid)) {
     PrepareForMigration();
-  } else {
-    // TODO:(crbug.com/1252443) Start rolling migration.
   }
 }
 
@@ -110,9 +124,12 @@
 }
 
 void BuiltInBackendToAndroidBackendMigrator::PrepareForMigration() {
+  prefs_->SetDouble(password_manager::prefs::kTimeOfLastMigrationAttempt,
+                    base::Time::Now().ToDoubleT());
+
   auto barrier_callback = base::BarrierCallback<BackendAndLoginsResults>(
       2, base::BindOnce(&BuiltInBackendToAndroidBackendMigrator::
-                            StartBuiltInToAndroidBackendMigration,
+                            MigratePasswordsBetweenAndroidAndBuiltInBackends,
                         weak_ptr_factory_.GetWeakPtr()));
 
   auto bind_backend_to_logins = [](PasswordStoreBackend* backend,
@@ -130,7 +147,7 @@
 }
 
 void BuiltInBackendToAndroidBackendMigrator::
-    StartBuiltInToAndroidBackendMigration(
+    MigratePasswordsBetweenAndroidAndBuiltInBackends(
         std::vector<BackendAndLoginsResults> results) {
   DCHECK_EQ(2u, results.size());
   // TODO:(crbug.com/1252443) Record that migration was canceled due to an
@@ -138,47 +155,65 @@
   if (results[0].HasError() || results[1].HasError())
     return;
 
-  auto built_in_backend_logins = (results[0].backend == built_in_backend_)
-                                     ? results[0].GetLogins()
-                                     : results[1].GetLogins();
+  base::flat_set<const PasswordForm*, IsPasswordLess> built_in_backend_logins =
+      (results[0].backend == built_in_backend_) ? results[0].GetLogins()
+                                                : results[1].GetLogins();
 
-  auto android_logins = (results[0].backend == android_backend_)
-                            ? results[0].GetLogins()
-                            : results[1].GetLogins();
+  base::flat_set<const PasswordForm*, IsPasswordLess> android_logins =
+      (results[0].backend == android_backend_) ? results[0].GetLogins()
+                                               : results[1].GetLogins();
 
-  // This method merges password from the built in backend and password from the
-  // android backend based on their primary keys. For a form |F|, there are
-  // three cases to handle:
-  // 1. |F| exists only in the built in backend --> |F| should be added to the
-  // 'android_backend'.
-  // 2. |F| exists only in the android backend --> |F| should be added to the
-  // 'built_in_backend'.
-  // 3. |F| exists in both the built in and android backends --> both versions
-  //    should be merged by accepting the most recently created one, and update
-  //    built in and android backends accordingly.
-  // In most of the cases there shouldn't be any passwords in 'android_backend'.
+  bool is_initial_migration = IsInitialMigrationNeeded(prefs_);
 
-  // After all operations are finished we should update preference to mark the
-  // completion of the migration. Callbacks are chained in a LIFO way. Callbacks
-  // are chained by passing 'callback_chain' as a completion for the next
-  // operation.
-  base::OnceClosure callbacks_chain = base::BindOnce(
-      &BuiltInBackendToAndroidBackendMigrator::UpdateMigrationVersionInPref,
-      weak_ptr_factory_.GetWeakPtr());
+  // For a form |F|, there are three cases to handle:
+  // 1. |F| exists only in the |built_in_backend_|
+  // 2. |F| exists only in the |android_backend_|
+  // 3. |F| exists in both |built_in_backend_| and |android_backend_|.
+  //
+  // In initial migration is required:
+  // 1. |F| should be added to the |android_backend_|.
+  // 2. |F| should be added to the |built_in_backend_|.
+  // 3. Both versions should be merged by accepting the most recently created
+  //    one*, and update either |built_in_backend_| and |android_backend_|
+  //    accordingly.
+  //    * it should happen only if password values differs between backends.
+  // Otherwise:
+  // 1. |F| should be removed from the |built_in_backend_|.
+  // 2. |F| should be added to the |built_in_backend_|.
+  // 3. version from |built_in_backend_| should be updated with version from the
+  // |android_backend_|.
+
+  // Callbacks are chained in a LIFO way by passing 'callback_chain' as a
+  // completion for the next operation. If it is initial migration - update pref
+  // to mark successful completion.
+  base::OnceClosure callbacks_chain =
+      is_initial_migration
+          ? base::BindOnce(&BuiltInBackendToAndroidBackendMigrator::
+                               UpdateMigrationVersionInPref,
+                           weak_ptr_factory_.GetWeakPtr())
+          : base::DoNothing();
   for (auto* const login : built_in_backend_logins) {
     auto android_login_iter = android_logins.find(login);
 
     if (android_login_iter == android_logins.end()) {
-      // Local password doesn't exist in the android backend, add it to the
-      // 'android_backend_'.
-      callbacks_chain = base::BindOnce(
-          &PasswordStoreBackend::AddLoginAsync, android_backend_->GetWeakPtr(),
-          *login, IgnoreChangeListAndRunCallback(std::move(callbacks_chain)));
+      // Password from the |built_in_backend_| doesn't exist in the
+      // |android_backend_|.
+      if (is_initial_migration) {
+        callbacks_chain = base::BindOnce(
+            &PasswordStoreBackend::AddLoginAsync,
+            android_backend_->GetWeakPtr(), *login,
+            IgnoreChangeListAndRunCallback(std::move(callbacks_chain)));
+      } else {
+        callbacks_chain = base::BindOnce(
+            &PasswordStoreBackend::RemoveLoginAsync,
+            built_in_backend_->GetWeakPtr(), *login,
+            IgnoreChangeListAndRunCallback(std::move(callbacks_chain)));
+      }
+
       continue;
     }
 
-    // Local password exists in the android backend as well. A merge is
-    // required.
+    // Password from the |built_in_backend_| exists in the |android_backend_|.
     auto* const android_login = (*android_login_iter);
 
     if (login->password_value == android_login->password_value) {
@@ -186,31 +221,37 @@
       continue;
     }
 
-    // Passwords aren't identical, pick the most recently created one.
-    if (login->date_created > android_login->date_created) {
+    // Passwords aren't identical.
+    if (is_initial_migration &&
+        login->date_created > android_login->date_created) {
+      // // During initial migration, pick the most recently created one. This
+      // is aligned with the merge sync logic in PasswordSyncBridge.
       callbacks_chain = base::BindOnce(
-          &PasswordStoreBackend::AddLoginAsync, android_backend_->GetWeakPtr(),
-          *login, IgnoreChangeListAndRunCallback(std::move(callbacks_chain)));
+          &PasswordStoreBackend::UpdateLoginAsync,
+          android_backend_->GetWeakPtr(), *login,
+          IgnoreChangeListAndRunCallback(std::move(callbacks_chain)));
     } else {
+      // During rolling migration, update the built-in version to match the
+      // Android version.
       callbacks_chain = base::BindOnce(
-          &PasswordStoreBackend::AddLoginAsync, built_in_backend_->GetWeakPtr(),
-          *android_login,
+          &PasswordStoreBackend::UpdateLoginAsync,
+          built_in_backend_->GetWeakPtr(), *android_login,
           IgnoreChangeListAndRunCallback(std::move(callbacks_chain)));
     }
   }
 
-  // At this point, we have processed all passwords from the built in backend.
-  // In addition, we also have processed all passwords from 'android_backend_'
-  // that exist in the 'built_in_backend_'. What's remaining is to process
-  // passwords from 'android_backend_' that don't exist in the
-  // 'built_in_backend_'.
+  // At this point, we have processed all passwords from the |built_in_backend_|
+  // In addition, we also have processed all passwords from the
+  // |android_backend_| which exist in the |built_in_backend_|. What's remaining
+  // is to process passwords from |android_backend_| that don't exist in the
+  // |built_in_backend_|.
   for (auto* const android_login : android_logins) {
     if (built_in_backend_logins.contains(android_login)) {
       continue;
     }
 
-    // Add to 'built_in_backend_' any passwords from 'android_backend_' that
-    // doesn't exist in the 'built_in_backend_'
+    // Add to the |built_in_backend_| any passwords from the |android_backend_|
+    // that doesn't exist in the |built_in_backend_|.
     callbacks_chain = base::BindOnce(
         &PasswordStoreBackend::AddLoginAsync, built_in_backend_->GetWeakPtr(),
         *android_login,
diff --git a/components/password_manager/core/browser/built_in_backend_to_android_backend_migrator.h b/components/password_manager/core/browser/built_in_backend_to_android_backend_migrator.h
index 24d388c..3962e99 100644
--- a/components/password_manager/core/browser/built_in_backend_to_android_backend_migrator.h
+++ b/components/password_manager/core/browser/built_in_backend_to_android_backend_migrator.h
@@ -48,8 +48,12 @@
   // Schedules async calls to read of all passwords from both backends.
   void PrepareForMigration();
 
-  // Migrates passwords from the |built_in_backend_| to the |android_backend|.
-  void StartBuiltInToAndroidBackendMigration(
+  // Migrates password between |built_in_backend_| and |android_backend_|.
+  // |result| consists of passwords from the |built_in_backend_| let's call them
+  // |A| and passwords from the |android_backend_| - |B|. If initial migration
+  // needed this function will update both backends with |A|U|B| otherwise it
+  // will replace passwords from the |built_in_backend_| with |B|.
+  void MigratePasswordsBetweenAndroidAndBuiltInBackends(
       std::vector<BackendAndLoginsResults> result);
 
   const raw_ptr<PasswordStoreBackend> built_in_backend_;
diff --git a/components/password_manager/core/browser/built_in_backend_to_android_backend_migrator_unittest.cc b/components/password_manager/core/browser/built_in_backend_to_android_backend_migrator_unittest.cc
index 16d5fe56..9610048 100644
--- a/components/password_manager/core/browser/built_in_backend_to_android_backend_migrator_unittest.cc
+++ b/components/password_manager/core/browser/built_in_backend_to_android_backend_migrator_unittest.cc
@@ -46,6 +46,8 @@
     prefs_ = std::make_unique<TestingPrefServiceSimple>();
     prefs_->registry()->RegisterIntegerPref(
         prefs::kCurrentMigrationVersionToGoogleMobileServices, 0);
+    prefs_->registry()->RegisterDoublePref(prefs::kTimeOfLastMigrationAttempt,
+                                           0.0);
     migrator_ = std::make_unique<BuiltInBackendToAndroidBackendMigrator>(
         &built_in_backend_, &android_backend_, prefs_.get(),
         /*is_syncing_passwords_callback=*/is_sync_enabled_callback_.Get());
@@ -68,7 +70,8 @@
   }
 
  private:
-  base::test::SingleThreadTaskEnvironment task_env_;
+  base::test::SingleThreadTaskEnvironment task_env_{
+      base::test::TaskEnvironment::TimeSource::MOCK_TIME};
   base::test::ScopedFeatureList feature_list_;
   std::unique_ptr<TestingPrefServiceSimple> prefs_;
   FakePasswordStoreBackend built_in_backend_;
@@ -79,9 +82,10 @@
 };
 
 TEST_F(BuiltInBackendToAndroidBackendMigratorTest,
-       PrefUpdatedToNewerVersionWhenMigrationIsNecessary_SyncOn) {
+       CurrentMigrationVersionIsUpdatedWhenMigrationIsNeeded_SyncOn) {
   feature_list().InitAndEnableFeatureWithParameters(
-      features::kUnifiedPasswordManagerMigration, {{"migration_version", "1"}});
+      /*enabled_feature=*/features::kUnifiedPasswordManagerMigration,
+      {{"migration_version", "1"}});
   ExpectSyncCallbackAndSetResult(true);
 
   migrator()->StartMigrationIfNecessary();
@@ -89,25 +93,92 @@
 
   EXPECT_EQ(1, prefs()->GetInteger(
                    prefs::kCurrentMigrationVersionToGoogleMobileServices));
+  // Since for syncing users we don't manually migrate passwords
+  // |kTimeOfLastMigrationAttempt| shouldn't be updated.
+  EXPECT_EQ(0, prefs()->GetDouble(
+                   password_manager::prefs::kTimeOfLastMigrationAttempt));
 }
 
 TEST_F(BuiltInBackendToAndroidBackendMigratorTest,
-       PrefUnchangedWhenMigrationIsNotNecessary) {
+       AllPrefsAreUpdatedWhenMigrationIsNeeded_SyncOff) {
   feature_list().InitAndEnableFeatureWithParameters(
-      features::kUnifiedPasswordManagerMigration, {{"migration_version", "1"}});
-  prefs()->SetInteger(prefs::kCurrentMigrationVersionToGoogleMobileServices, 2);
+      /*enabled_feature=*/features::kUnifiedPasswordManagerMigration,
+      {{"migration_version", "1"}});
   ExpectSyncCallbackAndSetResult(false);
 
   migrator()->StartMigrationIfNecessary();
   RunUntilIdle();
 
-  EXPECT_EQ(2, prefs()->GetInteger(
+  EXPECT_EQ(1, prefs()->GetInteger(
                    prefs::kCurrentMigrationVersionToGoogleMobileServices));
+  EXPECT_EQ(
+      base::Time::Now().ToDoubleT(),
+      prefs()->GetDouble(password_manager::prefs::kTimeOfLastMigrationAttempt));
+}
+
+TEST_F(BuiltInBackendToAndroidBackendMigratorTest,
+       PrefsUnchangedWhenAttemptedMigrationEarlierToday) {
+  feature_list().InitAndEnableFeatureWithParameters(
+      features::kUnifiedPasswordManagerMigration, {{"migration_version", "1"}});
+  prefs()->SetDouble(password_manager::prefs::kTimeOfLastMigrationAttempt,
+                     (base::Time::Now() - base::Hours(2)).ToDoubleT());
+  ExpectSyncCallbackAndSetResult(false);
+
+  migrator()->StartMigrationIfNecessary();
+  RunUntilIdle();
+
+  EXPECT_EQ(0, prefs()->GetInteger(
+                   prefs::kCurrentMigrationVersionToGoogleMobileServices));
+  EXPECT_EQ(
+      (base::Time::Now() - base::Hours(2)).ToDoubleT(),
+      prefs()->GetDouble(password_manager::prefs::kTimeOfLastMigrationAttempt));
+}
+
+TEST_F(BuiltInBackendToAndroidBackendMigratorTest,
+       LastAttemptUnchangedWhenRollingMigrationDisabled) {
+  // Setup the pref to indicate that the initial migration has happened already.
+  feature_list().InitWithFeaturesAndParameters(
+      /*enabled_features=*/{{features::kUnifiedPasswordManagerMigration,
+                             {{"migration_version", "1"}}}},
+      /*disabled_features=*/{features::kUnifiedPasswordManagerAndroid});
+  prefs()->SetInteger(prefs::kCurrentMigrationVersionToGoogleMobileServices, 1);
+
+  ExpectSyncCallbackAndSetResult(false);
+
+  migrator()->StartMigrationIfNecessary();
+  RunUntilIdle();
+
+  EXPECT_EQ(1, prefs()->GetInteger(
+                   prefs::kCurrentMigrationVersionToGoogleMobileServices));
+  EXPECT_EQ(0, prefs()->GetDouble(
+                   password_manager::prefs::kTimeOfLastMigrationAttempt));
+}
+
+TEST_F(BuiltInBackendToAndroidBackendMigratorTest,
+       LastAttemptUpdatedInPrefsWhenRollingMigrationEnabled) {
+  // Setup the pref to indicate that the initial migration has happened already.
+  feature_list().InitWithFeaturesAndParameters(
+      /*enabled_features=*/{{features::kUnifiedPasswordManagerMigration,
+                             {{"migration_version", "1"}}},
+                            {features::kUnifiedPasswordManagerAndroid, {{}}}},
+      /*disabled_features=*/{});
+  prefs()->SetInteger(prefs::kCurrentMigrationVersionToGoogleMobileServices, 1);
+
+  ExpectSyncCallbackAndSetResult(false);
+
+  migrator()->StartMigrationIfNecessary();
+  RunUntilIdle();
+
+  EXPECT_EQ(1, prefs()->GetInteger(
+                   prefs::kCurrentMigrationVersionToGoogleMobileServices));
+  EXPECT_EQ(
+      base::Time::Now().ToDoubleT(),
+      prefs()->GetDouble(password_manager::prefs::kTimeOfLastMigrationAttempt));
 }
 
 // Holds the built in and android backend's logins and the expected result after
 // the migration.
-struct InitialMigrationParam {
+struct MigrationParam {
   struct Entry {
     Entry(int index,
           std::string password = "",
@@ -134,8 +205,8 @@
     return EntriesToPasswordForms(android_logins);
   }
 
-  std::vector<std::unique_ptr<PasswordForm>> GetMigratedLogins() const {
-    return EntriesToPasswordForms(migrated_logins);
+  std::vector<std::unique_ptr<PasswordForm>> GetMergedLogins() const {
+    return EntriesToPasswordForms(merged_logins);
   }
 
   std::vector<std::unique_ptr<PasswordForm>> EntriesToPasswordForms(
@@ -148,12 +219,12 @@
 
   std::vector<Entry> built_in_logins;
   std::vector<Entry> android_logins;
-  std::vector<Entry> migrated_logins;
+  std::vector<Entry> merged_logins;
 };
 
 class BuiltInBackendToAndroidBackendMigratorTestWithMigrationParams
     : public BuiltInBackendToAndroidBackendMigratorTest,
-      public testing::WithParamInterface<InitialMigrationParam> {};
+      public testing::WithParamInterface<MigrationParam> {};
 
 // Tests the initial migration result.
 TEST_P(BuiltInBackendToAndroidBackendMigratorTestWithMigrationParams,
@@ -161,9 +232,10 @@
   ExpectSyncCallbackAndSetResult(false);
 
   feature_list().InitAndEnableFeatureWithParameters(
-      features::kUnifiedPasswordManagerMigration, {{"migration_version", "1"}});
+      /*enabled_feature=*/features::kUnifiedPasswordManagerMigration,
+      {{"migration_version", "1"}});
 
-  const InitialMigrationParam& p = GetParam();
+  const MigrationParam& p = GetParam();
 
   for (const auto& login : p.GetBuiltInLogins()) {
     built_in_backend().AddLoginAsync(*login, base::DoNothing());
@@ -178,7 +250,42 @@
 
   for (auto* const backend : {&android_backend(), &built_in_backend()}) {
     base::MockCallback<LoginsOrErrorReply> mock_reply;
-    auto expected_logins = p.GetMigratedLogins();
+    auto expected_logins = p.GetMergedLogins();
+    EXPECT_CALL(mock_reply, Run(LoginsResultsOrErrorAre(&expected_logins)));
+    backend->GetAllLoginsAsync(mock_reply.Get());
+    RunUntilIdle();
+  }
+}
+
+TEST_P(BuiltInBackendToAndroidBackendMigratorTestWithMigrationParams,
+       RollingMigration) {
+  // Setup the pref to indicate that the initial migration has happened already.
+  // This implies that rolling migration will take place!
+  feature_list().InitWithFeaturesAndParameters(
+      /*enabled_features=*/{{features::kUnifiedPasswordManagerMigration,
+                             {{"migration_version", "1"}}},
+                            {features::kUnifiedPasswordManagerAndroid, {{}}}},
+      /*disabled_features=*/{});
+  prefs()->SetDouble(password_manager::prefs::kTimeOfLastMigrationAttempt,
+                     (base::Time::Now() - base::Days(2)).ToDoubleT());
+  prefs()->SetInteger(prefs::kCurrentMigrationVersionToGoogleMobileServices, 1);
+
+  const MigrationParam& p = GetParam();
+
+  for (const auto& login : p.GetBuiltInLogins()) {
+    built_in_backend().AddLoginAsync(*login, base::DoNothing());
+  }
+  for (const auto& login : p.GetAndroidLogins()) {
+    android_backend().AddLoginAsync(*login, base::DoNothing());
+  }
+  RunUntilIdle();
+
+  migrator()->StartMigrationIfNecessary();
+  RunUntilIdle();
+
+  for (auto* const backend : {&android_backend(), &built_in_backend()}) {
+    base::MockCallback<LoginsOrErrorReply> mock_reply;
+    auto expected_logins = p.GetAndroidLogins();
     EXPECT_CALL(mock_reply, Run(LoginsResultsOrErrorAre(&expected_logins)));
     backend->GetAllLoginsAsync(mock_reply.Get());
     RunUntilIdle();
@@ -189,30 +296,28 @@
     BuiltInBackendToAndroidBackendMigratorTest,
     BuiltInBackendToAndroidBackendMigratorTestWithMigrationParams,
     testing::Values(
-        InitialMigrationParam{.built_in_logins = {},
-                              .android_logins = {},
-                              .migrated_logins = {}},
-        InitialMigrationParam{.built_in_logins = {{1}, {2}},
-                              .android_logins = {},
-                              .migrated_logins = {{1}, {2}}},
-        InitialMigrationParam{.built_in_logins = {},
-                              .android_logins = {{1}, {2}},
-                              .migrated_logins = {{1}, {2}}},
-        InitialMigrationParam{.built_in_logins = {{1}, {2}},
-                              .android_logins = {{3}},
-                              .migrated_logins = {{1}, {2}, {3}}},
-        InitialMigrationParam{.built_in_logins = {{1}, {2}, {3}},
-                              .android_logins = {{1}, {2}, {3}},
-                              .migrated_logins = {{1}, {2}, {3}}},
-        InitialMigrationParam{
+        MigrationParam{.built_in_logins = {},
+                       .android_logins = {},
+                       .merged_logins = {}},
+        MigrationParam{.built_in_logins = {{1}, {2}},
+                       .android_logins = {},
+                       .merged_logins = {{1}, {2}}},
+        MigrationParam{.built_in_logins = {},
+                       .android_logins = {{1}, {2}},
+                       .merged_logins = {{1}, {2}}},
+        MigrationParam{.built_in_logins = {{1}, {2}},
+                       .android_logins = {{3}},
+                       .merged_logins = {{1}, {2}, {3}}},
+        MigrationParam{.built_in_logins = {{1}, {2}, {3}},
+                       .android_logins = {{1}, {2}, {3}},
+                       .merged_logins = {{1}, {2}, {3}}},
+        MigrationParam{
             .built_in_logins = {{1, "old_password", base::Days(1)}, {2}},
             .android_logins = {{1, "new_password", base::Days(2)}, {3}},
-            .migrated_logins = {{1, "new_password", base::Days(2)}, {2}, {3}}},
-        InitialMigrationParam{
+            .merged_logins = {{1, "new_password", base::Days(2)}, {2}, {3}}},
+        MigrationParam{
             .built_in_logins = {{1, "new_password", base::Days(2)}, {2}},
             .android_logins = {{1, "old_password", base::Days(1)}, {3}},
-            .migrated_logins = {{1, "new_password", base::Days(2)},
-                                {2},
-                                {3}}}));
+            .merged_logins = {{1, "new_password", base::Days(2)}, {2}, {3}}}));
 
 }  // namespace password_manager
diff --git a/components/password_manager/core/browser/fake_password_store_backend.cc b/components/password_manager/core/browser/fake_password_store_backend.cc
index 6e48b0c..b0f55816 100644
--- a/components/password_manager/core/browser/fake_password_store_backend.cc
+++ b/components/password_manager/core/browser/fake_password_store_backend.cc
@@ -83,7 +83,11 @@
 void FakePasswordStoreBackend::RemoveLoginAsync(
     const PasswordForm& form,
     PasswordStoreChangeListReply callback) {
-  NOTREACHED();
+  base::SequencedTaskRunnerHandle::Get()->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      base::BindOnce(&FakePasswordStoreBackend::RemoveLoginInternal,
+                     base::Unretained(this), form),
+      std::move(callback));
 }
 
 void FakePasswordStoreBackend::RemoveLoginsByURLAndTimeAsync(
@@ -243,4 +247,20 @@
   }
 }
 
+PasswordStoreChangeList FakePasswordStoreBackend::RemoveLoginInternal(
+    const PasswordForm& form) {
+  PasswordStoreChangeList changes;
+  std::vector<PasswordForm>& forms = stored_passwords_[form.signon_realm];
+  auto it = forms.begin();
+  while (it != forms.end()) {
+    if (ArePasswordFormUniqueKeysEqual(form, *it)) {
+      it = forms.erase(it);
+      changes.push_back(PasswordStoreChange(PasswordStoreChange::REMOVE, form));
+    } else {
+      ++it;
+    }
+  }
+  return changes;
+}
+
 }  // namespace password_manager
diff --git a/components/password_manager/core/browser/fake_password_store_backend.h b/components/password_manager/core/browser/fake_password_store_backend.h
index 516a9ee..5a54560 100644
--- a/components/password_manager/core/browser/fake_password_store_backend.h
+++ b/components/password_manager/core/browser/fake_password_store_backend.h
@@ -75,6 +75,7 @@
   PasswordStoreChangeList UpdateLoginInternal(const PasswordForm& form);
   void DisableAutoSignInForOriginsInternal(
       const base::RepeatingCallback<bool(const GURL&)>& origin_filter);
+  PasswordStoreChangeList RemoveLoginInternal(const PasswordForm& form);
 
   PasswordMap stored_passwords_;
   base::WeakPtrFactory<FakePasswordStoreBackend> weak_ptr_factory_{this};
diff --git a/components/password_manager/core/browser/password_autofill_manager.cc b/components/password_manager/core/browser/password_autofill_manager.cc
index 011ef4eb2..7f7fecb 100644
--- a/components/password_manager/core/browser/password_autofill_manager.cc
+++ b/components/password_manager/core/browser/password_autofill_manager.cc
@@ -29,6 +29,7 @@
 #include "components/autofill/core/browser/ui/suggestion.h"
 #include "components/autofill/core/common/autofill_constants.h"
 #include "components/autofill/core/common/autofill_data_validation.h"
+#include "components/autofill/core/common/autofill_features.h"
 #include "components/autofill/core/common/autofill_util.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
 #include "components/autofill/core/common/password_generation_util.h"
@@ -192,7 +193,8 @@
   }
 }
 
-void MaybeAppendManualFallback(std::vector<autofill::Suggestion>* suggestions) {
+void MaybeAppendManagePasswordsEntry(
+    std::vector<autofill::Suggestion>* suggestions) {
   bool has_no_fillable_suggestions = base::ranges::none_of(
       *suggestions,
       [](int id) {
@@ -241,7 +243,11 @@
       l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_GENERATE_PASSWORD));
   suggestion.frontend_id =
       autofill::POPUP_ITEM_ID_PASSWORD_ACCOUNT_STORAGE_OPT_IN_AND_GENERATE;
-  suggestion.icon = "google";
+  suggestion.icon =
+      base::FeatureList::IsEnabled(
+          autofill::features::kAutofillVisualImprovementsForSuggestionUi)
+          ? "keyIcon"
+          : "google";
   return suggestion;
 }
 
@@ -657,8 +663,12 @@
                               : CreateGenerationEntry());
   }
 
-  // Add "Manage all passwords" link to settings.
-  MaybeAppendManualFallback(&suggestions);
+  // TODO(crbug.com/1274134): Delete once improvements are launched.
+  if (!base::FeatureList::IsEnabled(
+          autofill::features::kAutofillVisualImprovementsForSuggestionUi)) {
+    // Add "Manage all passwords" link to settings.
+    MaybeAppendManagePasswordsEntry(&suggestions);
+  }
 
   // Add button to opt into using the account storage for passwords and then
   // suggest.
@@ -669,6 +679,13 @@
   if (show_account_storage_resignin)
     suggestions.push_back(CreateEntryToReSignin());
 
+  // TODO(crbug.com/1274134): Remove feature flag once improvements are
+  // launched.
+  if (base::FeatureList::IsEnabled(
+          autofill::features::kAutofillVisualImprovementsForSuggestionUi)) {
+    // Add "Manage all passwords" link to settings.
+    MaybeAppendManagePasswordsEntry(&suggestions);
+  }
   return suggestions;
 }
 
diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
index b1c566b..df71f193 100644
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -244,6 +244,7 @@
 #if defined(OS_ANDROID)
   registry->RegisterIntegerPref(
       prefs::kCurrentMigrationVersionToGoogleMobileServices, 0);
+  registry->RegisterDoublePref(prefs::kTimeOfLastMigrationAttempt, 0.0);
 #endif
 }
 
diff --git a/components/password_manager/core/browser/password_store_backend_migration_decorator.cc b/components/password_manager/core/browser/password_store_backend_migration_decorator.cc
index aee99a9..f95f8c3 100644
--- a/components/password_manager/core/browser/password_store_backend_migration_decorator.cc
+++ b/components/password_manager/core/browser/password_store_backend_migration_decorator.cc
@@ -157,7 +157,15 @@
 
 std::unique_ptr<syncer::ProxyModelTypeControllerDelegate>
 PasswordStoreBackendMigrationDecorator::CreateSyncControllerDelegate() {
-  return active_backend_->CreateSyncControllerDelegate();
+  if (base::FeatureList::IsEnabled(
+          features::kUnifiedPasswordManagerSyncUsingAndroidBackendOnly)) {
+    // The android backend (PasswordStoreAndroidBackend) creates a controller
+    // delegate that prevents sync from actually communicating with the sync
+    // server using the built in SyncEngine.
+    return android_backend_->CreateSyncControllerDelegate();
+  }
+
+  return built_in_backend_->CreateSyncControllerDelegate();
 }
 
 void PasswordStoreBackendMigrationDecorator::StartMigration() {
diff --git a/components/password_manager/core/browser/password_store_proxy_backend.cc b/components/password_manager/core/browser/password_store_proxy_backend.cc
index 0f124a7..43625367 100644
--- a/components/password_manager/core/browser/password_store_proxy_backend.cc
+++ b/components/password_manager/core/browser/password_store_proxy_backend.cc
@@ -299,14 +299,6 @@
 
 std::unique_ptr<syncer::ProxyModelTypeControllerDelegate>
 PasswordStoreProxyBackend::CreateSyncControllerDelegate() {
-  if (base::FeatureList::IsEnabled(
-          features::kUnifiedPasswordManagerSyncUsingAndroidBackendOnly)) {
-    // The shadow backend (PasswordStoreAndroidBackend) creates a controller
-    // delegate that prevents sync from actually communicating with the sync
-    // server using the built in SyncEngine.
-    return shadow_backend_->CreateSyncControllerDelegate();
-  }
-
   return main_backend_->CreateSyncControllerDelegate();
 }
 
diff --git a/components/password_manager/core/common/password_manager_pref_names.cc b/components/password_manager/core/common/password_manager_pref_names.cc
index 9200cca..f11ac3e9 100644
--- a/components/password_manager/core/common/password_manager_pref_names.cc
+++ b/components/password_manager/core/common/password_manager_pref_names.cc
@@ -15,6 +15,8 @@
 #if defined(OS_ANDROID)
 const char kCurrentMigrationVersionToGoogleMobileServices[] =
     "current_migration_version_to_google_mobile_services";
+
+const char kTimeOfLastMigrationAttempt[] = "time_of_last_migration_attempt";
 #endif
 
 #if defined(OS_WIN)
diff --git a/components/password_manager/core/common/password_manager_pref_names.h b/components/password_manager/core/common/password_manager_pref_names.h
index ad2c434..1a2e864 100644
--- a/components/password_manager/core/common/password_manager_pref_names.h
+++ b/components/password_manager/core/common/password_manager_pref_names.h
@@ -28,6 +28,10 @@
 // Integer value which indicates the version used to migrate passwords from
 // built in storage to Google Mobile Services.
 extern const char kCurrentMigrationVersionToGoogleMobileServices[];
+
+// Timestamps of when credentials from the GMS Core to the built in storage were
+// last time migrated, in microseconds since Windows epoch.
+extern const char kTimeOfLastMigrationAttempt[];
 #endif
 
 #if defined(OS_WIN)
diff --git a/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc b/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
index 621187d..b85011fc 100644
--- a/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
+++ b/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
@@ -370,6 +370,7 @@
   RecordCount100WithAndWithoutSuffix(
       "SafeBrowsing.RT.Request.ReferrerChainLength", GetMetricSuffix(),
       request->referrer_chain().size());
+
   std::string req_data;
   request->SerializeToString(&req_data);
 
@@ -386,7 +387,8 @@
   // just below.
   SendRequestInternal(std::move(resource_request), req_data, url,
                       access_token_string, std::move(response_callback),
-                      callback_task_runner);
+                      callback_task_runner,
+                      request->population().user_population());
 
   callback_task_runner->PostTask(
       FROM_HERE,
@@ -401,7 +403,8 @@
     const GURL& url,
     absl::optional<std::string> access_token_string,
     RTLookupResponseCallback response_callback,
-    scoped_refptr<base::SequencedTaskRunner> callback_task_runner) {
+    scoped_refptr<base::SequencedTaskRunner> callback_task_runner,
+    ChromeUserPopulation::UserPopulation user_population) {
   std::unique_ptr<network::SimpleURLLoader> owned_loader =
       network::SimpleURLLoader::Create(std::move(resource_request),
                                        GetTrafficAnnotationTag());
@@ -415,7 +418,8 @@
       url_loader_factory_.get(),
       base::BindOnce(&RealTimeUrlLookupServiceBase::OnURLLoaderComplete,
                      GetWeakPtr(), url, access_token_string, loader,
-                     base::TimeTicks::Now(), std::move(callback_task_runner)));
+                     user_population, base::TimeTicks::Now(),
+                     std::move(callback_task_runner)));
 
   pending_requests_[owned_loader.release()] = std::move(response_callback);
 }
@@ -424,6 +428,7 @@
     const GURL& url,
     absl::optional<std::string> access_token_string,
     network::SimpleURLLoader* url_loader,
+    ChromeUserPopulation::UserPopulation user_population,
     base::TimeTicks request_start_time,
     scoped_refptr<base::SequencedTaskRunner> response_callback_task_runner,
     std::unique_ptr<std::string> response_body) {
@@ -466,6 +471,17 @@
     RecordSparseWithAndWithoutSuffix("SafeBrowsing.RT.Response.VerdictType",
                                      GetMetricSuffix(),
                                      response->threat_info(0).verdict_type());
+
+    std::string enhanced_protection_suffix =
+        user_population == ChromeUserPopulation::ENHANCED_PROTECTION
+            ? "EnhancedProtection"
+            : "NotEnhancedProtection";
+
+    // Log histograms with suffix and avoid using
+    // RecordSparseWithAndWithoutSuffix as it (without) has been logged.
+    base::UmaHistogramSparse(
+        "SafeBrowsing.RT.Response.VerdictType." + enhanced_protection_suffix,
+        response->threat_info(0).verdict_type());
   }
 
   response_callback_task_runner->PostTask(
diff --git a/components/safe_browsing/core/browser/realtime/url_lookup_service_base.h b/components/safe_browsing/core/browser/realtime/url_lookup_service_base.h
index 2fe7fb57..20c68d20 100644
--- a/components/safe_browsing/core/browser/realtime/url_lookup_service_base.h
+++ b/components/safe_browsing/core/browser/realtime/url_lookup_service_base.h
@@ -218,7 +218,8 @@
       const GURL& url,
       absl::optional<std::string> access_token_string,
       RTLookupResponseCallback response_callback,
-      scoped_refptr<base::SequencedTaskRunner> callback_task_runner);
+      scoped_refptr<base::SequencedTaskRunner> callback_task_runner,
+      ChromeUserPopulation::UserPopulation user_population);
 
   // Called when the response from the real-time lookup remote endpoint is
   // received. |url_loader| is the unowned loader that was used to send the
@@ -230,6 +231,7 @@
       const GURL& url,
       absl::optional<std::string> access_token_string,
       network::SimpleURLLoader* url_loader,
+      ChromeUserPopulation::UserPopulation user_population,
       base::TimeTicks request_start_time,
       scoped_refptr<base::SequencedTaskRunner> response_callback_task_runner,
       std::unique_ptr<std::string> response_body);
diff --git a/components/signin/internal/identity_manager/profile_oauth2_token_service_builder.cc b/components/signin/internal/identity_manager/profile_oauth2_token_service_builder.cc
index dbdbcb1..c17cc2e 100644
--- a/components/signin/internal/identity_manager/profile_oauth2_token_service_builder.cc
+++ b/components/signin/internal/identity_manager/profile_oauth2_token_service_builder.cc
@@ -7,19 +7,19 @@
 #include <string>
 #include <utility>
 
-#include "build/buildflag.h"
 #include "build/chromeos_buildflags.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
 #include "components/signin/public/base/account_consistency_method.h"
 #include "components/signin/public/base/device_id_helper.h"
-#include "components/signin/public/base/signin_buildflags.h"
 #include "components/signin/public/base/signin_client.h"
 #include "components/signin/public/base/signin_switches.h"
 
 #if defined(OS_ANDROID)
 #include "components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_android.h"
-#else
+#endif
+
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
 #include "components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.h"
 #include "components/signin/public/webdata/token_web_data.h"
 #endif
@@ -115,7 +115,7 @@
     account_manager::AccountManagerFacade* account_manager_facade,
     bool is_regular_profile,
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
-#if !defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
     bool delete_signin_cookies_on_exit,
     scoped_refptr<TokenWebData> token_web_data,
 #endif
@@ -179,7 +179,7 @@
     account_manager::AccountManagerFacade* account_manager_facade,
     bool is_regular_profile,
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
-#if !defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
     bool delete_signin_cookies_on_exit,
     scoped_refptr<TokenWebData> token_web_data,
 #endif
@@ -207,7 +207,7 @@
 #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
           account_manager_facade, is_regular_profile,
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
-#if !defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
           delete_signin_cookies_on_exit, token_web_data,
 #endif
 #if defined(OS_IOS)
diff --git a/components/signin/internal/identity_manager/profile_oauth2_token_service_builder.h b/components/signin/internal/identity_manager/profile_oauth2_token_service_builder.h
index 41f0aaed..19a13e6 100644
--- a/components/signin/internal/identity_manager/profile_oauth2_token_service_builder.h
+++ b/components/signin/internal/identity_manager/profile_oauth2_token_service_builder.h
@@ -8,7 +8,9 @@
 #include <memory>
 
 #include "build/build_config.h"
+#include "build/buildflag.h"
 #include "build/chromeos_buildflags.h"
+#include "components/signin/public/base/signin_buildflags.h"
 
 #if !defined(OS_ANDROID)
 #include "base/memory/scoped_refptr.h"
@@ -35,7 +37,7 @@
 class NetworkConnectionTracker;
 }
 
-#if !defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
 class TokenWebData;
 #endif
 
@@ -54,7 +56,7 @@
     account_manager::AccountManagerFacade* account_manager_facade,
     bool is_regular_profile,
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
-#if !defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
     bool delete_signin_cookies_on_exit,
     scoped_refptr<TokenWebData> token_web_data,
 #endif
diff --git a/components/signin/public/identity_manager/identity_manager_builder.cc b/components/signin/public/identity_manager/identity_manager_builder.cc
index ec59579d..f948d70 100644
--- a/components/signin/public/identity_manager/identity_manager_builder.cc
+++ b/components/signin/public/identity_manager/identity_manager_builder.cc
@@ -117,7 +117,7 @@
 #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
           params->account_manager_facade, params->is_regular_profile,
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
-#if !defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
           params->delete_signin_cookies_on_exit, params->token_web_data,
 #endif
 #if defined(OS_IOS)
diff --git a/components/signin/public/identity_manager/identity_manager_builder.h b/components/signin/public/identity_manager/identity_manager_builder.h
index 7a588669..21bc1f8 100644
--- a/components/signin/public/identity_manager/identity_manager_builder.h
+++ b/components/signin/public/identity_manager/identity_manager_builder.h
@@ -11,6 +11,7 @@
 #include "base/memory/raw_ptr.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
+#include "components/signin/public/base/signin_buildflags.h"
 #include "components/signin/public/identity_manager/identity_manager.h"
 
 #if !defined(OS_ANDROID)
@@ -24,7 +25,7 @@
 class PrefService;
 class SigninClient;
 
-#if !defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
 class TokenWebData;
 #endif
 
@@ -62,7 +63,7 @@
   base::FilePath profile_path;
   raw_ptr<SigninClient> signin_client = nullptr;
 
-#if !defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
   bool delete_signin_cookies_on_exit = false;
   scoped_refptr<TokenWebData> token_web_data;
 #endif
diff --git a/components/version_ui/resources/about_version.css b/components/version_ui/resources/about_version.css
index bd7da3a..f4a8c01a 100644
--- a/components/version_ui/resources/about_version.css
+++ b/components/version_ui/resources/about_version.css
@@ -24,8 +24,8 @@
 }
 
 #outer {
-  margin-left: auto;
-  margin-right: auto;
+  margin-inline-end: auto;
+  margin-inline-start: auto;
   margin-top: 10px;
   min-width: 800px;
   width: 60%;
@@ -51,19 +51,19 @@
 
 #logo {
   float: right;
-  margin-left: 40px;
-  text-align: right;
+  margin-inline-start: 40px;
+  text-align: end;
   width: 180px;
 }
 
 #company {
   font-size: 0.7em;
-  text-align: right;
+  text-align: end;
 }
 
 #copyright {
   font-size: 0.7em;
-  text-align: right;
+  text-align: end;
 }
 
 #useragent {
@@ -73,13 +73,27 @@
 .version {
   font-family: monospace;
   max-width: 430px;
-  padding-left: 5px;
+  padding-inline-start: 5px;
   vertical-align: bottom;
 }
 
 .version-wide {
   font-family: monospace;
   max-width: auto;
-  padding-left: 5px;
+  padding-inline-start: 5px;
   vertical-align: bottom;
 }
+
+#copy-to-clipboard {
+  -webkit-mask-image: url(chrome://resources/images/icon_copy_content.svg);
+  -webkit-mask-size: cover;
+  background: none;
+  background-color: var(--primary-color);
+  border: none;
+  display: inline-block;
+  height: 1em;
+  padding: 0;
+  position: relative;
+  top: .2em;
+  width: 1em;
+}
\ No newline at end of file
diff --git a/components/version_ui/resources/about_version.html b/components/version_ui/resources/about_version.html
index 1caa96b..9392131 100644
--- a/components/version_ui/resources/about_version.html
+++ b/components/version_ui/resources/about_version.html
@@ -53,13 +53,16 @@
       <table id="inner" cellpadding="0" cellspacing="0" border="0">
         <tr><td class="label">$i18n{application_label}</td>
           <td class="version" id="version">
-            <span>$i18n{version}</span>
-            (<span>$i18n{official}</span>)
-            <span>$i18n{version_modifier}</span>
-            <span>$i18n{version_processor_variation}</span>
-<if expr="is_win">
-            <span>$i18n{update_cohort_name}</span>
-</if>
+            <span id="copy-content">
+              <span>$i18n{version}</span>
+              (<span>$i18n{official}</span>)
+              <span>$i18n{version_modifier}</span>
+              <span>$i18n{version_processor_variation}</span>
+  <if expr="is_win">
+              <span>$i18n{update_cohort_name}</span>
+  </if>
+            </span>
+            <button id="copy-to-clipboard"></button>
           </td>
         </tr>
         <tr>
diff --git a/components/version_ui/resources/about_version.js b/components/version_ui/resources/about_version.js
index 6e63cfd..5e53264 100644
--- a/components/version_ui/resources/about_version.js
+++ b/components/version_ui/resources/about_version.js
@@ -82,6 +82,10 @@
 }
 // </if>
 
+function copyToClipboard() {
+  navigator.clipboard.writeText($('copy-content').innerText);
+}
+
 /* All the work we do onload. */
 function onLoadWork() {
   // <if expr="chromeos or is_win">
@@ -106,6 +110,8 @@
   if ($('sanitizer').textContent !== '') {
     $('sanitizer-section').hidden = false;
   }
+
+  $('copy-to-clipboard').addEventListener('click', copyToClipboard);
 }
 
 document.addEventListener('DOMContentLoaded', onLoadWork);
diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
index 63b3ff053..4d83201 100644
--- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
+++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
@@ -445,6 +445,42 @@
   [NSSpellChecker.sharedSpellChecker.substitutionsPanel orderFront:sender];
 }
 
+- (bool)canTransformText {
+  if (_textInputType == ui::TEXT_INPUT_TYPE_NONE)
+    return NO;
+  if (_textInputType == ui::TEXT_INPUT_TYPE_PASSWORD)
+    return NO;
+
+  return YES;
+}
+
+- (void)uppercaseWord:(id)sender {
+  NSString *text = base::SysUTF16ToNSString([self selectedText]);
+  if (!text)
+    return;
+
+  [self insertText:text.localizedUppercaseString
+      replacementRange:_textSelectionRange.ToNSRange()];
+}
+
+- (void)lowercaseWord:(id)sender {
+  NSString *text = base::SysUTF16ToNSString([self selectedText]);
+  if (!text)
+    return;
+
+  [self insertText:text.localizedLowercaseString
+      replacementRange:_textSelectionRange.ToNSRange()];
+}
+
+- (void)capitalizeWord:(id)sender {
+  NSString *text = base::SysUTF16ToNSString([self selectedText]);
+  if (!text)
+    return;
+
+  [self insertText:text.localizedCapitalizedString
+      replacementRange:_textSelectionRange.ToNSRange()];
+}
+
 - (void)setTextSelectionText:(std::u16string)text
                       offset:(size_t)offset
                        range:(gfx::Range)range {
@@ -1565,6 +1601,12 @@
     } else if (item.action == @selector(toggleAutomaticTextReplacement:)) {
       menuItem.state = self.automaticTextReplacementEnabled;
       return !!(self.allowedTextCheckingTypes & NSTextCheckingTypeReplacement);
+    } else if (item.action == @selector(uppercaseWord:)) {
+      return self.canTransformText;
+    } else if (item.action == @selector(lowercaseWord:)) {
+      return self.canTransformText;
+    } else if (item.action == @selector(capitalizeWord:)) {
+      return self.canTransformText;
     }
   }
 
diff --git a/content/browser/attribution_reporting/attribution_internals.mojom b/content/browser/attribution_reporting/attribution_internals.mojom
index 3ed12bd..2f38fd0 100644
--- a/content/browser/attribution_reporting/attribution_internals.mojom
+++ b/content/browser/attribution_reporting/attribution_internals.mojom
@@ -64,6 +64,14 @@
 
 // Observer for events relevant to the attribution internals WebUI.
 interface AttributionInternalsObserver {
+  // Called when the sources in storage changed, indicating that the observer
+  // should call `AttributionInternalsHandler::GetActiveSources()`.
+  OnSourcesChanged();
+
+  // Called when the reports in storage changed, indicating that the observer
+  // should call `AttributionInternalsHandler::GetReports()`.
+  OnReportsChanged();
+
   // Called when a source is deactivated.
   OnSourceDeactivated(WebUIAttributionSource source);
 
diff --git a/content/browser/attribution_reporting/attribution_internals_browsertest.cc b/content/browser/attribution_reporting/attribution_internals_browsertest.cc
index b40bea1..9a1bbd0 100644
--- a/content/browser/attribution_reporting/attribution_internals_browsertest.cc
+++ b/content/browser/attribution_reporting/attribution_internals_browsertest.cc
@@ -539,6 +539,11 @@
 
   EXPECT_TRUE(
       ExecJsInWebUI("document.getElementById('send-reports').click();"));
+
+  // The real manager would do this itself, but the test manager requires manual
+  // triggering.
+  manager_.NotifyReportsChanged();
+
   EXPECT_EQ(kSentTitle, sent_title_watcher.WaitAndGetTitle());
 }
 
diff --git a/content/browser/attribution_reporting/attribution_internals_handler_impl.cc b/content/browser/attribution_reporting/attribution_internals_handler_impl.cc
index f8fe56e..8ae7f992 100644
--- a/content/browser/attribution_reporting/attribution_internals_handler_impl.cc
+++ b/content/browser/attribution_reporting/attribution_internals_handler_impl.cc
@@ -200,6 +200,16 @@
   }
 }
 
+void AttributionInternalsHandlerImpl::OnSourcesChanged() {
+  for (auto& observer : observers_)
+    observer->OnSourcesChanged();
+}
+
+void AttributionInternalsHandlerImpl::OnReportsChanged() {
+  for (auto& observer : observers_)
+    observer->OnReportsChanged();
+}
+
 void AttributionInternalsHandlerImpl::OnSourceDeactivated(
     const AttributionStorage::DeactivatedSource& deactivated_source) {
   auto source = WebUIAttributionSource(deactivated_source.source,
diff --git a/content/browser/attribution_reporting/attribution_internals_handler_impl.h b/content/browser/attribution_reporting/attribution_internals_handler_impl.h
index 450dc07..ba6af47 100644
--- a/content/browser/attribution_reporting/attribution_internals_handler_impl.h
+++ b/content/browser/attribution_reporting/attribution_internals_handler_impl.h
@@ -64,6 +64,8 @@
 
  private:
   // AttributionManager::Observer:
+  void OnSourcesChanged() override;
+  void OnReportsChanged() override;
   void OnSourceDeactivated(
       const AttributionStorage::DeactivatedSource& deactivated_source) override;
   void OnReportSent(const SentReportInfo& info) override;
diff --git a/content/browser/attribution_reporting/attribution_manager.h b/content/browser/attribution_reporting/attribution_manager.h
index 9657779..bd17799d 100644
--- a/content/browser/attribution_reporting/attribution_manager.h
+++ b/content/browser/attribution_reporting/attribution_manager.h
@@ -51,6 +51,10 @@
    public:
     ~Observer() override = default;
 
+    virtual void OnSourcesChanged() {}
+
+    virtual void OnReportsChanged() {}
+
     virtual void OnSourceDeactivated(
         const AttributionStorage::DeactivatedSource& source) {}
 
diff --git a/content/browser/attribution_reporting/attribution_manager_impl.cc b/content/browser/attribution_reporting/attribution_manager_impl.cc
index b59d7a3..22d7322f 100644
--- a/content/browser/attribution_reporting/attribution_manager_impl.cc
+++ b/content/browser/attribution_reporting/attribution_manager_impl.cc
@@ -33,6 +33,8 @@
 
 namespace {
 
+using CreateReportResult = ::content::AttributionStorage::CreateReportResult;
+
 // These values are persisted to logs. Entries should not be renumbered and
 // numeric values should never be reused.
 enum class ConversionReportSendOutcome {
@@ -69,8 +71,7 @@
   return false;
 }
 
-void RecordCreateReportStatus(
-    AttributionStorage::CreateReportResult::Status status) {
+void RecordCreateReportStatus(CreateReportResult::Status status) {
   base::UmaHistogramEnumeration("Conversions.CreateReportStatus", status);
 }
 
@@ -221,6 +222,8 @@
             if (!manager)
               return;
 
+            manager->NotifySourcesChanged();
+
             for (const auto& source : deactivated_sources) {
               manager->NotifySourceDeactivated(source);
             }
@@ -240,9 +243,16 @@
     GetAndQueueReportsForNextInterval();
 }
 
-void AttributionManagerImpl::OnReportStored(
-    AttributionStorage::CreateReportResult result) {
+void AttributionManagerImpl::OnReportStored(CreateReportResult result) {
   RecordCreateReportStatus(result.status());
+
+  if (result.status() != CreateReportResult::Status::kInternalError) {
+    // Sources are changed here because storing a report can cause sources to be
+    // deleted or become associated with a dedup key.
+    NotifySourcesChanged();
+    NotifyReportsChanged();
+  }
+
   if (!result.dropped_report().has_value())
     return;
 
@@ -292,9 +302,12 @@
       .Then(base::BindOnce(
           [](base::OnceClosure done,
              base::WeakPtr<AttributionManagerImpl> manager) {
-            std::move(done).Run();
-            if (manager)
+            if (manager) {
               manager->GetAndQueueReportsForNextInterval();
+              manager->NotifySourcesChanged();
+              manager->NotifyReportsChanged();
+            }
+            std::move(done).Run();
           },
           std::move(done), weak_factory_.GetWeakPtr()));
 }
@@ -433,6 +446,8 @@
               // using `AddReportsToReporter()` to avoid having to remove and
               // then immediately re-add the report ID to the set.
               manager->reporter_->AddReportsToQueue({std::move(report)});
+
+              manager->NotifyReportsChanged();
             },
             weak_factory_.GetWeakPtr(), info.report));
   } else if (info.status == SentReportInfo::Status::kOffline ||
@@ -456,6 +471,8 @@
                 // in order to avoid duplicates.
                 size_t num_removed = manager->queued_reports_.erase(report_id);
                 DCHECK_EQ(num_removed, 1u);
+
+                manager->NotifyReportsChanged();
               }
             },
             weak_factory_.GetWeakPtr(), *info.report.conversion_id));
@@ -489,6 +506,16 @@
     observer.OnReportSent(info);
 }
 
+void AttributionManagerImpl::NotifySourcesChanged() {
+  for (Observer& observer : observers_)
+    observer.OnSourcesChanged();
+}
+
+void AttributionManagerImpl::NotifyReportsChanged() {
+  for (Observer& observer : observers_)
+    observer.OnReportsChanged();
+}
+
 void AttributionManagerImpl::NotifySourceDeactivated(
     const AttributionStorage::DeactivatedSource& source) {
   for (Observer& observer : observers_)
diff --git a/content/browser/attribution_reporting/attribution_manager_impl.h b/content/browser/attribution_reporting/attribution_manager_impl.h
index 1b194bb..c91b19e 100644
--- a/content/browser/attribution_reporting/attribution_manager_impl.h
+++ b/content/browser/attribution_reporting/attribution_manager_impl.h
@@ -163,6 +163,8 @@
 
   void AddReportsToReporter(std::vector<AttributionReport> reports);
 
+  void NotifySourcesChanged();
+  void NotifyReportsChanged();
   void NotifySourceDeactivated(
       const AttributionStorage::DeactivatedSource& source);
 
diff --git a/content/browser/attribution_reporting/attribution_manager_impl_unittest.cc b/content/browser/attribution_reporting/attribution_manager_impl_unittest.cc
index 59e71152..24af328 100644
--- a/content/browser/attribution_reporting/attribution_manager_impl_unittest.cc
+++ b/content/browser/attribution_reporting/attribution_manager_impl_unittest.cc
@@ -70,6 +70,10 @@
   TestAttributionManagerObserver() = default;
   ~TestAttributionManagerObserver() override = default;
 
+  size_t sources_changed() const { return sources_changed_; }
+
+  size_t reports_changed() const { return reports_changed_; }
+
   const std::vector<DeactivatedSource>& deactivated_sources() const {
     return deactivated_sources_;
   }
@@ -86,6 +90,10 @@
  private:
   // AttributionManager::Observer:
 
+  void OnSourcesChanged() override { sources_changed_++; }
+
+  void OnReportsChanged() override { reports_changed_++; }
+
   void OnSourceDeactivated(const DeactivatedSource& source) override {
     deactivated_sources_.push_back(source);
   }
@@ -99,6 +107,9 @@
     dropped_reports_.push_back(result);
   }
 
+  size_t sources_changed_ = 0;
+  size_t reports_changed_ = 0;
+
   std::vector<DeactivatedSource> deactivated_sources_;
   std::vector<SentReportInfo> sent_reports_;
   std::vector<AttributionStorage::CreateReportResult> dropped_reports_;
@@ -354,11 +365,21 @@
   attribution_manager_->HandleSource(
       SourceBuilder(clock().Now()).SetExpiry(kImpressionExpiry).Build());
   attribution_manager_->HandleTrigger(DefaultTrigger());
+  EXPECT_THAT(StoredReports(), SizeIs(1));
+
+  TestAttributionManagerObserver observer;
+  base::ScopedObservation<AttributionManager, AttributionManager::Observer>
+      observation(&observer);
+  observation.Observe(attribution_manager_.get());
 
   task_environment_.FastForwardBy(kFirstReportingWindow -
                                   kAttributionManagerQueueReportsInterval);
   EXPECT_THAT(test_reporter_->added_reports(), SizeIs(1));
 
+  // Ensure that observers are notified after the report is deleted.
+  EXPECT_EQ(0u, observer.sources_changed());
+  EXPECT_EQ(1u, observer.reports_changed());
+
   // If the report indicated retry, it should be added to the queue again.
   task_environment_.FastForwardBy(kAttributionManagerQueueReportsInterval);
   EXPECT_THAT(test_reporter_->added_reports(), SizeIs(1));
@@ -876,10 +897,20 @@
   attribution_manager_->HandleSource(SourceBuilder(clock().Now()).Build());
   attribution_manager_->HandleTrigger(DefaultTrigger());
   EXPECT_THAT(StoredReports(), SizeIs(1));
+
+  TestAttributionManagerObserver observer;
+  base::ScopedObservation<AttributionManager, AttributionManager::Observer>
+      observation(&observer);
+  observation.Observe(attribution_manager_.get());
+
   task_environment_.FastForwardBy(kFirstReportingWindow -
                                   kAttributionManagerQueueReportsInterval);
   EXPECT_THAT(StoredReports(), IsEmpty());
 
+  // Ensure that deleting a report notifies observers.
+  EXPECT_EQ(0u, observer.sources_changed());
+  EXPECT_EQ(1u, observer.reports_changed());
+
   static constexpr char kMetric[] = "Conversions.DeleteSentReportOperation";
   histograms.ExpectTotalCount(kMetric, 2);
   histograms.ExpectBucketCount(
@@ -966,10 +997,14 @@
   attribution_manager_->HandleSource(source1);
   EXPECT_THAT(StoredSources(), SizeIs(1));
   EXPECT_THAT(observer.deactivated_sources(), IsEmpty());
+  EXPECT_EQ(1u, observer.sources_changed());
+  EXPECT_EQ(0u, observer.reports_changed());
 
   attribution_manager_->HandleTrigger(DefaultTrigger());
   EXPECT_THAT(StoredReports(), SizeIs(1));
   EXPECT_THAT(observer.deactivated_sources(), IsEmpty());
+  EXPECT_EQ(2u, observer.sources_changed());
+  EXPECT_EQ(1u, observer.reports_changed());
 
   auto source2 = SourceBuilder(clock().Now())
                      .SetExpiry(kImpressionExpiry)
@@ -980,9 +1015,11 @@
   EXPECT_THAT(observer.deactivated_sources(),
               ElementsAre(DeactivatedSource{
                   source1, DeactivatedSource::Reason::kReplacedByNewerSource}));
+  EXPECT_EQ(3u, observer.sources_changed());
+  EXPECT_EQ(1u, observer.reports_changed());
 }
 
-TEST_F(AttributionManagerImplTest, HandleTrigger_StoresDeactivatedSources) {
+TEST_F(AttributionManagerImplTest, HandleTrigger_NotifiesObservers) {
   TestAttributionManagerObserver observer;
   base::ScopedObservation<AttributionManager, AttributionManager::Observer>
       observation(&observer);
@@ -997,6 +1034,8 @@
   attribution_manager_->HandleSource(source1);
   EXPECT_THAT(StoredSources(), SizeIs(1));
   EXPECT_THAT(observer.deactivated_sources(), IsEmpty());
+  EXPECT_EQ(1u, observer.sources_changed());
+  EXPECT_EQ(0u, observer.reports_changed());
 
   // Store the maximum number of reports for the source.
   for (size_t i = 1; i <= 3; i++) {
@@ -1005,6 +1044,10 @@
     EXPECT_THAT(observer.deactivated_sources(), IsEmpty());
   }
 
+  // Each stored report should notify sources changed one time.
+  EXPECT_EQ(4u, observer.sources_changed());
+  EXPECT_EQ(3u, observer.reports_changed());
+
   // Simulate the reports being sent and removed from storage.
   task_environment_.FastForwardBy(kFirstReportingWindow -
                                   kAttributionManagerQueueReportsInterval);
@@ -1021,4 +1064,21 @@
           source1, DeactivatedSource::Reason::kReachedAttributionLimit}));
 }
 
+TEST_F(AttributionManagerImplTest, ClearData_NotifiesObservers) {
+  TestAttributionManagerObserver observer;
+  base::ScopedObservation<AttributionManager, AttributionManager::Observer>
+      observation(&observer);
+  observation.Observe(attribution_manager_.get());
+
+  base::RunLoop run_loop;
+  attribution_manager_->ClearData(
+      base::Time::Min(), base::Time::Max(),
+      base::BindRepeating([](const url::Origin& _) { return false; }),
+      run_loop.QuitClosure());
+  run_loop.Run();
+
+  EXPECT_EQ(1u, observer.sources_changed());
+  EXPECT_EQ(1u, observer.reports_changed());
+}
+
 }  // namespace content
diff --git a/content/browser/attribution_reporting/attribution_test_utils.cc b/content/browser/attribution_reporting/attribution_test_utils.cc
index 35cfd967..9ddd95d 100644
--- a/content/browser/attribution_reporting/attribution_test_utils.cc
+++ b/content/browser/attribution_reporting/attribution_test_utils.cc
@@ -163,6 +163,16 @@
   reports_ = std::move(reports);
 }
 
+void TestAttributionManager::NotifySourcesChanged() {
+  for (Observer& observer : observers_)
+    observer.OnSourcesChanged();
+}
+
+void TestAttributionManager::NotifyReportsChanged() {
+  for (Observer& observer : observers_)
+    observer.OnReportsChanged();
+}
+
 void TestAttributionManager::NotifySourceDeactivated(
     const DeactivatedSource& source) {
   for (Observer& observer : observers_)
diff --git a/content/browser/attribution_reporting/attribution_test_utils.h b/content/browser/attribution_reporting/attribution_test_utils.h
index 3235a59..505d3fc 100644
--- a/content/browser/attribution_reporting/attribution_test_utils.h
+++ b/content/browser/attribution_reporting/attribution_test_utils.h
@@ -166,6 +166,8 @@
   void SetActiveSourcesForWebUI(std::vector<StorableSource> sources);
   void SetReportsForWebUI(std::vector<AttributionReport> reports);
 
+  void NotifySourcesChanged();
+  void NotifyReportsChanged();
   void NotifySourceDeactivated(
       const AttributionStorage::DeactivatedSource& source);
   void NotifyReportSent(const SentReportInfo& info);
diff --git a/content/browser/renderer_host/render_frame_host_delegate.cc b/content/browser/renderer_host/render_frame_host_delegate.cc
index 387b326e..1f89dfec 100644
--- a/content/browser/renderer_host/render_frame_host_delegate.cc
+++ b/content/browser/renderer_host/render_frame_host_delegate.cc
@@ -77,7 +77,9 @@
     mojo::PendingReceiver<device::mojom::NFC> receiver) {}
 #endif
 
-bool RenderFrameHostDelegate::CanEnterFullscreenMode() {
+bool RenderFrameHostDelegate::CanEnterFullscreenMode(
+    RenderFrameHostImpl* requesting_frame,
+    const blink::mojom::FullscreenOptions& options) {
   return true;
 }
 
diff --git a/content/browser/renderer_host/render_frame_host_delegate.h b/content/browser/renderer_host/render_frame_host_delegate.h
index e4e0ed5..760a2dd 100644
--- a/content/browser/renderer_host/render_frame_host_delegate.h
+++ b/content/browser/renderer_host/render_frame_host_delegate.h
@@ -300,7 +300,9 @@
 #endif
 
   // Returns whether entering fullscreen with EnterFullscreenMode() is allowed.
-  virtual bool CanEnterFullscreenMode();
+  virtual bool CanEnterFullscreenMode(
+      RenderFrameHostImpl* requesting_frame,
+      const blink::mojom::FullscreenOptions& options);
 
   // Notification that the frame with the given host wants to enter fullscreen
   // mode. Must only be called if CanEnterFullscreenMode returns true.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index fa73c2ba..370cc43 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -5959,7 +5959,7 @@
   // Frames (possibly a subframe) that are not active nor belonging to a primary
   // page should not enter fullscreen.
   if (!IsActive() || !GetPage().IsPrimary() ||
-      !delegate_->CanEnterFullscreenMode()) {
+      !delegate_->CanEnterFullscreenMode(this, *options)) {
     std::move(callback).Run(/*granted=*/false);
     return;
   }
diff --git a/content/browser/resources/attribution_reporting/attribution_internals.js b/content/browser/resources/attribution_reporting/attribution_internals.js
index de84335..c89564e 100644
--- a/content/browser/resources/attribution_reporting/attribution_internals.js
+++ b/content/browser/resources/attribution_reporting/attribution_internals.js
@@ -363,7 +363,7 @@
     }
 
     this.deactivatedSources.push(source);
-    updatePageData();
+    this.table.updateTbody();
   }
 
   clear() {
@@ -465,7 +465,7 @@
     }
 
     this.sentOrDroppedReports.push(report);
-    updatePageData();
+    this.table.updateTbody();
   }
 
   clear() {
@@ -564,11 +564,18 @@
     }
   });
 
+  updateSources();
+  updateReports();
+}
+
+function updateSources() {
   pageHandler.getActiveSources().then((response) => {
     sourceTableModel.setStoredSources(
         response.sources.map((mojo) => new Source(mojo)));
   });
+}
 
+function updateReports() {
   pageHandler.getReports().then((response) => {
     reportTableModel.setStoredReports(
         response.reports.map((mojo) => new Report(mojo)));
@@ -576,19 +583,22 @@
 }
 
 /**
- * Deletes all data stored by the conversions backend, and refreshes
- * page data once this operation has finished.
+ * Deletes all data stored by the conversions backend.
+ * Observer.onReportsChanged and Observer.onSourcesChanged will be called
+ * automatically as reports are deleted, so there's no need to manually refresh
+ * the data on completion.
  */
 function clearStorage() {
   reportTableModel.clear();
-  pageHandler.clearStorage().then(() => {
-    updatePageData();
-  });
+  pageHandler.clearStorage();
 }
 
 /**
- * Sends all conversion reports, and updates the page once they are sent.
+ * Sends all conversion reports.
  * Disables the button while the reports are still being sent.
+ * Observer.onReportsChanged and Observer.onSourcesChanged will be called
+ * automatically as reports are deleted, so there's no need to manually refresh
+ * the data on completion.
  */
 function sendReports() {
   const button = $('send-reports');
@@ -597,7 +607,6 @@
   button.disabled = true;
   button.innerText = 'Sending...';
   pageHandler.sendPendingReports().then(() => {
-    updatePageData();
     button.disabled = false;
     button.innerText = previousText;
   });
@@ -606,6 +615,16 @@
 /** @implements {AttributionInternalsObserverInterface} */
 class Observer {
   /** @override */
+  onSourcesChanged() {
+    updateSources();
+  }
+
+  /** @override */
+  onReportsChanged() {
+    updateReports();
+  }
+
+  /** @override */
   onSourceDeactivated(mojo) {
     sourceTableModel.addDeactivatedSource(new Source(mojo));
   }
@@ -638,7 +657,5 @@
   const receiver = new AttributionInternalsObserverReceiver(new Observer());
   pageHandler.addObserver(receiver.$.bindNewPipeAndPassRemote());
 
-  // Automatically refresh every 2 minutes.
-  setInterval(updatePageData, 2 * 60 * 1000);
   updatePageData();
 });
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index a3da81f..b86e3a90 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3321,22 +3321,26 @@
       ->GetRenderWidgetHost();
 }
 
-bool WebContentsImpl::CanEnterFullscreenMode() {
+bool WebContentsImpl::CanEnterFullscreenMode(
+    RenderFrameHostImpl* requesting_frame,
+    const blink::mojom::FullscreenOptions& options) {
   // It's possible that this WebContents was spawned while blocking UI was on
   // the screen, or that it was downstream from a WebContents when UI was
   // blocked. Therefore, disqualify it from fullscreen if it or any upstream
   // WebContents has an active blocker.
   auto openers = GetAllOpeningWebContents(this);
-  return std::all_of(openers.begin(), openers.end(), [](auto* opener) {
-    return opener->fullscreen_blocker_count_ == 0;
-  });
+  return std::all_of(openers.begin(), openers.end(),
+                     [](auto* opener) {
+                       return opener->fullscreen_blocker_count_ == 0;
+                     }) &&
+         delegate_->CanEnterFullscreenModeForTab(requesting_frame, options);
 }
 
 void WebContentsImpl::EnterFullscreenMode(
     RenderFrameHostImpl* requesting_frame,
     const blink::mojom::FullscreenOptions& options) {
   OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
-  DCHECK(CanEnterFullscreenMode());
+  DCHECK(CanEnterFullscreenMode(requesting_frame, options));
   DCHECK(requesting_frame->IsActive());
 
   if (delegate_) {
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 246d89e7..122415e 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -648,7 +648,9 @@
   void GetNFC(RenderFrameHost*,
               mojo::PendingReceiver<device::mojom::NFC>) override;
 #endif
-  bool CanEnterFullscreenMode() override;
+  bool CanEnterFullscreenMode(
+      RenderFrameHostImpl* requesting_frame,
+      const blink::mojom::FullscreenOptions& options) override;
   void EnterFullscreenMode(
       RenderFrameHostImpl* requesting_frame,
       const blink::mojom::FullscreenOptions& options) override;
diff --git a/content/gpu/gpu_sandbox_hook_linux.cc b/content/gpu/gpu_sandbox_hook_linux.cc
index c74f7f3c..db9de09 100644
--- a/content/gpu/gpu_sandbox_hook_linux.cc
+++ b/content/gpu/gpu_sandbox_hook_linux.cc
@@ -212,14 +212,9 @@
 }
 
 void AddAmdGpuPermissions(std::vector<BrokerFilePermission>* permissions) {
-  static const char* const kReadOnlyList[] = {
-      "/etc/ld.so.cache",
-      "/usr/lib64/libEGL.so.1",
-      "/usr/lib64/libGLESv2.so.2",
-      "/usr/share/vulkan/icd.d",
-      "/usr/share/vulkan/icd.d/radeon_icd.x86_64.json",
-      "/usr/lib64/libvulkan.so.1",
-      "/usr/lib64/libvulkan_radeon.so"};
+  static const char* const kReadOnlyList[] = {"/etc/ld.so.cache",
+                                              "/usr/lib64/libEGL.so.1",
+                                              "/usr/lib64/libGLESv2.so.2"};
   for (const char* item : kReadOnlyList)
     permissions->push_back(BrokerFilePermission::ReadOnly(item));
 
@@ -247,26 +242,15 @@
 
 void AddIntelGpuPermissions(std::vector<BrokerFilePermission>* permissions) {
   static const char* const kReadOnlyList[] = {
-      "/usr/share/vulkan/icd.d",
-      "/usr/share/vulkan/icd.d/intel_icd.x86_64.json",
-      // TODO(hob): libvulkan.so is broadly applicable across all platforms
-      // for WebGPU, but let's allowlist only on Intel for now since it's the
-      // first platform to support WebGPU. As we start rolling out WebGPU on
-      // more platforms, we should move this into |AddStandardGpuPermissions|.
-      "/usr/lib64/libvulkan.so.1",
-      "/usr/lib64/libvulkan_intel.so",
       // To support threads in mesa we use --gpu-sandbox-start-early and
       // that requires the following libs and files to be accessible.
-      "/usr/lib64/libEGL.so.1",
-      "/usr/lib64/libGLESv2.so.2",
-      "/usr/lib64/libglapi.so.0",
-      "/usr/lib64/dri/i965_dri.so",
+      "/usr/lib64/libEGL.so.1", "/usr/lib64/libGLESv2.so.2",
+      "/usr/lib64/libglapi.so.0", "/usr/lib64/dri/i965_dri.so",
       "/usr/lib64/dri/iris_dri.so",
       // Allow libglvnd files and libs.
       "/usr/share/glvnd/egl_vendor.d",
       "/usr/share/glvnd/egl_vendor.d/50_mesa.json",
-      "/usr/lib64/libEGL_mesa.so.0",
-      "/usr/lib64/libGLdispatch.so.0"};
+      "/usr/lib64/libEGL_mesa.so.0", "/usr/lib64/libGLdispatch.so.0"};
   for (const char* item : kReadOnlyList)
     permissions->push_back(BrokerFilePermission::ReadOnly(item));
 
@@ -324,6 +308,22 @@
   }
 }
 
+void AddVulkanICDPermissions(std::vector<BrokerFilePermission>* permissions) {
+  static const char* const kReadOnlyICDPrefixes[] = {"/usr/share/vulkan/icd.d",
+                                                     "/etc/vulkan/icd.d"};
+
+  static const char* const kReadOnlyICDList[] = {
+      "intel_icd.x86_64.json", "nvidia_icd.json", "radeon_icd.x86_64.json"};
+
+  for (std::string prefix : kReadOnlyICDPrefixes) {
+    permissions->push_back(BrokerFilePermission::ReadOnly(prefix));
+    for (const char* json : kReadOnlyICDList) {
+      permissions->push_back(
+          BrokerFilePermission::ReadOnly(prefix + "/" + json));
+    }
+  }
+}
+
 void AddStandardGpuPermissions(std::vector<BrokerFilePermission>* permissions) {
   static const char kDriCardBasePath[] = "/dev/dri/card";
   static const char kNvidiaCtlPath[] = "/dev/nvidiactl";
@@ -331,9 +331,6 @@
   static const char kNvidiaDeviceModeSetPath[] = "/dev/nvidia-modeset";
   static const char kNvidiaParamsPath[] = "/proc/driver/nvidia/params";
   static const char kDevShm[] = "/dev/shm/";
-  static const char kVulkanIcdPath[] = "/usr/share/vulkan/icd.d";
-  static const char kNvidiaVulkanIcd[] =
-      "/usr/share/vulkan/icd.d/nvidia_icd.json";
 
   // For shared memory.
   permissions->push_back(
@@ -354,9 +351,6 @@
   permissions->push_back(
       BrokerFilePermission::ReadWrite(kNvidiaDeviceModeSetPath));
   permissions->push_back(BrokerFilePermission::ReadOnly(kNvidiaParamsPath));
-
-  permissions->push_back(BrokerFilePermission::ReadOnly(kVulkanIcdPath));
-  permissions->push_back(BrokerFilePermission::ReadOnly(kNvidiaVulkanIcd));
 }
 
 std::vector<BrokerFilePermission> FilePermissionsForGpu(
@@ -366,6 +360,8 @@
   std::vector<BrokerFilePermission> permissions = {
       BrokerFilePermission::ReadOnly(kDriRcPath)};
 
+  AddVulkanICDPermissions(&permissions);
+
   if (IsChromeOS()) {
     if (UseV4L2Codec())
       AddV4L2GpuPermissions(&permissions, options);
@@ -477,6 +473,15 @@
   return true;
 }
 
+void LoadVulkanLibraries() {
+  // Try to preload Vulkan libraries. Failure is not an error as not all may be
+  // present.
+  dlopen("libvulkan.so.1", dlopen_flag);
+  dlopen("libvulkan_radeon.so ", dlopen_flag);
+  dlopen("libvulkan_intel.so", dlopen_flag);
+  dlopen("libGLX_nvidia.so.0", dlopen_flag);
+}
+
 bool IsAcceleratedVideoEnabled(
     const sandbox::policy::SandboxSeccompBPF::Options& options) {
   return options.accelerated_video_encode_enabled ||
@@ -506,6 +511,7 @@
 
 bool LoadLibrariesForGpu(
     const sandbox::policy::SandboxSeccompBPF::Options& options) {
+  LoadVulkanLibraries();
   if (IsChromeOS()) {
     if (UseV4L2Codec())
       LoadV4L2Libraries(options);
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
index 894000be9..2c87b89 100644
--- a/content/public/browser/web_contents_delegate.cc
+++ b/content/public/browser/web_contents_delegate.cc
@@ -158,6 +158,12 @@
   return false;
 }
 
+bool WebContentsDelegate::CanEnterFullscreenModeForTab(
+    RenderFrameHost* requesting_frame,
+    const blink::mojom::FullscreenOptions& options) {
+  return true;
+}
+
 blink::mojom::DisplayMode WebContentsDelegate::GetDisplayMode(
     const WebContents* web_contents) {
   return blink::mojom::DisplayMode::kBrowser;
diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
index 177bc12..f04506b 100644
--- a/content/public/browser/web_contents_delegate.h
+++ b/content/public/browser/web_contents_delegate.h
@@ -443,8 +443,15 @@
                                base::OnceCallback<void()> on_confirm,
                                base::OnceCallback<void()> on_cancel);
 
+  // Returns whether entering fullscreen with |EnterFullscreenModeForTab()| is
+  // allowed.
+  virtual bool CanEnterFullscreenModeForTab(
+      RenderFrameHost* requesting_frame,
+      const blink::mojom::FullscreenOptions& options);
+
   // Called when the renderer puts a tab into fullscreen mode.
   // |requesting_frame| is the specific content frame requesting fullscreen.
+  // |CanEnterFullscreenModeForTab()| must return true on entry.
   virtual void EnterFullscreenModeForTab(
       RenderFrameHost* requesting_frame,
       const blink::mojom::FullscreenOptions& options) {}
diff --git a/content/public/renderer/render_frame.h b/content/public/renderer/render_frame.h
index b5eed54..7395d54a 100644
--- a/content/public/renderer/render_frame.h
+++ b/content/public/renderer/render_frame.h
@@ -183,6 +183,11 @@
   // Returns true if this is the main (top-level) frame.
   virtual bool IsMainFrame() = 0;
 
+  // Returns false if fenced frames are disabled. Returns true if the
+  // feature is enabled and if |this| or any of its ancestor nodes is a
+  // fenced frame.
+  virtual bool IsInFencedFrameTree() const = 0;
+
   // Return true if this frame is hidden.
   virtual bool IsHidden() = 0;
 
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index fb0445b..584ae29b 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4668,6 +4668,10 @@
   return is_main_frame_;
 }
 
+bool RenderFrameImpl::IsInFencedFrameTree() const {
+  return GetWebFrame()->IsInFencedFrameTree();
+}
+
 bool RenderFrameImpl::IsHidden() {
   return GetLocalRootWebFrameWidget()->IsHidden();
 }
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 038b9c0..1b582c1 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -355,6 +355,7 @@
                                  const blink::WebPluginParams& params) override;
   void ExecuteJavaScript(const std::u16string& javascript) override;
   bool IsMainFrame() override;
+  bool IsInFencedFrameTree() const override;
   bool IsHidden() override;
   void BindLocalInterface(
       const std::string& interface_name,
diff --git a/content/services/auction_worklet/auction_downloader.cc b/content/services/auction_worklet/auction_downloader.cc
index 5194dff..1c30150 100644
--- a/content/services/auction_worklet/auction_downloader.cc
+++ b/content/services/auction_worklet/auction_downloader.cc
@@ -47,6 +47,8 @@
             "These requests triggered by a website."
         })");
 
+const char kWebAssemblyMime[] = "application/wasm";
+
 // Returns the MIME type string to send for the Accept header for `mime_type`.
 // These are the official IANA MIME type strings, though other MIME type strings
 // are allows in the response.
@@ -56,18 +58,34 @@
       return base::StringPiece("application/javascript");
     case AuctionDownloader::MimeType::kJson:
       return base::StringPiece("application/json");
+    case AuctionDownloader::MimeType::kWebAssembly:
+      return base::StringPiece(kWebAssemblyMime);
   }
 }
 
-// Checks if `advertised_mime_type` is consistent with `mime_type`.
-// `advertised_mime_type` must be lowercase.
-bool MimeTypeIsConsistent(AuctionDownloader::MimeType mime_type,
-                          const std::string& advertised_mime_type) {
+// Checks if `response_info` is consistent with `mime_type`.
+bool MimeTypeIsConsistent(
+    AuctionDownloader::MimeType mime_type,
+    const network::mojom::URLResponseHead* response_info) {
   switch (mime_type) {
     case AuctionDownloader::MimeType::kJavascript:
-      return blink::IsSupportedJavascriptMimeType(advertised_mime_type);
+      // ResponseInfo's `mime_type` is always lowercase.
+      return blink::IsSupportedJavascriptMimeType(response_info->mime_type);
     case AuctionDownloader::MimeType::kJson:
-      return blink::IsJSONMimeType(advertised_mime_type);
+      // ResponseInfo's `mime_type` is always lowercase.
+      return blink::IsJSONMimeType(response_info->mime_type);
+    case AuctionDownloader::MimeType::kWebAssembly: {
+      std::string raw_content_type;
+      // Here we use the headers directly, not the parsed mimetype, since we
+      // much check there are no parameters whatsoever. Ref.
+      // https://webassembly.github.io/spec/web-api/#streaming-modules
+      if (!response_info->headers->GetNormalizedHeader(
+              net::HttpRequestHeaders::kContentType, &raw_content_type)) {
+        return false;
+      }
+
+      return base::ToLowerASCII(raw_content_type) == kWebAssemblyMime;
+    }
   }
 }
 
@@ -149,16 +167,15 @@
              base::StringPrintf(
                  "Rejecting load of %s due to lack of X-Allow-FLEDGE: true.",
                  source_url_.spec().c_str()));
-  } else if (!MimeTypeIsConsistent(
-                 mime_type_,
-                 // ResponseInfo's `mime_type` is always lowercase.
-                 simple_url_loader->ResponseInfo()->mime_type)) {
+  } else if (!MimeTypeIsConsistent(mime_type_,
+                                   simple_url_loader->ResponseInfo())) {
     std::move(auction_downloader_callback_)
         .Run(nullptr /* body */,
              base::StringPrintf(
                  "Rejecting load of %s due to unexpected MIME type.",
                  source_url_.spec().c_str()));
-  } else if (!IsAllowedCharset(simple_url_loader->ResponseInfo()->charset,
+  } else if ((mime_type_ != MimeType::kWebAssembly) &&
+             !IsAllowedCharset(simple_url_loader->ResponseInfo()->charset,
                                *body)) {
     std::move(auction_downloader_callback_)
         .Run(nullptr /* body */,
diff --git a/content/services/auction_worklet/auction_downloader.h b/content/services/auction_worklet/auction_downloader.h
index 27bfb1d4..06a4a363 100644
--- a/content/services/auction_worklet/auction_downloader.h
+++ b/content/services/auction_worklet/auction_downloader.h
@@ -30,6 +30,7 @@
   enum class MimeType {
     kJavascript,
     kJson,
+    kWebAssembly,
   };
 
   // Passes in nullptr on failure. Always invoked asynchronously. Will not be
diff --git a/content/services/auction_worklet/auction_downloader_unittest.cc b/content/services/auction_worklet/auction_downloader_unittest.cc
index f8e6177..fb98f87 100644
--- a/content/services/auction_worklet/auction_downloader_unittest.cc
+++ b/content/services/auction_worklet/auction_downloader_unittest.cc
@@ -273,6 +273,70 @@
   EXPECT_EQ(kAsciiResponseBody, *body);
 }
 
+TEST_F(AuctionDownloaderTest, MimeTypeWasm) {
+  mime_type_ = AuctionDownloader::MimeType::kWebAssembly;
+
+  // WASM request, Javascript response type.
+  AddResponse(&url_loader_factory_, url_, kJavascriptMimeType, kUtf8Charset,
+              kAsciiResponseBody);
+  EXPECT_FALSE(RunRequest());
+  EXPECT_EQ(
+      "Rejecting load of https://url.test/script.js due to unexpected MIME "
+      "type.",
+      last_error_msg());
+
+  // WASM request, no response type.
+  AddResponse(&url_loader_factory_, url_, /*mime_type=*/absl::nullopt,
+              /*charset=*/absl::nullopt, kAsciiResponseBody);
+  EXPECT_FALSE(RunRequest());
+  EXPECT_EQ(
+      "Rejecting load of https://url.test/script.js due to unexpected MIME "
+      "type.",
+      last_error_msg());
+
+  // WASM request, JSON response type.
+  AddResponse(&url_loader_factory_, url_, kJsonMimeType, kUtf8Charset,
+              kAsciiResponseBody);
+  EXPECT_FALSE(RunRequest());
+  EXPECT_EQ(
+      "Rejecting load of https://url.test/script.js due to unexpected MIME "
+      "type.",
+      last_error_msg());
+
+  // WASM request, WASM response type.
+  AddResponse(&url_loader_factory_, url_, kWasmMimeType,
+              /*charset=*/absl::nullopt, kNonUtf8ResponseBody);
+  std::unique_ptr<std::string> body = RunRequest();
+  ASSERT_TRUE(body);
+  EXPECT_EQ(kNonUtf8ResponseBody, *body);
+
+  // Mimetypes are case insensitive.
+  AddResponse(&url_loader_factory_, url_, "Application/WasM",
+              /*charset=*/absl::nullopt, kNonUtf8ResponseBody);
+  body = RunRequest();
+  ASSERT_TRUE(body);
+  EXPECT_EQ(kNonUtf8ResponseBody, *body);
+
+  // No charset should be used (it's a binary format, after all).
+  AddResponse(&url_loader_factory_, url_, kWasmMimeType,
+              /*charset=*/kUtf8Charset, kUtf8ResponseBody);
+  body = RunRequest();
+  EXPECT_FALSE(RunRequest());
+  EXPECT_EQ(
+      "Rejecting load of https://url.test/script.js due to unexpected MIME "
+      "type.",
+      last_error_msg());
+
+  // Even an empty parameter list is to be rejected.
+  AddResponse(&url_loader_factory_, url_, "application/wasm;",
+              /*charset=*/absl::nullopt, kNonUtf8ResponseBody);
+  EXPECT_FALSE(RunRequest());
+  EXPECT_EQ(
+      "Rejecting load of https://url.test/script.js due to unexpected MIME "
+      "type.",
+      last_error_msg());
+}
+
 // Test all Javscript and JSON MIME type strings.
 TEST_F(AuctionDownloaderTest, MimeTypeVariants) {
   // All supported Javscript MIME types, copied from blink's mime_util.cc.
diff --git a/content/services/auction_worklet/worklet_test_util.cc b/content/services/auction_worklet/worklet_test_util.cc
index 0f4216a..795a521 100644
--- a/content/services/auction_worklet/worklet_test_util.cc
+++ b/content/services/auction_worklet/worklet_test_util.cc
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/logging.h"
+#include "base/strings/strcat.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "content/services/auction_worklet/auction_downloader.h"
@@ -24,6 +25,7 @@
 
 const char kJavascriptMimeType[] = "application/javascript";
 const char kJsonMimeType[] = "application/json";
+const char kWasmMimeType[] = "application/wasm";
 
 const char kAllowFledgeHeader[] = "X-Allow-FLEDGE: true";
 
@@ -36,22 +38,30 @@
                  net::HttpStatusCode http_status,
                  network::TestURLLoaderFactory::Redirects redirects) {
   auto head = network::mojom::URLResponseHead::New();
-  // Don't bother adding these as headers, since the script grabs headers from
-  // URLResponseHead fields instead of the corresponding
-  // net::HttpResponseHeaders fields.
   if (mime_type)
     head->mime_type = *mime_type;
   if (charset)
     head->charset = *charset;
-  if (headers) {
-    std::string full_headers =
-        base::StringPrintf("HTTP/1.1 %d %s\r\n\r\n",
-                           static_cast<int>(http_status),
-                           net::GetHttpReasonPhrase(http_status)) +
-        *headers;
-    head->headers = net::HttpResponseHeaders::TryToCreate(full_headers);
-    CHECK(head->headers);
+
+  std::string full_headers =
+      base::StringPrintf("HTTP/1.1 %d %s\r\n\r\n",
+                         static_cast<int>(http_status),
+                         net::GetHttpReasonPhrase(http_status)) +
+      headers.value_or(std::string());
+  head->headers = net::HttpResponseHeaders::TryToCreate(full_headers);
+  CHECK(head->headers);
+
+  // WASM handling cares about content-type header, so add one if needed.
+  // This doesn't try to escape, and purposefully passes any weird stuff passed
+  // in for easier checking of it.
+  if (mime_type) {
+    std::string content_type_str = *mime_type;
+    if (charset)
+      base::StrAppend(&content_type_str, {";charset=", *charset});
+    head->headers->SetHeader(net::HttpRequestHeaders::kContentType,
+                             content_type_str);
   }
+
   url_loader_factory->AddResponse(url, std::move(head), content,
                                   network::URLLoaderCompletionStatus(),
                                   std::move(redirects));
diff --git a/content/services/auction_worklet/worklet_test_util.h b/content/services/auction_worklet/worklet_test_util.h
index a9f8925..8527a4ca 100644
--- a/content/services/auction_worklet/worklet_test_util.h
+++ b/content/services/auction_worklet/worklet_test_util.h
@@ -21,10 +21,11 @@
 
 class AuctionV8Helper;
 
-// The official Javascript and JSON MIME types. These are not the only supported
-// MIME types for either, however.
+// The official Javascript, JSON, and WASM MIME types. For JS and JSON there are
+// also other supported MIME types.
 extern const char kJavascriptMimeType[];
 extern const char kJsonMimeType[];
+extern const char kWasmMimeType[];
 
 // "X-Allow-Fledge: true" header.
 extern const char kAllowFledgeHeader[];
diff --git a/content/shell/browser/shell_browser_main_parts.cc b/content/shell/browser/shell_browser_main_parts.cc
index 559a35de..49fc86b 100644
--- a/content/shell/browser/shell_browser_main_parts.cc
+++ b/content/shell/browser/shell_browser_main_parts.cc
@@ -53,12 +53,12 @@
 #include "ui/base/ime/init/input_method_initializer.h"
 #endif
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#elif defined(OS_LINUX)
 #include "device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.h"
-#endif  // #elif (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+#endif
 
 #if BUILDFLAG(IS_CHROMEOS_LACROS)
 #include "chromeos/lacros/dbus/lacros_dbus_thread_manager.h"
@@ -117,13 +117,15 @@
 void ShellBrowserMainParts::PostCreateMainMessageLoop() {
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   chromeos::DBusThreadManager::Initialize();
-  bluez::BluezDBusManager::InitializeFake();
-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-  bluez::DBusBluezManagerWrapperLinux::Initialize();
-#endif
-#if BUILDFLAG(IS_CHROMEOS_LACROS)
+#elif BUILDFLAG(IS_CHROMEOS_LACROS)
   chromeos::LacrosDBusThreadManager::Initialize();
 #endif
+
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+  bluez::BluezDBusManager::InitializeFake();
+#elif defined(OS_LINUX)
+  bluez::DBusBluezManagerWrapperLinux::Initialize();
+#endif
 }
 
 int ShellBrowserMainParts::PreEarlyInitialization() {
@@ -205,17 +207,19 @@
 }
 
 void ShellBrowserMainParts::PostDestroyThreads() {
-#if BUILDFLAG(IS_CHROMEOS_LACROS)
-  chromeos::LacrosDBusThreadManager::Shutdown();
-#endif
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   device::BluetoothAdapterFactory::Shutdown();
   bluez::BluezDBusManager::Shutdown();
-  chromeos::DBusThreadManager::Shutdown();
-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#elif defined(OS_LINUX)
   device::BluetoothAdapterFactory::Shutdown();
   bluez::DBusBluezManagerWrapperLinux::Shutdown();
 #endif
+
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+  chromeos::DBusThreadManager::Shutdown();
+#elif BUILDFLAG(IS_CHROMEOS_LACROS)
+  chromeos::LacrosDBusThreadManager::Shutdown();
+#endif
 }
 
 std::unique_ptr<ShellPlatformDelegate>
diff --git a/content/test/test_blink_web_unit_test_support.cc b/content/test/test_blink_web_unit_test_support.cc
index 7cb36d4..936d18dd 100644
--- a/content/test/test_blink_web_unit_test_support.cc
+++ b/content/test/test_blink_web_unit_test_support.cc
@@ -115,6 +115,9 @@
   gin::V8Initializer::LoadV8Snapshot(kSnapshotType);
 #endif
 
+  // Test shell always exposes the GC.
+  std::string v8_flags("--expose-gc");
+
   blink::Platform::InitializeBlink();
   scoped_refptr<base::SingleThreadTaskRunner> dummy_task_runner;
   std::unique_ptr<base::ThreadTaskRunnerHandle> dummy_task_runner_handle;
@@ -131,6 +134,8 @@
     dummy_task_runner = base::MakeRefCounted<base::NullTaskRunner>();
     dummy_task_runner_handle =
         std::make_unique<base::ThreadTaskRunnerHandle>(dummy_task_runner);
+    // Force V8 to run single threaded.
+    v8_flags += " --single-threaded";
   } else {
     DCHECK_EQ(scheduler_type, SchedulerType::kRealScheduler);
     main_thread_scheduler_ =
@@ -143,6 +148,9 @@
   // Initialize mojo firstly to enable Blink initialization to use it.
   InitializeMojo();
 
+  // Set V8 flags.
+  v8::V8::SetFlagsFromString(v8_flags.c_str(), v8_flags.size());
+
   mojo::BinderMap binders;
   blink::Initialize(this, &binders, main_thread_scheduler_.get());
   g_test_platform = this;
@@ -158,10 +166,6 @@
 
   // Initialize libraries for media.
   media::InitializeMediaLibrary();
-
-  // Test shell always exposes the GC.
-  std::string flags("--expose-gc");
-  v8::V8::SetFlagsFromString(flags.c_str(), flags.size());
 }
 
 TestBlinkWebUnitTestSupport::~TestBlinkWebUnitTestSupport() {
diff --git a/dbus/object_proxy.cc b/dbus/object_proxy.cc
index a8ac28f..9aaea42 100644
--- a/dbus/object_proxy.cc
+++ b/dbus/object_proxy.cc
@@ -113,10 +113,6 @@
   return std::move(callback_);
 }
 
-bool ObjectProxy::ReplyCallbackHolder::IsNullCallback() const {
-  return callback_.is_null();
-}
-
 ObjectProxy::ObjectProxy(Bus* bus,
                          const std::string& service_name,
                          const ObjectPath& object_path,
@@ -182,10 +178,6 @@
 void ObjectProxy::CallMethod(MethodCall* method_call,
                              int timeout_ms,
                              ResponseCallback callback) {
-  // `callback` should not be null. Otherwise, it crashes later in OnCallMethod.
-  // TODO(http://crbug/1211451): Remove after fix.
-  CHECK(!callback.is_null());
-
   auto internal_callback = base::BindOnce(
       &ObjectProxy::OnCallMethod, this, method_call->GetInterface(),
       method_call->GetMember(), std::move(callback));
@@ -204,8 +196,6 @@
 
   ReplyCallbackHolder callback_holder(bus_->GetOriginTaskRunner(),
                                       std::move(callback));
-  // TODO(http://crbug/1211451): Remove after fix.
-  CHECK(!callback_holder.IsNullCallback());
 
   if (!method_call->SetDestination(service_name_) ||
       !method_call->SetPath(object_path_)) {
@@ -351,9 +341,6 @@
   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
                                                 base::BlockingType::MAY_BLOCK);
 
-  // TODO(http://crbug/1211451): Remove after fix.
-  CHECK(!callback_holder.IsNullCallback());
-
   if (!bus_->Connect() || !bus_->SetUpAsyncOperations()) {
     // In case of a failure, run the error callback with nullptr.
     base::OnceClosure task =
@@ -396,9 +383,6 @@
   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
                                                 base::BlockingType::MAY_BLOCK);
 
-  // TODO(http://crbug/1211451): Remove after fix.
-  CHECK(!callback_holder.IsNullCallback());
-
   DBusMessage* response_message = dbus_pending_call_steal_reply(pending_call);
 
   // Either |response| or |error_response| takes ownership of the
@@ -452,9 +436,6 @@
     base::TimeTicks start_time,
     Response* response,
     ErrorResponse* error_response) {
-  // TODO(http://crbug/1211451): Remove after fix.
-  CHECK(!callback_holder.IsNullCallback());
-
   bus_->AssertOnOriginThread();
   callback_holder.ReleaseCallback().Run(response, error_response);
 
@@ -647,16 +628,6 @@
                                ResponseCallback response_callback,
                                Response* response,
                                ErrorResponse* error_response) {
-  // Crash on null `response_callback` with details of the call.
-  // TODO(http://crbug/1211451): Remove after fix.
-  DEBUG_ALIAS_FOR_CSTR(interface_name_copy, interface_name.c_str(), 64);
-  DEBUG_ALIAS_FOR_CSTR(method_name_copy, method_name.c_str(), 64);
-  DEBUG_ALIAS_FOR_CSTR(object_path_copy, object_path_.value().c_str(), 64);
-  LOG_IF(FATAL, response_callback.is_null())
-      << "Null response_callback"
-      << ", method:" << interface_name << "." << method_name
-      << ", obj=" << object_path_.value();
-
   if (response) {
     // Method call was successful.
     std::move(response_callback).Run(response);
diff --git a/dbus/object_proxy.h b/dbus/object_proxy.h
index 25f79ab..063a60e 100644
--- a/dbus/object_proxy.h
+++ b/dbus/object_proxy.h
@@ -251,10 +251,6 @@
     // This must be called on the origin thread.
     ResponseOrErrorCallback ReleaseCallback();
 
-    // Whether |callback_| is null.
-    // TODO(http://crbug/1211451): Remove after fix.
-    bool IsNullCallback() const;
-
    private:
     scoped_refptr<base::SequencedTaskRunner> origin_task_runner_;
     ResponseOrErrorCallback callback_;
diff --git a/device/BUILD.gn b/device/BUILD.gn
index f76b068..3c42e29 100644
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
@@ -237,16 +237,16 @@
     ]
   }
 
-  if (is_chromeos) {
-    deps += [ "//chromeos/constants" ]
-  }
-
-  if (is_chromeos_ash) {
+  if (is_chromeos_ash || is_chromeos_lacros) {
     sources += [
       "bluetooth/bluetooth_low_energy_scan_filter_unittest.cc",
       "bluetooth/chromeos/bluetooth_connection_logger_unittest.cc",
       "bluetooth/chromeos/bluetooth_utils_unittest.cc",
     ]
+    deps += [ "//chromeos/constants" ]
+    if (is_chromeos_lacros) {
+      deps += [ "//chromeos/lacros:test_support" ]
+    }
   }
 
   if ((is_chromeos || is_linux) && use_dbus) {
@@ -274,7 +274,7 @@
       "//dbus:test_support",
     ]
 
-    if (is_chromeos_ash) {
+    if (is_chromeos_ash || is_chromeos_lacros) {
       sources += [
         "bluetooth/dbus/bluetooth_advertisement_monitor_application_service_provider_unittest.cc",
         "bluetooth/dbus/bluetooth_advertisement_monitor_service_provider_unittest.cc",
diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn
index 29f3c702..cbf9574 100644
--- a/device/bluetooth/BUILD.gn
+++ b/device/bluetooth/BUILD.gn
@@ -8,7 +8,7 @@
 if (is_android) {
   import("//build/config/android/rules.gni")  # For generate_jni().
 }
-if (is_chromeos_ash) {
+if (is_chromeos_ash || is_chromeos_lacros) {
   import("//chromeos/dbus/config/use_real_dbus_clients.gni")
 } else if (use_bluez) {
   use_real_dbus_clients = false
@@ -207,6 +207,10 @@
     deps += [ "//chromeos/constants" ]
   }
 
+  if (is_chromeos_ash || is_chromeos_lacros) {
+    deps += [ "//chromeos/constants" ]
+  }
+
   if (is_chromeos_ash) {
     deps += [ "//ash/constants" ]
   }
@@ -453,7 +457,7 @@
         "floss/floss_manager_client.cc",
         "floss/floss_manager_client.h",
       ]
-      if (is_chromeos_ash) {
+      if (is_chromeos_ash || is_chromeos_lacros) {
         configs += [ "//chromeos/dbus/config:use_real_dbus_clients_config" ]
         sources += [
           "chromeos/bluetooth_connection_logger.cc",
@@ -462,6 +466,9 @@
           "chromeos/bluetooth_utils.h",
         ]
         deps += [ "//services/data_decoder/public/mojom" ]
+        if (is_chromeos_lacros) {
+          deps += [ "//chromeos/lacros" ]
+        }
       }
       if (!use_real_dbus_clients) {
         sources += [
@@ -581,7 +588,7 @@
     "test/mock_bluetooth_socket.h",
   ]
 
-  if (is_chromeos_ash) {
+  if (is_chromeos_ash || is_chromeos_lacros) {
     sources += [
       "test/mock_bluetooth_low_energy_scan_session.cc",
       "test/mock_bluetooth_low_energy_scan_session.h",
diff --git a/device/bluetooth/bluetooth_adapter.h b/device/bluetooth/bluetooth_adapter.h
index 2f4e8444..b347702 100644
--- a/device/bluetooth/bluetooth_adapter.h
+++ b/device/bluetooth/bluetooth_adapter.h
@@ -28,9 +28,9 @@
 #include "device/bluetooth/bluetooth_export.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 #include "device/bluetooth/bluetooth_low_energy_scan_session.h"
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 namespace base {
 class SingleThreadTaskRunner;
@@ -42,9 +42,9 @@
 class BluetoothDiscoveryFilter;
 class BluetoothDiscoverySession;
 class BluetoothLocalGattService;
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 class BluetoothLowEnergyScanFilter;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 class BluetoothRemoteGattCharacteristic;
 class BluetoothRemoteGattDescriptor;
 class BluetoothRemoteGattService;
@@ -680,7 +680,7 @@
       BluetoothRemoteGattDescriptor* descriptor,
       const std::vector<uint8_t>& value);
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   // Set a service allowlist by specifying services UUIDs. When this is called,
   // existing connections will be disconnected and services not in the allowlist
   // will be blocked. Device property |IsBlockedByPolicy| will be True if some
@@ -726,7 +726,7 @@
   StartLowEnergyScanSession(
       std::unique_ptr<BluetoothLowEnergyScanFilter> filter,
       base::WeakPtr<BluetoothLowEnergyScanSession::Delegate> delegate) = 0;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   // The timeout in seconds used by RemoveTimedOutDevices.
   static const base::TimeDelta timeoutSec;
diff --git a/device/bluetooth/bluetooth_adapter_factory.cc b/device/bluetooth/bluetooth_adapter_factory.cc
index 14d1d6d..c81514e 100644
--- a/device/bluetooth/bluetooth_adapter_factory.cc
+++ b/device/bluetooth/bluetooth_adapter_factory.cc
@@ -148,7 +148,7 @@
   return Get()->adapter_ != nullptr;
 }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 // static
 void BluetoothAdapterFactory::SetBleScanParserCallback(
     BleScanParserCallback callback) {
@@ -160,7 +160,7 @@
 BluetoothAdapterFactory::GetBleScanParserCallback() {
   return Get()->ble_scan_parser_;
 }
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 BluetoothAdapterFactory::GlobalValuesForTesting::GlobalValuesForTesting() =
     default;
diff --git a/device/bluetooth/bluetooth_adapter_factory.h b/device/bluetooth/bluetooth_adapter_factory.h
index 5ae616c2..d14b86c2 100644
--- a/device/bluetooth/bluetooth_adapter_factory.h
+++ b/device/bluetooth/bluetooth_adapter_factory.h
@@ -13,10 +13,10 @@
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_export.h"
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "services/data_decoder/public/mojom/ble_scan_parser.mojom-forward.h"
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 namespace device {
 
@@ -35,10 +35,10 @@
   using AdapterCallback =
       base::OnceCallback<void(scoped_refptr<BluetoothAdapter> adapter)>;
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   using BleScanParserCallback = base::RepeatingCallback<
       mojo::PendingRemote<data_decoder::mojom::BleScanParser>()>;
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   BluetoothAdapterFactory();
   ~BluetoothAdapterFactory();
@@ -86,13 +86,13 @@
   // adapter. Exposed for testing.
   static bool HasSharedInstanceForTesting();
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   // Sets the mojo::Remote<BleScanParser> callback used in Get*() below.
   static void SetBleScanParserCallback(BleScanParserCallback callback);
   // Returns a reference to a parser for BLE advertisement packets.
   // This will be an empty callback until something calls Set*() above.
   static BleScanParserCallback GetBleScanParserCallback();
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   // ValuestForTesting holds the return values for BluetoothAdapterFactory's
   // functions that have been set for testing.
@@ -159,9 +159,9 @@
   base::WeakPtr<BluetoothAdapter> classic_adapter_;
 #endif
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   BleScanParserCallback ble_scan_parser_;
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 };
 
 }  // namespace device
diff --git a/device/bluetooth/bluetooth_adapter_unittest.cc b/device/bluetooth/bluetooth_adapter_unittest.cc
index e6972d4..81c8956 100644
--- a/device/bluetooth/bluetooth_adapter_unittest.cc
+++ b/device/bluetooth/bluetooth_adapter_unittest.cc
@@ -48,10 +48,10 @@
 #include "device/bluetooth/test/bluetooth_test_fuchsia.h"
 #endif
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 #include "device/bluetooth/bluetooth_low_energy_scan_filter.h"
 #include "device/bluetooth/bluetooth_low_energy_scan_session.h"
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 using device::BluetoothDevice;
 
@@ -138,7 +138,7 @@
     return nullptr;
   }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void SetServiceAllowList(const UUIDList& uuids,
                            base::OnceClosure callback,
                            ErrorCallback error_callback) override {}
@@ -154,7 +154,7 @@
       override {
     return nullptr;
   }
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   void OnStartDiscoverySessionQuitLoop(
       base::OnceClosure run_loop_quit,
diff --git a/device/bluetooth/bluetooth_device.h b/device/bluetooth/bluetooth_device.h
index 3f8c70c..aa42dd59 100644
--- a/device/bluetooth/bluetooth_device.h
+++ b/device/bluetooth/bluetooth_device.h
@@ -630,7 +630,7 @@
   std::vector<BluetoothRemoteGattService*> GetPrimaryServicesByUUID(
       const BluetoothUUID& service_uuid);
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   using ExecuteWriteErrorCallback =
       base::OnceCallback<void(device::BluetoothGattService::GattErrorCode)>;
   using AbortWriteErrorCallback =
@@ -641,7 +641,7 @@
   // Aborts all the previous prepare writes in a reliable write session.
   virtual void AbortWrite(base::OnceClosure callback,
                           AbortWriteErrorCallback error_callback) = 0;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 #if defined(OS_CHROMEOS) || defined(OS_LINUX)
   // Set the battery information for the battery type |info.type|. Overrides
diff --git a/device/bluetooth/bluetooth_device_unittest.cc b/device/bluetooth/bluetooth_device_unittest.cc
index 4ef43a5..02a5194d 100644
--- a/device/bluetooth/bluetooth_device_unittest.cc
+++ b/device/bluetooth/bluetooth_device_unittest.cc
@@ -1193,9 +1193,9 @@
 // and is non trivial to implement. On ChromeOS, it is not essential for
 // this test to operate, and so it is simply skipped. Android at least
 // does require this step.
-#if !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS))
   StartLowEnergyDiscoverySession();
-#endif
+#endif  // !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS))
 
   BluetoothDevice* device = SimulateLowEnergyDevice(5);
   EXPECT_FALSE(device->GetName());
diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic.cc b/device/bluetooth/bluetooth_remote_gatt_characteristic.cc
index 0d34f97e..0c3d7e9 100644
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic.cc
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic.cc
@@ -115,7 +115,7 @@
                              std::move(error_callback));
 }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 void BluetoothRemoteGattCharacteristic::StartNotifySession(
     NotificationType notification_type,
     NotifySessionCallback callback,
@@ -123,7 +123,7 @@
   StartNotifySessionInternal(notification_type, std::move(callback),
                              std::move(error_callback));
 }
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 bool BluetoothRemoteGattCharacteristic::AddDescriptor(
     std::unique_ptr<BluetoothRemoteGattDescriptor> descriptor) {
@@ -240,11 +240,11 @@
   // do whatever else is needed to get the notifications flowing.
   SubscribeToNotifications(
       ccc_descriptor[0],
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
       notification_type.value_or((GetProperties() & PROPERTY_NOTIFY)
                                      ? NotificationType::kNotification
                                      : NotificationType::kIndication),
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
       base::BindOnce(
           &BluetoothRemoteGattCharacteristic::OnStartNotifySessionSuccess,
           GetWeakPtr(), std::move(callback)),
diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic.h b/device/bluetooth/bluetooth_remote_gatt_characteristic.h
index 92952b0b..86bfc68 100644
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic.h
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic.h
@@ -134,7 +134,7 @@
   // BluetoothGattNotifySession object that you received in |callback|.
   virtual void StartNotifySession(NotifySessionCallback callback,
                                   ErrorCallback error_callback);
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   // TODO(https://crbug.com/849359): This method should also be implemented on
   // Android and Windows.
   // macOS does not support specifying a notification type. According to macOS
@@ -144,7 +144,7 @@
   virtual void StartNotifySession(NotificationType notification_type,
                                   NotifySessionCallback callback,
                                   ErrorCallback error_callback);
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   // Sends a read request to a remote characteristic to read its value.
   // |callback| is called to return the read value or error.
@@ -170,7 +170,7 @@
       base::OnceClosure callback,
       ErrorCallback error_callback) = 0;
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   // Sends a prepare write request to a remote characteristic with the value
   // |value|. |callback| is called to signal success and |error_callback| for
   // failures. This method only applies to remote characteristics and will fail
@@ -181,7 +181,7 @@
       const std::vector<uint8_t>& value,
       base::OnceClosure callback,
       ErrorCallback error_callback) = 0;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
  protected:
   using DescriptorMap =
@@ -194,7 +194,7 @@
   // notifications/indications. This method is meant to be called from
   // StartNotifySession and should contain only the code necessary to start
   // listening to characteristic notifications on a particular platform.
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   // |notification_type| specifies the type of notifications that will be
   // enabled: notifications or indications.
   // TODO(https://crbug.com/849359): This method should also be implemented on
@@ -209,7 +209,7 @@
       BluetoothRemoteGattDescriptor* ccc_descriptor,
       base::OnceClosure callback,
       ErrorCallback error_callback) = 0;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   // Writes to the Client Characteristic Configuration descriptor to disable
   // notifications/indications. This method is meant to be called from
diff --git a/device/bluetooth/bluez/bluetooth_adapter_bluez.cc b/device/bluetooth/bluez/bluetooth_adapter_bluez.cc
index 24e55e7e..b38592c 100644
--- a/device/bluetooth/bluez/bluetooth_adapter_bluez.cc
+++ b/device/bluetooth/bluez/bluetooth_adapter_bluez.cc
@@ -54,8 +54,7 @@
 #include "device/bluetooth/public/cpp/bluetooth_uuid.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "ash/constants/devicetype.h"
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 #include "base/unguessable_token.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluez/bluetooth_low_energy_scan_session_bluez.h"
@@ -64,7 +63,11 @@
 #include "device/bluetooth/dbus/bluetooth_advertisement_monitor_application_service_provider.h"
 #include "device/bluetooth/dbus/bluetooth_advertisement_monitor_manager_client.h"
 #include "device/bluetooth/dbus/bluetooth_advertisement_monitor_service_provider.h"
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+#include "ash/constants/devicetype.h"
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
 using device::BluetoothAdapter;
 using device::BluetoothDevice;
@@ -85,12 +88,12 @@
 
 const char kDeviceNameArcTouch[] = "Arc Touch BT Mouse";
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 // This root path identifies the application registering low energy scanners
 // through D-Bus.
 constexpr char kAdvertisementMonitorApplicationObjectPath[] =
     "/org/chromium/bluetooth_advertisement_monitor";
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 void OnUnregisterAgentError(const std::string& error_name,
                             const std::string& error_message) {
@@ -122,7 +125,7 @@
   }
 }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 device::BluetoothDevice::ServiceDataMap ConvertServiceDataMap(
     const base::flat_map<std::string, std::vector<uint8_t>>& input) {
   device::BluetoothDevice::ServiceDataMap output;
@@ -138,7 +141,7 @@
   return device::BluetoothDevice::ManufacturerDataMap(input.begin(),
                                                       input.end());
 }
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 bool IsBatteryDisplayBlocklisted(const BluetoothDevice* device) {
   if (!device->GetName())
@@ -200,7 +203,7 @@
       .Run(device::BluetoothAdvertisement::ErrorCode::ERROR_RESET_ADVERTISING);
 }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 void SetServiceAllowListErrorCallback(
     BluetoothAdapterBlueZ::ErrorCallback error_callback,
     const std::string& error_name,
@@ -210,7 +213,7 @@
                        << error_name << ", error_message = " << error_message;
   std::move(error_callback).Run();
 }
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 }  // namespace
 
@@ -254,9 +257,9 @@
   if (IsPresent())
     RemoveAdapter();  // Also deletes devices_.
   DCHECK(devices_.empty());
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   is_advertisement_monitor_application_provider_registered_ = false;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   // profiles_ must be empty because all BluetoothSockets have been notified
   // that this adapter is disappearing.
@@ -341,14 +344,14 @@
       system_bus, dbus::ObjectPath(kAgentPath), this));
   DCHECK(agent_.get());
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   if (chromeos::features::IsBluetoothAdvertisementMonitoringEnabled()) {
     advertisement_monitor_application_provider_ =
         BluetoothAdvertisementMonitorApplicationServiceProvider::Create(
             system_bus,
             dbus::ObjectPath(kAdvertisementMonitorApplicationObjectPath));
   }
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   std::vector<dbus::ObjectPath> object_paths = bluez::BluezDBusManager::Get()
                                                    ->GetBluetoothAdapterClient()
@@ -358,9 +361,9 @@
   if (!object_paths.empty()) {
     BLUETOOTH_LOG(EVENT) << "BlueZ Adapters available: " << object_paths.size();
     SetAdapter(object_paths[0]);
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     RegisterAdvertisementMonitorApplicationServiceProvider();
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   }
   initialized_ = true;
   std::move(init_callback_).Run();
@@ -705,9 +708,9 @@
   if (!IsPresent())
     SetAdapter(object_path);
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   RegisterAdvertisementMonitorApplicationServiceProvider();
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 }
 
 void BluetoothAdapterBlueZ::AdapterRemoved(
@@ -1287,9 +1290,9 @@
 
   PresentChanged(false);
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   is_advertisement_monitor_application_provider_registered_ = false;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 }
 
 void BluetoothAdapterBlueZ::DiscoverableChanged(bool discoverable) {
@@ -1341,7 +1344,7 @@
   for (auto& observer : observers_)
     observer.DeviceAdvertisementReceived(this, device, rssi, eir);
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   if (ble_scan_parser_.is_bound()) {
     ScanRecordCallback callback =
         base::BindOnce(&BluetoothAdapterBlueZ::OnAdvertisementReceived,
@@ -1350,10 +1353,10 @@
                        rssi, device->GetAppearance(), device->object_path());
     ble_scan_parser_->Parse(eir, std::move(callback));
   }
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 void BluetoothAdapterBlueZ::OnAdvertisementReceived(
     std::string device_address,
     std::string device_name,
@@ -1383,7 +1386,7 @@
 
   device->SetAdvertisedUUIDs(scan_record->service_uuids);
 }
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 void BluetoothAdapterBlueZ::NotifyDeviceConnectedStateChanged(
     BluetoothDeviceBlueZ* device,
@@ -1391,12 +1394,12 @@
   DCHECK_EQ(device->adapter_, this);
   DCHECK_EQ(device->IsConnected(), is_now_connected);
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   if (is_now_connected) {
     device::BluetoothConnectionLogger::RecordDeviceConnected(
         device->GetIdentifier(), device->GetDeviceType());
   }
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   for (auto& observer : observers_)
     observer.DeviceConnectedStateChanged(this, device, is_now_connected);
@@ -1561,7 +1564,7 @@
   return true;
 }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 void BluetoothAdapterBlueZ::SetServiceAllowList(const UUIDList& uuids,
                                                 base::OnceClosure callback,
                                                 ErrorCallback error_callback) {
@@ -1659,7 +1662,7 @@
   }
   return low_energy_scan_session_hardware_offloading_status_;
 }
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 dbus::ObjectPath BluetoothAdapterBlueZ::GetApplicationObjectPath() const {
   return dbus::ObjectPath(object_path_.value() + kGattApplicationObjectPath);
@@ -1806,9 +1809,9 @@
 }
 
 void BluetoothAdapterBlueZ::StopScan(DiscoverySessionResultCallback callback) {
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   ble_scan_parser_.reset();
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   // Not having an adapter qualifies as not scanning so we callback a success
   if (!IsPresent()) {
@@ -1898,7 +1901,7 @@
   // Report success on the original request and increment the count.
   BLUETOOTH_LOG(EVENT) << __func__;
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   device::BluetoothAdapterFactory::BleScanParserCallback
       ble_scan_parser_callback =
           device::BluetoothAdapterFactory::GetBleScanParserCallback();
@@ -1916,7 +1919,7 @@
     logged_once = true;
 #endif  // DCHECK_IS_ON()
   }
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   if (IsPresent()) {
     std::move(callback).Run(false,
@@ -2173,7 +2176,7 @@
   device->RemoveBatteryInfo(BatteryType::kDefault);
 }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 void BluetoothAdapterBlueZ::
     RegisterAdvertisementMonitorApplicationServiceProvider() {
   if (is_advertisement_monitor_application_provider_registered_ ||
@@ -2227,6 +2230,6 @@
   advertisement_monitor_application_provider_->RemoveMonitor(
       dbus::ObjectPath(session_id));
 }
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 }  // namespace bluez
diff --git a/device/bluetooth/bluez/bluetooth_adapter_bluez.h b/device/bluetooth/bluez/bluetooth_adapter_bluez.h
index 6a659b4..fc4ba67 100644
--- a/device/bluetooth/bluez/bluetooth_adapter_bluez.h
+++ b/device/bluetooth/bluez/bluetooth_adapter_bluez.h
@@ -36,13 +36,13 @@
 #include "device/bluetooth/dbus/bluetooth_profile_manager_client.h"
 #include "device/bluetooth/dbus/bluetooth_profile_service_provider.h"
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 #include "device/bluetooth/bluetooth_low_energy_scan_filter.h"
 #include "device/bluetooth/bluetooth_low_energy_scan_session.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/data_decoder/public/mojom/ble_scan_parser.mojom.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 namespace base {
 class TimeDelta;
@@ -59,10 +59,10 @@
 class BluetoothBlueZTest;
 class BluetoothAdapterProfileBlueZ;
 class BluetoothAdvertisementBlueZ;
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 class BluetoothAdvertisementMonitorApplicationServiceProvider;
 class BluetoothAdvertisementMonitorServiceProvider;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 class BluetoothDeviceBlueZ;
 class BluetoothLocalGattCharacteristicBlueZ;
 class BluetoothLocalGattServiceBlueZ;
@@ -102,10 +102,10 @@
   using ServiceRecordErrorCallback =
       base::OnceCallback<void(BluetoothServiceRecordBlueZ::ErrorCode)>;
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   using ScanRecordPtr = data_decoder::mojom::ScanRecordPtr;
   using ScanRecordCallback = base::OnceCallback<void(ScanRecordPtr)>;
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   static scoped_refptr<BluetoothAdapterBlueZ> CreateAdapter();
 
@@ -170,7 +170,7 @@
   device::BluetoothLocalGattService* GetGattService(
       const std::string& identifier) const override;
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void SetServiceAllowList(const UUIDList& uuids,
                            base::OnceClosure callback,
                            ErrorCallback error_callback) override;
@@ -183,7 +183,7 @@
       std::unique_ptr<device::BluetoothLowEnergyScanFilter> filter,
       base::WeakPtr<device::BluetoothLowEnergyScanSession::Delegate> delegate)
       override;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   // These functions are specifically for use with ARC. They have no need to
   // exist for other platforms, hence we're putting them directly in the BlueZ
@@ -219,7 +219,7 @@
                                          int16_t rssi,
                                          const std::vector<uint8_t>& eir);
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   // Announce to observers advertisement received from |device|.
   void OnAdvertisementReceived(std::string device_address,
                                std::string device_name,
@@ -227,8 +227,11 @@
                                uint16_t device_appearance,
                                const dbus::ObjectPath& device_path,
                                ScanRecordPtr scan_record);
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
-  // Set the adapter name to one chosen from the system information.
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+  // Set the adapter name to one chosen from the system information. Only Ash
+  // needs to do this.
   void SetStandardChromeOSAdapterName();
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
@@ -518,14 +521,14 @@
   void UpdateDeviceBatteryLevelFromBatteryClient(
       const dbus::ObjectPath& object_path);
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void RegisterAdvertisementMonitorApplicationServiceProvider();
   void OnRegisterAdvertisementMonitorApplicationServiceProvider();
 
   // Unregister the underlying advertisement monitor through
   // |advertisement_monitor_application_provider_|.
   void OnLowEnergyScanSessionDestroyed(const std::string& session_id);
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   base::OnceClosure init_callback_;
 
@@ -587,7 +590,7 @@
   // crbug.com/687396.
   std::vector<scoped_refptr<BluetoothAdvertisementBlueZ>> advertisements_;
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   // Timer used to schedule a second update to BlueZ's long term keys. This
   // second update is necessary in a first-time install situation, where field
   // trials might not yet have been available. By scheduling a second update
@@ -613,7 +616,7 @@
   LowEnergyScanSessionHardwareOffloadingStatus
       low_energy_scan_session_hardware_offloading_status_ =
           LowEnergyScanSessionHardwareOffloadingStatus::kUndetermined;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
diff --git a/device/bluetooth/bluez/bluetooth_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_bluez_unittest.cc
index 1674b2d4..a4ac56d 100644
--- a/device/bluetooth/bluez/bluetooth_bluez_unittest.cc
+++ b/device/bluetooth/bluez/bluetooth_bluez_unittest.cc
@@ -44,7 +44,7 @@
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/time/time.h"
@@ -56,7 +56,7 @@
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/self_owned_receiver.h"
 #include "services/data_decoder/public/mojom/ble_scan_parser.mojom.h"
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 namespace {
 
@@ -74,7 +74,7 @@
 using ::testing::_;
 using ::testing::StrictMock;
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 // Background scanning filter values.
 constexpr int16_t kBackgroundScanningDeviceFoundRSSIThreshold = -80;
 constexpr int16_t kBackgroundScanningDeviceLostRSSIThreshold = -100;
@@ -109,7 +109,7 @@
                  ->GetBluetoothAdvertisementMonitorManagerClient())
       ->application_provider();
 }
-#endif  // #if BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 void ScheduleAsynchronousCancelPairing(BluetoothDevice* device) {
   base::SequencedTaskRunnerHandle::Get()->PostTask(
@@ -148,7 +148,7 @@
   return -1;
 }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 class FakeBleScanParserImpl : public data_decoder::mojom::BleScanParser {
  public:
   FakeBleScanParserImpl() = default;
@@ -164,7 +164,7 @@
     std::move(callback).Run(nullptr);
   }
 };
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 class FakeBluetoothProfileServiceProviderDelegate
     : public bluez::BluetoothProfileServiceProvider::Delegate {
@@ -186,7 +186,7 @@
   void Cancel() override {}
 };
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 class FakeBluetoothLowEnergyScanSessionDelegate
     : public device::BluetoothLowEnergyScanSession::Delegate {
  public:
@@ -256,19 +256,19 @@
   base::WeakPtrFactory<FakeBluetoothLowEnergyScanSessionDelegate>
       weak_ptr_factory_{this};
 };
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 }  // namespace
 
 class BluetoothBlueZTest : public testing::Test {
  public:
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   BluetoothBlueZTest() {
     scoped_feature_list_.InitWithFeatures(
         /*enabled_features=*/{chromeos::features::
                                   kBluetoothAdvertisementMonitoring},
         /*disabled_features=*/{});
   }
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS
   static const char kGapUuid[];
   static const char kGattUuid[];
   static const char kPnpUuid[];
@@ -317,7 +317,7 @@
     dbus_setter->SetBluetoothGattServiceClient(
         std::make_unique<bluez::FakeBluetoothGattServiceClient>());
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     device::BluetoothAdapterFactory::SetBleScanParserCallback(
         base::BindLambdaForTesting([&]() {
           mojo::PendingRemote<data_decoder::mojom::BleScanParser>
@@ -327,7 +327,7 @@
               ble_scan_parser.InitWithNewPipeAndPassReceiver());
           return ble_scan_parser;
         }));
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
     callback_count_ = 0;
     error_callback_count_ = 0;
@@ -335,10 +335,10 @@
   }
 
   void TearDown() override {
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     device::BluetoothAdapterFactory::SetBleScanParserCallback(
         base::NullCallback());
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
     discovery_sessions_.clear();
     adapter_.reset();
@@ -495,7 +495,7 @@
   std::string last_client_error_;
   std::vector<std::unique_ptr<BluetoothDiscoverySession>> discovery_sessions_;
   BluetoothAdapterProfileBlueZ* adapter_profile_;
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   base::HistogramTester histogram_tester_;
 #endif
 
@@ -506,7 +506,7 @@
     if (base::RunLoop::IsRunningOnCurrentThread())
       base::RunLoop::QuitCurrentWhenIdleDeprecated();
   }
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   base::test::ScopedFeatureList scoped_feature_list_;
 #endif
 };
@@ -2530,7 +2530,7 @@
   EXPECT_EQ(1, observer.device_removed_count());
   EXPECT_EQ(address, observer.last_device_address());
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   histogram_tester_.ExpectBucketCount("Bluetooth.ChromeOS.Forget.Result",
                                       device::ForgetResult::kSuccess, 1);
 #endif
@@ -2773,13 +2773,13 @@
   BluetoothDevice* device = adapter_->GetDevice(
       bluez::FakeBluetoothDeviceClient::kPairedDeviceAddress);
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   bluez::FakeBluetoothDeviceClient::Properties* properties =
       fake_bluetooth_device_client_->GetProperties(dbus::ObjectPath(
           bluez::FakeBluetoothDeviceClient::kPairedDevicePath));
   properties->type.ReplaceValue(BluetoothDeviceClient::kTypeBredr);
   properties->type.set_valid(true);
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   ASSERT_TRUE(device != nullptr);
   ASSERT_TRUE(device->IsPaired());
@@ -2811,13 +2811,13 @@
 
   EXPECT_FALSE(device->IsConnected());
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   histogram_tester_.ExpectBucketCount("Bluetooth.ChromeOS.Disconnect.Result",
                                       device::DisconnectResult::kSuccess, 1);
   histogram_tester_.ExpectBucketCount(
       "Bluetooth.ChromeOS.Disconnect.Result.Classic",
       device::DisconnectResult::kSuccess, 1);
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 }
 
 TEST_F(BluetoothBlueZTest, DisconnectUnconnectedDevice) {
@@ -4833,7 +4833,7 @@
                              uuidLaterAdv, uuidLaterServ, uuidLaterBoth,
                              uuidAlwaysAdv, uuidAlwaysServ, uuidAlwaysBoth));
 }
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 TEST_F(BluetoothBlueZTest, StartLowEnergyScanSessionAdapterPresent) {
   GetAdapter();
 
@@ -5104,6 +5104,6 @@
             BluetoothAdapter::LowEnergyScanSessionHardwareOffloadingStatus::
                 kUndetermined);
 }
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 }  // namespace bluez
diff --git a/device/bluetooth/bluez/bluetooth_device_bluez.cc b/device/bluetooth/bluez/bluetooth_device_bluez.cc
index 8171dd9..badbce08 100644
--- a/device/bluetooth/bluez/bluetooth_device_bluez.cc
+++ b/device/bluetooth/bluez/bluetooth_device_bluez.cc
@@ -36,7 +36,7 @@
 #include "device/bluetooth/public/cpp/bluetooth_uuid.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 #include "device/bluetooth/chromeos/bluetooth_utils.h"
 #endif
 
@@ -128,7 +128,7 @@
                    bluez::BluetoothDeviceBlueZ::ErrorCallback error_callback,
                    const std::string& error_name,
                    const std::string& error_message) {
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   device::RecordForgetResult(device::ForgetResult::kFailure);
 #endif
   BLUETOOTH_LOG(ERROR) << object_path.value()
@@ -224,7 +224,7 @@
     absl::optional<BluetoothUUID> service_uuid) {
 // Once ConnectLE is supported on Linux, this buildflag will not be necessary
 // (this bluez code is only run on Chrome OS and Linux).
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   if (num_connecting_calls_++ == 0)
     adapter()->NotifyDeviceChanged(this);
 
@@ -289,7 +289,7 @@
 
 // Once DisconnectLE is supported on Linux, this buildflag will not be necessary
 // (this bluez code is only run on Chrome OS and Linux).
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   bluez::BluezDBusManager::Get()->GetBluetoothDeviceClient()->DisconnectLE(
       object_path_, base::DoNothing(),
       base::BindOnce(&BluetoothDeviceBlueZ::OnDisconnectLEError,
@@ -301,7 +301,7 @@
 
 // Once DisconnectLE is supported on Linux, this buildflag will not be necessary
 // (this bluez code is only run on Chrome OS and Linux).
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 void BluetoothDeviceBlueZ::OnDisconnectLEError(
     const std::string& error_name,
     const std::string& error_message) {
@@ -418,7 +418,7 @@
 bool BluetoothDeviceBlueZ::IsGattConnected() const {
 // Once the |connected_le| property is supported on Linux, this buildflag will
 // not be necessary (this bluez code is only run on Chrome OS and Linux).
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   bluez::BluetoothDeviceClient::Properties* properties =
       bluez::BluezDBusManager::Get()->GetBluetoothDeviceClient()->GetProperties(
           object_path_);
@@ -676,7 +676,7 @@
 }
 
 void BluetoothDeviceBlueZ::OnForgetSuccess(base::OnceClosure callback) {
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   device::RecordForgetResult(device::ForgetResult::kSuccess);
 #endif
   if (IsPaired())
@@ -730,7 +730,7 @@
                      std::move(error_callback)));
 }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 void BluetoothDeviceBlueZ::ExecuteWrite(
     base::OnceClosure callback,
     ExecuteWriteErrorCallback error_callback) {
@@ -973,7 +973,7 @@
   std::move(error_callback).Run(code);
 }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 void BluetoothDeviceBlueZ::OnExecuteWriteError(
     ExecuteWriteErrorCallback error_callback,
     const std::string& error_name,
@@ -1130,7 +1130,7 @@
 }
 
 void BluetoothDeviceBlueZ::OnDisconnect(base::OnceClosure callback) {
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   device::RecordDisconnectResult(device::DisconnectResult::kSuccess,
                                  /*transport=*/GetType());
 #endif
@@ -1141,7 +1141,7 @@
 void BluetoothDeviceBlueZ::OnDisconnectError(ErrorCallback error_callback,
                                              const std::string& error_name,
                                              const std::string& error_message) {
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   device::RecordDisconnectResult(device::DisconnectResult::kFailure,
                                  /*transport=*/GetType());
 #endif
diff --git a/device/bluetooth/bluez/bluetooth_device_bluez.h b/device/bluetooth/bluez/bluetooth_device_bluez.h
index 3b734e4..12232a0 100644
--- a/device/bluetooth/bluez/bluetooth_device_bluez.h
+++ b/device/bluetooth/bluez/bluetooth_device_bluez.h
@@ -105,12 +105,12 @@
   bool IsGattServicesDiscoveryComplete() const override;
   void Pair(device::BluetoothDevice::PairingDelegate* pairing_delegate,
             ConnectCallback callback) override;
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void ExecuteWrite(base::OnceClosure callback,
                     ExecuteWriteErrorCallback error_callback) override;
   void AbortWrite(base::OnceClosure callback,
                   AbortWriteErrorCallback error_callback) override;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   // Returns the complete list of service records discovered for on this
   // device via SDP. If called before discovery is complete, it may return
@@ -225,7 +225,7 @@
                                 const std::string& error_name,
                                 const std::string& error_message);
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void OnExecuteWriteError(ExecuteWriteErrorCallback error_callback,
                            const std::string& error_name,
                            const std::string& error_message);
@@ -233,7 +233,7 @@
   void OnAbortWriteError(AbortWriteErrorCallback error_callback,
                          const std::string& error_name,
                          const std::string& error_message);
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   // Internal method to initiate a connection to this device, and methods called
   // by dbus:: on completion of the D-Bus method call.
@@ -245,10 +245,10 @@
 
 // Once DisconnectLE is supported on Linux, this buildflag will not be necessary
 // (this bluez code is only run on Chrome OS and Linux).
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void OnDisconnectLEError(const std::string& error_name,
                            const std::string& error_message);
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   // Called by dbus:: on completion of the D-Bus method call to pair the device,
   // made inside |Connect()|.
diff --git a/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc
index 3af6ef7..1620a41 100644
--- a/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc
+++ b/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc
@@ -2226,7 +2226,7 @@
   EXPECT_TRUE(update_sessions_[0]->IsActive());
 }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 TEST_F(BluetoothGattBlueZTest, ReliableWrite) {
   fake_bluetooth_device_client_->CreateDevice(
       dbus::ObjectPath(bluez::FakeBluetoothAdapterClient::kAdapterPath),
@@ -2373,7 +2373,7 @@
   base::RunLoop().Run();
   EXPECT_EQ(2, observer.gatt_characteristic_value_changed_count());
 }
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 TEST_F(BluetoothGattBlueZTest, MultipleDevices) {
   fake_bluetooth_device_client_->CreateDevice(
diff --git a/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.cc b/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.cc
index 512870a..3c23cc1 100644
--- a/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.cc
+++ b/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.cc
@@ -220,7 +220,7 @@
                          std::move(error_callback)));
 }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 void BluetoothRemoteGattCharacteristicBlueZ::PrepareWriteRemoteCharacteristic(
     const std::vector<uint8_t>& value,
     base::OnceClosure callback,
@@ -238,22 +238,22 @@
                          weak_ptr_factory_.GetWeakPtr(),
                          std::move(error_callback)));
 }
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 void BluetoothRemoteGattCharacteristicBlueZ::SubscribeToNotifications(
     device::BluetoothRemoteGattDescriptor* ccc_descriptor,
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     NotificationType notification_type,
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     base::OnceClosure callback,
     ErrorCallback error_callback) {
   bluez::BluezDBusManager::Get()
       ->GetBluetoothGattCharacteristicClient()
       ->StartNotify(
           object_path(),
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
           notification_type,
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
           base::BindOnce(
               &BluetoothRemoteGattCharacteristicBlueZ::OnStartNotifySuccess,
               weak_ptr_factory_.GetWeakPtr(), std::move(callback)),
diff --git a/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.h b/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.h
index e69feeb2..9b39d53 100644
--- a/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.h
+++ b/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.h
@@ -68,14 +68,14 @@
       const std::vector<uint8_t>& value,
       base::OnceClosure callback,
       ErrorCallback error_callback) override;
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void PrepareWriteRemoteCharacteristic(const std::vector<uint8_t>& value,
                                         base::OnceClosure callback,
                                         ErrorCallback error_callback) override;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
  protected:
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void SubscribeToNotifications(
       device::BluetoothRemoteGattDescriptor* ccc_descriptor,
       NotificationType notification_type,
@@ -86,7 +86,7 @@
       device::BluetoothRemoteGattDescriptor* ccc_descriptor,
       base::OnceClosure callback,
       ErrorCallback error_callback) override;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void UnsubscribeFromNotifications(
       device::BluetoothRemoteGattDescriptor* ccc_descriptor,
       base::OnceClosure callback,
diff --git a/device/bluetooth/chromeos/bluetooth_utils_unittest.cc b/device/bluetooth/chromeos/bluetooth_utils_unittest.cc
index c6ffa6b..02f2ea8 100644
--- a/device/bluetooth/chromeos/bluetooth_utils_unittest.cc
+++ b/device/bluetooth/chromeos/bluetooth_utils_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/run_loop.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/task_environment.h"
+#include "build/chromeos_buildflags.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/test/mock_bluetooth_adapter.h"
@@ -16,6 +17,10 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if BUILDFLAG(IS_CHROMEOS_LACROS)
+#include "chromeos/lacros/lacros_test_helper.h"
+#endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
+
 namespace device {
 
 namespace {
@@ -77,6 +82,9 @@
   base::test::TaskEnvironment task_environment_;
   scoped_refptr<MockBluetoothAdapter> adapter_ =
       base::MakeRefCounted<testing::NiceMock<MockBluetoothAdapter>>();
+#if BUILDFLAG(IS_CHROMEOS_LACROS)
+  chromeos::ScopedLacrosServiceTestHelper scoped_lacros_service_test_helper_;
+#endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
 };
 
 TEST_F(BluetoothUtilsTest,
diff --git a/device/bluetooth/dbus/bluetooth_dbus_client_bundle.cc b/device/bluetooth/dbus/bluetooth_dbus_client_bundle.cc
index 5f3a87f..4b16baf 100644
--- a/device/bluetooth/dbus/bluetooth_dbus_client_bundle.cc
+++ b/device/bluetooth/dbus/bluetooth_dbus_client_bundle.cc
@@ -51,12 +51,12 @@
     bluetooth_admin_policy_client_ = BluetoothAdminPolicyClient::Create();
     bluetooth_le_advertising_manager_client_.reset(
         BluetoothLEAdvertisingManagerClient::Create());
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     if (chromeos::features::IsBluetoothAdvertisementMonitoringEnabled()) {
       bluetooth_advertisement_monitor_manager_client_ =
           BluetoothAdvertisementMonitorManagerClient::Create();
     }
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     bluetooth_agent_manager_client_.reset(
         BluetoothAgentManagerClient::Create());
     bluetooth_battery_client_.reset(BluetoothBatteryClient::Create());
@@ -86,12 +86,12 @@
         std::make_unique<FakeBluetoothAdminPolicyClient>();
     bluetooth_le_advertising_manager_client_ =
         std::make_unique<FakeBluetoothLEAdvertisingManagerClient>();
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     if (chromeos::features::IsBluetoothAdvertisementMonitoringEnabled()) {
       bluetooth_advertisement_monitor_manager_client_ =
           std::make_unique<FakeBluetoothAdvertisementMonitorManagerClient>();
     }
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     bluetooth_agent_manager_client_ =
         std::make_unique<FakeBluetoothAgentManagerClient>();
     bluetooth_battery_client_ = std::make_unique<FakeBluetoothBatteryClient>();
diff --git a/device/bluetooth/dbus/bluetooth_gatt_characteristic_client.cc b/device/bluetooth/dbus/bluetooth_gatt_characteristic_client.cc
index 4194429c..b62076a 100644
--- a/device/bluetooth/dbus/bluetooth_gatt_characteristic_client.cc
+++ b/device/bluetooth/dbus/bluetooth_gatt_characteristic_client.cc
@@ -187,9 +187,9 @@
   // BluetoothGattCharacteristicClient override.
   void StartNotify(
       const dbus::ObjectPath& object_path,
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
       device::BluetoothGattCharacteristic::NotificationType notification_type,
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
       base::OnceClosure callback,
       ErrorCallback error_callback) override {
     dbus::ObjectProxy* object_proxy =
@@ -202,10 +202,10 @@
     dbus::MethodCall method_call(
         bluetooth_gatt_characteristic::kBluetoothGattCharacteristicInterface,
         bluetooth_gatt_characteristic::kStartNotify);
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     dbus::MessageWriter writer(&method_call);
     writer.AppendByte(static_cast<uint8_t>(notification_type));
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
     object_proxy->CallMethodWithErrorCallback(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
diff --git a/device/bluetooth/dbus/bluetooth_gatt_characteristic_client.h b/device/bluetooth/dbus/bluetooth_gatt_characteristic_client.h
index e335f824..c6c423f2 100644
--- a/device/bluetooth/dbus/bluetooth_gatt_characteristic_client.h
+++ b/device/bluetooth/dbus/bluetooth_gatt_characteristic_client.h
@@ -132,7 +132,7 @@
   // Starts a notification session from this characteristic with object path
   // |object_path| if it supports value notifications or indications. Invokes
   // |callback| on success and |error_callback| on failure.
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   virtual void StartNotify(
       const dbus::ObjectPath& object_path,
       device::BluetoothGattCharacteristic::NotificationType notification_type,
@@ -142,7 +142,7 @@
   virtual void StartNotify(const dbus::ObjectPath& object_path,
                            base::OnceClosure callback,
                            ErrorCallback error_callback) = 0;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   // Cancels any previous StartNotify transaction for characteristic with
   // object path |object_path|. Invokes |callback| on success and
diff --git a/device/bluetooth/dbus/bluez_dbus_manager.cc b/device/bluetooth/dbus/bluez_dbus_manager.cc
index 048a699c..f1dc0d25 100644
--- a/device/bluetooth/dbus/bluez_dbus_manager.cc
+++ b/device/bluetooth/dbus/bluez_dbus_manager.cc
@@ -55,9 +55,9 @@
   // On Chrome OS, Bluez might not be ready by the time we initialize the
   // BluezDBusManager so we initialize the clients anyway.
   bool should_check_object_manager = true;
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   should_check_object_manager = false;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   if (!should_check_object_manager || use_dbus_fakes) {
     client_bundle_ =
@@ -226,12 +226,12 @@
                                                    bluetooth_service_name);
   client_bundle_->bluetooth_admin_policy_client()->Init(GetSystemBus(),
                                                         bluetooth_service_name);
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   if (chromeos::features::IsBluetoothAdvertisementMonitoringEnabled()) {
     client_bundle_->bluetooth_advertisement_monitor_manager_client()->Init(
         GetSystemBus(), bluetooth_service_name);
   }
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   client_bundle_->bluetooth_agent_manager_client()->Init(
       GetSystemBus(), bluetooth_service_name);
   client_bundle_->bluetooth_device_client()->Init(GetSystemBus(),
@@ -277,7 +277,7 @@
 
   BluezDBusThreadManager::Initialize();
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   DCHECK(system_bus);
   // On ChromeOS, BluetoothSystem needs a separate connection to Bluez, so we
   // use BluezDBusThreadManager to get two different connections to the same
@@ -286,7 +286,7 @@
   CreateGlobalInstance(system_bus,
                        BluezDBusThreadManager::Get()->GetSystemBus(),
                        false /* use_dbus_stubs */);
-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#elif defined(OS_LINUX)
   // BluetoothSystem, the client that needs the extra connection, is not
   // implemented on Linux, so no need for an extra Bus.
   CreateGlobalInstance(BluezDBusThreadManager::Get()->GetSystemBus(), nullptr,
@@ -336,10 +336,10 @@
   g_bluez_dbus_manager = nullptr;
   delete dbus_manager;
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   if (!g_using_bluez_dbus_manager_for_testing)
     BluezDBusThreadManager::Shutdown();
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   g_using_bluez_dbus_manager_for_testing = false;
   DVLOG(1) << "BluezDBusManager Shutdown completed";
diff --git a/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.cc b/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.cc
index a7b262ff..ead7997 100644
--- a/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.cc
+++ b/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.cc
@@ -329,9 +329,9 @@
 
 void FakeBluetoothGattCharacteristicClient::StartNotify(
     const dbus::ObjectPath& object_path,
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     device::BluetoothGattCharacteristic::NotificationType notification_type,
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     base::OnceClosure callback,
     ErrorCallback error_callback) {
   if (!IsHeartRateVisible()) {
diff --git a/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.h b/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.h
index 36994fd..11cecef 100644
--- a/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.h
+++ b/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.h
@@ -70,7 +70,7 @@
                          const std::vector<uint8_t>& value,
                          base::OnceClosure callback,
                          ErrorCallback error_callback) override;
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void StartNotify(
       const dbus::ObjectPath& object_path,
       device::BluetoothGattCharacteristic::NotificationType notification_type,
@@ -80,7 +80,7 @@
   void StartNotify(const dbus::ObjectPath& object_path,
                    base::OnceClosure callback,
                    ErrorCallback error_callback) override;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   void StopNotify(const dbus::ObjectPath& object_path,
                   base::OnceClosure callback,
diff --git a/device/bluetooth/floss/bluetooth_adapter_floss.cc b/device/bluetooth/floss/bluetooth_adapter_floss.cc
index c9cc911..49c50e9b 100644
--- a/device/bluetooth/floss/bluetooth_adapter_floss.cc
+++ b/device/bluetooth/floss/bluetooth_adapter_floss.cc
@@ -592,7 +592,7 @@
   return nullptr;
 }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 void BluetoothAdapterFloss::SetServiceAllowList(const UUIDList& uuids,
                                                 base::OnceClosure callback,
                                                 ErrorCallback error_callback) {
@@ -612,7 +612,7 @@
   NOTIMPLEMENTED();
   return LowEnergyScanSessionHardwareOffloadingStatus::kNotSupported;
 }
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 void BluetoothAdapterFloss::RemovePairingDelegateInternal(
     device::BluetoothDevice::PairingDelegate* pairing_delegate) {
diff --git a/device/bluetooth/floss/bluetooth_adapter_floss.h b/device/bluetooth/floss/bluetooth_adapter_floss.h
index c2b208b0..81e163b1 100644
--- a/device/bluetooth/floss/bluetooth_adapter_floss.h
+++ b/device/bluetooth/floss/bluetooth_adapter_floss.h
@@ -21,10 +21,10 @@
 #include "device/bluetooth/floss/floss_dbus_client.h"
 #include "device/bluetooth/floss/floss_manager_client.h"
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 #include "device/bluetooth/bluetooth_low_energy_scan_filter.h"
 #include "device/bluetooth/bluetooth_low_energy_scan_session.h"
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 namespace floss {
 
@@ -104,7 +104,7 @@
   device::BluetoothLocalGattService* GetGattService(
       const std::string& identifier) const override;
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void SetServiceAllowList(const UUIDList& uuids,
                            base::OnceClosure callback,
                            ErrorCallback error_callback) override;
@@ -117,7 +117,7 @@
       std::unique_ptr<device::BluetoothLowEnergyScanFilter> filter,
       base::WeakPtr<device::BluetoothLowEnergyScanSession::Delegate> delegate)
       override;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
  protected:
   // BluetoothAdapter:
diff --git a/device/bluetooth/floss/bluetooth_device_floss.cc b/device/bluetooth/floss/bluetooth_device_floss.cc
index a34b984..a5e677fd 100644
--- a/device/bluetooth/floss/bluetooth_device_floss.cc
+++ b/device/bluetooth/floss/bluetooth_device_floss.cc
@@ -282,7 +282,7 @@
   NOTIMPLEMENTED();
 }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 void BluetoothDeviceFloss::ExecuteWrite(
     base::OnceClosure callback,
     ExecuteWriteErrorCallback error_callback) {
@@ -293,7 +293,7 @@
                                       AbortWriteErrorCallback error_callback) {
   NOTIMPLEMENTED();
 }
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 FlossDeviceId BluetoothDeviceFloss::AsFlossDeviceId() const {
   return FlossDeviceId{.address = address_, .name = name_};
diff --git a/device/bluetooth/floss/bluetooth_device_floss.h b/device/bluetooth/floss/bluetooth_device_floss.h
index af4575a5..4160aee 100644
--- a/device/bluetooth/floss/bluetooth_device_floss.h
+++ b/device/bluetooth/floss/bluetooth_device_floss.h
@@ -87,12 +87,12 @@
   bool IsGattServicesDiscoveryComplete() const override;
   void Pair(device::BluetoothDevice::PairingDelegate* pairing_delegate,
             ConnectCallback callback) override;
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void ExecuteWrite(base::OnceClosure callback,
                     ExecuteWriteErrorCallback error_callback) override;
   void AbortWrite(base::OnceClosure callback,
                   AbortWriteErrorCallback error_callback) override;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   FlossDeviceId AsFlossDeviceId() const;
   void SetName(const std::string& name);
diff --git a/device/bluetooth/test/fake_central.cc b/device/bluetooth/test/fake_central.cc
index 66d8e967..4b291d8 100644
--- a/device/bluetooth/test/fake_central.cc
+++ b/device/bluetooth/test/fake_central.cc
@@ -21,9 +21,9 @@
 #include "device/bluetooth/test/fake_remote_gatt_characteristic.h"
 #include "device/bluetooth/test/fake_remote_gatt_service.h"
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 #include "device/bluetooth/bluetooth_low_energy_scan_filter.h"
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 namespace bluetooth {
 
@@ -614,7 +614,7 @@
   return nullptr;
 }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 void FakeCentral::SetServiceAllowList(const UUIDList& uuids,
                                       base::OnceClosure callback,
                                       ErrorCallback error_callback) {
@@ -633,7 +633,7 @@
 FakeCentral::GetLowEnergyScanSessionHardwareOffloadingStatus() {
   return LowEnergyScanSessionHardwareOffloadingStatus::kNotSupported;
 }
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 base::WeakPtr<device::BluetoothAdapter> FakeCentral::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
diff --git a/device/bluetooth/test/fake_central.h b/device/bluetooth/test/fake_central.h
index e14e011..99f32b1 100644
--- a/device/bluetooth/test/fake_central.h
+++ b/device/bluetooth/test/fake_central.h
@@ -16,10 +16,10 @@
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 #include "device/bluetooth/bluetooth_low_energy_scan_filter.h"
 #include "device/bluetooth/bluetooth_low_energy_scan_session.h"
-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 namespace bluetooth {
 
@@ -195,7 +195,7 @@
 #endif
   device::BluetoothLocalGattService* GetGattService(
       const std::string& identifier) const override;
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void SetServiceAllowList(const UUIDList& uuids,
                            base::OnceClosure callback,
                            ErrorCallback error_callback) override;
@@ -206,7 +206,7 @@
       std::unique_ptr<device::BluetoothLowEnergyScanFilter> filter,
       base::WeakPtr<device::BluetoothLowEnergyScanSession::Delegate> delegate)
       override;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   base::WeakPtr<BluetoothAdapter> GetWeakPtr() override;
   bool SetPoweredImpl(bool powered) override;
   void UpdateFilter(
diff --git a/device/bluetooth/test/fake_peripheral.cc b/device/bluetooth/test/fake_peripheral.cc
index bfeed7d42..53e8144 100644
--- a/device/bluetooth/test/fake_peripheral.cc
+++ b/device/bluetooth/test/fake_peripheral.cc
@@ -361,7 +361,7 @@
 void FakePeripheral::DisconnectGatt() {
 }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 void FakePeripheral::ExecuteWrite(base::OnceClosure callback,
                                   ExecuteWriteErrorCallback error_callback) {
   NOTIMPLEMENTED();
@@ -371,6 +371,6 @@
                                 AbortWriteErrorCallback error_callback) {
   NOTIMPLEMENTED();
 }
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 }  // namespace bluetooth
diff --git a/device/bluetooth/test/fake_peripheral.h b/device/bluetooth/test/fake_peripheral.h
index ff8f0a8..b3cf25ed 100644
--- a/device/bluetooth/test/fake_peripheral.h
+++ b/device/bluetooth/test/fake_peripheral.h
@@ -8,6 +8,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
+#include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/test/fake_central.h"
@@ -123,12 +124,12 @@
       GattConnectionCallback callback,
       absl::optional<device::BluetoothUUID> service_uuid) override;
   bool IsGattServicesDiscoveryComplete() const override;
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void ExecuteWrite(base::OnceClosure callback,
                     ExecuteWriteErrorCallback error_callback) override;
   void AbortWrite(base::OnceClosure callback,
                   AbortWriteErrorCallback error_callback) override;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
  protected:
   void CreateGattConnectionImpl(absl::optional<device::BluetoothUUID>) override;
diff --git a/device/bluetooth/test/fake_remote_gatt_characteristic.cc b/device/bluetooth/test/fake_remote_gatt_characteristic.cc
index 3276d055..e2d7c4d 100644
--- a/device/bluetooth/test/fake_remote_gatt_characteristic.cc
+++ b/device/bluetooth/test/fake_remote_gatt_characteristic.cc
@@ -192,20 +192,20 @@
                      std::move(error_callback), value, write_type));
 }
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 void FakeRemoteGattCharacteristic::PrepareWriteRemoteCharacteristic(
     const std::vector<uint8_t>& value,
     base::OnceClosure callback,
     ErrorCallback error_callback) {
   NOTIMPLEMENTED();
 }
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 void FakeRemoteGattCharacteristic::SubscribeToNotifications(
     device::BluetoothRemoteGattDescriptor* ccc_descriptor,
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     NotificationType notification_type,
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     base::OnceClosure callback,
     ErrorCallback error_callback) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
diff --git a/device/bluetooth/test/fake_remote_gatt_characteristic.h b/device/bluetooth/test/fake_remote_gatt_characteristic.h
index c7c70ead..29f0dbd 100644
--- a/device/bluetooth/test/fake_remote_gatt_characteristic.h
+++ b/device/bluetooth/test/fake_remote_gatt_characteristic.h
@@ -98,14 +98,14 @@
       const std::vector<uint8_t>& value,
       base::OnceClosure callback,
       ErrorCallback error_callback) override;
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void PrepareWriteRemoteCharacteristic(const std::vector<uint8_t>& value,
                                         base::OnceClosure callback,
                                         ErrorCallback error_callback) override;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
  protected:
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   // device::BluetoothRemoteGattCharacteristic overrides:
   void SubscribeToNotifications(
       device::BluetoothRemoteGattDescriptor* ccc_descriptor,
@@ -118,7 +118,7 @@
       device::BluetoothRemoteGattDescriptor* ccc_descriptor,
       base::OnceClosure callback,
       ErrorCallback error_callback) override;
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void UnsubscribeFromNotifications(
       device::BluetoothRemoteGattDescriptor* ccc_descriptor,
       base::OnceClosure callback,
diff --git a/device/bluetooth/test/mock_bluetooth_adapter.h b/device/bluetooth/test/mock_bluetooth_adapter.h
index 6fa522b..4d49342 100644
--- a/device/bluetooth/test/mock_bluetooth_adapter.h
+++ b/device/bluetooth/test/mock_bluetooth_adapter.h
@@ -18,9 +18,9 @@
 #include "device/bluetooth/test/mock_bluetooth_device.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 #include "device/bluetooth/bluetooth_low_energy_scan_filter.h"
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 namespace device {
 
@@ -119,7 +119,7 @@
                     CreateServiceErrorCallback error_callback));
   MOCK_CONST_METHOD1(GetGattService,
                      BluetoothLocalGattService*(const std::string& identifier));
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   MOCK_METHOD3(SetServiceAllowList,
                void(const UUIDList& uuids,
                     base::OnceClosure callback,
@@ -131,7 +131,7 @@
       std::unique_ptr<BluetoothLowEnergyScanSession>(
           std::unique_ptr<BluetoothLowEnergyScanFilter> filter,
           base::WeakPtr<BluetoothLowEnergyScanSession::Delegate> delegate));
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 #if defined(OS_CHROMEOS) || defined(OS_LINUX)
   MOCK_METHOD4(
       ConnectDevice,
diff --git a/device/bluetooth/test/mock_bluetooth_device.h b/device/bluetooth/test/mock_bluetooth_device.h
index 223a5fd..4216815 100644
--- a/device/bluetooth/test/mock_bluetooth_device.h
+++ b/device/bluetooth/test/mock_bluetooth_device.h
@@ -119,14 +119,14 @@
   MOCK_METHOD1(CreateGattConnectionImpl,
                void(absl::optional<BluetoothUUID> service_uuid));
   MOCK_METHOD0(DisconnectGatt, void());
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   MOCK_METHOD2(ExecuteWrite,
                void(base::OnceClosure callback,
                     ExecuteWriteErrorCallback error_callback));
   MOCK_METHOD2(AbortWrite,
                void(base::OnceClosure callback,
                     AbortWriteErrorCallback error_callback));
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   // BluetoothDevice manages the lifetime of its BluetoothGATTServices.
   // This method takes ownership of the MockBluetoothGATTServices. This is only
diff --git a/device/bluetooth/test/mock_bluetooth_gatt_characteristic.h b/device/bluetooth/test/mock_bluetooth_gatt_characteristic.h
index 1a71dd69..7454a13b 100644
--- a/device/bluetooth/test/mock_bluetooth_gatt_characteristic.h
+++ b/device/bluetooth/test/mock_bluetooth_gatt_characteristic.h
@@ -52,7 +52,7 @@
                      std::vector<BluetoothRemoteGattDescriptor*>());
   MOCK_CONST_METHOD1(GetDescriptor,
                      BluetoothRemoteGattDescriptor*(const std::string&));
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void StartNotifySession(NotificationType t,
                           NotifySessionCallback c,
                           ErrorCallback ec) override {
@@ -60,7 +60,7 @@
   }
   MOCK_METHOD3(StartNotifySession_,
                void(NotificationType, NotifySessionCallback&, ErrorCallback&));
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void StartNotifySession(NotifySessionCallback c, ErrorCallback ec) override {
     StartNotifySession_(c, ec);
   }
@@ -96,7 +96,7 @@
                void(const std::vector<uint8_t>&,
                     base::OnceClosure&,
                     ErrorCallback&));
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void PrepareWriteRemoteCharacteristic(const std::vector<uint8_t>& v,
                                         base::OnceClosure c,
                                         ErrorCallback ec) override {
@@ -106,13 +106,13 @@
                void(const std::vector<uint8_t>&,
                     base::OnceClosure&,
                     ErrorCallback&));
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
   void AddMockDescriptor(
       std::unique_ptr<MockBluetoothGattDescriptor> mock_descriptor);
 
  protected:
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void SubscribeToNotifications(BluetoothRemoteGattDescriptor* d,
                                 NotificationType t,
                                 base::OnceClosure c,
@@ -134,7 +134,7 @@
                void(BluetoothRemoteGattDescriptor*,
                     base::OnceClosure&,
                     ErrorCallback&));
-#endif
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
   void UnsubscribeFromNotifications(BluetoothRemoteGattDescriptor* d,
                                     base::OnceClosure c,
                                     ErrorCallback ec) override {
diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc
index 1b429b1..25bfaf9 100644
--- a/extensions/shell/browser/shell_browser_main_parts.cc
+++ b/extensions/shell/browser/shell_browser_main_parts.cc
@@ -117,14 +117,26 @@
   // D-Bus objects.
   chromeos::DBusThreadManager::Initialize();
   dbus::Bus* bus = chromeos::DBusThreadManager::Get()->GetSystemBus();
+#elif BUILDFLAG(IS_CHROMEOS_LACROS)
+  chromeos::LacrosDBusThreadManager::Initialize();
+  dbus::Bus* bus = chromeos::LacrosDBusThreadManager::Get()->GetSystemBus();
+#endif
+
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+  if (bus) {
+    bluez::BluezDBusManager::Initialize(bus);
+  } else {
+    bluez::BluezDBusManager::InitializeFake();
+  }
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+
+#if BUILDFLAG(IS_CHROMEOS_ASH)
   if (bus) {
     chromeos::hermes_clients::Initialize(bus);
-    bluez::BluezDBusManager::Initialize(bus);
     chromeos::CrasAudioClient::Initialize(bus);
     chromeos::PowerManagerClient::Initialize(bus);
   } else {
     chromeos::hermes_clients::InitializeFakes();
-    bluez::BluezDBusManager::InitializeFake();
     chromeos::CrasAudioClient::InitializeFake();
     chromeos::PowerManagerClient::InitializeFake();
   }
@@ -145,13 +157,12 @@
   // See crbug.com/381852 and revision fb69f142.
   // TODO(michaelpg): Verify this works for target environments.
   ui::InitializeInputMethodForTesting();
-
-  bluez::BluezDBusManager::Initialize(nullptr /* system_bus */);
 #else
   ui::InitializeInputMethodForTesting();
 #endif
-#if BUILDFLAG(IS_CHROMEOS_LACROS)
-  chromeos::LacrosDBusThreadManager::Initialize();
+
+#if defined(OS_LINUX)
+  bluez::BluezDBusManager::Initialize(nullptr /* system_bus */);
 #endif
 }
 
@@ -291,23 +302,27 @@
 void ShellBrowserMainParts::PostDestroyThreads() {
   extensions_browser_client_.reset();
   ExtensionsBrowserClient::Set(nullptr);
-
-#if BUILDFLAG(IS_CHROMEOS_LACROS)
-  chromeos::LacrosDBusThreadManager::Shutdown();
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+  device::BluetoothAdapterFactory::Shutdown();
+  bluez::BluezDBusManager::Shutdown();
+#elif defined(OS_LINUX)
+  device::BluetoothAdapterFactory::Shutdown();
+  bluez::BluezDBusManager::Shutdown();
+  bluez::BluezDBusThreadManager::Shutdown();
 #endif
+
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   network_controller_.reset();
   chromeos::NetworkHandler::Shutdown();
   ash::disks::DiskMountManager::Shutdown();
-  device::BluetoothAdapterFactory::Shutdown();
-  bluez::BluezDBusManager::Shutdown();
   chromeos::PowerManagerClient::Shutdown();
   chromeos::CrasAudioClient::Shutdown();
+#endif
+
+#if BUILDFLAG(IS_CHROMEOS_ASH)
   chromeos::DBusThreadManager::Shutdown();
-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-  device::BluetoothAdapterFactory::Shutdown();
-  bluez::BluezDBusManager::Shutdown();
-  bluez::BluezDBusThreadManager::Shutdown();
+#elif BUILDFLAG(IS_CHROMEOS_LACROS)
+  chromeos::LacrosDBusThreadManager::Shutdown();
 #endif
 }
 
diff --git a/fuchsia/engine/BUILD.gn b/fuchsia/engine/BUILD.gn
index a1fd7b7..361e9be 100644
--- a/fuchsia/engine/BUILD.gn
+++ b/fuchsia/engine/BUILD.gn
@@ -580,6 +580,7 @@
     "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.accessibility.semantics",
     "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web",
     "//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp",
+    "//ui/ozone",
   ]
   additional_manifest_fragments = [
     # TODO(crbug.com/1185811): Figure out why jit_capabilities is needed.
diff --git a/fuchsia/engine/context_provider_impl_unittest.cc b/fuchsia/engine/context_provider_impl_unittest.cc
index fdb6837..2d278025 100644
--- a/fuchsia/engine/context_provider_impl_unittest.cc
+++ b/fuchsia/engine/context_provider_impl_unittest.cc
@@ -46,6 +46,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
+#include "ui/ozone/public/ozone_switches.h"
 
 namespace {
 
@@ -316,6 +317,9 @@
                           sys_launcher_.get()),
         provider_(std::make_unique<ContextProviderImpl>()) {
     bindings_.AddBinding(provider_.get(), provider_ptr_.NewRequest());
+
+    base::CommandLine::ForCurrentProcess()->AppendSwitchNative(
+        switches::kOzonePlatform, "scenic");
   }
 
   ContextProviderImplTest(const ContextProviderImplTest&) = delete;
diff --git a/fuchsia/engine/web_instance_host/BUILD.gn b/fuchsia/engine/web_instance_host/BUILD.gn
index da2f651..726ab85 100644
--- a/fuchsia/engine/web_instance_host/BUILD.gn
+++ b/fuchsia/engine/web_instance_host/BUILD.gn
@@ -29,6 +29,7 @@
   public_deps = [
     "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.io",
     "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sys",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.scenic",
     "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web",
     "//third_party/fuchsia-sdk/sdk/pkg/fidl",
   ]
diff --git a/fuchsia/engine/web_instance_host/web_instance_host.cc b/fuchsia/engine/web_instance_host/web_instance_host.cc
index 90cc4b7..1fccbd7 100644
--- a/fuchsia/engine/web_instance_host/web_instance_host.cc
+++ b/fuchsia/engine/web_instance_host/web_instance_host.cc
@@ -5,6 +5,7 @@
 #include "fuchsia/engine/web_instance_host/web_instance_host.h"
 
 #include <fuchsia/sys/cpp/fidl.h>
+#include <fuchsia/ui/scenic/cpp/fidl.h>
 #include <lib/async/default.h>
 #include <lib/fdio/directory.h>
 #include <lib/fdio/fd.h>
@@ -340,6 +341,24 @@
   return true;
 }
 
+// Checks the supported ozone platform with Scenic if no arg is specified.
+void HandleOzonePlatformArgs(base::CommandLine* launch_args) {
+  if (launch_args->HasSwitch(switches::kOzonePlatform))
+    return;
+  fuchsia::ui::scenic::ScenicSyncPtr scenic;
+  zx_status_t status =
+      base::ComponentContextForProcess()->svc()->Connect(scenic.NewRequest());
+  if (status != ZX_OK) {
+    ZX_LOG(ERROR, status) << "Couldn't connect to Scenic.";
+    return;
+  }
+
+  bool scenic_uses_flatland = false;
+  scenic->UsesFlatland(&scenic_uses_flatland);
+  launch_args->AppendSwitchNative(switches::kOzonePlatform,
+                                  scenic_uses_flatland ? "flatland" : "scenic");
+}
+
 // Returns false if the config is present but has invalid contents.
 bool MaybeAddCommandLineArgsFromConfig(const base::Value& config,
                                        base::CommandLine* command_line) {
@@ -678,6 +697,7 @@
 
   HandleUnsafelyTreatInsecureOriginsAsSecureParam(&params, &launch_args);
   HandleCorsExemptHeadersParam(&params, &launch_args);
+  HandleOzonePlatformArgs(&launch_args);
 
   // Set the command-line flag to enable DevTools, if requested.
   if (enable_remote_debug_mode_)
diff --git a/gpu/command_buffer/service/external_vk_image_gl_representation.cc b/gpu/command_buffer/service/external_vk_image_gl_representation.cc
index 12ddaff..3c1a12f 100644
--- a/gpu/command_buffer/service/external_vk_image_gl_representation.cc
+++ b/gpu/command_buffer/service/external_vk_image_gl_representation.cc
@@ -7,52 +7,11 @@
 #include <vector>
 
 #include "base/logging.h"
+#include "gpu/vulkan/vulkan_util.h"
 #include "ui/gl/gl_bindings.h"
 
-#define GL_LAYOUT_GENERAL_EXT 0x958D
-#define GL_LAYOUT_COLOR_ATTACHMENT_EXT 0x958E
-#define GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT 0x958F
-#define GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT 0x9590
-#define GL_LAYOUT_SHADER_READ_ONLY_EXT 0x9591
-#define GL_LAYOUT_TRANSFER_SRC_EXT 0x9592
-#define GL_LAYOUT_TRANSFER_DST_EXT 0x9593
-#define GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT 0x9530
-#define GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT 0x9531
-
 namespace gpu {
 
-namespace {
-
-GLenum ToGLImageLayout(VkImageLayout layout) {
-  switch (layout) {
-    case VK_IMAGE_LAYOUT_UNDEFINED:
-      return GL_NONE;
-    case VK_IMAGE_LAYOUT_GENERAL:
-      return GL_LAYOUT_GENERAL_EXT;
-    case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL:
-      return GL_LAYOUT_COLOR_ATTACHMENT_EXT;
-    case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL:
-      return GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT;
-    case VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL:
-      return GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT;
-    case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL:
-      return GL_LAYOUT_SHADER_READ_ONLY_EXT;
-    case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL:
-      return GL_LAYOUT_TRANSFER_SRC_EXT;
-    case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL:
-      return GL_LAYOUT_TRANSFER_DST_EXT;
-    case VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL_KHR:
-      return GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT;
-    case VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL_KHR:
-      return GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT;
-    default:
-      NOTREACHED() << "Invalid image layout " << layout;
-      return GL_NONE;
-  }
-}
-
-}  // namespace
-
 // static
 void ExternalVkImageGLRepresentationShared::AcquireTexture(
     ExternalSemaphore* semaphore,
@@ -60,7 +19,7 @@
     VkImageLayout src_layout) {
   GLuint gl_semaphore = semaphore->GetGLSemaphore();
   if (gl_semaphore) {
-    GLenum gl_layout = ToGLImageLayout(src_layout);
+    GLenum gl_layout = VkImageLayoutToGLImageLayout(src_layout);
     auto* api = gl::g_current_gl_context;
     api->glWaitSemaphoreEXTFn(gl_semaphore, 0, nullptr, 1, &texture_id,
                               &gl_layout);
@@ -92,7 +51,7 @@
     return {};
   }
 
-  GLenum gl_layout = ToGLImageLayout(dst_layout);
+  GLenum gl_layout = VkImageLayoutToGLImageLayout(dst_layout);
   auto* api = gl::g_current_gl_context;
   api->glSignalSemaphoreEXTFn(gl_semaphore, 0, nullptr, 1, &texture_id,
                               &gl_layout);
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc b/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc
index 4f1590e6..88c71f6 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc
@@ -978,6 +978,7 @@
 #if defined(OS_MAC)
       "GL_ANGLE_texture_rectangle",
 #endif
+      "GL_ANGLE_vulkan_image",
     };
     RequestExtensions(api(), requestable_extensions,
                       kRequiredFunctionalityExtensions,
diff --git a/gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc b/gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc
index f11cf27..258a111 100644
--- a/gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc
+++ b/gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc
@@ -14,6 +14,7 @@
 #include "gpu/command_buffer/service/shared_image_backing_gl_image.h"
 #include "gpu/command_buffer/service/shared_image_representation.h"
 #include "gpu/vulkan/vulkan_device_queue.h"
+#include "gpu/vulkan/vulkan_util.h"
 #include "third_party/skia/include/core/SkPromiseImageTexture.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_image_egl_angle_vulkan.h"
@@ -61,7 +62,8 @@
 
 using ScopedRestoreTexture = SharedImageBackingGLCommon::ScopedRestoreTexture;
 
-class AngleVulkanBacking : public ClearTrackingSharedImageBacking {
+class AngleVulkanBacking : public ClearTrackingSharedImageBacking,
+                           public SharedImageRepresentationGLTextureClient {
  public:
   AngleVulkanBacking(const raw_ptr<SharedContextState>& context_state,
                      const Mailbox& mailbox,
@@ -88,6 +90,58 @@
     passthrough_texture_.reset();
   }
 
+  bool Initialize(
+      const SharedImageBackingFactoryAngleVulkan::FormatInfo& format_info,
+      const SharedImageBackingGLCommon::UnpackStateAttribs& attribs) {
+    SharedImageBackingGLCommon::MakeTextureAndSetParameters(
+        GL_TEXTURE_2D, /*service_id=*/0, /*framebuffer_attachment_angle=*/true,
+        &passthrough_texture_, nullptr);
+    passthrough_texture_->SetEstimatedSize(estimated_size());
+
+    GLuint texture = passthrough_texture_->service_id();
+
+    gl::GLApi* api = gl::g_current_gl_context;
+    ScopedRestoreTexture scoped_restore(api, GL_TEXTURE_2D);
+    api->glBindTextureFn(GL_TEXTURE_2D, texture);
+
+    if (format_info.supports_storage) {
+      {
+        gl::ScopedProgressReporter scoped_progress_reporter(
+            context_state_->progress_reporter());
+        api->glTexStorage2DEXTFn(GL_TEXTURE_2D, 1,
+                                 format_info.storage_internal_format,
+                                 size().width(), size().height());
+      }
+
+    } else {
+      ScopedResetAndRestoreUnpackState scoped_unpack_state(api, attribs, false);
+      gl::ScopedProgressReporter scoped_progress_reporter(
+          context_state_->progress_reporter());
+      api->glTexImage2DFn(GL_TEXTURE_2D, 0, format_info.image_internal_format,
+                          size().width(), size().height(), 0,
+                          format_info.adjusted_format, format_info.gl_type,
+                          nullptr);
+    }
+
+    if (gl::g_current_gl_driver->ext.b_GL_KHR_debug) {
+      const std::string label =
+          "SharedImage_AngleVulkan" + CreateLabelForSharedImageUsage(usage());
+      api->glObjectLabelFn(GL_TEXTURE, texture, -1, label.c_str());
+    }
+
+    // Release the texture from ANGLE.
+    api->glReleaseTexturesANGLEFn(1, &texture, &layout_);
+
+    auto image = base::MakeRefCounted<gl::GLImageEGLAngleVulkan>(size());
+    if (!image->Initialize(texture)) {
+      passthrough_texture_.reset();
+      return false;
+    }
+    image_ = std::move(image);
+    return true;
+  }
+
+ protected:
   // SharedImageBacking implementation.
   bool ProduceLegacyMailbox(MailboxManager* mailbox_manager) override {
     NOTREACHED() << "Not supported.";
@@ -103,38 +157,47 @@
                     base::trace_event::ProcessMemoryDump* pmd,
                     uint64_t client_tracing_id) override {}
 
-  void InitializeGLTexture() {
-    SharedImageBackingGLCommon::MakeTextureAndSetParameters(
-        GL_TEXTURE_2D, /*service_id=*/0, /*framebuffer_attachment_angle=*/true,
-        &passthrough_texture_, nullptr);
-    passthrough_texture_->SetEstimatedSize(estimated_size());
-  }
-  GLenum GetGLTarget() const { return GL_TEXTURE_2D; }
-  GLuint GetGLServiceId() const { return passthrough_texture_->service_id(); }
-
- protected:
   std::unique_ptr<SharedImageRepresentationGLTexturePassthrough>
   ProduceGLTexturePassthrough(SharedImageManager* manager,
-                              MemoryTypeTracker* tracker) override;
+                              MemoryTypeTracker* tracker) override {
+    DCHECK(passthrough_texture_);
+    return std::make_unique<SharedImageRepresentationGLTexturePassthroughImpl>(
+        manager, this, this, tracker, passthrough_texture_);
+  }
+
   std::unique_ptr<SharedImageRepresentationSkia> ProduceSkia(
       SharedImageManager* manager,
       MemoryTypeTracker* tracker,
       scoped_refptr<SharedContextState> context_state) override;
 
+  // SharedImageRepresentationGLTextureClient implementation.
+  bool SharedImageRepresentationGLTextureBeginAccess() override {
+    gl::GLApi* api = gl::g_current_gl_context;
+    GLuint texture = passthrough_texture_->service_id();
+    // Acquire the texture, so ANGLE can access it.
+    api->glAcquireTexturesANGLEFn(1, &texture, &layout_);
+    return true;
+  }
+
+  void SharedImageRepresentationGLTextureEndAccess(bool readonly) override {
+    gl::GLApi* api = gl::g_current_gl_context;
+    GLuint texture = passthrough_texture_->service_id();
+    // Release the texture from ANGLE, so it can be used elsewhere.
+    api->glReleaseTexturesANGLEFn(1, &texture, &layout_);
+  }
+
+  void SharedImageRepresentationGLTextureRelease(bool have_context) override {
+    if (!have_context) {
+      passthrough_texture_->MarkContextLost();
+    }
+    passthrough_texture_.reset();
+    image_.reset();
+  }
+
  private:
   class SkiaRepresentation;
 
-  bool BeginAccess() {
-    if (!image_) {
-      auto image = base::MakeRefCounted<gl::GLImageEGLAngleVulkan>(size());
-      if (!image->Initialize(passthrough_texture_->service_id())) {
-        return false;
-      }
-      image_ = std::move(image);
-    }
-
-    // TODO(penghaung): use glReleaseTextures() to get image layout from ANGLE.
-
+  bool BeginAccessSkia() {
     VkImageCreateInfo info;
     VkImage vk_image = image_->ExportVkImage(&info);
     // Check whether VkImage is re-created in ANGLE.
@@ -144,12 +207,16 @@
           size().width(), size().height(),
           CreateGrVkImageInfo(vk_image_, info, context_state_));
     }
+    auto vk_layout = GLImageLayoutToVkImageLayout(layout_);
+    backend_texture_.setVkImageLayout(vk_layout);
     return true;
   }
 
-  void EndAccess() {
-    // TODO(penghaung): use glAcquireTextures() to update image layout in
-    // ANGLE.
+  void EndAccessSkia() {
+    GrVkImageInfo info;
+    bool result = backend_texture_.getVkImageInfo(&info);
+    DCHECK(result);
+    layout_ = VkImageLayoutToGLImageLayout(info.fImageLayout);
   }
 
   raw_ptr<SharedContextState> context_state_;
@@ -157,6 +224,7 @@
   scoped_refptr<gles2::TexturePassthrough> passthrough_texture_;
   GrBackendTexture backend_texture_{};
   VkImage vk_image_ = VK_NULL_HANDLE;
+  GLenum layout_ = GL_NONE;
 };  // namespace
 
 class AngleVulkanBacking::SkiaRepresentation
@@ -174,12 +242,12 @@
       std::vector<GrBackendSemaphore>* begin_semaphores,
       std::vector<GrBackendSemaphore>* end_semaphores,
       std::unique_ptr<GrBackendSurfaceMutableState>* end_state) override {
-    if (!backing_impl()->BeginAccess())
+    if (!backing_impl()->BeginAccessSkia())
       return nullptr;
     return SkPromiseImageTexture::Make(backing_impl()->backend_texture_);
   }
 
-  void EndReadAccess() override { backing_impl()->EndAccess(); }
+  void EndReadAccess() override { backing_impl()->EndAccessSkia(); }
 
   sk_sp<SkPromiseImageTexture> BeginWriteAccess(
       std::vector<GrBackendSemaphore>* begin_semaphores,
@@ -205,14 +273,6 @@
   int surface_msaa_count_ = 0;
 };
 
-std::unique_ptr<SharedImageRepresentationGLTexturePassthrough>
-AngleVulkanBacking::ProduceGLTexturePassthrough(SharedImageManager* manager,
-                                                MemoryTypeTracker* tracker) {
-  DCHECK(passthrough_texture_);
-  return std::make_unique<SharedImageRepresentationGLTexturePassthroughImpl>(
-      manager, this, nullptr, tracker, passthrough_texture_);
-}
-
 std::unique_ptr<SharedImageRepresentationSkia> AngleVulkanBacking::ProduceSkia(
     SharedImageManager* manager,
     MemoryTypeTracker* tracker,
@@ -259,37 +319,10 @@
   auto result = std::make_unique<AngleVulkanBacking>(
       context_state_, mailbox, format, size, color_space, surface_origin,
       alpha_type, usage);
-  result->InitializeGLTexture();
 
-  gl::GLApi* api = gl::g_current_gl_context;
-  auto target = result->GetGLTarget();
-  ScopedRestoreTexture scoped_restore(api, target);
-  api->glBindTextureFn(target, result->GetGLServiceId());
-
-  if (format_info.supports_storage) {
-    {
-      gl::ScopedProgressReporter scoped_progress_reporter(progress_reporter_);
-      api->glTexStorage2DEXTFn(target, 1, format_info.storage_internal_format,
-                               size.width(), size.height());
-    }
-
-  } else {
-    ScopedResetAndRestoreUnpackState scoped_unpack_state(api, attribs_, false);
-    gl::ScopedProgressReporter scoped_progress_reporter(progress_reporter_);
-    api->glTexImage2DFn(target, 0, format_info.image_internal_format,
-                        size.width(), size.height(), 0,
-                        format_info.adjusted_format, format_info.gl_type,
-                        nullptr);
-  }
-
-  if (gl::g_current_gl_driver->ext.b_GL_KHR_debug) {
-    const std::string label =
-        "SharedImage_AngleVulkan" + CreateLabelForSharedImageUsage(usage);
-    api->glObjectLabelFn(GL_TEXTURE, result->GetGLServiceId(), -1,
-                         label.c_str());
-  }
-
-  return std::move(result);
+  if (!result->Initialize(format_info, attribs_))
+    return nullptr;
+  return result;
 }
 
 std::unique_ptr<SharedImageBacking>
diff --git a/gpu/vulkan/vulkan_util.cc b/gpu/vulkan/vulkan_util.cc
index 75b50cc644..64a7cea 100644
--- a/gpu/vulkan/vulkan_util.cc
+++ b/gpu/vulkan/vulkan_util.cc
@@ -20,6 +20,17 @@
 #include "base/android/build_info.h"
 #endif
 
+#define GL_NONE 0x00
+#define GL_LAYOUT_GENERAL_EXT 0x958D
+#define GL_LAYOUT_COLOR_ATTACHMENT_EXT 0x958E
+#define GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT 0x958F
+#define GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT 0x9590
+#define GL_LAYOUT_SHADER_READ_ONLY_EXT 0x9591
+#define GL_LAYOUT_TRANSFER_SRC_EXT 0x9592
+#define GL_LAYOUT_TRANSFER_DST_EXT 0x9593
+#define GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT 0x9530
+#define GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT 0x9531
+
 namespace gpu {
 namespace {
 
@@ -223,4 +234,61 @@
   return true;
 }
 
+VkImageLayout GLImageLayoutToVkImageLayout(uint32_t layout) {
+  switch (layout) {
+    case GL_NONE:
+      break;
+    case GL_LAYOUT_GENERAL_EXT:
+      return VK_IMAGE_LAYOUT_GENERAL;
+    case GL_LAYOUT_COLOR_ATTACHMENT_EXT:
+      return VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+    case GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT:
+      return VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+    case GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT:
+      return VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL;
+    case GL_LAYOUT_SHADER_READ_ONLY_EXT:
+      return VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+    case GL_LAYOUT_TRANSFER_SRC_EXT:
+      return VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
+    case GL_LAYOUT_TRANSFER_DST_EXT:
+      return VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+    case GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT:
+      return VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL_KHR;
+    case GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT:
+      return VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL_KHR;
+    default:
+      break;
+  }
+  NOTREACHED() << "Invalid image layout " << layout;
+  return VK_IMAGE_LAYOUT_UNDEFINED;
+}
+
+uint32_t VkImageLayoutToGLImageLayout(VkImageLayout layout) {
+  switch (layout) {
+    case VK_IMAGE_LAYOUT_UNDEFINED:
+      return GL_NONE;
+    case VK_IMAGE_LAYOUT_GENERAL:
+      return GL_LAYOUT_GENERAL_EXT;
+    case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL:
+      return GL_LAYOUT_COLOR_ATTACHMENT_EXT;
+    case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL:
+      return GL_LAYOUT_DEPTH_STENCIL_ATTACHMENT_EXT;
+    case VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL:
+      return GL_LAYOUT_DEPTH_STENCIL_READ_ONLY_EXT;
+    case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL:
+      return GL_LAYOUT_SHADER_READ_ONLY_EXT;
+    case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL:
+      return GL_LAYOUT_TRANSFER_SRC_EXT;
+    case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL:
+      return GL_LAYOUT_TRANSFER_DST_EXT;
+    case VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL_KHR:
+      return GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT;
+    case VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL_KHR:
+      return GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT;
+    default:
+      NOTREACHED() << "Invalid image layout " << layout;
+      return GL_NONE;
+  }
+}
+
 }  // namespace gpu
diff --git a/gpu/vulkan/vulkan_util.h b/gpu/vulkan/vulkan_util.h
index 1f39061..c2be5c9 100644
--- a/gpu/vulkan/vulkan_util.h
+++ b/gpu/vulkan/vulkan_util.h
@@ -92,6 +92,12 @@
                               const GPUInfo& gpu_info,
                               std::string enable_by_device_name);
 
+COMPONENT_EXPORT(VULKAN)
+VkImageLayout GLImageLayoutToVkImageLayout(uint32_t layout);
+
+COMPONENT_EXPORT(VULKAN)
+uint32_t VkImageLayoutToGLImageLayout(VkImageLayout layout);
+
 }  // namespace gpu
 
 #endif  // GPU_VULKAN_VULKAN_UTIL_H_
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index 464e10e..07606db 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -70900,37 +70900,33 @@
       dimensions: "os:Ubuntu-18.04"
       dimensions: "pool:luci.chromium.try"
       exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
+        cipd_package: "infra/chromium/bootstrapper/${platform}"
+        cipd_version: "latest"
+        cmd: "bootstrapper"
       }
       properties:
         '{'
-        '  "$build/chromium_orchestrator": {'
-        '    "compilator": "linux-rel-compilator",'
-        '    "compilator_watcher_git_revision": "5fd7f4ae276865742fe632642ec4633dd9f81649"'
+        '  "$bootstrap/exe": {'
+        '    "exe": {'
+        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
+        '      "cipd_version": "refs/heads/main",'
+        '      "cmd": ['
+        '        "luciexe"'
+        '      ]'
+        '    }'
         '  },'
-        '  "$build/code_coverage": {'
-        '    "coverage_test_types": ['
-        '      "unit",'
-        '      "overall"'
-        '    ],'
-        '    "use_clang_coverage": true'
-        '  },'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/resultdb/test_presentation": {'
-        '    "column_keys": [],'
-        '    "grouping_keys": ['
-        '      "status",'
-        '      "v.test_suite"'
-        '    ]'
+        '  "$bootstrap/properties": {'
+        '    "properties_file": "infra/config/generated/builders/try/linux-rel/properties.textpb",'
+        '    "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/orchestrator"'
         '}'
       execution_timeout_secs: 14400
@@ -71003,38 +70999,33 @@
       dimensions: "pool:luci.chromium.try"
       dimensions: "ssd:1"
       exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
+        cipd_package: "infra/chromium/bootstrapper/${platform}"
+        cipd_version: "latest"
+        cmd: "bootstrapper"
       }
       properties:
         '{'
-        '  "$build/code_coverage": {'
-        '    "coverage_test_types": ['
-        '      "unit",'
-        '      "overall"'
-        '    ],'
-        '    "use_clang_coverage": true'
+        '  "$bootstrap/exe": {'
+        '    "exe": {'
+        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
+        '      "cipd_version": "refs/heads/main",'
+        '      "cmd": ['
+        '        "luciexe"'
+        '      ]'
+        '    }'
         '  },'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "jobs": 150,'
-        '    "rpc_extra_params": "?prod",'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/resultdb/test_presentation": {'
-        '    "column_keys": [],'
-        '    "grouping_keys": ['
-        '      "status",'
-        '      "v.test_suite"'
-        '    ]'
+        '  "$bootstrap/properties": {'
+        '    "properties_file": "infra/config/generated/builders/try/linux-rel-compilator/properties.textpb",'
+        '    "top_level_project": {'
+        '      "ref": "refs/heads/main",'
+        '      "repo": {'
+        '        "host": "chromium.googlesource.com",'
+        '        "project": "chromium/src"'
+        '      }'
+        '    }'
         '  },'
         '  "builder_group": "tryserver.chromium.linux",'
-        '  "orchestrator": {'
-        '    "builder_group": "tryserver.chromium.linux",'
-        '    "builder_name": "linux-rel"'
-        '  },'
+        '  "led_builder_is_bootstrapped": true,'
         '  "recipe": "chromium/compilator"'
         '}'
       execution_timeout_secs: 14400
diff --git a/infra/config/subprojects/chromium/try.star b/infra/config/subprojects/chromium/try.star
index db52dbac..2daca66 100644
--- a/infra/config/subprojects/chromium/try.star
+++ b/infra/config/subprojects/chromium/try.star
@@ -1358,6 +1358,7 @@
 
 try_.chromium_linux_orchestrator_pair(
     name = "linux-rel",
+    bootstrap = True,
     branch_selector = branches.STANDARD_MILESTONE,
     main_list_view = "try",
     use_clang_coverage = True,
diff --git a/ios/chrome/browser/tabs/BUILD.gn b/ios/chrome/browser/tabs/BUILD.gn
index a697137b..1c875f7 100644
--- a/ios/chrome/browser/tabs/BUILD.gn
+++ b/ios/chrome/browser/tabs/BUILD.gn
@@ -102,6 +102,7 @@
     "//ios/chrome/browser/web/image_fetch",
     "//ios/chrome/browser/web/print",
     "//ios/chrome/browser/web/session_state",
+    "//ios/chrome/browser/web/web_performance_metrics",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list/web_usage_enabler",
     "//ios/components/security_interstitials",
diff --git a/ios/chrome/browser/tabs/tab_helper_util.mm b/ios/chrome/browser/tabs/tab_helper_util.mm
index 27b18688..2d1b30a1 100644
--- a/ios/chrome/browser/tabs/tab_helper_util.mm
+++ b/ios/chrome/browser/tabs/tab_helper_util.mm
@@ -77,6 +77,7 @@
 #import "ios/chrome/browser/web/sad_tab_tab_helper.h"
 #import "ios/chrome/browser/web/session_state/web_session_state_tab_helper.h"
 #import "ios/chrome/browser/web/tab_id_tab_helper.h"
+#import "ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_tab_helper.h"
 #import "ios/components/security_interstitials/ios_blocking_page_tab_helper.h"
 #import "ios/components/security_interstitials/lookalikes/lookalike_url_container.h"
 #import "ios/components/security_interstitials/lookalikes/lookalike_url_tab_allow_list.h"
@@ -203,4 +204,5 @@
   }
 
   WebSessionStateTabHelper::CreateForWebState(web_state);
+  WebPerformanceMetricsTabHelper::CreateForWebState(web_state);
 }
diff --git a/ios/chrome/browser/ui/authentication/signin_sync/BUILD.gn b/ios/chrome/browser/ui/authentication/signin_sync/BUILD.gn
index b927e0de6..2a1dece 100644
--- a/ios/chrome/browser/ui/authentication/signin_sync/BUILD.gn
+++ b/ios/chrome/browser/ui/authentication/signin_sync/BUILD.gn
@@ -35,6 +35,7 @@
     "//ios/chrome/browser/ui/authentication/signin/user_signin/logging",
     "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/first_run:field_trial",
     "//ios/chrome/browser/ui/first_run:interruptible_chrome_coordinator",
     "//ios/chrome/browser/ui/first_run:screen_delegate",
     "//ios/chrome/browser/ui/first_run:utils",
@@ -61,6 +62,7 @@
     "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils",
     "//ios/chrome/browser/ui/authentication/views",
     "//ios/chrome/browser/ui/elements:elements_internal",
+    "//ios/chrome/browser/ui/first_run:field_trial",
     "//ios/chrome/browser/ui/settings/elements:constants",
     "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
     "//ios/chrome/common",
diff --git a/ios/chrome/browser/ui/authentication/signin_sync/signin_sync_coordinator.mm b/ios/chrome/browser/ui/authentication/signin_sync/signin_sync_coordinator.mm
index 62c4951..ece6291f 100644
--- a/ios/chrome/browser/ui/authentication/signin_sync/signin_sync_coordinator.mm
+++ b/ios/chrome/browser/ui/authentication/signin_sync/signin_sync_coordinator.mm
@@ -39,6 +39,7 @@
 #import "ios/chrome/browser/ui/commands/command_dispatcher.h"
 #import "ios/chrome/browser/ui/first_run/first_run_screen_delegate.h"
 #import "ios/chrome/browser/ui/first_run/first_run_util.h"
+#include "ios/chrome/browser/ui/first_run/fre_field_trial.h"
 #import "ios/chrome/browser/ui/main/scene_state.h"
 #import "ios/chrome/browser/ui/main/scene_state_browser_agent.h"
 #import "ios/chrome/browser/unified_consent/unified_consent_service_factory.h"
@@ -158,6 +159,10 @@
   self.viewController.delegate = self;
   self.viewController.enterpriseSignInRestrictions =
       GetEnterpriseSignInRestrictions(browserState);
+  self.viewController.identitySwitcherPosition =
+      fre_field_trial::GetSigninSyncScreenUIIdentitySwitcherPosition();
+  self.viewController.stringsSet =
+      fre_field_trial::GetSigninSyncScreenUIStringSet();
 
   self.accountManagerService =
       ChromeAccountManagerServiceFactory::GetForBrowserState(browserState);
diff --git a/ios/chrome/browser/ui/authentication/signin_sync/signin_sync_view_controller.h b/ios/chrome/browser/ui/authentication/signin_sync/signin_sync_view_controller.h
index b86734f..69418dd 100644
--- a/ios/chrome/browser/ui/authentication/signin_sync/signin_sync_view_controller.h
+++ b/ios/chrome/browser/ui/authentication/signin_sync/signin_sync_view_controller.h
@@ -11,6 +11,7 @@
 #import "ios/chrome/browser/ui/authentication/enterprise/enterprise_utils.h"
 #import "ios/chrome/browser/ui/authentication/signin_sync/signin_sync_consumer.h"
 #import "ios/chrome/browser/ui/authentication/signin_sync/signin_sync_view_controller_delegate.h"
+#import "ios/chrome/browser/ui/first_run/fre_field_trial.h"
 #import "ios/chrome/common/ui/promo_style/promo_style_view_controller.h"
 
 @interface SigninSyncViewController
@@ -21,13 +22,12 @@
 @property(nonatomic, assign)
     EnterpriseSignInRestrictions enterpriseSignInRestrictions;
 
-// YES if the identity control button has to be in the top of the screen.
-@property(nonatomic, assign) BOOL identityControlInTop;
+// Position of the identity switcher.
+@property(nonatomic, assign)
+    SigninSyncScreenUIIdentitySwitcherPosition identitySwitcherPosition;
 
-// TODO(crbug.com/1271609) This may change for an enum once we determined the
-// API for the feature parameters.
-// YES if the other set of strings should be used.
-@property(nonatomic, assign) BOOL useOtherStringsSet;
+// Set of strings used in the UI.
+@property(nonatomic, assign) SigninSyncScreenUIStringSet stringsSet;
 
 // The ID of the main button activating sync.
 @property(nonatomic, readonly) int activateSyncButtonID;
diff --git a/ios/chrome/browser/ui/authentication/signin_sync/signin_sync_view_controller.mm b/ios/chrome/browser/ui/authentication/signin_sync/signin_sync_view_controller.mm
index 48ca8d8b1..ad912e9 100644
--- a/ios/chrome/browser/ui/authentication/signin_sync/signin_sync_view_controller.mm
+++ b/ios/chrome/browser/ui/authentication/signin_sync/signin_sync_view_controller.mm
@@ -71,19 +71,13 @@
   self.readMoreString =
       l10n_util::GetNSString(IDS_IOS_FIRST_RUN_SCREEN_READ_MORE);
 
-  int titleTextID = self.useOtherStringsSet
-                        ? IDS_IOS_FIRST_RUN_SYNC_SCREEN_TITLE
-                        : IDS_IOS_ACCOUNT_UNIFIED_CONSENT_TITLE;
-  [self.delegate signinSyncViewController:self addConsentStringID:titleTextID];
-  self.titleText = l10n_util::GetNSString(titleTextID);
-
-  int subtitleTextID = self.useOtherStringsSet
-                           ? IDS_IOS_FIRST_RUN_SYNC_SCREEN_SUBTITLE
-                           : IDS_IOS_ACCOUNT_UNIFIED_CONSENT_SYNC_TITLE;
   [self.delegate signinSyncViewController:self
-                       addConsentStringID:subtitleTextID];
+                       addConsentStringID:[self titleTextID]];
+  self.titleText = l10n_util::GetNSString([self titleTextID]);
 
-  self.subtitleText = l10n_util::GetNSString(subtitleTextID);
+  [self.delegate signinSyncViewController:self
+                       addConsentStringID:[self subtitleTextID]];
+  self.subtitleText = l10n_util::GetNSString([self subtitleTextID]);
 
   if (!self.primaryActionString) {
     // |primaryActionString| could already be set using the consumer methods.
@@ -96,7 +90,7 @@
   [self.delegate signinSyncViewController:self
                        addConsentStringID:self.activateSyncButtonID];
 
-  if (self.identityControlInTop) {
+  if ([self identityControlInTop]) {
     [self.topSpecificContentView addSubview:self.identityControl];
   } else {
     [self.specificContentView addSubview:self.identityControl];
@@ -126,11 +120,8 @@
   }
 
   self.bannerImage = [UIImage imageNamed:@"sync_screen_banner"];
-  int secondaryActionStringID =
-      self.useOtherStringsSet
-          ? IDS_IOS_FIRST_RUN_SYNC_SCREEN_SECONDARY_ACTION
-          : IDS_IOS_FIRST_RUN_DEFAULT_BROWSER_SCREEN_SECONDARY_ACTION;
-  self.secondaryActionString = l10n_util::GetNSString(secondaryActionStringID);
+  self.secondaryActionString =
+      l10n_util::GetNSString([self secondaryActionStringID]);
 
   // Set constraints specific to the identity control button that don't change.
   NSLayoutConstraint* widthConstraint = [self.identityControl.widthAnchor
@@ -148,7 +139,7 @@
   // Set constraints that are dependent on the position of the identity
   // controller button and sign-in restrictions.
 
-  if (self.identityControlInTop) {
+  if ([self identityControlInTop]) {
     [self.identityControl.bottomAnchor
         constraintEqualToAnchor:self.identityControl.superview.bottomAnchor
                        constant:-kTopSpecificContentVerticalMargin]
@@ -329,9 +320,14 @@
   return _advanceSyncSettingsButton;
 }
 
+// Returns the ID of the string of the button that is used to activate sync.
 - (int)activateSyncButtonID {
-  return self.useOtherStringsSet ? IDS_IOS_FIRST_RUN_SYNC_SCREEN_PRIMARY_ACTION
-                                 : IDS_IOS_ACCOUNT_UNIFIED_CONSENT_OK_BUTTON;
+  switch (self.stringsSet) {
+    case SigninSyncScreenUIStringSet::kOld:
+      return IDS_IOS_ACCOUNT_UNIFIED_CONSENT_OK_BUTTON;
+    case SigninSyncScreenUIStringSet::kNew:
+      return IDS_IOS_FIRST_RUN_SYNC_SCREEN_PRIMARY_ACTION;
+  }
 }
 
 #pragma mark - SignInSyncConsumer
@@ -398,6 +394,46 @@
   [self.delegate signinSyncViewControllerDidTapOnSettings:self];
 }
 
+// Returns the title string ID.
+- (int)titleTextID {
+  switch (self.stringsSet) {
+    case SigninSyncScreenUIStringSet::kOld:
+      return IDS_IOS_ACCOUNT_UNIFIED_CONSENT_TITLE;
+    case SigninSyncScreenUIStringSet::kNew:
+      return IDS_IOS_FIRST_RUN_SYNC_SCREEN_TITLE;
+  }
+}
+
+// Returns the subtitle string ID.
+- (int)subtitleTextID {
+  switch (self.stringsSet) {
+    case SigninSyncScreenUIStringSet::kOld:
+      return IDS_IOS_ACCOUNT_UNIFIED_CONSENT_SYNC_TITLE;
+    case SigninSyncScreenUIStringSet::kNew:
+      return IDS_IOS_FIRST_RUN_SYNC_SCREEN_SUBTITLE;
+  }
+}
+
+// Returns the secondary action string ID.
+- (int)secondaryActionStringID {
+  switch (self.stringsSet) {
+    case SigninSyncScreenUIStringSet::kOld:
+      return IDS_IOS_FIRST_RUN_DEFAULT_BROWSER_SCREEN_SECONDARY_ACTION;
+    case SigninSyncScreenUIStringSet::kNew:
+      return IDS_IOS_FIRST_RUN_SYNC_SCREEN_SECONDARY_ACTION;
+  }
+}
+
+// Returns YES if the identity control button has to be in top.
+- (BOOL)identityControlInTop {
+  switch (self.identitySwitcherPosition) {
+    case SigninSyncScreenUIIdentitySwitcherPosition::kTop:
+      return YES;
+    case SigninSyncScreenUIIdentitySwitcherPosition::kBottom:
+      return NO;
+  }
+}
+
 #pragma mark - UITextViewDelegate
 
 - (BOOL)textView:(UITextView*)textView
diff --git a/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/identity_chooser_add_account_item.mm b/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/identity_chooser_add_account_item.mm
index cf47865..02758826 100644
--- a/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/identity_chooser_add_account_item.mm
+++ b/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/identity_chooser_add_account_item.mm
@@ -32,6 +32,7 @@
       l10n_util::GetNSString(IDS_IOS_ACCOUNT_IDENTITY_CHOOSER_ADD_ACCOUNT);
   UIImage* image = [[UIImage imageNamed:@"settings_accounts_add_account"]
       imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+  cell.accessibilityIdentifier = kIdentityPickerAddAccountIdentifier;
   [cell configureCellWithTitle:title
                       subtitle:nil
                          image:image
diff --git a/ios/chrome/browser/ui/authentication/views/views_constants.h b/ios/chrome/browser/ui/authentication/views/views_constants.h
index 6a0273d2..991e46d 100644
--- a/ios/chrome/browser/ui/authentication/views/views_constants.h
+++ b/ios/chrome/browser/ui/authentication/views/views_constants.h
@@ -9,6 +9,9 @@
 
 // Accessibility identifier for the identity picker view.
 extern NSString* const kIdentityButtonControlIdentifier;
+// Accessibility identifier for "Add Account" button in the identity picker
+// view.
+extern NSString* const kIdentityPickerAddAccountIdentifier;
 
 // Style for the identity view (modify the avatar size, font sizes and some
 // margins).
diff --git a/ios/chrome/browser/ui/authentication/views/views_constants.mm b/ios/chrome/browser/ui/authentication/views/views_constants.mm
index fdebe283..305ddf2 100644
--- a/ios/chrome/browser/ui/authentication/views/views_constants.mm
+++ b/ios/chrome/browser/ui/authentication/views/views_constants.mm
@@ -9,4 +9,6 @@
 #endif
 
 NSString* const kIdentityButtonControlIdentifier =
-    @"kIdentityButtonControlIdentifier";
+    @"IdentityButtonControlIdentifier";
+NSString* const kIdentityPickerAddAccountIdentifier =
+    @"IdentityPickerAddAccountIdentifier";
diff --git a/ios/chrome/browser/ui/settings/password/passwords_table_view_controller.mm b/ios/chrome/browser/ui/settings/password/passwords_table_view_controller.mm
index a63e220..ade3bd01 100644
--- a/ios/chrome/browser/ui/settings/password/passwords_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/password/passwords_table_view_controller.mm
@@ -23,13 +23,11 @@
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/strings/grit/components_strings.h"
-#include "components/sync/driver/sync_service.h"
 #include "ios/chrome/browser/application_context.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #import "ios/chrome/browser/main/browser.h"
 #import "ios/chrome/browser/signin/chrome_account_manager_service_factory.h"
 #import "ios/chrome/browser/signin/chrome_account_manager_service_observer_bridge.h"
-#import "ios/chrome/browser/sync/sync_service_factory.h"
 #import "ios/chrome/browser/sync/sync_setup_service.h"
 #import "ios/chrome/browser/sync/sync_setup_service_factory.h"
 #include "ios/chrome/browser/system_flags.h"
@@ -630,30 +628,30 @@
   syncer::ModelType kSyncPasswordsModelType =
       syncSetupService->GetModelType(SyncSetupService::kSyncPasswords);
   BOOL isSyncingPasswords =
-      syncSetupService->IsDataTypeActive(kSyncPasswordsModelType);
+      syncSetupService->IsDataTypePreferred(kSyncPasswordsModelType) &&
+      syncSetupService->IsSyncRequested();
 
   TableViewLinkHeaderFooterItem* footerItem =
       [[TableViewLinkHeaderFooterItem alloc] initWithType:ItemTypeLinkHeader];
 
-  if (base::FeatureList::IsEnabled(
+  if (!base::FeatureList::IsEnabled(
           password_manager::features::
               kIOSEnablePasswordManagerBrandingUpdate)) {
-    if (isSyncingPasswords) {
-      footerItem.text = l10n_util::GetNSString(IDS_IOS_PASSWORD_MANAGER_SETTINGS_SYNC_HEADER);
-      footerItem.urls = std::vector<GURL>{google_util::AppendGoogleLocaleParam(
-          GURL(password_manager::kPasswordManagerAccountDashboardURL),
-          GetApplicationContext()->GetApplicationLocale())};
-    } else {
-      footerItem.text =
-          l10n_util::GetNSString(IDS_IOS_PASSWORD_MANAGER_SETTINGS_NOT_SYNC_HEADER);
-    }
-  } else {
     footerItem.text =
         l10n_util::GetNSString(IDS_IOS_SAVE_PASSWORDS_MANAGE_ACCOUNT);
 
     footerItem.urls = std::vector<GURL>{google_util::AppendGoogleLocaleParam(
         GURL(password_manager::kPasswordManagerAccountDashboardURL),
         GetApplicationContext()->GetApplicationLocale())};
+  } else if (isSyncingPasswords) {
+    footerItem.text =
+        l10n_util::GetNSString(IDS_IOS_PASSWORD_MANAGER_SETTINGS_SYNC_HEADER);
+    footerItem.urls = std::vector<GURL>{google_util::AppendGoogleLocaleParam(
+        GURL(password_manager::kPasswordManagerAccountDashboardURL),
+        GetApplicationContext()->GetApplicationLocale())};
+  } else {
+    footerItem.text = l10n_util::GetNSString(
+        IDS_IOS_PASSWORD_MANAGER_SETTINGS_NOT_SYNC_HEADER);
   }
 
   return footerItem;
diff --git a/ios/chrome/browser/web/web_performance_metrics/BUILD.gn b/ios/chrome/browser/web/web_performance_metrics/BUILD.gn
index 1d44f734..ed1e2ad 100644
--- a/ios/chrome/browser/web/web_performance_metrics/BUILD.gn
+++ b/ios/chrome/browser/web/web_performance_metrics/BUILD.gn
@@ -11,15 +11,34 @@
   deps = [
     ":web_performance_metrics_js",
     "//base",
+    "//ios/web/public:public",
+    "//ios/web/public:web_state_observer",
     "//ios/web/public/js_messaging",
   ]
 
   sources = [
     "web_performance_metrics_java_script_feature.h",
     "web_performance_metrics_java_script_feature.mm",
+    "web_performance_metrics_java_script_feature_util.h",
+    "web_performance_metrics_java_script_feature_util.mm",
+    "web_performance_metrics_tab_helper.h",
+    "web_performance_metrics_tab_helper.mm",
   ]
 }
 
+source_set("unit_tests") {
+  testonly = true
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":web_performance_metrics",
+    "//base",
+    "//testing/gtest",
+  ]
+
+  sources = [ "web_performance_metrics_java_script_feature_unittest.mm" ]
+}
+
 js_compile_bundle("web_performance_metrics_js") {
   visibility = [ ":web_performance_metrics" ]
   closure_entry_point = "__crWeb.webPerformanceMetrics"
diff --git a/ios/chrome/browser/web/web_performance_metrics/resources/web_performance_metrics.js b/ios/chrome/browser/web/web_performance_metrics/resources/web_performance_metrics.js
index 328d66eb..1d90f56 100644
--- a/ios/chrome/browser/web/web_performance_metrics/resources/web_performance_metrics.js
+++ b/ios/chrome/browser/web/web_performance_metrics/resources/web_performance_metrics.js
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 goog.provide('__crWeb.webPerformanceMetrics');
 
 /** Beginning of anonymous object */
@@ -10,18 +9,19 @@
   const FIRST_CONTENTFUL_PAINT = 'first-contentful-paint';
   const WEB_PERFORMANCE_METRICS_HANDLER_NAME = 'WebPerformanceMetricsHandler';
 
-  /**
-  * Sends the First Contentful Paint time for each
-  * frame in a website to the browser. Due to WebKit's
-  * implementation of First Contentful Paint, this
-  * will only be called for the main frame and
-  * subframes that are same-origin relative to the
-  * main frame.
-  */
+  // Sends the First Contentful Paint time for each
+  // frame in a website to the browser. Due to WebKit's
+  // implementation of First Contentful Paint, this
+  // will only be called for the main frame and
+  // subframes that are same-origin relative to the
+  // main frame.
   function processPaintEvents(paintEvents, observer) {
     for (const event of paintEvents.getEntriesByName(FIRST_CONTENTFUL_PAINT)){
+      // The performance.timing.navigationStart property has been deprecated.
+      // See https://crbug.com/1273083
       let response = {
         'metric' : 'FirstContentfulPaint',
+        'frameNavigationStartTime' : performance.timing.navigationStart,
         'value'  : event.startTime,
       }
 
@@ -33,12 +33,10 @@
     }
   }
 
-  /**
-  * Register PerformanceObserver to observe 'paint' events
-  * Once the PerformanceObserver receives the
-  * 'first-contentful-paint' event, capture the time of the
-  * event and print it out.
-  */
+  // Register PerformanceObserver to observe 'paint' events
+  // Once the PerformanceObserver receives the
+  // 'first-contentful-paint' event, capture the time of the
+  // event and print it out.
   function registerPerformanceObserver(){
     let observer = new PerformanceObserver(processPaintEvents);
     observer.observe({ entryTypes : ['paint'] });
diff --git a/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature.h b/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature.h
index aaa90e6..5530f94 100644
--- a/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature.h
+++ b/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature.h
@@ -7,11 +7,9 @@
 
 #include "ios/web/public/js_messaging/java_script_feature.h"
 
-/**
- * A feature which captures Web Vitals metrics that determine
- * JavaScript injected logic's affect on a user's perception
- * of web performance.
- **/
+// A feature which captures Web Vitals metrics that determine
+// JavaScript injected logic's affect on a user's perception
+// of web performance.
 class WebPerformanceMetricsJavaScriptFeature : public web::JavaScriptFeature {
  public:
   WebPerformanceMetricsJavaScriptFeature();
@@ -24,6 +22,15 @@
   absl::optional<std::string> GetScriptMessageHandlerName() const override;
   void ScriptMessageReceived(web::WebState* web_state,
                              const web::ScriptMessage& message) override;
+
+  // Logs the First Contentful Paint time relative to each frame in UMA.
+  void LogRelativeFirstContentfulPaint(double value, bool is_main_frame);
+
+  // Logs the earliest Contentful Paint time across main and sub frames in UMA.
+  void LogAggregateFirstContentfulPaint(web::WebState* web_state,
+                                        double frameNavigationStartTime,
+                                        double relativeFirstContentfulPaint,
+                                        bool is_main_frame);
 };
 
 #endif  // IOS_CHROME_BROWSER_WEB_WEB_PERFORMANCE_METRICS_WEB_PERFORMANCE_METRICS_JAVA_SCRIPT_FEATURE_H_
diff --git a/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature.mm b/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature.mm
index fee4125..fa9cb2a 100644
--- a/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature.mm
+++ b/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature.mm
@@ -2,12 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature.h"
+
+#include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/no_destructor.h"
 #include "base/strings/strcat.h"
 #include "base/values.h"
-
-#include "ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature.h"
+#include "ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature_util.h"
+#include "ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_tab_helper.h"
 #include "ios/web/public/js_messaging/java_script_feature_util.h"
 #include "ios/web/public/js_messaging/script_message.h"
 #include "ios/web/public/js_messaging/web_frame_util.h"
@@ -62,11 +65,61 @@
     return;
   }
 
-  if (*metric == "FirstContentfulPaint" && message.is_main_frame()) {
+  absl::optional<double> frame_navigation_start_time =
+      message.body()->FindDoubleKey("frameNavigationStartTime");
+  if (!frame_navigation_start_time) {
+    return;
+  }
+
+  LogRelativeFirstContentfulPaint(value.value(), message.is_main_frame());
+  LogAggregateFirstContentfulPaint(web_state,
+                                   frame_navigation_start_time.value(),
+                                   value.value(), message.is_main_frame());
+}
+
+void WebPerformanceMetricsJavaScriptFeature::LogRelativeFirstContentfulPaint(
+    double value,
+    bool is_main_frame) {
+  if (is_main_frame) {
     UMA_HISTOGRAM_TIMES("IOS.Frame.FirstContentfulPaint.MainFrame",
-                        base::Milliseconds(value.value()));
-  } else if (*metric == "FirstContentfulPaint") {
+                        base::Milliseconds(value));
+  } else {
     UMA_HISTOGRAM_TIMES("IOS.Frame.FirstContentfulPaint.SubFrame",
-                        base::Milliseconds(value.value()));
+                        base::Milliseconds(value));
+  }
+}
+
+void WebPerformanceMetricsJavaScriptFeature::LogAggregateFirstContentfulPaint(
+    web::WebState* web_state,
+    double frame_navigation_start_time,
+    double relative_first_contentful_paint,
+    bool is_main_frame) {
+  WebPerformanceMetricsTabHelper* tab_helper =
+      WebPerformanceMetricsTabHelper::FromWebState(web_state);
+
+  if (!tab_helper) {
+    return;
+  }
+
+  const double aggregate =
+      tab_helper->GetAggregateAbsoluteFirstContentfulPaint();
+
+  if (is_main_frame) {
+    // Finds the earliest First Contentful Paint time across
+    // main and subframes and logs that time to UMA.
+    web_performance_metrics::FirstContentfulPaint frame = {
+        frame_navigation_start_time, relative_first_contentful_paint,
+        web_performance_metrics::CalculateAbsoluteFirstContentfulPaint(
+            frame_navigation_start_time, relative_first_contentful_paint)};
+    base::TimeDelta aggregate_first_contentful_paint =
+        web_performance_metrics::CalculateAggregateFirstContentfulPaint(
+            aggregate, frame);
+
+    UMA_HISTOGRAM_TIMES("PageLoad.PaintTiming.NavigationToFirstContentfulPaint",
+                        aggregate_first_contentful_paint);
+  } else if (aggregate == std::numeric_limits<double>::max()) {
+    tab_helper->SetAggregateAbsoluteFirstContentfulPaint(
+        web_performance_metrics::CalculateAbsoluteFirstContentfulPaint(
+            frame_navigation_start_time, relative_first_contentful_paint));
   }
 }
diff --git a/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature_unittest.mm b/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature_unittest.mm
new file mode 100644
index 0000000..ec21f67
--- /dev/null
+++ b/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature_unittest.mm
@@ -0,0 +1,106 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature.h"
+
+#import <limits>
+
+#import "base/time/time.h"
+#import "ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature_util.h"
+#import "ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_tab_helper.h"
+#import "testing/platform_test.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+using WebPerformanceMetricsJavaScriptFeatureTest = PlatformTest;
+
+namespace {
+struct TestParams {
+  web_performance_metrics::FirstContentfulPaint frame;
+  bool is_main_frame;
+};
+
+struct TestCase {
+  TestParams params;
+  base::TimeDelta expected;
+};
+
+// Iterates over the test cases and validates the results against the
+// expected value for Aggregate First Contetnful Paint test caess.
+template <int N>
+void ValidateAggregateFirstContentfulPaintTestCases(
+    const TestCase (&test_cases)[N]) {
+  double absolute_aggregate_first_contentful_paint =
+      std::numeric_limits<double>::max();
+
+  // Stores the first subframe's absolute first contentful paint
+  // and uses it in the calculation of the aggregate first
+  // contentful paint which occurs on the appearance of the
+  // main frame.
+  for (const TestCase& test_case : test_cases) {
+    if (test_case.params.is_main_frame) {
+      base::TimeDelta aggregate_first_contentful_paint =
+          web_performance_metrics::CalculateAggregateFirstContentfulPaint(
+              absolute_aggregate_first_contentful_paint,
+              test_case.params.frame);
+      EXPECT_EQ(aggregate_first_contentful_paint, test_case.expected);
+    } else if (absolute_aggregate_first_contentful_paint ==
+               std::numeric_limits<double>::max()) {
+      absolute_aggregate_first_contentful_paint =
+          test_case.params.frame.absolute_time;
+    }
+  }
+}
+
+}  // namespace
+
+// Simulates the event where a subframe loads before the main frame
+// and has a faster first contentful paint.
+TEST_F(WebPerformanceMetricsJavaScriptFeatureTest,
+       AggregateFirstContentfulPaintWithSubframeLoadingFirst) {
+  static const TestCase kTestCases[] = {
+      {{{160, 10, 170}, false}, base::TimeDelta::Max()},
+      {{{150, 30, 180}, true}, base::Milliseconds(20)}};
+  ValidateAggregateFirstContentfulPaintTestCases(kTestCases);
+}
+
+// Simulates the event where the mainframe loads before the subframe
+// and has a faster first contentful paint.
+TEST_F(WebPerformanceMetricsJavaScriptFeatureTest,
+       AggregateFirstContentfulPaintWithMainFrameLoadingFirst) {
+  static const TestCase kTestCases[] = {
+      {{{100, 40, 140}, true}, base::Milliseconds(40)},
+      {{{250, 50, 300}, false}, base::TimeDelta::Max()}};
+  ValidateAggregateFirstContentfulPaintTestCases(kTestCases);
+}
+
+// Simulates the event where the mainframe loads before the subframe
+// and a slower first contentful paint.
+TEST_F(WebPerformanceMetricsJavaScriptFeatureTest,
+       AggregateFirstContentfulPaintWithOnlyMainFrame) {
+  static const TestCase kTestCases[] = {
+      {{{100, 40, 140}, true}, base::Milliseconds(40)}};
+  ValidateAggregateFirstContentfulPaintTestCases(kTestCases);
+}
+
+// Tests the function responsible for calculating the
+// absolute first contentful paint time.
+TEST_F(WebPerformanceMetricsJavaScriptFeatureTest,
+       AbsoluteFirstContentfulPaint) {
+  static const TestCase kTestCases[] = {
+      {{{100, 40, 140}, true}, base::Milliseconds(140)},
+      {{{120, 30, 150}, true}, base::Milliseconds(150)},
+      {{{0, 90, 90}, true}, base::Milliseconds(90)},
+      {{{100, 220, 320}, true}, base::Milliseconds(320)}};
+
+  for (const TestCase& test_case : kTestCases) {
+    base::TimeDelta result = base::Milliseconds(
+        web_performance_metrics::CalculateAbsoluteFirstContentfulPaint(
+            test_case.params.frame.navigation_start_time,
+            test_case.params.frame.relative_time));
+    EXPECT_EQ(result, test_case.expected);
+  }
+}
\ No newline at end of file
diff --git a/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature_util.h b/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature_util.h
new file mode 100644
index 0000000..9df7db6
--- /dev/null
+++ b/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature_util.h
@@ -0,0 +1,46 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef IOS_CHROME_BROWSER_WEB_WEB_PERFORMANCE_METRICS_WEB_PERFORMANCE_METRICS_JAVA_SCRIPT_FEATURE_UTIL_H_
+#define IOS_CHROME_BROWSER_WEB_WEB_PERFORMANCE_METRICS_WEB_PERFORMANCE_METRICS_JAVA_SCRIPT_FEATURE_UTIL_H_
+
+#include "base/time/time.h"
+
+namespace web_performance_metrics {
+
+struct FirstContentfulPaint {
+  // The time at which the frame started loading.
+  double navigation_start_time;
+  // The first contentful paint time relative to the frame's
+  // navigation start time.
+  double relative_time;
+  // The sum of the frame's navigation start time and its
+  // first contentful paint.
+  double absolute_time;
+
+  FirstContentfulPaint(double start_time = std::numeric_limits<double>::max(),
+                       double r_time = std::numeric_limits<double>::max(),
+                       double a_time = std::numeric_limits<double>::max())
+      : navigation_start_time(start_time),
+        relative_time(r_time),
+        absolute_time(a_time) {}
+};
+
+// The function calculates the First Contentful Paint
+// across main and subframes that
+// occurred at the earliest point in time relative to the
+// main frame's navigation start time.
+base::TimeDelta CalculateAggregateFirstContentfulPaint(
+    double aggregate_absolute_first_contentful_paint,
+    FirstContentfulPaint main_frame);
+
+// The function calculates the absolute first contentful paint time
+// relative to the given frame's navigation start time.
+double CalculateAbsoluteFirstContentfulPaint(
+    double navigation_start_time,
+    double relative_first_contentful_paint);
+
+}  // namespace web_performance_metrics
+
+#endif  // IOS_CHROME_BROWSER_WEB_WEB_PERFORMANCE_METRICS_WEB_PERFORMANCE_METRICS_JAVA_SCRIPT_FEATURE_UTIL_H_
diff --git a/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature_util.mm b/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature_util.mm
new file mode 100644
index 0000000..324235d
--- /dev/null
+++ b/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature_util.mm
@@ -0,0 +1,34 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature_util.h"
+
+#import <limits>
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+namespace web_performance_metrics {
+
+base::TimeDelta CalculateAggregateFirstContentfulPaint(
+    double aggregate_absolute_first_contentful_paint,
+    web_performance_metrics::FirstContentfulPaint main_frame) {
+  if (aggregate_absolute_first_contentful_paint < main_frame.absolute_time) {
+    // Converts the aggregate absolute iframe's first contentful paint
+    // time to a relative first contenful paint time with respect to
+    // the main frame's navigation start time.
+    return base::Milliseconds(aggregate_absolute_first_contentful_paint -
+                              main_frame.navigation_start_time);
+  }
+  return base::Milliseconds(main_frame.relative_time);
+}
+
+double CalculateAbsoluteFirstContentfulPaint(
+    double navigation_start_time,
+    double relative_first_contentful_paint) {
+  return navigation_start_time + relative_first_contentful_paint;
+}
+
+}
diff --git a/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_tab_helper.h b/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_tab_helper.h
new file mode 100644
index 0000000..809ca6e
--- /dev/null
+++ b/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_tab_helper.h
@@ -0,0 +1,64 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef IOS_CHROME_BROWSER_WEB_WEB_PERFORMANCE_METRICS_WEB_PERFORMANCE_METRICS_TAB_HELPER_H_
+#define IOS_CHROME_BROWSER_WEB_WEB_PERFORMANCE_METRICS_WEB_PERFORMANCE_METRICS_TAB_HELPER_H_
+
+#include <limits>
+
+#include "base/scoped_observation.h"
+#include "ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_java_script_feature_util.h"
+#include "ios/web/public/web_state_observer.h"
+#include "ios/web/public/web_state_user_data.h"
+
+namespace web {
+class WebState;
+}
+
+// A Tab Helper that inherits from the WebStateObserver in order to
+// notify the WebPerformanceMetricsJavaScriptFeature that a web page
+// navigation event has occurred and signals for the feature to log
+// the metrics it has caputered into UMA.
+class WebPerformanceMetricsTabHelper
+    : public web::WebStateObserver,
+      public web::WebStateUserData<WebPerformanceMetricsTabHelper> {
+ public:
+  WebPerformanceMetricsTabHelper(const WebPerformanceMetricsTabHelper&) =
+      delete;
+  WebPerformanceMetricsTabHelper& operator=(
+      const WebPerformanceMetricsTabHelper&) = delete;
+
+  ~WebPerformanceMetricsTabHelper() override;
+
+  // Returns the absolute first contentful paint time aggregated across iframes.
+  double GetAggregateAbsoluteFirstContentfulPaint() const;
+
+  // Sets the absolute first contentful paint time.
+  void SetAggregateAbsoluteFirstContentfulPaint(
+      double absolute_first_contentful_paint);
+
+ private:
+  friend class web::WebStateUserData<WebPerformanceMetricsTabHelper>;
+
+  explicit WebPerformanceMetricsTabHelper(web::WebState* web_state);
+
+  // WebStateObserver::
+  void WebStateDestroyed(web::WebState* web_state) override;
+
+  void DidStartNavigation(web::WebState* web_state,
+                          web::NavigationContext* navigation_context) override;
+
+  // Manages the tab helper's connection to the WebState
+  base::ScopedObservation<web::WebState, web::WebStateObserver>
+      web_state_observation_{this};
+
+  // Stores the earliest absolute First Contentful Paint across a web page's
+  // main and subframes.
+  double aggregate_absolute_first_contentful_paint_ =
+      std::numeric_limits<double>::max();
+
+  WEB_STATE_USER_DATA_KEY_DECL();
+};
+
+#endif  // IOS_CHROME_BROWSER_WEB_WEB_PERFORMANCE_METRICS_WEB_PERFORMANCE_METRICS_TAB_HELPER_H_
\ No newline at end of file
diff --git a/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_tab_helper.mm b/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_tab_helper.mm
new file mode 100644
index 0000000..5550789
--- /dev/null
+++ b/ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_tab_helper.mm
@@ -0,0 +1,40 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "ios/chrome/browser/web/web_performance_metrics/web_performance_metrics_tab_helper.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+WebPerformanceMetricsTabHelper::WebPerformanceMetricsTabHelper(
+    web::WebState* web_state) {
+  web_state_observation_.Observe(web_state);
+}
+
+WebPerformanceMetricsTabHelper::~WebPerformanceMetricsTabHelper() = default;
+
+void WebPerformanceMetricsTabHelper::DidStartNavigation(
+    web::WebState* web_state,
+    web::NavigationContext* navigation_context) {
+  SetAggregateAbsoluteFirstContentfulPaint(std::numeric_limits<double>::max());
+}
+
+void WebPerformanceMetricsTabHelper::WebStateDestroyed(
+    web::WebState* web_state) {
+  web_state_observation_.Reset();
+}
+
+double
+WebPerformanceMetricsTabHelper::GetAggregateAbsoluteFirstContentfulPaint()
+    const {
+  return aggregate_absolute_first_contentful_paint_;
+}
+
+void WebPerformanceMetricsTabHelper::SetAggregateAbsoluteFirstContentfulPaint(
+    double absolute_first_contentful_paint) {
+  aggregate_absolute_first_contentful_paint_ = absolute_first_contentful_paint;
+}
+
+WEB_STATE_USER_DATA_KEY_IMPL(WebPerformanceMetricsTabHelper)
diff --git a/ios/chrome/browser/web_state_list/BUILD.gn b/ios/chrome/browser/web_state_list/BUILD.gn
index e260443..88611efb 100644
--- a/ios/chrome/browser/web_state_list/BUILD.gn
+++ b/ios/chrome/browser/web_state_list/BUILD.gn
@@ -20,6 +20,8 @@
     "active_web_state_observation_forwarder.mm",
     "all_web_state_observation_forwarder.h",
     "all_web_state_observation_forwarder.mm",
+    "web_state_dependency_installation_observer.h",
+    "web_state_dependency_installation_observer.mm",
     "web_state_list.h",
     "web_state_list.mm",
     "web_state_list_delegate.h",
@@ -103,6 +105,7 @@
     "all_web_state_observation_forwarder_unittest.mm",
     "session_metrics_unittest.cc",
     "tab_insertion_browser_agent_unittest.mm",
+    "web_state_dependency_installation_observer_unittest.mm",
     "web_state_list_favicon_driver_observer_unittest.mm",
     "web_state_list_order_controller_unittest.mm",
     "web_state_list_serialization_unittest.mm",
diff --git a/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer.h b/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer.h
new file mode 100644
index 0000000..49dafbea
--- /dev/null
+++ b/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer.h
@@ -0,0 +1,99 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef IOS_CHROME_BROWSER_WEB_STATE_LIST_WEB_STATE_DEPENDENCY_INSTALLATION_OBSERVER_H_
+#define IOS_CHROME_BROWSER_WEB_STATE_LIST_WEB_STATE_DEPENDENCY_INSTALLATION_OBSERVER_H_
+
+#import <Foundation/Foundation.h>
+#import <memory>
+
+#import "base/scoped_observation.h"
+#import "ios/chrome/browser/web_state_list/web_state_list.h"
+#import "ios/chrome/browser/web_state_list/web_state_list_observer.h"
+
+// Objective-C version of DependencyInstaller; see docs for that class.
+@protocol DependencyInstalling <NSObject>
+@optional
+
+- (void)installDependencyForWebState:(web::WebState*)web_state;
+- (void)uninstallDependencyForWebState:(web::WebState*)web_state;
+
+@end
+
+// Interface for classes wishing to install and/or uninstall dependencies
+// (delegates, etc) for each WebState using
+// WebStateDependencyInstallationObserver (below).
+class DependencyInstaller {
+ public:
+  // Serves as a hook for any installation work needed to set up a per-WebState
+  // dependency.
+  virtual void InstallDependency(web::WebState* web_state) {}
+  // Serves as a hook for any cleanup work needed to remove a dependency when it
+  // is no longer needed.
+  virtual void UninstallDependency(web::WebState* web_state) {}
+  virtual ~DependencyInstaller() {}
+};
+
+// Bridge allowing Objective-C classes to act as DependencyInstaller for a
+// WebStateDependencyInstallationObserver.
+class DependencyInstallerBridge : public DependencyInstaller {
+ public:
+  DependencyInstallerBridge(id<DependencyInstalling> installing);
+  ~DependencyInstallerBridge() override {}
+  void InstallDependency(web::WebState* web_state) override;
+  void UninstallDependency(web::WebState* web_state) override;
+
+  DependencyInstallerBridge(const DependencyInstallerBridge&) = delete;
+  DependencyInstallerBridge& operator=(const DependencyInstallerBridge&) =
+      delete;
+
+ private:
+  // The Objective-C class which installs/uninstalls dependencies in response to
+  // forwarded messages.
+  id<DependencyInstalling> installing_;
+};
+
+// Classes wishing to install/uninstall dependencies (such as delegates) for
+// each WebState can create an instance and pass a DependencyInstaller
+// configured to do the installing/uninstalling work. This class acts as a
+// forwarder, listening for changes in the WebStateList and invoking the
+// installation/uninstallation methods as necessary.
+class WebStateDependencyInstallationObserver : public WebStateListObserver {
+ public:
+  WebStateDependencyInstallationObserver(
+      WebStateList* web_state_list,
+      DependencyInstaller* dependency_installer);
+  ~WebStateDependencyInstallationObserver() override;
+
+  // WebStateListObserver:
+  void WebStateInsertedAt(WebStateList* web_state_list,
+                          web::WebState* web_state,
+                          int index,
+                          bool activating) override;
+  void WebStateReplacedAt(WebStateList* web_state_list,
+                          web::WebState* old_web_state,
+                          web::WebState* new_web_state,
+                          int index) override;
+  void WebStateDetachedAt(WebStateList* web_state_list,
+                          web::WebState* web_state,
+                          int index) override;
+
+  WebStateDependencyInstallationObserver(
+      const WebStateDependencyInstallationObserver&) = delete;
+  WebStateDependencyInstallationObserver& operator=(
+      const WebStateDependencyInstallationObserver&) = delete;
+
+ private:
+  // The WebStateList being observed for addition, replacement, and detachment
+  // of WebStates
+  WebStateList* web_state_list_;
+  // The class which installs/uninstalls dependencies in response to changes to
+  // the WebStateList
+  DependencyInstaller* dependency_installer_;
+  // Automatically detaches |this| from the WebStateList when destroyed
+  base::ScopedObservation<WebStateList, WebStateListObserver> observation_{
+      this};
+};
+
+#endif  // IOS_CHROME_BROWSER_WEB_STATE_LIST_WEB_STATE_DEPENDENCY_INSTALLATION_OBSERVER_H_
diff --git a/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer.mm b/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer.mm
new file mode 100644
index 0000000..ad537a1
--- /dev/null
+++ b/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer.mm
@@ -0,0 +1,64 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+#import "ios/chrome/browser/web_state_list/web_state_dependency_installation_observer.h"
+
+DependencyInstallerBridge::DependencyInstallerBridge(
+    id<DependencyInstalling> installing)
+    : installing_(installing) {}
+
+void DependencyInstallerBridge::InstallDependency(web::WebState* web_state) {
+  if ([installing_
+          respondsToSelector:@selector(installDependencyForWebState:)]) {
+    [installing_ installDependencyForWebState:web_state];
+  }
+}
+void DependencyInstallerBridge::UninstallDependency(web::WebState* web_state) {
+  if ([installing_
+          respondsToSelector:@selector(uninstallDependencyForWebState:)]) {
+    [installing_ uninstallDependencyForWebState:web_state];
+  }
+}
+
+WebStateDependencyInstallationObserver::WebStateDependencyInstallationObserver(
+    WebStateList* web_state_list,
+    DependencyInstaller* dependency_installer)
+    : web_state_list_(web_state_list),
+      dependency_installer_(dependency_installer) {
+  observation_.Observe(web_state_list_);
+  for (int i = 0; i < web_state_list_->count(); i++) {
+    dependency_installer_->InstallDependency(web_state_list_->GetWebStateAt(i));
+  }
+}
+
+WebStateDependencyInstallationObserver::
+    ~WebStateDependencyInstallationObserver() {}
+
+void WebStateDependencyInstallationObserver::WebStateInsertedAt(
+    WebStateList* web_state_list,
+    web::WebState* web_state,
+    int index,
+    bool activating) {
+  dependency_installer_->InstallDependency(web_state);
+}
+
+void WebStateDependencyInstallationObserver::WebStateReplacedAt(
+    WebStateList* web_state_list,
+    web::WebState* old_web_state,
+    web::WebState* new_web_state,
+    int index) {
+  dependency_installer_->UninstallDependency(old_web_state);
+  dependency_installer_->InstallDependency(new_web_state);
+}
+
+void WebStateDependencyInstallationObserver::WebStateDetachedAt(
+    WebStateList* web_state_list,
+    web::WebState* web_state,
+    int index) {
+  dependency_installer_->UninstallDependency(web_state);
+}
diff --git a/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer_unittest.mm b/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer_unittest.mm
new file mode 100644
index 0000000..3e1d94f
--- /dev/null
+++ b/ios/chrome/browser/web_state_list/web_state_dependency_installation_observer_unittest.mm
@@ -0,0 +1,90 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "ios/chrome/browser/web_state_list/web_state_dependency_installation_observer.h"
+
+#import <memory>
+#import <set>
+
+#import "ios/chrome/browser/web_state_list/web_state_list.h"
+#import "ios/chrome/browser/web_state_list/web_state_list_delegate.h"
+#import "ios/chrome/browser/web_state_list/web_state_opener.h"
+#import "ios/web/public/test/fakes/fake_web_state.h"
+#import "testing/gtest_mac.h"
+#import "testing/platform_test.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+// DependencyInstaller which simply tracks which WebStates have been passed to
+// the install/uninstall methods.
+class FakeDependencyInstaller : public DependencyInstaller {
+ public:
+  void InstallDependency(web::WebState* web_state) override {
+    installed_.insert(web_state);
+  }
+  void UninstallDependency(web::WebState* web_state) override {
+    uninstalled_.insert(web_state);
+  }
+  ~FakeDependencyInstaller() override {}
+
+  bool WasInstalled(web::WebState* web_state) {
+    return installed_.count(web_state);
+  }
+
+  bool WasUninstalled(web::WebState* web_state) {
+    return uninstalled_.count(web_state);
+  }
+
+ private:
+  std::set<web::WebState*> installed_;
+  std::set<web::WebState*> uninstalled_;
+};
+
+class WebStateDependencyInstallationObserverTest : public PlatformTest,
+                                                   public WebStateListDelegate {
+ public:
+  WebStateDependencyInstallationObserverTest() : web_state_list_(this) {}
+
+  // WebStateListDelegate.
+  void WillAddWebState(web::WebState* web_state) override {}
+  void WebStateDetached(web::WebState* web_state) override {}
+
+ protected:
+  WebStateList web_state_list_;
+  FakeDependencyInstaller installer_;
+};
+
+TEST_F(WebStateDependencyInstallationObserverTest,
+       InsertReplaceAndRemoveWebState) {
+  WebStateDependencyInstallationObserver observer(&web_state_list_,
+                                                  &installer_);
+  auto web_state_1 = std::make_unique<web::FakeWebState>();
+  web::WebState* web_state_1_raw = web_state_1.get();
+
+  EXPECT_FALSE(installer_.WasInstalled(web_state_1_raw));
+  web_state_list_.InsertWebState(0, std::move(web_state_1),
+                                 WebStateList::INSERT_ACTIVATE,
+                                 WebStateOpener());
+  EXPECT_TRUE(installer_.WasInstalled(web_state_1_raw));
+  EXPECT_FALSE(installer_.WasUninstalled(web_state_1_raw));
+
+  auto web_state_2 = std::make_unique<web::FakeWebState>();
+  web::WebState* web_state_2_raw = web_state_2.get();
+  web_state_list_.ReplaceWebStateAt(0, std::move(web_state_2));
+  EXPECT_TRUE(installer_.WasUninstalled(web_state_1_raw));
+  EXPECT_TRUE(installer_.WasInstalled(web_state_2_raw));
+}
+
+TEST_F(WebStateDependencyInstallationObserverTest,
+       RespectsPreexistingWebState) {
+  auto web_state = std::make_unique<web::FakeWebState>();
+  web::WebState* web_state_raw = web_state.get();
+  web_state_list_.InsertWebState(
+      0, std::move(web_state), WebStateList::INSERT_ACTIVATE, WebStateOpener());
+  WebStateDependencyInstallationObserver observer(&web_state_list_,
+                                                  &installer_);
+  EXPECT_TRUE(installer_.WasInstalled(web_state_raw));
+}
diff --git a/ios/chrome/test/BUILD.gn b/ios/chrome/test/BUILD.gn
index a28072d..56ca34e 100644
--- a/ios/chrome/test/BUILD.gn
+++ b/ios/chrome/test/BUILD.gn
@@ -122,6 +122,7 @@
     "//ios/chrome/browser:chrome_paths",
     "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/browser_state:browser_state_impl",
+    "//ios/chrome/browser/web/web_performance_metrics:unit_tests",
     "//ios/chrome/test:test_support",
     "//ios/components/webui:url_constants",
     "//ios/public/provider/chrome/browser",
diff --git a/net/data/ssl/certificates/900_days_after_2019_07_01.pem b/net/data/ssl/certificates/900_days_after_2019_07_01.pem
index 337df27..a70bcbd 100644
--- a/net/data/ssl/certificates/900_days_after_2019_07_01.pem
+++ b/net/data/ssl/certificates/900_days_after_2019_07_01.pem
@@ -2,41 +2,41 @@
     Data:
         Version: 3 (0x2)
         Serial Number:
-            12:f6:d9:f1:80:1b:50:9f:64:09:c8:ea:2f:16:33:c2
+            97:a2:ec:ef:8c:1f:34:bb:02:1d:83:75:90:67:0b:26
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=California, L=Mountain View, O=Test CA, CN=Test Root CA
         Validity
-            Not Before: Jul  1 00:00:00 2019 GMT
-            Not After : Dec 17 00:00:00 2021 GMT
+            Not Before: Dec  2 02:29:26 2021 GMT
+            Not After : May 20 02:29:26 2024 GMT
         Subject: C=US, ST=California, L=Mountain View, O=Test CA, CN=127.0.0.1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 RSA Public-Key: (2048 bit)
                 Modulus:
-                    00:a4:01:2d:0e:2e:a3:25:4c:21:58:79:4e:75:4e:
-                    c2:85:0d:3f:1e:ee:ee:6b:28:c1:13:92:9b:55:83:
-                    06:30:c4:ab:01:ab:e8:53:7e:75:4f:be:97:48:82:
-                    8e:34:c4:6d:c0:12:33:8e:0f:0e:e2:84:c7:ad:1a:
-                    67:82:26:e0:21:b8:ef:3c:0b:b0:09:8e:35:1a:5f:
-                    61:c3:16:d7:33:0a:2b:4e:f9:cd:4f:da:8c:21:ad:
-                    8e:5b:1a:47:d4:78:89:e7:01:df:75:af:df:04:fe:
-                    07:f0:93:2b:20:f1:e9:b5:3b:98:bd:61:01:c4:c4:
-                    e9:0a:86:d8:dd:73:50:db:3f:a0:3c:3b:4c:9b:d5:
-                    5b:4f:42:a6:e4:76:9b:b9:26:d0:9f:c5:97:c6:1b:
-                    b5:9d:51:93:73:f4:ba:02:37:96:03:ef:ec:3a:ca:
-                    34:a2:1b:83:48:a4:82:7a:5a:ac:22:6c:5e:a7:e0:
-                    af:d6:56:dc:d2:d8:31:3f:c2:14:b9:36:52:bc:bc:
-                    ac:d3:7b:09:54:7a:b2:76:3d:03:a9:13:67:ab:0d:
-                    b2:3d:6b:e7:be:97:8a:3b:cc:6a:f2:00:de:e9:05:
-                    a5:b7:46:0e:7c:30:7b:4f:2f:01:6d:8b:bd:98:4e:
-                    20:c3:ec:eb:c5:16:eb:31:f5:02:25:9a:0b:50:ec:
-                    d4:13
+                    00:9c:80:4b:13:19:37:bf:ef:3f:08:23:f2:49:29:
+                    19:ee:17:ae:f0:c5:38:6c:44:a8:5b:8d:6b:64:c3:
+                    35:a3:68:3f:86:32:f3:91:f9:0c:04:05:af:7f:56:
+                    58:47:99:cb:2e:1d:dd:52:29:83:11:55:ed:17:e3:
+                    49:02:b8:fd:aa:9a:db:76:ba:62:c8:df:fb:d7:05:
+                    23:3d:3b:07:4c:19:b7:01:8e:5b:30:49:4f:fa:43:
+                    82:f5:17:06:47:52:da:c2:93:80:3e:dc:8c:a6:fd:
+                    26:70:e1:c3:12:83:9b:c3:2e:ac:af:49:e8:ce:31:
+                    df:4d:64:23:5c:7c:cd:1e:d3:6e:f9:4b:b1:ab:d1:
+                    6c:45:32:b0:48:31:60:57:57:dd:f5:d5:af:02:7f:
+                    d7:ec:cf:92:16:7e:d8:7e:a6:3a:d6:94:7d:6b:ab:
+                    02:a9:81:83:68:b7:56:24:41:e8:5e:39:5c:1e:e6:
+                    7e:c4:58:04:19:e0:b0:03:67:12:81:1c:17:ac:08:
+                    d9:49:b6:b7:5b:d2:0d:fd:46:fd:8c:b4:d1:b5:4d:
+                    c7:9a:fb:5d:ab:b0:a5:9b:c6:d2:62:39:56:d0:d6:
+                    a6:ef:6f:07:35:d4:08:6f:aa:0a:6d:8c:9e:83:8a:
+                    8f:5f:31:b4:1c:78:7e:d8:71:0a:c2:aa:74:17:b8:
+                    4b:97
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: critical
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                26:66:03:97:4C:35:D2:1C:5E:10:06:EF:69:F8:D5:86:5C:1C:10:7A
+                B9:33:59:57:E2:07:76:38:A7:D6:4A:43:19:79:AF:54:65:E9:7B:E2
             X509v3 Authority Key Identifier: 
                 keyid:9B:26:0B:8A:98:A9:BB:1D:B9:1F:1C:E3:1A:40:33:ED:8E:17:88:AB
 
@@ -45,41 +45,41 @@
             X509v3 Subject Alternative Name: 
                 IP Address:127.0.0.1
     Signature Algorithm: sha256WithRSAEncryption
-         07:49:e3:70:af:b1:b9:8a:68:73:47:8f:6c:ee:92:a8:a3:dc:
-         3e:db:56:59:ce:88:e2:09:45:f3:1d:45:7d:56:c6:c5:23:f8:
-         dc:f4:9d:66:d3:8d:76:48:5d:46:d1:23:6a:5d:c1:85:5e:cf:
-         ca:78:33:42:0e:d7:9d:e6:e4:59:59:8a:ef:6a:cb:89:f3:5f:
-         5c:35:69:8a:7d:c2:f3:ee:27:8a:98:2e:3e:7b:1f:9d:3b:d1:
-         de:07:a9:15:d1:f4:6d:b1:eb:1b:13:d4:27:ec:2e:77:e3:2a:
-         e9:00:58:43:d3:83:7a:d8:a2:aa:82:36:3a:7e:d0:40:e1:32:
-         f0:43:ad:f3:32:73:14:a2:be:35:5f:a6:dc:e5:93:58:03:f3:
-         fa:24:3f:fc:81:f2:62:c4:87:dc:9b:71:a2:e9:a3:7a:9d:28:
-         b1:6a:ad:8b:13:51:99:f0:b2:54:4b:66:2b:2e:2c:5a:02:4b:
-         66:14:e0:a2:9f:15:a0:fd:40:b7:25:f4:9c:9f:2c:bc:25:5d:
-         8d:94:17:1b:af:f6:ec:4d:0a:d8:60:03:04:ec:6c:0c:5a:9a:
-         3d:5e:96:d1:a0:e2:7b:d8:34:e0:26:84:03:dc:11:d9:d4:ff:
-         ee:24:aa:eb:23:0a:8c:d0:c0:0b:76:1f:a9:e6:2a:0f:9d:c5:
-         3c:fe:a1:44
+         a6:e1:c0:06:0f:64:8c:50:54:38:9a:2a:19:38:6e:ce:12:bb:
+         a1:4b:2e:62:39:a6:dd:e3:7e:3a:c2:f6:93:40:d1:b4:22:c8:
+         f2:53:82:48:46:77:66:20:31:65:fd:03:9c:38:92:a9:38:4a:
+         df:65:fb:c1:ec:c6:33:ce:94:53:eb:20:1c:5e:66:22:8a:c4:
+         b6:ce:f2:91:e6:58:21:dc:5a:f3:c1:69:37:1a:ad:03:e9:28:
+         dc:cb:ee:29:8d:73:6f:c3:a3:7c:f6:66:99:d1:c0:5a:2c:3e:
+         79:9d:3c:df:f4:de:83:a2:aa:63:7c:e6:d3:ae:23:2a:47:61:
+         15:54:d3:da:fb:c5:c3:a2:db:69:45:76:f0:f9:e0:9c:06:ab:
+         e7:20:96:a4:b5:8d:08:54:c1:37:da:27:84:d2:8e:b2:60:a9:
+         e6:d6:42:31:20:58:70:22:3e:66:2a:33:da:5f:09:64:f2:dc:
+         c6:a3:e2:b0:56:7b:a1:31:aa:cc:82:e8:a7:a7:8d:85:ad:01:
+         ac:d3:1d:ec:27:63:44:ea:ce:c2:fe:e9:6e:4d:43:11:57:dd:
+         a5:27:b3:0d:88:ad:eb:e1:60:09:0d:c9:c5:62:be:8c:ff:24:
+         eb:c7:42:b4:45:5f:23:20:0b:63:4b:81:e8:cc:57:bc:a9:88:
+         15:b6:af:20
 -----BEGIN CERTIFICATE-----
-MIIDzjCCAragAwIBAgIQEvbZ8YAbUJ9kCcjqLxYzwjANBgkqhkiG9w0BAQsFADBj
-MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91
-bnRhaW4gVmlldzEQMA4GA1UECgwHVGVzdCBDQTEVMBMGA1UEAwwMVGVzdCBSb290
-IENBMB4XDTE5MDcwMTAwMDAwMFoXDTIxMTIxNzAwMDAwMFowYDELMAkGA1UEBhMC
-VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDU1vdW50YWluIFZpZXcx
-EDAOBgNVBAoMB1Rlc3QgQ0ExEjAQBgNVBAMMCTEyNy4wLjAuMTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKQBLQ4uoyVMIVh5TnVOwoUNPx7u7msowROS
-m1WDBjDEqwGr6FN+dU++l0iCjjTEbcASM44PDuKEx60aZ4Im4CG47zwLsAmONRpf
-YcMW1zMKK075zU/ajCGtjlsaR9R4iecB33Wv3wT+B/CTKyDx6bU7mL1hAcTE6QqG
-2N1zUNs/oDw7TJvVW09CpuR2m7km0J/Fl8YbtZ1Rk3P0ugI3lgPv7DrKNKIbg0ik
-gnparCJsXqfgr9ZW3NLYMT/CFLk2Ury8rNN7CVR6snY9A6kTZ6sNsj1r576XijvM
-avIA3ukFpbdGDnwwe08vAW2LvZhOIMPs68UW6zH1AiWaC1Ds1BMCAwEAAaOBgDB+
-MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFCZmA5dMNdIcXhAG72n41YZcHBB6MB8G
-A1UdIwQYMBaAFJsmC4qYqbsduR8c4xpAM+2OF4irMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAPBgNVHREECDAGhwR/AAABMA0GCSqGSIb3DQEBCwUAA4IB
-AQAHSeNwr7G5imhzR49s7pKoo9w+21ZZzojiCUXzHUV9VsbFI/jc9J1m0412SF1G
-0SNqXcGFXs/KeDNCDted5uRZWYrvasuJ819cNWmKfcLz7ieKmC4+ex+dO9HeB6kV
-0fRtsesbE9Qn7C534yrpAFhD04N62KKqgjY6ftBA4TLwQ63zMnMUor41X6bc5ZNY
-A/P6JD/8gfJixIfcm3Gi6aN6nSixaq2LE1GZ8LJUS2YrLixaAktmFOCinxWg/UC3
-JfScnyy8JV2NlBcbr/bsTQrYYAME7GwMWpo9XpbRoOJ72DTgJoQD3BHZ1P/uJKrr
-IwqM0MALdh+p5ioPncU8/qFE
+MIIDzzCCAregAwIBAgIRAJei7O+MHzS7Ah2DdZBnCyYwDQYJKoZIhvcNAQELBQAw
+YzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDU1v
+dW50YWluIFZpZXcxEDAOBgNVBAoMB1Rlc3QgQ0ExFTATBgNVBAMMDFRlc3QgUm9v
+dCBDQTAeFw0yMTEyMDIwMjI5MjZaFw0yNDA1MjAwMjI5MjZaMGAxCzAJBgNVBAYT
+AlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3
+MRAwDgYDVQQKDAdUZXN0IENBMRIwEAYDVQQDDAkxMjcuMC4wLjEwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcgEsTGTe/7z8II/JJKRnuF67wxThsRKhb
+jWtkwzWjaD+GMvOR+QwEBa9/VlhHmcsuHd1SKYMRVe0X40kCuP2qmtt2umLI3/vX
+BSM9OwdMGbcBjlswSU/6Q4L1FwZHUtrCk4A+3Iym/SZw4cMSg5vDLqyvSejOMd9N
+ZCNcfM0e0275S7Gr0WxFMrBIMWBXV9311a8Cf9fsz5IWfth+pjrWlH1rqwKpgYNo
+t1YkQeheOVwe5n7EWAQZ4LADZxKBHBesCNlJtrdb0g39Rv2MtNG1Tcea+12rsKWb
+xtJiOVbQ1qbvbwc11AhvqgptjJ6Dio9fMbQceH7YcQrCqnQXuEuXAgMBAAGjgYAw
+fjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBS5M1lX4gd2OKfWSkMZea9UZel74jAf
+BgNVHSMEGDAWgBSbJguKmKm7HbkfHOMaQDPtjheIqzAdBgNVHSUEFjAUBggrBgEF
+BQcDAQYIKwYBBQUHAwIwDwYDVR0RBAgwBocEfwAAATANBgkqhkiG9w0BAQsFAAOC
+AQEApuHABg9kjFBUOJoqGThuzhK7oUsuYjmm3eN+OsL2k0DRtCLI8lOCSEZ3ZiAx
+Zf0DnDiSqThK32X7wezGM86UU+sgHF5mIorEts7ykeZYIdxa88FpNxqtA+ko3Mvu
+KY1zb8OjfPZmmdHAWiw+eZ083/Teg6KqY3zm064jKkdhFVTT2vvFw6LbaUV28Png
+nAar5yCWpLWNCFTBN9onhNKOsmCp5tZCMSBYcCI+Zioz2l8JZPLcxqPisFZ7oTGq
+zILop6eNha0BrNMd7CdjROrOwv7pbk1DEVfdpSezDYit6+FgCQ3JxWK+jP8k68dC
+tEVfIyALY0uB6MxXvKmIFbavIA==
 -----END CERTIFICATE-----
diff --git a/net/data/ssl/scripts/generate-test-certs.sh b/net/data/ssl/scripts/generate-test-certs.sh
index f8fa1e8..acd0fdc 100755
--- a/net/data/ssl/scripts/generate-test-certs.sh
+++ b/net/data/ssl/scripts/generate-test-certs.sh
@@ -645,8 +645,7 @@
   openssl ca \
     -batch \
     -extensions user_cert \
-    -startdate 190701000000Z \
-    -enddate   211217000000Z \
+    -days 900 \
     -in out/900_days_after_2019_07_01.req \
     -out ../certificates/900_days_after_2019_07_01.pem \
     -config ca.cnf
diff --git a/net/dns/host_resolver.cc b/net/dns/host_resolver.cc
index 68b8ed6..fc3112f 100644
--- a/net/dns/host_resolver.cc
+++ b/net/dns/host_resolver.cc
@@ -270,20 +270,8 @@
 std::vector<HostResolverEndpointResult>
 HostResolver::AddressListToEndpointResults(const AddressList& address_list) {
   HostResolverEndpointResult connection_endpoint;
-  for (const IPEndPoint& endpoint : address_list.endpoints()) {
-    switch (endpoint.GetFamily()) {
-      case ADDRESS_FAMILY_IPV4:
-        connection_endpoint.ipv4_endpoints.push_back(endpoint);
-        break;
-      case ADDRESS_FAMILY_IPV6:
-        connection_endpoint.ipv6_endpoints.push_back(endpoint);
-        break;
-      default:
-        // Conversion to ConnectionEndpoints only allowed when AddressList
-        // contains only IP addresses.
-        NOTREACHED();
-    }
-  }
+
+  connection_endpoint.ip_endpoints = address_list.endpoints();
 
   // AddressList always assumes a single alias name. Not completely accurate to
   // assume it is valid for both address families, but only as inaccurate as
diff --git a/net/dns/host_resolver_manager_unittest.cc b/net/dns/host_resolver_manager_unittest.cc
index ef5d3f90..42630ff 100644
--- a/net/dns/host_resolver_manager_unittest.cc
+++ b/net/dns/host_resolver_manager_unittest.cc
@@ -796,10 +796,9 @@
   EXPECT_THAT(v6_response.result_error(), IsOk());
   EXPECT_THAT(v6_response.request()->GetAddressResults().value().endpoints(),
               testing::ElementsAre(CreateExpected("::5", 80)));
-  EXPECT_THAT(
-      v6_response.request()->GetEndpointResults(),
-      testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-          IsEmpty(), _, testing::ElementsAre(CreateExpected("::5", 80))))));
+  EXPECT_THAT(v6_response.request()->GetEndpointResults(),
+              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
+                  testing::ElementsAre(CreateExpected("::5", 80))))));
 }
 
 TEST_F(HostResolverManagerTest, DnsQueryWithoutAliases) {
@@ -844,10 +843,9 @@
   EXPECT_THAT(v4_v6_response.result_error(), IsOk());
   EXPECT_THAT(v4_v6_response.request()->GetAddressResults().value().endpoints(),
               testing::ElementsAre(CreateExpected("::1", 80)));
-  EXPECT_THAT(
-      v4_v6_response.request()->GetEndpointResults(),
-      testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-          IsEmpty(), _, testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(v4_v6_response.request()->GetEndpointResults(),
+              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
+                  testing::ElementsAre(CreateExpected("::1", 80))))));
 
   ResolveHostResponseHelper v4_unsp_response(resolver_->CreateRequest(
       HostPortPair("localhost", 80), NetworkIsolationKey(), NetLogWithSource(),
@@ -857,10 +855,11 @@
       v4_unsp_response.request()->GetAddressResults().value().endpoints(),
       testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                     CreateExpected("::1", 80)));
-  EXPECT_THAT(v4_unsp_response.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      v4_unsp_response.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 }
 
 TEST_F(HostResolverManagerTest, ResolveIPLiteralWithHostResolverSystemOnly) {
@@ -1000,12 +999,10 @@
   EXPECT_THAT(response.result_error(), IsOk());
   EXPECT_THAT(response.request()->GetAddressResults().value().endpoints(),
               testing::ElementsAre(CreateExpected("2001:db8::1", 5555)));
-  EXPECT_THAT(
-      response.request()->GetEndpointResults(),
-      testing::Optional(testing::UnorderedElementsAre(
-          ExpectEndpointResult(IsEmpty(), _,
-                               testing::UnorderedElementsAre(
-                                   CreateExpected("2001:db8::1", 5555))))));
+  EXPECT_THAT(response.request()->GetEndpointResults(),
+              testing::Optional(testing::UnorderedElementsAre(
+                  ExpectEndpointResult(testing::UnorderedElementsAre(
+                      CreateExpected("2001:db8::1", 5555))))));
 }
 
 TEST_F(HostResolverManagerTest, NumericIPv6AddressWithScheme) {
@@ -1017,12 +1014,10 @@
   EXPECT_THAT(response.result_error(), IsOk());
   EXPECT_THAT(response.request()->GetAddressResults().value().endpoints(),
               testing::ElementsAre(CreateExpected("2001:db8::1", 5555)));
-  EXPECT_THAT(
-      response.request()->GetEndpointResults(),
-      testing::Optional(testing::UnorderedElementsAre(
-          ExpectEndpointResult(IsEmpty(), _,
-                               testing::UnorderedElementsAre(
-                                   CreateExpected("2001:db8::1", 5555))))));
+  EXPECT_THAT(response.request()->GetEndpointResults(),
+              testing::Optional(testing::UnorderedElementsAre(
+                  ExpectEndpointResult(testing::UnorderedElementsAre(
+                      CreateExpected("2001:db8::1", 5555))))));
 }
 
 TEST_F(HostResolverManagerTest, EmptyHost) {
@@ -2155,7 +2150,7 @@
   EXPECT_THAT(
       v6_v6_request.request()->GetEndpointResults(),
       testing::Optional(testing::UnorderedElementsAre(ExpectEndpointResult(
-          IsEmpty(), _, testing::ElementsAre(CreateExpected("::1", 80))))));
+          testing::ElementsAre(CreateExpected("::1", 80))))));
 
   ResolveHostResponseHelper v6_unsp_request(resolver_->CreateRequest(
       HostPortPair("::1", 80), NetworkIsolationKey(), NetLogWithSource(),
@@ -2167,7 +2162,7 @@
   EXPECT_THAT(
       v6_unsp_request.request()->GetEndpointResults(),
       testing::Optional(testing::UnorderedElementsAre(ExpectEndpointResult(
-          IsEmpty(), _, testing::ElementsAre(CreateExpected("::1", 80))))));
+          testing::ElementsAre(CreateExpected("::1", 80))))));
 }
 
 TEST_F(HostResolverManagerTest, LocalOnly_FromCache) {
@@ -3024,10 +3019,10 @@
           CreateExpected("000a:0000:0000:0000:0001:0002:0003:0004", 80)));
   EXPECT_THAT(
       response.request()->GetEndpointResults(),
-      testing::Optional(testing::UnorderedElementsAre(ExpectEndpointResult(
-          testing::ElementsAre(CreateExpected("1.2.3.4", 80)), _,
-          testing::ElementsAre(CreateExpected(
-              "000a:0000:0000:0000:0001:0002:0003:0004", 80))))));
+      testing::Optional(testing::UnorderedElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("000a:0000:0000:0000:0001:0002:0003:0004", 80),
+              CreateExpected("1.2.3.4", 80))))));
   EXPECT_FALSE(response.request()->GetTextResults());
   EXPECT_FALSE(response.request()->GetHostnameResults());
   EXPECT_FALSE(response.request()->GetExperimentalResultsForTesting());
@@ -3056,12 +3051,10 @@
   EXPECT_THAT(response.request()->GetAddressResults().value().endpoints(),
               testing::ElementsAre(CreateExpected(
                   "000a:0000:0000:0000:0001:0002:0003:0004", 80)));
-  EXPECT_THAT(
-      response.request()->GetEndpointResults(),
-      testing::Optional(testing::UnorderedElementsAre(ExpectEndpointResult(
-          IsEmpty(), _,
-          testing::ElementsAre(CreateExpected(
-              "000a:0000:0000:0000:0001:0002:0003:0004", 80))))));
+  EXPECT_THAT(response.request()->GetEndpointResults(),
+              testing::Optional(testing::UnorderedElementsAre(
+                  ExpectEndpointResult(testing::ElementsAre(CreateExpected(
+                      "000a:0000:0000:0000:0001:0002:0003:0004", 80))))));
 }
 
 TEST_F(HostResolverManagerTest, Mdns_Txt) {
@@ -4464,10 +4457,11 @@
       response_dns_client.request()->GetAddressResults().value().endpoints(),
       testing::UnorderedElementsAre(CreateExpected("::1", 1212),
                                     CreateExpected("127.0.0.1", 1212)));
-  EXPECT_THAT(response_dns_client.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 1212)), _,
-                  testing::ElementsAre(CreateExpected("::1", 1212))))));
+  EXPECT_THAT(
+      response_dns_client.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(ExpectEndpointResult(
+          testing::UnorderedElementsAre(CreateExpected("::1", 1212),
+                                        CreateExpected("127.0.0.1", 1212))))));
 }
 
 TEST_F(HostResolverManagerDnsTest, UseProcTaskWhenPrivateDnsActive) {
@@ -4508,10 +4502,11 @@
   EXPECT_THAT(response0.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(response0.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response0.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 
   ResolveHostResponseHelper response1(resolver_->CreateRequest(
       HostPortPair("localhost", 80), NetworkIsolationKey(), NetLogWithSource(),
@@ -4520,10 +4515,11 @@
   EXPECT_THAT(response1.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(response1.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response1.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 
   ResolveHostResponseHelper response2(resolver_->CreateRequest(
       HostPortPair("localhost.", 80), NetworkIsolationKey(), NetLogWithSource(),
@@ -4532,10 +4528,11 @@
   EXPECT_THAT(response2.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(response2.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response2.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 }
 
 // RFC 6761 localhost names should always resolve to loopback, even if a HOSTS
@@ -4558,10 +4555,11 @@
   EXPECT_THAT(response0.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(response0.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response0.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 
   ResolveHostResponseHelper response1(resolver_->CreateRequest(
       HostPortPair("foo.localhost", 80), NetworkIsolationKey(),
@@ -4571,10 +4569,11 @@
   EXPECT_THAT(response1.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(response1.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response1.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 }
 
 // Test successful and fallback resolutions in HostResolverManager::DnsTask.
@@ -4611,10 +4610,11 @@
   EXPECT_THAT(response0.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(response0.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response0.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 
   // Fallback to ProcTask.
   EXPECT_THAT(response1.result_error(), IsError(ERR_NAME_NOT_RESOLVED));
@@ -4639,10 +4639,11 @@
   EXPECT_THAT(response.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(response.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 }
 
 // Test successful and failing resolutions in HostResolverManager::DnsTask when
@@ -4690,10 +4691,11 @@
   EXPECT_THAT(response0.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(response0.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response0.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
   // Fallback to ProcTask is disabled.
   EXPECT_THAT(response1.result_error(), IsError(ERR_NAME_NOT_RESOLVED));
 }
@@ -4878,10 +4880,11 @@
       response_secure.request()->GetAddressResults().value().endpoints(),
       testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                     CreateExpected("::1", 80)));
-  EXPECT_THAT(response_secure.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response_secure.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 }
 
 TEST_F(HostResolverManagerDnsTest, DnsTaskUnspec) {
@@ -4921,10 +4924,11 @@
   EXPECT_THAT(responses[0]->request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(responses[0]->request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      responses[0]->request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
   EXPECT_THAT(responses[1]->request()->GetAddressResults().value().endpoints(),
               testing::ElementsAre(CreateExpected("127.0.0.1", 80)));
   EXPECT_THAT(responses[1]->request()->GetEndpointResults(),
@@ -4932,10 +4936,9 @@
                   testing::ElementsAre(CreateExpected("127.0.0.1", 80))))));
   EXPECT_THAT(responses[2]->request()->GetAddressResults().value().endpoints(),
               testing::ElementsAre(CreateExpected("::1", 80)));
-  EXPECT_THAT(
-      responses[2]->request()->GetEndpointResults(),
-      testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-          IsEmpty(), _, testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(responses[2]->request()->GetEndpointResults(),
+              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
+                  testing::ElementsAre(CreateExpected("::1", 80))))));
   EXPECT_THAT(responses[3]->request()->GetAddressResults().value().endpoints(),
               testing::ElementsAre(CreateExpected("192.168.1.101", 80)));
   EXPECT_THAT(responses[3]->request()->GetEndpointResults(),
@@ -4966,7 +4969,6 @@
               testing::ElementsAre(CreateExpected("::127.0.53.53", 80)));
   EXPECT_THAT(response_ipv6.request()->GetEndpointResults(),
               testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  IsEmpty(), _,
                   testing::ElementsAre(CreateExpected("::127.0.53.53", 80))))));
 }
 
@@ -5014,10 +5016,9 @@
   EXPECT_THAT(response_ipv6.result_error(), IsOk());
   EXPECT_THAT(response_ipv6.request()->GetAddressResults().value().endpoints(),
               testing::ElementsAre(CreateExpected("::1", 80)));
-  EXPECT_THAT(
-      response_ipv6.request()->GetEndpointResults(),
-      testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-          IsEmpty(), _, testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(response_ipv6.request()->GetEndpointResults(),
+              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
+                  testing::ElementsAre(CreateExpected("::1", 80))))));
   EXPECT_FALSE(response_ipv6.request()->GetDnsAliasResults());
 
   ResolveHostResponseHelper response_both(resolver_->CreateRequest(
@@ -5027,10 +5028,11 @@
   EXPECT_THAT(response_both.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(response_both.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response_both.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
   EXPECT_FALSE(response_both.request()->GetDnsAliasResults());
 
   // Requests with specified DNS query type.
@@ -5061,10 +5063,9 @@
                   .value()
                   .endpoints(),
               testing::ElementsAre(CreateExpected("::1", 80)));
-  EXPECT_THAT(
-      response_specified_ipv6.request()->GetEndpointResults(),
-      testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-          IsEmpty(), _, testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(response_specified_ipv6.request()->GetEndpointResults(),
+              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
+                  testing::ElementsAre(CreateExpected("::1", 80))))));
   EXPECT_FALSE(response_specified_ipv6.request()->GetDnsAliasResults());
 
   // Request with upper case.
@@ -5354,10 +5355,11 @@
   EXPECT_THAT(response.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("1.2.3.4", 500),
                                             CreateExpected("::5", 500)));
-  EXPECT_THAT(response.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("1.2.3.4", 500)), _,
-                  testing::ElementsAre(CreateExpected("::5", 500))))));
+  EXPECT_THAT(
+      response.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::5", 500), CreateExpected("1.2.3.4", 500))))));
 }
 
 TEST_F(HostResolverManagerDnsTest, Ipv6Unreachable_UseLocalIpv6) {
@@ -5376,10 +5378,11 @@
   EXPECT_THAT(response1.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 500),
                                             CreateExpected("::1", 500)));
-  EXPECT_THAT(response1.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 500)), _,
-                  testing::ElementsAre(CreateExpected("::1", 500))))));
+  EXPECT_THAT(
+      response1.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 500), CreateExpected("127.0.0.1", 500))))));
 
   // Set |use_local_ipv6| to false. Expect only IPv4 results.
   config.use_local_ipv6 = false;
@@ -5419,10 +5422,11 @@
       system_response.request()->GetAddressResults().value().endpoints(),
       testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                     CreateExpected("::1", 80)));
-  EXPECT_THAT(system_response.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      system_response.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 
   // With DnsClient
   UseMockDnsClient(CreateValidDnsConfig(), CreateDefaultDnsRules());
@@ -5434,10 +5438,11 @@
       builtin_response.request()->GetAddressResults().value().endpoints(),
       testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                     CreateExpected("::1", 80)));
-  EXPECT_THAT(builtin_response.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      builtin_response.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 
   // DnsClient configured without ipv6 (but ipv6 should still work for
   // localhost).
@@ -5452,10 +5457,11 @@
       ipv6_disabled_response.request()->GetAddressResults().value().endpoints(),
       testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                     CreateExpected("::1", 80)));
-  EXPECT_THAT(ipv6_disabled_response.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      ipv6_disabled_response.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 }
 
 TEST_F(HostResolverManagerDnsTest, SeparateJobsBySecureDnsMode) {
@@ -5632,10 +5638,11 @@
   EXPECT_THAT(response.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(response.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 
   DestroyResolver();
 
@@ -5643,10 +5650,11 @@
   EXPECT_THAT(response.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(response.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 }
 
 TEST_F(HostResolverManagerDnsTest, ExplicitCancel) {
@@ -5685,10 +5693,11 @@
   EXPECT_THAT(response.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(response.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 
   response.request()->Cancel();
 
@@ -5696,10 +5705,11 @@
   EXPECT_THAT(response.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(response.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 }
 
 // Cancel a request with only the IPv6 transaction active.
@@ -5853,10 +5863,11 @@
   EXPECT_THAT(responses[0]->request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(responses[0]->request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      responses[0]->request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 
   EXPECT_THAT(responses[1]->result_error(), IsOk());
   EXPECT_THAT(responses[1]->request()->GetAddressResults().value().endpoints(),
@@ -5943,10 +5954,11 @@
       response_secure.request()->GetAddressResults().value().endpoints(),
       testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                     CreateExpected("::1", 80)));
-  EXPECT_THAT(response_secure.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response_secure.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
   HostCache::Key secure_key = HostCache::Key(
       "automatic", DnsQueryType::UNSPECIFIED, 0 /* host_resolver_flags */,
       HostResolverSource::ANY, NetworkIsolationKey());
@@ -5968,10 +5980,11 @@
       response_insecure.request()->GetAddressResults().value().endpoints(),
       testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                     CreateExpected("::1", 80)));
-  EXPECT_THAT(response_insecure.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response_insecure.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
   HostCache::Key insecure_key =
       HostCache::Key("insecure_automatic", DnsQueryType::UNSPECIFIED,
                      0 /* host_resolver_flags */, HostResolverSource::ANY,
@@ -6124,10 +6137,11 @@
   EXPECT_THAT(response.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(response.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
   HostCache::Key key = HostCache::Key(
       "automatic", DnsQueryType::UNSPECIFIED, 0 /* host_resolver_flags */,
       HostResolverSource::ANY, NetworkIsolationKey());
@@ -6155,10 +6169,11 @@
       response_automatic.request()->GetAddressResults().value().endpoints(),
       testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                     CreateExpected("::1", 80)));
-  EXPECT_THAT(response_automatic.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response_automatic.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
   HostCache::Key secure_key = HostCache::Key(
       "automatic", DnsQueryType::UNSPECIFIED, 0 /* host_resolver_flags */,
       HostResolverSource::ANY, NetworkIsolationKey());
@@ -6311,10 +6326,11 @@
       response_secure.request()->GetAddressResults().value().endpoints(),
       testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                     CreateExpected("::1", 80)));
-  EXPECT_THAT(response_secure.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response_secure.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
   HostCache::Key secure_key = HostCache::Key(
       "automatic", DnsQueryType::UNSPECIFIED, 0 /* host_resolver_flags */,
       HostResolverSource::ANY, NetworkIsolationKey());
@@ -6387,10 +6403,11 @@
       response_secure.request()->GetAddressResults().value().endpoints(),
       testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                     CreateExpected("::1", 80)));
-  EXPECT_THAT(response_secure.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response_secure.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
   HostCache::Key secure_key = HostCache::Key(
       "automatic", DnsQueryType::UNSPECIFIED, 0 /* host_resolver_flags */,
       HostResolverSource::ANY, NetworkIsolationKey());
@@ -6620,10 +6637,11 @@
   EXPECT_THAT(response0.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(response0.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response0.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
   EXPECT_THAT(response1.result_error(), IsError(ERR_NAME_NOT_RESOLVED));
   EXPECT_THAT(response2.result_error(), IsOk());
   EXPECT_THAT(response2.request()->GetAddressResults().value().endpoints(),
@@ -6673,10 +6691,11 @@
   EXPECT_THAT(response0.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(response0.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response0.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
   EXPECT_THAT(response1.result_error(), IsError(ERR_NAME_NOT_RESOLVED));
   EXPECT_THAT(response2.result_error(), IsOk());
   EXPECT_THAT(response2.request()->GetAddressResults().value().endpoints(),
@@ -6731,10 +6750,11 @@
   EXPECT_THAT(response.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(response.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 }
 
 // Test the case where subsequent transactions are handled on transaction
@@ -6768,10 +6788,11 @@
   EXPECT_THAT(response1.request()->GetAddressResults().value().endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 80),
                                             CreateExpected("::1", 80)));
-  EXPECT_THAT(response1.request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 80)), _,
-                  testing::ElementsAre(CreateExpected("::1", 80))))));
+  EXPECT_THAT(
+      response1.request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 80), CreateExpected("127.0.0.1", 80))))));
 }
 
 // Tests the case that a Job with a single transaction receives an empty address
@@ -7190,10 +7211,9 @@
   EXPECT_THAT(v6_response.result_error(), IsOk());
   EXPECT_THAT(v6_response.request()->GetAddressResults().value().endpoints(),
               testing::ElementsAre(CreateExpected("::2", 80)));
-  EXPECT_THAT(
-      v6_response.request()->GetEndpointResults(),
-      testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-          IsEmpty(), _, testing::ElementsAre(CreateExpected("::2", 80))))));
+  EXPECT_THAT(v6_response.request()->GetEndpointResults(),
+              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
+                  testing::ElementsAre(CreateExpected("::2", 80))))));
 
   // Now repeat the test on non-wifi to check that IPv6 is used as normal
   // after the network changes.
@@ -7220,10 +7240,9 @@
   EXPECT_THAT(
       no_wifi_response.request()->GetAddressResults().value().endpoints(),
       testing::ElementsAre(CreateExpected("::3", 80)));
-  EXPECT_THAT(
-      no_wifi_response.request()->GetEndpointResults(),
-      testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-          IsEmpty(), _, testing::ElementsAre(CreateExpected("::3", 80))))));
+  EXPECT_THAT(no_wifi_response.request()->GetEndpointResults(),
+              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
+                  testing::ElementsAre(CreateExpected("::3", 80))))));
 
   EXPECT_THAT(no_wifi_v4_response.result_error(), IsOk());
   EXPECT_THAT(
@@ -7236,10 +7255,9 @@
   EXPECT_THAT(
       no_wifi_v6_response.request()->GetAddressResults().value().endpoints(),
       testing::ElementsAre(CreateExpected("::2", 80)));
-  EXPECT_THAT(
-      no_wifi_v6_response.request()->GetEndpointResults(),
-      testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-          IsEmpty(), _, testing::ElementsAre(CreateExpected("::2", 80))))));
+  EXPECT_THAT(no_wifi_v6_response.request()->GetEndpointResults(),
+              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
+                  testing::ElementsAre(CreateExpected("::2", 80))))));
 }
 
 TEST_F(HostResolverManagerDnsTest, NotFoundTTL) {
@@ -7468,7 +7486,7 @@
   EXPECT_TRUE(result_name.empty() || result_name == "canonical");
   EXPECT_THAT(response.request()->GetEndpointResults(),
               testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  _, testing::AnyOf(IsEmpty(), "canonical"), _,
+                  _, testing::AnyOf(IsEmpty(), "canonical"),
                   testing::AnyOf(IsEmpty(), "canonical")))));
 }
 
@@ -7495,7 +7513,7 @@
             "canonical");
   EXPECT_THAT(response.request()->GetEndpointResults(),
               testing::Optional(testing::ElementsAre(
-                  ExpectEndpointResult(_, "canonical", _, "canonical"))));
+                  ExpectEndpointResult(_, "canonical", "canonical"))));
 }
 
 TEST_F(HostResolverManagerDnsTest, CanonicalName_PreferV6) {
@@ -7525,7 +7543,7 @@
   // address family.
   EXPECT_THAT(response.request()->GetEndpointResults(),
               testing::Optional(testing::ElementsAre(
-                  ExpectEndpointResult(_, "correct", _, "correct"))));
+                  ExpectEndpointResult(_, "correct", "correct"))));
 }
 
 TEST_F(HostResolverManagerDnsTest, CanonicalName_V4Only) {
@@ -7550,7 +7568,7 @@
   // address family.
   EXPECT_THAT(response.request()->GetEndpointResults(),
               testing::Optional(testing::ElementsAre(
-                  ExpectEndpointResult(_, "correct", _, "correct"))));
+                  ExpectEndpointResult(_, "correct", "correct"))));
 }
 
 // Test that responses containing CNAME records but no address results are fine
@@ -7632,7 +7650,6 @@
   EXPECT_THAT(
       response.request()->GetEndpointResults(),
       testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-          IsEmpty(), _,
           testing::ElementsAre(IPEndPoint(IPAddress::IPv6Localhost(), 80))))));
 }
 
@@ -7660,7 +7677,7 @@
             "canonical");
   EXPECT_THAT(response.request()->GetEndpointResults(),
               testing::Optional(testing::ElementsAre(
-                  ExpectEndpointResult(_, "canonical", _, "canonical"))));
+                  ExpectEndpointResult(_, "canonical", "canonical"))));
 }
 
 TEST_F(HostResolverManagerDnsTest, DnsAliases) {
@@ -7706,7 +7723,7 @@
                                    "first.test"));
   EXPECT_THAT(response.request()->GetEndpointResults(),
               testing::Optional(testing::ElementsAre(
-                  ExpectEndpointResult(_, "fourth.test", _, "fourth.test"))));
+                  ExpectEndpointResult(_, "fourth.test", "fourth.test"))));
 
   EXPECT_THAT(response.request()->GetDnsAliasResults(),
               testing::Optional(testing::ElementsAre(
@@ -7755,7 +7772,7 @@
               testing::ElementsAre("localhost", "host.test"));
   EXPECT_THAT(response.request()->GetEndpointResults(),
               testing::Optional(testing::ElementsAre(
-                  ExpectEndpointResult(_, "localhost", _, "localhost"))));
+                  ExpectEndpointResult(_, "localhost", "localhost"))));
   EXPECT_THAT(response.request()->GetDnsAliasResults(),
               testing::Optional(testing::ElementsAre("host.test")));
 }
@@ -7788,7 +7805,7 @@
               testing::ElementsAre("first.test"));
   EXPECT_THAT(response.request()->GetEndpointResults(),
               testing::Optional(testing::ElementsAre(
-                  ExpectEndpointResult(_, "first.test", _, "first.test"))));
+                  ExpectEndpointResult(_, "first.test", "first.test"))));
   EXPECT_THAT(response.request()->GetDnsAliasResults(),
               testing::Optional(testing::ElementsAre("first.test")));
 }
@@ -7847,8 +7864,8 @@
   EXPECT_THAT(
       response.request()->GetEndpointResults(),
       testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-          testing::ElementsAre(IPEndPoint(IPAddress::IPv4Localhost(), 80)), _,
-          testing::ElementsAre(IPEndPoint(IPAddress::IPv6Localhost(), 80))))));
+          testing::ElementsAre(IPEndPoint(IPAddress::IPv6Localhost(), 80),
+                               IPEndPoint(IPAddress::IPv4Localhost(), 80))))));
 }
 
 TEST_F(HostResolverManagerTest, ResolveLocalHostname) {
@@ -13283,10 +13300,11 @@
   EXPECT_THAT(response->request()->GetAddressResults()->endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 108),
                                             CreateExpected("::1", 108)));
-  EXPECT_THAT(response->request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 108)), _,
-                  testing::ElementsAre(CreateExpected("::1", 108))))));
+  EXPECT_THAT(
+      response->request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 108), CreateExpected("127.0.0.1", 108))))));
   // If this expectation fails, the INTEGRITY query was probably timed out.
   // Check the |kDnsHttpssvcExtraTimeMs| and |kDnsHttpssvcExtraTimePercent|
   // feature params in relation to this test's FastForward steps.
@@ -13392,10 +13410,11 @@
   EXPECT_THAT(response->request()->GetAddressResults()->endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 108),
                                             CreateExpected("::1", 108)));
-  EXPECT_THAT(response->request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 108)), _,
-                  testing::ElementsAre(CreateExpected("::1", 108))))));
+  EXPECT_THAT(
+      response->request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 108), CreateExpected("127.0.0.1", 108))))));
 }
 
 // Ensure that the address results are preserved, even when the INTEGRITY query
@@ -13436,10 +13455,11 @@
   EXPECT_THAT(response->request()->GetAddressResults()->endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 108),
                                             CreateExpected("::1", 108)));
-  EXPECT_THAT(response->request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 108)), _,
-                  testing::ElementsAre(CreateExpected("::1", 108))))));
+  EXPECT_THAT(
+      response->request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 108), CreateExpected("127.0.0.1", 108))))));
   EXPECT_THAT(response->request()->GetExperimentalResultsForTesting(),
               Optional(IsEmpty()));
 }
@@ -13485,10 +13505,11 @@
   EXPECT_THAT(response->request()->GetAddressResults()->endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 108),
                                             CreateExpected("::1", 108)));
-  EXPECT_THAT(response->request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 108)), _,
-                  testing::ElementsAre(CreateExpected("::1", 108))))));
+  EXPECT_THAT(
+      response->request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 108), CreateExpected("127.0.0.1", 108))))));
 }
 
 TEST_F(HostResolverManagerDnsTestIntegrity,
@@ -13525,10 +13546,11 @@
   EXPECT_THAT(response->request()->GetAddressResults()->endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 108),
                                             CreateExpected("::1", 108)));
-  EXPECT_THAT(response->request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 108)), _,
-                  testing::ElementsAre(CreateExpected("::1", 108))))));
+  EXPECT_THAT(
+      response->request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 108), CreateExpected("127.0.0.1", 108))))));
   EXPECT_THAT(response->request()->GetExperimentalResultsForTesting(),
               Optional(UnorderedElementsAre(false)));
 }
@@ -13569,10 +13591,11 @@
   EXPECT_THAT(response->request()->GetAddressResults()->endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 108),
                                             CreateExpected("::1", 108)));
-  EXPECT_THAT(response->request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 108)), _,
-                  testing::ElementsAre(CreateExpected("::1", 108))))));
+  EXPECT_THAT(
+      response->request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 108), CreateExpected("127.0.0.1", 108))))));
 }
 
 // Make sure that INTEGRITY queries don't get cancelled *before* the configured
@@ -13719,10 +13742,11 @@
   EXPECT_THAT(response->request()->GetAddressResults()->endpoints(),
               testing::UnorderedElementsAre(CreateExpected("127.0.0.1", 108),
                                             CreateExpected("::1", 108)));
-  EXPECT_THAT(response->request()->GetEndpointResults(),
-              testing::Optional(testing::ElementsAre(ExpectEndpointResult(
-                  testing::ElementsAre(CreateExpected("127.0.0.1", 108)), _,
-                  testing::ElementsAre(CreateExpected("::1", 108))))));
+  EXPECT_THAT(
+      response->request()->GetEndpointResults(),
+      testing::Optional(testing::ElementsAre(
+          ExpectEndpointResult(testing::UnorderedElementsAre(
+              CreateExpected("::1", 108), CreateExpected("127.0.0.1", 108))))));
 
   // Out of paranoia, pass some more time to ensure no crashes occur.
   FastForwardBy(base::Milliseconds(100));
diff --git a/net/dns/host_resolver_proc.cc b/net/dns/host_resolver_proc.cc
index cee70a0..9e3c9b6e 100644
--- a/net/dns/host_resolver_proc.cc
+++ b/net/dns/host_resolver_proc.cc
@@ -176,8 +176,8 @@
   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
                                                 base::BlockingType::WILL_BLOCK);
 
-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
+#if defined(OS_POSIX) && \
+    !(defined(OS_APPLE) || defined(OS_OPENBSD) || defined(OS_ANDROID))
   DnsReloaderMaybeReload();
 #endif
   absl::optional<AddressInfo> ai;
diff --git a/net/dns/host_resolver_results.h b/net/dns/host_resolver_results.h
index 5e784c8..602cf02 100644
--- a/net/dns/host_resolver_results.h
+++ b/net/dns/host_resolver_results.h
@@ -26,16 +26,13 @@
   HostResolverEndpointResult(HostResolverEndpointResult&&);
   HostResolverEndpointResult& operator=(HostResolverEndpointResult&&) = default;
 
-  // IPv4 endpoints at which to connect to the service.
-  std::vector<net::IPEndPoint> ipv4_endpoints;
+  // IP endpoints at which to connect to the service.
+  std::vector<net::IPEndPoint> ip_endpoints;
 
   // The final name in the alias chain (DNS CNAME or HTTPS) at which the
   // IPv4 addresses were found.
   std::string ipv4_alias_name;
 
-  // IPv6 endpoints at which to connect to the service.
-  std::vector<net::IPEndPoint> ipv6_endpoints;
-
   // The final name in the alias chain (DNS CNAME or HTTPS) at which the
   // IPv6 addresses were found.
   std::string ipv6_alias_name;
diff --git a/net/dns/host_resolver_results_test_util.cc b/net/dns/host_resolver_results_test_util.cc
index d042fbd..8e361b0 100644
--- a/net/dns/host_resolver_results_test_util.cc
+++ b/net/dns/host_resolver_results_test_util.cc
@@ -23,14 +23,12 @@
     : public testing::MatcherInterface<const HostResolverEndpointResult&> {
  public:
   EndpointResultMatcher(
-      testing::Matcher<std::vector<IPEndPoint>> ipv4_endpoints_matcher,
+      testing::Matcher<std::vector<IPEndPoint>> ip_endpoints_matcher,
       testing::Matcher<std::string> ipv4_alias_name_matcher,
-      testing::Matcher<std::vector<IPEndPoint>> ipv6_endpoints_matcher,
       testing::Matcher<std::string> ipv6_alias_name_matcher,
       testing::Matcher<const ConnectionEndpointMetadata&> metadata_matcher)
-      : ipv4_endpoints_matcher_(std::move(ipv4_endpoints_matcher)),
+      : ip_endpoints_matcher_(std::move(ip_endpoints_matcher)),
         ipv4_alias_name_matcher_(std::move(ipv4_alias_name_matcher)),
-        ipv6_endpoints_matcher_(std::move(ipv6_endpoints_matcher)),
         ipv6_alias_name_matcher_(std::move(ipv6_alias_name_matcher)),
         metadata_matcher_(std::move(metadata_matcher)) {}
 
@@ -45,9 +43,9 @@
       const HostResolverEndpointResult& endpoint,
       testing::MatchResultListener* result_listener) const override {
     return ExplainMatchResult(
-               testing::Field("ipv4_endpoints",
-                              &HostResolverEndpointResult::ipv4_endpoints,
-                              ipv4_endpoints_matcher_),
+               testing::Field("ip_endpoints",
+                              &HostResolverEndpointResult::ip_endpoints,
+                              ip_endpoints_matcher_),
                endpoint, result_listener) &&
            ExplainMatchResult(
                testing::Field("ipv4_alias_name",
@@ -55,11 +53,6 @@
                               ipv4_alias_name_matcher_),
                endpoint, result_listener) &&
            ExplainMatchResult(
-               testing::Field("ipv6_endpoints",
-                              &HostResolverEndpointResult::ipv6_endpoints,
-                              ipv6_endpoints_matcher_),
-               endpoint, result_listener) &&
-           ExplainMatchResult(
                testing::Field("ipv6_alias_name",
                               &HostResolverEndpointResult::ipv6_alias_name,
                               ipv6_alias_name_matcher_),
@@ -82,20 +75,16 @@
 
  private:
   void Describe(std::ostream& os) const {
-    os << "HostResolverEndpointResult {\nipv4_endpoints: "
-       << testing::PrintToString(ipv4_endpoints_matcher_)
-       << "\nipv4_alias_name: "
+    os << "HostResolverEndpointResult {\nip_endpoints: "
+       << testing::PrintToString(ip_endpoints_matcher_) << "\nipv4_alias_name: "
        << testing::PrintToString(ipv4_alias_name_matcher_)
-       << "\nipv6_endpoints: "
-       << testing::PrintToString(ipv6_endpoints_matcher_)
        << "\nipv6_alias_name: "
        << testing::PrintToString(ipv6_alias_name_matcher_)
        << "\nmetadata: " << testing::PrintToString(metadata_matcher_) << "\n}";
   }
 
-  testing::Matcher<std::vector<IPEndPoint>> ipv4_endpoints_matcher_;
+  testing::Matcher<std::vector<IPEndPoint>> ip_endpoints_matcher_;
   testing::Matcher<std::string> ipv4_alias_name_matcher_;
-  testing::Matcher<std::vector<IPEndPoint>> ipv6_endpoints_matcher_;
   testing::Matcher<std::string> ipv6_alias_name_matcher_;
   testing::Matcher<const ConnectionEndpointMetadata&> metadata_matcher_;
 };
@@ -103,24 +92,20 @@
 }  // namespace
 
 testing::Matcher<const HostResolverEndpointResult&> ExpectEndpointResult(
-    testing::Matcher<std::vector<IPEndPoint>> ipv4_endpoints_matcher,
+    testing::Matcher<std::vector<IPEndPoint>> ip_endpoints_matcher,
     testing::Matcher<std::string> ipv4_alias_name_matcher,
-    testing::Matcher<std::vector<IPEndPoint>> ipv6_endpoints_matcher,
     testing::Matcher<std::string> ipv6_alias_name_matcher,
     testing::Matcher<const ConnectionEndpointMetadata&> metadata_matcher) {
   return testing::MakeMatcher(new EndpointResultMatcher(
-      std::move(ipv4_endpoints_matcher), std::move(ipv4_alias_name_matcher),
-      std::move(ipv6_endpoints_matcher), std::move(ipv6_alias_name_matcher),
-      std::move(metadata_matcher)));
+      std::move(ip_endpoints_matcher), std::move(ipv4_alias_name_matcher),
+      std::move(ipv6_alias_name_matcher), std::move(metadata_matcher)));
 }
 
 std::ostream& operator<<(std::ostream& os,
                          const HostResolverEndpointResult& endpoint_result) {
-  return os << "HostResolverEndpointResult {\nipv4_endpoints: "
-            << testing::PrintToString(endpoint_result.ipv4_endpoints)
+  return os << "HostResolverEndpointResult {\nip_endpoints: "
+            << testing::PrintToString(endpoint_result.ip_endpoints)
             << "\nipv4_alias_name: " << endpoint_result.ipv4_alias_name
-            << "\nipv6_endpoints: "
-            << testing::PrintToString(endpoint_result.ipv6_endpoints)
             << "\nipv6_alias_name: " << endpoint_result.ipv6_alias_name
             << "\nmetadata: "
             << testing::PrintToString(endpoint_result.metadata) << "\n}";
diff --git a/net/dns/host_resolver_results_test_util.h b/net/dns/host_resolver_results_test_util.h
index d60ac07e..3d0f9b9 100644
--- a/net/dns/host_resolver_results_test_util.h
+++ b/net/dns/host_resolver_results_test_util.h
@@ -20,11 +20,9 @@
 struct HostResolverEndpointResult;
 
 testing::Matcher<const HostResolverEndpointResult&> ExpectEndpointResult(
-    testing::Matcher<std::vector<IPEndPoint>> ipv4_endpoints_matcher =
+    testing::Matcher<std::vector<IPEndPoint>> ip_endpoints_matcher =
         testing::IsEmpty(),
     testing::Matcher<std::string> ipv4_alias_name_matcher = testing::_,
-    testing::Matcher<std::vector<IPEndPoint>> ipv6_endpoints_matcher =
-        testing::IsEmpty(),
     testing::Matcher<std::string> ipv6_alias_name_matcher = testing::_,
     testing::Matcher<const ConnectionEndpointMetadata&> metadata_matcher =
         ExpectConnectionEndpointMetadata());
diff --git a/services/OWNERS b/services/OWNERS
index cd5feb0..486a440 100644
--- a/services/OWNERS
+++ b/services/OWNERS
@@ -6,3 +6,6 @@
 
 # For adding or removing languages.
 per-file *.grd=claudiomagni@chromium.org
+
+# Translation artifacts:
+per-file ....xtb=file://tools/translation/TRANSLATION_OWNERS
\ No newline at end of file
diff --git a/services/audio/output_device_mixer_impl.cc b/services/audio/output_device_mixer_impl.cc
index 85df85ac..b6c4904 100644
--- a/services/audio/output_device_mixer_impl.cc
+++ b/services/audio/output_device_mixer_impl.cc
@@ -21,6 +21,7 @@
 constexpr double OutputDeviceMixerImpl::kDefaultVolume;
 
 namespace {
+
 const char* LatencyToUmaSuffix(media::AudioLatency::LatencyType latency) {
   switch (latency) {
     case media::AudioLatency::LATENCY_EXACT_MS:
@@ -35,6 +36,34 @@
       return "LatencyUnknown";
   }
 }
+
+// Do not change: used for UMA reporting, matches
+// AudioOutputDeviceMixerStreamStatus from enums.xml.
+enum class TrackError {
+  kNone = 0,
+  kIndependentOpenFailed,
+  kIndependentPlaybackFailed,
+  kMixedOpenFailed,
+  kMixedPlaybackFailed,
+  kMaxValue = kMixedPlaybackFailed
+};
+
+const char* TrackErrorToString(TrackError error) {
+  switch (error) {
+    case TrackError::kIndependentOpenFailed:
+      return "Failed to open independent rendering stream";
+    case TrackError::kIndependentPlaybackFailed:
+      return "Error during independent playback";
+    case TrackError::kMixedOpenFailed:
+      return "Failed to open mixing rendering stream";
+    case TrackError::kMixedPlaybackFailed:
+      return "Error during mixed playback";
+    default:
+      NOTREACHED();
+      return "No error";
+  }
+}
+
 }  // namespace
 
 // Audio data flow though the mixer:
@@ -52,7 +81,8 @@
 // Helper class which stores all the data associated with a specific audio
 // output managed by the mixer. To the clients such an audio output is
 // represented as MixableOutputStream (below).
-class OutputDeviceMixerImpl::MixTrack {
+class OutputDeviceMixerImpl::MixTrack final
+    : public media::AudioOutputStream::AudioSourceCallback {
  public:
   MixTrack(OutputDeviceMixerImpl* mixer,
            std::unique_ptr<MixingGraph::Input> graph_input,
@@ -61,7 +91,11 @@
         on_device_change_callback_(std::move(on_device_change_callback)),
         graph_input_(std::move(graph_input)) {}
 
-  ~MixTrack() { DCHECK(!audio_source_callback_); }
+  ~MixTrack() final {
+    DCHECK(!audio_source_callback_);
+    base::UmaHistogramEnumeration(
+        "Media.Audio.OutputDeviceMixer.StreamPlaybackStatus", error_);
+  }
 
   void SetSource(
       media::AudioOutputStream::AudioSourceCallback* audio_source_callback) {
@@ -99,16 +133,14 @@
           mixer_->CreateAndOpenDeviceStream(graph_input_->GetParams()));
 
       if (!rendering_stream_) {
-        LOG(ERROR) << "Failed to open individual rendering stream";
-        audio_source_callback_->OnError(
-            ErrorType::kUnknown);  // TODO(olka): add dedicated error type.
+        ReportError(TrackError::kIndependentOpenFailed);
         return;
       }
       rendering_stream_->SetVolume(volume_);
     }
 
     RegisterPlaybackStarted();
-    rendering_stream_->Start(audio_source_callback_);
+    rendering_stream_->Start(this);
   }
 
   void StopIndependentRenderingStream() {
@@ -125,9 +157,12 @@
     rendering_stream_.reset();
   }
 
-  void OnError(ErrorType error) {
+  void ReportError(TrackError error) {
     DCHECK(audio_source_callback_);
-    audio_source_callback_->OnError(error);
+    DCHECK_NE(error, TrackError::kNone);
+    LOG(ERROR) << "MixableOutputStream: " << TrackErrorToString(error);
+    error_ = error;
+    audio_source_callback_->OnError(ErrorType::kUnknown);
   }
 
   void OnDeviceChange() {
@@ -159,6 +194,23 @@
     playback_activation_time_for_uma_ = base::TimeTicks();
   }
 
+  // media::AudioOutputStream::AudioSourceCallback implementation to intercept
+  // error reporting during independent playback.
+  int OnMoreData(base::TimeDelta delay,
+                 base::TimeTicks delay_timestamp,
+                 int prior_frames_skipped,
+                 media::AudioBus* dest) final {
+    DCHECK(audio_source_callback_);
+    return audio_source_callback_->OnMoreData(delay, delay_timestamp,
+                                              prior_frames_skipped, dest);
+  }
+
+  void OnError(ErrorType type) final {
+    // Device change events are intercepted by the underlying physical streams.
+    DCHECK_EQ(type, ErrorType::kUnknown);
+    ReportError(TrackError::kIndependentPlaybackFailed);
+  }
+
   double volume_ = kDefaultVolume;
 
   const raw_ptr<OutputDeviceMixerImpl> mixer_;
@@ -185,6 +237,8 @@
       nullptr;
 
   base::TimeTicks playback_activation_time_for_uma_;
+
+  TrackError error_ = TrackError::kNone;
 };
 
 // A proxy which represents MixTrack as media::AudioOutputStream.
@@ -375,14 +429,14 @@
     : OutputDeviceMixer(device_id),
       create_stream_callback_(std::move(create_stream_callback)),
       mixing_graph_output_params_(output_params),
-      mixing_graph_(
-          std::move(create_mixing_graph_callback)
-              .Run(output_params,
-                   base::BindRepeating(
-                       &OutputDeviceMixerImpl::BroadcastToListeners,
-                       base::Unretained(this)),
-                   base::BindRepeating(&OutputDeviceMixerImpl::OnError,
-                                       base::Unretained(this)))) {
+      mixing_graph_(std::move(create_mixing_graph_callback)
+                        .Run(output_params,
+                             base::BindRepeating(
+                                 &OutputDeviceMixerImpl::BroadcastToListeners,
+                                 base::Unretained(this)),
+                             base::BindRepeating(
+                                 &OutputDeviceMixerImpl::OnMixingGraphError,
+                                 base::Unretained(this)))) {
   DCHECK(mixing_graph_output_params_.IsValid());
   DCHECK_EQ(mixing_graph_output_params_.format(),
             media::AudioParameters::AUDIO_PCM_LOW_LATENCY);
@@ -431,7 +485,7 @@
 
   // Stop and close all audio playback.
   if (mixing_graph_output_stream_) {
-    StopMixingGraphPlayback();
+    StopMixingGraphPlayback(MixingError::kNone);
   } else {
     for (MixTrack* mix_track : active_tracks_)
       mix_track->StopIndependentRenderingStream();
@@ -529,7 +583,7 @@
   if (!active_tracks_.size()) {
     // There is no actual playback: we were just sending silence to the
     // listener as a reference.
-    StopMixingGraphPlayback();
+    StopMixingGraphPlayback(MixingError::kNone);
   } else {
     // No listeners left, and we are playing via the mixing graph. Schedule
     // switching to independent playback.
@@ -659,17 +713,16 @@
   }
 }
 
-// Processes errors for the cases when the playback via the mixing graph is
-// attempted to start or ongoing.
-void OutputDeviceMixerImpl::OnError(ErrorType error) {
+// Processes errors coming from |mixing_graph_| during mixed playback.
+void OutputDeviceMixerImpl::OnMixingGraphError(ErrorType error) {
+  // |mixing_graph_output_stream_| guarantees this.
   DCHECK_CALLED_ON_VALID_SEQUENCE(owning_sequence_);
-  LOG(ERROR) << "Error when mixing audio for device [" << device_id() << "]";
+  // Device change events are intercepted by the underlying physical stream.
+  DCHECK_EQ(error, ErrorType::kUnknown);
+  // This call is expected only during mixed playback.
+  DCHECK(mixing_graph_output_stream_);
 
-  if (mixing_graph_output_stream_)
-    StopMixingGraphPlayback();
-
-  for (MixTrack* mix_track : active_tracks_)
-    mix_track->OnError(error);
+  StopMixingGraphPlayback(MixingError::kPlaybackFailed);
 }
 
 bool OutputDeviceMixerImpl::HasListeners() const {
@@ -702,8 +755,7 @@
   mixing_graph_output_stream_.reset(
       CreateAndOpenDeviceStream(mixing_graph_output_params_));
   if (!mixing_graph_output_stream_) {
-    LOG(ERROR) << "Failed to open output stream for mixing";
-    OnError(ErrorType::kUnknown);
+    StopMixingGraphPlayback(MixingError::kOpenFailed);
     return;
   }
 
@@ -719,29 +771,47 @@
   DVLOG(1) << " Mixing started for device [" << device_id() << "]";
 }
 
-void OutputDeviceMixerImpl::StopMixingGraphPlayback() {
+void OutputDeviceMixerImpl::StopMixingGraphPlayback(MixingError error) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(owning_sequence_);
-  DCHECK(mixing_graph_output_stream_);
 
-  TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("audio"),
-               "OutputDeviceMixerImpl::StopMixingGraphPlayback", "device_id",
-               device_id());
+  if (mixing_graph_output_stream_) {
+    // Mixing was in progress, we should stop it.
+    DCHECK_NE(error, MixingError::kOpenFailed);
 
-  switch_to_unmixed_playback_delay_timer_.Stop();
+    TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("audio"),
+                 "OutputDeviceMixerImpl::StopMixingGraphPlayback", "device_id",
+                 device_id());
 
-  mixing_graph_output_stream_->Stop();
-  mixing_graph_output_stream_.reset();  // Auto-close the stream.
+    switch_to_unmixed_playback_delay_timer_.Stop();
 
-  DCHECK(mixing_stats_);
-  mixing_stats_.reset();
+    mixing_graph_output_stream_->Stop();
+    mixing_graph_output_stream_.reset();  // Auto-close the stream.
 
-  DVLOG(1) << " Mixing stopped for device [" << device_id() << "]";
+    DCHECK(mixing_stats_);
+    mixing_stats_.reset();
 
-  for (MixTrack* mix_track : active_tracks_)
-    mix_track->StopProvidingAudioToMixingGraph();
+    DVLOG(1) << " Mixing stopped for device [" << device_id() << "]";
 
-  TRACE_EVENT_NESTABLE_ASYNC_END0(TRACE_DISABLED_BY_DEFAULT("audio"),
-                                  "OutputDeviceMixerImpl mixing", this);
+    for (MixTrack* mix_track : active_tracks_)
+      mix_track->StopProvidingAudioToMixingGraph();
+
+    TRACE_EVENT_NESTABLE_ASYNC_END0(TRACE_DISABLED_BY_DEFAULT("audio"),
+                                    "OutputDeviceMixerImpl mixing", this);
+  }
+
+  DCHECK(!mixing_graph_output_stream_);
+
+  if (error != MixingError::kNone) {
+    LOG(ERROR) << ErrorToString(error) << " for device [" << device_id() << "]";
+    TrackError track_error = (error == MixingError::kOpenFailed)
+                                 ? TrackError::kMixedOpenFailed
+                                 : TrackError::kMixedPlaybackFailed;
+    for (MixTrack* mix_track : active_tracks_)
+      mix_track->ReportError(track_error);
+  }
+
+  base::UmaHistogramEnumeration(
+      "Media.Audio.OutputDeviceMixer.MixedPlaybackStatus", error);
 }
 
 void OutputDeviceMixerImpl::SwitchToUnmixedPlaybackTimerHelper() {
@@ -750,9 +820,22 @@
 #if DCHECK_IS_ON()
   DCHECK(!device_changed_);
 #endif
-  StopMixingGraphPlayback();
+  StopMixingGraphPlayback(MixingError::kNone);
   for (MixTrack* mix_track : active_tracks_)
     mix_track->StartIndependentRenderingStream();
 }
 
+// static
+const char* OutputDeviceMixerImpl::ErrorToString(MixingError error) {
+  switch (error) {
+    case MixingError::kOpenFailed:
+      return "Failed to open mixing rendering stream";
+    case MixingError::kPlaybackFailed:
+      return "Error during mixed playback";
+    default:
+      NOTREACHED();
+      return "No error";
+  }
+}
+
 }  // namespace audio
diff --git a/services/audio/output_device_mixer_impl.h b/services/audio/output_device_mixer_impl.h
index 91fa668..c74efdd 100644
--- a/services/audio/output_device_mixer_impl.h
+++ b/services/audio/output_device_mixer_impl.h
@@ -88,6 +88,15 @@
     }
   };
 
+  // Do not change: used for UMA reporting, matches
+  // AudioOutputDeviceMixerMixedPlaybackStatus from enums.xml.
+  enum class MixingError {
+    kNone = 0,
+    kOpenFailed,
+    kPlaybackFailed,
+    kMaxValue = kPlaybackFailed
+  };
+
   using MixTracks =
       std::set<std::unique_ptr<MixTrack>, base::UniquePtrComparator>;
   using ActiveTracks = std::set<MixTrack*>;
@@ -108,14 +117,16 @@
                             base::TimeDelta delay);
   // Processes |mixing_output_stream_| rendering errors; provided as a callback
   // to MixingGraph.
-  void OnError(ErrorType error);
+  void OnMixingGraphError(ErrorType error);
 
   // Helpers to manage audio playback.
   bool HasListeners() const;
   void StartMixingGraphPlayback();
-  void StopMixingGraphPlayback();
+  void StopMixingGraphPlayback(MixingError mixing_error);
   void SwitchToUnmixedPlaybackTimerHelper();
 
+  static const char* ErrorToString(MixingError error);
+
   SEQUENCE_CHECKER(owning_sequence_);
 
   // Callback to create physical audio streams.
diff --git a/services/audio/output_device_mixer_impl_unittest.cc b/services/audio/output_device_mixer_impl_unittest.cc
index 3d7fa1a4..03a02a45 100644
--- a/services/audio/output_device_mixer_impl_unittest.cc
+++ b/services/audio/output_device_mixer_impl_unittest.cc
@@ -49,10 +49,10 @@
 
   void Start(AudioSourceCallback* callback) override {
     provided_callback_ = callback;
-    StartCalled(provided_callback_);
+    StartCalled();
   }
 
-  MOCK_METHOD1(StartCalled, void(AudioSourceCallback*));
+  MOCK_METHOD0(StartCalled, void());
   MOCK_METHOD0(Stop, void());
   MOCK_METHOD0(Open, bool());
   void SetVolume(double volume) final { volume_ = volume; }
@@ -281,8 +281,7 @@
         .WillOnce(Return(true));
     EXPECT_CALL(mock_mixing_graph_output_stream_, Open())
         .WillOnce(Return(true));
-    EXPECT_CALL(mock_mixing_graph_output_stream_,
-                StartCalled(mock_mixing_graph_.get()));
+    EXPECT_CALL(mock_mixing_graph_output_stream_, StartCalled());
     mixing_graph_output_stream_not_running_ = false;
   }
 
@@ -305,8 +304,7 @@
             .WillOnce(Return(true));
         mix_track_mock->independent_rendergin_stream_was_open = true;
       }
-      EXPECT_CALL(mix_track_mock->rendering_stream,
-                  StartCalled(&mix_track_mock->source_callback));
+      EXPECT_CALL(mix_track_mock->rendering_stream, StartCalled());
     } else {
       EXPECT_CALL(mix_track_mock->graph_input,
                   Start(&mix_track_mock->source_callback));
@@ -358,13 +356,11 @@
   // Sets "no playback change" expectations for a given set of mocks.
   void ExpectNoPlaybackModeChange(const std::set<MixTrackMock*>& mocks) {
     EXPECT_CALL(mock_mixing_graph_output_stream_, Stop).Times(0);
-    EXPECT_CALL(mock_mixing_graph_output_stream_,
-                StartCalled(mock_mixing_graph_.get()))
-        .Times(0);
+    EXPECT_CALL(mock_mixing_graph_output_stream_, StartCalled()).Times(0);
 
     for (MixTrackMock* mock : mocks) {
       EXPECT_CALL(mock->graph_input, Stop).Times(0);
-      EXPECT_CALL(mock->rendering_stream, StartCalled(_)).Times(0);
+      EXPECT_CALL(mock->rendering_stream, StartCalled()).Times(0);
       EXPECT_CALL(mock->graph_input, Start(_)).Times(0);
       EXPECT_CALL(mock->rendering_stream, Stop).Times(0);
     }
diff --git a/services/data_decoder/public/mojom/BUILD.gn b/services/data_decoder/public/mojom/BUILD.gn
index 2bd5266..663666b 100644
--- a/services/data_decoder/public/mojom/BUILD.gn
+++ b/services/data_decoder/public/mojom/BUILD.gn
@@ -25,7 +25,7 @@
     "//url/mojom:url_mojom_gurl",
   ]
 
-  if (is_chromeos_ash) {
+  if (is_chromeos_ash || is_chromeos_lacros) {
     sources += [ "ble_scan_parser.mojom" ]
     public_deps += [ "//device/bluetooth/public/mojom" ]
   }
diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.gn
index 47c5677..11574eb 100644
--- a/services/shape_detection/BUILD.gn
+++ b/services/shape_detection/BUILD.gn
@@ -12,16 +12,16 @@
     "text_detection_impl.h",
   ]
 
+  deps = [
+    "//build:branding_buildflags",
+    "//build:chromeos_buildflags",
+    "//mojo/public/cpp/bindings",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+  ]
+
   if (is_mac) {
     sources += [
-      "barcode_detection_impl_mac.h",
-      "barcode_detection_impl_mac.mm",
-      "barcode_detection_impl_mac_vision.h",
-      "barcode_detection_impl_mac_vision.mm",
-      "barcode_detection_impl_mac_vision_api.h",
-      "barcode_detection_impl_mac_vision_api.mm",
-      "barcode_detection_provider_mac.h",
-      "barcode_detection_provider_mac.mm",
       "detection_utils_mac.h",
       "detection_utils_mac.mm",
       "face_detection_impl_mac.h",
@@ -37,8 +37,6 @@
     weak_frameworks = [ "Vision.framework" ]
   } else if (is_win) {
     sources += [
-      "barcode_detection_provider_impl.cc",
-      "barcode_detection_provider_impl.h",
       "detection_utils_win.cc",
       "detection_utils_win.h",
       "face_detection_impl_win.cc",
@@ -48,40 +46,53 @@
       "text_detection_impl_win.cc",
       "text_detection_impl_win.h",
     ]
-  } else if (is_chromeos_ash && is_chrome_branded) {
+  } else if (is_android) {
+    # No C++ sources needed, face and text detection is provided by Java.
+  } else {
+    sources += [
+      "face_detection_provider_impl.cc",
+      "face_detection_provider_impl.h",
+      "text_detection_impl.cc",
+    ]
+  }
+
+  if (is_mac) {
+    # On macOS there is a barcode detection API available from the platform.
+    sources += [
+      "barcode_detection_impl_mac.h",
+      "barcode_detection_impl_mac.mm",
+      "barcode_detection_impl_mac_vision.h",
+      "barcode_detection_impl_mac_vision.mm",
+      "barcode_detection_impl_mac_vision_api.h",
+      "barcode_detection_impl_mac_vision_api.mm",
+      "barcode_detection_provider_mac.h",
+      "barcode_detection_provider_mac.mm",
+    ]
+  } else if (is_android) {
+    # No C++ sources needed, barcode detection is provided by Java.
+  } else if (!is_fuchsia && is_chrome_branded) {
+    # On all other platforms (except Fuchsia) use Google's "Barhopper" library
+    # if src-internal is available.
+    #
+    # For the moment this library is not built on Fuchsia in order to reduce
+    # binary size. See https://crbug.com/1275298.
     sources += [
       "barcode_detection_impl_barhopper.cc",
       "barcode_detection_impl_barhopper.h",
       "barcode_detection_provider_barhopper.cc",
       "barcode_detection_provider_barhopper.h",
-      "face_detection_provider_impl.cc",
-      "face_detection_provider_impl.h",
-      "text_detection_impl.cc",
     ]
+    deps += [ "//third_party/barhopper" ]
   } else {
+    # Otherwise, use a stub implementation.
     sources += [
       "barcode_detection_provider_impl.cc",
       "barcode_detection_provider_impl.h",
-      "face_detection_provider_impl.cc",
-      "face_detection_provider_impl.h",
-      "text_detection_impl.cc",
     ]
   }
 
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
-  deps = [
-    "//build:branding_buildflags",
-    "//build:chromeos_buildflags",
-    "//mojo/public/cpp/bindings",
-    "//ui/gfx",
-    "//ui/gfx/geometry",
-  ]
-
-  if (is_chromeos_ash && is_chrome_branded) {
-    deps += [ "//third_party/barhopper:barhopper" ]
-  }
-
   public_deps = [
     "//base",
     "//media/capture",
@@ -153,7 +164,7 @@
     ]
   }
 
-  if (is_chromeos_ash && is_chrome_branded) {
+  if (!is_mac && !is_android && !is_fuchsia && is_chrome_branded) {
     sources += [ "barcode_detection_impl_barhopper_unittest.cc" ]
   }
 
diff --git a/services/shape_detection/barcode_detection_impl_barhopper_unittest.cc b/services/shape_detection/barcode_detection_impl_barhopper_unittest.cc
index d934ca7..644cd68 100644
--- a/services/shape_detection/barcode_detection_impl_barhopper_unittest.cc
+++ b/services/shape_detection/barcode_detection_impl_barhopper_unittest.cc
@@ -15,25 +15,27 @@
 
 namespace shape_detection {
 
-struct TestParams {
-  std::string filename;
-  std::string expected_value;
+constexpr struct TestParams {
+  base::FilePath::StringPieceType filename;
+  base::StringPiece expected_value;
   float x;
   float y;
   float width;
   float height;
-} kTestParams[] = {{"codabar.png", "A6.2831853B", 24, 24, 448, 95},
-                   {"code_39.png", "CHROMIUM", 20, 20, 318, 75},
-                   {"code_93.png", "CHROMIUM", 20, 20, 216, 75},
-                   {"code_128.png", "Chromium", 20, 20, 246, 75},
-                   {"data_matrix.png", "Chromium", 11, 11, 53, 53},
-                   {"ean_8.png", "62831857", 14, 10, 134, 75},
-                   {"ean_13.png", "6283185307179", 27, 10, 190, 75},
-                   {"itf.png", "62831853071795", 10, 10, 135, 39},
-                   {"pdf417.png", "Chromium", 20, 20, 240, 44},
-                   {"qr_code.png", "https://chromium.org", 40, 40, 250, 250},
-                   {"upc_a.png", "628318530714", 23, 10, 190, 75},
-                   {"upc_e.png", "06283186", 23, 10, 102, 75}};
+} kTestParams[] = {
+    {FILE_PATH_LITERAL("codabar.png"), "A6.2831853B", 24, 24, 448, 95},
+    {FILE_PATH_LITERAL("code_39.png"), "CHROMIUM", 20, 20, 318, 75},
+    {FILE_PATH_LITERAL("code_93.png"), "CHROMIUM", 20, 20, 216, 75},
+    {FILE_PATH_LITERAL("code_128.png"), "Chromium", 20, 20, 246, 75},
+    {FILE_PATH_LITERAL("data_matrix.png"), "Chromium", 11, 11, 53, 53},
+    {FILE_PATH_LITERAL("ean_8.png"), "62831857", 14, 10, 134, 75},
+    {FILE_PATH_LITERAL("ean_13.png"), "6283185307179", 27, 10, 190, 75},
+    {FILE_PATH_LITERAL("itf.png"), "62831853071795", 10, 10, 135, 39},
+    {FILE_PATH_LITERAL("pdf417.png"), "Chromium", 20, 20, 240, 44},
+    {FILE_PATH_LITERAL("qr_code.png"), "https://chromium.org", 40, 40, 250,
+     250},
+    {FILE_PATH_LITERAL("upc_a.png"), "628318530714", 23, 10, 190, 75},
+    {FILE_PATH_LITERAL("upc_e.png"), "06283186", 23, 10, 102, 75}};
 
 class BarcodeDetectionImplBarhopperTest
     : public testing::TestWithParam<struct TestParams> {
@@ -58,14 +60,15 @@
     return barcode_service;
   }
 
-  std::unique_ptr<SkBitmap> LoadTestImage(std::string filename) {
+  std::unique_ptr<SkBitmap> LoadTestImage(
+      base::FilePath::StringPieceType filename) {
     // Load image data from test directory.
     base::FilePath image_path;
     EXPECT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &image_path));
     image_path = image_path.Append(FILE_PATH_LITERAL("services"))
                      .Append(FILE_PATH_LITERAL("test"))
                      .Append(FILE_PATH_LITERAL("data"))
-                     .Append(FILE_PATH_LITERAL(filename));
+                     .Append(filename);
     EXPECT_TRUE(base::PathExists(image_path));
     std::string image_data;
     EXPECT_TRUE(base::ReadFileToString(image_path, &image_data));
@@ -114,4 +117,4 @@
                          BarcodeDetectionImplBarhopperTest,
                          testing::ValuesIn(kTestParams));
 
-}  // namespace shape_detection
\ No newline at end of file
+}  // namespace shape_detection
diff --git a/services/shape_detection/shape_detection_service.cc b/services/shape_detection/shape_detection_service.cc
index 542c266f..9bc5c92 100644
--- a/services/shape_detection/shape_detection_service.cc
+++ b/services/shape_detection/shape_detection_service.cc
@@ -10,19 +10,6 @@
 #include "base/bind.h"
 #include "build/branding_buildflags.h"
 #include "build/chromeos_buildflags.h"
-#if defined(OS_WIN)
-#include "services/shape_detection/barcode_detection_provider_impl.h"
-#include "services/shape_detection/face_detection_provider_win.h"
-#elif defined(OS_MAC)
-#include "services/shape_detection/barcode_detection_provider_mac.h"
-#include "services/shape_detection/face_detection_provider_mac.h"
-#elif BUILDFLAG(GOOGLE_CHROME_BRANDING) && BUILDFLAG(IS_CHROMEOS_ASH)
-#include "services/shape_detection/barcode_detection_provider_barhopper.h"
-#include "services/shape_detection/face_detection_provider_impl.h"
-#else
-#include "services/shape_detection/barcode_detection_provider_impl.h"
-#include "services/shape_detection/face_detection_provider_impl.h"
-#endif
 #include "services/shape_detection/text_detection_impl.h"
 
 #if defined(OS_ANDROID)
@@ -30,6 +17,26 @@
 #include "services/shape_detection/shape_detection_jni_headers/InterfaceRegistrar_jni.h"
 #endif
 
+#if defined(OS_MAC)
+#include "services/shape_detection/barcode_detection_provider_mac.h"
+#elif defined(OS_ANDROID)
+// Barcode detection comes from Java.
+#elif !defined(OS_FUCHSIA) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
+#include "services/shape_detection/barcode_detection_provider_barhopper.h"
+#else
+#include "services/shape_detection/barcode_detection_provider_impl.h"
+#endif
+
+#if defined(OS_WIN)
+#include "services/shape_detection/face_detection_provider_win.h"
+#elif defined(OS_MAC)
+#include "services/shape_detection/face_detection_provider_mac.h"
+#elif defined(OS_ANDROID)
+// Face detection comes from Java.
+#else
+#include "services/shape_detection/face_detection_provider_impl.h"
+#endif
+
 namespace shape_detection {
 
 ShapeDetectionService::ShapeDetectionService(
@@ -47,7 +54,7 @@
       receiver.PassPipe().release().value());
 #elif defined(OS_MAC)
   BarcodeDetectionProviderMac::Create(std::move(receiver));
-#elif BUILDFLAG(GOOGLE_CHROME_BRANDING) && BUILDFLAG(IS_CHROMEOS_ASH)
+#elif !defined(OS_FUCHSIA) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
   BarcodeDetectionProviderBarhopper::Create(std::move(receiver));
 #else
   BarcodeDetectionProviderImpl::Create(std::move(receiver));
diff --git a/testing/buildbot/chromium.android.fyi.json b/testing/buildbot/chromium.android.fyi.json
index c0bc71e9..6f32970 100644
--- a/testing/buildbot/chromium.android.fyi.json
+++ b/testing/buildbot/chromium.android.fyi.json
@@ -5884,7 +5884,7 @@
             {
               "cipd_package": "chromium/testing/weblayer-x86",
               "location": "weblayer_instrumentation_test_M97",
-              "revision": "version:97.0.4692.37"
+              "revision": "version:97.0.4692.38"
             },
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ -6148,7 +6148,7 @@
             {
               "cipd_package": "chromium/testing/weblayer-x86",
               "location": "weblayer_instrumentation_test_M97",
-              "revision": "version:97.0.4692.37"
+              "revision": "version:97.0.4692.38"
             },
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index 06d9570..754eb26 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -43753,7 +43753,7 @@
             {
               "cipd_package": "chromium/testing/weblayer-x86",
               "location": "weblayer_instrumentation_test_M97",
-              "revision": "version:97.0.4692.37"
+              "revision": "version:97.0.4692.38"
             },
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ -44017,7 +44017,7 @@
             {
               "cipd_package": "chromium/testing/weblayer-x86",
               "location": "weblayer_instrumentation_test_M97",
-              "revision": "version:97.0.4692.37"
+              "revision": "version:97.0.4692.38"
             },
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ -44356,7 +44356,7 @@
             {
               "cipd_package": "chromium/testing/weblayer-x86",
               "location": "weblayer_instrumentation_test_M97",
-              "revision": "version:97.0.4692.37"
+              "revision": "version:97.0.4692.38"
             },
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ -44620,7 +44620,7 @@
             {
               "cipd_package": "chromium/testing/weblayer-x86",
               "location": "weblayer_instrumentation_test_M97",
-              "revision": "version:97.0.4692.37"
+              "revision": "version:97.0.4692.38"
             },
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ -44959,7 +44959,7 @@
             {
               "cipd_package": "chromium/testing/weblayer-x86",
               "location": "weblayer_instrumentation_test_M97",
-              "revision": "version:97.0.4692.37"
+              "revision": "version:97.0.4692.38"
             },
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ -45223,7 +45223,7 @@
             {
               "cipd_package": "chromium/testing/weblayer-x86",
               "location": "weblayer_instrumentation_test_M97",
-              "revision": "version:97.0.4692.37"
+              "revision": "version:97.0.4692.38"
             },
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
diff --git a/testing/buildbot/variants.pyl b/testing/buildbot/variants.pyl
index ea3677b..6819440 100644
--- a/testing/buildbot/variants.pyl
+++ b/testing/buildbot/variants.pyl
@@ -363,7 +363,7 @@
         {
           'cipd_package': 'chromium/testing/weblayer-x86',
           'location': 'weblayer_instrumentation_test_M97',
-          'revision': 'version:97.0.4692.37',
+          'revision': 'version:97.0.4692.38',
         }
       ],
     },
@@ -435,7 +435,7 @@
         {
           'cipd_package': 'chromium/testing/weblayer-x86',
           'location': 'weblayer_instrumentation_test_M97',
-          'revision': 'version:97.0.4692.37',
+          'revision': 'version:97.0.4692.38',
         }
       ],
     },
@@ -507,7 +507,7 @@
         {
           'cipd_package': 'chromium/testing/weblayer-x86',
           'location': 'weblayer_instrumentation_test_M97',
-          'revision': 'version:97.0.4692.37',
+          'revision': 'version:97.0.4692.38',
         }
       ],
     },
diff --git a/third_party/blink/public/mojom/web_feature/web_feature.mojom b/third_party/blink/public/mojom/web_feature/web_feature.mojom
index 181a342..9e2287a 100644
--- a/third_party/blink/public/mojom/web_feature/web_feature.mojom
+++ b/third_party/blink/public/mojom/web_feature/web_feature.mojom
@@ -1874,7 +1874,7 @@
   kV8FunctionTokenOffsetTooLongForToString = 2497,
   kServiceWorkerImportScriptNotInstalled = 2498,
   kNestedDedicatedWorker = 2499,
-  kClientHintsMetaAcceptCHLifetime = 2500,
+  kOBSOLETE_ClientHintsMetaAcceptCHLifetime = 2500,
   kCSSFillAvailableLogicalWidth = 2507,
   kCSSFillAvailableLogicalHeight = 2508,
   kPopupOpenWhileFileChooserOpened = 2509,
diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
index 9923e05..1f4214d 100644
--- a/third_party/blink/public/web/web_local_frame.h
+++ b/third_party/blink/public/web/web_local_frame.h
@@ -254,6 +254,11 @@
   virtual const absl::optional<base::UnguessableToken>& GetEmbeddingToken()
       const = 0;
 
+  // "Returns true if the frame the document belongs to, or any of its ancestor
+  // nodes is a fenced frame. See blink::Frame::IsInFencedFrameTree() for more
+  // details.
+  virtual bool IsInFencedFrameTree() const = 0;
+
   // Navigation Ping --------------------------------------------------------
 
   virtual void SendPings(const WebURL& destination_url) = 0;
diff --git a/third_party/blink/renderer/core/css/css_import_rule.cc b/third_party/blink/renderer/core/css/css_import_rule.cc
index 88cf1bd..477573f12 100644
--- a/third_party/blink/renderer/core/css/css_import_rule.cc
+++ b/third_party/blink/renderer/core/css/css_import_rule.cc
@@ -57,7 +57,7 @@
 
   if (import_rule_->IsLayered()) {
     result.Append(" layer");
-    String layer_name = import_rule_->GetLayerNameAsString();
+    String layer_name = layerName();
     if (layer_name.length()) {
       result.Append("(");
       result.Append(layer_name);
@@ -89,6 +89,12 @@
   return style_sheet_cssom_wrapper_.Get();
 }
 
+String CSSImportRule::layerName() const {
+  if (!import_rule_->IsLayered())
+    return g_null_atom;
+  return import_rule_->GetLayerNameAsString();
+}
+
 void CSSImportRule::Reattach(StyleRuleBase*) {
   // FIXME: Implement when enabling caching for stylesheets with import rules.
   NOTREACHED();
diff --git a/third_party/blink/renderer/core/css/css_import_rule.h b/third_party/blink/renderer/core/css/css_import_rule.h
index 3755ec0..1d95fdf5 100644
--- a/third_party/blink/renderer/core/css/css_import_rule.h
+++ b/third_party/blink/renderer/core/css/css_import_rule.h
@@ -45,6 +45,8 @@
   MediaList* media() const;
   CSSStyleSheet* styleSheet() const;
 
+  String layerName() const;
+
   void Trace(Visitor*) const override;
 
  private:
diff --git a/third_party/blink/renderer/core/css/css_import_rule.idl b/third_party/blink/renderer/core/css/css_import_rule.idl
index df27837..a69cef6 100644
--- a/third_party/blink/renderer/core/css/css_import_rule.idl
+++ b/third_party/blink/renderer/core/css/css_import_rule.idl
@@ -27,4 +27,6 @@
     readonly attribute DOMString href;
     [SameObject, PutForwards=mediaText] readonly attribute MediaList media;
     [SameObject] readonly attribute CSSStyleSheet styleSheet;
+
+    [RuntimeEnabled=CSSCascadeLayers] readonly attribute CSSOMString? layerName;
 };
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
index bba0ce47..fdb409d 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
@@ -98,6 +98,7 @@
 #include "services/network/public/cpp/web_sandbox_flags.h"
 #include "services/network/public/mojom/web_sandbox_flags.mojom-blink.h"
 #include "third_party/blink/public/common/context_menu_data/context_menu_params_builder.h"
+#include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/common/page_state/page_state.h"
 #include "third_party/blink/public/mojom/devtools/inspector_issue.mojom-blink.h"
 #include "third_party/blink/public/mojom/fenced_frame/fenced_frame.mojom-blink.h"
@@ -2315,6 +2316,12 @@
   frame_->SetEmbeddingToken(embedding_token);
 }
 
+bool WebLocalFrameImpl::IsInFencedFrameTree() const {
+  bool result = frame_->IsInFencedFrameTree();
+  DCHECK(!result || blink::features::IsFencedFramesEnabled());
+  return result;
+}
+
 const absl::optional<base::UnguessableToken>&
 WebLocalFrameImpl::GetEmbeddingToken() const {
   return frame_->GetEmbeddingToken();
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
index d4ad5967..fdee3c1a 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
@@ -133,6 +133,7 @@
       const base::UnguessableToken& embedding_token) override;
   const absl::optional<base::UnguessableToken>& GetEmbeddingToken()
       const override;
+  bool IsInFencedFrameTree() const override;
   void SendPings(const WebURL& destination_url) override;
   void StartReload(WebFrameLoadType) override;
   void ClearActiveFindMatchForTesting() override;
diff --git a/third_party/blink/renderer/core/inspector/inspector_overlay_agent.cc b/third_party/blink/renderer/core/inspector/inspector_overlay_agent.cc
index 6fbb3d9..ee0e1bf 100644
--- a/third_party/blink/renderer/core/inspector/inspector_overlay_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_overlay_agent.cc
@@ -1286,8 +1286,7 @@
     const DoubleSize& viewport_size_for_media_queries) {
   std::unique_ptr<protocol::DictionaryValue> reset_data =
       protocol::DictionaryValue::create();
-  reset_data->setDouble("deviceScaleFactor",
-                        GetFrame()->GetPage()->DeviceScaleFactorDeprecated());
+  reset_data->setDouble("deviceScaleFactor", WindowToViewportScale());
   reset_data->setDouble(
       "emulationScaleFactor",
       GetFrame()->GetPage()->GetChromeClient().InputEventsScaleForEmulation());
diff --git a/third_party/blink/renderer/core/layout/ng/ng_layout_overflow_calculator.cc b/third_party/blink/renderer/core/layout/ng/ng_layout_overflow_calculator.cc
index 9c32c20..e342e7c 100644
--- a/third_party/blink/renderer/core/layout/ng/ng_layout_overflow_calculator.cc
+++ b/third_party/blink/renderer/core/layout/ng/ng_layout_overflow_calculator.cc
@@ -140,20 +140,12 @@
   // would be.
   if (node_.Style().OverflowInlineDirection() == EOverflow::kAuto ||
       node_.Style().OverflowInlineDirection() == EOverflow::kScroll) {
-    if (converter.ToLogical(alternate_overflow.size).inline_size !=
-        converter.ToLogical(padding_rect_.size).inline_size) {
+    UseCounter::Count(node_.GetDocument(),
+                      WebFeature::kNewLayoutOverflowDifferentBlock);
+    if (!inflow_bounds->IsEmpty()) {
       UseCounter::Count(
           node_.GetDocument(),
-          WebFeature::kNewLayoutOverflowDifferentAndAlreadyScrollsBlock);
-    } else {
-      UseCounter::Count(node_.GetDocument(),
-                        WebFeature::kNewLayoutOverflowDifferentBlock);
-      if (!inflow_bounds->IsEmpty()) {
-        UseCounter::Count(
-            node_.GetDocument(),
-            WebFeature::
-                kNewLayoutOverflowDifferentBlockWithNonEmptyInflowBounds);
-      }
+          WebFeature::kNewLayoutOverflowDifferentBlockWithNonEmptyInflowBounds);
     }
   }
 
diff --git a/third_party/blink/renderer/modules/screen_orientation/screen_orientation_controller.cc b/third_party/blink/renderer/modules/screen_orientation/screen_orientation_controller.cc
index dacd4d4..dff21a1 100644
--- a/third_party/blink/renderer/modules/screen_orientation/screen_orientation_controller.cc
+++ b/third_party/blink/renderer/modules/screen_orientation/screen_orientation_controller.cc
@@ -48,13 +48,23 @@
       PageVisibilityObserver(window.GetFrame()->GetPage()),
       Supplement<LocalDOMWindow>(window),
       screen_orientation_service_(&window) {
-  AssociatedInterfaceProvider* provider =
-      window.GetFrame()->GetRemoteNavigationAssociatedInterfaces();
-  if (provider) {
-    provider->GetInterface(
-        screen_orientation_service_.BindNewEndpointAndPassReceiver(
-            window.GetTaskRunner(TaskType::kMiscPlatformAPI)));
+  Page* page = window.GetFrame()->GetPage();
+
+  // https://wicg.github.io/nav-speculation/prerendering.html#patch-orientation-lock
+  // Step 2: If this's relevant global object's browsing context is a
+  // prerendering browsing context, then append the following steps to this's
+  // post-prerendering activation steps list and return promise.
+  //
+  // According to the specification, `lock` and `unlock` operations should be
+  // deferred until the prerendering page is activated. So here it also delay
+  // binding the interface until activation because no one would use it.
+  if (page && page->IsPrerendering()) {
+    DomWindow()->document()->AddPostPrerenderingActivationStep(
+        WTF::Bind(&ScreenOrientationController::BuildMojoConnection,
+                  WrapWeakPersistent(this)));
+    return;
   }
+  BuildMojoConnection();
 }
 
 // Compute the screen orientation using the orientation angle and the screen
@@ -126,6 +136,19 @@
   return orientation_ && DomWindow() && GetPage() && GetPage()->IsPageVisible();
 }
 
+void ScreenOrientationController::BuildMojoConnection() {
+  // Need not to bind when detached.
+  if (!DomWindow() || !DomWindow()->document())
+    return;
+  AssociatedInterfaceProvider* provider =
+      DomWindow()->GetFrame()->GetRemoteNavigationAssociatedInterfaces();
+  if (provider) {
+    provider->GetInterface(
+        screen_orientation_service_.BindNewEndpointAndPassReceiver(
+            DomWindow()->GetTaskRunner(TaskType::kMiscPlatformAPI)));
+  }
+}
+
 void ScreenOrientationController::PageVisibilityChanged() {
   if (!IsActiveAndVisible())
     return;
@@ -203,10 +226,9 @@
     return;
 
   // https://wicg.github.io/nav-speculation/prerendering.html#patch-orientation-lock
-  // Step 7.3.10. Screen Orientation API.
-  // Defer to lock with |orientation| until the prerendering page is activated
-  // via appending lock operation to the post-prerendering activation steps
-  // list.
+  // Step 2: If this's relevant global object's browsing context is a
+  // prerendering browsing context, then append the following steps to this's
+  // post-prerendering activation steps list and return promise.
   if (DomWindow()->document()->IsPrerendering()) {
     DomWindow()->document()->AddPostPrerenderingActivationStep(
         WTF::Bind(&ScreenOrientationController::LockOrientationInternal,
@@ -223,10 +245,9 @@
     return;
 
   // https://wicg.github.io/nav-speculation/prerendering.html#patch-orientation-lock
-  // Step 7.3.10. Screen Orientation API.
-  // Defer to unlock with |orientation| until the prerendering page is activated
-  // via appending unlock operation to the post-prerendering activation steps
-  // list.
+  // Step 2: If this's relevant global object's browsing context is a
+  // prerendering browsing context, then append the following steps to this's
+  // post-prerendering activation steps list and return promise.
   if (DomWindow()->document()->IsPrerendering()) {
     DomWindow()->document()->AddPostPrerenderingActivationStep(
         WTF::Bind(&ScreenOrientationController::UnlockOrientationInternal,
@@ -315,6 +336,11 @@
 void ScreenOrientationController::LockOrientationInternal(
     device::mojom::blink::ScreenOrientationLockType orientation,
     std::unique_ptr<WebLockOrientationCallback> callback) {
+  // Do not lock when detached. This can be executed as a post prerendering
+  // activation step so should be checked again.
+  if (!DomWindow() || !DomWindow()->document())
+    return;
+
   CancelPendingLocks();
   pending_callback_ = std::move(callback);
   screen_orientation_service_->LockOrientation(
@@ -326,6 +352,11 @@
 }
 
 void ScreenOrientationController::UnlockOrientationInternal() {
+  // Do not unlock when detached. This can be executed as a post prerendering
+  // activation step so should be checked again.
+  if (!DomWindow() || !DomWindow()->document())
+    return;
+
   CancelPendingLocks();
   screen_orientation_service_->UnlockOrientation();
   active_lock_ = false;
diff --git a/third_party/blink/renderer/modules/screen_orientation/screen_orientation_controller.h b/third_party/blink/renderer/modules/screen_orientation/screen_orientation_controller.h
index 1da440a..8d32cfc8 100644
--- a/third_party/blink/renderer/modules/screen_orientation/screen_orientation_controller.h
+++ b/third_party/blink/renderer/modules/screen_orientation/screen_orientation_controller.h
@@ -71,6 +71,12 @@
 
   void UpdateOrientation();
 
+  // Sends binding requests to the browser for
+  // device::mojom::blink::ScreenOrientation. This method can be called when:
+  // * `this` is created in non-prerendering context.
+  // * The corresponding prerendering context is activated.
+  void BuildMojoConnection();
+
   bool IsActiveAndVisible() const;
 
   void OnLockOrientationResult(int, ScreenOrientationLockResult);
diff --git a/third_party/blink/renderer/modules/webusb/usb_interface.cc b/third_party/blink/renderer/modules/webusb/usb_interface.cc
index ee7b79b..bba6f5e 100644
--- a/third_party/blink/renderer/modules/webusb/usb_interface.cc
+++ b/third_party/blink/renderer/modules/webusb/usb_interface.cc
@@ -51,10 +51,11 @@
 }
 
 USBAlternateInterface* USBInterface::alternate() const {
-  if (device_->IsInterfaceClaimed(configuration_index_, interface_index_))
+  if (device_->IsInterfaceClaimed(configuration_index_, interface_index_)) {
     return USBAlternateInterface::Create(
         this, device_->SelectedAlternateInterface(interface_index_));
-  return nullptr;
+  }
+  return USBAlternateInterface::Create(this, 0);
 }
 
 HeapVector<Member<USBAlternateInterface>> USBInterface::alternates() const {
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index 95843908..b67c00b 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -281,14 +281,7 @@
     },
     {
       name: "BarcodeDetector",
-      status: {
-        // Built-in barcode detection APIs are only available from some
-        // platforms. See //services/shape_detection.
-        "Android": "stable",
-        "ChromeOS": "stable",
-        "Mac": "stable",
-        "default": "test",
-      },
+      status: "stable",
     },
     {
       // https://github.com/chrishtr/battery-savings/blob/master/explainer.md
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
index 4fa7b30..d2f9011 100644
--- a/third_party/blink/web_tests/TestExpectations
+++ b/third_party/blink/web_tests/TestExpectations
@@ -3681,7 +3681,6 @@
 crbug.com/626703 [ Fuchsia ] virtual/threaded/external/wpt/animation-worklet/worklet-animation-pause-immediately.https.html [ Failure ]
 crbug.com/626703 [ Mac ] external/wpt/web-locks/query-ordering.tentative.https.html [ Failure Pass ]
 crbug.com/626703 external/wpt/fetch/connection-pool/network-partition-key.html [ Failure Skip Timeout ]
-crbug.com/626703 [ Mac10.15 ] external/wpt/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-tokenization-top-left.html [ Skip Timeout ]
 crbug.com/626703 external/wpt/input-events/input-events-get-target-ranges-backspace.tentative.html [ Failure Skip Timeout ]
 crbug.com/626703 external/wpt/input-events/input-events-get-target-ranges-forwarddelete.tentative.html [ Failure Skip Timeout ]
 crbug.com/626703 [ Linux ] external/wpt/css/css-color/t422-rgba-a0.6-a.xht [ Failure ]
@@ -3725,7 +3724,6 @@
 crbug.com/626703 external/wpt/workers/shared-worker-parse-error-failure.html [ Timeout ]
 crbug.com/626703 external/wpt/webrtc/RTCPeerConnection-operations.https.html [ Timeout ]
 crbug.com/626703 external/wpt/content-dpr/content-dpr-various-elements.html [ Failure ]
-crbug.com/626703 [ Mac10.14 ] external/wpt/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-tokenization-top-left.html [ Skip Timeout ]
 crbug.com/626703 external/wpt/workers/abrupt-completion.html [ Timeout ]
 crbug.com/626703 [ Mac10.12 ] external/wpt/eventsource/eventsource-constructor-url-bogus.any.html [ Failure Timeout ]
 crbug.com/626703 [ Mac10.12 ] external/wpt/html/webappapis/scripting/events/event-handler-attributes-body-window.html [ Failure Timeout ]
@@ -7339,3 +7337,7 @@
 # Sheriff 2021-12-01
 crbug.com/1275658 http/tests/misc/script-after-slow-stylesheet-removed.html [ Failure Pass ]
 crbug.com/1275716 [ Mac ] fast/forms/text-control-intrinsic-widths.html [ Failure Pass ]
+
+# Sheriff 2021-12-02
+crbug.com/1275944 [ Mac ] external/wpt/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-tokenization-top-left.html [ Failure Pass ]
+crbug.com/1275967 [ Linux ] external/wpt/permissions-policy/permissions-policy-frame-policy-timing.https.sub.html [ Failure Pass ]
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/css/css-cascade/idlharness.html b/third_party/blink/web_tests/external/wpt/css/css-cascade/idlharness.html
index fff4c66..80d3318 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-cascade/idlharness.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-cascade/idlharness.html
@@ -7,8 +7,9 @@
 <script src="/resources/idlharness.js"></script>
 
 <style>
-@layer foo { }
 @layer bar, baz;
+@import url('data:text/css,') layer(qux);
+@layer foo { }
 </style>
 
 <script>
@@ -18,15 +19,17 @@
     ['cssom'],
     idl_array => {
       try {
-        self.block = document.styleSheets[0].cssRules.item(0);
-        self.statement = document.styleSheets[0].cssRules.item(1);
+        self.statement = document.styleSheets[0].cssRules.item(0);
+        self.layeredImport = document.styleSheets[0].cssRules.item(1);
+        self.block = document.styleSheets[0].cssRules.item(2);
       } catch (e) {
-        // Will be surfaced when block or statement is undefined below.
+        // Will be surfaced when any rule is undefined below.
       }
 
       idl_array.add_objects({
         CSSLayerBlockRule: ['block'],
         CSSLayerStatementRule: ['statement'],
+        CSSImportRule: ['layeredImport']
       });
     }
   );
diff --git a/third_party/blink/web_tests/external/wpt/css/css-cascade/layer-rules-cssom.html b/third_party/blink/web_tests/external/wpt/css/css-cascade/layer-rules-cssom.html
index 923da1b..3e0b613 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-cascade/layer-rules-cssom.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-cascade/layer-rules-cssom.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
-<title>The CSSOM API for @layer Rules</title>
-<link rel="help" href="https://drafts.csswg.org/css-cascade-5/#the-csslayerblockrule-interface">
-<link rel="help" href="https://drafts.csswg.org/css-cascade-5/#the-csslayerstatementrule-interface">
+<title>The CSSOM API for Cascade Layers</title>
+<link rel="help" href="https://drafts.csswg.org/css-cascade-5/#layer-apis">
 <link rel="author" href="mailto:xiaochengh@chromium.org">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -51,6 +50,27 @@
     expectedNames: ['outer', ['foo.bar', 'baz'], ['outer.foo.bar', 'outer.baz']],
     title: 'Nested layer statement name lists',
   },
+  {
+    style: `
+      @import url('data:text/css,') layer;
+    `,
+    expectedNames: [''],
+    title: 'Import into anonymous layer',
+  },
+  {
+    style: `
+      @import url('data:text/css,') layer(foo);
+    `,
+    expectedNames: ['foo'],
+    title: 'Import into named layer',
+  },
+  {
+    style: `
+      @import url('data:text/css,');
+    `,
+    expectedNames: [null],
+    title: 'Import without layer',
+  },
 ];
 
 for (let testCase of testCases) {
@@ -66,6 +86,8 @@
     function compareNames(ruleOrSheet) {
       if (ruleOrSheet instanceof CSSLayerBlockRule)
         assert_equals(ruleOrSheet.name, testCase.expectedNames[index++]);
+      else if (ruleOrSheet instanceof CSSImportRule)
+        assert_equals(ruleOrSheet.layerName, testCase.expectedNames[index++]);
       else if (ruleOrSheet instanceof CSSLayerStatementRule)
         assert_array_equals(ruleOrSheet.nameList, testCase.expectedNames[index++]);
       if (ruleOrSheet.cssRules) {
diff --git a/third_party/blink/web_tests/external/wpt/css/css-cascade/revert-layer-012.html b/third_party/blink/web_tests/external/wpt/css/css-cascade/revert-layer-012.html
new file mode 100644
index 0000000..e065def
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-cascade/revert-layer-012.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<title>CSS Cascade Layers: important 'revert-layer' from the style attribute to other style sheets</title>
+<link rel="help" href="https://drafts.csswg.org/css-cascade-5/#revert-layer">
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+<link rel="match" href="reference/ref-filled-green-100px-square.xht">
+
+<style>
+#target {
+  width: 100px;
+  height: 100px;
+  background-color: green !important;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="target" style="background-color: red !important; background-color: revert-layer !important"></div>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/aspect-ratio-feature-evaluation.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/aspect-ratio-feature-evaluation.html
new file mode 100644
index 0000000..ee34c54f
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/aspect-ratio-feature-evaluation.html
@@ -0,0 +1,46 @@
+<!doctype html>
+<title>@container queries with aspect-ratio</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#aspect-ratio">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  .container {
+    width: 100px;
+    height: 100px;
+  }
+  #inline-size { container-type: inline-size; }
+  #size { container-type: size; }
+  span { color: red }
+  @container size(min-aspect-ratio: 1 / 1000) {
+    span { color: green; }
+  }
+  @container size(min-aspect-ratio: 2 / 1) {
+    span { background-color: lime; }
+  }
+</style>
+<div id="inline-size" class="container"><span></span></div>
+<div id="size" class="container"><span></span></div>
+<script>
+  const red = "rgb(255, 0, 0)";
+  const green = "rgb(0, 128, 0)";
+  const lime = "rgb(0, 255, 0)";
+  const transparent = "rgba(0, 0, 0, 0)";
+
+  const inline_span = document.querySelector("#inline-size > span");
+  const size_span = document.querySelector("#size > span");
+
+  test(() => {
+    assert_equals(getComputedStyle(inline_span).color, red,
+                  "Should not match for inline-size containment");
+    assert_equals(getComputedStyle(size_span).color, green,
+                  "Should match for block-size containment");
+    assert_equals(getComputedStyle(size_span).backgroundColor, transparent,
+                  "Square should not match 2/1 min-ratio");
+  }, "@container queries with aspect-ratio and size containment");
+
+  test(() => {
+    document.querySelector("#size").style.width = "200px";
+    assert_equals(getComputedStyle(size_span).backgroundColor, lime,
+                  "Should match 2/1 min-ratio");
+  }, "@container query with aspect-ratio change after resize");
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/backdrop-invalidation.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/backdrop-invalidation.html
new file mode 100644
index 0000000..778d640
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/backdrop-invalidation.html
@@ -0,0 +1,48 @@
+<!doctype html>
+<title>Test that ::backdrop responds to container size changes</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#size-container">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  :root {
+    color: black;
+  }
+
+  #container {
+    container-type: size;
+    width: 200px;
+    height: 40px;
+  }
+
+  ::backdrop {
+    background-color: black;
+  }
+
+  @container size(min-width: 300px) {
+    ::backdrop {
+      background-color: green;
+    }
+  }
+</style>
+<main id=container>
+  <dialog>test</dialog>
+</main>
+<script>
+  let dialog = document.querySelector('dialog');
+
+  test(function() {
+    try {
+      dialog.showModal();
+
+      assert_equals(getComputedStyle(dialog, '::backdrop').backgroundColor, 'rgb(0, 0, 0)');
+
+      container.style.width = '300px';
+      assert_equals(getComputedStyle(dialog, '::backdrop').backgroundColor, 'rgb(0, 128, 0)');
+
+      container.style = '';
+      assert_equals(getComputedStyle(dialog, '::backdrop').backgroundColor, 'rgb(0, 0, 0)');
+    } finally {
+      dialog.close();
+    }
+  }, 'Pseudo-element ::backdrop responds to container size changes');
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/conditional-container-status.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/conditional-container-status.html
new file mode 100644
index 0000000..8b5bb9b
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/conditional-container-status.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<title>Conditionally removing container status</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#container-type">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  .parent { width: 300px; }
+  .child { width: 100px; }
+  .parent, .child { container-type: inline-size; }
+  @container size(min-width: 200px) {
+    .child { container-type: initial; }
+    .grandchild { border: 3px solid green }
+  }
+</style>
+<div class="parent">
+  <div class="child">
+    <div class="grandchild">You should see a green border around this text</div>
+  </div>
+</div>
+<script>
+  test(function() {
+    let s = getComputedStyle(document.querySelector('.grandchild'));
+    assert_equals(s.getPropertyValue('border-color'), 'rgb(0, 128, 0)');
+  }, 'Conditionally applying container-type:initial');
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-computed-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-computed-expected.txt
new file mode 100644
index 0000000..262fe39
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-computed-expected.txt
@@ -0,0 +1,17 @@
+This is a testharness.js-based test.
+PASS Property container value 'initial'
+PASS Property container value 'inherit'
+PASS Property container value 'unset'
+PASS Property container value 'inline-size'
+PASS Property container value 'size'
+PASS Property container value 'inline-size / inline-size'
+PASS Property container value 'size / block-size'
+FAIL Property container value 'size style / name' assert_true: 'size style / name' is a supported value for container. expected true got false
+FAIL Property container value 'inline-size state style/ name' assert_true: 'inline-size state style/ name' is a supported value for container. expected true got false
+PASS Property container value 'inline-size / foo'
+PASS Property container value 'inline-size /foo'
+PASS Property container value 'inline-size/ foo'
+PASS Property container value 'inline-size/foo'
+PASS Property container value 'size / FoO'
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-computed.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-computed.html
new file mode 100644
index 0000000..3485e2f8
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-computed.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Containment Test: Computed values of container</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#container-name">
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#container-type">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<div id="target"></div>
+<script>
+test_computed_value('container', 'initial', 'none');
+test_computed_value('container', 'inherit', 'none');
+test_computed_value('container', 'unset', 'none');
+test_computed_value('container', 'inline-size');
+test_computed_value('container', 'size');
+test_computed_value('container', 'inline-size / inline-size');
+test_computed_value('container', 'size / block-size');
+test_computed_value('container', 'size style / name', 'style size / name');
+test_computed_value('container', 'inline-size state style/ name', 'style state inline-size / name');
+test_computed_value('container', 'inline-size / foo');
+test_computed_value('container', 'inline-size /foo', 'inline-size / foo');
+test_computed_value('container', 'inline-size/ foo', 'inline-size / foo');
+test_computed_value('container', 'inline-size/foo', 'inline-size / foo');
+test_computed_value('container', 'size / FoO', 'size / FoO');
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-inheritance.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-inheritance.html
new file mode 100644
index 0000000..0dda54a
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-inheritance.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Containment Test: Inheritance of container-*</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#container-name">
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#container-type">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/inheritance-testcommon.js"></script>
+<div id="container">
+  <div id="target"></div>
+</div>
+<script>
+assert_not_inherited('container-name', 'none', 'foo');
+assert_not_inherited('container-type', 'none', 'inline-size');
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-name-computed.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-name-computed.html
new file mode 100644
index 0000000..dfd00a0
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-name-computed.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Containment Test: Computed values of container-name</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#container-name">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<div id="target"></div>
+<script>
+test_computed_value('container-name', 'initial', 'none');
+test_computed_value('container-name', 'unset', 'none');
+test_computed_value('container-name', 'foo');
+test_computed_value('container-name', 'FoO');
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-name-invalidation.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-name-invalidation.html
new file mode 100644
index 0000000..2017f7b
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-name-invalidation.html
@@ -0,0 +1,71 @@
+<!doctype html>
+<title>container-name invalidation</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#container-name">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  div {
+    color: black;
+  }
+  #outer {
+    container-name: c1;
+    container-type: inline-size;
+    width: 300px;
+  }
+
+  #inner {
+    container-name: c2;
+    container-type: inline-size;
+    width: 200px;
+  }
+
+  #intermediate {
+    width: 250px;
+  }
+
+  @container c1 size(width: 250px) {
+    #child {
+      color: green;
+    }
+  }
+</style>
+<div id=outer>
+  <div id=intermediate>
+    <div id=inner>
+      <div id=child>Test</div>
+    </div>
+  </div>
+</div>
+<script>
+  test(function(t) {
+    t.add_cleanup(() => { outer.style = ''; });
+
+    assert_equals(getComputedStyle(child).color, 'rgb(0, 0, 0)');
+
+    outer.style.width = '250px';
+    assert_equals(getComputedStyle(child).color, 'rgb(0, 128, 0)');
+
+    outer.style.width = '251px';
+    assert_equals(getComputedStyle(child).color, 'rgb(0, 0, 0)');
+  }, 'Changing a named container invalidates relevant descendants');
+
+  test(function(t) {
+    t.add_cleanup(() => {
+      outer.style = '';
+      intermediate.style = '';
+    });
+
+    assert_equals(getComputedStyle(child).color, 'rgb(0, 0, 0)');
+
+    // #intermediate becomes the new container.
+    intermediate.style = 'container-name:c1; container-type:inline-size';
+    assert_equals(getComputedStyle(child).color, 'rgb(0, 128, 0)');
+
+    // #outer becomes the container again.
+    intermediate.style = '';
+    assert_equals(getComputedStyle(child).color, 'rgb(0, 0, 0)');
+
+    outer.style.width = '250px';
+    assert_equals(getComputedStyle(child).color, 'rgb(0, 128, 0)');
+  }, 'Changing container-name invalidates relevant descendants');
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-name-parsing-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-name-parsing-expected.txt
new file mode 100644
index 0000000..cda9550e
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-name-parsing-expected.txt
@@ -0,0 +1,16 @@
+This is a testharness.js-based test.
+PASS e.style['container-name'] = "initial" should set the property value
+PASS e.style['container-name'] = "inherit" should set the property value
+PASS e.style['container-name'] = "unset" should set the property value
+PASS e.style['container-name'] = "revert" should set the property value
+PASS e.style['container-name'] = "none" should set the property value
+PASS e.style['container-name'] = "foo" should set the property value
+PASS e.style['container-name'] = "BAR" should set the property value
+FAIL e.style['container-name'] = "foo bar" should set the property value assert_not_equals: property should be set got disallowed value ""
+PASS e.style['container-name'] = "none none" should not set the property value
+PASS e.style['container-name'] = "foo, bar" should not set the property value
+PASS e.style['container-name'] = "#fff" should not set the property value
+PASS e.style['container-name'] = "1px" should not set the property value
+PASS e.style['container-name'] = "default" should not set the property value
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-name-parsing.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-name-parsing.html
new file mode 100644
index 0000000..de408dd
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-name-parsing.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Containment Test: Parsing of container-name</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#container-name">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<div id="target"></div>
+<script>
+test_valid_value('container-name', 'initial');
+test_valid_value('container-name', 'inherit');
+test_valid_value('container-name', 'unset');
+test_valid_value('container-name', 'revert');
+test_valid_value('container-name', 'none');
+test_valid_value('container-name', 'foo');
+test_valid_value('container-name', 'BAR');
+test_valid_value('container-name', 'foo bar');
+
+test_invalid_value('container-name', 'none none');
+test_invalid_value('container-name', 'foo, bar');
+test_invalid_value('container-name', '#fff');
+test_invalid_value('container-name', '1px');
+test_invalid_value('container-name', 'default'); /* reserved */
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-parsing-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-parsing-expected.txt
new file mode 100644
index 0000000..5ef42ae
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-parsing-expected.txt
@@ -0,0 +1,38 @@
+This is a testharness.js-based test.
+PASS e.style['container'] = "initial" should set the property value
+PASS e.style['container'] = "inherit" should set the property value
+PASS e.style['container'] = "unset" should set the property value
+PASS e.style['container'] = "revert" should set the property value
+PASS e.style['container'] = "none" should set the property value
+PASS e.style['container'] = "none / none" should set the property value
+PASS e.style['container'] = "inline-size" should set the property value
+PASS e.style['container'] = "inline-size / none" should set the property value
+PASS e.style['container'] = "size" should set the property value
+PASS e.style['container'] = "size / block-size" should set the property value
+PASS e.style['container'] = "inline-size / inline-size" should set the property value
+PASS e.style['container'] = "size / size" should set the property value
+FAIL e.style['container'] = "size state / none" should set the property value assert_not_equals: property should be set got disallowed value ""
+PASS e.style['container'] = "none none" should not set the property value
+PASS e.style['container'] = "none inline-size" should not set the property value
+PASS e.style['container'] = "inline-size none" should not set the property value
+PASS e.style['container'] = "inline-size inline-size" should not set the property value
+PASS e.style['container'] = "inline-size block-size unknown" should not set the property value
+PASS e.style['container'] = "inline-size block-size" should not set the property value
+PASS e.style['container'] = "size block-size" should not set the property value
+PASS e.style['container'] = "none, none" should not set the property value
+PASS e.style['container'] = "foo" should not set the property value
+PASS e.style['container'] = "foo, bar" should not set the property value
+PASS e.style['container'] = "#fff" should not set the property value
+PASS e.style['container'] = "1px" should not set the property value
+PASS e.style['container'] = "default" should not set the property value
+PASS e.style['container'] = "inline-size / 10px" should not set the property value
+PASS e.style['container'] = "inline-size / #fefefe" should not set the property value
+PASS e.style['container'] = "inline-size / calc(3px)" should not set the property value
+PASS e.style['container'] = "size 1 / name" should not set the property value
+FAIL e.style['container'] = "block-size" should not set the property value assert_equals: expected "" but got "block-size"
+FAIL e.style['container'] = "block-size / name" should not set the property value assert_equals: expected "" but got "block-size / name"
+FAIL e.style['container'] = "block-size /  NAME" should not set the property value assert_equals: expected "" but got "block-size / NAME"
+FAIL e.style['container'] = "block-size/NAME" should not set the property value assert_equals: expected "" but got "block-size / NAME"
+FAIL e.style['container'] = "block-size / block-size" should not set the property value assert_equals: expected "" but got "block-size / block-size"
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-parsing.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-parsing.html
new file mode 100644
index 0000000..9ec72b2f
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-parsing.html
@@ -0,0 +1,47 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Containment Test: Parsing of container</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#container-name">
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#container-type">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<div id="target"></div>
+<script>
+test_valid_value('container', 'initial');
+test_valid_value('container', 'inherit');
+test_valid_value('container', 'unset');
+test_valid_value('container', 'revert');
+test_valid_value('container', 'none');
+test_valid_value('container', 'none / none', 'none');
+test_valid_value('container', 'inline-size');
+test_valid_value('container', 'inline-size / none', 'inline-size');
+test_valid_value('container', 'size');
+test_valid_value('container', 'size / block-size');
+test_valid_value('container', 'inline-size / inline-size');
+test_valid_value('container', 'size / size');
+test_valid_value('container', 'size state / none', 'size state');
+
+test_invalid_value('container', 'none none');
+test_invalid_value('container', 'none inline-size');
+test_invalid_value('container', 'inline-size none');
+test_invalid_value('container', 'inline-size inline-size');
+test_invalid_value('container', 'inline-size block-size unknown');
+test_invalid_value('container', 'inline-size block-size');
+test_invalid_value('container', 'size block-size');
+test_invalid_value('container', 'none, none');
+test_invalid_value('container', 'foo');
+test_invalid_value('container', 'foo, bar');
+test_invalid_value('container', '#fff');
+test_invalid_value('container', '1px');
+test_invalid_value('container', 'default');
+test_invalid_value('container', 'inline-size / 10px');
+test_invalid_value('container', 'inline-size / #fefefe');
+test_invalid_value('container', 'inline-size / calc(3px)');
+test_invalid_value('container', 'size 1 / name');
+test_invalid_value('container', 'block-size');
+test_invalid_value('container', 'block-size / name');
+test_invalid_value('container', 'block-size /  NAME', 'block-size / NAME');
+test_invalid_value('container', 'block-size/NAME','block-size / NAME');
+test_invalid_value('container', 'block-size / block-size');
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-selection.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-selection.html
index 347c24d..8e721c4 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-selection.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-selection.html
@@ -29,6 +29,8 @@
   .b-size { container:  inline-size / b; }
   .b-size { container:  size / b; }
 
+  .a { container-name: a; contain: strict; }
+
 </style>
 
 <main>
@@ -73,6 +75,14 @@
 
 <main>
   <div class="a-size">
+    <div class="a">
+      <span></span>
+    </div>
+  </div>
+</main>
+
+<main>
+  <div class="a-size">
     <div class="b-size">
       <div class="a-inline">
         <span></span>
@@ -145,6 +155,9 @@
   test_rejected('c size(width)', '.a-size > .b-size > span');
   test_applied('a size(width: 16px)', '.a-size > .a-size > span');
 
+  // container-name alone does not establish a container:
+  test_applied('a size(width: 32px)', '.a-size > .a > span');
+
   // The following tests have three containers:
   //
   //  outer  -> 32x32px
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-size-invalidation.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-size-invalidation.html
new file mode 100644
index 0000000..bf9d64f
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-size-invalidation.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<title>@container-dependent elements respond to container size changes</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#size-container">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #container {
+    container-type: size;
+    width: 200px;
+    height: 50px;
+  }
+  div { color: red; }
+  @container size(min-width: 300px) {
+    div { color: green; }
+  }
+</style>
+<main id=container>
+  <div id=child>
+    Test
+    <p><span id=descendant>Deep</span></p>
+  </div>
+</main>
+<script>
+  test(function() {
+    assert_equals(getComputedStyle(child).color, 'rgb(255, 0, 0)');
+    container.style.width = '300px';
+    assert_equals(getComputedStyle(child).color, 'rgb(0, 128, 0)');
+  }, 'Children respond to changes in container size');
+
+  test(function() {
+    container.style = '';
+    assert_equals(getComputedStyle(descendant).color, 'rgb(255, 0, 0)');
+    container.style.width = '300px';
+    assert_equals(getComputedStyle(descendant).color, 'rgb(0, 128, 0)');
+  }, 'Descendants respond to changes in container size');
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-type-computed.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-type-computed.html
new file mode 100644
index 0000000..edcd057
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-type-computed.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Computed values of container-type</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#container-type">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<div id="target"></div>
+<script>
+test_computed_value('container-type', 'initial', 'none');
+test_computed_value('container-type', 'unset', 'none');
+test_computed_value('container-type', 'inline-size');
+test_computed_value('container-type', 'size');
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-type-invalidation.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-type-invalidation.html
new file mode 100644
index 0000000..f4b1bf8
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-type-invalidation.html
@@ -0,0 +1,67 @@
+<!doctype html>
+<title>container-type invalidation</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#container-type">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  div {
+    color: black;
+  }
+  #outer {
+    width: 300px;
+  }
+
+  #intermediate {
+    width: 250px;
+  }
+
+  #inner {
+    width: 200px;
+  }
+
+  .container {
+    container-type: inline-size;
+  }
+
+  @container size((max-width: 200px) or (min-width: 300px)) {
+    #child { color: green; }
+  }
+
+</style>
+<div id=outer>
+  <div id=intermediate>
+    <div id=inner>
+      <div id=child>Test</div>
+    </div>
+  </div>
+</div>
+<script>
+  test(function(t) {
+    t.add_cleanup(() => {
+      for (let e of [outer, intermediate, inner])
+        e.classList.remove('container');
+    });
+
+    // No container.
+    assert_equals(getComputedStyle(child).color, 'rgb(0, 0, 0)');
+
+    outer.classList.add('container');
+    assert_equals(getComputedStyle(child).color, 'rgb(0, 128, 0)');
+
+    // The container query does not match widths in the range [201, 299],
+    // and #intermediate has width:250px.
+    intermediate.classList.add('container');
+    assert_equals(getComputedStyle(child).color, 'rgb(0, 0, 0)');
+
+    inner.classList.add('container');
+    assert_equals(getComputedStyle(child).color, 'rgb(0, 128, 0)');
+
+    // Should have no effect, #inner is the container.
+    outer.classList.remove('container');
+    intermediate.classList.remove('container');
+    assert_equals(getComputedStyle(child).color, 'rgb(0, 128, 0)');
+
+    inner.classList.remove('container');
+    assert_equals(getComputedStyle(child).color, 'rgb(0, 0, 0)');
+  }, 'Changing the container type invalidates relevant descendants');
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-type-layout-invalidation.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-type-layout-invalidation.html
new file mode 100644
index 0000000..57fbc5a
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-type-layout-invalidation.html
@@ -0,0 +1,26 @@
+<!doctype html>
+<title>container-type layout invalidation</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#size-container">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #div {
+    width: fit-content;
+  }
+</style>
+<div id=div>
+  content
+</div>
+<script>
+  test(function(t) {
+    t.add_cleanup(() => { div.style = ''; });
+
+    assert_greater_than(div.offsetWidth, 0);
+    assert_greater_than(div.offsetHeight, 0);
+
+    div.style.containerType = 'size';
+
+    assert_equals(div.offsetWidth, 0);
+    assert_equals(div.offsetHeight, 0);
+  }, 'Changing container-type invalidates layout');
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-type-parsing-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-type-parsing-expected.txt
new file mode 100644
index 0000000..82de146
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-type-parsing-expected.txt
@@ -0,0 +1,33 @@
+This is a testharness.js-based test.
+PASS e.style['container-type'] = "initial" should set the property value
+PASS e.style['container-type'] = "inherit" should set the property value
+PASS e.style['container-type'] = "unset" should set the property value
+PASS e.style['container-type'] = "revert" should set the property value
+PASS e.style['container-type'] = "none" should set the property value
+FAIL e.style['container-type'] = "style" should set the property value assert_not_equals: property should be set got disallowed value ""
+FAIL e.style['container-type'] = "state" should set the property value assert_not_equals: property should be set got disallowed value ""
+PASS e.style['container-type'] = "size" should set the property value
+PASS e.style['container-type'] = "inline-size" should set the property value
+FAIL e.style['container-type'] = "inline-size state" should set the property value assert_not_equals: property should be set got disallowed value ""
+FAIL e.style['container-type'] = "style state" should set the property value assert_not_equals: property should be set got disallowed value ""
+FAIL e.style['container-type'] = "style inline-size" should set the property value assert_not_equals: property should be set got disallowed value ""
+FAIL e.style['container-type'] = "state size" should set the property value assert_not_equals: property should be set got disallowed value ""
+FAIL e.style['container-type'] = "block-size" should not set the property value assert_equals: expected "" but got "block-size"
+PASS e.style['container-type'] = "none none" should not set the property value
+PASS e.style['container-type'] = "none inline-size" should not set the property value
+PASS e.style['container-type'] = "inline-size none" should not set the property value
+PASS e.style['container-type'] = "inline-size inline-size" should not set the property value
+PASS e.style['container-type'] = "inline-size block-size" should not set the property value
+PASS e.style['container-type'] = "block-size inline-size" should not set the property value
+PASS e.style['container-type'] = "size inline-size" should not set the property value
+PASS e.style['container-type'] = "inline-size size" should not set the property value
+PASS e.style['container-type'] = "none, none" should not set the property value
+PASS e.style['container-type'] = "foo" should not set the property value
+PASS e.style['container-type'] = "\"foo\"" should not set the property value
+PASS e.style['container-type'] = "foo, bar" should not set the property value
+PASS e.style['container-type'] = "#fff" should not set the property value
+PASS e.style['container-type'] = "1px" should not set the property value
+PASS e.style['container-type'] = "default" should not set the property value
+PASS e.style['container-type'] = "size nonsense" should not set the property value
+Harness: the test ran to completion.
+
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-type-parsing.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-type-parsing.html
new file mode 100644
index 0000000..7a2e2d6
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/container-type-parsing.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Containment Test: Parsing of container-type</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#container-type">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<div id="target"></div>
+<script>
+test_valid_value('container-type', 'initial');
+test_valid_value('container-type', 'inherit');
+test_valid_value('container-type', 'unset');
+test_valid_value('container-type', 'revert');
+test_valid_value('container-type', 'none');
+test_valid_value('container-type', 'style');
+test_valid_value('container-type', 'state');
+test_valid_value('container-type', 'size');
+test_valid_value('container-type', 'inline-size');
+
+test_valid_value('container-type', 'inline-size state');
+test_valid_value('container-type', 'style state');
+test_valid_value('container-type', 'style inline-size');
+test_valid_value('container-type', 'state size');
+
+test_invalid_value('container-type', 'block-size');
+test_invalid_value('container-type', 'none none');
+test_invalid_value('container-type', 'none inline-size');
+test_invalid_value('container-type', 'inline-size none');
+test_invalid_value('container-type', 'inline-size inline-size');
+test_invalid_value('container-type', 'inline-size block-size');
+test_invalid_value('container-type', 'block-size inline-size');
+test_invalid_value('container-type', 'size inline-size');
+test_invalid_value('container-type', 'inline-size size');
+test_invalid_value('container-type', 'none, none');
+test_invalid_value('container-type', 'foo');
+test_invalid_value('container-type', '"foo"');
+test_invalid_value('container-type', 'foo, bar');
+test_invalid_value('container-type', '#fff');
+test_invalid_value('container-type', '1px');
+test_invalid_value('container-type', 'default');
+test_invalid_value('container-type', 'size nonsense');
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/display-contents.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/display-contents.html
new file mode 100644
index 0000000..4df979e
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/display-contents.html
@@ -0,0 +1,89 @@
+<!doctype html>
+<title>@container and display:contents</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#size-container">
+<link rel="help" href="https://drafts.csswg.org/css-contain-2/#containment-size">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  .container {
+    container-type: inline-size;
+    width: 30px;
+    height: 30px;
+    background: tomato;
+  }
+  .big {
+    width: 50px;
+    height: 50px;
+    background: skyblue;
+  }
+  .contents {
+    display: none;
+  }
+
+  @container size(width: 30px) {
+    .target { --x:30; }
+  }
+
+  @container size(width: 50px) {
+    .target { --x:50; }
+  }
+
+  main {
+    display: flex;
+    flex-wrap: wrap;
+  }
+
+</style>
+
+<main>
+  <!-- Container is display:contents -->
+  <div class="container contents">
+    <div>
+      <div class="target" id=target1></div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target1);
+      assert_equals(s.getPropertyValue('--x'), '');
+    }, 'getComputedStyle when container is display:contents');
+  </script>
+
+  <!-- Container becomes display:contents -->
+  <div id=container2 class="container">
+    <div>
+      <div class="target" id=target2></div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target2);
+      assert_equals(s.getPropertyValue('--x'), '30');
+      container2.classList.add('contents');
+      assert_equals(s.getPropertyValue('--x'), '');
+      container2.classList.remove('contents');
+      assert_equals(s.getPropertyValue('--x'), '30');
+    }, 'getComputedStyle when container becomes display:contents');
+  </script>
+
+  <!-- Intermediate container becomes display:contents -->
+  <div class="container">
+    <div>
+      <div id=container3 class="container">
+        <div>
+          <div class="target" id=target3></div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target3);
+      assert_equals(s.getPropertyValue('--x'), '30');
+      container3.classList.add('contents');
+      assert_equals(s.getPropertyValue('--x'), '');
+      container3.classList.remove('contents');
+      assert_equals(s.getPropertyValue('--x'), '30');
+    }, 'getComputedStyle when intermediate container becomes display:contents');
+  </script>
+</main>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/display-none.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/display-none.html
new file mode 100644
index 0000000..d6511c2
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/display-none.html
@@ -0,0 +1,345 @@
+<!doctype html>
+<title>@container in display:none</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#size-container">
+<link rel="help" href="https://drafts.csswg.org/css-contain-2/#containment-size">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  .container {
+    container-type: size;
+    width: 30px;
+    height: 30px;
+    background: tomato;
+  }
+  .big {
+    width: 50px;
+    height: 50px;
+    background: skyblue;
+  }
+  .none {
+    display: none;
+  }
+  .pseudo::before {
+    content: "foo";
+  }
+  .pseudo_none::before {
+    content: "foo";
+    display: none;
+  }
+
+  @container size(width: 30px) {
+    .target { --x:30; }
+  }
+
+  @container size(width: 50px) {
+    .target { --x:50; }
+  }
+
+  main {
+    display: flex;
+    flex-wrap: wrap;
+  }
+
+</style>
+
+<main>
+  <!-- Target element is display:none -->
+  <div class="container">
+    <div>
+      <div>
+        <div class="target none" id=target1></div>
+      </div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target1);
+      assert_equals(s.getPropertyValue('--x'), '30');
+    }, 'getComputedStyle when element is display:none');
+  </script>
+
+  <!-- Parent is display:none -->
+  <div class="container">
+    <div>
+      <div class="none">
+        <div class="target" id=target2></div>
+      </div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target2);
+      assert_equals(s.getPropertyValue('--x'), '30');
+    }, 'getComputedStyle when parent is display:none');
+  </script>
+
+  <!-- Ancestor is display:none -->
+  <div class="container">
+    <div class="none">
+      <div>
+        <div class="target" id=target3></div>
+      </div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target3);
+      assert_equals(s.getPropertyValue('--x'), '30');
+    }, 'getComputedStyle when ancestor is display:none');
+  </script>
+
+  <!-- Container is display:none -->
+  <div class="container none">
+    <div>
+      <div>
+        <div class="target" id=target4></div>
+      </div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target4);
+      assert_equals(s.getPropertyValue('--x'), '');
+    }, 'getComputedStyle when container is display:none');
+  </script>
+
+  <!-- Target element is display:none in nested container -->
+  <div class="container big">
+    <div>
+      <div>
+        <div class="container">
+          <div>
+            <div>
+              <div class="target none" id=target5></div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target5);
+      assert_equals(s.getPropertyValue('--x'), '30');
+    }, 'getComputedStyle when element in nested container is display:none');
+  </script>
+
+  <!-- Inner container is display:none -->
+  <div class="container big">
+    <div>
+      <div>
+        <div class="container none">
+          <div>
+            <div>
+              <div class="target" id=target6></div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target6);
+      assert_equals(s.getPropertyValue('--x'), '');
+    }, 'getComputedStyle when inner container is display:none');
+  </script>
+
+  <!-- Intermediate ancestor is display:none -->
+  <div class="container big">
+    <div class="none">
+      <div>
+        <div class="container">
+          <div>
+            <div>
+              <div class="target" id=target7></div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target7);
+      assert_equals(s.getPropertyValue('--x'), '');
+    }, 'getComputedStyle when intermediate ancestor is display:none');
+  </script>
+
+  <!-- Outer container is display:none -->
+  <div class="container big none">
+    <div>
+      <div>
+        <div class="container">
+          <div>
+            <div>
+              <div class="target" id=target8></div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target8);
+      assert_equals(s.getPropertyValue('--x'), '');
+    }, 'getComputedStyle when outer container is display:none');
+  </script>
+
+  <!-- Nothing is display:none initially, but target becomes display:none -->
+  <div class="container">
+    <div>
+      <div>
+        <div class="target" id=target9></div>
+      </div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target9);
+      assert_equals(s.getPropertyValue('--x'), '30');
+      target9.classList.add('none');
+      assert_equals(s.getPropertyValue('--x'), '30');
+    }, 'getComputedStyle when element becomes display:none');
+  </script>
+
+  <!-- Nothing is display:none initially, but parent becomes display:none -->
+  <div class="container">
+    <div>
+      <div id=parent10>
+        <div class="target" id=target10></div>
+      </div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target10);
+      assert_equals(s.getPropertyValue('--x'), '30');
+      parent10.classList.add('none');
+      assert_equals(s.getPropertyValue('--x'), '30');
+    }, 'getComputedStyle when parent becomes display:none');
+  </script>
+
+  <!-- Nothing is display:none initially, but ancestor becomes display:none -->
+  <div class="container">
+    <div id=ancestor11>
+      <div>
+        <div class="target" id=target11></div>
+      </div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target11);
+      assert_equals(s.getPropertyValue('--x'), '30');
+      ancestor11.classList.add('none');
+      assert_equals(s.getPropertyValue('--x'), '30');
+    }, 'getComputedStyle when ancestor becomes display:none');
+  </script>
+
+  <!-- Nothing is display:none initially, but container becomes display:none -->
+  <div class="container" id=container12>
+    <div>
+      <div>
+        <div class="target" id=target12></div>
+      </div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target12);
+      assert_equals(s.getPropertyValue('--x'), '30');
+      container12.classList.add('none');
+      assert_equals(s.getPropertyValue('--x'), '');
+    }, 'getComputedStyle when container becomes display:none');
+  </script>
+
+  <!-- Intermediate container becomes display:none -->
+  <div class="container big">
+    <div>
+      <div>
+        <div class="container" id=container13>
+          <div>
+            <div>
+              <div class="target" id=target13></div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target13);
+      assert_equals(s.getPropertyValue('--x'), '30');
+      container13.classList.add('none');
+      assert_equals(s.getPropertyValue('--x'), '');
+    }, 'getComputedStyle when intermediate container becomes display:none');
+  </script>
+
+  <!-- Pseudo-element is display:none -->
+  <div class="container">
+    <div>
+      <div>
+        <div class="target pseudo_none" id=target14></div>
+      </div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target14, '::before');
+      assert_equals(s.getPropertyValue('content'), '"foo"');
+      assert_equals(s.getPropertyValue('--x'), '30');
+    }, 'getComputedStyle when ::before is display:none');
+  </script>
+
+  <!-- Pseudo-element with display:none originating element -->
+  <div class="container">
+    <div>
+      <div>
+        <div class="target pseudo none" id=target15></div>
+      </div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target15, '::before');
+      assert_equals(s.getPropertyValue('content'), '"foo"');
+      assert_equals(s.getPropertyValue('--x'), '30');
+    }, 'getComputedStyle when originating element is display:none');
+  </script>
+
+  <!-- Pseudo-element with display:none ancestor -->
+  <div class="container">
+    <div class="none">
+      <div>
+        <div class="target pseudo" id=target16></div>
+      </div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target16, '::before');
+      assert_equals(s.getPropertyValue('content'), '"foo"');
+      assert_equals(s.getPropertyValue('--x'), '30');
+    }, 'getComputedStyle on ::before when ancestor element is display:none');
+  </script>
+
+  <!-- Pseudo-element with in display:none container -->
+  <div class="container none">
+    <div>
+      <div>
+        <div class="target pseudo" id=target17></div>
+      </div>
+    </div>
+  </div>
+  <script>
+    test(function() {
+      let s = getComputedStyle(target17, '::before');
+      assert_equals(s.getPropertyValue('content'), '"foo"');
+      assert_equals(s.getPropertyValue('--x'), '');
+    }, 'getComputedStyle on ::before when container is display:none');
+  </script>
+
+</main>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/focus-inside-content-visibility-crash.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/focus-inside-content-visibility-crash.html
new file mode 100644
index 0000000..ef2eb97
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/focus-inside-content-visibility-crash.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<title>Container Queries Test: size change detected while focusing inside content-visibility: auto container</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#container-queries">
+<link rel="help" href="https://drafts.csswg.org/css-contain-2/#using-cv-auto">
+<link rel="help" href="https://crbug.com/1270848">
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+
+<style>
+.spacer { height: 3000px; }
+.auto { content-visibility: auto; }
+#container {
+  border: 1px solid black;
+  width: 100px;
+  height: 100px;
+
+  container-type: size;
+}
+#input {
+  width: 100%;
+  visibility: hidden;
+}
+@container size(min-width: 150px) {
+  #input { visibility: visible; }
+}
+
+</style>
+
+<div class=spacer></div>
+<div class=auto>
+  <div id=container>
+    <input id=input type=text></input>
+  </div>
+</div>
+
+<script>
+function focus() {
+  container.style.width = "200px";
+  input.focus();
+}
+
+onload = () => requestAnimationFrame(() => requestAnimationFrame(focus));
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/iframe-invalidation.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/iframe-invalidation.html
new file mode 100644
index 0000000..90513fe
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/iframe-invalidation.html
@@ -0,0 +1,41 @@
+<!doctype html>
+<title>@container-dependent elements respond to iframe size changes</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#size-container">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  iframe {
+    width: 200px;
+    height: 40px;
+  }
+</style>
+<iframe id=iframe srcdoc="
+  <style>
+    div#container {
+      container-type: size;
+      height: 20px;
+    }
+    div#child { color: red; }
+    @container size(min-width: 300px) {
+      div#child { color: green; }
+    }
+  </style>
+  <div id=container>
+    <div id=child>Test</div>
+  </div>
+"></iframe>
+<script>
+
+  function waitForLoad(w) {
+    return new Promise(resolve => w.addEventListener('load', resolve));
+  }
+
+  promise_test(async () => {
+    await waitForLoad(window);
+    let inner_div = iframe.contentDocument.querySelector('div#child');
+    assert_equals(getComputedStyle(inner_div).color, 'rgb(255, 0, 0)');
+
+    iframe.style = 'width:400px';
+    assert_equals(getComputedStyle(inner_div).color, 'rgb(0, 128, 0)');
+  })
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/ineligible-containment.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/ineligible-containment.html
new file mode 100644
index 0000000..f9ea1e2
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/ineligible-containment.html
@@ -0,0 +1,49 @@
+<!doctype html>
+<title>Containers ineligible for containment</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#size-container">
+<link rel="help" href="https://drafts.csswg.org/css-contain-2/#containment-size">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #outer, #inner1, #inner2 {
+    width: 200px;
+    container-type: inline-size;
+  }
+  #inner1 {
+    display: table;
+  }
+  p {
+    color: green;
+  }
+  @container size(min-width: 1px) {
+    p { color: red; }
+  }
+</style>
+<div id=outer>
+  <div id=inner1>
+    <p id=p1>Test1</p>
+  </div>
+  <div id=inner2>
+    <p id=p2>Test1</p>
+  </div>
+</main>
+<script>
+
+  test(function(t) {
+    // #inner1 is the container, but it does not satisfy the containment
+    // requirements, hence the query should fail.
+    assert_equals(getComputedStyle(p1).color, 'rgb(0, 128, 0)');
+  }, 'Container ineligible for containment');
+
+  test(function(t) {
+    t.add_cleanup(() => { inner2.style = ''; });
+
+    assert_equals(getComputedStyle(p2).color, 'rgb(255, 0, 0)');
+
+    inner2.style = 'display:table';
+
+    // #inner2 is still the container, but it no longer satisfies the
+    // containment requirements.
+    assert_equals(getComputedStyle(p2).color, 'rgb(0, 128, 0)');
+  }, 'Changing containment eligibility invalidates style');
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/orthogonal-wm-container-query.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/orthogonal-wm-container-query.html
new file mode 100644
index 0000000..1aa748a3
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/orthogonal-wm-container-query.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<title>CSS Container Queries Test: Orthogonal writing-mode change in @container</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#size-container">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+  #container {
+    container-type: size;
+    width: 50vw;
+    height: 50vh;
+  }
+  #orthogonal {
+    font: 50px/1 Ahem;
+  }
+  @container size(max-width: 100px) {
+    #orthogonal {
+      writing-mode: vertical-lr;
+    }
+  }
+</style>
+<div id="container">
+  <div id="orthogonal">XX</div>
+</div>
+<script>
+  test(() => {
+    assert_equals(orthogonal.offsetWidth, container.offsetWidth);
+  }, "Initial non-orthogonal width");
+
+  test(() => {
+    container.style.width = "100px";
+    assert_equals(orthogonal.offsetWidth, 50);
+    assert_not_equals(orthogonal.offsetWidth, container.offsetWidth);
+  }, "Orthogonal width");
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/pseudo-container-crash.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/pseudo-container-crash.html
new file mode 100644
index 0000000..f998c3a
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/pseudo-container-crash.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<title>CSS Container Queries Test: No crash when ::after is a container</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#query-container">
+<link rel="help" href="https://crbug.com/1225381">
+<style>
+  div::after {
+    container-type: size;
+    content: '';
+    display: block;
+  }
+</style>
+<div>
+  PASS if no crash
+</div>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/reattach-container-with-dirty-child.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/reattach-container-with-dirty-child.html
new file mode 100644
index 0000000..1d8c294
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/reattach-container-with-dirty-child.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<title>CSS Container Queries Test: @container changing display type while descendant styles change</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#size-container">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #container {
+    container-type: inline-size;
+  }
+  @container size(min-width: 200px) {
+    div { color: red }
+  }
+  @container size(max-width: 150px) {
+    div { color: lime }
+  }
+</style>
+<div id="container">
+  <div id="child"><span id="inner">XXX</span></div>
+</div>
+<script>
+  test(() => {
+    container.offsetTop;
+    assert_equals(getComputedStyle(child).color, "rgb(255, 0, 0)");
+  }, "Initially wider than 200px");
+
+  test(() => {
+    container.style.width = "100px";
+    container.style.display = "inline-block";
+    inner.style.color = "green";
+    container.offsetTop;
+    assert_equals(getComputedStyle(child).color, "rgb(0, 255, 0)");
+    assert_equals(getComputedStyle(inner).color, "rgb(0, 128, 0)");
+  }, "Container query changed and inner.style applied");
+</script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/size-feature-evaluation.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/size-feature-evaluation.html
new file mode 100644
index 0000000..390f7caf
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/size-feature-evaluation.html
@@ -0,0 +1,89 @@
+<!doctype html>
+<title>Evaluation of size features</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#size-container">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id=container>
+  <div id=target>
+    Test
+  </div>
+</div>
+
+<script>
+
+function test_evaluation(container_class, query, expected) {
+  test(function(t) {
+    let style_node = document.createElement('style');
+    t.add_cleanup(() => {
+      container.classList.remove(container_class);
+      style_node.remove();
+    });
+    style_node.innerText = `@container ${query} { #target { --applied:true; } }`;
+
+    assert_equals(getComputedStyle(target).getPropertyValue('--applied'), '');
+    container.classList.add(container_class);
+    document.head.append(style_node);
+    assert_equals(getComputedStyle(target).getPropertyValue('--applied'), expected ? 'true' : '');
+  }, `${query} (.${container_class})`);
+}
+
+</script>
+
+<style>
+  .horizontal {
+    width: 100px;
+    height: 200px;
+    container-type: size;
+  }
+
+  .vertical {
+    width: 100px;
+    height: 200px;
+    container-type: size;
+    writing-mode: vertical-rl;
+  }
+</style>
+<script>
+
+  for (let cls of ['horizontal', 'vertical']) {
+
+    let logical_width = (cls == 'horizontal') ? 'inline' : 'block';
+    let logical_height = (cls == 'horizontal') ? 'block' : 'inline';
+
+    test_evaluation(cls, 'size(width < 100px)', false);
+    test_evaluation(cls, 'size(width >= 100px)', true);
+    test_evaluation(cls, 'size(min-width: 100px)', true);
+    test_evaluation(cls, 'size(min-width: 101px)', false);
+    test_evaluation(cls, 'size(max-width: 100px)', true);
+    test_evaluation(cls, 'size(max-width: 99px)', false);
+
+    test_evaluation(cls, 'size(height < 200px)', false);
+    test_evaluation(cls, 'size(height >= 200px)', true);
+    test_evaluation(cls, 'size(min-height: 200px)', true);
+    test_evaluation(cls, 'size(min-height: 201px)', false);
+    test_evaluation(cls, 'size(max-height: 200px)', true);
+    test_evaluation(cls, 'size(max-height: 199px)', false);
+
+    test_evaluation(cls, `size(${logical_width}-size < 100px)`, false);
+    test_evaluation(cls, `size(${logical_width}-size >= 100px)`, true);
+    test_evaluation(cls, `size(min-${logical_width}-size: 100px)`, true);
+    test_evaluation(cls, `size(min-${logical_width}-size: 101px)`, false);
+    test_evaluation(cls, `size(max-${logical_width}-size: 100px)`, true);
+    test_evaluation(cls, `size(max-${logical_width}-size: 99px)`, false);
+
+    test_evaluation(cls, `size(${logical_height}-size < 200px)`, false);
+    test_evaluation(cls, `size(${logical_height}-size >= 200px)`, true);
+    test_evaluation(cls, `size(min-${logical_height}-size: 200px)`, true);
+    test_evaluation(cls, `size(min-${logical_height}-size: 201px)`, false);
+    test_evaluation(cls, `size(max-${logical_height}-size: 200px)`, true);
+    test_evaluation(cls, `size(max-${logical_height}-size: 199px)`, false);
+
+    test_evaluation(cls, 'size(orientation: landscape)', false);
+    test_evaluation(cls, 'size(orientation: portrait)', true);
+
+    test_evaluation(cls, 'size(aspect-ratio: 1/2)', true);
+    test_evaluation(cls, 'size(aspect-ratio: 2/1)', false);
+  }
+
+</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/svg-layout-root-crash.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/svg-layout-root-crash.html
similarity index 100%
rename from third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/svg-layout-root-crash.html
rename to third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/svg-layout-root-crash.html
diff --git a/third_party/blink/web_tests/external/wpt/css/css-position/inheritance-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-position/inheritance-expected.txt
deleted file mode 100644
index 8e816f48..0000000
--- a/third_party/blink/web_tests/external/wpt/css/css-position/inheritance-expected.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-This is a testharness.js-based test.
-PASS Property position has initial value static
-PASS Property position does not inherit
-PASS Property top has initial value auto
-PASS Property top does not inherit
-PASS Property right has initial value auto
-PASS Property right does not inherit
-PASS Property bottom has initial value auto
-PASS Property bottom does not inherit
-PASS Property left has initial value auto
-PASS Property left does not inherit
-FAIL Property inset-before has initial value auto assert_true: inset-before doesn't seem to be supported in the computed style expected true got false
-FAIL Property inset-before does not inherit assert_true: expected true got false
-FAIL Property inset-after has initial value auto assert_true: inset-after doesn't seem to be supported in the computed style expected true got false
-FAIL Property inset-after does not inherit assert_true: expected true got false
-FAIL Property inset-start has initial value auto assert_true: inset-start doesn't seem to be supported in the computed style expected true got false
-FAIL Property inset-start does not inherit assert_true: expected true got false
-FAIL Property inset-end has initial value auto assert_true: inset-end doesn't seem to be supported in the computed style expected true got false
-FAIL Property inset-end does not inherit assert_true: expected true got false
-PASS Property z-index has initial value auto
-PASS Property z-index does not inherit
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/external/wpt/css/css-position/inheritance.html b/third_party/blink/web_tests/external/wpt/css/css-position/inheritance.html
index d75b28c..ef037dc 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-position/inheritance.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-position/inheritance.html
@@ -25,10 +25,6 @@
 assert_not_inherited('right', 'auto', '10px');
 assert_not_inherited('bottom', 'auto', '10px');
 assert_not_inherited('left', 'auto', '10px');
-assert_not_inherited('inset-before', 'auto', '10px');
-assert_not_inherited('inset-after', 'auto', '10px');
-assert_not_inherited('inset-start', 'auto', '10px');
-assert_not_inherited('inset-end', 'auto', '10px');
 assert_not_inherited('z-index', 'auto', '123');
 </script>
 </body>
diff --git a/third_party/blink/web_tests/external/wpt/interfaces/css-cascade-5.idl b/third_party/blink/web_tests/external/wpt/interfaces/css-cascade-5.idl
index c640a13..4166ae6 100644
--- a/third_party/blink/web_tests/external/wpt/interfaces/css-cascade-5.idl
+++ b/third_party/blink/web_tests/external/wpt/interfaces/css-cascade-5.idl
@@ -1,6 +1,11 @@
 // Source: CSS Cascading and Inheritance Level 5 (https://drafts.csswg.org/css-cascade-5/)
 
 [Exposed=Window]
+partial interface CSSImportRule {
+  readonly attribute CSSOMString? layerName;
+};
+
+[Exposed=Window]
 interface CSSLayerBlockRule : CSSGroupingRule {
   readonly attribute CSSOMString name;
 };
diff --git a/third_party/blink/web_tests/external/wpt/webusb/usbInterface.https.any.js b/third_party/blink/web_tests/external/wpt/webusb/usbInterface.https.any.js
index 8e99c6f..22692a7 100644
--- a/third_party/blink/web_tests/external/wpt/webusb/usbInterface.https.any.js
+++ b/third_party/blink/web_tests/external/wpt/webusb/usbInterface.https.any.js
@@ -35,20 +35,21 @@
       device, device.configurations[1].configurationValue);
   let usbInterface = new USBInterface(
       configuration, configuration.interfaces[0].interfaceNumber);
-  assert_equals(usbInterface.alternate, null);
-}, 'The alternate attribute of USBInterface returns null if the interface' +
-    'has not been claimed.');
+  assert_equals(usbInterface.alternate.alternateSetting, 0);
+}, 'The alternate attribute of USBInterface returns the one with ' +
+   'bAlternateSetting 0 if the interface has not been claimed.');
 
 usb_test(async () => {
   let { device } =  await getFakeDevice();
   await device.open();
   await device.selectConfiguration(2);
   await device.claimInterface(0);
-  await device.selectAlternateInterface(0, 1);
   let configuration = new USBConfiguration(
-      device, device.configurations[1].configurationValue);
+    device, device.configurations[1].configurationValue);
   let usbInterface = new USBInterface(
-      configuration, configuration.interfaces[0].interfaceNumber);
+    configuration, configuration.interfaces[0].interfaceNumber);
+  assert_equals(usbInterface.alternate.alternateSetting, 0);
+  await device.selectAlternateInterface(0, 1);
   assert_equals(usbInterface.alternate.alternateSetting, 1);
 }, 'The alternate attribute of USBInterface returns the active alternate ' +
-    'interface.');
+   'interface.');
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/layout_ng_svg_text/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/layout_ng_svg_text/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt
deleted file mode 100644
index d64056a..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/layout_ng_svg_text/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [246, 89, 127, 46],
-        [203, 336, 126, 45],
-        [108, 84, 105, 102],
-        [355, 125, 104, 104],
-        [352, 398, 99, 98],
-        [90, 207, 98, 99]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/layout_ng_svg_text/paint/invalidation/svg/text-rescale-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/layout_ng_svg_text/paint/invalidation/svg/text-rescale-expected.txt
deleted file mode 100644
index 399ea51..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/layout_ng_svg_text/paint/invalidation/svg/text-rescale-expected.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [0, 114, 192, 46],
-        [0, 14, 192, 46],
-        [310, 114, 91, 46],
-        [310, 14, 91, 46],
-        [210, 114, 91, 46],
-        [210, 14, 91, 46],
-        [0, 3, 9, 2],
-        [9, 3, 4, 2],
-        [6, 3, 4, 2],
-        [0, 0, 1, 1]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/layout_ng_svg_text/paint/invalidation/svg/text-selection-text-05-t-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/layout_ng_svg_text/paint/invalidation/svg/text-selection-text-05-t-expected.txt
deleted file mode 100644
index 18af936..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/layout_ng_svg_text/paint/invalidation/svg/text-selection-text-05-t-expected.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 521, 452, 79],
-        [519, 12, 129, 36],
-        [352, 12, 129, 36],
-        [186, 12, 128, 36],
-        [265, 485, 114, 29],
-        [265, 201, 114, 21],
-        [428, 485, 104, 29],
-        [428, 201, 104, 21],
-        [590, 485, 95, 29],
-        [590, 201, 95, 21],
-        [376, 36, 82, 35],
-        [16, 491, 79, 34],
-        [16, 441, 79, 34],
-        [16, 391, 79, 34],
-        [16, 341, 79, 34],
-        [16, 291, 79, 34],
-        [16, 241, 79, 34],
-        [16, 191, 79, 34],
-        [16, 141, 79, 34],
-        [16, 91, 79, 34],
-        [265, 285, 62, 54],
-        [265, 435, 62, 29],
-        [265, 151, 62, 21],
-        [428, 285, 61, 54],
-        [428, 435, 61, 29],
-        [428, 151, 61, 21],
-        [590, 285, 60, 54],
-        [590, 435, 60, 29],
-        [590, 151, 60, 21],
-        [224, 36, 52, 35],
-        [265, 335, 47, 54],
-        [428, 335, 46, 54],
-        [590, 335, 45, 54],
-        [562, 36, 42, 35],
-        [573, 235, 39, 54],
-        [411, 235, 38, 54],
-        [546, 101, 38, 21],
-        [250, 235, 37, 54],
-        [250, 385, 37, 45],
-        [398, 101, 37, 21],
-        [250, 101, 37, 21],
-        [565, 385, 29, 45],
-        [411, 385, 29, 45]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/layout_ng_svg_text/paint/invalidation/svg/text-selection-update-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/layout_ng_svg_text/paint/invalidation/svg/text-selection-update-expected.txt
deleted file mode 100644
index 899961a..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/layout_ng_svg_text/paint/invalidation/svg/text-selection-update-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [10, 0, 41, 14]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/layout_ng_svg_text/svg/custom/text-image-opacity-expected.png b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/layout_ng_svg_text/svg/custom/text-image-opacity-expected.png
deleted file mode 100644
index 5207b1b..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/layout_ng_svg_text/svg/custom/text-image-opacity-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/synchronous_html_parser/media/audio-repaint-expected.png b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/synchronous_html_parser/media/audio-repaint-expected.png
deleted file mode 100644
index cb995706..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/synchronous_html_parser/media/audio-repaint-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-expected.png b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-expected.png
deleted file mode 100644
index 5bb3c45..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-zoomed-expected.png b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-zoomed-expected.png
deleted file mode 100644
index 5121006..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-zoomed-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/block-shift-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/block-shift-repaint-expected.txt
deleted file mode 100644
index af3658bf..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/block-shift-repaint-expected.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [8, 248, 60, 30],
-        [8, 218, 60, 30],
-        [8, 188, 60, 30],
-        [8, 158, 60, 30],
-        [8, 128, 60, 30],
-        [8, 98, 60, 30],
-        [8, 68, 60, 30],
-        [8, 38, 60, 30],
-        [8, 8, 60, 30],
-        [8, 353, 60, 8],
-        [8, 338, 60, 8]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt
deleted file mode 100644
index 02a3d82..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF"
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV",
-      "bounds": [200, 200],
-      "contentsOpaque": true,
-      "backgroundColor": "#D3D3D3",
-      "transform": 1
-    },
-    {
-      "name": "LayoutNGBlockFlow (positioned) DIV",
-      "position": [50, 50],
-      "bounds": [250, 250],
-      "contentsOpaqueForText": true,
-      "backgroundColor": "#FF0000",
-      "invalidations": [
-        [50, 50, 200, 200]
-      ]
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [8, 8, 0, 1]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/compositing/subpixel-offset-scaled-will-change-transform-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/compositing/subpixel-offset-scaled-will-change-transform-expected.txt
deleted file mode 100644
index 79c74cf..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/compositing/subpixel-offset-scaled-will-change-transform-expected.txt
+++ /dev/null
@@ -1,175 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF"
-    },
-    {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV id='child1' class='child composited'",
-      "bounds": [1, 1],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 2
-    },
-    {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV id='child2' class='child scale composited'",
-      "bounds": [1, 1],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 4
-    },
-    {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV id='child3' class='child'",
-      "bounds": [1, 1],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 6
-    },
-    {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV id='child4' class='child scale'",
-      "bounds": [1, 1],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 8
-    },
-    {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV id='child5' class='child composited'",
-      "bounds": [1, 1],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 10
-    },
-    {
-      "name": "LayoutNGBlockFlow (relative positioned) DIV id='child6' class='child scale composited'",
-      "bounds": [1, 1],
-      "contentsOpaque": true,
-      "backgroundColor": "#0000FF",
-      "transform": 12
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [8, 8, 0, 1]
-      ]
-    },
-    {
-      "id": 2,
-      "parent": 1,
-      "transform": [
-        [40, 0, 0, 0],
-        [0, 40, 0, 0],
-        [0, 0, 1, 0],
-        [0, 0, 0, 1]
-      ],
-      "origin": [0, 0]
-    },
-    {
-      "id": 3,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [9, 58, 0, 1]
-      ]
-    },
-    {
-      "id": 4,
-      "parent": 3,
-      "transform": [
-        [40, 0, 0, 0],
-        [0, 40, 0, 0],
-        [0, 0, 1, 0],
-        [0, 0, 0, 1]
-      ],
-      "origin": [0, 0]
-    },
-    {
-      "id": 5,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [8, 108, 0, 1]
-      ]
-    },
-    {
-      "id": 6,
-      "parent": 5,
-      "transform": [
-        [40, 0, 0, 0],
-        [0, 40, 0, 0],
-        [0, 0, 1, 0],
-        [0, 0, 0, 1]
-      ],
-      "origin": [0, 0]
-    },
-    {
-      "id": 7,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [8, 158, 0, 1]
-      ]
-    },
-    {
-      "id": 8,
-      "parent": 7,
-      "transform": [
-        [40, 0, 0, 0],
-        [0, 40, 0, 0],
-        [0, 0, 1, 0],
-        [0, 0, 0, 1]
-      ],
-      "origin": [0, 0]
-    },
-    {
-      "id": 9,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [8, 208, 0, 1]
-      ]
-    },
-    {
-      "id": 10,
-      "parent": 9,
-      "transform": [
-        [40, 0, 0, 0],
-        [0, 40, 0, 0],
-        [0, 0, 1, 0],
-        [0, 0, 0, 1]
-      ],
-      "origin": [0, 0]
-    },
-    {
-      "id": 11,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [8, 258, 0, 1]
-      ]
-    },
-    {
-      "id": 12,
-      "parent": 11,
-      "transform": [
-        [40, 0, 0, 0],
-        [0, 40, 0, 0],
-        [0, 0, 1, 0],
-        [0, 0, 0, 1]
-      ],
-      "origin": [0, 0]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/compositing/text-match-highlight-expected.png b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/compositing/text-match-highlight-expected.png
deleted file mode 100644
index d81d47b..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/compositing/text-match-highlight-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/flexbox/repaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/flexbox/repaint-expected.txt
deleted file mode 100644
index cdb6e55..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/flexbox/repaint-expected.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [139, 128, 653, 100],
-        [138, 128, 636, 99],
-        [400, 128, 392, 180],
-        [8, 228, 392, 80],
-        [148, 128, 252, 180],
-        [8, 128, 140, 100]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/flexbox/repaint-rtl-column-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/flexbox/repaint-rtl-column-expected.txt
deleted file mode 100644
index a029c79..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/flexbox/repaint-rtl-column-expected.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [8, 116, 200, 252],
-        [8, 68, 200, 145],
-        [13, 218, 190, 350],
-        [13, 125, 190, 350],
-        [13, 121, 190, 350]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/iframe-rounding-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/iframe-rounding-expected.txt
deleted file mode 100644
index 7228a4ce88..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/iframe-rounding-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [20, 18, 100, 100]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-10-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-10-expected.txt
deleted file mode 100644
index 4671413..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-10-expected.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 520, 408, 79],
-        [14, 240, 407, 139],
-        [14, 180, 407, 79],
-        [65, 360, 356, 39],
-        [14, 80, 355, 119],
-        [14, 460, 355, 59],
-        [14, 440, 355, 39],
-        [14, 420, 355, 39],
-        [65, 400, 304, 19],
-        [14, 374, 48, 64],
-        [14, 363, 48, 64]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-3-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-3-expected.txt
deleted file mode 100644
index c3aa5f6..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-3-expected.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 520, 408, 79],
-        [14, 240, 407, 139],
-        [14, 180, 407, 79],
-        [14, 400, 406, 59],
-        [65, 360, 356, 39],
-        [14, 80, 355, 119],
-        [14, 460, 355, 59],
-        [14, 440, 339, 79],
-        [356, 423, 64, 80],
-        [372, 403, 48, 80]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-4-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-4-expected.txt
deleted file mode 100644
index 419db37a..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-4-expected.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 520, 408, 79],
-        [14, 240, 407, 139],
-        [14, 180, 407, 79],
-        [14, 460, 407, 59],
-        [65, 360, 356, 39],
-        [14, 80, 355, 119],
-        [14, 420, 355, 39],
-        [65, 400, 304, 19],
-        [372, 403, 48, 80]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-5-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-5-expected.txt
deleted file mode 100644
index 307c7f8..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-5-expected.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 520, 408, 79],
-        [14, 240, 407, 139],
-        [14, 180, 407, 79],
-        [49, 360, 372, 39],
-        [14, 400, 356, 59],
-        [14, 80, 355, 119],
-        [14, 440, 355, 79],
-        [14, 363, 48, 64]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-8-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-8-expected.txt
deleted file mode 100644
index 7c9148c..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-8-expected.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 520, 408, 79],
-        [14, 240, 407, 139],
-        [14, 180, 407, 79],
-        [14, 360, 407, 39],
-        [14, 440, 356, 79],
-        [14, 80, 355, 119],
-        [14, 400, 355, 59],
-        [14, 363, 48, 64]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-9-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-9-expected.txt
deleted file mode 100644
index 2f8433c7..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-9-expected.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 520, 408, 79],
-        [14, 240, 407, 139],
-        [14, 180, 407, 79],
-        [65, 360, 356, 39],
-        [14, 80, 355, 119],
-        [14, 460, 355, 59],
-        [14, 440, 355, 39],
-        [14, 420, 355, 39],
-        [65, 400, 304, 19],
-        [14, 383, 48, 64],
-        [14, 363, 48, 64]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt
deleted file mode 100644
index a7f9b8bb..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#008000",
-      "invalidations": [
-        [8, 341, 500, 167],
-        [8, 8, 500, 167],
-        [8, 175, 500, 166]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/reflection/reflection-with-rotation-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/reflection/reflection-with-rotation-expected.txt
deleted file mode 100644
index 118224f..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/reflection/reflection-with-rotation-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [23, 51, 72, 110]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/repaint-subrect-grid-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/repaint-subrect-grid-expected.txt
deleted file mode 100644
index fc4ce0b..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/repaint-subrect-grid-expected.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [18, 37, 19, 18],
-        [18, 0, 19, 18],
-        [46, 18, 18, 19],
-        [28, 18, 18, 19],
-        [9, 18, 18, 19],
-        [37, 37, 18, 18],
-        [37, 0, 18, 18],
-        [0, 37, 18, 18],
-        [0, 0, 18, 18],
-        [0, 18, 9, 19]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
deleted file mode 100644
index a743c6a8..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [785, 656],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [353, 8, 15, 640]
-      ]
-    },
-    {
-      "name": "LayoutNGBlockFlow (sticky positioned) DIV id='sticky'",
-      "bounds": [345, 20],
-      "transform": 4
-    },
-    {
-      "name": "VerticalScrollbar",
-      "position": [785, 0],
-      "bounds": [15, 600]
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, -0.1],
-        [0, 0, 0, 1]
-      ],
-      "origin": [188, 328]
-    },
-    {
-      "id": 2,
-      "parent": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [8, 8, 0, 1]
-      ],
-      "flattenInheritedTransform": false
-    },
-    {
-      "id": 3,
-      "parent": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [0, -35, 0, 1]
-      ],
-      "flattenInheritedTransform": false
-    },
-    {
-      "id": 4,
-      "parent": 3,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [0, 35, 0, 1]
-      ],
-      "flattenInheritedTransform": false
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-gradient-creation-expected.png b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-gradient-creation-expected.png
deleted file mode 100644
index edc04cc..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-gradient-creation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/outline-offset-text-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/outline-offset-text-expected.txt
deleted file mode 100644
index 7a1f41ef..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/outline-offset-text-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [103, 26, 160, 113],
-        [63, 26, 160, 113]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/text-rescale-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/text-rescale-expected.txt
deleted file mode 100644
index 96b0edc..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/text-rescale-expected.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [0, 114, 192, 46],
-        [0, 14, 192, 46],
-        [310, 114, 91, 46],
-        [310, 14, 91, 46],
-        [210, 114, 91, 46],
-        [210, 14, 91, 46],
-        [0, 3, 9, 3],
-        [9, 3, 4, 3],
-        [6, 3, 4, 2],
-        [0, 0, 1, 1]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/text-selection-text-05-t-expected.png b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/text-selection-text-05-t-expected.png
deleted file mode 100644
index 99272e6..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/text-selection-text-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/text-selection-text-05-t-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/text-selection-text-05-t-expected.txt
deleted file mode 100644
index 18af936..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/text-selection-text-05-t-expected.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 521, 452, 79],
-        [519, 12, 129, 36],
-        [352, 12, 129, 36],
-        [186, 12, 128, 36],
-        [265, 485, 114, 29],
-        [265, 201, 114, 21],
-        [428, 485, 104, 29],
-        [428, 201, 104, 21],
-        [590, 485, 95, 29],
-        [590, 201, 95, 21],
-        [376, 36, 82, 35],
-        [16, 491, 79, 34],
-        [16, 441, 79, 34],
-        [16, 391, 79, 34],
-        [16, 341, 79, 34],
-        [16, 291, 79, 34],
-        [16, 241, 79, 34],
-        [16, 191, 79, 34],
-        [16, 141, 79, 34],
-        [16, 91, 79, 34],
-        [265, 285, 62, 54],
-        [265, 435, 62, 29],
-        [265, 151, 62, 21],
-        [428, 285, 61, 54],
-        [428, 435, 61, 29],
-        [428, 151, 61, 21],
-        [590, 285, 60, 54],
-        [590, 435, 60, 29],
-        [590, 151, 60, 21],
-        [224, 36, 52, 35],
-        [265, 335, 47, 54],
-        [428, 335, 46, 54],
-        [590, 335, 45, 54],
-        [562, 36, 42, 35],
-        [573, 235, 39, 54],
-        [411, 235, 38, 54],
-        [546, 101, 38, 21],
-        [250, 235, 37, 54],
-        [250, 385, 37, 45],
-        [398, 101, 37, 21],
-        [250, 101, 37, 21],
-        [565, 385, 29, 45],
-        [411, 385, 29, 45]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/text-selection-update-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/text-selection-update-expected.txt
deleted file mode 100644
index f87bb66..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/text-selection-update-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [10, 0, 42, 14]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/use-detach-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/use-detach-expected.txt
deleted file mode 100644
index e1e53776..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/svg/use-detach-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [207, 57, 50, 66]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/table/invisible-tbody-visible-td-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/table/invisible-tbody-visible-td-expected.txt
deleted file mode 100644
index 6a0c442..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/table/invisible-tbody-visible-td-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [9, 9, 99, 198]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/table/invisible-tr-visible-td-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/table/invisible-tr-visible-td-expected.txt
deleted file mode 100644
index 6a0c442..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/table/invisible-tr-visible-td-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [9, 9, 99, 198]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/table/table-col-background-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/table/table-col-background-expected.txt
deleted file mode 100644
index 91f836d..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/table/table-col-background-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [10, 110, 102, 100]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/table/table-col-background-offset-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/table/table-col-background-offset-expected.txt
deleted file mode 100644
index cfc850e4..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/table/table-col-background-offset-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [114, 110, 102, 100]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt
deleted file mode 100644
index 759f42f..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [11, 46, 100, 25]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt
deleted file mode 100644
index ba8136f..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [85, 70, 90, 91]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/vertical-align1-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/vertical-align1-expected.txt
deleted file mode 100644
index fc4e8a8..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/vertical-align1-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [120, 80, 20, 20],
-        [120, 34, 20, 20],
-        [0, 80, 20, 20],
-        [0, 34, 20, 20]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/vertical-align2-expected.txt b/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/vertical-align2-expected.txt
deleted file mode 100644
index 17d55d8d..0000000
--- a/third_party/blink/web_tests/flag-specific/composite-after-paint/virtual/transform-interop-disabled/paint/invalidation/vertical-align2-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [200, 146, 100, 100],
-        [200, 100, 100, 100]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/blink-cors/external/wpt/service-workers/service-worker/registration-schedule-job.https-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/blink-cors/external/wpt/service-workers/service-worker/registration-schedule-job.https-expected.txt
deleted file mode 100644
index e077379..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/blink-cors/external/wpt/service-workers/service-worker/registration-schedule-job.https-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a testharness.js-based test.
-FAIL different scriptURL and updateViaCache promise_test: Unhandled rejection with value: object "TypeError: Cannot read property 'scriptURL' of null"
-FAIL different type assert_equals: expected (string) "classic" but got (undefined) undefined
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/blink-cors/external/wpt/service-workers/service-worker/registration-updateviacache.https-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/blink-cors/external/wpt/service-workers/service-worker/registration-updateviacache.https-expected.txt
deleted file mode 100644
index 98881c1..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/blink-cors/external/wpt/service-workers/service-worker/registration-updateviacache.https-expected.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-This is a testharness.js-based test.
-PASS register-with-updateViaCache-undefined
-PASS register-with-updateViaCache-imports
-PASS register-with-updateViaCache-all
-PASS register-with-updateViaCache-none
-PASS register-with-updateViaCache-undefined-then-undefined
-PASS register-with-updateViaCache-undefined-then-imports
-PASS register-with-updateViaCache-undefined-then-all
-PASS register-with-updateViaCache-undefined-then-none
-PASS register-with-updateViaCache-imports-then-undefined
-PASS register-with-updateViaCache-imports-then-imports
-PASS register-with-updateViaCache-imports-then-all
-PASS register-with-updateViaCache-imports-then-none
-PASS register-with-updateViaCache-all-then-undefined
-PASS register-with-updateViaCache-all-then-imports
-PASS register-with-updateViaCache-all-then-all
-PASS register-with-updateViaCache-all-then-none
-PASS register-with-updateViaCache-none-then-undefined
-PASS register-with-updateViaCache-none-then-imports
-PASS register-with-updateViaCache-none-then-all
-PASS register-with-updateViaCache-none-then-none
-PASS access-updateViaCache-after-unregister-undefined
-PASS access-updateViaCache-after-unregister-imports
-PASS access-updateViaCache-after-unregister-all
-PASS access-updateViaCache-after-unregister-none
-PASS updateViaCache is not updated if register() rejects
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/cascade/fast/forms/001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/cascade/fast/forms/001-expected.png
deleted file mode 100644
index 1b1437d2..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/cascade/fast/forms/001-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
deleted file mode 100644
index c58c3c4a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/cascade/fast/forms/date/date-appearance-basic-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/cascade/fast/forms/date/date-appearance-basic-expected.png
deleted file mode 100644
index 4e37b1b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/cascade/fast/forms/date/date-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/cascade/fast/forms/month/month-appearance-basic-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/cascade/fast/forms/month/month-appearance-basic-expected.png
deleted file mode 100644
index a97c81d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/cascade/fast/forms/month/month-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/omt-worker-fetch/external/wpt/service-workers/service-worker/registration-updateviacache.https-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/omt-worker-fetch/external/wpt/service-workers/service-worker/registration-updateviacache.https-expected.txt
deleted file mode 100644
index 98881c1..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/omt-worker-fetch/external/wpt/service-workers/service-worker/registration-updateviacache.https-expected.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-This is a testharness.js-based test.
-PASS register-with-updateViaCache-undefined
-PASS register-with-updateViaCache-imports
-PASS register-with-updateViaCache-all
-PASS register-with-updateViaCache-none
-PASS register-with-updateViaCache-undefined-then-undefined
-PASS register-with-updateViaCache-undefined-then-imports
-PASS register-with-updateViaCache-undefined-then-all
-PASS register-with-updateViaCache-undefined-then-none
-PASS register-with-updateViaCache-imports-then-undefined
-PASS register-with-updateViaCache-imports-then-imports
-PASS register-with-updateViaCache-imports-then-all
-PASS register-with-updateViaCache-imports-then-none
-PASS register-with-updateViaCache-all-then-undefined
-PASS register-with-updateViaCache-all-then-imports
-PASS register-with-updateViaCache-all-then-all
-PASS register-with-updateViaCache-all-then-none
-PASS register-with-updateViaCache-none-then-undefined
-PASS register-with-updateViaCache-none-then-imports
-PASS register-with-updateViaCache-none-then-all
-PASS register-with-updateViaCache-none-then-none
-PASS access-updateViaCache-after-unregister-undefined
-PASS access-updateViaCache-after-unregister-imports
-PASS access-updateViaCache-after-unregister-all
-PASS access-updateViaCache-after-unregister-none
-PASS updateViaCache is not updated if register() rejects
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-continuation-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-continuation-expected.txt
deleted file mode 100644
index 071fa45..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-continuation-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-This tests verifies the hit test regions given to the compositor specifically for continuation case. It can only be run in DumpRenderTree.
-
-continuation: layer(800x600) has hit test rect (13,79 101x11)
-continuation: layer(800x600) has hit test rect (13,90 290x12)
-continuation: layer(800x600) has hit test rect (13,102 121x11)
-
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-expected.txt
deleted file mode 100644
index 7ec74cb..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-expected.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-This tests verifies the hit test regions given to the compositor. It can only be run in DumpRenderTree. The outputted rects should cover the hit test regions of all the listed elements. Enable visualize mode to quickly validate graphically.
-
-normalFlow: layer(785x1530) has hit test rect (13,128 290x12)
-
-inlineOverflow: layer(785x1578) has hit test rect (13,145 152x12)
-inlineOverflow: layer(785x1578) has hit test rect (13,157 42x10)
-
-absoluteChildContainer: layer(785x1658) has hit test rect (13,172 290x12)
-absoluteChildContainer: layer(785x1658) has hit test rect (320,173 142x12)
-
-relativeChildContainer: layer(785x1738) has hit test rect (13,189 290x22)
-relativeChildContainer: layer(785x1738) has hit test rect (314,199 142x12)
-
-fixed: layer(52x12) has hit test rect (0,0 52x12)
-
-translate: layer(785x1866) has hit test rect (13,216 290x14)
-translate: layer(785x1866) has hit test rect (314,219 288x12)
-
-transform2d: layer(785x1946) has hit test rect (16,236 284x20)
-
-overhangingContainer: layer(785x1994) has hit test rect (13,262 290x12)
-overhangingContainer: layer(785x1994) has hit test rect (14,274 102x10)
-overhangingContainer: layer(785x1994) has hit test rect (14,284 111x10)
-overhangingContainer: layer(785x1994) has hit test rect (14,294 102x11)
-
-transform3d: layer(288x12) has hit test rect (0,0 288x12)
-transform3d: layer(785x2138) has hit test rect (13,315 290x14)
-
-negativeOffsetChild: layer(211x13) has hit test rect (0,1 102x12)
-
-continuation: layer(785x2266) has hit test rect (13,355 101x11)
-continuation: layer(785x2266) has hit test rect (13,366 290x12)
-continuation: layer(785x2266) has hit test rect (13,378 121x11)
-
-inlineAbsoluteChildContainer: layer(785x2378) has hit test rect (13,392 262x12)
-inlineAbsoluteChildContainer: layer(785x2378) has hit test rect (320,393 252x12)
-
-list: layer(785x2458) has hit test rect (13,413 290x14)
-list: layer(785x2458) has hit test rect (354,414 248x12)
-
-styleModified: layer(785x2548) has hit test rect (13,437 290x22)
-
-containsSvg: layer(785x2596) has hit test rect (13,464 290x16)
-
-svgline: layer(785x2644) has hit test rect (13,488 22x4)
-
-tablecell: layer(785x2692) has hit test rect (45,518 32x11)
-
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-list-translate-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-list-translate-expected.txt
deleted file mode 100644
index 9b2bb8a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-list-translate-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-list: layer(800x600) has hit test rect (13,10 290x14)
-list: layer(800x600) has hit test rect (354,11 248x12)
-
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/external/wpt/html/semantics/scripting-1/the-script-element/execution-timing/083-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/external/wpt/html/semantics/scripting-1/the-script-element/execution-timing/083-expected.txt
deleted file mode 100644
index f5f51835..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/external/wpt/html/semantics/scripting-1/the-script-element/execution-timing/083-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL  scheduler: event listener defined by script in a document in history assert_array_equals: lengths differ, expected array ["inline script #1", "IFRAME script", "end script #1", "event: foo", "inline script #2"] length 5, got ["inline script #1", "IFRAME script", "end script #1", "event: foo", "event: foo", "inline script #2"] length 6
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/002-expected.png
deleted file mode 100644
index c798092c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/002-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/004-expected.png
deleted file mode 100644
index 68441ad5..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/004-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/005-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/005-expected.png
deleted file mode 100644
index 8ad8eab7..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/005-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/acid2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/acid2-expected.png
deleted file mode 100644
index 74e85e5..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/acid2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/clip-text-in-scaled-div-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/clip-text-in-scaled-div-expected.png
deleted file mode 100644
index 6ec97771..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/clip-text-in-scaled-div-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/clip-zooming-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/clip-zooming-expected.png
deleted file mode 100644
index f0615b0..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/clip-zooming-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/first-child-pseudo-class-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/first-child-pseudo-class-expected.png
deleted file mode 100644
index 631928c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/first-child-pseudo-class-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/first-of-type-pseudo-class-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/first-of-type-pseudo-class-expected.png
deleted file mode 100644
index 6c7270d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/first-of-type-pseudo-class-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/focus-ring-continuations-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/focus-ring-continuations-expected.png
deleted file mode 100644
index 146a698..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/focus-ring-continuations-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/font-face-synthetic-bold-italic-for-locally-installed-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/font-face-synthetic-bold-italic-for-locally-installed-expected.png
deleted file mode 100644
index 67c9fed6..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/font-face-synthetic-bold-italic-for-locally-installed-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/font-smoothing-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/font-smoothing-expected.png
deleted file mode 100644
index 6030423c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/font-smoothing-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/font_property_normal-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/font_property_normal-expected.png
deleted file mode 100644
index 12a754c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/font_property_normal-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/input-search-padding-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/input-search-padding-expected.png
deleted file mode 100644
index b3812aa..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/input-search-padding-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/last-child-pseudo-class-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/last-child-pseudo-class-expected.png
deleted file mode 100644
index acdce0c88..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/last-child-pseudo-class-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/last-of-type-pseudo-class-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/last-of-type-pseudo-class-expected.png
deleted file mode 100644
index 28ff695c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/last-of-type-pseudo-class-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/list-item-height-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/list-item-height-expected.png
deleted file mode 100644
index be29b8f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/list-item-height-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/negative-leading-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/negative-leading-expected.png
deleted file mode 100644
index 4fc561a1..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/negative-leading-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/only-child-pseudo-class-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/only-child-pseudo-class-expected.png
deleted file mode 100644
index 209131b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/only-child-pseudo-class-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/only-of-type-pseudo-class-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/only-of-type-pseudo-class-expected.png
deleted file mode 100644
index 5ea36cab..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/only-of-type-pseudo-class-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/outline-auto-location-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/outline-auto-location-expected.png
deleted file mode 100644
index 1f2a0345..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/outline-auto-location-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/rem-calc-dynamic-scaling-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/rem-calc-dynamic-scaling-expected.png
deleted file mode 100644
index 74e885d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/rem-calc-dynamic-scaling-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/rem-dynamic-scaling-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/rem-dynamic-scaling-expected.png
deleted file mode 100644
index 74e885d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/rem-dynamic-scaling-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/rem-units-on-root-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/rem-units-on-root-expected.png
deleted file mode 100644
index d37ad8d3..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/rem-units-on-root-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/shadow-multiple-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/shadow-multiple-expected.png
deleted file mode 100644
index eee32fa..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/shadow-multiple-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/text-overflow-ellipsis-multiple-shadows-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/text-overflow-ellipsis-multiple-shadows-expected.png
deleted file mode 100644
index 156ce55..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/text-overflow-ellipsis-multiple-shadows-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/text-overflow-ellipsis-shadow-alpha-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/text-overflow-ellipsis-shadow-alpha-expected.png
deleted file mode 100644
index befe81c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/text-overflow-ellipsis-shadow-alpha-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/text-overflow-input-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/text-overflow-input-expected.png
deleted file mode 100644
index 1de080e5..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/text-overflow-input-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/text-rendering-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/text-rendering-expected.png
deleted file mode 100644
index 7eb350d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/text-rendering-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/word-space-extra-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/word-space-extra-expected.png
deleted file mode 100644
index 844204c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/word-space-extra-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/zoom-font-size-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/zoom-font-size-expected.png
deleted file mode 100644
index 19736745..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/fast/css/zoom-font-size-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/media/video-zoom-controls-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/media/video-zoom-controls-expected.png
deleted file mode 100644
index 4ef147b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/media/video-zoom-controls-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirLTR-ubNone-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirLTR-ubNone-expected.png
deleted file mode 100644
index c8733fb..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirLTR-ubNone-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirLTR-ubOverride-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirLTR-ubOverride-expected.png
deleted file mode 100644
index 7fff83a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirLTR-ubOverride-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirRTL-ubNone-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirRTL-ubNone-expected.png
deleted file mode 100644
index 97b2a3b5..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirRTL-ubNone-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirRTL-ubOverride-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirRTL-ubOverride-expected.png
deleted file mode 100644
index 837ed1d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirRTL-ubOverride-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirLTR-anchorEnd-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirLTR-anchorEnd-expected.png
deleted file mode 100644
index 844e525..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirLTR-anchorEnd-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirLTR-anchorMiddle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirLTR-anchorMiddle-expected.png
deleted file mode 100644
index f57645c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirLTR-anchorMiddle-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirLTR-anchorStart-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirLTR-anchorStart-expected.png
deleted file mode 100644
index e4ef516..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirLTR-anchorStart-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirNone-anchorEnd-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirNone-anchorEnd-expected.png
deleted file mode 100644
index 844e525..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirNone-anchorEnd-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirNone-anchorMiddle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirNone-anchorMiddle-expected.png
deleted file mode 100644
index f57645c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirNone-anchorMiddle-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirNone-anchorStart-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirNone-anchorStart-expected.png
deleted file mode 100644
index e4ef516..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirNone-anchorStart-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirRTL-anchorEnd-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirRTL-anchorEnd-expected.png
deleted file mode 100644
index e4ef516..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirRTL-anchorEnd-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirRTL-anchorMiddle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirRTL-anchorMiddle-expected.png
deleted file mode 100644
index f57645c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirRTL-anchorMiddle-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirRTL-anchorStart-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirRTL-anchorStart-expected.png
deleted file mode 100644
index 844e525..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirRTL-anchorStart-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirLTR-anchorEnd-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirLTR-anchorEnd-expected.png
deleted file mode 100644
index 844e525..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirLTR-anchorEnd-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirLTR-anchorMiddle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirLTR-anchorMiddle-expected.png
deleted file mode 100644
index f57645c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirLTR-anchorMiddle-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirLTR-anchorStart-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirLTR-anchorStart-expected.png
deleted file mode 100644
index e4ef516..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirLTR-anchorStart-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirRTL-anchorEnd-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirRTL-anchorEnd-expected.png
deleted file mode 100644
index e4ef516..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirRTL-anchorEnd-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirRTL-anchorMiddle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirRTL-anchorMiddle-expected.png
deleted file mode 100644
index f57645c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirRTL-anchorMiddle-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirRTL-anchorStart-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirRTL-anchorStart-expected.png
deleted file mode 100644
index 844e525..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirRTL-anchorStart-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-no-markup-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-no-markup-expected.png
deleted file mode 100644
index e4ef516..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-no-markup-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirLTR-ubNone-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirLTR-ubNone-expected.png
deleted file mode 100644
index c8733fb..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirLTR-ubNone-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirLTR-ubOverride-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirLTR-ubOverride-expected.png
deleted file mode 100644
index 01f9c9a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirLTR-ubOverride-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirRTL-ubNone-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirRTL-ubNone-expected.png
deleted file mode 100644
index 97b2a3b5..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirRTL-ubNone-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirRTL-ubOverride-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirRTL-ubOverride-expected.png
deleted file mode 100644
index 3c2efec..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirRTL-ubOverride-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubEmbed-in-rtl-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubEmbed-in-rtl-context-expected.png
deleted file mode 100644
index 70d259a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubEmbed-in-rtl-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubNone-in-rtl-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubNone-in-rtl-context-expected.png
deleted file mode 100644
index 7fa104d4..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubNone-in-rtl-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubOverride-in-default-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubOverride-in-default-context-expected.png
deleted file mode 100644
index d9279298..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubOverride-in-default-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubOverride-in-ltr-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubOverride-in-ltr-context-expected.png
deleted file mode 100644
index d9279298..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubOverride-in-ltr-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubOverride-in-rtl-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubOverride-in-rtl-context-expected.png
deleted file mode 100644
index 77e31e55..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubOverride-in-rtl-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirNone-ubOverride-in-default-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirNone-ubOverride-in-default-context-expected.png
deleted file mode 100644
index fe4887f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirNone-ubOverride-in-default-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirNone-ubOverride-in-ltr-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirNone-ubOverride-in-ltr-context-expected.png
deleted file mode 100644
index fe4887f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirNone-ubOverride-in-ltr-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirNone-ubOverride-in-rtl-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirNone-ubOverride-in-rtl-context-expected.png
deleted file mode 100644
index 688133d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirNone-ubOverride-in-rtl-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-default-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-default-context-expected.png
deleted file mode 100644
index 5466b50..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-default-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-ltr-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-ltr-context-expected.png
deleted file mode 100644
index 5466b50..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-ltr-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubNone-in-default-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubNone-in-default-context-expected.png
deleted file mode 100644
index db79b3a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubNone-in-default-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubNone-in-ltr-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubNone-in-ltr-context-expected.png
deleted file mode 100644
index db79b3a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubNone-in-ltr-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-default-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-default-context-expected.png
deleted file mode 100644
index e622764..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-default-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-ltr-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-ltr-context-expected.png
deleted file mode 100644
index e622764..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-ltr-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-rtl-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-rtl-context-expected.png
deleted file mode 100644
index 988caf9..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-rtl-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-direction-ltr-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-direction-ltr-expected.png
deleted file mode 100644
index 3363f95..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-direction-ltr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-direction-rtl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-direction-rtl-expected.png
deleted file mode 100644
index 15e99371..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-direction-rtl-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-dom-03-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-dom-03-f-expected.png
deleted file mode 100644
index 2865789..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-dom-03-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-dom-04-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-dom-04-f-expected.png
deleted file mode 100644
index 4dda94c2..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-dom-04-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-units-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-units-03-b-expected.png
deleted file mode 100644
index 993849e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-units-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png
deleted file mode 100644
index da4a845..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.png
deleted file mode 100644
index 32c81ed..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-05-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-05-f-expected.png
deleted file mode 100644
index 2e222cc..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-05-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/interact-pointer-03-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/interact-pointer-03-t-expected.png
deleted file mode 100644
index 4c13119..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/interact-pointer-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png
deleted file mode 100644
index dea6178..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png
deleted file mode 100644
index 7701847..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.png
deleted file mode 100644
index 0da079f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/struct-dom-11-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/struct-dom-11-f-expected.png
deleted file mode 100644
index 72fcd9e9..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/struct-dom-11-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/struct-use-14-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/struct-use-14-f-expected.png
deleted file mode 100644
index 4b30713..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/struct-use-14-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/styling-css-04-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/styling-css-04-f-expected.png
deleted file mode 100644
index 25ddfe55..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/styling-css-04-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/styling-pres-02-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/styling-pres-02-f-expected.png
deleted file mode 100644
index 7462619..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/styling-pres-02-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/svgdom-over-01-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/svgdom-over-01-f-expected.png
deleted file mode 100644
index f78305d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/svgdom-over-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-02-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-02-b-expected.png
deleted file mode 100644
index e6c2af3..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-05-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-05-t-expected.png
deleted file mode 100644
index f77bc43..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-09-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-09-b-expected.png
deleted file mode 100644
index 0a80a55..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-09-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-tspan-02-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-tspan-02-b-expected.png
deleted file mode 100644
index 3682c55..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-tspan-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png
deleted file mode 100644
index e527d20..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-02-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-02-f-expected.png
deleted file mode 100644
index 2c924969..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-02-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-04-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-04-b-expected.png
deleted file mode 100644
index c7d44f4..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-05-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-05-b-expected.png
deleted file mode 100644
index addc666..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-07-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-07-f-expected.png
deleted file mode 100644
index 02e5809..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-07-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-03-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-03-t-expected.png
deleted file mode 100644
index 82b919c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-04-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-04-t-expected.png
deleted file mode 100644
index 57630f2..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-05-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-05-t-expected.png
deleted file mode 100644
index 1f106cd7..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-06-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-06-t-expected.png
deleted file mode 100644
index cb210dd..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-06-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-07-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-07-t-expected.png
deleted file mode 100644
index 90ec653..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-07-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-08-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-08-t-expected.png
deleted file mode 100644
index a00d41a4..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-08-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-09-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-09-t-expected.png
deleted file mode 100644
index fb532a0..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-09-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-10-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-10-t-expected.png
deleted file mode 100644
index bb4f838..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-10-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-11-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-11-t-expected.png
deleted file mode 100644
index 4c400be..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-11-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-12-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-12-t-expected.png
deleted file mode 100644
index bb4f838..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-12-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-13-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-13-t-expected.png
deleted file mode 100644
index 046d065..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-13-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-20-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-20-t-expected.png
deleted file mode 100644
index a61a8ae..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-20-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-21-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-21-t-expected.png
deleted file mode 100644
index a61a8ae..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-21-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-22-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-22-b-expected.png
deleted file mode 100644
index ec3b0cdb..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-22-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-23-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-23-t-expected.png
deleted file mode 100644
index d067d1e0..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-23-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-24-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-24-t-expected.png
deleted file mode 100644
index e36474d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-24-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-25-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-25-t-expected.png
deleted file mode 100644
index 0a5c668f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-25-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-26-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-26-t-expected.png
deleted file mode 100644
index 63720a9..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-26-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-27-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-27-t-expected.png
deleted file mode 100644
index 218504e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-27-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-28-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-28-t-expected.png
deleted file mode 100644
index 80e1058d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-28-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-29-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-29-b-expected.png
deleted file mode 100644
index 47ff381..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-29-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png
deleted file mode 100644
index a7b5502..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-31-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-31-t-expected.png
deleted file mode 100644
index 5bdb9cf1..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-31-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-32-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-32-t-expected.png
deleted file mode 100644
index 984c765..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-32-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-33-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-33-t-expected.png
deleted file mode 100644
index 428c9a5e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-33-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-34-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-34-t-expected.png
deleted file mode 100644
index d08f5a7..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-34-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-36-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-36-t-expected.png
deleted file mode 100644
index b8f3d64..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-36-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png
deleted file mode 100644
index db7de4a8..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png
deleted file mode 100644
index 0a2cd365..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-40-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-40-t-expected.png
deleted file mode 100644
index ba3b335..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-40-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-41-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-41-t-expected.png
deleted file mode 100644
index 2c928dd..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-41-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-44-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-44-t-expected.png
deleted file mode 100644
index a8c68cde..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-44-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-46-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-46-t-expected.png
deleted file mode 100644
index 74962cc..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-46-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png
deleted file mode 100644
index 65ada21..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-60-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-60-t-expected.png
deleted file mode 100644
index 7997495..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-60-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-61-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-61-t-expected.png
deleted file mode 100644
index 7de62101..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-61-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-62-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-62-t-expected.png
deleted file mode 100644
index 4acf09e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-62-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-63-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-63-t-expected.png
deleted file mode 100644
index 322399e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-63-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-64-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-64-t-expected.png
deleted file mode 100644
index 18d26a77..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-64-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-65-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-65-t-expected.png
deleted file mode 100644
index e04218f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-65-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-66-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-66-t-expected.png
deleted file mode 100644
index d6c8e52..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-66-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-67-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-67-t-expected.png
deleted file mode 100644
index 77f1160..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-67-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-68-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-68-t-expected.png
deleted file mode 100644
index 5f31c21..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-68-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-69-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-69-t-expected.png
deleted file mode 100644
index a6dfa7d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-69-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-70-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-70-t-expected.png
deleted file mode 100644
index fbacce4..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-70-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-77-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-77-t-expected.png
deleted file mode 100644
index 9657c44..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-77-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-78-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-78-t-expected.png
deleted file mode 100644
index 8120d14..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-78-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png
deleted file mode 100644
index ce3f15a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-81-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-81-t-expected.png
deleted file mode 100644
index 1406aa5..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-81-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-82-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-82-t-expected.png
deleted file mode 100644
index 3f34042..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-82-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png
deleted file mode 100644
index dc07cea..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-84-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-84-t-expected.png
deleted file mode 100644
index 14e197e7..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-84-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-85-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-85-t-expected.png
deleted file mode 100644
index 2cb702b3..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-85-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prof-01-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prof-01-f-expected.png
deleted file mode 100644
index ae046dd0..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prof-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prop-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prop-01-b-expected.png
deleted file mode 100644
index 087fd85..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prop-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prop-02-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prop-02-f-expected.png
deleted file mode 100644
index 794e40c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prop-02-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prop-03-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prop-03-t-expected.png
deleted file mode 100644
index 0aaddb6..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prop-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-coord-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-coord-01-t-expected.png
deleted file mode 100644
index e05d7b3f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-coord-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-coord-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-coord-02-t-expected.png
deleted file mode 100644
index e05d7b3f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-coord-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-01-b-expected.png
deleted file mode 100644
index 856c75f1..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-02-t-expected.png
deleted file mode 100644
index a28e7db..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-03-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-03-t-expected.png
deleted file mode 100644
index fa39d5a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-04-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-04-t-expected.png
deleted file mode 100644
index 4a0a12a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-05-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-05-t-expected.png
deleted file mode 100644
index 310a14d8..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-06-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-06-t-expected.png
deleted file mode 100644
index fea2492..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-06-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-units-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-units-01-b-expected.png
deleted file mode 100644
index 49bf70d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-units-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-units-02-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-units-02-b-expected.png
deleted file mode 100644
index 8794822..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-units-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.png
deleted file mode 100644
index 2b1f3bb..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.png
deleted file mode 100644
index a280444..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png
deleted file mode 100644
index f39bb42..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png
deleted file mode 100644
index 251f420..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-blend-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-blend-01-b-expected.png
deleted file mode 100644
index bcd57c4b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-blend-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-color-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-color-01-b-expected.png
deleted file mode 100644
index c73dd3d5b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-color-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-composite-02-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-composite-02-b-expected.png
deleted file mode 100644
index c606f4ec..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-composite-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.png
deleted file mode 100644
index 081fa36..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-example-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-example-01-b-expected.png
deleted file mode 100644
index f4107f6..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-example-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.png
deleted file mode 100644
index 382dd0e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-image-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-image-01-b-expected.png
deleted file mode 100644
index 9912c71..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-image-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-light-01-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-light-01-f-expected.png
deleted file mode 100644
index a6bcaf4..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-light-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-light-04-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-light-04-f-expected.png
deleted file mode 100644
index 13cbdf7..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-light-04-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-offset-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-offset-01-b-expected.png
deleted file mode 100644
index 9db6e597..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-offset-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-specular-01-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-specular-01-f-expected.png
deleted file mode 100644
index 3e60310..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-specular-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-tile-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-tile-01-b-expected.png
deleted file mode 100644
index 4490396..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-tile-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-turb-01-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-turb-01-f-expected.png
deleted file mode 100644
index 1f0e4ed..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-turb-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-turb-02-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-turb-02-f-expected.png
deleted file mode 100644
index 6f960bd..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-turb-02-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/fonts-elem-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/fonts-elem-03-b-expected.png
deleted file mode 100644
index 3187d9d7..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/fonts-elem-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.png
deleted file mode 100644
index 5ce1be8..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/fonts-elem-07-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/fonts-elem-07-b-expected.png
deleted file mode 100644
index 64d9a3f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/fonts-elem-07-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.png
deleted file mode 100644
index 8327144..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-dom-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-dom-01-b-expected.png
deleted file mode 100644
index ee2ddc9..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-dom-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-events-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-events-01-b-expected.png
deleted file mode 100644
index 4e5580d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-events-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-order-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-order-01-b-expected.png
deleted file mode 100644
index 7ebf91a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-order-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-order-02-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-order-02-b-expected.png
deleted file mode 100644
index d862a06..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-order-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-order-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-order-03-b-expected.png
deleted file mode 100644
index 6eeebd94..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-order-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.png
deleted file mode 100644
index 0f7032f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-01-b-expected.png
deleted file mode 100644
index 3bc6472..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-02-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-02-b-expected.png
deleted file mode 100644
index 4d3bc3a7..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-03-b-expected.png
deleted file mode 100644
index 1d00c09..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-04-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-04-t-expected.png
deleted file mode 100644
index ccdc0ae..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-05-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-05-t-expected.png
deleted file mode 100644
index 697f00c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-07-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-07-t-expected.png
deleted file mode 100644
index 5268d0f4..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-07-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-uri-02-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-uri-02-b-expected.png
deleted file mode 100644
index b8a1d29..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-uri-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-uri-03-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-uri-03-t-expected.png
deleted file mode 100644
index d033a8a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-uri-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png
deleted file mode 100644
index be8c688..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png
deleted file mode 100644
index 225e5bf..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-opacity-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-opacity-01-b-expected.png
deleted file mode 100644
index b4067043..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-opacity-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-01-b-expected.png
deleted file mode 100644
index 62e62416e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-02-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-02-b-expected.png
deleted file mode 100644
index 41696c9..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-03-b-expected.png
deleted file mode 100644
index e11cedc..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-04-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-04-b-expected.png
deleted file mode 100644
index a9fe612..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-05-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-05-f-expected.png
deleted file mode 100644
index 4738266..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-05-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png
deleted file mode 100644
index 69c8f5d7..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-01-t-expected.png
deleted file mode 100644
index 0e9d4b3..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-02-t-expected.png
deleted file mode 100644
index b112e32..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-03-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-03-t-expected.png
deleted file mode 100644
index f5dfd72..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-04-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-04-t-expected.png
deleted file mode 100644
index 03693333..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-05-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-05-b-expected.png
deleted file mode 100644
index 5742b6a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png
deleted file mode 100644
index 9f85819d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png
deleted file mode 100644
index 8ad8c67..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png
deleted file mode 100644
index bf9acccd..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-render-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-render-01-b-expected.png
deleted file mode 100644
index 1f2949b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-render-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-01-t-expected.png
deleted file mode 100644
index b749642..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-02-t-expected.png
deleted file mode 100644
index 4a915c33..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.png
deleted file mode 100644
index e54dee5a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-04-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-04-t-expected.png
deleted file mode 100644
index 3966ce8..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png
deleted file mode 100644
index f9d1bda..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-01-t-expected.png
deleted file mode 100644
index 5e7df2fb..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-02-t-expected.png
deleted file mode 100644
index 80e4719f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-03-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-03-f-expected.png
deleted file mode 100644
index 1697f9d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-03-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-04-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-04-t-expected.png
deleted file mode 100644
index 67dc9685..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-05-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-05-t-expected.png
deleted file mode 100644
index cd39816c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-06-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-06-t-expected.png
deleted file mode 100644
index 4cb83f49..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-06-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-07-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-07-t-expected.png
deleted file mode 100644
index 17eb19ad78..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-07-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-08-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-08-t-expected.png
deleted file mode 100644
index 0d57c1e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-08-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-09-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-09-t-expected.png
deleted file mode 100644
index ac8cbe9..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-09-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-10-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-10-t-expected.png
deleted file mode 100644
index 8c75c0e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-10-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-12-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-12-t-expected.png
deleted file mode 100644
index fb6781f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-12-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-13-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-13-t-expected.png
deleted file mode 100644
index 8c18076..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-13-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-14-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-14-t-expected.png
deleted file mode 100644
index f36e3bc..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-14-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-15-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-15-t-expected.png
deleted file mode 100644
index abafe95d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-15-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-01-b-expected.png
deleted file mode 100644
index 2749fde..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-02-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-02-b-expected.png
deleted file mode 100644
index 1df906a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-03-b-expected.png
deleted file mode 100644
index 093be03f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-04-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-04-b-expected.png
deleted file mode 100644
index 443a0e3..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
deleted file mode 100644
index 74d48502..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.png
deleted file mode 100644
index e6290b90..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-07-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-07-b-expected.png
deleted file mode 100644
index 6156aff..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-07-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-08-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-08-b-expected.png
deleted file mode 100644
index 13eed111..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-08-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-09-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-09-b-expected.png
deleted file mode 100644
index 81a4112..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-09-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-10-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-10-b-expected.png
deleted file mode 100644
index 039ca34..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-10-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-11-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-11-b-expected.png
deleted file mode 100644
index 0ac789d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-11-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-12-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-12-b-expected.png
deleted file mode 100644
index 58531b1..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-12-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-13-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-13-b-expected.png
deleted file mode 100644
index 7faedc8f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-13-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-14-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-14-b-expected.png
deleted file mode 100644
index 6840615..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-14-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-15-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-15-b-expected.png
deleted file mode 100644
index 651b0f07..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-15-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-16-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-16-b-expected.png
deleted file mode 100644
index 6b1eaff..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-16-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-18-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-18-b-expected.png
deleted file mode 100644
index 319730b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-18-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-19-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-19-b-expected.png
deleted file mode 100644
index c1c8f03..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-19-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-pattern-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-pattern-01-b-expected.png
deleted file mode 100644
index 11a93cb..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-pattern-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-01-t-expected.png
deleted file mode 100644
index f2deb6f10..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-02-t-expected.png
deleted file mode 100644
index 249871a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-03-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-03-t-expected.png
deleted file mode 100644
index 36e3232..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-06-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-06-t-expected.png
deleted file mode 100644
index 24e3d9a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-06-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-07-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-07-t-expected.png
deleted file mode 100644
index 37df814..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-07-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-08-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-08-t-expected.png
deleted file mode 100644
index 7aadb55..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-08-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-groups-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-groups-01-b-expected.png
deleted file mode 100644
index 7b4591b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-groups-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-groups-03-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-groups-03-t-expected.png
deleted file mode 100644
index 888b59c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-groups-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-01-b-expected.png
deleted file mode 100644
index fadfc6c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-02-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-02-b-expected.png
deleted file mode 100644
index b54b08c2..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-03-b-expected.png
deleted file mode 100644
index 7f7e581c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-04-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-04-b-expected.png
deleted file mode 100644
index 49d4a98..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.png
deleted file mode 100644
index 240aebe5..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.png
deleted file mode 100644
index 879cab1f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.png
deleted file mode 100644
index b8a31acf..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.png
deleted file mode 100644
index ea43f92f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-intro-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-intro-01-t-expected.png
deleted file mode 100644
index 9cb8fd2..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-intro-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-line-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-line-01-t-expected.png
deleted file mode 100644
index e30ad7d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-line-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.png
deleted file mode 100644
index 7fd8029..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.png
deleted file mode 100644
index e3d62bcf..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-rect-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-rect-01-t-expected.png
deleted file mode 100644
index 655e875..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-rect-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-rect-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-rect-02-t-expected.png
deleted file mode 100644
index 793dc003..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-rect-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-cond-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-cond-01-t-expected.png
deleted file mode 100644
index ffba81ad..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-cond-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-cond-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-cond-02-t-expected.png
deleted file mode 100644
index de54f01..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-cond-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-cond-03-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-cond-03-t-expected.png
deleted file mode 100644
index b9b567fd..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-cond-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-defs-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-defs-01-t-expected.png
deleted file mode 100644
index 047fa0e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-defs-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-01-b-expected.png
deleted file mode 100644
index ac32228..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-02-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-02-b-expected.png
deleted file mode 100644
index 4aa6adc..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-03-b-expected.png
deleted file mode 100644
index 176f6b3f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-04-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-04-b-expected.png
deleted file mode 100644
index cb620abc..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-05-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-05-b-expected.png
deleted file mode 100644
index f9cc1bb..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-06-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-06-b-expected.png
deleted file mode 100644
index f748fbb..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-06-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-02-t-expected.png
deleted file mode 100644
index ed6c66d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-03-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-03-t-expected.png
deleted file mode 100644
index 76b0b73..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-05-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-05-t-expected.png
deleted file mode 100644
index f7ee28559..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png
deleted file mode 100644
index 7532d70e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-group-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-group-01-t-expected.png
deleted file mode 100644
index f3be6c5..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-group-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-group-02-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-group-02-b-expected.png
deleted file mode 100644
index 8cc14c7..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-group-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-group-03-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-group-03-t-expected.png
deleted file mode 100644
index 775ebd4..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-group-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-01-t-expected.png
deleted file mode 100644
index 1e41db4..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-02-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-02-b-expected.png
deleted file mode 100644
index bbf520c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-03-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-03-t-expected.png
deleted file mode 100644
index de73257..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-04-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-04-t-expected.png
deleted file mode 100644
index fd98c08..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-05-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-05-b-expected.png
deleted file mode 100644
index 3a73071..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-06-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-06-t-expected.png
deleted file mode 100644
index 884e3cd..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-06-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-08-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-08-t-expected.png
deleted file mode 100644
index 437fa8d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-08-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-09-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-09-t-expected.png
deleted file mode 100644
index fb65ef8..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-09-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-10-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-10-t-expected.png
deleted file mode 100644
index 8b39c88..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-10-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-symbol-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-symbol-01-b-expected.png
deleted file mode 100644
index 53a0a6d0..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-symbol-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-use-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-use-01-t-expected.png
deleted file mode 100644
index 940f8d7..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-use-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-use-03-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-use-03-t-expected.png
deleted file mode 100644
index d4ff6c6e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-use-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-use-05-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-use-05-b-expected.png
deleted file mode 100644
index d7e8589..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-use-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-01-b-expected.png
deleted file mode 100644
index 1fde82a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-02-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-02-b-expected.png
deleted file mode 100644
index af70a37..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-03-b-expected.png
deleted file mode 100644
index 3ea2836..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-05-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-05-b-expected.png
deleted file mode 100644
index ad1664e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-06-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-06-b-expected.png
deleted file mode 100644
index d56481c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-06-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-pres-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-pres-01-t-expected.png
deleted file mode 100644
index 441c30c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-pres-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-01-b-expected.png
deleted file mode 100644
index 897793b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-02-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-02-b-expected.png
deleted file mode 100644
index e3e1697..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-03-b-expected.png
deleted file mode 100644
index ea26d15..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-04-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-04-b-expected.png
deleted file mode 100644
index 79f891d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-05-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-05-b-expected.png
deleted file mode 100644
index 48b0f93c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-06-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-06-b-expected.png
deleted file mode 100644
index c7b94b2f4..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-06-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-08-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-08-b-expected.png
deleted file mode 100644
index 40da1e1..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-08-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-deco-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-deco-01-b-expected.png
deleted file mode 100644
index a108c45..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-deco-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png
deleted file mode 100644
index 323b9f2..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-fonts-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-fonts-02-t-expected.png
deleted file mode 100644
index 53e0acc..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-fonts-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-01-t-expected.png
deleted file mode 100644
index 34d3909d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-03-b-expected.png
deleted file mode 100644
index 982606f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-04-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-04-t-expected.png
deleted file mode 100644
index 8234fcc..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-path-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-path-01-b-expected.png
deleted file mode 100644
index 87722a5..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-path-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-spacing-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-spacing-01-b-expected.png
deleted file mode 100644
index 1d54961..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-spacing-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-01-b-expected.png
deleted file mode 100644
index fcbccabf..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-03-b-expected.png
deleted file mode 100644
index 1326f7c9..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-04-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-04-t-expected.png
deleted file mode 100644
index 67c29df..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-05-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-05-t-expected.png
deleted file mode 100644
index f5bd5ca..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-06-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-06-t-expected.png
deleted file mode 100644
index 388d014..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-06-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-07-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-07-t-expected.png
deleted file mode 100644
index 4a00c40..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-07-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-08-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-08-b-expected.png
deleted file mode 100644
index 12ba2dd..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-08-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tselect-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tselect-01-b-expected.png
deleted file mode 100644
index 5e49018..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tselect-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tselect-02-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tselect-02-f-expected.png
deleted file mode 100644
index 18671159..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tselect-02-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tspan-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tspan-01-b-expected.png
deleted file mode 100644
index eef01727c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tspan-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-ws-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-ws-01-t-expected.png
deleted file mode 100644
index 5e01b4e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-ws-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-ws-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-ws-02-t-expected.png
deleted file mode 100644
index c110504..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-ws-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png
deleted file mode 100644
index 32ed753..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png
deleted file mode 100644
index f3b6cfd..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png
deleted file mode 100644
index d3a26403..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/as-background-image/animated-svg-as-background-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/as-background-image/animated-svg-as-background-expected.png
deleted file mode 100644
index 9d269f8..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/as-background-image/animated-svg-as-background-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-3-expected.png
deleted file mode 100644
index df70ddad..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-5-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-5-expected.png
deleted file mode 100644
index 0f16b91..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-5-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/as-image/image-respects-pageScaleFactor-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/as-image/image-respects-pageScaleFactor-expected.png
deleted file mode 100644
index 4a53aa4..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/as-image/image-respects-pageScaleFactor-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/filters/feTile-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/filters/feTile-expected.png
deleted file mode 100644
index 667405e9..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/filters/feTile-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/paints/gradientLimit-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/paints/gradientLimit-expected.png
deleted file mode 100644
index ac9d817..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/paints/gradientLimit-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/paints/patternPreserveAspectRatioA-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/paints/patternPreserveAspectRatioA-expected.png
deleted file mode 100644
index 24d6cd4..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/paints/patternPreserveAspectRatioA-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/paints/patternRegionA-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/paints/patternRegionA-expected.png
deleted file mode 100644
index a5f97e7..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/paints/patternRegionA-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/paints/patternRegions-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/paints/patternRegions-expected.png
deleted file mode 100644
index 76e2dd1..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/paints/patternRegions-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/paints/patternRegions-positioned-objects-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/paints/patternRegions-positioned-objects-expected.png
deleted file mode 100644
index 97b33cd..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/paints/patternRegions-positioned-objects-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/longTextOnPath-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/longTextOnPath-expected.png
deleted file mode 100644
index f6c654d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/longTextOnPath-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/smallFonts-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/smallFonts-expected.png
deleted file mode 100644
index 7a80c0a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/smallFonts-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textAnchor-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textAnchor-expected.png
deleted file mode 100644
index 3a0cfa4e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textAnchor-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textAnchor2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textAnchor2-expected.png
deleted file mode 100644
index 9720e1ad..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textAnchor2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textAnchor3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textAnchor3-expected.png
deleted file mode 100644
index 12a02f1..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textAnchor3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textDecoration-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textDecoration-expected.png
deleted file mode 100644
index b6b4689..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textDecoration-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textEffect2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textEffect2-expected.png
deleted file mode 100644
index bd945ee..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textEffect2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textEffect3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textEffect3-expected.png
deleted file mode 100644
index 9fe124f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textEffect3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textFeatures-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textFeatures-expected.png
deleted file mode 100644
index 7c52b68d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textFeatures-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textGlyphOrientationHorizontal-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textGlyphOrientationHorizontal-expected.png
deleted file mode 100644
index 95a36575..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textGlyphOrientationHorizontal-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textLength-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textLength-expected.png
deleted file mode 100644
index 34710b1..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textLength-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textOnPath-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textOnPath-expected.png
deleted file mode 100644
index 7018bc5..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textOnPath-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textOnPath2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textOnPath2-expected.png
deleted file mode 100644
index e89b9e9..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textOnPath2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textOnPath3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textOnPath3-expected.png
deleted file mode 100644
index cca2ac9..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textOnPath3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textOnPathSpaces-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textOnPathSpaces-expected.png
deleted file mode 100644
index 4740a9e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textOnPathSpaces-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textPosition-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textPosition-expected.png
deleted file mode 100644
index 5a27444..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textPosition-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textProperties-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textProperties-expected.png
deleted file mode 100644
index 44ef830..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/textProperties-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/verticalTextOnPath-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/verticalTextOnPath-expected.png
deleted file mode 100644
index b65c5ee..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/verticalTextOnPath-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/xmlSpace-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/xmlSpace-expected.png
deleted file mode 100644
index 5a7c665..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/batik/text/xmlSpace-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/carto.net/colourpicker-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/carto.net/colourpicker-expected.png
deleted file mode 100644
index 42a51e1..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/carto.net/colourpicker-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/carto.net/textbox-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/carto.net/textbox-expected.png
deleted file mode 100644
index 0d3ba14..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/carto.net/textbox-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/clip-path/clip-path-text-and-shape-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/clip-path/clip-path-text-and-shape-expected.png
deleted file mode 100644
index 90edd14..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/clip-path/clip-path-text-and-shape-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/clip-path/clip-path-text-and-stroke-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/clip-path/clip-path-text-and-stroke-expected.png
deleted file mode 100644
index 23634b1..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/clip-path/clip-path-text-and-stroke-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/clip-path/clip-path-text-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/clip-path/clip-path-text-expected.png
deleted file mode 100644
index 9552585..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/clip-path/clip-path-text-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/clip-path/clip-path-tspan-and-stroke-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/clip-path/clip-path-tspan-and-stroke-expected.png
deleted file mode 100644
index 23634b1..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/clip-path/clip-path-tspan-and-stroke-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/css/alignment-baseline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/css/alignment-baseline-expected.png
deleted file mode 100644
index 909ba95..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/css/alignment-baseline-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/css/text-gradient-shadow-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/css/text-gradient-shadow-expected.png
deleted file mode 100644
index 5b18b14b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/css/text-gradient-shadow-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/css/text-shadow-multiple-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/css/text-shadow-multiple-expected.png
deleted file mode 100644
index ef5bceb6..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/css/text-shadow-multiple-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/SVGPoint-matrixTransform-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/SVGPoint-matrixTransform-expected.png
deleted file mode 100644
index c1abb12..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/SVGPoint-matrixTransform-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/foreign-object-skew-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/foreign-object-skew-expected.png
deleted file mode 100644
index b6c0f5e3..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/foreign-object-skew-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/image-parent-translation-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/image-parent-translation-expected.png
deleted file mode 100644
index 345eaa2..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/image-parent-translation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/image-small-width-height-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/image-small-width-height-expected.png
deleted file mode 100644
index 4ac0cc8..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/image-small-width-height-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/invalid-css-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/invalid-css-expected.png
deleted file mode 100644
index 0de0f9e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/invalid-css-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/linking-a-03-b-viewBox-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/linking-a-03-b-viewBox-expected.png
deleted file mode 100644
index 4e1e081..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/linking-a-03-b-viewBox-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/linking-a-03-b-viewBox-transform-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/linking-a-03-b-viewBox-transform-expected.png
deleted file mode 100644
index 89b18a75..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/linking-a-03-b-viewBox-transform-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/linking-uri-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/linking-uri-01-b-expected.png
deleted file mode 100644
index 7657623ce..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/linking-uri-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/marker-default-width-height-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/marker-default-width-height-expected.png
deleted file mode 100644
index 32a6455..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/marker-default-width-height-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/object-sizing-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/object-sizing-expected.png
deleted file mode 100644
index a31fa458..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/object-sizing-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/shapes-supporting-markers-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/shapes-supporting-markers-expected.png
deleted file mode 100644
index 6f0538be..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/shapes-supporting-markers-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/svg-fonts-in-html-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/svg-fonts-in-html-expected.png
deleted file mode 100644
index b7c6ffe..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/svg-fonts-in-html-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/svg-fonts-with-no-element-reference-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/svg-fonts-with-no-element-reference-expected.png
deleted file mode 100644
index fe3f7fa..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/svg-fonts-with-no-element-reference-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-ctm-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-ctm-expected.png
deleted file mode 100644
index 6c434f8..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-ctm-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-filter-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-filter-expected.png
deleted file mode 100644
index bb74560..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-filter-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-hit-test-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-hit-test-expected.png
deleted file mode 100644
index 9cfa3c7b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-hit-test-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-match-highlight-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-match-highlight-expected.png
deleted file mode 100644
index a62bed5..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-match-highlight-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-rotated-gradient-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-rotated-gradient-expected.png
deleted file mode 100644
index c2aa485..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-rotated-gradient-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-rotation-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-rotation-expected.png
deleted file mode 100644
index c449ea8..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-rotation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-whitespace-handling-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-whitespace-handling-expected.png
deleted file mode 100644
index 0f7cb31..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-whitespace-handling-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-x-dy-lists-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-x-dy-lists-expected.png
deleted file mode 100644
index eb80de9..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/text-x-dy-lists-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-events-crash-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-events-crash-expected.png
deleted file mode 100644
index b0dfba7..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-events-crash-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-modify-container-in-target-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-modify-container-in-target-expected.png
deleted file mode 100644
index b7083b4e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-modify-container-in-target-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-modify-target-container-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-modify-target-container-expected.png
deleted file mode 100644
index 9e78d7a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-modify-target-container-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-modify-target-symbol-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-modify-target-symbol-expected.png
deleted file mode 100644
index 3a4124b4..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-modify-target-symbol-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-1-expected.png
deleted file mode 100644
index fc25c8f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-2-expected.png
deleted file mode 100644
index fc25c8f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-3-expected.png
deleted file mode 100644
index fc25c8f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-4-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-4-expected.png
deleted file mode 100644
index fc25c8f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-4-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-5-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-5-expected.png
deleted file mode 100644
index fc25c8f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-5-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-6-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-6-expected.png
deleted file mode 100644
index fc25c8f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-6-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-g-containing-use-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-g-containing-use-expected.png
deleted file mode 100644
index 3d0e84f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-g-containing-use-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-g-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-g-expected.png
deleted file mode 100644
index 6b37f1c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-g-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-non-svg-namespaced-element-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-non-svg-namespaced-element-expected.png
deleted file mode 100644
index fc25c8f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-non-svg-namespaced-element-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-rect-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-rect-expected.png
deleted file mode 100644
index eec9fcd..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-rect-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-symbol-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-symbol-expected.png
deleted file mode 100644
index eec9fcd..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-symbol-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-text-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-text-expected.png
deleted file mode 100644
index eec4f10a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-text-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-use-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-use-expected.png
deleted file mode 100644
index 6b37f1c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-on-use-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-recursion-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-recursion-1-expected.png
deleted file mode 100644
index 206ad1c0..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-recursion-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-recursion-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-recursion-2-expected.png
deleted file mode 100644
index 1c96818..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-recursion-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-recursion-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-recursion-3-expected.png
deleted file mode 100644
index 206ad1c0..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-recursion-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-recursion-4-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-recursion-4-expected.png
deleted file mode 100644
index 206ad1c0..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-recursion-4-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-transform-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-transform-expected.png
deleted file mode 100644
index ceba02a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/custom/use-transform-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/error/010-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/error/010-expected.png
deleted file mode 100644
index 20a295e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/error/010-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/error/011-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/error/011-expected.png
deleted file mode 100644
index 20a295e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/error/011-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/links/002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/links/002-expected.png
deleted file mode 100644
index 7364884..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/links/002-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/mixed/008-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/mixed/008-expected.png
deleted file mode 100644
index e71b4b4..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/mixed/008-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/text/002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/text/002-expected.png
deleted file mode 100644
index 2a1cd61..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/text/002-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/viewbox/preserveAspectRatio/001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/viewbox/preserveAspectRatio/001-expected.png
deleted file mode 100644
index 2ae8b44..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/viewbox/preserveAspectRatio/001-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/viewbox/preserveAspectRatio/002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/viewbox/preserveAspectRatio/002-expected.png
deleted file mode 100644
index 050021683..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/hixie/viewbox/preserveAspectRatio/002-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-expected.png
deleted file mode 100644
index 966e391..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-zoomed-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-zoomed-expected.png
deleted file mode 100644
index 71d818535..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-zoomed-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/bidi-reorder-in-text-chunks-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/bidi-reorder-in-text-chunks-expected.png
deleted file mode 100644
index dde81cf..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/bidi-reorder-in-text-chunks-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/bidi-textlength-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/bidi-textlength-expected.png
deleted file mode 100644
index 47d90a5..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/bidi-textlength-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/combining-character-queries-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/combining-character-queries-expected.png
deleted file mode 100644
index 0942328e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/combining-character-queries-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/current-text-position-initial-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/current-text-position-initial-expected.png
deleted file mode 100644
index 918e4874..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/current-text-position-initial-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/foreignObject-repaint-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/foreignObject-repaint-expected.png
deleted file mode 100644
index 8096e35..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/foreignObject-repaint-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/ligature-queries-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/ligature-queries-expected.png
deleted file mode 100644
index 404fc34..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/ligature-queries-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-1-expected.png
deleted file mode 100644
index a781871..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-2-expected.png
deleted file mode 100644
index afcef4d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-3-expected.png
deleted file mode 100644
index d067c8a8..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-4-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-4-expected.png
deleted file mode 100644
index 15b304c..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-4-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-1-expected.png
deleted file mode 100644
index d809b5b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-2-expected.png
deleted file mode 100644
index c3888dda7..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-3-expected.png
deleted file mode 100644
index 4a85bee..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-4-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-4-expected.png
deleted file mode 100644
index 48fa434..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-4-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/selection-styles-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/selection-styles-expected.png
deleted file mode 100644
index 4e3b289a2..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/selection-styles-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/small-fonts-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/small-fonts-2-expected.png
deleted file mode 100644
index 5ed36ea..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/small-fonts-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/small-fonts-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/small-fonts-3-expected.png
deleted file mode 100644
index fa6ba646..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/small-fonts-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/small-fonts-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/small-fonts-expected.png
deleted file mode 100644
index d639791..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/small-fonts-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/small-fonts-in-html5-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/small-fonts-in-html5-expected.png
deleted file mode 100644
index 7a0ec8f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/small-fonts-in-html5-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-decorations-in-scaled-pattern-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-decorations-in-scaled-pattern-expected.png
deleted file mode 100644
index 3d3a0bff..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-decorations-in-scaled-pattern-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-fill-opacity-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-fill-opacity-expected.png
deleted file mode 100644
index a60f88f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-fill-opacity-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-gradient-positioning-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-gradient-positioning-expected.png
deleted file mode 100644
index bb253726..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-gradient-positioning-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-repaint-rects-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-repaint-rects-expected.png
deleted file mode 100644
index b46b54f5..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-repaint-rects-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-align-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-align-01-b-expected.png
deleted file mode 100644
index 6fc6e01..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-align-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-align-02-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-align-02-b-expected.png
deleted file mode 100644
index 32f0ea1..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-align-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-align-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-align-03-b-expected.png
deleted file mode 100644
index 6363739..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-align-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-align-04-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-align-04-b-expected.png
deleted file mode 100644
index 3ec2ed8..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-align-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-align-05-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-align-05-b-expected.png
deleted file mode 100644
index ed1a7d7..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-align-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-align-06-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-align-06-b-expected.png
deleted file mode 100644
index 96b8b8e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-align-06-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-deco-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-deco-01-b-expected.png
deleted file mode 100644
index c5966da..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-deco-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-fonts-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-fonts-01-t-expected.png
deleted file mode 100644
index 633f042..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-fonts-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-fonts-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-fonts-02-t-expected.png
deleted file mode 100644
index ad68117..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-fonts-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-intro-05-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-intro-05-t-expected.png
deleted file mode 100644
index f78e39a11..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-intro-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-path-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-path-01-b-expected.png
deleted file mode 100644
index 273301c4..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-path-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-spacing-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-spacing-01-b-expected.png
deleted file mode 100644
index eb73474..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-spacing-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-text-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-text-01-b-expected.png
deleted file mode 100644
index d9501f4..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-text-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-text-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-text-03-b-expected.png
deleted file mode 100644
index a1555524..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-text-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-text-04-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-text-04-t-expected.png
deleted file mode 100644
index 616a877..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-text-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-text-06-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-text-06-t-expected.png
deleted file mode 100644
index 1f84013..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-text-06-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-text-07-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-text-07-t-expected.png
deleted file mode 100644
index eea4763..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-text-07-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-text-08-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-text-08-b-expected.png
deleted file mode 100644
index ace4cde..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-text-08-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-tselect-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-tselect-01-b-expected.png
deleted file mode 100644
index 1e3ac88b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-tselect-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-tselect-02-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-tselect-02-f-expected.png
deleted file mode 100644
index 5df3f7e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-tselect-02-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-tspan-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-tspan-01-b-expected.png
deleted file mode 100644
index 0c884ea..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-tspan-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-ws-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-ws-01-t-expected.png
deleted file mode 100644
index 45c63a1a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-ws-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-ws-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-ws-02-t-expected.png
deleted file mode 100644
index b74f8aed..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/text/text-selection-ws-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/transforms/svg-css-transforms-clip-path-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/transforms/svg-css-transforms-clip-path-expected.png
deleted file mode 100644
index 7a8df36f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/transforms/svg-css-transforms-clip-path-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/transforms/svg-css-transforms-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/transforms/svg-css-transforms-expected.png
deleted file mode 100644
index 014acf5..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/transforms/svg-css-transforms-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/transforms/text-with-mask-with-svg-transform-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/transforms/text-with-mask-with-svg-transform-expected.png
deleted file mode 100644
index 97946f73..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/transforms/text-with-mask-with-svg-transform-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/transforms/text-with-pattern-with-svg-transform-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/transforms/text-with-pattern-with-svg-transform-expected.png
deleted file mode 100644
index e6784dc..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/transforms/text-with-pattern-with-svg-transform-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/wicd/test-rightsizing-a-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/wicd/test-rightsizing-a-expected.png
deleted file mode 100644
index 5814a19..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/wicd/test-rightsizing-a-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/wicd/test-rightsizing-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/wicd/test-rightsizing-b-expected.png
deleted file mode 100644
index 7ca8746b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/wicd/test-rightsizing-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/wicd/test-scalable-background-image1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/wicd/test-scalable-background-image1-expected.png
deleted file mode 100644
index c2ccb54..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/wicd/test-scalable-background-image1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/wicd/test-scalable-background-image2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/wicd/test-scalable-background-image2-expected.png
deleted file mode 100644
index 75488ebca..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/wicd/test-scalable-background-image2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/zoom/page/zoom-foreignObject-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/zoom/page/zoom-foreignObject-expected.png
deleted file mode 100644
index d709ed37..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/zoom/page/zoom-foreignObject-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/zoom/page/zoom-hixie-mixed-009-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/zoom/page/zoom-hixie-mixed-009-expected.png
deleted file mode 100644
index 9696370..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/zoom/page/zoom-hixie-mixed-009-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/zoom/page/zoom-mask-with-percentages-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/zoom/page/zoom-mask-with-percentages-expected.png
deleted file mode 100644
index fd7197d..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/zoom/page/zoom-mask-with-percentages-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png
deleted file mode 100644
index d5880172f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/zoom/page/zoom-zoom-coords-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/zoom/page/zoom-zoom-coords-expected.txt
deleted file mode 100644
index d8a8c7b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/zoom/page/zoom-zoom-coords-expected.txt
+++ /dev/null
@@ -1,125 +0,0 @@
-Test
-Test
-Test
-
-This test checks getBoundingClientRect() on zoomed HTML and SVG elements
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-Gray rectangles: 100x50
-Green rectangles: 100x50, zoom=200%
-Blue rectangles: 200x100, zoom=50%
-
-
-Checking HTML elements:
-
-
-PASS div1.left is 0.00
-PASS div1.top is 0.00
-PASS div1.width is 100.00
-PASS div1.height is 50.00
-PASS div1.right is 100.00
-PASS div1.bottom is 50.00
-
-
-PASS div2.left is 0.00
-PASS div2.top is 25.00
-PASS div2.width is 100.00
-PASS div2.height is 50.00
-PASS div2.right is 100.00
-PASS div2.bottom is 75.00
-
-
-PASS div3.left is 0.00
-PASS div3.top is 300.00
-PASS div3.width is 200.00
-PASS div3.height is 100.00
-PASS div3.right is 200.00
-PASS div3.bottom is 400.00
-
-
-Checking SVG elements:
-
-
-PASS svg1.left is 0.00
-PASS svg1.top is 250.00
-PASS svg1.width is 150.00
-PASS svg1.height is 50.00
-PASS svg1.right is 150.00
-PASS svg1.bottom is 300.00
-PASS rect1.left is 0.00
-PASS rect1.top is 250.00
-PASS rect1.width is 100.00
-PASS rect1.height is 50.00
-PASS rect1.right is 100.00
-PASS rect1.bottom is 300.00
-PASS image1.left is 100.00
-PASS image1.top is 250.00
-PASS image1.width is 50.00
-PASS image1.height is 25.00
-PASS image1.right is 150.00
-PASS image1.bottom is 275.00
-PASS text1.left is 100.00
-PASS text1.top is 282.66
-FAIL text1.width should be 47.98. Was 49.203128814697266.
-PASS text1.height is 6.16
-FAIL text1.right should be 147.98. Was 149.20312881469727.
-PASS text1.bottom is 288.82
-
-
-PASS svg2.left is 75.00
-PASS svg2.top is 100.00
-PASS svg2.width is 150.00
-PASS svg2.height is 50.00
-PASS svg2.right is 225.00
-PASS svg2.bottom is 150.00
-PASS rect2.left is 75.00
-PASS rect2.top is 100.00
-PASS rect2.width is 100.00
-PASS rect2.height is 50.00
-PASS rect2.right is 175.00
-PASS rect2.bottom is 150.00
-PASS image2.left is 175.00
-PASS image2.top is 100.00
-PASS image2.width is 50.00
-PASS image2.height is 25.00
-PASS image2.right is 225.00
-PASS image2.bottom is 125.00
-PASS text2.left is 175.00
-PASS text2.top is 132.66
-FAIL text2.width should be 47.98. Was 47.875.
-FAIL text2.height should be 6.02. Was 5.937491416931152.
-FAIL text2.right should be 222.98. Was 222.875.
-FAIL text2.bottom should be 138.7. Was 138.60155391693115.
-
-
-PASS svg3.left is 900.00
-PASS svg3.top is 500.00
-PASS svg3.width is 300.00
-PASS svg3.height is 100.00
-PASS svg3.right is 1200.00
-PASS svg3.bottom is 600.00
-PASS rect3.left is 900.00
-PASS rect3.top is 500.00
-PASS rect3.width is 200.00
-PASS rect3.height is 100.00
-PASS rect3.right is 1100.00
-PASS rect3.bottom is 600.00
-PASS image3.left is 1100.00
-PASS image3.top is 500.00
-PASS image3.width is 100.00
-PASS image3.height is 50.00
-PASS image3.right is 1200.00
-PASS image3.bottom is 550.00
-PASS text3.left is 1100.00
-PASS text3.top is 565.33
-FAIL text3.width should be 95.97. Was 98.40630340576172.
-PASS text3.height is 12.31
-FAIL text3.right should be 1195.97. Was 1198.4063034057617.
-PASS text3.bottom is 577.64
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/zoom/text/zoom-hixie-mixed-009-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/zoom/text/zoom-hixie-mixed-009-expected.png
deleted file mode 100644
index 3d0ed5ff..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/synchronous_html_parser/svg/zoom/text/zoom-hixie-mixed-009-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/compositing/geometry/clipping-foreground-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/compositing/geometry/clipping-foreground-expected.png
deleted file mode 100644
index 17ecc75..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/compositing/geometry/clipping-foreground-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/compositing/overflow/accelerated-scrolling-with-clip-path-text-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/compositing/overflow/accelerated-scrolling-with-clip-path-text-expected.png
deleted file mode 100644
index 2a3bc499..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/compositing/overflow/accelerated-scrolling-with-clip-path-text-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/compositing/overflow/overflow-scroll-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/compositing/overflow/overflow-scroll-expected.png
deleted file mode 100644
index b4f240b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/compositing/overflow/overflow-scroll-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt
deleted file mode 100644
index 17a27fb..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF"
-    },
-    {
-      "name": "LayoutBlockFlow (positioned) DIV",
-      "bounds": [200, 200],
-      "contentsOpaque": true,
-      "backgroundColor": "#D3D3D3",
-      "transform": 1
-    },
-    {
-      "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV)",
-      "position": [42, 42],
-      "bounds": [251, 251],
-      "backgroundColor": "#FF0000",
-      "invalidations": [
-        [50, 50, 200, 200]
-      ],
-      "transform": 1
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [8, 8, 0, 1]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/compositing/text-match-highlight-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/compositing/text-match-highlight-expected.png
deleted file mode 100644
index f472b9a..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/compositing/text-match-highlight-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/delete-into-nested-block-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/delete-into-nested-block-expected.png
deleted file mode 100644
index b803737b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/delete-into-nested-block-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/flexbox/repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/flexbox/repaint-expected.txt
deleted file mode 100644
index 8f30dcb..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/flexbox/repaint-expected.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [139, 128, 653, 100],
-        [138, 168, 636, 19],
-        [138, 128, 636, 19],
-        [138, 188, 627, 19],
-        [138, 148, 620, 19],
-        [138, 208, 573, 19],
-        [400, 128, 392, 180],
-        [8, 228, 392, 80],
-        [148, 128, 252, 180],
-        [8, 128, 140, 100]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/invalidation-after-opacity-change-subtree-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/invalidation-after-opacity-change-subtree-expected.png
deleted file mode 100644
index 8920a00..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/invalidation-after-opacity-change-subtree-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-10-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-10-expected.txt
deleted file mode 100644
index 8f467b4..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-10-expected.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 540, 407, 19],
-        [14, 560, 406, 19],
-        [14, 520, 387, 19],
-        [14, 480, 354, 19],
-        [89, 580, 331, 19],
-        [65, 360, 306, 19],
-        [65, 400, 304, 19],
-        [14, 340, 292, 19],
-        [14, 320, 264, 19],
-        [14, 260, 259, 19],
-        [14, 300, 256, 19],
-        [56, 460, 255, 19],
-        [14, 280, 252, 19],
-        [128, 420, 241, 19],
-        [14, 460, 226, 19],
-        [14, 500, 219, 19],
-        [243, 240, 177, 19],
-        [14, 440, 172, 19],
-        [65, 440, 171, 19],
-        [266, 280, 154, 19],
-        [270, 300, 150, 19],
-        [273, 260, 147, 19],
-        [278, 320, 142, 19],
-        [240, 460, 128, 19],
-        [186, 440, 116, 19],
-        [235, 440, 115, 19],
-        [306, 340, 114, 19],
-        [65, 380, 89, 19],
-        [14, 580, 75, 19],
-        [302, 440, 66, 19],
-        [65, 420, 64, 19],
-        [370, 360, 51, 19],
-        [14, 374, 48, 64],
-        [14, 363, 48, 64],
-        [401, 520, 20, 19],
-        [349, 440, 20, 19]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-3-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-3-expected.txt
deleted file mode 100644
index 76005c5..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-3-expected.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 540, 407, 19],
-        [14, 560, 406, 19],
-        [14, 520, 387, 19],
-        [89, 580, 331, 19],
-        [65, 360, 306, 19],
-        [65, 400, 304, 19],
-        [14, 340, 292, 19],
-        [65, 420, 288, 19],
-        [14, 480, 288, 19],
-        [14, 320, 264, 19],
-        [14, 260, 259, 19],
-        [14, 300, 256, 19],
-        [14, 280, 252, 19],
-        [128, 420, 241, 19],
-        [14, 460, 226, 19],
-        [243, 240, 177, 19],
-        [14, 440, 172, 19],
-        [266, 280, 154, 19],
-        [14, 500, 151, 19],
-        [270, 300, 150, 19],
-        [273, 260, 147, 19],
-        [278, 320, 142, 19],
-        [215, 460, 137, 19],
-        [240, 460, 128, 19],
-        [186, 440, 116, 19],
-        [306, 340, 114, 19],
-        [133, 440, 109, 19],
-        [65, 380, 89, 19],
-        [14, 580, 75, 19],
-        [302, 480, 66, 19],
-        [302, 440, 66, 19],
-        [287, 480, 65, 19],
-        [242, 440, 65, 19],
-        [356, 423, 64, 80],
-        [362, 400, 58, 19],
-        [370, 360, 51, 19],
-        [372, 403, 48, 80],
-        [401, 520, 20, 19]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-4-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-4-expected.txt
deleted file mode 100644
index 243b6eb..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-4-expected.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 540, 407, 19],
-        [14, 560, 406, 19],
-        [14, 520, 387, 19],
-        [89, 580, 331, 19],
-        [65, 360, 306, 19],
-        [65, 400, 304, 19],
-        [14, 340, 292, 19],
-        [14, 480, 288, 19],
-        [14, 320, 264, 19],
-        [14, 260, 259, 19],
-        [14, 300, 256, 19],
-        [14, 280, 252, 19],
-        [128, 420, 241, 19],
-        [14, 460, 226, 19],
-        [243, 240, 177, 19],
-        [14, 440, 172, 19],
-        [266, 280, 154, 19],
-        [14, 500, 151, 19],
-        [270, 300, 150, 19],
-        [273, 260, 147, 19],
-        [278, 320, 142, 19],
-        [282, 480, 138, 19],
-        [240, 460, 128, 19],
-        [186, 440, 116, 19],
-        [306, 340, 114, 19],
-        [65, 380, 89, 19],
-        [14, 580, 75, 19],
-        [302, 440, 66, 19],
-        [65, 420, 64, 19],
-        [370, 360, 51, 19],
-        [372, 403, 48, 80],
-        [401, 520, 20, 19]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-5-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-5-expected.txt
deleted file mode 100644
index fcc88fa..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-5-expected.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 540, 407, 19],
-        [14, 560, 406, 19],
-        [14, 520, 387, 19],
-        [89, 580, 331, 19],
-        [49, 360, 322, 19],
-        [65, 400, 304, 19],
-        [49, 400, 302, 19],
-        [14, 340, 292, 19],
-        [14, 480, 288, 19],
-        [88, 420, 281, 19],
-        [14, 320, 264, 19],
-        [14, 260, 259, 19],
-        [14, 300, 256, 19],
-        [14, 280, 252, 19],
-        [14, 460, 226, 19],
-        [181, 460, 187, 19],
-        [243, 240, 177, 19],
-        [14, 440, 172, 19],
-        [266, 280, 154, 19],
-        [14, 500, 151, 19],
-        [270, 300, 150, 19],
-        [273, 260, 147, 19],
-        [278, 320, 142, 19],
-        [229, 480, 139, 19],
-        [186, 440, 116, 19],
-        [306, 340, 114, 19],
-        [134, 440, 111, 19],
-        [65, 380, 89, 19],
-        [49, 380, 89, 19],
-        [14, 580, 75, 19],
-        [302, 440, 66, 19],
-        [245, 440, 65, 19],
-        [65, 420, 64, 19],
-        [370, 360, 51, 19],
-        [14, 363, 48, 64],
-        [49, 420, 40, 19],
-        [401, 520, 20, 19],
-        [350, 400, 20, 19]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-8-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-8-expected.txt
deleted file mode 100644
index f02ec31..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-8-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [8, 74, 418, 526]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-9-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-9-expected.txt
deleted file mode 100644
index 362553f6..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-9-expected.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 540, 407, 19],
-        [14, 560, 406, 19],
-        [14, 360, 406, 19],
-        [14, 520, 387, 19],
-        [14, 340, 387, 19],
-        [14, 300, 385, 19],
-        [14, 320, 358, 19],
-        [14, 480, 354, 19],
-        [89, 580, 331, 19],
-        [14, 280, 328, 19],
-        [65, 400, 304, 19],
-        [14, 260, 263, 19],
-        [56, 460, 255, 19],
-        [128, 420, 241, 19],
-        [189, 200, 231, 19],
-        [14, 240, 229, 19],
-        [193, 220, 227, 19],
-        [14, 460, 226, 19],
-        [14, 500, 219, 19],
-        [14, 220, 179, 19],
-        [243, 240, 177, 19],
-        [14, 200, 175, 19],
-        [14, 440, 172, 19],
-        [65, 440, 171, 19],
-        [212, 240, 156, 19],
-        [266, 280, 154, 19],
-        [270, 300, 150, 19],
-        [273, 260, 147, 19],
-        [277, 180, 143, 19],
-        [278, 320, 142, 19],
-        [65, 380, 142, 19],
-        [240, 460, 128, 19],
-        [186, 440, 116, 19],
-        [235, 440, 115, 19],
-        [306, 340, 114, 19],
-        [14, 580, 75, 19],
-        [302, 440, 66, 19],
-        [65, 420, 64, 19],
-        [370, 360, 51, 19],
-        [14, 383, 48, 64],
-        [14, 363, 48, 64],
-        [372, 243, 48, 48],
-        [401, 520, 20, 19],
-        [349, 440, 20, 19]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/overflow/line-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/overflow/line-overflow-expected.txt
deleted file mode 100644
index 2a655c1..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/overflow/line-overflow-expected.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [8, 182, 195, 19],
-        [8, 102, 192, 19],
-        [8, 162, 168, 19],
-        [8, 142, 151, 19],
-        [8, 202, 139, 19],
-        [8, 82, 129, 19],
-        [103, 142, 94, 19],
-        [8, 122, 64, 19],
-        [149, 122, 54, 19],
-        [72, 122, 42, 19],
-        [114, 92, 35, 30],
-        [114, 122, 35, 19]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/reflection/reflection-with-rotation-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/reflection/reflection-with-rotation-expected.txt
deleted file mode 100644
index 972d1e85..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/reflection/reflection-with-rotation-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [22, 50, 226, 167]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/shadow-multiple-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/shadow-multiple-expected.png
deleted file mode 100644
index 98c30647..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/shadow-multiple-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/animated-svg-as-image-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/animated-svg-as-image-expected.png
deleted file mode 100644
index 707941b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/animated-svg-as-image-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/animated-svg-as-image-same-image-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/animated-svg-as-image-same-image-expected.png
deleted file mode 100644
index 707941b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/animated-svg-as-image-same-image-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/append-text-node-to-tspan-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/append-text-node-to-tspan-expected.png
deleted file mode 100644
index 34803a9..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/append-text-node-to-tspan-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/ems-display-none-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/ems-display-none-expected.png
deleted file mode 100644
index 1678c1d6..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/ems-display-none-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/exs-display-none-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/exs-display-none-expected.png
deleted file mode 100644
index cccddff6..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/exs-display-none-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.png
deleted file mode 100644
index c7a787e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-clipPath-creation-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-clipPath-creation-expected.png
deleted file mode 100644
index c7a787e..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-clipPath-creation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.png
deleted file mode 100644
index da6f30b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-gradient-creation-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-gradient-creation-expected.png
deleted file mode 100644
index 3d1d1a0..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-gradient-creation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.png
deleted file mode 100644
index 0998fb31..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-pattern-creation-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-pattern-creation-expected.png
deleted file mode 100644
index 675bcd0b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-pattern-creation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/modify-text-node-in-tspan-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/modify-text-node-in-tspan-expected.png
deleted file mode 100644
index 34803a9..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/modify-text-node-in-tspan-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/remove-text-node-from-tspan-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/remove-text-node-from-tspan-expected.png
deleted file mode 100644
index fbf578f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/remove-text-node-from-tspan-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/remove-tspan-from-text-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/remove-tspan-from-text-expected.png
deleted file mode 100644
index 32e03c0..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/remove-tspan-from-text-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/text-rescale-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/text-rescale-expected.png
deleted file mode 100644
index c21a227..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/text-rescale-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/text-rescale-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/text-rescale-expected.txt
deleted file mode 100644
index 3932a34..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/text-rescale-expected.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [0, 114, 192, 46],
-        [0, 14, 192, 46],
-        [310, 114, 91, 46],
-        [310, 14, 91, 46],
-        [210, 114, 91, 46],
-        [210, 14, 91, 46],
-        [0, 3, 8, 3],
-        [9, 3, 4, 3],
-        [6, 3, 4, 2],
-        [0, 0, 1, 1]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/text-selection-text-05-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/text-selection-text-05-t-expected.png
deleted file mode 100644
index d148296..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/text-selection-text-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/use-detach-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/use-detach-expected.png
deleted file mode 100644
index 8ef2865..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/use-detach-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/window-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/window-expected.png
deleted file mode 100644
index 640e37f..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/window-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
deleted file mode 100644
index 2b1f3bb..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/zoom-foreignObject-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/zoom-foreignObject-expected.png
deleted file mode 100644
index 4130567..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/svg/zoom-foreignObject-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/table/invisible-tr-visible-td-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/table/invisible-tr-visible-td-expected.txt
deleted file mode 100644
index d79c3a8..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/table/invisible-tr-visible-td-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [8, 8, 200, 200]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt
deleted file mode 100644
index a1e15602..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [61, 45, 50, 25]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/vertical-align1-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/vertical-align1-expected.txt
deleted file mode 100644
index db6f62b2..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/vertical-align1-expected.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [20, 0, 100, 100],
-        [120, 80, 20, 20],
-        [120, 34, 20, 20],
-        [0, 80, 20, 20],
-        [0, 34, 20, 20]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/vertical-align2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/vertical-align2-expected.txt
deleted file mode 100644
index 62f8311b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/paint/invalidation/vertical-align2-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [300, 0, 200, 200],
-        [0, 0, 200, 200],
-        [200, 146, 100, 100],
-        [200, 100, 100, 100]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/transforms/2d/zoom-menulist-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/transforms/2d/zoom-menulist-expected.png
deleted file mode 100644
index e90c993..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/transforms/2d/zoom-menulist-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/transforms/svg-vs-css-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/transforms/svg-vs-css-expected.png
deleted file mode 100644
index b9e79aeb..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/transforms/svg-vs-css-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/transforms/transformed-caret-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/transforms/transformed-caret-expected.png
deleted file mode 100644
index 9471b58b..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/transforms/transformed-caret-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/transforms/transforms-with-zoom-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/transforms/transforms-with-zoom-expected.png
deleted file mode 100644
index 1eca0662..0000000
--- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/transform-interop-disabled/transforms/transforms-with-zoom-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/css/acid2-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/css/acid2-expected.png
deleted file mode 100644
index c97032c..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/css/acid2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/001-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/001-expected.png
deleted file mode 100644
index 12bbec3..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/001-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/button-style-color-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/button-style-color-expected.png
deleted file mode 100644
index ed3ce76..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/button-style-color-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
deleted file mode 100644
index 2ce5ecdd..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/color/color-suggestion-picker-appearance-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/color/color-suggestion-picker-appearance-expected.png
deleted file mode 100644
index 9252905..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/color/color-suggestion-picker-appearance-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
deleted file mode 100644
index 2d480b9b..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/fieldset/fieldset-align-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/fieldset/fieldset-align-expected.png
deleted file mode 100644
index 2af3089..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/fieldset/fieldset-align-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/month/month-appearance-basic-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/month/month-appearance-basic-expected.png
deleted file mode 100644
index 178bfc2..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/month/month-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom090-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom090-expected.png
deleted file mode 100644
index ecf40c1..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom090-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png
deleted file mode 100644
index ef07e6b..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/select/basic-selects-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/select/basic-selects-expected.png
deleted file mode 100644
index 8c6604f..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/select/basic-selects-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/select/select-autofilled-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/select/select-autofilled-expected.png
deleted file mode 100644
index a061754..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/select/select-autofilled-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/submit/submit-appearance-basic-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/submit/submit-appearance-basic-expected.png
deleted file mode 100644
index cbcbfa9..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/submit/submit-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/text/text-appearance-basic-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/text/text-appearance-basic-expected.png
deleted file mode 100644
index 637e3ed97..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/text/text-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/textarea/textarea-appearance-basic-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/textarea/textarea-appearance-basic-expected.png
deleted file mode 100644
index 3ed28df..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/cascade/fast/forms/textarea/textarea-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-003-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-003-expected.txt
deleted file mode 100644
index e5111be2..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-003-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a testharness.js-based test.
-PASS Children respond to changes in container size
-PASS Descendants respond to changes in container size
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-005-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-005-expected.txt
deleted file mode 100644
index 77428658..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-005-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a testharness.js-based test.
-PASS Pseudo-elements ::before and ::after respond to container size changes
-PASS Pseudo-element ::marker responds to container size changes
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-006-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-006-expected.txt
deleted file mode 100644
index 7eb77aa..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-006-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-PASS Pseudo-element ::backdrop responds to container size changes
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-007-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-007-expected.txt
deleted file mode 100644
index 4a3c455..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-007-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-This is a testharness.js-based test.
-PASS getComputedStyle when element is display:none
-PASS getComputedStyle when parent is display:none
-PASS getComputedStyle when ancestor is display:none
-PASS getComputedStyle when container is display:none
-PASS getComputedStyle when element in nested container is display:none
-PASS getComputedStyle when inner container is display:none
-PASS getComputedStyle when intermediate ancestor is display:none
-PASS getComputedStyle when outer container is display:none
-PASS getComputedStyle when element becomes display:none
-PASS getComputedStyle when parent becomes display:none
-PASS getComputedStyle when ancestor becomes display:none
-PASS getComputedStyle when container becomes display:none
-PASS getComputedStyle when intermediate container becomes display:none
-PASS getComputedStyle when ::before is display:none
-PASS getComputedStyle when originating element is display:none
-PASS getComputedStyle on ::before when ancestor element is display:none
-PASS getComputedStyle on ::before when container is display:none
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-008-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-008-expected.txt
deleted file mode 100644
index c95936c1..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-008-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-This is a testharness.js-based test.
-PASS Querying nearest (unnamed) container
-PASS Querying nearest container by name
-PASS Querying intermediate container by name
-PASS Querying topmost container by name
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-009-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-009-expected.txt
deleted file mode 100644
index 1e9f703e..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-009-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a testharness.js-based test.
-PASS Changing a named container invalidates relevant descendants
-PASS Changing container-name invalidates relevant descendants
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-011-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-011-expected.txt
deleted file mode 100644
index 457d8b1..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/at-container-011-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-PASS Changing the container type invalidates relevant descendants
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/auto-scrollbars-001-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/auto-scrollbars-001-expected.txt
deleted file mode 100644
index 3c8c56f..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/auto-scrollbars-001-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a testharness.js-based test.
-PASS Initial layout - expecting a scrollbar without overflowing content instead of overflowing content without a scrollbar
-PASS Same result after a reflow
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/block-size-containment-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/block-size-containment-expected.txt
deleted file mode 100644
index c27028d..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/block-size-containment-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-PASS block-size containment only
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/inline-size-containment-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/inline-size-containment-expected.txt
deleted file mode 100644
index a0f4441..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/inline-size-containment-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-PASS inline-size containment only
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/inline-size-containment-vertical-rl-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/inline-size-containment-vertical-rl-expected.txt
deleted file mode 100644
index a0f4441..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/inline-size-containment-vertical-rl-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-PASS inline-size containment only
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/orthogonal-wm-container-query-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/orthogonal-wm-container-query-expected.txt
deleted file mode 100644
index 2c4edd6..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/container-queries/wpt_internal/css/css-conditional/container-queries/orthogonal-wm-container-query-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a testharness.js-based test.
-PASS Initial non-orthogonal width
-PASS Orthogonal width
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/css-calc-infinity-and-nan/external/wpt/css/css-values/calc-infinity-nan-computed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/css-calc-infinity-and-nan/external/wpt/css/css-values/calc-infinity-nan-computed-expected.txt
deleted file mode 100644
index 6b92e47..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/css-calc-infinity-and-nan/external/wpt/css/css-values/calc-infinity-nan-computed-expected.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-This is a testharness.js-based test.
-FAIL Property width value 'calc(NaN * 1px)' assert_greater_than_equal: calc(NaN * 1px) expected a number greater than or equal to 33554400 but got 22369600
-FAIL Property width value 'calc(infinity * 1px)' assert_greater_than_equal: calc(infinity * 1px) expected a number greater than or equal to 33554400 but got 22369600
-FAIL Property width value 'calc(infinity * 1cm)' assert_greater_than_equal: calc(infinity * 1cm) expected a number greater than or equal to 33554400 but got 22369600
-FAIL Property width value 'calc(NaN * 1rem)' assert_greater_than_equal: calc(NaN * 1rem) expected a number greater than or equal to 33554400 but got 22369600
-FAIL Property width value 'calc(infinity * 1px - infinity * 1%)' assert_greater_than_equal: calc(infinity * 1px - infinity * 1%) expected a number greater than or equal to 33554400 but got 22369600
-FAIL Property width value 'calc(infinity * 1px + infinity * 1%)' assert_greater_than_equal: calc(infinity * 1px + infinity * 1%) expected a number greater than or equal to 33554400 but got 22369600
-FAIL Property width value 'calc(min(NaN * 1px, infinity * 1px) + max(infinity * 1px, -infinity * 1px))' assert_greater_than_equal: calc(min(NaN * 1px, infinity * 1px) + max(infinity * 1px, -infinity * 1px)) expected a number greater than or equal to 33554400 but got 22369600
-FAIL Property width value 'calc(infinity * 1px - max(infinity * 1%, 0%))' assert_greater_than_equal: calc(infinity * 1px - max(infinity * 1%, 0%)) expected a number greater than or equal to 33554400 but got 22369600
-FAIL Property width value 'calc(max(infinity * 1px, 10px))' assert_greater_than_equal: calc(max(infinity * 1px, 10px)) expected a number greater than or equal to 33554400 but got 22369600
-FAIL Property margin-left value 'calc(-infinity * 1px)' assert_less_than_equal: calc(-infinity * 1px) expected a number less than or equal to -33554400 but got -22369600
-FAIL Property margin-left value 'calc(min(1px, -infinity * 1%))' assert_less_than_equal: calc(min(1px, -infinity * 1%)) expected a number less than or equal to -33554400 but got -22369600
-FAIL Property margin-left value 'calc(-infinity * 1%)' assert_less_than_equal: calc(-infinity * 1%) expected a number less than or equal to -33554400 but got -22369600
-FAIL Property margin-left value 'calc(max(10000px, 0px) + min(-infinity * 1px, infinity * 1px))' assert_less_than_equal: calc(max(10000px, 0px) + min(-infinity * 1px, infinity * 1px)) expected a number less than or equal to -33554400 but got -22369600
-FAIL Property margin-left value 'calc(-infinity * 1px - infinity * 1px)' assert_less_than_equal: calc(-infinity * 1px - infinity * 1px) expected a number less than or equal to -33554400 but got -22369600
-FAIL Property margin-left value 'calc(min(-infinity * 1px, 10px))' assert_less_than_equal: calc(min(-infinity * 1px, 10px)) expected a number less than or equal to -33554400 but got -22369600
-PASS Property animation-duration value 'calc(NaN * 1s)'
-PASS Property animation-duration value 'calc(infinity * 1s)'
-PASS Property animation-duration value 'calc(1 / 0 * 1s)'
-PASS Property animation-duration value 'calc(max(infinity * 1s, 10s)'
-PASS Property transition-delay value 'calc(-infinity* 1s)'
-PASS Property transition-delay value 'calc(max(10000s, 0s) + min(-infinity * 1s, infinity * 1s))'
-PASS Property transition-delay value 'calc(min(-infinity * 1s, 10s))'
-PASS Property rotate(calc(infinity * 1deg)) value expected same with rotate(0deg) in +/-0.0001
-PASS Property rotate(calc(-infinity * 1deg)) value expected same with rotate(0deg) in +/-0.0001
-PASS Property rotate(calc(NaN * 1deg)) value expected same with rotate(0deg) in +/-0.0001
-PASS Property rotate(calc(infinity * 1turn)) value expected same with rotate(0turn) in +/-0.0001
-PASS Property rotate(calc(-infinity * 1turn)) value expected same with rotate(0turn) in +/-0.0001
-PASS Property rotate(calc(NaN * 1turn)) value expected same with rotate(0turn) in +/-0.0001
-PASS Property rotate(calc(infinity * 1rad)) value expected same with rotate(0rad) in +/-0.0001
-PASS Property rotate(calc(-infinity * 1rad)) value expected same with rotate(0rad) in +/-0.0001
-PASS Property rotate(calc(NaN * 1rad)) value expected same with rotate(0rad) in +/-0.0001
-PASS Property rotate(calc(infinity * 1grad)) value expected same with rotate(0grad) in +/-0.0001
-PASS Property rotate(calc(-infinity * 1grad)) value expected same with rotate(0grad) in +/-0.0001
-PASS Property rotate(calc(NaN * 1grad)) value expected same with rotate(0grad) in +/-0.0001
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/dark-mode-grayscale-images/desaturate-before-inversion-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/dark-mode-grayscale-images/desaturate-before-inversion-expected.png
deleted file mode 100644
index 1b5a24c..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/dark-mode-grayscale-images/desaturate-before-inversion-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/isolated-animation-updates/animations/3d/matrix-transform-type-animation-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/isolated-animation-updates/animations/3d/matrix-transform-type-animation-expected.png
deleted file mode 100644
index 17d1526..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/isolated-animation-updates/animations/3d/matrix-transform-type-animation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/isolated-animation-updates/animations/state-at-end-event-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/isolated-animation-updates/animations/state-at-end-event-expected.png
deleted file mode 100644
index d071b070..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/isolated-animation-updates/animations/state-at-end-event-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/layout_ng_fieldset/fast/forms/fieldset/fieldset-with-float-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/layout_ng_fieldset/fast/forms/fieldset/fieldset-with-float-expected.png
deleted file mode 100644
index 5be4384f..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/layout_ng_fieldset/fast/forms/fieldset/fieldset-with-float-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/layout_ng_fieldset/fast/forms/fieldset/float-before-fieldset-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/layout_ng_fieldset/fast/forms/fieldset/float-before-fieldset-expected.png
deleted file mode 100644
index 352a73c..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/layout_ng_fieldset/fast/forms/fieldset/float-before-fieldset-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification-wheel-event-regions/fast/events/wheel/wheelevent-ctrl-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification-wheel-event-regions/fast/events/wheel/wheelevent-ctrl-expected.txt
deleted file mode 100644
index 2436206..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/scroll-unification-wheel-event-regions/fast/events/wheel/wheelevent-ctrl-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-This is a testharness.js-based test.
-FAIL Div: Ctrl+wheel doesn't scroll. assert_equals: expected 53 but got 79.5
-FAIL Div: No-Ctrl wheel scrolls. assert_equals: expected 53 but got 79.5
-FAIL Doc: Ctrl+wheel doesn't scroll. assert_equals: expected 53 but got 79.5
-FAIL Doc: Ctrl+high precision touchpad scroll scrolls. assert_equals: expected 53 but got 79.5
-FAIL Doc: No-Ctrl wheel scrolls. assert_equals: expected 53 but got 79.5
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/synchronous_html_parser/fast/parser/001-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/synchronous_html_parser/fast/parser/001-expected.png
deleted file mode 100644
index 9008f5f..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/synchronous_html_parser/fast/parser/001-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/synchronous_html_parser/fast/parser/bad-xml-slash-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/synchronous_html_parser/fast/parser/bad-xml-slash-expected.png
deleted file mode 100644
index d5a2423c..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/synchronous_html_parser/fast/parser/bad-xml-slash-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/synchronous_html_parser/fast/parser/broken-comments-vs-parsing-mode-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/virtual/synchronous_html_parser/fast/parser/broken-comments-vs-parsing-mode-expected.png
deleted file mode 100644
index 8b12b78..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/synchronous_html_parser/fast/parser/broken-comments-vs-parsing-mode-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/wheel-event-regions/fast/compositor-wheel-scroll-latching/animated-scroll/touchpad-scroll-impl-to-main-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/wheel-event-regions/fast/compositor-wheel-scroll-latching/animated-scroll/touchpad-scroll-impl-to-main-expected.txt
deleted file mode 100644
index 0e23229..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/wheel-event-regions/fast/compositor-wheel-scroll-latching/animated-scroll/touchpad-scroll-impl-to-main-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL Scroller should continue to scroll when MT takes over scroll handling. assert_equals: div must be fully scrolled expected 315 but got 314.6666564941406
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/wheel-event-regions/fast/events/platform-wheelevent-paging-xy-in-scrolling-div-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/wheel-event-regions/fast/events/platform-wheelevent-paging-xy-in-scrolling-div-expected.txt
deleted file mode 100644
index ee80cc5..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/wheel-event-regions/fast/events/platform-wheelevent-paging-xy-in-scrolling-div-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-PASS This test checks one page of scroll on both x and y on div moves the content by 87.5% of the scroller size.
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/wheel-event-regions/fast/events/wheel/wheelevent-basic-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/wheel-event-regions/fast/events/wheel/wheelevent-basic-expected.txt
deleted file mode 100644
index 7f77200..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/wheel-event-regions/fast/events/wheel/wheelevent-basic-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL Tests the basic functionality of the standard wheel event promise_test: Unhandled rejection with value: "Reaches the maximum frames."
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/wheel-event-regions/fast/events/wheel/wheelevent-ctrl-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/wheel-event-regions/fast/events/wheel/wheelevent-ctrl-expected.txt
deleted file mode 100644
index 2436206..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/wheel-event-regions/fast/events/wheel/wheelevent-ctrl-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-This is a testharness.js-based test.
-FAIL Div: Ctrl+wheel doesn't scroll. assert_equals: expected 53 but got 79.5
-FAIL Div: No-Ctrl wheel scrolls. assert_equals: expected 53 but got 79.5
-FAIL Doc: Ctrl+wheel doesn't scroll. assert_equals: expected 53 but got 79.5
-FAIL Doc: Ctrl+high precision touchpad scroll scrolls. assert_equals: expected 53 but got 79.5
-FAIL Doc: No-Ctrl wheel scrolls. assert_equals: expected 53 but got 79.5
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/virtual/wheel-event-regions/http/tests/devtools/layers/layer-scroll-rects-get-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/virtual/wheel-event-regions/http/tests/devtools/layers/layer-scroll-rects-get-expected.txt
deleted file mode 100644
index aa71b28..0000000
--- a/third_party/blink/web_tests/flag-specific/highdpi/virtual/wheel-event-regions/http/tests/devtools/layers/layer-scroll-rects-get-expected.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Tests scroll rectangles support in in Layers3DViewxScroll rectangles
-
-Scroll rectangles
-{
-    0 : {
-        rect : {
-            height : 30
-            width : 45
-            x : 0
-            y : 0
-        }
-        type : "WheelEventHandler"
-    }
-}
-{
-    0 : {
-        rect : {
-            height : 30
-            width : 30
-            x : 0
-            y : 0
-        }
-        type : "TouchEventHandler"
-    }
-}
-{
-    0 : {
-        rect : {
-            height : 60
-            width : 60
-            x : 0
-            y : 0
-        }
-        type : "TouchEventHandler"
-    }
-}
-
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/conversion/attribution-invalid-data-expected.txt b/third_party/blink/web_tests/http/tests/inspector-protocol/conversion/attribution-invalid-data-expected.txt
index 6528456c..ffed7ea 100644
--- a/third_party/blink/web_tests/http/tests/inspector-protocol/conversion/attribution-invalid-data-expected.txt
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/conversion/attribution-invalid-data-expected.txt
@@ -1,4 +1,4 @@
-Test that clicking an attribution link in insecure contexts triggers an issue.
+Test that an attribution redirect with invalid trigger data triggers an issue.
 Issue reported: {
     code : AttributionReportingIssue
     details : {
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/conversion/attribution-invalid-data.js b/third_party/blink/web_tests/http/tests/inspector-protocol/conversion/attribution-invalid-data.js
index b010d20..7634973 100644
--- a/third_party/blink/web_tests/http/tests/inspector-protocol/conversion/attribution-invalid-data.js
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/conversion/attribution-invalid-data.js
@@ -4,7 +4,7 @@
 
 (async function(testRunner) {
   const {page, dp} = await testRunner.startBlank(
-      `Test that clicking an attribution link in insecure contexts triggers an issue.`);
+      `Test that an attribution redirect with invalid trigger data triggers an issue.`);
 
   await dp.Audits.enable();
   await page.navigate('https://devtools.test:8443/inspector-protocol/resources/empty.html');
diff --git a/third_party/blink/web_tests/http/tests/serviceworker/webexposed/global-interface-listing-platform-specific-service-worker-expected.txt b/third_party/blink/web_tests/http/tests/serviceworker/webexposed/global-interface-listing-platform-specific-service-worker-expected.txt
index 92e6b2e..c704856 100644
--- a/third_party/blink/web_tests/http/tests/serviceworker/webexposed/global-interface-listing-platform-specific-service-worker-expected.txt
+++ b/third_party/blink/web_tests/http/tests/serviceworker/webexposed/global-interface-listing-platform-specific-service-worker-expected.txt
@@ -1,9 +1,4 @@
 [INTERFACES]
-interface BarcodeDetector
-    static method getSupportedFormats
-    attribute @@toStringTag
-    method constructor
-    method detect
 interface Notification : EventTarget
     getter image
 [NAMESPACES]
diff --git a/third_party/blink/web_tests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt b/third_party/blink/web_tests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt
index c69b987..83dcd944 100644
--- a/third_party/blink/web_tests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt
+++ b/third_party/blink/web_tests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt
@@ -51,6 +51,11 @@
     attribute @@toStringTag
     method constructor
     method updateUI
+interface BarcodeDetector
+    static method getSupportedFormats
+    attribute @@toStringTag
+    method constructor
+    method detect
 interface Blob
     attribute @@toStringTag
     getter size
diff --git a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/001-expected.png b/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/001-expected.png
deleted file mode 100644
index 8f0277e0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/001-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/button-style-color-expected.png b/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/button-style-color-expected.png
deleted file mode 100644
index 462c844..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/button-style-color-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png b/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
deleted file mode 100644
index c7259b6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/color/color-suggestion-picker-appearance-expected.png b/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/color/color-suggestion-picker-appearance-expected.png
deleted file mode 100644
index d6dea28..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/color/color-suggestion-picker-appearance-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/date/date-appearance-basic-expected.png b/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/date/date-appearance-basic-expected.png
deleted file mode 100644
index 59409ba0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/date/date-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png b/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
deleted file mode 100644
index c089d9a8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/fieldset/fieldset-align-expected.png b/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/fieldset/fieldset-align-expected.png
deleted file mode 100644
index dd67537..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/fieldset/fieldset-align-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/month/month-appearance-basic-expected.png b/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/month/month-appearance-basic-expected.png
deleted file mode 100644
index 8d35e14..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/month/month-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom090-expected.png b/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom090-expected.png
deleted file mode 100644
index dab5b74..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom090-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png b/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png
deleted file mode 100644
index 29e3931..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/select/basic-selects-expected.png b/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/select/basic-selects-expected.png
deleted file mode 100644
index a379506..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/select/basic-selects-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/select/select-autofilled-expected.png b/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/select/select-autofilled-expected.png
deleted file mode 100644
index 6946dd80..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/select/select-autofilled-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/submit/submit-appearance-basic-expected.png b/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/submit/submit-appearance-basic-expected.png
deleted file mode 100644
index 347d511..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/submit/submit-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/text/text-appearance-basic-expected.png b/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/text/text-appearance-basic-expected.png
deleted file mode 100644
index 3efbd69..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/text/text-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/textarea/textarea-appearance-basic-expected.png b/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/textarea/textarea-appearance-basic-expected.png
deleted file mode 100644
index e126e63..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/cascade/fast/forms/textarea/textarea-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/dark-mode-native-theme-off/text-input-elements-expected.png b/third_party/blink/web_tests/platform/linux/virtual/dark-mode-native-theme-off/text-input-elements-expected.png
deleted file mode 100644
index d5415787..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/dark-mode-native-theme-off/text-input-elements-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/dark-mode-native-theme-on/text-input-elements-expected.png b/third_party/blink/web_tests/platform/linux/virtual/dark-mode-native-theme-on/text-input-elements-expected.png
deleted file mode 100644
index 38e58f2..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/dark-mode-native-theme-on/text-input-elements-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/disable-spinvalidation/compositing/masks/mask-with-removed-filters-expected.png b/third_party/blink/web_tests/platform/linux/virtual/disable-spinvalidation/compositing/masks/mask-with-removed-filters-expected.png
deleted file mode 100644
index d74c112..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/disable-spinvalidation/compositing/masks/mask-with-removed-filters-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/disable-spinvalidation/compositing/text-on-scaled-surface-expected.png b/third_party/blink/web_tests/platform/linux/virtual/disable-spinvalidation/compositing/text-on-scaled-surface-expected.png
deleted file mode 100644
index c6129603..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/disable-spinvalidation/compositing/text-on-scaled-surface-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png
deleted file mode 100644
index cf3e85646..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-video-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-video-expected.png
deleted file mode 100644
index a39e5ac..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-video-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-video-shadow-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-video-shadow-expected.png
deleted file mode 100644
index bd46744..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-video-shadow-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-drawImage-video-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-drawImage-video-expected.png
deleted file mode 100644
index a58254b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-drawImage-video-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-incremental-repaint-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-incremental-repaint-expected.png
deleted file mode 100644
index 7090a8f34f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-incremental-repaint-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-pattern-video-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-pattern-video-expected.png
deleted file mode 100644
index 71553edf..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-pattern-video-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-shadow-source-in-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-shadow-source-in-expected.txt
deleted file mode 100644
index c370adf..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-shadow-source-in-expected.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x470
-  LayoutBlockFlow {HTML} at (0,0) size 800x470
-    LayoutBlockFlow {BODY} at (8,8) size 784x454
-      LayoutBlockFlow {DIV} at (0,0) size 784x20
-        LayoutText {#text} at (0,0) size 59x19
-          text run at (0,0) width 59: "Test Rect"
-      LayoutBlockFlow (anonymous) at (0,20) size 784x207
-        LayoutText {#text} at (0,0) size 0x0
-      LayoutBlockFlow {DIV} at (0,227) size 784x20
-        LayoutText {#text} at (0,0) size 69x19
-          text run at (0,0) width 69: "Test Image"
-      LayoutBlockFlow (anonymous) at (0,247) size 784x207
-        LayoutText {#text} at (0,0) size 0x0
-layer at (8,28) size 202x202
-  LayoutHTMLCanvas {CANVAS} at (0,0) size 202x202 [border: (1px solid #999999)]
-layer at (8,255) size 202x202
-  LayoutHTMLCanvas {CANVAS} at (0,0) size 202x202 [border: (1px solid #999999)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-text-alignment-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-text-alignment-expected.png
deleted file mode 100644
index adbde2c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-text-alignment-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-text-baseline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-text-baseline-expected.png
deleted file mode 100644
index 51a7204..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-text-baseline-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-text-baseline-tiny-fonts-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-text-baseline-tiny-fonts-expected.png
deleted file mode 100644
index 7c4ff01d6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-text-baseline-tiny-fonts-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-textMetrics-width-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-textMetrics-width-expected.png
deleted file mode 100644
index 3914315..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-textMetrics-width-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png
deleted file mode 100644
index ddbf0ff..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-transforms-during-path-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-transforms-during-path-expected.png
deleted file mode 100644
index 4140549..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-transforms-during-path-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/drawImage-with-globalAlpha-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/drawImage-with-globalAlpha-expected.png
deleted file mode 100644
index 7664c41..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/drawImage-with-globalAlpha-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/fill-stroke-clip-reset-path-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/fill-stroke-clip-reset-path-expected.png
deleted file mode 100644
index fc73fb3..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/fill-stroke-clip-reset-path-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/fill-stroke-clip-reset-path-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/fill-stroke-clip-reset-path-expected.txt
deleted file mode 100644
index ef7ea7f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/fill-stroke-clip-reset-path-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutBlockFlow {HTML} at (0,0) size 800x600
-    LayoutBlockFlow {BODY} at (8,8) size 784x584
-      LayoutBlockFlow {P} at (0,0) size 784x20
-        LayoutText {#text} at (0,0) size 365x19
-          text run at (0,0) width 365: "All three of these small canvases should be green, not red."
-      LayoutBlockFlow (anonymous) at (0,36) size 784x25
-        LayoutText {#text} at (20,5) size 4x19
-          text run at (20,5) width 4: " "
-        LayoutText {#text} at (44,5) size 4x19
-          text run at (44,5) width 4: " "
-        LayoutText {#text} at (0,0) size 0x0
-layer at (8,44) size 20x20
-  LayoutHTMLCanvas {CANVAS} at (0,0) size 20x20
-layer at (32,44) size 20x20
-  LayoutHTMLCanvas {CANVAS} at (24,0) size 20x20
-layer at (56,44) size 20x20
-  LayoutHTMLCanvas {CANVAS} at (48,0) size 20x20
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/fillrect_gradient-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/fillrect_gradient-expected.png
deleted file mode 100644
index e27dc16..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/fillrect_gradient-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png
deleted file mode 100644
index fd50afb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/patternfill-repeat-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/patternfill-repeat-expected.png
deleted file mode 100644
index 04ca244..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/patternfill-repeat-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/patternfill-repeat-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/patternfill-repeat-expected.txt
deleted file mode 100644
index 479b43d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/patternfill-repeat-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x469
-  LayoutBlockFlow {HTML} at (0,0) size 800x469
-    LayoutBlockFlow {BODY} at (8,16) size 784x437
-      LayoutBlockFlow {P} at (0,0) size 784x80
-        LayoutText {#text} at (0,0) size 772x79
-          text run at (0,0) width 750: "There should be one big square below containing four squares. Top left square should be filled with 3 rows of 2 and bit"
-          text run at (0,20) width 772: "Apple images. Top right square should be 2 and a bit rows with one Apple image column along the left edge of the square."
-          text run at (0,40) width 764: "Bottom left square should be one row with three Apple images along the top of the square. Bottom right square should be"
-          text run at (0,60) width 220: "one Apple image in top left corner."
-      LayoutBlockFlow {P} at (0,96) size 784x341
-layer at (8,112) size 336x336
-  LayoutHTMLCanvas {CANVAS} at (0,0) size 336x336 [border: (3px solid #000000)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/quadraticCurveTo-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/quadraticCurveTo-expected.png
deleted file mode 100644
index 1e29669..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/quadraticCurveTo-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/rendering-contexts-back-references-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/rendering-contexts-back-references-expected.txt
deleted file mode 100644
index 7f0b50e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/rendering-contexts-back-references-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-This is a testharness.js-based test.
-PASS 2d context on html canvas
-PASS webgl context on html canvas
-PASS bitmaprenderer context on html canvas
-PASS 2d context on offscreen canvas
-PASS webgl context on offscreen canvas
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png
deleted file mode 100644
index 1c53ed2c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/shadow-offset-1-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/shadow-offset-1-expected.png
deleted file mode 100644
index 66bfcdc..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/shadow-offset-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/toDataURL-alpha-expected.png b/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/toDataURL-alpha-expected.png
deleted file mode 100644
index ead8cdfe..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/toDataURL-alpha-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-child-1-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-child-1-expected.png
deleted file mode 100644
index 9e8cbaae..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-child-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-child-2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-child-2-expected.png
deleted file mode 100644
index 9e8cbaae..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-child-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-details-child-1-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-details-child-1-expected.png
deleted file mode 100644
index 9e8cbaae..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-details-child-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-details-child-2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-details-child-2-expected.png
deleted file mode 100644
index 9e8cbaae..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-details-child-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-1-and-click-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-1-and-click-expected.png
deleted file mode 100644
index c70bcc8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-1-and-click-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-1-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-1-expected.png
deleted file mode 100644
index e8d27e0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-10-and-click-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-10-and-click-expected.png
deleted file mode 100644
index 95fad259..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-10-and-click-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-10-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-10-expected.png
deleted file mode 100644
index afa24d11..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-10-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-2-and-click-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-2-and-click-expected.png
deleted file mode 100644
index 8576ebb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-2-and-click-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-2-expected.png
deleted file mode 100644
index e8d27e0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-3-and-click-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-3-and-click-expected.png
deleted file mode 100644
index 4b0f82f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-3-and-click-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-3-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-3-expected.png
deleted file mode 100644
index 79adf1d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-4-and-click-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-4-and-click-expected.png
deleted file mode 100644
index 1e678c8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-4-and-click-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-4-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-4-expected.png
deleted file mode 100644
index cf40718..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-4-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-5-and-click-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-5-and-click-expected.png
deleted file mode 100644
index ec66c3b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-5-and-click-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-5-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-5-expected.png
deleted file mode 100644
index e8d27e0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-5-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-6-and-click-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-6-and-click-expected.png
deleted file mode 100644
index 95fad259..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-6-and-click-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-6-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-6-expected.png
deleted file mode 100644
index becc6686..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-6-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-7-and-click-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-7-and-click-expected.png
deleted file mode 100644
index 95fad259..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-7-and-click-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-7-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-7-expected.png
deleted file mode 100644
index e64c0021..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-7-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-8-and-click-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-8-and-click-expected.png
deleted file mode 100644
index 066a9fe..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-8-and-click-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-8-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-8-expected.png
deleted file mode 100644
index 28632b9..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-8-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-9-and-click-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-9-and-click-expected.png
deleted file mode 100644
index 953e9e4e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-9-and-click-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-9-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-9-expected.png
deleted file mode 100644
index d7b9ce4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-9-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-child-1-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-child-1-expected.png
deleted file mode 100644
index d7c5846..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-child-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-child-2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-child-2-expected.png
deleted file mode 100644
index d7c5846..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-add-summary-child-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-marker-style-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-marker-style-expected.png
deleted file mode 100644
index 8f69368..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-marker-style-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-nested-1-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-nested-1-expected.png
deleted file mode 100644
index 6a48786..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-nested-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-nested-2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-nested-2-expected.png
deleted file mode 100644
index 741b2d0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-nested-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-no-summary1-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-no-summary1-expected.png
deleted file mode 100644
index 7054cf4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-no-summary1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-no-summary2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-no-summary2-expected.png
deleted file mode 100644
index 9edd1c9b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-no-summary2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-no-summary3-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-no-summary3-expected.png
deleted file mode 100644
index 7054cf4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-no-summary3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-no-summary4-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-no-summary4-expected.png
deleted file mode 100644
index 4c61322..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-no-summary4-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-no-summary4-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-no-summary4-expected.txt
deleted file mode 100644
index d061b321..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-no-summary4-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutBlockFlow {HTML} at (0,0) size 800x600
-    LayoutBlockFlow {BODY} at (8,8) size 784x584
-      LayoutBlockFlow {DETAILS} at (0,0) size 784x42
-        LayoutBlockFlow {SUMMARY} at (0,0) size 784x20
-          LayoutDetailsMarker {DIV} at (0,4.45) size 10.55x10.55: down
-          LayoutText {#text} at (16,0) size 45x19
-            text run at (16,0) width 45: "Details"
-        LayoutBlockFlow {DIV} at (0,20) size 784x22
-          LayoutTextControl {INPUT} at (0,0) size 181x22 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-          LayoutText {#text} at (0,0) size 0x0
-layer at (10,31) size 177x16
-  LayoutBlockFlow {DIV} at (2,3) size 177x16
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open-javascript-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open-javascript-expected.png
deleted file mode 100644
index 3524e88..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open-javascript-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open-javascript-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open-javascript-expected.txt
deleted file mode 100644
index 525463b0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open-javascript-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutBlockFlow {HTML} at (0,0) size 800x600
-    LayoutBlockFlow {BODY} at (8,8) size 784x584
-      LayoutBlockFlow {DETAILS} at (0,0) size 784x42
-        LayoutBlockFlow {SUMMARY} at (0,0) size 784x20
-          LayoutDetailsMarker {DIV} at (0,4.45) size 10.55x10.55: down
-          LayoutText {#text} at (16,0) size 49x19
-            text run at (16,0) width 49: "details1"
-        LayoutBlockFlow {DIV} at (0,20) size 784x22
-          LayoutTextControl {INPUT} at (0,0) size 181x22 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-          LayoutText {#text} at (0,0) size 0x0
-      LayoutBlockFlow {DETAILS} at (0,42) size 784x20
-        LayoutBlockFlow {SUMMARY} at (0,0) size 784x20
-          LayoutDetailsMarker {DIV} at (0,4.45) size 10.55x10.55: right
-          LayoutText {#text} at (16,0) size 49x19
-            text run at (16,0) width 49: "details2"
-layer at (10,31) size 177x16
-  LayoutBlockFlow {DIV} at (2,3) size 177x16
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open1-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open1-expected.png
deleted file mode 100644
index cf40718..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open2-expected.png
deleted file mode 100644
index 41ed31c9..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open2-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open2-expected.txt
deleted file mode 100644
index a1cdd93..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open2-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutBlockFlow {HTML} at (0,0) size 800x600
-    LayoutBlockFlow {BODY} at (8,8) size 784x584
-      LayoutBlockFlow {DETAILS} at (0,0) size 784x42
-        LayoutBlockFlow {SUMMARY} at (0,0) size 784x20
-          LayoutDetailsMarker {DIV} at (0,4.45) size 10.55x10.55: down
-          LayoutText {#text} at (16,0) size 59x19
-            text run at (16,0) width 59: "summary"
-        LayoutBlockFlow {DIV} at (0,20) size 784x22
-          LayoutTextControl {INPUT} at (0,0) size 181x22 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-          LayoutText {#text} at (0,0) size 0x0
-layer at (10,31) size 177x16
-  LayoutBlockFlow {DIV} at (2,3) size 177x16
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open3-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open3-expected.png
deleted file mode 100644
index cf40718..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open4-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open4-expected.png
deleted file mode 100644
index 41ed31c9..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open4-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open4-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open4-expected.txt
deleted file mode 100644
index a1cdd93..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open4-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutBlockFlow {HTML} at (0,0) size 800x600
-    LayoutBlockFlow {BODY} at (8,8) size 784x584
-      LayoutBlockFlow {DETAILS} at (0,0) size 784x42
-        LayoutBlockFlow {SUMMARY} at (0,0) size 784x20
-          LayoutDetailsMarker {DIV} at (0,4.45) size 10.55x10.55: down
-          LayoutText {#text} at (16,0) size 59x19
-            text run at (16,0) width 59: "summary"
-        LayoutBlockFlow {DIV} at (0,20) size 784x22
-          LayoutTextControl {INPUT} at (0,0) size 181x22 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-          LayoutText {#text} at (0,0) size 0x0
-layer at (10,31) size 177x16
-  LayoutBlockFlow {DIV} at (2,3) size 177x16
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open5-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open5-expected.png
deleted file mode 100644
index cf40718..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-open5-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-position-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-position-expected.png
deleted file mode 100644
index 9255b8f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-position-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-child-1-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-child-1-expected.png
deleted file mode 100644
index 15f57039..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-child-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-child-2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-child-2-expected.png
deleted file mode 100644
index 15f57039..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-child-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-1-and-click-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-1-and-click-expected.png
deleted file mode 100644
index b2258be..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-1-and-click-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-1-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-1-expected.png
deleted file mode 100644
index 7054cf4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-2-and-click-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-2-and-click-expected.png
deleted file mode 100644
index e2067f35..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-2-and-click-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-2-expected.png
deleted file mode 100644
index efe5a1b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-3-and-click-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-3-and-click-expected.png
deleted file mode 100644
index 70b4d8b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-3-and-click-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-3-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-3-expected.png
deleted file mode 100644
index aaaa711..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-4-and-click-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-4-and-click-expected.png
deleted file mode 100644
index dbefaf51..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-4-and-click-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-4-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-4-expected.png
deleted file mode 100644
index 9edd1c9b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-4-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-5-and-click-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-5-and-click-expected.png
deleted file mode 100644
index ada869f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-5-and-click-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-5-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-5-expected.png
deleted file mode 100644
index 4248bb8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-5-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-6-and-click-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-6-and-click-expected.png
deleted file mode 100644
index 136b37a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-6-and-click-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-6-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-6-expected.png
deleted file mode 100644
index 6b17cf4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-6-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-child-1-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-child-1-expected.png
deleted file mode 100644
index 2611f8a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-child-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-child-2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-child-2-expected.png
deleted file mode 100644
index 5573d0af..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-remove-summary-child-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-replace-summary-child-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-replace-summary-child-expected.png
deleted file mode 100644
index 5a240a5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-replace-summary-child-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-replace-text-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-replace-text-expected.png
deleted file mode 100644
index 4486697..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-replace-text-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-writing-mode-align-center-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-writing-mode-align-center-expected.png
deleted file mode 100644
index c830efd..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-writing-mode-align-center-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-writing-mode-align-left-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-writing-mode-align-left-expected.png
deleted file mode 100644
index 1b4b19a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-writing-mode-align-left-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-writing-mode-align-right-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-writing-mode-align-right-expected.png
deleted file mode 100644
index e72ee4f4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-writing-mode-align-right-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-writing-mode-expected.png b/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-writing-mode-expected.png
deleted file mode 100644
index 1019e58c3..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/incremental-shadow-dom/html/details_summary/details-writing-mode-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/css2.1/20110323/background-intrinsic-004-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/css2.1/20110323/background-intrinsic-004-expected.png
deleted file mode 100644
index 52853f1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/css2.1/20110323/background-intrinsic-004-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/css2.1/20110323/background-intrinsic-005-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/css2.1/20110323/background-intrinsic-005-expected.png
deleted file mode 100644
index 8aead0d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/css2.1/20110323/background-intrinsic-005-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/001-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/001-expected.png
deleted file mode 100644
index f7691ad1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/001-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/002-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/002-expected.png
deleted file mode 100644
index 4fab2b43..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/002-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/003-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/003-expected.png
deleted file mode 100644
index 48a5b928..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/003-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/004-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/004-expected.png
deleted file mode 100644
index 4776d243..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/004-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/005-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/005-expected.png
deleted file mode 100644
index e5a38ab..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/005-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/006-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/006-expected.png
deleted file mode 100644
index 0396dbf..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/006-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/007-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/007-expected.png
deleted file mode 100644
index d33d5ef8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/007-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/008-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/008-expected.png
deleted file mode 100644
index dec86bf..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/008-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/009-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/009-expected.png
deleted file mode 100644
index 0396dbf..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/009-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/011-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/011-expected.png
deleted file mode 100644
index 8044737..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/011-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/012-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/012-expected.png
deleted file mode 100644
index 44a643a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/012-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/013-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/013-expected.png
deleted file mode 100644
index dcc024b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/013-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/014-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/014-expected.png
deleted file mode 100644
index ee0f175..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/014-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/015-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/015-expected.png
deleted file mode 100644
index 0452cc05..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/015-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/016-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/016-expected.png
deleted file mode 100644
index 0c0a5d9..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/016-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/018-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/018-expected.png
deleted file mode 100644
index 1b9f95c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/018-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/019-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/019-expected.png
deleted file mode 100644
index 1b51f37..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/019-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/020-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/020-expected.png
deleted file mode 100644
index e255f14..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/020-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/021-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/021-expected.png
deleted file mode 100644
index 7da7b2a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/021-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/adding-near-anonymous-block-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/adding-near-anonymous-block-expected.png
deleted file mode 100644
index b7d345f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/adding-near-anonymous-block-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/minheight-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/minheight-expected.png
deleted file mode 100644
index 62fcfef6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/minheight-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/percent-height-inside-anonymous-block-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/percent-height-inside-anonymous-block-expected.png
deleted file mode 100644
index 39552f12a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/percent-height-inside-anonymous-block-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/quirk-height-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/quirk-height-expected.png
deleted file mode 100644
index c748efd..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/quirk-height-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/text-indent-rtl-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/text-indent-rtl-expected.png
deleted file mode 100644
index 6708fcb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/text-indent-rtl-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/truncation-rtl-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/truncation-rtl-expected.png
deleted file mode 100644
index 46a9787..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/truncation-rtl-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/white-space-pre-wraps-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/white-space-pre-wraps-expected.png
deleted file mode 100644
index ecf5e78..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/basic/white-space-pre-wraps-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/001-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/001-expected.png
deleted file mode 100644
index 953373d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/001-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/002-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/002-expected.png
deleted file mode 100644
index 3b38aa7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/002-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/004-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/004-expected.png
deleted file mode 100644
index a381bd7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/004-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/005-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/005-expected.png
deleted file mode 100644
index 79ef2b4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/005-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/006-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/006-expected.png
deleted file mode 100644
index 30f77fc..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/006-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/007-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/007-expected.png
deleted file mode 100644
index 4d4f85cb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/007-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/010-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/010-expected.png
deleted file mode 100644
index 872240e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/010-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/011-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/011-expected.png
deleted file mode 100644
index e4ba4359..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/011-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/012-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/012-expected.png
deleted file mode 100644
index cb86d45..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/012-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/013-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/013-expected.png
deleted file mode 100644
index 72728fa..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/013-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/015-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/015-expected.png
deleted file mode 100644
index a1744ec6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/015-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/016-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/016-expected.png
deleted file mode 100644
index 538f395..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/016-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/017-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/017-expected.png
deleted file mode 100644
index d1cb1f8b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/017-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/018-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/018-expected.png
deleted file mode 100644
index 73eddb9..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/018-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/020-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/020-expected.png
deleted file mode 100644
index cc1c0483..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/020-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/021-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/021-expected.png
deleted file mode 100644
index 5802a42..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/021-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/022-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/022-expected.png
deleted file mode 100644
index 196c3b8c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/022-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/023-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/023-expected.png
deleted file mode 100644
index 4b0f9025..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/023-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/024-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/024-expected.png
deleted file mode 100644
index e8372e397..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/024-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/025-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/025-expected.png
deleted file mode 100644
index e575562..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/025-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/026-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/026-expected.png
deleted file mode 100644
index 8ee80b5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/026-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/027-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/027-expected.png
deleted file mode 100644
index e575562..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/027-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/028-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/028-expected.png
deleted file mode 100644
index 8ee80b5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/028-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/029-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/029-expected.png
deleted file mode 100644
index 64caf48..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/029-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/030-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/030-expected.png
deleted file mode 100644
index b3586745..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/030-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/031-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/031-expected.png
deleted file mode 100644
index fa6076d5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/031-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/add-inline-between-floats-with-preceding-anonymous-box-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/add-inline-between-floats-with-preceding-anonymous-box-expected.png
deleted file mode 100644
index 56b00b8bb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/add-inline-between-floats-with-preceding-anonymous-box-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/add-inline-to-block-flow-with-block-children-that-do-not-need-anonymous-boxes-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/add-inline-to-block-flow-with-block-children-that-do-not-need-anonymous-boxes-expected.png
deleted file mode 100644
index 257b9f2..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/add-inline-to-block-flow-with-block-children-that-do-not-need-anonymous-boxes-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/avoidance-percent-width-compat-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/avoidance-percent-width-compat-expected.png
deleted file mode 100644
index 41565d7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/avoidance-percent-width-compat-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/avoidance-percent-width-strict-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/avoidance-percent-width-strict-expected.png
deleted file mode 100644
index 9be238a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/avoidance-percent-width-strict-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/avoiding-float-centered-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/avoiding-float-centered-expected.png
deleted file mode 100644
index 0fc7d8e2..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/avoiding-float-centered-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/centered-float-avoidance-complexity-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/centered-float-avoidance-complexity-expected.png
deleted file mode 100644
index 7c1a0ab..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/centered-float-avoidance-complexity-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/clamped-right-float-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/clamped-right-float-expected.png
deleted file mode 100644
index e5ee858..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/clamped-right-float-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/clear-element-too-wide-for-containing-block-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/clear-element-too-wide-for-containing-block-expected.png
deleted file mode 100644
index a736e42..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/clear-element-too-wide-for-containing-block-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/dynamic-unfloat-pref-width-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/dynamic-unfloat-pref-width-expected.png
deleted file mode 100644
index e0b6410..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/dynamic-unfloat-pref-width-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/editable-text-overlapping-float-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/editable-text-overlapping-float-expected.png
deleted file mode 100644
index 882233f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/editable-text-overlapping-float-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/fit_line_below_floats-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/fit_line_below_floats-expected.png
deleted file mode 100644
index 971d29e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/fit_line_below_floats-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/float-avoidance-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/float-avoidance-expected.png
deleted file mode 100644
index 541e34d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/float-avoidance-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/floats-and-text-indent-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/floats-and-text-indent-expected.png
deleted file mode 100644
index 6349d13..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/floats-and-text-indent-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/floats-and-text-indent-rl-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/floats-and-text-indent-rl-expected.png
deleted file mode 100644
index f74c8761..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/floats-and-text-indent-rl-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/independent-align-positioning-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/independent-align-positioning-expected.png
deleted file mode 100644
index 9248128..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/independent-align-positioning-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-float-add-in-sibling-block-on-static-position-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-float-add-in-sibling-block-on-static-position-expected.png
deleted file mode 100644
index b4c58cf0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-float-add-in-sibling-block-on-static-position-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-float-add-in-sibling-block-on-static-position2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-float-add-in-sibling-block-on-static-position2-expected.png
deleted file mode 100644
index b4c58cf0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-float-add-in-sibling-block-on-static-position2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-float-remove-from-sibling-block-on-absolute-position-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-float-remove-from-sibling-block-on-absolute-position-expected.png
deleted file mode 100644
index cb326817..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-float-remove-from-sibling-block-on-absolute-position-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-float-remove-from-sibling-block-on-absolute-position2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-float-remove-from-sibling-block-on-absolute-position2-expected.png
deleted file mode 100644
index cb326817..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-float-remove-from-sibling-block-on-absolute-position2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-float-remove-from-sibling-block-on-fixed-position-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-float-remove-from-sibling-block-on-fixed-position-expected.png
deleted file mode 100644
index cb326817..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-float-remove-from-sibling-block-on-fixed-position-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-float-remove-from-sibling-block-on-fixed-position2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-float-remove-from-sibling-block-on-fixed-position2-expected.png
deleted file mode 100644
index cb326817..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-float-remove-from-sibling-block-on-fixed-position2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-painted-twice-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-painted-twice-expected.png
deleted file mode 100644
index 80c7d8f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/intruding-painted-twice-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/multiple-float-positioning-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/multiple-float-positioning-expected.png
deleted file mode 100644
index 60c28c2..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/multiple-float-positioning-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/nestedAnonymousBlocks-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/nestedAnonymousBlocks-expected.png
deleted file mode 100644
index fd16f5a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/nestedAnonymousBlocks-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/nestedAnonymousBlocks2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/nestedAnonymousBlocks2-expected.png
deleted file mode 100644
index 84d6638..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/nestedAnonymousBlocks2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/overhanging-after-height-decrease-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/overhanging-after-height-decrease-expected.png
deleted file mode 100644
index 21aee810..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/overhanging-after-height-decrease-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/overhanging-float-add-in-static-position-block-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/overhanging-float-add-in-static-position-block-expected.png
deleted file mode 100644
index b4c58cf0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/overhanging-float-add-in-static-position-block-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/overhanging-float-add-in-static-position-block2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/overhanging-float-add-in-static-position-block2-expected.png
deleted file mode 100644
index b4c58cf0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/overhanging-float-add-in-static-position-block2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/overhanging-float-remove-from-absolute-position-block-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/overhanging-float-remove-from-absolute-position-block-expected.png
deleted file mode 100644
index bfcb48e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/overhanging-float-remove-from-absolute-position-block-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/overhanging-float-remove-from-absolute-position-block2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/overhanging-float-remove-from-absolute-position-block2-expected.png
deleted file mode 100644
index bfcb48e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/overhanging-float-remove-from-absolute-position-block2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/overlapping-floats-with-overflow-hidden-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/overlapping-floats-with-overflow-hidden-expected.png
deleted file mode 100644
index 54bc899..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/overlapping-floats-with-overflow-hidden-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/shrink-to-avoid-float-complexity-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/shrink-to-avoid-float-complexity-expected.png
deleted file mode 100644
index df9c1f7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/shrink-to-avoid-float-complexity-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/shrink-to-fit-width-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/shrink-to-fit-width-expected.png
deleted file mode 100644
index dca189f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/shrink-to-fit-width-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/table-relayout-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/table-relayout-expected.png
deleted file mode 100644
index a854c0f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/table-relayout-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/vertical-move-relayout-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/vertical-move-relayout-expected.png
deleted file mode 100644
index 22a30c0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/vertical-move-relayout-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/width-update-after-clear-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/width-update-after-clear-expected.png
deleted file mode 100644
index 3858bf8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/float/width-update-after-clear-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/001-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/001-expected.png
deleted file mode 100644
index 3c18418..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/001-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/002-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/002-expected.png
deleted file mode 100644
index 6c741d5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/002-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/003-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/003-expected.png
deleted file mode 100644
index aa0a2ad..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/003-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/004-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/004-expected.png
deleted file mode 100644
index 6c741d5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/004-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/005-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/005-expected.png
deleted file mode 100644
index 3c18418..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/005-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/006-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/006-expected.png
deleted file mode 100644
index fae6588..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/006-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/010-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/010-expected.png
deleted file mode 100644
index efec22a6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/010-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/011-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/011-expected.png
deleted file mode 100644
index efec22a6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/011-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/012-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/012-expected.png
deleted file mode 100644
index cbec5267..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/012-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/015-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/015-expected.png
deleted file mode 100644
index 7e2194f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/015-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/016-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/016-expected.png
deleted file mode 100644
index dc5eb81..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/016-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/017-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/017-expected.png
deleted file mode 100644
index 4a1e3418..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/017-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/018-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/018-expected.png
deleted file mode 100644
index 5aeafb0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/018-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/019-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/019-expected.png
deleted file mode 100644
index b74fa8c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/019-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/020-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/020-expected.png
deleted file mode 100644
index 39481140..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/020-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/021-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/021-expected.png
deleted file mode 100644
index 28e14c6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/021-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/022-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/022-expected.png
deleted file mode 100644
index 28e14c6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/022-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/025-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/025-expected.png
deleted file mode 100644
index 28e14c6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/025-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/026-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/026-expected.png
deleted file mode 100644
index 67a865e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/026-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/027-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/027-expected.png
deleted file mode 100644
index 7977763..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/027-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/028-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/028-expected.png
deleted file mode 100644
index 67a865e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/028-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/029-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/029-expected.png
deleted file mode 100644
index 67a865e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/029-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/030-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/030-expected.png
deleted file mode 100644
index e00a3624..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/030-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/031-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/031-expected.png
deleted file mode 100644
index 6aebb56..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/031-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/032-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/032-expected.png
deleted file mode 100644
index f249144..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/032-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/033-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/033-expected.png
deleted file mode 100644
index e0423e28..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/033-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/034-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/034-expected.png
deleted file mode 100644
index 3e923aa..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/034-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/035-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/035-expected.png
deleted file mode 100644
index 67a865e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/035-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/037-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/037-expected.png
deleted file mode 100644
index 50afbd7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/037-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/038-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/038-expected.png
deleted file mode 100644
index 50afbd7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/038-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/039-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/039-expected.png
deleted file mode 100644
index 3ce6c51..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/039-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/040-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/040-expected.png
deleted file mode 100644
index 3ce6c51..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/040-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/041-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/041-expected.png
deleted file mode 100644
index 4da4b47..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/041-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/042-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/042-expected.png
deleted file mode 100644
index 5e17a1d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/042-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/043-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/043-expected.png
deleted file mode 100644
index 738fb41..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/043-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/044-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/044-expected.png
deleted file mode 100644
index 93851e2a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/044-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/045-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/045-expected.png
deleted file mode 100644
index e27ea05..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/045-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/055-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/055-expected.png
deleted file mode 100644
index ee6d3e1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/055-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/056-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/056-expected.png
deleted file mode 100644
index ec113ca9..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/056-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/057-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/057-expected.png
deleted file mode 100644
index c562e4a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/057-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/058-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/058-expected.png
deleted file mode 100644
index f2fad35..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/058-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/059-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/059-expected.png
deleted file mode 100644
index 6622a8c3..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/059-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/062-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/062-expected.png
deleted file mode 100644
index 4f32822..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/062-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/063-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/063-expected.png
deleted file mode 100644
index 54b9236..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/063-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/100-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/100-expected.png
deleted file mode 100644
index 2cec55d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/100-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/101-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/101-expected.png
deleted file mode 100644
index 5dda0d3..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/101-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/102-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/102-expected.png
deleted file mode 100644
index 2f5242e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/102-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/103-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/103-expected.png
deleted file mode 100644
index b7785b9..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/103-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/104-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/104-expected.png
deleted file mode 100644
index 7e9f29d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/104-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/001-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/001-expected.png
deleted file mode 100644
index 3c18418..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/001-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/002-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/002-expected.png
deleted file mode 100644
index 6c741d5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/002-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/003-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/003-expected.png
deleted file mode 100644
index aa0a2ad..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/003-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/004-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/004-expected.png
deleted file mode 100644
index 6c741d5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/004-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/005-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/005-expected.png
deleted file mode 100644
index 3c18418..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/005-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/006-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/006-expected.png
deleted file mode 100644
index fae6588..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/006-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/010-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/010-expected.png
deleted file mode 100644
index efec22a6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/010-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/011-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/011-expected.png
deleted file mode 100644
index efec22a6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/011-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/012-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/012-expected.png
deleted file mode 100644
index cbec5267..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/012-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/015-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/015-expected.png
deleted file mode 100644
index 7e2194f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/015-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/016-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/016-expected.png
deleted file mode 100644
index dc5eb81..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/016-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/017-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/017-expected.png
deleted file mode 100644
index 4a1e3418..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/017-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/018-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/018-expected.png
deleted file mode 100644
index 5aeafb0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/018-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/019-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/019-expected.png
deleted file mode 100644
index b74fa8c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/019-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/020-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/020-expected.png
deleted file mode 100644
index 39481140..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/020-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/021-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/021-expected.png
deleted file mode 100644
index 28e14c6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/021-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/022-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/022-expected.png
deleted file mode 100644
index 28e14c6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/022-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/025-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/025-expected.png
deleted file mode 100644
index 28e14c6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/025-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/empty-clear-blocks-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/empty-clear-blocks-expected.png
deleted file mode 100644
index a19d9de..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/empty-clear-blocks-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/negative-margins-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/negative-margins-expected.png
deleted file mode 100644
index 2cacd2e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/block/margin-collapse/negative-margins-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/001-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/001-expected.png
deleted file mode 100644
index b8b05e7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/001-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/25277-2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/25277-2-expected.png
deleted file mode 100644
index 4c55675..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/25277-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/25277-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/25277-expected.png
deleted file mode 100644
index 4c55675..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/25277-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/inline-padding-disables-text-quirk-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/inline-padding-disables-text-quirk-expected.png
deleted file mode 100644
index ea10d2e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/inline-padding-disables-text-quirk-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/inline-text-quirk-bpm-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/inline-text-quirk-bpm-expected.png
deleted file mode 100644
index d36f404..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/inline-text-quirk-bpm-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/inline-wrap-with-parent-padding-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/inline-wrap-with-parent-padding-expected.png
deleted file mode 100644
index acb639a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/inline-wrap-with-parent-padding-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/nested-top-alignment-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/nested-top-alignment-expected.png
deleted file mode 100644
index a88af4f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/nested-top-alignment-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/vertical-align-text-bottom-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/vertical-align-text-bottom-expected.png
deleted file mode 100644
index e2529d8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/vertical-align-text-bottom-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/vertical-align-with-fallback-fonts-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/vertical-align-with-fallback-fonts-expected.png
deleted file mode 100644
index f0327cb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/inline/vertical-align-with-fallback-fonts-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/writing-mode/Kusa-Makura-background-canvas-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/writing-mode/Kusa-Makura-background-canvas-expected.png
deleted file mode 100644
index 4c5101a5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/writing-mode/Kusa-Makura-background-canvas-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/writing-mode/english-lr-text-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/writing-mode/english-lr-text-expected.png
deleted file mode 100644
index 4f68f49..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/writing-mode/english-lr-text-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/writing-mode/japanese-lr-text-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/writing-mode/japanese-lr-text-expected.png
deleted file mode 100644
index fe3dfc1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/writing-mode/japanese-lr-text-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/writing-mode/vertical-font-fallback-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/writing-mode/vertical-font-fallback-expected.png
deleted file mode 100644
index a63d5a805..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/fast/writing-mode/vertical-font-fallback-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/overflow/overflow-transform-perspective-expected.png b/third_party/blink/web_tests/platform/linux/virtual/layout_ng/overflow/overflow-transform-perspective-expected.png
deleted file mode 100644
index d43288f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/layout_ng/overflow/overflow-transform-perspective-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/media-capture-image-ptz/external/wpt/mediacapture-image/MediaStreamTrack-getSettings-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/media-capture-image-ptz/external/wpt/mediacapture-image/MediaStreamTrack-getSettings-expected.txt
deleted file mode 100644
index 9aed7862..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/media-capture-image-ptz/external/wpt/mediacapture-image/MediaStreamTrack-getSettings-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-This is a testharness.js-based test.
-PASS exercises MediaStreamTrack.getSettings() with PTZ permission denied
-PASS MediaStreamTrack-getSettings
-PASS exercises MediaStreamTrack.getSettings() with PTZ permission granted
-FAIL MediaStreamTrack-getSettings 1 assert_equals: expected (number) 5 but got (undefined) undefined
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/new-remote-playback-pipeline/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.png b/third_party/blink/web_tests/platform/linux/virtual/new-remote-playback-pipeline/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.png
deleted file mode 100644
index 7be338bd..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/new-remote-playback-pipeline/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/new-remote-playback-pipeline/media/controls/paint-controls-webkit-appearance-none-expected.png b/third_party/blink/web_tests/platform/linux/virtual/new-remote-playback-pipeline/media/controls/paint-controls-webkit-appearance-none-expected.png
deleted file mode 100644
index 18eaafb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/new-remote-playback-pipeline/media/controls/paint-controls-webkit-appearance-none-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/new-remote-playback-pipeline/media/controls/video-controls-with-cast-rendering-expected.png b/third_party/blink/web_tests/platform/linux/virtual/new-remote-playback-pipeline/media/controls/video-controls-with-cast-rendering-expected.png
deleted file mode 100644
index 0b554e1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/new-remote-playback-pipeline/media/controls/video-controls-with-cast-rendering-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/new-remote-playback-pipeline/media/controls/video-overlay-cast-dark-rendering-expected.png b/third_party/blink/web_tests/platform/linux/virtual/new-remote-playback-pipeline/media/controls/video-overlay-cast-dark-rendering-expected.png
deleted file mode 100644
index 9ccff31..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/new-remote-playback-pipeline/media/controls/video-overlay-cast-dark-rendering-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/new-remote-playback-pipeline/media/controls/video-overlay-cast-light-rendering-expected.png b/third_party/blink/web_tests/platform/linux/virtual/new-remote-playback-pipeline/media/controls/video-overlay-cast-light-rendering-expected.png
deleted file mode 100644
index 0916cbe..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/new-remote-playback-pipeline/media/controls/video-overlay-cast-light-rendering-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/not-omt-sw-fetch/external/wpt/xhr/getallresponseheaders-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/not-omt-sw-fetch/external/wpt/xhr/getallresponseheaders-expected.txt
deleted file mode 100644
index 69617d19..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/not-omt-sw-fetch/external/wpt/xhr/getallresponseheaders-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-This is a testharness.js-based test.
-FAIL XMLHttpRequest: getAllResponseHeaders() assert_equals: expected "also-here: Mr. PB\r\newok: lego\r\nfoo-test: 1, 2\r\n__custom: token\r\n" but got "__custom: token\r\nalso-here: Mr. PB\r\nfoo-test: 1, 2\r\newok: lego\r\n"
-PASS XMLHttpRequest: getAllResponseHeaders() 1
-PASS XMLHttpRequest: getAllResponseHeaders() 2
-PASS XMLHttpRequest: getAllResponseHeaders() 3
-PASS XMLHttpRequest: getAllResponseHeaders() 4
-PASS XMLHttpRequest: getAllResponseHeaders() 5
-PASS XMLHttpRequest: getAllResponseHeaders() 6
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/not-omt-sw-fetch/external/wpt/xhr/responsexml-document-properties-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/not-omt-sw-fetch/external/wpt/xhr/responsexml-document-properties-expected.txt
deleted file mode 100644
index 8703e748..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/not-omt-sw-fetch/external/wpt/xhr/responsexml-document-properties-expected.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-This is a testharness.js-based test.
-PASS domain
-PASS URL
-PASS documentURI
-PASS baseURI
-PASS referrer
-PASS title
-PASS contentType
-PASS readyState
-PASS location
-PASS defaultView
-PASS body
-PASS doctype
-PASS all
-PASS cookie
-PASS Test document URL properties after redirect
-PASS Test document URL properties of document with <base> after redirect
-PASS lastModified set to time of response if no HTTP header provided
-PASS lastModified set to related HTTP header if provided
-PASS cookie (after setting it)
-PASS styleSheets should be an object
-PASS implementation should be an object
-PASS images should be an object
-PASS forms should be an object
-PASS links should be an object
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/omt-worker-fetch/external/wpt/xhr/abort-after-send.any-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/omt-worker-fetch/external/wpt/xhr/abort-after-send.any-expected.txt
deleted file mode 100644
index 0f10f7e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/omt-worker-fetch/external/wpt/xhr/abort-after-send.any-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL XMLHttpRequest: abort() after send() assert_equals: expected "abort(0,0,false)" but got "upload.abort(0,0,false)"
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/pointerevent/fast/events/context-no-deselect-expected.png b/third_party/blink/web_tests/platform/linux/virtual/pointerevent/fast/events/context-no-deselect-expected.png
deleted file mode 100644
index 675b66c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/pointerevent/fast/events/context-no-deselect-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/pointerevent/fast/events/hit-test-clip-path-reference-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/pointerevent/fast/events/hit-test-clip-path-reference-expected.txt
deleted file mode 100644
index d38e48e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/pointerevent/fast/events/hit-test-clip-path-reference-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Test that hit-test work with clip-path using svg reference
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS path contains point at (99, 247)
-PASS path contains point at (94, 242)
-PASS path contains point at (104, 252)
-PASS path contains point at (94, 252)
-PASS path contains point at (104, 242)
-PASS path does not contain point at (67, 215)
-PASS path does not contain point at (66, 214)
-PASS path does not contain point at (68, 216)
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/pointerevent/fast/events/pointer-events-2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/pointerevent/fast/events/pointer-events-2-expected.png
deleted file mode 100644
index 2dd85cc..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/pointerevent/fast/events/pointer-events-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/pointerevent/fast/events/pointer-events-2-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/pointerevent/fast/events/pointer-events-2-expected.txt
deleted file mode 100644
index 50714e6b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/pointerevent/fast/events/pointer-events-2-expected.txt
+++ /dev/null
@@ -1,199 +0,0 @@
-layer at (0,0) size 800x600 scrollHeight 640
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x176
-  LayoutBlockFlow {HTML} at (0,0) size 800x175.88
-    LayoutBlockFlow {BODY} at (8,21.44) size 784x138.44
-      LayoutBlockFlow {H1} at (0,0) size 784x37
-        LayoutText {#text} at (0,0) size 757x36
-          text run at (0,0) width 757: "Testing the values of 'pointer-events' on HTML content"
-      LayoutBlockFlow {P} at (0,58.44) size 784x80
-        LayoutText {#text} at (0,0) size 779x79
-          text run at (0,0) width 542: "This test is expected to be run from within DumpRenderTree. If running manually, click on "
-          text run at (541,0) width 235: "the elements in the first column, making"
-          text run at (0,20) width 261: "sure the actual result (3rd column) matches "
-          text run at (261,20) width 518: "the expected result (2nd column). Repeat for click target (4th column), expected result"
-          text run at (0,40) width 80: "(5th column) "
-          text run at (80,40) width 495: "and actual result (6th column). Note: You should click on a yellow inline element if "
-          text run at (574,40) width 202: "one exists, otherwise anywhere in"
-          text run at (0,60) width 49: "the box."
-layer at (10,140) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,140) size 300x100
-layer at (10,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,140) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 68x39
-      text run at (0,0) width 48: "pointer-"
-      text run at (0,20) width 68: "events auto"
-layer at (110,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x19
-      text run at (0,0) width 16: "p1"
-layer at (210,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x19
-      text run at (0,0) width 16: "p1"
-layer at (10,240) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,240) size 300x100
-layer at (10,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,240) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 71x39
-      text run at (0,0) width 48: "pointer-"
-      text run at (0,20) width 71: "events none"
-layer at (110,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 29x19
-      text run at (0,0) width 29: "none"
-layer at (210,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 29x19
-      text run at (0,0) width 29: "none"
-layer at (10,340) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,340) size 300x100
-layer at (10,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,340) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 69x39
-      text run at (0,0) width 53: "siblings -"
-      text run at (0,20) width 69: "auto on top"
-layer at (10,340) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80
-layer at (110,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x19
-      text run at (0,0) width 16: "p4"
-layer at (210,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x19
-      text run at (0,0) width 16: "p4"
-layer at (10,440) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,440) size 300x100
-layer at (10,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,440) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 72x39
-      text run at (0,0) width 53: "siblings -"
-      text run at (0,20) width 72: "none on top"
-layer at (10,440) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80
-layer at (110,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x19
-      text run at (0,0) width 16: "p5"
-layer at (210,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x19
-      text run at (0,0) width 16: "p5"
-layer at (10,540) size 300x100 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (10,540) size 300x100
-layer at (10,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 79x39
-      text run at (0,0) width 79: "nested - auto"
-      text run at (0,20) width 31: "outer"
-layer at (110,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x19
-      text run at (0,0) width 16: "p7"
-layer at (210,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x19
-      text run at (0,0) width 16: "p7"
-layer at (340,140) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,140) size 300x100
-layer at (340,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,140) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 64x39
-      text run at (0,0) width 49: "nested -"
-      text run at (0,20) width 64: "none outer"
-layer at (440,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x19
-      text run at (0,0) width 24: "p10"
-layer at (540,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x19
-      text run at (0,0) width 24: "p10"
-layer at (340,240) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,240) size 300x100
-layer at (340,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,240) size 80x80
-  LayoutImage (positioned) {IMG} at (0,0) size 80x80
-layer at (440,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x19
-      text run at (0,0) width 24: "p11"
-layer at (540,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x19
-      text run at (0,0) width 24: "p11"
-layer at (340,340) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,340) size 300x100
-layer at (340,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,340) size 80x80
-  LayoutImage (positioned) {IMG} at (0,0) size 80x80
-layer at (440,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 29x19
-      text run at (0,0) width 29: "none"
-layer at (540,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 29x19
-      text run at (0,0) width 29: "none"
-layer at (340,440) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,440) size 300x100
-layer at (340,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,440) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutInline {SPAN} at (0,0) size 30x19 [bgcolor=#FFFF00]
-      LayoutText {#text} at (0,0) size 30x19
-        text run at (0,0) width 30: "inline"
-    LayoutText {#text} at (30,0) size 72x59
-      text run at (30,0) width 24: " has"
-      text run at (0,20) width 72: "auto, parent"
-      text run at (0,40) width 29: "none"
-layer at (440,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x19
-      text run at (0,0) width 24: "p14"
-layer at (540,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x19
-      text run at (0,0) width 24: "p14"
-layer at (340,540) size 300x100 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (340,540) size 300x100
-layer at (340,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutInline {SPAN} at (0,0) size 30x19 [bgcolor=#FFFF00]
-      LayoutText {#text} at (0,0) size 30x19
-        text run at (0,0) width 30: "inline"
-    LayoutText {#text} at (30,0) size 75x59
-      text run at (30,0) width 24: " has"
-      text run at (0,20) width 75: "none, parent"
-      text run at (0,40) width 26: "auto"
-layer at (440,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x19
-      text run at (0,0) width 24: "p15"
-layer at (540,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x19
-      text run at (0,0) width 24: "p15"
-caret: position 1 of child 0 {#text} of child 0 {SPAN} of child 1 {P} of child 1 {DIV} of child 23 {DIV} of body
diff --git a/third_party/blink/web_tests/platform/linux/virtual/pointerevent/fast/events/reveal-link-when-focused-expected.png b/third_party/blink/web_tests/platform/linux/virtual/pointerevent/fast/events/reveal-link-when-focused-expected.png
deleted file mode 100644
index 9d5de936..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/pointerevent/fast/events/reveal-link-when-focused-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/reporting/external/wpt/content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/reporting/external/wpt/content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub-expected.txt
deleted file mode 100644
index eda05ab..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/reporting/external/wpt/content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a testharness.js-based test.
-PASS Test that image does not load
-PASS Event is fired
-FAIL Violation report status OK. assert_equals: No such report. expected "" but got "false"
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/reporting/external/wpt/content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/reporting/external/wpt/content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub-expected.txt
deleted file mode 100644
index eda05ab..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/reporting/external/wpt/content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a testharness.js-based test.
-PASS Test that image does not load
-PASS Event is fired
-FAIL Violation report status OK. assert_equals: No such report. expected "" but got "false"
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/reporting/external/wpt/content-security-policy/reporting/securitypolicyviolation-idl-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/reporting/external/wpt/content-security-policy/reporting/securitypolicyviolation-idl-expected.txt
deleted file mode 100644
index 18d8446..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/reporting/external/wpt/content-security-policy/reporting/securitypolicyviolation-idl-expected.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-This is a testharness.js-based test.
-PASS Test driver
-PASS SecurityPolicyViolationEvent interface: existence and properties of interface object
-PASS SecurityPolicyViolationEvent interface object length
-PASS SecurityPolicyViolationEvent interface object name
-PASS SecurityPolicyViolationEvent interface: existence and properties of interface prototype object
-PASS SecurityPolicyViolationEvent interface: existence and properties of interface prototype object's "constructor" property
-PASS SecurityPolicyViolationEvent interface: attribute documentURI
-PASS SecurityPolicyViolationEvent interface: attribute referrer
-PASS SecurityPolicyViolationEvent interface: attribute blockedURI
-PASS SecurityPolicyViolationEvent interface: attribute violatedDirective
-PASS SecurityPolicyViolationEvent interface: attribute effectiveDirective
-PASS SecurityPolicyViolationEvent interface: attribute originalPolicy
-PASS SecurityPolicyViolationEvent interface: attribute disposition
-PASS SecurityPolicyViolationEvent interface: attribute sourceFile
-PASS SecurityPolicyViolationEvent interface: attribute statusCode
-PASS SecurityPolicyViolationEvent interface: attribute lineNumber
-PASS SecurityPolicyViolationEvent interface: attribute columnNumber
-PASS SecurityPolicyViolationEvent must be primary interface of event_to_test
-PASS Stringification of event_to_test
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "documentURI" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "referrer" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "blockedURI" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "violatedDirective" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "effectiveDirective" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "originalPolicy" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "disposition" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "sourceFile" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "statusCode" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "lineNumber" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "columnNumber" with the proper type
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/samesite-by-default-cookies/external/wpt/cookies/http-state/general-tests-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/samesite-by-default-cookies/external/wpt/cookies/http-state/general-tests-expected.txt
deleted file mode 100644
index 4d33a0e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/samesite-by-default-cookies/external/wpt/cookies/http-state/general-tests-expected.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-This is a testharness.js-based test.
-PASS 0001 - Set cookie.
-PASS 0002 - Set cookie with future expiration.
-PASS 0003 - Set expired cookie along with valid cookie.
-FAIL 0004 - Ignore cookie without key. assert_equals: expected "" but got "foo"
-PASS 0005 - Set cookie with age.
-PASS 0006 - Set no cookie with max-age=0.
-PASS 0007 - Set cookie with version=1.
-PASS 0008 - Set cookie with version=1000.
-PASS 0009 - Set cookie with custom value.
-PASS 0010 - Dont accept 'secure' cookies over http.
-PASS 0011 - Ignore separators in cookie values.
-PASS 0012 - Ignore values with separators and without ';'.
-PASS 0013 - Use last value for cookies with identical keys.
-PASS 0014 - Keep alphabetic key order.
-PASS 0015 - Keep alphabetic single-char key order.
-PASS 0016 - Keep non-alphabetic key order.
-PASS 0017 - Keep order if comma-separated.
-PASS 0018 - Ignore keys after semicolon.
-PASS 0019 - Ignore attributes after semicolon.
-FAIL 0020 - Ignore cookies without key and value. assert_equals: expected "a=b; c=d" but got "a=b; ; c=d"
-FAIL 0021 - Ignore cookie without key in all 'Set-Cookie'. assert_equals: expected "a=b; c=d" but got "a=b; x; c=d"
-PASS 0022 - Set cookie without value in all 'Set-Cookie'.
-PASS 0023 - Ignore cookies without '=' in all 'Set-Cookie'.
-PASS 0024 - Ignore malformed cookies in all 'Set-Cookie'.
-PASS 0025 - Ignore cookies with ';' in all 'Set-Cookie'.
-PASS 0026 - Ignore malformed cookies in all 'Set-Cookie' v2.
-FAIL 0027 - Ignore malformed cookies in all 'Set-Cookie' v3. assert_equals: expected "" but got "bar"
-FAIL 0028 - [INVALID EXPECTATION] Ignore malformed cookies in all 'Set-Cookie' v4. assert_equals: expected "Set-Cookie: foo\nSet-Cookie:" but got ""
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-svg-container-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-svg-container-expected.txt
deleted file mode 100644
index a177811..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-svg-container-expected.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-: layer(800x600) has hit test rect (8,13 54x19)
-
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-svg-text-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-svg-text-expected.txt
deleted file mode 100644
index a177811..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-svg-text-expected.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-: layer(800x600) has hit test rect (8,13 54x19)
-
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/scroll_customization/fast/events/touch/multi-touch-user-gesture-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/scroll_customization/fast/events/touch/multi-touch-user-gesture-expected.txt
deleted file mode 100644
index 61a5134..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/scroll_customization/fast/events/touch/multi-touch-user-gesture-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL Test user gesture behavior during multi-finger touch events. assert_equals: expected "touchstart@target1(false), touchstart@target2(false), touchmove@target1(false), touchmove@target2(false), touchend@target1(true), touchend@target2(true)" but got "touchstart@target1(false), touchstart@target2(false), touchmove@target2(false), touchmove@target1(false), touchend@target1(true), touchend@target2(true)"
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/child-style-can-override-visited-style-expected.png b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/child-style-can-override-visited-style-expected.png
deleted file mode 100644
index 0916a62a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/child-style-can-override-visited-style-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/child-style-can-override-visited-style-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/child-style-can-override-visited-style-expected.txt
deleted file mode 100644
index 5404ac4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/child-style-can-override-visited-style-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutBlockFlow {HTML} at (0,0) size 800x600
-    LayoutBlockFlow {BODY} at (8,8) size 784x584
-      LayoutBlockFlow (anonymous) at (0,0) size 784x20
-        LayoutText {#text} at (0,0) size 356x19
-          text run at (0,0) width 356: "This tests that a child style can override the :visited style."
-        LayoutInline {A} at (0,0) size 0x0 [color=#FF0000]
-          LayoutText {#text} at (0,0) size 0x0
-      LayoutBlockFlow (anonymous) at (0,20) size 784x20 [color=#FF0000]
-        LayoutBlockFlow {DIV} at (0,0) size 784x20 [color=#008000]
-          LayoutText {#text} at (0,0) size 267x19
-            text run at (0,0) width 267: "This text should be green (and underlined)"
-      LayoutBlockFlow (anonymous) at (0,40) size 784x0
-        LayoutInline {A} at (0,0) size 0x0 [color=#FF0000]
-        LayoutText {#text} at (0,0) size 0x0
-      LayoutBlockFlow {DIV} at (0,40) size 784x20 [color=#008000]
-        LayoutText {#text} at (0,0) size 159x19
-          text run at (0,0) width 159: "This text should be green"
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/clip-zooming-expected.png b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/clip-zooming-expected.png
deleted file mode 100644
index 2c31eaf..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/clip-zooming-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/color-correction-on-text-shadow-expected.png b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/color-correction-on-text-shadow-expected.png
deleted file mode 100644
index 473eaa5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/color-correction-on-text-shadow-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/compare-content-style-expected.png b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/compare-content-style-expected.png
deleted file mode 100644
index 36ed0413..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/compare-content-style-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/crash-on-gradient-with-derived-color-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/crash-on-gradient-with-derived-color-expected.txt
deleted file mode 100644
index 97296481..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/crash-on-gradient-with-derived-color-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-This test passes if it does not CRASH.
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/first-letter-hover-expected.png b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/first-letter-hover-expected.png
deleted file mode 100644
index b33fc8e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/first-letter-hover-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/first-letter-visibility-expected.png b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/first-letter-visibility-expected.png
deleted file mode 100644
index 4760d94d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/first-letter-visibility-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/focus-ring-multiline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/focus-ring-multiline-expected.png
deleted file mode 100644
index 22f35f6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/focus-ring-multiline-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/invalid-percentage-property-expected.png b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/invalid-percentage-property-expected.png
deleted file mode 100644
index 2edd02c3..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/invalid-percentage-property-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/line-height-font-order-expected.png b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/line-height-font-order-expected.png
deleted file mode 100644
index bfd0d978..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/line-height-font-order-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/line-thickness-underline-strikethrough-overline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/line-thickness-underline-strikethrough-overline-expected.png
deleted file mode 100644
index 6fd33625..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/line-thickness-underline-strikethrough-overline-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/nth-child-dynamic-expected.png b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/nth-child-dynamic-expected.png
deleted file mode 100644
index 0cb1212..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/nth-child-dynamic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/number-parsing-crash-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/number-parsing-crash-expected.txt
deleted file mode 100644
index 75cf4f3..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/number-parsing-crash-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-This should not crash.  
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-expected.png b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-expected.png
deleted file mode 100644
index c1e7edf..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-iframe-expected.png b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-iframe-expected.png
deleted file mode 100644
index 4698598c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-iframe-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/shadow-multiple-expected.png b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/shadow-multiple-expected.png
deleted file mode 100644
index d3b706d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/shadow-multiple-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/text-overflow-ellipsis-expected.png b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/text-overflow-ellipsis-expected.png
deleted file mode 100644
index 615980c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/text-overflow-ellipsis-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/text-overflow-ellipsis-strict-expected.png b/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/text-overflow-ellipsis-strict-expected.png
deleted file mode 100644
index 615980c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/sharedarraybuffer/fast/css/text-overflow-ellipsis-strict-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/spv175/paint/invalidation/svg/transform-foreign-object-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/spv175/paint/invalidation/svg/transform-foreign-object-expected.txt
deleted file mode 100644
index 56c9291..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/spv175/paint/invalidation/svg/transform-foreign-object-expected.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "backgroundColor": "#FFFFFF"
-    },
-    {
-      "name": "Scrolling Layer",
-      "bounds": [800, 600],
-      "drawsContent": false
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "paintInvalidations": [
-        {
-          "object": "LayoutSVGForeignObject foreignObject",
-          "rect": [108, 8, 100, 100],
-          "reason": "appeared"
-        },
-        {
-          "object": "LayoutSVGRoot svg",
-          "rect": [8, 8, 100, 100],
-          "reason": "disappeared"
-        }
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/002-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/002-expected.png
deleted file mode 100644
index 5277267..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/002-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/004-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/004-expected.png
deleted file mode 100644
index 3122a36..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/004-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/005-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/005-expected.png
deleted file mode 100644
index 69040508..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/005-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/acid2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/acid2-expected.png
deleted file mode 100644
index 74e85e5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/acid2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/bidi-override-in-anonymous-block-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/bidi-override-in-anonymous-block-expected.png
deleted file mode 100644
index ccc08b7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/bidi-override-in-anonymous-block-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/clip-text-in-scaled-div-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/clip-text-in-scaled-div-expected.png
deleted file mode 100644
index 6ec97771..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/clip-text-in-scaled-div-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/clip-zooming-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/clip-zooming-expected.png
deleted file mode 100644
index 4bdb885..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/clip-zooming-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/first-child-pseudo-class-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/first-child-pseudo-class-expected.png
deleted file mode 100644
index 800ac42..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/first-child-pseudo-class-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/first-of-type-pseudo-class-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/first-of-type-pseudo-class-expected.png
deleted file mode 100644
index b2ccb266..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/first-of-type-pseudo-class-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/font-face-synthetic-bold-italic-for-locally-installed-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/font-face-synthetic-bold-italic-for-locally-installed-expected.png
deleted file mode 100644
index 67c9fed6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/font-face-synthetic-bold-italic-for-locally-installed-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/font-smoothing-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/font-smoothing-expected.png
deleted file mode 100644
index 6030423c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/font-smoothing-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/font_property_normal-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/font_property_normal-expected.png
deleted file mode 100644
index c9947a1d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/font_property_normal-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/input-search-padding-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/input-search-padding-expected.png
deleted file mode 100644
index b3812aa..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/input-search-padding-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/last-child-pseudo-class-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/last-child-pseudo-class-expected.png
deleted file mode 100644
index 60466a6b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/last-child-pseudo-class-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/last-of-type-pseudo-class-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/last-of-type-pseudo-class-expected.png
deleted file mode 100644
index f38bf0b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/last-of-type-pseudo-class-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/list-item-height-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/list-item-height-expected.png
deleted file mode 100644
index 972584b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/list-item-height-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/negative-leading-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/negative-leading-expected.png
deleted file mode 100644
index 4fc561a1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/negative-leading-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/only-child-pseudo-class-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/only-child-pseudo-class-expected.png
deleted file mode 100644
index 1d185c5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/only-child-pseudo-class-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/only-of-type-pseudo-class-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/only-of-type-pseudo-class-expected.png
deleted file mode 100644
index 3a174645..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/only-of-type-pseudo-class-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/outline-auto-location-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/outline-auto-location-expected.png
deleted file mode 100644
index b5d450c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/outline-auto-location-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/rem-calc-dynamic-scaling-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/rem-calc-dynamic-scaling-expected.png
deleted file mode 100644
index 74e885d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/rem-calc-dynamic-scaling-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/rem-dynamic-scaling-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/rem-dynamic-scaling-expected.png
deleted file mode 100644
index 74e885d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/rem-dynamic-scaling-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/rem-units-on-root-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/rem-units-on-root-expected.png
deleted file mode 100644
index d37ad8d3..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/rem-units-on-root-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/shadow-multiple-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/shadow-multiple-expected.png
deleted file mode 100644
index e7d09d54..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/shadow-multiple-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/text-overflow-ellipsis-multiple-shadows-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/text-overflow-ellipsis-multiple-shadows-expected.png
deleted file mode 100644
index 156ce55..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/text-overflow-ellipsis-multiple-shadows-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/text-overflow-ellipsis-shadow-alpha-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/text-overflow-ellipsis-shadow-alpha-expected.png
deleted file mode 100644
index befe81c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/text-overflow-ellipsis-shadow-alpha-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/text-overflow-input-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/text-overflow-input-expected.png
deleted file mode 100644
index 8304903..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/text-overflow-input-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/text-rendering-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/text-rendering-expected.png
deleted file mode 100644
index 41f97b22..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/text-rendering-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/transformed-mask-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/transformed-mask-expected.png
deleted file mode 100644
index 2d2421e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/transformed-mask-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/word-space-extra-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/word-space-extra-expected.png
deleted file mode 100644
index 8309a99..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/word-space-extra-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/zoom-font-size-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/zoom-font-size-expected.png
deleted file mode 100644
index 19736745..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/fast/css/zoom-font-size-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/http/tests/inspector-protocol/issues/content-security-policy-issue-creation-img-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/http/tests/inspector-protocol/issues/content-security-policy-issue-creation-img-expected.txt
deleted file mode 100644
index 831cf05..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/http/tests/inspector-protocol/issues/content-security-policy-issue-creation-img-expected.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Verifies that CSP issue is created from a page with image source violation.
-
-Inspector issue: {
-    issue : {
-        code : ContentSecurityPolicyIssue
-        details : {
-            contentSecurityPolicyIssueDetails : {
-                blockedURL : https://thirdparty.test/network/resources/to-be-blocked.jpg
-                contentSecurityPolicyViolationType : kURLViolation
-                isReportOnly : false
-                sourceCodeLocation : {
-                    columnNumber : 0
-                    lineNumber : 8
-                    scriptId : <string>
-                    url : https://devtools.test:8443/inspector-protocol/resources/content-security-policy-issue-image.php
-                }
-                violatedDirective : img-src
-            }
-        }
-    }
-}
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/audio-controls-rendering-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/audio-controls-rendering-expected.png
deleted file mode 100644
index a11bb1a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/audio-controls-rendering-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/audio-repaint-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/audio-repaint-expected.png
deleted file mode 100644
index cb995706..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/audio-repaint-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/color-profile-video-seek-filter-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/color-profile-video-seek-filter-expected.png
deleted file mode 100644
index c1490d7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/color-profile-video-seek-filter-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls-after-reload-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls-after-reload-expected.png
deleted file mode 100644
index 3872a4a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls-after-reload-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls-layout-direction-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls-layout-direction-expected.png
deleted file mode 100644
index 62a11ed..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls-layout-direction-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls-strict-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls-strict-expected.png
deleted file mode 100644
index e79094e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls-strict-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls-styling-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls-styling-expected.png
deleted file mode 100644
index aae08301..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls-styling-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls-styling-strict-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls-styling-strict-expected.png
deleted file mode 100644
index 3b0ed46..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls-styling-strict-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls-without-preload-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls-without-preload-expected.png
deleted file mode 100644
index 856c532..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls-without-preload-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls/paint-controls-webkit-appearance-none-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls/paint-controls-webkit-appearance-none-expected.png
deleted file mode 100644
index eac24bb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/controls/paint-controls-webkit-appearance-none-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/media-controls-clone-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/media-controls-clone-expected.png
deleted file mode 100644
index 4ec84cb7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/media-controls-clone-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/media-controls-grey-scrubber-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/media-controls-grey-scrubber-expected.png
deleted file mode 100644
index d2f8471..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/media-controls-grey-scrubber-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/media-document-audio-repaint-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/media-document-audio-repaint-expected.png
deleted file mode 100644
index 70b8bec8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/media-document-audio-repaint-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-canvas-alpha-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-canvas-alpha-expected.png
deleted file mode 100644
index 73833681..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-canvas-alpha-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-controls-rendering-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-controls-rendering-expected.png
deleted file mode 100644
index 65b8e6f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-controls-rendering-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-display-toggle-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-display-toggle-expected.png
deleted file mode 100644
index ad71ea8a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-display-toggle-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-no-audio-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-no-audio-expected.png
deleted file mode 100644
index 3d197ff..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-no-audio-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-replaces-poster-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-replaces-poster-expected.png
deleted file mode 100644
index c3c0c82..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-replaces-poster-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-seek-past-end-paused-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-seek-past-end-paused-expected.txt
deleted file mode 100644
index 1adfc7f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-seek-past-end-paused-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL Test that seeking a paused video past its end sets currentTime to duration and leaves the video paused. assert_true: expected true got false
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-zoom-controls-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-zoom-controls-expected.png
deleted file mode 100644
index 4ef147b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-zoom-controls-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-zoom-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-zoom-expected.png
deleted file mode 100644
index 477cf2e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/media/video-zoom-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirLTR-ubNone-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirLTR-ubNone-expected.png
deleted file mode 100644
index c8733fb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirLTR-ubNone-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirLTR-ubOverride-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirLTR-ubOverride-expected.png
deleted file mode 100644
index 7fff83a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirLTR-ubOverride-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirRTL-ubNone-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirRTL-ubNone-expected.png
deleted file mode 100644
index d1c1fae..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirRTL-ubNone-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirRTL-ubOverride-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirRTL-ubOverride-expected.png
deleted file mode 100644
index 6dcf7cae..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirRTL-ubOverride-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirLTR-anchorEnd-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirLTR-anchorEnd-expected.png
deleted file mode 100644
index 844e525..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirLTR-anchorEnd-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirLTR-anchorMiddle-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirLTR-anchorMiddle-expected.png
deleted file mode 100644
index f57645c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirLTR-anchorMiddle-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirLTR-anchorStart-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirLTR-anchorStart-expected.png
deleted file mode 100644
index e4ef516..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirLTR-anchorStart-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirNone-anchorEnd-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirNone-anchorEnd-expected.png
deleted file mode 100644
index 844e525..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirNone-anchorEnd-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirNone-anchorMiddle-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirNone-anchorMiddle-expected.png
deleted file mode 100644
index f57645c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirNone-anchorMiddle-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirNone-anchorStart-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirNone-anchorStart-expected.png
deleted file mode 100644
index e4ef516..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirNone-anchorStart-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirRTL-anchorEnd-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirRTL-anchorEnd-expected.png
deleted file mode 100644
index e4ef516..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirRTL-anchorEnd-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirRTL-anchorMiddle-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirRTL-anchorMiddle-expected.png
deleted file mode 100644
index f57645c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirRTL-anchorMiddle-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirRTL-anchorStart-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirRTL-anchorStart-expected.png
deleted file mode 100644
index 844e525..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-dirRTL-anchorStart-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirLTR-anchorEnd-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirLTR-anchorEnd-expected.png
deleted file mode 100644
index 844e525..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirLTR-anchorEnd-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirLTR-anchorMiddle-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirLTR-anchorMiddle-expected.png
deleted file mode 100644
index f57645c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirLTR-anchorMiddle-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirLTR-anchorStart-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirLTR-anchorStart-expected.png
deleted file mode 100644
index e4ef516..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirLTR-anchorStart-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirRTL-anchorEnd-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirRTL-anchorEnd-expected.png
deleted file mode 100644
index e4ef516..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirRTL-anchorEnd-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirRTL-anchorMiddle-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirRTL-anchorMiddle-expected.png
deleted file mode 100644
index f57645c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirRTL-anchorMiddle-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirRTL-anchorStart-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirRTL-anchorStart-expected.png
deleted file mode 100644
index 844e525..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-inherited-dirRTL-anchorStart-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-no-markup-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-no-markup-expected.png
deleted file mode 100644
index e4ef516..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-anchor-no-markup-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirLTR-ubNone-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirLTR-ubNone-expected.png
deleted file mode 100644
index c8733fb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirLTR-ubNone-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirLTR-ubOverride-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirLTR-ubOverride-expected.png
deleted file mode 100644
index 01f9c9a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirLTR-ubOverride-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirRTL-ubNone-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirRTL-ubNone-expected.png
deleted file mode 100644
index d1c1fae..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirRTL-ubNone-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirRTL-ubOverride-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirRTL-ubOverride-expected.png
deleted file mode 100644
index 3c2efec..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirRTL-ubOverride-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubEmbed-in-rtl-context-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubEmbed-in-rtl-context-expected.png
deleted file mode 100644
index 70d259a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubEmbed-in-rtl-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubNone-in-rtl-context-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubNone-in-rtl-context-expected.png
deleted file mode 100644
index 7fa104d4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubNone-in-rtl-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubOverride-in-default-context-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubOverride-in-default-context-expected.png
deleted file mode 100644
index d9279298..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubOverride-in-default-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubOverride-in-ltr-context-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubOverride-in-ltr-context-expected.png
deleted file mode 100644
index d9279298..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubOverride-in-ltr-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubOverride-in-rtl-context-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubOverride-in-rtl-context-expected.png
deleted file mode 100644
index 77e31e55..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirLTR-ubOverride-in-rtl-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirNone-ubOverride-in-default-context-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirNone-ubOverride-in-default-context-expected.png
deleted file mode 100644
index fe4887f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirNone-ubOverride-in-default-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirNone-ubOverride-in-ltr-context-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirNone-ubOverride-in-ltr-context-expected.png
deleted file mode 100644
index fe4887f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirNone-ubOverride-in-ltr-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirNone-ubOverride-in-rtl-context-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirNone-ubOverride-in-rtl-context-expected.png
deleted file mode 100644
index 688133d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirNone-ubOverride-in-rtl-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-default-context-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-default-context-expected.png
deleted file mode 100644
index 7a8278b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-default-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-ltr-context-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-ltr-context-expected.png
deleted file mode 100644
index 7a8278b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-ltr-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubNone-in-default-context-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubNone-in-default-context-expected.png
deleted file mode 100644
index bc7df194..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubNone-in-default-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubNone-in-ltr-context-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubNone-in-ltr-context-expected.png
deleted file mode 100644
index bc7df194..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubNone-in-ltr-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-default-context-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-default-context-expected.png
deleted file mode 100644
index 2b9fd3e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-default-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-ltr-context-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-ltr-context-expected.png
deleted file mode 100644
index 2b9fd3e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-ltr-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-rtl-context-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-rtl-context-expected.png
deleted file mode 100644
index 988caf9..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-rtl-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-direction-ltr-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-direction-ltr-expected.png
deleted file mode 100644
index 3363f95..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-direction-ltr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-direction-rtl-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-direction-rtl-expected.png
deleted file mode 100644
index f8f917d0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-direction-rtl-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-dom-03-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-dom-03-f-expected.png
deleted file mode 100644
index 2865789..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-dom-03-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-dom-04-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-dom-04-f-expected.png
deleted file mode 100644
index 4dda94c2..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-dom-04-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-units-03-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-units-03-b-expected.png
deleted file mode 100644
index 993849e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-units-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png
deleted file mode 100644
index 886de86b7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.png
deleted file mode 100644
index 32c81ed..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-05-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-05-f-expected.png
deleted file mode 100644
index a179624..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-05-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/interact-pointer-03-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/interact-pointer-03-t-expected.png
deleted file mode 100644
index 4c13119..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/interact-pointer-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png
deleted file mode 100644
index dea6178..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png
deleted file mode 100644
index 7701847..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.png
deleted file mode 100644
index 0da079f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/pservers-pattern-04-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/pservers-pattern-04-f-expected.png
deleted file mode 100644
index cdd4f915..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/pservers-pattern-04-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/struct-dom-11-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/struct-dom-11-f-expected.png
deleted file mode 100644
index 72fcd9e9..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/struct-dom-11-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/struct-use-14-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/struct-use-14-f-expected.png
deleted file mode 100644
index 4b30713..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/struct-use-14-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/styling-css-04-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/styling-css-04-f-expected.png
deleted file mode 100644
index 25ddfe55..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/styling-css-04-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/styling-pres-02-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/styling-pres-02-f-expected.png
deleted file mode 100644
index 7462619..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/styling-pres-02-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/svgdom-over-01-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/svgdom-over-01-f-expected.png
deleted file mode 100644
index f78305d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/svgdom-over-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-02-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-02-b-expected.png
deleted file mode 100644
index e6c2af3..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-05-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-05-t-expected.png
deleted file mode 100644
index f77bc43..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-09-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-09-b-expected.png
deleted file mode 100644
index 0a80a55..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-09-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-tspan-02-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-tspan-02-b-expected.png
deleted file mode 100644
index 3682c55..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-tspan-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png
deleted file mode 100644
index e527d20..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-02-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-02-f-expected.png
deleted file mode 100644
index 2c924969..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-02-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-04-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-04-b-expected.png
deleted file mode 100644
index c7d44f4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-05-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-05-b-expected.png
deleted file mode 100644
index addc666..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-07-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-07-f-expected.png
deleted file mode 100644
index 02e5809..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-07-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-03-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-03-t-expected.png
deleted file mode 100644
index 82b919c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-04-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-04-t-expected.png
deleted file mode 100644
index 57630f2..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-05-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-05-t-expected.png
deleted file mode 100644
index 1f106cd7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-06-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-06-t-expected.png
deleted file mode 100644
index cb210dd..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-06-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-07-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-07-t-expected.png
deleted file mode 100644
index 90ec653..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-07-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-08-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-08-t-expected.png
deleted file mode 100644
index a00d41a4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-08-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-09-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-09-t-expected.png
deleted file mode 100644
index fb532a0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-09-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-10-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-10-t-expected.png
deleted file mode 100644
index bb4f838..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-10-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-11-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-11-t-expected.png
deleted file mode 100644
index 4c400be..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-11-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-12-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-12-t-expected.png
deleted file mode 100644
index bb4f838..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-12-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-13-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-13-t-expected.png
deleted file mode 100644
index 046d065..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-13-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-20-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-20-t-expected.png
deleted file mode 100644
index a61a8ae..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-20-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-21-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-21-t-expected.png
deleted file mode 100644
index a61a8ae..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-21-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-22-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-22-b-expected.png
deleted file mode 100644
index ec3b0cdb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-22-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-23-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-23-t-expected.png
deleted file mode 100644
index d067d1e0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-23-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-24-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-24-t-expected.png
deleted file mode 100644
index e36474d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-24-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-25-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-25-t-expected.png
deleted file mode 100644
index 0a5c668f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-25-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-26-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-26-t-expected.png
deleted file mode 100644
index 63720a9..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-26-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-27-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-27-t-expected.png
deleted file mode 100644
index 218504e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-27-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-28-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-28-t-expected.png
deleted file mode 100644
index 80e1058d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-28-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-29-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-29-b-expected.png
deleted file mode 100644
index 47ff381..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-29-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png
deleted file mode 100644
index a7b5502..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-31-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-31-t-expected.png
deleted file mode 100644
index 5bdb9cf1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-31-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-32-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-32-t-expected.png
deleted file mode 100644
index 984c765..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-32-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-33-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-33-t-expected.png
deleted file mode 100644
index 428c9a5e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-33-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-34-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-34-t-expected.png
deleted file mode 100644
index d08f5a7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-34-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-36-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-36-t-expected.png
deleted file mode 100644
index b8f3d64..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-36-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png
deleted file mode 100644
index 2eaa0ca..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png
deleted file mode 100644
index 411e8d8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-40-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-40-t-expected.png
deleted file mode 100644
index ba3b335..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-40-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-41-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-41-t-expected.png
deleted file mode 100644
index 2c928dd..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-41-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-44-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-44-t-expected.png
deleted file mode 100644
index a8c68cde..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-44-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-46-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-46-t-expected.png
deleted file mode 100644
index 74962cc..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-46-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png
deleted file mode 100644
index a68550b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-60-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-60-t-expected.png
deleted file mode 100644
index 7997495..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-60-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-61-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-61-t-expected.png
deleted file mode 100644
index 7de62101..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-61-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-62-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-62-t-expected.png
deleted file mode 100644
index 4acf09e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-62-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-63-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-63-t-expected.png
deleted file mode 100644
index 322399e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-63-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-64-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-64-t-expected.png
deleted file mode 100644
index 18d26a77..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-64-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-65-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-65-t-expected.png
deleted file mode 100644
index e04218f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-65-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-66-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-66-t-expected.png
deleted file mode 100644
index d6c8e52..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-66-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-67-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-67-t-expected.png
deleted file mode 100644
index 77f1160..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-67-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-68-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-68-t-expected.png
deleted file mode 100644
index 5f31c21..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-68-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-69-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-69-t-expected.png
deleted file mode 100644
index a6dfa7d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-69-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-70-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-70-t-expected.png
deleted file mode 100644
index fbacce4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-70-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-77-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-77-t-expected.png
deleted file mode 100644
index 9657c44..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-77-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-78-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-78-t-expected.png
deleted file mode 100644
index 8120d14..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-78-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png
deleted file mode 100644
index ce3f15a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-81-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-81-t-expected.png
deleted file mode 100644
index 1406aa5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-81-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-82-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-82-t-expected.png
deleted file mode 100644
index 3f34042..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-82-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png
deleted file mode 100644
index 2c63193c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-84-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-84-t-expected.png
deleted file mode 100644
index d1f03c4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-84-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-85-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-85-t-expected.png
deleted file mode 100644
index 2cb702b3..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-85-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prof-01-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prof-01-f-expected.png
deleted file mode 100644
index ae046dd0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prof-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prop-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prop-01-b-expected.png
deleted file mode 100644
index 087fd85..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prop-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prop-02-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prop-02-f-expected.png
deleted file mode 100644
index 794e40c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prop-02-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prop-03-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prop-03-t-expected.png
deleted file mode 100644
index 0aaddb6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/color-prop-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-coord-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-coord-01-t-expected.png
deleted file mode 100644
index e05d7b3f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-coord-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-coord-02-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-coord-02-t-expected.png
deleted file mode 100644
index e05d7b3f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-coord-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-01-b-expected.png
deleted file mode 100644
index 856c75f1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-02-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-02-t-expected.png
deleted file mode 100644
index a28e7db..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-03-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-03-t-expected.png
deleted file mode 100644
index fa39d5a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-04-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-04-t-expected.png
deleted file mode 100644
index 4a0a12a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-05-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-05-t-expected.png
deleted file mode 100644
index 310a14d8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-06-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-06-t-expected.png
deleted file mode 100644
index fea2492..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-trans-06-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-units-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-units-01-b-expected.png
deleted file mode 100644
index 49bf70d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-units-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-units-02-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-units-02-b-expected.png
deleted file mode 100644
index 8794822..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-units-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.png
deleted file mode 100644
index 2b1f3bb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.png
deleted file mode 100644
index a280444..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png
deleted file mode 100644
index 9cd9863..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png
deleted file mode 100644
index 251f420..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-blend-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-blend-01-b-expected.png
deleted file mode 100644
index bcd57c4b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-blend-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-color-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-color-01-b-expected.png
deleted file mode 100644
index c73dd3d5b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-color-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-composite-02-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-composite-02-b-expected.png
deleted file mode 100644
index c606f4ec..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-composite-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.png
deleted file mode 100644
index 081fa36..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.png
deleted file mode 100644
index 8aa571f6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-diffuse-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-example-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-example-01-b-expected.png
deleted file mode 100644
index f4107f6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-example-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.png
deleted file mode 100644
index 382dd0e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-image-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-image-01-b-expected.png
deleted file mode 100644
index 9912c71..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-image-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-light-01-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-light-01-f-expected.png
deleted file mode 100644
index a6bcaf4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-light-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-light-04-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-light-04-f-expected.png
deleted file mode 100644
index 13cbdf7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-light-04-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-offset-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-offset-01-b-expected.png
deleted file mode 100644
index 9db6e597..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-offset-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-specular-01-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-specular-01-f-expected.png
deleted file mode 100644
index 3e60310..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-specular-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-tile-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-tile-01-b-expected.png
deleted file mode 100644
index 1d6bb2a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-tile-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-turb-01-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-turb-01-f-expected.png
deleted file mode 100644
index 163ac50..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-turb-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-turb-02-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-turb-02-f-expected.png
deleted file mode 100644
index 80017ff7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-turb-02-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/fonts-elem-03-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/fonts-elem-03-b-expected.png
deleted file mode 100644
index 3187d9d7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/fonts-elem-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.png
deleted file mode 100644
index 5ce1be8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/fonts-elem-07-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/fonts-elem-07-b-expected.png
deleted file mode 100644
index 64d9a3f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/fonts-elem-07-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.png
deleted file mode 100644
index 8327144..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-dom-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-dom-01-b-expected.png
deleted file mode 100644
index b0cfa789..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-dom-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-events-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-events-01-b-expected.png
deleted file mode 100644
index a6d84d8e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-events-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-order-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-order-01-b-expected.png
deleted file mode 100644
index 7ebf91a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-order-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-order-02-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-order-02-b-expected.png
deleted file mode 100644
index d862a06..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-order-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-order-03-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-order-03-b-expected.png
deleted file mode 100644
index 6eeebd94..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-order-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.png
deleted file mode 100644
index 0f7032f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-01-b-expected.png
deleted file mode 100644
index 3bc6472..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-02-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-02-b-expected.png
deleted file mode 100644
index 4d3bc3a7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-03-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-03-b-expected.png
deleted file mode 100644
index 1d00c09..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-04-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-04-t-expected.png
deleted file mode 100644
index ccdc0ae..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-05-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-05-t-expected.png
deleted file mode 100644
index 697f00c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-07-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-07-t-expected.png
deleted file mode 100644
index 5268d0f4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-a-07-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-uri-02-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-uri-02-b-expected.png
deleted file mode 100644
index b8a1d29..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-uri-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-uri-03-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-uri-03-t-expected.png
deleted file mode 100644
index d033a8a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/linking-uri-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png
deleted file mode 100644
index bb96c69..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png
deleted file mode 100644
index 225e5bf..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-opacity-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-opacity-01-b-expected.png
deleted file mode 100644
index b4067043..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-opacity-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-01-b-expected.png
deleted file mode 100644
index 62e62416e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-02-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-02-b-expected.png
deleted file mode 100644
index 41696c9..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-03-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-03-b-expected.png
deleted file mode 100644
index e11cedc..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-04-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-04-b-expected.png
deleted file mode 100644
index acec20a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-05-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-05-f-expected.png
deleted file mode 100644
index 4738266..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-05-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png
deleted file mode 100644
index cf9b8d4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-01-t-expected.png
deleted file mode 100644
index 0e9d4b3..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-02-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-02-t-expected.png
deleted file mode 100644
index b112e32..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-03-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-03-t-expected.png
deleted file mode 100644
index f5dfd72..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-04-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-04-t-expected.png
deleted file mode 100644
index 03693333..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-05-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-05-b-expected.png
deleted file mode 100644
index 5742b6a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-fill-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png
deleted file mode 100644
index 9f85819d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png
deleted file mode 100644
index 8ad8c67..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png
deleted file mode 100644
index 099dae0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-render-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-render-01-b-expected.png
deleted file mode 100644
index a898084..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-render-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-01-t-expected.png
deleted file mode 100644
index b749642..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-02-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-02-t-expected.png
deleted file mode 100644
index 4a915c33..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.png
deleted file mode 100644
index e54dee5a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-04-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-04-t-expected.png
deleted file mode 100644
index 3966ce8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png
deleted file mode 100644
index f9d1bda..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-01-t-expected.png
deleted file mode 100644
index 5e7df2fb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-02-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-02-t-expected.png
deleted file mode 100644
index 80e4719f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-03-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-03-f-expected.png
deleted file mode 100644
index 5df7eac7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-03-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-04-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-04-t-expected.png
deleted file mode 100644
index 67dc9685..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-05-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-05-t-expected.png
deleted file mode 100644
index cd39816c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-06-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-06-t-expected.png
deleted file mode 100644
index 4cb83f49..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-06-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-07-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-07-t-expected.png
deleted file mode 100644
index 17eb19ad78..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-07-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-08-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-08-t-expected.png
deleted file mode 100644
index 0d57c1e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-08-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-09-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-09-t-expected.png
deleted file mode 100644
index ac8cbe9..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-09-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-10-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-10-t-expected.png
deleted file mode 100644
index 8c75c0e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-10-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-12-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-12-t-expected.png
deleted file mode 100644
index fb6781f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-12-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-13-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-13-t-expected.png
deleted file mode 100644
index 8c18076..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-13-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-14-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-14-t-expected.png
deleted file mode 100644
index f36e3bc..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-14-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-15-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-15-t-expected.png
deleted file mode 100644
index abafe95d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/paths-data-15-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-01-b-expected.png
deleted file mode 100644
index 2749fde..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-02-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-02-b-expected.png
deleted file mode 100644
index 1df906a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-03-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-03-b-expected.png
deleted file mode 100644
index 093be03f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-04-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-04-b-expected.png
deleted file mode 100644
index 443a0e3..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
deleted file mode 100644
index 74d48502..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.png
deleted file mode 100644
index e6290b90..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-07-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-07-b-expected.png
deleted file mode 100644
index 6156aff..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-07-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-08-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-08-b-expected.png
deleted file mode 100644
index 13eed111..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-08-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-09-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-09-b-expected.png
deleted file mode 100644
index 81a4112..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-09-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-10-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-10-b-expected.png
deleted file mode 100644
index 039ca34..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-10-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-11-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-11-b-expected.png
deleted file mode 100644
index 0ac789d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-11-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-12-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-12-b-expected.png
deleted file mode 100644
index 58531b1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-12-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-13-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-13-b-expected.png
deleted file mode 100644
index ccd7d42..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-13-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-14-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-14-b-expected.png
deleted file mode 100644
index 6840615..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-14-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-15-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-15-b-expected.png
deleted file mode 100644
index 651b0f07..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-15-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-16-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-16-b-expected.png
deleted file mode 100644
index 6b1eaff..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-16-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-18-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-18-b-expected.png
deleted file mode 100644
index 319730b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-18-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-19-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-19-b-expected.png
deleted file mode 100644
index c1c8f03..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-19-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-pattern-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-pattern-01-b-expected.png
deleted file mode 100644
index 11a93cb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-pattern-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-01-t-expected.png
deleted file mode 100644
index f2deb6f10..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-02-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-02-t-expected.png
deleted file mode 100644
index 249871a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-03-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-03-t-expected.png
deleted file mode 100644
index 36e3232..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-06-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-06-t-expected.png
deleted file mode 100644
index 5583176..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-06-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-07-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-07-t-expected.png
deleted file mode 100644
index db52e31..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-07-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-08-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-08-t-expected.png
deleted file mode 100644
index 7dccb87..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-elems-08-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-groups-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-groups-01-b-expected.png
deleted file mode 100644
index 7b4591b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-groups-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-groups-03-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-groups-03-t-expected.png
deleted file mode 100644
index 888b59c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/render-groups-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-01-b-expected.png
deleted file mode 100644
index ff611592..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-02-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-02-b-expected.png
deleted file mode 100644
index b54b08c2..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-03-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-03-b-expected.png
deleted file mode 100644
index 7f7e581c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-04-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-04-b-expected.png
deleted file mode 100644
index 49d4a98..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/script-handle-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.png
deleted file mode 100644
index 240aebe5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.png
deleted file mode 100644
index 879cab1f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.png
deleted file mode 100644
index b8a31acf..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.png
deleted file mode 100644
index ea43f92f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-intro-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-intro-01-t-expected.png
deleted file mode 100644
index 9cb8fd2..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-intro-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-line-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-line-01-t-expected.png
deleted file mode 100644
index e30ad7d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-line-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.png
deleted file mode 100644
index 7fd8029..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.png
deleted file mode 100644
index e3d62bcf..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-rect-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-rect-01-t-expected.png
deleted file mode 100644
index 655e875..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-rect-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-rect-02-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-rect-02-t-expected.png
deleted file mode 100644
index 793dc003..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/shapes-rect-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-cond-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-cond-01-t-expected.png
deleted file mode 100644
index ffba81ad..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-cond-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-cond-02-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-cond-02-t-expected.png
deleted file mode 100644
index 93cc1dc..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-cond-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-cond-03-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-cond-03-t-expected.png
deleted file mode 100644
index ef4857f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-cond-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-defs-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-defs-01-t-expected.png
deleted file mode 100644
index 047fa0e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-defs-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-01-b-expected.png
deleted file mode 100644
index ac32228..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-02-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-02-b-expected.png
deleted file mode 100644
index 4aa6adc..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-03-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-03-b-expected.png
deleted file mode 100644
index 176f6b3f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-04-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-04-b-expected.png
deleted file mode 100644
index cb620abc..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-05-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-05-b-expected.png
deleted file mode 100644
index f9cc1bb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-06-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-06-b-expected.png
deleted file mode 100644
index f7b4159..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-dom-06-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-02-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-02-t-expected.png
deleted file mode 100644
index ed6c66d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-03-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-03-t-expected.png
deleted file mode 100644
index 76b0b73..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-05-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-05-t-expected.png
deleted file mode 100644
index f7ee28559..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png
deleted file mode 100644
index 39b2085..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-group-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-group-01-t-expected.png
deleted file mode 100644
index f3be6c5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-group-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-group-02-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-group-02-b-expected.png
deleted file mode 100644
index 8cc14c7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-group-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-group-03-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-group-03-t-expected.png
deleted file mode 100644
index 775ebd4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-group-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-01-t-expected.png
deleted file mode 100644
index 1e41db4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-02-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-02-b-expected.png
deleted file mode 100644
index bbf520c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-03-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-03-t-expected.png
deleted file mode 100644
index de73257..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-04-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-04-t-expected.png
deleted file mode 100644
index fd98c08..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-05-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-05-b-expected.png
deleted file mode 100644
index 3a73071..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-06-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-06-t-expected.png
deleted file mode 100644
index 884e3cd..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-06-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-08-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-08-t-expected.png
deleted file mode 100644
index 437fa8d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-08-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-09-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-09-t-expected.png
deleted file mode 100644
index fb65ef8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-09-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-10-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-10-t-expected.png
deleted file mode 100644
index 8b39c88..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-10-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-symbol-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-symbol-01-b-expected.png
deleted file mode 100644
index 53a0a6d0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-symbol-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-use-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-use-01-t-expected.png
deleted file mode 100644
index 940f8d7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-use-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-use-03-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-use-03-t-expected.png
deleted file mode 100644
index d4ff6c6e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-use-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-use-05-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-use-05-b-expected.png
deleted file mode 100644
index 795bb614..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-use-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-01-b-expected.png
deleted file mode 100644
index 1fde82a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-02-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-02-b-expected.png
deleted file mode 100644
index af70a37..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-03-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-03-b-expected.png
deleted file mode 100644
index 3ea2836..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-05-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-05-b-expected.png
deleted file mode 100644
index 80276e38..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-06-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-06-b-expected.png
deleted file mode 100644
index d56481c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-css-06-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-pres-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-pres-01-t-expected.png
deleted file mode 100644
index 441c30c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-pres-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-01-b-expected.png
deleted file mode 100644
index 897793b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-02-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-02-b-expected.png
deleted file mode 100644
index e3e1697..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-03-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-03-b-expected.png
deleted file mode 100644
index ac4064c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-04-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-04-b-expected.png
deleted file mode 100644
index 79f891d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-05-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-05-b-expected.png
deleted file mode 100644
index 48b0f93c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-06-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-06-b-expected.png
deleted file mode 100644
index 7aa1a04..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-06-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-08-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-08-b-expected.png
deleted file mode 100644
index 40da1e1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-align-08-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-deco-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-deco-01-b-expected.png
deleted file mode 100644
index 7de647e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-deco-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png
deleted file mode 100644
index 254f771..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-fonts-02-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-fonts-02-t-expected.png
deleted file mode 100644
index 53e0acc..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-fonts-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-01-t-expected.png
deleted file mode 100644
index a5cdb4c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-03-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-03-b-expected.png
deleted file mode 100644
index 0a75a857..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-04-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-04-t-expected.png
deleted file mode 100644
index 038dad2..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-path-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-path-01-b-expected.png
deleted file mode 100644
index 3ae68db3..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-path-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-spacing-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-spacing-01-b-expected.png
deleted file mode 100644
index 535e99c2..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-spacing-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-01-b-expected.png
deleted file mode 100644
index fcbccabf..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-03-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-03-b-expected.png
deleted file mode 100644
index ec35423..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-04-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-04-t-expected.png
deleted file mode 100644
index 67c29df..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-05-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-05-t-expected.png
deleted file mode 100644
index f5bd5ca..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-06-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-06-t-expected.png
deleted file mode 100644
index 388d014..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-06-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-07-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-07-t-expected.png
deleted file mode 100644
index b350f93..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-07-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-08-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-08-b-expected.png
deleted file mode 100644
index e98d4af5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-08-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tselect-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tselect-01-b-expected.png
deleted file mode 100644
index 5e49018..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tselect-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tselect-02-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tselect-02-f-expected.png
deleted file mode 100644
index 73785f2..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tselect-02-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tspan-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tspan-01-b-expected.png
deleted file mode 100644
index c9e5c37..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tspan-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-ws-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-ws-01-t-expected.png
deleted file mode 100644
index 5e01b4e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-ws-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-ws-02-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-ws-02-t-expected.png
deleted file mode 100644
index c110504..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-ws-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png
deleted file mode 100644
index 32ed753..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png
deleted file mode 100644
index f3b6cfd..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png
deleted file mode 100644
index d3a26403..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/as-background-image/animated-svg-as-background-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/as-background-image/animated-svg-as-background-expected.png
deleted file mode 100644
index 9d269f8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/as-background-image/animated-svg-as-background-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-3-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-3-expected.png
deleted file mode 100644
index df70ddad..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-5-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-5-expected.png
deleted file mode 100644
index 29c48dd..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-5-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/as-image/image-respects-pageScaleFactor-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/as-image/image-respects-pageScaleFactor-expected.png
deleted file mode 100644
index 4a53aa4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/as-image/image-respects-pageScaleFactor-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/filters/feTile-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/filters/feTile-expected.png
deleted file mode 100644
index 667405e9..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/filters/feTile-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/paints/gradientLimit-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/paints/gradientLimit-expected.png
deleted file mode 100644
index ac9d817..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/paints/gradientLimit-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/paints/patternPreserveAspectRatioA-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/paints/patternPreserveAspectRatioA-expected.png
deleted file mode 100644
index 24d6cd4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/paints/patternPreserveAspectRatioA-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/paints/patternRegionA-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/paints/patternRegionA-expected.png
deleted file mode 100644
index a5f97e7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/paints/patternRegionA-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/paints/patternRegions-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/paints/patternRegions-expected.png
deleted file mode 100644
index 76e2dd1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/paints/patternRegions-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/paints/patternRegions-positioned-objects-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/paints/patternRegions-positioned-objects-expected.png
deleted file mode 100644
index 97b33cd..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/paints/patternRegions-positioned-objects-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/longTextOnPath-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/longTextOnPath-expected.png
deleted file mode 100644
index f6c654d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/longTextOnPath-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/smallFonts-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/smallFonts-expected.png
deleted file mode 100644
index 40fceca..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/smallFonts-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textAnchor-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textAnchor-expected.png
deleted file mode 100644
index 3a0cfa4e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textAnchor-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textAnchor2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textAnchor2-expected.png
deleted file mode 100644
index 9720e1ad..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textAnchor2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textAnchor3-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textAnchor3-expected.png
deleted file mode 100644
index 12a02f1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textAnchor3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textDecoration-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textDecoration-expected.png
deleted file mode 100644
index 672be48..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textDecoration-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textEffect2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textEffect2-expected.png
deleted file mode 100644
index bd945ee..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textEffect2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textEffect3-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textEffect3-expected.png
deleted file mode 100644
index 0938313e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textEffect3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textFeatures-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textFeatures-expected.png
deleted file mode 100644
index 0486eac..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textFeatures-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textGlyphOrientationHorizontal-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textGlyphOrientationHorizontal-expected.png
deleted file mode 100644
index 95a36575..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textGlyphOrientationHorizontal-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textLength-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textLength-expected.png
deleted file mode 100644
index 8ba02eb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textLength-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textOnPath-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textOnPath-expected.png
deleted file mode 100644
index c859921..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textOnPath-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textOnPath2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textOnPath2-expected.png
deleted file mode 100644
index 3f158a238..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textOnPath2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textOnPath3-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textOnPath3-expected.png
deleted file mode 100644
index 3fa3580..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textOnPath3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textOnPathSpaces-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textOnPathSpaces-expected.png
deleted file mode 100644
index 1f3fb3a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textOnPathSpaces-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textPosition-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textPosition-expected.png
deleted file mode 100644
index 5a27444..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textPosition-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textProperties-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textProperties-expected.png
deleted file mode 100644
index b2e6612..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/textProperties-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/verticalTextOnPath-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/verticalTextOnPath-expected.png
deleted file mode 100644
index 09b8efa1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/verticalTextOnPath-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/xmlSpace-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/xmlSpace-expected.png
deleted file mode 100644
index 644b51a6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/batik/text/xmlSpace-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/carto.net/colourpicker-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/carto.net/colourpicker-expected.png
deleted file mode 100644
index 42a51e1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/carto.net/colourpicker-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/carto.net/textbox-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/carto.net/textbox-expected.png
deleted file mode 100644
index 0d3ba14..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/carto.net/textbox-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/clip-path/clip-path-text-and-shape-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/clip-path/clip-path-text-and-shape-expected.png
deleted file mode 100644
index 90edd14..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/clip-path/clip-path-text-and-shape-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/clip-path/clip-path-text-and-stroke-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/clip-path/clip-path-text-and-stroke-expected.png
deleted file mode 100644
index 23634b1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/clip-path/clip-path-text-and-stroke-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/clip-path/clip-path-text-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/clip-path/clip-path-text-expected.png
deleted file mode 100644
index 9552585..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/clip-path/clip-path-text-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/clip-path/clip-path-tspan-and-stroke-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/clip-path/clip-path-tspan-and-stroke-expected.png
deleted file mode 100644
index 23634b1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/clip-path/clip-path-tspan-and-stroke-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/css/alignment-baseline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/css/alignment-baseline-expected.png
deleted file mode 100644
index 0de167a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/css/alignment-baseline-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/css/text-gradient-shadow-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/css/text-gradient-shadow-expected.png
deleted file mode 100644
index 5b18b14b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/css/text-gradient-shadow-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/css/text-shadow-multiple-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/css/text-shadow-multiple-expected.png
deleted file mode 100644
index ef5bceb6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/css/text-shadow-multiple-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/SVGPoint-matrixTransform-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/SVGPoint-matrixTransform-expected.png
deleted file mode 100644
index c1abb12..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/SVGPoint-matrixTransform-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/foreign-object-skew-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/foreign-object-skew-expected.png
deleted file mode 100644
index b6c0f5e3..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/foreign-object-skew-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/image-parent-translation-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/image-parent-translation-expected.png
deleted file mode 100644
index 345eaa2..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/image-parent-translation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/image-small-width-height-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/image-small-width-height-expected.png
deleted file mode 100644
index 4ac0cc8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/image-small-width-height-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/invalid-css-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/invalid-css-expected.png
deleted file mode 100644
index 0de0f9e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/invalid-css-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/linking-a-03-b-viewBox-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/linking-a-03-b-viewBox-expected.png
deleted file mode 100644
index 4e1e081..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/linking-a-03-b-viewBox-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/linking-a-03-b-viewBox-transform-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/linking-a-03-b-viewBox-transform-expected.png
deleted file mode 100644
index 89b18a75..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/linking-a-03-b-viewBox-transform-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/linking-uri-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/linking-uri-01-b-expected.png
deleted file mode 100644
index b43852e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/linking-uri-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/marker-default-width-height-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/marker-default-width-height-expected.png
deleted file mode 100644
index 32a6455..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/marker-default-width-height-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/object-sizing-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/object-sizing-expected.png
deleted file mode 100644
index a31fa458..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/object-sizing-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/pattern-rotate-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/pattern-rotate-expected.png
deleted file mode 100644
index a3b67242..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/pattern-rotate-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/pattern-with-transformation-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/pattern-with-transformation-expected.png
deleted file mode 100644
index 36006747..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/pattern-with-transformation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/shapes-supporting-markers-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/shapes-supporting-markers-expected.png
deleted file mode 100644
index 6f0538be..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/shapes-supporting-markers-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/stroked-pattern-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/stroked-pattern-expected.png
deleted file mode 100644
index b6af9b3..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/stroked-pattern-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/svg-fonts-in-html-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/svg-fonts-in-html-expected.png
deleted file mode 100644
index 855f022..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/svg-fonts-in-html-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/svg-fonts-with-no-element-reference-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/svg-fonts-with-no-element-reference-expected.png
deleted file mode 100644
index fe3f7fa..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/svg-fonts-with-no-element-reference-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-ctm-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-ctm-expected.png
deleted file mode 100644
index 6c434f8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-ctm-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-filter-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-filter-expected.png
deleted file mode 100644
index bb74560..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-filter-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-hit-test-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-hit-test-expected.png
deleted file mode 100644
index 9cfa3c7b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-hit-test-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-match-highlight-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-match-highlight-expected.png
deleted file mode 100644
index ba8d8e1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-match-highlight-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-rotated-gradient-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-rotated-gradient-expected.png
deleted file mode 100644
index c2aa485..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-rotated-gradient-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-rotation-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-rotation-expected.png
deleted file mode 100644
index c449ea8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-rotation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-whitespace-handling-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-whitespace-handling-expected.png
deleted file mode 100644
index 3a787ac..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-whitespace-handling-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-x-dy-lists-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-x-dy-lists-expected.png
deleted file mode 100644
index 8f8632a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/text-x-dy-lists-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-events-crash-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-events-crash-expected.png
deleted file mode 100644
index b0dfba7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-events-crash-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-modify-container-in-target-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-modify-container-in-target-expected.png
deleted file mode 100644
index b7083b4e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-modify-container-in-target-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-modify-target-container-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-modify-target-container-expected.png
deleted file mode 100644
index 9e78d7a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-modify-target-container-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-modify-target-symbol-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-modify-target-symbol-expected.png
deleted file mode 100644
index 3a4124b4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-modify-target-symbol-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-1-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-1-expected.png
deleted file mode 100644
index fc25c8f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-2-expected.png
deleted file mode 100644
index fc25c8f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-3-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-3-expected.png
deleted file mode 100644
index fc25c8f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-4-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-4-expected.png
deleted file mode 100644
index fc25c8f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-4-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-5-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-5-expected.png
deleted file mode 100644
index fc25c8f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-5-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-6-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-6-expected.png
deleted file mode 100644
index fc25c8f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-disallowed-foreign-object-6-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-g-containing-use-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-g-containing-use-expected.png
deleted file mode 100644
index 3d0e84f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-g-containing-use-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-g-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-g-expected.png
deleted file mode 100644
index 6b37f1c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-g-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-non-svg-namespaced-element-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-non-svg-namespaced-element-expected.png
deleted file mode 100644
index fc25c8f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-non-svg-namespaced-element-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-rect-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-rect-expected.png
deleted file mode 100644
index eec9fcd..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-rect-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-symbol-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-symbol-expected.png
deleted file mode 100644
index eec9fcd..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-symbol-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-symbol-inside-pattern-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-symbol-inside-pattern-expected.png
deleted file mode 100644
index d16f854..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-symbol-inside-pattern-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-text-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-text-expected.png
deleted file mode 100644
index eec4f10a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-text-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-use-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-use-expected.png
deleted file mode 100644
index 6b37f1c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-on-use-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-recursion-1-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-recursion-1-expected.png
deleted file mode 100644
index 206ad1c0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-recursion-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-recursion-2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-recursion-2-expected.png
deleted file mode 100644
index 1c96818..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-recursion-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-recursion-3-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-recursion-3-expected.png
deleted file mode 100644
index 206ad1c0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-recursion-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-recursion-4-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-recursion-4-expected.png
deleted file mode 100644
index 206ad1c0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-recursion-4-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-transform-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-transform-expected.png
deleted file mode 100644
index ceba02a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/custom/use-transform-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/error/010-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/error/010-expected.png
deleted file mode 100644
index 20a295e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/error/010-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/error/011-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/error/011-expected.png
deleted file mode 100644
index 20a295e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/error/011-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/links/002-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/links/002-expected.png
deleted file mode 100644
index 7364884..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/links/002-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/mixed/008-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/mixed/008-expected.png
deleted file mode 100644
index e71b4b4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/mixed/008-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/text/002-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/text/002-expected.png
deleted file mode 100644
index 2a1cd61..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/text/002-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/viewbox/preserveAspectRatio/001-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/viewbox/preserveAspectRatio/001-expected.png
deleted file mode 100644
index 9f8b65c5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/viewbox/preserveAspectRatio/001-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/viewbox/preserveAspectRatio/002-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/viewbox/preserveAspectRatio/002-expected.png
deleted file mode 100644
index 050021683..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/hixie/viewbox/preserveAspectRatio/002-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-expected.png
deleted file mode 100644
index 5bb3c45..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-zoomed-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-zoomed-expected.png
deleted file mode 100644
index 5121006..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-zoomed-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/bidi-reorder-in-text-chunks-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/bidi-reorder-in-text-chunks-expected.png
deleted file mode 100644
index 9832e901..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/bidi-reorder-in-text-chunks-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/bidi-textlength-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/bidi-textlength-expected.png
deleted file mode 100644
index 3e2d0c3..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/bidi-textlength-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/combining-character-queries-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/combining-character-queries-expected.png
deleted file mode 100644
index 7a6eab39..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/combining-character-queries-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/current-text-position-initial-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/current-text-position-initial-expected.png
deleted file mode 100644
index 006c20e0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/current-text-position-initial-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/foreignObject-repaint-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/foreignObject-repaint-expected.png
deleted file mode 100644
index 8096e35..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/foreignObject-repaint-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/ligature-queries-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/ligature-queries-expected.png
deleted file mode 100644
index 6f69cea..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/ligature-queries-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-1-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-1-expected.png
deleted file mode 100644
index a781871..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-2-expected.png
deleted file mode 100644
index afcef4d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-3-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-3-expected.png
deleted file mode 100644
index d067c8a8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-4-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-4-expected.png
deleted file mode 100644
index 15b304c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-4-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-1-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-1-expected.png
deleted file mode 100644
index 4bc80b02..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-2-expected.png
deleted file mode 100644
index c3888dda7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-3-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-3-expected.png
deleted file mode 100644
index 4a85bee..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-4-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-4-expected.png
deleted file mode 100644
index 48fa434..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-4-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/selection-styles-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/selection-styles-expected.png
deleted file mode 100644
index 4e3b289a2..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/selection-styles-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/small-fonts-2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/small-fonts-2-expected.png
deleted file mode 100644
index 5ed36ea..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/small-fonts-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/small-fonts-3-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/small-fonts-3-expected.png
deleted file mode 100644
index fa6ba646..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/small-fonts-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/small-fonts-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/small-fonts-expected.png
deleted file mode 100644
index d639791..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/small-fonts-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/small-fonts-in-html5-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/small-fonts-in-html5-expected.png
deleted file mode 100644
index 7a0ec8f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/small-fonts-in-html5-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-decorations-in-scaled-pattern-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-decorations-in-scaled-pattern-expected.png
deleted file mode 100644
index 45bee97..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-decorations-in-scaled-pattern-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-fill-opacity-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-fill-opacity-expected.png
deleted file mode 100644
index a60f88f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-fill-opacity-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-gradient-positioning-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-gradient-positioning-expected.png
deleted file mode 100644
index bb253726..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-gradient-positioning-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-repaint-rects-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-repaint-rects-expected.png
deleted file mode 100644
index c24f832..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-repaint-rects-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-align-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-align-01-b-expected.png
deleted file mode 100644
index fb825150..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-align-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-align-02-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-align-02-b-expected.png
deleted file mode 100644
index d3c0fa5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-align-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-align-03-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-align-03-b-expected.png
deleted file mode 100644
index b4521ffa..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-align-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-align-04-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-align-04-b-expected.png
deleted file mode 100644
index d05c52cb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-align-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-align-05-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-align-05-b-expected.png
deleted file mode 100644
index e91d233..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-align-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-align-06-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-align-06-b-expected.png
deleted file mode 100644
index 92b69670..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-align-06-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-deco-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-deco-01-b-expected.png
deleted file mode 100644
index 22db64d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-deco-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-fonts-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-fonts-01-t-expected.png
deleted file mode 100644
index a3200e1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-fonts-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-fonts-02-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-fonts-02-t-expected.png
deleted file mode 100644
index a3bd8ff8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-fonts-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-intro-05-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-intro-05-t-expected.png
deleted file mode 100644
index 0144216..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-intro-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-path-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-path-01-b-expected.png
deleted file mode 100644
index 18955f78..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-path-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-spacing-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-spacing-01-b-expected.png
deleted file mode 100644
index e93198e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-spacing-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-text-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-text-01-b-expected.png
deleted file mode 100644
index 28626ab..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-text-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-text-03-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-text-03-b-expected.png
deleted file mode 100644
index 12becd2..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-text-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-text-04-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-text-04-t-expected.png
deleted file mode 100644
index 6565aac0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-text-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-text-06-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-text-06-t-expected.png
deleted file mode 100644
index 6317a92..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-text-06-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-text-07-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-text-07-t-expected.png
deleted file mode 100644
index cbc6c334..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-text-07-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-text-08-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-text-08-b-expected.png
deleted file mode 100644
index 22f2ef29..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-text-08-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-tselect-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-tselect-01-b-expected.png
deleted file mode 100644
index 8b7b718..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-tselect-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-tselect-02-f-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-tselect-02-f-expected.png
deleted file mode 100644
index af42392f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-tselect-02-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-tspan-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-tspan-01-b-expected.png
deleted file mode 100644
index 4bc4ec3..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-tspan-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-ws-01-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-ws-01-t-expected.png
deleted file mode 100644
index 3bedd6df..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-ws-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-ws-02-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-ws-02-t-expected.png
deleted file mode 100644
index 5ee116f9..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/text/text-selection-ws-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/transforms/svg-css-transforms-clip-path-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/transforms/svg-css-transforms-clip-path-expected.png
deleted file mode 100644
index 7a8df36f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/transforms/svg-css-transforms-clip-path-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/transforms/svg-css-transforms-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/transforms/svg-css-transforms-expected.png
deleted file mode 100644
index 014acf5..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/transforms/svg-css-transforms-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/transforms/text-with-mask-with-svg-transform-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/transforms/text-with-mask-with-svg-transform-expected.png
deleted file mode 100644
index d51cae6c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/transforms/text-with-mask-with-svg-transform-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/transforms/text-with-pattern-inside-transformed-html-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/transforms/text-with-pattern-inside-transformed-html-expected.png
deleted file mode 100644
index 3185cfb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/transforms/text-with-pattern-inside-transformed-html-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/transforms/text-with-pattern-with-svg-transform-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/transforms/text-with-pattern-with-svg-transform-expected.png
deleted file mode 100644
index d9b369f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/transforms/text-with-pattern-with-svg-transform-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/wicd/test-rightsizing-a-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/wicd/test-rightsizing-a-expected.png
deleted file mode 100644
index 5814a19..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/wicd/test-rightsizing-a-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/wicd/test-rightsizing-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/wicd/test-rightsizing-b-expected.png
deleted file mode 100644
index 7ca8746b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/wicd/test-rightsizing-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/wicd/test-scalable-background-image1-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/wicd/test-scalable-background-image1-expected.png
deleted file mode 100644
index c2ccb54..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/wicd/test-scalable-background-image1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/wicd/test-scalable-background-image2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/wicd/test-scalable-background-image2-expected.png
deleted file mode 100644
index 45c03282..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/wicd/test-scalable-background-image2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/zoom/page/zoom-foreignObject-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/zoom/page/zoom-foreignObject-expected.png
deleted file mode 100644
index d709ed37..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/zoom/page/zoom-foreignObject-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/zoom/page/zoom-hixie-mixed-009-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/zoom/page/zoom-hixie-mixed-009-expected.png
deleted file mode 100644
index 9696370..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/zoom/page/zoom-hixie-mixed-009-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/zoom/page/zoom-mask-with-percentages-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/zoom/page/zoom-mask-with-percentages-expected.png
deleted file mode 100644
index addc298..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/zoom/page/zoom-mask-with-percentages-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png
deleted file mode 100644
index d340056..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/zoom/text/zoom-hixie-mixed-009-expected.png b/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/zoom/text/zoom-hixie-mixed-009-expected.png
deleted file mode 100644
index 3d0ed5ff..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/synchronous_html_parser/svg/zoom/text/zoom-hixie-mixed-009-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/compositing/geometry/clipping-foreground-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/compositing/geometry/clipping-foreground-expected.png
deleted file mode 100644
index 17ecc75..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/compositing/geometry/clipping-foreground-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/compositing/overflow/accelerated-scrolling-with-clip-path-text-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/compositing/overflow/accelerated-scrolling-with-clip-path-text-expected.png
deleted file mode 100644
index 2a3bc499..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/compositing/overflow/accelerated-scrolling-with-clip-path-text-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/compositing/overflow/overflow-scroll-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/compositing/overflow/overflow-scroll-expected.png
deleted file mode 100644
index b4f240b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/compositing/overflow/overflow-scroll-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/compositing/text-match-highlight-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/compositing/text-match-highlight-expected.png
deleted file mode 100644
index d81d47b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/compositing/text-match-highlight-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/delete-into-nested-block-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/delete-into-nested-block-expected.png
deleted file mode 100644
index b803737b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/delete-into-nested-block-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/flexbox/repaint-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/flexbox/repaint-expected.txt
deleted file mode 100644
index cdb6e55..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/flexbox/repaint-expected.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [139, 128, 653, 100],
-        [138, 128, 636, 99],
-        [400, 128, 392, 180],
-        [8, 228, 392, 80],
-        [148, 128, 252, 180],
-        [8, 128, 140, 100]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/invalidation-after-opacity-change-subtree-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/invalidation-after-opacity-change-subtree-expected.png
deleted file mode 100644
index 8920a00..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/invalidation-after-opacity-change-subtree-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-10-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-10-expected.txt
deleted file mode 100644
index 4671413..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-10-expected.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 520, 408, 79],
-        [14, 240, 407, 139],
-        [14, 180, 407, 79],
-        [65, 360, 356, 39],
-        [14, 80, 355, 119],
-        [14, 460, 355, 59],
-        [14, 440, 355, 39],
-        [14, 420, 355, 39],
-        [65, 400, 304, 19],
-        [14, 374, 48, 64],
-        [14, 363, 48, 64]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-3-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-3-expected.txt
deleted file mode 100644
index c3aa5f6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-3-expected.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 520, 408, 79],
-        [14, 240, 407, 139],
-        [14, 180, 407, 79],
-        [14, 400, 406, 59],
-        [65, 360, 356, 39],
-        [14, 80, 355, 119],
-        [14, 460, 355, 59],
-        [14, 440, 339, 79],
-        [356, 423, 64, 80],
-        [372, 403, 48, 80]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-4-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-4-expected.txt
deleted file mode 100644
index 419db37a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-4-expected.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 520, 408, 79],
-        [14, 240, 407, 139],
-        [14, 180, 407, 79],
-        [14, 460, 407, 59],
-        [65, 360, 356, 39],
-        [14, 80, 355, 119],
-        [14, 420, 355, 39],
-        [65, 400, 304, 19],
-        [372, 403, 48, 80]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-5-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-5-expected.txt
deleted file mode 100644
index 307c7f8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-5-expected.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 520, 408, 79],
-        [14, 240, 407, 139],
-        [14, 180, 407, 79],
-        [49, 360, 372, 39],
-        [14, 400, 356, 59],
-        [14, 80, 355, 119],
-        [14, 440, 355, 79],
-        [14, 363, 48, 64]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-8-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-8-expected.txt
deleted file mode 100644
index 7c9148c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-8-expected.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 520, 408, 79],
-        [14, 240, 407, 139],
-        [14, 180, 407, 79],
-        [14, 360, 407, 39],
-        [14, 440, 356, 79],
-        [14, 80, 355, 119],
-        [14, 400, 355, 59],
-        [14, 363, 48, 64]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-9-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-9-expected.txt
deleted file mode 100644
index 2f8433c7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/line-flow-with-floats-9-expected.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [14, 520, 408, 79],
-        [14, 240, 407, 139],
-        [14, 180, 407, 79],
-        [65, 360, 356, 39],
-        [14, 80, 355, 119],
-        [14, 460, 355, 59],
-        [14, 440, 355, 39],
-        [14, 420, 355, 39],
-        [65, 400, 304, 19],
-        [14, 383, 48, 64],
-        [14, 363, 48, 64]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/reflection/reflection-with-rotation-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/reflection/reflection-with-rotation-expected.png
deleted file mode 100644
index 8fc0cfbc..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/reflection/reflection-with-rotation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/reflection/reflection-with-rotation-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/reflection/reflection-with-rotation-expected.txt
deleted file mode 100644
index 118224f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/reflection/reflection-with-rotation-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [23, 51, 72, 110]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/shadow-multiple-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/shadow-multiple-expected.png
deleted file mode 100644
index 98c30647..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/shadow-multiple-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
deleted file mode 100644
index aa6873a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/animated-svg-as-image-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/animated-svg-as-image-expected.png
deleted file mode 100644
index 707941b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/animated-svg-as-image-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/animated-svg-as-image-same-image-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/animated-svg-as-image-same-image-expected.png
deleted file mode 100644
index 707941b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/animated-svg-as-image-same-image-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/append-text-node-to-tspan-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/append-text-node-to-tspan-expected.png
deleted file mode 100644
index 34803a9..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/append-text-node-to-tspan-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/ems-display-none-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/ems-display-none-expected.png
deleted file mode 100644
index 1678c1d6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/ems-display-none-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/exs-display-none-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/exs-display-none-expected.png
deleted file mode 100644
index cccddff6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/exs-display-none-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.png
deleted file mode 100644
index c7a787e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-clipPath-creation-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-clipPath-creation-expected.png
deleted file mode 100644
index c7a787e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-clipPath-creation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.png
deleted file mode 100644
index da6f30b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-gradient-creation-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-gradient-creation-expected.png
deleted file mode 100644
index edc04cc..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-gradient-creation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.png
deleted file mode 100644
index 0998fb31..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-pattern-creation-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-pattern-creation-expected.png
deleted file mode 100644
index 675bcd0b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/js-late-pattern-creation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/modify-text-node-in-tspan-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/modify-text-node-in-tspan-expected.png
deleted file mode 100644
index 34803a9..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/modify-text-node-in-tspan-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/remove-text-node-from-tspan-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/remove-text-node-from-tspan-expected.png
deleted file mode 100644
index fbf578f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/remove-text-node-from-tspan-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/remove-tspan-from-text-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/remove-tspan-from-text-expected.png
deleted file mode 100644
index 32e03c0..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/remove-tspan-from-text-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
deleted file mode 100644
index 841db752..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/text-rescale-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/text-rescale-expected.png
deleted file mode 100644
index c21a227..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/text-rescale-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/text-selection-text-05-t-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/text-selection-text-05-t-expected.png
deleted file mode 100644
index 99272e6..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/text-selection-text-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/use-detach-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/use-detach-expected.png
deleted file mode 100644
index 8ef2865..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/use-detach-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/use-detach-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/use-detach-expected.txt
deleted file mode 100644
index e1e53776..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/use-detach-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [207, 57, 50, 66]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/window-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/window-expected.png
deleted file mode 100644
index 640e37f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/window-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
deleted file mode 100644
index 2b1f3bb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/zoom-foreignObject-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/zoom-foreignObject-expected.png
deleted file mode 100644
index 4130567..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/svg/zoom-foreignObject-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/vertical-align2-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/vertical-align2-expected.txt
deleted file mode 100644
index 17d55d8d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/paint/invalidation/vertical-align2-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [200, 146, 100, 100],
-        [200, 100, 100, 100]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/transforms/2d/zoom-menulist-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/transforms/2d/zoom-menulist-expected.png
deleted file mode 100644
index e90c993..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/transforms/2d/zoom-menulist-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/transforms/svg-vs-css-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/transforms/svg-vs-css-expected.png
deleted file mode 100644
index b9e79aeb..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/transforms/svg-vs-css-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/transforms/transformed-caret-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/transforms/transformed-caret-expected.png
deleted file mode 100644
index 9471b58b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/transforms/transformed-caret-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/transforms/transforms-with-zoom-expected.png b/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/transforms/transforms-with-zoom-expected.png
deleted file mode 100644
index e6f17f60..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/transform-interop-disabled/transforms/transforms-with-zoom-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/trustedeventsdefaultaction/fast/events/hit-test-clip-path-reference-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/trustedeventsdefaultaction/fast/events/hit-test-clip-path-reference-expected.txt
deleted file mode 100644
index d38e48e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/trustedeventsdefaultaction/fast/events/hit-test-clip-path-reference-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Test that hit-test work with clip-path using svg reference
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS path contains point at (99, 247)
-PASS path contains point at (94, 242)
-PASS path contains point at (104, 252)
-PASS path contains point at (94, 252)
-PASS path contains point at (104, 242)
-PASS path does not contain point at (67, 215)
-PASS path does not contain point at (66, 214)
-PASS path does not contain point at (68, 216)
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/trustedeventsdefaultaction/fast/events/pointer-events-2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/trustedeventsdefaultaction/fast/events/pointer-events-2-expected.png
deleted file mode 100644
index 2dd85cc..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/trustedeventsdefaultaction/fast/events/pointer-events-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/trustedeventsdefaultaction/fast/events/pointer-events-2-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/trustedeventsdefaultaction/fast/events/pointer-events-2-expected.txt
deleted file mode 100644
index 50714e6b..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/trustedeventsdefaultaction/fast/events/pointer-events-2-expected.txt
+++ /dev/null
@@ -1,199 +0,0 @@
-layer at (0,0) size 800x600 scrollHeight 640
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x176
-  LayoutBlockFlow {HTML} at (0,0) size 800x175.88
-    LayoutBlockFlow {BODY} at (8,21.44) size 784x138.44
-      LayoutBlockFlow {H1} at (0,0) size 784x37
-        LayoutText {#text} at (0,0) size 757x36
-          text run at (0,0) width 757: "Testing the values of 'pointer-events' on HTML content"
-      LayoutBlockFlow {P} at (0,58.44) size 784x80
-        LayoutText {#text} at (0,0) size 779x79
-          text run at (0,0) width 542: "This test is expected to be run from within DumpRenderTree. If running manually, click on "
-          text run at (541,0) width 235: "the elements in the first column, making"
-          text run at (0,20) width 261: "sure the actual result (3rd column) matches "
-          text run at (261,20) width 518: "the expected result (2nd column). Repeat for click target (4th column), expected result"
-          text run at (0,40) width 80: "(5th column) "
-          text run at (80,40) width 495: "and actual result (6th column). Note: You should click on a yellow inline element if "
-          text run at (574,40) width 202: "one exists, otherwise anywhere in"
-          text run at (0,60) width 49: "the box."
-layer at (10,140) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,140) size 300x100
-layer at (10,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,140) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 68x39
-      text run at (0,0) width 48: "pointer-"
-      text run at (0,20) width 68: "events auto"
-layer at (110,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x19
-      text run at (0,0) width 16: "p1"
-layer at (210,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x19
-      text run at (0,0) width 16: "p1"
-layer at (10,240) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,240) size 300x100
-layer at (10,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,240) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 71x39
-      text run at (0,0) width 48: "pointer-"
-      text run at (0,20) width 71: "events none"
-layer at (110,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 29x19
-      text run at (0,0) width 29: "none"
-layer at (210,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 29x19
-      text run at (0,0) width 29: "none"
-layer at (10,340) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,340) size 300x100
-layer at (10,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,340) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 69x39
-      text run at (0,0) width 53: "siblings -"
-      text run at (0,20) width 69: "auto on top"
-layer at (10,340) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80
-layer at (110,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x19
-      text run at (0,0) width 16: "p4"
-layer at (210,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x19
-      text run at (0,0) width 16: "p4"
-layer at (10,440) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,440) size 300x100
-layer at (10,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,440) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 72x39
-      text run at (0,0) width 53: "siblings -"
-      text run at (0,20) width 72: "none on top"
-layer at (10,440) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80
-layer at (110,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x19
-      text run at (0,0) width 16: "p5"
-layer at (210,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x19
-      text run at (0,0) width 16: "p5"
-layer at (10,540) size 300x100 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (10,540) size 300x100
-layer at (10,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 79x39
-      text run at (0,0) width 79: "nested - auto"
-      text run at (0,20) width 31: "outer"
-layer at (110,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x19
-      text run at (0,0) width 16: "p7"
-layer at (210,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x19
-      text run at (0,0) width 16: "p7"
-layer at (340,140) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,140) size 300x100
-layer at (340,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,140) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 64x39
-      text run at (0,0) width 49: "nested -"
-      text run at (0,20) width 64: "none outer"
-layer at (440,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x19
-      text run at (0,0) width 24: "p10"
-layer at (540,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x19
-      text run at (0,0) width 24: "p10"
-layer at (340,240) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,240) size 300x100
-layer at (340,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,240) size 80x80
-  LayoutImage (positioned) {IMG} at (0,0) size 80x80
-layer at (440,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x19
-      text run at (0,0) width 24: "p11"
-layer at (540,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x19
-      text run at (0,0) width 24: "p11"
-layer at (340,340) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,340) size 300x100
-layer at (340,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,340) size 80x80
-  LayoutImage (positioned) {IMG} at (0,0) size 80x80
-layer at (440,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 29x19
-      text run at (0,0) width 29: "none"
-layer at (540,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 29x19
-      text run at (0,0) width 29: "none"
-layer at (340,440) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,440) size 300x100
-layer at (340,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,440) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutInline {SPAN} at (0,0) size 30x19 [bgcolor=#FFFF00]
-      LayoutText {#text} at (0,0) size 30x19
-        text run at (0,0) width 30: "inline"
-    LayoutText {#text} at (30,0) size 72x59
-      text run at (30,0) width 24: " has"
-      text run at (0,20) width 72: "auto, parent"
-      text run at (0,40) width 29: "none"
-layer at (440,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x19
-      text run at (0,0) width 24: "p14"
-layer at (540,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x19
-      text run at (0,0) width 24: "p14"
-layer at (340,540) size 300x100 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (340,540) size 300x100
-layer at (340,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutInline {SPAN} at (0,0) size 30x19 [bgcolor=#FFFF00]
-      LayoutText {#text} at (0,0) size 30x19
-        text run at (0,0) width 30: "inline"
-    LayoutText {#text} at (30,0) size 75x59
-      text run at (30,0) width 24: " has"
-      text run at (0,20) width 75: "none, parent"
-      text run at (0,40) width 26: "auto"
-layer at (440,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x19
-      text run at (0,0) width 24: "p15"
-layer at (540,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x19
-      text run at (0,0) width 24: "p15"
-caret: position 1 of child 0 {#text} of child 0 {SPAN} of child 1 {P} of child 1 {DIV} of child 23 {DIV} of body
diff --git a/third_party/blink/web_tests/platform/linux/virtual/trustedeventsdefaultaction/fast/events/reveal-link-when-focused-expected.png b/third_party/blink/web_tests/platform/linux/virtual/trustedeventsdefaultaction/fast/events/reveal-link-when-focused-expected.png
deleted file mode 100644
index 9d5de936..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/trustedeventsdefaultaction/fast/events/reveal-link-when-focused-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/user-activation-v2/fast/events/touch/compositor-touch-hit-rects-svg-container-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/user-activation-v2/fast/events/touch/compositor-touch-hit-rects-svg-container-expected.txt
deleted file mode 100644
index 84adaf64..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/user-activation-v2/fast/events/touch/compositor-touch-hit-rects-svg-container-expected.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-: layer(0,0 800x600) has hit test rect (8,13 54x19)
-
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/user-activation-v2/fast/events/touch/compositor-touch-hit-rects-svg-text-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/user-activation-v2/fast/events/touch/compositor-touch-hit-rects-svg-text-expected.txt
deleted file mode 100644
index 84adaf64..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/user-activation-v2/fast/events/touch/compositor-touch-hit-rects-svg-text-expected.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-: layer(0,0 800x600) has hit test rect (8,13 54x19)
-
-
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/audio-controls-rendering-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/audio-controls-rendering-expected.png
deleted file mode 100644
index 696b88e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/audio-controls-rendering-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/color-profile-munsell-bt601-smpte-to-srgb-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/color-profile-munsell-bt601-smpte-to-srgb-expected.png
deleted file mode 100644
index a9c72f8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/color-profile-munsell-bt601-smpte-to-srgb-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/color-profile-munsell-bt709-to-srgb-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/color-profile-munsell-bt709-to-srgb-expected.png
deleted file mode 100644
index 8e88aa8..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/color-profile-munsell-bt709-to-srgb-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls-after-reload-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls-after-reload-expected.png
deleted file mode 100644
index cd30881..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls-after-reload-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls-layout-direction-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls-layout-direction-expected.png
deleted file mode 100644
index 257d2b1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls-layout-direction-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls-strict-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls-strict-expected.png
deleted file mode 100644
index 951c069..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls-strict-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls-styling-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls-styling-expected.png
deleted file mode 100644
index dfc29839..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls-styling-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls-styling-strict-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls-styling-strict-expected.png
deleted file mode 100644
index befd21d..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls-styling-strict-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls-without-preload-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls-without-preload-expected.png
deleted file mode 100644
index 6a808e2..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls-without-preload-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.png
deleted file mode 100644
index 1a5b4d7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-expected.png
deleted file mode 100644
index 1a5b4d7..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls/video-controls-with-cast-rendering-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls/video-controls-with-cast-rendering-expected.png
deleted file mode 100644
index 423924c..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/controls/video-controls-with-cast-rendering-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/media-controls-clone-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/media-controls-clone-expected.png
deleted file mode 100644
index 7d2592dd..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/media-controls-clone-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/media-controls-grey-scrubber-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/media-controls-grey-scrubber-expected.png
deleted file mode 100644
index c2fbc19..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/media-controls-grey-scrubber-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/media-document-audio-repaint-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/media-document-audio-repaint-expected.png
deleted file mode 100644
index 2a00039..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/media-document-audio-repaint-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/track/track-cue-rendering-vertical-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/track/track-cue-rendering-vertical-expected.png
deleted file mode 100644
index c53e8c5a..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/track/track-cue-rendering-vertical-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-aspect-ratio-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-aspect-ratio-expected.png
deleted file mode 100644
index 324e5f47..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-aspect-ratio-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-canvas-alpha-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-canvas-alpha-expected.png
deleted file mode 100644
index d67be5e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-canvas-alpha-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-controls-rendering-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-controls-rendering-expected.png
deleted file mode 100644
index 8ebba7e4..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-controls-rendering-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-display-toggle-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-display-toggle-expected.png
deleted file mode 100644
index 2cd41700..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-display-toggle-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-empty-source-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-empty-source-expected.png
deleted file mode 100644
index e34d665..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-empty-source-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-frame-accurate-seek-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-frame-accurate-seek-expected.png
deleted file mode 100644
index 2db608dda..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-frame-accurate-seek-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-no-audio-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-no-audio-expected.png
deleted file mode 100644
index f75790f..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-no-audio-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-zoom-controls-expected.png b/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-zoom-controls-expected.png
deleted file mode 100644
index 2563c3e..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/video-surface-layer/media/video-zoom-controls-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/cascade/fast/css/acid2-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/cascade/fast/css/acid2-expected.png
deleted file mode 100644
index e2836b18..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/cascade/fast/css/acid2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
deleted file mode 100644
index a6d768f..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/incremental-shadow-dom/html/details_summary/details-marker-style-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/incremental-shadow-dom/html/details_summary/details-marker-style-expected.png
deleted file mode 100644
index 12fbaa8..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/incremental-shadow-dom/html/details_summary/details-marker-style-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/incremental-shadow-dom/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/incremental-shadow-dom/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.png
deleted file mode 100644
index bce7432..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/incremental-shadow-dom/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/incremental-shadow-dom/media/controls/paint-controls-webkit-appearance-none-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/incremental-shadow-dom/media/controls/paint-controls-webkit-appearance-none-expected.png
deleted file mode 100644
index bce7432..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/incremental-shadow-dom/media/controls/paint-controls-webkit-appearance-none-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/layout_ng/fast/block/basic/001-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/layout_ng/fast/block/basic/001-expected.png
deleted file mode 100644
index b9409a0..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/layout_ng/fast/block/basic/001-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/layout_ng/fast/block/basic/014-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/layout_ng/fast/block/basic/014-expected.png
deleted file mode 100644
index 8ffeeea..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/layout_ng/fast/block/basic/014-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/layout_ng/fast/block/float/shrink-to-avoid-float-complexity-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/layout_ng/fast/block/float/shrink-to-avoid-float-complexity-expected.png
deleted file mode 100644
index 8df58d12..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/layout_ng/fast/block/float/shrink-to-avoid-float-complexity-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/layout_ng/fast/block/margin-collapse/100-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/layout_ng/fast/block/margin-collapse/100-expected.png
deleted file mode 100644
index 8246308..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/layout_ng/fast/block/margin-collapse/100-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/media-capture-image-ptz/external/wpt/mediacapture-image/MediaStreamTrack-getSettings-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/media-capture-image-ptz/external/wpt/mediacapture-image/MediaStreamTrack-getSettings-expected.txt
deleted file mode 100644
index 9aed7862..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/media-capture-image-ptz/external/wpt/mediacapture-image/MediaStreamTrack-getSettings-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-This is a testharness.js-based test.
-PASS exercises MediaStreamTrack.getSettings() with PTZ permission denied
-PASS MediaStreamTrack-getSettings
-PASS exercises MediaStreamTrack.getSettings() with PTZ permission granted
-FAIL MediaStreamTrack-getSettings 1 assert_equals: expected (number) 5 but got (undefined) undefined
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/new-remote-playback-pipeline/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/new-remote-playback-pipeline/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.png
deleted file mode 100644
index 3542c3b9..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/new-remote-playback-pipeline/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/new-remote-playback-pipeline/media/controls/paint-controls-webkit-appearance-none-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/new-remote-playback-pipeline/media/controls/paint-controls-webkit-appearance-none-expected.png
deleted file mode 100644
index 5d9e2bf..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/new-remote-playback-pipeline/media/controls/paint-controls-webkit-appearance-none-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/not-omt-sw-fetch/external/wpt/xhr/getallresponseheaders-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/not-omt-sw-fetch/external/wpt/xhr/getallresponseheaders-expected.txt
deleted file mode 100644
index 69617d19..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/not-omt-sw-fetch/external/wpt/xhr/getallresponseheaders-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-This is a testharness.js-based test.
-FAIL XMLHttpRequest: getAllResponseHeaders() assert_equals: expected "also-here: Mr. PB\r\newok: lego\r\nfoo-test: 1, 2\r\n__custom: token\r\n" but got "__custom: token\r\nalso-here: Mr. PB\r\nfoo-test: 1, 2\r\newok: lego\r\n"
-PASS XMLHttpRequest: getAllResponseHeaders() 1
-PASS XMLHttpRequest: getAllResponseHeaders() 2
-PASS XMLHttpRequest: getAllResponseHeaders() 3
-PASS XMLHttpRequest: getAllResponseHeaders() 4
-PASS XMLHttpRequest: getAllResponseHeaders() 5
-PASS XMLHttpRequest: getAllResponseHeaders() 6
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/not-omt-sw-fetch/external/wpt/xhr/responsexml-document-properties-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/not-omt-sw-fetch/external/wpt/xhr/responsexml-document-properties-expected.txt
deleted file mode 100644
index 8703e748..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/not-omt-sw-fetch/external/wpt/xhr/responsexml-document-properties-expected.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-This is a testharness.js-based test.
-PASS domain
-PASS URL
-PASS documentURI
-PASS baseURI
-PASS referrer
-PASS title
-PASS contentType
-PASS readyState
-PASS location
-PASS defaultView
-PASS body
-PASS doctype
-PASS all
-PASS cookie
-PASS Test document URL properties after redirect
-PASS Test document URL properties of document with <base> after redirect
-PASS lastModified set to time of response if no HTTP header provided
-PASS lastModified set to related HTTP header if provided
-PASS cookie (after setting it)
-PASS styleSheets should be an object
-PASS implementation should be an object
-PASS images should be an object
-PASS forms should be an object
-PASS links should be an object
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/omt-worker-fetch/external/wpt/xhr/abort-after-send.any-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/omt-worker-fetch/external/wpt/xhr/abort-after-send.any-expected.txt
deleted file mode 100644
index 0f10f7e..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/omt-worker-fetch/external/wpt/xhr/abort-after-send.any-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL XMLHttpRequest: abort() after send() assert_equals: expected "abort(0,0,false)" but got "upload.abort(0,0,false)"
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/omt-worker-fetch/external/wpt/xhr/xhr-timeout-longtask.any.worker-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/omt-worker-fetch/external/wpt/xhr/xhr-timeout-longtask.any.worker-expected.txt
deleted file mode 100644
index d7127cf..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/omt-worker-fetch/external/wpt/xhr/xhr-timeout-longtask.any.worker-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-PASS Long tasks should not trigger load timeout
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/samesite-by-default-cookies/external/wpt/cookies/http-state/general-tests-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/samesite-by-default-cookies/external/wpt/cookies/http-state/general-tests-expected.txt
deleted file mode 100644
index 4d33a0e..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/samesite-by-default-cookies/external/wpt/cookies/http-state/general-tests-expected.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-This is a testharness.js-based test.
-PASS 0001 - Set cookie.
-PASS 0002 - Set cookie with future expiration.
-PASS 0003 - Set expired cookie along with valid cookie.
-FAIL 0004 - Ignore cookie without key. assert_equals: expected "" but got "foo"
-PASS 0005 - Set cookie with age.
-PASS 0006 - Set no cookie with max-age=0.
-PASS 0007 - Set cookie with version=1.
-PASS 0008 - Set cookie with version=1000.
-PASS 0009 - Set cookie with custom value.
-PASS 0010 - Dont accept 'secure' cookies over http.
-PASS 0011 - Ignore separators in cookie values.
-PASS 0012 - Ignore values with separators and without ';'.
-PASS 0013 - Use last value for cookies with identical keys.
-PASS 0014 - Keep alphabetic key order.
-PASS 0015 - Keep alphabetic single-char key order.
-PASS 0016 - Keep non-alphabetic key order.
-PASS 0017 - Keep order if comma-separated.
-PASS 0018 - Ignore keys after semicolon.
-PASS 0019 - Ignore attributes after semicolon.
-FAIL 0020 - Ignore cookies without key and value. assert_equals: expected "a=b; c=d" but got "a=b; ; c=d"
-FAIL 0021 - Ignore cookie without key in all 'Set-Cookie'. assert_equals: expected "a=b; c=d" but got "a=b; x; c=d"
-PASS 0022 - Set cookie without value in all 'Set-Cookie'.
-PASS 0023 - Ignore cookies without '=' in all 'Set-Cookie'.
-PASS 0024 - Ignore malformed cookies in all 'Set-Cookie'.
-PASS 0025 - Ignore cookies with ';' in all 'Set-Cookie'.
-PASS 0026 - Ignore malformed cookies in all 'Set-Cookie' v2.
-FAIL 0027 - Ignore malformed cookies in all 'Set-Cookie' v3. assert_equals: expected "" but got "bar"
-FAIL 0028 - [INVALID EXPECTATION] Ignore malformed cookies in all 'Set-Cookie' v4. assert_equals: expected "Set-Cookie: foo\nSet-Cookie:" but got ""
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/fast/css/bidi-override-in-anonymous-block-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/fast/css/bidi-override-in-anonymous-block-expected.png
deleted file mode 100644
index 79494bb..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/fast/css/bidi-override-in-anonymous-block-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/fast/css/content/content-quotes-01-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/fast/css/content/content-quotes-01-expected.txt
deleted file mode 100644
index 486ca4de..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/fast/css/content/content-quotes-01-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-The texts between the markers should be identical.
-
-========Marker1========
-
-ab	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-WWaWWbWWWWWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=195.062px; expected 195.047px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/fast/css/content/content-quotes-02-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/fast/css/content/content-quotes-02-expected.txt
deleted file mode 100644
index fe032c9..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/fast/css/content/content-quotes-02-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-abcd	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-aWWWbWWWWWcWWdWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=241.656px; expected 241.625px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/fast/css/content/content-quotes-03-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/fast/css/content/content-quotes-03-expected.txt
deleted file mode 100644
index 72857d68..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/fast/css/content/content-quotes-03-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-ab	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-aWWWbWWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=136.828px; expected 136.812px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/fast/css/content/content-quotes-05-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/fast/css/content/content-quotes-05-expected.txt
deleted file mode 100644
index 42634168..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/fast/css/content/content-quotes-05-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-abc	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-WWaWWWbWWWWWcWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=232.391px; expected 232.359px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/fast/css/content/content-quotes-06-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/fast/css/content/content-quotes-06-expected.txt
deleted file mode 100644
index 85f9069..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/fast/css/content/content-quotes-06-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-abc	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-a'b'c	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=28px; expected 27.9688px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/audio-controls-rendering-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/audio-controls-rendering-expected.png
deleted file mode 100644
index 3afadb40..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/audio-controls-rendering-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/audio-repaint-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/audio-repaint-expected.png
deleted file mode 100644
index fd0f3d4..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/audio-repaint-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls-after-reload-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls-after-reload-expected.png
deleted file mode 100644
index 110d54d..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls-after-reload-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls-layout-direction-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls-layout-direction-expected.png
deleted file mode 100644
index df5b495..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls-layout-direction-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls-strict-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls-strict-expected.png
deleted file mode 100644
index 8d3d001..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls-strict-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls-styling-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls-styling-expected.png
deleted file mode 100644
index 74e2734..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls-styling-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls-styling-strict-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls-styling-strict-expected.png
deleted file mode 100644
index fb22df9d..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls-styling-strict-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls-without-preload-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls-without-preload-expected.png
deleted file mode 100644
index d527675..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls-without-preload-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls/paint-controls-webkit-appearance-none-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls/paint-controls-webkit-appearance-none-expected.png
deleted file mode 100644
index 86333895..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/controls/paint-controls-webkit-appearance-none-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/media-controls-clone-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/media-controls-clone-expected.png
deleted file mode 100644
index 81e3ff6..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/media-controls-clone-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/media-controls-grey-scrubber-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/media-controls-grey-scrubber-expected.png
deleted file mode 100644
index 2d74c5f..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/media-controls-grey-scrubber-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/media-document-audio-repaint-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/media-document-audio-repaint-expected.png
deleted file mode 100644
index a85217a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/media-document-audio-repaint-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/track/track-cue-rendering-horizontal-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/track/track-cue-rendering-horizontal-expected.png
deleted file mode 100644
index 3a80aad5..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/track/track-cue-rendering-horizontal-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/video-controls-rendering-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/video-controls-rendering-expected.png
deleted file mode 100644
index 93e60a8..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/video-controls-rendering-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/video-display-toggle-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/video-display-toggle-expected.png
deleted file mode 100644
index d82ecad..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/video-display-toggle-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/video-zoom-controls-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/video-zoom-controls-expected.png
deleted file mode 100644
index f181b5b..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/media/video-zoom-controls-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png
deleted file mode 100644
index 82fb882b..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/smallFonts-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/smallFonts-expected.png
deleted file mode 100644
index 6b99623..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/smallFonts-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textEffect3-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textEffect3-expected.png
deleted file mode 100644
index c37cfdd..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textEffect3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textLayout-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textLayout-expected.png
deleted file mode 100644
index 82e17c5..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textLayout-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textLayout2-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textLayout2-expected.png
deleted file mode 100644
index 63597bc..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textLayout2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textLength-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textLength-expected.png
deleted file mode 100644
index b433c42..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textLength-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textOnPath-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textOnPath-expected.png
deleted file mode 100644
index 0b0271a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textOnPath-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textOnPath2-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textOnPath2-expected.png
deleted file mode 100644
index cbae6e1..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textOnPath2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textOnPath3-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textOnPath3-expected.png
deleted file mode 100644
index 96e8dae4..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textOnPath3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textOnPathSpaces-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textOnPathSpaces-expected.png
deleted file mode 100644
index de483a9..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textOnPathSpaces-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textStyles-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textStyles-expected.png
deleted file mode 100644
index 5c259cb..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/textStyles-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/verticalTextOnPath-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/verticalTextOnPath-expected.png
deleted file mode 100644
index 202931b..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/batik/text/verticalTextOnPath-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/custom/stroked-pattern-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/custom/stroked-pattern-expected.png
deleted file mode 100644
index f2d4ef0..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/custom/stroked-pattern-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-expected.png
deleted file mode 100644
index 9efa4886..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-zoomed-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-zoomed-expected.png
deleted file mode 100644
index 4135d26..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-zoomed-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/bidi-textlength-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/bidi-textlength-expected.png
deleted file mode 100644
index 78b95eb..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/bidi-textlength-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/combining-character-queries-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/combining-character-queries-expected.png
deleted file mode 100644
index 0685601..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/combining-character-queries-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/ligature-queries-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/ligature-queries-expected.png
deleted file mode 100644
index 16c5887..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/ligature-queries-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/surrogate-pair-queries-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/surrogate-pair-queries-expected.png
deleted file mode 100644
index 5007106..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/surrogate-pair-queries-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/text-layout-crash-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/text-layout-crash-expected.png
deleted file mode 100644
index 2a66799..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/synchronous_html_parser/svg/text/text-layout-crash-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/audio-controls-rendering-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/audio-controls-rendering-expected.png
deleted file mode 100644
index 2542f5a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/audio-controls-rendering-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls-after-reload-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls-after-reload-expected.png
deleted file mode 100644
index 22b516c..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls-after-reload-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls-layout-direction-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls-layout-direction-expected.png
deleted file mode 100644
index a7ae85be..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls-layout-direction-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls-strict-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls-strict-expected.png
deleted file mode 100644
index cf13900..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls-strict-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls-styling-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls-styling-expected.png
deleted file mode 100644
index ec7c734..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls-styling-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls-styling-strict-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls-styling-strict-expected.png
deleted file mode 100644
index 145b74e..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls-styling-strict-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls-without-preload-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls-without-preload-expected.png
deleted file mode 100644
index ea566b6..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls-without-preload-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-expected.png
deleted file mode 100644
index 72827d5d..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/media-controls-clone-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/media-controls-clone-expected.png
deleted file mode 100644
index 8e28305..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/media-controls-clone-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/media-controls-grey-scrubber-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/media-controls-grey-scrubber-expected.png
deleted file mode 100644
index 937cec17..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/media-controls-grey-scrubber-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/media-document-audio-repaint-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/media-document-audio-repaint-expected.png
deleted file mode 100644
index f52e7738..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/media-document-audio-repaint-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/track/track-cue-rendering-horizontal-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/track/track-cue-rendering-horizontal-expected.png
deleted file mode 100644
index 17b7f9d6..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/track/track-cue-rendering-horizontal-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/video-controls-rendering-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/video-controls-rendering-expected.png
deleted file mode 100644
index ff025e5..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/video-controls-rendering-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/video-display-toggle-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/video-display-toggle-expected.png
deleted file mode 100644
index 96b1d19..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/video-display-toggle-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/video-empty-source-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/video-empty-source-expected.png
deleted file mode 100644
index fd7c978c..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/video-empty-source-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/video-no-audio-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/video-no-audio-expected.png
deleted file mode 100644
index 3c0936cd..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/video-no-audio-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/video-zoom-controls-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/video-zoom-controls-expected.png
deleted file mode 100644
index 592e5f47..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/video-surface-layer/media/video-zoom-controls-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/cascade/fast/forms/select/basic-selects-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/cascade/fast/forms/select/basic-selects-expected.png
deleted file mode 100644
index 8eeb70d..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/cascade/fast/forms/select/basic-selects-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/css-calc-infinity-and-nan/external/wpt/css/css-values/minmax-percentage-serialize-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/css-calc-infinity-and-nan/external/wpt/css/css-values/minmax-percentage-serialize-expected.txt
deleted file mode 100644
index a25b56c..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/css-calc-infinity-and-nan/external/wpt/css/css-values/minmax-percentage-serialize-expected.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-This is a testharness.js-based test.
-FAIL 'min(1%)' as a specified value should serialize as 'calc(1%)'. assert_equals: 'min(1%)' and 'calc(1%)' should serialize the same in specified values. expected "calc(1%)" but got "min(1%)"
-PASS 'min(1%)' as a computed value should serialize as '1%'.
-PASS 'min(1%)' as a used value should serialize as '1px'.
-FAIL 'max(1%)' as a specified value should serialize as 'calc(1%)'. assert_equals: 'max(1%)' and 'calc(1%)' should serialize the same in specified values. expected "calc(1%)" but got "max(1%)"
-PASS 'max(1%)' as a computed value should serialize as '1%'.
-PASS 'max(1%)' as a used value should serialize as '1px'.
-PASS 'min(1%, 2%, 3%)' as a specified value should serialize as 'min(1%, 2%, 3%)'.
-FAIL 'min(1%, 2%, 3%)' as a computed value should serialize as 'min(1%, 2%, 3%)'. assert_equals: 'min(1%, 2%, 3%)' should round-trip exactly in computed values. expected "min(1%, 2%, 3%)" but got "1%"
-PASS 'min(1%, 2%, 3%)' as a used value should serialize as '1px'.
-PASS 'min(3%, 2%, 1%)' as a specified value should serialize as 'min(3%, 2%, 1%)'.
-FAIL 'min(3%, 2%, 1%)' as a computed value should serialize as 'min(3%, 2%, 1%)'. assert_equals: 'min(3%, 2%, 1%)' should round-trip exactly in computed values. expected "min(3%, 2%, 1%)" but got "1%"
-PASS 'min(3%, 2%, 1%)' as a used value should serialize as '1px'.
-PASS 'max(1%, 2%, 3%)' as a specified value should serialize as 'max(1%, 2%, 3%)'.
-FAIL 'max(1%, 2%, 3%)' as a computed value should serialize as 'max(1%, 2%, 3%)'. assert_equals: 'max(1%, 2%, 3%)' should round-trip exactly in computed values. expected "max(1%, 2%, 3%)" but got "3%"
-PASS 'max(1%, 2%, 3%)' as a used value should serialize as '3px'.
-PASS 'max(3%, 2%, 1%)' as a specified value should serialize as 'max(3%, 2%, 1%)'.
-FAIL 'max(3%, 2%, 1%)' as a computed value should serialize as 'max(3%, 2%, 1%)'. assert_equals: 'max(3%, 2%, 1%)' should round-trip exactly in computed values. expected "max(3%, 2%, 1%)" but got "3%"
-PASS 'max(3%, 2%, 1%)' as a used value should serialize as '3px'.
-PASS 'min(1%, 2%, 3%) 0px' as a specified value should serialize as 'min(1%, 2%, 3%) 0px'.
-FAIL 'min(1%, 2%, 3%) 0px' as a computed value should serialize as 'min(1%, 2%, 3%) 0px'. assert_equals: 'min(1%, 2%, 3%) 0px' should round-trip exactly in computed values. expected "min(1%, 2%, 3%) 0px" but got "min(1% + 0px, 2% + 0px, 3% + 0px) 0px"
-FAIL 'calc(min(1%, 2%) + max(3%, 4%) + 10%)' as a specified value should serialize as 'calc(10% + min(1%, 2%) + max(3%, 4%))'. assert_equals: 'calc(min(1%, 2%) + max(3%, 4%) + 10%)' and 'calc(10% + min(1%, 2%) + max(3%, 4%))' should serialize the same in specified values. expected "calc(10% + min(1%, 2%) + max(3%, 4%))" but got "calc(15%)"
-FAIL 'calc(min(1%, 2%) + max(3%, 4%) + 10%)' as a computed value should serialize as 'calc(10% + min(1%, 2%) + max(3%, 4%))'. assert_equals: 'calc(10% + min(1%, 2%) + max(3%, 4%))' should round-trip exactly in computed values. expected "calc(10% + min(1%, 2%) + max(3%, 4%))" but got "15%"
-PASS 'calc(min(1%, 2%) + max(3%, 4%) + 10%)' as a used value should serialize as '15px'.
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/fast/css/content/content-quotes-01-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/fast/css/content/content-quotes-01-expected.txt
deleted file mode 100644
index 486ca4de..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/fast/css/content/content-quotes-01-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-The texts between the markers should be identical.
-
-========Marker1========
-
-ab	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-WWaWWbWWWWWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=195.062px; expected 195.047px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/fast/css/content/content-quotes-02-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/fast/css/content/content-quotes-02-expected.txt
deleted file mode 100644
index fe032c9..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/fast/css/content/content-quotes-02-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-abcd	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-aWWWbWWWWWcWWdWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=241.656px; expected 241.625px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/fast/css/content/content-quotes-03-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/fast/css/content/content-quotes-03-expected.txt
deleted file mode 100644
index 72857d68..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/fast/css/content/content-quotes-03-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-ab	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-aWWWbWWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=136.828px; expected 136.812px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/fast/css/content/content-quotes-05-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/fast/css/content/content-quotes-05-expected.txt
deleted file mode 100644
index 42634168..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/fast/css/content/content-quotes-05-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-abc	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-WWaWWWbWWWWWcWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=232.391px; expected 232.359px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/fast/css/content/content-quotes-06-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/fast/css/content/content-quotes-06-expected.txt
deleted file mode 100644
index 85f9069..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/fast/css/content/content-quotes-06-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-abc	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-a'b'c	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=28px; expected 27.9688px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/media/audio-controls-rendering-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/media/audio-controls-rendering-expected.png
deleted file mode 100644
index 4fcf781..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/media/audio-controls-rendering-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/media/controls-layout-direction-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/media/controls-layout-direction-expected.png
deleted file mode 100644
index 72cb126..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/media/controls-layout-direction-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/media/media-controls-clone-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/media/media-controls-clone-expected.png
deleted file mode 100644
index 369cb14..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/media/media-controls-clone-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/media/media-controls-grey-scrubber-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/media/media-controls-grey-scrubber-expected.png
deleted file mode 100644
index 1b2cd88a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/media/media-controls-grey-scrubber-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/media/media-document-audio-repaint-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/media/media-document-audio-repaint-expected.png
deleted file mode 100644
index 421f698..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/media/media-document-audio-repaint-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-opacity-01-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-opacity-01-b-expected.png
deleted file mode 100644
index 4b0c88a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-opacity-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tselect-02-f-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tselect-02-f-expected.png
deleted file mode 100644
index 72d5bb4e..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-tselect-02-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/batik/text/verticalText-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/batik/text/verticalText-expected.png
deleted file mode 100644
index 57fe3d0..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/batik/text/verticalText-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/custom/text-dom-01-f-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/custom/text-dom-01-f-expected.png
deleted file mode 100644
index 3985be1..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/custom/text-dom-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEComponentTransferElement-svgdom-tableValues-prop-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEComponentTransferElement-svgdom-tableValues-prop-expected.png
deleted file mode 100644
index f68563f..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEComponentTransferElement-svgdom-tableValues-prop-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/bidi-textlength-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/bidi-textlength-expected.png
deleted file mode 100644
index 0b29051..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/bidi-textlength-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-squeeze-1-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-squeeze-1-expected.png
deleted file mode 100644
index 46d7c42..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-squeeze-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-squeeze-2-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-squeeze-2-expected.png
deleted file mode 100644
index 8e0f327f..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-squeeze-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-squeeze-3-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-squeeze-3-expected.png
deleted file mode 100644
index 88c45b76..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-squeeze-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-squeeze-4-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-squeeze-4-expected.png
deleted file mode 100644
index f29bdd7..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-squeeze-4-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-stretch-1-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-stretch-1-expected.png
deleted file mode 100644
index 9bd5f73..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-stretch-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-stretch-2-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-stretch-2-expected.png
deleted file mode 100644
index 6d5316a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-stretch-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-stretch-3-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-stretch-3-expected.png
deleted file mode 100644
index a53fbbb..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-stretch-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-stretch-4-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-stretch-4-expected.png
deleted file mode 100644
index 5b7585fc..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacing-stretch-4-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-1-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-1-expected.png
deleted file mode 100644
index 4ce4b172..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-2-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-2-expected.png
deleted file mode 100644
index 3a9dd9dea..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-3-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-3-expected.png
deleted file mode 100644
index 45623f1..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-4-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-4-expected.png
deleted file mode 100644
index 361c98c..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-squeeze-4-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-1-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-1-expected.png
deleted file mode 100644
index 1dc1961..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-2-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-2-expected.png
deleted file mode 100644
index a17ee77..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-3-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-3-expected.png
deleted file mode 100644
index 07c97d5..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-4-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-4-expected.png
deleted file mode 100644
index 0e50504d5..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-textLength-spacingAndGlyphs-stretch-4-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-x-list-3-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-x-list-3-expected.png
deleted file mode 100644
index 6632e332..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-x-list-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-x-list-4-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-x-list-4-expected.png
deleted file mode 100644
index 6c46965..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-x-list-4-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-x-list-with-tspans-3-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-x-list-with-tspans-3-expected.png
deleted file mode 100644
index 6632e332..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-x-list-with-tspans-3-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-x-list-with-tspans-4-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-x-list-with-tspans-4-expected.png
deleted file mode 100644
index 44d97e5..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/select-x-list-with-tspans-4-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/surrogate-pair-queries-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/surrogate-pair-queries-expected.png
deleted file mode 100644
index aae6f01..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/surrogate-pair-queries-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-align-01-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-align-01-b-expected.png
deleted file mode 100644
index d0e443eb..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-align-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-align-02-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-align-02-b-expected.png
deleted file mode 100644
index ca64313..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-align-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-align-03-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-align-03-b-expected.png
deleted file mode 100644
index f274f601..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-align-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-align-04-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-align-04-b-expected.png
deleted file mode 100644
index 7a22fa54..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-align-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-align-05-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-align-05-b-expected.png
deleted file mode 100644
index fe8feaa..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-align-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-align-06-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-align-06-b-expected.png
deleted file mode 100644
index 68f7062..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-align-06-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-deco-01-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-deco-01-b-expected.png
deleted file mode 100644
index eead15c..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-deco-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-fonts-01-t-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-fonts-01-t-expected.png
deleted file mode 100644
index f01bacc..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-fonts-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-fonts-02-t-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-fonts-02-t-expected.png
deleted file mode 100644
index cd47548f..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-fonts-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-intro-05-t-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-intro-05-t-expected.png
deleted file mode 100644
index c82a1b3..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-intro-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-path-01-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-path-01-b-expected.png
deleted file mode 100644
index ee5a332f..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-path-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-spacing-01-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-spacing-01-b-expected.png
deleted file mode 100644
index 17dd7a2..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-spacing-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-text-01-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-text-01-b-expected.png
deleted file mode 100644
index a4cc64ea..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-text-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-text-03-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-text-03-b-expected.png
deleted file mode 100644
index 9e365b8..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-text-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-text-04-t-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-text-04-t-expected.png
deleted file mode 100644
index 243ccd0..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-text-04-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-text-06-t-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-text-06-t-expected.png
deleted file mode 100644
index c72d1c8..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-text-06-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-text-07-t-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-text-07-t-expected.png
deleted file mode 100644
index 657fff7..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-text-07-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-text-08-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-text-08-b-expected.png
deleted file mode 100644
index a2f0148..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-text-08-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-tselect-01-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-tselect-01-b-expected.png
deleted file mode 100644
index b60dd1b..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-tselect-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-tselect-02-f-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-tselect-02-f-expected.png
deleted file mode 100644
index 769ffd90..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-tselect-02-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-tspan-01-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-tspan-01-b-expected.png
deleted file mode 100644
index ffc687f1..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-tspan-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-ws-01-t-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-ws-01-t-expected.png
deleted file mode 100644
index f3c4b92..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-ws-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-ws-02-t-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-ws-02-t-expected.png
deleted file mode 100644
index fd2dec63..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/text-selection-ws-02-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/textPathBoundsBug-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/textPathBoundsBug-expected.png
deleted file mode 100644
index 5da204b..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/synchronous_html_parser/svg/text/textPathBoundsBug-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/transform-interop-disabled/paint/invalidation/compositing/text-match-highlight-expected.png b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/transform-interop-disabled/paint/invalidation/compositing/text-match-highlight-expected.png
deleted file mode 100644
index ab4ec2b7..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/transform-interop-disabled/paint/invalidation/compositing/text-match-highlight-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/transform-interop-disabled/paint/invalidation/forms/textarea-caret-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/transform-interop-disabled/paint/invalidation/forms/textarea-caret-expected.txt
deleted file mode 100644
index 3307d75..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/transform-interop-disabled/paint/invalidation/forms/textarea-caret-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [7, 7, 183, 38]
-      ]
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/transform-interop-disabled/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.13/virtual/transform-interop-disabled/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
deleted file mode 100644
index 4c0135f..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.13/virtual/transform-interop-disabled/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [785, 656],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [353, 8, 15, 640]
-      ]
-    },
-    {
-      "name": "LayoutNGBlockFlow (sticky positioned) DIV id='sticky'",
-      "bounds": [345, 18],
-      "transform": 4
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [785, 0],
-      "bounds": [15, 600],
-      "contentsOpaque": true
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, -0.1],
-        [0, 0, 0, 1]
-      ],
-      "origin": [188, 328]
-    },
-    {
-      "id": 2,
-      "parent": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [8, 8, 0, 1]
-      ],
-      "flattenInheritedTransform": false
-    },
-    {
-      "id": 3,
-      "parent": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [0, -35, 0, 1]
-      ],
-      "flattenInheritedTransform": false
-    },
-    {
-      "id": 4,
-      "parent": 3,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [0, 35, 0, 1]
-      ],
-      "flattenInheritedTransform": false
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/cascade/fast/css/acid2-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/cascade/fast/css/acid2-expected.png
deleted file mode 100644
index ccaaad7..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/cascade/fast/css/acid2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/css-calc-infinity-and-nan/external/wpt/css/css-values/minmax-percentage-serialize-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/css-calc-infinity-and-nan/external/wpt/css/css-values/minmax-percentage-serialize-expected.txt
deleted file mode 100644
index 476b017a0..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/css-calc-infinity-and-nan/external/wpt/css/css-values/minmax-percentage-serialize-expected.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-This is a testharness.js-based test.
-FAIL 'min(1%)' as a specified value should serialize as 'calc(1%)'. assert_equals: 'min(1%)' and 'calc(1%)' should serialize the same in specified values. expected "calc(1%)" but got "min(1%)"
-PASS 'min(1%)' as a computed value should serialize as '1%'.
-PASS 'min(1%)' as a used value should serialize as '1px'.
-FAIL 'max(1%)' as a specified value should serialize as 'calc(1%)'. assert_equals: 'max(1%)' and 'calc(1%)' should serialize the same in specified values. expected "calc(1%)" but got "max(1%)"
-PASS 'max(1%)' as a computed value should serialize as '1%'.
-PASS 'max(1%)' as a used value should serialize as '1px'.
-PASS 'min(1%, 2%, 3%)' as a specified value should serialize as 'min(1%, 2%, 3%)'.
-FAIL 'min(1%, 2%, 3%)' as a computed value should serialize as 'min(1%, 2%, 3%)'. assert_equals: 'min(1%, 2%, 3%)' should round-trip exactly in computed values. expected "min(1%, 2%, 3%)" but got "1%"
-PASS 'min(1%, 2%, 3%)' as a used value should serialize as '1px'.
-PASS 'min(3%, 2%, 1%)' as a specified value should serialize as 'min(3%, 2%, 1%)'.
-FAIL 'min(3%, 2%, 1%)' as a computed value should serialize as 'min(3%, 2%, 1%)'. assert_equals: 'min(3%, 2%, 1%)' should round-trip exactly in computed values. expected "min(3%, 2%, 1%)" but got "1%"
-PASS 'min(3%, 2%, 1%)' as a used value should serialize as '1px'.
-PASS 'max(1%, 2%, 3%)' as a specified value should serialize as 'max(1%, 2%, 3%)'.
-FAIL 'max(1%, 2%, 3%)' as a computed value should serialize as 'max(1%, 2%, 3%)'. assert_equals: 'max(1%, 2%, 3%)' should round-trip exactly in computed values. expected "max(1%, 2%, 3%)" but got "3%"
-PASS 'max(1%, 2%, 3%)' as a used value should serialize as '3px'.
-PASS 'max(3%, 2%, 1%)' as a specified value should serialize as 'max(3%, 2%, 1%)'.
-FAIL 'max(3%, 2%, 1%)' as a computed value should serialize as 'max(3%, 2%, 1%)'. assert_equals: 'max(3%, 2%, 1%)' should round-trip exactly in computed values. expected "max(3%, 2%, 1%)" but got "3%"
-PASS 'max(3%, 2%, 1%)' as a used value should serialize as '3px'.
-PASS 'min(1%, 2%, 3%) 0px' as a specified value should serialize as 'min(1%, 2%, 3%) 0px'.
-FAIL 'min(1%, 2%, 3%) 0px' as a computed value should serialize as 'min(1%, 2%, 3%) 0px'. assert_equals: 'min(1%, 2%, 3%) 0px' should round-trip exactly in computed values. expected "min(1%, 2%, 3%) 0px" but got "min(1% + 0px, 2% + 0px, 3% + 0px) 0px"
-PASS 'calc(min(1%, 2%) + max(3%, 4%) + 10%)' as a specified value should serialize as 'calc(15%)'.
-PASS 'calc(min(1%, 2%) + max(3%, 4%) + 10%)' as a computed value should serialize as '15%'.
-PASS 'calc(min(1%, 2%) + max(3%, 4%) + 10%)' as a used value should serialize as '15px'.
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/omt-worker-fetch/external/wpt/xhr/xhr-timeout-longtask.any-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/omt-worker-fetch/external/wpt/xhr/xhr-timeout-longtask.any-expected.txt
deleted file mode 100644
index d7127cf..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/omt-worker-fetch/external/wpt/xhr/xhr-timeout-longtask.any-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-PASS Long tasks should not trigger load timeout
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/fast/css/content/content-quotes-01-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/fast/css/content/content-quotes-01-expected.txt
deleted file mode 100644
index 486ca4de..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/fast/css/content/content-quotes-01-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-The texts between the markers should be identical.
-
-========Marker1========
-
-ab	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-WWaWWbWWWWWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=195.062px; expected 195.047px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/fast/css/content/content-quotes-02-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/fast/css/content/content-quotes-02-expected.txt
deleted file mode 100644
index fe032c9..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/fast/css/content/content-quotes-02-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-abcd	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-aWWWbWWWWWcWWdWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=241.656px; expected 241.625px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/fast/css/content/content-quotes-03-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/fast/css/content/content-quotes-03-expected.txt
deleted file mode 100644
index 72857d68..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/fast/css/content/content-quotes-03-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-ab	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-aWWWbWWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=136.828px; expected 136.812px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/fast/css/content/content-quotes-05-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/fast/css/content/content-quotes-05-expected.txt
deleted file mode 100644
index 42634168..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/fast/css/content/content-quotes-05-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-abc	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-WWaWWWbWWWWWcWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=232.391px; expected 232.359px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/fast/css/content/content-quotes-06-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/fast/css/content/content-quotes-06-expected.txt
deleted file mode 100644
index 85f9069..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/fast/css/content/content-quotes-06-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-abc	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-a'b'c	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=28px; expected 27.9688px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/audio-controls-rendering-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/audio-controls-rendering-expected.png
deleted file mode 100644
index 7f4d45d2..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/audio-controls-rendering-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/audio-repaint-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/audio-repaint-expected.png
deleted file mode 100644
index 9219f13..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/audio-repaint-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls-after-reload-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls-after-reload-expected.png
deleted file mode 100644
index a85412f..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls-after-reload-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls-layout-direction-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls-layout-direction-expected.png
deleted file mode 100644
index 65a83152..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls-layout-direction-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls-strict-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls-strict-expected.png
deleted file mode 100644
index 0282f7c..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls-strict-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls-styling-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls-styling-expected.png
deleted file mode 100644
index 4d576a99..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls-styling-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls-styling-strict-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls-styling-strict-expected.png
deleted file mode 100644
index 321055a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls-styling-strict-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls-without-preload-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls-without-preload-expected.png
deleted file mode 100644
index 353492c..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls-without-preload-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls/paint-controls-webkit-appearance-none-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls/paint-controls-webkit-appearance-none-expected.png
deleted file mode 100644
index a0eb1bd0..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/controls/paint-controls-webkit-appearance-none-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/media-controls-clone-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/media-controls-clone-expected.png
deleted file mode 100644
index 6149fae..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/media-controls-clone-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/media-controls-grey-scrubber-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/media-controls-grey-scrubber-expected.png
deleted file mode 100644
index 88420f90..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/media-controls-grey-scrubber-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/media-document-audio-repaint-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/media-document-audio-repaint-expected.png
deleted file mode 100644
index e525e33..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/media-document-audio-repaint-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/track/track-cue-rendering-horizontal-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/track/track-cue-rendering-horizontal-expected.png
deleted file mode 100644
index 1a96aa87..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/track/track-cue-rendering-horizontal-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/track/track-cue-rendering-vertical-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/track/track-cue-rendering-vertical-expected.png
deleted file mode 100644
index 2d321a90..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/track/track-cue-rendering-vertical-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/video-controls-rendering-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/video-controls-rendering-expected.png
deleted file mode 100644
index dc7208f..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/video-controls-rendering-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/video-display-toggle-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/video-display-toggle-expected.png
deleted file mode 100644
index a42e45b..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/media/video-display-toggle-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-dom-03-f-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-dom-03-f-expected.png
deleted file mode 100644
index fa52863..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-dom-03-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-units-03-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-units-03-b-expected.png
deleted file mode 100644
index 7c1517e..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/coords-units-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.png
deleted file mode 100644
index 7864195..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-05-f-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-05-f-expected.png
deleted file mode 100644
index 89721bb8..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-05-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png
deleted file mode 100644
index 74b4829..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png
deleted file mode 100644
index 0b22c59..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/pservers-pattern-04-f-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/pservers-pattern-04-f-expected.png
deleted file mode 100644
index a603a98..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/pservers-pattern-04-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/styling-pres-02-f-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/styling-pres-02-f-expected.png
deleted file mode 100644
index fc5d5aa..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/styling-pres-02-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/svgdom-over-01-f-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/svgdom-over-01-f-expected.png
deleted file mode 100644
index 6bf7c63..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/svgdom-over-01-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-tspan-02-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-tspan-02-b-expected.png
deleted file mode 100644
index 052c560..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-tspan-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png
deleted file mode 100644
index c19845aa..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-05-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-05-b-expected.png
deleted file mode 100644
index f1191a2f..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/types-dom-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-46-t-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-46-t-expected.png
deleted file mode 100644
index af751f6..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-46-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-77-t-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-77-t-expected.png
deleted file mode 100644
index 320750f..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-77-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-light-04-f-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-light-04-f-expected.png
deleted file mode 100644
index 515eb7fa..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-light-04-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-turb-02-f-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-turb-02-f-expected.png
deleted file mode 100644
index b03b433..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-turb-02-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png
deleted file mode 100644
index 641d8535..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png
deleted file mode 100644
index ae0c79a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/as-image/img-preserveAspectRatio-support-1-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/as-image/img-preserveAspectRatio-support-1-expected.png
deleted file mode 100644
index 7156dd7..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/as-image/img-preserveAspectRatio-support-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/batik/text/textStyles-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/batik/text/textStyles-expected.png
deleted file mode 100644
index c6fb366..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/batik/text/textStyles-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/css/alignment-baseline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/css/alignment-baseline-expected.png
deleted file mode 100644
index 7600a15..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/css/alignment-baseline-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/text/bidi-reorder-in-text-chunks-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/text/bidi-reorder-in-text-chunks-expected.png
deleted file mode 100644
index 72cfaac..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/text/bidi-reorder-in-text-chunks-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/text/bidi-textlength-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/text/bidi-textlength-expected.png
deleted file mode 100644
index 85b1310..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/text/bidi-textlength-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/text/combining-character-queries-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/text/combining-character-queries-expected.png
deleted file mode 100644
index a552e88..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/text/combining-character-queries-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/text/ligature-queries-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/text/ligature-queries-expected.png
deleted file mode 100644
index bc5398ef..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/text/ligature-queries-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/text/surrogate-pair-queries-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/text/surrogate-pair-queries-expected.png
deleted file mode 100644
index fc64a53..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/text/surrogate-pair-queries-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/text/text-selection-fonts-01-t-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/text/text-selection-fonts-01-t-expected.png
deleted file mode 100644
index c2c6fe74..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/synchronous_html_parser/svg/text/text-selection-fonts-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/composite-bgcolor-animation/external/wpt/css/css-backgrounds/parsing/background-image-computed.sub-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.15/virtual/composite-bgcolor-animation/external/wpt/css/css-backgrounds/parsing/background-image-computed.sub-expected.txt
deleted file mode 100644
index 2590ac0..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/composite-bgcolor-animation/external/wpt/css/css-backgrounds/parsing/background-image-computed.sub-expected.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-This is a testharness.js-based test.
-PASS Property background-image value 'none'
-PASS Property background-image value 'url("http://web-platform.test/")'
-PASS Property background-image value 'none, url("http://web-platform.test/")'
-PASS Property background-image value 'linear-gradient(to left bottom, red, blue)'
-PASS Property background-image value 'radial-gradient(rgb(255, 0, 0), rgb(0, 0, 255))'
-FAIL Property background-image value 'radial-gradient(at center, red, blue)' assert_equals: expected "radial-gradient(rgb(255, 0, 0), rgb(0, 0, 255))" but got "radial-gradient(at center center, rgb(255, 0, 0), rgb(0, 0, 255))"
-FAIL Property background-image value 'radial-gradient(at 50%, red, blue)' assert_equals: expected "radial-gradient(rgb(255, 0, 0), rgb(0, 0, 255))" but got "radial-gradient(at 50% center, rgb(255, 0, 0), rgb(0, 0, 255))"
-PASS Property background-image value 'radial-gradient(at 10px 10px, rgb(255, 0, 0), rgb(0, 0, 255))'
-PASS Property background-image value 'radial-gradient(farthest-side, rgb(255, 0, 0), rgb(0, 0, 255))'
-PASS Property background-image value 'radial-gradient(farthest-side at 10px 10px, rgb(255, 0, 0), rgb(0, 0, 255))'
-PASS Property background-image value 'radial-gradient(farthest-corner, red, blue)'
-FAIL Property background-image value 'radial-gradient(farthest-corner at center, red, blue)' assert_equals: expected "radial-gradient(rgb(255, 0, 0), rgb(0, 0, 255))" but got "radial-gradient(at center center, rgb(255, 0, 0), rgb(0, 0, 255))"
-FAIL Property background-image value 'radial-gradient(farthest-corner at 50%, red, blue)' assert_equals: expected "radial-gradient(rgb(255, 0, 0), rgb(0, 0, 255))" but got "radial-gradient(at 50% center, rgb(255, 0, 0), rgb(0, 0, 255))"
-PASS Property background-image value 'radial-gradient(farthest-corner at 10px 10px, red, blue)'
-PASS Property background-image value 'radial-gradient(10px at 20px 30px, rgb(255, 0, 0), rgb(0, 0, 255))'
-FAIL Property background-image value 'radial-gradient(circle calc(-0.5em + 10px) at calc(-1em + 10px) calc(-2em + 10px), red, blue)' assert_equals: expected "radial-gradient(0px at -30px -70px, rgb(255, 0, 0), rgb(0, 0, 255))" but got "radial-gradient(calc(-0.5em + 10px) at calc(-1em + 10px) calc(-2em + 10px), rgb(255, 0, 0), rgb(0, 0, 255))"
-FAIL Property background-image value 'radial-gradient(ellipse calc(-0.5em + 10px) calc(0.5em + 10px) at 20px 30px, red, blue)' assert_equals: expected "radial-gradient(0px 30px at 20px 30px, rgb(255, 0, 0), rgb(0, 0, 255))" but got "radial-gradient(calc(-0.5em + 10px) calc(0.5em + 10px) at 20px 30px, rgb(255, 0, 0), rgb(0, 0, 255))"
-FAIL Property background-image value 'radial-gradient(ellipse calc(0.5em + 10px) calc(-0.5em + 10px) at 20px 30px, red, blue)' assert_equals: expected "radial-gradient(30px 0px at 20px 30px, rgb(255, 0, 0), rgb(0, 0, 255))" but got "radial-gradient(calc(0.5em + 10px) calc(-0.5em + 10px) at 20px 30px, rgb(255, 0, 0), rgb(0, 0, 255))"
-PASS Property background-image value 'conic-gradient(rgb(255, 0, 0), rgb(0, 0, 255))'
-FAIL Property background-image value 'conic-gradient(at center, red, blue)' assert_equals: expected "conic-gradient(rgb(255, 0, 0), rgb(0, 0, 255))" but got "conic-gradient(at center center, rgb(255, 0, 0), rgb(0, 0, 255))"
-FAIL Property background-image value 'conic-gradient(at 50%, red, blue)' assert_equals: expected "conic-gradient(rgb(255, 0, 0), rgb(0, 0, 255))" but got "conic-gradient(at 50% center, rgb(255, 0, 0), rgb(0, 0, 255))"
-PASS Property background-image value 'conic-gradient(at 10px 10px, rgb(255, 0, 0), rgb(0, 0, 255))'
-FAIL Property background-image value 'conic-gradient(from 0deg, red, blue)' assert_equals: expected "conic-gradient(rgb(255, 0, 0), rgb(0, 0, 255))" but got "conic-gradient(from 0deg, rgb(255, 0, 0), rgb(0, 0, 255))"
-FAIL Property background-image value 'conic-gradient(from 0deg at center, red, blue)' assert_equals: expected "conic-gradient(rgb(255, 0, 0), rgb(0, 0, 255))" but got "conic-gradient(from 0deg at center center, rgb(255, 0, 0), rgb(0, 0, 255))"
-FAIL Property background-image value 'conic-gradient(from 0deg at 50%, red, blue)' assert_equals: expected "conic-gradient(rgb(255, 0, 0), rgb(0, 0, 255))" but got "conic-gradient(from 0deg at 50% center, rgb(255, 0, 0), rgb(0, 0, 255))"
-FAIL Property background-image value 'conic-gradient(from 0deg at 10px 10px, red, blue)' assert_equals: expected "conic-gradient(at 10px 10px, rgb(255, 0, 0), rgb(0, 0, 255))" but got "conic-gradient(from 0deg at 10px 10px, rgb(255, 0, 0), rgb(0, 0, 255))"
-PASS Property background-image value 'conic-gradient(from 45deg, rgb(255, 0, 0), rgb(0, 0, 255))'
-FAIL Property background-image value 'conic-gradient(from 45deg at center, red, blue)' assert_equals: expected "conic-gradient(from 45deg, rgb(255, 0, 0), rgb(0, 0, 255))" but got "conic-gradient(from 45deg at center center, rgb(255, 0, 0), rgb(0, 0, 255))"
-FAIL Property background-image value 'conic-gradient(from 45deg at 50%, red, blue)' assert_equals: expected "conic-gradient(from 45deg, rgb(255, 0, 0), rgb(0, 0, 255))" but got "conic-gradient(from 45deg at 50% center, rgb(255, 0, 0), rgb(0, 0, 255))"
-PASS Property background-image value 'conic-gradient(from 45deg at 10px 10px, red, blue)'
-PASS Property background-image value 'conic-gradient(from -45deg, rgb(255, 0, 0), rgb(0, 0, 255))'
-FAIL Property background-image value 'conic-gradient(from -45deg at center, red, blue)' assert_equals: expected "conic-gradient(from -45deg, rgb(255, 0, 0), rgb(0, 0, 255))" but got "conic-gradient(from -45deg at center center, rgb(255, 0, 0), rgb(0, 0, 255))"
-FAIL Property background-image value 'conic-gradient(from -45deg at 50%, red, blue)' assert_equals: expected "conic-gradient(from -45deg, rgb(255, 0, 0), rgb(0, 0, 255))" but got "conic-gradient(from -45deg at 50% center, rgb(255, 0, 0), rgb(0, 0, 255))"
-PASS Property background-image value 'conic-gradient(from -45deg at 10px 10px, red, blue)'
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/omt-worker-fetch/external/wpt/xhr/xhr-timeout-longtask.any-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.15/virtual/omt-worker-fetch/external/wpt/xhr/xhr-timeout-longtask.any-expected.txt
deleted file mode 100644
index 8651942..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/omt-worker-fetch/external/wpt/xhr/xhr-timeout-longtask.any-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL Long tasks should not trigger load timeout assert_unreached: [object ProgressEvent] Reached unreachable code
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/scroll-unification-synchronous_html_parser/external/wpt/dom/xslt/transformToFragment.tentative.window-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.15/virtual/scroll-unification-synchronous_html_parser/external/wpt/dom/xslt/transformToFragment.tentative.window-expected.txt
deleted file mode 100644
index 8e39712..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/scroll-unification-synchronous_html_parser/external/wpt/dom/xslt/transformToFragment.tentative.window-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a testharness.js-based test.
-FAIL internal script assert_true: script element from XSLTProcessor.transformToFragment() is evaluated expected true got undefined
-FAIL external script assert_true: script element from XSLTProcessor.transformToFragment() is evaluated expected true got undefined
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/external/wpt/content-security-policy/securitypolicyviolation/source-file-data-scheme-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/external/wpt/content-security-policy/securitypolicyviolation/source-file-data-scheme-expected.txt
deleted file mode 100644
index 8e68733..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/external/wpt/content-security-policy/securitypolicyviolation/source-file-data-scheme-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL Violations from data:-URL scripts have a sourceFile of 'data' assert_equals: expected 16 but got 17
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/external/wpt/dom/xslt/transformToFragment.tentative.window-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/external/wpt/dom/xslt/transformToFragment.tentative.window-expected.txt
deleted file mode 100644
index 8e39712..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/external/wpt/dom/xslt/transformToFragment.tentative.window-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a testharness.js-based test.
-FAIL internal script assert_true: script element from XSLTProcessor.transformToFragment() is evaluated expected true got undefined
-FAIL external script assert_true: script element from XSLTProcessor.transformToFragment() is evaluated expected true got undefined
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/external/wpt/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/endTime-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/external/wpt/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/endTime-expected.txt
deleted file mode 100644
index ee77d34..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/external/wpt/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/endTime-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a testharness.js-based test.
-FAIL TextTrackCue.endTime, script-created cue Failed to set the 'endTime' property on 'TextTrackCue': The provided double value is non-finite.
-PASS TextTrackCue.endTime, parsed cue
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/fast/css/content/content-quotes-01-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/fast/css/content/content-quotes-01-expected.txt
deleted file mode 100644
index 486ca4de..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/fast/css/content/content-quotes-01-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-The texts between the markers should be identical.
-
-========Marker1========
-
-ab	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-WWaWWbWWWWWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=195.062px; expected 195.047px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/fast/css/content/content-quotes-02-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/fast/css/content/content-quotes-02-expected.txt
deleted file mode 100644
index fe032c9..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/fast/css/content/content-quotes-02-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-abcd	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-aWWWbWWWWWcWWdWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=241.656px; expected 241.625px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/fast/css/content/content-quotes-03-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/fast/css/content/content-quotes-03-expected.txt
deleted file mode 100644
index 72857d68..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/fast/css/content/content-quotes-03-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-ab	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-aWWWbWWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=136.828px; expected 136.812px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/fast/css/content/content-quotes-05-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/fast/css/content/content-quotes-05-expected.txt
deleted file mode 100644
index 42634168..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/fast/css/content/content-quotes-05-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-abc	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-WWaWWWbWWWWWcWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=232.391px; expected 232.359px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/fast/css/content/content-quotes-06-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/fast/css/content/content-quotes-06-expected.txt
deleted file mode 100644
index 85f9069..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/fast/css/content/content-quotes-06-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-abc	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-a'b'c	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=28px; expected 27.9688px
diff --git a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/fast/css/font-face-opentype-expected.png b/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/fast/css/font-face-opentype-expected.png
deleted file mode 100644
index eb3ac07..0000000
--- a/third_party/blink/web_tests/platform/mac-mac10.15/virtual/synchronous_html_parser/fast/css/font-face-opentype-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/dark-mode-images-grayscale/dark-mode/images/crossfade-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/dark-mode-images-grayscale/dark-mode/images/crossfade-expected.png
deleted file mode 100644
index 1fff804..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/dark-mode-images-grayscale/dark-mode/images/crossfade-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/fast/css/background-clip-radius-values-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/fast/css/background-clip-radius-values-expected.png
deleted file mode 100644
index 4ae04482..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/fast/css/background-clip-radius-values-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/fast/css/font-face-opentype-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/fast/css/font-face-opentype-expected.png
deleted file mode 100644
index eb3ac07..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/fast/css/font-face-opentype-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/fast/css/shadow-multiple-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/fast/css/shadow-multiple-expected.png
deleted file mode 100644
index e928423c..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/fast/css/shadow-multiple-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/fast/css/transformed-mask-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/fast/css/transformed-mask-expected.png
deleted file mode 100644
index 7607c71..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/fast/css/transformed-mask-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/alpha-video-playback-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/alpha-video-playback-expected.png
deleted file mode 100644
index 7fc316c..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/alpha-video-playback-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/audio-controls-rendering-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/audio-controls-rendering-expected.png
deleted file mode 100644
index cfa241e..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/audio-controls-rendering-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/audio-repaint-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/audio-repaint-expected.png
deleted file mode 100644
index 488405d6..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/audio-repaint-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/controls-layout-direction-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/controls-layout-direction-expected.png
deleted file mode 100644
index 243bf7ee..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/controls-layout-direction-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/media-controls-clone-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/media-controls-clone-expected.png
deleted file mode 100644
index cab6695..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/media-controls-clone-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/media-controls-grey-scrubber-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/media-controls-grey-scrubber-expected.png
deleted file mode 100644
index 2b3c226..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/media-controls-grey-scrubber-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/media-document-audio-repaint-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/media-document-audio-repaint-expected.png
deleted file mode 100644
index 8874a70..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/media-document-audio-repaint-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/video-empty-source-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/video-empty-source-expected.png
deleted file mode 100644
index 61f58daa..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/media/video-empty-source-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.png
deleted file mode 100644
index 778f276..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-units-01-b-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-units-01-b-expected.png
deleted file mode 100644
index 27ad753a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/coords-units-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-blend-01-b-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-blend-01-b-expected.png
deleted file mode 100644
index 8b9af94..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-blend-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-composite-02-b-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-composite-02-b-expected.png
deleted file mode 100644
index 4b068753..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-composite-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-example-01-b-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-example-01-b-expected.png
deleted file mode 100644
index 74273ba..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-example-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-image-01-b-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-image-01-b-expected.png
deleted file mode 100644
index b774321..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-image-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-offset-01-b-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-offset-01-b-expected.png
deleted file mode 100644
index 030c5027..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-offset-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-02-b-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-02-b-expected.png
deleted file mode 100644
index a5b7413a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-02-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-04-b-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-04-b-expected.png
deleted file mode 100644
index ad6eb4f..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
deleted file mode 100644
index edf04a7..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.png
deleted file mode 100644
index 6b7c972..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-06-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-12-b-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-12-b-expected.png
deleted file mode 100644
index f0e56827..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-12-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-13-b-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-13-b-expected.png
deleted file mode 100644
index 6ff7484..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/pservers-grad-13-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-08-t-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-08-t-expected.png
deleted file mode 100644
index b37802f..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-08-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-09-t-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-09-t-expected.png
deleted file mode 100644
index 9d3b07c..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-09-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-10-t-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-10-t-expected.png
deleted file mode 100644
index 726fa63..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/struct-image-10-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-inherit-01-b-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-inherit-01-b-expected.png
deleted file mode 100644
index b96e44e..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/styling-inherit-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png
deleted file mode 100644
index 050430d..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/background-image-tiled-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/background-image-tiled-expected.png
deleted file mode 100644
index c809dfb..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/background-image-tiled-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/background-repeat-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/background-repeat-expected.png
deleted file mode 100644
index 3e17990..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/background-repeat-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/same-image-two-instances-background-image-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/same-image-two-instances-background-image-expected.png
deleted file mode 100644
index 05639ab..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/same-image-two-instances-background-image-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-1-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-1-expected.png
deleted file mode 100644
index 4b56046c..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-2-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-2-expected.png
deleted file mode 100644
index b8641e6d..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-6-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-6-expected.png
deleted file mode 100644
index b5b4ac0..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-6-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/batik/filters/feTile-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/batik/filters/feTile-expected.png
deleted file mode 100644
index cd1ebd5f..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/batik/filters/feTile-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/batik/paints/patternPreserveAspectRatioA-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/batik/paints/patternPreserveAspectRatioA-expected.png
deleted file mode 100644
index 2bd8f80..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/batik/paints/patternPreserveAspectRatioA-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/batik/text/textDecoration-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/batik/text/textDecoration-expected.png
deleted file mode 100644
index 80b214e3..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/batik/text/textDecoration-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/carto.net/colourpicker-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/carto.net/colourpicker-expected.png
deleted file mode 100644
index 59bf97c..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/carto.net/colourpicker-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/clip-path/clip-path-childs-clipped-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/clip-path/clip-path-childs-clipped-expected.png
deleted file mode 100644
index 78f78d0..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/clip-path/clip-path-childs-clipped-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/embedding-external-svgs-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/embedding-external-svgs-expected.png
deleted file mode 100644
index f486d27..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/embedding-external-svgs-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/focus-ring-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/focus-ring-expected.png
deleted file mode 100644
index 6c7e8c1..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/focus-ring-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/gradient-stroke-width-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/gradient-stroke-width-expected.png
deleted file mode 100644
index 377604d..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/gradient-stroke-width-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/gradient-userSpaceOnUse-with-percentage-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/gradient-userSpaceOnUse-with-percentage-expected.png
deleted file mode 100644
index b28d055..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/gradient-userSpaceOnUse-with-percentage-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/marker-opacity-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/marker-opacity-expected.png
deleted file mode 100644
index baf71a09..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/marker-opacity-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/nested-pattern-boundingBoxModeContent-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/nested-pattern-boundingBoxModeContent-expected.png
deleted file mode 100644
index 1a2d0de..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/nested-pattern-boundingBoxModeContent-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/pattern-rotate-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/pattern-rotate-expected.png
deleted file mode 100644
index f7d01aa6..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/pattern-rotate-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/pattern-with-transformation-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/pattern-with-transformation-expected.png
deleted file mode 100644
index 49cdadb..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/pattern-with-transformation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/radialGradient-focal-radius-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/radialGradient-focal-radius-expected.png
deleted file mode 100644
index 5bf330e..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/radialGradient-focal-radius-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/recursive-gradient-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/recursive-gradient-expected.png
deleted file mode 100644
index 7491f1b..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/recursive-gradient-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/stroked-pattern-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/stroked-pattern-expected.png
deleted file mode 100644
index 095afe9..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/stroked-pattern-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/transformed-outlines-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/transformed-outlines-expected.png
deleted file mode 100644
index 12148f1a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/transformed-outlines-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/use-on-symbol-inside-pattern-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/use-on-symbol-inside-pattern-expected.png
deleted file mode 100644
index 41f9e4a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/custom/use-on-symbol-inside-pattern-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEBlendElement-dom-in-attr-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEBlendElement-dom-in-attr-expected.png
deleted file mode 100644
index 55cd33a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEBlendElement-dom-in-attr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEBlendElement-dom-in2-attr-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEBlendElement-dom-in2-attr-expected.png
deleted file mode 100644
index 55cd33a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEBlendElement-dom-in2-attr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEBlendElement-dom-mode-attr-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEBlendElement-dom-mode-attr-expected.png
deleted file mode 100644
index 55cd33a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEBlendElement-dom-mode-attr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEBlendElement-svgdom-in-prop-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEBlendElement-svgdom-in-prop-expected.png
deleted file mode 100644
index 55cd33a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEBlendElement-svgdom-in-prop-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEBlendElement-svgdom-in2-prop-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEBlendElement-svgdom-in2-prop-expected.png
deleted file mode 100644
index 55cd33a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEBlendElement-svgdom-in2-prop-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEBlendElement-svgdom-mode-prop-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEBlendElement-svgdom-mode-prop-expected.png
deleted file mode 100644
index 55cd33a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEBlendElement-svgdom-mode-prop-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-in-attr-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-in-attr-expected.png
deleted file mode 100644
index dffea6f6..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-in-attr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-in2-attr-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-in2-attr-expected.png
deleted file mode 100644
index 8c65005..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-in2-attr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-k1-attr-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-k1-attr-expected.png
deleted file mode 100644
index 8c65005..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-k1-attr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-k2-attr-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-k2-attr-expected.png
deleted file mode 100644
index 8c65005..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-k2-attr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-k3-attr-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-k3-attr-expected.png
deleted file mode 100644
index e4227c8..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-k3-attr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-k4-attr-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-k4-attr-expected.png
deleted file mode 100644
index 8c65005..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-k4-attr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-operator-attr-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-operator-attr-expected.png
deleted file mode 100644
index 8c65005..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-dom-operator-attr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-in-prop-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-in-prop-expected.png
deleted file mode 100644
index dffea6f6..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-in-prop-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-in2-prop-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-in2-prop-expected.png
deleted file mode 100644
index 8c65005..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-in2-prop-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-k1-prop-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-k1-prop-expected.png
deleted file mode 100644
index 8c65005..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-k1-prop-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-k2-prop-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-k2-prop-expected.png
deleted file mode 100644
index 8c65005..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-k2-prop-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-k3-prop-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-k3-prop-expected.png
deleted file mode 100644
index e4227c8..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-k3-prop-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-k4-prop-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-k4-prop-expected.png
deleted file mode 100644
index 8c65005..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-k4-prop-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-operator-prop-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-operator-prop-expected.png
deleted file mode 100644
index 8c65005..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFECompositeElement-svgdom-operator-prop-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-dom-dx-attr-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-dom-dx-attr-expected.png
deleted file mode 100644
index 605bab2..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-dom-dx-attr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-dom-dy-attr-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-dom-dy-attr-expected.png
deleted file mode 100644
index 605bab2..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-dom-dy-attr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-dom-in-attr-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-dom-in-attr-expected.png
deleted file mode 100644
index 605bab2..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-dom-in-attr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-color-attr-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-color-attr-expected.png
deleted file mode 100644
index 68708ea..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-color-attr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-opacity-attr-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-opacity-attr-expected.png
deleted file mode 100644
index 125f689..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-opacity-attr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-dom-stdDeviation-attr-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-dom-stdDeviation-attr-expected.png
deleted file mode 100644
index ef2677c..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-dom-stdDeviation-attr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-dx-prop-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-dx-prop-expected.png
deleted file mode 100644
index 605bab2..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-dx-prop-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-dy-prop-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-dy-prop-expected.png
deleted file mode 100644
index 605bab2..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-dy-prop-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-in-prop-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-in-prop-expected.png
deleted file mode 100644
index 605bab2..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-in-prop-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-shadow-color-prop-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-shadow-color-prop-expected.png
deleted file mode 100644
index 68708ea..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-shadow-color-prop-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-shadow-opacity-prop-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-shadow-opacity-prop-expected.png
deleted file mode 100644
index 125f689..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-shadow-opacity-prop-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-stdDeviation-prop-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-stdDeviation-prop-expected.png
deleted file mode 100644
index ef2677c..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-stdDeviation-prop-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEImageElement-dom-preserveAspectRatio-attr-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEImageElement-dom-preserveAspectRatio-attr-expected.png
deleted file mode 100644
index 62138755..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEImageElement-dom-preserveAspectRatio-attr-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEImageElement-svgdom-preserveAspectRatio-prop-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEImageElement-svgdom-preserveAspectRatio-prop-expected.png
deleted file mode 100644
index 62138755..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/dynamic-updates/SVGFEImageElement-svgdom-preserveAspectRatio-prop-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feBlend-all-modes-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feBlend-all-modes-expected.png
deleted file mode 100644
index ece8b96..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feBlend-all-modes-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feDropShadow-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feDropShadow-expected.png
deleted file mode 100644
index deebd1a..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feDropShadow-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png
deleted file mode 100644
index 195761bc..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png
deleted file mode 100644
index bba0f03..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png
deleted file mode 100644
index 195761bc..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png
deleted file mode 100644
index bba0f03..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feImage-preserveAspectRatio-all-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feImage-preserveAspectRatio-all-expected.png
deleted file mode 100644
index 69c22c71..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/filters/feImage-preserveAspectRatio-all-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/text/mix-blend-mode-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/text/mix-blend-mode-expected.png
deleted file mode 100644
index 18da5c0..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/text/mix-blend-mode-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/text/surrogate-pair-queries-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/text/surrogate-pair-queries-expected.png
deleted file mode 100644
index 1ecb3d9..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/text/surrogate-pair-queries-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/transforms/text-with-mask-with-svg-transform-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/transforms/text-with-mask-with-svg-transform-expected.png
deleted file mode 100644
index f5ba8a0..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/transforms/text-with-mask-with-svg-transform-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/transforms/text-with-pattern-inside-transformed-html-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/transforms/text-with-pattern-inside-transformed-html-expected.png
deleted file mode 100644
index 20a1cc4..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/transforms/text-with-pattern-inside-transformed-html-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/transforms/text-with-pattern-with-svg-transform-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/transforms/text-with-pattern-with-svg-transform-expected.png
deleted file mode 100644
index d9866c2..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/transforms/text-with-pattern-with-svg-transform-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/wicd/test-scalable-background-image2-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/wicd/test-scalable-background-image2-expected.png
deleted file mode 100644
index fc654b9..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/wicd/test-scalable-background-image2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/zoom/page/zoom-background-image-tiled-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/zoom/page/zoom-background-image-tiled-expected.png
deleted file mode 100644
index 488b685..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/zoom/page/zoom-background-image-tiled-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/zoom/page/zoom-background-images-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/zoom/page/zoom-background-images-expected.png
deleted file mode 100644
index dd9698fe..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/synchronous_html_parser/svg/zoom/page/zoom-background-images-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/transform-interop-disabled/paint/invalidation/canvas-resize-no-full-invalidation-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/transform-interop-disabled/paint/invalidation/canvas-resize-no-full-invalidation-expected.png
deleted file mode 100644
index 2bfe7f7..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/transform-interop-disabled/paint/invalidation/canvas-resize-no-full-invalidation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/transform-interop-disabled/paint/invalidation/reflection/reflection-with-rotation-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/transform-interop-disabled/paint/invalidation/reflection/reflection-with-rotation-expected.png
deleted file mode 100644
index 06523dd..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/transform-interop-disabled/paint/invalidation/reflection/reflection-with-rotation-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/transform-interop-disabled/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/transform-interop-disabled/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
deleted file mode 100644
index 4adbb41..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/transform-interop-disabled/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/transform-interop-disabled/paint/invalidation/svg/mask-clip-target-transform-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/transform-interop-disabled/paint/invalidation/svg/mask-clip-target-transform-expected.png
deleted file mode 100644
index 0af3f71..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/transform-interop-disabled/paint/invalidation/svg/mask-clip-target-transform-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/transform-interop-disabled/paint/invalidation/svg/relative-sized-content-with-resources-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/transform-interop-disabled/paint/invalidation/svg/relative-sized-content-with-resources-expected.png
deleted file mode 100644
index 2a04ce3..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/transform-interop-disabled/paint/invalidation/svg/relative-sized-content-with-resources-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/transform-interop-disabled/transforms/transformed-document-element-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/transform-interop-disabled/transforms/transformed-document-element-expected.png
deleted file mode 100644
index a6feb428..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/virtual/transform-interop-disabled/transforms/transformed-document-element-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/css/acid2-expected.png b/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/css/acid2-expected.png
deleted file mode 100644
index 8a096ffd..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/css/acid2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/001-expected.png b/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/001-expected.png
deleted file mode 100644
index 6daeec4..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/001-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/button-style-color-expected.png b/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/button-style-color-expected.png
deleted file mode 100644
index 7b0e2f7..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/button-style-color-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png b/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
deleted file mode 100644
index 389d56a..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/color/color-suggestion-picker-appearance-expected.png b/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/color/color-suggestion-picker-appearance-expected.png
deleted file mode 100644
index 4f58855..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/color/color-suggestion-picker-appearance-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/date/date-appearance-basic-expected.png b/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/date/date-appearance-basic-expected.png
deleted file mode 100644
index 2dbf52d..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/date/date-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png b/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
deleted file mode 100644
index 42d0a7e..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/fieldset/fieldset-align-expected.png b/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/fieldset/fieldset-align-expected.png
deleted file mode 100644
index 3a8ff8abe..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/fieldset/fieldset-align-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/month/month-appearance-basic-expected.png b/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/month/month-appearance-basic-expected.png
deleted file mode 100644
index 7ea28f68..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/month/month-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/select/basic-selects-expected.png b/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/select/basic-selects-expected.png
deleted file mode 100644
index b2268dd..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/select/basic-selects-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/select/select-autofilled-expected.png b/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/select/select-autofilled-expected.png
deleted file mode 100644
index f3c383d7..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/select/select-autofilled-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/submit/submit-appearance-basic-expected.png b/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/submit/submit-appearance-basic-expected.png
deleted file mode 100644
index 790a33f..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/submit/submit-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/text/text-appearance-basic-expected.png b/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/text/text-appearance-basic-expected.png
deleted file mode 100644
index 13cd362..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/text/text-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/textarea/textarea-appearance-basic-expected.png b/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/textarea/textarea-appearance-basic-expected.png
deleted file mode 100644
index 0074f15..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/cascade/fast/forms/textarea/textarea-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/dark-mode-native-theme-off/text-input-elements-expected.png b/third_party/blink/web_tests/platform/mac/virtual/dark-mode-native-theme-off/text-input-elements-expected.png
deleted file mode 100644
index 7484e1dc..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/dark-mode-native-theme-off/text-input-elements-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/dark-mode-native-theme-on/text-input-elements-expected.png b/third_party/blink/web_tests/platform/mac/virtual/dark-mode-native-theme-on/text-input-elements-expected.png
deleted file mode 100644
index 75980b0a..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/dark-mode-native-theme-on/text-input-elements-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/disable-spinvalidation/compositing/masks/mask-with-removed-filters-expected.png b/third_party/blink/web_tests/platform/mac/virtual/disable-spinvalidation/compositing/masks/mask-with-removed-filters-expected.png
deleted file mode 100644
index 0481bdbb..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/disable-spinvalidation/compositing/masks/mask-with-removed-filters-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/disable-spinvalidation/compositing/text-on-scaled-surface-expected.png b/third_party/blink/web_tests/platform/mac/virtual/disable-spinvalidation/compositing/text-on-scaled-surface-expected.png
deleted file mode 100644
index 94cb2fb..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/disable-spinvalidation/compositing/text-on-scaled-surface-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png
deleted file mode 100644
index 0d10a60..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-video-expected.png b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-video-expected.png
deleted file mode 100644
index 4cbdf75..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-video-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-ellipse-connecting-line-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-ellipse-connecting-line-expected.txt
deleted file mode 100644
index 0dec203..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-ellipse-connecting-line-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x320
-  LayoutBlockFlow {HTML} at (0,0) size 800x320
-    LayoutBlockFlow {BODY} at (8,8) size 784x304
-      LayoutText {#text} at (0,0) size 0x0
-layer at (8,8) size 300x300
-  LayoutHTMLCanvas {CANVAS} at (0,0) size 300x300
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
deleted file mode 100644
index fe14df1..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-text-alignment-expected.png b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-text-alignment-expected.png
deleted file mode 100644
index fc6fb33..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-text-alignment-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-text-baseline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-text-baseline-expected.png
deleted file mode 100644
index 9cceddb..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-text-baseline-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-text-baseline-tiny-fonts-expected.png b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-text-baseline-tiny-fonts-expected.png
deleted file mode 100644
index 39e2dcf..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-text-baseline-tiny-fonts-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-textMetrics-width-expected.png b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-textMetrics-width-expected.png
deleted file mode 100644
index 69a83d3..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-textMetrics-width-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png
deleted file mode 100644
index ad7239b..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-transforms-during-path-expected.png b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-transforms-during-path-expected.png
deleted file mode 100644
index 4ee9168..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-transforms-during-path-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/drawImage-with-globalAlpha-expected.png b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/drawImage-with-globalAlpha-expected.png
deleted file mode 100644
index 8ccc73a1a..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/drawImage-with-globalAlpha-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/fillrect_gradient-expected.png b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/fillrect_gradient-expected.png
deleted file mode 100644
index d4b107d..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/fillrect_gradient-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png
deleted file mode 100644
index ebff45f8..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/patternfill-repeat-expected.png b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/patternfill-repeat-expected.png
deleted file mode 100644
index e3a6aab..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/patternfill-repeat-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/patternfill-repeat-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/patternfill-repeat-expected.txt
deleted file mode 100644
index 5b140e7..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/patternfill-repeat-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x460
-  LayoutBlockFlow {HTML} at (0,0) size 800x460
-    LayoutBlockFlow {BODY} at (8,16) size 784x428
-      LayoutBlockFlow {P} at (0,0) size 784x72
-        LayoutText {#text} at (0,0) size 785x72
-          text run at (0,0) width 761: "There should be one big square below containing four squares. Top left square should be filled with 3 rows of 2 and bit"
-          text run at (0,18) width 785: "Apple images. Top right square should be 2 and a bit rows with one Apple image column along the left edge of the square."
-          text run at (0,36) width 778: "Bottom left square should be one row with three Apple images along the top of the square. Bottom right square should be"
-          text run at (0,54) width 224: "one Apple image in top left corner."
-      LayoutBlockFlow {P} at (0,88) size 784x340
-layer at (8,104) size 336x336
-  LayoutHTMLCanvas {CANVAS} at (0,0) size 336x336 [border: (3px solid #000000)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/quadraticCurveTo-expected.png b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/quadraticCurveTo-expected.png
deleted file mode 100644
index a4384ad..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/quadraticCurveTo-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png
deleted file mode 100644
index 04f45429f..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/shadow-offset-1-expected.png b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/shadow-offset-1-expected.png
deleted file mode 100644
index 92a1f110..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/shadow-offset-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/toDataURL-alpha-expected.png b/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/toDataURL-alpha-expected.png
deleted file mode 100644
index 278dce35..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/toDataURL-alpha-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/forced-high-contrast-cascade/external/wpt/forced-colors-mode/forced-colors-mode-04-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/forced-high-contrast-cascade/external/wpt/forced-colors-mode/forced-colors-mode-04-expected.txt
deleted file mode 100644
index 29a12151..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/forced-high-contrast-cascade/external/wpt/forced-colors-mode/forced-colors-mode-04-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL Checks hyperlinks are overridden in forced colors mode. assert_equals: expected "rgba(0, 0, 0, 0.18)" but got "rgba(0, 0, 0, 0.4)"
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/css2.1/20110323/background-intrinsic-004-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/css2.1/20110323/background-intrinsic-004-expected.png
deleted file mode 100644
index 4abd014..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/css2.1/20110323/background-intrinsic-004-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/css2.1/20110323/background-intrinsic-005-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/css2.1/20110323/background-intrinsic-005-expected.png
deleted file mode 100644
index 59f3b6728..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/css2.1/20110323/background-intrinsic-005-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/003-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/003-expected.png
deleted file mode 100644
index f48ba09e..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/003-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/015-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/015-expected.png
deleted file mode 100644
index 7a2dbaa..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/015-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/016-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/016-expected.png
deleted file mode 100644
index 9134bfa..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/016-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/018-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/018-expected.png
deleted file mode 100644
index a99f36fc..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/018-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/020-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/020-expected.png
deleted file mode 100644
index 16ae4d3..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/020-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/adding-near-anonymous-block-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/adding-near-anonymous-block-expected.png
deleted file mode 100644
index 604e6d8..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/adding-near-anonymous-block-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/white-space-pre-wraps-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/white-space-pre-wraps-expected.png
deleted file mode 100644
index c1133eb..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/basic/white-space-pre-wraps-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/001-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/001-expected.png
deleted file mode 100644
index 3a91c7c..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/001-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/002-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/002-expected.png
deleted file mode 100644
index 9c96d9c..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/002-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/014-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/014-expected.png
deleted file mode 100644
index 29e0b64..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/014-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/016-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/016-expected.png
deleted file mode 100644
index c2f71509..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/016-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/021-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/021-expected.png
deleted file mode 100644
index 4fa5d3182..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/021-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/avoidance-percent-width-strict-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/avoidance-percent-width-strict-expected.png
deleted file mode 100644
index d29b831..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/avoidance-percent-width-strict-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/centered-float-avoidance-complexity-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/centered-float-avoidance-complexity-expected.png
deleted file mode 100644
index 55e99d2..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/centered-float-avoidance-complexity-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/editable-text-overlapping-float-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/editable-text-overlapping-float-expected.png
deleted file mode 100644
index 90e9e752..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/editable-text-overlapping-float-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/float-avoidance-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/float-avoidance-expected.png
deleted file mode 100644
index 40df0067..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/float-avoidance-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/independent-align-positioning-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/independent-align-positioning-expected.png
deleted file mode 100644
index 323a8a4..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/independent-align-positioning-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/multiple-float-positioning-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/multiple-float-positioning-expected.png
deleted file mode 100644
index 5a329b7..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/multiple-float-positioning-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/nestedAnonymousBlocks2-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/nestedAnonymousBlocks2-expected.png
deleted file mode 100644
index 59a2eb07..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/nestedAnonymousBlocks2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/nopaint-after-layer-destruction-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/nopaint-after-layer-destruction-expected.png
deleted file mode 100644
index 3d120b3..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/nopaint-after-layer-destruction-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/shrink-to-avoid-float-complexity-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/shrink-to-avoid-float-complexity-expected.png
deleted file mode 100644
index 6f0b746..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/shrink-to-avoid-float-complexity-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/shrink-to-fit-width-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/shrink-to-fit-width-expected.png
deleted file mode 100644
index b25783df..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/shrink-to-fit-width-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/table-relayout-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/table-relayout-expected.png
deleted file mode 100644
index 8435833..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/table-relayout-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/vertical-move-relayout-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/vertical-move-relayout-expected.png
deleted file mode 100644
index 0b7515ae..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/float/vertical-move-relayout-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/006-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/006-expected.png
deleted file mode 100644
index fb01fd6..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/006-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/010-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/010-expected.png
deleted file mode 100644
index f7a162a9..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/010-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/011-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/011-expected.png
deleted file mode 100644
index f7a162a9..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/011-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/012-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/012-expected.png
deleted file mode 100644
index 9a86076..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/012-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/015-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/015-expected.png
deleted file mode 100644
index 2b3e410..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/015-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/016-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/016-expected.png
deleted file mode 100644
index 5704a8a..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/016-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/017-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/017-expected.png
deleted file mode 100644
index cd5bba7..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/017-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/019-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/019-expected.png
deleted file mode 100644
index 3f83783a..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/019-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/020-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/020-expected.png
deleted file mode 100644
index 7d9acf0..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/020-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/059-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/059-expected.png
deleted file mode 100644
index 4901154..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/059-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/100-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/100-expected.png
deleted file mode 100644
index 1b36e9e..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/100-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/006-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/006-expected.png
deleted file mode 100644
index fb01fd6..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/006-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/016-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/016-expected.png
deleted file mode 100644
index 5704a8a..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/016-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/017-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/017-expected.png
deleted file mode 100644
index cd5bba7..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/017-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/019-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/019-expected.png
deleted file mode 100644
index 3f83783a..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/019-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/020-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/020-expected.png
deleted file mode 100644
index 7d9acf0..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/block/margin-collapse/block-inside-inline/020-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/inline/002-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/inline/002-expected.png
deleted file mode 100644
index c1173c0..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/inline/002-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/inline/25277-2-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/inline/25277-2-expected.png
deleted file mode 100644
index acf2f8a..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/inline/25277-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/inline/nested-top-alignment-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/inline/nested-top-alignment-expected.png
deleted file mode 100644
index 8a5b2f60..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/inline/nested-top-alignment-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/writing-mode/english-rl-text-expected.png b/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/writing-mode/english-rl-text-expected.png
deleted file mode 100644
index 6a3bd37..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/layout_ng/fast/writing-mode/english-rl-text-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-blobs/fast/files/file-in-input-display-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-blobs/fast/files/file-in-input-display-expected.png
deleted file mode 100644
index 7ddbaae..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/mojo-blobs/fast/files/file-in-input-display-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/new-remote-playback-pipeline/media/controls/paint-controls-webkit-appearance-none-expected.png b/third_party/blink/web_tests/platform/mac/virtual/new-remote-playback-pipeline/media/controls/paint-controls-webkit-appearance-none-expected.png
deleted file mode 100644
index c57b090..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/new-remote-playback-pipeline/media/controls/paint-controls-webkit-appearance-none-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/not-omt-sw-fetch/external/wpt/xhr/getallresponseheaders-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/not-omt-sw-fetch/external/wpt/xhr/getallresponseheaders-expected.txt
deleted file mode 100644
index 69617d19..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/not-omt-sw-fetch/external/wpt/xhr/getallresponseheaders-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-This is a testharness.js-based test.
-FAIL XMLHttpRequest: getAllResponseHeaders() assert_equals: expected "also-here: Mr. PB\r\newok: lego\r\nfoo-test: 1, 2\r\n__custom: token\r\n" but got "__custom: token\r\nalso-here: Mr. PB\r\nfoo-test: 1, 2\r\newok: lego\r\n"
-PASS XMLHttpRequest: getAllResponseHeaders() 1
-PASS XMLHttpRequest: getAllResponseHeaders() 2
-PASS XMLHttpRequest: getAllResponseHeaders() 3
-PASS XMLHttpRequest: getAllResponseHeaders() 4
-PASS XMLHttpRequest: getAllResponseHeaders() 5
-PASS XMLHttpRequest: getAllResponseHeaders() 6
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac/virtual/not-omt-sw-fetch/external/wpt/xhr/responsexml-document-properties-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/not-omt-sw-fetch/external/wpt/xhr/responsexml-document-properties-expected.txt
deleted file mode 100644
index 8703e748..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/not-omt-sw-fetch/external/wpt/xhr/responsexml-document-properties-expected.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-This is a testharness.js-based test.
-PASS domain
-PASS URL
-PASS documentURI
-PASS baseURI
-PASS referrer
-PASS title
-PASS contentType
-PASS readyState
-PASS location
-PASS defaultView
-PASS body
-PASS doctype
-PASS all
-PASS cookie
-PASS Test document URL properties after redirect
-PASS Test document URL properties of document with <base> after redirect
-PASS lastModified set to time of response if no HTTP header provided
-PASS lastModified set to related HTTP header if provided
-PASS cookie (after setting it)
-PASS styleSheets should be an object
-PASS implementation should be an object
-PASS images should be an object
-PASS forms should be an object
-PASS links should be an object
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac/virtual/omt-worker-fetch/external/wpt/xhr/abort-after-send.any-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/omt-worker-fetch/external/wpt/xhr/abort-after-send.any-expected.txt
deleted file mode 100644
index 0f10f7e..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/omt-worker-fetch/external/wpt/xhr/abort-after-send.any-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL XMLHttpRequest: abort() after send() assert_equals: expected "abort(0,0,false)" but got "upload.abort(0,0,false)"
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/context-no-deselect-expected.png b/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/context-no-deselect-expected.png
deleted file mode 100644
index 07f8a78..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/context-no-deselect-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/context-no-deselect-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/context-no-deselect-expected.txt
deleted file mode 100644
index e15e625..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/context-no-deselect-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutBlockFlow {HTML} at (0,0) size 800x600
-    LayoutBlockFlow {BODY} at (8,8) size 784x584
-      LayoutTextControl {INPUT} at (0,0) size 131x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-      LayoutText {#text} at (0,0) size 0x0
-      LayoutText {#text} at (0,0) size 0x0
-layer at (11,11) size 125x13
-  LayoutBlockFlow {DIV} at (3,3) size 125x13
-    LayoutText {#text} at (0,0) size 92x13
-      text run at (0,0) width 92: "some sample text"
-selection start: position 5 of child 0 {#text} of child 0 {DIV} of {#document-fragment} of child 1 {INPUT} of body
-selection end:   position 15 of child 0 {#text} of child 0 {DIV} of {#document-fragment} of child 1 {INPUT} of body
diff --git a/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/event-listener-on-link-expected.png b/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/event-listener-on-link-expected.png
deleted file mode 100644
index 4db3fec..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/event-listener-on-link-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/event-listener-on-link-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/event-listener-on-link-expected.txt
deleted file mode 100644
index 3ef06f4..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/event-listener-on-link-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutBlockFlow {HTML} at (0,0) size 800x600
-    LayoutBlockFlow {BODY} at (8,8) size 784x584
-      LayoutText {#text} at (0,0) size 781x36
-        text run at (0,0) width 781: "This tests that you can successfully add a DOMSubtreeModified event listener to a link element, and the page should load"
-        text run at (0,18) width 112: "without crashing."
diff --git a/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/hit-test-clip-path-reference-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/hit-test-clip-path-reference-expected.txt
deleted file mode 100644
index a4c4334..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/hit-test-clip-path-reference-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Test that hit-test work with clip-path using svg reference
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS path contains point at (99, 238)
-PASS path contains point at (94, 233)
-PASS path contains point at (104, 243)
-PASS path contains point at (94, 243)
-PASS path contains point at (104, 233)
-PASS path does not contain point at (67, 206)
-PASS path does not contain point at (66, 205)
-PASS path does not contain point at (68, 207)
-
diff --git a/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/pointer-events-2-expected.png b/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/pointer-events-2-expected.png
deleted file mode 100644
index 3cab2c6..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/pointer-events-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/pointer-events-2-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/pointer-events-2-expected.txt
deleted file mode 100644
index 7afe55b..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/pointer-events-2-expected.txt
+++ /dev/null
@@ -1,198 +0,0 @@
-layer at (0,0) size 800x600 scrollHeight 640
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x168
-  LayoutBlockFlow {HTML} at (0,0) size 800x167.88
-    LayoutBlockFlow {BODY} at (8,21.44) size 784x130.44
-      LayoutBlockFlow {H1} at (0,0) size 784x37
-        LayoutText {#text} at (0,0) size 755x37
-          text run at (0,0) width 755: "Testing the values of 'pointer-events' on HTML content"
-      LayoutBlockFlow {P} at (0,58.44) size 784x72
-        LayoutText {#text} at (0,0) size 784x72
-          text run at (0,0) width 589: "This test is expected to be run from within DumpRenderTree. If running manually, click on "
-          text run at (588,0) width 150: "the elements in the first"
-          text run at (0,18) width 389: "column, making sure the actual result (3rd column) matches "
-          text run at (388,18) width 391: "the expected result (2nd column). Repeat for click target (4th"
-          text run at (0,36) width 249: "column), expected result (5th column) "
-          text run at (248,36) width 536: "and actual result (6th column). Note: You should click on a yellow inline element if"
-          text run at (0,54) width 272: "one exists, otherwise anywhere in the box."
-layer at (10,140) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,140) size 300x100
-layer at (10,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,140) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 73x36
-      text run at (0,0) width 51: "pointer-"
-      text run at (0,18) width 73: "events auto"
-layer at (110,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x18
-      text run at (0,0) width 16: "p1"
-layer at (210,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x18
-      text run at (0,0) width 16: "p1"
-layer at (10,240) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,240) size 300x100
-layer at (10,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,240) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 76x36
-      text run at (0,0) width 51: "pointer-"
-      text run at (0,18) width 76: "events none"
-layer at (110,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 32x18
-      text run at (0,0) width 32: "none"
-layer at (210,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 32x18
-      text run at (0,0) width 32: "none"
-layer at (10,340) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,340) size 300x100
-layer at (10,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,340) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 72x36
-      text run at (0,0) width 60: "siblings -"
-      text run at (0,18) width 72: "auto on top"
-layer at (10,340) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80
-layer at (110,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x18
-      text run at (0,0) width 16: "p4"
-layer at (210,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x18
-      text run at (0,0) width 16: "p4"
-layer at (10,440) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,440) size 300x100
-layer at (10,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,440) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 76x36
-      text run at (0,0) width 60: "siblings -"
-      text run at (0,18) width 76: "none on top"
-layer at (10,440) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80
-layer at (110,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x18
-      text run at (0,0) width 16: "p5"
-layer at (210,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x18
-      text run at (0,0) width 16: "p5"
-layer at (10,540) size 300x100 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (10,540) size 300x100
-layer at (10,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 65x36
-      text run at (0,0) width 51: "nested -"
-      text run at (0,18) width 65: "auto outer"
-layer at (110,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x18
-      text run at (0,0) width 16: "p7"
-layer at (210,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x18
-      text run at (0,0) width 16: "p7"
-layer at (340,140) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,140) size 300x100
-layer at (340,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,140) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 68x36
-      text run at (0,0) width 51: "nested -"
-      text run at (0,18) width 68: "none outer"
-layer at (440,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x18
-      text run at (0,0) width 24: "p10"
-layer at (540,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x18
-      text run at (0,0) width 24: "p10"
-layer at (340,240) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,240) size 300x100
-layer at (340,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,240) size 80x80
-  LayoutImage (positioned) {IMG} at (0,0) size 80x80
-layer at (440,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x18
-      text run at (0,0) width 24: "p11"
-layer at (540,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x18
-      text run at (0,0) width 24: "p11"
-layer at (340,340) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,340) size 300x100
-layer at (340,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,340) size 80x80
-  LayoutImage (positioned) {IMG} at (0,0) size 80x80
-layer at (440,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 32x18
-      text run at (0,0) width 32: "none"
-layer at (540,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 32x18
-      text run at (0,0) width 32: "none"
-layer at (340,440) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,440) size 300x100
-layer at (340,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,440) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutInline {SPAN} at (0,0) size 37x18 [bgcolor=#FFFF00]
-      LayoutText {#text} at (0,0) size 37x18
-        text run at (0,0) width 37: "inline"
-    LayoutText {#text} at (36,0) size 76x54
-      text run at (36,0) width 26: " has"
-      text run at (0,18) width 76: "auto, parent"
-      text run at (0,36) width 32: "none"
-layer at (440,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x18
-      text run at (0,0) width 24: "p14"
-layer at (540,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x18
-      text run at (0,0) width 24: "p14"
-layer at (340,540) size 300x100 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (340,540) size 300x100
-layer at (340,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutInline {SPAN} at (0,0) size 37x18 [bgcolor=#FFFF00]
-      LayoutText {#text} at (0,0) size 37x18
-        text run at (0,0) width 37: "inline"
-    LayoutText {#text} at (36,0) size 80x54
-      text run at (36,0) width 26: " has"
-      text run at (0,18) width 80: "none, parent"
-      text run at (0,36) width 28: "auto"
-layer at (440,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x18
-      text run at (0,0) width 24: "p15"
-layer at (540,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x18
-      text run at (0,0) width 24: "p15"
-caret: position 1 of child 0 {#text} of child 0 {SPAN} of child 1 {P} of child 1 {DIV} of child 23 {DIV} of body
diff --git a/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/reveal-link-when-focused-expected.png b/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/reveal-link-when-focused-expected.png
deleted file mode 100644
index 9dca37c..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/reveal-link-when-focused-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/scale-and-scroll-iframe-body-expected.png b/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/scale-and-scroll-iframe-body-expected.png
deleted file mode 100644
index f0dc220..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/pointerevent/fast/events/scale-and-scroll-iframe-body-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/reporting/external/wpt/content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/reporting/external/wpt/content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub-expected.txt
deleted file mode 100644
index eda05ab..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/reporting/external/wpt/content-security-policy/reporting/reporting-api-report-only-sends-reports-on-violation.https.sub-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a testharness.js-based test.
-PASS Test that image does not load
-PASS Event is fired
-FAIL Violation report status OK. assert_equals: No such report. expected "" but got "false"
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac/virtual/reporting/external/wpt/content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/reporting/external/wpt/content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub-expected.txt
deleted file mode 100644
index eda05ab..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/reporting/external/wpt/content-security-policy/reporting/reporting-api-sends-reports-on-violation.https.sub-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a testharness.js-based test.
-PASS Test that image does not load
-PASS Event is fired
-FAIL Violation report status OK. assert_equals: No such report. expected "" but got "false"
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac/virtual/reporting/external/wpt/content-security-policy/reporting/securitypolicyviolation-idl-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/reporting/external/wpt/content-security-policy/reporting/securitypolicyviolation-idl-expected.txt
deleted file mode 100644
index 18d8446..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/reporting/external/wpt/content-security-policy/reporting/securitypolicyviolation-idl-expected.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-This is a testharness.js-based test.
-PASS Test driver
-PASS SecurityPolicyViolationEvent interface: existence and properties of interface object
-PASS SecurityPolicyViolationEvent interface object length
-PASS SecurityPolicyViolationEvent interface object name
-PASS SecurityPolicyViolationEvent interface: existence and properties of interface prototype object
-PASS SecurityPolicyViolationEvent interface: existence and properties of interface prototype object's "constructor" property
-PASS SecurityPolicyViolationEvent interface: attribute documentURI
-PASS SecurityPolicyViolationEvent interface: attribute referrer
-PASS SecurityPolicyViolationEvent interface: attribute blockedURI
-PASS SecurityPolicyViolationEvent interface: attribute violatedDirective
-PASS SecurityPolicyViolationEvent interface: attribute effectiveDirective
-PASS SecurityPolicyViolationEvent interface: attribute originalPolicy
-PASS SecurityPolicyViolationEvent interface: attribute disposition
-PASS SecurityPolicyViolationEvent interface: attribute sourceFile
-PASS SecurityPolicyViolationEvent interface: attribute statusCode
-PASS SecurityPolicyViolationEvent interface: attribute lineNumber
-PASS SecurityPolicyViolationEvent interface: attribute columnNumber
-PASS SecurityPolicyViolationEvent must be primary interface of event_to_test
-PASS Stringification of event_to_test
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "documentURI" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "referrer" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "blockedURI" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "violatedDirective" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "effectiveDirective" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "originalPolicy" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "disposition" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "sourceFile" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "statusCode" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "lineNumber" with the proper type
-PASS SecurityPolicyViolationEvent interface: event_to_test must inherit property "columnNumber" with the proper type
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac/virtual/samesite-by-default-cookies/external/wpt/cookies/http-state/general-tests-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/samesite-by-default-cookies/external/wpt/cookies/http-state/general-tests-expected.txt
deleted file mode 100644
index 4d33a0e..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/samesite-by-default-cookies/external/wpt/cookies/http-state/general-tests-expected.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-This is a testharness.js-based test.
-PASS 0001 - Set cookie.
-PASS 0002 - Set cookie with future expiration.
-PASS 0003 - Set expired cookie along with valid cookie.
-FAIL 0004 - Ignore cookie without key. assert_equals: expected "" but got "foo"
-PASS 0005 - Set cookie with age.
-PASS 0006 - Set no cookie with max-age=0.
-PASS 0007 - Set cookie with version=1.
-PASS 0008 - Set cookie with version=1000.
-PASS 0009 - Set cookie with custom value.
-PASS 0010 - Dont accept 'secure' cookies over http.
-PASS 0011 - Ignore separators in cookie values.
-PASS 0012 - Ignore values with separators and without ';'.
-PASS 0013 - Use last value for cookies with identical keys.
-PASS 0014 - Keep alphabetic key order.
-PASS 0015 - Keep alphabetic single-char key order.
-PASS 0016 - Keep non-alphabetic key order.
-PASS 0017 - Keep order if comma-separated.
-PASS 0018 - Ignore keys after semicolon.
-PASS 0019 - Ignore attributes after semicolon.
-FAIL 0020 - Ignore cookies without key and value. assert_equals: expected "a=b; c=d" but got "a=b; ; c=d"
-FAIL 0021 - Ignore cookie without key in all 'Set-Cookie'. assert_equals: expected "a=b; c=d" but got "a=b; x; c=d"
-PASS 0022 - Set cookie without value in all 'Set-Cookie'.
-PASS 0023 - Ignore cookies without '=' in all 'Set-Cookie'.
-PASS 0024 - Ignore malformed cookies in all 'Set-Cookie'.
-PASS 0025 - Ignore cookies with ';' in all 'Set-Cookie'.
-PASS 0026 - Ignore malformed cookies in all 'Set-Cookie' v2.
-FAIL 0027 - Ignore malformed cookies in all 'Set-Cookie' v3. assert_equals: expected "" but got "bar"
-FAIL 0028 - [INVALID EXPECTATION] Ignore malformed cookies in all 'Set-Cookie' v4. assert_equals: expected "Set-Cookie: foo\nSet-Cookie:" but got ""
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-svg-container-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-svg-container-expected.txt
deleted file mode 100644
index a177811..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-svg-container-expected.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-: layer(800x600) has hit test rect (8,13 54x19)
-
-
diff --git a/third_party/blink/web_tests/platform/mac/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-svg-text-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-svg-text-expected.txt
deleted file mode 100644
index a177811..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-svg-text-expected.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-: layer(800x600) has hit test rect (8,13 54x19)
-
-
diff --git a/third_party/blink/web_tests/platform/mac/virtual/scroll_customization/fast/scrolling/scrollbar-tickmarks-styled-after-onload-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scroll_customization/fast/scrolling/scrollbar-tickmarks-styled-after-onload-expected.png
deleted file mode 100644
index 57bfc32..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/scroll_customization/fast/scrolling/scrollbar-tickmarks-styled-after-onload-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/scroll_customization/fast/scrolling/scrollbar-tickmarks-styled-expected.png b/third_party/blink/web_tests/platform/mac/virtual/scroll_customization/fast/scrolling/scrollbar-tickmarks-styled-expected.png
deleted file mode 100644
index 57bfc32..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/scroll_customization/fast/scrolling/scrollbar-tickmarks-styled-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/sharedarraybuffer/fast/css/child-style-can-override-visited-style-expected.png b/third_party/blink/web_tests/platform/mac/virtual/sharedarraybuffer/fast/css/child-style-can-override-visited-style-expected.png
deleted file mode 100644
index 53d32f1..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/sharedarraybuffer/fast/css/child-style-can-override-visited-style-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/sharedarraybuffer/fast/css/child-style-can-override-visited-style-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/sharedarraybuffer/fast/css/child-style-can-override-visited-style-expected.txt
deleted file mode 100644
index 0991ac27..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/sharedarraybuffer/fast/css/child-style-can-override-visited-style-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutBlockFlow {HTML} at (0,0) size 800x600
-    LayoutBlockFlow {BODY} at (8,8) size 784x584
-      LayoutBlockFlow (anonymous) at (0,0) size 784x18
-        LayoutText {#text} at (0,0) size 367x18
-          text run at (0,0) width 367: "This tests that a child style can override the :visited style."
-        LayoutInline {A} at (0,0) size 0x0 [color=#FF0000]
-          LayoutText {#text} at (0,0) size 0x0
-      LayoutBlockFlow (anonymous) at (0,18) size 784x18 [color=#FF0000]
-        LayoutBlockFlow {DIV} at (0,0) size 784x18 [color=#008000]
-          LayoutText {#text} at (0,0) size 272x18
-            text run at (0,0) width 272: "This text should be green (and underlined)"
-      LayoutBlockFlow (anonymous) at (0,36) size 784x0
-        LayoutInline {A} at (0,0) size 0x0 [color=#FF0000]
-        LayoutText {#text} at (0,0) size 0x0
-      LayoutBlockFlow {DIV} at (0,36) size 784x18 [color=#008000]
-        LayoutText {#text} at (0,0) size 162x18
-          text run at (0,0) width 162: "This text should be green"
diff --git a/third_party/blink/web_tests/platform/mac/virtual/sharedarraybuffer/fast/css/crash-on-gradient-with-derived-color-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/sharedarraybuffer/fast/css/crash-on-gradient-with-derived-color-expected.txt
deleted file mode 100644
index 97296481..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/sharedarraybuffer/fast/css/crash-on-gradient-with-derived-color-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-This test passes if it does not CRASH.
diff --git a/third_party/blink/web_tests/platform/mac/virtual/sharedarraybuffer/fast/css/number-parsing-crash-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/sharedarraybuffer/fast/css/number-parsing-crash-expected.txt
deleted file mode 100644
index 75cf4f3..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/sharedarraybuffer/fast/css/number-parsing-crash-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-This should not crash.  
diff --git a/third_party/blink/web_tests/platform/mac/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-expected.png b/third_party/blink/web_tests/platform/mac/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-expected.png
deleted file mode 100644
index 3fde0568..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-iframe-expected.png b/third_party/blink/web_tests/platform/mac/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-iframe-expected.png
deleted file mode 100644
index 40252901..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-iframe-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/stable/http/tests/serviceworker/webexposed/global-interface-listing-platform-specific-service-worker-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/stable/http/tests/serviceworker/webexposed/global-interface-listing-platform-specific-service-worker-expected.txt
index 6abc29e..d6e213f 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/stable/http/tests/serviceworker/webexposed/global-interface-listing-platform-specific-service-worker-expected.txt
+++ b/third_party/blink/web_tests/platform/mac/virtual/stable/http/tests/serviceworker/webexposed/global-interface-listing-platform-specific-service-worker-expected.txt
@@ -1,9 +1,4 @@
 [INTERFACES]
-interface BarcodeDetector
-    static method getSupportedFormats
-    attribute @@toStringTag
-    method constructor
-    method detect
 interface Notification : EventTarget
 [NAMESPACES]
 [GLOBAL OBJECT]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/stable/webexposed/global-interface-listing-platform-specific-dedicated-worker-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/stable/webexposed/global-interface-listing-platform-specific-dedicated-worker-expected.txt
index 5c8c872..038f2b1 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/stable/webexposed/global-interface-listing-platform-specific-dedicated-worker-expected.txt
+++ b/third_party/blink/web_tests/platform/mac/virtual/stable/webexposed/global-interface-listing-platform-specific-dedicated-worker-expected.txt
@@ -4,11 +4,6 @@
 
 Starting worker: resources/global-interface-listing-worker.js
 [Worker] [INTERFACES]
-[Worker] interface BarcodeDetector
-[Worker]     static method getSupportedFormats
-[Worker]     attribute @@toStringTag
-[Worker]     method constructor
-[Worker]     method detect
 [Worker] interface Notification : EventTarget
 [Worker] [NAMESPACES]
 [Worker] [GLOBAL OBJECT]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/stable/webexposed/global-interface-listing-platform-specific-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/stable/webexposed/global-interface-listing-platform-specific-expected.txt
index fa72a06..3af5376 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/stable/webexposed/global-interface-listing-platform-specific-expected.txt
+++ b/third_party/blink/web_tests/platform/mac/virtual/stable/webexposed/global-interface-listing-platform-specific-expected.txt
@@ -3,11 +3,6 @@
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 [INTERFACES]
-interface BarcodeDetector
-    static method getSupportedFormats
-    attribute @@toStringTag
-    method constructor
-    method detect
 interface Bluetooth : EventTarget
     attribute @@toStringTag
     method constructor
diff --git a/third_party/blink/web_tests/platform/mac/virtual/stable/webexposed/global-interface-listing-platform-specific-shared-worker-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/stable/webexposed/global-interface-listing-platform-specific-shared-worker-expected.txt
index 802ec99..034c681 100644
--- a/third_party/blink/web_tests/platform/mac/virtual/stable/webexposed/global-interface-listing-platform-specific-shared-worker-expected.txt
+++ b/third_party/blink/web_tests/platform/mac/virtual/stable/webexposed/global-interface-listing-platform-specific-shared-worker-expected.txt
@@ -4,11 +4,6 @@
 
 Starting worker: resources/global-interface-listing-worker.js
 [Worker] [INTERFACES]
-[Worker] interface BarcodeDetector
-[Worker]     static method getSupportedFormats
-[Worker]     attribute @@toStringTag
-[Worker]     method constructor
-[Worker]     method detect
 [Worker] interface Notification : EventTarget
 [Worker] [NAMESPACES]
 [Worker] [GLOBAL OBJECT]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/synchronous_html_parser/fast/css/content/content-quotes-01-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/synchronous_html_parser/fast/css/content/content-quotes-01-expected.txt
deleted file mode 100644
index 486ca4de..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/synchronous_html_parser/fast/css/content/content-quotes-01-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-The texts between the markers should be identical.
-
-========Marker1========
-
-ab	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-WWaWWbWWWWWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=195.062px; expected 195.047px
diff --git a/third_party/blink/web_tests/platform/mac/virtual/synchronous_html_parser/fast/css/content/content-quotes-02-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/synchronous_html_parser/fast/css/content/content-quotes-02-expected.txt
deleted file mode 100644
index fe032c9..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/synchronous_html_parser/fast/css/content/content-quotes-02-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-abcd	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-aWWWbWWWWWcWWdWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=241.656px; expected 241.625px
diff --git a/third_party/blink/web_tests/platform/mac/virtual/synchronous_html_parser/fast/css/content/content-quotes-03-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/synchronous_html_parser/fast/css/content/content-quotes-03-expected.txt
deleted file mode 100644
index 72857d68..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/synchronous_html_parser/fast/css/content/content-quotes-03-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-ab	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-aWWWbWWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=136.828px; expected 136.812px
diff --git a/third_party/blink/web_tests/platform/mac/virtual/synchronous_html_parser/fast/css/content/content-quotes-05-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/synchronous_html_parser/fast/css/content/content-quotes-05-expected.txt
deleted file mode 100644
index 42634168..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/synchronous_html_parser/fast/css/content/content-quotes-05-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-abc	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-WWaWWWbWWWWWcWWWW	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=232.391px; expected 232.359px
diff --git a/third_party/blink/web_tests/platform/mac/virtual/synchronous_html_parser/fast/css/content/content-quotes-06-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/synchronous_html_parser/fast/css/content/content-quotes-06-expected.txt
deleted file mode 100644
index 85f9069..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/synchronous_html_parser/fast/css/content/content-quotes-06-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-========Marker1========
-
-abc	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker2========
-
-a'b'c	1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-
-========Marker3========
-
-FAILED: testWidth=28px; expected 27.9688px
diff --git a/third_party/blink/web_tests/platform/mac/virtual/synchronous_html_parser/svg/filters/feDisplacementMap-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/synchronous_html_parser/svg/filters/feDisplacementMap-expected.txt
deleted file mode 100644
index f48e69f..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/synchronous_html_parser/svg/filters/feDisplacementMap-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Content-Type: text/plain
-#EOF
-
-ActualHash: 2da96af37e813b07f9137dba488d9f66
-
-ExpectedHash: 2da96af37e813b07f9137dba488d9f66
-#EOF
diff --git a/third_party/blink/web_tests/platform/mac/virtual/transform-interop-disabled/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/transform-interop-disabled/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
deleted file mode 100644
index 85952dfc..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/transform-interop-disabled/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [785, 656],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF"
-    },
-    {
-      "name": "LayoutNGBlockFlow MAT id='scroller'",
-      "bounds": [360, 640],
-      "transform": 2
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [345, 0],
-      "bounds": [15, 640],
-      "transform": 2
-    },
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [345, 2018],
-      "transform": 3
-    },
-    {
-      "name": "LayoutNGBlockFlow (sticky positioned) DIV id='sticky'",
-      "bounds": [345, 18],
-      "transform": 4
-    },
-    {
-      "name": "ContentsLayer for Vertical Scrollbar Layer",
-      "position": [785, 0],
-      "bounds": [15, 600],
-      "contentsOpaque": true
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, -0.1],
-        [0, 0, 0, 1]
-      ],
-      "origin": [188, 328]
-    },
-    {
-      "id": 2,
-      "parent": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [8, 8, 0, 1]
-      ],
-      "flattenInheritedTransform": false
-    },
-    {
-      "id": 3,
-      "parent": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [0, -35, 0, 1]
-      ],
-      "flattenInheritedTransform": false
-    },
-    {
-      "id": 4,
-      "parent": 3,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [0, 35, 0, 1]
-      ],
-      "flattenInheritedTransform": false
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/platform/mac/virtual/trustedeventsdefaultaction/fast/events/event-listener-on-link-expected.png b/third_party/blink/web_tests/platform/mac/virtual/trustedeventsdefaultaction/fast/events/event-listener-on-link-expected.png
deleted file mode 100644
index 4db3fec..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/trustedeventsdefaultaction/fast/events/event-listener-on-link-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/trustedeventsdefaultaction/fast/events/event-listener-on-link-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/trustedeventsdefaultaction/fast/events/event-listener-on-link-expected.txt
deleted file mode 100644
index 3ef06f4..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/trustedeventsdefaultaction/fast/events/event-listener-on-link-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutBlockFlow {HTML} at (0,0) size 800x600
-    LayoutBlockFlow {BODY} at (8,8) size 784x584
-      LayoutText {#text} at (0,0) size 781x36
-        text run at (0,0) width 781: "This tests that you can successfully add a DOMSubtreeModified event listener to a link element, and the page should load"
-        text run at (0,18) width 112: "without crashing."
diff --git a/third_party/blink/web_tests/platform/mac/virtual/trustedeventsdefaultaction/fast/events/hit-test-clip-path-reference-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/trustedeventsdefaultaction/fast/events/hit-test-clip-path-reference-expected.txt
deleted file mode 100644
index a4c4334..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/trustedeventsdefaultaction/fast/events/hit-test-clip-path-reference-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Test that hit-test work with clip-path using svg reference
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS path contains point at (99, 238)
-PASS path contains point at (94, 233)
-PASS path contains point at (104, 243)
-PASS path contains point at (94, 243)
-PASS path contains point at (104, 233)
-PASS path does not contain point at (67, 206)
-PASS path does not contain point at (66, 205)
-PASS path does not contain point at (68, 207)
-
diff --git a/third_party/blink/web_tests/platform/mac/virtual/trustedeventsdefaultaction/fast/events/pointer-events-2-expected.png b/third_party/blink/web_tests/platform/mac/virtual/trustedeventsdefaultaction/fast/events/pointer-events-2-expected.png
deleted file mode 100644
index 3cab2c6..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/trustedeventsdefaultaction/fast/events/pointer-events-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/trustedeventsdefaultaction/fast/events/pointer-events-2-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/trustedeventsdefaultaction/fast/events/pointer-events-2-expected.txt
deleted file mode 100644
index 7afe55b..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/trustedeventsdefaultaction/fast/events/pointer-events-2-expected.txt
+++ /dev/null
@@ -1,198 +0,0 @@
-layer at (0,0) size 800x600 scrollHeight 640
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x168
-  LayoutBlockFlow {HTML} at (0,0) size 800x167.88
-    LayoutBlockFlow {BODY} at (8,21.44) size 784x130.44
-      LayoutBlockFlow {H1} at (0,0) size 784x37
-        LayoutText {#text} at (0,0) size 755x37
-          text run at (0,0) width 755: "Testing the values of 'pointer-events' on HTML content"
-      LayoutBlockFlow {P} at (0,58.44) size 784x72
-        LayoutText {#text} at (0,0) size 784x72
-          text run at (0,0) width 589: "This test is expected to be run from within DumpRenderTree. If running manually, click on "
-          text run at (588,0) width 150: "the elements in the first"
-          text run at (0,18) width 389: "column, making sure the actual result (3rd column) matches "
-          text run at (388,18) width 391: "the expected result (2nd column). Repeat for click target (4th"
-          text run at (0,36) width 249: "column), expected result (5th column) "
-          text run at (248,36) width 536: "and actual result (6th column). Note: You should click on a yellow inline element if"
-          text run at (0,54) width 272: "one exists, otherwise anywhere in the box."
-layer at (10,140) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,140) size 300x100
-layer at (10,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,140) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 73x36
-      text run at (0,0) width 51: "pointer-"
-      text run at (0,18) width 73: "events auto"
-layer at (110,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x18
-      text run at (0,0) width 16: "p1"
-layer at (210,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x18
-      text run at (0,0) width 16: "p1"
-layer at (10,240) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,240) size 300x100
-layer at (10,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,240) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 76x36
-      text run at (0,0) width 51: "pointer-"
-      text run at (0,18) width 76: "events none"
-layer at (110,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 32x18
-      text run at (0,0) width 32: "none"
-layer at (210,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 32x18
-      text run at (0,0) width 32: "none"
-layer at (10,340) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,340) size 300x100
-layer at (10,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,340) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 72x36
-      text run at (0,0) width 60: "siblings -"
-      text run at (0,18) width 72: "auto on top"
-layer at (10,340) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80
-layer at (110,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x18
-      text run at (0,0) width 16: "p4"
-layer at (210,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x18
-      text run at (0,0) width 16: "p4"
-layer at (10,440) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,440) size 300x100
-layer at (10,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,440) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 76x36
-      text run at (0,0) width 60: "siblings -"
-      text run at (0,18) width 76: "none on top"
-layer at (10,440) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80
-layer at (110,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x18
-      text run at (0,0) width 16: "p5"
-layer at (210,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x18
-      text run at (0,0) width 16: "p5"
-layer at (10,540) size 300x100 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (10,540) size 300x100
-layer at (10,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 65x36
-      text run at (0,0) width 51: "nested -"
-      text run at (0,18) width 65: "auto outer"
-layer at (110,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x18
-      text run at (0,0) width 16: "p7"
-layer at (210,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x18
-      text run at (0,0) width 16: "p7"
-layer at (340,140) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,140) size 300x100
-layer at (340,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,140) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 68x36
-      text run at (0,0) width 51: "nested -"
-      text run at (0,18) width 68: "none outer"
-layer at (440,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x18
-      text run at (0,0) width 24: "p10"
-layer at (540,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x18
-      text run at (0,0) width 24: "p10"
-layer at (340,240) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,240) size 300x100
-layer at (340,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,240) size 80x80
-  LayoutImage (positioned) {IMG} at (0,0) size 80x80
-layer at (440,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x18
-      text run at (0,0) width 24: "p11"
-layer at (540,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x18
-      text run at (0,0) width 24: "p11"
-layer at (340,340) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,340) size 300x100
-layer at (340,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,340) size 80x80
-  LayoutImage (positioned) {IMG} at (0,0) size 80x80
-layer at (440,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 32x18
-      text run at (0,0) width 32: "none"
-layer at (540,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 32x18
-      text run at (0,0) width 32: "none"
-layer at (340,440) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,440) size 300x100
-layer at (340,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,440) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutInline {SPAN} at (0,0) size 37x18 [bgcolor=#FFFF00]
-      LayoutText {#text} at (0,0) size 37x18
-        text run at (0,0) width 37: "inline"
-    LayoutText {#text} at (36,0) size 76x54
-      text run at (36,0) width 26: " has"
-      text run at (0,18) width 76: "auto, parent"
-      text run at (0,36) width 32: "none"
-layer at (440,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x18
-      text run at (0,0) width 24: "p14"
-layer at (540,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x18
-      text run at (0,0) width 24: "p14"
-layer at (340,540) size 300x100 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (340,540) size 300x100
-layer at (340,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutInline {SPAN} at (0,0) size 37x18 [bgcolor=#FFFF00]
-      LayoutText {#text} at (0,0) size 37x18
-        text run at (0,0) width 37: "inline"
-    LayoutText {#text} at (36,0) size 80x54
-      text run at (36,0) width 26: " has"
-      text run at (0,18) width 80: "none, parent"
-      text run at (0,36) width 28: "auto"
-layer at (440,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x18
-      text run at (0,0) width 24: "p15"
-layer at (540,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x18
-      text run at (0,0) width 24: "p15"
-caret: position 1 of child 0 {#text} of child 0 {SPAN} of child 1 {P} of child 1 {DIV} of child 23 {DIV} of body
diff --git a/third_party/blink/web_tests/platform/mac/virtual/user-activation-v2/fast/events/context-no-deselect-expected.png b/third_party/blink/web_tests/platform/mac/virtual/user-activation-v2/fast/events/context-no-deselect-expected.png
deleted file mode 100644
index 67d4647..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/user-activation-v2/fast/events/context-no-deselect-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/user-activation-v2/fast/events/reveal-link-when-focused-expected.png b/third_party/blink/web_tests/platform/mac/virtual/user-activation-v2/fast/events/reveal-link-when-focused-expected.png
deleted file mode 100644
index d6853f26d..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/user-activation-v2/fast/events/reveal-link-when-focused-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.png b/third_party/blink/web_tests/platform/mac/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.png
deleted file mode 100644
index 72827d5d..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-expected.png b/third_party/blink/web_tests/platform/mac/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-expected.png
deleted file mode 100644
index 819ea7d..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/video-surface-layer/media/media-controls-clone-expected.png b/third_party/blink/web_tests/platform/mac/virtual/video-surface-layer/media/media-controls-clone-expected.png
deleted file mode 100644
index 18e528d9..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/video-surface-layer/media/media-controls-clone-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/video-surface-layer/media/video-empty-source-expected.png b/third_party/blink/web_tests/platform/mac/virtual/video-surface-layer/media/video-empty-source-expected.png
deleted file mode 100644
index fc52f341..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/video-surface-layer/media/video-empty-source-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/video-surface-layer/media/video-frame-accurate-seek-expected.png b/third_party/blink/web_tests/platform/mac/virtual/video-surface-layer/media/video-frame-accurate-seek-expected.png
deleted file mode 100644
index d83b1e8..0000000
--- a/third_party/blink/web_tests/platform/mac/virtual/video-surface-layer/media/video-frame-accurate-seek-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/001-expected.png b/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/001-expected.png
deleted file mode 100644
index 05c1caf..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/001-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/button-style-color-expected.png b/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/button-style-color-expected.png
deleted file mode 100644
index bea8447..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/button-style-color-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png b/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
deleted file mode 100644
index aa4987f..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/color/color-suggestion-picker-appearance-expected.png b/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/color/color-suggestion-picker-appearance-expected.png
deleted file mode 100644
index e1f5f38..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/color/color-suggestion-picker-appearance-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/date/date-appearance-basic-expected.png b/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/date/date-appearance-basic-expected.png
deleted file mode 100644
index de48939b..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/date/date-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png b/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
deleted file mode 100644
index 86f075a..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/fieldset/fieldset-align-expected.png b/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/fieldset/fieldset-align-expected.png
deleted file mode 100644
index a987a664..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/fieldset/fieldset-align-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/month/month-appearance-basic-expected.png b/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/month/month-appearance-basic-expected.png
deleted file mode 100644
index 103853c5..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/month/month-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom090-expected.png b/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom090-expected.png
deleted file mode 100644
index 829e44c1..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom090-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png b/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png
deleted file mode 100644
index e51c59b..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/select/basic-selects-expected.png b/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/select/basic-selects-expected.png
deleted file mode 100644
index f1acb10..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/select/basic-selects-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/select/select-autofilled-expected.png b/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/select/select-autofilled-expected.png
deleted file mode 100644
index 31119ed9..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/select/select-autofilled-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/submit/submit-appearance-basic-expected.png b/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/submit/submit-appearance-basic-expected.png
deleted file mode 100644
index 35a66bd..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/submit/submit-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/text/text-appearance-basic-expected.png b/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/text/text-appearance-basic-expected.png
deleted file mode 100644
index af035056e..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/text/text-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/textarea/textarea-appearance-basic-expected.png b/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/textarea/textarea-appearance-basic-expected.png
deleted file mode 100644
index cefac39..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/cascade/fast/forms/textarea/textarea-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/dark-mode-native-theme-off/text-input-elements-expected.png b/third_party/blink/web_tests/platform/win/virtual/dark-mode-native-theme-off/text-input-elements-expected.png
deleted file mode 100644
index c118f1f..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/dark-mode-native-theme-off/text-input-elements-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/dark-mode-native-theme-on/text-input-elements-expected.png b/third_party/blink/web_tests/platform/win/virtual/dark-mode-native-theme-on/text-input-elements-expected.png
deleted file mode 100644
index e2aafbb7..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/dark-mode-native-theme-on/text-input-elements-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/disable-spinvalidation/compositing/masks/mask-with-removed-filters-expected.png b/third_party/blink/web_tests/platform/win/virtual/disable-spinvalidation/compositing/masks/mask-with-removed-filters-expected.png
deleted file mode 100644
index a469aba..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/disable-spinvalidation/compositing/masks/mask-with-removed-filters-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/disable-spinvalidation/compositing/text-on-scaled-surface-expected.png b/third_party/blink/web_tests/platform/win/virtual/disable-spinvalidation/compositing/text-on-scaled-surface-expected.png
deleted file mode 100644
index 7dad5c3..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/disable-spinvalidation/compositing/text-on-scaled-surface-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png b/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png
deleted file mode 100644
index ce3c6420c..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-video-expected.png b/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-video-expected.png
deleted file mode 100644
index 5754aae..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-video-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-ellipse-connecting-line-expected.txt b/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-ellipse-connecting-line-expected.txt
deleted file mode 100644
index f26bf3b..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-ellipse-connecting-line-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x321
-  LayoutBlockFlow {HTML} at (0,0) size 800x321
-    LayoutBlockFlow {BODY} at (8,8) size 784x305
-      LayoutText {#text} at (0,0) size 0x0
-layer at (8,8) size 300x300
-  LayoutHTMLCanvas {CANVAS} at (0,0) size 300x300
diff --git a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png b/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
deleted file mode 100644
index 836814b..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-shadow-source-in-expected.txt b/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-shadow-source-in-expected.txt
deleted file mode 100644
index a5916ba..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-shadow-source-in-expected.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x470
-  LayoutBlockFlow {HTML} at (0,0) size 800x470
-    LayoutBlockFlow {BODY} at (8,8) size 784x454
-      LayoutBlockFlow {DIV} at (0,0) size 784x20
-        LayoutText {#text} at (0,0) size 57x19
-          text run at (0,0) width 57: "Test Rect"
-      LayoutBlockFlow (anonymous) at (0,20) size 784x207
-        LayoutText {#text} at (0,0) size 0x0
-      LayoutBlockFlow {DIV} at (0,227) size 784x20
-        LayoutText {#text} at (0,0) size 66x19
-          text run at (0,0) width 66: "Test Image"
-      LayoutBlockFlow (anonymous) at (0,247) size 784x207
-        LayoutText {#text} at (0,0) size 0x0
-layer at (8,28) size 202x202
-  LayoutHTMLCanvas {CANVAS} at (0,0) size 202x202 [border: (1px solid #999999)]
-layer at (8,255) size 202x202
-  LayoutHTMLCanvas {CANVAS} at (0,0) size 202x202 [border: (1px solid #999999)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-text-alignment-expected.png b/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-text-alignment-expected.png
deleted file mode 100644
index 76ef30b..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-text-alignment-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-text-baseline-expected.png b/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-text-baseline-expected.png
deleted file mode 100644
index 6544c3db..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-text-baseline-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-text-baseline-tiny-fonts-expected.png b/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-text-baseline-tiny-fonts-expected.png
deleted file mode 100644
index adff6c34..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-text-baseline-tiny-fonts-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-textMetrics-width-expected.png b/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-textMetrics-width-expected.png
deleted file mode 100644
index 0a842d3..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-textMetrics-width-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png b/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png
deleted file mode 100644
index b507aef..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/fillrect_gradient-expected.png b/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/fillrect_gradient-expected.png
deleted file mode 100644
index 5505ce312..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/fillrect_gradient-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png b/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png
deleted file mode 100644
index e8f71624..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/patternfill-repeat-expected.png b/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/patternfill-repeat-expected.png
deleted file mode 100644
index 0fe9432..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/patternfill-repeat-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/patternfill-repeat-expected.txt b/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/patternfill-repeat-expected.txt
deleted file mode 100644
index 6a81b68..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/patternfill-repeat-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x469
-  LayoutBlockFlow {HTML} at (0,0) size 800x469
-    LayoutBlockFlow {BODY} at (8,16) size 784x437
-      LayoutBlockFlow {P} at (0,0) size 784x80
-        LayoutText {#text} at (0,0) size 778x79
-          text run at (0,0) width 753: "There should be one big square below containing four squares. Top left square should be filled with 3 rows of 2 and bit Apple"
-          text run at (0,20) width 763: "images. Top right square should be 2 and a bit rows with one Apple image column along the left edge of the square. Bottom left"
-          text run at (0,40) width 778: "square should be one row with three Apple images along the top of the square. Bottom right square should be one Apple image in"
-          text run at (0,60) width 89: "top left corner."
-      LayoutBlockFlow {P} at (0,96) size 784x341
-layer at (8,112) size 336x336
-  LayoutHTMLCanvas {CANVAS} at (0,0) size 336x336 [border: (3px solid #000000)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png b/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png
deleted file mode 100644
index 8cedbb8..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/shadow-offset-1-expected.png b/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/shadow-offset-1-expected.png
deleted file mode 100644
index e1308d1..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/shadow-offset-1-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/toDataURL-alpha-expected.png b/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/toDataURL-alpha-expected.png
deleted file mode 100644
index 4dafea95..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/toDataURL-alpha-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/toDataURL-alpha-stability-expected.png b/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/toDataURL-alpha-stability-expected.png
deleted file mode 100644
index 99872cb..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/display_list_2d_canvas/fast/canvas/toDataURL-alpha-stability-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/fractional_scrolling/fast/scrolling/editor-command-scroll-page-scale-expected.txt b/third_party/blink/web_tests/platform/win/virtual/fractional_scrolling/fast/scrolling/editor-command-scroll-page-scale-expected.txt
deleted file mode 100644
index 7749044..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/fractional_scrolling/fast/scrolling/editor-command-scroll-page-scale-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a testharness.js-based test.
-FAIL Document scrolling commands scroll visual viewport assert_equals: expected 1700 but got 1400
-FAIL Page scrolling commands scroll visual viewport assert_equals: expected 1700 but got 1400
-FAIL Line scrolling commands scroll visual viewport assert_equals: expected 1700 but got 1400
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/win/virtual/layout_ng/css2.1/20110323/background-intrinsic-004-expected.png b/third_party/blink/web_tests/platform/win/virtual/layout_ng/css2.1/20110323/background-intrinsic-004-expected.png
deleted file mode 100644
index 4b569223..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/layout_ng/css2.1/20110323/background-intrinsic-004-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/layout_ng/css2.1/20110323/background-intrinsic-005-expected.png b/third_party/blink/web_tests/platform/win/virtual/layout_ng/css2.1/20110323/background-intrinsic-005-expected.png
deleted file mode 100644
index 73bea03f..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/layout_ng/css2.1/20110323/background-intrinsic-005-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/layout_ng/fast/block/basic/015-expected.png b/third_party/blink/web_tests/platform/win/virtual/layout_ng/fast/block/basic/015-expected.png
deleted file mode 100644
index b40259a38..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/layout_ng/fast/block/basic/015-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/layout_ng/fast/block/basic/016-expected.png b/third_party/blink/web_tests/platform/win/virtual/layout_ng/fast/block/basic/016-expected.png
deleted file mode 100644
index 68ba76d..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/layout_ng/fast/block/basic/016-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/layout_ng/fast/block/basic/018-expected.png b/third_party/blink/web_tests/platform/win/virtual/layout_ng/fast/block/basic/018-expected.png
deleted file mode 100644
index 66169bd8..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/layout_ng/fast/block/basic/018-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/layout_ng/fast/block/basic/020-expected.png b/third_party/blink/web_tests/platform/win/virtual/layout_ng/fast/block/basic/020-expected.png
deleted file mode 100644
index f6821895..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/layout_ng/fast/block/basic/020-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/layout_ng/fast/block/float/016-expected.png b/third_party/blink/web_tests/platform/win/virtual/layout_ng/fast/block/float/016-expected.png
deleted file mode 100644
index 1b7d291..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/layout_ng/fast/block/float/016-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/layout_ng/fast/block/float/centered-float-avoidance-complexity-expected.png b/third_party/blink/web_tests/platform/win/virtual/layout_ng/fast/block/float/centered-float-avoidance-complexity-expected.png
deleted file mode 100644
index 098f08784..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/layout_ng/fast/block/float/centered-float-avoidance-complexity-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/not-omt-sw-fetch/external/wpt/xhr/getallresponseheaders-expected.txt b/third_party/blink/web_tests/platform/win/virtual/not-omt-sw-fetch/external/wpt/xhr/getallresponseheaders-expected.txt
deleted file mode 100644
index 69617d19..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/not-omt-sw-fetch/external/wpt/xhr/getallresponseheaders-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-This is a testharness.js-based test.
-FAIL XMLHttpRequest: getAllResponseHeaders() assert_equals: expected "also-here: Mr. PB\r\newok: lego\r\nfoo-test: 1, 2\r\n__custom: token\r\n" but got "__custom: token\r\nalso-here: Mr. PB\r\nfoo-test: 1, 2\r\newok: lego\r\n"
-PASS XMLHttpRequest: getAllResponseHeaders() 1
-PASS XMLHttpRequest: getAllResponseHeaders() 2
-PASS XMLHttpRequest: getAllResponseHeaders() 3
-PASS XMLHttpRequest: getAllResponseHeaders() 4
-PASS XMLHttpRequest: getAllResponseHeaders() 5
-PASS XMLHttpRequest: getAllResponseHeaders() 6
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/win/virtual/not-omt-sw-fetch/external/wpt/xhr/responsexml-document-properties-expected.txt b/third_party/blink/web_tests/platform/win/virtual/not-omt-sw-fetch/external/wpt/xhr/responsexml-document-properties-expected.txt
deleted file mode 100644
index 8703e748..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/not-omt-sw-fetch/external/wpt/xhr/responsexml-document-properties-expected.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-This is a testharness.js-based test.
-PASS domain
-PASS URL
-PASS documentURI
-PASS baseURI
-PASS referrer
-PASS title
-PASS contentType
-PASS readyState
-PASS location
-PASS defaultView
-PASS body
-PASS doctype
-PASS all
-PASS cookie
-PASS Test document URL properties after redirect
-PASS Test document URL properties of document with <base> after redirect
-PASS lastModified set to time of response if no HTTP header provided
-PASS lastModified set to related HTTP header if provided
-PASS cookie (after setting it)
-PASS styleSheets should be an object
-PASS implementation should be an object
-PASS images should be an object
-PASS forms should be an object
-PASS links should be an object
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/win/virtual/omt-worker-fetch/external/wpt/xhr/abort-after-send.any-expected.txt b/third_party/blink/web_tests/platform/win/virtual/omt-worker-fetch/external/wpt/xhr/abort-after-send.any-expected.txt
deleted file mode 100644
index 0f10f7e..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/omt-worker-fetch/external/wpt/xhr/abort-after-send.any-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL XMLHttpRequest: abort() after send() assert_equals: expected "abort(0,0,false)" but got "upload.abort(0,0,false)"
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/win/virtual/outofblink-cors/http/tests/xmlhttprequest/origin-header-cross-origin-get-sync-expected.txt b/third_party/blink/web_tests/platform/win/virtual/outofblink-cors/http/tests/xmlhttprequest/origin-header-cross-origin-get-sync-expected.txt
deleted file mode 100644
index 7386346..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/outofblink-cors/http/tests/xmlhttprequest/origin-header-cross-origin-get-sync-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-CONSOLE WARNING: line 13: Synchronous XMLHttpRequest on the main thread is deprecated because of its detrimental effects to the end user's experience. For more help, check https://xhr.spec.whatwg.org/.
-PASS: Cross-domain access allowed.
-HTTP_ORIGIN: http://127.0.0.1:8000
-
-
diff --git a/third_party/blink/web_tests/platform/win/virtual/pointerevent/fast/events/context-no-deselect-expected.png b/third_party/blink/web_tests/platform/win/virtual/pointerevent/fast/events/context-no-deselect-expected.png
deleted file mode 100644
index 1d82d38..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/pointerevent/fast/events/context-no-deselect-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/pointerevent/fast/events/hit-test-clip-path-reference-expected.txt b/third_party/blink/web_tests/platform/win/virtual/pointerevent/fast/events/hit-test-clip-path-reference-expected.txt
deleted file mode 100644
index 8bc478c7..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/pointerevent/fast/events/hit-test-clip-path-reference-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Test that hit-test work with clip-path using svg reference
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS path contains point at (99, 241)
-PASS path contains point at (94, 236)
-PASS path contains point at (104, 246)
-PASS path contains point at (94, 246)
-PASS path contains point at (104, 236)
-PASS path does not contain point at (67, 209)
-PASS path does not contain point at (66, 208)
-PASS path does not contain point at (68, 210)
-
diff --git a/third_party/blink/web_tests/platform/win/virtual/pointerevent/fast/events/pointer-events-2-expected.png b/third_party/blink/web_tests/platform/win/virtual/pointerevent/fast/events/pointer-events-2-expected.png
deleted file mode 100644
index 0763729..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/pointerevent/fast/events/pointer-events-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/pointerevent/fast/events/pointer-events-2-expected.txt b/third_party/blink/web_tests/platform/win/virtual/pointerevent/fast/events/pointer-events-2-expected.txt
deleted file mode 100644
index cc3e528..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/pointerevent/fast/events/pointer-events-2-expected.txt
+++ /dev/null
@@ -1,198 +0,0 @@
-layer at (0,0) size 800x600 scrollHeight 640
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x168
-  LayoutBlockFlow {HTML} at (0,0) size 800x167.88
-    LayoutBlockFlow {BODY} at (8,21.44) size 784x130.44
-      LayoutBlockFlow {H1} at (0,0) size 784x37
-        LayoutText {#text} at (0,0) size 755x36
-          text run at (0,0) width 755: "Testing the values of 'pointer-events' on HTML content"
-      LayoutBlockFlow {P} at (0,58.44) size 784x72
-        LayoutText {#text} at (0,0) size 784x71
-          text run at (0,0) width 589: "This test is expected to be run from within DumpRenderTree. If running manually, click on "
-          text run at (588,0) width 151: "the elements in the first"
-          text run at (0,18) width 389: "column, making sure the actual result (3rd column) matches "
-          text run at (388,18) width 391: "the expected result (2nd column). Repeat for click target (4th"
-          text run at (0,36) width 249: "column), expected result (5th column) "
-          text run at (248,36) width 536: "and actual result (6th column). Note: You should click on a yellow inline element if"
-          text run at (0,54) width 272: "one exists, otherwise anywhere in the box."
-layer at (10,140) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,140) size 300x100
-layer at (10,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,140) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 73x35
-      text run at (0,0) width 51: "pointer-"
-      text run at (0,18) width 73: "events auto"
-layer at (110,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x17
-      text run at (0,0) width 16: "p1"
-layer at (210,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x17
-      text run at (0,0) width 16: "p1"
-layer at (10,240) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,240) size 300x100
-layer at (10,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,240) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 76x35
-      text run at (0,0) width 51: "pointer-"
-      text run at (0,18) width 76: "events none"
-layer at (110,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 32x17
-      text run at (0,0) width 32: "none"
-layer at (210,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 32x17
-      text run at (0,0) width 32: "none"
-layer at (10,340) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,340) size 300x100
-layer at (10,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,340) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 72x35
-      text run at (0,0) width 60: "siblings -"
-      text run at (0,18) width 72: "auto on top"
-layer at (10,340) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80
-layer at (110,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x17
-      text run at (0,0) width 16: "p4"
-layer at (210,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x17
-      text run at (0,0) width 16: "p4"
-layer at (10,440) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,440) size 300x100
-layer at (10,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,440) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 76x35
-      text run at (0,0) width 60: "siblings -"
-      text run at (0,18) width 76: "none on top"
-layer at (10,440) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80
-layer at (110,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x17
-      text run at (0,0) width 16: "p5"
-layer at (210,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x17
-      text run at (0,0) width 16: "p5"
-layer at (10,540) size 300x100 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (10,540) size 300x100
-layer at (10,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 65x35
-      text run at (0,0) width 51: "nested -"
-      text run at (0,18) width 65: "auto outer"
-layer at (110,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x17
-      text run at (0,0) width 16: "p7"
-layer at (210,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x17
-      text run at (0,0) width 16: "p7"
-layer at (340,140) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,140) size 300x100
-layer at (340,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,140) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 68x35
-      text run at (0,0) width 51: "nested -"
-      text run at (0,18) width 68: "none outer"
-layer at (440,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x17
-      text run at (0,0) width 24: "p10"
-layer at (540,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x17
-      text run at (0,0) width 24: "p10"
-layer at (340,240) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,240) size 300x100
-layer at (340,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,240) size 80x80
-  LayoutImage (positioned) {IMG} at (0,0) size 80x80
-layer at (440,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x17
-      text run at (0,0) width 24: "p11"
-layer at (540,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x17
-      text run at (0,0) width 24: "p11"
-layer at (340,340) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,340) size 300x100
-layer at (340,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,340) size 80x80
-  LayoutImage (positioned) {IMG} at (0,0) size 80x80
-layer at (440,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 32x17
-      text run at (0,0) width 32: "none"
-layer at (540,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 32x17
-      text run at (0,0) width 32: "none"
-layer at (340,440) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,440) size 300x100
-layer at (340,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,440) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutInline {SPAN} at (0,0) size 37x17 [bgcolor=#FFFF00]
-      LayoutText {#text} at (0,0) size 37x17
-        text run at (0,0) width 37: "inline"
-    LayoutText {#text} at (36,0) size 76x53
-      text run at (36,0) width 26: " has"
-      text run at (0,18) width 76: "auto, parent"
-      text run at (0,36) width 32: "none"
-layer at (440,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x17
-      text run at (0,0) width 24: "p14"
-layer at (540,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x17
-      text run at (0,0) width 24: "p14"
-layer at (340,540) size 300x100 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (340,540) size 300x100
-layer at (340,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutInline {SPAN} at (0,0) size 37x17 [bgcolor=#FFFF00]
-      LayoutText {#text} at (0,0) size 37x17
-        text run at (0,0) width 37: "inline"
-    LayoutText {#text} at (36,0) size 80x53
-      text run at (36,0) width 26: " has"
-      text run at (0,18) width 80: "none, parent"
-      text run at (0,36) width 28: "auto"
-layer at (440,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x17
-      text run at (0,0) width 24: "p15"
-layer at (540,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x17
-      text run at (0,0) width 24: "p15"
-caret: position 1 of child 0 {#text} of child 0 {SPAN} of child 1 {P} of child 1 {DIV} of child 23 {DIV} of body
diff --git a/third_party/blink/web_tests/platform/win/virtual/pointerevent/fast/events/reveal-link-when-focused-expected.png b/third_party/blink/web_tests/platform/win/virtual/pointerevent/fast/events/reveal-link-when-focused-expected.png
deleted file mode 100644
index 3b14dfb..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/pointerevent/fast/events/reveal-link-when-focused-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/pointerevent/fast/events/scale-and-scroll-iframe-body-expected.png b/third_party/blink/web_tests/platform/win/virtual/pointerevent/fast/events/scale-and-scroll-iframe-body-expected.png
deleted file mode 100644
index 1c932ef5..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/pointerevent/fast/events/scale-and-scroll-iframe-body-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/samesite-by-default-cookies/external/wpt/cookies/http-state/general-tests-expected.txt b/third_party/blink/web_tests/platform/win/virtual/samesite-by-default-cookies/external/wpt/cookies/http-state/general-tests-expected.txt
deleted file mode 100644
index 4d33a0e..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/samesite-by-default-cookies/external/wpt/cookies/http-state/general-tests-expected.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-This is a testharness.js-based test.
-PASS 0001 - Set cookie.
-PASS 0002 - Set cookie with future expiration.
-PASS 0003 - Set expired cookie along with valid cookie.
-FAIL 0004 - Ignore cookie without key. assert_equals: expected "" but got "foo"
-PASS 0005 - Set cookie with age.
-PASS 0006 - Set no cookie with max-age=0.
-PASS 0007 - Set cookie with version=1.
-PASS 0008 - Set cookie with version=1000.
-PASS 0009 - Set cookie with custom value.
-PASS 0010 - Dont accept 'secure' cookies over http.
-PASS 0011 - Ignore separators in cookie values.
-PASS 0012 - Ignore values with separators and without ';'.
-PASS 0013 - Use last value for cookies with identical keys.
-PASS 0014 - Keep alphabetic key order.
-PASS 0015 - Keep alphabetic single-char key order.
-PASS 0016 - Keep non-alphabetic key order.
-PASS 0017 - Keep order if comma-separated.
-PASS 0018 - Ignore keys after semicolon.
-PASS 0019 - Ignore attributes after semicolon.
-FAIL 0020 - Ignore cookies without key and value. assert_equals: expected "a=b; c=d" but got "a=b; ; c=d"
-FAIL 0021 - Ignore cookie without key in all 'Set-Cookie'. assert_equals: expected "a=b; c=d" but got "a=b; x; c=d"
-PASS 0022 - Set cookie without value in all 'Set-Cookie'.
-PASS 0023 - Ignore cookies without '=' in all 'Set-Cookie'.
-PASS 0024 - Ignore malformed cookies in all 'Set-Cookie'.
-PASS 0025 - Ignore cookies with ';' in all 'Set-Cookie'.
-PASS 0026 - Ignore malformed cookies in all 'Set-Cookie' v2.
-FAIL 0027 - Ignore malformed cookies in all 'Set-Cookie' v3. assert_equals: expected "" but got "bar"
-FAIL 0028 - [INVALID EXPECTATION] Ignore malformed cookies in all 'Set-Cookie' v4. assert_equals: expected "Set-Cookie: foo\nSet-Cookie:" but got ""
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/win/virtual/scroll_customization/fast/scrolling/scrollbar-tickmarks-styled-after-onload-expected.png b/third_party/blink/web_tests/platform/win/virtual/scroll_customization/fast/scrolling/scrollbar-tickmarks-styled-after-onload-expected.png
deleted file mode 100644
index d175124..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/scroll_customization/fast/scrolling/scrollbar-tickmarks-styled-after-onload-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/scroll_customization/fast/scrolling/scrollbar-tickmarks-styled-expected.png b/third_party/blink/web_tests/platform/win/virtual/scroll_customization/fast/scrolling/scrollbar-tickmarks-styled-expected.png
deleted file mode 100644
index d175124..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/scroll_customization/fast/scrolling/scrollbar-tickmarks-styled-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/child-style-can-override-visited-style-expected.png b/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/child-style-can-override-visited-style-expected.png
deleted file mode 100644
index 58f7829..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/child-style-can-override-visited-style-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/child-style-can-override-visited-style-expected.txt b/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/child-style-can-override-visited-style-expected.txt
deleted file mode 100644
index 3b6baea..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/child-style-can-override-visited-style-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutBlockFlow {HTML} at (0,0) size 800x600
-    LayoutBlockFlow {BODY} at (8,8) size 784x584
-      LayoutBlockFlow (anonymous) at (0,0) size 784x20
-        LayoutText {#text} at (0,0) size 337x19
-          text run at (0,0) width 337: "This tests that a child style can override the :visited style."
-        LayoutInline {A} at (0,0) size 0x0 [color=#FF0000]
-          LayoutText {#text} at (0,0) size 0x0
-      LayoutBlockFlow (anonymous) at (0,20) size 784x20 [color=#FF0000]
-        LayoutBlockFlow {DIV} at (0,0) size 784x20 [color=#008000]
-          LayoutText {#text} at (0,0) size 252x19
-            text run at (0,0) width 252: "This text should be green (and underlined)"
-      LayoutBlockFlow (anonymous) at (0,40) size 784x0
-        LayoutInline {A} at (0,0) size 0x0 [color=#FF0000]
-        LayoutText {#text} at (0,0) size 0x0
-      LayoutBlockFlow {DIV} at (0,40) size 784x20 [color=#008000]
-        LayoutText {#text} at (0,0) size 150x19
-          text run at (0,0) width 150: "This text should be green"
diff --git a/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/color-correction-on-text-shadow-expected.png b/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/color-correction-on-text-shadow-expected.png
deleted file mode 100644
index 48731362..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/color-correction-on-text-shadow-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/crash-on-gradient-with-derived-color-expected.txt b/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/crash-on-gradient-with-derived-color-expected.txt
deleted file mode 100644
index 97296481..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/crash-on-gradient-with-derived-color-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-This test passes if it does not CRASH.
diff --git a/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/number-parsing-crash-expected.txt b/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/number-parsing-crash-expected.txt
deleted file mode 100644
index 75cf4f3..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/number-parsing-crash-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-This should not crash.  
diff --git a/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-expected.png b/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-expected.png
deleted file mode 100644
index 2997751..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-iframe-expected.png b/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-iframe-expected.png
deleted file mode 100644
index aaa3e8bdb..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-iframe-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/shadow-multiple-expected.png b/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/shadow-multiple-expected.png
deleted file mode 100644
index 1512f442..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/sharedarraybuffer/fast/css/shadow-multiple-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/synchronous_html_parser/fast/css/bidi-override-in-anonymous-block-expected.png b/third_party/blink/web_tests/platform/win/virtual/synchronous_html_parser/fast/css/bidi-override-in-anonymous-block-expected.png
deleted file mode 100644
index f15f9b80..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/synchronous_html_parser/fast/css/bidi-override-in-anonymous-block-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/transform-interop-disabled/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt b/third_party/blink/web_tests/platform/win/virtual/transform-interop-disabled/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
deleted file mode 100644
index a743c6a8..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/transform-interop-disabled/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky-expected.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "Scrolling background of LayoutView #document",
-      "bounds": [785, 656],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "invalidations": [
-        [353, 8, 15, 640]
-      ]
-    },
-    {
-      "name": "LayoutNGBlockFlow (sticky positioned) DIV id='sticky'",
-      "bounds": [345, 20],
-      "transform": 4
-    },
-    {
-      "name": "VerticalScrollbar",
-      "position": [785, 0],
-      "bounds": [15, 600]
-    }
-  ],
-  "transforms": [
-    {
-      "id": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, -0.1],
-        [0, 0, 0, 1]
-      ],
-      "origin": [188, 328]
-    },
-    {
-      "id": 2,
-      "parent": 1,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [8, 8, 0, 1]
-      ],
-      "flattenInheritedTransform": false
-    },
-    {
-      "id": 3,
-      "parent": 2,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [0, -35, 0, 1]
-      ],
-      "flattenInheritedTransform": false
-    },
-    {
-      "id": 4,
-      "parent": 3,
-      "transform": [
-        [1, 0, 0, 0],
-        [0, 1, 0, 0],
-        [0, 0, 1, 0],
-        [0, 35, 0, 1]
-      ],
-      "flattenInheritedTransform": false
-    }
-  ]
-}
-
diff --git a/third_party/blink/web_tests/platform/win/virtual/trustedeventsdefaultaction/fast/events/hit-test-clip-path-reference-expected.txt b/third_party/blink/web_tests/platform/win/virtual/trustedeventsdefaultaction/fast/events/hit-test-clip-path-reference-expected.txt
deleted file mode 100644
index 8bc478c7..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/trustedeventsdefaultaction/fast/events/hit-test-clip-path-reference-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Test that hit-test work with clip-path using svg reference
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS path contains point at (99, 241)
-PASS path contains point at (94, 236)
-PASS path contains point at (104, 246)
-PASS path contains point at (94, 246)
-PASS path contains point at (104, 236)
-PASS path does not contain point at (67, 209)
-PASS path does not contain point at (66, 208)
-PASS path does not contain point at (68, 210)
-
diff --git a/third_party/blink/web_tests/platform/win/virtual/trustedeventsdefaultaction/fast/events/pointer-events-2-expected.png b/third_party/blink/web_tests/platform/win/virtual/trustedeventsdefaultaction/fast/events/pointer-events-2-expected.png
deleted file mode 100644
index 0763729..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/trustedeventsdefaultaction/fast/events/pointer-events-2-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/trustedeventsdefaultaction/fast/events/pointer-events-2-expected.txt b/third_party/blink/web_tests/platform/win/virtual/trustedeventsdefaultaction/fast/events/pointer-events-2-expected.txt
deleted file mode 100644
index cc3e528..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/trustedeventsdefaultaction/fast/events/pointer-events-2-expected.txt
+++ /dev/null
@@ -1,198 +0,0 @@
-layer at (0,0) size 800x600 scrollHeight 640
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x168
-  LayoutBlockFlow {HTML} at (0,0) size 800x167.88
-    LayoutBlockFlow {BODY} at (8,21.44) size 784x130.44
-      LayoutBlockFlow {H1} at (0,0) size 784x37
-        LayoutText {#text} at (0,0) size 755x36
-          text run at (0,0) width 755: "Testing the values of 'pointer-events' on HTML content"
-      LayoutBlockFlow {P} at (0,58.44) size 784x72
-        LayoutText {#text} at (0,0) size 784x71
-          text run at (0,0) width 589: "This test is expected to be run from within DumpRenderTree. If running manually, click on "
-          text run at (588,0) width 151: "the elements in the first"
-          text run at (0,18) width 389: "column, making sure the actual result (3rd column) matches "
-          text run at (388,18) width 391: "the expected result (2nd column). Repeat for click target (4th"
-          text run at (0,36) width 249: "column), expected result (5th column) "
-          text run at (248,36) width 536: "and actual result (6th column). Note: You should click on a yellow inline element if"
-          text run at (0,54) width 272: "one exists, otherwise anywhere in the box."
-layer at (10,140) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,140) size 300x100
-layer at (10,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,140) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 73x35
-      text run at (0,0) width 51: "pointer-"
-      text run at (0,18) width 73: "events auto"
-layer at (110,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x17
-      text run at (0,0) width 16: "p1"
-layer at (210,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x17
-      text run at (0,0) width 16: "p1"
-layer at (10,240) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,240) size 300x100
-layer at (10,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,240) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 76x35
-      text run at (0,0) width 51: "pointer-"
-      text run at (0,18) width 76: "events none"
-layer at (110,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 32x17
-      text run at (0,0) width 32: "none"
-layer at (210,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 32x17
-      text run at (0,0) width 32: "none"
-layer at (10,340) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,340) size 300x100
-layer at (10,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,340) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 72x35
-      text run at (0,0) width 60: "siblings -"
-      text run at (0,18) width 72: "auto on top"
-layer at (10,340) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80
-layer at (110,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x17
-      text run at (0,0) width 16: "p4"
-layer at (210,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x17
-      text run at (0,0) width 16: "p4"
-layer at (10,440) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (10,440) size 300x100
-layer at (10,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,440) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 76x35
-      text run at (0,0) width 60: "siblings -"
-      text run at (0,18) width 76: "none on top"
-layer at (10,440) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80
-layer at (110,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x17
-      text run at (0,0) width 16: "p5"
-layer at (210,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x17
-      text run at (0,0) width 16: "p5"
-layer at (10,540) size 300x100 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (10,540) size 300x100
-layer at (10,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (10,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 65x35
-      text run at (0,0) width 51: "nested -"
-      text run at (0,18) width 65: "auto outer"
-layer at (110,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x17
-      text run at (0,0) width 16: "p7"
-layer at (210,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 16x17
-      text run at (0,0) width 16: "p7"
-layer at (340,140) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,140) size 300x100
-layer at (340,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,140) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutText {#text} at (0,0) size 68x35
-      text run at (0,0) width 51: "nested -"
-      text run at (0,18) width 68: "none outer"
-layer at (440,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x17
-      text run at (0,0) width 24: "p10"
-layer at (540,140) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x17
-      text run at (0,0) width 24: "p10"
-layer at (340,240) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,240) size 300x100
-layer at (340,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,240) size 80x80
-  LayoutImage (positioned) {IMG} at (0,0) size 80x80
-layer at (440,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x17
-      text run at (0,0) width 24: "p11"
-layer at (540,240) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x17
-      text run at (0,0) width 24: "p11"
-layer at (340,340) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,340) size 300x100
-layer at (340,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,340) size 80x80
-  LayoutImage (positioned) {IMG} at (0,0) size 80x80
-layer at (440,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 32x17
-      text run at (0,0) width 32: "none"
-layer at (540,340) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 32x17
-      text run at (0,0) width 32: "none"
-layer at (340,440) size 300x100
-  LayoutBlockFlow (positioned) {DIV} at (340,440) size 300x100
-layer at (340,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,440) size 80x80
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutInline {SPAN} at (0,0) size 37x17 [bgcolor=#FFFF00]
-      LayoutText {#text} at (0,0) size 37x17
-        text run at (0,0) width 37: "inline"
-    LayoutText {#text} at (36,0) size 76x53
-      text run at (36,0) width 26: " has"
-      text run at (0,18) width 76: "auto, parent"
-      text run at (0,36) width 32: "none"
-layer at (440,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x17
-      text run at (0,0) width 24: "p14"
-layer at (540,440) size 80x80
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x17
-      text run at (0,0) width 24: "p14"
-layer at (340,540) size 300x100 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (340,540) size 300x100
-layer at (340,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (0,0) size 80x80
-layer at (340,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {P} at (0,0) size 80x80 [bgcolor=#808080]
-    LayoutInline {SPAN} at (0,0) size 37x17 [bgcolor=#FFFF00]
-      LayoutText {#text} at (0,0) size 37x17
-        text run at (0,0) width 37: "inline"
-    LayoutText {#text} at (36,0) size 80x53
-      text run at (36,0) width 26: " has"
-      text run at (0,18) width 80: "none, parent"
-      text run at (0,36) width 28: "auto"
-layer at (440,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (100,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x17
-      text run at (0,0) width 24: "p15"
-layer at (540,540) size 80x80 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600
-  LayoutBlockFlow (positioned) {DIV} at (200,0) size 80x80
-    LayoutText {#text} at (0,0) size 24x17
-      text run at (0,0) width 24: "p15"
-caret: position 1 of child 0 {#text} of child 0 {SPAN} of child 1 {P} of child 1 {DIV} of child 23 {DIV} of body
diff --git a/third_party/blink/web_tests/platform/win/virtual/trustedeventsdefaultaction/fast/events/reveal-link-when-focused-expected.png b/third_party/blink/web_tests/platform/win/virtual/trustedeventsdefaultaction/fast/events/reveal-link-when-focused-expected.png
deleted file mode 100644
index 3b14dfb..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/trustedeventsdefaultaction/fast/events/reveal-link-when-focused-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.png b/third_party/blink/web_tests/platform/win/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.png
deleted file mode 100644
index 5d40014..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-custom-bg-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-expected.png b/third_party/blink/web_tests/platform/win/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-expected.png
deleted file mode 100644
index 5d40014..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/video-surface-layer/media/controls/paint-controls-webkit-appearance-none-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/video-surface-layer/media/video-canvas-alpha-expected.png b/third_party/blink/web_tests/platform/win/virtual/video-surface-layer/media/video-canvas-alpha-expected.png
deleted file mode 100644
index 68d086c3..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/video-surface-layer/media/video-canvas-alpha-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/video-surface-layer/media/video-frame-accurate-seek-expected.png b/third_party/blink/web_tests/platform/win/virtual/video-surface-layer/media/video-frame-accurate-seek-expected.png
deleted file mode 100644
index 2acc43d..0000000
--- a/third_party/blink/web_tests/platform/win/virtual/video-surface-layer/media/video-frame-accurate-seek-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png b/third_party/blink/web_tests/platform/win7/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
deleted file mode 100644
index ef2bebab..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/cascade/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/cascade/fast/forms/month/month-appearance-basic-expected.png b/third_party/blink/web_tests/platform/win7/virtual/cascade/fast/forms/month/month-appearance-basic-expected.png
deleted file mode 100644
index 9c10dbe..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/cascade/fast/forms/month/month-appearance-basic-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom090-expected.png b/third_party/blink/web_tests/platform/win7/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom090-expected.png
deleted file mode 100644
index 829e44c1..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom090-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png b/third_party/blink/web_tests/platform/win7/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png
deleted file mode 100644
index e1bcef4..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/cascade/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/layout_ng/fast/block/basic/minheight-expected.png b/third_party/blink/web_tests/platform/win7/virtual/layout_ng/fast/block/basic/minheight-expected.png
deleted file mode 100644
index 12c3096..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/layout_ng/fast/block/basic/minheight-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/layout_ng/fast/writing-mode/Kusa-Makura-background-canvas-expected.png b/third_party/blink/web_tests/platform/win7/virtual/layout_ng/fast/writing-mode/Kusa-Makura-background-canvas-expected.png
deleted file mode 100644
index 6d686c5..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/layout_ng/fast/writing-mode/Kusa-Makura-background-canvas-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/media-capture-image-ptz/external/wpt/mediacapture-image/MediaStreamTrack-getSettings-expected.txt b/third_party/blink/web_tests/platform/win7/virtual/media-capture-image-ptz/external/wpt/mediacapture-image/MediaStreamTrack-getSettings-expected.txt
deleted file mode 100644
index 9aed7862..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/media-capture-image-ptz/external/wpt/mediacapture-image/MediaStreamTrack-getSettings-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-This is a testharness.js-based test.
-PASS exercises MediaStreamTrack.getSettings() with PTZ permission denied
-PASS MediaStreamTrack-getSettings
-PASS exercises MediaStreamTrack.getSettings() with PTZ permission granted
-FAIL MediaStreamTrack-getSettings 1 assert_equals: expected (number) 5 but got (undefined) undefined
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/win7/virtual/not-omt-sw-fetch/external/wpt/xhr/getallresponseheaders-expected.txt b/third_party/blink/web_tests/platform/win7/virtual/not-omt-sw-fetch/external/wpt/xhr/getallresponseheaders-expected.txt
deleted file mode 100644
index 69617d19..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/not-omt-sw-fetch/external/wpt/xhr/getallresponseheaders-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-This is a testharness.js-based test.
-FAIL XMLHttpRequest: getAllResponseHeaders() assert_equals: expected "also-here: Mr. PB\r\newok: lego\r\nfoo-test: 1, 2\r\n__custom: token\r\n" but got "__custom: token\r\nalso-here: Mr. PB\r\nfoo-test: 1, 2\r\newok: lego\r\n"
-PASS XMLHttpRequest: getAllResponseHeaders() 1
-PASS XMLHttpRequest: getAllResponseHeaders() 2
-PASS XMLHttpRequest: getAllResponseHeaders() 3
-PASS XMLHttpRequest: getAllResponseHeaders() 4
-PASS XMLHttpRequest: getAllResponseHeaders() 5
-PASS XMLHttpRequest: getAllResponseHeaders() 6
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/win7/virtual/not-omt-sw-fetch/external/wpt/xhr/responsexml-document-properties-expected.txt b/third_party/blink/web_tests/platform/win7/virtual/not-omt-sw-fetch/external/wpt/xhr/responsexml-document-properties-expected.txt
deleted file mode 100644
index 8703e748..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/not-omt-sw-fetch/external/wpt/xhr/responsexml-document-properties-expected.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-This is a testharness.js-based test.
-PASS domain
-PASS URL
-PASS documentURI
-PASS baseURI
-PASS referrer
-PASS title
-PASS contentType
-PASS readyState
-PASS location
-PASS defaultView
-PASS body
-PASS doctype
-PASS all
-PASS cookie
-PASS Test document URL properties after redirect
-PASS Test document URL properties of document with <base> after redirect
-PASS lastModified set to time of response if no HTTP header provided
-PASS lastModified set to related HTTP header if provided
-PASS cookie (after setting it)
-PASS styleSheets should be an object
-PASS implementation should be an object
-PASS images should be an object
-PASS forms should be an object
-PASS links should be an object
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/win7/virtual/omt-worker-fetch/external/wpt/xhr/abort-after-send.any-expected.txt b/third_party/blink/web_tests/platform/win7/virtual/omt-worker-fetch/external/wpt/xhr/abort-after-send.any-expected.txt
deleted file mode 100644
index 0f10f7e..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/omt-worker-fetch/external/wpt/xhr/abort-after-send.any-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL XMLHttpRequest: abort() after send() assert_equals: expected "abort(0,0,false)" but got "upload.abort(0,0,false)"
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/win7/virtual/omt-worker-fetch/external/wpt/xhr/responsexml-document-properties-expected.txt b/third_party/blink/web_tests/platform/win7/virtual/omt-worker-fetch/external/wpt/xhr/responsexml-document-properties-expected.txt
deleted file mode 100644
index b04fa7d6..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/omt-worker-fetch/external/wpt/xhr/responsexml-document-properties-expected.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-This is a testharness.js-based test.
-PASS domain
-PASS URL
-PASS documentURI
-PASS baseURI
-PASS referrer
-PASS title
-PASS contentType
-PASS readyState
-PASS location
-PASS defaultView
-PASS body
-PASS doctype
-PASS all
-PASS cookie
-PASS Test document URL properties after redirect
-PASS Test document URL properties of document with <base> after redirect
-FAIL lastModified set to time of response if no HTTP header provided assert_less_than_equal: expected a number less than or equal to 1566177361 but got 1566180961
-FAIL lastModified set to related HTTP header if provided assert_equals: expected 1566155284000 but got 1566151684000
-PASS cookie (after setting it)
-PASS styleSheets should be an object
-PASS implementation should be an object
-PASS images should be an object
-PASS forms should be an object
-PASS links should be an object
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/win7/virtual/outofblink-cors/http/tests/xmlhttprequest/origin-header-same-origin-post-async-expected.txt b/third_party/blink/web_tests/platform/win7/virtual/outofblink-cors/http/tests/xmlhttprequest/origin-header-same-origin-post-async-expected.txt
deleted file mode 100644
index 85f9a5c..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/outofblink-cors/http/tests/xmlhttprequest/origin-header-same-origin-post-async-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-PASS: Cross-domain access allowed.
-HTTP_ORIGIN: http://127.0.0.1:8000
-
-
diff --git a/third_party/blink/web_tests/platform/win7/virtual/outofblink-cors/http/tests/xmlhttprequest/origin-header-same-origin-post-sync-expected.txt b/third_party/blink/web_tests/platform/win7/virtual/outofblink-cors/http/tests/xmlhttprequest/origin-header-same-origin-post-sync-expected.txt
deleted file mode 100644
index 7386346..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/outofblink-cors/http/tests/xmlhttprequest/origin-header-same-origin-post-sync-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-CONSOLE WARNING: line 13: Synchronous XMLHttpRequest on the main thread is deprecated because of its detrimental effects to the end user's experience. For more help, check https://xhr.spec.whatwg.org/.
-PASS: Cross-domain access allowed.
-HTTP_ORIGIN: http://127.0.0.1:8000
-
-
diff --git a/third_party/blink/web_tests/platform/win7/virtual/samesite-by-default-cookies/external/wpt/cookies/http-state/general-tests-expected.txt b/third_party/blink/web_tests/platform/win7/virtual/samesite-by-default-cookies/external/wpt/cookies/http-state/general-tests-expected.txt
deleted file mode 100644
index 4d33a0e..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/samesite-by-default-cookies/external/wpt/cookies/http-state/general-tests-expected.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-This is a testharness.js-based test.
-PASS 0001 - Set cookie.
-PASS 0002 - Set cookie with future expiration.
-PASS 0003 - Set expired cookie along with valid cookie.
-FAIL 0004 - Ignore cookie without key. assert_equals: expected "" but got "foo"
-PASS 0005 - Set cookie with age.
-PASS 0006 - Set no cookie with max-age=0.
-PASS 0007 - Set cookie with version=1.
-PASS 0008 - Set cookie with version=1000.
-PASS 0009 - Set cookie with custom value.
-PASS 0010 - Dont accept 'secure' cookies over http.
-PASS 0011 - Ignore separators in cookie values.
-PASS 0012 - Ignore values with separators and without ';'.
-PASS 0013 - Use last value for cookies with identical keys.
-PASS 0014 - Keep alphabetic key order.
-PASS 0015 - Keep alphabetic single-char key order.
-PASS 0016 - Keep non-alphabetic key order.
-PASS 0017 - Keep order if comma-separated.
-PASS 0018 - Ignore keys after semicolon.
-PASS 0019 - Ignore attributes after semicolon.
-FAIL 0020 - Ignore cookies without key and value. assert_equals: expected "a=b; c=d" but got "a=b; ; c=d"
-FAIL 0021 - Ignore cookie without key in all 'Set-Cookie'. assert_equals: expected "a=b; c=d" but got "a=b; x; c=d"
-PASS 0022 - Set cookie without value in all 'Set-Cookie'.
-PASS 0023 - Ignore cookies without '=' in all 'Set-Cookie'.
-PASS 0024 - Ignore malformed cookies in all 'Set-Cookie'.
-PASS 0025 - Ignore cookies with ';' in all 'Set-Cookie'.
-PASS 0026 - Ignore malformed cookies in all 'Set-Cookie' v2.
-FAIL 0027 - Ignore malformed cookies in all 'Set-Cookie' v3. assert_equals: expected "" but got "bar"
-FAIL 0028 - [INVALID EXPECTATION] Ignore malformed cookies in all 'Set-Cookie' v4. assert_equals: expected "Set-Cookie: foo\nSet-Cookie:" but got ""
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/win7/virtual/sharedarraybuffer/fast/css/color-correction-on-text-shadow-expected.png b/third_party/blink/web_tests/platform/win7/virtual/sharedarraybuffer/fast/css/color-correction-on-text-shadow-expected.png
deleted file mode 100644
index fc926e86..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/sharedarraybuffer/fast/css/color-correction-on-text-shadow-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/sharedarraybuffer/fast/css/crash-on-gradient-with-derived-color-expected.txt b/third_party/blink/web_tests/platform/win7/virtual/sharedarraybuffer/fast/css/crash-on-gradient-with-derived-color-expected.txt
deleted file mode 100644
index 97296481..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/sharedarraybuffer/fast/css/crash-on-gradient-with-derived-color-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-This test passes if it does not CRASH.
diff --git a/third_party/blink/web_tests/platform/win7/virtual/sharedarraybuffer/fast/css/number-parsing-crash-expected.txt b/third_party/blink/web_tests/platform/win7/virtual/sharedarraybuffer/fast/css/number-parsing-crash-expected.txt
deleted file mode 100644
index 75cf4f3..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/sharedarraybuffer/fast/css/number-parsing-crash-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-This should not crash.  
diff --git a/third_party/blink/web_tests/platform/win7/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-expected.png b/third_party/blink/web_tests/platform/win7/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-expected.png
deleted file mode 100644
index 2997751..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-iframe-expected.png b/third_party/blink/web_tests/platform/win7/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-iframe-expected.png
deleted file mode 100644
index aaa3e8bdb..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/sharedarraybuffer/fast/css/resize-corner-tracking-transformed-iframe-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/sharedarraybuffer/fast/css/shadow-multiple-expected.png b/third_party/blink/web_tests/platform/win7/virtual/sharedarraybuffer/fast/css/shadow-multiple-expected.png
deleted file mode 100644
index b94d6b1..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/sharedarraybuffer/fast/css/shadow-multiple-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/fast/css/bidi-override-in-anonymous-block-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/fast/css/bidi-override-in-anonymous-block-expected.png
deleted file mode 100644
index f15f9b80..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/fast/css/bidi-override-in-anonymous-block-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirRTL-ubNone-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirRTL-ubNone-expected.png
deleted file mode 100644
index 58e73e8..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirRTL-ubNone-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirRTL-ubOverride-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirRTL-ubOverride-expected.png
deleted file mode 100644
index 3807091..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/g-dirRTL-ubOverride-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirRTL-ubNone-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirRTL-ubNone-expected.png
deleted file mode 100644
index 58e73e8..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/text-dirRTL-ubNone-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-default-context-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-default-context-expected.png
deleted file mode 100644
index e212905..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-default-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-ltr-context-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-ltr-context-expected.png
deleted file mode 100644
index e212905..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-ltr-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubNone-in-default-context-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubNone-in-default-context-expected.png
deleted file mode 100644
index 080812b..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubNone-in-default-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubNone-in-ltr-context-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubNone-in-ltr-context-expected.png
deleted file mode 100644
index 080812b..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubNone-in-ltr-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-default-context-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-default-context-expected.png
deleted file mode 100644
index 887086d..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-default-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-ltr-context-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-ltr-context-expected.png
deleted file mode 100644
index 887086d..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-ltr-context-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-direction-rtl-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-direction-rtl-expected.png
deleted file mode 100644
index f100c00..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-I18N/tspan-direction-rtl-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-05-t-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-05-t-expected.png
deleted file mode 100644
index 52ff966..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1-SE/text-intro-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-22-b-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-22-b-expected.png
deleted file mode 100644
index 162080f..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/animate-elem-22-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-color-01-b-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-color-01-b-expected.png
deleted file mode 100644
index f7cacc4..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/filters-color-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-04-b-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-04-b-expected.png
deleted file mode 100644
index e0f71168..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/masking-path-04-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-render-01-b-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-render-01-b-expected.png
deleted file mode 100644
index f7c6743..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/painting-render-01-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png
deleted file mode 100644
index b970889..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-03-b-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-03-b-expected.png
deleted file mode 100644
index 41141b2..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-intro-03-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-08-b-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-08-b-expected.png
deleted file mode 100644
index f179ba8..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/W3C-SVG-1.1/text-text-08-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-5-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-5-expected.png
deleted file mode 100644
index 0754cad..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/as-background-image/svg-as-background-5-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/css/alignment-baseline-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/css/alignment-baseline-expected.png
deleted file mode 100644
index c8ace945..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/css/alignment-baseline-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-expected.png
deleted file mode 100644
index 34b4be6..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-on-path-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-on-path-expected.png
deleted file mode 100644
index 5521c09a..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-on-path-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-zoomed-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-zoomed-expected.png
deleted file mode 100644
index f9064244..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/bbox-with-glyph-overflow-zoomed-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/bidi-reorder-in-text-chunks-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/bidi-reorder-in-text-chunks-expected.png
deleted file mode 100644
index adbbc75..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/bidi-reorder-in-text-chunks-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/bidi-textlength-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/bidi-textlength-expected.png
deleted file mode 100644
index b53a098..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/bidi-textlength-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/bidi-tspans-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/bidi-tspans-expected.png
deleted file mode 100644
index 681f1568..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/bidi-tspans-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/surrogate-pair-queries-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/surrogate-pair-queries-expected.png
deleted file mode 100644
index 7081440..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/surrogate-pair-queries-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/text-selection-fonts-01-t-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/text-selection-fonts-01-t-expected.png
deleted file mode 100644
index 7e9f37a..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/text-selection-fonts-01-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/text-selection-intro-05-t-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/text-selection-intro-05-t-expected.png
deleted file mode 100644
index 1b019294..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/text-selection-intro-05-t-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/text-selection-text-08-b-expected.png b/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/text-selection-text-08-b-expected.png
deleted file mode 100644
index 193467b..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/synchronous_html_parser/svg/text/text-selection-text-08-b-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/transform-interop-disabled/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png b/third_party/blink/web_tests/platform/win7/virtual/transform-interop-disabled/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
deleted file mode 100644
index 5da95943..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/transform-interop-disabled/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/video-surface-layer/media/track/track-cue-rendering-vertical-expected.png b/third_party/blink/web_tests/platform/win7/virtual/video-surface-layer/media/track/track-cue-rendering-vertical-expected.png
deleted file mode 100644
index 12d70d3..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/video-surface-layer/media/track/track-cue-rendering-vertical-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/video-surface-layer/media/video-zoom-controls-expected.png b/third_party/blink/web_tests/platform/win7/virtual/video-surface-layer/media/video-zoom-controls-expected.png
deleted file mode 100644
index 217e45d..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/video-surface-layer/media/video-zoom-controls-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/webrtc-wpt-unified-plan/external/wpt/webrtc/RTCPeerConnection-track-stats.https-expected.txt b/third_party/blink/web_tests/platform/win7/virtual/webrtc-wpt-unified-plan/external/wpt/webrtc/RTCPeerConnection-track-stats.https-expected.txt
deleted file mode 100644
index 1a6478f..0000000
--- a/third_party/blink/web_tests/platform/win7/virtual/webrtc-wpt-unified-plan/external/wpt/webrtc/RTCPeerConnection-track-stats.https-expected.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-This is a testharness.js-based test.
-PASS addTrack() without setLocalDescription() yields track stats
-PASS addTrack() without setLocalDescription() yields media stream stats
-PASS addTrack() with setLocalDescription() yields track stats
-PASS addTrack() with setLocalDescription() yields media stream stats
-PASS addTrack(): Media stream stats references track stats
-PASS Media stream stats references track stats
-PASS O/A exchange yields outbound RTP stream stats for sending track
-PASS O/A exchange yields inbound RTP stream stats for receiving track
-PASS replaceTrack() before offer: new track attachment stats present
-PASS replaceTrack() after offer, before answer: new track attachment stats present
-PASS replaceTrack() after answer: new track attachment stats present
-FAIL replaceTrack(): original track attachment stats present after replacing assert_true: Has stats for original track expected true got false
-PASS RTCRtpSender.getStats() contains only outbound-rtp and related stats
-FAIL RTCRtpReceiver.getStats() contains only inbound-rtp and related stats assert_equals: receiverReport should contain candidate-pair stats expected 1 but got 0
-PASS RTCPeerConnection.getStats(sendingTrack) is the same as RTCRtpSender.getStats()
-PASS RTCPeerConnection.getStats(receivingTrack) is the same as RTCRtpReceiver.getStats()
-PASS RTCPeerConnection.getStats(track) throws InvalidAccessError when there are zero senders or receivers for the track
-PASS RTCPeerConnection.getStats(track) throws InvalidAccessError when there are multiple senders for the track
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/resources/global-interface-listing.js b/third_party/blink/web_tests/resources/global-interface-listing.js
index 16fbc4e..5b4d5aa 100644
--- a/third_party/blink/web_tests/resources/global-interface-listing.js
+++ b/third_party/blink/web_tests/resources/global-interface-listing.js
@@ -118,7 +118,6 @@
 // platform-specific expectations files to a bare minimum to make updates in the
 // common (platform-neutral) case as simple as possible.
 var platformSpecificInterfaces = new Set([
-  'BarcodeDetector',
   'Bluetooth',
   'BluetoothCharacteristicProperties',
   'BluetoothDevice',
diff --git a/third_party/blink/web_tests/virtual/cache-code-on-idle/README.md b/third_party/blink/web_tests/virtual/cache-code-on-idle/README.md
deleted file mode 100644
index 11230eb..0000000
--- a/third_party/blink/web_tests/virtual/cache-code-on-idle/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-Virtual test suite for testing delayed production of V8 code caches in an idle
-task.
diff --git a/third_party/blink/web_tests/virtual/cache-code-on-idle/http/tests/devtools/isolated-code-cache/cross-origin-test-expected.txt b/third_party/blink/web_tests/virtual/cache-code-on-idle/http/tests/devtools/isolated-code-cache/cross-origin-test-expected.txt
deleted file mode 100644
index 145aaf6..0000000
--- a/third_party/blink/web_tests/virtual/cache-code-on-idle/http/tests/devtools/isolated-code-cache/cross-origin-test-expected.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-Tests V8 code cache for javascript resources
-
----First navigation - produce and consume code cache ------
-
-v8.compile Properties:
-{
-    data : {
-        columnNumber : 0
-        lineNumber : 0
-        streamed : <boolean>
-        url : .../devtools/resources/v8-cache-script.js
-    }
-    endTime : <number>
-    startTime : <number>
-    type : "v8.compile"
-}
-Text details for v8.compile: v8-cache-script.js:1
-v8.compile Properties:
-{
-    data : {
-        columnNumber : 0
-        lineNumber : 0
-        notStreamedReason : "already used streamed data"
-        streamed : <boolean>
-        url : .../devtools/resources/v8-cache-script.js
-    }
-    endTime : <number>
-    startTime : <number>
-    type : "v8.compile"
-}
-Text details for v8.compile: v8-cache-script.js:1
-v8.compile Properties:
-{
-    data : {
-        columnNumber : 0
-        lineNumber : 0
-        notStreamedReason : "already used streamed data"
-        streamed : <boolean>
-        url : .../devtools/resources/v8-cache-script.js
-    }
-    endTime : <number>
-    startTime : <number>
-    type : "v8.compile"
-}
-Text details for v8.compile: v8-cache-script.js:1
-v8.produceCache Properties:
-{
-    data : {
-        columnNumber : 0
-        lineNumber : 0
-        producedCacheSize : <number>
-        url : .../devtools/resources/v8-cache-script.js
-    }
-    endTime : <number>
-    startTime : <number>
-    type : "v8.produceCache"
-}
-Text details for v8.produceCache: v8-cache-script.js:1
-v8.produceCache Properties:
-{
-    data : {
-        columnNumber : 0
-        lineNumber : 0
-        producedCacheSize : <number>
-        url : .../devtools/resources/v8-cache-script.js
-    }
-    endTime : <number>
-    startTime : <number>
-    type : "v8.produceCache"
-}
-Text details for v8.produceCache: v8-cache-script.js:1
-
---- Second navigation - from a different origin ------
-
-v8.compile Properties:
-{
-    data : {
-        columnNumber : 0
-        lineNumber : 0
-        streamed : <boolean>
-        url : .../devtools/resources/v8-cache-script.js
-    }
-    endTime : <number>
-    startTime : <number>
-    type : "v8.compile"
-}
-Text details for v8.compile: v8-cache-script.js:1
-
diff --git a/third_party/blink/web_tests/virtual/file-system-access-access-handle/README.md b/third_party/blink/web_tests/virtual/file-system-access-access-handle/README.md
deleted file mode 100644
index 26c6552..0000000
--- a/third_party/blink/web_tests/virtual/file-system-access-access-handle/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-This directory contains (tentative) tests for the
-[File System Access Access Handle](https://docs.google.com/document/d/1g7ZCqZ5NdiU7oqyCpsc2iZ7rRAY1ZXO-9VoG4LfP7fM)
-specification.
diff --git a/third_party/blink/web_tests/virtual/font-access-chooser/OWNERS b/third_party/blink/web_tests/virtual/font-access-chooser/OWNERS
deleted file mode 100644
index 272a4ab..0000000
--- a/third_party/blink/web_tests/virtual/font-access-chooser/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file://third_party/blink/renderer/modules/font_access/OWNERS
diff --git a/third_party/blink/web_tests/virtual/font-access-chooser/README.md b/third_party/blink/web_tests/virtual/font-access-chooser/README.md
deleted file mode 100644
index 57f1a91..0000000
--- a/third_party/blink/web_tests/virtual/font-access-chooser/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# This suite runs tests with --enable-features=FontAccess,FontAccessChooser
diff --git a/third_party/blink/web_tests/virtual/isolated-animation-updates/external/wpt/scroll-animations/css/at-scroll-timeline-dynamic.tentative-expected.txt b/third_party/blink/web_tests/virtual/isolated-animation-updates/external/wpt/scroll-animations/css/at-scroll-timeline-dynamic.tentative-expected.txt
deleted file mode 100644
index 4c820a8c..0000000
--- a/third_party/blink/web_tests/virtual/isolated-animation-updates/external/wpt/scroll-animations/css/at-scroll-timeline-dynamic.tentative-expected.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-This is a testharness.js-based test.
-PASS Switching between document and scroll timelines [immediate]
-PASS Switching between document and scroll timelines [scroll]
-PASS Changing computed value of animation-timeline changes effective timeline [immediate]
-PASS Changing computed value of animation-timeline changes effective timeline [scroll]
-FAIL Changing to/from animation-timeline:none [immediate] assert_equals: expected "0px" but got "100px"
-PASS Changing to/from animation-timeline:none [scroll]
-PASS Changing the source descriptor switches effective timeline [immediate]
-PASS Changing the source descriptor switches effective timeline [scroll]
-PASS Changing the start descriptor switches effective timeline [immediate]
-PASS Changing the start descriptor switches effective timeline [scroll]
-PASS Changing the end descriptor switches effective timeline [immediate]
-PASS Changing the end descriptor switches effective timeline [scroll]
-PASS Reverse animation direction [immediate]
-PASS Reverse animation direction [scroll]
-PASS Switching timelines while paused [immediate]
-PASS Switching timelines while paused [scroll]
-PASS Switching timelines and pausing at the same time [immediate]
-PASS Switching timelines and pausing at the same time [scroll]
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/virtual/module-service-worker/external/wpt/service-workers/service-worker/update-bytecheck-cors-import.https-expected.txt b/third_party/blink/web_tests/virtual/module-service-worker/external/wpt/service-workers/service-worker/update-bytecheck-cors-import.https-expected.txt
deleted file mode 100644
index e2f1336..0000000
--- a/third_party/blink/web_tests/virtual/module-service-worker/external/wpt/service-workers/service-worker/update-bytecheck-cors-import.https-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-This is a testharness.js-based test.
-PASS Test(main: default, imported: default)
-PASS Test(main: default, imported: time)
-PASS Test(main: time, imported: default)
-PASS Test(main: time, imported: time)
-FAIL Test module script(main: default, imported: default) assert_unreached: unregister and register should not fail: Failed to register a ServiceWorker for scope ('https://web-platform.test:8444/service-workers/service-worker/resources/blank.html') with script ('https://web-platform.test:8444/service-workers/service-worker/resources/bytecheck-worker.py?main=default&imported=default&path=https://www1.web-platform.test:8444/service-workers/service-worker/resources/&type=module'): ServiceWorker cannot be started Reached unreachable code
-FAIL Test module script(main: default, imported: time) assert_unreached: unregister and register should not fail: Failed to register a ServiceWorker for scope ('https://web-platform.test:8444/service-workers/service-worker/resources/blank.html') with script ('https://web-platform.test:8444/service-workers/service-worker/resources/bytecheck-worker.py?main=default&imported=time&path=https://www1.web-platform.test:8444/service-workers/service-worker/resources/&type=module'): ServiceWorker cannot be started Reached unreachable code
-FAIL Test module script(main: time, imported: default) assert_unreached: unregister and register should not fail: Failed to register a ServiceWorker for scope ('https://web-platform.test:8444/service-workers/service-worker/resources/blank.html') with script ('https://web-platform.test:8444/service-workers/service-worker/resources/bytecheck-worker.py?main=time&imported=default&path=https://www1.web-platform.test:8444/service-workers/service-worker/resources/&type=module'): ServiceWorker cannot be started Reached unreachable code
-FAIL Test module script(main: time, imported: time) assert_unreached: unregister and register should not fail: Failed to register a ServiceWorker for scope ('https://web-platform.test:8444/service-workers/service-worker/resources/blank.html') with script ('https://web-platform.test:8444/service-workers/service-worker/resources/bytecheck-worker.py?main=time&imported=time&path=https://www1.web-platform.test:8444/service-workers/service-worker/resources/&type=module'): ServiceWorker cannot be started Reached unreachable code
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/virtual/scroll-unification-disable-navigator-plugins-empty/README.md b/third_party/blink/web_tests/virtual/scroll-unification-disable-navigator-plugins-empty/README.md
deleted file mode 100644
index 98ab509f..0000000
--- a/third_party/blink/web_tests/virtual/scroll-unification-disable-navigator-plugins-empty/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This directory is dedicated for testing the "ScrollUnification" and "DisableNavigatorPluginsEmpty" feature.
diff --git a/third_party/blink/web_tests/virtual/stable/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt b/third_party/blink/web_tests/virtual/stable/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt
index d25a338..08d172c52 100644
--- a/third_party/blink/web_tests/virtual/stable/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt
+++ b/third_party/blink/web_tests/virtual/stable/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt
@@ -51,6 +51,11 @@
     attribute @@toStringTag
     method constructor
     method updateUI
+interface BarcodeDetector
+    static method getSupportedFormats
+    attribute @@toStringTag
+    method constructor
+    method detect
 interface Blob
     attribute @@toStringTag
     getter size
diff --git a/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-dedicated-worker-expected.txt b/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-dedicated-worker-expected.txt
index 2a352b6..17e6b65 100644
--- a/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-dedicated-worker-expected.txt
+++ b/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-dedicated-worker-expected.txt
@@ -79,6 +79,11 @@
 [Worker]     method match
 [Worker]     method matchAll
 [Worker]     setter onprogress
+[Worker] interface BarcodeDetector
+[Worker]     static method getSupportedFormats
+[Worker]     attribute @@toStringTag
+[Worker]     method constructor
+[Worker]     method detect
 [Worker] interface Blob
 [Worker]     attribute @@toStringTag
 [Worker]     getter size
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 2769a0e..8680bdd 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
@@ -320,6 +320,11 @@
     attribute @@toStringTag
     getter visible
     method constructor
+interface BarcodeDetector
+    static method getSupportedFormats
+    attribute @@toStringTag
+    method constructor
+    method detect
 interface BaseAudioContext : EventTarget
     attribute @@toStringTag
     getter audioWorklet
diff --git a/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-shared-worker-expected.txt b/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-shared-worker-expected.txt
index ab9f8573..8b1e371e 100644
--- a/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-shared-worker-expected.txt
+++ b/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-shared-worker-expected.txt
@@ -44,6 +44,11 @@
 [Worker]     method match
 [Worker]     method matchAll
 [Worker]     setter onprogress
+[Worker] interface BarcodeDetector
+[Worker]     static method getSupportedFormats
+[Worker]     attribute @@toStringTag
+[Worker]     method constructor
+[Worker]     method detect
 [Worker] interface Blob
 [Worker]     attribute @@toStringTag
 [Worker]     getter size
diff --git a/third_party/blink/web_tests/webexposed/global-interface-listing-dedicated-worker-expected.txt b/third_party/blink/web_tests/webexposed/global-interface-listing-dedicated-worker-expected.txt
index 8feba2bf..e6837c3 100644
--- a/third_party/blink/web_tests/webexposed/global-interface-listing-dedicated-worker-expected.txt
+++ b/third_party/blink/web_tests/webexposed/global-interface-listing-dedicated-worker-expected.txt
@@ -79,6 +79,11 @@
 [Worker]     method match
 [Worker]     method matchAll
 [Worker]     setter onprogress
+[Worker] interface BarcodeDetector
+[Worker]     static method getSupportedFormats
+[Worker]     attribute @@toStringTag
+[Worker]     method constructor
+[Worker]     method detect
 [Worker] interface Blob
 [Worker]     attribute @@toStringTag
 [Worker]     getter size
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 e19cb87..44a7f0a 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
@@ -537,6 +537,11 @@
     attribute @@toStringTag
     getter visible
     method constructor
+interface BarcodeDetector
+    static method getSupportedFormats
+    attribute @@toStringTag
+    method constructor
+    method detect
 interface BaseAudioContext : EventTarget
     attribute @@toStringTag
     getter audioWorklet
@@ -753,6 +758,7 @@
 interface CSSImportRule : CSSRule
     attribute @@toStringTag
     getter href
+    getter layerName
     getter media
     getter styleSheet
     method constructor
diff --git a/third_party/blink/web_tests/webexposed/global-interface-listing-platform-specific-dedicated-worker-expected.txt b/third_party/blink/web_tests/webexposed/global-interface-listing-platform-specific-dedicated-worker-expected.txt
index bf64d64f..35dc755 100644
--- a/third_party/blink/web_tests/webexposed/global-interface-listing-platform-specific-dedicated-worker-expected.txt
+++ b/third_party/blink/web_tests/webexposed/global-interface-listing-platform-specific-dedicated-worker-expected.txt
@@ -4,11 +4,6 @@
 
 Starting worker: resources/global-interface-listing-worker.js
 [Worker] [INTERFACES]
-[Worker] interface BarcodeDetector
-[Worker]     static method getSupportedFormats
-[Worker]     attribute @@toStringTag
-[Worker]     method constructor
-[Worker]     method detect
 [Worker] interface Notification : EventTarget
 [Worker]     getter image
 [Worker] [NAMESPACES]
diff --git a/third_party/blink/web_tests/webexposed/global-interface-listing-platform-specific-expected.txt b/third_party/blink/web_tests/webexposed/global-interface-listing-platform-specific-expected.txt
index c4d6a2e2..0e40791 100644
--- a/third_party/blink/web_tests/webexposed/global-interface-listing-platform-specific-expected.txt
+++ b/third_party/blink/web_tests/webexposed/global-interface-listing-platform-specific-expected.txt
@@ -3,11 +3,6 @@
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 [INTERFACES]
-interface BarcodeDetector
-    static method getSupportedFormats
-    attribute @@toStringTag
-    method constructor
-    method detect
 interface Bluetooth : EventTarget
     attribute @@toStringTag
     getter onadvertisementreceived
diff --git a/third_party/blink/web_tests/webexposed/global-interface-listing-platform-specific-shared-worker-expected.txt b/third_party/blink/web_tests/webexposed/global-interface-listing-platform-specific-shared-worker-expected.txt
index 639c7c6..be8425d 100644
--- a/third_party/blink/web_tests/webexposed/global-interface-listing-platform-specific-shared-worker-expected.txt
+++ b/third_party/blink/web_tests/webexposed/global-interface-listing-platform-specific-shared-worker-expected.txt
@@ -4,11 +4,6 @@
 
 Starting worker: resources/global-interface-listing-worker.js
 [Worker] [INTERFACES]
-[Worker] interface BarcodeDetector
-[Worker]     static method getSupportedFormats
-[Worker]     attribute @@toStringTag
-[Worker]     method constructor
-[Worker]     method detect
 [Worker] interface Notification : EventTarget
 [Worker]     getter image
 [Worker] [NAMESPACES]
diff --git a/third_party/blink/web_tests/webexposed/global-interface-listing-shared-worker-expected.txt b/third_party/blink/web_tests/webexposed/global-interface-listing-shared-worker-expected.txt
index 2e328ac..5a539be 100644
--- a/third_party/blink/web_tests/webexposed/global-interface-listing-shared-worker-expected.txt
+++ b/third_party/blink/web_tests/webexposed/global-interface-listing-shared-worker-expected.txt
@@ -44,6 +44,11 @@
 [Worker]     method match
 [Worker]     method matchAll
 [Worker]     setter onprogress
+[Worker] interface BarcodeDetector
+[Worker]     static method getSupportedFormats
+[Worker]     attribute @@toStringTag
+[Worker]     method constructor
+[Worker]     method detect
 [Worker] interface Blob
 [Worker]     attribute @@toStringTag
 [Worker]     getter size
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/aspect-ratio.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/aspect-ratio.html
deleted file mode 100644
index 151f803..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/aspect-ratio.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!doctype html>
-<title>Tests @container queries with aspect-ratio</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  .container {
-    width: 100px;
-    height: 100px;
-  }
-  #inline-size { container-type: inline-size; }
-  #block-size { container-type: block-size; }
-  #size { container-type: size; }
-  span { color: red }
-  @container size(min-aspect-ratio: 1 / 1000) {
-    span { color: green; }
-  }
-  @container size(min-aspect-ratio: 2 / 1) {
-    span { background-color: lime; }
-  }
-</style>
-<div id="inline-size" class="container"><span></span></div>
-<div id="block-size" class="container"><span></span></div>
-<div id="size" class="container"><span></span></div>
-<script>
-  const red = "rgb(255, 0, 0)";
-  const green = "rgb(0, 128, 0)";
-  const lime = "rgb(0, 255, 0)";
-  const transparent = "rgba(0, 0, 0, 0)";
-
-  const inline_span = document.querySelector("#inline-size > span");
-  const block_span = document.querySelector("#block-size > span");
-  const size_span = document.querySelector("#size > span");
-
-  test(() => {
-    assert_equals(getComputedStyle(inline_span).color, red,
-                  "Should not match for inline-size containment");
-    assert_equals(getComputedStyle(block_span).color, red,
-                  "Should not match for block-size containment");
-    assert_equals(getComputedStyle(size_span).color, green,
-                  "Should match for block-size containment");
-    assert_equals(getComputedStyle(size_span).backgroundColor, transparent,
-                  "Square should not match 2/1 min-ratio");
-  }, "@container queries with aspect-ratio and size containment");
-
-  test(() => {
-    document.querySelector("#size").style.width = "200px";
-    assert_equals(getComputedStyle(size_span).backgroundColor, lime,
-                  "Should match 2/1 min-ratio");
-  }, "@container query with aspect-ratio change after resize");
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-003.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-003.html
deleted file mode 100644
index d5bc89e3..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-003.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<title>Test that @container-dependent elements respond to container size changes</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  #container {
-    container-type: size;
-    width: 200px;
-    height: 50px;
-  }
-  div { color: red; }
-  @container size(min-width: 300px) {
-    div { color: green; }
-  }
-</style>
-<main id=container>
-  <div id=child>
-    Test
-    <p><span id=descendant>Deep</span></p>
-  </div>
-</main>
-<script>
-  test(function() {
-    assert_equals(getComputedStyle(child).color, 'rgb(255, 0, 0)');
-    container.style.width = '300px';
-    assert_equals(getComputedStyle(child).color, 'rgb(0, 128, 0)');
-  }, 'Children respond to changes in container size');
-
-  test(function() {
-    container.style = '';
-    assert_equals(getComputedStyle(descendant).color, 'rgb(255, 0, 0)');
-    container.style.width = '300px';
-    assert_equals(getComputedStyle(descendant).color, 'rgb(0, 128, 0)');
-  }, 'Descendants respond to changes in container size');
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-004.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-004.html
deleted file mode 100644
index 4cc71003..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-004.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<title>Test that @container-dependent elements respond to iframe size changes</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  iframe {
-    width: 200px;
-    height: 40px;
-  }
-</style>
-<iframe id=iframe srcdoc="
-  <style>
-    div#container {
-      container-type: size;
-      height: 20px;
-    }
-    div#child { color: red; }
-    @container size(min-width: 300px) {
-      div#child { color: green; }
-    }
-  </style>
-  <div id=container>
-    <div id=child>Test</div>
-  </div>
-"></iframe>
-<script>
-
-  function waitForLoad(w) {
-    return new Promise(resolve => w.addEventListener('load', resolve));
-  }
-
-  promise_test(async () => {
-    await waitForLoad(window);
-    let inner_div = iframe.contentDocument.querySelector('div#child');
-    assert_equals(getComputedStyle(inner_div).color, 'rgb(255, 0, 0)');
-
-    iframe.style = 'width:400px';
-    assert_equals(getComputedStyle(inner_div).color, 'rgb(0, 128, 0)');
-  })
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-006.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-006.html
deleted file mode 100644
index 024f99f..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-006.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<title>Test that ::backdrop responds to container size changes</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  :root {
-    color: black;
-  }
-
-  #container {
-    container-type: size;
-    width: 200px;
-    height: 40px;
-  }
-
-  ::backdrop {
-    background-color: black;
-  }
-
-  @container size(min-width: 300px) {
-    ::backdrop {
-      background-color: green;
-    }
-  }
-</style>
-<main id=container>
-  <dialog>test</dialog>
-</main>
-<script>
-  let dialog = document.querySelector('dialog');
-
-  test(function() {
-    try {
-      dialog.showModal();
-
-      assert_equals(getComputedStyle(dialog, '::backdrop').backgroundColor, 'rgb(0, 0, 0)');
-
-      container.style.width = '300px';
-      assert_equals(getComputedStyle(dialog, '::backdrop').backgroundColor, 'rgb(0, 128, 0)');
-
-      container.style = '';
-      assert_equals(getComputedStyle(dialog, '::backdrop').backgroundColor, 'rgb(0, 0, 0)');
-    } finally {
-      dialog.close();
-    }
-  }, 'Pseudo-element ::backdrop responds to container size changes');
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-007.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-007.html
deleted file mode 100644
index 38e20313..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-007.html
+++ /dev/null
@@ -1,343 +0,0 @@
-<!DOCTYPE html>
-<title>@container in display:none</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  .container {
-    container-type: size;
-    width: 30px;
-    height: 30px;
-    background: tomato;
-  }
-  .big {
-    width: 50px;
-    height: 50px;
-    background: skyblue;
-  }
-  .none {
-    display: none;
-  }
-  .pseudo::before {
-    content: "foo";
-  }
-  .pseudo_none::before {
-    content: "foo";
-    display: none;
-  }
-
-  @container size(width: 30px) {
-    .target { --x:30; }
-  }
-
-  @container size(width: 50px) {
-    .target { --x:50; }
-  }
-
-  main {
-    display: flex;
-    flex-wrap: wrap;
-  }
-
-</style>
-
-<main>
-  <!-- Target element is display:none -->
-  <div class="container">
-    <div>
-      <div>
-        <div class="target none" id=target1></div>
-      </div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target1);
-      assert_equals(s.getPropertyValue('--x'), '30');
-    }, 'getComputedStyle when element is display:none');
-  </script>
-
-  <!-- Parent is display:none -->
-  <div class="container">
-    <div>
-      <div class="none">
-        <div class="target" id=target2></div>
-      </div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target2);
-      assert_equals(s.getPropertyValue('--x'), '30');
-    }, 'getComputedStyle when parent is display:none');
-  </script>
-
-  <!-- Ancestor is display:none -->
-  <div class="container">
-    <div class="none">
-      <div>
-        <div class="target" id=target3></div>
-      </div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target3);
-      assert_equals(s.getPropertyValue('--x'), '30');
-    }, 'getComputedStyle when ancestor is display:none');
-  </script>
-
-  <!-- Container is display:none -->
-  <div class="container none">
-    <div>
-      <div>
-        <div class="target" id=target4></div>
-      </div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target4);
-      assert_equals(s.getPropertyValue('--x'), '');
-    }, 'getComputedStyle when container is display:none');
-  </script>
-
-  <!-- Target element is display:none in nested container -->
-  <div class="container big">
-    <div>
-      <div>
-        <div class="container">
-          <div>
-            <div>
-              <div class="target none" id=target5></div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target5);
-      assert_equals(s.getPropertyValue('--x'), '30');
-    }, 'getComputedStyle when element in nested container is display:none');
-  </script>
-
-  <!-- Inner container is display:none -->
-  <div class="container big">
-    <div>
-      <div>
-        <div class="container none">
-          <div>
-            <div>
-              <div class="target" id=target6></div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target6);
-      assert_equals(s.getPropertyValue('--x'), '');
-    }, 'getComputedStyle when inner container is display:none');
-  </script>
-
-  <!-- Intermediate ancestor is display:none -->
-  <div class="container big">
-    <div class="none">
-      <div>
-        <div class="container">
-          <div>
-            <div>
-              <div class="target" id=target7></div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target7);
-      assert_equals(s.getPropertyValue('--x'), '');
-    }, 'getComputedStyle when intermediate ancestor is display:none');
-  </script>
-
-  <!-- Outer container is display:none -->
-  <div class="container big none">
-    <div>
-      <div>
-        <div class="container">
-          <div>
-            <div>
-              <div class="target" id=target8></div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target8);
-      assert_equals(s.getPropertyValue('--x'), '');
-    }, 'getComputedStyle when outer container is display:none');
-  </script>
-
-  <!-- Nothing is display:none initially, but target becomes display:none -->
-  <div class="container">
-    <div>
-      <div>
-        <div class="target" id=target9></div>
-      </div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target9);
-      assert_equals(s.getPropertyValue('--x'), '30');
-      target9.classList.add('none');
-      assert_equals(s.getPropertyValue('--x'), '30');
-    }, 'getComputedStyle when element becomes display:none');
-  </script>
-
-  <!-- Nothing is display:none initially, but parent becomes display:none -->
-  <div class="container">
-    <div>
-      <div id=parent10>
-        <div class="target" id=target10></div>
-      </div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target10);
-      assert_equals(s.getPropertyValue('--x'), '30');
-      parent10.classList.add('none');
-      assert_equals(s.getPropertyValue('--x'), '30');
-    }, 'getComputedStyle when parent becomes display:none');
-  </script>
-
-  <!-- Nothing is display:none initially, but ancestor becomes display:none -->
-  <div class="container">
-    <div id=ancestor11>
-      <div>
-        <div class="target" id=target11></div>
-      </div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target11);
-      assert_equals(s.getPropertyValue('--x'), '30');
-      ancestor11.classList.add('none');
-      assert_equals(s.getPropertyValue('--x'), '30');
-    }, 'getComputedStyle when ancestor becomes display:none');
-  </script>
-
-  <!-- Nothing is display:none initially, but container becomes display:none -->
-  <div class="container" id=container12>
-    <div>
-      <div>
-        <div class="target" id=target12></div>
-      </div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target12);
-      assert_equals(s.getPropertyValue('--x'), '30');
-      container12.classList.add('none');
-      assert_equals(s.getPropertyValue('--x'), '');
-    }, 'getComputedStyle when container becomes display:none');
-  </script>
-
-  <!-- Intermediate container becomes display:none -->
-  <div class="container big">
-    <div>
-      <div>
-        <div class="container" id=container13>
-          <div>
-            <div>
-              <div class="target" id=target13></div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target13);
-      assert_equals(s.getPropertyValue('--x'), '30');
-      container13.classList.add('none');
-      assert_equals(s.getPropertyValue('--x'), '');
-    }, 'getComputedStyle when intermediate container becomes display:none');
-  </script>
-
-  <!-- Pseudo-element is display:none -->
-  <div class="container">
-    <div>
-      <div>
-        <div class="target pseudo_none" id=target14></div>
-      </div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target14, '::before');
-      assert_equals(s.getPropertyValue('content'), '"foo"');
-      assert_equals(s.getPropertyValue('--x'), '30');
-    }, 'getComputedStyle when ::before is display:none');
-  </script>
-
-  <!-- Pseudo-element with display:none originating element -->
-  <div class="container">
-    <div>
-      <div>
-        <div class="target pseudo none" id=target15></div>
-      </div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target15, '::before');
-      assert_equals(s.getPropertyValue('content'), '"foo"');
-      assert_equals(s.getPropertyValue('--x'), '30');
-    }, 'getComputedStyle when originating element is display:none');
-  </script>
-
-  <!-- Pseudo-element with display:none ancestor -->
-  <div class="container">
-    <div class="none">
-      <div>
-        <div class="target pseudo" id=target16></div>
-      </div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target16, '::before');
-      assert_equals(s.getPropertyValue('content'), '"foo"');
-      assert_equals(s.getPropertyValue('--x'), '30');
-    }, 'getComputedStyle on ::before when ancestor element is display:none');
-  </script>
-
-  <!-- Pseudo-element with in display:none container -->
-  <div class="container none">
-    <div>
-      <div>
-        <div class="target pseudo" id=target17></div>
-      </div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target17, '::before');
-      assert_equals(s.getPropertyValue('content'), '"foo"');
-      assert_equals(s.getPropertyValue('--x'), '');
-    }, 'getComputedStyle on ::before when container is display:none');
-  </script>
-
-</main>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-008.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-008.html
deleted file mode 100644
index 7880db8..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-008.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html>
-<title>Basic named @container</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  div {
-    color: black;
-  }
-  #container1 {
-    container-name: c1;
-    container-type: inline-size;
-    width: 400px;
-  }
-  #container2 {
-    container-name: c2;
-    container-type: inline-size;
-    width: 300px;
-  }
-  #container3 {
-    container-name: c3;
-    container-type: inline-size;
-    width: 200px;
-  }
-
-  @container size(width: 200px) { #unnamed .w200 { color:green; } }
-  @container size(width: 300px) { #unnamed .w300 { color:red !important; } }
-  @container size(width: 400px) { #unnamed .w400 { color:red !important; } }
-
-  @container c3 size(width: 200px) { #q3 .w200 { color:green; } }
-  @container c3 size(width: 300px) { #q3 .w300 { color:red !important; } }
-  @container c3 size(width: 400px) { #q3 .w400 { color:red !important; } }
-
-  @container c2 size(width: 200px) { #q2 .w200 { color:red !important; } }
-  @container c2 size(width: 300px) { #q2 .w300 { color:green; } }
-  @container c2 size(width: 400px) { #q2 .w400 { color:red !important; } }
-
-  @container c1 size(width: 200px) { #q1 .w200 { color:red !important; } }
-  @container c1 size(width: 300px) { #q1 .w300 { color:red !important; } }
-  @container c1 size(width: 400px) { #q1 .w400 { color:green; } }
-
-</style>
-<div id=container1>
-  <div id=container2>
-    <div id=container3>
-      <div id=unnamed>
-        <div class=w200>unnamed, w200</div>
-        <div class=w300>unnamed, w300</div>
-        <div class=w400>unnamed, w400</div>
-      </div>
-      <div id=q3>
-        <div class=w200>c3, w200</div>
-        <div class=w300>c3, w300</div>
-        <div class=w400>c3, w400</div>
-      </div>
-      <div id=q2>
-        <div class=w200>c2, w200</div>
-        <div class=w300>c2, w300</div>
-        <div class=w400>c2, w400</div>
-      </div>
-      <div id=q1>
-        <div class=w200>c1, w200</div>
-        <div class=w300>c1, w300</div>
-        <div class=w400>c1, w400</div>
-      </div>
-    </div>
-  </div>
-</div>
-<script>
-  function computedColor(selector) {
-    return getComputedStyle(document.querySelector(selector)).color;
-  }
-
-  test(function() {
-    assert_equals(computedColor('#unnamed > .w200'), 'rgb(0, 128, 0)');
-    assert_equals(computedColor('#unnamed > .w300'), 'rgb(0, 0, 0)');
-    assert_equals(computedColor('#unnamed > .w400'), 'rgb(0, 0, 0)');
-  }, 'Querying nearest (unnamed) container');
-
-  test(function() {
-    assert_equals(computedColor('#q3 > .w200'), 'rgb(0, 128, 0)');
-    assert_equals(computedColor('#q3 > .w300'), 'rgb(0, 0, 0)');
-    assert_equals(computedColor('#q3 > .w400'), 'rgb(0, 0, 0)');
-  }, 'Querying nearest container by name');
-
-  test(function() {
-    assert_equals(computedColor('#q2 > .w200'), 'rgb(0, 0, 0)');
-    assert_equals(computedColor('#q2 > .w300'), 'rgb(0, 128, 0)');
-    assert_equals(computedColor('#q2 > .w400'), 'rgb(0, 0, 0)');
-  }, 'Querying intermediate container by name');
-
-  test(function() {
-    assert_equals(computedColor('#q1 > .w200'), 'rgb(0, 0, 0)');
-    assert_equals(computedColor('#q1 > .w300'), 'rgb(0, 0, 0)');
-    assert_equals(computedColor('#q1 > .w400'), 'rgb(0, 128, 0)');
-  }, 'Querying topmost container by name');
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-009.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-009.html
deleted file mode 100644
index 9696c183..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-009.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE html>
-<title>container-name invalidation</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  div {
-    color: black;
-  }
-  #outer {
-    container-name: c1;
-    container-type: inline-size;
-    width: 300px;
-  }
-
-  #inner {
-    container-name: c2;
-    container-type: inline-size;
-    width: 200px;
-  }
-
-  #intermediate {
-    width: 250px;
-  }
-
-  @container c1 size(width: 250px) {
-    #child {
-      color: green;
-    }
-  }
-</style>
-<div id=outer>
-  <div id=intermediate>
-    <div id=inner>
-      <div id=child>Test</div>
-    </div>
-  </div>
-</div>
-<script>
-  test(function(t) {
-    t.add_cleanup(() => { outer.style = ''; });
-
-    assert_equals(getComputedStyle(child).color, 'rgb(0, 0, 0)');
-
-    outer.style.width = '250px';
-    assert_equals(getComputedStyle(child).color, 'rgb(0, 128, 0)');
-
-    outer.style.width = '251px';
-    assert_equals(getComputedStyle(child).color, 'rgb(0, 0, 0)');
-  }, 'Changing a named container invalidates relevant descendants');
-
-  test(function(t) {
-    t.add_cleanup(() => {
-      outer.style = '';
-      intermediate.style = '';
-    });
-
-    assert_equals(getComputedStyle(child).color, 'rgb(0, 0, 0)');
-
-    // #intermediate becomes the new container.
-    intermediate.style = 'container-name:c1; container-type:inline-size';
-    assert_equals(getComputedStyle(child).color, 'rgb(0, 128, 0)');
-
-    // #outer becomes the container again.
-    intermediate.style = '';
-    assert_equals(getComputedStyle(child).color, 'rgb(0, 0, 0)');
-
-    outer.style.width = '250px';
-    assert_equals(getComputedStyle(child).color, 'rgb(0, 128, 0)');
-  }, 'Changing container-name invalidates relevant descendants');
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-010.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-010.html
deleted file mode 100644
index 562121f..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-010.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<title>container-name does not establish a container</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  div {
-    color: black;
-  }
-
-  #outer {
-    container-name: c1;
-    container-type: inline-size;
-    width: 300px;
-  }
-
-  #inner {
-    container-name: c1;
-    width: 200px;
-  }
-
-  @container c1 size(min-width: 300px) {
-    #child { color: green; }
-  }
-
-</style>
-<div id=outer>
-  <div id=inner>
-    <div id=child>Test</div>
-  </div>
-</div>
-<script>
-  test(function(t) {
-    assert_equals(getComputedStyle(child).color, 'rgb(0, 128, 0)');
-  }, 'container-name does not establish a container');
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-011.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-011.html
deleted file mode 100644
index cec6918..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-011.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<title>container-type invalidation</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  div {
-    color: black;
-  }
-  #outer {
-    width: 300px;
-  }
-
-  #intermediate {
-    width: 250px;
-  }
-
-  #inner {
-    width: 200px;
-  }
-
-  .container {
-    container-type: inline-size;
-  }
-
-  @container size((max-width: 200px) or (min-width: 300px)) {
-    #child { color: green; }
-  }
-
-</style>
-<div id=outer>
-  <div id=intermediate>
-    <div id=inner>
-      <div id=child>Test</div>
-    </div>
-  </div>
-</div>
-<script>
-  test(function(t) {
-    t.add_cleanup(() => {
-      for (let e of [outer, intermediate, inner])
-        e.classList.remove('container');
-    });
-
-    // No container.
-    assert_equals(getComputedStyle(child).color, 'rgb(0, 0, 0)');
-
-    outer.classList.add('container');
-    assert_equals(getComputedStyle(child).color, 'rgb(0, 128, 0)');
-
-    // The container query does not match widths in the range [201, 299],
-    // and #intermediate has width:250px.
-    intermediate.classList.add('container');
-    assert_equals(getComputedStyle(child).color, 'rgb(0, 0, 0)');
-
-    inner.classList.add('container');
-    assert_equals(getComputedStyle(child).color, 'rgb(0, 128, 0)');
-
-    // Should have no effect, #inner is the container.
-    outer.classList.remove('container');
-    intermediate.classList.remove('container');
-    assert_equals(getComputedStyle(child).color, 'rgb(0, 128, 0)');
-
-    inner.classList.remove('container');
-    assert_equals(getComputedStyle(child).color, 'rgb(0, 0, 0)');
-  }, 'Changing the container type invalidates relevant descendants');
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-012.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-012.html
deleted file mode 100644
index 4ea2bfa..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-012.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<title>container-type layout invalidation</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  #div {
-    width: fit-content;
-  }
-</style>
-<div id=div>
-  content
-</div>
-<script>
-  test(function(t) {
-    t.add_cleanup(() => { div.style = ''; });
-
-    assert_greater_than(div.offsetWidth, 0);
-    assert_greater_than(div.offsetHeight, 0);
-
-    div.style.containerType = 'size';
-
-    assert_equals(div.offsetWidth, 0);
-    assert_equals(div.offsetHeight, 0);
-  }, 'Changing container-type invalidates layout');
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-013.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-013.html
deleted file mode 100644
index 4a8998b..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-013.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<title>Containers ineligible for containment</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  #outer, #inner1, #inner2 {
-    width: 200px;
-    container-type: inline-size;
-  }
-  #inner1 {
-    display: table;
-  }
-  p {
-    color: green;
-  }
-  @container size(min-width: 1px) {
-    p { color: red; }
-  }
-</style>
-<div id=outer>
-  <div id=inner1>
-    <p id=p1>Test1</p>
-  </div>
-  <div id=inner2>
-    <p id=p2>Test1</p>
-  </div>
-</main>
-<script>
-
-  test(function(t) {
-    // #inner1 is the container, but it does not satisfy the containment
-    // requirements, hence the query should fail.
-    assert_equals(getComputedStyle(p1).color, 'rgb(0, 128, 0)');
-  }, 'Container ineligible for containment');
-
-  test(function(t) {
-    t.add_cleanup(() => { inner2.style = ''; });
-
-    assert_equals(getComputedStyle(p2).color, 'rgb(255, 0, 0)');
-
-    inner2.style = 'display:table';
-
-    // #inner2 is still the container, but it no longer satisfies the
-    // containment requirements.
-    assert_equals(getComputedStyle(p2).color, 'rgb(0, 128, 0)');
-  }, 'Changing containment eligibility invalidates style');
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-014.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-014.html
deleted file mode 100644
index 9490e49..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-014.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html>
-<title>@container and display:contents</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  .container {
-    container-type: inline-size;
-    width: 30px;
-    height: 30px;
-    background: tomato;
-  }
-  .big {
-    width: 50px;
-    height: 50px;
-    background: skyblue;
-  }
-  .contents {
-    display: none;
-  }
-
-  @container size(width: 30px) {
-    .target { --x:30; }
-  }
-
-  @container size(width: 50px) {
-    .target { --x:50; }
-  }
-
-  main {
-    display: flex;
-    flex-wrap: wrap;
-  }
-
-</style>
-
-<main>
-  <!-- Container is display:contents -->
-  <div class="container contents">
-    <div>
-      <div class="target" id=target1></div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target1);
-      assert_equals(s.getPropertyValue('--x'), '');
-    }, 'getComputedStyle when container is display:contents');
-  </script>
-
-  <!-- Container becomes display:contents -->
-  <div id=container2 class="container">
-    <div>
-      <div class="target" id=target2></div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target2);
-      assert_equals(s.getPropertyValue('--x'), '30');
-      container2.classList.add('contents');
-      assert_equals(s.getPropertyValue('--x'), '');
-      container2.classList.remove('contents');
-      assert_equals(s.getPropertyValue('--x'), '30');
-    }, 'getComputedStyle when container becomes display:contents');
-  </script>
-
-  <!-- Intermediate container becomes display:contents -->
-  <div class="container">
-    <div>
-      <div id=container3 class="container">
-        <div>
-          <div class="target" id=target3></div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <script>
-    test(function() {
-      let s = getComputedStyle(target3);
-      assert_equals(s.getPropertyValue('--x'), '30');
-      container3.classList.add('contents');
-      assert_equals(s.getPropertyValue('--x'), '');
-      container3.classList.remove('contents');
-      assert_equals(s.getPropertyValue('--x'), '30');
-    }, 'getComputedStyle when intermediate container becomes display:contents');
-  </script>
-</main>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-015.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-015.html
deleted file mode 100644
index d5ec18e..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/at-container-015.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<title>Conditionally removing container status</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  .parent { width: 300px; }
-  .child { width: 100px; }
-  .parent, .child { container-type: inline-size; }
-  @container size(min-width: 200px) {
-    .child { container-type: initial; }
-    .grandchild { border: 3px solid green }
-  }
-</style>
-<div class="parent">
-  <div class="child">
-    <div class="grandchild">You should see a green border around this text</div>
-  </div>
-</div>
-<script>
-  test(function() {
-    let s = getComputedStyle(document.querySelector('.grandchild'));
-    assert_equals(s.getPropertyValue('border-color'), 'rgb(0, 128, 0)');
-  }, 'Conditionally applying container-type:initial');
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/container-computed.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/container-computed.html
deleted file mode 100644
index 80ea12d..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/container-computed.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<title>Computed values of container</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/computed-testcommon.js"></script>
-<div id="target"></div>
-<script>
-test_computed_value('container', 'initial', 'none');
-test_computed_value('container', 'inherit', 'none');
-test_computed_value('container', 'unset', 'none');
-test_computed_value('container', 'inline-size');
-test_computed_value('container', 'block-size');
-test_computed_value('container', 'size');
-test_computed_value('container', 'inline-size / inline-size');
-test_computed_value('container', 'block-size / block-size');
-test_computed_value('container', 'size / block-size');
-
-test_computed_value('container', 'inline-size / foo');
-test_computed_value('container', 'inline-size /foo', 'inline-size / foo');
-test_computed_value('container', 'inline-size/ foo', 'inline-size / foo');
-test_computed_value('container', 'inline-size/foo', 'inline-size / foo');
-test_computed_value('container', 'size / FoO', 'size / FoO');
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/container-name-computed.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/container-name-computed.html
deleted file mode 100644
index e725ee2..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/container-name-computed.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<title>Computed values of container-name</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/computed-testcommon.js"></script>
-<style>
-  #outer { container-name: foo; }
-</style>
-<div id="outer">
-  <div id="target"></div>
-  <div id="target2"></div>
-</div>
-<script>
-test_computed_value('container-name', 'initial', 'none');
-test_computed_value('container-name', 'inherit', 'foo');
-test_computed_value('container-name', 'unset', 'none');
-test_computed_value('container-name', 'foo');
-test_computed_value('container-name', 'FoO');
-
-test(() => {
-  assert_equals(getComputedStyle(outer).containerName, 'foo');
-  assert_equals(getComputedStyle(target2).containerName, 'none');
-}, 'container-type is not inherited');
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/container-name-parsing.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/container-name-parsing.html
deleted file mode 100644
index 82e8391..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/container-name-parsing.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<title>Parsing of container-name</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-<div id="target"></div>
-<script>
-test_valid_value('container-name', 'initial');
-test_valid_value('container-name', 'inherit');
-test_valid_value('container-name', 'unset');
-test_valid_value('container-name', 'revert');
-test_valid_value('container-name', 'none');
-test_valid_value('container-name', 'foo');
-test_valid_value('container-name', 'BAR');
-
-test_invalid_value('container-name', 'none none');
-test_invalid_value('container-name', 'foo bar');
-test_invalid_value('container-name', '"foo"');
-test_invalid_value('container-name', 'foo, bar');
-test_invalid_value('container-name', '#fff');
-test_invalid_value('container-name', '1px');
-test_invalid_value('container-name', 'default'); /* reserved */
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/container-parsing.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/container-parsing.html
deleted file mode 100644
index 851e1e6..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/container-parsing.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<title>Parsing of container</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-<div id="target"></div>
-<script>
-test_valid_value('container', 'initial');
-test_valid_value('container', 'inherit');
-test_valid_value('container', 'unset');
-test_valid_value('container', 'revert');
-test_valid_value('container', 'none');
-test_valid_value('container', 'none / none', 'none');
-test_valid_value('container', 'inline-size');
-test_valid_value('container', 'inline-size / none', 'inline-size');
-test_valid_value('container', 'block-size');
-test_valid_value('container', 'size');
-test_valid_value('container', 'block-size / name');
-test_valid_value('container', 'block-size /  NAME', 'block-size / NAME');
-test_valid_value('container', 'block-size/NAME','block-size / NAME');
-test_valid_value('container', 'inline-size / inline-size');
-test_valid_value('container', 'block-size / block-size');
-test_valid_value('container', 'size / size');
-test_valid_value('container', 'size / block-size');
-
-test_invalid_value('container', 'none none');
-test_invalid_value('container', 'none inline-size');
-test_invalid_value('container', 'inline-size none');
-test_invalid_value('container', 'inline-size inline-size');
-test_invalid_value('container', 'inline-size block-size unknown');
-test_invalid_value('container', 'inline-size block-size');
-test_invalid_value('container', 'size block-size');
-test_invalid_value('container', 'none, none');
-test_invalid_value('container', 'foo');
-test_invalid_value('container', '"foo"');
-test_invalid_value('container', 'foo, bar');
-test_invalid_value('container', '#fff');
-test_invalid_value('container', '1px');
-test_invalid_value('container', 'default');
-test_invalid_value('container', 'inline-size / 10px');
-test_invalid_value('container', 'inline-size / #fefefe');
-test_invalid_value('container', 'inline-size / calc(3px)');
-test_invalid_value('container', 'size 1 / name');
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/container-type-computed.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/container-type-computed.html
deleted file mode 100644
index 77d110d..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/container-type-computed.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<title>Computed values of container-type</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/computed-testcommon.js"></script>
-<style>
-  #outer { container-type: inline-size; }
-</style>
-<div id="outer">
-  <div id="target"></div>
-  <div id="target2"></div>
-</div>
-<script>
-test_computed_value('container-type', 'initial', 'none');
-test_computed_value('container-type', 'inherit', 'inline-size');
-test_computed_value('container-type', 'unset', 'none');
-test_computed_value('container-type', 'inline-size');
-test_computed_value('container-type', 'block-size');
-test_computed_value('container-type', 'size');
-
-test(() => {
-  assert_equals(getComputedStyle(outer).containerType, 'inline-size');
-  assert_equals(getComputedStyle(target2).containerType, 'none');
-}, 'container-type is not inherited');
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/container-type-parsing.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/container-type-parsing.html
deleted file mode 100644
index 5d5cddb..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/container-type-parsing.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<title>Parsing of container-type</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-<div id="target"></div>
-<script>
-test_valid_value('container-type', 'initial');
-test_valid_value('container-type', 'inherit');
-test_valid_value('container-type', 'unset');
-test_valid_value('container-type', 'revert');
-test_valid_value('container-type', 'none');
-test_valid_value('container-type', 'inline-size');
-test_valid_value('container-type', 'block-size');
-test_valid_value('container-type', 'size');
-
-test_invalid_value('container-type', 'none none');
-test_invalid_value('container-type', 'none inline-size');
-test_invalid_value('container-type', 'inline-size none');
-test_invalid_value('container-type', 'inline-size inline-size');
-test_invalid_value('container-type', 'inline-size block-size');
-test_invalid_value('container-type', 'block-size inline-size');
-test_invalid_value('container-type', 'size inline-size');
-test_invalid_value('container-type', 'inline-size size');
-test_invalid_value('container-type', 'none, none');
-test_invalid_value('container-type', 'foo');
-test_invalid_value('container-type', '"foo"');
-test_invalid_value('container-type', 'foo, bar');
-test_invalid_value('container-type', '#fff');
-test_invalid_value('container-type', '1px');
-test_invalid_value('container-type', 'default');
-test_invalid_value('container-type', 'size nonsense');
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/focus-inside-content-visibility-crash.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/focus-inside-content-visibility-crash.html
deleted file mode 100644
index b5f7888..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/focus-inside-content-visibility-crash.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!doctype html>
-
-<title>Container Queries - CQ size change detected while focusing inside content-visibility: auto container</title>
-<link rel="help" href="https://drafts.csswg.org/css-contain-3/#container-queries">
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-
-<style>
-.spacer { height: 3000px; }
-.auto { content-visibility: auto; }
-#container {
-  border: 1px solid black;
-  width: 100px;
-  height: 100px;
-
-  container-type: size;
-}
-#input {
-  width: 100%;
-  visibility: hidden;
-}
-@container size(min-width: 150px) {
-  #input { visibility: visible; }
-}
-
-</style>
-
-
-<div class=spacer></div>
-<div class=auto>
-  <div id=container>
-    <input id=input type=text></input>
-  </div>
-</div>
-
-<script>
-function focus() {
-  container.style.width = "200px";
-  input.focus();
-}
-
-onload = () => requestAnimationFrame(() => requestAnimationFrame(focus));
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/orthogonal-wm-container-query.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/orthogonal-wm-container-query.html
deleted file mode 100644
index ae6708f..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/orthogonal-wm-container-query.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!doctype html>
-<title>Orthogonal writing-mode change in @container</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<link rel="stylesheet" href="/fonts/ahem.css">
-<style>
-  #container {
-    container-type: size;
-    width: 50vw;
-    height: 50vh;
-  }
-  #orthogonal {
-    font: 50px/1 Ahem;
-  }
-  @container size(max-width: 100px) {
-    #orthogonal {
-      writing-mode: vertical-lr;
-    }
-  }
-</style>
-<div id="container">
-  <div id="orthogonal">XX</div>
-</div>
-<script>
-  test(() => {
-    assert_equals(orthogonal.offsetWidth, container.offsetWidth);
-  }, "Initial non-orthogonal width");
-
-  test(() => {
-    container.style.width = "100px";
-    assert_equals(orthogonal.offsetWidth, 50);
-    assert_not_equals(orthogonal.offsetWidth, container.offsetWidth);
-  }, "Orthogonal width");
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/pseudo-container-crash.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/pseudo-container-crash.html
deleted file mode 100644
index d9c5139..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/pseudo-container-crash.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<title>Container Queries - No crash when ::after is a container</title>
-<style>
-  div::after {
-    container-type: size;
-    content: '';
-    display: block;
-  }
-</style>
-<div>
-  PASS if no crash
-</div>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/reattach-container-with-dirty-child.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/reattach-container-with-dirty-child.html
deleted file mode 100644
index b1af2ef..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/reattach-container-with-dirty-child.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!doctype html>
-<title>@container changing display type while descendant styles change</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  #container {
-    container-type: inline-size;
-  }
-  @container size(min-width: 200px) {
-    div { color: red }
-  }
-  @container size(max-width: 150px) {
-    div { color: lime }
-  }
-</style>
-<div id="container">
-  <div id="child"><span id="inner">XXX</span></div>
-</div>
-<script>
-  test(() => {
-    container.offsetTop;
-    assert_equals(getComputedStyle(child).color, "rgb(255, 0, 0)");
-  }, "Initially wider than 200px");
-
-  test(() => {
-    container.style.width = "100px";
-    container.style.display = "inline-block";
-    inner.style.color = "green";
-    container.offsetTop;
-    assert_equals(getComputedStyle(child).color, "rgb(0, 255, 0)");
-    assert_equals(getComputedStyle(inner).color, "rgb(0, 128, 0)");
-  }, "Container query changed and inner.style applied");
-</script>
diff --git a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/size-feature-evaluation.html b/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/size-feature-evaluation.html
deleted file mode 100644
index 10b9b21..0000000
--- a/third_party/blink/web_tests/wpt_internal/css/css-conditional/container-queries/size-feature-evaluation.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!doctype html>
-<title>Test evaluation of size features</title>
-<link rel="help" href="https://drafts.csswg.org/css-contain-3/#size-container">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<div id=container>
-  <div id=target>
-    Test
-  </div>
-</div>
-
-<script>
-
-function test_evaluation(container_class, query, expected) {
-  test(function(t) {
-    let style_node = document.createElement('style');
-    t.add_cleanup(() => {
-      container.classList.remove(container_class);
-      style_node.remove();
-    });
-    style_node.innerText = `@container ${query} { #target { --applied:true; } }`;
-
-    assert_equals(getComputedStyle(target).getPropertyValue('--applied'), '');
-    container.classList.add(container_class);
-    document.head.append(style_node);
-    assert_equals(getComputedStyle(target).getPropertyValue('--applied'), expected ? 'true' : '');
-  }, `${query} (.${container_class})`);
-}
-
-</script>
-
-<style>
-  .horizontal {
-    width: 100px;
-    height: 200px;
-    container-type: size;
-  }
-
-  .vertical {
-    width: 100px;
-    height: 200px;
-    container-type: size;
-    writing-mode: vertical-rl;
-  }
-</style>
-<script>
-
-  for (let cls of ['horizontal', 'vertical']) {
-
-    let logical_width = (cls == 'horizontal') ? 'inline' : 'block';
-    let logical_height = (cls == 'horizontal') ? 'block' : 'inline';
-
-    test_evaluation(cls, 'size(width < 100px)', false);
-    test_evaluation(cls, 'size(width >= 100px)', true);
-    test_evaluation(cls, 'size(min-width: 100px)', true);
-    test_evaluation(cls, 'size(min-width: 101px)', false);
-    test_evaluation(cls, 'size(max-width: 100px)', true);
-    test_evaluation(cls, 'size(max-width: 99px)', false);
-
-    test_evaluation(cls, 'size(height < 200px)', false);
-    test_evaluation(cls, 'size(height >= 200px)', true);
-    test_evaluation(cls, 'size(min-height: 200px)', true);
-    test_evaluation(cls, 'size(min-height: 201px)', false);
-    test_evaluation(cls, 'size(max-height: 200px)', true);
-    test_evaluation(cls, 'size(max-height: 199px)', false);
-
-    test_evaluation(cls, `size(${logical_width}-size < 100px)`, false);
-    test_evaluation(cls, `size(${logical_width}-size >= 100px)`, true);
-    test_evaluation(cls, `size(min-${logical_width}-size: 100px)`, true);
-    test_evaluation(cls, `size(min-${logical_width}-size: 101px)`, false);
-    test_evaluation(cls, `size(max-${logical_width}-size: 100px)`, true);
-    test_evaluation(cls, `size(max-${logical_width}-size: 99px)`, false);
-
-    test_evaluation(cls, `size(${logical_height}-size < 200px)`, false);
-    test_evaluation(cls, `size(${logical_height}-size >= 200px)`, true);
-    test_evaluation(cls, `size(min-${logical_height}-size: 200px)`, true);
-    test_evaluation(cls, `size(min-${logical_height}-size: 201px)`, false);
-    test_evaluation(cls, `size(max-${logical_height}-size: 200px)`, true);
-    test_evaluation(cls, `size(max-${logical_height}-size: 199px)`, false);
-
-    test_evaluation(cls, 'size(orientation: landscape)', false);
-    test_evaluation(cls, 'size(orientation: portrait)', true);
-  }
-
-</script>
diff --git a/tools/cfi/ignores.txt b/tools/cfi/ignores.txt
index 304c1ae..1e764e2 100644
--- a/tools/cfi/ignores.txt
+++ b/tools/cfi/ignores.txt
@@ -133,6 +133,7 @@
 ######### Cross-DSO icalls using dynamically resolved symbols crbug.com/771365
 
 # ANGLE
+src:*third_party/angle/src/common/vulkan/vulkan_icd.cpp
 src:*third_party/angle/src/libANGLE/*
 src:*third_party/angle/src/libEGL/*
 src:*third_party/angle/src/third_party/libXNVCtrl/NVCtrl.c
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index 7fd5a0b..02ed285 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -5112,6 +5112,20 @@
   <int value="4" label="Document destroyed"/>
 </enum>
 
+<enum name="AudioOutputDeviceMixerMixedPlaybackStatus">
+  <int value="0" label="Ok"/>
+  <int value="1" label="Failed to open rendering stream"/>
+  <int value="2" label="Error during rendering"/>
+</enum>
+
+<enum name="AudioOutputDeviceMixerStreamStatus">
+  <int value="0" label="Ok"/>
+  <int value="1" label="Failed to open independent rendering stream"/>
+  <int value="2" label="Error during independent rendering"/>
+  <int value="3" label="Failed to start mixed playback"/>
+  <int value="4" label="Error during mixed playback"/>
+</enum>
+
 <enum name="AudioOutputProxyStreamFormat">
   <int value="0" label="Bitstream"/>
   <int value="1" label="Linear PCM"/>
@@ -17495,6 +17509,15 @@
   <int value="1" label="Site marked as legitimate"/>
 </enum>
 
+<enum name="CreditCardSeamlessFill">
+  <int value="0" label=":-D Full fill"/>
+  <int value="1" label=":-) Optional name missing"/>
+  <int value="2" label=":-) Optional CVC missing"/>
+  <int value="3" label=":-) Optional name and CVC missing"/>
+  <int value="4" label=":-| Full fill but exp. date missing"/>
+  <int value="5" label=":-( Partial fill"/>
+</enum>
+
 <enum name="CreditCardUploadDisallowedNetwork">
   <int value="0" label="Elo card"/>
   <int value="1" label="JCB card"/>
@@ -24017,7 +24040,8 @@
   <int value="5" label="Failed to Generate a Response"/>
   <int value="6" label="Failed to Sign the Response"/>
   <int value="7" label="Failed to Serialize the Response"/>
-  <int value="8" label="Success"/>
+  <int value="8" label="Serialized Response is Empty"/>
+  <int value="9" label="Success"/>
 </enum>
 
 <enum name="DTLS_SRTPCryptoSuite">
@@ -41764,6 +41788,13 @@
              gpu_info.can_lose_context=True"/>
 </enum>
 
+<enum name="GridTabSwitcherMessageDisableReason">
+  <int value="0" label="Unknown"/>
+  <int value="1" label="User taps the primary button on message"/>
+  <int value="2" label="User dismisses the message"/>
+  <int value="3" label="User ignores the message many times"/>
+</enum>
+
 <enum name="GridTabSwitcherThumbnailFetchingResult">
   <summary>The result of thumbnail fetching in the Grid Tab Switcher.</summary>
   <int value="0" label="Got JPEG thumbnail"/>
@@ -57620,7 +57651,6 @@
   <int value="21" label="AutoDarkWebContents"/>
   <int value="22" label="TestMessage"/>
   <int value="23" label="TailoredSecurityEnabled"/>
-  <int value="24" label="VrServicesUpgrade"/>
 </enum>
 
 <enum name="MessageLoopProblems">
diff --git a/tools/metrics/histograms/metadata/METRIC_REVIEWER_OWNERS b/tools/metrics/histograms/metadata/METRIC_REVIEWER_OWNERS
index 3c81e49..6cd93aeb 100644
--- a/tools/metrics/histograms/metadata/METRIC_REVIEWER_OWNERS
+++ b/tools/metrics/histograms/metadata/METRIC_REVIEWER_OWNERS
@@ -39,6 +39,7 @@
 kron@chromium.org
 lizeb@chromium.org
 lyf@chromium.org
+maxlg@chromium.org
 mcrouse@chromium.org
 mhasank@chromium.org
 mlippautz@chromium.org
diff --git a/tools/metrics/histograms/metadata/android/histograms.xml b/tools/metrics/histograms/metadata/android/histograms.xml
index 091d8b08..ba1b3d0 100644
--- a/tools/metrics/histograms/metadata/android/histograms.xml
+++ b/tools/metrics/histograms/metadata/android/histograms.xml
@@ -102,7 +102,6 @@
   <variant name=".SyncError"/>
   <variant name=".TailoredSecurityEnabled"/>
   <variant name=".UpdatePassword"/>
-  <variant name=".VrServicesUpgrade"/>
 </variants>
 
 <variants name="ProviderPermissionType">
diff --git a/tools/metrics/histograms/metadata/autofill/histograms.xml b/tools/metrics/histograms/metadata/autofill/histograms.xml
index 9da45c5..2afcbd41 100644
--- a/tools/metrics/histograms/metadata/autofill/histograms.xml
+++ b/tools/metrics/histograms/metadata/autofill/histograms.xml
@@ -809,6 +809,49 @@
   </summary>
 </histogram>
 
+<histogram name="Autofill.CreditCard.NumberFills" units="NumberFills"
+    expires_after="2022-10-31">
+  <owner>schwering@google.com</owner>
+  <owner>chrome-autofill-alerts@google.com</owner>
+  <summary>
+    Records for each credit card form submission whether a credit card number
+    has been autofilled.
+
+    That is, emits 1 if a form contains an autofilled credit card number.
+  </summary>
+</histogram>
+
+<histogram name="Autofill.CreditCard.SeamlessFills"
+    enum="CreditCardSeamlessFill" expires_after="2022-10-31">
+  <owner>schwering@google.com</owner>
+  <owner>chrome-autofill-alerts@google.com</owner>
+  <summary>
+    Records for each credit card form submission the quality of the fill.
+
+    The fields in question are: cardholder name (full, or first and last),
+    credit card number, expiration date (MM/YY, MM/YYYY, MM and YY, or MM and
+    YYYY), and CVC.
+
+    Each bucket represents a minimal set of fields that must be autofilled.
+    Lower numbers are better:
+
+    Bucket 0 = name &amp; number &amp; exp. date &amp; CVC = Full fill :-D
+
+    Bucket 1 = number &amp; exp. date &amp; CVC = Optional name missing :-)
+
+    Bucket 2 = name &amp; number &amp; exp. date = Optional CVC missing :-)
+
+    Bucket 3 = number &amp; exp. date = Optional name and CVC missing :-)
+
+    Bucket 4 = name &amp; number &amp; CVC = Full fill but exp. date missing :-|
+
+    Bucket 5 = all other scenarios = Partial fill :-(
+
+    Any form that contains at least one credit card field counts as credit card
+    form.
+  </summary>
+</histogram>
+
 <histogram name="Autofill.CreditCardFillingInfoBar"
     enum="AutofillCreditCardInfoBar" expires_after="2022-12-12">
   <owner>battre@chromium.org</owner>
@@ -1551,6 +1594,54 @@
   </summary>
 </histogram>
 
+<histogram name="Autofill.Iframes.NumberOfFramesWithAutofilledCreditCardFields"
+    units="frames" expires_after="2022-10-31">
+  <owner>schwering@google.com</owner>
+  <owner>chrome-autofill-alerts@google.com</owner>
+  <summary>
+    Counts per form submission the number of frames across which the form's
+    autofilled credit card fields are distributed.
+
+    A field is an &quot;autofilled credit card field&quot; if it is autofilled
+    at submission time and its field type belongs to the credit card group.
+
+    For example, emits 1 if all fields are in the same frame, and emits 2 if the
+    fields live in two different frames. Never emits 0.
+  </summary>
+</histogram>
+
+<histogram name="Autofill.Iframes.NumberOfFramesWithDetectedCreditCardFields"
+    units="frames" expires_after="2022-10-31">
+  <owner>schwering@google.com</owner>
+  <owner>chrome-autofill-alerts@google.com</owner>
+  <summary>
+    Counts per form submission the number of frames across which the form's
+    detected credit card fields are distributed.
+
+    A field is a &quot;detected credit card field&quot; if its field type
+    belongs to the credit card group.
+
+    For example, emits 1 if all fields are in the same frame, and emits 2 if the
+    fields live in two different frames. Never emits 0.
+  </summary>
+</histogram>
+
+<histogram name="Autofill.Iframes.NumberOfFramesWithDetectedFields"
+    units="frames" expires_after="2022-10-31">
+  <owner>schwering@google.com</owner>
+  <owner>chrome-autofill-alerts@google.com</owner>
+  <summary>
+    Counts per form submission the number of frames across which the form's
+    detected fields are distributed.
+
+    A field is &quot;detected&quot; if its field type is neither EMPTY_TYPE or
+    UNKNOWN_TYPE.
+
+    For example, emits 1 if all fields are in the same frame, and emits 2 if the
+    fields live in two different frames. Never emits 0.
+  </summary>
+</histogram>
+
 <histogram name="Autofill.ImageFetcher.RequestLatency" units="ms"
     expires_after="2022-07-01">
   <owner>vishwasuppoor@chromium.org</owner>
diff --git a/tools/metrics/histograms/metadata/commerce/histograms.xml b/tools/metrics/histograms/metadata/commerce/histograms.xml
index 3e42972..b551c21 100644
--- a/tools/metrics/histograms/metadata/commerce/histograms.xml
+++ b/tools/metrics/histograms/metadata/commerce/histograms.xml
@@ -169,8 +169,9 @@
   <owner>chrome-shopping@google.com</owner>
   <summary>
     Records whether the price drop notification channel is blocked by users.
-    Recorded when we try to initialize commerce subscriptions. Implemented for
-    Android.
+    Recorded when we initialize commerce subscriptions (For eligible users, we
+    initialize subscriptions when Chrome becomes foreground app but at most once
+    in a one-day moving window). Implemented for Android.
   </summary>
 </histogram>
 
@@ -180,7 +181,9 @@
   <owner>chrome-shopping@google.com</owner>
   <summary>
     Records whether the price drop notification channel is created. Recorded
-    when we try to initialize commerce subscriptions. Implemented for Android.
+    when we initialize commerce subscriptions (For eligible users, we initialize
+    subscriptions when Chrome becomes foreground app but at most once in a
+    one-day moving window). Implemented for Android.
   </summary>
 </histogram>
 
@@ -190,7 +193,9 @@
   <owner>chrome-shopping@google.com</owner>
   <summary>
     Records whether the system notification is enabled by users. Recorded when
-    we try to initialize commerce subscriptions. Implemented for Android.
+    we initialize commerce subscriptions (For eligible users, we initialize
+    subscriptions when Chrome becomes foreground app but at most once in a
+    one-day moving window). Implemented for Android.
   </summary>
 </histogram>
 
@@ -243,6 +248,20 @@
   <token key="TabUsageStatus" variants="TabUsageStatuses"/>
 </histogram>
 
+<histogram name="Commerce.Subscriptions.TabEligible" enum="Boolean"
+    expires_after="2022-06-01">
+  <owner>zhiyuancai@chromium.org</owner>
+  <owner>ayman@chromium.org</owner>
+  <owner>chrome-shopping@google.com</owner>
+  <summary>
+    Records whether a tab is eligible for commerce subscriptions. True when the
+    tab has offer and the tab is stale (Last opened time between 1 and 90 days).
+    Recorded when we initialize commerce subscriptions (For eligible users, we
+    initialize subscriptions when Chrome becomes foreground app but at most once
+    in a one-day moving window). Implemented for Android.
+  </summary>
+</histogram>
+
 </histograms>
 
 </histogram-configuration>
diff --git a/tools/metrics/histograms/metadata/media/histograms.xml b/tools/metrics/histograms/metadata/media/histograms.xml
index 402e140..6a932a6e 100644
--- a/tools/metrics/histograms/metadata/media/histograms.xml
+++ b/tools/metrics/histograms/metadata/media/histograms.xml
@@ -689,6 +689,16 @@
   </summary>
 </histogram>
 
+<histogram name="Media.Audio.OutputDeviceMixer.MixedPlaybackStatus"
+    enum="AudioOutputDeviceMixerMixedPlaybackStatus" expires_after="2022-10-04">
+  <owner>olka@chromium.org</owner>
+  <owner>tguilbert@chromium.org</owner>
+  <summary>
+    Health status of the mixed playback. Recorded when mixed playback stopped or
+    failed to start.
+  </summary>
+</histogram>
+
 <histogram name="Media.Audio.OutputDeviceMixer.MixingDuration" units="ms"
     expires_after="2022-10-04">
   <owner>olka@chromium.org</owner>
@@ -742,6 +752,16 @@
   </token>
 </histogram>
 
+<histogram name="Media.Audio.OutputDeviceMixer.StreamStatus"
+    enum="AudioOutputDeviceMixerStreamStatus" expires_after="2022-10-04">
+  <owner>olka@chromium.org</owner>
+  <owner>tguilbert@chromium.org</owner>
+  <summary>
+    Health status of each output stream managed by mixer. Recorded when the
+    stream is closed.
+  </summary>
+</histogram>
+
 <histogram name="Media.Audio.PhysicalProcessorsMac" units="units"
     expires_after="2021-07-01">
   <owner>henrika@chromium.org</owner>
diff --git a/tools/metrics/histograms/metadata/others/histograms.xml b/tools/metrics/histograms/metadata/others/histograms.xml
index 835b7ca..14eb171 100644
--- a/tools/metrics/histograms/metadata/others/histograms.xml
+++ b/tools/metrics/histograms/metadata/others/histograms.xml
@@ -44,6 +44,13 @@
   </variant>
 </variants>
 
+<variants name="GridTabSwitcherMessageTypes">
+  <variant name="PriceAlertsMessageCard"
+      summary="the promo message for price notifications"/>
+  <variant name="PriceWelcomeMessageCard"
+      summary="the message introducing price chips"/>
+</variants>
+
 <variants name="ProcessName">
   <variant name="BrowserProcess" summary=""/>
   <variant name="GPUProcess" summary=""/>
@@ -7589,6 +7596,19 @@
   </summary>
 </histogram>
 
+<histogram name="GridTabSwitcher.{MessageType}.DisableReason"
+    enum="GridTabSwitcherMessageDisableReason" expires_after="2022-06-07">
+  <owner>zhiyuancai@chromium.org</owner>
+  <owner>wychen@chromium.org</owner>
+  <owner>ayman@chromium.org</owner>
+  <summary>
+    Records why the {MessageType} is disabled in GridTabSwitcher and will no
+    longer be shown to users. Recorded when the message is disabled. Implemented
+    for Android.
+  </summary>
+  <token key="MessageType" variants="GridTabSwitcherMessageTypes"/>
+</histogram>
+
 <histogram name="GwpAsan.CrashAnalysisResult" enum="GwpAsanCrashAnalysisResult"
     expires_after="2020-05-17">
   <owner>vtsyrklevich@chromium.org</owner>
diff --git a/tools/metrics/histograms/metadata/payment/OWNERS b/tools/metrics/histograms/metadata/payment/OWNERS
index c39c5ef6..6cf5377 100644
--- a/tools/metrics/histograms/metadata/payment/OWNERS
+++ b/tools/metrics/histograms/metadata/payment/OWNERS
@@ -3,3 +3,4 @@
 # Prefer sending CLs to the owners listed below.
 # Use chromium-metrics-reviews@google.com as a backup.
 rouslan@chromium.org
+maxlg@chromium.org
diff --git a/tools/metrics/histograms/metadata/safe_browsing/histograms.xml b/tools/metrics/histograms/metadata/safe_browsing/histograms.xml
index 3c5d01ad..02473c201 100644
--- a/tools/metrics/histograms/metadata/safe_browsing/histograms.xml
+++ b/tools/metrics/histograms/metadata/safe_browsing/histograms.xml
@@ -1697,6 +1697,24 @@
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.RT.Response.VerdictType.{UserPopulation}"
+    enum="SafeBrowsingRTLookupResponseVerdictType" expires_after="2022-11-30">
+  <owner>zackhan@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    Logs the verdict type of the response from real time URL check from an
+    {UserPopulation} user. This histogram tells us whether EnhancedProtection
+    users are more likely to get dangerous verdicts as well as the average
+    number of Protego pings for EnhancedProtection users and
+    non-EnhancedProtection users.
+  </summary>
+  <token key="UserPopulation">
+    <variant name="EnhancedProtection" summary="Enhanced Protection"/>
+    <variant name="NotEnhancedProtection"
+        summary="Any Non-Enhanced Protection"/>
+  </token>
+</histogram>
+
 <histogram name="SafeBrowsing.RT.ThreatInfoSize" units="verdicts"
     expires_after="2022-04-17">
   <owner>xinghuilu@chromium.org</owner>
diff --git a/tools/metrics/histograms/metadata/v8/histograms.xml b/tools/metrics/histograms/metadata/v8/histograms.xml
index c3d1766..38bdd6b 100644
--- a/tools/metrics/histograms/metadata/v8/histograms.xml
+++ b/tools/metrics/histograms/metadata/v8/histograms.xml
@@ -1510,8 +1510,10 @@
   </summary>
 </histogram>
 
-<histogram name="V8.WasmAddressSpaceUsageMiB" units="MB"
-    expires_after="2022-02-15">
+<histogram name="V8.WasmAddressSpaceUsageMiB" units="MB" expires_after="M98">
+  <obsolete>
+    Received no values since M79.
+  </obsolete>
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>ahaas@chromium.org</owner>
diff --git a/tools/perf/core/perfetto_binary_roller/binary_deps.json b/tools/perf/core/perfetto_binary_roller/binary_deps.json
index 5b8eac3e..db43450 100644
--- a/tools/perf/core/perfetto_binary_roller/binary_deps.json
+++ b/tools/perf/core/perfetto_binary_roller/binary_deps.json
@@ -5,8 +5,8 @@
             "remote_path": "perfetto_binaries/trace_processor_shell/linux_arm/49b4b5dcbc312d8d2c3751cf29238b8efeb4e494/trace_processor_shell"
         },
         "win": {
-            "hash": "9405df9253ab4a871ff35fa75ad18727814a2f2e",
-            "remote_path": "perfetto_binaries/trace_processor_shell/win/4a9b683ccbbb7f1d3d16645671e960dae6a8a352/trace_processor_shell.exe"
+            "hash": "792e5be68d0bb83eb3fdc2988fc3c7fabede49d0",
+            "remote_path": "perfetto_binaries/trace_processor_shell/win/470f122ca67ec0d21a340e25755337fe55d93e23/trace_processor_shell.exe"
         },
         "mac": {
             "hash": "4a926d300d0f033f8228621e17025616e662f664",
@@ -17,8 +17,8 @@
             "remote_path": "perfetto_binaries/trace_processor_shell/linux_arm64/49b4b5dcbc312d8d2c3751cf29238b8efeb4e494/trace_processor_shell"
         },
         "linux": {
-            "hash": "df3fbde5f64bc02eac02cc4b745c21e879d68953",
-            "remote_path": "perfetto_binaries/trace_processor_shell/linux/4a9b683ccbbb7f1d3d16645671e960dae6a8a352/trace_processor_shell"
+            "hash": "808a2a2649fe7510cfc4af8f0eedb913dfdb5b29",
+            "remote_path": "perfetto_binaries/trace_processor_shell/linux/470f122ca67ec0d21a340e25755337fe55d93e23/trace_processor_shell"
         }
     },
     "power_profile.sql": {
diff --git a/ui/events/ozone/evdev/event_device_info.cc b/ui/events/ozone/evdev/event_device_info.cc
index 8e9ebadf..ddbc6c44 100644
--- a/ui/events/ozone/evdev/event_device_info.cc
+++ b/ui/events/ozone/evdev/event_device_info.cc
@@ -718,6 +718,7 @@
       {0x18d1, 0x5052},  // Google, Star PID (homestar)
       {0x18d1, 0x5056},  // Google, bland PID (mrbland)
       {0x18d1, 0x5057},  // Google, eel PID (wormdingler)
+      {0x18d1, 0x505B},  // Google, Duck PID (quackingstick)
       {0x1fd2, 0x8103},  // LG, Internal TouchScreen PID
   };
 
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
index 9ac6427c2..5750a270 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
@@ -147,7 +147,6 @@
 
 #if defined(OS_FUCHSIA)
   properties.enable_keyboard = true;
-  properties.enable_virtual_keyboard = true;
 #endif
 
   return properties;