Index: content/browser/service_worker/service_worker_job_unittest.cc |
diff --git a/content/browser/service_worker/service_worker_job_unittest.cc b/content/browser/service_worker/service_worker_job_unittest.cc |
index 985da5f1a1aab547f65048f5d0b757860f97e65c..233949e3bf7a41f3b4d639541e752c7b2ff5f12f 100644 |
--- a/content/browser/service_worker/service_worker_job_unittest.cc |
+++ b/content/browser/service_worker/service_worker_job_unittest.cc |
@@ -12,6 +12,7 @@ |
#include "base/test/test_simple_task_runner.h" |
#include "content/browser/browser_thread_impl.h" |
#include "content/browser/service_worker/embedded_worker_registry.h" |
+#include "content/browser/service_worker/embedded_worker_status.h" |
#include "content/browser/service_worker/embedded_worker_test_helper.h" |
#include "content/browser/service_worker/service_worker_context_core.h" |
#include "content/browser/service_worker/service_worker_context_wrapper.h" |
@@ -657,15 +658,14 @@ TEST_F(ServiceWorkerJobTest, UnregisterWaitingSetsRedundant) { |
version->SetStatus(ServiceWorkerVersion::INSTALLED); |
registration->SetWaitingVersion(version); |
- EXPECT_EQ(ServiceWorkerVersion::RUNNING, |
- version->running_status()); |
+ EXPECT_EQ(EmbeddedWorkerStatus::RUNNING, version->running_status()); |
EXPECT_EQ(ServiceWorkerVersion::INSTALLED, version->status()); |
RunUnregisterJob(GURL("http://www.example.com/")); |
// The version should be stopped since there is no controllee after |
// unregistration. |
- EXPECT_EQ(ServiceWorkerVersion::STOPPED, version->running_status()); |
+ EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, version->running_status()); |
EXPECT_EQ(ServiceWorkerVersion::REDUNDANT, version->status()); |
} |
@@ -678,14 +678,14 @@ TEST_F(ServiceWorkerJobTest, UnregisterActiveSetsRedundant) { |
ASSERT_TRUE(registration.get()); |
scoped_refptr<ServiceWorkerVersion> version = registration->active_version(); |
- EXPECT_EQ(ServiceWorkerVersion::RUNNING, version->running_status()); |
+ EXPECT_EQ(EmbeddedWorkerStatus::RUNNING, version->running_status()); |
EXPECT_EQ(ServiceWorkerVersion::ACTIVATED, version->status()); |
RunUnregisterJob(GURL("http://www.example.com/")); |
// The version should be stopped since there is no controllee after |
// unregistration. |
- EXPECT_EQ(ServiceWorkerVersion::STOPPED, version->running_status()); |
+ EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, version->running_status()); |
EXPECT_EQ(ServiceWorkerVersion::REDUNDANT, version->status()); |
} |
@@ -702,20 +702,20 @@ TEST_F(ServiceWorkerJobTest, |
registration->active_version()->AddControllee(host.get()); |
scoped_refptr<ServiceWorkerVersion> version = registration->active_version(); |
- EXPECT_EQ(ServiceWorkerVersion::RUNNING, version->running_status()); |
+ EXPECT_EQ(EmbeddedWorkerStatus::RUNNING, version->running_status()); |
EXPECT_EQ(ServiceWorkerVersion::ACTIVATED, version->status()); |
RunUnregisterJob(GURL("http://www.example.com/")); |
// The version should be running since there is still a controllee. |
- EXPECT_EQ(ServiceWorkerVersion::RUNNING, version->running_status()); |
+ EXPECT_EQ(EmbeddedWorkerStatus::RUNNING, version->running_status()); |
EXPECT_EQ(ServiceWorkerVersion::ACTIVATED, version->status()); |
registration->active_version()->RemoveControllee(host.get()); |
base::RunLoop().RunUntilIdle(); |
// The version should be stopped since there is no controllee. |
- EXPECT_EQ(ServiceWorkerVersion::STOPPED, version->running_status()); |
+ EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, version->running_status()); |
EXPECT_EQ(ServiceWorkerVersion::REDUNDANT, version->status()); |
} |
@@ -1252,7 +1252,7 @@ TEST_F(ServiceWorkerJobTest, RegisterWhileUninstalling) { |
// Verify the new version is installed but not activated yet. |
EXPECT_EQ(NULL, registration->installing_version()); |
EXPECT_TRUE(new_version); |
- EXPECT_EQ(ServiceWorkerVersion::RUNNING, new_version->running_status()); |
+ EXPECT_EQ(EmbeddedWorkerStatus::RUNNING, new_version->running_status()); |
EXPECT_EQ(ServiceWorkerVersion::INSTALLED, new_version->status()); |
old_version->RemoveControllee(host.get()); |
@@ -1269,7 +1269,7 @@ TEST_F(ServiceWorkerJobTest, RegisterWhileUninstalling) { |
runner->RunUntilIdle(); |
base::RunLoop().RunUntilIdle(); |
- EXPECT_EQ(ServiceWorkerVersion::RUNNING, new_version->running_status()); |
+ EXPECT_EQ(EmbeddedWorkerStatus::RUNNING, new_version->running_status()); |
EXPECT_EQ(ServiceWorkerVersion::ACTIVATED, new_version->status()); |
} |
@@ -1304,9 +1304,9 @@ TEST_F(ServiceWorkerJobTest, RegisterAndUnregisterWhileUninstalling) { |
EXPECT_TRUE(registration->is_uninstalling()); |
EXPECT_EQ(old_version, registration->active_version()); |
- EXPECT_EQ(ServiceWorkerVersion::RUNNING, old_version->running_status()); |
+ EXPECT_EQ(EmbeddedWorkerStatus::RUNNING, old_version->running_status()); |
EXPECT_EQ(ServiceWorkerVersion::ACTIVATED, old_version->status()); |
- EXPECT_EQ(ServiceWorkerVersion::RUNNING, new_version->running_status()); |
+ EXPECT_EQ(EmbeddedWorkerStatus::RUNNING, new_version->running_status()); |
EXPECT_EQ(ServiceWorkerVersion::INSTALLED, new_version->status()); |
old_version->RemoveControllee(host.get()); |
@@ -1315,9 +1315,9 @@ TEST_F(ServiceWorkerJobTest, RegisterAndUnregisterWhileUninstalling) { |
EXPECT_FALSE(registration->is_uninstalling()); |
EXPECT_TRUE(registration->is_uninstalled()); |
- EXPECT_EQ(ServiceWorkerVersion::STOPPED, old_version->running_status()); |
+ EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, old_version->running_status()); |
EXPECT_EQ(ServiceWorkerVersion::REDUNDANT, old_version->status()); |
- EXPECT_EQ(ServiceWorkerVersion::STOPPED, new_version->running_status()); |
+ EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, new_version->running_status()); |
EXPECT_EQ(ServiceWorkerVersion::REDUNDANT, new_version->status()); |
} |
@@ -1368,7 +1368,7 @@ TEST_F(ServiceWorkerJobTest, RegisterSameScriptMultipleTimesWhileUninstalling) { |
runner->RunUntilIdle(); |
base::RunLoop().RunUntilIdle(); |
- EXPECT_EQ(ServiceWorkerVersion::RUNNING, new_version->running_status()); |
+ EXPECT_EQ(EmbeddedWorkerStatus::RUNNING, new_version->running_status()); |
EXPECT_EQ(ServiceWorkerVersion::ACTIVATED, new_version->status()); |
} |
@@ -1424,7 +1424,7 @@ TEST_F(ServiceWorkerJobTest, RegisterMultipleTimesWhileUninstalling) { |
runner->RunUntilIdle(); |
base::RunLoop().RunUntilIdle(); |
- EXPECT_EQ(ServiceWorkerVersion::RUNNING, third_version->running_status()); |
+ EXPECT_EQ(EmbeddedWorkerStatus::RUNNING, third_version->running_status()); |
EXPECT_EQ(ServiceWorkerVersion::ACTIVATED, third_version->status()); |
} |
@@ -1503,7 +1503,7 @@ TEST_F(ServiceWorkerJobTest, RemoveControlleeDuringInstall) { |
EXPECT_EQ(NULL, registration->installing_version()); |
EXPECT_EQ(NULL, registration->waiting_version()); |
EXPECT_EQ(new_version, registration->active_version()); |
- EXPECT_EQ(ServiceWorkerVersion::RUNNING, new_version->running_status()); |
+ EXPECT_EQ(EmbeddedWorkerStatus::RUNNING, new_version->running_status()); |
EXPECT_EQ(ServiceWorkerVersion::ACTIVATED, new_version->status()); |
EXPECT_EQ(registration, FindRegistrationForPattern(pattern)); |
@@ -1539,7 +1539,7 @@ TEST_F(ServiceWorkerJobTest, RemoveControlleeDuringRejectedInstall) { |
EXPECT_FALSE(registration->is_uninstalling()); |
EXPECT_TRUE(registration->is_uninstalled()); |
- EXPECT_EQ(ServiceWorkerVersion::STOPPED, old_version->running_status()); |
+ EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, old_version->running_status()); |
EXPECT_EQ(ServiceWorkerVersion::REDUNDANT, old_version->status()); |
FindRegistrationForPattern(pattern, SERVICE_WORKER_ERROR_NOT_FOUND); |
@@ -1575,7 +1575,7 @@ TEST_F(ServiceWorkerJobTest, RemoveControlleeDuringInstall_RejectActivate) { |
EXPECT_FALSE(registration->is_uninstalling()); |
EXPECT_FALSE(registration->is_uninstalled()); |
- EXPECT_EQ(ServiceWorkerVersion::STOPPED, old_version->running_status()); |
+ EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, old_version->running_status()); |
EXPECT_EQ(ServiceWorkerVersion::REDUNDANT, old_version->status()); |
FindRegistrationForPattern(pattern, SERVICE_WORKER_OK); |