[ServiceWorker] Mojofy ActivateEvent 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 fe94ff1a2eea7240bde5b9d42c6df01cff386cd2..80fc297b62dcec994c81f39a0496471d0ad37957 100644
--- a/content/browser/service_worker/embedded_worker_test_helper.h
+++ b/content/browser/service_worker/embedded_worker_test_helper.h
@@ -64,9 +64,11 @@ struct ServiceWorkerFetchRequest;
 class EmbeddedWorkerTestHelper : public IPC::Sender,
                                  public IPC::Listener {
  public:
+  enum class Event { OnActivateEvent, LastEvent };

[shimazu, 2017/02/07 04:43:47]

How about "enum class EventType { Activate, Last };"?

[falken, 2017/02/07 05:19:35]

nit: "LastEvent" doesn't seem used in this patch, so maybe you can just remove
it. Otherwise  "NumTypes" is clearer than "Last". A lot of places in the
codebase use Last to refer to the last type, not the number of types, e.g.:
enum { A, B, C, LAST = C };

[xiaofengzhang, 2017/02/07 06:15:36]

Thanks, I will remove it in this cl, InstallEvent will be added in another one.

   using FetchCallback =
       base::Callback<void(ServiceWorkerStatusCode,
                           base::Time /* dispatch_event_time */)>;
+  const std::vector<Event>& events() const { return events_; }

[shimazu, 2017/02/07 04:43:48]

dispatched_events() might be clearer. 

[xiaofengzhang, 2017/02/07 06:15:36]

Acknowledged.

[xiaofengzhang, 2017/02/15 06:14:44]

Done.

 
   class MockEmbeddedWorkerInstanceClient
       : public mojom::EmbeddedWorkerInstanceClient {
@@ -182,7 +184,9 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
   // OnMessageToWorker when events are sent to the embedded
   // worker. By default they just return success via
   // SimulateSendReplyToBrowser.
-  virtual void OnActivateEvent(int embedded_worker_id, int request_id);
+  virtual void OnActivateEvent(
+      const mojom::ServiceWorkerEventDispatcher::DispatchActivateEventCallback&
+          callback);
   virtual void OnExtendableMessageEvent(
       mojom::ExtendableMessageEventPtr event,
       const mojom::ServiceWorkerEventDispatcher::
@@ -214,6 +218,7 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
   void SimulateSend(IPC::Message* message);
 
   EmbeddedWorkerRegistry* registry();
+  std::vector<Event> events_;
 
  private:
   class MockServiceWorkerEventDispatcher;
@@ -226,7 +231,9 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
   void OnMessageToWorkerStub(int thread_id,
                              int embedded_worker_id,
                              const IPC::Message& message);
-  void OnActivateEventStub(int request_id);
+  void OnActivateEventStub(
+      const mojom::ServiceWorkerEventDispatcher::DispatchActivateEventCallback&
+          callback);
   void OnExtendableMessageEventStub(
       mojom::ExtendableMessageEventPtr event,
       const mojom::ServiceWorkerEventDispatcher::