Set the "waiting" Service Worker of Service Worker providers

content/child/service_worker/web_service_worker_provider_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/child/service_worker/web_service_worker_provider_impl.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/logging.h"
 #include "content/child/child_thread.h"
 #include "content/child/service_worker/service_worker_dispatcher.h"
@@ skipping 29 matching lines @@
     return;
   }
 
   // TODO(kinuko): Here we could also register the current thread ID
   // on the provider context so that multiple WebServiceWorkerProviderImpl
   // (e.g. on document and on dedicated workers) can properly share
   // the single provider context across threads. (http://crbug.com/366538
   // for more context)
   GetDispatcher()->AddScriptClient(provider_id_, client);
 
-  int handle_id = context_->current_handle_id();
-  if (handle_id == kInvalidServiceWorkerHandleId)
-    return;
+  if (context_->waiting_handle_id() != kInvalidServiceWorkerHandleId) {
+    client->setWaiting(
+        GetDispatcher()->GetServiceWorker(context_->waiting()->info(), false));
+  }
 
-  client->setCurrentServiceWorker(
-      GetDispatcher()->GetServiceWorker(context_->current()->info(), false));
+  if (context_->current_handle_id() != kInvalidServiceWorkerHandleId) {
+    client->setController(
+        GetDispatcher()->GetServiceWorker(context_->current()->info(), false));
+  }
 }
 
 void WebServiceWorkerProviderImpl::registerServiceWorker(
     const WebURL& pattern,
     const WebURL& script_url,
     WebServiceWorkerCallbacks* callbacks) {
   GetDispatcher()->RegisterServiceWorker(
       provider_id_, pattern, script_url, callbacks);
 }
 
@@ skipping 12 matching lines @@
   if (dispatcher)
     dispatcher->RemoveScriptClient(provider_id_);
 }
 
 ServiceWorkerDispatcher* WebServiceWorkerProviderImpl::GetDispatcher() {
   return ServiceWorkerDispatcher::GetOrCreateThreadSpecificInstance(
       thread_safe_sender_);
 }
 
 }  // namespace content