[DevTools] Prevent css enable fetch from notifying service workers

Bug: 823392 Change-Id: I23d47a25a47c5be77971fcde0f24a4bc591788fd Reviewed-on: https://chromium-review.googlesource.com/c/1350170 Commit-Queue: Joey Arhar <jarhar@chromium.org> Reviewed-by: Dmitry Gozman <dgozman@chromium.org> Cr-Commit-Position: refs/heads/master@{#611512}

[DevTools] Prevent css enable fetch from notifying service workers
Bug: 823392 Change-Id: I23d47a25a47c5be77971fcde0f24a4bc591788fd Reviewed-on: https://chromium-review.googlesource.com/c/1350170 Commit-Queue: Joey Arhar <jarhar@chromium.org> Reviewed-by: Dmitry Gozman <dgozman@chromium.org> Cr-Commit-Position: refs/heads/master@{#611512}
a403b514 · Joey Arhar · Commit Bot · 6152af04 · a403b514 · a403b514
Commit a403b514 authored Nov 28, 2018 by Joey Arhar Committed by Commit Bot Nov 28, 2018
5 changed files
--- a/third_party/blink/renderer/core/inspector/inspector_resource_content_loader.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_resource_content_loader.cc
@@ -88,6 +88,7 @@ void InspectorResourceContentLoader::Start() {
      resource_request.SetCacheMode(mojom::FetchCacheMode::kOnlyIfCached);
    }
    resource_request.SetRequestContext(mojom::RequestContextType::INTERNAL);
+    resource_request.SetSkipServiceWorker(true);

    if (!resource_request.Url().GetString().IsEmpty()) {
      urls_to_fetch.insert(resource_request.Url().GetString());

--- a/third_party/blink/web_tests/http/tests/inspector-protocol/service-worker/intercept-css-enable-fetch-expected.txt
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/service-worker/intercept-css-enable-fetch-expected.txt
+Verifies that service workers do not throw errors from devtools css enable initiated fetch.
+finished awaiting for css enable
+
--- a/third_party/blink/web_tests/http/tests/inspector-protocol/service-worker/intercept-css-enable-fetch.js
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/service-worker/intercept-css-enable-fetch.js
+(async function(testRunner) {
+  var {page, session, dp} = await testRunner.startURL(
+      'resources/repeat-fetch-service-worker.html',
+      'Verifies that service workers do not throw errors from devtools css enable initiated fetch.');
+
+  dp.ServiceWorker.onWorkerErrorReported(error => {
+    testRunner.log(
+        'serivce worker reported error: ' + JSON.stringify(error, null, 2));
+    testRunner.completeTest();
+  });
+
+  await dp.Runtime.enable();
+  await dp.ServiceWorker.enable();
+
+  let versions;
+  do {
+    const result = await dp.ServiceWorker.onceWorkerVersionUpdated();
+    versions = result.params.versions;
+  } while (!versions.length || versions[0].status !== 'activated');
+  await versions[0].registrationId;
+
+  await dp.Page.enable();
+  await dp.Page.reload();
+
+  await dp.DOM.enable();
+  await dp.CSS.enable();
+
+  testRunner.log('finished awaiting for css enable');
+  testRunner.completeTest();
+});
--- a/third_party/blink/web_tests/http/tests/inspector-protocol/service-worker/resources/repeat-fetch-service-worker.html
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/service-worker/resources/repeat-fetch-service-worker.html
+<!DOCTYPE html>
+<html>
+<head>
+<title>webpage for repeat-fetch-service-worker.js</title>
+<script>
+function installSW() {
+  navigator.serviceWorker.register('repeat-fetch-service-worker.js');
+}
+</script>
+</head>
+<body onload="installSW()"></body>
+</html>
--- a/third_party/blink/web_tests/http/tests/inspector-protocol/service-worker/resources/repeat-fetch-service-worker.js
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/service-worker/resources/repeat-fetch-service-worker.js
+self.addEventListener('fetch', fetchEvent => {
+  console.log('service worker making fetch for url: ' + fetchEvent.request.url);
+  fetch(fetchEvent.request);
+});