Index: chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc |
diff --git a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc |
index 32fd27f0ddbacda994be394f3757f6602762f574..e419d3ae7d464337f28405e4685f4041bfb5de71 100644 |
--- a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc |
+++ b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc |
@@ -80,12 +80,9 @@ TEST_F(WebDialogWebContentsDelegateTest, DoNothingMethodsTest) { |
TEST_F(WebDialogWebContentsDelegateTest, OpenURLFromTabTest) { |
test_web_contents_delegate_->OpenURLFromTab( |
- NULL, |
- OpenURLParams(GURL(url::kAboutBlankURL), |
- Referrer(), |
- NEW_FOREGROUND_TAB, |
- ui::PAGE_TRANSITION_LINK, |
- false)); |
+ NULL, OpenURLParams(GURL(url::kAboutBlankURL), Referrer(), |
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, |
+ ui::PAGE_TRANSITION_LINK, false)); |
// This should create a new foreground tab in the existing browser. |
EXPECT_EQ(1, browser()->tab_strip_model()->count()); |
EXPECT_EQ(1U, chrome::GetTotalBrowserCount()); |
@@ -95,7 +92,8 @@ TEST_F(WebDialogWebContentsDelegateTest, AddNewContentsForegroundTabTest) { |
WebContents* contents = |
WebContentsTester::CreateTestWebContents(profile(), NULL); |
test_web_contents_delegate_->AddNewContents( |
- NULL, contents, NEW_FOREGROUND_TAB, gfx::Rect(), false, NULL); |
+ NULL, contents, WindowOpenDisposition::NEW_FOREGROUND_TAB, gfx::Rect(), |
+ false, NULL); |
// This should create a new foreground tab in the existing browser. |
EXPECT_EQ(1, browser()->tab_strip_model()->count()); |
EXPECT_EQ(1U, chrome::GetTotalBrowserCount()); |
@@ -107,14 +105,12 @@ TEST_F(WebDialogWebContentsDelegateTest, DetachTest) { |
EXPECT_EQ(NULL, test_web_contents_delegate_->browser_context()); |
// Now, none of the following calls should do anything. |
test_web_contents_delegate_->OpenURLFromTab( |
- NULL, |
- OpenURLParams(GURL(url::kAboutBlankURL), |
- Referrer(), |
- NEW_FOREGROUND_TAB, |
- ui::PAGE_TRANSITION_LINK, |
- false)); |
- test_web_contents_delegate_->AddNewContents(NULL, NULL, NEW_FOREGROUND_TAB, |
- gfx::Rect(), false, NULL); |
+ NULL, OpenURLParams(GURL(url::kAboutBlankURL), Referrer(), |
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, |
+ ui::PAGE_TRANSITION_LINK, false)); |
+ test_web_contents_delegate_->AddNewContents( |
+ NULL, NULL, WindowOpenDisposition::NEW_FOREGROUND_TAB, gfx::Rect(), false, |
+ NULL); |
EXPECT_EQ(0, browser()->tab_strip_model()->count()); |
EXPECT_EQ(1U, chrome::GetTotalBrowserCount()); |
} |