ServiceWorker: Move worker candidate process knowledge to ServiceWorkerProcessManager.

content/browser/service_worker/service_worker_register_job.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_register_job.h"
 
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
@@ skipping 40 matching lines @@
       weak_factory_(this) {
   internal_.registration = registration;
 }
 
 ServiceWorkerRegisterJob::~ServiceWorkerRegisterJob() {
   DCHECK(!context_ ||
          phase_ == INITIAL || phase_ == COMPLETE || phase_ == ABORT)
       << "Jobs should only be interrupted during shutdown.";
 }
 
-void ServiceWorkerRegisterJob::AddCallback(const RegistrationCallback& callback,
-                                           int process_id) {
+void ServiceWorkerRegisterJob::AddCallback(
+    const RegistrationCallback& callback,
+    ServiceWorkerProviderHost* provider_host) {
   if (!is_promise_resolved_) {
     callbacks_.push_back(callback);
-    if (process_id != -1 && (phase_ < UPDATE || !new_version()))
-      pending_process_ids_.push_back(process_id);
+    if (provider_host && (phase_ < UPDATE || !new_version()))
+      pending_provider_hosts_.push_back(provider_host->AsWeakPtr());

[michaeln, 2014/09/04 01:26:32]

Why defer till later? Maybe we don't need the pending collection at all.

provider_host->AddScopedProcessReferenceToPattern(pattern_)

[xiang, 2014/09/04 09:18:37]

Yes, you're right, we don't need to pend it anymore.
However SWPH still need to distinguish register callback pattern and associated
registration pattern, So I added AssociatePattern method to SWPH, and used it
here instead.

     return;
   }
   RunSoon(base::Bind(
       callback, promise_resolved_status_,
       promise_resolved_registration_, promise_resolved_version_));
 }
 
 void ServiceWorkerRegisterJob::Start() {
   SetPhase(START);
   ServiceWorkerStorage::FindRegistrationCallback next_step;
@@ skipping 238 matching lines @@
   // "Let serviceWorker be a newly-created ServiceWorker object..." and start
   // the worker.
   set_new_version(new ServiceWorkerVersion(registration(),
                                            script_url_,
                                            context_->storage()->NewVersionId(),
                                            context_));
 
   bool pause_after_download = job_type_ == UPDATE_JOB;
   if (pause_after_download)
     new_version()->embedded_worker()->AddListener(this);
-  new_version()->StartWorkerWithCandidateProcesses(
-      pending_process_ids_,
+  AssociateProviderHostsToPendingRegistration(registration());
+  new_version()->StartWorker(
       pause_after_download,
       base::Bind(&ServiceWorkerRegisterJob::OnStartWorkerFinished,
                  weak_factory_.GetWeakPtr()));
 }
 
 void ServiceWorkerRegisterJob::OnStartWorkerFinished(
     ServiceWorkerStatusCode status) {
   // "If serviceWorker fails to start up..." then reject the promise with an
   // error and abort.
   if (status != SERVICE_WORKER_OK) {
@@ skipping 196 matching lines @@
        !it->IsAtEnd(); it->Advance()) {
     ServiceWorkerProviderHost* host = it->GetProviderHost();
     if (ServiceWorkerUtils::ScopeMatches(registration->pattern(),
                                          host->document_url())) {
       if (host->CanAssociateRegistration(registration))
         host->AssociateRegistration(registration);
     }
   }
 }
 
+void ServiceWorkerRegisterJob::AssociateProviderHostsToPendingRegistration(
+    ServiceWorkerRegistration* registration) {
+  DCHECK(registration);
+  for (std::vector<base::WeakPtr<ServiceWorkerProviderHost> >::iterator it =
+           pending_provider_hosts_.begin();
+       it != pending_provider_hosts_.end(); ++it) {
+    if (*it)
+      (*it)->AssociatePendingRegistration(registration);
+  }
+}
+
 }  // namespace content