Revert of [CacheStorage] Clean up CacheStorageCache lifetimes

content/browser/cache_storage/cache_storage_dispatcher_host.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/browser/cache_storage/cache_storage_dispatcher_host.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 209 matching lines @@
     Send(new CacheStorageMsg_CacheMatchError(
         thread_id, request_id, blink::WebServiceWorkerCacheErrorNotFound));
     return;
   }
 
   scoped_refptr<CacheStorageCache> cache = it->second;
   std::unique_ptr<ServiceWorkerFetchRequest> scoped_request(
       new ServiceWorkerFetchRequest(request.url, request.method,
                                     request.headers, request.referrer,
                                     request.is_reload));
-
-  cache->Match(
-      std::move(scoped_request),
-      base::Bind(&CacheStorageDispatcherHost::OnCacheMatchCallback, this,
-                 thread_id, request_id, StoreCacheReference(cache)));
+  cache->Match(std::move(scoped_request),
+               base::Bind(&CacheStorageDispatcherHost::OnCacheMatchCallback,
+                          this, thread_id, request_id, cache));
 }
 
 void CacheStorageDispatcherHost::OnCacheMatchAll(
     int thread_id,
     int request_id,
     int cache_id,
     const ServiceWorkerFetchRequest& request,
     const CacheStorageCacheQueryParams& match_params) {
   IDToCacheMap::iterator it = id_to_cache_map_.find(cache_id);
   if (it == id_to_cache_map_.end()) {
     Send(new CacheStorageMsg_CacheMatchError(
         thread_id, request_id, blink::WebServiceWorkerCacheErrorNotFound));
     return;
   }
 
   scoped_refptr<CacheStorageCache> cache = it->second;
   if (request.url.is_empty()) {
     cache->MatchAll(
         std::unique_ptr<ServiceWorkerFetchRequest>(), match_params,
         base::Bind(&CacheStorageDispatcherHost::OnCacheMatchAllCallback, this,
-                   thread_id, request_id, StoreCacheReference(cache)));
+                   thread_id, request_id, cache));
     return;
   }
 
   std::unique_ptr<ServiceWorkerFetchRequest> scoped_request(
       new ServiceWorkerFetchRequest(request.url, request.method,
                                     request.headers, request.referrer,
                                     request.is_reload));
   if (match_params.ignore_search) {
     cache->MatchAll(
         std::move(scoped_request), match_params,
         base::Bind(&CacheStorageDispatcherHost::OnCacheMatchAllCallback, this,
-                   thread_id, request_id, StoreCacheReference(cache)));
+                   thread_id, request_id, cache));
     return;
   }
   cache->Match(
       std::move(scoped_request),
       base::Bind(&CacheStorageDispatcherHost::OnCacheMatchAllCallbackAdapter,
-                 this, thread_id, request_id, StoreCacheReference(cache)));
+                 this, thread_id, request_id, cache));
 }
 
 void CacheStorageDispatcherHost::OnCacheKeys(
     int thread_id,
     int request_id,
     int cache_id,
     const ServiceWorkerFetchRequest& request,
     const CacheStorageCacheQueryParams& match_params) {
   IDToCacheMap::iterator it = id_to_cache_map_.find(cache_id);
   if (it == id_to_cache_map_.end()) {
     Send(new CacheStorageMsg_CacheKeysError(
         thread_id, request_id, blink::WebServiceWorkerCacheErrorNotFound));
     return;
   }
 
   scoped_refptr<CacheStorageCache> cache = it->second;
 
   cache->Keys(base::Bind(&CacheStorageDispatcherHost::OnCacheKeysCallback, this,
-                         thread_id, request_id, StoreCacheReference(cache)));
+                         thread_id, request_id, cache));
 }
 
 void CacheStorageDispatcherHost::OnCacheBatch(
     int thread_id,
     int request_id,
     int cache_id,
     const std::vector<CacheStorageBatchOperation>& operations) {
   IDToCacheMap::iterator it = id_to_cache_map_.find(cache_id);
   if (it == id_to_cache_map_.end()) {
     Send(new CacheStorageMsg_CacheBatchError(
         thread_id, request_id, blink::WebServiceWorkerCacheErrorNotFound));
     return;
   }
   scoped_refptr<CacheStorageCache> cache = it->second;
   cache->BatchOperation(
-      operations,
-      base::Bind(&CacheStorageDispatcherHost::OnCacheBatchCallback, this,
-                 thread_id, request_id, StoreCacheReference(cache)));
+      operations, base::Bind(&CacheStorageDispatcherHost::OnCacheBatchCallback,
+                             this, thread_id, request_id, cache));
 }
 
 void CacheStorageDispatcherHost::OnCacheClosed(int cache_id) {
   DropCacheReference(cache_id);
 }
 
 void CacheStorageDispatcherHost::OnBlobDataHandled(const std::string& uuid) {
   DropBlobDataHandle(uuid);
 }
 
@@ skipping 77 matching lines @@
   if (blob_data_handle)
     StoreBlobDataHandle(*blob_data_handle);
 
   Send(new CacheStorageMsg_CacheStorageMatchSuccess(thread_id, request_id,
                                                     *response));
 }
 
 void CacheStorageDispatcherHost::OnCacheMatchCallback(
     int thread_id,
     int request_id,
-    CacheID cache_id,
+    scoped_refptr<CacheStorageCache> cache,
     CacheStorageError error,
     std::unique_ptr<ServiceWorkerResponse> response,
     std::unique_ptr<storage::BlobDataHandle> blob_data_handle) {
-  DropCacheReference(cache_id);
   if (error != CACHE_STORAGE_OK) {
     Send(new CacheStorageMsg_CacheMatchError(
         thread_id, request_id, ToWebServiceWorkerCacheError(error)));
     return;
   }
 
   if (blob_data_handle)
     StoreBlobDataHandle(*blob_data_handle);
 
   Send(new CacheStorageMsg_CacheMatchSuccess(thread_id, request_id, *response));
 }
 
 void CacheStorageDispatcherHost::OnCacheMatchAllCallbackAdapter(
     int thread_id,
     int request_id,
-    CacheID cache_id,
+    scoped_refptr<CacheStorageCache> cache,
     CacheStorageError error,
     std::unique_ptr<ServiceWorkerResponse> response,
     std::unique_ptr<storage::BlobDataHandle> blob_data_handle) {
   std::unique_ptr<CacheStorageCache::Responses> responses(
       new CacheStorageCache::Responses);
   std::unique_ptr<CacheStorageCache::BlobDataHandles> blob_data_handles(
       new CacheStorageCache::BlobDataHandles);
   if (error == CACHE_STORAGE_OK) {
     DCHECK(response);
     responses->push_back(*response);
     if (blob_data_handle)
       blob_data_handles->push_back(*blob_data_handle);
   }
-  OnCacheMatchAllCallback(thread_id, request_id, cache_id, error,
+  OnCacheMatchAllCallback(thread_id, request_id, std::move(cache), error,
                           std::move(responses), std::move(blob_data_handles));
 }
 
 void CacheStorageDispatcherHost::OnCacheMatchAllCallback(
     int thread_id,
     int request_id,
-    CacheID cache_id,
+    scoped_refptr<CacheStorageCache> cache,
     CacheStorageError error,
     std::unique_ptr<CacheStorageCache::Responses> responses,
     std::unique_ptr<CacheStorageCache::BlobDataHandles> blob_data_handles) {
-  DropCacheReference(cache_id);
   if (error != CACHE_STORAGE_OK && error != CACHE_STORAGE_ERROR_NOT_FOUND) {
     Send(new CacheStorageMsg_CacheMatchAllError(
         thread_id, request_id, ToWebServiceWorkerCacheError(error)));
     return;
   }
 
   for (const storage::BlobDataHandle& handle : *blob_data_handles)
     StoreBlobDataHandle(handle);
 
   Send(new CacheStorageMsg_CacheMatchAllSuccess(thread_id, request_id,
                                                 *responses));
 }
 
 void CacheStorageDispatcherHost::OnCacheKeysCallback(
     int thread_id,
     int request_id,
-    CacheID cache_id,
+    scoped_refptr<CacheStorageCache> cache,
     CacheStorageError error,
     std::unique_ptr<CacheStorageCache::Requests> requests) {
-  DropCacheReference(cache_id);
   if (error != CACHE_STORAGE_OK) {
     Send(new CacheStorageMsg_CacheKeysError(
         thread_id, request_id, ToWebServiceWorkerCacheError(error)));
     return;
   }
 
   CacheStorageCache::Requests out;
 
   for (CacheStorageCache::Requests::const_iterator it = requests->begin();
        it != requests->end(); ++it) {
     ServiceWorkerFetchRequest request(it->url, it->method, it->headers,
                                       it->referrer, it->is_reload);
     out.push_back(request);
   }
 
   Send(new CacheStorageMsg_CacheKeysSuccess(thread_id, request_id, out));
 }
 
-void CacheStorageDispatcherHost::OnCacheBatchCallback(int thread_id,
-                                                      int request_id,
-                                                      CacheID cache_id,
-                                                      CacheStorageError error) {
-  DropCacheReference(cache_id);
+void CacheStorageDispatcherHost::OnCacheBatchCallback(
+    int thread_id,
+    int request_id,
+    scoped_refptr<CacheStorageCache> cache,
+    CacheStorageError error) {
   if (error != CACHE_STORAGE_OK) {
     Send(new CacheStorageMsg_CacheBatchError(
         thread_id, request_id, ToWebServiceWorkerCacheError(error)));
     return;
   }
 
   Send(new CacheStorageMsg_CacheBatchSuccess(thread_id, request_id));
 }
 
 CacheStorageDispatcherHost::CacheID
@@ skipping 20 matching lines @@
   UUIDToBlobDataHandleList::iterator it = blob_handle_store_.find(uuid);
   if (it == blob_handle_store_.end())
     return;
   DCHECK(!it->second.empty());
   it->second.pop_front();
   if (it->second.empty())
     blob_handle_store_.erase(it);
 }
 
 }  // namespace content