Mojoify FetchEvent of Service Worker.

content/browser/service_worker/service_worker_url_request_job_unittest.cc

Index: content/browser/service_worker/service_worker_url_request_job_unittest.cc
diff --git a/content/browser/service_worker/service_worker_url_request_job_unittest.cc b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
index 34bfff4c8a0da1b071a04862b7bbb790f51b4ca7..2f7a6d8e003958484fc24045978e1bb6ba9b26d4 100644
--- a/content/browser/service_worker/service_worker_url_request_job_unittest.cc
+++ b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
@@ -364,8 +364,8 @@ class ProviderDeleteHelper : public EmbeddedWorkerTestHelper {
  protected:
   void OnFetchEvent(int embedded_worker_id,
                     int response_id,
-                    int event_finish_id,
-                    const ServiceWorkerFetchRequest& request) override {
+                    const ServiceWorkerFetchRequest& request,
+                    const FetchCallback& callback) override {
     context()->RemoveProviderHost(mock_render_process_id(), kProviderID);
     SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
         embedded_worker_id, response_id,
@@ -378,9 +378,8 @@ class ProviderDeleteHelper : public EmbeddedWorkerTestHelper {
             std::string() /* response_cache_storage_cache_name */,
             ServiceWorkerHeaderList() /* cors_exposed_header_names */),
         base::Time::Now()));
-    SimulateSend(new ServiceWorkerHostMsg_FetchEventFinished(
-        embedded_worker_id, event_finish_id,
-        blink::WebServiceWorkerEventResultCompleted, base::Time::Now()));
+    callback.Run(blink::mojom::ServiceWorkerEventStatus::COMPLETED,
+                 base::Time::Now());
   }
 
  private:
@@ -449,8 +448,8 @@ class BlobResponder : public EmbeddedWorkerTestHelper {
  protected:
   void OnFetchEvent(int embedded_worker_id,
                     int response_id,
-                    int event_finish_id,
-                    const ServiceWorkerFetchRequest& request) override {
+                    const ServiceWorkerFetchRequest& request,
+                    const FetchCallback& callback) override {
     SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
         embedded_worker_id, response_id,
         SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
@@ -462,9 +461,8 @@ class BlobResponder : public EmbeddedWorkerTestHelper {
             std::string() /* response_cache_storage_cache_name */,
             ServiceWorkerHeaderList() /* cors_exposed_header_names */),
         base::Time::Now()));
-    SimulateSend(new ServiceWorkerHostMsg_FetchEventFinished(
-        embedded_worker_id, event_finish_id,
-        blink::WebServiceWorkerEventResultCompleted, base::Time::Now()));
+    callback.Run(blink::mojom::ServiceWorkerEventStatus::COMPLETED,
+                 base::Time::Now());
   }
 
   std::string blob_uuid_;
@@ -533,8 +531,8 @@ class StreamResponder : public EmbeddedWorkerTestHelper {
  protected:
   void OnFetchEvent(int embedded_worker_id,
                     int response_id,
-                    int event_finish_id,
-                    const ServiceWorkerFetchRequest& request) override {
+                    const ServiceWorkerFetchRequest& request,
+                    const FetchCallback& callback) override {
     SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
         embedded_worker_id, response_id,
         SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
@@ -546,9 +544,8 @@ class StreamResponder : public EmbeddedWorkerTestHelper {
             std::string() /* response_cache_storage_cache_name */,
             ServiceWorkerHeaderList() /* cors_exposed_header_names */),
         base::Time::Now()));
-    SimulateSend(new ServiceWorkerHostMsg_FetchEventFinished(
-        embedded_worker_id, event_finish_id,
-        blink::WebServiceWorkerEventResultCompleted, base::Time::Now()));
+    callback.Run(blink::mojom::ServiceWorkerEventStatus::COMPLETED,
+                 base::Time::Now());
   }
 
   const GURL stream_url_;
@@ -848,9 +845,11 @@ class FailFetchHelper : public EmbeddedWorkerTestHelper {
  protected:
   void OnFetchEvent(int embedded_worker_id,
                     int response_id,
-                    int event_finish_id,
-                    const ServiceWorkerFetchRequest& request) override {
+                    const ServiceWorkerFetchRequest& request,
+                    const FetchCallback& callback) override {
     SimulateWorkerStopped(embedded_worker_id);
+    callback.Run(blink::mojom::ServiceWorkerEventStatus::ABORTED,
+                 base::Time::Now());
   }
 
  private:
@@ -925,18 +924,16 @@ class EarlyResponseHelper : public EmbeddedWorkerTestHelper {
   ~EarlyResponseHelper() override {}
 
   void FinishWaitUntil() {
-    SimulateSend(new ServiceWorkerHostMsg_FetchEventFinished(
-        embedded_worker_id_, event_finish_id_,
-        blink::WebServiceWorkerEventResultCompleted, base::Time::Now()));
+    callback_.Run(blink::mojom::ServiceWorkerEventStatus::COMPLETED,
+                  base::Time::Now());
   }
 
  protected:
   void OnFetchEvent(int embedded_worker_id,
                     int response_id,
-                    int event_finish_id,
-                    const ServiceWorkerFetchRequest& request) override {
-    embedded_worker_id_ = embedded_worker_id;
-    event_finish_id_ = event_finish_id;
+                    const ServiceWorkerFetchRequest& request,
+                    const FetchCallback& callback) override {
+    callback_ = callback;
     SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
         embedded_worker_id, response_id,
         SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
@@ -951,8 +948,7 @@ class EarlyResponseHelper : public EmbeddedWorkerTestHelper {
   }
 
  private:
-  int embedded_worker_id_ = 0;
-  int event_finish_id_ = 0;
+  FetchCallback callback_;
   DISALLOW_COPY_AND_ASSIGN(EarlyResponseHelper);
 };
 
@@ -981,6 +977,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, EarlyResponse) {
 
   EXPECT_TRUE(version_->HasWork());
   helper->FinishWaitUntil();
+  base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(version_->HasWork());
 }
 
@@ -1002,25 +999,24 @@ class DelayedResponseHelper : public EmbeddedWorkerTestHelper {
             std::string() /* response_cache_storage_cache_name */,
             ServiceWorkerHeaderList() /* cors_exposed_header_names */),
         base::Time::Now()));
-    SimulateSend(new ServiceWorkerHostMsg_FetchEventFinished(
-        embedded_worker_id_, event_finish_id_,
-        blink::WebServiceWorkerEventResultCompleted, base::Time::Now()));
+    callback_.Run(blink::mojom::ServiceWorkerEventStatus::COMPLETED,
+                  base::Time::Now());
   }
 
  protected:
   void OnFetchEvent(int embedded_worker_id,
                     int response_id,
-                    int event_finish_id,
-                    const ServiceWorkerFetchRequest& request) override {
+                    const ServiceWorkerFetchRequest& request,
+                    const FetchCallback& callback) override {
     embedded_worker_id_ = embedded_worker_id;
     response_id_ = response_id;
-    event_finish_id_ = event_finish_id;
+    callback_ = callback;
   }
 
  private:
   int embedded_worker_id_ = 0;
   int response_id_ = 0;
-  int event_finish_id_ = 0;
+  FetchCallback callback_;
   DISALLOW_COPY_AND_ASSIGN(DelayedResponseHelper);
 };