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 bfb2183558c943927edbbdb227ef92e717a27c17..51710c5846ea922ae8afff30240653cbad5ec784 100644 |
--- a/content/browser/service_worker/service_worker_url_job_wrapper.h |
+++ b/content/browser/service_worker/service_worker_url_job_wrapper.h |
@@ -6,13 +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_response_type.h" |
#include "content/browser/service_worker/service_worker_url_request_job.h" |
+#include "content/common/url_loader.mojom.h" |
namespace content { |
-// TODO(scottmg): Not yet implemented. See https://crbug.com/715640. |
-class ServiceWorkerControlleeURLLoader; |
- |
// This class is a helper to support having |
// ServiceWorkerControlleeRequestHandler work with both URLRequestJobs and |
// mojom::URLLoaderFactorys (that is, both with and without |
@@ -26,8 +27,12 @@ class ServiceWorkerURLJobWrapper { |
base::WeakPtr<ServiceWorkerURLRequestJob> url_request_job); |
// With --enable-network-service. |
- explicit ServiceWorkerURLJobWrapper( |
- ServiceWorkerControlleeURLLoader* url_loader); |
+ // TODO(kinuko): Implement this as a separate job class rather |
+ // than in a wrapper. |
+ ServiceWorkerURLJobWrapper( |
+ URLLoaderRequestHandler::Controller* controller, |
+ mojom::URLLoaderAssociatedRequest url_loader_request, |
+ mojom::URLLoaderClientPtr url_loader_client_ptr); |
~ServiceWorkerURLJobWrapper(); |
@@ -57,8 +62,19 @@ class ServiceWorkerURLJobWrapper { |
bool WasCanceled() const; |
private: |
+ // Used only for URLLoader case. |
+ // TODO(kinuko): Implement this in a separate job class rather |
+ // than in a wrapper. |
+ void StartRequest(); |
+ |
+ URLLoaderRequestHandler::Controller* controller_; |
+ mojom::URLLoaderAssociatedRequest url_loader_request_; |
+ mojom::URLLoaderClientPtr url_loader_client_ptr_; |
+ ServiceWorkerResponseType response_type_ = NOT_DETERMINED; |
+ |
base::WeakPtr<ServiceWorkerURLRequestJob> url_request_job_; |
- ServiceWorkerControlleeURLLoader* url_loader_; |
+ |
+ base::WeakPtrFactory<ServiceWorkerURLJobWrapper> weak_factory_; |
DISALLOW_COPY_AND_ASSIGN(ServiceWorkerURLJobWrapper); |
}; |