Revert 51858 - Disk cache: Switch the disk cache to use the cache_thread. ...

net/disk_cache/eviction.cc

-// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 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.
 
 // The eviction policy is a very simple pure LRU, so the elements at the end of
 // the list are evicted until kCleanUpMargin free space is available. There is
 // only one list in use (Rankings::NO_USE), and elements are sent to the front
 // of the list whenever they are accessed.
 
 // The new (in-development) eviction policy ads re-use as a factor to evict
 // an entry. The story so far:
@@ skipping 205 matching lines @@
 
 bool Eviction::EvictEntry(CacheRankingsBlock* node, bool empty) {
   EntryImpl* entry = backend_->GetEnumeratedEntry(node, true);
   if (!entry) {
     Trace("NewEntry failed on Trim 0x%x", node->address().value());
     return false;
   }
 
   ReportTrimTimes(entry);
   if (empty || !new_eviction_) {
-    entry->DoomImpl();
+    entry->Doom();
   } else {
     entry->DeleteEntryData(false);
     EntryStore* info = entry->entry()->Data();
     DCHECK(ENTRY_NORMAL == info->state);
 
     rankings_->Remove(entry->rankings(), GetListForEntryV2(entry));
     info->state = ENTRY_EVICTED;
     entry->entry()->Store();
     rankings_->Insert(entry->rankings(), true, Rankings::DELETED);
     backend_->OnEvent(Stats::TRIM_ENTRY);
@@ skipping 208 matching lines @@
   }
 
   // TODO(rvargas): figure out how to deal with corruption at this point (dirty
   // entries that live in this list).
   if (node->Data()->dirty) {
     // We ignore the failure; we're removing the entry anyway.
     entry->Update();
   }
   bool doomed = (entry->entry()->Data()->state == ENTRY_DOOMED);
   entry->entry()->Data()->state = ENTRY_DOOMED;
-  entry->DoomImpl();
+  entry->Doom();
   entry->Release();
   return !doomed;
 }
 
 bool Eviction::NodeIsOldEnough(CacheRankingsBlock* node, int list) {
   if (!node)
     return false;
 
   // If possible, we want to keep entries on each list at least kTargetTime
   // hours. Each successive list on the enumeration has 2x the target time of
@@ skipping 35 matching lines @@
               Time::FromInternalValue(last2.get()->Data()->last_used));
   if (last3.get())
     CACHE_UMA(AGE, "HighUseAge", 0,
               Time::FromInternalValue(last3.get()->Data()->last_used));
   if (last4.get())
     CACHE_UMA(AGE, "DeletedAge", 0,
               Time::FromInternalValue(last4.get()->Data()->last_used));
 }
 
 }  // namespace disk_cache