Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

ash/test/ash_test_base.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/test/ash_test_base.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/display/display_controller.h"
-#include "ash/display/multi_display_manager.h"
+#include "ash/display/display_manager.h"
 #include "ash/shell.h"
-#include "ash/test/multi_display_manager_test_api.h"
+#include "ash/test/display_manager_test_api.h"
 #include "ash/test/test_shell_delegate.h"
 #include "base/run_loop.h"
 #include "content/public/test/web_contents_tester.h"
 #include "ui/aura/env.h"
-#include "ui/aura/display_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/ime/text_input_test_support.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 namespace test {
 
 content::WebContents* AshTestViewsDelegate::CreateWebContents(
@@ skipping 34 matching lines @@
   ui::TextInputTestSupport::Shutdown();
 }
 
 void AshTestBase::ChangeDisplayConfig(float scale,
                                       const gfx::Rect& bounds_in_pixel) {
   gfx::Display display =
       gfx::Display(Shell::GetScreen()->GetPrimaryDisplay().id());
   display.SetScaleAndBounds(scale, bounds_in_pixel);
   std::vector<gfx::Display> displays;
   displays.push_back(display);
-  aura::Env::GetInstance()->display_manager()->OnNativeDisplaysChanged(
-      displays);
+  Shell::GetInstance()->display_manager()->OnNativeDisplaysChanged(displays);
 }
 
 void AshTestBase::UpdateDisplay(const std::string& display_specs) {
-  internal::MultiDisplayManager* multi_display_manager =
-      static_cast<internal::MultiDisplayManager*>(
-          aura::Env::GetInstance()->display_manager());
-  MultiDisplayManagerTestApi multi_display_manager_test_api(
-      multi_display_manager);
-  multi_display_manager_test_api.UpdateDisplay(display_specs);
+  DisplayManagerTestApi display_manager_test_api(
+      Shell::GetInstance()->display_manager());
+  display_manager_test_api.UpdateDisplay(display_specs);
 }
 
 void AshTestBase::RunAllPendingInMessageLoop() {
 #if !defined(OS_MACOSX)
   DCHECK(MessageLoopForUI::current() == &message_loop_);
   base::RunLoop run_loop(aura::Env::GetInstance()->GetDispatcher());
   run_loop.RunUntilIdle();
 #endif
 }
 
 void AshTestBase::SetSessionStarted(bool session_started) {
   test_shell_delegate_->SetSessionStarted(session_started);
 }
 
 void AshTestBase::SetUserLoggedIn(bool user_logged_in) {
   test_shell_delegate_->SetUserLoggedIn(user_logged_in);
 }
 
 }  // namespace test
 }  // namespace ash