[CacheStorage] Give ownership of all CacheStorageCaches to CacheStorage

content/browser/renderer_host/render_message_filter.cc

Index: content/browser/renderer_host/render_message_filter.cc
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 172a80de0e863286e79d0de4173d604c08ba67df..77c4e0e4d8009247e7cfdfc7320a5e89ccdc1a22 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -23,6 +23,7 @@
 #include "content/browser/blob_storage/chrome_blob_storage_context.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/cache_storage/cache_storage_cache.h"
+#include "content/browser/cache_storage/cache_storage_cache_handle.h"
 #include "content/browser/cache_storage/cache_storage_context_impl.h"
 #include "content/browser/cache_storage/cache_storage_manager.h"
 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
@@ -142,7 +143,9 @@ void DownloadUrlOnUIThread(std::unique_ptr<DownloadUrlParameters> parameters) {
   download_manager->DownloadUrl(std::move(parameters));
 }
 
-void NoOpCacheStorageErrorCallback(CacheStorageError error) {}
+void NoOpCacheStorageErrorCallback(
+    std::unique_ptr<CacheStorageCacheHandle> cache_handle,
+    CacheStorageError error) {}
 
 }  // namespace
 
@@ -612,12 +615,16 @@ void RenderMessageFilter::OnCacheStorageOpenCallback(
     base::Time expected_response_time,
     scoped_refptr<net::IOBuffer> buf,
     int buf_len,
-    scoped_refptr<CacheStorageCache> cache,
+    std::unique_ptr<CacheStorageCacheHandle> cache_handle,
     CacheStorageError error) {
-  if (error != CACHE_STORAGE_OK)
+  if (error != CACHE_STORAGE_OK || !cache_handle || !cache_handle->value())
     return;
-  cache->WriteSideData(base::Bind(&NoOpCacheStorageErrorCallback), url,
-                       expected_response_time, buf, buf_len);
+  CacheStorageCache* cache = cache_handle->value();
+  if (!cache)
+    return;
+  cache->WriteSideData(base::Bind(&NoOpCacheStorageErrorCallback,
+                                  base::Passed(std::move(cache_handle))),
+                       url, expected_response_time, buf, buf_len);
 }
 
 void RenderMessageFilter::OnKeygen(uint32_t key_size_index,