Separate ash::test::DisplayManagerTestApi from ash

ash/touch/touch_observer_hud_unittest.cc

 // Copyright (c) 2013 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/touch/touch_observer_hud.h"
 
 #include "ash/common/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
-#include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/touch/touch_hud_debug.h"
 #include "ash/touch/touch_hud_projection.h"
 #include "ash/touch_hud/touch_hud_renderer.h"
 #include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "ui/aura/window.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 class TouchHudTestBase : public test::AshTestBase {
  public:
   TouchHudTestBase() {}
   ~TouchHudTestBase() override {}
 
   void SetUp() override {
     test::AshTestBase::SetUp();
 
     // Initialize display infos. They should be initialized after Ash
     // environment is set up, i.e., after test::AshTestBase::SetUp().
     internal_display_id_ =
-        test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
+        test::DisplayManagerTestApi(Shell::GetInstance()->display_manager())
+            .SetFirstDisplayAsInternalDisplay();
     external_display_id_ = 10;
     mirrored_display_id_ = 11;
 
     internal_display_info_ =
         CreateDisplayInfo(internal_display_id_, gfx::Rect(0, 0, 500, 500));
     external_display_info_ =
         CreateDisplayInfo(external_display_id_, gfx::Rect(1, 1, 100, 100));
     mirrored_display_info_ =
         CreateDisplayInfo(mirrored_display_id_, gfx::Rect(0, 0, 100, 100));
   }
 
   display::Display GetPrimaryDisplay() {
     return display::Screen::GetScreen()->GetPrimaryDisplay();
   }
 
-  const display::Display& GetSecondaryDisplay() {
-    return ScreenUtil::GetSecondaryDisplay();
-  }
-
   void SetupSingleDisplay() {
     display_info_list_.clear();
     display_info_list_.push_back(internal_display_info_);
     GetDisplayManager()->OnNativeDisplaysChanged(display_info_list_);
   }
 
   void SetupDualDisplays() {
     display_info_list_.clear();
     display_info_list_.push_back(internal_display_info_);
     display_info_list_.push_back(external_display_info_);
@@ skipping 79 matching lines @@
     return GetWindowTreeHostManager()->GetRootWindowForDisplayId(
         external_display_id_);
   }
 
   aura::Window* GetPrimaryRootWindow() {
     const display::Display& display = GetPrimaryDisplay();
     return GetWindowTreeHostManager()->GetRootWindowForDisplayId(display.id());
   }
 
   aura::Window* GetSecondaryRootWindow() {
-    const display::Display& display = GetSecondaryDisplay();
+    const display::Display& display = display_manager()->GetSecondaryDisplay();
     return GetWindowTreeHostManager()->GetRootWindowForDisplayId(display.id());
   }
 
   RootWindowController* GetInternalRootController() {
     aura::Window* root = GetInternalRootWindow();
     return GetRootWindowController(root);
   }
 
   RootWindowController* GetExternalRootController() {
     aura::Window* root = GetExternalRootWindow();
@@ skipping 176 matching lines @@
     return;
 
   // Setup a dual display setting.
   SetupDualDisplays();
 
   // Set the primary display to the external one.
   SetExternalAsPrimary();
 
   // Check if displays' touch HUDs are not swapped as root windows are.
   EXPECT_EQ(external_display_id(), GetPrimaryDisplay().id());
-  EXPECT_EQ(internal_display_id(), GetSecondaryDisplay().id());
+  EXPECT_EQ(internal_display_id(),
+            display_manager()->GetSecondaryDisplay().id());
   CheckInternalDisplay();
   CheckExternalDisplay();
 
   // Set the primary display back to the internal one.
   SetInternalAsPrimary();
 
   // Check if displays' touch HUDs are not swapped back as root windows are.
   EXPECT_EQ(internal_display_id(), GetPrimaryDisplay().id());
-  EXPECT_EQ(external_display_id(), GetSecondaryDisplay().id());
+  EXPECT_EQ(external_display_id(),
+            display_manager()->GetSecondaryDisplay().id());
   CheckInternalDisplay();
   CheckExternalDisplay();
 }
 
 // Checks if debug touch HUDs are correctly handled when displays are mirrored.
 TEST_F(TouchHudDebugTest, MirrorDisplays) {
   if (!SupportsMultipleDisplays())
     return;
 
   // Setup a dual display setting.
   SetupDualDisplays();
 
   // Mirror displays.
   MirrorDisplays();
 
   // Check if the internal display is intact.
   EXPECT_EQ(internal_display_id(), GetPrimaryDisplay().id());
   CheckInternalDisplay();
 
   // Unmirror displays.
   UnmirrorDisplays();
 
   // Check if external display is added back correctly.
   EXPECT_EQ(internal_display_id(), GetPrimaryDisplay().id());
-  EXPECT_EQ(external_display_id(), GetSecondaryDisplay().id());
+  EXPECT_EQ(external_display_id(),
+            display_manager()->GetSecondaryDisplay().id());
   CheckInternalDisplay();
   CheckExternalDisplay();
 }
 
 // Checks if debug touch HUDs are correctly handled when displays are mirrored
 // after setting the external display as the primary one.
 TEST_F(TouchHudDebugTest, SwapPrimaryThenMirrorDisplays) {
   if (!SupportsMultipleDisplays())
     return;
 
   // Setup a dual display setting.
   SetupDualDisplays();
 
   // Set the primary display to the external one.
   SetExternalAsPrimary();
 
   // Mirror displays.
   MirrorDisplays();
 
   // Check if the internal display is set as the primary one.
   EXPECT_EQ(internal_display_id(), GetPrimaryDisplay().id());
   CheckInternalDisplay();
 
   // Unmirror displays.
   UnmirrorDisplays();
 
   // Check if the external display is added back as the primary display and
   // touch HUDs are set correctly.
   EXPECT_EQ(external_display_id(), GetPrimaryDisplay().id());
-  EXPECT_EQ(internal_display_id(), GetSecondaryDisplay().id());
+  EXPECT_EQ(internal_display_id(),
+            display_manager()->GetSecondaryDisplay().id());
   CheckInternalDisplay();
   CheckExternalDisplay();
 }
 
 // Checks if debug touch HUDs are correctly handled when the external display,
 // which is the secondary one, is removed.
 TEST_F(TouchHudDebugTest, RemoveSecondaryDisplay) {
   if (!SupportsMultipleDisplays())
     return;
 
   // Setup a dual display setting.
   SetupDualDisplays();
 
   // Remove external display which is the secondary one.
   RemoveExternalDisplay();
 
   // Check if the internal display is intact.
   EXPECT_EQ(internal_display_id(), GetPrimaryDisplay().id());
   CheckInternalDisplay();
 
   // Add external display back.
   AddExternalDisplay();
 
   // Check if displays' touch HUDs are set correctly.
   EXPECT_EQ(internal_display_id(), GetPrimaryDisplay().id());
-  EXPECT_EQ(external_display_id(), GetSecondaryDisplay().id());
+  EXPECT_EQ(external_display_id(),
+            display_manager()->GetSecondaryDisplay().id());
   CheckInternalDisplay();
   CheckExternalDisplay();
 }
 
 // Checks if debug touch HUDs are correctly handled when the external display,
 // which is set as the primary display, is removed.
 TEST_F(TouchHudDebugTest, RemovePrimaryDisplay) {
   if (!SupportsMultipleDisplays())
     return;
 
   // Setup a dual display setting.
   SetupDualDisplays();
 
   // Set the primary display to the external one.
   SetExternalAsPrimary();
 
   // Remove the external display which is the primary display.
   RemoveExternalDisplay();
 
   // Check if the internal display is set as the primary one.
   EXPECT_EQ(internal_display_id(), GetPrimaryDisplay().id());
   CheckInternalDisplay();
 
   // Add the external display back.
   AddExternalDisplay();
 
   // Check if the external display is set as primary and touch HUDs are set
   // correctly.
   EXPECT_EQ(external_display_id(), GetPrimaryDisplay().id());
-  EXPECT_EQ(internal_display_id(), GetSecondaryDisplay().id());
+  EXPECT_EQ(internal_display_id(),
+            display_manager()->GetSecondaryDisplay().id());
   CheckInternalDisplay();
   CheckExternalDisplay();
 }
 
 // Checks if debug touch HUDs are correctly handled when all displays are
 // removed.
 TEST_F(TouchHudDebugTest, Headless) {
   if (!SupportsMultipleDisplays())
     return;
 
@@ skipping 132 matching lines @@
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1);
   EXPECT_EQ(1, GetInternalTouchPointsCount());
 
   // Disabling projection touch HUD shoud remove it without crashing.
   DisableTouchHudProjection();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 }
 
 }  // namespace ash