Move PageTransition from //content/public/common to //ui/base

chrome/browser/history/visit_database_unittest.cc

Index: chrome/browser/history/visit_database_unittest.cc
diff --git a/chrome/browser/history/visit_database_unittest.cc b/chrome/browser/history/visit_database_unittest.cc
index 28c68dcf853f8c7ef7bbfbf90def49be405b63f7..a47e05e17e08a7c65414deed7588ea8b8cec8488 100644
--- a/chrome/browser/history/visit_database_unittest.cc
+++ b/chrome/browser/history/visit_database_unittest.cc
@@ -71,19 +71,19 @@ class VisitDatabaseTest : public PlatformTest,
 
 TEST_F(VisitDatabaseTest, Add) {
   // Add one visit.
-  VisitRow visit_info1(1, Time::Now(), 0, content::PAGE_TRANSITION_LINK, 0);
+  VisitRow visit_info1(1, Time::Now(), 0, ui::PAGE_TRANSITION_LINK, 0);
   EXPECT_TRUE(AddVisit(&visit_info1, SOURCE_BROWSED));
 
   // Add second visit for the same page.
   VisitRow visit_info2(visit_info1.url_id,
       visit_info1.visit_time + TimeDelta::FromSeconds(1), 1,
-      content::PAGE_TRANSITION_TYPED, 0);
+      ui::PAGE_TRANSITION_TYPED, 0);
   EXPECT_TRUE(AddVisit(&visit_info2, SOURCE_BROWSED));
 
   // Add third visit for a different page.
   VisitRow visit_info3(2,
       visit_info1.visit_time + TimeDelta::FromSeconds(2), 0,
-      content::PAGE_TRANSITION_LINK, 0);
+      ui::PAGE_TRANSITION_LINK, 0);
   EXPECT_TRUE(AddVisit(&visit_info3, SOURCE_BROWSED));
 
   // Query the first two.
@@ -102,17 +102,17 @@ TEST_F(VisitDatabaseTest, Delete) {
   // should link them.
   static const int kTime1 = 1000;
   VisitRow visit_info1(1, Time::FromInternalValue(kTime1), 0,
-                       content::PAGE_TRANSITION_LINK, 0);
+                       ui::PAGE_TRANSITION_LINK, 0);
   EXPECT_TRUE(AddVisit(&visit_info1, SOURCE_BROWSED));
 
   static const int kTime2 = kTime1 + 1;
   VisitRow visit_info2(1, Time::FromInternalValue(kTime2),
-                       visit_info1.visit_id, content::PAGE_TRANSITION_LINK, 0);
+                       visit_info1.visit_id, ui::PAGE_TRANSITION_LINK, 0);
   EXPECT_TRUE(AddVisit(&visit_info2, SOURCE_BROWSED));
 
   static const int kTime3 = kTime2 + 1;
   VisitRow visit_info3(1, Time::FromInternalValue(kTime3),
-                       visit_info2.visit_id, content::PAGE_TRANSITION_LINK, 0);
+                       visit_info2.visit_id, ui::PAGE_TRANSITION_LINK, 0);
   EXPECT_TRUE(AddVisit(&visit_info3, SOURCE_BROWSED));
 
   // First make sure all the visits are there.
@@ -138,13 +138,13 @@ TEST_F(VisitDatabaseTest, Delete) {
 
 TEST_F(VisitDatabaseTest, Update) {
   // Make something in the database.
-  VisitRow original(1, Time::Now(), 23, content::PageTransitionFromInt(0), 19);
+  VisitRow original(1, Time::Now(), 23, ui::PageTransitionFromInt(0), 19);
   AddVisit(&original, SOURCE_BROWSED);
 
   // Mutate that row.
   VisitRow modification(original);
   modification.url_id = 2;
-  modification.transition = content::PAGE_TRANSITION_TYPED;
+  modification.transition = ui::PAGE_TRANSITION_TYPED;
   modification.visit_time = Time::Now() + TimeDelta::FromDays(1);
   modification.referring_visit = 9292;
   UpdateVisitRow(modification);
@@ -166,48 +166,48 @@ std::vector<VisitRow> GetTestVisitRows() {
 
   // Add one visit.
   VisitRow visit_info1(1, base_time + TimeDelta::FromMinutes(1), 0,
-      static_cast<content::PageTransition>(
-          content::PAGE_TRANSITION_LINK |
-          content::PAGE_TRANSITION_CHAIN_START |
-          content::PAGE_TRANSITION_CHAIN_END),
+      ui::PageTransitionFromInt(
+          ui::PAGE_TRANSITION_LINK |
+          ui::PAGE_TRANSITION_CHAIN_START |
+          ui::PAGE_TRANSITION_CHAIN_END),
       0);
   visit_info1.visit_id = 1;
 
   // Add second visit for the same page.
   VisitRow visit_info2(visit_info1.url_id,
       visit_info1.visit_time + TimeDelta::FromSeconds(1), 1,
-      static_cast<content::PageTransition>(
-          content::PAGE_TRANSITION_TYPED |
-          content::PAGE_TRANSITION_CHAIN_START |
-          content::PAGE_TRANSITION_CHAIN_END),
+      ui::PageTransitionFromInt(
+          ui::PAGE_TRANSITION_TYPED |
+          ui::PAGE_TRANSITION_CHAIN_START |
+          ui::PAGE_TRANSITION_CHAIN_END),
       0);
   visit_info2.visit_id = 2;
 
   // Add third visit for a different page.
   VisitRow visit_info3(2,
       visit_info1.visit_time + TimeDelta::FromSeconds(2), 0,
-      static_cast<content::PageTransition>(
-          content::PAGE_TRANSITION_LINK |
-          content::PAGE_TRANSITION_CHAIN_START),
+      ui::PageTransitionFromInt(
+          ui::PAGE_TRANSITION_LINK |
+          ui::PAGE_TRANSITION_CHAIN_START),
       0);
   visit_info3.visit_id = 3;
 
   // Add a redirect visit from the last page.
   VisitRow visit_info4(3,
       visit_info1.visit_time + TimeDelta::FromSeconds(3), visit_info3.visit_id,
-      static_cast<content::PageTransition>(
-          content::PAGE_TRANSITION_SERVER_REDIRECT |
-          content::PAGE_TRANSITION_CHAIN_END),
+      ui::PageTransitionFromInt(
+          ui::PAGE_TRANSITION_SERVER_REDIRECT |
+          ui::PAGE_TRANSITION_CHAIN_END),
       0);
   visit_info4.visit_id = 4;
 
   // Add a subframe visit.
   VisitRow visit_info5(4,
       visit_info1.visit_time + TimeDelta::FromSeconds(4), visit_info4.visit_id,
-      static_cast<content::PageTransition>(
-          content::PAGE_TRANSITION_AUTO_SUBFRAME |
-          content::PAGE_TRANSITION_CHAIN_START |
-          content::PAGE_TRANSITION_CHAIN_END),
+      ui::PageTransitionFromInt(
+          ui::PAGE_TRANSITION_AUTO_SUBFRAME |
+          ui::PAGE_TRANSITION_CHAIN_START |
+          ui::PAGE_TRANSITION_CHAIN_END),
       0);
   visit_info5.visit_id = 5;
 
@@ -215,10 +215,10 @@ std::vector<VisitRow> GetTestVisitRows() {
   // later than visit 2.
   VisitRow visit_info6(visit_info1.url_id,
       visit_info2.visit_time + TimeDelta::FromDays(1), 1,
-      static_cast<content::PageTransition>(
-          content::PAGE_TRANSITION_TYPED |
-          content::PAGE_TRANSITION_CHAIN_START |
-          content::PAGE_TRANSITION_CHAIN_END),
+      ui::PageTransitionFromInt(
+          ui::PAGE_TRANSITION_TYPED |
+          ui::PAGE_TRANSITION_CHAIN_START |
+          ui::PAGE_TRANSITION_CHAIN_END),
       0);
   visit_info6.visit_id = 6;
 
@@ -355,13 +355,13 @@ TEST_F(VisitDatabaseTest, GetVisibleVisitsInRange) {
 
 TEST_F(VisitDatabaseTest, VisitSource) {
   // Add visits.
-  VisitRow visit_info1(111, Time::Now(), 0, content::PAGE_TRANSITION_LINK, 0);
+  VisitRow visit_info1(111, Time::Now(), 0, ui::PAGE_TRANSITION_LINK, 0);
   ASSERT_TRUE(AddVisit(&visit_info1, SOURCE_BROWSED));
 
-  VisitRow visit_info2(112, Time::Now(), 1, content::PAGE_TRANSITION_TYPED, 0);
+  VisitRow visit_info2(112, Time::Now(), 1, ui::PAGE_TRANSITION_TYPED, 0);
   ASSERT_TRUE(AddVisit(&visit_info2, SOURCE_SYNCED));
 
-  VisitRow visit_info3(113, Time::Now(), 0, content::PAGE_TRANSITION_TYPED, 0);
+  VisitRow visit_info3(113, Time::Now(), 0, ui::PAGE_TRANSITION_TYPED, 0);
   ASSERT_TRUE(AddVisit(&visit_info3, SOURCE_EXTENSION));
 
   // Query each visit.