ServiceWorker: Move worker candidate process knowledge to ServiceWorkerProcessManager.

content/browser/service_worker/embedded_worker_instance_unittest.cc

Index: content/browser/service_worker/embedded_worker_instance_unittest.cc
diff --git a/content/browser/service_worker/embedded_worker_instance_unittest.cc b/content/browser/service_worker/embedded_worker_instance_unittest.cc
index 7f1fcca080864f7ae814697fddf9f92c5aa7d528..be2fb59636a8ec54e5d2083ee7c9367f4bf64c98 100644
--- a/content/browser/service_worker/embedded_worker_instance_unittest.cc
+++ b/content/browser/service_worker/embedded_worker_instance_unittest.cc
@@ -60,23 +60,21 @@ TEST_F(EmbeddedWorkerInstanceTest, StartAndStop) {
       embedded_worker_registry()->CreateWorker();
   EXPECT_EQ(EmbeddedWorkerInstance::STOPPED, worker->status());
 
-  const int embedded_worker_id = worker->embedded_worker_id();
   const int64 service_worker_version_id = 55L;
-  const GURL scope("http://example.com/");
+  const GURL pattern("http://example.com/");
   const GURL url("http://example.com/worker.js");
 
-  // Simulate adding one process to the worker.
-  helper_->SimulateAddProcessToWorker(embedded_worker_id, kRenderProcessId);
+  // Simulate adding one process to the pattern.
+  helper_->SimulateAddProcessToPattern(pattern, kRenderProcessId);
 
   // Start should succeed.
   ServiceWorkerStatusCode status;
   base::RunLoop run_loop;
   worker->Start(
       service_worker_version_id,
-      scope,
+      pattern,
       url,
       false,
-      std::vector<int>(),
       base::Bind(&SaveStatusAndCall, &status, run_loop.QuitClosure()));
   run_loop.Run();
   EXPECT_EQ(SERVICE_WORKER_OK, status);
@@ -108,20 +106,19 @@ TEST_F(EmbeddedWorkerInstanceTest, InstanceDestroyedBeforeStartFinishes) {
   EXPECT_EQ(EmbeddedWorkerInstance::STOPPED, worker->status());
 
   const int64 service_worker_version_id = 55L;
-  const GURL scope("http://example.com/");
+  const GURL pattern("http://example.com/");
   const GURL url("http://example.com/worker.js");
 
   ServiceWorkerStatusCode status;
   base::RunLoop run_loop;
   // Begin starting the worker.
-  std::vector<int> available_process;
-  available_process.push_back(kRenderProcessId);
+  context()->process_manager()->AddProcessReferenceToPattern(
+      pattern, kRenderProcessId);
   worker->Start(
       service_worker_version_id,
-      scope,
+      pattern,
       url,
       false,
-      available_process,
       base::Bind(&SaveStatusAndCall, &status, run_loop.QuitClosure()));
   // But destroy it before it gets a chance to complete.
   worker.reset();
@@ -133,38 +130,4 @@ TEST_F(EmbeddedWorkerInstanceTest, InstanceDestroyedBeforeStartFinishes) {
       ipc_sink()->GetUniqueMessageMatching(EmbeddedWorkerMsg_StartWorker::ID));
 }
 
-TEST_F(EmbeddedWorkerInstanceTest, SortProcesses) {
-  scoped_ptr<EmbeddedWorkerInstance> worker =
-      embedded_worker_registry()->CreateWorker();
-  EXPECT_EQ(EmbeddedWorkerInstance::STOPPED, worker->status());
-
-  // Simulate adding processes to the worker.
-  // Process 1 has 1 ref, 2 has 2 refs and 3 has 3 refs.
-  const int embedded_worker_id = worker->embedded_worker_id();
-  helper_->SimulateAddProcessToWorker(embedded_worker_id, 1);
-  helper_->SimulateAddProcessToWorker(embedded_worker_id, 2);
-  helper_->SimulateAddProcessToWorker(embedded_worker_id, 2);
-  helper_->SimulateAddProcessToWorker(embedded_worker_id, 3);
-  helper_->SimulateAddProcessToWorker(embedded_worker_id, 3);
-  helper_->SimulateAddProcessToWorker(embedded_worker_id, 3);
-
-  // Process 3 has the biggest # of references and it should be chosen.
-  EXPECT_THAT(worker->SortProcesses(std::vector<int>()),
-              testing::ElementsAre(3, 2, 1));
-  EXPECT_EQ(-1, worker->process_id());
-
-  // Argument processes are added to the existing set, but only for a single
-  // call.
-  std::vector<int> registering_processes;
-  registering_processes.push_back(1);
-  registering_processes.push_back(1);
-  registering_processes.push_back(1);
-  registering_processes.push_back(4);
-  EXPECT_THAT(worker->SortProcesses(registering_processes),
-              testing::ElementsAre(1, 3, 2, 4));
-
-  EXPECT_THAT(worker->SortProcesses(std::vector<int>()),
-              testing::ElementsAre(3, 2, 1));
-}
-
 }  // namespace content