CacheStorage: Introduce QueryCache algorithm.

content/browser/cache_storage/cache_storage_cache.h

 // 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.
 
 #ifndef CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_CACHE_H_
 #define CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_CACHE_H_
 
 #include <stdint.h>
 
 #include <vector>
@@ skipping 43 matching lines @@
   using BlobDataHandles = std::vector<storage::BlobDataHandle>;
   using ResponsesCallback =
       base::Callback<void(CacheStorageError,
                           std::unique_ptr<Responses>,
                           std::unique_ptr<BlobDataHandles>)>;
   using Requests = std::vector<ServiceWorkerFetchRequest>;
   using RequestsCallback =
       base::Callback<void(CacheStorageError, std::unique_ptr<Requests>)>;
   using SizeCallback = base::Callback<void(int64_t)>;
 
+  struct QueryCacheResults;
+  using QueryCacheResultsCallback =
+      base::Callback<void(CacheStorageError,
+                          std::unique_ptr<QueryCacheResults>)>;
+
   enum EntryIndex { INDEX_HEADERS = 0, INDEX_RESPONSE_BODY, INDEX_SIDE_DATA };
 
   static std::unique_ptr<CacheStorageCache> CreateMemoryCache(
       const GURL& origin,
       const std::string& cache_name,
       CacheStorage* cache_storage,
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       scoped_refptr<storage::QuotaManagerProxy> quota_manager_proxy,
       base::WeakPtr<storage::BlobStorageContext> blob_context);
   static std::unique_ptr<CacheStorageCache> CreatePersistentCache(
@@ skipping 76 matching lines @@
 
   std::string cache_name() const { return cache_name_; }
 
   base::WeakPtr<CacheStorageCache> AsWeakPtr();
 
  private:
   friend class base::RefCounted<CacheStorageCache>;
   friend class TestCacheStorageCache;
 
   struct OpenAllEntriesContext;
-  struct MatchAllContext;
-  struct KeysContext;
   struct PutContext;
 
   // The backend progresses from uninitialized, to open, to closed, and cannot
   // reverse direction.  The open step may be skipped.
   enum BackendState {
     BACKEND_UNINITIALIZED,  // No backend, create backend on first operation.
     BACKEND_OPEN,           // Backend can be used.
     BACKEND_CLOSED          // Backend cannot be used.  All ops should fail.
   };
 
@@ skipping 16 matching lines @@
 
   // Returns true if the backend is ready to operate.
   bool LazyInitialize();
 
   // Returns all entries in this cache.
   void OpenAllEntries(const OpenAllEntriesCallback& callback);
   void DidOpenNextEntry(std::unique_ptr<OpenAllEntriesContext> entries_context,
                         const OpenAllEntriesCallback& callback,
                         int rv);
 
+  void QueryCache(std::unique_ptr<ServiceWorkerFetchRequest> request,
+                  const CacheStorageCacheQueryParams& options,
+                  const QueryCacheResultsCallback& callback);
+  void QueryCacheDidOpenAllEntries(
+      std::unique_ptr<QueryCacheResults> query_cache_results,
+      std::unique_ptr<OpenAllEntriesContext> entries_context,
+      CacheStorageError error);
+  void QueryCacheProcessNextEntry(
+      std::unique_ptr<QueryCacheResults> query_cache_results,
+      const Entries::iterator& iter);
+  void QueryCacheDidReadMetadata(
+      std::unique_ptr<QueryCacheResults> query_cache_results,
+      const Entries::iterator& iter,
+      std::unique_ptr<CacheMetadata> metadata);
+
   // Match callbacks
   void MatchImpl(std::unique_ptr<ServiceWorkerFetchRequest> request,
                  const ResponseCallback& callback);
   void MatchDidOpenEntry(std::unique_ptr<ServiceWorkerFetchRequest> request,
                          const ResponseCallback& callback,
                          std::unique_ptr<disk_cache::Entry*> entry_ptr,
                          int rv);
   void MatchDidReadMetadata(std::unique_ptr<ServiceWorkerFetchRequest> request,
                             const ResponseCallback& callback,
                             disk_cache::ScopedEntryPtr entry,
                             std::unique_ptr<CacheMetadata> headers);
 
   // MatchAll callbacks
-  void MatchAllImpl(std::unique_ptr<MatchAllContext> context);
-  void MatchAllDidOpenAllEntries(
-      std::unique_ptr<MatchAllContext> context,
-      std::unique_ptr<OpenAllEntriesContext> entries_context,
-      CacheStorageError error);
-  void MatchAllProcessNextEntry(std::unique_ptr<MatchAllContext> context,
-                                const Entries::iterator& iter);
-  void MatchAllDidReadMetadata(std::unique_ptr<MatchAllContext> context,
-                               const Entries::iterator& iter,
-                               std::unique_ptr<CacheMetadata> metadata);
+  void MatchAllImpl(std::unique_ptr<ServiceWorkerFetchRequest> request,
+                    const CacheStorageCacheQueryParams& options,
+                    const ResponsesCallback& callback);
+  void MatchAllDidQueryCache(
+      const ResponsesCallback& callback,
+      CacheStorageError error,
+      std::unique_ptr<QueryCacheResults> query_cache_results);
 
   // WriteSideData callbacks
   void WriteSideDataDidGetQuota(const ErrorCallback& callback,
                                 const GURL& url,
                                 base::Time expected_response_time,
                                 scoped_refptr<net::IOBuffer> buffer,
                                 int buf_len,
                                 storage::QuotaStatusCode status_code,
                                 int64_t usage,
                                 int64_t quota);
@@ skipping 70 matching lines @@
       std::unique_ptr<OpenAllEntriesContext> entries_context,
       CacheStorageError error);
   void DeleteDidOpenEntry(const GURL& origin,
                           std::unique_ptr<ServiceWorkerFetchRequest> request,
                           const CacheStorageCache::ErrorCallback& callback,
                           std::unique_ptr<disk_cache::Entry*> entryptr,
                           int rv);
 
   // Keys callbacks.
   void KeysImpl(const RequestsCallback& callback);
-  void KeysDidOpenAllEntries(
-      const RequestsCallback& callback,
-      std::unique_ptr<OpenAllEntriesContext> entries_context,
-      CacheStorageError error);
-  void KeysProcessNextEntry(std::unique_ptr<KeysContext> keys_context,
-                            const Entries::iterator& iter);
-  void KeysDidReadMetadata(std::unique_ptr<KeysContext> keys_context,
-                           const Entries::iterator& iter,
-                           std::unique_ptr<CacheMetadata> metadata);
+  void KeysDidQueryCache(
+    const RequestsCallback& callback,
+    CacheStorageError error,
+    std::unique_ptr<QueryCacheResults> query_cache_results);
 
   void CloseImpl(const base::Closure& callback);
 
   void SizeImpl(const SizeCallback& callback);
 
   void GetSizeThenCloseDidGetSize(const SizeCallback& callback,
                                   int64_t cache_size);
 
   // Loads the backend and calls the callback with the result (true for
   // success). The callback will always be called. Virtual for tests.
@@ skipping 16 matching lines @@
       std::unique_ptr<storage::BlobDataHandle> blob_data_handle);
   void PendingResponsesCallback(
       const ResponsesCallback& callback,
       CacheStorageError error,
       std::unique_ptr<Responses> responses,
       std::unique_ptr<BlobDataHandles> blob_data_handles);
   void PendingRequestsCallback(const RequestsCallback& callback,
                                CacheStorageError error,
                                std::unique_ptr<Requests> requests);
   void PendingSizeCallback(const SizeCallback& callback, int64_t size);
+  // TODO(zino): Do we really need this?
+  void PendingQueryCacheResultsCallback(

[nhiroki, 2016/07/20 15:44:17]

You may be able to avoid this pattern after jkarlin@'s refactoring:
https://codereview.chromium.org/2167483002/

[zino, 2016/07/24 10:14:04]

Done.

+      const QueryCacheResultsCallback& callback,
+      CacheStorageError error,
+      std::unique_ptr<QueryCacheResults> results);
 
+  void PopulateRequestFromMetadata(const CacheMetadata& metadata,
+                                   ServiceWorkerFetchRequest* request);
   void PopulateResponseMetadata(const CacheMetadata& metadata,
                                 ServiceWorkerResponse* response);
   std::unique_ptr<storage::BlobDataHandle> PopulateResponseBody(
       disk_cache::ScopedEntryPtr entry,
       ServiceWorkerResponse* response);
 
   // Virtual for testing.
   virtual std::unique_ptr<CacheStorageCacheHandle> CreateCacheHandle();
 
   // Be sure to check |backend_state_| before use.
@@ skipping 21 matching lines @@
   bool memory_only_;
 
   base::WeakPtrFactory<CacheStorageCache> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CacheStorageCache);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_CACHE_H_