Split ServiceWorkerURLLoaderJob from URLJobWrapper

content/browser/service_worker/service_worker_url_job_wrapper.h

Index: content/browser/service_worker/service_worker_url_job_wrapper.h
diff --git a/content/browser/service_worker/service_worker_url_job_wrapper.h b/content/browser/service_worker/service_worker_url_job_wrapper.h
index 891d13d87af8089a53c617c0d814eb174389abba..2eb97cfbdc3c787144dfea40ea69800095197032 100644
--- a/content/browser/service_worker/service_worker_url_job_wrapper.h
+++ b/content/browser/service_worker/service_worker_url_job_wrapper.h
@@ -6,15 +6,14 @@
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_JOB_WRAPPER_H_
 
 #include "base/macros.h"
-#include "base/memory/weak_ptr.h"
 #include "content/browser/loader/url_loader_request_handler.h"
-#include "content/browser/service_worker/service_worker_fetch_dispatcher.h"
-#include "content/browser/service_worker/service_worker_response_type.h"
-#include "content/browser/service_worker/service_worker_url_request_job.h"
 #include "storage/browser/blob/blob_reader.h"
 
 namespace content {
 
+class ServiceWorkerURLRequestJob;
+class ServiceWorkerURLLoaderJob;
+
 // This class is a helper to support having
 // ServiceWorkerControlleeRequestHandler work with both URLRequestJobs and
 // mojom::URLLoaders (that is, both with and without --enable-network-service).
@@ -22,26 +21,13 @@ namespace content {
 // URLLoader and forwards to the underlying implementation.
 class ServiceWorkerURLJobWrapper {
  public:
-  class Delegate {
-   public:
-    virtual ~Delegate() {}
-
-    virtual ServiceWorkerVersion* GetServiceWorkerVersion(
-        ServiceWorkerMetrics::URLRequestJobResult* result) = 0;
-  };
-
   // Non-network service case.
   explicit ServiceWorkerURLJobWrapper(
       base::WeakPtr<ServiceWorkerURLRequestJob> url_request_job);
 
   // With --enable-network-service.
-  // TODO(kinuko): Implement this as a separate job class rather
-  // than in a wrapper.
-  ServiceWorkerURLJobWrapper(
-      LoaderCallback loader_callback,
-      Delegate* delegate,
-      const ResourceRequest& resource_request,
-      base::WeakPtr<storage::BlobStorageContext> blob_storage_context);
+  explicit ServiceWorkerURLJobWrapper(
+      std::unique_ptr<ServiceWorkerURLLoaderJob> url_loader_job);
 
   ~ServiceWorkerURLJobWrapper();
 
@@ -72,37 +58,8 @@ class ServiceWorkerURLJobWrapper {
 
  private:
   enum class JobType { kURLRequest, kURLLoader };
-
-  // Used only for URLLoader case.
-  // For FORWARD_TO_SERVICE_WORKER case.
-  void StartRequest();
-
-  void DidPrepareFetchEvent(scoped_refptr<ServiceWorkerVersion> version);
-  void DidDispatchFetchEvent(
-      ServiceWorkerStatusCode status,
-      ServiceWorkerFetchEventResult fetch_result,
-      const ServiceWorkerResponse& response,
-      blink::mojom::ServiceWorkerStreamHandlePtr body_as_stream,
-      const scoped_refptr<ServiceWorkerVersion>& version);
-
-  std::unique_ptr<ServiceWorkerFetchRequest> CreateFetchRequest(
-      const ResourceRequest& request);
-
-  void AfterRead(scoped_refptr<net::IOBuffer> buffer, int bytes);
-
-  JobType job_type_;
-
-  ServiceWorkerResponseType response_type_ = NOT_DETERMINED;
-  LoaderCallback loader_callback_;
-
   base::WeakPtr<ServiceWorkerURLRequestJob> url_request_job_;
-
-  Delegate* delegate_;
-  ResourceRequest resource_request_;
-  base::WeakPtr<storage::BlobStorageContext> blob_storage_context_;
-  std::unique_ptr<ServiceWorkerFetchDispatcher> fetch_dispatcher_;
-
-  base::WeakPtrFactory<ServiceWorkerURLJobWrapper> weak_factory_;
+  std::unique_ptr<ServiceWorkerURLLoaderJob> url_loader_job_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerURLJobWrapper);
 };