diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 17:21:18 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 17:21:18 +0000 |
| commit | e75642a8f1dd697ee69dd4849f44d3ae85f51ca8 (patch) | |
| tree | cd329f9f61d405dee5882e24953849fada6b0bd7 /ash/tooltips | |
| parent | eb4b9550a3c201af19b51a648707cc1ffc04445d (diff) | |
| download | chromium_src-e75642a8f1dd697ee69dd4849f44d3ae85f51ca8.zip chromium_src-e75642a8f1dd697ee69dd4849f44d3ae85f51ca8.tar.gz chromium_src-e75642a8f1dd697ee69dd4849f44d3ae85f51ca8.tar.bz2 | |
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
Diffstat (limited to 'ash/tooltips')
| -rw-r--r-- | ash/tooltips/tooltip_controller_unittest.cc | 12 |
1 files changed, 3 insertions, 9 deletions
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 @@ 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( |