| Index: ash/wm/drag_window_resizer_unittest.cc
|
| diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc
|
| index de17018daee3338e13655679f25694f31c95bf79..5041d969b9bd028faf00c634cd8fabe55b842030 100644
|
| --- a/ash/wm/drag_window_resizer_unittest.cc
|
| +++ b/ash/wm/drag_window_resizer_unittest.cc
|
| @@ -179,8 +179,6 @@ INSTANTIATE_TEST_CASE_P(
|
|
|
| // Verifies a window can be moved from the primary display to another.
|
| TEST_P(DragWindowResizerTest, WindowDragWithMultiDisplays) {
|
| - if (!SupportsMultipleDisplays())
|
| - return;
|
| const int height_offset = GetMdMaximizedWindowHeightOffset();
|
|
|
| // The secondary display is logically on the right, but on the system (e.g. X)
|
| @@ -304,9 +302,6 @@ TEST_P(DragWindowResizerTest, WindowDragWithMultiDisplays) {
|
| // Verifies that dragging the active window to another display makes the new
|
| // root window the active root window.
|
| TEST_P(DragWindowResizerTest, WindowDragWithMultiDisplaysActiveRoot) {
|
| - if (!SupportsMultipleDisplays())
|
| - return;
|
| -
|
| // The secondary display is logically on the right, but on the system (e.g. X)
|
| // layer, it's below the primary one. See UpdateDisplay() in ash_test_base.cc.
|
| UpdateDisplay("800x600,800x600");
|
| @@ -343,9 +338,6 @@ TEST_P(DragWindowResizerTest, WindowDragWithMultiDisplaysActiveRoot) {
|
|
|
| // Verifies a window can be moved from the secondary display to primary.
|
| TEST_P(DragWindowResizerTest, WindowDragWithMultiDisplaysRightToLeft) {
|
| - if (!SupportsMultipleDisplays())
|
| - return;
|
| -
|
| UpdateDisplay("800x600,800x600");
|
| aura::Window::Windows root_windows = Shell::GetAllRootWindows();
|
| ASSERT_EQ(2U, root_windows.size());
|
| @@ -370,9 +362,6 @@ TEST_P(DragWindowResizerTest, WindowDragWithMultiDisplaysRightToLeft) {
|
|
|
| // Verifies the drag window is shown correctly.
|
| TEST_P(DragWindowResizerTest, DragWindowController) {
|
| - if (!SupportsMultipleDisplays())
|
| - return;
|
| -
|
| UpdateDisplay("800x600,800x600");
|
| aura::Window::Windows root_windows = Shell::GetAllRootWindows();
|
| ASSERT_EQ(2U, root_windows.size());
|
| @@ -463,9 +452,6 @@ TEST_P(DragWindowResizerTest, DragWindowController) {
|
| }
|
|
|
| TEST_P(DragWindowResizerTest, DragWindowControllerAcrossThreeDisplays) {
|
| - if (!SupportsMultipleDisplays())
|
| - return;
|
| -
|
| UpdateDisplay("400x600,400x600,800x600");
|
| aura::Window::Windows root_windows = Shell::GetAllRootWindows();
|
|
|
| @@ -610,9 +596,6 @@ TEST_P(DragWindowResizerTest, WarpMousePointer) {
|
| // Verifies cursor's device scale factor is updated whe a window is moved across
|
| // root windows with different device scale factors (http://crbug.com/154183).
|
| TEST_P(DragWindowResizerTest, CursorDeviceScaleFactor) {
|
| - if (!SupportsMultipleDisplays())
|
| - return;
|
| -
|
| // The secondary display is logically on the right, but on the system (e.g. X)
|
| // layer, it's below the primary one. See UpdateDisplay() in ash_test_base.cc.
|
| UpdateDisplay("400x400,800x800*2");
|
| @@ -667,9 +650,6 @@ TEST_P(DragWindowResizerTest, CursorDeviceScaleFactor) {
|
|
|
| // Verifies several kinds of windows can be moved across displays.
|
| TEST_P(DragWindowResizerTest, MoveWindowAcrossDisplays) {
|
| - if (!SupportsMultipleDisplays())
|
| - return;
|
| -
|
| // The secondary display is logically on the right, but on the system (e.g. X)
|
| // layer, it's below the primary one. See UpdateDisplay() in ash_test_base.cc.
|
| UpdateDisplay("400x400,400x400");
|
|
|