ServiceWorker: Move worker candidate process knowledge to ServiceWorkerProcessManager.

content/browser/service_worker/embedded_worker_instance.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/embedded_worker_instance.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind_helpers.h"
@@ skipping 109 matching lines @@
     NotifyWorkerDestroyed(process_id_, worker_devtools_agent_route_id_);
   if (context_ && process_id_ != -1)
     context_->process_manager()->ReleaseWorkerProcess(embedded_worker_id_);
   registry_->RemoveWorker(process_id_, embedded_worker_id_);
 }
 
 void EmbeddedWorkerInstance::Start(int64 service_worker_version_id,
                                    const GURL& scope,
                                    const GURL& script_url,
                                    bool pause_after_download,
-                                   const std::vector<int>& possible_process_ids,
                                    const StatusCallback& callback) {
   if (!context_) {
     callback.Run(SERVICE_WORKER_ERROR_ABORT);
     return;
   }
   DCHECK(status_ == STOPPED);
   status_ = STARTING;
   scoped_ptr<EmbeddedWorkerMsg_StartWorker_Params> params(
       new EmbeddedWorkerMsg_StartWorker_Params());
   TRACE_EVENT_ASYNC_BEGIN2("ServiceWorker",
                            "EmbeddedWorkerInstance::ProcessAllocate",
                            params.get(),
                            "Scope", scope.spec(),
                            "Script URL", script_url.spec());
   params->embedded_worker_id = embedded_worker_id_;
   params->service_worker_version_id = service_worker_version_id;
   params->scope = scope;
   params->script_url = script_url;
   params->worker_devtools_agent_route_id = MSG_ROUTING_NONE;
   params->pause_after_download = pause_after_download;
   params->wait_for_debugger = false;
   context_->process_manager()->AllocateWorkerProcess(
       embedded_worker_id_,
-      SortProcesses(possible_process_ids),
+      scope,
       script_url,
       base::Bind(&EmbeddedWorkerInstance::RunProcessAllocated,
                  weak_factory_.GetWeakPtr(),
                  context_,
                  base::Passed(&params),
                  callback));
 }
 
 ServiceWorkerStatusCode EmbeddedWorkerInstance::Stop() {
   DCHECK(status_ == STARTING || status_ == RUNNING);
@@ skipping 14 matching lines @@
 ServiceWorkerStatusCode EmbeddedWorkerInstance::SendMessage(
     const IPC::Message& message) {
   DCHECK_NE(kInvalidEmbeddedWorkerThreadId, thread_id_);
   if (status_ != RUNNING && status_ != STARTING)
     return SERVICE_WORKER_ERROR_IPC_FAILED;
   return registry_->Send(process_id_,
                          new EmbeddedWorkerContextMsg_MessageToWorker(
                              thread_id_, embedded_worker_id_, message));
 }
 
-void EmbeddedWorkerInstance::AddProcessReference(int process_id) {
-  ProcessRefMap::iterator found = process_refs_.find(process_id);
-  if (found == process_refs_.end())
-    found = process_refs_.insert(std::make_pair(process_id, 0)).first;
-  ++found->second;
-}
-
-void EmbeddedWorkerInstance::ReleaseProcessReference(int process_id) {
-  ProcessRefMap::iterator found = process_refs_.find(process_id);
-  if (found == process_refs_.end()) {
-    NOTREACHED() << "Releasing unknown process ref " << process_id;
-    return;
-  }
-  if (--found->second == 0)
-    process_refs_.erase(found);
-}
-
 EmbeddedWorkerInstance::EmbeddedWorkerInstance(
     base::WeakPtr<ServiceWorkerContextCore> context,
     int embedded_worker_id)
     : context_(context),
       registry_(context->embedded_worker_registry()),
       embedded_worker_id_(embedded_worker_id),
       status_(STOPPED),
       process_id_(-1),
       thread_id_(kInvalidEmbeddedWorkerThreadId),
       worker_devtools_agent_route_id_(MSG_ROUTING_NONE),
@@ skipping 143 matching lines @@
 }
 
 void EmbeddedWorkerInstance::AddListener(Listener* listener) {
   listener_list_.AddObserver(listener);
 }
 
 void EmbeddedWorkerInstance::RemoveListener(Listener* listener) {
   listener_list_.RemoveObserver(listener);
 }
 
-std::vector<int> EmbeddedWorkerInstance::SortProcesses(
-    const std::vector<int>& possible_process_ids) const {
-  // Add the |possible_process_ids| to the existing process_refs_ since each one
-  // is likely to take a reference once the SW starts up.
-  ProcessRefMap refs_with_new_ids = process_refs_;
-  for (std::vector<int>::const_iterator it = possible_process_ids.begin();
-       it != possible_process_ids.end();
-       ++it) {
-    refs_with_new_ids[*it]++;
-  }
-
-  std::vector<std::pair<int, int> > counted(refs_with_new_ids.begin(),
-                                            refs_with_new_ids.end());
-  // Sort descending by the reference count.
-  std::sort(counted.begin(), counted.end(), SecondGreater());
-
-  std::vector<int> result(counted.size());
-  for (size_t i = 0; i < counted.size(); ++i)
-    result[i] = counted[i].first;
-  return result;
-}
-
 }  // namespace content