chromeos: Remove AshTestBase::SupportsMultipleDisplays

ash/display/extended_mouse_warp_controller_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/extended_mouse_warp_controller.h"
 
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/display/display.h"
@@ skipping 32 matching lines @@
   const gfx::Rect& GetIndicatorBounds(int64_t id) {
     return GetWarpRegion(0)->GetIndicatorBoundsForTest(id);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ExtendedMouseWarpControllerTest);
 };
 
 // Verifies if MouseCursorEventFilter's bounds calculation works correctly.
 TEST_F(ExtendedMouseWarpControllerTest, IndicatorBoundsTestOnRight) {
-  if (!SupportsMultipleDisplays())
-    return;
-
   UpdateDisplay("360x360,700x700");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   int64_t display_0_id = display::Screen::GetScreen()
                              ->GetDisplayNearestWindow(root_windows[0])
                              .id();
   int64_t display_1_id = display::Screen::GetScreen()
                              ->GetDisplayNearestWindow(root_windows[1])
                              .id();
 
   std::unique_ptr<display::DisplayLayout> layout(
@@ skipping 50 matching lines @@
   // 16 px are reserved on 2nd display from top, so y must be
   // (16 - 5) = 11
   ASSERT_EQ(1U, GetWarpRegionsCount());
   EXPECT_EQ(gfx::Rect(359, 0, 1, 360), GetIndicatorBounds(display_0_id));
   EXPECT_EQ(gfx::Rect(360, 11, 1, 349), GetIndicatorBounds(display_1_id));
 
   event_filter()->HideSharedEdgeIndicator();
 }
 
 TEST_F(ExtendedMouseWarpControllerTest, IndicatorBoundsTestOnLeft) {
-  if (!SupportsMultipleDisplays())
-    return;
-
   UpdateDisplay("360x360,700x700");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
 
   int64_t display_0_id = display::Screen::GetScreen()
                              ->GetDisplayNearestWindow(root_windows[0])
                              .id();
   int64_t display_1_id = display::Screen::GetScreen()
                              ->GetDisplayNearestWindow(root_windows[1])
                              .id();
 
@@ skipping 21 matching lines @@
 
   event_filter()->ShowSharedEdgeIndicator(root_windows[1] /* secondary */);
   ASSERT_EQ(1U, GetWarpRegionsCount());
   EXPECT_EQ(gfx::Rect(0, 250, 1, 110), GetIndicatorBounds(display_0_id));
   EXPECT_EQ(gfx::Rect(-1, 250, 1, 110), GetIndicatorBounds(display_1_id));
 
   event_filter()->HideSharedEdgeIndicator();
 }
 
 TEST_F(ExtendedMouseWarpControllerTest, IndicatorBoundsTestOnTopBottom) {
-  if (!SupportsMultipleDisplays())
-    return;
-
   UpdateDisplay("360x360,700x700");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   int64_t display_0_id = display::Screen::GetScreen()
                              ->GetDisplayNearestWindow(root_windows[0])
                              .id();
   int64_t display_1_id = display::Screen::GetScreen()
                              ->GetDisplayNearestWindow(root_windows[1])
                              .id();
 
   std::unique_ptr<display::DisplayLayout> layout(
@@ skipping 33 matching lines @@
   event_filter()->ShowSharedEdgeIndicator(root_windows[1] /* secondary */);
   ASSERT_EQ(1U, GetWarpRegionsCount());
   EXPECT_EQ(gfx::Rect(0, 359, 360, 1), GetIndicatorBounds(display_0_id));
   EXPECT_EQ(gfx::Rect(0, 360, 360, 1), GetIndicatorBounds(display_1_id));
 
   event_filter()->HideSharedEdgeIndicator();
 }
 
 // Verify indicators show up as expected with 3+ displays.
 TEST_F(ExtendedMouseWarpControllerTest, IndicatorBoundsTestThreeDisplays) {
-  if (!SupportsMultipleDisplays())
-    return;
-
   UpdateDisplay("360x360,700x700,1000x1000");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   display::Screen* screen = display::Screen::GetScreen();
   int64_t display_0_id = screen->GetDisplayNearestWindow(root_windows[0]).id();
   int64_t display_1_id = screen->GetDisplayNearestWindow(root_windows[1]).id();
   int64_t display_2_id = screen->GetDisplayNearestWindow(root_windows[2]).id();
 
   // Drag from left most display
   event_filter()->ShowSharedEdgeIndicator(root_windows[0]);
   ASSERT_EQ(2U, GetWarpRegionsCount());
@@ skipping 34 matching lines @@
   EXPECT_EQ(gfx::Rect(1059, 0, 1, 700),
             region_0->GetIndicatorBoundsForTest(display_1_id));
   EXPECT_EQ(gfx::Rect(1060, 16, 1, 684),
             region_0->GetIndicatorBoundsForTest(display_2_id));
   event_filter()->HideSharedEdgeIndicator();
   // TODO(oshima): Add test cases primary swap.
 }
 
 TEST_F(ExtendedMouseWarpControllerTest,
        IndicatorBoundsTestThreeDisplaysWithLayout) {
-  if (!SupportsMultipleDisplays())
-    return;
   UpdateDisplay("700x500,500x500,1000x1000");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   display::Screen* screen = display::Screen::GetScreen();
   int64_t display_0_id = screen->GetDisplayNearestWindow(root_windows[0]).id();
   int64_t display_1_id = screen->GetDisplayNearestWindow(root_windows[1]).id();
   int64_t display_2_id = screen->GetDisplayNearestWindow(root_windows[2]).id();
 
   // Layout so that all displays touches togter like this:
   //  +-----+---+
   //  |  0  | 1 |
@@ skipping 28 matching lines @@
   // between 1 and 0
   EXPECT_EQ(gfx::Rect(699, 16, 1, 484),
             region_2->GetIndicatorBoundsForTest(display_0_id));
   EXPECT_EQ(gfx::Rect(700, 0, 1, 500),
             region_2->GetIndicatorBoundsForTest(display_1_id));
   event_filter()->HideSharedEdgeIndicator();
 }
 
 TEST_F(ExtendedMouseWarpControllerTest,
        IndicatorBoundsTestThreeDisplaysWithLayout2) {
-  if (!SupportsMultipleDisplays())
-    return;
   UpdateDisplay("700x500,500x500,1000x1000");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   display::Screen* screen = display::Screen::GetScreen();
   int64_t display_0_id = screen->GetDisplayNearestWindow(root_windows[0]).id();
   int64_t display_1_id = screen->GetDisplayNearestWindow(root_windows[1]).id();
   int64_t display_2_id = screen->GetDisplayNearestWindow(root_windows[2]).id();
 
   // Layout so that 0 and 1 displays are disconnected.
   //  +-----+ +---+
   //  |  0  | |1 |
@@ skipping 21 matching lines @@
             region_0->GetIndicatorBoundsForTest(display_2_id));
   // between 2 and 1
   EXPECT_EQ(gfx::Rect(900, 499, 200, 1),
             region_1->GetIndicatorBoundsForTest(display_1_id));
   EXPECT_EQ(gfx::Rect(900, 500, 200, 1),
             region_1->GetIndicatorBoundsForTest(display_2_id));
   event_filter()->HideSharedEdgeIndicator();
 }
 
 }  // namespace ash