Http Cache: Don't delete the callback that is waiting for

the backend creation when the cache goes away.

BUG=49193
TEST=net_unittests


Review URL: http://codereview.chromium.org/3016006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52776 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 2 deletions

diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index fb89928..552d9c4 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -134,10 +134,15 @@ class HttpCache::BackendCallback : public CallbackRunner<Tuple1<int> > {
   ~BackendCallback() {}
 
   virtual void RunWithParams(const Tuple1<int>& params) {
-    cache_->OnIOComplete(params.a, pending_op_);
+    if (cache_)
+      cache_->OnIOComplete(params.a, pending_op_);
     delete this;
   }
 
+  void Cancel() {
+    cache_ = NULL;
+  }
+
  private:
   HttpCache* cache_;
   PendingOp* pending_op_;
@@ -283,7 +288,15 @@ HttpCache::~HttpCache() {
     // though they are waiting for a callback that will never fire.
     PendingOp* pending_op = pending_it->second;
     delete pending_op->writer;
-    delete pending_op->callback;
+    if (building_backend_) {
+      // If we don't have a backend, when its construction finishes it will
+      // deliver the callbacks.
+      BackendCallback* callback =
+          static_cast<BackendCallback*>(pending_op->callback);
+      callback->Cancel();
+    } else {
+      delete pending_op->callback;
+    }
 
     STLDeleteElements(&pending_op->pending_queue);
     delete pending_op;