Disk cache: Stop evictions while performing final cleanup....

net/disk_cache/backend_impl.cc

 // Copyright (c) 2006-2010 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/backend_impl.h"
 
 #include "base/field_trial.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/histogram.h"
@@ skipping 241 matching lines @@
   explicit FinalCleanup(disk_cache::BackendImpl* backend) : backend_(backend) {}
   ~FinalCleanup() {}
 
   virtual void Run();
  private:
   disk_cache::BackendImpl* backend_;
   DISALLOW_EVIL_CONSTRUCTORS(FinalCleanup);
 };
 
 void FinalCleanup::Run() {
-  backend_->CleanupCache();
+  backend_->StartCleanup();
 }
 
 }  // namespace
 
 // ------------------------------------------------------------------------
 
 namespace disk_cache {
 
 int CreateCacheBackend(net::CacheType type, const FilePath& path, int max_bytes,
                        bool force, base::MessageLoopProxy* thread,
@@ skipping 245 matching lines @@
   disabled_ = !rankings_.Init(this, new_eviction_);
   eviction_.Init(this);
 
   // Setup load-time data only for the main cache.
   if (cache_type() == net::DISK_CACHE)
     SetFieldTrialInfo(GetSizeGroup());
 
   return disabled_ ? net::ERR_FAILED : net::OK;
 }
 
+void BackendImpl::StartCleanup() {
+  Trace("Backend StartCleanup");
+  eviction_.Stop();
+
+  // Give a chance for any posted evictions to be discarded.
+  MessageLoop::current()->PostTask(FROM_HERE,
+        factory_.NewRunnableMethod(&BackendImpl::CleanupCache));
+}
+
 void BackendImpl::CleanupCache() {
   Trace("Backend Cleanup");
   if (init_) {
     if (data_)
       data_->header.crash = 0;
 
     timer_.Stop();
     File::WaitForPendingIO(&num_pending_io_);
     DCHECK(!num_refs_);
   }
@@ skipping 1318 matching lines @@
 
   return num_dirty;
 }
 
 bool BackendImpl::CheckEntry(EntryImpl* cache_entry) {
   RankingsNode* rankings = cache_entry->rankings()->Data();
   return !rankings->dummy;
 }
 
 }  // namespace disk_cache