Moved typedef of RedirectList from HistoryService class to history namespace....

chrome/browser/history/history_unittest.cc

Index: chrome/browser/history/history_unittest.cc
===================================================================
--- chrome/browser/history/history_unittest.cc	(revision 19748)
+++ chrome/browser/history/history_unittest.cc	(working copy)
@@ -241,7 +241,7 @@
   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 @@
 
   // 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 @@
   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 @@
 
   // 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 @@
   // 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 @@
   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 @@
     "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 @@
   // 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 @@
   // 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 @@
 
   // 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 @@
 
   // 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 @@
 
   // 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 @@
   // 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 @@
   // 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 @@
 
   // 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 @@
                                 kAddArgsScope,
                                 0,
                                 GURL(),
-                                HistoryService::RedirectList(),
+                                history::RedirectList(),
                                 PageTransition::TYPED, false);
 }