Set the "waiting" Service Worker of Service Worker providers

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 "base/stl_util.h"
 #include "content/browser/message_port_message_filter.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_context_request_handler.h"
@@ skipping 37 matching lines @@
   scoped_refptr<ServiceWorkerVersion> previous_version = active_version_;
   active_version_ = version;
   if (version)
     version->AddControllee(this);
   if (previous_version)
     previous_version->RemoveControllee(this);
 
   if (!dispatcher_host_)
     return;  // Could be NULL in some tests.
 
+  dispatcher_host_->Send(new ServiceWorkerMsg_SetCurrentServiceWorker(
+      kDocumentMainThreadId, provider_id(), CreateHandleAndPass(version)));
+}
+
+ServiceWorkerObjectInfo ServiceWorkerProviderHost::CreateHandleAndPass(
+    ServiceWorkerVersion* version) {
   ServiceWorkerObjectInfo info;
   if (context_ && version) {
     scoped_ptr<ServiceWorkerHandle> handle =
         ServiceWorkerHandle::Create(context_, dispatcher_host_,
                                     kDocumentMainThreadId, version);
     info = handle->GetObjectInfo();
     dispatcher_host_->RegisterServiceWorkerHandle(handle.Pass());
   }
-  dispatcher_host_->Send(
-      new ServiceWorkerMsg_SetCurrentServiceWorker(
-          kDocumentMainThreadId, provider_id(), info));
+  return info;
 }
 
 void ServiceWorkerProviderHost::SetWaitingVersion(
     ServiceWorkerVersion* version) {
   if (version == waiting_version_)
     return;
   scoped_refptr<ServiceWorkerVersion> previous_version = waiting_version_;
   waiting_version_ = version;
   if (version)
     version->AddWaitingControllee(this);
   if (previous_version)
     previous_version->RemoveWaitingControllee(this);
 
   if (!dispatcher_host_)
     return;  // Could be NULL in some tests.
 
-  // TODO(kinuko): dispatch pendingchange event to the document.
+  dispatcher_host_->Send(new ServiceWorkerMsg_SetWaitingServiceWorker(
+      kDocumentMainThreadId, provider_id(), CreateHandleAndPass(version)));
 }
 
 bool ServiceWorkerProviderHost::SetHostedVersionId(int64 version_id) {
   if (!context_)
     return true;  // System is shutting down.
   if (active_version_)
     return false;  // Unexpected bad message.
 
   ServiceWorkerVersion* live_version = context_->GetLiveVersion(version_id);
   if (!live_version)
@@ skipping 42 matching lines @@
 
   dispatcher_host_->Send(
       new ServiceWorkerMsg_MessageToDocument(
           kDocumentMainThreadId, provider_id(),
           message,
           sent_message_port_ids,
           new_routing_ids));
 }
 
 }  // namespace content