summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-13 20:34:14 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-13 20:34:14 +0000
commite6cf530dcbe563f9e9cbc1c38e3e4a74c3a7d30f (patch)
tree658613a48885a0968024570822ade4a29de17145 /base
parent5a0d4dbd656554ce1c568f16d3688d27485d3f58 (diff)
downloadchromium_src-e6cf530dcbe563f9e9cbc1c38e3e4a74c3a7d30f.zip
chromium_src-e6cf530dcbe563f9e9cbc1c38e3e4a74c3a7d30f.tar.gz
chromium_src-e6cf530dcbe563f9e9cbc1c38e3e4a74c3a7d30f.tar.bz2
Move mru_cache to the new containers subdirectory.
Review URL: https://codereview.chromium.org/11361193 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/base.gyp2
-rw-r--r--base/base.gypi2
-rw-r--r--base/containers/mru_cache.h (renamed from base/memory/mru_cache.h)6
-rw-r--r--base/containers/mru_cache_unittest.cc (renamed from base/memory/mru_cache_unittest.cc)2
4 files changed, 6 insertions, 6 deletions
diff --git a/base/base.gyp b/base/base.gyp
index c1dea4b..9cd1e0f 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -421,6 +421,7 @@
'cancelable_callback_unittest.cc',
'command_line_unittest.cc',
'containers/linked_list_unittest.cc',
+ 'containers/mru_cache_unittest.cc',
'containers/small_map_unittest.cc',
'containers/stack_container_unittest.cc',
'cpu_unittest.cc',
@@ -466,7 +467,6 @@
'md5_unittest.cc',
'memory/aligned_memory_unittest.cc',
'memory/linked_ptr_unittest.cc',
- 'memory/mru_cache_unittest.cc',
'memory/ref_counted_memory_unittest.cc',
'memory/ref_counted_unittest.cc',
'memory/scoped_nsobject_unittest.mm',
diff --git a/base/base.gypi b/base/base.gypi
index 977cc02..e77d20f 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -92,6 +92,7 @@
'command_line.h',
'compiler_specific.h',
'containers/linked_list.h',
+ 'containers/mru_cache.h',
'containers/small_map.h',
'containers/stack_container.h',
'cpu.cc',
@@ -234,7 +235,6 @@
'memory/aligned_memory.h',
'memory/linked_ptr.h',
'memory/manual_constructor.h',
- 'memory/mru_cache.h',
'memory/raw_scoped_refptr_mismatch_checker.h',
'memory/ref_counted.cc',
'memory/ref_counted.h',
diff --git a/base/memory/mru_cache.h b/base/containers/mru_cache.h
index 915d2b5..0683ead 100644
--- a/base/memory/mru_cache.h
+++ b/base/containers/mru_cache.h
@@ -13,8 +13,8 @@
// legibility rather than optimality. If future profiling identifies this as
// a bottleneck, there is room for smaller values of 1 in the O(1). :]
-#ifndef BASE_MEMORY_MRU_CACHE_H_
-#define BASE_MEMORY_MRU_CACHE_H_
+#ifndef BASE_CONTAINERS_MRU_CACHE_H_
+#define BASE_CONTAINERS_MRU_CACHE_H_
#include <list>
#include <map>
@@ -302,4 +302,4 @@ class HashingMRUCache : public MRUCacheBase<KeyType,
} // namespace base
-#endif // BASE_MEMORY_MRU_CACHE_H_
+#endif // BASE_CONTAINERS_MRU_CACHE_H_
diff --git a/base/memory/mru_cache_unittest.cc b/base/containers/mru_cache_unittest.cc
index 1fe9ce2..a8e8932 100644
--- a/base/memory/mru_cache_unittest.cc
+++ b/base/containers/mru_cache_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/basictypes.h"
-#include "base/memory/mru_cache.h"
+#include "base/containers/mru_cache.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {