Separate ash::test::DisplayManagerTestApi from ash

ash/display/screen_position_controller_unittest.cc

 // Copyright (c) 2012 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/screen_position_controller.h"
 
 #include <memory>
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/display/display_manager.h"
@@ skipping 29 matching lines @@
 #define MAYBE_ConvertHostPointToScreenUIScale ConvertHostPointToScreenUIScale
 #define MAYBE_ConvertToScreenWhileRemovingSecondaryDisplay \
   ConvertToScreenWhileRemovingSecondaryDisplay
 #endif
 
 namespace ash {
 namespace test {
 
 namespace {
 
-void SetSecondaryDisplayLayout(display::DisplayPlacement::Position position) {
-  std::unique_ptr<display::DisplayLayout> layout(Shell::GetInstance()
-                                                     ->display_manager()
-                                                     ->GetCurrentDisplayLayout()
-                                                     .Copy());
-  layout->placement_list[0].position = position;
-  Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays(
-      std::move(layout));
-}
-
 ScreenPositionController* GetScreenPositionController() {
   ShellTestApi test_api(Shell::GetInstance());
   return test_api.screen_position_controller();
 }
 
 class ScreenPositionControllerTest : public test::AshTestBase {
  public:
   ScreenPositionControllerTest() {}
   ~ScreenPositionControllerTest() override {}
 
@@ skipping 13 matching lines @@
 
   // Converts a point (x, y) in host window's coordinate to screen and
   // returns its string representation.
   std::string ConvertHostPointToScreen(int x, int y) const {
     gfx::Point point(x, y);
     GetScreenPositionController()->ConvertHostPointToScreen(
         window_->GetRootWindow(), &point);
     return point.ToString();
   }
 
+  void SetSecondaryDisplayLayout(display::DisplayPlacement::Position position) {
+    std::unique_ptr<display::DisplayLayout> layout(
+        display_manager()->GetCurrentDisplayLayout().Copy());
+    layout->placement_list[0].position = position;
+    display_manager()->SetLayoutForCurrentDisplays(std::move(layout));
+  }
+
  protected:
   std::unique_ptr<aura::Window> window_;
   aura::test::TestWindowDelegate window_delegate_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenPositionControllerTest);
 };
 
 }  // namespace
 
@@ skipping 132 matching lines @@
   // The point is on the 1st host.
   EXPECT_EQ("70,149", ConvertHostPointToScreen(50, 70));
   // The point is out of the host windows.
   EXPECT_EQ("250,-51", ConvertHostPointToScreen(250, 250));
   // The point is on the 2nd host. Point on 2nd host (30,150) -
   // rotate 270 clockwise -> (149, 30) - layout [+(200,0)] -> (349,30).
   EXPECT_EQ("349,30", ConvertHostPointToScreen(30, 450));
 
   // Move |window_| to the 2nd.
   window_->SetBoundsInScreen(gfx::Rect(300, 20, 50, 50),
-                             ScreenUtil::GetSecondaryDisplay());
+                             display_manager()->GetSecondaryDisplay());
   aura::Window::Windows root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   EXPECT_EQ(root_windows[1], window_->GetRootWindow());
 
   // The point is on the 2nd host. (50,70) on 2n host -
   // roatate 270 clockwise -> (129,50) -layout [+(200,0)] -> (329,50)
   EXPECT_EQ("329,50", ConvertHostPointToScreen(50, 70));
   // The point is out of the host windows.
   EXPECT_EQ("449,50", ConvertHostPointToScreen(50, -50));
   // The point is on the 2nd host. Point on 2nd host (50,50) -
@@ skipping 11 matching lines @@
   // The point is on the 1st host.
   EXPECT_EQ("45,45", ConvertHostPointToScreen(60, 60));
   // The point is out of the host windows.
   EXPECT_EQ("45,225", ConvertHostPointToScreen(60, 300));
   // The point is on the 2nd host. Point on 2nd host (60,150) -
   // - screen [+(150,0)]
   EXPECT_EQ("210,49", ConvertHostPointToScreen(60, 450));
 
   // Move |window_| to the 2nd.
   window_->SetBoundsInScreen(gfx::Rect(300, 20, 50, 50),
-                             ScreenUtil::GetSecondaryDisplay());
+                             display_manager()->GetSecondaryDisplay());
   aura::Window::Windows root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   EXPECT_EQ(root_windows[1], window_->GetRootWindow());
 
   // The point is on the 2nd host. (50,70) - ro
   EXPECT_EQ("210,70", ConvertHostPointToScreen(60, 70));
   // The point is out of the host windows.
   EXPECT_EQ("210,-50", ConvertHostPointToScreen(60, -50));
   // The point is on the 2nd host. Point on 1nd host (60, 60)
   // 1/2 * 1.5 = (45,45)
@@ skipping 37 matching lines @@
 // to convert the event to screen coordinates. The ScreenPositionClient is
 // detached from the root window prior to the root window being destroyed. Test
 // that no events are dispatched at this time.
 TEST_F(ScreenPositionControllerTest,
        MAYBE_ConvertToScreenWhileRemovingSecondaryDisplay) {
   UpdateDisplay("600x600,600x600");
   RunAllPendingInMessageLoop();
 
   // Create a window on the secondary display.
   window_->SetBoundsInScreen(gfx::Rect(600, 0, 400, 400),
-                             ScreenUtil::GetSecondaryDisplay());
+                             display_manager()->GetSecondaryDisplay());
 
   // Move the mouse cursor over |window_|. Synthetic mouse moves are dispatched
   // asynchronously when a window which contains the mouse cursor is destroyed.
   // We want to check that none of these synthetic events are dispatched after
   // ScreenPositionClient has been detached from the root window.
   GetEventGenerator().MoveMouseTo(800, 200);
   EXPECT_TRUE(window_->GetBoundsInScreen().Contains(
       aura::Env::GetInstance()->last_mouse_location()));
 
   aura::Window::Windows root_windows =
@@ skipping 15 matching lines @@
   // destroyed.
   EXPECT_FALSE(tracker.Contains(root_windows[1]));
 
   // Check that we could convert all of the mouse events we got to screen
   // coordinates.
   EXPECT_TRUE(event_handler->could_convert_to_screen());
 }
 
 }  // namespace test
 }  // namespace ash