Reland of [ServiceWorker] Mojofy PushEvent of Service Worker.

content/browser/service_worker/embedded_worker_test_helper.cc

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 93abef456f330cac6d41d9a786eb8b32b5f68e41..cadcdf5ac16d7ae68e8a20054cbbf6ae6558344a 100644
--- a/content/browser/service_worker/embedded_worker_test_helper.cc
+++ b/content/browser/service_worker/embedded_worker_test_helper.cc
@@ -162,6 +162,13 @@ class EmbeddedWorkerTestHelper::MockServiceWorkerEventDispatcher
                               std::move(preload_handle), callback);
   }
 
+  void DispatchPushEvent(const PushEventPayload& payload,
+                         const DispatchPushEventCallback& callback) override {
+    if (!helper_)
+      return;
+    helper_->OnPushEventStub(payload, callback);
+  }
+
   void DispatchSyncEvent(
       const std::string& tag,
       blink::mojom::BackgroundSyncEventLastChance last_chance,
@@ -320,7 +327,6 @@ bool EmbeddedWorkerTestHelper::OnMessageToWorker(int thread_id,
   IPC_BEGIN_MESSAGE_MAP(EmbeddedWorkerTestHelper, message)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_ActivateEvent, OnActivateEventStub)
     IPC_MESSAGE_HANDLER(ServiceWorkerMsg_InstallEvent, OnInstallEventStub)
-    IPC_MESSAGE_HANDLER(ServiceWorkerMsg_PushEvent, OnPushEventStub)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   // Record all messages directed to inner script context.
@@ -374,12 +380,11 @@ void EmbeddedWorkerTestHelper::OnFetchEvent(
   callback.Run(SERVICE_WORKER_OK, base::Time::Now());
 }
 
-void EmbeddedWorkerTestHelper::OnPushEvent(int embedded_worker_id,
-                                           int request_id,
-                                           const PushEventPayload& payload) {
-  SimulateSend(new ServiceWorkerHostMsg_PushEventFinished(
-      embedded_worker_id, request_id,
-      blink::WebServiceWorkerEventResultCompleted, base::Time::Now()));
+void EmbeddedWorkerTestHelper::OnPushEvent(
+    const PushEventPayload& payload,
+    const mojom::ServiceWorkerEventDispatcher::DispatchPushEventCallback&
+        callback) {
+  callback.Run(SERVICE_WORKER_OK, base::Time::Now());
 }
 
 void EmbeddedWorkerTestHelper::SimulateWorkerReadyForInspection(
@@ -532,11 +537,12 @@ void EmbeddedWorkerTestHelper::OnFetchEventStub(
 }
 
 void EmbeddedWorkerTestHelper::OnPushEventStub(
-    int request_id,
-    const PushEventPayload& payload) {
+    const PushEventPayload& payload,
+    const mojom::ServiceWorkerEventDispatcher::DispatchPushEventCallback&
+        callback) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&EmbeddedWorkerTestHelper::OnPushEvent, AsWeakPtr(),
-                            current_embedded_worker_id_, request_id, payload));
+                            payload, callback));
 }
 
 EmbeddedWorkerRegistry* EmbeddedWorkerTestHelper::registry() {