[CacheStorage] Use QueryCache everywhere

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 68 matching lines @@
       const GURL& origin,
       const std::string& cache_name,
       CacheStorage* cache_storage,
       const base::FilePath& path,
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       scoped_refptr<storage::QuotaManagerProxy> quota_manager_proxy,
       base::WeakPtr<storage::BlobStorageContext> blob_context);
 
   // Returns ERROR_TYPE_NOT_FOUND if not found.
   void Match(std::unique_ptr<ServiceWorkerFetchRequest> request,
+             const CacheStorageCacheQueryParams& match_params,
              const ResponseCallback& callback);
 
   // Returns CACHE_STORAGE_OK and matched responses in this cache. If there are
   // no responses, returns CACHE_STORAGE_OK and an empty vector.
   void MatchAll(std::unique_ptr<ServiceWorkerFetchRequest> request,
                 const CacheStorageCacheQueryParams& match_params,
                 const ResponsesCallback& callback);
 
   // Writes the side data (ex: V8 code cache) for the specified cache entry.
   // If it doesn't exist, or the |expected_response_time| differs from the
@@ skipping 53 matching lines @@
   // Async operations in progress will cancel and not run their callbacks.
   virtual ~CacheStorageCache();
 
   base::FilePath path() const { return path_; }
 
   std::string cache_name() const { return cache_name_; }
 
   base::WeakPtr<CacheStorageCache> AsWeakPtr();
 
  private:
+  enum class QueryCacheType { REQUESTS_AND_RESPONSES, CACHE_ENTRIES };
+
   friend class base::RefCounted<CacheStorageCache>;
   friend class TestCacheStorageCache;
 
   struct OpenAllEntriesContext;
   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.
@@ skipping 17 matching lines @@
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       scoped_refptr<storage::QuotaManagerProxy> quota_manager_proxy,
       base::WeakPtr<storage::BlobStorageContext> blob_context);
 
   // Returns all entries in this cache.
   void OpenAllEntries(const OpenAllEntriesCallback& callback);
   void DidOpenNextEntry(std::unique_ptr<OpenAllEntriesContext> entries_context,
                         const OpenAllEntriesCallback& callback,
                         int rv);
 
+  // Runs |callback| with matching requests/response data. The data provided
+  // in the QueryCacheResults depends on the |query_type|. If |query_type| is
+  // CACHE_ENTRIES then only out_entries is valid. If |query_type| is
+  // REQUESTS_AND_RESPONSES then only out_requests, out_responses, and
+  // out_blob_data_handles are valid.
   void QueryCache(std::unique_ptr<ServiceWorkerFetchRequest> request,
                   const CacheStorageCacheQueryParams& options,
+                  QueryCacheType query_type,
                   const QueryCacheResultsCallback& callback);
+  void QueryCacheDidOpenEntry(
+      std::unique_ptr<QueryCacheResults> query_cache_results,
+      std::unique_ptr<disk_cache::Entry*> entry,
+      int rv);
   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 CacheStorageCacheQueryParams& match_params,
                  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);
+  void MatchDidMatchAll(const ResponseCallback& callback,
+                        CacheStorageError match_all_error,
+                        std::unique_ptr<Responses> match_all_responses,
+                        std::unique_ptr<BlobDataHandles> match_all_handles);
 
   // MatchAll callbacks
   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);
 
@@ skipping 36 matching lines @@
                              disk_cache::ScopedEntryPtr entry,
                              int expected_bytes,
                              int rv);
 
   // Puts the request and response object in the cache. The response body (if
   // present) is stored in the cache, but not the request body. Returns OK on
   // success.
   void Put(const CacheStorageBatchOperation& operation,
            const ErrorCallback& callback);
   void PutImpl(std::unique_ptr<PutContext> put_context);
-  void PutDidDelete(std::unique_ptr<PutContext> put_context,
-                    CacheStorageError delete_error);
+  void PutDidDoomEntry(std::unique_ptr<PutContext> put_context, int rv);
   void PutDidGetUsageAndQuota(std::unique_ptr<PutContext> put_context,
                               storage::QuotaStatusCode status_code,
                               int64_t usage,
                               int64_t quota);
   void PutDidCreateEntry(std::unique_ptr<disk_cache::Entry*> entry_ptr,
                          std::unique_ptr<PutContext> put_context,
                          int rv);
   void PutDidWriteHeaders(std::unique_ptr<PutContext> put_context,
                           int expected_bytes,
                           int rv);
   void PutDidWriteBlobToCache(std::unique_ptr<PutContext> put_context,
                               BlobToDiskCacheIDMap::KeyType blob_to_cache_key,
                               disk_cache::ScopedEntryPtr entry,
                               bool success);
 
   // Asynchronously calculates the current cache size, notifies the quota
   // manager of any change from the last report, and sets cache_size_ to the new
   // size.
   void UpdateCacheSize();
   void UpdateCacheSizeGotSize(std::unique_ptr<CacheStorageCacheHandle>,
                               int current_cache_size);
 
   // Returns ERROR_NOT_FOUND if not found. Otherwise deletes and returns OK.
   void Delete(const CacheStorageBatchOperation& operation,
               const ErrorCallback& callback);
   void DeleteImpl(std::unique_ptr<ServiceWorkerFetchRequest> request,
                   const CacheStorageCacheQueryParams& match_params,
                   const ErrorCallback& callback);
-  void DeleteDidOpenAllEntries(
-      std::unique_ptr<ServiceWorkerFetchRequest> request,
+  void DeleteDidQueryCache(
       const ErrorCallback& callback,
-      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);
+      CacheStorageError error,
+      std::unique_ptr<QueryCacheResults> query_cache_results);
 
   // Keys callbacks.
   void KeysImpl(std::unique_ptr<ServiceWorkerFetchRequest> request,
                 const CacheStorageCacheQueryParams& options,
                 const RequestsCallback& callback);
   void KeysDidQueryCache(
       const RequestsCallback& callback,
       CacheStorageError error,
       std::unique_ptr<QueryCacheResults> query_cache_results);
 
@@ skipping 55 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_