Service Worker: Detach the controller when falling back to network on failure

content/browser/service_worker/service_worker_url_request_job.cc

 // Copyright 2014 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/browser/service_worker/service_worker_url_request_job.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 472 matching lines @@
     scoped_refptr<ServiceWorkerVersion> version) {
   fetch_dispatcher_.reset();
 
   // Check if we're not orphaned.
   if (!request())
     return;
 
   if (status != SERVICE_WORKER_OK) {
     // TODO(falken): Add UMA and the report error to the version.
     if (is_main_resource_load_) {
+      // Using the service worker failed, so fallback to network. Detach the
+      // controller so subresource requests also skip the worker.
+      provider_host_->NotifyControllerLost();
       response_type_ = FALLBACK_TO_NETWORK;
       NotifyRestartRequired();
     } else {
       DeliverErrorResponse();
     }
     return;
   }
 
   if (fetch_result == SERVICE_WORKER_FETCH_EVENT_RESULT_FALLBACK) {
     // When the request_mode is |CORS| or |CORS-with-forced-preflight| we can't
@@ skipping 143 matching lines @@
   }
   if (!waiting_stream_url_.is_empty()) {
     StreamRegistry* stream_registry =
         GetStreamContextForResourceContext(resource_context_)->registry();
     stream_registry->RemoveRegisterObserver(waiting_stream_url_);
     stream_registry->AbortPendingStream(waiting_stream_url_);
   }
 }
 
 }  // namespace content