Use original repaint tests for spv2

third_party/WebKit/LayoutTests/TestExpectations

 # ====== Oilpan-only failures from here ======
 # Most of these actually cause the tests to report success, rather than
 # failure. Expected outputs will be adjusted for the better once Oilpan
 # has been well and truly enabled always.
 
 crbug.com/420008 inspector/tracing/worker-js-frames.html [ Pass Timeout Failure ]
 crbug.com/420008 virtual/threaded/inspector/tracing/worker-js-frames.html [ Pass Timeout Failure ]
 crbug.com/596940 inspector-protocol/runtime/runtime-execution-contexts-events.html [ Pass Timeout ]
 crbug.com/597572 [ Debug ] http/tests/inspector/resource-tree/resource-tree-reload.html [ Pass Failure ]
 
 crbug.com/569901 crbug.com/24182 [ Debug ] jquery/manipulation.html [ Timeout Pass ]
 
 # ====== Oilpan-only failures until here ======
 
 # Run these tests with under virtual/scalefactor... only.
 crbug.com/567837 fast/hidpi/static [ Skip ]
 
 # TODO(yosin): We should convert following tests to use asynchronous spell checker.
 crbug.com/563265 editing/spelling/context-menu-suggestions.html [ Skip ]
 crbug.com/563265 editing/spelling/spellcheck-editable-on-focus-multiframe.html [ Skip ]
 crbug.com/563265 editing/spelling/spellcheck-editable-on-focus-sync.html [ Skip ]
 crbug.com/563265 editing/spelling/spelling-unified-emulation.html [ Skip ]
 
-# Run these tests with under virtual/spv2 only.
+# TODO(wangxianzhu): Remove paint/invalidation/spv2.
 crbug.com/524134 paint/invalidation/spv2 [ Skip ]
+crbug.com/524134 virtual/spv2/paint/invalidation/spv2 [ Skip ]
 
-# TODO(wangxianzhu): Triage the failures
 crbug.com/524134 virtual/spv2/paint/invalidation/invalidate-after-composited-scroll.html [ Failure ]
-crbug.com/524134 virtual/spv2/paint/invalidation/spv2/focus-ring-on-continuation-move.html [ Failure ]
-crbug.com/524236 virtual/spv2/paint/invalidation/spv2/clipping-should-not-repaint-composited-descendants-as-text.html [ Failure ]
-crbug.com/524236 virtual/spv2/paint/invalidation/spv2/scroll-fixed-layer-no-content-as-text.html [ Failure ]
-crbug.com/524236 virtual/spv2/paint/invalidation/spv2/scroll-fixed-layer-out-of-view-as-text.html [ Failure ]
-crbug.com/524236 virtual/spv2/paint/invalidation/spv2/scroll-fixed-squahed-layer-as-text.html [ Failure ]
-crbug.com/524236 virtual/spv2/paint/invalidation/spv2/should-not-repaint-composited-descendants-on-overflow-change-as-text.html [ Failure ]
-crbug.com/524236 virtual/spv2/paint/invalidation/spv2/should-not-repaint-composited-descendants-as-text.html [ Failure ]
-crbug.com/524236 virtual/spv2/paint/invalidation/spv2/should-not-repaint-composited-filter-as-text.html [ Failure ]
-crbug.com/524236 virtual/spv2/paint/invalidation/spv2/should-not-repaint-composited-opacity-as-text.html [ Failure ]
-crbug.com/524236 virtual/spv2/paint/invalidation/spv2/should-not-repaint-composited-transform-as-text.html [ Failure ]
-crbug.com/524236 virtual/spv2/paint/invalidation/spv2/absolute-layer-specified-left-or-right-auto-width-moved-vertically-as-text.html [ Failure ]
-crbug.com/524236 virtual/spv2/paint/invalidation/spv2/invalidate-after-composited-scroll-as-text.html [ Failure ]
-crbug.com/524236 virtual/spv2/paint/invalidation/spv2/clip-path-constant-repaint-as-text.html [ Failure ]
-crbug.com/524236 virtual/spv2/paint/invalidation/spv2/relative-positioned-movement-repaint-as-text.html [ Failure ]
-crbug.com/524236 virtual/spv2/paint/invalidation/spv2/repaint-tile-clipped-as-text.html [ Failure ]
-crbug.com/524236 virtual/spv2/paint/invalidation/spv2/updating-scrolling-content-as-text.html [ Failure ]
-crbug.com/524236 virtual/spv2/paint/invalidation/spv2/scrolling-without-painting-as-text.html [ Failure ]
-crbug.com/527242 virtual/spv2/paint/invalidation/spv2/cached-cell-append.html [ Failure ]
-crbug.com/527242 virtual/spv2/paint/invalidation/spv2/cached-cell-remove.html [ Failure ]
-crbug.com/527242 virtual/spv2/paint/invalidation/spv2/cached-change-cell-border-width.html [ Failure ]
-crbug.com/527242 virtual/spv2/paint/invalidation/spv2/cached-change-col-border-width.html [ Failure ]
-crbug.com/527242 virtual/spv2/paint/invalidation/spv2/cached-change-colgroup-border-width.html [ Failure ]
-crbug.com/527242 virtual/spv2/paint/invalidation/spv2/cached-change-row-border-width.html [ Failure ]
-crbug.com/527242 virtual/spv2/paint/invalidation/spv2/cached-change-table-border-width.html [ Failure ]
-crbug.com/527242 virtual/spv2/paint/invalidation/spv2/cached-change-tbody-border-width.html [ Failure ]
-crbug.com/564443 virtual/spv2/paint/invalidation/spv2/background-image-paint-invalidation.html [ Failure Pass ]
+crbug.com/524134 virtual/spv2/fast/repaint/focus-ring-on-continuation-move.html [ Failure ]
+crbug.com/524236 virtual/spv2/compositing/overflow/updating-scrolling-content.html [ Failure ]
+crbug.com/524236 virtual/spv2/compositing/overflow/scrolling-without-painting.html [ Failure ]
+crbug.com/524236 virtual/spv2/compositing/repaint/clipping-should-not-repaint-composited-descendants.html [ Failure ]
+crbug.com/524236 virtual/spv2/compositing/repaint/scroll-fixed-layer-no-content.html [ Failure ]
+crbug.com/524236 virtual/spv2/compositing/repaint/scroll-fixed-layer-out-of-view.html [ Failure ]
+crbug.com/524236 virtual/spv2/compositing/repaint/scroll-fixed-squahed-layer.html [ Failure ]
+crbug.com/524236 virtual/spv2/compositing/repaint/should-not-repaint-composited-descendants-on-overflow-change.html [ Failure ]
+crbug.com/524236 virtual/spv2/compositing/repaint/should-not-repaint-composited-descendants.html [ Failure ]
+crbug.com/524236 virtual/spv2/compositing/repaint/should-not-repaint-composited-filter.html [ Failure ]
+crbug.com/524236 virtual/spv2/compositing/repaint/should-not-repaint-composited-opacity.html [ Failure ]
+crbug.com/524236 virtual/spv2/compositing/repaint/should-not-repaint-composited-transform.html [ Failure ]
+crbug.com/524236 virtual/spv2/fast/repaint/absolute-layer-specified-left-or-right-auto-width-moved-vertically.html [ Failure ]
+crbug.com/524236 virtual/spv2/fast/repaint/clip-path-constant-repaint.html [ Failure ]
+crbug.com/524236 virtual/spv2/fast/repaint/relative-positioned-movement-repaint.html [ Failure ]
+crbug.com/524236 virtual/spv2/fast/repaint/repaint-tile-clipped.html [ Failure ]
+crbug.com/564443 virtual/spv2/fast/repaint/background-image-paint-invalidation.html [ Failure ]
 
 crbug.com/504613 crbug.com/524248 paint/images/image-backgrounds-not-antialiased.html [ Skip ]
 crbug.com/504613 crbug.com/524248 virtual/spv2/paint/images/image-backgrounds-not-antialiased.html [ Skip ]
 crbug.com/502531 fast/borders/border-antialiasing.html [ Failure ]
 
 crbug.com/538697 [ Win7 Debug ] virtual/threaded/printing/webgl-oversized-printing.html [ Crash ]
 crbug.com/538697 [ Win7 Debug ] printing/webgl-oversized-printing.html [ Crash ]
 
 # Expected to fail until OffscreenCanvas can render on the gpu
 crbug.com/593514 virtual/gpu/fast/canvas/OffscreenCanvas-strokeRect-in-worker.html [ Failure ]
@@ skipping 946 matching lines @@
 crbug.com/421771 accessibility/inline-text-box-next-on-line.html [ Skip ]
 
 # Disabled briefly until test runner support lands.
 crbug.com/479533 accessibility/show-context-menu.html [ Skip ]
 crbug.com/479533 accessibility/show-context-menu-shadowdom.html [ Skip ]
 crbug.com/483653 accessibility/scroll-containers.html [ Skip ]
 
 crbug.com/491764 http/tests/inspector/service-workers/user-agent-override.html [ Pass Timeout ]
 crbug.com/474798 fast/repaint/align-self-change-keeping-geometry-grid.html [ Failure ]
 crbug.com/474798 fast/repaint/justify-self-change-keeping-geometry.html [ Failure ]
-crbug.com/474798 virtual/spv2/paint/invalidation/spv2/align-self-change-keeping-geometry-grid-as-text.html [ Skip ]
-crbug.com/474798 virtual/spv2/paint/invalidation/spv2/justify-self-change-keeping-geometry-as-text.html [ Skip ]
 
 crbug.com/582230 fast/css-grid-layout/relayout-align-items-changed.html [ Skip ]
 crbug.com/582230 fast/repaint/align-items-change.html [ Skip ]
 crbug.com/582230 fast/repaint/align-items-overflow-change.html [ Skip ]
 
 # Temporarily disabled after chromium change
 crbug.com/492511 [ Mac ] fast/text/atsui-negative-spacing-features.html [ Failure ]
 crbug.com/492511 [ Mac ] fast/text/international/arabic-justify.html [ Failure ]
 
 # Ref tests that fail due to differences in inline box structure, even though they contain the same text.
@@ skipping 372 matching lines @@
 crbug.com/606302 [ Win7 Debug ] transforms/3d/point-mapping/3d-point-mapping-deep.html [ Failure ]
 crbug.com/606302 [ Mac ] transforms/3d/point-mapping/3d-point-mapping-preserve-3d.html [ Failure ]
 crbug.com/606302 [ Win ] transforms/3d/point-mapping/3d-point-mapping-preserve-3d.html [ Failure ]
 crbug.com/606302 [ Linux Debug ] transforms/3d/point-mapping/3d-point-mapping-preserve-3d.html [ Failure ]
 crbug.com/613497 [ Linux Release ] transforms/3d/point-mapping/3d-point-mapping-preserve-3d.html [ Failure ]
 
 crbug.com/613659 imported/wpt/quirks-mode/percentage-height-calculation.html [ Failure ]
 crbug.com/613661 imported/wpt/quirks-mode/table-cell-nowrap-minimum-width-calculation.html [ Failure ]
 crbug.com/613663 imported/wpt/quirks-mode/table-cell-width-calculation.html [ Failure ]
 crbug.com/611442 [ Win7 Debug ] imported/wpt/quirks-mode/hashless-hex-color.html [ Failure Timeout ]