[ServiceWorker] Introduce skip_service_worker flag and remove LOAD_BYPASS_CACHE check.

content/renderer/render_frame_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 2672 matching lines @@
     // If the navigation is browser-initiated, the NavigationState contains the
     // correct value instead of the WebDataSource.
     //
     // TODO(davidben): Avoid this awkward duplication of state. See comment on
     // NavigationState::should_replace_current_entry().
     should_replace_current_entry =
         navigation_state->should_replace_current_entry();
   }
 
   int provider_id = kInvalidServiceWorkerProviderId;
-  if (request.frameType() == blink::WebURLRequest::FrameTypeTopLevel ||
-      request.frameType() == blink::WebURLRequest::FrameTypeNested) {
-    // |provisionalDataSource| may be null in some content::ResourceFetcher
-    // use cases, we don't hook those requests.
-    if (frame->provisionalDataSource()) {
+  if (!request.skipServiceWorker()) {
+    if (request.frameType() == blink::WebURLRequest::FrameTypeTopLevel ||
+        request.frameType() == blink::WebURLRequest::FrameTypeNested) {
+      // |provisionalDataSource| may be null in some content::ResourceFetcher
+      // use cases, we don't hook those requests.
+      if (frame->provisionalDataSource()) {
+        ServiceWorkerNetworkProvider* provider =
+            ServiceWorkerNetworkProvider::FromDocumentState(
+                DocumentState::FromDataSource(frame->provisionalDataSource()));
+        provider_id = provider->provider_id();
+      }
+    } else if (frame->dataSource()) {
       ServiceWorkerNetworkProvider* provider =
           ServiceWorkerNetworkProvider::FromDocumentState(
-              DocumentState::FromDataSource(frame->provisionalDataSource()));
+              DocumentState::FromDataSource(frame->dataSource()));
       provider_id = provider->provider_id();
     }
-  } else if (frame->dataSource()) {
-    ServiceWorkerNetworkProvider* provider =
-        ServiceWorkerNetworkProvider::FromDocumentState(
-            DocumentState::FromDataSource(frame->dataSource()));
-    provider_id = provider->provider_id();
   }
 
   WebFrame* parent = frame->parent();
   int parent_routing_id = MSG_ROUTING_NONE;
   if (!parent) {
     parent_routing_id = -1;
   } else if (parent->isWebLocalFrame()) {
     parent_routing_id = FromWebFrame(parent)->GetRoutingID();
   } else {
     parent_routing_id = RenderFrameProxy::FromWebFrame(parent)->routing_id();
@@ skipping 1131 matching lines @@
 
 #if defined(ENABLE_BROWSER_CDMS)
 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
   if (!cdm_manager_)
     cdm_manager_ = new RendererCdmManager(this);
   return cdm_manager_;
 }
 #endif  // defined(ENABLE_BROWSER_CDMS)
 
 }  // namespace content