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

chrome/browser/safe_browsing/browser_feature_extractor_unittest.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 <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_backend.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/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
-#include "content/common/page_transition_types.h"
 #include "content/common/view_messages.h"
+#include "content/public/common/page_transition_types.h"
 #include "crypto/sha2.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::Return;
 using ::testing::StrictMock;
 
 namespace safe_browsing {
 namespace {
@@ skipping 39 matching lines @@
       browse_info_->host_redirects = redirect_chain;
     }
   }
 
   // Wrapper around NavigateAndCommit that also sets the redirect chain to
   // a sane value.
   void SimpleNavigateAndCommit(const GURL& url) {
     std::vector<GURL> redirect_chain;
     redirect_chain.push_back(url);
     SetRedirectChain(redirect_chain, true);
-    NavigateAndCommit(url, GURL(), PageTransition::LINK);
+    NavigateAndCommit(url, GURL(), content::PAGE_TRANSITION_LINK);
   }
 
   // This is similar to NavigateAndCommit that is in test_tab_contents, but
   // allows us to specify the referrer and page_transition_type.
   void NavigateAndCommit(const GURL& url,
                          const GURL& referrer,
-                         PageTransition::Type type) {
+                         content::PageTransition type) {
     contents()->controller().LoadURL(url, referrer, type, std::string());
 
     static int page_id = 0;
     ViewHostMsg_FrameNavigate_Params params;
     InitNavigateParams(&params, ++page_id, url, type);
     params.referrer = referrer;
 
     RenderViewHost* rvh = contents()->pending_rvh();
     if (!rvh) {
       rvh = contents()->render_view_host();
@@ skipping 66 matching lines @@
   history_service()->AddPage(GURL("http://www.foo.com/bar.html"),
                              history::SOURCE_BROWSED);
   history_service()->AddPage(GURL("https://www.foo.com/gaa.html"),
                              history::SOURCE_BROWSED);  // same host HTTPS.
   history_service()->AddPage(GURL("http://www.foo.com/gaa.html"),
                              history::SOURCE_BROWSED);  // same host HTTP.
   history_service()->AddPage(GURL("http://bar.foo.com/gaa.html"),
                              history::SOURCE_BROWSED);  // different host.
   history_service()->AddPage(GURL("http://www.foo.com/bar.html?a=b"),
                              base::Time::Now() - base::TimeDelta::FromHours(23),
-                             NULL, 0, GURL(), PageTransition::LINK,
+                             NULL, 0, GURL(), content::PAGE_TRANSITION_LINK,
                              history::RedirectList(), history::SOURCE_BROWSED,
                              false);
   history_service()->AddPage(GURL("http://www.foo.com/bar.html"),
                              base::Time::Now() - base::TimeDelta::FromHours(25),
-                             NULL, 0, GURL(), PageTransition::TYPED,
+                             NULL, 0, GURL(), content::PAGE_TRANSITION_TYPED,
                              history::RedirectList(), history::SOURCE_BROWSED,
                              false);
   history_service()->AddPage(GURL("https://www.foo.com/goo.html"),
                              base::Time::Now() - base::TimeDelta::FromDays(5),
-                             NULL, 0, GURL(), PageTransition::TYPED,
+                             NULL, 0, GURL(), content::PAGE_TRANSITION_TYPED,
                              history::RedirectList(), history::SOURCE_BROWSED,
                              false);
 
   SimpleNavigateAndCommit(GURL("http://www.foo.com/bar.html"));
 
   ClientPhishingRequest request;
   request.set_url("http://www.foo.com/bar.html");
   request.set_client_score(0.5);
   EXPECT_TRUE(ExtractFeatures(&request));
   std::map<std::string, double> features;
@@ skipping 66 matching lines @@
 
   ClientPhishingRequest request;
   request.set_url("http://www.foo.com/");
   request.set_client_score(0.5);
   std::vector<GURL> redirect_chain;
   redirect_chain.push_back(GURL("http://somerandomwebsite.com/"));
   redirect_chain.push_back(GURL("http://www.foo.com/"));
   SetRedirectChain(redirect_chain, true);
   NavigateAndCommit(GURL("http://www.foo.com/"),
                     GURL("http://google.com/"),
-                    PageTransition::AUTO_BOOKMARK |
-                    PageTransition::FORWARD_BACK);
+                    content::PageTransitionFromInt(
+                        content::PAGE_TRANSITION_AUTO_BOOKMARK |
+                        content::PAGE_TRANSITION_FORWARD_BACK));
 
   EXPECT_TRUE(ExtractFeatures(&request));
   std::map<std::string, double> features;
   GetFeatureMap(request, &features);
 
   EXPECT_EQ(1.0,
             features[StringPrintf("%s=%s",
                                   features::kReferrer,
                                   "http://google.com/")]);
   EXPECT_EQ(1.0,
@@ skipping 13 matching lines @@
   request.Clear();
   request.set_url("http://www.foo.com/page.html");
   request.set_client_score(0.5);
   redirect_chain.clear();
   redirect_chain.push_back(GURL("http://www.foo.com/redirect"));
   redirect_chain.push_back(GURL("http://www.foo.com/second_redirect"));
   redirect_chain.push_back(GURL("http://www.foo.com/page.html"));
   SetRedirectChain(redirect_chain, false);
   NavigateAndCommit(GURL("http://www.foo.com/page.html"),
                     GURL("http://www.foo.com"),
-                    PageTransition::TYPED |
-                    PageTransition::CHAIN_START |
-                    PageTransition::CLIENT_REDIRECT);
+                    content::PageTransitionFromInt(
+                        content::PAGE_TRANSITION_TYPED |
+                        content::PAGE_TRANSITION_CHAIN_START |
+                        content::PAGE_TRANSITION_CLIENT_REDIRECT));
 
   EXPECT_TRUE(ExtractFeatures(&request));
   features.clear();
   GetFeatureMap(request, &features);
 
   EXPECT_EQ(1,
             features[StringPrintf("%s=%s",
                                   features::kReferrer,
                                   "http://www.foo.com/")]);
   EXPECT_EQ(1.0,
@@ skipping 28 matching lines @@
 
   request.Clear();
   request.set_url("http://www.bar.com/");
   request.set_client_score(0.5);
   redirect_chain.clear();
   redirect_chain.push_back(GURL("http://www.foo.com/page.html"));
   redirect_chain.push_back(GURL("http://www.bar.com/"));
   SetRedirectChain(redirect_chain, true);
   NavigateAndCommit(GURL("http://www.bar.com/"),
                     GURL("http://www.foo.com/page.html"),
-                    PageTransition::LINK |
-                    PageTransition::CHAIN_END |
-                    PageTransition::CLIENT_REDIRECT);
+                    content::PageTransitionFromInt(
+                        content::PAGE_TRANSITION_LINK |
+                        content::PAGE_TRANSITION_CHAIN_END |
+                        content::PAGE_TRANSITION_CLIENT_REDIRECT));
 
   EXPECT_TRUE(ExtractFeatures(&request));
   features.clear();
   GetFeatureMap(request, &features);
 
   EXPECT_EQ(1.0,
             features[StringPrintf("%s=%s",
                                   features::kReferrer,
                                   "http://www.foo.com/page.html")]);
   EXPECT_EQ(1.0,
@@ skipping 15 matching lines @@
                                         features::kIsFirstNavigation)));
 
   request.Clear();
   request.set_url("http://www.bar.com/other_page.html");
   request.set_client_score(0.5);
   redirect_chain.clear();
   redirect_chain.push_back(GURL("http://www.bar.com/other_page.html"));
   SetRedirectChain(redirect_chain, false);
   NavigateAndCommit(GURL("http://www.bar.com/other_page.html"),
                     GURL("http://www.bar.com/"),
-                    PageTransition::LINK);
+                    content::PAGE_TRANSITION_LINK);
 
   EXPECT_TRUE(ExtractFeatures(&request));
   features.clear();
   GetFeatureMap(request, &features);
 
   EXPECT_EQ(1.0,
             features[StringPrintf("%s=%s",
                                   features::kReferrer,
                                   "http://www.bar.com/")]);
   EXPECT_EQ(0.0, features[features::kHasSSLReferrer]);
@@ skipping 19 matching lines @@
                                   features::kIsFirstNavigation)]);
   request.Clear();
   request.set_url("http://www.baz.com/");
   request.set_client_score(0.5);
   redirect_chain.clear();
   redirect_chain.push_back(GURL("https://bankofamerica.com"));
   redirect_chain.push_back(GURL("http://www.baz.com/"));
   SetRedirectChain(redirect_chain, true);
   NavigateAndCommit(GURL("http://www.baz.com"),
                     GURL("https://bankofamerica.com"),
-                    PageTransition::GENERATED);
+                    content::PAGE_TRANSITION_GENERATED);
 
   browse_info_->ips.insert("193.5.163.8");
   browse_info_->ips.insert("23.94.78.1");
   EXPECT_CALL(*service_, IsBadIpAddress("193.5.163.8")).WillOnce(Return(true));
   EXPECT_CALL(*service_, IsBadIpAddress("23.94.78.1")).WillOnce(Return(false));
 
   EXPECT_TRUE(ExtractFeatures(&request));
   features.clear();
   GetFeatureMap(request, &features);
 
@@ skipping 84 matching lines @@
   history_service()->AddPage(GURL("http://www.host.com/A%21//B"),
                              history::SOURCE_BROWSED);
   SimpleNavigateAndCommit(GURL("http://www.host.com/A%21//B"));
 
   EXPECT_TRUE(ExtractFeatures(&request));
   EXPECT_EQ(crypto::SHA256HashString("host.com/a!/").substr(
       0, BrowserFeatureExtractor::kHashPrefixLength),
             request.hash_prefix());
 }
 }  // namespace safe_browsing