ServiceWorker: Introduce ExtendableMessageEvent to replace MessageEvent

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 "content/child/service_worker/service_worker_dispatcher.h"
 #include "content/child/service_worker/service_worker_handle_reference.h"
 #include "content/child/service_worker/service_worker_provider_context.h"
 #include "content/child/service_worker/web_service_worker_impl.h"
@@ skipping 28 matching lines @@
   // 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()->AddProviderClient(context_->provider_id(), client);
 
   if (!context_->controller())
     return;
   client->setController(
-      GetDispatcher()->GetServiceWorker(context_->controller()->info(), false),
+      GetDispatcher()->GetServiceWorker(context_->controller()->info(),
+                                        context_->provider_id(), false),
       false /* shouldNotifyControllerChange */);
 }
 
 void WebServiceWorkerProviderImpl::registerServiceWorker(
     const WebURL& pattern,
     const WebURL& script_url,
     WebServiceWorkerRegistrationCallbacks* callbacks) {
   GetDispatcher()->RegisterServiceWorker(
       context_->provider_id(), pattern, script_url, callbacks);
 }
@@ skipping 28 matching lines @@
   if (dispatcher)
     dispatcher->RemoveProviderClient(context_->provider_id());
 }
 
 ServiceWorkerDispatcher* WebServiceWorkerProviderImpl::GetDispatcher() {
   return ServiceWorkerDispatcher::GetOrCreateThreadSpecificInstance(
       thread_safe_sender_.get());
 }
 
 }  // namespace content