CacheStorage: Expand cache.keys() method.

content/renderer/cache_storage/cache_storage_dispatcher.cc

 // Copyright 2014 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/cache_storage/cache_storage_dispatcher.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <string>
@@ skipping 159 matching lines @@
   }
   void dispatchMatchAll(CacheWithResponsesCallbacks* callbacks,
                         const blink::WebServiceWorkerRequest& request,
                         const QueryParams& query_params) override {
     if (!dispatcher_)
       return;
     dispatcher_->dispatchMatchAllForCache(cache_id_, callbacks, request,
                                           query_params);
   }
   void dispatchKeys(CacheWithRequestsCallbacks* callbacks,
-                    const blink::WebServiceWorkerRequest* request,
+                    const blink::WebServiceWorkerRequest& request,
                     const QueryParams& query_params) override {
     if (!dispatcher_)
       return;
     dispatcher_->dispatchKeysForCache(cache_id_, callbacks, request,
                                       query_params);
   }
   void dispatchBatch(
       CacheBatchCallbacks* callbacks,
       const blink::WebVector<BatchOperation>& batch_operations) override {
     if (!dispatcher_)
@@ skipping 412 matching lines @@
 
   Send(new CacheStorageHostMsg_CacheMatchAll(
       CurrentWorkerId(), request_id, cache_id,
       FetchRequestFromWebRequest(request),
       QueryParamsFromWebQueryParams(query_params)));
 }
 
 void CacheStorageDispatcher::dispatchKeysForCache(
     int cache_id,
     blink::WebServiceWorkerCache::CacheWithRequestsCallbacks* callbacks,
-    const blink::WebServiceWorkerRequest* request,
+    const blink::WebServiceWorkerRequest& request,
     const blink::WebServiceWorkerCache::QueryParams& query_params) {
   int request_id = cache_keys_callbacks_.Add(callbacks);
   cache_keys_times_[request_id] = base::TimeTicks::Now();
 
   Send(new CacheStorageHostMsg_CacheKeys(
       CurrentWorkerId(), request_id, cache_id,
-      request ? FetchRequestFromWebRequest(*request)
-              : ServiceWorkerFetchRequest(),
+      FetchRequestFromWebRequest(request),
       QueryParamsFromWebQueryParams(query_params)));
 }
 
 void CacheStorageDispatcher::dispatchBatchForCache(
     int cache_id,
     blink::WebServiceWorkerCache::CacheBatchCallbacks* callbacks,
     const blink::WebVector<blink::WebServiceWorkerCache::BatchOperation>&
         web_operations) {
   int request_id = cache_batch_callbacks_.Add(callbacks);
   cache_batch_times_[request_id] = base::TimeTicks::Now();
@@ skipping 51 matching lines @@
 CacheStorageDispatcher::WebResponsesFromResponses(
     const std::vector<ServiceWorkerResponse>& responses) {
   blink::WebVector<blink::WebServiceWorkerResponse> web_responses(
       responses.size());
   for (size_t i = 0; i < responses.size(); ++i)
     PopulateWebResponseFromResponse(responses[i], &(web_responses[i]));
   return web_responses;
 }
 
 }  // namespace content