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

Unified Diff: chrome/browser/ui/webui/web_ui_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
« no previous file with comments | « chrome/browser/ui/webui/web_ui_browsertest.cc ('k') | chrome/common/metrics_helpers.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/web_ui_unittest.cc
===================================================================
--- chrome/browser/ui/webui/web_ui_unittest.cc (revision 105162)
+++ chrome/browser/ui/webui/web_ui_unittest.cc (working copy)
@@ -28,7 +28,7 @@
// Start a pending load.
GURL new_tab_url(chrome::kChromeUINewTabURL);
- controller->LoadURL(new_tab_url, GURL(), PageTransition::LINK,
+ controller->LoadURL(new_tab_url, GURL(), content::PAGE_TRANSITION_LINK,
std::string());
// The navigation entry should be pending with no committed entry.
@@ -49,7 +49,8 @@
// Start a pending navigation to a regular page.
GURL next_url("http://google.com/");
- controller->LoadURL(next_url, GURL(), PageTransition::LINK, std::string());
+ controller->LoadURL(next_url, GURL(), content::PAGE_TRANSITION_LINK,
+ std::string());
// Check the flags. Some should reflect the new page (URL, title), some
// should reflect the old one (bookmark bar) until it has committed.
@@ -100,12 +101,12 @@
TEST_F(WebUITest, WebUIToWebUI) {
// Do a load (this state is tested above).
GURL new_tab_url(chrome::kChromeUINewTabURL);
- controller().LoadURL(new_tab_url, GURL(), PageTransition::LINK,
+ controller().LoadURL(new_tab_url, GURL(), content::PAGE_TRANSITION_LINK,
std::string());
rvh()->SendNavigate(1, new_tab_url);
// Start another pending load of the new tab page.
- controller().LoadURL(new_tab_url, GURL(), PageTransition::LINK,
+ controller().LoadURL(new_tab_url, GURL(), content::PAGE_TRANSITION_LINK,
std::string());
rvh()->SendNavigate(2, new_tab_url);
@@ -119,7 +120,8 @@
// Start a pending navigation to a regular page.
GURL std_url("http://google.com/");
- controller().LoadURL(std_url, GURL(), PageTransition::LINK, std::string());
+ controller().LoadURL(std_url, GURL(), content::PAGE_TRANSITION_LINK,
+ std::string());
// The state should now reflect the default.
EXPECT_TRUE(contents_wrapper()->favicon_tab_helper()->ShouldDisplayFavicon());
@@ -132,7 +134,7 @@
// Start a pending load for a WebUI.
GURL new_tab_url(chrome::kChromeUINewTabURL);
- controller().LoadURL(new_tab_url, GURL(), PageTransition::LINK,
+ controller().LoadURL(new_tab_url, GURL(), content::PAGE_TRANSITION_LINK,
std::string());
EXPECT_TRUE(contents_wrapper()->favicon_tab_helper()->ShouldDisplayFavicon());
EXPECT_TRUE(contents()->FocusLocationBarByDefault());
@@ -165,14 +167,15 @@
// Load the NTP.
GURL new_tab_url(chrome::kChromeUINewTabURL);
- controller().LoadURL(new_tab_url, GURL(), PageTransition::LINK,
+ controller().LoadURL(new_tab_url, GURL(), content::PAGE_TRANSITION_LINK,
std::string());
rvh()->SendNavigate(page_id, new_tab_url);
// Navigate to another page.
GURL next_url("http://google.com/");
int next_page_id = page_id + 1;
- controller().LoadURL(next_url, GURL(), PageTransition::LINK, std::string());
+ controller().LoadURL(next_url, GURL(), content::PAGE_TRANSITION_LINK,
+ std::string());
TestRenderViewHost* old_rvh = rvh();
old_rvh->SendShouldCloseACK(true);
pending_rvh()->SendNavigate(next_page_id, next_url);
« no previous file with comments | « chrome/browser/ui/webui/web_ui_browsertest.cc ('k') | chrome/common/metrics_helpers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698