Split virtual test suites with different args

Virtual test suites under the same prefix with different args are
confusing and error-prone. As we'll combine virtual test suite entries
with the same prefix/arg into one suite in crrev.com/c/1873504, this
CL prepares for that. See that CL for the future format of
VirtualTestSuites.

Bug: 1014162
Change-Id: I707c67f7a5be925fde7fb252b5f7ceec50edb6f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1876740
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Reviewed-by: Ian Kilpatrick <ikilpatrick@chromium.org>
Reviewed-by: Philip Rogers <pdr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709077}

third_party/blink/web_tests/ASANExpectations

@@ -49,10 +49,10 @@ crbug.com/438499 [ Linux ] http/tests/websocket/workers/worker-simple.html [ Tim
 crbug.com/438499 [ Linux ] http/tests/workers/text-encoding.html [ Timeout ]
 crbug.com/438499 [ Linux ] http/tests/devtools/profiler/heap-snapshot-loader.js [ Timeout ]
 crbug.com/438499 [ Linux ] http/tests/devtools/profiler/heap-snapshot-containment-show-all.js [ Timeout ]
-crbug.com/438499 [ Linux ] virtual/threaded/animations/unanimated-style.html [ Timeout ]
+crbug.com/438499 [ Linux ] virtual/threaded-no-composited-antialiasing/animations/unanimated-style.html [ Timeout ]
 
 # Flakily timeout on Linux ASAN bots.
-crbug.com/243871 [ Linux ] virtual/threaded/fast/scroll-behavior/ [ Skip ]
+crbug.com/243871 [ Linux ] virtual/threaded-prefer-compositing/fast/scroll-behavior/ [ Skip ]
 crbug.com/464065 [ Linux ] media/track/css-cue-for-video-in-shadow.html [ Timeout ]
 crbug.com/464065 [ Linux ] media/track/css-cue-for-video-in-shadow-2.html [ Timeout ]
 crbug.com/572723 [ Linux ] http/tests/devtools/sources/debugger/debugger-completions-on-call-frame.js [ Timeout Pass ]

third_party/blink/web_tests/FlagExpectations/disable-blink-features=LayoutNG

@@ -306,8 +306,8 @@ crbug.com/591099 inspector-protocol/layout-fonts/languages-emoji-rare-glyphs.js
 # Newline painting difference with LayoutNG disabled.
 crbug.com/591099 external/wpt/forced-colors-mode/forced-colors-mode-14.html [ Failure ]
 crbug.com/591099 external/wpt/forced-colors-mode/forced-colors-mode-15.html [ Failure ]
-crbug.com/591099 virtual/forced-colors/external/wpt/forced-colors-mode/forced-colors-mode-14.html [ Failure ]
-crbug.com/591099 virtual/forced-colors/external/wpt/forced-colors-mode/forced-colors-mode-15.html [ Failure ]
+crbug.com/591099 virtual/forced-high-contrast-colors/external/wpt/forced-colors-mode/forced-colors-mode-14.html [ Failure ]
+crbug.com/591099 virtual/forced-high-contrast-colors/external/wpt/forced-colors-mode/forced-colors-mode-15.html [ Failure ]
 
 ### http/tests/credentialmanager/
 crbug.com/874695 http/tests/credentialmanager/credentialscontainer-create-with-virtual-authenticator.html [ Failure ]
@@ -393,6 +393,6 @@ Bug(none) paint/invalidation/overflow/float-overflow.html [ Failure ]
 Bug(none) scrollingcoordinator/non-fast-scrollable-transform-changed.html [ Crash ]
 Bug(none) svg/zoom/text/zoom-svg-float-border-padding.xml [ Failure ]
 Bug(none) virtual/composite-after-paint/scrollingcoordinator/non-fast-scrollable-transform-changed.html [ Crash ]
-Bug(none) virtual/forced-colors/fast/css/forced-colors-mode/forced-colors-mode-15.html [ Failure ]
-Bug(none) virtual/forced-colors/fast/css/forced-colors-mode/backplate/forced-colors-mode-backplate-07.html [ Failure ]
+Bug(none) virtual/forced-high-contrast-colors/fast/css/forced-colors-mode/forced-colors-mode-15.html [ Failure ]
+Bug(none) virtual/forced-high-contrast-colors/fast/css/forced-colors-mode/backplate/forced-colors-mode-backplate-07.html [ Failure ]
 

third_party/blink/web_tests/FlagExpectations/enable-features=OutOfBlinkCors

@@ -29,7 +29,6 @@ crbug.com/870173 virtual/omt-worker-fetch/http/tests/workers/worker-redirect.htm
 # OOR-CORS, but with different texts. Just mark them as Failure.
 crbug.com/870173 external/wpt/service-workers/service-worker/fetch-request-xhr.https.html [ Failure ]
 crbug.com/870173 virtual/cache-storage-eager-reading/external/wpt/service-workers/service-worker/fetch-request-xhr.https.html [ Failure ]
-crbug.com/870173 virtual/cache-storage-parallel/external/wpt/service-workers/service-worker/fetch-request-xhr.https.html [ Failure ]
 crbug.com/870173 virtual/cache-storage-sequence/external/wpt/service-workers/service-worker/fetch-request-xhr.https.html [ Failure ]
 crbug.com/870173 virtual/omt-service-worker-startup/external/wpt/service-workers/service-worker/fetch-request-xhr.https.html [ Failure ]
 crbug.com/870173 virtual/omt-worker-fetch/external/wpt/service-workers/service-worker/fetch-request-xhr.https.html [ Failure ]

third_party/blink/web_tests/MSANExpectations

@@ -159,7 +159,6 @@ crbug.com/856601 [ Linux ] external/wpt/webstorage/idlharness.window.html [ Pass
 crbug.com/856601 [ Linux ] virtual/feature-policy-permissions/external/wpt/mediacapture-streams/MediaDevices-IDL-enumerateDevices.html [ Pass Timeout ]
 crbug.com/856601 [ Linux ] virtual/feature-policy-permissions/external/wpt/mediacapture-streams/idlharness.https.window.html [ Pass Timeout ]
 crbug.com/856601 [ Linux ] virtual/omt-worker-fetch/external/wpt/service-workers/service-worker/interfaces-sw.https.html [ Timeout Pass ]
-crbug.com/856601 [ Linux ] virtual/service-worker-servicification/external/wpt/service-workers/service-worker/interfaces-sw.https.html [ Timeout Pass ]
 crbug.com/856601 [ Linux ] virtual/cache-storage-sequence/external/wpt/service-workers/service-worker/interfaces-sw.https.html [ Pass Timeout ]
 crbug.com/856601 [ Linux ] virtual/cache-storage-eager-reading/external/wpt/service-workers/service-worker/interfaces-sw.https.html [ Timeout Pass ]
 crbug.com/856601 [ Linux ] virtual/omt-service-worker-startup/external/wpt/service-workers/service-worker/interfaces-sw.https.html [ Pass Failure Timeout ]
@@ -173,9 +172,6 @@ crbug.com/856601 [ Linux ] external/wpt/css/css-pseudo/idlharness.html [ Timeout
 crbug.com/856601 [ Linux ] external/wpt/hr-time/idlharness.any.worker.html [ Timeout Pass ]
 crbug.com/856601 [ Linux ] external/wpt/media-source/idlharness.any.html [ Timeout Pass ]
 crbug.com/856601 [ Linux ] external/wpt/page-visibility/idlharness.window.html [ Timeout Pass ]
-crbug.com/856601 [ Linux ] virtual/new-remote-playback-pipeline/external/wpt/remote-playback/idlharness.window.html [ Timeout Pass ]
-crbug.com/856601 [ Linux ] virtual/service-worker-servicification/external/wpt/service-workers/service-worker/interfaces-window.https.html [ Timeout Pass ]
-crbug.com/856601 [ Linux ] virtual/webrtc-wpt-unified-plan/external/wpt/webrtc/idlharness.https.window.html [ Timeout Pass ]
 crbug.com/856601 [ Linux ] external/wpt/css/filter-effects/interfaces.any.html [ Timeout Pass ]
 crbug.com/856601 [ Linux ] external/wpt/webxr/idlharness.https.window.html [ Timeout Pass ]
 crbug.com/856601 [ Linux ] virtual/webrtc-wpt-plan-b/external/wpt/webrtc/idlharness.https.window.html [ Pass Timeout ]
@@ -345,9 +341,6 @@ crbug.com/856601 [ Linux ] external/wpt/fetch/api/idlharness.any.sharedworker.ht
 crbug.com/856601 [ Linux ] external/wpt/generic-sensor/idlharness.https.window.html [ Pass Timeout ]
 crbug.com/856601 [ Linux ] external/wpt/html-media-capture/idlharness.window.html [ Pass Timeout ]
 crbug.com/856601 [ Linux ] external/wpt/pointerlock/idlharness.window.html [ Pass Timeout ]
-crbug.com/856601 [ Linux ] virtual/blink-cors/external/wpt/fetch/api/idlharness.any.html [ Pass Timeout ]
-crbug.com/856601 [ Linux ] virtual/blink-cors/external/wpt/fetch/api/idlharness.any.sharedworker.html [ Pass Timeout ]
-crbug.com/856601 [ Linux ] virtual/blink-cors/external/wpt/fetch/cors-rfc1918/idlharness.tentative.any.sharedworker.html [ Pass Timeout ]
 crbug.com/856601 [ Linux ] virtual/omt-worker-fetch/external/wpt/fetch/cors-rfc1918/idlharness.tentative.any.worker.html [ Pass Timeout ]
 crbug.com/856601 [ Linux ] virtual/omt-worker-fetch/external/wpt/resource-timing/idlharness.any.worker.html [ Pass Timeout ]
 

third_party/blink/web_tests/SlowTests

@@ -125,7 +125,7 @@ crbug.com/869829 virtual/audio-service/http/tests/media/video-cancel-load.html [
 crbug.com/870259 virtual/audio-service/http/tests/media/video-throttled-load-metadata.html [ Slow ]
 
 # Many of the virtual animations tests are slow.
-crbug.com/243871 virtual/threaded/fast/scroll-behavior/ [ Slow ]
+crbug.com/243871 virtual/threaded-prefer-compositing/fast/scroll-behavior/ [ Slow ]
 
 # These html5lib tests are generated tests that test a huge amount of permutations so they need a bit more time.
 crbug.com/453312 html5lib/generated/run-doctype01-data.html [ Slow ]
@@ -318,7 +318,7 @@ crbug.com/869800 http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-worker
 crbug.com/869800 http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-worker-synconworker.html [ Slow ]
 
 ### Slow only on Mac10.13
-crbug.com/869662 [ Mac10.13 ] virtual/threaded/fast/scrolling/overflow-scrollability.html [ Slow ]
+crbug.com/869662 [ Mac10.13 ] virtual/threaded-prefer-compositing/fast/scrolling/overflow-scrollability.html [ Slow ]
 
 # Tests with slowest_run >= 10s on flakiness dashboard for site_per_process_webkit_layout_tests
 crbug.com/874695 http/tests/devtools/sources/debugger-breakpoints/breakpoints-ui-shifted-breakpoint.js [ Slow ]
@@ -594,10 +594,10 @@ crbug.com/874695 virtual/streaming-preload/http/tests/fetch/workers/thorough/ [
 crbug.com/874695 http/tests/devtools/sxg/sxg-cert-not-found.js [ Slow ]
 crbug.com/874695 http/tests/devtools/sxg/sxg-disable-cache.js [ Slow ]
 crbug.com/874695 virtual/sxg-with-network-service/http/tests/devtools/sxg/sxg-disable-cache.js [ Slow ]
-crbug.com/874695 virtual/threaded/animations/svg/animated-filter-svg-element.html [ Slow ]
+crbug.com/874695 virtual/threaded-no-composited-antialiasing/animations/svg/animated-filter-svg-element.html [ Slow ]
 crbug.com/874695 virtual/threaded/fast/idle-callback/idle_periods.html [ Slow ]
 crbug.com/874695 virtual/threaded/fast/idle-callback/long_idle_periods.html [ Slow ]
-crbug.com/874695 virtual/threaded/fast/scroll-behavior/overscroll-behavior.html [ Slow ]
+crbug.com/874695 virtual/threaded-prefer-compositing/fast/scroll-behavior/overscroll-behavior.html [ Slow ]
 crbug.com/874695 virtual/threaded/http/tests/devtools/tracing/console-timeline.js [ Slow ]
 crbug.com/874695 virtual/threaded/http/tests/devtools/tracing/decode-resize.js [ Slow ]
 crbug.com/874695 virtual/threaded/http/tests/devtools/tracing/timeline-layout/timeline-layout-with-invalidations.js [ Slow ]
@@ -640,7 +640,7 @@ crbug.com/967526 http/tests/devtools/console/console-uncaught-promise.js [ Slow
 crbug.com/980804 fast/scrolling/scrollbars/mouse-autoscrolling-on-scrollbar.html [ Slow ]
 crbug.com/980804 virtual/compositor_threaded_scrollbar_scrolling/fast/scrolling/scrollbars/mouse-autoscrolling-on-scrollbar.html [ Slow ]
 crbug.com/980804 virtual/scroll_customization/fast/scrolling/scrollbars/mouse-autoscrolling-on-scrollbar.html [ Slow ]
-crbug.com/980804 virtual/threaded/fast/scrolling/scrollbars/mouse-autoscrolling-on-scrollbar.html [ Slow ]
+crbug.com/980804 virtual/threaded-prefer-compositing/fast/scrolling/scrollbars/mouse-autoscrolling-on-scrollbar.html [ Slow ]
 
 crbug.com/983642 virtual/gpu/fast/canvas/canvas-composite-alpha.html [ Slow ]
 crbug.com/983642 [ Mac Debug ] fast/canvas/canvas-composite-alpha.html [ Slow ]

third_party/blink/web_tests/SmokeTests

@@ -988,7 +988,7 @@ virtual/stable/http/tests/navigation/replacestate-base-legal.html
 virtual/stable/http/tests/navigation/useragent.php
 virtual/stable/web-animations-api/additive-animations-unsupported.html
 virtual/stable/webexposed/internal-properties-should-not-be-exposed.html
-virtual/threaded/animations/stability/pseudo-element-animation-with-marker-crash.html
+virtual/threaded-no-composited-antialiasing/animations/stability/pseudo-element-animation-with-marker-crash.html
 virtual/threaded/printing/page-and-element-geometry-match.html
 webaudio/AudioParam/audioparam-setValueCurve-duration.html
 webaudio/codec-tests/flac/flac-decode.html

third_party/blink/web_tests/VirtualTestSuites

@@ -65,13 +65,13 @@
     "args": ["--enable-threaded-compositing"]
   },
   {
-    "prefix": "threaded",
+    "prefix": "off-main-thread-css-paint",
     "base": "external/wpt/css/css-paint-api",
     "args": ["--enable-threaded-compositing",
              "--enable-blink-features=OffMainThreadCSSPaint"]
   },
   {
-    "prefix": "threaded",
+    "prefix": "off-main-thread-css-paint",
     "base": "http/tests/csspaint",
     "args": ["--enable-threaded-compositing",
              "--enable-blink-features=OffMainThreadCSSPaint"]
@@ -92,7 +92,7 @@
     "args": ["--enable-prefer-compositing-to-lcd-text"]
   },
   {
-    "prefix": "threaded",
+    "prefix": "threaded-no-composited-antialiasing",
     "base": "animations",
     "args": ["--enable-threaded-compositing",
              "--disable-composited-antialiasing"]
@@ -103,13 +103,13 @@
     "args": ["--enable-threaded-compositing"]
   },
   {
-    "prefix": "threaded",
+    "prefix": "threaded-prefer-compositing",
     "base": "fast/scroll-behavior",
     "args": ["--enable-threaded-compositing",
              "--enable-prefer-compositing-to-lcd-text"]
   },
   {
-    "prefix": "threaded",
+    "prefix": "threaded-prefer-compositing",
     "base": "fast/scrolling",
     "args": ["--enable-threaded-compositing",
              "--enable-prefer-compositing-to-lcd-text"]
@@ -377,57 +377,52 @@
     "args": ["--force-device-scale-factor=1.5"]
   },
   {
-    "prefix": "layout_ng_experimental",
+    "prefix": "layout_ng_block_frag",
     "base": "external/wpt/css/css-multicol",
     "args": ["--enable-blink-features=LayoutNGBlockFragmentation"]
   },
   {
-    "prefix": "layout_ng_experimental",
+    "prefix": "layout_ng_block_frag",
     "base": "fast/multicol",
     "args": ["--enable-blink-features=LayoutNGBlockFragmentation"]
   },
   {
-    "prefix": "layout_ng_experimental",
-    "base": "fast/pagination",
-    "args": ["--enable-blink-features=LayoutNGBlockFragmentation"]
-  },
-  {
-    "prefix": "layout_ng_experimental",
+    "prefix": "layout_ng_block_frag",
     "base": "fragmentation",
     "args": ["--enable-blink-features=LayoutNGBlockFragmentation"]
   },
   {
-    "prefix": "layout_ng_experimental",
+    "prefix": "layout_ng_block_frag",
     "base": "printing",
     "args": ["--enable-blink-features=LayoutNGBlockFragmentation"]
   },
   {
-    "prefix": "layout_ng_experimental",
+    "prefix": "layout_ng_flex_box",
     "base": "css3/flexbox",
     "args": ["--enable-blink-features=LayoutNGFlexBox"]
   },
   {
-    "prefix": "layout_ng_experimental",
+    "prefix": "layout_ng_flex_box",
     "base": "external/wpt/css/css-flexbox",
     "args": ["--enable-blink-features=LayoutNGFlexBox"]
   },
   {
-    "prefix": "layout_ng_experimental",
+    "prefix": "layout_ng_fieldset",
     "base": "external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements",
     "args": ["--enable-blink-features=LayoutNGFieldset"]
   },
   {
-    "prefix": "layout_ng_experimental",
+    "prefix": "layout_ng_fieldset",
     "base": "fast/forms/fieldset",
     "args": ["--enable-blink-features=LayoutNGFieldset"]
   },
   {
-    "prefix": "layout_ng_experimental",
+    "prefix": "layout_ng_fieldset",
     "base": "external/wpt/css/css-contain",
     "args": ["--enable-blink-features=LayoutNGFieldset"]
   },
   {
-    "prefix": "layout_ng_experimental",
+    "prefix": "layout_ng_fieldset",
     "base": "external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/contain",
     "args": ["--enable-blink-features=LayoutNGFieldset"]
   },
@@ -437,47 +432,42 @@
     "args": ["--enable-print-browser"]
   },
   {
-    "prefix": "dark-mode",
+    "prefix": "dark-mode-grayscale-images",
     "base": "paint/dark-mode/grayscale-images",
     "args": ["--blink-settings=darkModeEnabled=true,darkModeInversionAlgorithm=3,darkModeImagePolicy=0,darkModeImageStyle=1,darkModeTextBrightnessThreshold=256,darkModeBackgroundBrightnessThreshold=0"]
   },
   {
-    "prefix": "dark-mode",
+    "prefix": "dark-mode-image-filter-all",
     "base": "paint/dark-mode/image-filter-all",
     "args": ["--blink-settings=darkModeEnabled=true,darkModeInversionAlgorithm=3,darkModeImagePolicy=0,darkModeTextBrightnessThreshold=256,darkModeBackgroundBrightnessThreshold=0"]
   },
   {
-    "prefix": "dark-mode",
+    "prefix": "dark-mode-image-filter-none",
     "base": "paint/dark-mode/image-filter-none",
     "args": ["--blink-settings=darkModeEnabled=true,darkModeInversionAlgorithm=3,darkModeImagePolicy=1,darkModeTextBrightnessThreshold=256,darkModeBackgroundBrightnessThreshold=0"]
   },
   {
-    "prefix": "dark-mode",
-    "base": "paint/dark-mode/image-filter-smart",
-    "args": ["--blink-settings=darkModeEnabled=true,darkModeInversionAlgorithm=3,darkModeImagePolicy=2,darkModeTextBrightnessThreshold=256,darkModeBackgroundBrightnessThreshold=0"]
-  },
-  {
-    "prefix": "dark-mode",
+    "prefix": "dark-mode-native-theme-off",
     "base": "paint/dark-mode/native-theme-off",
     "args": ["--blink-settings=darkModeEnabled=true,darkModeInversionAlgorithm=3,darkModeTextBrightnessThreshold=256,darkModeBackgroundBrightnessThreshold=0"]
   },
   {
-    "prefix": "dark-mode",
+    "prefix": "dark-mode-native-theme-on",
     "base": "paint/dark-mode/native-theme-on",
     "args": ["--blink-settings=darkModeEnabled=true,darkModeInversionAlgorithm=3,darkModeTextBrightnessThreshold=256,darkModeBackgroundBrightnessThreshold=0"]
   },
   {
-    "prefix": "dark-mode",
+    "prefix": "dark-mode-page-policy-all",
     "base": "paint/dark-mode/page-policy-all",
     "args": ["--blink-settings=darkModeEnabled=true,darkModeInversionAlgorithm=3,darkModePagePolicy=0,darkModeTextBrightnessThreshold=256,darkModeBackgroundBrightnessThreshold=0"]
   },
   {
-    "prefix": "dark-mode",
+    "prefix": "dark-mode-page-policy-background",
     "base": "paint/dark-mode/page-policy-background",
     "args": ["--blink-settings=darkModeEnabled=true,darkModeInversionAlgorithm=3,darkModePagePolicy=1,darkModeTextBrightnessThreshold=256,darkModeBackgroundBrightnessThreshold=0"]
   },
   {
-    "prefix": "dark-mode",
+    "prefix": "dark-mode-svg-invert-all",
     "base": "paint/dark-mode/svg-invert-all",
     "args": ["--blink-settings=darkModeEnabled=true,darkModeInversionAlgorithm=3,darkModeImagePolicy=0,darkModeTextBrightnessThreshold=256,darkModeBackgroundBrightnessThreshold=0"]
   },
@@ -686,7 +676,7 @@
     "args": ["--enable-features=PlzDedicatedWorker"]
   },
   {
-    "prefix": "omt-worker-fetch",
+    "prefix": "omt-worker-fetch-cors-rfc1918",
     "base": "http/tests/security/cors-rfc1918",
     "args": ["--enable-features=PlzDedicatedWorker",
              "--enable-blink-features=CorsRFC1918"]
@@ -1022,12 +1012,12 @@
     "args": ["--enable-blink-features=ForcedColors"]
   },
   {
-    "prefix": "forced-colors",
+    "prefix": "forced-high-contrast-colors",
     "base": "external/wpt/forced-colors-mode",
     "args": ["--force-high-contrast", "--enable-blink-features=ForcedColors"]
   },
   {
-    "prefix": "forced-colors",
+    "prefix": "forced-high-contrast-colors",
     "base": "fast/css/forced-colors-mode",
     "args": ["--force-high-contrast", "--enable-blink-features=ForcedColors"]
   },

third_party/blink/web_tests/virtual/dark-mode/paint/dark-mode/image-filter-smart/README.txt

-# This suite runs the tests in LayoutTests/paint/dark-mode
-# with --blink-settings="darkMode=3,darkModeImagePolicy=2"
-# See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.

third_party/blink/web_tests/virtual/dark-mode/paint/dark-mode/image-filter-smart/gradient-noinvert-expected.txt

-

third_party/blink/web_tests/virtual/dark-mode/paint/dark-mode/image-filter-smart/image-invert-expected.txt

-