Move PageTransition into content namespace. While I'm touching all these files, I've also updated...

chrome/browser/history/history_backend_unittest.cc

 // 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.
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 74 matching lines @@
     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, history::SOURCE_BROWSED, true));
+            redirects, content::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED,
+            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);
     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,
+            redirects, content::PAGE_TRANSITION_CLIENT_REDIRECT,
             history::SOURCE_BROWSED, did_replace));
     backend_->AddPage(request);
 
     *transition1 = getTransition(url1);
     *transition2 = getTransition(url2);
   }
 
   int getTransition(const GURL& url) {
     if (!url.is_valid())
       return 0;
@@ skipping 230 matching lines @@
 // data for the visited page works.  This can happen when clearing the history
 // immediately after visiting a page.
 TEST_F(HistoryBackendTest, DeleteAllThenAddData) {
   ASSERT_TRUE(backend_.get());
 
   Time visit_time = Time::Now();
   GURL url("http://www.google.com/");
   scoped_refptr<HistoryAddPageArgs> request(
       new HistoryAddPageArgs(url, visit_time, NULL, 0, GURL(),
                              history::RedirectList(),
-                             PageTransition::KEYWORD_GENERATED,
+                             content::PAGE_TRANSITION_KEYWORD_GENERATED,
                              history::SOURCE_BROWSED, false));
   backend_->AddPage(request);
 
   // Check that a row was added.
   URLRow outrow;
   EXPECT_TRUE(backend_->db_->GetRowForURL(url, &outrow));
 
   // Check that the visit was added.
   VisitVector all_visits;
   backend_->db_->GetAllVisitsInRange(Time(), Time(), 0, &all_visits);
@@ skipping 131 matching lines @@
 // 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(),
                              history::RedirectList(),
-                             PageTransition::KEYWORD_GENERATED,
+                             content::PAGE_TRANSITION_KEYWORD_GENERATED,
                              history::SOURCE_BROWSED, 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 29 matching lines @@
 
 TEST_F(HistoryBackendTest, ClientRedirect) {
   ASSERT_TRUE(backend_.get());
 
   int transition1;
   int transition2;
 
   // Initial transition to page A.
   GURL url_a("http://google.com/a");
   AddClientRedirect(GURL(), url_a, false, &transition1, &transition2);
-  EXPECT_TRUE(transition2 & PageTransition::CHAIN_END);
+  EXPECT_TRUE(transition2 & content::PAGE_TRANSITION_CHAIN_END);
 
   // User initiated redirect to page B.
   GURL url_b("http://google.com/b");
   AddClientRedirect(url_a, url_b, false, &transition1, &transition2);
-  EXPECT_TRUE(transition1 & PageTransition::CHAIN_END);
-  EXPECT_TRUE(transition2 & PageTransition::CHAIN_END);
+  EXPECT_TRUE(transition1 & content::PAGE_TRANSITION_CHAIN_END);
+  EXPECT_TRUE(transition2 & content::PAGE_TRANSITION_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);
+  EXPECT_FALSE(transition1 & content::PAGE_TRANSITION_CHAIN_END);
+  EXPECT_TRUE(transition2 & content::PAGE_TRANSITION_CHAIN_END);
 }
 
 TEST_F(HistoryBackendTest, ImportedFaviconsTest) {
   // Setup test data - two Urls in the history, one with favicon assigned and
   // one without.
   GURL favicon_url1("http://www.google.com/favicon.ico");
   FaviconID favicon1 = backend_->thumbnail_db_->AddFavicon(favicon_url1,
                                                            FAVICON);
   std::vector<unsigned char> data;
   data.push_back('1');
@@ skipping 59 matching lines @@
   ASSERT_TRUE(backend_.get());
 
   GURL url("http://anyuser:anypass@www.google.com");
   GURL stripped_url("http://www.google.com");
 
   // Clear all history.
   backend_->DeleteAllHistory();
 
   // Visit the url with username, password.
   backend_->AddPageVisit(url, base::Time::Now(), 0,
-    PageTransition::GetQualifier(PageTransition::TYPED),
-    history::SOURCE_BROWSED);
+      content::PageTransitionFromInt(
+          content::PageTransitionGetQualifier(content::PAGE_TRANSITION_TYPED)),
+      history::SOURCE_BROWSED);
 
   // Fetch the row information about stripped url from history db.
   VisitVector visits;
   URLID row_id = backend_->db_->GetRowForURL(stripped_url, NULL);
   backend_->db_->GetVisitsForURL(row_id, &visits);
 
   // Check if stripped url is stored in database.
   ASSERT_EQ(1U, visits.size());
 }
 
 TEST_F(HistoryBackendTest, AddPageVisitSource) {
   ASSERT_TRUE(backend_.get());
 
   GURL url("http://www.google.com");
 
   // Clear all history.
   backend_->DeleteAllHistory();
 
   // Assume visiting the url from an externsion.
-  backend_->AddPageVisit(url, base::Time::Now(), 0, PageTransition::TYPED,
-                         history::SOURCE_EXTENSION);
+  backend_->AddPageVisit(
+      url, base::Time::Now(), 0, content::PAGE_TRANSITION_TYPED,
+      history::SOURCE_EXTENSION);
   // Assume the url is imported from Firefox.
-  backend_->AddPageVisit(url, base::Time::Now(), 0, PageTransition::TYPED,
+  backend_->AddPageVisit(url, base::Time::Now(), 0,
+                         content::PAGE_TRANSITION_TYPED,
                          history::SOURCE_FIREFOX_IMPORTED);
   // Assume this url is also synced.
-  backend_->AddPageVisit(url, base::Time::Now(), 0, PageTransition::TYPED,
+  backend_->AddPageVisit(url, base::Time::Now(), 0,
+                         content::PAGE_TRANSITION_TYPED,
                          history::SOURCE_SYNCED);
 
   // Fetch the row information about the url from history db.
   VisitVector visits;
   URLID row_id = backend_->db_->GetRowForURL(url, NULL);
   backend_->db_->GetVisitsForURL(row_id, &visits);
 
   // Check if all the visits to the url are stored in database.
   ASSERT_EQ(3U, visits.size());
   VisitSourceMap visit_sources;
@@ skipping 19 matching lines @@
 
 TEST_F(HistoryBackendTest, AddPageArgsSource) {
   ASSERT_TRUE(backend_.get());
 
   GURL url("http://testpageargs.com");
 
   // Assume this page is browsed by user.
   scoped_refptr<HistoryAddPageArgs> request1(
       new HistoryAddPageArgs(url, base::Time::Now(), NULL, 0, GURL(),
                              history::RedirectList(),
-                             PageTransition::KEYWORD_GENERATED,
+                             content::PAGE_TRANSITION_KEYWORD_GENERATED,
                              history::SOURCE_BROWSED, false));
   backend_->AddPage(request1);
   // Assume this page is synced.
   scoped_refptr<HistoryAddPageArgs> request2(
       new HistoryAddPageArgs(url, base::Time::Now(), NULL, 0, GURL(),
                              history::RedirectList(),
-                             PageTransition::LINK,
+                             content::PAGE_TRANSITION_LINK,
                              history::SOURCE_SYNCED, false));
   backend_->AddPage(request2);
   // Assume this page is browsed again.
   scoped_refptr<HistoryAddPageArgs> request3(
       new HistoryAddPageArgs(url, base::Time::Now(), NULL, 0, GURL(),
                              history::RedirectList(),
-                             PageTransition::TYPED,
+                             content::PAGE_TRANSITION_TYPED,
                              history::SOURCE_BROWSED, false));
   backend_->AddPage(request3);
 
   // Three visits should be added with proper sources.
   VisitVector visits;
   URLRow row;
   URLID id = backend_->db()->GetRowForURL(url, &row);
   ASSERT_TRUE(backend_->db()->GetVisitsForURL(id, &visits));
   ASSERT_EQ(3U, visits.size());
   VisitSourceMap visit_sources;
   backend_->db_->GetVisitsSource(visits, &visit_sources);
   ASSERT_EQ(1U, visit_sources.size());
   EXPECT_EQ(history::SOURCE_SYNCED, visit_sources.begin()->second);
 }
 
 TEST_F(HistoryBackendTest, AddVisitsSource) {
   ASSERT_TRUE(backend_.get());
 
   GURL url1("http://www.cnn.com");
   std::vector<VisitInfo> visits1, visits2;
   visits1.push_back(VisitInfo(
-      Time::Now() - base::TimeDelta::FromDays(5), PageTransition::LINK));
+      Time::Now() - base::TimeDelta::FromDays(5),
+      content::PAGE_TRANSITION_LINK));
   visits1.push_back(VisitInfo(
-      Time::Now() - base::TimeDelta::FromDays(1), PageTransition::LINK));
+      Time::Now() - base::TimeDelta::FromDays(1),
+      content::PAGE_TRANSITION_LINK));
   visits1.push_back(VisitInfo(
-      Time::Now(), PageTransition::LINK));
+      Time::Now(), content::PAGE_TRANSITION_LINK));
 
   GURL url2("http://www.example.com");
   visits2.push_back(VisitInfo(
-      Time::Now() - base::TimeDelta::FromDays(10), PageTransition::LINK));
-  visits2.push_back(VisitInfo(Time::Now(), PageTransition::LINK));
+      Time::Now() - base::TimeDelta::FromDays(10),
+      content::PAGE_TRANSITION_LINK));
+  visits2.push_back(VisitInfo(Time::Now(), content::PAGE_TRANSITION_LINK));
 
   // Clear all history.
   backend_->DeleteAllHistory();
 
   // Add the visits.
   backend_->AddVisits(url1, visits1, history::SOURCE_IE_IMPORTED);
   backend_->AddVisits(url2, visits2, history::SOURCE_SYNCED);
 
   // Verify the visits were added with their sources.
   VisitVector visits;
@@ skipping 14 matching lines @@
   for (int i = 0; i < 2; i++)
     EXPECT_EQ(history::SOURCE_SYNCED, visit_sources[visits[i].visit_id]);
 }
 
 TEST_F(HistoryBackendTest, GetMostRecentVisits) {
   ASSERT_TRUE(backend_.get());
 
   GURL url1("http://www.cnn.com");
   std::vector<VisitInfo> visits1;
   visits1.push_back(VisitInfo(
-      Time::Now() - base::TimeDelta::FromDays(5), PageTransition::LINK));
+      Time::Now() - base::TimeDelta::FromDays(5),
+      content::PAGE_TRANSITION_LINK));
   visits1.push_back(VisitInfo(
-      Time::Now() - base::TimeDelta::FromDays(1), PageTransition::LINK));
+      Time::Now() - base::TimeDelta::FromDays(1),
+      content::PAGE_TRANSITION_LINK));
   visits1.push_back(VisitInfo(
-      Time::Now(), PageTransition::LINK));
+      Time::Now(), content::PAGE_TRANSITION_LINK));
 
   // Clear all history.
   backend_->DeleteAllHistory();
 
   // Add the visits.
   backend_->AddVisits(url1, visits1, history::SOURCE_IE_IMPORTED);
 
   // Verify the visits were added with their sources.
   VisitVector visits;
   URLRow row;
   URLID id = backend_->db()->GetRowForURL(url1, &row);
   ASSERT_TRUE(backend_->db()->GetMostRecentVisitsForURL(id, 1, &visits));
   ASSERT_EQ(1U, visits.size());
   EXPECT_EQ(visits1[2].first, visits[0].visit_time);
 }
 
 TEST_F(HistoryBackendTest, RemoveVisitsTransitions) {
   ASSERT_TRUE(backend_.get());
 
   // Clear all history.
   backend_->DeleteAllHistory();
 
   GURL url1("http://www.cnn.com");
   VisitInfo typed_visit(
-      Time::Now() - base::TimeDelta::FromDays(6), PageTransition::TYPED);
+      Time::Now() - base::TimeDelta::FromDays(6),
+      content::PAGE_TRANSITION_TYPED);
   VisitInfo reload_visit(
-      Time::Now() - base::TimeDelta::FromDays(5), PageTransition::RELOAD);
+      Time::Now() - base::TimeDelta::FromDays(5),
+      content::PAGE_TRANSITION_RELOAD);
   VisitInfo link_visit(
-      Time::Now() - base::TimeDelta::FromDays(4), PageTransition::LINK);
+      Time::Now() - base::TimeDelta::FromDays(4),
+      content::PAGE_TRANSITION_LINK);
   std::vector<VisitInfo> visits_to_add;
   visits_to_add.push_back(typed_visit);
   visits_to_add.push_back(reload_visit);
   visits_to_add.push_back(link_visit);
 
   // Add the visits.
   backend_->AddVisits(url1, visits_to_add, history::SOURCE_SYNCED);
 
   // Verify that the various counts are what we expect.
   VisitVector visits;
@@ skipping 25 matching lines @@
   ASSERT_TRUE(backend_->RemoveVisits(VisitVector(1, visits[0])));
   ASSERT_EQ(0, backend_->db()->GetRowForURL(url1, &row));
 }
 
 TEST_F(HistoryBackendTest, RemoveVisitsSource) {
   ASSERT_TRUE(backend_.get());
 
   GURL url1("http://www.cnn.com");
   std::vector<VisitInfo> visits1, visits2;
   visits1.push_back(VisitInfo(
-      Time::Now() - base::TimeDelta::FromDays(5), PageTransition::LINK));
-  visits1.push_back(VisitInfo(Time::Now(), PageTransition::LINK));
+      Time::Now() - base::TimeDelta::FromDays(5),
+      content::PAGE_TRANSITION_LINK));
+  visits1.push_back(VisitInfo(Time::Now(),
+    content::PAGE_TRANSITION_LINK));
 
   GURL url2("http://www.example.com");
   visits2.push_back(VisitInfo(
-      Time::Now() - base::TimeDelta::FromDays(10), PageTransition::LINK));
-  visits2.push_back(VisitInfo(Time::Now(), PageTransition::LINK));
+      Time::Now() - base::TimeDelta::FromDays(10),
+      content::PAGE_TRANSITION_LINK));
+  visits2.push_back(VisitInfo(Time::Now(), content::PAGE_TRANSITION_LINK));
 
   // Clear all history.
   backend_->DeleteAllHistory();
 
   // Add the visits.
   backend_->AddVisits(url1, visits1, history::SOURCE_IE_IMPORTED);
   backend_->AddVisits(url2, visits2, history::SOURCE_SYNCED);
 
   // Verify the visits of url1 were added.
   VisitVector visits;
@@ skipping 209 matching lines @@
   ASSERT_TRUE(backend_->GetFaviconFromDB(url, TOUCH_ICON, &favicon));
   std::string touchicon_data(
       favicon.image_data->front(),
       favicon.image_data->front() + favicon.image_data->size());
 
   EXPECT_EQ(TOUCH_ICON, favicon.icon_type);
   EXPECT_EQ(icon_url, favicon.icon_url);
   EXPECT_EQ(blob_data, touchicon_data);
 }
 }  // namespace history