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

chrome/browser/sync/glue/typed_url_model_associator_unittest.cc

Index: chrome/browser/sync/glue/typed_url_model_associator_unittest.cc
===================================================================
--- chrome/browser/sync/glue/typed_url_model_associator_unittest.cc	(revision 105162)
+++ chrome/browser/sync/glue/typed_url_model_associator_unittest.cc	(working copy)
@@ -36,7 +36,7 @@
     history_url.set_hidden(hidden);
     visits->push_back(history::VisitRow(
         history_url.id(), history_url.last_visit(), 0,
-        PageTransition::RELOAD, 0));
+        content::PAGE_TRANSITION_RELOAD, 0));
     history_url.set_visit_count(visits->size());
     return history_url;
   }
@@ -50,7 +50,7 @@
     typed_url.set_title(title);
     typed_url.set_hidden(hidden);
     typed_url.add_visits(last_visit);
-    typed_url.add_visit_transitions(PageTransition::TYPED);
+    typed_url.add_visit_transitions(content::PAGE_TRANSITION_TYPED);
     return typed_url;
   }
 
@@ -157,10 +157,10 @@
 
   for (size_t c = 0; c < arraysize(visits); ++c) {
     old_visits.push_back(history::VisitRow(
-        0, base::Time::FromInternalValue(visits[c]), 0, PageTransition::TYPED,
-        0));
+        0, base::Time::FromInternalValue(visits[c]), 0,
+        content::PAGE_TRANSITION_TYPED, 0));
     new_url.add_visits(visits[c]);
-    new_url.add_visit_transitions(PageTransition::TYPED);
+    new_url.add_visit_transitions(content::PAGE_TRANSITION_TYPED);
   }
 
   std::vector<history::VisitInfo> new_visits;
@@ -185,12 +185,12 @@
   for (size_t c = 0; c < arraysize(visits_left); ++c) {
     old_visits.push_back(history::VisitRow(
         0, base::Time::FromInternalValue(visits_left[c]), 0,
-        PageTransition::TYPED, 0));
+        content::PAGE_TRANSITION_TYPED, 0));
   }
 
   for (size_t c = 0; c < arraysize(visits_right); ++c) {
     new_url.add_visits(visits_right[c]);
-    new_url.add_visit_transitions(PageTransition::TYPED);
+    new_url.add_visit_transitions(content::PAGE_TRANSITION_TYPED);
   }
 
   std::vector<history::VisitInfo> new_visits;
@@ -219,12 +219,12 @@
   for (size_t c = 0; c < arraysize(visits_left); ++c) {
     old_visits.push_back(history::VisitRow(
         0, base::Time::FromInternalValue(visits_left[c]), 0,
-        PageTransition::TYPED, 0));
+        content::PAGE_TRANSITION_TYPED, 0));
   }
 
   for (size_t c = 0; c < arraysize(visits_right); ++c) {
     new_url.add_visits(visits_right[c]);
-    new_url.add_visit_transitions(PageTransition::TYPED);
+    new_url.add_visit_transitions(content::PAGE_TRANSITION_TYPED);
   }
 
   std::vector<history::VisitInfo> new_visits;
@@ -237,11 +237,11 @@
   for (size_t c = 0; c < arraysize(visits_added); ++c) {
     EXPECT_EQ(new_visits[c].first.ToInternalValue(),
               visits_added[c]);
-    EXPECT_EQ(new_visits[c].second, PageTransition::TYPED);
+    EXPECT_EQ(new_visits[c].second, content::PAGE_TRANSITION_TYPED);
   }
 }
 
-static history::VisitRow CreateVisit(PageTransition::Type type,
+static history::VisitRow CreateVisit(content::PageTransition type,
                                      int64 timestamp) {
   return history::VisitRow(0, base::Time::FromInternalValue(timestamp), 0,
                            type, 0);
@@ -249,9 +249,9 @@
 
 TEST_F(TypedUrlModelAssociatorTest, WriteTypedUrlSpecifics) {
   history::VisitVector visits;
-  visits.push_back(CreateVisit(PageTransition::TYPED, 1));
-  visits.push_back(CreateVisit(PageTransition::RELOAD, 2));
-  visits.push_back(CreateVisit(PageTransition::LINK, 3));
+  visits.push_back(CreateVisit(content::PAGE_TRANSITION_TYPED, 1));
+  visits.push_back(CreateVisit(content::PAGE_TRANSITION_RELOAD, 2));
+  visits.push_back(CreateVisit(content::PAGE_TRANSITION_LINK, 3));
 
   history::URLRow url(MakeTypedUrlRow("http://pie.com/", "pie",
                                       1, 100, false, &visits));
@@ -262,18 +262,18 @@
   EXPECT_EQ(typed_url.visit_transitions_size(), typed_url.visits_size());
   EXPECT_EQ(1, typed_url.visits(0));
   EXPECT_EQ(3, typed_url.visits(1));
-  EXPECT_EQ(PageTransition::TYPED,
-            static_cast<PageTransition::Type>(typed_url.visit_transitions(0)));
-  EXPECT_EQ(PageTransition::LINK,
-            static_cast<PageTransition::Type>(typed_url.visit_transitions(1)));
+  EXPECT_EQ(content::PAGE_TRANSITION_TYPED,
+      static_cast<content::PageTransition>(typed_url.visit_transitions(0)));
+  EXPECT_EQ(content::PAGE_TRANSITION_LINK,
+      static_cast<content::PageTransition>(typed_url.visit_transitions(1)));
 }
 
 TEST_F(TypedUrlModelAssociatorTest, TooManyVisits) {
   history::VisitVector visits;
   int64 timestamp = 1000;
-  visits.push_back(CreateVisit(PageTransition::TYPED, timestamp++));
+  visits.push_back(CreateVisit(content::PAGE_TRANSITION_TYPED, timestamp++));
   for (int i = 0 ; i < 100; ++i) {
-    visits.push_back(CreateVisit(PageTransition::LINK, timestamp++));
+    visits.push_back(CreateVisit(content::PAGE_TRANSITION_LINK, timestamp++));
   }
   history::URLRow url(MakeTypedUrlRow("http://pie.com/", "pie",
                                       1, timestamp++, false, &visits));
@@ -286,19 +286,19 @@
   // Visit with timestamp of 1001 should be omitted since we should have
   // skipped that visit to stay under the cap.
   EXPECT_EQ(1002, typed_url.visits(1));
-  EXPECT_EQ(PageTransition::TYPED,
-            static_cast<PageTransition::Type>(typed_url.visit_transitions(0)));
-  EXPECT_EQ(PageTransition::LINK,
-            static_cast<PageTransition::Type>(typed_url.visit_transitions(1)));
+  EXPECT_EQ(content::PAGE_TRANSITION_TYPED,
+      static_cast<content::PageTransition>(typed_url.visit_transitions(0)));
+  EXPECT_EQ(content::PAGE_TRANSITION_LINK,
+      static_cast<content::PageTransition>(typed_url.visit_transitions(1)));
 }
 
 TEST_F(TypedUrlModelAssociatorTest, TooManyTypedVisits) {
   history::VisitVector visits;
   int64 timestamp = 1000;
   for (int i = 0 ; i < 102; ++i) {
-    visits.push_back(CreateVisit(PageTransition::TYPED, timestamp++));
-    visits.push_back(CreateVisit(PageTransition::LINK, timestamp++));
-    visits.push_back(CreateVisit(PageTransition::RELOAD, timestamp++));
+    visits.push_back(CreateVisit(content::PAGE_TRANSITION_TYPED, timestamp++));
+    visits.push_back(CreateVisit(content::PAGE_TRANSITION_LINK, timestamp++));
+    visits.push_back(CreateVisit(content::PAGE_TRANSITION_RELOAD, timestamp++));
   }
   history::URLRow url(MakeTypedUrlRow("http://pie.com/", "pie",
                                       1, timestamp++, false, &visits));
@@ -312,8 +312,8 @@
 
   // Ensure there are no non-typed visits since that's all that should fit.
   for (int i = 0; i < typed_url.visits_size(); ++i) {
-    EXPECT_EQ(PageTransition::TYPED, static_cast<PageTransition::Type>(
-        typed_url.visit_transitions(i)));
+    EXPECT_EQ(content::PAGE_TRANSITION_TYPED,
+        static_cast<content::PageTransition>(typed_url.visit_transitions(i)));
   }
 }
 
@@ -329,8 +329,8 @@
   EXPECT_EQ(typed_url.visit_transitions_size(), typed_url.visits_size());
   // First two typed visits should be skipped.
   EXPECT_EQ(1000, typed_url.visits(0));
-  EXPECT_EQ(PageTransition::RELOAD, static_cast<PageTransition::Type>(
-      typed_url.visit_transitions(0)));
+  EXPECT_EQ(content::PAGE_TRANSITION_RELOAD,
+      static_cast<content::PageTransition>(typed_url.visit_transitions(0)));
 }
 
 class TestTypedUrlModelAssociator : public TypedUrlModelAssociator {