Skip mulitple-display tests on win8
Re-enable tests that should pass on win7.
BUG=247427
Review URL: https://chromiumcodereview.appspot.com/16539005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205846 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc
index 4e560e4..ff894c8 100644
--- a/ash/tooltips/tooltip_controller_unittest.cc
+++ b/ash/tooltips/tooltip_controller_unittest.cc
@@ -132,16 +132,10 @@
EXPECT_TRUE(helper_->IsTooltipVisible());
}
-#if defined(OS_WIN)
-// Multiple displays are not supported on Windows Ash. http://crbug.com/165962
-#define MAYBE_TooltipsOnMultiDisplayShouldNotCrash \
- DISABLED_TooltipsOnMultiDisplayShouldNotCrash
-#else
-#define MAYBE_TooltipsOnMultiDisplayShouldNotCrash \
- TooltipsOnMultiDisplayShouldNotCrash
-#endif
+TEST_F(TooltipControllerTest, TooltipsOnMultiDisplayShouldNotCrash) {
+ if (!SupportsMultipleDisplays())
+ return;
-TEST_F(TooltipControllerTest, MAYBE_TooltipsOnMultiDisplayShouldNotCrash) {
UpdateDisplay("1000x600,600x400");
Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
scoped_ptr<views::Widget> widget1(CreateNewWidgetWithBoundsOn(
