Introduce url_list to the Response scheme of CacheStorage.

content/renderer/cache_storage/cache_storage_dispatcher.cc

Index: content/renderer/cache_storage/cache_storage_dispatcher.cc
diff --git a/content/renderer/cache_storage/cache_storage_dispatcher.cc b/content/renderer/cache_storage/cache_storage_dispatcher.cc
index ffa2e98d9a23a10a31bafa9ef292d1a4ecff87c6..369361cee25eb1a50bb1284b5382f232526b0b41 100644
--- a/content/renderer/cache_storage/cache_storage_dispatcher.cc
+++ b/content/renderer/cache_storage/cache_storage_dispatcher.cc
@@ -78,25 +78,6 @@ blink::WebVector<blink::WebServiceWorkerRequest> WebRequestsFromRequests(
   return web_requests;
 }
 
-ServiceWorkerResponse ResponseFromWebResponse(
-    const blink::WebServiceWorkerResponse& web_response) {
-  ServiceWorkerHeaderMap headers;
-  GetServiceWorkerHeaderMapFromWebResponse(web_response, &headers);
-  ServiceWorkerHeaderList cors_exposed_header_names;
-  GetCorsExposedHeaderNamesFromWebResponse(web_response,
-                                           &cors_exposed_header_names);
-  // We don't support streaming for cache.
-  DCHECK(web_response.streamURL().isEmpty());
-  return ServiceWorkerResponse(
-      web_response.url(), web_response.status(),
-      web_response.statusText().ascii(), web_response.responseType(), headers,
-      web_response.blobUUID().ascii(), web_response.blobSize(),
-      web_response.streamURL(), blink::WebServiceWorkerResponseErrorUnknown,
-      base::Time::FromInternalValue(web_response.responseTime()),
-      !web_response.cacheStorageCacheName().isNull(),
-      web_response.cacheStorageCacheName().utf8(), cors_exposed_header_names);
-}

[falken, 2016/11/30 14:57:37]

nice cleanup

-
 CacheStorageCacheQueryParams QueryParamsFromWebQueryParams(
     const blink::WebServiceWorkerCache::QueryParams& web_query_params) {
   CacheStorageCacheQueryParams query_params;
@@ -121,11 +102,15 @@ CacheStorageCacheOperationType CacheOperationTypeFromWebCacheOperationType(
 
 CacheStorageBatchOperation BatchOperationFromWebBatchOperation(
     const blink::WebServiceWorkerCache::BatchOperation& web_operation) {
+  // We don't support streaming for cache.
+  DCHECK(web_operation.response.streamURL().isEmpty());
+
   CacheStorageBatchOperation operation;
   operation.operation_type =
       CacheOperationTypeFromWebCacheOperationType(web_operation.operationType);
   operation.request = FetchRequestFromWebRequest(web_operation.request);
-  operation.response = ResponseFromWebResponse(web_operation.response);
+  operation.response =
+      GetServiceWorkerResponseFromWebResponse(web_operation.response);
   operation.match_params =
       QueryParamsFromWebQueryParams(web_operation.matchParams);
   return operation;
@@ -632,7 +617,11 @@ void CacheStorageDispatcher::OnWebCacheDestruction(int cache_id) {
 void CacheStorageDispatcher::PopulateWebResponseFromResponse(
     const ServiceWorkerResponse& response,
     blink::WebServiceWorkerResponse* web_response) {
-  web_response->setURL(response.url);
+  blink::WebVector<blink::WebURL> url_list(response.url_list.size());
+  std::transform(response.url_list.begin(), response.url_list.end(),
+                 url_list.begin(), [](const GURL& url) { return url; });
+  web_response->setURLList(url_list);
+
   web_response->setStatus(response.status_code);
   web_response->setStatusText(WebString::fromASCII(response.status_text));
   web_response->setResponseType(response.response_type);