content/browser/service_worker/service_worker_browsertest.cc - Issue 238043002: Teach EmbeddedWorkerInstance to create a process when it needs one.

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

Issue 238043002: Teach EmbeddedWorkerInstance to create a process when it needs one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Null out browser_context_ in Shutdown Created 6 years, 8 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_context_core.h » ('j') | content/browser/service_worker/service_worker_context_wrapper.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_browsertest.cc

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

index 60a98499d8cd818b20762b14eaf096129a69b5a0..746f2e3f9aa517a1a78062b4742d49c678c0d175 100644

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

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

@@ -164,9 +164,17 @@ class EmbeddedWorkerBrowserTest : public ServiceWorkerBrowserTest,

const GURL scope = embedded_test_server()->GetURL("/*");

const GURL script_url = embedded_test_server()->GetURL(

"/service_worker/worker.js");

- ServiceWorkerStatusCode status = worker_->Start(

- service_worker_version_id, scope, script_url);

+ std::vector<int> processes;

+ processes.push_back(

+ shell()->web_contents()->GetRenderProcessHost()->GetID());

+ worker_->Start(

+ service_worker_version_id,

+ scope,

+ script_url,

+ processes,

+ base::Bind(&EmbeddedWorkerBrowserTest::StartOnIOThread2, this));

+ }

+ void StartOnIOThread2(ServiceWorkerStatusCode status) {

last_worker_status_ = worker_->status();

EXPECT_EQ(SERVICE_WORKER_OK, status);

EXPECT_EQ(EmbeddedWorkerInstance::STARTING, last_worker_status_);

@@ -320,7 +328,8 @@ class ServiceWorkerVersionBrowserTest : public ServiceWorkerBrowserTest {

void StartOnIOThread(const base::Closure& done,

ServiceWorkerStatusCode* result) {

ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));

- version_->StartWorker(CreateReceiver(BrowserThread::UI, done, result));

+ version_->StartWorker(CreateReceiver(BrowserThread::UI, done, result),

+ std::vector<int>());

}

void InstallOnIOThread(const base::Closure& done,

@@ -596,7 +605,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBlackBoxBrowserTest, Registration) {

public_context()->RegisterServiceWorker(

embedded_test_server()->GetURL("/*"),

embedded_test_server()->GetURL(kWorkerUrl),

- RenderProcessID(),

+ shell()->web_contents()->GetBrowserContext(),

Jeffrey Yasskin 2014/04/25 04:40:33 Since the new ServiceWorker has no ProviderHosts,

base::Bind(&ServiceWorkerBlackBoxBrowserTest::ExpectResultAndRun,

true,

run_loop.QuitClosure()));

@@ -610,7 +619,7 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerBlackBoxBrowserTest, Registration) {