Index: content/renderer/service_worker/service_worker_context_client.cc |
diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc |
index 8715c801236c753374df5b1cc40aa80dc99d3d6a..cc0638306ddeb03b7b86a6c40ec01658e5f84af2 100644 |
--- a/content/renderer/service_worker/service_worker_context_client.cc |
+++ b/content/renderer/service_worker/service_worker_context_client.cc |
@@ -251,7 +251,9 @@ class ServiceWorkerContextClient::NavigationPreloadRequest final |
void OnReceiveResponse(const ResourceResponseHead& response_head) override { |
DCHECK(!response_); |
response_ = base::MakeUnique<blink::WebServiceWorkerResponse>(); |
- response_->setURL(url_); |
+ std::vector<blink::WebURL> url_list; |
+ url_list.push_back(url_); |
+ response_->setURLList(url_list); |
DCHECK(response_head.headers); |
response_->setStatus(response_head.headers->response_code()); |
response_->setStatusText( |
@@ -691,22 +693,10 @@ void ServiceWorkerContextClient::respondToFetchEvent( |
int fetch_event_id, |
const blink::WebServiceWorkerResponse& web_response, |
double event_dispatch_time) { |
- ServiceWorkerHeaderMap headers; |
- GetServiceWorkerHeaderMapFromWebResponse(web_response, &headers); |
- ServiceWorkerHeaderList cors_exposed_header_names; |
- GetCorsExposedHeaderNamesFromWebResponse(web_response, |
- &cors_exposed_header_names); |
- ServiceWorkerResponse response( |
- web_response.url(), web_response.status(), |
- web_response.statusText().utf8(), web_response.responseType(), headers, |
- web_response.blobUUID().utf8(), web_response.blobSize(), |
- web_response.streamURL(), web_response.error(), |
- base::Time::FromInternalValue(web_response.responseTime()), |
- !web_response.cacheStorageCacheName().isNull(), |
- web_response.cacheStorageCacheName().utf8(), cors_exposed_header_names); |
Send(new ServiceWorkerHostMsg_FetchEventResponse( |
GetRoutingID(), fetch_event_id, |
- SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, response, |
+ SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, |
+ GetServiceWorkerResponseFromWebResponse(web_response), |
falken
2016/11/30 14:57:37
ah this is nicer
|
base::Time::FromDoubleT(event_dispatch_time))); |
} |