[CacheStorage] Give ownership of all CacheStorageCaches to CacheStorage

content/browser/cache_storage/cache_storage_dispatcher_host.h

 // 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.
 
 #ifndef CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_HOST_H_
 
 #include <stdint.h>
 
 #include <list>
@@ skipping 23 matching lines @@
   // BrowserMessageFilter implementation
   void OnDestruct() const override;
   bool OnMessageReceived(const IPC::Message& message) override;
 
  private:
   // Friends to allow OnDestruct() delegation
   friend class BrowserThread;
   friend class base::DeleteHelper<CacheStorageDispatcherHost>;
 
   typedef int32_t CacheID;  // TODO(jkarlin): Bump to 64 bit.
-  typedef std::map<CacheID, scoped_refptr<CacheStorageCache>> IDToCacheMap;
+  typedef std::map<CacheID, std::unique_ptr<CacheStorageCacheHandle>>
+      IDToCacheMap;
   typedef std::map<std::string, std::list<storage::BlobDataHandle>>
       UUIDToBlobDataHandleList;
 
   ~CacheStorageDispatcherHost() override;
 
   // Called by Init() on IO thread.
   void CreateCacheListener(CacheStorageContextImpl* context);
 
   // The message receiver functions for the CacheStorage API:
   void OnCacheStorageHas(int thread_id,
@@ skipping 33 matching lines @@
                     int cache_id,
                     const std::vector<CacheStorageBatchOperation>& operations);
   void OnCacheClosed(int cache_id);
   void OnBlobDataHandled(const std::string& uuid);
 
   // CacheStorageManager callbacks
   void OnCacheStorageHasCallback(int thread_id,
                                  int request_id,
                                  bool has_cache,
                                  CacheStorageError error);
-  void OnCacheStorageOpenCallback(int thread_id,
-                                  int request_id,
-                                  scoped_refptr<CacheStorageCache> cache,
-                                  CacheStorageError error);
+  void OnCacheStorageOpenCallback(
+      int thread_id,
+      int request_id,
+      std::unique_ptr<CacheStorageCacheHandle> cache_handle,
+      CacheStorageError error);
   void OnCacheStorageDeleteCallback(int thread_id,
                                     int request_id,
                                     bool deleted,
                                     CacheStorageError error);
   void OnCacheStorageKeysCallback(int thread_id,
                                   int request_id,
                                   const std::vector<std::string>& strings,
                                   CacheStorageError error);
   void OnCacheStorageMatchCallback(
       int thread_id,
       int request_id,
       CacheStorageError error,
       std::unique_ptr<ServiceWorkerResponse> response,
       std::unique_ptr<storage::BlobDataHandle> blob_data_handle);
 
   // Cache callbacks.
   void OnCacheMatchCallback(
       int thread_id,
       int request_id,
-      scoped_refptr<CacheStorageCache> cache,
+      std::unique_ptr<CacheStorageCacheHandle> cache_handle,
       CacheStorageError error,
       std::unique_ptr<ServiceWorkerResponse> response,
       std::unique_ptr<storage::BlobDataHandle> blob_data_handle);
   void OnCacheMatchAllCallbackAdapter(
       int thread_id,
       int request_id,
-      scoped_refptr<CacheStorageCache> cache,
+      std::unique_ptr<CacheStorageCacheHandle> cache_handle,
       CacheStorageError error,
       std::unique_ptr<ServiceWorkerResponse> response,
       std::unique_ptr<storage::BlobDataHandle> blob_data_handle);
   void OnCacheMatchAllCallback(
       int thread_id,
       int request_id,
-      scoped_refptr<CacheStorageCache> cache,
+      std::unique_ptr<CacheStorageCacheHandle> cache_handle,
       CacheStorageError error,
       std::unique_ptr<std::vector<ServiceWorkerResponse>> responses,
       std::unique_ptr<CacheStorageCache::BlobDataHandles> blob_data_handles);
   void OnCacheMatchAll(int thread_id,
                        int request_id,
                        int cache_id,
                        const ServiceWorkerFetchRequest& request,
                        const CacheStorageCacheQueryParams& match_params);
   void OnCacheKeysCallback(
       int thread_id,
       int request_id,
-      scoped_refptr<CacheStorageCache> cache,
+      std::unique_ptr<CacheStorageCacheHandle> cache_handle,
       CacheStorageError error,
       std::unique_ptr<CacheStorageCache::Requests> requests);
-  void OnCacheBatchCallback(int thread_id,
-                            int request_id,
-                            scoped_refptr<CacheStorageCache> cache,
-                            CacheStorageError error);
+  void OnCacheBatchCallback(
+      int thread_id,
+      int request_id,
+      std::unique_ptr<CacheStorageCacheHandle> cache_handle,
+      CacheStorageError error);
 
-  // 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);
+  // Hangs onto a cache handle. Returns a unique cache_id. Call
+  // DropCacheReference when the reference is no longer needed.
+  CacheID StoreCacheReference(
+      std::unique_ptr<CacheStorageCacheHandle> cache_handle);
   void DropCacheReference(CacheID cache_id);
 
   // Stores blob handles while waiting for acknowledgement of receipt from the
   // renderer.
   void StoreBlobDataHandle(const storage::BlobDataHandle& blob_data_handle);
   void DropBlobDataHandle(const std::string& uuid);
 
   IDToCacheMap id_to_cache_map_;
   CacheID next_cache_id_ = 0;
 
   UUIDToBlobDataHandleList blob_handle_store_;
 
   scoped_refptr<CacheStorageContextImpl> context_;
 
   DISALLOW_COPY_AND_ASSIGN(CacheStorageDispatcherHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_HOST_H_