Separate ash::test::DisplayManagerTestApi from ash

ash/content/display/screen_orientation_controller_chromeos_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/display/screen_orientation_controller_chromeos.h"
 
 #include <memory>
 #include <vector>
 
 #include "ash/common/ash_switches.h"
@@ skipping 404 matching lines @@
 }
 
 // The ScreenLayoutObserver class that is responsible for adding/updating
 // MessageCenter notifications is only added to the SystemTray on ChromeOS.
 // Tests that the screen rotation notifications are suppressed when
 // triggered by the accelerometer.
 TEST_F(ScreenOrientationControllerTest, BlockRotationNotifications) {
   EnableMaximizeMode(true);
   test::TestSystemTrayDelegate* tray_delegate = GetSystemTrayDelegate();
   tray_delegate->set_should_show_display_notification(true);
-  test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
+  test::DisplayManagerTestApi(display_manager())
+      .SetFirstDisplayAsInternalDisplay();
 
   message_center::MessageCenter* message_center =
       message_center::MessageCenter::Get();
 
   EXPECT_EQ(0u, message_center->NotificationCount());
   EXPECT_FALSE(message_center->HasPopupNotifications());
 
   // Make sure notifications are still displayed when
   // adjusting the screen rotation directly when in maximize mode
   ASSERT_NE(display::Display::ROTATE_270, GetCurrentInternalDisplayRotation());
@@ skipping 31 matching lines @@
   ASSERT_FALSE(message_center->HasPopupNotifications());
   SetInternalDisplayRotation(display::Display::ROTATE_180);
   EXPECT_EQ(display::Display::ROTATE_180, GetCurrentInternalDisplayRotation());
   EXPECT_EQ(1u, message_center->NotificationCount());
   EXPECT_TRUE(message_center->HasPopupNotifications());
 }
 
 // Tests that if a user has set a display rotation that it is restored upon
 // exiting maximize mode.
 TEST_F(ScreenOrientationControllerTest, ResetUserRotationUponExit) {
-  test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
+  test::DisplayManagerTestApi(display_manager())
+      .SetFirstDisplayAsInternalDisplay();
 
   SetInternalDisplayRotation(display::Display::ROTATE_90);
   EnableMaximizeMode(true);
 
   TriggerLidUpdate(gfx::Vector3dF(0.0f, kMeanGravity, 0.0f));
   EXPECT_EQ(display::Display::ROTATE_180, GetCurrentInternalDisplayRotation());
 
   EnableMaximizeMode(false);
   EXPECT_EQ(display::Display::ROTATE_90, GetCurrentInternalDisplayRotation());
 }
@@ skipping 105 matching lines @@
   EXPECT_EQ(display::Display::ROTATE_0, GetCurrentInternalDisplayRotation());
 
   TriggerLidUpdate(gfx::Vector3dF(0.0f, kMeanGravity, 0.0f));
   EXPECT_EQ(display::Display::ROTATE_0, GetCurrentInternalDisplayRotation());
 }
 
 // Tests that when MaximizeMode is triggered before the internal display is
 // ready, that ScreenOrientationController still begins listening to events,
 // which require an internal display to be acted upon.
 TEST_F(ScreenOrientationControllerTest, InternalDisplayNotAvailableAtStartup) {
-  test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
+  test::DisplayManagerTestApi(display_manager())
+      .SetFirstDisplayAsInternalDisplay();
 
   int64_t internal_display_id = display::Display::InternalDisplayId();
   display::Display::SetInternalDisplayId(display::Display::kInvalidDisplayID);
 
   EnableMaximizeMode(true);
 
   // Should not crash, even though there is no internal display.
   SetDisplayRotationById(internal_display_id, display::Display::ROTATE_180);
   EXPECT_FALSE(RotationLocked());
 
@@ skipping 22 matching lines @@
   std::vector<display::ManagedDisplayInfo> display_info_list_two_active;
   display_info_list_two_active.push_back(internal_display_info);
   display_info_list_two_active.push_back(external_display_info);
 
   std::vector<display::ManagedDisplayInfo> display_info_list_one_active;
   display_info_list_one_active.push_back(external_display_info);
 
   // The display::ManagedDisplayInfo list with two active displays needs to be
   // added first so that the DisplayManager can track the
   // |internal_display_info| as inactive instead of non-existent.
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-  display_manager->UpdateDisplaysWith(display_info_list_two_active);
-  display_manager->UpdateDisplaysWith(display_info_list_one_active);
+  display_manager()->UpdateDisplaysWith(display_info_list_two_active);
+  display_manager()->UpdateDisplaysWith(display_info_list_one_active);
 
-  test::ScopedSetInternalDisplayId set_internal(kInternalDisplayId);
+  test::ScopedSetInternalDisplayId set_internal(display_manager(),
+                                                kInternalDisplayId);
 
-  ASSERT_NE(
-      kNewRotation,
-      display_manager->GetDisplayInfo(kInternalDisplayId).GetActiveRotation());
+  ASSERT_NE(kNewRotation, display_manager()
+                              ->GetDisplayInfo(kInternalDisplayId)
+                              .GetActiveRotation());
 
   Shell::GetInstance()->screen_orientation_controller()->SetDisplayRotation(
       kNewRotation, display::Display::ROTATION_SOURCE_ACTIVE);
 
-  EXPECT_EQ(
-      kNewRotation,
-      display_manager->GetDisplayInfo(kInternalDisplayId).GetActiveRotation());
+  EXPECT_EQ(kNewRotation, display_manager()
+                              ->GetDisplayInfo(kInternalDisplayId)
+                              .GetActiveRotation());
 }
 
 }  // namespace ash