| Index: ash/wm/activation_controller_unittest.cc
|
| diff --git a/ash/wm/activation_controller_unittest.cc b/ash/wm/activation_controller_unittest.cc
|
| index 33f6a078e00d5a85707fa350a2b423edf6a1fc5d..74ad9b85351f8b33270b9bf9d117068823a07683 100644
|
| --- a/ash/wm/activation_controller_unittest.cc
|
| +++ b/ash/wm/activation_controller_unittest.cc
|
| @@ -533,18 +533,12 @@ TEST_F(ActivationControllerTest, ActivateLockScreen) {
|
| EXPECT_TRUE(w1->HasFocus());
|
| }
|
|
|
| -#if defined(OS_WIN)
|
| -// Multiple displays are not supported on Windows Ash. http://crbug.com/165962
|
| -#define MAYBE_NextActiveWindowOnMultipleDisplays \
|
| - DISABLED_NextActiveWindowOnMultipleDisplays
|
| -#else
|
| -#define MAYBE_NextActiveWindowOnMultipleDisplays \
|
| - NextActiveWindowOnMultipleDisplays
|
| -#endif
|
| -
|
| // Verifies that a next active window is chosen from current
|
| // active display.
|
| -TEST_F(ActivationControllerTest, MAYBE_NextActiveWindowOnMultipleDisplays) {
|
| +TEST_F(ActivationControllerTest, NextActiveWindowOnMultipleDisplays) {
|
| + if (!SupportsMultipleDisplays())
|
| + return;
|
| +
|
| UpdateDisplay("300x300,300x300");
|
| Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
|
|
|
|
|