Moved typedef of RedirectList from HistoryService class to history namespace.

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

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

21 files changed, 63 insertions, 61 deletions

diff --git a/chrome/browser/autocomplete/history_contents_provider_unittest.cc b/chrome/browser/autocomplete/history_contents_provider_unittest.cc
index 2e6fd59..8930353 100644
--- a/chrome/browser/autocomplete/history_contents_provider_unittest.cc
+++ b/chrome/browser/autocomplete/history_contents_provider_unittest.cc
@@ -67,7 +67,7 @@ class HistoryContentsProviderTest : public testing::Test,
       Time t = Time::Now() - TimeDelta::FromDays(arraysize(test_entries) + i);
 
       history_service->AddPage(url, t, id_scope, i, GURL(),
-          PageTransition::LINK, HistoryService::RedirectList(), false);
+          PageTransition::LINK, history::RedirectList(), false);
       history_service->SetPageTitle(url, test_entries[i].title);
       history_service->SetPageContents(url, test_entries[i].body);
     }
diff --git a/chrome/browser/autocomplete/history_url_provider.cc b/chrome/browser/autocomplete/history_url_provider.cc
index 18c1269..fb819d2 100644
--- a/chrome/browser/autocomplete/history_url_provider.cc
+++ b/chrome/browser/autocomplete/history_url_provider.cc
@@ -747,7 +747,7 @@ void HistoryURLProvider::CullRedirects(history::HistoryBackend* backend,
        (source < matches->size()) && (source < max_results); ) {
     const GURL& url = (*matches)[source].url_info.url();
     // TODO(brettw) this should go away when everything uses GURL.
-    HistoryService::RedirectList redirects;
+    history::RedirectList redirects;
     backend->GetMostRecentRedirectsFrom(url, &redirects);
     if (!redirects.empty()) {
       // Remove all but the first occurrence of any of these redirects in the
diff --git a/chrome/browser/autocomplete/history_url_provider_unittest.cc b/chrome/browser/autocomplete/history_url_provider_unittest.cc
index 429e9c1..370fb1c 100644
--- a/chrome/browser/autocomplete/history_url_provider_unittest.cc
+++ b/chrome/browser/autocomplete/history_url_provider_unittest.cc
@@ -316,7 +316,7 @@ TEST_F(HistoryURLProviderTest, CullRedirects) {
   // will appear in A,B,C order in the results. The autocomplete query will
   // search for the most recent visit when looking for redirects, so this will
   // be found even though the previous visits had no redirects.
-  HistoryService::RedirectList redirects_to_a;
+  history::RedirectList redirects_to_a;
   redirects_to_a.push_back(GURL(redirect[1].url));
   redirects_to_a.push_back(GURL(redirect[2].url));
   redirects_to_a.push_back(GURL(redirect[0].url));
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 8f15e06..d43bab6 100755
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -1809,7 +1809,7 @@ void AutomationProvider::OnRedirectQueryComplete(
     HistoryService::Handle request_handle,
     GURL from_url,
     bool success,
-    HistoryService::RedirectList* redirects) {
+    history::RedirectList* redirects) {
   DCHECK(request_handle == redirect_query_);
   DCHECK(reply_message_ != NULL);
 
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index 6701655..cbbc23c 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -460,7 +460,7 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>,
       HistoryService::Handle request_handle,
       GURL from_url,
       bool success,
-      HistoryService::RedirectList* redirects);
+      history::RedirectList* redirects);
 
   // Determine if the message from the external host represents a browser
   // event, and if so dispatch it.
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index 5f12cf4f..1a914be 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -823,7 +823,7 @@ TEST_F(BookmarkModelTestWithProfile2, RemoveNotification) {
 
   profile_->GetHistoryService(Profile::EXPLICIT_ACCESS)->AddPage(
       url, NULL, 1, GURL(), PageTransition::TYPED,
-      HistoryService::RedirectList(), false);
+      history::RedirectList(), false);
 
   // This won't actually delete the URL, rather it'll empty out the visits.
   // This triggers blocking on the BookmarkModel.
diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc
index b6c1d0a..8c314067 100644
--- a/chrome/browser/history/history.cc
+++ b/chrome/browser/history/history.cc
@@ -253,7 +253,7 @@ void HistoryService::AddPage(const GURL& url,
                              int32 page_id,
                              const GURL& referrer,
                              PageTransition::Type transition,
-                             const RedirectList& redirects,
+                             const history::RedirectList& redirects,
                              bool did_replace_entry) {
   AddPage(url, Time::Now(), id_scope, page_id, referrer, transition, redirects,
           did_replace_entry);
@@ -265,7 +265,7 @@ void HistoryService::AddPage(const GURL& url,
                              int32 page_id,
                              const GURL& referrer,
                              PageTransition::Type transition,
-                             const RedirectList& redirects,
+                             const history::RedirectList& redirects,
                              bool did_replace_entry) {
   DCHECK(history_backend_) << "History service being called after cleanup";
 
diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h
index 200e19c..edb446a 100644
--- a/chrome/browser/history/history.h
+++ b/chrome/browser/history/history.h
@@ -86,7 +86,6 @@ class HistoryService : public CancelableRequestProvider,
                        public base::RefCountedThreadSafe<HistoryService> {
  public:
   // Miscellaneous commonly-used types.
-  typedef std::vector<GURL> RedirectList;
   typedef std::vector<PageUsageData*> PageUsageDataList;
 
   // ID (both star_id and group_id) of the bookmark bar.
@@ -165,7 +164,7 @@ class HistoryService : public CancelableRequestProvider,
                int32 page_id,
                const GURL& referrer,
                PageTransition::Type transition,
-               const RedirectList& redirects,
+               const history::RedirectList& redirects,
                bool did_replace_entry);
 
   // For adding pages to history with a specific time. This is for testing
@@ -176,13 +175,13 @@ class HistoryService : public CancelableRequestProvider,
                int32 page_id,
                const GURL& referrer,
                PageTransition::Type transition,
-               const RedirectList& redirects,
+               const history::RedirectList& redirects,
                bool did_replace_entry);
 
   // For adding pages to history where no tracking information can be done.
   void AddPage(const GURL& url) {
     AddPage(url, NULL, 0, GURL::EmptyGURL(), PageTransition::LINK,
-            RedirectList(), false);
+            history::RedirectList(), false);
   }
 
   // Sets the title for the given page. The page should be in history. If it
@@ -276,7 +275,7 @@ class HistoryService : public CancelableRequestProvider,
   typedef Callback4<Handle,
                     GURL,  // from_url
                     bool,  // success
-                    RedirectList*>::Type
+                    history::RedirectList*>::Type
       QueryRedirectsCallback;
 
   // Schedules a query for the most recent redirect coming out of the given
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc
index 0bd6939..0dbd1ec 100644
--- a/chrome/browser/history/history_backend.cc
+++ b/chrome/browser/history/history_backend.cc
@@ -749,8 +749,8 @@ void HistoryBackend::SetPageTitle(const GURL& url,
   // Search for recent redirects which should get the same title. We make a
   // dummy list containing the exact URL visited if there are no redirects so
   // the processing below can be the same.
-  HistoryService::RedirectList dummy_list;
-  HistoryService::RedirectList* redirects;
+  history::RedirectList dummy_list;
+  history::RedirectList* redirects;
   RedirectCache::iterator iter = recent_redirects_.Get(url);
   if (iter != recent_redirects_.end()) {
     redirects = &iter->second;
@@ -1175,7 +1175,7 @@ void HistoryBackend::QueryTopURLsAndRedirects(
 
   for (size_t i = 0; i < data.size(); ++i) {
     top_urls->push_back(data[i]->GetURL());
-    HistoryService::RedirectList list;
+    history::RedirectList list;
     GetMostRecentRedirectsFrom(top_urls->back(), &list);
     (*redirects)[top_urls->back()] = new RefCountedVector<GURL>(list);
   }
@@ -1185,7 +1185,7 @@ void HistoryBackend::QueryTopURLsAndRedirects(
 }
 
 void HistoryBackend::GetRedirectsFromSpecificVisit(
-    VisitID cur_visit, HistoryService::RedirectList* redirects) {
+    VisitID cur_visit, history::RedirectList* redirects) {
   // Follow any redirects from the given visit and add them to the list.
   // It *should* be impossible to get a circular chain here, but we check
   // just in case to avoid infinite loops.
@@ -1204,7 +1204,7 @@ void HistoryBackend::GetRedirectsFromSpecificVisit(
 
 void HistoryBackend::GetRedirectsToSpecificVisit(
     VisitID cur_visit,
-    HistoryService::RedirectList* redirects) {
+    history::RedirectList* redirects) {
   // Follow redirects going to cur_visit. These are added to |redirects| in
   // the order they are found. If a redirect chain looks like A -> B -> C and
   // |cur_visit| = C, redirects will be {B, A} in that order.
@@ -1226,7 +1226,7 @@ void HistoryBackend::GetRedirectsToSpecificVisit(
 
 bool HistoryBackend::GetMostRecentRedirectsFrom(
     const GURL& from_url,
-    HistoryService::RedirectList* redirects) {
+    history::RedirectList* redirects) {
   redirects->clear();
   if (!db_.get())
     return false;
@@ -1242,7 +1242,7 @@ bool HistoryBackend::GetMostRecentRedirectsFrom(
 
 bool HistoryBackend::GetMostRecentRedirectsTo(
     const GURL& to_url,
-    HistoryService::RedirectList* redirects) {
+    history::RedirectList* redirects) {
   redirects->clear();
   if (!db_.get())
     return false;
@@ -1309,7 +1309,7 @@ void HistoryBackend::GetPageThumbnailDirectly(
     // Time the result.
     TimeTicks beginning_time = TimeTicks::Now();
 
-    HistoryService::RedirectList redirects;
+    history::RedirectList redirects;
     URLID url_id;
     bool success = false;
 
@@ -1357,7 +1357,7 @@ bool HistoryBackend::GetThumbnailFromOlderRedirect(
   bool success = false;
   for (VisitVector::const_iterator it = older_sessions.begin();
        !success && it != older_sessions.end(); ++it) {
-    HistoryService::RedirectList redirects;
+    history::RedirectList redirects;
     if (it->visit_id) {
       GetRedirectsFromSpecificVisit(it->visit_id, &redirects);
 
@@ -1533,8 +1533,8 @@ void HistoryBackend::SetFavIconMapping(const GURL& page_url,
                                        FavIconID id) {
   // Find all the pages whose favicons we should set, we want to set it for
   // all the pages in the redirect chain if it redirected.
-  HistoryService::RedirectList dummy_list;
-  HistoryService::RedirectList* redirects;
+  history::RedirectList dummy_list;
+  history::RedirectList* redirects;
   RedirectCache::iterator iter = recent_redirects_.Get(page_url);
   if (iter != recent_redirects_.end()) {
     redirects = &iter->second;
@@ -1552,7 +1552,7 @@ void HistoryBackend::SetFavIconMapping(const GURL& page_url,
   std::set<GURL> favicons_changed;
 
   // Save page <-> favicon association.
-  for (HistoryService::RedirectList::const_iterator i(redirects->begin());
+  for (history::RedirectList::const_iterator i(redirects->begin());
        i != redirects->end(); ++i) {
     URLRow row;
     if (!db_->GetRowForURL(*i, &row) || row.favicon_id() == id)
diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h
index 4870589..2898b7e 100644
--- a/chrome/browser/history/history_backend.h
+++ b/chrome/browser/history/history_backend.h
@@ -160,14 +160,14 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
   //
   // Backend for QueryRedirectsFrom.
   bool GetMostRecentRedirectsFrom(const GURL& url,
-                                  HistoryService::RedirectList* redirects);
+                                  history::RedirectList* redirects);
 
   // Similar to above function except computes a chain of redirects to the
   // given URL. Stores the most recent list of redirects ending at |url| in the
   // given RedirectList. For example, if we have the redirect list A -> B -> C,
   // then calling this function with url=C would fill redirects with {B, A}.
   bool GetMostRecentRedirectsTo(const GURL& url,
-                                      HistoryService::RedirectList* redirects);
+                                      history::RedirectList* redirects);
 
   // Thumbnails ----------------------------------------------------------------
 
@@ -310,12 +310,12 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
   // |cur_visit|. |cur_visit| is assumed to be valid. Assumes that
   // this HistoryBackend object has been Init()ed successfully.
   void GetRedirectsFromSpecificVisit(
-      VisitID cur_visit, HistoryService::RedirectList* redirects);
+      VisitID cur_visit, history::RedirectList* redirects);
 
   // Similar to the above function except returns a redirect list ending
   // at |cur_visit|.
   void GetRedirectsToSpecificVisit(
-      VisitID cur_visit, HistoryService::RedirectList* redirects);
+      VisitID cur_visit, history::RedirectList* redirects);
 
   // Thumbnail Helpers ---------------------------------------------------------
 
@@ -471,7 +471,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, HistoryService::RedirectList> RedirectCache;
+  typedef 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/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc
index beb73fa..62a518d 100644
--- a/chrome/browser/history/history_backend_unittest.cc
+++ b/chrome/browser/history/history_backend_unittest.cc
@@ -60,7 +60,7 @@ class HistoryBackendTest : public testing::Test {
   scoped_ptr<InMemoryHistoryBackend> mem_backend_;
 
   void AddRedirectChain(const char* sequence[], int page_id) {
-    HistoryService::RedirectList redirects;
+    history::RedirectList redirects;
     for (int i = 0; sequence[i] != NULL; ++i)
       redirects.push_back(GURL(sequence[i]));
 
@@ -83,7 +83,7 @@ class HistoryBackendTest : public testing::Test {
   void  AddClientRedirect(const GURL& url1, const GURL& url2, bool did_replace,
                           int* transition1, int* transition2) {
     void* const dummy_scope = reinterpret_cast<void*>(0x87654321);
-    HistoryService::RedirectList redirects;
+    history::RedirectList redirects;
     if (url1.is_valid())
       redirects.push_back(url1);
     if (url2.is_valid())
@@ -438,7 +438,7 @@ TEST_F(HistoryBackendTest, KeywordGenerated) {
   Time visit_time = Time::Now() - base::TimeDelta::FromDays(1);
   scoped_refptr<HistoryAddPageArgs> request(
       new HistoryAddPageArgs(url, visit_time, NULL, 0, GURL(),
-                             HistoryService::RedirectList(),
+                             history::RedirectList(),
                              PageTransition::KEYWORD_GENERATED, false));
   backend_->AddPage(request);
 
diff --git a/chrome/browser/history/history_marshaling.h b/chrome/browser/history/history_marshaling.h
index e2ed5ca..76317ba 100644
--- a/chrome/browser/history/history_marshaling.h
+++ b/chrome/browser/history/history_marshaling.h
@@ -25,7 +25,7 @@ class HistoryAddPageArgs : public base::RefCounted<HistoryAddPageArgs> {
                      const void* arg_id_scope,
                      int32 arg_page_id,
                      const GURL& arg_referrer,
-                     const HistoryService::RedirectList& arg_redirects,
+                     const history::RedirectList& arg_redirects,
                      PageTransition::Type arg_transition,
                      bool arg_did_replace_entry)
       : url(arg_url),
@@ -45,7 +45,7 @@ class HistoryAddPageArgs : public base::RefCounted<HistoryAddPageArgs> {
   int32 page_id;
 
   GURL referrer;
-  HistoryService::RedirectList redirects;
+  history::RedirectList redirects;
   PageTransition::Type transition;
   bool did_replace_entry;
 
@@ -64,7 +64,7 @@ typedef CancelableRequest1<HistoryService::QueryHistoryCallback,
     QueryHistoryRequest;
 
 typedef CancelableRequest1<HistoryService::QueryRedirectsCallback,
-                           HistoryService::RedirectList>
+                           history::RedirectList>
     QueryRedirectsRequest;
 
 typedef CancelableRequest<HistoryService::GetVisitCountToHostCallback>
diff --git a/chrome/browser/history/history_notifications.h b/chrome/browser/history/history_notifications.h
index 1281f2f4..5af5eb2 100644
--- a/chrome/browser/history/history_notifications.h
+++ b/chrome/browser/history/history_notifications.h
@@ -32,7 +32,7 @@ struct URLVisitedDetails : public HistoryDetails {
   // we have the redirect chain A -> B -> C and this struct represents visiting
   // C, then redirects[0]=B and redirects[1]=A.  If there are no redirects,
   // this will be an empty vector.
-  std::vector<GURL> redirects;
+  history::RedirectList redirects;
 };
 
 // Details for NOTIFY_HISTORY_TYPED_URLS_MODIFIED.
diff --git a/chrome/browser/history/history_querying_unittest.cc b/chrome/browser/history/history_querying_unittest.cc
index e9625c3..f7375d3 100644
--- a/chrome/browser/history/history_querying_unittest.cc
+++ b/chrome/browser/history/history_querying_unittest.cc
@@ -108,7 +108,7 @@ class HistoryQueryTest : public testing::Test {
       GURL url(test_entries[i].url);
 
       history_->AddPage(url, test_entries[i].time, id_scope, page_id, GURL(),
-                        PageTransition::LINK, HistoryService::RedirectList(),
+                        PageTransition::LINK, history::RedirectList(),
                         false);
       history_->SetPageTitle(url, test_entries[i].title);
       history_->SetPageContents(url, test_entries[i].body);
diff --git a/chrome/browser/history/history_types.h b/chrome/browser/history/history_types.h
index 8c92d64..5be7581 100644
--- a/chrome/browser/history/history_types.h
+++ b/chrome/browser/history/history_types.h
@@ -30,6 +30,9 @@ class URLDatabase;
 // A -> B -> C, and entry in the map would look like "A => {B -> C}".
 typedef std::map<GURL, scoped_refptr<RefCountedVector<GURL> > > RedirectMap;
 
+// Container for a list of URLs.
+typedef std::vector<GURL> RedirectList;
+
 typedef int64 StarID;  // Unique identifier for star entries.
 typedef int64 UIStarID;  // Identifier for star entries that come from the UI.
 typedef int64 DownloadID;   // Identifier for a download.
diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc
index 6915bf2..db6b941 100644
--- a/chrome/browser/history/history_unittest.cc
+++ b/chrome/browser/history/history_unittest.cc
@@ -241,7 +241,7 @@ class HistoryTest : public testing::Test {
   void OnRedirectQueryComplete(HistoryService::Handle handle,
                                GURL url,
                                bool success,
-                               HistoryService::RedirectList* redirects) {
+                               history::RedirectList* redirects) {
     redirect_query_success_ = success;
     if (redirect_query_success_)
       saved_redirects_.swap(*redirects);
@@ -270,7 +270,7 @@ class HistoryTest : public testing::Test {
 
   // Set by the redirect callback when we get data. You should be sure to
   // clear this before issuing a redirect request.
-  HistoryService::RedirectList saved_redirects_;
+  history::RedirectList saved_redirects_;
   bool redirect_query_success_;
 
   // For history requests.
@@ -384,7 +384,7 @@ TEST_F(HistoryTest, AddPage) {
   const GURL test_url("http://www.google.com/");
   history->AddPage(test_url, NULL, 0, GURL(),
                    PageTransition::MANUAL_SUBFRAME,
-                   HistoryService::RedirectList(), false);
+                   history::RedirectList(), false);
   EXPECT_TRUE(QueryURL(history, test_url));
   EXPECT_EQ(1, query_url_row_.visit_count());
   EXPECT_EQ(0, query_url_row_.typed_count());
@@ -392,7 +392,7 @@ TEST_F(HistoryTest, AddPage) {
 
   // Add the page once from the main frame (should unhide it).
   history->AddPage(test_url, NULL, 0, GURL(), PageTransition::LINK,
-                   HistoryService::RedirectList(), false);
+                   history::RedirectList(), false);
   EXPECT_TRUE(QueryURL(history, test_url));
   EXPECT_EQ(2, query_url_row_.visit_count());  // Added twice.
   EXPECT_EQ(0, query_url_row_.typed_count());  // Never typed.
@@ -415,14 +415,14 @@ TEST_F(HistoryTest, AddPageSameTimes) {
   // additions have different timestamps.
   history->AddPage(test_urls[0], now, NULL, 0, GURL(),
                    PageTransition::LINK,
-                   HistoryService::RedirectList(), false);
+                   history::RedirectList(), false);
   EXPECT_TRUE(QueryURL(history, test_urls[0]));
   EXPECT_EQ(1, query_url_row_.visit_count());
   EXPECT_TRUE(now == query_url_row_.last_visit());  // gtest doesn't like Time
 
   history->AddPage(test_urls[1], now, NULL, 0, GURL(),
                    PageTransition::LINK,
-                   HistoryService::RedirectList(), false);
+                   history::RedirectList(), false);
   EXPECT_TRUE(QueryURL(history, test_urls[1]));
   EXPECT_EQ(1, query_url_row_.visit_count());
   EXPECT_TRUE(now + TimeDelta::FromMicroseconds(1) ==
@@ -432,7 +432,7 @@ TEST_F(HistoryTest, AddPageSameTimes) {
   history->AddPage(test_urls[2], now + TimeDelta::FromMinutes(1),
                    NULL, 0, GURL(),
                    PageTransition::LINK,
-                   HistoryService::RedirectList(), false);
+                   history::RedirectList(), false);
   EXPECT_TRUE(QueryURL(history, test_urls[2]));
   EXPECT_EQ(1, query_url_row_.visit_count());
   EXPECT_TRUE(now + TimeDelta::FromMinutes(1) ==
@@ -448,7 +448,7 @@ TEST_F(HistoryTest, AddRedirect) {
     "http://first.page/",
     "http://second.page/"};
   int first_count = arraysize(first_sequence);
-  HistoryService::RedirectList first_redirects;
+  history::RedirectList first_redirects;
   for (int i = 0; i < first_count; i++)
     first_redirects.push_back(GURL(first_sequence[i]));
 
@@ -486,7 +486,7 @@ TEST_F(HistoryTest, AddRedirect) {
   // Now add a client redirect from that second visit to a third, client
   // redirects are tracked by the RenderView prior to updating history,
   // so we pass in a CLIENT_REDIRECT qualifier to mock that behavior.
-  HistoryService::RedirectList second_redirects;
+  history::RedirectList second_redirects;
   second_redirects.push_back(first_redirects[1]);
   second_redirects.push_back(GURL("http://last.page/"));
   history->AddPage(second_redirects[1], MakeFakeHost(1), 1,
@@ -518,7 +518,7 @@ TEST_F(HistoryTest, Typed) {
   // Add the page once as typed.
   const GURL test_url("http://www.google.com/");
   history->AddPage(test_url, NULL, 0, GURL(), PageTransition::TYPED,
-                   HistoryService::RedirectList(), false);
+                   history::RedirectList(), false);
   EXPECT_TRUE(QueryURL(history, test_url));
 
   // We should have the same typed & visit count.
@@ -527,7 +527,7 @@ TEST_F(HistoryTest, Typed) {
 
   // Add the page again not typed.
   history->AddPage(test_url, NULL, 0, GURL(), PageTransition::LINK,
-                   HistoryService::RedirectList(), false);
+                   history::RedirectList(), false);
   EXPECT_TRUE(QueryURL(history, test_url));
 
   // The second time should not have updated the typed count.
@@ -536,7 +536,7 @@ TEST_F(HistoryTest, Typed) {
 
   // Add the page again as a generated URL.
   history->AddPage(test_url, NULL, 0, GURL(),
-                   PageTransition::GENERATED, HistoryService::RedirectList(),
+                   PageTransition::GENERATED, history::RedirectList(),
                    false);
   EXPECT_TRUE(QueryURL(history, test_url));
 
@@ -546,7 +546,7 @@ TEST_F(HistoryTest, Typed) {
 
   // Add the page again as a reload.
   history->AddPage(test_url, NULL, 0, GURL(),
-                   PageTransition::RELOAD, HistoryService::RedirectList(),
+                   PageTransition::RELOAD, history::RedirectList(),
                    false);
   EXPECT_TRUE(QueryURL(history, test_url));
 
@@ -596,7 +596,7 @@ TEST_F(HistoryTest, Segments) {
   // Add a URL.
   const GURL existing_url("http://www.google.com/");
   history->AddPage(existing_url, scope, 0, GURL(),
-                   PageTransition::TYPED, HistoryService::RedirectList(),
+                   PageTransition::TYPED, history::RedirectList(),
                    false);
 
   // Make sure a segment was created.
@@ -615,7 +615,7 @@ TEST_F(HistoryTest, Segments) {
   // Add a URL which doesn't create a segment.
   const GURL link_url("http://yahoo.com/");
   history->AddPage(link_url, scope, 0, GURL(),
-                   PageTransition::LINK, HistoryService::RedirectList(),
+                   PageTransition::LINK, history::RedirectList(),
                    false);
 
   // Query again
@@ -633,7 +633,7 @@ TEST_F(HistoryTest, Segments) {
 
   // Add a page linked from existing_url.
   history->AddPage(GURL("http://www.google.com/foo"), scope, 3, existing_url,
-                   PageTransition::LINK, HistoryService::RedirectList(),
+                   PageTransition::LINK, history::RedirectList(),
                    false);
 
   // Query again
@@ -762,7 +762,7 @@ HistoryAddPageArgs* MakeAddArgs(const GURL& url) {
                                 kAddArgsScope,
                                 0,
                                 GURL(),
-                                HistoryService::RedirectList(),
+                                history::RedirectList(),
                                 PageTransition::TYPED, false);
 }
 
diff --git a/chrome/browser/search_engines/template_url_model.cc b/chrome/browser/search_engines/template_url_model.cc
index 2d0ebf2..cf78196 100644
--- a/chrome/browser/search_engines/template_url_model.cc
+++ b/chrome/browser/search_engines/template_url_model.cc
@@ -954,7 +954,7 @@ void TemplateURLModel::AddTabToSearchVisit(const TemplateURL& t_url) {
   // autocompleted even if the user doesn't type the url in directly.
   history->AddPage(url, NULL, 0, GURL(),
                    PageTransition::KEYWORD_GENERATED,
-                   HistoryService::RedirectList(), false);
+                   history::RedirectList(), false);
 }
 
 // static
diff --git a/chrome/browser/search_engines/template_url_model_unittest.cc b/chrome/browser/search_engines/template_url_model_unittest.cc
index cbaa576..606dc3c 100644
--- a/chrome/browser/search_engines/template_url_model_unittest.cc
+++ b/chrome/browser/search_engines/template_url_model_unittest.cc
@@ -671,7 +671,7 @@ TEST_F(TemplateURLModelTest, GenerateVisitOnKeyword) {
   history->AddPage(
       GURL(WideToUTF8(t_url->url()->ReplaceSearchTerms(*t_url, L"blah", 0,
                                                        std::wstring()))),
-      NULL, 0, GURL(), PageTransition::KEYWORD, HistoryService::RedirectList(),
+      NULL, 0, GURL(), PageTransition::KEYWORD, history::RedirectList(),
       false);
 
   // Wait for history to finish processing the request.
diff --git a/chrome/browser/thumbnail_store.cc b/chrome/browser/thumbnail_store.cc
index 6acc551..186fc81 100644
--- a/chrome/browser/thumbnail_store.cc
+++ b/chrome/browser/thumbnail_store.cc
@@ -209,7 +209,7 @@ ThumbnailStore::GetStatus ThumbnailStore::GetPageThumbnail(
 
   // Return the first available thumbnail starting at the end of the
   // redirect list.
-  HistoryService::RedirectList::reverse_iterator rit;
+  history::RedirectList::reverse_iterator rit;
   for (rit = it->second->data.rbegin();
        rit != it->second->data.rend(); ++rit) {
     if (cache_->find(*rit) != cache_->end()) {
@@ -245,7 +245,7 @@ void ThumbnailStore::OnRedirectQueryComplete(
     HistoryService::Handle request_handle,
     GURL url,
     bool success,
-    HistoryService::RedirectList* redirects) {
+    history::RedirectList* redirects) {
   if (!success)
     return;
 
diff --git a/chrome/browser/thumbnail_store.h b/chrome/browser/thumbnail_store.h
index 5c6bfe4..6369224 100644
--- a/chrome/browser/thumbnail_store.h
+++ b/chrome/browser/thumbnail_store.h
@@ -144,7 +144,7 @@ class ThumbnailStore : public base::RefCountedThreadSafe<ThumbnailStore> {
   void OnRedirectQueryComplete(HistoryService::Handle request_handle,
                                GURL url,
                                bool success,
-                               HistoryService::RedirectList* redirects);
+                               history::RedirectList* redirects);
 
   // Called on a timer initiated in Init().  Calls the HistoryService to
   // update the list of most visited URLs.  The callback is
diff --git a/chrome/tools/profiles/generate_profile.cc b/chrome/tools/profiles/generate_profile.cc
index 397ae0c..6115412 100644
--- a/chrome/tools/profiles/generate_profile.cc
+++ b/chrome/tools/profiles/generate_profile.cc
@@ -140,7 +140,7 @@ void InsertURLBatch(const std::wstring& profile_dir, int page_id,
     }
 
     // Randomly construct a redirect chain.
-    HistoryService::RedirectList redirects;
+    history::RedirectList redirects;
     if (RandomFloat() < kRedirectProbability) {
       const int redir_count = RandomInt(1, 4);
       for (int i = 0; i < redir_count; ++i)