Start EmbeddedWorker during registration - take 2

content/browser/service_worker/service_worker_context_core.cc

Index: content/browser/service_worker/service_worker_context_core.cc
diff --git a/content/browser/service_worker/service_worker_context_core.cc b/content/browser/service_worker/service_worker_context_core.cc
index 0a30b7bba14fdd075b8344694fbdea823b9a16a9..cd82c9d28e598664e7280e1ee63684f12ec9407c 100644
--- a/content/browser/service_worker/service_worker_context_core.cc
+++ b/content/browser/service_worker/service_worker_context_core.cc
@@ -23,8 +23,10 @@ ServiceWorkerContextCore::ServiceWorkerContextCore(
     const base::FilePath& path,
     quota::QuotaManagerProxy* quota_manager_proxy)
     : storage_(new ServiceWorkerStorage(path, quota_manager_proxy)),
-      job_coordinator_(new ServiceWorkerJobCoordinator(storage_.get())),
-      embedded_worker_registry_(new EmbeddedWorkerRegistry(AsWeakPtr())) {}
+      embedded_worker_registry_(new EmbeddedWorkerRegistry(AsWeakPtr())),
+      job_coordinator_(
+          new ServiceWorkerJobCoordinator(storage_.get(),
+                                          embedded_worker_registry_)) {}
 
 ServiceWorkerContextCore::~ServiceWorkerContextCore() {}
 
@@ -68,12 +70,14 @@ bool ServiceWorkerContextCore::IsEnabled() {
 void ServiceWorkerContextCore::RegisterServiceWorker(
     const GURL& pattern,
     const GURL& script_url,
+    ServiceWorkerProviderHost* source_provider,
     const RegistrationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   job_coordinator_->Register(
       pattern,
       script_url,
+      source_provider,
       base::Bind(&ServiceWorkerContextCore::RegistrationComplete,
                  AsWeakPtr(),
                  callback));
@@ -81,10 +85,11 @@ void ServiceWorkerContextCore::RegisterServiceWorker(
 
 void ServiceWorkerContextCore::UnregisterServiceWorker(
     const GURL& pattern,
+    ServiceWorkerProviderHost* source_provider,
     const UnregistrationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  job_coordinator_->Unregister(pattern, callback);
+  job_coordinator_->Unregister(pattern, source_provider, callback);
 }
 
 void ServiceWorkerContextCore::RegistrationComplete(