| 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 244b5f9344c77741486b7a449a67d0219a739d88..1b9801cb30b8cf83281e3c9053e417a060b426b6 100644
|
| --- a/content/browser/service_worker/embedded_worker_instance_unittest.cc
|
| +++ b/content/browser/service_worker/embedded_worker_instance_unittest.cc
|
| @@ -55,12 +55,11 @@ static void SaveStatusAndCall(ServiceWorkerStatusCode* out,
|
|
|
| TEST_F(EmbeddedWorkerInstanceTest, StartAndStop) {
|
| scoped_ptr<EmbeddedWorkerInstance> worker =
|
| - embedded_worker_registry()->CreateWorker();
|
| + embedded_worker_registry()->CreateWorker(GURL("http://example.com/*"));
|
| 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 url("http://example.com/worker.js");
|
|
|
| // Simulate adding one process to the worker.
|
| @@ -71,7 +70,6 @@ TEST_F(EmbeddedWorkerInstanceTest, StartAndStop) {
|
| base::RunLoop run_loop;
|
| worker->Start(
|
| service_worker_version_id,
|
| - scope,
|
| url,
|
| std::vector<int>(),
|
| base::Bind(&SaveStatusAndCall, &status, run_loop.QuitClosure()));
|
| @@ -101,11 +99,10 @@ TEST_F(EmbeddedWorkerInstanceTest, StartAndStop) {
|
|
|
| TEST_F(EmbeddedWorkerInstanceTest, InstanceDestroyedBeforeStartFinishes) {
|
| scoped_ptr<EmbeddedWorkerInstance> worker =
|
| - embedded_worker_registry()->CreateWorker();
|
| + embedded_worker_registry()->CreateWorker(GURL("http://example.com/*"));
|
| EXPECT_EQ(EmbeddedWorkerInstance::STOPPED, worker->status());
|
|
|
| const int64 service_worker_version_id = 55L;
|
| - const GURL scope("http://example.com/*");
|
| const GURL url("http://example.com/worker.js");
|
|
|
| ServiceWorkerStatusCode status;
|
| @@ -115,7 +112,6 @@ TEST_F(EmbeddedWorkerInstanceTest, InstanceDestroyedBeforeStartFinishes) {
|
| available_process.push_back(kRenderProcessId);
|
| worker->Start(
|
| service_worker_version_id,
|
| - scope,
|
| url,
|
| available_process,
|
| base::Bind(&SaveStatusAndCall, &status, run_loop.QuitClosure()));
|
| @@ -131,7 +127,7 @@ TEST_F(EmbeddedWorkerInstanceTest, InstanceDestroyedBeforeStartFinishes) {
|
|
|
| TEST_F(EmbeddedWorkerInstanceTest, ChooseProcess) {
|
| scoped_ptr<EmbeddedWorkerInstance> worker =
|
| - embedded_worker_registry()->CreateWorker();
|
| + embedded_worker_registry()->CreateWorker(GURL("http://example.com/*"));
|
| EXPECT_EQ(EmbeddedWorkerInstance::STOPPED, worker->status());
|
|
|
| // Simulate adding processes to the worker.
|
| @@ -149,7 +145,6 @@ TEST_F(EmbeddedWorkerInstanceTest, ChooseProcess) {
|
| base::RunLoop run_loop;
|
| worker->Start(
|
| 1L,
|
| - GURL("http://example.com/*"),
|
| GURL("http://example.com/worker.js"),
|
| std::vector<int>(),
|
| base::Bind(&SaveStatusAndCall, &status, run_loop.QuitClosure()));
|
|
|