summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-15 20:53:47 +0000
committerstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-15 20:53:47 +0000
commit9db263abcd3ee3ed83c2c9b65a923206af4feab5 (patch)
tree9b92eb24583ef8c8ef9868112f9fae2ad8360b60
parent993a6dbbbed0fe14bcc6c61568ec6451560ba2dd (diff)
downloadchromium_src-9db263abcd3ee3ed83c2c9b65a923206af4feab5.zip
chromium_src-9db263abcd3ee3ed83c2c9b65a923206af4feab5.tar.gz
chromium_src-9db263abcd3ee3ed83c2c9b65a923206af4feab5.tar.bz2
Disable IsActive() in BrowserNavigatorTest tests.
Fix test failure on build bots from chromium-os:4046. BUG=chromium-os:4046 TEST=Make sure BrowserNavigatorTest.Disposition_NewPopupUnfocused and BrowserNavigatorTest.Disposition_NewPopup succeed. Review URL: http://codereview.chromium.org/6864024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81797 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/browser_navigator_browsertest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc
index 11b9a0c..16b6ac0 100644
--- a/chrome/browser/ui/browser_navigator_browsertest.cc
+++ b/chrome/browser/ui/browser_navigator_browsertest.cc
@@ -250,8 +250,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewPopup) {
// Navigate() should have opened a new, focused popup window.
EXPECT_NE(browser(), p.browser);
-#if defined(OS_WIN)
- // TODO(stevenjb): Enable this test for other OSs, see: crbug.com/79493
+#if 0
+ // TODO(stevenjb): Enable this test. See: crbug.com/79493
EXPECT_TRUE(p.browser->window()->IsActive());
#endif
EXPECT_EQ(Browser::TYPE_POPUP, p.browser->type());
@@ -346,8 +346,6 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
// TODO(beng): TBD.
}
-#if defined(OS_WIN)
-// TODO(stevenjb): Enable this test for other OSs, see: crbug.com/79493
// This test verifies that navigating with window_action = SHOW_WINDOW_INACTIVE
// does not focus a new new popup window.
IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewPopupUnfocused) {
@@ -361,9 +359,11 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewPopupUnfocused) {
// Navigate() should have opened a new, unfocused, popup window.
EXPECT_NE(browser(), p.browser);
EXPECT_EQ(Browser::TYPE_POPUP, p.browser->type());
+#if 0
+// TODO(stevenjb): Enable this test. See: crbug.com/79493
EXPECT_FALSE(p.browser->window()->IsActive());
-}
#endif
+}
// This test verifies that navigating with WindowOpenDisposition = NEW_WINDOW
// always opens a new window.