content/browser/service_worker/service_worker_context_unittest.cc - Issue 286203008: Revert of Stop ServiceWorker context when no controllee is associated (and when all refs are dropped)

Unified Diff: content/browser/service_worker/service_worker_context_unittest.cc

Issue 286203008: Revert of Stop ServiceWorker context when no controllee is associated (and when all refs are dropped) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/service_worker/embedded_worker_test_helper.cc ('k') | content/browser/service_worker/service_worker_version.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_context_unittest.cc

diff --git a/content/browser/service_worker/service_worker_context_unittest.cc b/content/browser/service_worker/service_worker_context_unittest.cc

index 1afb47d0d7f3eced00de5c1ba736474c6e19ee47..6a8088be9e4a98987f26abfde098b40de3660098 100644

--- a/content/browser/service_worker/service_worker_context_unittest.cc

+++ b/content/browser/service_worker/service_worker_context_unittest.cc

@@ -13,7 +13,6 @@

#include "content/browser/service_worker/service_worker_context_core.h"

#include "content/browser/service_worker/service_worker_registration.h"

#include "content/browser/service_worker/service_worker_storage.h"

-#include "content/common/service_worker/embedded_worker_messages.h"

#include "content/common/service_worker/service_worker_messages.h"

#include "content/public/test/test_browser_thread_bundle.h"

#include "content/public/test/test_utils.h"

@@ -151,15 +150,11 @@

base::RunLoop().RunUntilIdle();

EXPECT_TRUE(called);

- EXPECT_EQ(4UL, helper_->ipc_sink()->message_count());

- EXPECT_TRUE(helper_->ipc_sink()->GetUniqueMessageMatching(

- EmbeddedWorkerMsg_StartWorker::ID));

+ EXPECT_EQ(3UL, helper_->ipc_sink()->message_count());

EXPECT_TRUE(helper_->inner_ipc_sink()->GetUniqueMessageMatching(

ServiceWorkerMsg_InstallEvent::ID));

EXPECT_TRUE(helper_->inner_ipc_sink()->GetUniqueMessageMatching(

ServiceWorkerMsg_ActivateEvent::ID));

- EXPECT_TRUE(helper_->ipc_sink()->GetUniqueMessageMatching(

- EmbeddedWorkerMsg_StopWorker::ID));

EXPECT_NE(kInvalidServiceWorkerRegistrationId, registration_id);

EXPECT_NE(kInvalidServiceWorkerVersionId, version_id);

@@ -194,15 +189,11 @@

base::RunLoop().RunUntilIdle();

EXPECT_TRUE(called);

- EXPECT_EQ(3UL, helper_->ipc_sink()->message_count());

- EXPECT_TRUE(helper_->ipc_sink()->GetUniqueMessageMatching(

- EmbeddedWorkerMsg_StartWorker::ID));

+ EXPECT_EQ(2UL, helper_->ipc_sink()->message_count());

EXPECT_TRUE(helper_->inner_ipc_sink()->GetUniqueMessageMatching(

ServiceWorkerMsg_InstallEvent::ID));

EXPECT_FALSE(helper_->inner_ipc_sink()->GetUniqueMessageMatching(

ServiceWorkerMsg_ActivateEvent::ID));

- EXPECT_TRUE(helper_->ipc_sink()->GetUniqueMessageMatching(

- EmbeddedWorkerMsg_StopWorker::ID));

EXPECT_NE(kInvalidServiceWorkerRegistrationId, registration_id);

EXPECT_NE(kInvalidServiceWorkerVersionId, version_id);

@@ -237,15 +228,11 @@

base::RunLoop().RunUntilIdle();

EXPECT_TRUE(called);

- EXPECT_EQ(4UL, helper_->ipc_sink()->message_count());

- EXPECT_TRUE(helper_->ipc_sink()->GetUniqueMessageMatching(

- EmbeddedWorkerMsg_StartWorker::ID));

+ EXPECT_EQ(3UL, helper_->ipc_sink()->message_count());

EXPECT_TRUE(helper_->inner_ipc_sink()->GetUniqueMessageMatching(

ServiceWorkerMsg_InstallEvent::ID));

EXPECT_TRUE(helper_->inner_ipc_sink()->GetUniqueMessageMatching(

ServiceWorkerMsg_ActivateEvent::ID));

- EXPECT_TRUE(helper_->ipc_sink()->GetUniqueMessageMatching(

- EmbeddedWorkerMsg_StopWorker::ID));

EXPECT_NE(kInvalidServiceWorkerRegistrationId, registration_id);

EXPECT_NE(kInvalidServiceWorkerVersionId, version_id);