[ServiceWorker] Mojofy InstallEvent of Service Worker

content/browser/service_worker/embedded_worker_test_helper.cc

 // 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.
 
 #include "content/browser/service_worker/embedded_worker_test_helper.h"
 
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "content/browser/service_worker/embedded_worker_instance.h"
 #include "content/browser/service_worker/embedded_worker_registry.h"
 #include "content/browser/service_worker/embedded_worker_status.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/browser/service_worker/service_worker_dispatcher_host.h"
 #include "content/browser/service_worker/service_worker_test_utils.h"
 #include "content/common/background_fetch/background_fetch_types.h"
 #include "content/common/service_worker/embedded_worker_messages.h"
 #include "content/common/service_worker/embedded_worker_start_params.h"
+#include "content/common/service_worker/service_worker_event_dispatcher.mojom.h"
 #include "content/common/service_worker/service_worker_messages.h"
 #include "content/common/service_worker/service_worker_utils.h"
 #include "content/public/common/push_event_payload.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "services/service_manager/public/interfaces/interface_provider.mojom.h"
@@ skipping 111 matching lines @@
         std::move(request));
   }
 
   MockServiceWorkerEventDispatcher(
       const base::WeakPtr<EmbeddedWorkerTestHelper>& helper,
       int thread_id)
       : helper_(helper), thread_id_(thread_id) {}
 
   ~MockServiceWorkerEventDispatcher() override {}
 
+  void DispatchInstallEvent(
+      mojom::ServiceWorkerInstallEventMethodsAssociatedPtrInfo client,
+      const DispatchInstallEventCallback& callback) override {
+    if (!helper_)
+      return;
+    helper_->OnInstallEventStub(callback);
+  }
+
   void DispatchActivateEvent(
       const DispatchActivateEventCallback& callback) override {
     if (!helper_)
       return;
     helper_->OnActivateEventStub(callback);
   }
 
   void DispatchBackgroundFetchAbortEvent(
       const std::string& tag,
       const DispatchBackgroundFetchAbortEventCallback& callback) override {
@@ skipping 239 matching lines @@
 }
 
 void EmbeddedWorkerTestHelper::OnStopWorker(int embedded_worker_id) {
   // By default just notify the sender that the worker is stopped.
   SimulateWorkerStopped(embedded_worker_id);
 }
 
 bool EmbeddedWorkerTestHelper::OnMessageToWorker(int thread_id,
                                                  int embedded_worker_id,
                                                  const IPC::Message& message) {
   bool handled = true;

[leonhsl(Using Gerrit), 2017/04/23 03:33:10]

After install event mojofication this function will become trivial, and some of
its related functions will also become trivial.

Hi, Shimazu-san, can we keep this as is in this CL and do thorough cleanup with
a follow-up CL?

[shimazu, 2017/04/24 05:00:13]

It's great work!
Let's remove no-op functions (inner_sink(), for example) and redundant members
like |inner_sink_| in this patch.

[xiaofengzhang, 2017/04/24 05:44:08]

Hi leon@, shimazu-san@, OnMessageToWorker is still used by
TEST_F(ServiceWorkerVersionTest, DispatchEvent) in
service_worker_version_unittest.cc to received TestMsg_TestEvent, etc.
It's seems better to keeps it or mojofy it in another CL?

[shimazu, 2017/04/24 06:22:18]

I feel separating cleanup work is not preferable because it's likely to keep
some garbage left behind.

Now I checked the code and found the last user of SWVersion::DispatchEvent is
InstallEvent. 
I think SWVersion::DispatchEvent method is also no longer needed, and we can
also remove the tests related to that while we should keep a test for
SWVersion::RegisterRequestCallback because it's used for FetchEvent.

In summary, what we should do here is:
- removing SWVersion::DispatchEvent, EWTestHelper::innser_sink() and
EWTestHelper::OnMessageToWorker.
- removing ServiceWorkerVersionTest::DispatchEvent, ::DispatchConcurrentEvent, 
::DispatchEvent_MultipleResponse and DispatchEventToStoppedWorker
- adding a test for SWVersion::RegisterRequestCallback.

[xiaofengzhang, 2017/04/25 06:01:28]

Done. Thanks a lot for you detailed explanation!

-  current_embedded_worker_id_ = embedded_worker_id;
-  IPC_BEGIN_MESSAGE_MAP(EmbeddedWorkerTestHelper, message)
-    IPC_MESSAGE_HANDLER(ServiceWorkerMsg_InstallEvent, OnInstallEventStub)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
   // Record all messages directed to inner script context.
   inner_sink_.OnMessageReceived(message);
   return handled;
 }
 
 void EmbeddedWorkerTestHelper::OnActivateEvent(
     const mojom::ServiceWorkerEventDispatcher::DispatchActivateEventCallback&
         callback) {
   dispatched_events()->push_back(Event::Activate);
   callback.Run(SERVICE_WORKER_OK, base::Time::Now());
@@ skipping 30 matching lines @@
   callback.Run(SERVICE_WORKER_OK, base::Time::Now());
 }
 
 void EmbeddedWorkerTestHelper::OnExtendableMessageEvent(
     mojom::ExtendableMessageEventPtr event,
     const mojom::ServiceWorkerEventDispatcher::
         DispatchExtendableMessageEventCallback& callback) {
   callback.Run(SERVICE_WORKER_OK, base::Time::Now());
 }
 
-void EmbeddedWorkerTestHelper::OnInstallEvent(int embedded_worker_id,
-                                              int request_id) {
-  // The installing worker may have been doomed and terminated.
-  if (!registry()->GetWorker(embedded_worker_id))
-    return;
-  SimulateSend(new ServiceWorkerHostMsg_InstallEventFinished(
-      embedded_worker_id, request_id,
-      blink::kWebServiceWorkerEventResultCompleted, true, base::Time::Now()));
+void EmbeddedWorkerTestHelper::OnInstallEvent(
+    const mojom::ServiceWorkerEventDispatcher::DispatchInstallEventCallback&
+        callback) {
+  dispatched_events()->push_back(Event::Install);
+  callback.Run(SERVICE_WORKER_OK, true /* has_fetch_handler */,
+               base::Time::Now());
 }
 
 void EmbeddedWorkerTestHelper::OnFetchEvent(
     int /* embedded_worker_id */,
     int /* fetch_event_id */,
     const ServiceWorkerFetchRequest& /* request */,
     mojom::FetchEventPreloadHandlePtr /* preload_handle */,
     mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
     const FetchCallback& finish_callback) {
   response_callback->OnResponse(
@@ skipping 234 matching lines @@
 
 void EmbeddedWorkerTestHelper::OnExtendableMessageEventStub(
     mojom::ExtendableMessageEventPtr event,
     const mojom::ServiceWorkerEventDispatcher::
         DispatchExtendableMessageEventCallback& callback) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&EmbeddedWorkerTestHelper::OnExtendableMessageEvent,
                             AsWeakPtr(), base::Passed(&event), callback));
 }
 
-void EmbeddedWorkerTestHelper::OnInstallEventStub(int request_id) {
+void EmbeddedWorkerTestHelper::OnInstallEventStub(
+    const mojom::ServiceWorkerEventDispatcher::DispatchInstallEventCallback&
+        callback) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE,
-      base::Bind(&EmbeddedWorkerTestHelper::OnInstallEvent, AsWeakPtr(),
-                 current_embedded_worker_id_, request_id));
+      FROM_HERE, base::Bind(&EmbeddedWorkerTestHelper::OnInstallEvent,
+                            AsWeakPtr(), callback));
 }
 
 void EmbeddedWorkerTestHelper::OnFetchEventStub(
     int thread_id,
     int fetch_event_id,
     const ServiceWorkerFetchRequest& request,
     mojom::FetchEventPreloadHandlePtr preload_handle,
     mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
     const FetchCallback& finish_callback) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
@@ skipping 48 matching lines @@
                  base::Passed(std::move(app_request)),
                  base::Passed(std::move(response_callback)), callback));
 }
 
 EmbeddedWorkerRegistry* EmbeddedWorkerTestHelper::registry() {
   DCHECK(context());
   return context()->embedded_worker_registry();
 }
 
 }  // namespace content