[ServiceWorker] Mojofy InstallEvent of Service Worker

content/browser/service_worker/embedded_worker_test_helper.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_EMBEDDED_WORKER_TEST_HELPER_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_EMBEDDED_WORKER_TEST_HELPER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 44 matching lines @@
 // also returns success for event messages (e.g. InstallEvent, FetchEvent).
 //
 // Alternatively consumers can subclass this helper and override On*()
 // methods to add their own logic/verification code.
 //
 // See embedded_worker_instance_unittest.cc for example usages.
 //
 class EmbeddedWorkerTestHelper : public IPC::Sender,
                                  public IPC::Listener {
  public:
-  enum class Event { Activate };
+  enum class Event { Install, Activate };
   using FetchCallback =
       base::Callback<void(ServiceWorkerStatusCode,
                           base::Time /* dispatch_event_time */)>;
 
   class MockEmbeddedWorkerInstanceClient
       : public mojom::EmbeddedWorkerInstanceClient {
    public:
     explicit MockEmbeddedWorkerInstanceClient(
         base::WeakPtr<EmbeddedWorkerTestHelper> helper);
     ~MockEmbeddedWorkerInstanceClient() override;
@@ skipping 40 matching lines @@
   // Register a mojo endpoint object derived from
   // MockEmbeddedWorkerInstanceClient.
   void RegisterMockInstanceClient(
       std::unique_ptr<MockEmbeddedWorkerInstanceClient> client);
 
   template <typename MockType, typename... Args>
   MockType* CreateAndRegisterMockInstanceClient(Args&&... args);
 
   // 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_; }
 
   std::vector<std::unique_ptr<MockEmbeddedWorkerInstanceClient>>*
   mock_instance_clients() {
     return &mock_instance_clients_;
   }
 
   ServiceWorkerContextCore* context();
   ServiceWorkerContextWrapper* context_wrapper() { return wrapper_.get(); }
@@ skipping 31 matching lines @@
       int64_t service_worker_version_id,
       const GURL& scope,
       const GURL& script_url,
       bool pause_after_download,
       mojom::ServiceWorkerEventDispatcherRequest request,
       mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo instance_host);
   virtual void OnResumeAfterDownload(int embedded_worker_id);
   // 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
-  // SimulateSendReplyToBrowser.
+  // On*Event handlers.
   virtual void OnActivateEvent(
       const mojom::ServiceWorkerEventDispatcher::DispatchActivateEventCallback&
           callback);
   virtual void OnBackgroundFetchAbortEvent(
       const std::string& tag,
       const mojom::ServiceWorkerEventDispatcher::
           DispatchBackgroundFetchAbortEventCallback& callback);
   virtual void OnBackgroundFetchClickEvent(
       const std::string& tag,
       mojom::BackgroundFetchState state,
       const mojom::ServiceWorkerEventDispatcher::
           DispatchBackgroundFetchClickEventCallback& callback);
   virtual void OnBackgroundFetchFailEvent(
       const std::string& tag,
       const std::vector<BackgroundFetchSettledFetch>& fetches,
       const mojom::ServiceWorkerEventDispatcher::
           DispatchBackgroundFetchFailEventCallback& callback);
   virtual void OnBackgroundFetchedEvent(
       const std::string& tag,
       const std::vector<BackgroundFetchSettledFetch>& fetches,
       const mojom::ServiceWorkerEventDispatcher::
           DispatchBackgroundFetchedEventCallback& callback);
   virtual void OnExtendableMessageEvent(
       mojom::ExtendableMessageEventPtr event,
       const mojom::ServiceWorkerEventDispatcher::
           DispatchExtendableMessageEventCallback& callback);
-  virtual void OnInstallEvent(int embedded_worker_id, int request_id);
+  virtual void OnInstallEvent(
+      const mojom::ServiceWorkerEventDispatcher::DispatchInstallEventCallback&
+          callback);
   virtual void OnFetchEvent(
       int embedded_worker_id,
       int fetch_event_id,
       const ServiceWorkerFetchRequest& request,
       mojom::FetchEventPreloadHandlePtr preload_handle,
       mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       const FetchCallback& finish_callback);
   virtual void OnNotificationClickEvent(
       const std::string& notification_id,
       const PlatformNotificationData& notification_data,
@@ skipping 62 matching lines @@
           DispatchBackgroundFetchFailEventCallback& callback);
   void OnBackgroundFetchedEventStub(
       const std::string& tag,
       const std::vector<BackgroundFetchSettledFetch>& fetches,
       const mojom::ServiceWorkerEventDispatcher::
           DispatchBackgroundFetchedEventCallback& callback);
   void OnExtendableMessageEventStub(
       mojom::ExtendableMessageEventPtr event,
       const mojom::ServiceWorkerEventDispatcher::
           DispatchExtendableMessageEventCallback& callback);
-  void OnInstallEventStub(int request_id);
+  void OnInstallEventStub(
+      const mojom::ServiceWorkerEventDispatcher::DispatchInstallEventCallback&
+          callback);
   void OnFetchEventStub(
       int thread_id,
       int fetch_event_id,
       const ServiceWorkerFetchRequest& request,
       mojom::FetchEventPreloadHandlePtr preload_handle,
       mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       const FetchCallback& finish_callback);
   void OnNotificationClickEventStub(
       const std::string& notification_id,
       const PlatformNotificationData& notification_data,
@@ skipping 16 matching lines @@
       const mojom::ServiceWorkerEventDispatcher::
           DispatchPaymentRequestEventCallback& callback);
 
   std::unique_ptr<TestBrowserContext> browser_context_;
   std::unique_ptr<MockRenderProcessHost> render_process_host_;
   std::unique_ptr<MockRenderProcessHost> new_render_process_host_;
 
   scoped_refptr<ServiceWorkerContextWrapper> wrapper_;
 
   IPC::TestSink sink_;
-  IPC::TestSink inner_sink_;
 
   std::vector<std::unique_ptr<MockEmbeddedWorkerInstanceClient>>
       mock_instance_clients_;
   size_t mock_instance_clients_next_index_;
 
   int next_thread_id_;
   int next_provider_id_;
   int mock_render_process_id_;
   int new_mock_render_process_id_;
 
   std::map<int /* process_id */, scoped_refptr<ServiceWorkerDispatcherHost>>
       dispatcher_hosts_;
 
   std::map<int, int64_t> embedded_worker_id_service_worker_version_id_map_;
   std::map<int /* thread_id */, int /* embedded_worker_id */>
       thread_id_embedded_worker_id_map_;
 
   std::map<
       int /* embedded_worker_id */,
       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_;
 
   DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerTestHelper);
 };
 
 template <typename MockType, typename... Args>
 MockType* EmbeddedWorkerTestHelper::CreateAndRegisterMockInstanceClient(
     Args&&... args) {
   std::unique_ptr<MockType> mock =
       base::MakeUnique<MockType>(std::forward<Args>(args)...);
   MockType* mock_rawptr = mock.get();
   RegisterMockInstanceClient(std::move(mock));
   return mock_rawptr;
 }
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_EMBEDDED_WORKER_TEST_HELPER_H_