Add CHECKs to investigate ServiceWorkerControlleeRequestHandler crash.

content/browser/service_worker/service_worker_provider_host.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/browser/service_worker/service_worker_provider_host.h"
 
 #include <utility>
 
 #include "base/guid.h"
 #include "base/stl_util.h"
@@ skipping 64 matching lines @@
     ServiceWorkerDispatcherHost* dispatcher_host)
     : client_uuid_(base::GenerateGUID()),
       render_process_id_(render_process_id),
       route_id_(route_id),
       render_thread_id_(kDocumentMainThreadId),
       provider_id_(provider_id),
       provider_type_(provider_type),
       parent_frame_security_level_(parent_frame_security_level),
       context_(context),
       dispatcher_host_(dispatcher_host),
-      allow_association_(true) {
+      allow_association_(true),
+      controller_was_deleted_(false) {
   DCHECK_NE(SERVICE_WORKER_PROVIDER_UNKNOWN, provider_type_);
 
   // PlzNavigate
   CHECK(render_process_id != ChildProcessHost::kInvalidUniqueID ||
         IsBrowserSideNavigationEnabled());
 
   if (provider_type_ == SERVICE_WORKER_PROVIDER_FOR_CONTROLLER) {
     // Actual thread id is set when the service worker context gets started.
     render_thread_id_ = kInvalidEmbeddedWorkerThreadId;
   }
@@ skipping 71 matching lines @@
 void ServiceWorkerProviderHost::OnSkippedWaiting(
     ServiceWorkerRegistration* registration) {
   if (associated_registration_ != registration)
     return;
   // A client is "using" a registration if it is controlled by the active
   // worker of the registration. skipWaiting doesn't cause a client to start
   // using the registration.
   if (!controlling_version_)
     return;
   ServiceWorkerVersion* active_version = registration->active_version();
+  // TODO(falken): Change to DCHECK once https://crbug.com/655910 is
+  // resolved.
+  CHECK(active_version);
   DCHECK_EQ(active_version->status(), ServiceWorkerVersion::ACTIVATING);
   SetControllerVersionAttribute(active_version,
                                 true /* notify_controllerchange */);
 }
 
 void ServiceWorkerProviderHost::SetDocumentUrl(const GURL& url) {
   DCHECK(!url.has_ref());
   document_url_ = url;
   if (IsProviderForClient())
     SyncMatchingRegistrations();
@@ skipping 126 matching lines @@
   for (; it != matching_registrations_.rend(); ++it) {
     if (it->second->is_uninstalled())
       continue;
     if (it->second->is_uninstalling())
       return nullptr;
     return it->second.get();
   }
   return nullptr;
 }
 
-void ServiceWorkerProviderHost::NotifyControllerLost() {
+void ServiceWorkerProviderHost::NotifyControllerLost(bool was_deleted) {
+  if (was_deleted)
+    controller_was_deleted_ = true;
   SetControllerVersionAttribute(nullptr, true /* notify_controllerchange */);
 }
 
 std::unique_ptr<ServiceWorkerRequestHandler>
 ServiceWorkerProviderHost::CreateRequestHandler(
     FetchRequestMode request_mode,
     FetchCredentialsMode credentials_mode,
     FetchRedirectMode redirect_mode,
     ResourceType resource_type,
     RequestContextType request_context_type,
@@ skipping 70 matching lines @@
 }
 
 void ServiceWorkerProviderHost::AddScopedProcessReferenceToPattern(
     const GURL& pattern) {
   associated_patterns_.push_back(pattern);
   IncreaseProcessReference(pattern);
 }
 
 void ServiceWorkerProviderHost::ClaimedByRegistration(
     ServiceWorkerRegistration* registration) {
-  DCHECK(registration->active_version());
+  // TODO(falken): Change to DCHECK once https://crbug.com/655910 is resolved.
+  CHECK(registration->active_version());
   if (registration == associated_registration_) {
     SetControllerVersionAttribute(registration->active_version(),
                                   true /* notify_controllerchange */);
   } else if (allow_association_) {
     DisassociateRegistration();
     AssociateRegistration(registration, true /* notify_controllerchange */);
   }
 }
 
 bool ServiceWorkerProviderHost::GetRegistrationForReady(
@@ skipping 249 matching lines @@
       Send(new ServiceWorkerMsg_SetControllerServiceWorker(
           render_thread_id_, provider_id(),
           GetOrCreateServiceWorkerHandle(
               associated_registration_->active_version()),
           false /* shouldNotifyControllerChange */));
     }
   }
 }
 
 }  // namespace content