content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc - Issue 1223193009: WIP attempt to replace StartWorker/StopWorker IPCs with a new mojo EmbeddedWorker service.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1223193009: WIP attempt to replace StartWorker/StopWorker IPCs with a new mojo EmbeddedWorker service. Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-event-dispatching-option2

Patch Set: Created 5 years, 5 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/service_worker_context_unittest.cc ('k') | content/browser/service_worker/service_worker_dispatcher_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc

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

index cc8ceaf29d15b591cb312267ef815abee7a50169..91e57a9f5a7a40ea4499a6568870444eb665c8b1 100644

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

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

@@ -30,7 +30,6 @@ namespace content {

namespace {

-int kMockRenderProcessId = 1224;

int kMockProviderId = 1;

void EmptyCallback() {}

@@ -43,8 +42,7 @@ class ServiceWorkerControlleeRequestHandlerTest : public testing::Test {

: browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {}

void SetUp() override {

- helper_.reset(

- new EmbeddedWorkerTestHelper(base::FilePath(), kMockRenderProcessId));

+ helper_.reset(new EmbeddedWorkerTestHelper(base::FilePath()));

// A new unstored registration/version.

scope_ = GURL("http://host/scope/");

@@ -61,7 +59,7 @@ class ServiceWorkerControlleeRequestHandlerTest : public testing::Test {

// An empty host.

scoped_ptr<ServiceWorkerProviderHost> host(new ServiceWorkerProviderHost(

- kMockRenderProcessId, MSG_ROUTING_NONE, kMockProviderId,

+ helper_->mock_render_process_id(), MSG_ROUTING_NONE, kMockProviderId,

SERVICE_WORKER_PROVIDER_FOR_WINDOW, context()->AsWeakPtr(), NULL));

provider_host_ = host->AsWeakPtr();

context()->AddProviderHost(host.Pass());

@@ -236,7 +234,8 @@ TEST_F(ServiceWorkerControlleeRequestHandlerTest, DeletedProviderHost) {

// Shouldn't crash if the ProviderHost is deleted prior to completion of

// the database lookup.

- context()->RemoveProviderHost(kMockRenderProcessId, kMockProviderId);

+ context()->RemoveProviderHost(helper_->mock_render_process_id(),

+ kMockProviderId);

EXPECT_FALSE(provider_host_.get());

base::RunLoop().RunUntilIdle();

EXPECT_TRUE(sw_job->ShouldFallbackToNetwork());