Revert of Run compositing/ and paint/ for disable-spinvalidation

third_party/WebKit/LayoutTests/VirtualTestSuites

 [
   {
     "prefix": "color_space",
     "base": "fast/canvas/color-space",
     "args": ["--enable-color-correct-rendering",
              "--enable-true-color-rendering"]
   },
   {
     "prefix": "gpu",
     "base": "fast/canvas",
@@ skipping 87 matching lines @@
     "base": "animations-unprefixed",
     "args": ["--stable-release-mode"]
   },
   {
     "prefix": "stable",
     "base": "media/stable",
     "args": ["--stable-release-mode"]
   },
   {
     "prefix": "disable-spinvalidation",
-    "base": "compositing",
+    "base": "paint/invalidation",
     "args": ["--disable-slimming-paint-invalidation"]
   },
   {
-    "prefix": "disable-spinvalidation",
-    "base": "paint",
-    "args": ["--disable-slimming-paint-invalidation"]
-  },
-  {
     "prefix": "origin-trials-runtimeflags-disabled",
     "base": "http/tests/origin_trials/webexposed",
     "args": ["--disable-blink-features=ForeignFetch,ImageCapture,LinkServiceWorker,LongTaskObserver,ServiceWorkerNavigationPreload,SetRootScroller,WebUSB,WebVR,WebShare"]
   },
   {
     "prefix": "android",
     "base": "fullscreen",
     "args": ["--enable-threaded-compositing",
              "--enable-fixed-position-compositing", "--enable-prefer-compositing-to-lcd-text",
              "--enable-composited-scrolling-for-frames", "--enable-gesture-tap-highlight", "--enable-pinch",
@@ skipping 242 matching lines @@
     "prefix": "mojo-localstorage",
     "base": "storage/domstorage/localstorage",
     "args": ["--mojo-local-storage"]
   },
   {
     "prefix": "print_browser",
     "base": "print_testharness",
     "args": ["--enable-print-browser"]
   }
 ]