Flip S13nServiceWorker virtual test to disable the flag

Currently NetS13nServiceWorker is enabled by default, and we don't have tests
excercising non-S13nServiceWorker path. This flips the test to enable
S13nServiceWorker to disabling S13nServiceWorker forcefully.

Bug: 715640
Change-Id: I8ba3401989dcd9da46e24cd7dc0500f66a200741
Reviewed-on: https://chromium-review.googlesource.com/c/1365050
Commit-Queue: Makoto Shimazu <shimazu@chromium.org>
Reviewed-by: Matt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#614295}

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

@@ -34,3 +34,7 @@ Bug(none) virtual/outofblink-cors [ Skip ]
 # Skip virtual/outofblink-cors-ns on this bot, since when run normally it
 # already forces NetworkService on, so there is no need to run it again here.
 Bug(none) virtual/outofblink-cors-ns [ Skip ]
+
+# NetworkService needs S13nServiceWorker. Running these test with
+# NetworkService doesn't make sense.
+Bug(none) virtual/disabled-service-worker-servicification [ Skip ]

third_party/blink/web_tests/NeverFixTests

@@ -2122,15 +2122,19 @@ virtual/outofblink-cors/external/wpt/service-workers/service-worker/fetch-event-
 virtual/outofblink-cors/external/wpt/service-workers/service-worker/fetch-event-is-reload-navigation-manual.https.html [ WontFix ]
 virtual/outofblink-cors/external/wpt/xhr/send-authentication-existing-session-manual.htm [ WontFix ]
 virtual/outofblink-cors/external/wpt/xhr/send-authentication-prompt-2-manual.htm [ WontFix ]
-virtual/service-worker-servicification/external/wpt/service-workers/service-worker/fetch-event-is-history-backward-navigation-manual.https.html [ WontFix ]
-virtual/service-worker-servicification/external/wpt/service-workers/service-worker/fetch-event-is-history-forward-navigation-manual.https.html [ WontFix ]
-virtual/service-worker-servicification/external/wpt/service-workers/service-worker/fetch-event-is-reload-navigation-manual.https.html [ WontFix ]
+virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/fetch-event-is-history-backward-navigation-manual.https.html [ WontFix ]
+virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/fetch-event-is-history-forward-navigation-manual.https.html [ WontFix ]
+virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/fetch-event-is-reload-navigation-manual.https.html [ WontFix ]
 virtual/speech-with-unified-autoplay/external/wpt/speech-api/SpeechRecognition-abort-manual.https.html [ WontFix ]
 virtual/speech-with-unified-autoplay/external/wpt/speech-api/SpeechRecognition-onerror-manual.https.html [ WontFix ]
 virtual/speech-with-unified-autoplay/external/wpt/speech-api/SpeechRecognition-onresult-manual.https.html [ WontFix ]
 virtual/speech-with-unified-autoplay/external/wpt/speech-api/SpeechRecognition-stop-manual.https.html [ WontFix ]
 [ Retina ] external/wpt/pointerevents/pointerevent_touch-action-table-test_touch-manual.html [ WontFix ]
 
+# See crbug.com/865839.
+virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/update-after-navigation-redirect.https.html [ WontFix ]
+
+
 # ====== Tests incompatible with the default Site Isolation from here ======
 # See also third_party/blink/web_tests/virtual/not-site-per-process/README.md
 #

third_party/blink/web_tests/SlowTests

@@ -512,7 +512,7 @@ crbug.com/874695 virtual/outofblink-cors-ns/external/wpt/xhr/xmlhttprequest-time
 crbug.com/874695 virtual/outofblink-cors-ns/external/wpt/xhr/xmlhttprequest-timeout-worker-simple.html [ Slow ]
 crbug.com/874695 virtual/outofblink-cors-ns/external/wpt/xhr/xmlhttprequest-timeout-worker-synconworker.html [ Slow ]
 crbug.com/874695 virtual/outofblink-cors-ns/external/wpt/xhr/xmlhttprequest-timeout-worker-twice.html [ Slow ]
-crbug.com/874695 virtual/service-worker-servicification/external/wpt/service-workers/service-worker/fetch-frame-resource.https.html [ Slow ]
+crbug.com/874695 virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/fetch-frame-resource.https.html [ Slow ]
 crbug.com/874695 virtual/webrtc-wpt-unified-plan/external/wpt/webrtc/RTCDTMFSender-ontonechange-long.https.html [ Slow ]
 
 # Tests where |3s <= slowest_run < 10s| on flakiness dashboard for site_per_process_webkit_layout_tests
@@ -1392,19 +1392,19 @@ crbug.com/874695 virtual/paint-timing/external/wpt/paint-timing/idlharness.windo
 crbug.com/874695 virtual/reporting-api/external/wpt/content-security-policy/reporting-api/reporting-api-doesnt-send-reports-without-violation.https.sub.html [ Slow ]
 crbug.com/874695 virtual/sampling-heap-profiler/inspector-protocol/memory/sampling-native-snapshot.js [ Slow ]
 crbug.com/874695 virtual/scroll_customization/fast/scroll-behavior/overscroll-behavior.html [ Slow ]
-crbug.com/874695 virtual/service-worker-servicification/external/wpt/service-workers/service-worker/fetch-canvas-tainting-video-cache.https.html [ Slow ]
-crbug.com/874695 virtual/service-worker-servicification/external/wpt/service-workers/service-worker/fetch-canvas-tainting-video.https.html [ Slow ]
-crbug.com/874695 virtual/service-worker-servicification/external/wpt/service-workers/service-worker/fetch-event-redirect.https.html [ Slow ]
-crbug.com/874695 virtual/service-worker-servicification/external/wpt/service-workers/service-worker/fetch-event-respond-with-body-loaded-in-chunk.https.html [ Slow ]
-crbug.com/874695 virtual/service-worker-servicification/external/wpt/service-workers/service-worker/fetch-response-taint.https.html [ Slow ]
-crbug.com/874695 virtual/service-worker-servicification/external/wpt/service-workers/service-worker/navigation-redirect.https.html [ Slow ]
-crbug.com/874695 virtual/service-worker-servicification/external/wpt/service-workers/service-worker/registration-mime-types.https.html [ Slow ]
-crbug.com/874695 virtual/service-worker-servicification/external/wpt/service-workers/service-worker/registration-updateviacache.https.html [ Slow ]
-crbug.com/874695 virtual/service-worker-servicification/external/wpt/service-workers/service-worker/skip-waiting-using-registration.https.html [ Slow ]
-crbug.com/874695 virtual/service-worker-servicification/external/wpt/service-workers/service-worker/skip-waiting-without-using-registration.https.html [ Slow ]
-crbug.com/874695 virtual/service-worker-servicification/external/wpt/service-workers/service-worker/update-after-navigation-fetch-event.https.html [ Slow ]
-crbug.com/874695 virtual/service-worker-servicification/external/wpt/service-workers/service-worker/update-after-navigation-redirect.https.html [ Slow ]
-crbug.com/874695 virtual/service-worker-servicification/external/wpt/service-workers/service-worker/update-bytecheck.https.html [ Slow ]
+crbug.com/874695 virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/fetch-canvas-tainting-video-cache.https.html [ Slow ]
+crbug.com/874695 virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/fetch-canvas-tainting-video.https.html [ Slow ]
+crbug.com/874695 virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/fetch-event-redirect.https.html [ Slow ]
+crbug.com/874695 virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/fetch-event-respond-with-body-loaded-in-chunk.https.html [ Slow ]
+crbug.com/874695 virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/fetch-response-taint.https.html [ Slow ]
+crbug.com/874695 virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/navigation-redirect.https.html [ Slow ]
+crbug.com/874695 virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/registration-mime-types.https.html [ Slow ]
+crbug.com/874695 virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/registration-updateviacache.https.html [ Slow ]
+crbug.com/874695 virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/skip-waiting-using-registration.https.html [ Slow ]
+crbug.com/874695 virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/skip-waiting-without-using-registration.https.html [ Slow ]
+crbug.com/874695 virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/update-after-navigation-fetch-event.https.html [ Slow ]
+crbug.com/874695 virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/update-after-navigation-redirect.https.html [ Slow ]
+crbug.com/874695 virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/update-bytecheck.https.html [ Slow ]
 crbug.com/874695 virtual/sharedarraybuffer/external/wpt/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/broadcastchannel-success-and-failure.html [ Slow ]
 crbug.com/874695 virtual/sharedarraybuffer/external/wpt/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/broadcastchannel-success.html [ Slow ]
 crbug.com/874695 virtual/sharedarraybuffer/external/wpt/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/window-sharedworker-failure.html [ Slow ]

third_party/blink/web_tests/VirtualTestSuites

@@ -683,16 +683,14 @@
     "args": ["--enable-features=SignedHTTPExchangeOriginTrial,NetworkService"]
   },
   {
-    "prefix": "service-worker-servicification",
+    "prefix": "disabled-service-worker-servicification",
     "base": "http/tests/serviceworker",
-    "args": ["--enable-features=ServiceWorkerServicification",
-             "--disable-features=NetworkService"]
+    "args": ["--disable-features=ServiceWorkerServicification,NetworkService"]
   },
   {
-    "prefix": "service-worker-servicification",
+    "prefix": "disabled-service-worker-servicification",
     "base": "external/wpt/service-workers/service-worker",
-    "args": ["--enable-features=ServiceWorkerServicification",
-             "--disable-features=NetworkService"]
+    "args": ["--disable-features=ServiceWorkerServicification,NetworkService"]
   },
   {
     "prefix": "omt-worker-fetch",

third_party/blink/web_tests/virtual/service-worker-servicification/external/wpt/service-workers/service-worker/README.txt → third_party/blink/web_tests/virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/README.txt

-This directory is for testing the case where ServiceWorkerServicification (aka NetS13nServiceWorker) is on and NetworkService is off.
+This directory is for testing the case where ServiceWorkerServicification (aka NetS13nServiceWorker) and NetworkService are off.
 The tracking bug is crbug.com/846235.

third_party/blink/web_tests/virtual/service-worker-servicification/http/tests/serviceworker/README.txt → third_party/blink/web_tests/virtual/disabled-service-worker-servicification/http/tests/serviceworker/README.txt

-This directory is for testing the case where ServiceWorkerServicification (aka NetS13nServiceWorker) is on and NetworkService is off.
+This directory is for testing the case where ServiceWorkerServicification (aka NetS13nServiceWorker) and NetworkService are off.
 The tracking bug is crbug.com/846235.

third_party/blink/web_tests/virtual/service-worker-servicification/http/tests/serviceworker/navigation_preload/use-counter-expected.txt

-This is a testharness.js-based test.
-PASS Navigation Preload is not counted if not enabled.
-PASS Navigation Preload is use counted.
-FAIL Navigation Preload is use counted even if preloadResponse is not used. assert_true: expected true got false
-Harness: the test ran to completion.
-