Index: content/renderer/shared_worker/embedded_shared_worker_stub.cc |
diff --git a/content/renderer/shared_worker/embedded_shared_worker_stub.cc b/content/renderer/shared_worker/embedded_shared_worker_stub.cc |
index 4b7509754fc387908a83a7916bdfab0e13557248..c6ad799c0b363c6bd68b88074a33a28cd1e7c0c0 100644 |
--- a/content/renderer/shared_worker/embedded_shared_worker_stub.cc |
+++ b/content/renderer/shared_worker/embedded_shared_worker_stub.cc |
@@ -91,8 +91,11 @@ class WebServiceWorkerNetworkProviderImpl |
// renderer process hasn't received SetControllerServiceWorker message. |
if (request.getRequestContext() != |
blink::WebURLRequest::RequestContextSharedWorker && |
- !provider->IsControlledByServiceWorker()) { |
- request.setSkipServiceWorker(true); |
+ !provider->IsControlledByServiceWorker() && |
+ request.skipServiceWorker() != |
+ blink::WebURLRequest::SkipServiceWorker::All) { |
+ request.setSkipServiceWorker( |
+ blink::WebURLRequest::SkipServiceWorker::Controlling); |
} |
} |