[ServiceWorker] Mojofy InstallEvent of Service Worker

content/browser/service_worker/embedded_worker_test_helper.h

Index: content/browser/service_worker/embedded_worker_test_helper.h
diff --git a/content/browser/service_worker/embedded_worker_test_helper.h b/content/browser/service_worker/embedded_worker_test_helper.h
index 041bd972b57a6e3404a9839deba01bdce9dfd4a7..dab73fd5e6ca676d22524a943c9f2e3bd402d94f 100644
--- a/content/browser/service_worker/embedded_worker_test_helper.h
+++ b/content/browser/service_worker/embedded_worker_test_helper.h
@@ -62,7 +62,7 @@ struct ServiceWorkerFetchRequest;
 class EmbeddedWorkerTestHelper : public IPC::Sender,
                                  public IPC::Listener {
  public:
-  enum class Event { Activate };
+  enum class Event { Install, Activate };
   using FetchCallback =
       base::OnceCallback<void(ServiceWorkerStatusCode,
                               base::Time /* dispatch_event_time */)>;
@@ -123,8 +123,6 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
 
   // IPC sink for EmbeddedWorker messages.
   IPC::TestSink* ipc_sink() { return &sink_; }
-  // Inner IPC sink for script context messages sent via EmbeddedWorker.
-  IPC::TestSink* inner_ipc_sink() { return &inner_sink_; }
 
   std::vector<Event>* dispatched_events() { return &events_; }
 
@@ -176,15 +174,8 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
   // StopWorker IPC handler routed through MockEmbeddedWorkerInstanceClient.
   // This calls SimulateWorkerStopped() by default.
   virtual void OnStopWorker(int embedded_worker_id);
-  // The legacy IPC message handler. This passes the messages to their
-  // respective On*Event handler by default.
-  virtual bool OnMessageToWorker(int thread_id,
-                                 int embedded_worker_id,
-                                 const IPC::Message& message);
-
-  // On*Event handlers. Called by the default implementation of
-  // OnMessageToWorker when events are sent to the embedded
-  // worker. By default they just return success via
+
+  // On*Event handlers. By default they just return success via
   // SimulateSendReplyToBrowser.
   virtual void OnActivateEvent(
       mojom::ServiceWorkerEventDispatcher::DispatchActivateEventCallback
@@ -212,7 +203,9 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
       mojom::ExtendableMessageEventPtr event,
       mojom::ServiceWorkerEventDispatcher::
           DispatchExtendableMessageEventCallback callback);
-  virtual void OnInstallEvent(int embedded_worker_id, int request_id);
+  virtual void OnInstallEvent(
+      mojom::ServiceWorkerEventDispatcher::DispatchInstallEventCallback
+          callback);
   virtual void OnFetchEvent(
       int embedded_worker_id,
       int fetch_event_id,
@@ -294,7 +287,9 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
       mojom::ExtendableMessageEventPtr event,
       mojom::ServiceWorkerEventDispatcher::
           DispatchExtendableMessageEventCallback callback);
-  void OnInstallEventStub(int request_id);
+  void OnInstallEventStub(
+      mojom::ServiceWorkerEventDispatcher::DispatchInstallEventCallback
+          callback);
   void OnFetchEventStub(
       int thread_id,
       int fetch_event_id,
@@ -330,7 +325,6 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
   scoped_refptr<ServiceWorkerContextWrapper> wrapper_;
 
   IPC::TestSink sink_;
-  IPC::TestSink inner_sink_;
 
   std::vector<std::unique_ptr<MockEmbeddedWorkerInstanceClient>>
       mock_instance_clients_;
@@ -353,9 +347,6 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
       mojom::EmbeddedWorkerInstanceHostAssociatedPtr /* instance_host_ptr */>
       embedded_worker_id_instance_host_ptr_map_;
 
-  // Updated each time MessageToWorker message is received.
-  int current_embedded_worker_id_;
-
   std::vector<Event> events_;
 
   base::WeakPtrFactory<EmbeddedWorkerTestHelper> weak_factory_;