Separate ash::test::DisplayManagerTestApi from ash

ash/display/unified_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/unified_mouse_warp_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/display/mouse_cursor_event_filter.h"
@@ skipping 11 matching lines @@
 
 namespace ash {
 
 class UnifiedMouseWarpControllerTest : public test::AshTestBase {
  public:
   UnifiedMouseWarpControllerTest() {}
   ~UnifiedMouseWarpControllerTest() override {}
 
   void SetUp() override {
     test::AshTestBase::SetUp();
-    Shell::GetInstance()->display_manager()->SetUnifiedDesktopEnabled(true);
+    display_manager()->SetUnifiedDesktopEnabled(true);
   }
 
  protected:
   bool FindMirrroingDisplayIdContainingNativePoint(
       const gfx::Point& point_in_native,
       int64_t* display_id,
       gfx::Point* point_in_mirroring_host,
       gfx::Point* point_in_unified_host) {
-    DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-    for (auto display : display_manager->software_mirroring_display_list()) {
+    for (auto display : display_manager()->software_mirroring_display_list()) {
       display::ManagedDisplayInfo info =
-          display_manager->GetDisplayInfo(display.id());
+          display_manager()->GetDisplayInfo(display.id());
       if (info.bounds_in_native().Contains(point_in_native)) {
         *display_id = info.id();
         *point_in_unified_host = point_in_native;
         const gfx::Point& origin = info.bounds_in_native().origin();
         // Convert to mirroring host.
         point_in_unified_host->Offset(-origin.x(), -origin.y());
         *point_in_mirroring_host = *point_in_unified_host;
         // Convert from mirroring host to unified host.
         AshWindowTreeHost* ash_host =
             Shell::GetInstance()
                 ->window_tree_host_manager()
                 ->mirror_window_controller()
                 ->GetAshWindowTreeHostForDisplayId(info.id());
         ash_host->AsWindowTreeHost()->ConvertPointFromHost(
             point_in_unified_host);
         return true;
       }
     }
     return false;
   }
 
   bool TestIfMouseWarpsAt(const gfx::Point& point_in_native) {
     static_cast<UnifiedMouseWarpController*>(
         Shell::GetInstance()
             ->mouse_cursor_filter()
             ->mouse_warp_controller_for_test())
         ->update_location_for_test();
-    DisplayManager* display_manager = Shell::GetInstance()->display_manager();
     int64_t orig_mirroring_display_id;
     gfx::Point point_in_unified_host;
     gfx::Point point_in_mirroring_host;
     if (!FindMirrroingDisplayIdContainingNativePoint(
             point_in_native, &orig_mirroring_display_id,
             &point_in_mirroring_host, &point_in_unified_host)) {
       return false;
     }
 #if defined(USE_OZONE)
     // The location of the ozone's native event is relative to the host.
     GetEventGenerator().MoveMouseToWithNative(point_in_unified_host,
                                               point_in_mirroring_host);
 #else
     GetEventGenerator().MoveMouseToWithNative(point_in_unified_host,
                                               point_in_native);
 #endif
     aura::Window* root = Shell::GetPrimaryRootWindow();
     gfx::Point new_location_in_unified_host =
         aura::Env::GetInstance()->last_mouse_location();
     // Convert screen to the host.
     root->GetHost()->ConvertPointToHost(&new_location_in_unified_host);
 
     int new_index = display::FindDisplayIndexContainingPoint(
-        display_manager->software_mirroring_display_list(),
+        display_manager()->software_mirroring_display_list(),
         new_location_in_unified_host);
     if (new_index < 0)
       return false;
     return orig_mirroring_display_id !=
-           display_manager->software_mirroring_display_list()[new_index].id();
+           display_manager()->software_mirroring_display_list()[new_index].id();
   }
 
   MouseCursorEventFilter* event_filter() {
     return Shell::GetInstance()->mouse_cursor_filter();
   }
 
   UnifiedMouseWarpController* mouse_warp_controller() {
     return static_cast<UnifiedMouseWarpController*>(
         event_filter()->mouse_warp_controller_for_test());
   }
@@ skipping 144 matching lines @@
   EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(600, 10)));
   EXPECT_EQ("249,5",  // moved to 498 by 2px, divided by 2 (dsf).
             aura::Env::GetInstance()->last_mouse_location().ToString());
   {
     SCOPED_TRACE("1x2 NO WARP");
     NoWarpTestBody();
   }
 }
 
 }  // namespace aura