[CacheStorageCache] Close Entry* if the CacheStorageCache is gone

content/browser/cache_storage/cache_storage_cache.cc

 // Copyright 2014 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_cache.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <limits>
 #include <memory>
@@ skipping 274 matching lines @@
 
 struct CacheStorageCache::QueryCacheContext {
   QueryCacheContext(std::unique_ptr<ServiceWorkerFetchRequest> request,
                     const CacheStorageCacheQueryParams& options,
                     const QueryCacheCallback& callback)
       : request(std::move(request)),
         options(options),
         callback(callback),
         matches(base::MakeUnique<QueryCacheResults>()) {}
 
+  ~QueryCacheContext() {
+    // If the CacheStorageCache is deleted before a backend operation to open
+    // an entry completes, the callback won't be run and the resulting entry
+    // will be leaked unless we close it here.
+    if (enumerated_entry) {
+      enumerated_entry->Close();
+      enumerated_entry = nullptr;
+    }
+  }
+
   // Input to QueryCache
   std::unique_ptr<ServiceWorkerFetchRequest> request;
   CacheStorageCacheQueryParams options;
   QueryCacheCallback callback;
   QueryCacheType query_type;
   size_t estimated_out_bytes = 0;
 
   // Iteration state
   std::unique_ptr<disk_cache::Backend::Iterator> backend_iterator;
   disk_cache::Entry* enumerated_entry = nullptr;
@@ skipping 1176 matching lines @@
       temp_entry, INDEX_RESPONSE_BODY, INDEX_SIDE_DATA);
   return blob_storage_context_->AddFinishedBlob(&blob_data);
 }
 
 std::unique_ptr<CacheStorageCacheHandle>
 CacheStorageCache::CreateCacheHandle() {
   return cache_storage_->CreateCacheHandle(this);
 }
 
 }  // namespace content