Index: ash/tooltips/tooltip_controller_unittest.cc |
diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc |
index 4e560e4b83105036f01f8186860871da590eb748..ff894c89b2cbc89938b9d2d3ea12485589813e03 100644 |
--- a/ash/tooltips/tooltip_controller_unittest.cc |
+++ b/ash/tooltips/tooltip_controller_unittest.cc |
@@ -132,16 +132,10 @@ TEST_F(TooltipControllerTest, HideTooltipWhenCursorHidden) { |
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( |