Separate ash::test::DisplayManagerTestApi from ash

ash/wm/maximize_mode/maximize_mode_controller_unittest.cc

 // Copyright 2014 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/maximize_mode/maximize_mode_controller.h"
 
 #include <math.h>
 #include <utility>
 #include <vector>
 
@@ skipping 64 matching lines @@
 
   void SetUp() override {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kAshEnableTouchView);
     test::AshTestBase::SetUp();
     chromeos::AccelerometerReader::GetInstance()->RemoveObserver(
         maximize_mode_controller());
 
     // Set the first display to be the internal display for the accelerometer
     // screen rotation tests.
-    test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
+    test::DisplayManagerTestApi(Shell::GetInstance()->display_manager())
+        .SetFirstDisplayAsInternalDisplay();
   }
 
   void TearDown() override {
     chromeos::AccelerometerReader::GetInstance()->AddObserver(
         maximize_mode_controller());
     test::AshTestBase::TearDown();
   }
 
   MaximizeModeController* maximize_mode_controller() {
     return WmShell::Get()->maximize_mode_controller();
@@ skipping 386 matching lines @@
   EXPECT_FALSE(WmShell::Get()->window_selector_controller()->IsSelecting());
   EXPECT_EQ(w1->GetRootWindow(), w2->GetRootWindow());
 }
 
 // Test that the disabling of the internal display exits maximize mode, and that
 // while disabled we do not re-enter maximize mode.
 TEST_F(MaximizeModeControllerTest, NoMaximizeModeWithDisabledInternalDisplay) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   UpdateDisplay("200x200, 200x200");
   const int64_t internal_display_id =
-      test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
+      test::DisplayManagerTestApi(Shell::GetInstance()->display_manager())
+          .SetFirstDisplayAsInternalDisplay();
   ASSERT_FALSE(IsMaximizeModeStarted());
 
   OpenLidToAngle(270.0f);
   EXPECT_TRUE(IsMaximizeModeStarted());
   EXPECT_TRUE(AreEventsBlocked());
 
   // Deactivate internal display to simulate Docked Mode.
   std::vector<display::ManagedDisplayInfo> secondary_only;
   secondary_only.push_back(
       display_manager->GetDisplayInfo(display_manager->GetDisplayAt(1).id()));
@@ skipping 56 matching lines @@
 // accelerometer updates which would normally cause it to exit do not.
 TEST_F(MaximizeModeControllerSwitchesTest, IgnoreHingeAngles) {
   maximize_mode_controller()->EnableMaximizeModeWindowManager(true);
 
   // Would normally trigger an exit from maximize mode.
   OpenLidToAngle(90.0f);
   EXPECT_TRUE(IsMaximizeModeStarted());
 }
 
 }  // namespace ash