[CacheStorage] Clean up CacheStorageCache lifetimes

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..12a82a16a8dfb0ecf8979c72eb6d8dc3f804de44 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -142,8 +142,6 @@ void DownloadUrlOnUIThread(std::unique_ptr<DownloadUrlParameters> parameters) {
   download_manager->DownloadUrl(std::move(parameters));
 }
 
-void NoOpCacheStorageErrorCallback(CacheStorageError error) {}
-
 }  // namespace
 
 RenderMessageFilter::RenderMessageFilter(
@@ -168,6 +166,7 @@ RenderMessageFilter::RenderMessageFilter(
       audio_manager_(audio_manager),
       media_internals_(media_internals),
       cache_storage_context_(cache_storage_context),
+      next_cache_id_(0),
       weak_ptr_factory_(this) {
   DCHECK(request_context_.get());
 
@@ -616,8 +615,17 @@ void RenderMessageFilter::OnCacheStorageOpenCallback(
     CacheStorageError error) {
   if (error != CACHE_STORAGE_OK)
     return;
-  cache->WriteSideData(base::Bind(&NoOpCacheStorageErrorCallback), url,
-                       expected_response_time, buf, buf_len);
+
+  CacheID cache_id = next_cache_id_++;
+  cache_references_[cache_id] = cache;
+  cache->WriteSideData(base::Bind(&RenderMessageFilter::DidWriteSideData,
+                                  weak_ptr_factory_.GetWeakPtr(), cache_id),
+                       url, expected_response_time, buf, buf_len);
+}
+
+void RenderMessageFilter::DidWriteSideData(CacheID cache_id,
+                                           CacheStorageError error) {
+  cache_references_.erase(cache_id);
 }
 
 void RenderMessageFilter::OnKeygen(uint32_t key_size_index,