Moved mru_cache from content/common to base/memory.

BUG=None
TEST=None

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

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

3 files changed, 6 insertions, 7 deletions

diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h
index fd2f0fd..9bf8340 100644
--- a/chrome/browser/history/history_backend.h
+++ b/chrome/browser/history/history_backend.h
@@ -12,6 +12,7 @@
 #include "app/sql/init_status.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
+#include "base/memory/mru_cache.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/history/archived_database.h"
 #include "chrome/browser/history/expire_history_backend.h"
@@ -22,7 +23,6 @@
 #include "chrome/browser/history/thumbnail_database.h"
 #include "chrome/browser/history/visit_tracker.h"
 #include "chrome/browser/search_engines/template_url_id.h"
-#include "content/common/mru_cache.h"
 
 class BookmarkService;
 struct DownloadCreateInfo;
@@ -555,7 +555,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
   //
   // As with AddPage, the last item in the redirect chain will be the
   // destination of the redirect (i.e., the key into recent_redirects_);
-  typedef MRUCache<GURL, history::RedirectList> RedirectCache;
+  typedef base::MRUCache<GURL, history::RedirectList> RedirectCache;
   RedirectCache recent_redirects_;
 
   // Timestamp of the last page addition request. We use this to detect when
diff --git a/chrome/browser/history/text_database_manager.cc b/chrome/browser/history/text_database_manager.cc
index e884ec1..1e20087 100644
--- a/chrome/browser/history/text_database_manager.cc
+++ b/chrome/browser/history/text_database_manager.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -13,7 +13,6 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history_publisher.h"
 #include "chrome/browser/history/visit_database.h"
-#include "content/common/mru_cache.h"
 
 using base::Time;
 using base::TimeDelta;
diff --git a/chrome/browser/history/text_database_manager.h b/chrome/browser/history/text_database_manager.h
index 952edc6..0bf541f 100644
--- a/chrome/browser/history/text_database_manager.h
+++ b/chrome/browser/history/text_database_manager.h
@@ -14,11 +14,11 @@
 #include "base/gtest_prod_util.h"
 #include "base/string16.h"
 #include "base/task.h"
+#include "base/memory/mru_cache.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/text_database.h"
 #include "chrome/browser/history/query_parser.h"
 #include "chrome/browser/history/url_database.h"
-#include "content/common/mru_cache.h"
 
 namespace history {
 
@@ -262,7 +262,7 @@ class TextDatabaseManager {
   // using Get. Instead, we keep them in the order they were inserted, since
   // this is the metric we use to measure age. The MRUCache gives us an ordered
   // list with fast lookup by URL.
-  typedef MRUCache<GURL, PageInfo> RecentChangeList;
+  typedef base::MRUCache<GURL, PageInfo> RecentChangeList;
   RecentChangeList recent_changes_;
 
   // Nesting levels of transactions. Since sqlite only allows one open
@@ -273,7 +273,7 @@ class TextDatabaseManager {
 
   // The cache owns the TextDatabase pointers, they will be automagically
   // deleted when the cache entry is removed or expired.
-  typedef OwningMRUCache<TextDatabase::DBIdent, TextDatabase*> DBCache;
+  typedef base::OwningMRUCache<TextDatabase::DBIdent, TextDatabase*> DBCache;
   DBCache db_cache_;
 
   // Tells us about the existence of database files on disk. All existing