Reorganize net/disk_cache into backend specific directories.

net/disk_cache/blockfile/eviction_v3.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.
 
 // 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 adds re-use as a factor to evict
 // an entry. The story so far:
 
 // Entries are linked on separate lists depending on how often they are used.
 // When we see an element for the first time, it goes to the NO_USE list; if
 // the object is reused later on, we move it to the LOW_USE list, until it is
 // used kHighUse times, at which point it is moved to the HIGH_USE list.
 // Whenever an element is evicted, we move it to the DELETED list so that if the
 // element is accessed again, we remember the fact that it was already stored
 // and maybe in the future we don't evict that element.
 
 // When we have to evict an element, first we try to use the last element from
 // the NO_USE list, then we move to the LOW_USE and only then we evict an entry
 // from the HIGH_USE. We attempt to keep entries on the cache for at least
 // kTargetTime hours (with frequently accessed items stored for longer periods),
 // but if we cannot do that, we fall-back to keep each list roughly the same
 // size so that we have a chance to see an element again and move it to another
 // list.
 
-#include "net/disk_cache/v3/eviction_v3.h"
+#include "net/disk_cache/blockfile/eviction_v3.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
-#include "net/disk_cache/experiments.h"
-#include "net/disk_cache/trace.h"
-#include "net/disk_cache/v3/backend_impl_v3.h"
-#include "net/disk_cache/v3/entry_impl_v3.h"
+#include "net/disk_cache/blockfile/backend_impl_v3.h"
+#include "net/disk_cache/blockfile/entry_impl_v3.h"
+#include "net/disk_cache/blockfile/experiments.h"
+#include "net/disk_cache/blockfile/trace.h"
 
 // Define BLOCKFILE_BACKEND_IMPL_OBJ to be a disk_cache::BackendImpl* in order
 // to use the CACHE_UMA histogram macro.
 #define BLOCKFILE_BACKEND_IMPL_OBJ backend_

[rvargas (doing something else), 2014/02/11 20:15:12]

I know I've mentioned it before, but seeing the same changes on multiple CLs is
a pain. CLs should be independent, always diffed against trunk, not intermixed.

Now it is not just a matter of seeing what changed between PS 22 and 23

-#include "net/disk_cache/v3/histogram_macros.h"
+#include "net/disk_cache/blockfile/histogram_macros_v3.h"
 
 using base::Time;
 using base::TimeTicks;
 
 namespace {
 
 const int kCleanUpMargin = 1024 * 1024;
 
 #if defined(V3_NOT_JUST_YET_READY)
 const int kHighUse = 10;  // Reuse count to be on the HIGH_USE list.
@@ skipping 449 matching lines @@
   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));
 }
 #endif  // defined(V3_NOT_JUST_YET_READY).
 
 }  // namespace disk_cache