Disk cache: Make sure that entry_ and node_ are not saved after doom.

net/disk_cache/entry_impl.cc

 // Copyright (c) 2012 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 "net/disk_cache/entry_impl.h"
 
 #include "base/hash.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
@@ skipping 484 matching lines @@
   backend_->RemoveEntry(this);
 
   // Note that at this point node_ and entry_ are just two blocks of data, and
   // even if they reference each other, nobody should be referencing them.
 
   Addr address(entry_.Data()->long_key);
   DeleteData(address, kKeyFileIndex);
   backend_->ModifyStorageSize(entry_.Data()->key_len, 0);
 
   backend_->DeleteBlock(entry_.address(), true);
+  entry_.Discard();
 
-  if (!LeaveRankingsBehind())
+  if (!LeaveRankingsBehind()) {
     backend_->DeleteBlock(node_.address(), true);
+    node_.Discard();
+  }
 }
 
 CacheAddr EntryImpl::GetNextAddress() {
   return entry_.Data()->next;
 }
 
 void EntryImpl::SetNextAddress(Addr address) {
   DCHECK_NE(address.value(), entry_.address().value());
   entry_.Data()->next = address.value();
   bool success = entry_.Store();
@@ skipping 1019 matching lines @@
   Trace("%s 0x%p 0x%x 0x%x", msg, reinterpret_cast<void*>(this),
         entry_.address().value(), node_.address().value());
 
   Trace("  data: 0x%x 0x%x 0x%x", entry_.Data()->data_addr[0],
         entry_.Data()->data_addr[1], entry_.Data()->long_key);
 
   Trace("  doomed: %d 0x%x", doomed_, dirty);
 }
 
 }  // namespace disk_cache