Revert of 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 6c9afc6e64599f5a7adde1d43f72e5edcd341d98..bd63bb08fd253c8ee66e06c070d47ac72c2473fd 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
@@ -33,7 +33,6 @@
 #include "content/browser/streams/stream_registry.h"
 #include "content/common/resource_request_body_impl.h"
 #include "content/common/service_worker/service_worker_messages.h"
-#include "content/common/service_worker/service_worker_status_code.h"
 #include "content/public/browser/blob_handle.h"
 #include "content/public/common/request_context_frame_type.h"
 #include "content/public/common/request_context_type.h"
@@ -364,8 +363,8 @@
  protected:
   void OnFetchEvent(int embedded_worker_id,
                     int response_id,
-                    const ServiceWorkerFetchRequest& request,
-                    const FetchCallback& callback) override {
+                    int event_finish_id,
+                    const ServiceWorkerFetchRequest& request) override {
     context()->RemoveProviderHost(mock_render_process_id(), kProviderID);
     SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
         embedded_worker_id, response_id,
@@ -378,7 +377,9 @@
             std::string() /* response_cache_storage_cache_name */,
             ServiceWorkerHeaderList() /* cors_exposed_header_names */),
         base::Time::Now()));
-    callback.Run(SERVICE_WORKER_OK, base::Time::Now());
+    SimulateSend(new ServiceWorkerHostMsg_FetchEventFinished(
+        embedded_worker_id, event_finish_id,
+        blink::WebServiceWorkerEventResultCompleted, base::Time::Now()));
   }
 
  private:
@@ -447,8 +448,8 @@
  protected:
   void OnFetchEvent(int embedded_worker_id,
                     int response_id,
-                    const ServiceWorkerFetchRequest& request,
-                    const FetchCallback& callback) override {
+                    int event_finish_id,
+                    const ServiceWorkerFetchRequest& request) override {
     SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
         embedded_worker_id, response_id,
         SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
@@ -460,7 +461,9 @@
             std::string() /* response_cache_storage_cache_name */,
             ServiceWorkerHeaderList() /* cors_exposed_header_names */),
         base::Time::Now()));
-    callback.Run(SERVICE_WORKER_OK, base::Time::Now());
+    SimulateSend(new ServiceWorkerHostMsg_FetchEventFinished(
+        embedded_worker_id, event_finish_id,
+        blink::WebServiceWorkerEventResultCompleted, base::Time::Now()));
   }
 
   std::string blob_uuid_;
@@ -529,8 +532,8 @@
  protected:
   void OnFetchEvent(int embedded_worker_id,
                     int response_id,
-                    const ServiceWorkerFetchRequest& request,
-                    const FetchCallback& callback) override {
+                    int event_finish_id,
+                    const ServiceWorkerFetchRequest& request) override {
     SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
         embedded_worker_id, response_id,
         SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
@@ -542,7 +545,9 @@
             std::string() /* response_cache_storage_cache_name */,
             ServiceWorkerHeaderList() /* cors_exposed_header_names */),
         base::Time::Now()));
-    callback.Run(SERVICE_WORKER_OK, base::Time::Now());
+    SimulateSend(new ServiceWorkerHostMsg_FetchEventFinished(
+        embedded_worker_id, event_finish_id,
+        blink::WebServiceWorkerEventResultCompleted, base::Time::Now()));
   }
 
   const GURL stream_url_;
@@ -842,10 +847,9 @@
  protected:
   void OnFetchEvent(int embedded_worker_id,
                     int response_id,
-                    const ServiceWorkerFetchRequest& request,
-                    const FetchCallback& callback) override {
+                    int event_finish_id,
+                    const ServiceWorkerFetchRequest& request) override {
     SimulateWorkerStopped(embedded_worker_id);
-    callback.Run(SERVICE_WORKER_ERROR_ABORT, base::Time::Now());
   }
 
  private:
@@ -948,15 +952,18 @@
   ~EarlyResponseHelper() override {}
 
   void FinishWaitUntil() {
-    callback_.Run(SERVICE_WORKER_OK, base::Time::Now());
+    SimulateSend(new ServiceWorkerHostMsg_FetchEventFinished(
+        embedded_worker_id_, event_finish_id_,
+        blink::WebServiceWorkerEventResultCompleted, base::Time::Now()));
   }
 
  protected:
   void OnFetchEvent(int embedded_worker_id,
                     int response_id,
-                    const ServiceWorkerFetchRequest& request,
-                    const FetchCallback& callback) override {
-    callback_ = callback;
+                    int event_finish_id,
+                    const ServiceWorkerFetchRequest& request) override {
+    embedded_worker_id_ = embedded_worker_id;
+    event_finish_id_ = event_finish_id;
     SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
         embedded_worker_id, response_id,
         SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
@@ -971,7 +978,8 @@
   }
 
  private:
-  FetchCallback callback_;
+  int embedded_worker_id_ = 0;
+  int event_finish_id_ = 0;
   DISALLOW_COPY_AND_ASSIGN(EarlyResponseHelper);
 };
 
@@ -1000,7 +1008,6 @@
 
   EXPECT_TRUE(version_->HasWork());
   helper->FinishWaitUntil();
-  base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(version_->HasWork());
 }
 
@@ -1022,23 +1029,25 @@
             std::string() /* response_cache_storage_cache_name */,
             ServiceWorkerHeaderList() /* cors_exposed_header_names */),
         base::Time::Now()));
-    callback_.Run(SERVICE_WORKER_OK, base::Time::Now());
+    SimulateSend(new ServiceWorkerHostMsg_FetchEventFinished(
+        embedded_worker_id_, event_finish_id_,
+        blink::WebServiceWorkerEventResultCompleted, base::Time::Now()));
   }
 
  protected:
   void OnFetchEvent(int embedded_worker_id,
                     int response_id,
-                    const ServiceWorkerFetchRequest& request,
-                    const FetchCallback& callback) override {
+                    int event_finish_id,
+                    const ServiceWorkerFetchRequest& request) override {
     embedded_worker_id_ = embedded_worker_id;
     response_id_ = response_id;
-    callback_ = callback;
+    event_finish_id_ = event_finish_id;
   }
 
  private:
   int embedded_worker_id_ = 0;
   int response_id_ = 0;
-  FetchCallback callback_;
+  int event_finish_id_ = 0;
   DISALLOW_COPY_AND_ASSIGN(DelayedResponseHelper);
 };