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 2f852939088c0ae4f6fc15753280a7599f56b06b..bed88f7c6f1be8e8c12a3a8ef32d5c1d3138eb98 100644 |
--- a/content/browser/service_worker/service_worker_url_request_job.cc |
+++ b/content/browser/service_worker/service_worker_url_request_job.cc |
@@ -198,7 +198,7 @@ bool ServiceWorkerURLRequestJob::Delegate::RequestStillValid( |
ServiceWorkerURLRequestJob::ServiceWorkerURLRequestJob( |
net::URLRequest* request, |
net::NetworkDelegate* network_delegate, |
- const std::string& client_id, |
+ base::WeakPtr<ServiceWorkerProviderHost> client_provider_host, |
base::WeakPtr<storage::BlobStorageContext> blob_storage_context, |
const ResourceContext* resource_context, |
FetchRequestMode request_mode, |
@@ -215,7 +215,9 @@ ServiceWorkerURLRequestJob::ServiceWorkerURLRequestJob( |
response_type_(NOT_DETERMINED), |
is_started_(false), |
service_worker_response_type_(blink::WebServiceWorkerResponseTypeDefault), |
- client_id_(client_id), |
+ client_provider_host_(client_provider_host), |
+ client_id_(client_provider_host_ ? client_provider_host_->client_uuid() |
+ : std::string()), |
blob_storage_context_(blob_storage_context), |
resource_context_(resource_context), |
request_mode_(request_mode), |
@@ -893,7 +895,8 @@ void ServiceWorkerURLRequestJob::RequestBodyBlobsCompleted(bool success) { |
base::Bind(&ServiceWorkerURLRequestJob::DidDispatchFetchEvent, |
weak_factory_.GetWeakPtr()))); |
worker_start_time_ = base::TimeTicks::Now(); |
- fetch_dispatcher_->MaybeStartNavigationPreload(request()); |
+ fetch_dispatcher_->MaybeStartNavigationPreload(request(), |
+ client_provider_host_); |
fetch_dispatcher_->Run(); |
} |