Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2698)

Unified Diff: chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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(&params, page_id, GURL(url), PageTransition::TYPED);
+ InitNavigateParams(
+ &params, 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(&params, 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.
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_blocking_page.cc ('k') | chrome/browser/search_engines/template_url_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698