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

chrome/browser/history/expire_history_backend.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/expire_history_backend.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/bind.h"
@@ skipping 55 matching lines @@
         TimeDelta::FromDays(kEarlyExpirationAdvanceDays);
 
     // We don't want to set the early expiration threshold to a time in the
     // future.
     Time now = Time::Now();
     if (early_end_time > now)
       early_end_time = now;
 
     db->GetVisitsInRangeForTransition(begin_time, early_end_time,
                                       max_visits,
-                                      PageTransition::AUTO_SUBFRAME,
+                                      content::PAGE_TRANSITION_AUTO_SUBFRAME,
                                       visits);
     bool more = static_cast<int>(visits->size()) == max_visits;
     if (!more)
       db->UpdateEarlyExpirationThreshold(early_end_time);
 
     return more;
   }
 };
 
 // Returns true if this visit is worth archiving. Otherwise, this visit is not
 // worth saving (for example, subframe navigations and redirects) and we can
 // just delete it when it gets old.
 bool ShouldArchiveVisit(const VisitRow& visit) {
-  int no_qualifier = PageTransition::StripQualifier(visit.transition);
+  int no_qualifier = content::PageTransitionStripQualifier(visit.transition);
 
   // These types of transitions are always "important" and the user will want
   // to see them.
-  if (no_qualifier == PageTransition::TYPED ||
-      no_qualifier == PageTransition::AUTO_BOOKMARK ||
-      no_qualifier == PageTransition::START_PAGE)
+  if (no_qualifier == content::PAGE_TRANSITION_TYPED ||
+      no_qualifier == content::PAGE_TRANSITION_AUTO_BOOKMARK ||
+      no_qualifier == content::PAGE_TRANSITION_START_PAGE)
     return true;
 
   // Only archive these "less important" transitions when they were the final
   // navigation and not part of a redirect chain.
-  if ((no_qualifier == PageTransition::LINK ||
-       no_qualifier == PageTransition::FORM_SUBMIT ||
-       no_qualifier == PageTransition::KEYWORD ||
-       no_qualifier == PageTransition::GENERATED) &&
-      visit.transition & PageTransition::CHAIN_END)
+  if ((no_qualifier == content::PAGE_TRANSITION_LINK ||
+       no_qualifier == content::PAGE_TRANSITION_FORM_SUBMIT ||
+       no_qualifier == content::PAGE_TRANSITION_KEYWORD ||
+       no_qualifier == content::PAGE_TRANSITION_GENERATED) &&
+      visit.transition & content::PAGE_TRANSITION_CHAIN_END)
     return true;
 
   // The transition types we ignore are AUTO_SUBFRAME and MANUAL_SUBFRAME.
   return false;
 }
 
 // The number of visits we will expire very time we check for old items. This
 // Prevents us from doing too much work any given time.
 const int kNumExpirePerIteration = 10;
 
@@ skipping 337 matching lines @@
     DeleteDependencies* dependencies) {
   // First find all unique URLs and the number of visits we're deleting for
   // each one.
   std::map<URLID, ChangedURL> changed_urls;
   for (size_t i = 0; i < visits.size(); i++) {
     ChangedURL& cur = changed_urls[visits[i].url_id];
     // NOTE: This code must stay in sync with HistoryBackend::AddPageVisit().
     // TODO(pkasting): http://b/1148304 We shouldn't be marking so many URLs as
     // typed, which would help eliminate the need for this code (we still would
     // need to handle RELOAD transitions specially, though).
-    PageTransition::Type transition =
-        PageTransition::StripQualifier(visits[i].transition);
-    if (transition != PageTransition::RELOAD)
+    content::PageTransition transition =
+        content::PageTransitionStripQualifier(visits[i].transition);
+    if (transition != content::PAGE_TRANSITION_RELOAD)
       cur.visit_count++;
-    if ((transition == PageTransition::TYPED &&
-         !PageTransition::IsRedirect(visits[i].transition)) ||
-        transition == PageTransition::KEYWORD_GENERATED)
+    if ((transition == content::PAGE_TRANSITION_TYPED &&
+        !content::PageTransitionIsRedirect(visits[i].transition)) ||
+        transition == content::PAGE_TRANSITION_KEYWORD_GENERATED)
       cur.typed_count++;
   }
 
   // Check each unique URL with deleted visits.
   BookmarkService* bookmark_service = GetBookmarkService();
   for (std::map<URLID, ChangedURL>::const_iterator i = changed_urls.begin();
        i != changed_urls.end(); ++i) {
     // The unique URL rows should already be filled into the dependencies.
     URLRow& url_row = dependencies->affected_urls[i->first];
     if (!url_row.id())
@@ skipping 221 matching lines @@
   // We use the bookmark service to determine if a URL is bookmarked. The
   // bookmark service is loaded on a separate thread and may not be done by the
   // time we get here. We therefor block until the bookmarks have finished
   // loading.
   if (bookmark_service_)
     bookmark_service_->BlockTillLoaded();
   return bookmark_service_;
 }
 
 }  // namespace history