Separate ash::test::DisplayManagerTestApi from ash

ash/wm/panels/panel_layout_manager_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/common/wm/panels/panel_layout_manager.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_button.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_model.h"
@@ skipping 295 matching lines @@
   EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(window.get()));
   EXPECT_NO_FATAL_FAILURE(IsCalloutAboveLauncherIcon(window.get()));
 }
 
 // Tests for crashes during undocking.
 // See https://crbug.com/632755
 TEST_F(PanelLayoutManagerTest, UndockTest) {
   std::vector<display::ManagedDisplayInfo> info_list;
 
   const int64_t internal_display_id =
-      test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
+      test::DisplayManagerTestApi(Shell::GetInstance()->display_manager())
+          .SetFirstDisplayAsInternalDisplay();
 
   // Create the primary display info.
   display::ManagedDisplayInfo internal_display =
       CreateDisplayInfo(internal_display_id, gfx::Rect(0, 0, 1280, 720));
   // Create the secondary external display info. This will be docked display.
   display::ManagedDisplayInfo external_display_info =
       CreateDisplayInfo(2, gfx::Rect(0, 0, 1920, 1080));
 
   info_list.push_back(external_display_info);
   // Docked state.
   display_manager()->OnNativeDisplaysChanged(info_list);
 
   // Create a panel in the docked state
   std::unique_ptr<aura::Window> p1_d2(
       CreatePanelWindow(gfx::Rect(1555, 800, 50, 50)));
 
   info_list.clear();
   info_list.push_back(internal_display);
 
   // Undock and bring back the native device display as primary display.
   display_manager()->OnNativeDisplaysChanged(info_list);
 }
 
 // Tests for any crash during docking and then undocking.
 // See https://crbug.com/632755
 TEST_F(PanelLayoutManagerTest, DockUndockTest) {
   std::vector<display::ManagedDisplayInfo> info_list;
 
   const int64_t internal_display_id =
-      test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
+      test::DisplayManagerTestApi(Shell::GetInstance()->display_manager())
+          .SetFirstDisplayAsInternalDisplay();
 
   // Create the primary display info.
   display::ManagedDisplayInfo internal_display =
       CreateDisplayInfo(internal_display_id, gfx::Rect(0, 0, 1280, 720));
 
   info_list.push_back(internal_display);
   display_manager()->OnNativeDisplaysChanged(info_list);
 
   // Create a panel in the undocked state.
   std::unique_ptr<aura::Window> p1_d2(
@@ skipping 554 matching lines @@
   touch.set_location(gfx::Point(bounds.x() - 1, bounds.y() + 5));
   target = targeter->FindTargetForEvent(root, &touch);
   EXPECT_NE(w.get(), target);
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl,
                         PanelLayoutManagerTextDirectionTest,
                         testing::Bool());
 
 }  // namespace ash