[WIP] [service worker] Fix detach controller and fallback to network mechanism

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 568 matching lines @@
     DeliverErrorResponse();
     return;
   }
 
   if (status != SERVICE_WORKER_OK) {
     RecordResult(ServiceWorkerMetrics::REQUEST_JOB_ERROR_FETCH_EVENT_DISPATCH);
     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();
+      fall_back_required_ = true;
+      CreateResponseHeader(400, "Service Worker Fallback Required",
+                           ServiceWorkerHeaderMap());
+      CommitResponseHeader();
     } else {
       DeliverErrorResponse();
     }
     return;
   }
 
   if (fetch_result == SERVICE_WORKER_FETCH_EVENT_RESULT_FALLBACK) {
     ServiceWorkerMetrics::RecordFallbackedRequestMode(request_mode_);
     // When the request_mode is |CORS| or |CORS-with-forced-preflight| and the
     // origin of the request URL is different from the security origin of the
@@ skipping 194 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