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

chrome/browser/history/visit_database.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 "chrome/browser/history/visit_database.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <set>
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/common/url_constants.h"
-#include "content/common/page_transition_types.h"
+#include "content/public/common/page_transition_types.h"
 #include "sql/statement.h"
 
 // Rows, in order, of the visit table.
 #define HISTORY_VISIT_ROW_FIELDS \
   " id,url,visit_time,from_visit,transition,segment_id,is_indexed "
 
 namespace history {
 
 VisitDatabase::VisitDatabase() {
 }
@@ skipping 57 matching lines @@
   return GetDB().Execute("DROP TABLE visits");
 }
 
 // Must be in sync with HISTORY_VISIT_ROW_FIELDS.
 // static
 void VisitDatabase::FillVisitRow(sql::Statement& statement, VisitRow* visit) {
   visit->visit_id = statement.ColumnInt64(0);
   visit->url_id = statement.ColumnInt64(1);
   visit->visit_time = base::Time::FromInternalValue(statement.ColumnInt64(2));
   visit->referring_visit = statement.ColumnInt64(3);
-  visit->transition = PageTransition::FromInt(statement.ColumnInt(4));
+  visit->transition = content::PageTransitionFromInt(statement.ColumnInt(4));
   visit->segment_id = statement.ColumnInt64(5);
   visit->is_indexed = !!statement.ColumnInt(6);
 }
 
 // static
 void VisitDatabase::FillVisitVector(sql::Statement& statement,
                                     VisitVector* visits) {
   while (statement.Step()) {
     history::VisitRow visit;
     FillVisitRow(statement, &visit);
@@ skipping 173 matching lines @@
   statement.BindInt64(2,
       max_results ? max_results : std::numeric_limits<int64>::max());
 
   FillVisitVector(statement, visits);
 }
 
 void VisitDatabase::GetVisitsInRangeForTransition(
     base::Time begin_time,
     base::Time end_time,
     int max_results,
-    PageTransition::Type transition,
+    content::PageTransition transition,
     VisitVector* visits) {
   DCHECK(visits);
   visits->clear();
 
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "SELECT" HISTORY_VISIT_ROW_FIELDS "FROM visits "
       "WHERE visit_time >= ? AND visit_time < ? "
       "AND (transition & ?) == ?"
       "ORDER BY visit_time LIMIT ?"));
   if (!statement)
     return;
 
   // See GetVisibleVisitsInRange for more info on how these times are bound.
   int64 end = end_time.ToInternalValue();
   statement.BindInt64(0, begin_time.ToInternalValue());
   statement.BindInt64(1, end ? end : std::numeric_limits<int64>::max());
-  statement.BindInt(2, PageTransition::CORE_MASK);
+  statement.BindInt(2, content::PAGE_TRANSITION_CORE_MASK);
   statement.BindInt(3, transition);
   statement.BindInt64(4,
       max_results ? max_results : std::numeric_limits<int64>::max());
 
   FillVisitVector(statement, visits);
 }
 
 void VisitDatabase::GetVisibleVisitsInRange(base::Time begin_time,
                                             base::Time end_time,
                                             int max_count,
@@ skipping 10 matching lines @@
       "ORDER BY visit_time DESC, id DESC"));
   if (!statement)
     return;
 
   // Note that we use min/max values for querying unlimited ranges of time using
   // the same statement. Since the time has an index, this will be about the
   // same amount of work as just doing a query for everything with no qualifier.
   int64 end = end_time.ToInternalValue();
   statement.BindInt64(0, begin_time.ToInternalValue());
   statement.BindInt64(1, end ? end : std::numeric_limits<int64>::max());
-  statement.BindInt(2, PageTransition::CHAIN_END);
-  statement.BindInt(3, PageTransition::CORE_MASK);
-  statement.BindInt(4, PageTransition::AUTO_SUBFRAME);
-  statement.BindInt(5, PageTransition::MANUAL_SUBFRAME);
-  statement.BindInt(6, PageTransition::KEYWORD_GENERATED);
+  statement.BindInt(2, content::PAGE_TRANSITION_CHAIN_END);
+  statement.BindInt(3, content::PAGE_TRANSITION_CORE_MASK);
+  statement.BindInt(4, content::PAGE_TRANSITION_AUTO_SUBFRAME);
+  statement.BindInt(5, content::PAGE_TRANSITION_MANUAL_SUBFRAME);
+  statement.BindInt(6, content::PAGE_TRANSITION_KEYWORD_GENERATED);
 
   std::set<URLID> found_urls;
   while (statement.Step()) {
     VisitRow visit;
     FillVisitRow(statement, &visit);
     // Make sure the URL this visit corresponds to is unique.
     if (found_urls.find(visit.url_id) != found_urls.end())
       continue;
     found_urls.insert(visit.url_id);
     visits->push_back(visit);
@@ skipping 53 matching lines @@
                                          GURL* to_url) {
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "SELECT v.id,u.url "
       "FROM visits v JOIN urls u ON v.url = u.id "
       "WHERE v.from_visit = ? "
       "AND (v.transition & ?) != 0"));  // IS_REDIRECT_MASK
   if (!statement)
     return false;
 
   statement.BindInt64(0, from_visit);
-  statement.BindInt(1, PageTransition::IS_REDIRECT_MASK);
+  statement.BindInt(1, content::PAGE_TRANSITION_IS_REDIRECT_MASK);
 
   if (!statement.Step())
     return false;  // No redirect from this visit.
   if (to_visit)
     *to_visit = statement.ColumnInt64(0);
   if (to_url)
     *to_url = GURL(statement.ColumnString(1));
   return true;
 }
 
@@ skipping 46 matching lines @@
       "FROM visits v INNER JOIN urls u ON v.url = u.id "
       "WHERE u.url >= ? AND u.url < ? "
       "AND (transition & ?) != 0 "
       "AND (transition & ?) NOT IN (?, ?, ?)"));
   if (!statement)
     return false;
 
   statement.BindString(0, host_query_min);
   statement.BindString(1,
       host_query_min.substr(0, host_query_min.size() - 1) + '0');
-  statement.BindInt(2, PageTransition::CHAIN_END);
-  statement.BindInt(3, PageTransition::CORE_MASK);
-  statement.BindInt(4, PageTransition::AUTO_SUBFRAME);
-  statement.BindInt(5, PageTransition::MANUAL_SUBFRAME);
-  statement.BindInt(6, PageTransition::KEYWORD_GENERATED);
+  statement.BindInt(2, content::PAGE_TRANSITION_CHAIN_END);
+  statement.BindInt(3, content::PAGE_TRANSITION_CORE_MASK);
+  statement.BindInt(4, content::PAGE_TRANSITION_AUTO_SUBFRAME);
+  statement.BindInt(5, content::PAGE_TRANSITION_MANUAL_SUBFRAME);
+  statement.BindInt(6, content::PAGE_TRANSITION_KEYWORD_GENERATED);
 
   if (!statement.Step()) {
     // We've never been to this page before.
     *count = 0;
     return true;
   }
 
   *first_visit = base::Time::FromInternalValue(statement.ColumnInt64(0));
   *count = statement.ColumnInt(1);
   return true;
@@ skipping 42 matching lines @@
     // Get the source entries out of the query result.
     while (statement.Step()) {
       std::pair<VisitID, VisitSource> source_entry(statement.ColumnInt64(0),
           static_cast<VisitSource>(statement.ColumnInt(1)));
       sources->insert(source_entry);
     }
   }
 }
 
 }  // namespace history