Start EmbeddedWorker during registration - take 2

content/child/service_worker/service_worker_dispatcher.cc

Index: content/child/service_worker/service_worker_dispatcher.cc
diff --git a/content/child/service_worker/service_worker_dispatcher.cc b/content/child/service_worker/service_worker_dispatcher.cc
index def3a44eeec11f8ddde4dbf226dafb8c18c9269c..33107e51765bfbf10ea5c685bc675d0aeef782e1 100644
--- a/content/child/service_worker/service_worker_dispatcher.cc
+++ b/content/child/service_worker/service_worker_dispatcher.cc
@@ -62,20 +62,22 @@ bool ServiceWorkerDispatcher::Send(IPC::Message* msg) {
 void ServiceWorkerDispatcher::RegisterServiceWorker(
     const GURL& pattern,
     const GURL& script_url,
+    int provider_id,
     WebServiceWorkerProvider::WebServiceWorkerCallbacks* callbacks) {
   DCHECK(callbacks);
   int request_id = pending_callbacks_.Add(callbacks);
   thread_safe_sender_->Send(new ServiceWorkerHostMsg_RegisterServiceWorker(
-      CurrentWorkerId(), request_id, pattern, script_url));
+      CurrentWorkerId(), request_id, provider_id, pattern, script_url));
 }
 
 void ServiceWorkerDispatcher::UnregisterServiceWorker(
     const GURL& pattern,
+    int provider_id,
     WebServiceWorkerProvider::WebServiceWorkerCallbacks* callbacks) {
   DCHECK(callbacks);
   int request_id = pending_callbacks_.Add(callbacks);
   thread_safe_sender_->Send(new ServiceWorkerHostMsg_UnregisterServiceWorker(
-      CurrentWorkerId(), request_id, pattern));
+      CurrentWorkerId(), request_id, provider_id, pattern));
 }
 
 ServiceWorkerDispatcher* ServiceWorkerDispatcher::ThreadSpecificInstance(