Separate ash::test::DisplayManagerTestApi from ash

ash/test/ash_test_impl_aura.cc

 // Copyright 2016 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/test/ash_test_impl_aura.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/test/ash_test.h"
 #include "ash/display/display_manager.h"
 #include "ash/screen_util.h"
@@ skipping 49 matching lines @@
 std::unique_ptr<WindowOwner> AshTestImplAura::CreateTestWindow(
     const gfx::Rect& bounds_in_screen,
     ui::wm::WindowType type,
     int shell_window_id) {
   return base::MakeUnique<WindowOwner>(WmWindowAura::Get(
       ash_test_base_->CreateTestWindowInShellWithDelegateAndType(
           nullptr, type, shell_window_id, bounds_in_screen)));
 }
 
 display::Display AshTestImplAura::GetSecondaryDisplay() {
-  return ScreenUtil::GetSecondaryDisplay();
+  return Shell::GetInstance()->display_manager()->GetSecondaryDisplay();
 }
 
 bool AshTestImplAura::SetSecondaryDisplayPlacement(
     display::DisplayPlacement::Position position,
     int offset) {
   Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays(
-      test::CreateDisplayLayout(position, 0));
+      test::CreateDisplayLayout(Shell::GetInstance()->display_manager(),
+                                position, 0));
   return true;
 }
 
 // static
 std::unique_ptr<AshTestImpl> AshTestImpl::Create() {
   return base::MakeUnique<AshTestImplAura>();
 }
 
 }  // namespace ash