Introduce url_list to the Response scheme of CacheStorage.

content/renderer/service_worker/service_worker_context_client.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/service_worker/service_worker_context_client.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/lazy_instance.h"
@@ skipping 233 matching lines @@
         base::MakeUnique<blink::WebServiceWorkerError>(
             blink::WebServiceWorkerError::ErrorTypeAbort,
             blink::WebString::fromUTF8(
                 "Service Worker navigation preload aborted. Need to guard with "
                 "respondWith or waitUntil.")));
   }
 
   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(
         blink::WebString::fromUTF8(response_head.headers->GetStatusText()));
     response_->setResponseType(blink::WebServiceWorkerResponseTypeBasic);
     size_t iter = 0;
     std::string header_name;
     std::string header_value;
     while (response_head.headers->EnumerateHeaderLines(&iter, &header_name,
                                                        &header_value)) {
@@ skipping 419 matching lines @@
   Send(new ServiceWorkerHostMsg_FetchEventResponse(
       GetRoutingID(), fetch_event_id,
       SERVICE_WORKER_FETCH_EVENT_RESULT_FALLBACK, ServiceWorkerResponse(),
       base::Time::FromDoubleT(event_dispatch_time)));
 }
 
 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)));
 }
 
 void ServiceWorkerContextClient::didHandleFetchEvent(
     int fetch_event_id,
     blink::WebServiceWorkerEventResult result,
     double event_dispatch_time) {
   if (context_->preload_requests.Lookup(fetch_event_id)) {
     // Deletes NavigationPreloadRequest. If the network request is ongoing, it
     // will be canceled by deleting the mojom::URLLoaderPtr in the
@@ skipping 553 matching lines @@
 }
 
 base::WeakPtr<ServiceWorkerContextClient>
 ServiceWorkerContextClient::GetWeakPtr() {
   DCHECK(worker_task_runner_->RunsTasksOnCurrentThread());
   DCHECK(context_);
   return context_->weak_factory.GetWeakPtr();
 }
 
 }  // namespace content