Remove two virtual test suites and one obsolete flag reference

Removed: scalefactor200withzoom
(redundant with scalefactor200)

Removed: compositor-threaded-percent-based-scrolling-dsf-2-highdpi
(redundant with
 compositor-threaded-percent-based-scrolling-2-highdpi)

Bug: 1296791

Change-Id: Iea737bd93f0909ef0aa964a140daf6240c1b8ee7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3550076
Reviewed-by: Mason Freed <masonf@chromium.org>
Commit-Queue: Chris Harrelson <chrishtr@chromium.org>
Cr-Commit-Position: refs/heads/main@{#985127}

third_party/blink/web_tests/FlagExpectations/disable-layout-ng

@@ -1224,7 +1224,6 @@ crbug.com/1035582 tables/mozilla/bugs/bug2479-3.html [ Failure ]
 crbug.com/1035582 fast/hidpi/scrollbar-appearance-increase-device-scale-factor.html [ Failure ]
 crbug.com/1035582 paint/invalidation/overflow/float-overflow-right.html [ Failure ]
 crbug.com/1035582 virtual/prefer_compositing_to_lcd_text/scrollbars/listbox-scrollbar-combinations.html [ Failure ]
-crbug.com/1035582 virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-appearance.html [ Failure Timeout ]
 crbug.com/1035582 virtual/scalefactor150/fast/hidpi/static/calendar-picker-appearance.html [ Failure Timeout ]
 crbug.com/1035582 http/tests/devtools/sources/debugger-breakpoints/disable-breakpoints.js [ Failure Timeout ]
 crbug.com/1035582 paint/invalidation/forms/checkbox-focus-by-mouse-then-keydown.html [ Failure ]

third_party/blink/web_tests/NeverFixTests

@@ -1771,7 +1771,6 @@ crbug.com/567837 fast/hidpi/static/* [ Skip ]
 [ Linux ] virtual/scalefactor150/fast/hidpi/static/* [ Pass ]
 [ Win ] virtual/scalefactor150/fast/hidpi/static/* [ Pass ]
 virtual/scalefactor200/fast/hidpi/static/* [ Pass ]
-virtual/scalefactor200withzoom/fast/hidpi/static/* [ Pass ]
 
 # Memory measurement tests are run as virtual tests.
 external/wpt/measure-memory/* [ Skip ]

third_party/blink/web_tests/TestExpectations

@@ -2105,13 +2105,9 @@ crbug.com/432129 html/marquee/marquee-scroll.html [ Failure Pass ]
 crbug.com/326139 crbug.com/390125 media/video-frame-accurate-seek.html [ Failure Pass ]
 crbug.com/421283 html/marquee/marquee-scrollamount.html [ Failure Pass ]
 
-# TODO(oshima): Mac is currently not supported.
-crbug.com/567837 [ Mac ] virtual/scalefactor200withzoom/fast/hidpi/static/* [ Skip ]
-
 # TODO(oshima): Move the event scaling code to eventSender and remove this.
 crbug.com/567837 virtual/scalefactor200/fast/hidpi/static/gesture-scroll-amount.html [ Failure Timeout ]
 crbug.com/567837 virtual/scalefactor200/fast/hidpi/static/popup-menu-with-scrollbar-appearance.html [ Failure Timeout ]
-crbug.com/567837 virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-with-scrollbar-appearance.html [ Failure Timeout ]
 crbug.com/567837 [ Linux ] virtual/scalefactor150/fast/hidpi/static/mousewheel-scroll-amount.html [ Failure Timeout ]
 crbug.com/567837 [ Win ] virtual/scalefactor150/fast/hidpi/static/mousewheel-scroll-amount.html [ Failure Timeout ]
 crbug.com/567837 [ Linux ] virtual/scalefactor150/fast/hidpi/static/gesture-scroll-amount.html [ Failure Timeout ]
@@ -2804,9 +2800,6 @@ crbug.com/1298321 fast/forms/calendar-picker/calendar-picker-appearance-zoom200.
 crbug.com/1298321 fast/forms/calendar-picker/date-picker-appearance-zoom150.html [ Failure Pass Timeout ]
 crbug.com/1298321 fast/forms/select-popup/popup-menu-appearance-zoom.html [ Failure Pass Timeout ]
 crbug.com/1298321 fast/forms/suggestion-picker/date-suggestion-picker-appearance-zoom200.html [ Failure Pass Timeout ]
-crbug.com/1298321 virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-appearance.html [ Failure Pass Timeout ]
-crbug.com/1298321 virtual/scalefactor200withzoom/fast/hidpi/static/calendar-picker-appearance.html [ Failure Pass Timeout ]
-crbug.com/1298321 virtual/scalefactor200withzoom/fast/hidpi/static/data-suggestion-picker-appearance.html [ Failure Pass Timeout ]
 crbug.com/1298321 virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance.html [ Failure Pass Timeout ]
 crbug.com/1298321 virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance.html [ Failure Pass Timeout ]
 crbug.com/1298321 virtual/scalefactor200/fast/hidpi/static/popup-menu-appearance.html [ Failure Pass Timeout ]

third_party/blink/web_tests/VirtualTestSuites

@@ -224,7 +224,6 @@
     "bases": ["external/wpt/css/css-backgrounds/hidpi",
               "external/wpt/css/css-paint-api/hidpi"],
     "args": ["--force-device-scale-factor=2",
-             "--enable-use-zoom-for-dsf=false",
              "--enable-threaded-compositing"]
   },
   {
@@ -255,14 +254,6 @@
               "fast/hidpi/static"],
     "args": ["--force-device-scale-factor=1.5"]
   },
-  {
-    "prefix": "scalefactor200withzoom",
-    "platforms": ["Linux", "Mac", "Win"],
-    "bases": ["fast/hidpi/static",
-              "inspector-protocol/page/get-layout-metrics-css.js"],
-    "args": ["--force-device-scale-factor=2",
-             "--enable-use-zoom-for-dsf"]
-  },
   {
     "prefix": "schemeful-same-site",
     "platforms": ["Linux", "Mac", "Win"],
@@ -369,16 +360,6 @@
              "--enable-prefer-compositing-to-lcd-text",
              "--force-device-scale-factor=2"]
   },
-  {
-    "prefix": "compositor-threaded-percent-based-scrolling-dsf-2-highdpi",
-    "platforms": ["Linux", "Mac", "Win"],
-    "bases": ["virtual/percent-based-scrolling"],
-    "args": ["--enable-features=PercentBasedScrolling",
-             "--enable-threaded-compositing",
-             "--enable-prefer-compositing-to-lcd-text",
-             "--force-device-scale-factor=2",
-             "--enable-use-zoom-for-dsf=false"]
-  },
   {
     "prefix": "smooth_compositor_threaded_scrollbar_scrolling",
     "platforms": ["Linux", "Mac", "Win"],