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

chrome/browser/safe_browsing/browser_feature_extractor.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/safe_browsing/browser_feature_extractor.h"
 
 #include <map>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/format_macros.h"
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/browser_features.h"
 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
-#include "content/common/page_transition_types.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/cancelable_request.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/common/page_transition_types.h"
 #include "crypto/sha2.h"
 #include "googleurl/src/gurl.h"
 
 namespace safe_browsing {
 
 const int BrowserFeatureExtractor::kHashPrefixLength = 5;
 
 BrowseInfo::BrowseInfo() {}
 
 BrowseInfo::~BrowseInfo() {}
@@ skipping 22 matching lines @@
                             features::kReferrer,
                             entry->referrer().spec().c_str()),
                1.0,
                request);
   }
   AddFeature(feature_prefix + features::kHasSSLReferrer,
              is_secure_referrer ? 1.0 : 0.0,
              request);
   AddFeature(feature_prefix + features::kPageTransitionType,
              static_cast<double>(
-                 PageTransition::StripQualifier(entry->transition_type())),
+                 content::PageTransitionStripQualifier(
+                    entry->transition_type())),
              request);
   AddFeature(feature_prefix + features::kIsFirstNavigation,
              index == 0 ? 1.0 : 0.0,
              request);
   // Redirect chain should always be at least of size one, as the rendered
   // url is the last element in the chain.
   if (redirect_chain.empty()) {
     NOTREACHED();
     return;
   }
@@ skipping 206 matching lines @@
   AddFeature(features::kUrlHistoryVisitCount,
              static_cast<double>(row->visit_count()),
              request);
 
   base::Time threshold = base::Time::Now() - base::TimeDelta::FromDays(1);
   int num_visits_24h_ago = 0;
   int num_visits_typed = 0;
   int num_visits_link = 0;
   for (history::VisitVector::const_iterator it = visits->begin();
        it != visits->end(); ++it) {
-    if (!PageTransition::IsMainFrame(it->transition)) {
+    if (!content::PageTransitionIsMainFrame(it->transition)) {
       continue;
     }
     if (it->visit_time < threshold) {
       ++num_visits_24h_ago;
     }
-    PageTransition::Type transition = PageTransition::StripQualifier(
+    content::PageTransition transition = content::PageTransitionStripQualifier(
         it->transition);
-    if (transition == PageTransition::TYPED) {
+    if (transition == content::PAGE_TRANSITION_TYPED) {
       ++num_visits_typed;
-    } else if (transition == PageTransition::LINK) {
+    } else if (transition == content::PAGE_TRANSITION_LINK) {
       ++num_visits_link;
     }
   }
   AddFeature(features::kUrlHistoryVisitCountMoreThan24hAgo,
              static_cast<double>(num_visits_24h_ago),
              request);
   AddFeature(features::kUrlHistoryTypedCount,
              static_cast<double>(num_visits_typed),
              request);
   AddFeature(features::kUrlHistoryLinkCount,
@@ skipping 161 matching lines @@
     // Remove everything that comes after the last '/'.
     size_t last_path = path.rfind("/");
     path.erase(last_path + 1);
   }
 
   request->set_hash_prefix(crypto::SHA256HashString(host + path).substr(
       0, kHashPrefixLength));
 }
 
 };  // namespace safe_browsing