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

chrome/browser/safe_browsing/safe_browsing_blocking_page_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/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/malware_details.h"
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
 #include "chrome/common/pref_names.h"
@@ skipping 85 matching lines @@
   }
   virtual void OnBlockingPageComplete(bool proceed) {
     if (proceed)
       user_response_ = OK;
     else
       user_response_ = CANCEL;
   }
 
   void Navigate(const char* url, int page_id) {
     ViewHostMsg_FrameNavigate_Params params;
-    InitNavigateParams(&params, page_id, GURL(url), PageTransition::TYPED);
+    InitNavigateParams(
+        &params, page_id, GURL(url), content::PAGE_TRANSITION_TYPED);
     contents()->TestDidNavigate(contents()->render_view_host(), params);
   }
 
   void GoBackCrossSite() {
     NavigationEntry* entry = contents()->controller().GetEntryAtOffset(-1);
     ASSERT_TRUE(entry);
     contents()->controller().GoBack();
 
     // The navigation should commit in the pending RVH.
     ViewHostMsg_FrameNavigate_Params params;
     InitNavigateParams(&params, entry->page_id(), GURL(entry->url()),
-                       PageTransition::TYPED);
+                       content::PAGE_TRANSITION_TYPED);
     contents()->TestDidNavigate(contents()->pending_rvh(), params);
   }
 
   void ShowInterstitial(bool is_subresource, const char* url) {
     SafeBrowsingService::UnsafeResource resource;
     InitResource(&resource, is_subresource, GURL(url));
     SafeBrowsingBlockingPage::ShowBlockingPage(service_, resource);
   }
 
   // Returns the SafeBrowsingBlockingPage currently showing or NULL if none is
@@ skipping 43 matching lines @@
   BrowserThread io_thread_;
 };
 
 // Tests showing a blocking page for a malware page and not proceeding.
 TEST_F(SafeBrowsingBlockingPageTest, MalwarePageDontProceed) {
   // Enable malware details.
   Profile* profile = Profile::FromBrowserContext(contents()->browser_context());
   profile->GetPrefs()->SetBoolean(prefs::kSafeBrowsingReportingEnabled, true);
 
   // Start a load.
-  controller().LoadURL(GURL(kBadURL), GURL(), PageTransition::TYPED,
+  controller().LoadURL(GURL(kBadURL), GURL(), content::PAGE_TRANSITION_TYPED,
                        std::string());
 
 
   // Simulate the load causing a safe browsing interstitial to be shown.
   ShowInterstitial(false, kBadURL);
   SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
   ASSERT_TRUE(sb_interstitial);
 
   MessageLoop::current()->RunAllPending();
 
@@ skipping 12 matching lines @@
   service_->GetDetails()->clear();
 }
 
 // Tests showing a blocking page for a malware page and then proceeding.
 TEST_F(SafeBrowsingBlockingPageTest, MalwarePageProceed) {
   // Enable malware reports.
   Profile* profile = Profile::FromBrowserContext(contents()->browser_context());
   profile->GetPrefs()->SetBoolean(prefs::kSafeBrowsingReportingEnabled, true);
 
   // Start a load.
-  controller().LoadURL(GURL(kBadURL), GURL(), PageTransition::TYPED,
+  controller().LoadURL(GURL(kBadURL), GURL(), content::PAGE_TRANSITION_TYPED,
                        std::string());
 
   // Simulate the load causing a safe browsing interstitial to be shown.
   ShowInterstitial(false, kBadURL);
   SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
   ASSERT_TRUE(sb_interstitial);
 
   // Simulate the user clicking "proceed".
   ProceedThroughInterstitial(sb_interstitial);
 
@@ skipping 224 matching lines @@
 // controller entries are OK.  http://crbug.com/17627
 TEST_F(SafeBrowsingBlockingPageTest, NavigatingBackAndForth) {
   // Enable malware reports.
   Profile* profile = Profile::FromBrowserContext(contents()->browser_context());
   profile->GetPrefs()->SetBoolean(prefs::kSafeBrowsingReportingEnabled, true);
 
   // Navigate somewhere.
   Navigate(kGoodURL, 1);
 
   // Now navigate to a bad page triggerring an interstitial.
-  controller().LoadURL(GURL(kBadURL), GURL(), PageTransition::TYPED,
+  controller().LoadURL(GURL(kBadURL), GURL(), content::PAGE_TRANSITION_TYPED,
                        std::string());
   ShowInterstitial(false, kBadURL);
   SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
   ASSERT_TRUE(sb_interstitial);
 
   // Proceed, then navigate back.
   ProceedThroughInterstitial(sb_interstitial);
   Navigate(kBadURL, 2);  // Commit the navigation.
   GoBackCrossSite();
 
@@ skipping 23 matching lines @@
 }
 
 // Tests that calling "don't proceed" after "proceed" has been called doesn't
 // cause problems. http://crbug.com/30079
 TEST_F(SafeBrowsingBlockingPageTest, ProceedThenDontProceed) {
   // Enable malware reports.
   Profile* profile = Profile::FromBrowserContext(contents()->browser_context());
   profile->GetPrefs()->SetBoolean(prefs::kSafeBrowsingReportingEnabled, true);
 
   // Start a load.
-  controller().LoadURL(GURL(kBadURL), GURL(), PageTransition::TYPED,
+  controller().LoadURL(GURL(kBadURL), GURL(), content::PAGE_TRANSITION_TYPED,
                        std::string());
 
   // Simulate the load causing a safe browsing interstitial to be shown.
   ShowInterstitial(false, kBadURL);
   SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
   ASSERT_TRUE(sb_interstitial);
 
   MessageLoop::current()->RunAllPending();
 
   // Simulate the user clicking "proceed" then "don't proceed" (before the
@@ skipping 13 matching lines @@
   service_->GetDetails()->clear();
 }
 
 // Tests showing a blocking page for a malware page with reports disabled.
 TEST_F(SafeBrowsingBlockingPageTest, MalwareReportsDisabled) {
   // Disable malware reports.
   Profile* profile = Profile::FromBrowserContext(contents()->browser_context());
   profile->GetPrefs()->SetBoolean(prefs::kSafeBrowsingReportingEnabled, false);
 
   // Start a load.
-  controller().LoadURL(GURL(kBadURL), GURL(), PageTransition::TYPED,
+  controller().LoadURL(GURL(kBadURL), GURL(), content::PAGE_TRANSITION_TYPED,
                        std::string());
 
   // Simulate the load causing a safe browsing interstitial to be shown.
   ShowInterstitial(false, kBadURL);
   SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
   ASSERT_TRUE(sb_interstitial);
 
   MessageLoop::current()->RunAllPending();
 
   // Simulate the user clicking "don't proceed".
@@ skipping 11 matching lines @@
   service_->GetDetails()->clear();
 }
 
 // Test setting the malware report preferance
 TEST_F(SafeBrowsingBlockingPageTest, MalwareReports) {
   // Disable malware reports.
   Profile* profile = Profile::FromBrowserContext(contents()->browser_context());
   profile->GetPrefs()->SetBoolean(prefs::kSafeBrowsingReportingEnabled, false);
 
   // Start a load.
-  controller().LoadURL(GURL(kBadURL), GURL(), PageTransition::TYPED,
+  controller().LoadURL(GURL(kBadURL), GURL(), content::PAGE_TRANSITION_TYPED,
                        std::string());
 
   // Simulate the load causing a safe browsing interstitial to be shown.
   ShowInterstitial(false, kBadURL);
   SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
   ASSERT_TRUE(sb_interstitial);
 
   MessageLoop::current()->RunAllPending();
 
   EXPECT_FALSE(profile->GetPrefs()->GetBoolean(
       prefs::kSafeBrowsingReportingEnabled));
 
   // Simulate the user check the report agreement checkbox.
   sb_interstitial->SetReportingPreference(true);
 
   EXPECT_TRUE(profile->GetPrefs()->GetBoolean(
       prefs::kSafeBrowsingReportingEnabled));
 
   // Simulate the user uncheck the report agreement checkbox.
   sb_interstitial->SetReportingPreference(false);
 
   EXPECT_FALSE(profile->GetPrefs()->GetBoolean(
       prefs::kSafeBrowsingReportingEnabled));
 }