Separate ash::test::DisplayManagerTestApi from ash

ash/wm/window_util_unittest.cc

 // Copyright (c) 2013 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/wm/window_util.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
-#include "ash/screen_util.h"
+#include "ash/display/display_manager.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_state_aura.h"
 #include "ui/aura/window.h"
+#include "ui/display/screen.h"
 
 namespace ash {
 
 namespace {
 
 std::string GetAdjustedBounds(const gfx::Rect& visible,
                               gfx::Rect to_be_adjusted) {
   wm::AdjustBoundsToEnsureMinimumWindowVisibility(visible, &to_be_adjusted);
   return to_be_adjusted.ToString();
 }
@@ skipping 11 matching lines @@
 
   wm::WindowState* window_state = wm::GetWindowState(window.get());
   EXPECT_FALSE(window_state->bounds_changed_by_user());
 
   wm::CenterWindow(WmWindowAura::Get(window.get()));
   // Centring window is considered as a user's action.
   EXPECT_TRUE(window_state->bounds_changed_by_user());
   EXPECT_EQ("200,126 100x100", window->bounds().ToString());
   EXPECT_EQ("200,126 100x100", window->GetBoundsInScreen().ToString());
   window->SetBoundsInScreen(gfx::Rect(600, 0, 100, 100),
-                            ScreenUtil::GetSecondaryDisplay());
+                            display_manager()->GetSecondaryDisplay());
   wm::CenterWindow(WmWindowAura::Get(window.get()));
   EXPECT_EQ("250,126 100x100", window->bounds().ToString());
   EXPECT_EQ("750,126 100x100", window->GetBoundsInScreen().ToString());
 }
 
 TEST_F(WindowUtilTest, AdjustBoundsToEnsureMinimumVisibility) {
   const gfx::Rect visible_bounds(0, 0, 100, 100);
 
   EXPECT_EQ("0,0 90x90",
             GetAdjustedBounds(visible_bounds, gfx::Rect(0, 0, 90, 90)));
@@ skipping 49 matching lines @@
       "-250,-40 100x100",
       GetAdjustedBounds(visible_bounds_left, gfx::Rect(-250, -40, 150, 150)));
   EXPECT_EQ(
       "-275,-50 100x100",
       GetAdjustedBounds(visible_bounds_left, gfx::Rect(-400, -60, 150, 150)));
   EXPECT_EQ("-125,0 100x100",
             GetAdjustedBounds(visible_bounds_left, gfx::Rect(0, 0, 150, 150)));
 }
 
 }  // namespace ash