Mojoify FetchEvent of Service Worker.

content/browser/service_worker/service_worker_fetch_dispatcher.cc

Index: content/browser/service_worker/service_worker_fetch_dispatcher.cc
diff --git a/content/browser/service_worker/service_worker_fetch_dispatcher.cc b/content/browser/service_worker/service_worker_fetch_dispatcher.cc
index 130d87c4e15f8b1fab07bfbf864dd5c48b7a64df..3a0e37a016017b7f0c999dc02bd7cf8525dbe7dc 100644
--- a/content/browser/service_worker/service_worker_fetch_dispatcher.cc
+++ b/content/browser/service_worker/service_worker_fetch_dispatcher.cc
@@ -12,7 +12,9 @@
 #include "base/trace_event/trace_event.h"
 #include "content/browser/service_worker/embedded_worker_status.h"
 #include "content/browser/service_worker/service_worker_version.h"
+#include "content/common/service_worker/fetch_event_dispatcher.mojom.h"
 #include "content/common/service_worker/service_worker_messages.h"
+#include "content/common/service_worker/service_worker_status_code.h"
 #include "content/common/service_worker/service_worker_utils.h"
 #include "net/log/net_log_event_type.h"
 
@@ -71,6 +73,14 @@ ServiceWorkerMetrics::EventType FetchTypeToWaitUntilEventType(
   return ServiceWorkerMetrics::EventType::FETCH_WAITUNTIL;
 }
 
+void OnFetchEventFinished(ServiceWorkerVersion* version,
+                          int event_finish_id,
+                          ServiceWorkerStatusCode status,
+                          base::Time dispatch_event_time) {
+  version->FinishRequest(event_finish_id, status != SERVICE_WORKER_ERROR_ABORT,
+                         dispatch_event_time);
+}
+
 }  // namespace
 
 // Helper to receive the fetch event response even if
@@ -208,11 +218,16 @@ void ServiceWorkerFetchDispatcher::DispatchFetchEvent() {
       response_id,
       base::Bind(&ServiceWorkerFetchDispatcher::ResponseCallback::Run,
                  base::Owned(response_callback)));
-  version_->RegisterSimpleRequest<ServiceWorkerHostMsg_FetchEventFinished>(
-      event_finish_id);
-  version_->DispatchEvent({response_id, event_finish_id},
-                          ServiceWorkerMsg_FetchEvent(
-                              response_id, event_finish_id, *request_.get()));
+
+  base::WeakPtr<mojom::FetchEventDispatcher> dispatcher =
+      version_->GetMojoServiceForRequest<mojom::FetchEventDispatcher>(
+          event_finish_id);
+  // |dispatcher\ is owned by |version_|. So it is safe to pass the unretained

[dcheng, 2016/10/04 07:19:53]

Nit: \ => |

[horo, 2016/10/04 12:16:40]

Done.

+  // raw pointer of |version_| to OnFetchEventFinished callback.
+  dispatcher->DispatchFetchEvent(
+      response_id, *request_.get(),

[dcheng, 2016/10/04 07:19:53]

Nit: *request_.get() can be written simply as *request_

[horo, 2016/10/04 12:16:40]

Done.

+      base::Bind(&OnFetchEventFinished, base::Unretained(version_.get()),
+                 event_finish_id));
 }
 
 void ServiceWorkerFetchDispatcher::DidFailToDispatch(