CacheStorage: Expand cache.keys() method.

content/browser/cache_storage/cache_storage_cache.h

Index: content/browser/cache_storage/cache_storage_cache.h
diff --git a/content/browser/cache_storage/cache_storage_cache.h b/content/browser/cache_storage/cache_storage_cache.h
index 72e1c9a4f0efce5ab116acbf39eab3d18d5d83b4..2cef916460e5e9b47f5b5f64ebabde230d952946 100644
--- a/content/browser/cache_storage/cache_storage_cache.h
+++ b/content/browser/cache_storage/cache_storage_cache.h
@@ -102,9 +102,10 @@ class CONTENT_EXPORT CacheStorageCache
                             CacheStorageError error);
   void BatchDidAllOperations(scoped_ptr<ErrorCallback> callback);
 
-  // TODO(jkarlin): Have keys take an optional ServiceWorkerFetchRequest.
   // Returns CACHE_STORAGE_OK and a vector of requests if there are no errors.
-  void Keys(const RequestsCallback& callback);
+  void Keys(scoped_ptr<ServiceWorkerFetchRequest> request,
+            const CacheStorageCacheQueryParams& match_params,
+            const RequestsCallback& callback);
 
   // Closes the backend. Future operations that require the backend
   // will exit early. Close should only be called once per CacheStorageCache.
@@ -237,8 +238,10 @@ class CONTENT_EXPORT CacheStorageCache
                           int rv);
 
   // Keys callbacks.
-  void KeysImpl(const RequestsCallback& callback);
-  void KeysDidOpenAllEntries(const RequestsCallback& callback,
+  void KeysImpl(scoped_ptr<ServiceWorkerFetchRequest> request,
+                const CacheStorageCacheQueryParams& match_params,
+                const RequestsCallback& callback);
+  void KeysDidOpenAllEntries(scoped_ptr<KeysContext> keys_context,
                              scoped_ptr<OpenAllEntriesContext> entries_context,
                              CacheStorageError error);
   void KeysProcessNextEntry(scoped_ptr<KeysContext> keys_context,
@@ -246,6 +249,14 @@ class CONTENT_EXPORT CacheStorageCache
   void KeysDidReadMetadata(scoped_ptr<KeysContext> keys_context,
                            const Entries::iterator& iter,
                            scoped_ptr<CacheMetadata> metadata);
+  void KeyDidOpenEntry(scoped_ptr<ServiceWorkerFetchRequest> request,
+                       const RequestsCallback& callback,
+                       scoped_ptr<disk_cache::Entry*> entry_ptr,
+                       int rv);
+  void KeyDidReadMetadata(scoped_ptr<ServiceWorkerFetchRequest> request,
+                          const RequestsCallback& callback,
+                          disk_cache::ScopedEntryPtr entry,
+                          scoped_ptr<CacheMetadata> metadata);
 
   void CloseImpl(const base::Closure& callback);