X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcontent%2Fbrowser%2Fservice_worker%2Fembedded_worker_test_helper.cc;h=edc73b8951075b56fb35ef7e6fbfd090cffdb0f5;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=267ba4f2b6dd2b76b047786dad21bf84bfa1e18a;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/content/browser/service_worker/embedded_worker_test_helper.cc b/src/content/browser/service_worker/embedded_worker_test_helper.cc index 267ba4f..edc73b8 100644 --- a/src/content/browser/service_worker/embedded_worker_test_helper.cc +++ b/src/content/browser/service_worker/embedded_worker_test_helper.cc @@ -14,16 +14,18 @@ namespace content { EmbeddedWorkerTestHelper::EmbeddedWorkerTestHelper( - ServiceWorkerContextCore* context) + ServiceWorkerContextCore* context, + int mock_render_process_id) : context_(context->AsWeakPtr()), next_thread_id_(0), weak_factory_(this) { + registry()->AddChildProcessSender(mock_render_process_id, this); } EmbeddedWorkerTestHelper::~EmbeddedWorkerTestHelper() { } -void EmbeddedWorkerTestHelper::SimulateAddProcess( +void EmbeddedWorkerTestHelper::SimulateAddProcessToWorker( int embedded_worker_id, int process_id) { EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); @@ -32,14 +34,6 @@ void EmbeddedWorkerTestHelper::SimulateAddProcess( worker->AddProcessReference(process_id); } -void EmbeddedWorkerTestHelper::SimulateRemoveProcess( - int embedded_worker_id, int process_id) { - EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); - ASSERT_TRUE(worker); - registry()->RemoveChildProcessSender(process_id); - worker->ReleaseProcessReference(process_id); -} - bool EmbeddedWorkerTestHelper::Send(IPC::Message* message) { OnMessageReceived(*message); delete message; @@ -79,6 +73,7 @@ void EmbeddedWorkerTestHelper::OnStopWorker(int embedded_worker_id) { void EmbeddedWorkerTestHelper::OnSendMessageToWorker( int thread_id, int embedded_worker_id, + int request_id, const IPC::Message& message) { // Do nothing on the message by default. } @@ -101,8 +96,8 @@ void EmbeddedWorkerTestHelper::SimulateWorkerStopped( } void EmbeddedWorkerTestHelper::SimulateSendMessageToBrowser( - int embedded_worker_id, const IPC::Message& message) { - registry()->OnSendMessageToBrowser(embedded_worker_id, message); + int embedded_worker_id, int request_id, const IPC::Message& message) { + registry()->OnSendMessageToBrowser(embedded_worker_id, request_id, message); } void EmbeddedWorkerTestHelper::OnStartWorkerStub( @@ -134,6 +129,7 @@ void EmbeddedWorkerTestHelper::OnStopWorkerStub(int embedded_worker_id) { void EmbeddedWorkerTestHelper::OnSendMessageToWorkerStub( int thread_id, int embedded_worker_id, + int request_id, const IPC::Message& message) { EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); ASSERT_TRUE(worker != NULL); @@ -144,6 +140,7 @@ void EmbeddedWorkerTestHelper::OnSendMessageToWorkerStub( weak_factory_.GetWeakPtr(), thread_id, embedded_worker_id, + request_id, message)); }