Chromium Code Reviews| 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 78e892880dab4a5370f0c83522de85b3dcfe4040..e0243c074fcf82ee7c432b1d29b275005cb10500 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. |
| @@ -1471,13 +1471,14 @@ class EventCallbackHelper : public EmbeddedWorkerTestHelper { |
| install_event_result_(blink::kWebServiceWorkerEventResultCompleted), |
| activate_event_result_(blink::kWebServiceWorkerEventResultCompleted) {} |
| - void OnInstallEvent(int embedded_worker_id, |
| - int request_id) override { |
| + void OnInstallEvent( |
| + 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); |
|
xiaofengzhang
2017/04/28 07:14:24
Delete it because it's useless for the tests that
|
| + std::move(callback).Run(EventResultToStatus(install_event_result_), |
| + has_fetch_handler_, base::Time::Now()); |
| } |
| void OnActivateEvent( |