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

chrome/browser/history/history_backend_unittest.cc

 // Copyright (c) 2006-2008 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.
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/gfx/jpeg_codec.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 42 matching lines @@
  public:
   HistoryBackendTest() : bookmark_model_(NULL), loaded_(false) {}
   virtual ~HistoryBackendTest() {
   }
 
  protected:
   scoped_refptr<HistoryBackend> backend_;  // Will be NULL on init failure.
   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]));
 
     int int_scope = 1;
     void* scope = 0;
     memcpy(&scope, &int_scope, sizeof(int_scope));
     scoped_refptr<history::HistoryAddPageArgs> request(
         new history::HistoryAddPageArgs(
             redirects.back(), Time::Now(), scope, page_id, GURL(),
             redirects, PageTransition::LINK, true));
     backend_->AddPage(request);
   }
 
   // Adds CLIENT_REDIRECT page transition.
   // |url1| is the source URL and |url2| is the destination.
   // |did_replace| is true if the transition is non-user initiated and the
   // navigation entry for |url2| has replaced that for |url1|. The possibly
   // updated transition code of the visit records for |url1| and |url2| is
   // returned by filling in |*transition1| and |*transition2|, respectively.
   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())
       redirects.push_back(url2);
     scoped_refptr<HistoryAddPageArgs> request(
         new HistoryAddPageArgs(url2, base::Time(), dummy_scope, 0, url1,
             redirects, PageTransition::CLIENT_REDIRECT, did_replace));
     backend_->AddPage(request);
 
     *transition1 = getTransition(url1);
@@ skipping 334 matching lines @@
 // Tests a handful of assertions for a navigation with a type of
 // KEYWORD_GENERATED.
 TEST_F(HistoryBackendTest, KeywordGenerated) {
   ASSERT_TRUE(backend_.get());
 
   GURL url("http://google.com");
 
   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);
 
   // A row should have been added for the url.
   URLRow row;
   URLID url_id = backend_->db()->GetRowForURL(url, &row);
   ASSERT_NE(0, url_id);
 
   // The typed count should be 1.
   ASSERT_EQ(1, row.typed_count());
@@ skipping 43 matching lines @@
   EXPECT_TRUE(transition2 & PageTransition::CHAIN_END);
 
   // Non-user initiated redirect to page C.
   GURL url_c("http://google.com/c");
    AddClientRedirect(url_b, url_c, true, &transition1, &transition2);
   EXPECT_FALSE(transition1 & PageTransition::CHAIN_END);
   EXPECT_TRUE(transition2 & PageTransition::CHAIN_END);
 }
 
 }  // namespace history