Index: content/browser/service_worker/embedded_worker_test_helper.cc |
diff --git a/content/browser/service_worker/embedded_worker_test_helper.cc b/content/browser/service_worker/embedded_worker_test_helper.cc |
index c379c3a4ffc50f55205a6d8465e3d93be292a378..e4f8f4308dfcb1e5c07b8f5b6994f020e8b42357 100644 |
--- a/content/browser/service_worker/embedded_worker_test_helper.cc |
+++ b/content/browser/service_worker/embedded_worker_test_helper.cc |
@@ -150,6 +150,13 @@ class EmbeddedWorkerTestHelper::MockServiceWorkerEventDispatcher |
~MockServiceWorkerEventDispatcher() override {} |
+ void DispatchInstallEvent( |
+ const DispatchInstallEventCallback& callback) override { |
+ if (!helper_) |
+ return; |
+ helper_->OnInstallEventStub(callback); |
+ } |
+ |
void DispatchActivateEvent( |
const DispatchActivateEventCallback& callback) override { |
if (!helper_) |
@@ -361,11 +368,6 @@ bool EmbeddedWorkerTestHelper::OnMessageToWorker(int thread_id, |
int embedded_worker_id, |
const IPC::Message& message) { |
bool handled = true; |
- current_embedded_worker_id_ = embedded_worker_id; |
- IPC_BEGIN_MESSAGE_MAP(EmbeddedWorkerTestHelper, message) |
- IPC_MESSAGE_HANDLER(ServiceWorkerMsg_InstallEvent, OnInstallEventStub) |
- IPC_MESSAGE_UNHANDLED(handled = false) |
- IPC_END_MESSAGE_MAP() |
// Record all messages directed to inner script context. |
inner_sink_.OnMessageReceived(message); |
return handled; |
@@ -385,14 +387,11 @@ void EmbeddedWorkerTestHelper::OnExtendableMessageEvent( |
callback.Run(SERVICE_WORKER_OK, base::Time::Now()); |
} |
-void EmbeddedWorkerTestHelper::OnInstallEvent(int embedded_worker_id, |
- int request_id) { |
- // The installing worker may have been doomed and terminated. |
- if (!registry()->GetWorker(embedded_worker_id)) |
- return; |
- SimulateSend(new ServiceWorkerHostMsg_InstallEventFinished( |
- embedded_worker_id, request_id, |
- blink::WebServiceWorkerEventResultCompleted, true, base::Time::Now())); |
+void EmbeddedWorkerTestHelper::OnInstallEvent( |
+ const mojom::ServiceWorkerEventDispatcher::DispatchInstallEventCallback& |
+ callback) { |
+ dispatched_events()->push_back(Event::Install); |
+ callback.Run(SERVICE_WORKER_OK, true, base::Time::Now()); |
falken
2017/03/14 08:49:26
true /* has_fetch_handler */
xiaofengzhang
2017/04/01 02:27:21
Done.
|
} |
void EmbeddedWorkerTestHelper::OnFetchEvent( |
@@ -579,11 +578,12 @@ void EmbeddedWorkerTestHelper::OnExtendableMessageEventStub( |
AsWeakPtr(), base::Passed(&event), callback)); |
} |
-void EmbeddedWorkerTestHelper::OnInstallEventStub(int request_id) { |
+void EmbeddedWorkerTestHelper::OnInstallEventStub( |
+ const mojom::ServiceWorkerEventDispatcher::DispatchInstallEventCallback& |
+ callback) { |
base::ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, |
- base::Bind(&EmbeddedWorkerTestHelper::OnInstallEvent, AsWeakPtr(), |
- current_embedded_worker_id_, request_id)); |
+ FROM_HERE, base::Bind(&EmbeddedWorkerTestHelper::OnInstallEvent, |
+ AsWeakPtr(), callback)); |
} |
void EmbeddedWorkerTestHelper::OnFetchEventStub( |