Revert of [CacheStorage] Clean up CacheStorageCache lifetimes

content/browser/cache_storage/cache_storage_dispatcher_host.h

Index: content/browser/cache_storage/cache_storage_dispatcher_host.h
diff --git a/content/browser/cache_storage/cache_storage_dispatcher_host.h b/content/browser/cache_storage/cache_storage_dispatcher_host.h
index c5b1fc1c71743bc59aa397f74be975b690917184..a62755fce03e47222752b3376f82ce216d38a6c9 100644
--- a/content/browser/cache_storage/cache_storage_dispatcher_host.h
+++ b/content/browser/cache_storage/cache_storage_dispatcher_host.h
@@ -118,21 +118,21 @@
   void 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);
   void 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);
   void OnCacheMatchAllCallback(
       int thread_id,
       int request_id,
-      CacheID cache_id,
+      scoped_refptr<CacheStorageCache> cache,
       CacheStorageError error,
       std::unique_ptr<std::vector<ServiceWorkerResponse>> responses,
       std::unique_ptr<CacheStorageCache::BlobDataHandles> blob_data_handles);
@@ -144,16 +144,17 @@
   void OnCacheKeysCallback(
       int thread_id,
       int request_id,
-      CacheID cache_id,
+      scoped_refptr<CacheStorageCache> cache,
       CacheStorageError error,
       std::unique_ptr<CacheStorageCache::Requests> requests);
   void OnCacheBatchCallback(int thread_id,
                             int request_id,
-                            CacheID cache_id,
+                            scoped_refptr<CacheStorageCache> cache,
                             CacheStorageError error);
 
-  // Hangs onto a scoped_refptr to |cache|. Returns a unique cache_id. Call
-  // DropCacheReference when the reference is no longer needed.
+  // Hangs onto a scoped_refptr for the cache if it isn't already doing so.
+  // Returns a unique cache_id. Call DropCacheReference when the client is done
+  // with this cache.
   CacheID StoreCacheReference(scoped_refptr<CacheStorageCache> cache);
   void DropCacheReference(CacheID cache_id);