summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-11 12:26:13 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-11 12:26:13 +0000
commit115c2543fa69171afeafbe9aba1cc10a39fa454d (patch)
tree9e672d505aef1a41792a8877b7c9a8b10eba24d2
parent4d77e1721b7d18fdec359eb064dec0e713ca09b3 (diff)
downloadchromium_src-115c2543fa69171afeafbe9aba1cc10a39fa454d.zip
chromium_src-115c2543fa69171afeafbe9aba1cc10a39fa454d.tar.gz
chromium_src-115c2543fa69171afeafbe9aba1cc10a39fa454d.tar.bz2
Tab switching tests does not fail when running from an interactive
desktop. We need to ensure we always run it that way instead. Eventually we should add code to tell us the reason of the failure. BUG=46751 Review URL: http://codereview.chromium.org/3046039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55709 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/tab_switching/tab_switching_test.cc13
1 files changed, 2 insertions, 11 deletions
diff --git a/chrome/test/tab_switching/tab_switching_test.cc b/chrome/test/tab_switching/tab_switching_test.cc
index 3c0d2e2..ffbc659 100644
--- a/chrome/test/tab_switching/tab_switching_test.cc
+++ b/chrome/test/tab_switching/tab_switching_test.cc
@@ -181,20 +181,11 @@ class TabSwitchingUITest : public UITest {
DISALLOW_COPY_AND_ASSIGN(TabSwitchingUITest);
};
-#if defined(OS_WIN)
-// Started failing with a webkit roll in r49936. See http://crbug.com/46751
-#define MAYBE_TabSwitch FAILS_TabSwitch
-#define MAYBE_TabSwitchRef FAILS_TabSwitchRef
-#else
-#define MAYBE_TabSwitch TabSwitch
-#define MAYBE_TabSwitchRef TabSwitchRef
-#endif
-
-TEST_F(TabSwitchingUITest, MAYBE_TabSwitch) {
+TEST_F(TabSwitchingUITest, TabSwitch) {
RunTabSwitchingUITest("t", true);
}
-TEST_F(TabSwitchingUITest, MAYBE_TabSwitchRef) {
+TEST_F(TabSwitchingUITest, TabSwitchRef) {
UseReferenceBuild();
RunTabSwitchingUITest("t_ref", true);
}