diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 03:51:58 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 03:51:58 +0000 |
| commit | 2905f74ce902dbf21dcbbf7ed3537f803f027630 (patch) | |
| tree | 0371f49d1768902bf69e0130b55ec104258f5cf9 /chrome/browser/ui/webui/web_ui_unittest.cc | |
| parent | 49098f7091448e437190f23cc67a705df4abd079 (diff) | |
| download | chromium_src-2905f74ce902dbf21dcbbf7ed3537f803f027630.zip chromium_src-2905f74ce902dbf21dcbbf7ed3537f803f027630.tar.gz chromium_src-2905f74ce902dbf21dcbbf7ed3537f803f027630.tar.bz2 | |
Move PageTransition into content namespace. While I'm touching all these files, I've also updated it to use the enum naming convention in the Content API.
BUG=98716
Review URL: http://codereview.chromium.org/8253002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105254 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/web_ui_unittest.cc')
| -rw-r--r-- | chrome/browser/ui/webui/web_ui_unittest.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/chrome/browser/ui/webui/web_ui_unittest.cc b/chrome/browser/ui/webui/web_ui_unittest.cc index 7a52172..091bff4 100644 --- a/chrome/browser/ui/webui/web_ui_unittest.cc +++ b/chrome/browser/ui/webui/web_ui_unittest.cc @@ -28,7 +28,7 @@ class WebUITest : public TabContentsWrapperTestHarness { // 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 @@ class WebUITest : public TabContentsWrapperTestHarness { // 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, WebUIToStandard) { 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 @@ TEST_F(WebUITest, StandardToWebUI) { // 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 @@ TEST_F(WebUITest, StandardToWebUI) { // 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 @@ TEST_F(WebUITest, FocusOnNavigate) { // 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); |