Index: chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc |
=================================================================== |
--- chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc (revision 105162) |
+++ chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc (working copy) |
@@ -103,7 +103,8 @@ |
void Navigate(const char* url, int page_id) { |
ViewHostMsg_FrameNavigate_Params params; |
- InitNavigateParams(¶ms, page_id, GURL(url), PageTransition::TYPED); |
+ InitNavigateParams( |
+ ¶ms, page_id, GURL(url), content::PAGE_TRANSITION_TYPED); |
contents()->TestDidNavigate(contents()->render_view_host(), params); |
} |
@@ -115,7 +116,7 @@ |
// The navigation should commit in the pending RVH. |
ViewHostMsg_FrameNavigate_Params params; |
InitNavigateParams(¶ms, entry->page_id(), GURL(entry->url()), |
- PageTransition::TYPED); |
+ content::PAGE_TRANSITION_TYPED); |
contents()->TestDidNavigate(contents()->pending_rvh(), params); |
} |
@@ -179,7 +180,7 @@ |
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()); |
@@ -212,7 +213,7 @@ |
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. |
@@ -457,7 +458,7 @@ |
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(); |
@@ -501,7 +502,7 @@ |
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. |
@@ -535,7 +536,7 @@ |
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. |
@@ -567,7 +568,7 @@ |
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. |