| Index: content/browser/service_worker/service_worker_job_unittest.cc
|
| diff --git a/content/browser/service_worker/service_worker_job_unittest.cc b/content/browser/service_worker/service_worker_job_unittest.cc
|
| index 0d235ec0b3461f666ec53a2d4398b6570c7d4637..c106a4b715e1ecfb6a229452bd9c99472dac102a 100644
|
| --- a/content/browser/service_worker/service_worker_job_unittest.cc
|
| +++ b/content/browser/service_worker/service_worker_job_unittest.cc
|
| @@ -295,8 +295,8 @@ TEST_F(ServiceWorkerJobTest, Register) {
|
| GURL("http://www.example.com/service_worker.js"));
|
|
|
| ASSERT_NE(scoped_refptr<ServiceWorkerRegistration>(NULL), registration);
|
| - EXPECT_TRUE(helper_->inner_ipc_sink()->GetUniqueMessageMatching(
|
| - ServiceWorkerMsg_InstallEvent::ID));
|
| + EXPECT_EQ(EmbeddedWorkerTestHelper::Event::Install,
|
| + helper_->dispatched_events()->at(0));
|
| }
|
|
|
| // Make sure registrations are cleaned up when they are unregistered.
|
| @@ -1461,13 +1461,14 @@ class EventCallbackHelper : public EmbeddedWorkerTestHelper {
|
| install_event_result_(blink::WebServiceWorkerEventResultCompleted),
|
| activate_event_result_(blink::WebServiceWorkerEventResultCompleted) {}
|
|
|
| - void OnInstallEvent(int embedded_worker_id,
|
| - int request_id) override {
|
| + void OnInstallEvent(
|
| + const mojom::ServiceWorkerEventDispatcher::DispatchInstallEventCallback&
|
| + callback) override {
|
| if (!install_callback_.is_null())
|
| install_callback_.Run();
|
| - SimulateSend(new ServiceWorkerHostMsg_InstallEventFinished(
|
| - embedded_worker_id, request_id, install_event_result_,
|
| - has_fetch_handler_, base::Time::Now()));
|
| + dispatched_events()->push_back(Event::Install);
|
| + callback.Run(EventResultToStatus(install_event_result_), has_fetch_handler_,
|
| + base::Time::Now());
|
| }
|
|
|
| void OnActivateEvent(
|
|
|