Refactor ServiceWorker tests for inclusion in WPT

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 308 matching lines @@
     "prefix": "enable_asmjs",
     "base": "http/tests/asmjs",
     "args": ["--enable-features=AsmJsToWebAssembly"]
   },
   {
     "prefix": "service-worker-navigation-preload",
     "base": "http/tests/serviceworker",
     "args": ["--enable-features=ServiceWorkerNavigationPreload"]
   },
   {
+    "prefix": "service-worker-navigation-preload-wpt",
+    "base": "external/wpt/service-workers/service-worker/navigation-preload",
+    "args": ["--enable-features=ServiceWorkerNavigationPreload"]
+  },
+  {
     "prefix": "service-worker-navigation-preload-disabled",
     "base": "http/tests/serviceworker/chromium",
     "args": ["--disable-features=ServiceWorkerNavigationPreload"]
   },
   {
     "prefix": "layout_ng",
     "base": "fast/block/basic",
     "args": ["--enable-blink-features=LayoutNG, LayoutNGInline"]
   },
   {
@@ skipping 30 matching lines @@
     "prefix": "mojo-localstorage",
     "base": "storage/domstorage/localstorage",
     "args": ["--mojo-local-storage"]
   },
   {
     "prefix": "print_browser",
     "base": "print_testharness",
     "args": ["--enable-print-browser"]
   }
 ]