Disk cache: Fix the initialization order of the backend.

BUG=72963
TEST=net_unittests


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

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

2 files changed, 29 insertions, 5 deletions

diff --git a/net/disk_cache/backend_impl.cc b/net/disk_cache/backend_impl.cc
index 01c0136..dfa9e51 100644
--- a/net/disk_cache/backend_impl.cc
+++ b/net/disk_cache/backend_impl.cc
@@ -506,17 +506,18 @@ int BackendImpl::SyncInit() {
     read_only_ = true;
   }
 
+  // Setup load-time data only for the main cache.
+  if (!throttle_requests_ && cache_type() == net::DISK_CACHE)
+    throttle_requests_ = SetFieldTrialInfo(GetSizeGroup());
+
+  eviction_.Init(this);
+
   // stats_ and rankings_ may end up calling back to us so we better be enabled.
   disabled_ = false;
   if (!stats_.Init(this, &data_->header.stats))
     return net::ERR_FAILED;
 
   disabled_ = !rankings_.Init(this, new_eviction_);
-  eviction_.Init(this);
-
-  // Setup load-time data only for the main cache.
-  if (!throttle_requests_ && cache_type() == net::DISK_CACHE)
-    throttle_requests_ = SetFieldTrialInfo(GetSizeGroup());
 
   return disabled_ ? net::ERR_FAILED : net::OK;
 }
diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc
index 1760837..0a693be 100644
--- a/net/disk_cache/backend_unittest.cc
+++ b/net/disk_cache/backend_unittest.cc
@@ -48,6 +48,7 @@ class DiskCacheBackendTest : public DiskCacheTestWithCache {
   void BackendTransaction(const std::string& name, int num_entries, bool load);
   void BackendRecoverInsert();
   void BackendRecoverRemove();
+  void BackendRecoverWithEviction();
   void BackendInvalidEntry2();
   void BackendInvalidEntry3();
   void BackendNotMarkedButDirty(const std::string& name);
@@ -1272,6 +1273,28 @@ TEST_F(DiskCacheBackendTest, NewEvictionRecoverRemove) {
   BackendRecoverRemove();
 }
 
+void DiskCacheBackendTest::BackendRecoverWithEviction() {
+  success_ = false;
+  ASSERT_TRUE(CopyTestCache("insert_load1"));
+  DisableFirstCleanup();
+
+  SetMask(0xf);
+  SetMaxSize(0x1000);
+
+  // We should not crash here.
+  InitCache();
+  DisableIntegrityCheck();
+}
+
+TEST_F(DiskCacheBackendTest, RecoverWithEviction) {
+  BackendRecoverWithEviction();
+}
+
+TEST_F(DiskCacheBackendTest, NewEvictionRecoverWithEviction) {
+  SetNewEviction();
+  BackendRecoverWithEviction();
+}
+
 // Tests dealing with cache files that cannot be recovered.
 TEST_F(DiskCacheTest, DeleteOld) {
   ASSERT_TRUE(CopyTestCache("wrong_version"));