| Index: ash/display/display_controller_unittest.cc
|
| diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc
|
| index 1038069b764c0b0af689acacb43394d4bcb19e79..f2ec58d891cc04cc5cd7c5555030d103501bacff 100644
|
| --- a/ash/display/display_controller_unittest.cc
|
| +++ b/ash/display/display_controller_unittest.cc
|
| @@ -433,7 +433,16 @@ TEST_F(DisplayControllerTest, SwapPrimaryById) {
|
| EXPECT_TRUE(primary_root->Contains(launcher_window));
|
| }
|
|
|
| -TEST_F(DisplayControllerTest, CursorDeviceScaleFactorSwapPrimary) {
|
| +#if defined(OS_WIN)
|
| +// Multiple displays are not supported on Windows Ash. http://crbug.com/165962
|
| +#define MAYBE_CursorDeviceScaleFactorSwapPrimary \
|
| + DISABLED_CursorDeviceScaleFactorSwapPrimary
|
| +#else
|
| +#define MAYBE_CursorDeviceScaleFactorSwapPrimary \
|
| + CursorDeviceScaleFactorSwapPrimary
|
| +#endif
|
| +
|
| +TEST_F(DisplayControllerTest, MAYBE_CursorDeviceScaleFactorSwapPrimary) {
|
| DisplayController* display_controller =
|
| Shell::GetInstance()->display_controller();
|
|
|
|
|