[ServiceWorker] Mojofy ActivateEvent of Service Worker

content/browser/service_worker/service_worker_context_unittest.cc

Index: content/browser/service_worker/service_worker_context_unittest.cc
diff --git a/content/browser/service_worker/service_worker_context_unittest.cc b/content/browser/service_worker/service_worker_context_unittest.cc
index 88870e2511145bb2f0bad075224461c344c3543f..13e850f4f00df3a9ba5bf65be45567ff01289e12 100644
--- a/content/browser/service_worker/service_worker_context_unittest.cc
+++ b/content/browser/service_worker/service_worker_context_unittest.cc
@@ -97,10 +97,12 @@ class RejectActivateTestHelper : public EmbeddedWorkerTestHelper {
  public:
   RejectActivateTestHelper() : EmbeddedWorkerTestHelper(base::FilePath()) {}
 
-  void OnActivateEvent(int embedded_worker_id, int request_id) override {
-    SimulateSend(new ServiceWorkerHostMsg_ActivateEventFinished(
-        embedded_worker_id, request_id,
-        blink::WebServiceWorkerEventResultRejected, base::Time::Now()));
+  void OnActivateEvent(
+      const mojom::ServiceWorkerEventDispatcher::DispatchActivateEventCallback&
+          callback) override {
+    events_.push_back(Event::Activate);
+    callback.Run(SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED,
+                 base::Time::Now());
   }
 };
 
@@ -215,14 +217,14 @@ TEST_F(ServiceWorkerContextTest, Register) {
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(called);
 
-  EXPECT_EQ(2UL, helper_->ipc_sink()->message_count());
+  EXPECT_EQ(1UL, helper_->ipc_sink()->message_count());
   ASSERT_EQ(2UL, client->events().size());
   EXPECT_EQ(RecordableEmbeddedWorkerInstanceClient::Message::StartWorker,
             client->events()[0]);
   EXPECT_TRUE(helper_->inner_ipc_sink()->GetUniqueMessageMatching(
       ServiceWorkerMsg_InstallEvent::ID));
-  EXPECT_TRUE(helper_->inner_ipc_sink()->GetUniqueMessageMatching(
-      ServiceWorkerMsg_ActivateEvent::ID));
+  EXPECT_EQ(EmbeddedWorkerTestHelper::Event::Activate,

[Peter Beverloo, 2017/02/14 15:48:13]

Add:
  ASSERT_EQ(1UL, helper_->dispatched_events().size());

To make sure you're not accessing an invalid index on line 227.

[xiaofengzhang, 2017/02/15 01:59:45]

Acknowledged.

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

Done.

+            helper_->dispatched_events()[0]);
   EXPECT_EQ(RecordableEmbeddedWorkerInstanceClient::Message::StopWorker,
             client->events()[1]);
 
@@ -276,8 +278,6 @@ TEST_F(ServiceWorkerContextTest, Register_RejectInstall) {
             client->events()[0]);
   EXPECT_TRUE(helper_->inner_ipc_sink()->GetUniqueMessageMatching(
       ServiceWorkerMsg_InstallEvent::ID));
-  EXPECT_FALSE(helper_->inner_ipc_sink()->GetUniqueMessageMatching(
-      ServiceWorkerMsg_ActivateEvent::ID));
   EXPECT_EQ(RecordableEmbeddedWorkerInstanceClient::Message::StopWorker,
             client->events()[1]);
 
@@ -322,14 +322,14 @@ TEST_F(ServiceWorkerContextTest, Register_RejectActivate) {
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(called);
 
-  EXPECT_EQ(2UL, helper_->ipc_sink()->message_count());
+  EXPECT_EQ(1UL, helper_->ipc_sink()->message_count());
   ASSERT_EQ(2UL, client->events().size());
   EXPECT_EQ(RecordableEmbeddedWorkerInstanceClient::Message::StartWorker,
             client->events()[0]);
   EXPECT_TRUE(helper_->inner_ipc_sink()->GetUniqueMessageMatching(
       ServiceWorkerMsg_InstallEvent::ID));
-  EXPECT_TRUE(helper_->inner_ipc_sink()->GetUniqueMessageMatching(
-      ServiceWorkerMsg_ActivateEvent::ID));
+  EXPECT_EQ(EmbeddedWorkerTestHelper::Event::Activate,

[Peter Beverloo, 2017/02/14 15:48:13]

dito re: the ASSERT_EQ

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

Done.

+            helper_->dispatched_events()[0]);
   EXPECT_EQ(RecordableEmbeddedWorkerInstanceClient::Message::StopWorker,
             client->events()[1]);