Start EmbeddedWorker during registration - take 2

content/browser/service_worker/service_worker_job_coordinator.cc

Index: content/browser/service_worker/service_worker_job_coordinator.cc
diff --git a/content/browser/service_worker/service_worker_job_coordinator.cc b/content/browser/service_worker/service_worker_job_coordinator.cc
index 58d7e442a585155ce22dd3cd1daa2673958ea6ab..f72187e1bdfd2520816a660e6f3020f706910321 100644
--- a/content/browser/service_worker/service_worker_job_coordinator.cc
+++ b/content/browser/service_worker/service_worker_job_coordinator.cc
@@ -5,6 +5,7 @@
 #include "content/browser/service_worker/service_worker_job_coordinator.h"
 
 #include "base/stl_util.h"
+#include "content/browser/service_worker/embedded_worker_registry.h"
 #include "content/browser/service_worker/service_worker_registration.h"
 
 namespace content {
@@ -12,11 +13,14 @@ namespace content {
 ServiceWorkerJobCoordinator::JobQueue::JobQueue() {}
 
 ServiceWorkerJobCoordinator::JobQueue::~JobQueue() {
+  DCHECK(jobs_.empty()) << "Destroying JobQueue with " << jobs_.size()
+                        << " unfinished jobs";
   STLDeleteElements(&jobs_);
 }
 
 void ServiceWorkerJobCoordinator::JobQueue::Push(
     scoped_ptr<ServiceWorkerRegisterJob> job,
+    int source_process_id,
     const ServiceWorkerRegisterJob::RegistrationCallback& callback) {
   if (jobs_.empty()) {
     job->Start();
@@ -24,9 +28,10 @@ void ServiceWorkerJobCoordinator::JobQueue::Push(
   } else if (!job->Equals(jobs_.back())) {
     jobs_.push_back(job.release());
   }
+  // Note we are releasing 'job' here.
 
   DCHECK(!jobs_.empty());
-  jobs_.back()->AddCallback(callback);
+  jobs_.back()->AddCallback(callback, source_process_id);
 }
 
 void ServiceWorkerJobCoordinator::JobQueue::Pop(ServiceWorkerRegisterJob* job) {
@@ -38,36 +43,47 @@ void ServiceWorkerJobCoordinator::JobQueue::Pop(ServiceWorkerRegisterJob* job) {
 }
 
 ServiceWorkerJobCoordinator::ServiceWorkerJobCoordinator(
-    ServiceWorkerStorage* storage)
-    : storage_(storage), weak_factory_(this) {}
-
-ServiceWorkerJobCoordinator::~ServiceWorkerJobCoordinator() {}
+    ServiceWorkerStorage* storage,
+    EmbeddedWorkerRegistry* worker_registry)
+    : storage_(storage),
+      worker_registry_(worker_registry),
+      weak_factory_(this) {}
+
+ServiceWorkerJobCoordinator::~ServiceWorkerJobCoordinator() {
+  DCHECK(jobs_.empty()) << "Destroying ServiceWorkerJobCoordinator with "
+                        << jobs_.size() << " job queues";
+}
 
 void ServiceWorkerJobCoordinator::Register(
     const GURL& pattern,
     const GURL& script_url,
+    int source_process_id,
     const ServiceWorkerRegisterJob::RegistrationCallback& callback) {
   scoped_ptr<ServiceWorkerRegisterJob> job = make_scoped_ptr(
       new ServiceWorkerRegisterJob(storage_,
+                                   worker_registry_,
                                    this,
                                    pattern,
                                    script_url,
                                    ServiceWorkerRegisterJob::REGISTER));
-  jobs_[pattern].Push(job.Pass(), callback);
+  jobs_[pattern].Push(job.Pass(), source_process_id, callback);
 }
 
 void ServiceWorkerJobCoordinator::Unregister(
     const GURL& pattern,
+    int source_process_id,
     const ServiceWorkerRegisterJob::UnregistrationCallback& callback) {
 
   scoped_ptr<ServiceWorkerRegisterJob> job = make_scoped_ptr(
       new ServiceWorkerRegisterJob(storage_,
+                                   worker_registry_,
                                    this,
                                    pattern,
                                    GURL(),
                                    ServiceWorkerRegisterJob::UNREGISTER));
   jobs_[pattern]
       .Push(job.Pass(),
+            source_process_id,
             base::Bind(&ServiceWorkerJobCoordinator::UnregisterComplete,
                        weak_factory_.GetWeakPtr(),
                        callback));