Index: content/browser/service_worker/service_worker_url_request_job.cc |
diff --git a/content/browser/service_worker/service_worker_url_request_job.cc b/content/browser/service_worker/service_worker_url_request_job.cc |
index 22403a2205cbb919f73334762aeb75b1ba937c1c..ff176f2deb9fc940c207e7d6ecfa45547dd7d3a6 100644 |
--- a/content/browser/service_worker/service_worker_url_request_job.cc |
+++ b/content/browser/service_worker/service_worker_url_request_job.cc |
@@ -234,6 +234,7 @@ ServiceWorkerURLRequestJob::ServiceWorkerURLRequestJob( |
RequestContextFrameType frame_type, |
scoped_refptr<ResourceRequestBodyImpl> body, |
ServiceWorkerFetchType fetch_type, |
+ const base::Optional<base::TimeDelta>& timeout, |
Delegate* delegate) |
: net::URLRequestJob(request, network_delegate), |
delegate_(delegate), |
@@ -252,6 +253,7 @@ ServiceWorkerURLRequestJob::ServiceWorkerURLRequestJob( |
fall_back_required_(false), |
body_(body), |
fetch_type_(fetch_type), |
+ timeout_(timeout), |
weak_factory_(this) { |
DCHECK(delegate_) << "ServiceWorkerURLRequestJob requires a delegate"; |
} |
@@ -852,7 +854,8 @@ void ServiceWorkerURLRequestJob::RequestBodyFileSizesResolved(bool success) { |
DCHECK(!fetch_dispatcher_); |
fetch_dispatcher_.reset(new ServiceWorkerFetchDispatcher( |
- CreateFetchRequest(), active_worker, resource_type_, request()->net_log(), |
+ CreateFetchRequest(), active_worker, resource_type_, timeout_, |
+ request()->net_log(), |
base::Bind(&ServiceWorkerURLRequestJob::DidPrepareFetchEvent, |
weak_factory_.GetWeakPtr(), active_worker), |
base::Bind(&ServiceWorkerURLRequestJob::DidDispatchFetchEvent, |