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

content/child/service_worker/service_worker_provider_context.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/child/service_worker/service_worker_provider_context.h"
 
 #include "base/thread_task_runner_handle.h"
 #include "content/child/child_thread_impl.h"
 #include "content/child/service_worker/service_worker_dispatcher.h"
 #include "content/child/service_worker/service_worker_handle_reference.h"
@@ skipping 39 matching lines @@
   }
 
   void DisassociateRegistration() override {
     controller_.reset();
     registration_.reset();
   }
 
   void SetController(
       scoped_ptr<ServiceWorkerHandleReference> controller) override {
     DCHECK(registration_);
+    DCHECK(!controller ||
+           controller->handle_id() != kInvalidServiceWorkerHandleId);
     controller_ = controller.Pass();
   }
 
   void GetAssociatedRegistration(
       ServiceWorkerRegistrationObjectInfo* info,
       ServiceWorkerVersionAttributes* attrs) override {
     NOTREACHED();
   }
 
   ServiceWorkerHandleReference* controller() override {
@@ skipping 127 matching lines @@
 
 void ServiceWorkerProviderContext::DestructOnMainThread() const {
   if (!main_thread_task_runner_->RunsTasksOnCurrentThread() &&
       main_thread_task_runner_->DeleteSoon(FROM_HERE, this)) {
     return;
   }
   delete this;
 }
 
 }  // namespace content